From 12a8f590f8f1300780ca2e8e3e46316a3cb4321b Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 25 Aug 2011 04:02:11 -0500 Subject: [PATCH 001/627] Remove immediate mode from the Texture converter, probably need to redo this for texcache rewrite :/ --- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index c715775194..ad457996b2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -213,13 +213,24 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar PixelShaderCache::SetCurrentShader(shader.glprogid); - // Draw... - glBegin(GL_QUADS); - glTexCoord2f((float)sourceRc.left, (float)sourceRc.top); glVertex2f(-1,-1); - glTexCoord2f((float)sourceRc.left, (float)sourceRc.bottom); glVertex2f(-1,1); - glTexCoord2f((float)sourceRc.right, (float)sourceRc.bottom); glVertex2f(1,1); - glTexCoord2f((float)sourceRc.right, (float)sourceRc.top); glVertex2f(1,-1); - glEnd(); + GL_REPORT_ERRORD(); + + GLfloat tex1[] = { + (float)sourceRc.left, (float)sourceRc.top, + (float)sourceRc.left, (float)sourceRc.bottom, + (float)sourceRc.right, (float)sourceRc.bottom, + (float)sourceRc.right, (float)sourceRc.top + }; + GLfloat vtx1[] = { + -1, -1, 1, + -1, 1, 1, + 1, 1, 1, + 1, -1, 1 + }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + GL_REPORT_ERRORD(); // .. and then read back the results. @@ -458,12 +469,23 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur GL_REPORT_ERRORD(); - glBegin(GL_QUADS); - glTexCoord2f((float)srcFmtWidth, (float)srcHeight); glVertex2f(1,-1); - glTexCoord2f((float)srcFmtWidth, 0); glVertex2f(1,1); - glTexCoord2f(0, 0); glVertex2f(-1,1); - glTexCoord2f(0, (float)srcHeight); glVertex2f(-1,-1); - glEnd(); + GLfloat tex1[] = { + (float)srcFmtWidth, (float)srcHeight, + (float)srcFmtWidth, 0, + 0, 0, + 0, (float)srcHeight + }; + GLfloat vtx1[] = { + 1, -1, 1, + 1, 1, 1, + -1, 1, 1, + -1, -1, 1 + }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + GL_REPORT_ERRORD(); // reset state glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); From d021f9e3b65f507273d0a9b8bea2db46db9f062c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 25 Aug 2011 04:28:29 -0500 Subject: [PATCH 002/627] Here we go with the texture cache --- .../Plugin_VideoOGL/Src/TextureCache.cpp | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 4a9431a563..55e20c0b05 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -302,12 +302,24 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); - glBegin(GL_QUADS); - glTexCoord2f((GLfloat)targetSource.left, (GLfloat)targetSource.bottom); glVertex2f(-1, 1); - glTexCoord2f((GLfloat)targetSource.left, (GLfloat)targetSource.top ); glVertex2f(-1, -1); - glTexCoord2f((GLfloat)targetSource.right, (GLfloat)targetSource.top ); glVertex2f( 1, -1); - glTexCoord2f((GLfloat)targetSource.right, (GLfloat)targetSource.bottom); glVertex2f( 1, 1); - glEnd(); + GL_REPORT_ERRORD(); + + GLfloat tex1[] = { + (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, + (GLfloat)targetSource.left, (GLfloat)targetSource.top, + (GLfloat)targetSource.right, (GLfloat)targetSource.top, + (GLfloat)targetSource.right, (GLfloat)targetSource.bottom + }; + GLfloat vtx1[] = { + -1, 1, 1, + -1, -1, 1, + 1, -1, 1, + 1, 1, 1 + }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + GL_REPORT_ERRORD(); From 31fd25bf6138fae81af19d7c264cdefe3c5086a2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 25 Aug 2011 04:41:45 -0500 Subject: [PATCH 003/627] Move on to XFB drawing --- .../Src/FramebufferManager.cpp | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 0e37c3adb6..79189d4309 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -305,23 +305,30 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - glBegin(GL_QUADS); - glTexCoord2f(sourcerc.left, sourcerc.bottom); + GLfloat vtx1[] = { + drawrc.left, drawrc.bottom, 1, + drawrc.left, drawrc.top, 1, + drawrc.right, drawrc.top, 1, + drawrc.right, drawrc.bottom, 1 + }; + GLfloat tex1[] = { // For TEXTURE0 + sourcerc.left, sourcerc.bottom, + sourcerc.left, sourcerc.top, + sourcerc.right, sourcerc.top, + sourcerc.right, sourcerc.bottom + }; + + glClientActiveTexture(GL_TEXTURE0); + glTexCoordPointer(2, GL_FLOAT, 0, tex1); + + // Is this correct? glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); - glVertex2f(drawrc.left, drawrc.bottom); - - glTexCoord2f(sourcerc.left, sourcerc.top); glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); - glVertex2f(drawrc.left, drawrc.top); - - glTexCoord2f(sourcerc.right, sourcerc.top); glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); - glVertex2f(drawrc.right, drawrc.top); - - glTexCoord2f(sourcerc.right, sourcerc.bottom); glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); - glVertex2f(drawrc.right, drawrc.bottom); - glEnd(); + + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); GL_REPORT_ERRORD(); } From 5a6a2b2bec29e71efd8dda61bf6fb5aad4a45020 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 25 Aug 2011 05:20:41 -0500 Subject: [PATCH 004/627] Do clearscreen and swap, probably won't do debug text nonsense since it looks like trash anyway. maybe later. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 95 +++++++++++-------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 0c9d904cad..a0640d7294 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -888,16 +888,39 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE glViewport(targetRc.left, targetRc.bottom, targetRc.GetWidth(), targetRc.GetHeight()); glDepthRange(0.0, (float)(z & 0xFFFFFF) / float(0xFFFFFF)); - glColor4f((float)((color >> 16) & 0xFF) / 255.0f, - (float)((color >> 8) & 0xFF) / 255.0f, - (float)(color & 0xFF) / 255.0f, - (float)((color >> 24) & 0xFF) / 255.0f); - glBegin(GL_QUADS); - glVertex3f(-1.f, -1.f, 1.f); - glVertex3f(-1.f, 1.f, 1.f); - glVertex3f( 1.f, 1.f, 1.f); - glVertex3f( 1.f, -1.f, 1.f); - glEnd(); + GLfloat vtx1[] = { + -1, -1, 1, + -1, 1, 1, + 1, 1, 1, + 1, -1, 1 + }; + GLfloat col1[] = { // This looks terrible + (float)((color >> 16) & 0xFF) / 255.0f, + (float)((color >> 8) & 0xFF) / 255.0f, + (float)(color & 0xFF) / 255.0f, + (float)((color >> 24) & 0xFF) / 255.0f, + + (float)((color >> 16) & 0xFF) / 255.0f, + (float)((color >> 8) & 0xFF) / 255.0f, + (float)(color & 0xFF) / 255.0f, + (float)((color >> 24) & 0xFF) / 255.0f, + + (float)((color >> 16) & 0xFF) / 255.0f, + (float)((color >> 8) & 0xFF) / 255.0f, + (float)(color & 0xFF) / 255.0f, + (float)((color >> 24) & 0xFF) / 255.0f, + + (float)((color >> 16) & 0xFF) / 255.0f, + (float)((color >> 8) & 0xFF) / 255.0f, + (float)(color & 0xFF) / 255.0f, + (float)((color >> 24) & 0xFF) / 255.0f + }; + glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS); // Only need this to not overwrite the GL_COLOR_ARRAY state + glEnableClientState(GL_COLOR_ARRAY); + glColorPointer(4, GL_FLOAT, 0 ,col1); + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glPopClientAttrib(); RestoreAPIState(); } @@ -1115,43 +1138,35 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Render to the real buffer now. glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); // switch to the window backbuffer glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); + + GLfloat vtx1[] = { + -1, -1, 1, + -1, 1, 1, + 1, 1, 1, + 1, -1, 1 + }; + GLfloat tex1[] = { // For TEXTURE0 + targetRc.left, targetRc.bottom, + targetRc.left, targetRc.top, + targetRc.right, targetRc.top, + targetRc.right, targetRc.bottom + }; + + glClientActiveTexture(GL_TEXTURE0); + glTexCoordPointer(2, GL_FLOAT, 0, tex1); + if (applyShader) { - glBegin(GL_QUADS); - glTexCoord2f(targetRc.left, targetRc.bottom); glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); - glVertex2f(-1, -1); - - glTexCoord2f(targetRc.left, targetRc.top); glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); - glVertex2f(-1, 1); - - glTexCoord2f(targetRc.right, targetRc.top); glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); - glVertex2f( 1, 1); - - glTexCoord2f(targetRc.right, targetRc.bottom); glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); - glVertex2f( 1, -1); - glEnd(); + } + + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + if(applyShader) PixelShaderCache::DisableShader(); - } - else - { - glBegin(GL_QUADS); - glTexCoord2f(targetRc.left, targetRc.bottom); - glVertex2f(-1, -1); - - glTexCoord2f(targetRc.left, targetRc.top); - glVertex2f(-1, 1); - - glTexCoord2f(targetRc.right, targetRc.top); - glVertex2f( 1, 1); - - glTexCoord2f(targetRc.right, targetRc.bottom); - glVertex2f( 1, -1); - glEnd(); - } } glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); From 6773261a85d87bd7337689af55dd25c6963c7261 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Tue, 28 Aug 2012 03:35:31 -0600 Subject: [PATCH 005/627] Use correct linker flags for SDL. --- Source/Core/DolphinWX/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 9a2d7a6804..ef41d4f279 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -13,11 +13,11 @@ set(LIBS core ${X11_LIBRARIES}) if(SDL2_FOUND) - set(LIBS ${LIBS} SDL2) + set(LIBS ${LIBS} ${SDL2_LIBRARY}) endif() if(SDL_FOUND) - set(LIBS ${LIBS} SDL) + set(LIBS ${LIBS} ${SDL_LIBRARY}) endif() if(LIBAV_FOUND) From 94e49c50440fa804f39b866a8923304942cef323 Mon Sep 17 00:00:00 2001 From: plbl4ster Date: Tue, 28 Aug 2012 12:27:58 +0200 Subject: [PATCH 006/627] Fix frame skipping on non-win32 systems missing libav Fixes issue 4097. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index f10634ba18..19e4002b7e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -993,11 +993,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && frame_data) - #ifdef _WIN32 + { +#ifdef _WIN32 AVIDump::AddFrame(frame_data); - #elif defined HAVE_LIBAV +#elif defined HAVE_LIBAV AVIDump::AddFrame((u8*)frame_data, w, h); - #endif +#endif + } Core::Callback_VideoCopiedToXFB(false); return; } From d2e057d137e424b8fed910f615982c1f1e6bf15c Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 28 Aug 2012 22:34:24 -0500 Subject: [PATCH 007/627] Update libav code to remove deprecation warnings. --- Source/Core/VideoCommon/Src/AVIDump.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 4c31798d9f..c172903b5d 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -252,7 +252,7 @@ bool AVIDump::CreateFile() File::CreateFullPath(s_FormatContext->filename); if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) || - !(s_Stream = av_new_stream(s_FormatContext, 0))) + !(s_Stream = avformat_new_stream(s_FormatContext, codec))) { CloseFile(); return false; @@ -269,7 +269,7 @@ bool AVIDump::CreateFile() s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) || - (avcodec_open(s_Stream->codec, codec) < 0)) + (avcodec_open2(s_Stream->codec, codec, NULL) < 0)) { CloseFile(); return false; From 054c6f2aad82000b3a57852bc5e0909d56c74541 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 28 Aug 2012 22:38:21 -0500 Subject: [PATCH 008/627] Update the cmake build system to neccessary versions of libav. --- CMakeTests/CheckLib.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index 43f9370188..7b2525adae 100644 --- a/CMakeTests/CheckLib.cmake +++ b/CMakeTests/CheckLib.cmake @@ -55,8 +55,8 @@ endmacro() macro(check_libav) if(PKG_CONFIG_FOUND) - pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0 - libswscale>=2.0.0 libavutil>=51.7.0) + pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0 + libswscale>=2.1.0 libavutil>=51.22.1) else() message("pkg-config is required to check for libav") endif() From 7be4f1f74774a13c42fbb25d54a8912a3aaa0406 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Sun, 2 Sep 2012 15:08:16 +0300 Subject: [PATCH 009/627] Gameconfig ini updates/additions: The Ant Bully, WWE Day of Reckoning 1 & 2, Dream Pinball 3d, Pokepark, Spider-Man: Edge of Time, Spider-Man: SD, Another Code:R, Geist, The Incredibles 2, Skies of Arcadia Legends. --- Data/User/GameConfig/GAXE5D.ini | 16 ++++++++++++++++ Data/User/GameConfig/GEAE8P.ini | 3 +++ Data/User/GameConfig/GEAP8P.ini | 3 +++ Data/User/GameConfig/GIQE78.ini | 4 ++-- Data/User/GameConfig/GITE01.ini | 11 ++++++++++- Data/User/GameConfig/GITP01.ini | 12 +++++++++++- Data/User/GameConfig/GW2E78.ini | 15 +++++++++++++-- Data/User/GameConfig/GW2P78.ini | 12 ++++++++++-- Data/User/GameConfig/GWPE78.ini | 15 +++++++++++++-- Data/User/GameConfig/GWPJG2.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GWPP78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R3DES5.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R3DPS5.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R8AE01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/R8AJ01.ini | 5 ++++- Data/User/GameConfig/R8AP01.ini | 5 ++++- Data/User/GameConfig/RNOJ01.ini | 4 ++-- Data/User/GameConfig/RNOP01.ini | 4 ++-- Data/User/GameConfig/SPDE52.ini | 4 ++-- Data/User/GameConfig/SPDP52.ini | 4 ++-- Data/User/GameConfig/SQME52.ini | 2 +- Data/User/GameConfig/SQMP52.ini | 2 +- 22 files changed, 189 insertions(+), 22 deletions(-) create mode 100644 Data/User/GameConfig/GAXE5D.ini create mode 100644 Data/User/GameConfig/GWPJG2.ini create mode 100644 Data/User/GameConfig/GWPP78.ini create mode 100644 Data/User/GameConfig/R3DES5.ini create mode 100644 Data/User/GameConfig/R3DPS5.ini create mode 100644 Data/User/GameConfig/R8AE01.ini diff --git a/Data/User/GameConfig/GAXE5D.ini b/Data/User/GameConfig/GAXE5D.ini new file mode 100644 index 0000000000..6c9c6a4532 --- /dev/null +++ b/Data/User/GameConfig/GAXE5D.ini @@ -0,0 +1,16 @@ +# GAXE5D - The Ant Bully +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini index 5c2856e1ca..95afa9f062 100644 --- a/Data/User/GameConfig/GEAE8P.ini +++ b/Data/User/GameConfig/GEAE8P.ini @@ -15,3 +15,6 @@ PH_ZFar = 1.99998 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini index 08b7a7969e..92aa6472a9 100644 --- a/Data/User/GameConfig/GEAP8P.ini +++ b/Data/User/GameConfig/GEAP8P.ini @@ -15,3 +15,6 @@ PH_ZFar = 1.99998 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GIQE78.ini b/Data/User/GameConfig/GIQE78.ini index e6763d7e9f..3cb9063eb1 100644 --- a/Data/User/GameConfig/GIQE78.ini +++ b/Data/User/GameConfig/GIQE78.ini @@ -1,8 +1,8 @@ # GIQE78 - The Incredibles 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs real XFB for videos to show up(r6898) -EmulationStateId = 3 +EmulationIssues = Needs real XFB for videos to show up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code diff --git a/Data/User/GameConfig/GITE01.ini b/Data/User/GameConfig/GITE01.ini index b35cf1c579..568c971361 100644 --- a/Data/User/GameConfig/GITE01.ini +++ b/Data/User/GameConfig/GITE01.ini @@ -1,7 +1,16 @@ # GITE01 - Geist [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Very slow +EmulationIssues = EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GITP01.ini b/Data/User/GameConfig/GITP01.ini index 141ccddb47..5895802f4b 100644 --- a/Data/User/GameConfig/GITP01.ini +++ b/Data/User/GameConfig/GITP01.ini @@ -1,6 +1,16 @@ # GITP01 - Geist [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationIssues = +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GW2E78.ini b/Data/User/GameConfig/GW2E78.ini index 1552c4b1c3..9137f3bd0b 100644 --- a/Data/User/GameConfig/GW2E78.ini +++ b/Data/User/GameConfig/GW2E78.ini @@ -1,7 +1,18 @@ # GW2E78 - WWE Day of Reckoning 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = DSP/ARAM/Audio Streaming problem +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GW2P78.ini b/Data/User/GameConfig/GW2P78.ini index eabb9a40a1..b3783f9a2a 100644 --- a/Data/User/GameConfig/GW2P78.ini +++ b/Data/User/GameConfig/GW2P78.ini @@ -1,10 +1,18 @@ # GW2P78 - WWE Day of Reckoning 2 [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = DSP/ARAM/Audio Streaming problem +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWPE78.ini b/Data/User/GameConfig/GWPE78.ini index 0cd68a4d4d..0f23b70145 100644 --- a/Data/User/GameConfig/GWPE78.ini +++ b/Data/User/GameConfig/GWPE78.ini @@ -1,7 +1,18 @@ # GWPE78 - WWE Day of Reckoning [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWPJG2.ini b/Data/User/GameConfig/GWPJG2.ini new file mode 100644 index 0000000000..c4ee3c6b1c --- /dev/null +++ b/Data/User/GameConfig/GWPJG2.ini @@ -0,0 +1,18 @@ +# GWPJG2 - WWE Day of Reckoning +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GWPP78.ini b/Data/User/GameConfig/GWPP78.ini new file mode 100644 index 0000000000..e5582f167e --- /dev/null +++ b/Data/User/GameConfig/GWPP78.ini @@ -0,0 +1,18 @@ +# GWPP78 - WWE Day of Reckoning +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Efb to Ram for created fighters. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R3DES5.ini b/Data/User/GameConfig/R3DES5.ini new file mode 100644 index 0000000000..6e986ea0f3 --- /dev/null +++ b/Data/User/GameConfig/R3DES5.ini @@ -0,0 +1,18 @@ +# R3DES5 - Dream Pinball 3d +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Automatic framelimit is problematic. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/R3DPS5.ini b/Data/User/GameConfig/R3DPS5.ini new file mode 100644 index 0000000000..f0d2c21b46 --- /dev/null +++ b/Data/User/GameConfig/R3DPS5.ini @@ -0,0 +1,18 @@ +# R3DPS5 - Dream Pinball 3d +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Automatic framelimit is problematic. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/R8AE01.ini b/Data/User/GameConfig/R8AE01.ini new file mode 100644 index 0000000000..af8a1a8a8b --- /dev/null +++ b/Data/User/GameConfig/R8AE01.ini @@ -0,0 +1,18 @@ +# R8AE01 - Pokepark Wii +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/User/GameConfig/R8AJ01.ini index 594e651a76..d8bb08f0ba 100644 --- a/Data/User/GameConfig/R8AJ01.ini +++ b/Data/User/GameConfig/R8AJ01.ini @@ -2,8 +2,11 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = NPCs sporadically disappear. +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/User/GameConfig/R8AP01.ini index 1c06c00d3d..c677497a7b 100644 --- a/Data/User/GameConfig/R8AP01.ini +++ b/Data/User/GameConfig/R8AP01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = NPCs sporadically disappear. +EmulationIssues = NPCs sporadically disappear. Needs Efb to Ram for photos. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/User/GameConfig/RNOJ01.ini index f5b790de88..50f94d5f6a 100644 --- a/Data/User/GameConfig/RNOJ01.ini +++ b/Data/User/GameConfig/RNOJ01.ini @@ -1,8 +1,8 @@ # RNOJ01 - Another Code R Kioku no Tobira [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. -EmulationStateId = 3 +EmulationIssues = Efb to Ram is needed for proper scene transition effect. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RNOP01.ini b/Data/User/GameConfig/RNOP01.ini index a90f6378be..7a56630ac2 100644 --- a/Data/User/GameConfig/RNOP01.ini +++ b/Data/User/GameConfig/RNOP01.ini @@ -1,8 +1,8 @@ # RNOP01 - Another Code:R [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = You can't interact with some objects ingame. Efb to Ram is needed for proper scene transition effect. -EmulationStateId = 3 +EmulationIssues = Efb to Ram is needed for proper scene transition effect. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/User/GameConfig/SPDE52.ini index e9698d8952..dae5e74567 100644 --- a/Data/User/GameConfig/SPDE52.ini +++ b/Data/User/GameConfig/SPDE52.ini @@ -10,8 +10,8 @@ ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = 0.7 +PH_ZNear = 0.5 +PH_ZFar = 0.5 [Gecko] [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/User/GameConfig/SPDP52.ini index 0a19aeb06b..39f2a95725 100644 --- a/Data/User/GameConfig/SPDP52.ini +++ b/Data/User/GameConfig/SPDP52.ini @@ -10,8 +10,8 @@ ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = 0.7 +PH_ZNear = 0.5 +PH_ZFar = 0.5 [Gecko] [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/SQME52.ini b/Data/User/GameConfig/SQME52.ini index e510a3e524..c78a968d6d 100644 --- a/Data/User/GameConfig/SQME52.ini +++ b/Data/User/GameConfig/SQME52.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs LLE audio for sound ingame. Enabling texture filtering solves some texture issues with direct3d9 backend. +EmulationIssues = Needs LLE audio for sound ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SQMP52.ini b/Data/User/GameConfig/SQMP52.ini index 0819a4f354..544354b081 100644 --- a/Data/User/GameConfig/SQMP52.ini +++ b/Data/User/GameConfig/SQMP52.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Needs LLE audio for sound ingame. Enabling texture filtering solves some texture issues with direct3d9 backend. +EmulationIssues = Needs LLE audio for sound ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] From 1ffb9ce47eb2f84dc5feda027aa09991778ff283 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Sun, 2 Sep 2012 16:53:15 -0600 Subject: [PATCH 010/627] Fix broken build when using SDL from Externals. The problem here was the logic that detects SDL in the main CMakeLists.txt is not the same as it is in DolphinWX/CmakeLists.txt to set libraries. When using SDL from Externals it failed at link time because -lSDL was never set. This fixes the problem by using the same condition logic to set the libs as used when detecting SDL in the first place. --- Source/Core/DolphinWX/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index ef41d4f279..77ac9eb439 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -13,12 +13,18 @@ set(LIBS core ${X11_LIBRARIES}) if(SDL2_FOUND) + # Using shared SDL2 set(LIBS ${LIBS} ${SDL2_LIBRARY}) +else(SDL2_FOUND) + if(SDL_FOUND) + # Using shared SDL + set(LIBS ${LIBS} ${SDL_LIBRARY}) + else(SDL_FOUND) + # Using static SDL from Externals + set(LIBS ${LIBS} SDL) + endif() endif() -if(SDL_FOUND) - set(LIBS ${LIBS} ${SDL_LIBRARY}) -endif() if(LIBAV_FOUND) set(LIBS ${LIBS} ${LIBAV_LIBRARIES}) From 208d25c3f515c23b6c5989e2abc72a6423a38341 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 7 Sep 2012 01:09:49 +0200 Subject: [PATCH 011/627] Revert merges of aram-dma-fixes and memcard-delay These merges, while in theory improving emulation accuracy, cause issues in other parts of the emulator based on invalid assumptions. memcard-delay fixed some of these issues in the EXI memcard code, but several other problems still exist and I don't have the time to debug that right now. --- Source/Core/Core/Src/HW/DSP.cpp | 10 +++-- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 38 ++++++------------- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 11 +----- .../Interpreter_SystemRegisters.cpp | 1 - Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 3 +- .../Src/PowerPC/Jit64/Jit_SystemRegisters.cpp | 18 --------- Source/Core/Core/Src/PowerPC/Jit64IL/IR.h | 4 +- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 18 --------- .../PowerPC/Jit64IL/JitIL_SystemRegisters.cpp | 2 +- 9 files changed, 23 insertions(+), 82 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index 799fb62f0e..f2509555ed 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -436,6 +436,10 @@ void Write16(const u16 _Value, const u32 _Address) if (tmpControl.ARAM) g_dspState.DSPControl.ARAM = 0; if (tmpControl.DSP) g_dspState.DSPControl.DSP = 0; + // Tracking DMAState fixes Knockout Kings 2003 in DSP HLE mode + if (GetDSPEmulator()->IsLLE()) + g_dspState.DSPControl.DMAState = 0; // keep g_ARAM DMA State zero + // unknown g_dspState.DSPControl.unk3 = tmpControl.unk3; g_dspState.DSPControl.pad = tmpControl.pad; @@ -697,9 +701,9 @@ void Do_ARAM_DMA() // seems like a good estimate CoreTiming::ScheduleEvent_Threadsafe(g_arDMA.Cnt.count >> 1, et_GenerateDSPInterrupt, INT_ARAM | (1<<16)); - // Set the "DMA in progress" flag. It will be cleared when the interrupt will - // be triggered, after the simulated delay. - g_dspState.DSPControl.DMAState = 1; + // Emulating the DMA wait time fixes Knockout Kings 2003 in DSP HLE mode + if (!GetDSPEmulator()->IsLLE()) + g_dspState.DSPControl.DMAState = 1; // Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks if (g_arDMA.Cnt.dir) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 4705e849be..6f4bc502b6 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -47,22 +47,13 @@ void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate) pThis->Flush(); } -void CEXIMemoryCard::CmdDoneCallback(u64 userdata, int cyclesLate) -{ - int card_index = (int)userdata; - CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index); - if (pThis) - pThis->CmdDone(); -} - CEXIMemoryCard::CEXIMemoryCard(const int index) : card_index(index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential - et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardFlushA" : "memcardFlushB", FlushCallback); - et_cmd_done = CoreTiming::RegisterEvent((card_index == 0) ? "memcardDoneA" : "memcardDoneB", CmdDoneCallback); + et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardA" : "memcardB", FlushCallback); interruptSwitch = 0; m_bInterruptSet = 0; @@ -184,21 +175,6 @@ bool CEXIMemoryCard::IsPresent() return true; } -void CEXIMemoryCard::CmdDone() -{ - status |= MC_STATUS_READY; - status &= ~MC_STATUS_BUSY; - - m_bInterruptSet = 1; - m_bDirty = true; -} - -void CEXIMemoryCard::CmdDoneLater(u64 cycles) -{ - CoreTiming::RemoveEvent(et_cmd_done); - CoreTiming::ScheduleEvent(cycles, et_cmd_done, (u64)card_index); -} - void CEXIMemoryCard::SetCS(int cs) { // So that memory card won't be invalidated during flushing @@ -222,7 +198,11 @@ void CEXIMemoryCard::SetCS(int cs) //??? - CmdDoneLater(5000); + status |= MC_STATUS_READY; + status &= ~MC_STATUS_BUSY; + + m_bInterruptSet = 1; + m_bDirty = true; } break; @@ -249,7 +229,11 @@ void CEXIMemoryCard::SetCS(int cs) address = (address & ~0x1FF) | ((address+1) & 0x1FF); } - CmdDoneLater(5000); + status |= MC_STATUS_READY; + status &= ~MC_STATUS_BUSY; + + m_bInterruptSet = 1; + m_bDirty = true; } // Page written to memory card, not just to buffer - let's schedule a flush 0.5b cycles into the future (1 sec) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index 33b94ca530..dfdc6349aa 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -47,18 +47,9 @@ private: // through the userdata parameter, so that it can then call Flush on the right card. static void FlushCallback(u64 userdata, int cyclesLate); - // Scheduled when a command that required delayed end signaling is done. - static void CmdDoneCallback(u64 userdata, int cyclesLate); - // Flushes the memory card contents to disk. void Flush(bool exiting = false); - // Signals that the command that was previously executed is now done. - void CmdDone(); - - // Variant of CmdDone which schedules an event later in the future to complete the command. - void CmdDoneLater(u64 cycles); - enum { cmdNintendoID = 0x00, @@ -80,7 +71,7 @@ private: std::string m_strFilename; int card_index; - int et_this_card, et_cmd_done; + int et_this_card; //! memory card state // STATE_TO_SAVE diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 19fe74b3f2..bc7e37b533 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -234,7 +234,6 @@ void Interpreter::mtmsr(UGeckoInstruction _inst) { // Privileged? MSR = m_GPR[_inst.RS]; - PowerPC::CheckExceptions(); m_EndBlock = true; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 04015afca6..357eeb7809 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -303,8 +303,7 @@ void Jit64::Cleanup() void Jit64::WriteExit(u32 destination, int exit_num) { Cleanup(); - - SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); + SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); //If nobody has taken care of this yet (this can be removed when all branches are done) JitBlock *b = js.curBlock; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp index b977e82b28..14827129f8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -122,25 +122,7 @@ void Jit64::mtmsr(UGeckoInstruction inst) gpr.UnlockAll(); gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); - - // If some exceptions are pending and EE are now enabled, force checking - // external exceptions when going out of mtmsr in order to execute delayed - // interrupts as soon as possible. - MOV(32, R(EAX), M(&MSR)); - TEST(32, R(EAX), Imm32(0x8000)); - FixupBranch eeDisabled = J_CC(CC_Z); - - MOV(32, R(EAX), M((void*)&PowerPC::ppcState.Exceptions)); - TEST(32, R(EAX), R(EAX)); - FixupBranch noExceptionsPending = J_CC(CC_Z); - - MOV(32, M(&PC), Imm32(js.compilerPC + 4)); - WriteExternalExceptionExit(); - - SetJumpTarget(eeDisabled); - SetJumpTarget(noExceptionsPending); WriteExit(js.compilerPC + 4, 0); - js.firstFPInstructionFound = false; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h index 7fabd946f9..77f7d6977b 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.h @@ -276,8 +276,8 @@ public: InstLoc EmitLoadMSR() { return FoldZeroOp(LoadMSR, 0); } - InstLoc EmitStoreMSR(InstLoc val, InstLoc pc) { - return FoldBiOp(StoreMSR, val, pc); + InstLoc EmitStoreMSR(InstLoc val) { + return FoldUOp(StoreMSR, val); } InstLoc EmitStoreFPRF(InstLoc value) { return FoldUOp(StoreFPRF, value); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index d9aa46f6b5..e91291fa90 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -994,26 +994,8 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, bool UseProfile, bool Mak break; } case StoreMSR: { - unsigned InstLoc = ibuild->GetImmValue(getOp2(I)); regStoreInstToConstLoc(RI, 32, getOp1(I), &MSR); regNormalRegClear(RI, I); - - // If some exceptions are pending and EE are now enabled, force checking - // external exceptions when going out of mtmsr in order to execute delayed - // interrupts as soon as possible. - Jit->MOV(32, R(EAX), M(&MSR)); - Jit->TEST(32, R(EAX), Imm32(0x8000)); - FixupBranch eeDisabled = Jit->J_CC(CC_Z); - - Jit->MOV(32, R(EAX), M((void*)&PowerPC::ppcState.Exceptions)); - Jit->TEST(32, R(EAX), R(EAX)); - FixupBranch noExceptionsPending = Jit->J_CC(CC_Z); - - Jit->MOV(32, M(&PC), Imm32(InstLoc + 4)); - Jit->WriteExceptionExit(); // TODO: Implement WriteExternalExceptionExit for JitIL - - Jit->SetJumpTarget(eeDisabled); - Jit->SetJumpTarget(noExceptionsPending); break; } case StoreGQR: { diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp index ac914bec94..f3e25dc2dd 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp @@ -106,7 +106,7 @@ void JitIL::mfspr(UGeckoInstruction inst) // -------------- void JitIL::mtmsr(UGeckoInstruction inst) { - ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS), ibuild.EmitIntConst(js.compilerPC)); + ibuild.EmitStoreMSR(ibuild.EmitLoadGReg(inst.RS)); ibuild.EmitBranchUncond(ibuild.EmitIntConst(js.compilerPC + 4)); } // ============== From 1e174ad31a29b7b5f827837afa1785e00bf05da0 Mon Sep 17 00:00:00 2001 From: sulokuTDCmago Date: Fri, 21 Sep 2012 12:31:46 -0700 Subject: [PATCH 012/627] F-Zero and Phantasy Star Online Memory Card Manager support. Thanks to Ralf from GS Central Original information: http://board.gscentral.org/retro-hacking/53093.htm Signed-off-by: LPFaint99 --- Source/Core/Core/Src/HW/GCMemcard.cpp | 129 ++++++++++++++++++++++++++ Source/Core/Core/Src/HW/GCMemcard.h | 4 + 2 files changed, 133 insertions(+) diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 5ba0c2aaa6..381f942925 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -687,6 +687,8 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) int fileBlocks = BE16(direntry.BlockCount); + FZEROGX_MakeSaveGameValid(direntry, saveBlocks); + PSO_MakeSaveGameValid(direntry, saveBlocks); BlockAlloc UpdatedBat = *CurrentBat; u16 nextBlock; @@ -1266,3 +1268,130 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) calc_checksumsBE((u16*)p_bat+2, 0xFFE, &p_bat->Checksum, &p_bat->Checksum_Inv); calc_checksumsBE((u16*)p_bat_backup+2, 0xFFE, &p_bat_backup->Checksum, &p_bat_backup->Checksum_Inv); } + + +void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2) +{ + u32 serial[8]; + int i; + for (i = 0; i < 8; i++) + { + memcpy(&serial[i], (u8 *) &hdr+(i*4), 4); + } + + *serial1 = serial[0]^serial[2]^serial[4]^serial[6]; + *serial2 = serial[1]^serial[3]^serial[5]^serial[7]; +} + + +/*************************************************************/ +/* FZEROGX_MakeSaveGameValid */ +/* (use just before writing a F-Zero GX system .gci file) */ +/* */ +/* chn: Destination memory card port */ +/* ret: Error code */ +/*************************************************************/ + +s32 GCMemcard::FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) +{ + u32 i,j; + u32 serial1,serial2; + u16 chksum = 0xFFFF; + int block = 0; + + // check for F-Zero GX system file + if (strcmp((char*)direntry.Filename,"f_zero.dat")!=0) return 0; + + // get encrypted destination memory card serial numbers + CARD_GetSerialNo(&serial1,&serial2); + + // set new serial numbers + *(u16*)&FileBuffer[1].block[0x0066] = BE16(BE32(serial1) >> 16); + *(u16*)&FileBuffer[3].block[0x1580] = BE16(BE32(serial2) >> 16); + *(u16*)&FileBuffer[1].block[0x0060] = BE16(BE32(serial1) & 0xFFFF); + *(u16*)&FileBuffer[1].block[0x0200] = BE16(BE32(serial2) & 0xFFFF); + + // calc 16-bit checksum + for (i=0x02;i<0x8000;i++) + { + chksum ^= (FileBuffer[block].block[i-(block*0x2000)]&0xFF); + for (j=8; j > 0; j--) + { + if (chksum&1) chksum = (chksum>>1)^0x8408; + else chksum >>= 1; + } + if (!(i%0x2000)) block ++; + } + + // set new checksum + *(u16*)&FileBuffer[0].block[0x00] = BE16(~chksum); + + return 1; +} + +/***********************************************************/ +/* PSO_MakeSaveGameValid */ +/* (use just before writing a PSO system .gci file) */ +/* */ +/* chn: Destination memory card port */ +/* ret: Error code */ +/***********************************************************/ + +s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer) +{ + u32 i,j; + u32 chksum; + u32 crc32LUT[256]; + u32 serial1,serial2; + u32 pso3offset = 0x00; + + // check for PSO1&2 system file + if (strcmp((char*)direntry.Filename,"PSO_SYSTEM")!=0) + { + // check for PSO3 system file + if (strcmp((char*)&FileBuffer[0].block[0x08],"PSO3_SYSTEM")==0) + { + // PSO3 data block size adjustment + pso3offset = 0x10; + } + else + { + // nothing to do + return 0; + } + } + + // get encrypted destination memory card serial numbers + CARD_GetSerialNo(&serial1,&serial2); + + // set new serial numbers + *(u32*)&FileBuffer[1].block[0x0158] = serial1; + *(u32*)&FileBuffer[1].block[0x015C] = serial2; + + // generate crc32 LUT + for (i=0; i < 256; i++) + { + chksum = i; + for (j=8; j > 0; j--) + { + if (chksum&1) chksum = (chksum>>1)^0xEDB88320; + else chksum >>= 1; + } + + crc32LUT[i] = chksum; + } + + // PSO initial crc32 value + chksum = 0xDEBB20E3; + + // calc 32-bit checksum + for (i=0x004C; i < 0x0164+pso3offset; i++) + { + chksum = ((chksum>>8)&0xFFFFFF)^crc32LUT[(chksum^FileBuffer[1].block[i])&0xFF]; + } + + // set new checksum + *(u32*)&FileBuffer[1].block[0x0048] = BE32(chksum^0xFFFFFFFF); + + return 1; +} diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index be78bb527c..d2de93effb 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -256,6 +256,10 @@ public: // reads the animation frames u32 ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const; + + void CARD_GetSerialNo(u32 *serial1,u32 *serial2); + s32 FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer); + s32 PSO_MakeSaveGameValid(DEntry& direntry, std::vector &FileBuffer); }; #endif From b4ae200d0dde96c218e19421db8c095315ed5338 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 23 Sep 2012 10:08:13 -0500 Subject: [PATCH 013/627] This changes a mmap in MemArena so you don't need 786MB of memory free to actually allocate the 1GB memory space in Linux 32bit. I was also running in to this issue in my development. Kudos to plbl4ster to actually taking the time to research this. Closes issue 5625. --- Source/Core/Common/Src/MemArena.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 4af9da3415..26a332f161 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -118,8 +118,7 @@ u8* MemArena::Find4GBBase() } return base; #else - void* base = mmap(0, 0x31000000, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_SHARED, -1, 0); + void* base = mmap(0, 0x31000000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0); if (base == MAP_FAILED) { PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno)); return 0; From f8f8aea5770a1f2e790ccc1f164cd468b0a0a218 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 23 Sep 2012 16:02:11 -0500 Subject: [PATCH 014/627] Allow the user to set graphics backend from Game INI. Zero GUI option available for setting. --- Source/Core/Core/Src/BootManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 640c2eecdc..63ae0db062 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -56,6 +56,7 @@ struct ConfigCache bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT, bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker; int iTLBHack; + std::string strBackend; }; static ConfigCache config_cache; @@ -96,6 +97,7 @@ bool BootCore(const std::string& _rFilename) config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; config_cache.bDisableWiimoteSpeaker = StartUp.bDisableWiimoteSpeaker; + config_cache.strBackend = StartUp.m_strVideoBackend; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -109,7 +111,7 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); - + game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); // Wii settings if (StartUp.bWii) { @@ -149,6 +151,7 @@ void Stop() StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; + StartUp.m_strVideoBackend = config_cache.strBackend; } } From 3229bf824c365ca9df045733f7e0627fe39feb71 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 23 Sep 2012 17:54:23 -0500 Subject: [PATCH 015/627] Should actually load the backend when it changes via game INI --- Source/Core/Core/Src/BootManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 63ae0db062..74986359ff 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -44,6 +44,7 @@ #include "SysConf.h" #include "Core.h" #include "Host.h" +#include "VideoBackendBase.h" namespace BootManager @@ -112,6 +113,8 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); + VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); + // Wii settings if (StartUp.bWii) { From 41266129ba15ce8de5b97312478684347c87d8a5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 24 Sep 2012 17:16:34 -0500 Subject: [PATCH 016/627] Should fix issue 5630. --- Source/Core/Core/Src/BootManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 74986359ff..120355f029 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -155,6 +155,7 @@ void Stop() StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; + VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); } } From 8fed3b76c85e9c58dfc48a8aabed94017aa64339 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Tue, 25 Sep 2012 00:47:37 +0000 Subject: [PATCH 017/627] If setting videobackend back to null strings, Just set it to the front of the list. Fixes loading game specific INI files that don't load back the "default" video backend which is nothing. --- Source/Core/Common/Src/VideoBackendBase.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 1fbe0f4a41..339cb016c1 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -69,6 +69,9 @@ void VideoBackend::ClearList() void VideoBackend::ActivateBackend(const std::string& name) { + if (name.length() == 0) // If NULL, set it to the first one in the list. Expected behavior + g_video_backend = g_available_video_backends.front(); + for (std::vector::const_iterator it = g_available_video_backends.begin(); it != g_available_video_backends.end(); ++it) if (name == (*it)->GetName()) g_video_backend = *it; From bb8b5936c040bcf693b270d65821185386ff83b1 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 11 Aug 2012 16:54:46 +0200 Subject: [PATCH 018/627] Revert "Partially revert revision d511b506120c." This reverts commit 08e06b22937fa79db165e5a31dfd4ccf67ef57db. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 105 +++++++++++++++--- 1 file changed, 92 insertions(+), 13 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 7500997fef..bc7a12304f 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -487,6 +487,15 @@ static char swapModeTable[4][5]; static char text[16384]; static bool DepthTextureEnable; +struct RegisterState +{ + bool ColorNeedOverflowControl; + bool AlphaNeedOverflowControl; + bool AuxStored; +}; + +static RegisterState RegisterStates[4]; + static void BuildSwapModeTable() { static const char *swapColors = "rgba"; @@ -717,6 +726,16 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType } } + RegisterStates[0].AlphaNeedOverflowControl = false; + RegisterStates[0].ColorNeedOverflowControl = false; + RegisterStates[0].AuxStored = false; + for(int i = 1; i < 4; i++) + { + RegisterStates[i].AlphaNeedOverflowControl = true; + RegisterStates[i].ColorNeedOverflowControl = true; + RegisterStates[i].AuxStored = false; + } + for (int i = 0; i < numStages; i++) WriteStage(p, i, ApiType); //build the equation for this stage @@ -724,11 +743,22 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType { // The results of the last texenv stage are put onto the screen, // regardless of the used destination register - WRITE(p, "prev.rgb = %s;\n",tevCOutputTable[bpmem.combiners[numStages-1].colorC.dest]); - WRITE(p, "prev.a = %s;\n",tevAOutputTable[bpmem.combiners[numStages-1].alphaC.dest]); + if(bpmem.combiners[numStages - 1].colorC.dest != 0) + { + bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored; + WRITE(p, "prev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]); + RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl; + } + if(bpmem.combiners[numStages - 1].alphaC.dest != 0) + { + bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AuxStored; + WRITE(p, "prev.a = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]); + RegisterStates[0].AlphaNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl; + } } - // emulation of unsigned 8 overflow when casting - WRITE(p, "prev = frac(4.0f + prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + // emulation of unsigned 8 overflow when casting if needed + if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) + WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); if(Pretest == -1) { @@ -917,7 +947,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC; TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC; - // blah1 if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC || cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC || cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC @@ -950,7 +979,6 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, "textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); - // blah2 if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST || ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST || ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST) { @@ -971,30 +999,78 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) || cc.b == TEVCOLORARG_CPREV || cc.b == TEVCOLORARG_APREV || cc.c == TEVCOLORARG_CPREV || cc.c == TEVCOLORARG_APREV || ac.a == TEVALPHAARG_APREV || ac.b == TEVALPHAARG_APREV || ac.c == TEVALPHAARG_APREV) - WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) + { + WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[0].AlphaNeedOverflowControl = false; + RegisterStates[0].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cprev = prev;\n"); + } + RegisterStates[0].AuxStored = true; + } if(cc.a == TEVCOLORARG_C0 || cc.a == TEVCOLORARG_A0 || cc.b == TEVCOLORARG_C0 || cc.b == TEVCOLORARG_A0 || cc.c == TEVCOLORARG_C0 || cc.c == TEVCOLORARG_A0 || ac.a == TEVALPHAARG_A0 || ac.b == TEVALPHAARG_A0 || ac.c == TEVALPHAARG_A0) - WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl) + { + WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[1].AlphaNeedOverflowControl = false; + RegisterStates[1].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc0 = c0;\n"); + } + RegisterStates[1].AuxStored = true; + } if(cc.a == TEVCOLORARG_C1 || cc.a == TEVCOLORARG_A1 || cc.b == TEVCOLORARG_C1 || cc.b == TEVCOLORARG_A1 || cc.c == TEVCOLORARG_C1 || cc.c == TEVCOLORARG_A1 || ac.a == TEVALPHAARG_A1 || ac.b == TEVALPHAARG_A1 || ac.c == TEVALPHAARG_A1) - WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - + { + if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl) + { + WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[2].AlphaNeedOverflowControl = false; + RegisterStates[2].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc1 = c1;\n"); + } + RegisterStates[2].AuxStored = true; + } if(cc.a == TEVCOLORARG_C2 || cc.a == TEVCOLORARG_A2 || cc.b == TEVCOLORARG_C2 || cc.b == TEVCOLORARG_A2 || cc.c == TEVCOLORARG_C2 || cc.c == TEVCOLORARG_A2 || ac.a == TEVALPHAARG_A2 || ac.b == TEVALPHAARG_A2 || ac.c == TEVALPHAARG_A2) + { + if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl) + { WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n"); + RegisterStates[3].AlphaNeedOverflowControl = false; + RegisterStates[3].ColorNeedOverflowControl = false; + } + else + { + WRITE(p, "cc2 = c2;\n"); + } + RegisterStates[3].AuxStored = true; + } + RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0); + RegisterStates[cc.dest].AuxStored = false; + // combine the color channel WRITE(p, "// color combine\n"); if (cc.clamp) WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]); @@ -1042,8 +1118,11 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType) WRITE(p, ")"); WRITE(p,";\n"); - WRITE(p, "// alpha combine\n"); + RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0); + RegisterStates[ac.dest].AuxStored = false; + // combine the alpha channel + WRITE(p, "// alpha combine\n"); if (ac.clamp) WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]); else From ac2ce8b16ee5216de2670470b11f7e52ce0b4ce1 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 2 Sep 2012 13:12:47 +0200 Subject: [PATCH 019/627] Video_DX11: Remove some redundant code. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 3a725452e7..1b7cfb25bb 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -926,16 +926,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Prepare to copy the XFBs to our backbuffer TargetRectangle dst_rect; ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)s_backbuffer_width, (float)s_backbuffer_height); - D3D::context->RSSetViewports(1, &vp); - float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f }; - D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor); int X = dst_rect.left; int Y = dst_rect.top; int Width = dst_rect.right - dst_rect.left; int Height = dst_rect.bottom - dst_rect.top; + // TODO: Redundant checks... if (X < 0) X = 0; if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; @@ -944,10 +941,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; - vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); + D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); D3D::context->RSSetViewports(1, &vp); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); + float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f }; + D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor); + // activate linear filtering for the buffer copies D3D::SetLinearCopySampler(); From 6e4a61a991a29f32367accc2aa8a6d1e575b2090 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 28 Sep 2012 23:19:50 +0200 Subject: [PATCH 020/627] Minor cleanups. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 2 +- Source/Core/VideoCommon/Src/VideoConfig.h | 6 ++++++ Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 0bd1c89118..bf0eaa79f9 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -313,7 +313,7 @@ void Renderer::DrawDebugText() void Renderer::CalculateXYScale(const TargetRectangle& dst_rect) { - if (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.RealXFBEnabled()) { xScale = 1.0f; yScale = 1.0f; diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 7653972ec8..da760e48b9 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -162,6 +162,12 @@ struct VideoConfig bool bSupportsFormatReinterpretation; bool bSupportsPixelLighting; } backend_info; + + // Utility + bool RealXFBEnabled() const { return bUseXFB && bUseRealXFB; } + bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; } + bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; } + bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; } }; extern VideoConfig g_Config; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 1b7cfb25bb..857688ceec 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -898,7 +898,7 @@ void formatBufferDump(const char *in, char *out, int w, int h, int p) // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && frame_data) AVIDump::AddFrame(frame_data); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index fda9a02d25..c2e1c46bfd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -831,7 +831,7 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && frame_data) AVIDump::AddFrame(frame_data); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 19e4002b7e..4bdee8e198 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -990,7 +990,7 @@ void Renderer::SetBlendMode(bool forceUpdate) void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { static int w = 0, h = 0; - if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight) + if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { if (g_ActiveConfig.bDumpFrames && frame_data) { @@ -1010,7 +1010,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); - if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0)) { if (g_ActiveConfig.bDumpFrames && frame_data) { From 8f5223d0e66bf3fa3c1fe314b8e40c19555d3b09 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 28 Sep 2012 23:21:09 +0200 Subject: [PATCH 021/627] More cleanups. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 16 ++++++++-------- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 16 ++++++++-------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 17 ++++++++--------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 857688ceec..5b031a850f 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -974,7 +974,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = 1; + drawRc.bottom = -1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -995,13 +1002,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = 1; - drawRc.bottom = -1; - drawRc.left = -1; - drawRc.right = 1; - } xfbSource->Draw(sourceRc, drawRc, 0, 0); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index c2e1c46bfd..ea2afab345 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -949,7 +949,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (!g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = -1; + drawRc.bottom = 1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -970,13 +977,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = -1; - drawRc.bottom = 1; - drawRc.left = -1; - drawRc.right = 1; - } xfbSource->Draw(sourceRc, drawRc, Width, Height); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 4bdee8e198..cf81459245 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1067,7 +1067,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons MathUtil::Rectangle drawRc; - if (!g_ActiveConfig.bUseRealXFB) + if (g_ActiveConfig.bUseRealXFB) + { + drawRc.top = 1; + drawRc.bottom = -1; + drawRc.left = -1; + drawRc.right = 1; + } + else { // use virtual xfb with offset int xfbHeight = xfbSource->srcHeight; @@ -1088,14 +1095,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons //drawRc.left *= hScale; //drawRc.right *= hScale; } - else - { - drawRc.top = 1; - drawRc.bottom = -1; - drawRc.left = -1; - drawRc.right = 1; - } - // Tell the OSD Menu about the current internal resolution OSDInternalW = xfbSource->sourceRc.GetWidth(); OSDInternalH = xfbSource->sourceRc.GetHeight(); From 035840e7b57d8056c1b8546aa5d2ae3a8b65d6e4 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 28 Sep 2012 23:48:18 +0200 Subject: [PATCH 022/627] Move last XFB size from Render to FramebufferManager. --- .../VideoCommon/Src/FramebufferManagerBase.cpp | 3 +++ .../VideoCommon/Src/FramebufferManagerBase.h | 8 ++++++++ Source/Core/VideoCommon/Src/RenderBase.cpp | 15 ++++++--------- Source/Core/VideoCommon/Src/RenderBase.h | 3 --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 16 +++++++--------- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 16 +++++++--------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 17 ++++++++--------- 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index b234a7c865..fbb042c227 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -10,6 +10,9 @@ XFBSourceBase *FramebufferManagerBase::m_realXFBSource; // Only used in Real XFB FramebufferManagerBase::VirtualXFBListType FramebufferManagerBase::m_virtualXFBList; // Only used in Virtual XFB mode const XFBSourceBase* FramebufferManagerBase::m_overlappingXFBArray[MAX_VIRTUAL_XFB]; +unsigned int FramebufferManagerBase::s_last_xfb_width; +unsigned int FramebufferManagerBase::s_last_xfb_height; + FramebufferManagerBase::FramebufferManagerBase() { m_realXFBSource = NULL; diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index 26d360647d..a28a941e5b 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -50,6 +50,11 @@ public: static void CopyToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma); static const XFBSourceBase* const* GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount); + static void SetLastXfbWidth(unsigned int width) { s_last_xfb_width = width; } + static void SetLastXfbHeight(unsigned int height) { s_last_xfb_height = height; } + static unsigned int LastXfbWidth() { return s_last_xfb_width; } + static unsigned int LastXfbHeight() { return s_last_xfb_height; } + protected: struct VirtualXFB { @@ -85,6 +90,9 @@ private: static VirtualXFBListType m_virtualXFBList; // Only used in Virtual XFB mode static const XFBSourceBase* m_overlappingXFBArray[MAX_VIRTUAL_XFB]; + + static unsigned int s_last_xfb_width; + static unsigned int s_last_xfb_height; }; extern FramebufferManagerBase *g_framebuffer_manager; diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index bf0eaa79f9..d968ab5fbb 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -71,9 +71,6 @@ int Renderer::s_backbuffer_height; float Renderer::xScale; float Renderer::yScale; -unsigned int Renderer::s_XFB_width; -unsigned int Renderer::s_XFB_height; - int Renderer::s_LastEFBScale; bool Renderer::s_skipSwap; @@ -121,14 +118,14 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect VideoFifo_CheckSwapRequestAt(xfbAddr, fbWidth, fbHeight); XFBWrited = true; - // XXX: Without the VI, how would we know what kind of field this is? So - // just use progressive. if (g_ActiveConfig.bUseXFB) { FramebufferManagerBase::CopyToXFB(xfbAddr, fbWidth, fbHeight, sourceRc,Gamma); } else { + // XXX: Without the VI, how would we know what kind of field this is? So + // just use progressive. g_renderer->Swap(xfbAddr, FIELD_PROGRESSIVE, fbWidth, fbHeight,sourceRc,Gamma); Common::AtomicStoreRelease(s_swapRequested, false); } @@ -323,13 +320,13 @@ void Renderer::CalculateXYScale(const TargetRectangle& dst_rect) if (g_ActiveConfig.b3DVision) { // This works, yet the version in the else doesn't. No idea why. - xScale = (float)(s_backbuffer_width-1) / (float)(s_XFB_width-1); - yScale = (float)(s_backbuffer_height-1) / (float)(s_XFB_height-1); + xScale = (float)(s_backbuffer_width-1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); + yScale = (float)(s_backbuffer_height-1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); } else { - xScale = (float)(dst_rect.right - dst_rect.left - 1) / (float)(s_XFB_width-1); - yScale = (float)(dst_rect.bottom - dst_rect.top - 1) / (float)(s_XFB_height-1); + xScale = (float)(dst_rect.right - dst_rect.left - 1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); + yScale = (float)(dst_rect.bottom - dst_rect.top - 1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); } } } diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index e8d4c55a20..7f5e4743e6 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -163,9 +163,6 @@ protected: static float xScale; static float yScale; - static unsigned int s_XFB_width; - static unsigned int s_XFB_height; - // can probably eliminate this static var static int s_LastEFBScale; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 5b031a850f..b89226b410 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -345,8 +345,8 @@ Renderer::Renderer() s_backbuffer_width = D3D::GetBackBufferWidth(); s_backbuffer_height = D3D::GetBackBufferHeight(); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); TargetRectangle dst_rect; ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); @@ -1131,15 +1131,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(w); + FramebufferManagerBase::SetLastXfbHeight(h); } // update FPS counter diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index ea2afab345..66656d5022 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -274,8 +274,8 @@ Renderer::Renderer() s_backbuffer_width = D3D::GetBackBufferWidth(); s_backbuffer_height = D3D::GetBackBufferHeight(); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); TargetRectangle dst_rect; ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); @@ -1124,15 +1124,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(w); + FramebufferManagerBase::SetLastXfbHeight(h); } u32 newAA = g_ActiveConfig.iMultisampleMode; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index cf81459245..16d3af59cc 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -359,8 +359,9 @@ Renderer::Renderer() if (!GLEW_ARB_texture_non_power_of_two) WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported."); - s_XFB_width = MAX_XFB_WIDTH; - s_XFB_height = MAX_XFB_HEIGHT; + // TODO: Move these somewhere else? + FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); + FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); TargetRectangle dst_rect; ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); @@ -1288,15 +1289,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons bool xfbchanged = false; - if (s_XFB_width != fbWidth || s_XFB_height != fbHeight) + if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - s_XFB_width = fbWidth; - s_XFB_height = fbHeight; - if (s_XFB_width < 1) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_width > MAX_XFB_WIDTH) s_XFB_width = MAX_XFB_WIDTH; - if (s_XFB_height < 1) s_XFB_height = MAX_XFB_HEIGHT; - if (s_XFB_height > MAX_XFB_HEIGHT) s_XFB_height = MAX_XFB_HEIGHT; + unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(w); + FramebufferManagerBase::SetLastXfbHeight(h); } bool WindowResized = false; From 8cefcaa94cd02c3bd6d735b620c1e7797597c204 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 4 Oct 2012 05:41:02 +0200 Subject: [PATCH 023/627] Implement a simple benchmarking mode which logs FPS to a file Very useful to compare performance between two builds, check the impact of a configuration option, etc. FPS log is stored in User/Logs/fps.txt and is reset each time you launch a game. Only enabled if you check the "Log FPS to file" option in your graphics settings. Could be improved a bit: currently logs only every 1s (so you can't really see small variations), maybe output more infos to the fps.txt like average/stddev (but Excel/Libreoffice/Google Docs can compute that easily too). --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 + Source/Core/VideoCommon/CMakeLists.txt | 1 + Source/Core/VideoCommon/Src/FPSCounter.cpp | 64 +++++++++++++++++++ Source/Core/VideoCommon/Src/FPSCounter.h | 28 ++++++++ Source/Core/VideoCommon/Src/VideoConfig.cpp | 2 + Source/Core/VideoCommon/Src/VideoConfig.h | 1 + Source/Core/VideoCommon/VideoCommon.vcxproj | 2 + .../VideoCommon/VideoCommon.vcxproj.filters | 6 ++ .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 13 ++-- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 19 ++---- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 17 ++--- 11 files changed, 119 insertions(+), 36 deletions(-) create mode 100644 Source/Core/VideoCommon/Src/FPSCounter.cpp create mode 100644 Source/Core/VideoCommon/Src/FPSCounter.h diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index f5a488a7e8..20bd4dfb38 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -98,6 +98,7 @@ wxString wireframe_desc = wxTRANSLATE("Render the scene as a wireframe.\n\nIf un wxString disable_fog_desc = wxTRANSLATE("Improves performance but causes glitches in most games which rely on proper fog emulation.\n\nIf unsure, leave this unchecked."); wxString disable_alphapass_desc = wxTRANSLATE("Skip the destination alpha pass used in many games for various graphical effects.\n\nIf unsure, leave this unchecked."); wxString show_fps_desc = wxTRANSLATE("Show the number of frames rendered per second as a measure of emulation speed.\n\nIf unsure, leave this unchecked."); +wxString log_fps_to_file_desc = wxTRANSLATE("Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n\nIf unsure, leave this unchecked."); wxString show_input_display_desc = wxTRANSLATE("Display the inputs read by the emulator.\n\nIf unsure, leave this unchecked."); wxString show_stats_desc = wxTRANSLATE("Show various statistics.\n\nIf unsure, leave this unchecked."); wxString texfmt_desc = wxTRANSLATE("Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n\nIf unsure, leave this unchecked."); @@ -296,6 +297,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con { SettingCheckBox* render_to_main_cb; szr_other->Add(CreateCheckBox(page_general, _("Show FPS"), wxGetTranslation(show_fps_desc), vconfig.bShowFPS)); + szr_other->Add(CreateCheckBox(page_general, _("Log FPS to file"), wxGetTranslation(log_fps_to_file_desc), vconfig.bLogFPSToFile)); szr_other->Add(CreateCheckBox(page_general, _("Auto adjust Window Size"), wxGetTranslation(auto_window_size_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)); szr_other->Add(CreateCheckBox(page_general, _("Keep window on top"), wxGetTranslation(keep_window_on_top_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bKeepWindowOnTop)); szr_other->Add(CreateCheckBox(page_general, _("Hide Mouse Cursor"), wxGetTranslation(hide_mouse_cursor_desc), SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)); diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index d0e28f571c..6ed8e29c6b 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -6,6 +6,7 @@ set(SRCS Src/BPFunctions.cpp Src/DLCache.cpp Src/Debugger.cpp Src/Fifo.cpp + Src/FPSCounter.cpp Src/FramebufferManagerBase.cpp Src/HiresTextures.cpp Src/ImageWrite.cpp diff --git a/Source/Core/VideoCommon/Src/FPSCounter.cpp b/Source/Core/VideoCommon/Src/FPSCounter.cpp new file mode 100644 index 0000000000..ea3f624c73 --- /dev/null +++ b/Source/Core/VideoCommon/Src/FPSCounter.cpp @@ -0,0 +1,64 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "FPSCounter.h" +#include "FileUtil.h" +#include "Timer.h" +#include "VideoConfig.h" + +#define FPS_REFRESH_INTERVAL 1000 + +static unsigned int s_counter = 0; +static unsigned int s_fps = 0; +static unsigned int s_fps_last_counter = 0; +static unsigned long s_last_update_time = 0; +static File::IOFile s_bench_file; + +void InitFPSCounter() +{ + s_counter = s_fps_last_counter = 0; + s_fps = 0; + s_last_update_time = Common::Timer::GetTimeMs(); + + if (s_bench_file.IsOpen()) + s_bench_file.Close(); +} + +static void LogFPSToFile(unsigned long val) +{ + if (!s_bench_file.IsOpen()) + s_bench_file.Open(File::GetUserPath(D_LOGS_IDX) + "fps.txt", "w"); + + char buffer[256]; + snprintf(buffer, 256, "%ld\n", val); + s_bench_file.WriteArray(buffer, strlen(buffer)); +} + +int UpdateFPSCounter() +{ + if (Common::Timer::GetTimeMs() - s_last_update_time >= FPS_REFRESH_INTERVAL) + { + s_last_update_time = Common::Timer::GetTimeMs(); + s_fps = s_counter - s_fps_last_counter; + s_fps_last_counter = s_counter; + if (g_ActiveConfig.bLogFPSToFile) + LogFPSToFile(s_fps); + } + + s_counter++; + return s_fps; +} \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/FPSCounter.h b/Source/Core/VideoCommon/Src/FPSCounter.h new file mode 100644 index 0000000000..314f4b0fc7 --- /dev/null +++ b/Source/Core/VideoCommon/Src/FPSCounter.h @@ -0,0 +1,28 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _FPS_COUNTER_H_ +#define _FPS_COUNTER_H_ + +// Initializes the FPS counter. +void InitFPSCounter(); + +// Called when a frame is rendered. Returns the value to be displayed on +// screen as the FPS counter (updated every second). +int UpdateFPSCounter(); + +#endif // _FPS_COUNTER_H_ \ No newline at end of file diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index c5628c19a1..6d240ba357 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -59,6 +59,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "UseRealXFB", &bUseRealXFB, 0); iniFile.Get("Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples,128); iniFile.Get("Settings", "ShowFPS", &bShowFPS, false); // Settings + iniFile.Get("Settings", "LogFPSToFile", &bLogFPSToFile, false); iniFile.Get("Settings", "ShowInputDisplay", &bShowInputDisplay, false); iniFile.Get("Settings", "OverlayStats", &bOverlayStats, false); iniFile.Get("Settings", "OverlayProjStats", &bOverlayProjStats, false); @@ -186,6 +187,7 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "UseRealXFB", bUseRealXFB); iniFile.Set("Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples); iniFile.Set("Settings", "ShowFPS", bShowFPS); + iniFile.Set("Settings", "LogFPSToFile", bLogFPSToFile); iniFile.Set("Settings", "ShowInputDisplay", bShowInputDisplay); iniFile.Set("Settings", "OverlayStats", bOverlayStats); iniFile.Set("Settings", "OverlayProjStats", bOverlayProjStats); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 7653972ec8..e71c7356a9 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -97,6 +97,7 @@ struct VideoConfig bool bTexFmtOverlayEnable; bool bTexFmtOverlayCenter; bool bShowEFBCopyRegions; + bool bLogFPSToFile; // Render bool bWireFrame; diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index f53c18cb37..0869f33ff4 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -183,6 +183,7 @@ + @@ -228,6 +229,7 @@ + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index c933fbc939..e7019f17ed 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -119,6 +119,9 @@ Shader Generators + + Util + @@ -246,6 +249,9 @@ Shader Generators + + Util + diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 1b7cfb25bb..81efa3623f 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -44,6 +44,7 @@ #include "Host.h" #include "BPFunctions.h" #include "AVIDump.h" +#include "FPSCounter.h" namespace DX11 { @@ -338,6 +339,8 @@ Renderer::Renderer() int x, y, w_temp, h_temp; s_blendMode = 0; + InitFPSCounter(); + Host_GetRenderWindowSize(x, y, w_temp, h_temp); D3D::Create(EmuWindow::GetWnd()); @@ -1143,16 +1146,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } // update FPS counter - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // Begin new frame // Set default viewport and scissor, for the clear to work correctly diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index fda9a02d25..45030c48df 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -54,6 +54,7 @@ #include "Core.h" #include "Movie.h" #include "BPFunctions.h" +#include "FPSCounter.h" namespace DX9 { @@ -247,6 +248,8 @@ void TeardownDeviceObjects() // Init functions Renderer::Renderer() { + InitFPSCounter(); + st = new char[32768]; int fullScreenRes, x, y, w_temp, h_temp; @@ -1107,7 +1110,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::DrawMessages(); D3D::EndFrame(); - frameCount++; + ++frameCount; GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); @@ -1168,20 +1171,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0); } - // Place messages on the picture, then copy it to the screen - // --------------------------------------------------------------------- - // Count FPS. - // ------------- - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // Begin new frame // Set default viewport and scissor, for the clear to work correctly diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 19e4002b7e..a6121e1436 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -61,6 +61,7 @@ #include "Movie.h" #include "Host.h" #include "BPFunctions.h" +#include "FPSCounter.h" #include "main.h" // Local #ifdef _WIN32 @@ -251,6 +252,8 @@ Renderer::Renderer() s_fps=0; s_blendMode = 0; + InitFPSCounter(); + #if defined HAVE_CG && HAVE_CG g_cgcontext = cgCreateContext(); cgGetError(); @@ -1330,20 +1333,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } } - // Place messages on the picture, then copy it to the screen - // --------------------------------------------------------------------- - // Count FPS. - // ------------- - static int fpscount = 0; - static unsigned long lasttime = 0; - if (Common::Timer::GetTimeMs() - lasttime >= 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount; - fpscount = 0; - } if (XFBWrited) - ++fpscount; + s_fps = UpdateFPSCounter(); // --------------------------------------------------------------------- GL_REPORT_ERRORD(); From 39900022508121f7f2412b928989ee34f40ee069 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 6 Oct 2012 01:49:09 +0200 Subject: [PATCH 024/627] Optimize JitCache::InvalidateICache by maintaining a "valid blocks" bitset Most of the InvalidateICache calls are for a 32 bytes block: this is the number of bytes invalidated by PowerPC dcb*/icb* instructions. Profiling shows that a lot of CPU time is spent checking if there are any JIT blocks covered by these 32 bytes (using std::map::lower_bound). This patch adds a bitset containing the state of every 32 bytes block in RAM (JIT cached/not JIT cached). Using that, a 32 bytes InvalidateICache can check in the bitset if any JIT block might be invalidated. A bitset check is a lot faster than an std::map::lower_bound operation, improving performance of JitCache::InvalidateICache by more than 100%. Some practical numbers: * Xenoblade Chronicles (PAL) 56.04FPS -> 59.28FPS (+5.78%) * The Last Story (PAL) 30.9FPS -> 32.83FPS (+6.25%) * Super Mario Galaxy (PAL) 59.76FPS -> 62.46FPS (+4.52%) This function still takes more time than it should - more optimization in this area might be possible (specializing for 32 bytes blocks to avoid useless memcpy, for example). --- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 65 ++++++++++++------- .../Core/Src/PowerPC/JitCommon/JitCache.h | 2 + 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index b209a7299b..496ddebf7a 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -142,6 +142,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } links_to.clear(); block_map.clear(); + valid_block.reset(); num_blocks = 0; memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS); } @@ -220,6 +221,9 @@ bool JitBlock::ContainsAddress(u32 em_address) // Convert the logical address to a physical address for the block map u32 pAddr = b.originalAddress & 0x1FFFFFFF; + for (u32 i = 0; i < (b.originalSize + 7) / 8; ++i) + valid_block[pAddr / 32 + i] = true; + block_map[std::make_pair(pAddr + 4 * b.originalSize - 1, pAddr)] = block_num; if (block_link) { @@ -440,35 +444,48 @@ bool JitBlock::ContainsAddress(u32 em_address) // Convert the logical address to a physical address for the block map u32 pAddr = address & 0x1FFFFFFF; + // Optimize the common case of length == 32 which is used by Interpreter::dcb* + bool destroy_block = true; + if (length == 32) + { + if (!valid_block[pAddr / 32]) + destroy_block = false; + else + valid_block[pAddr / 32] = false; + } + // destroy JIT blocks // !! this works correctly under assumption that any two overlapping blocks end at the same address - std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1, it; - while (it2 != block_map.end() && it2->first.second < pAddr + length) + if (destroy_block) { + std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1, it; + while (it2 != block_map.end() && it2->first.second < pAddr + length) + { #ifdef JIT_UNLIMITED_ICACHE - JitBlock &b = blocks[it2->second]; - if (b.originalAddress & JIT_ICACHE_VMEM_BIT) - { - u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } - else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) - { - u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; - memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } - else - { - u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; - memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); - } + JitBlock &b = blocks[it2->second]; + if (b.originalAddress & JIT_ICACHE_VMEM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCacheVMEM + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } + else if (b.originalAddress & JIT_ICACHE_EXRAM_BIT) + { + u32 cacheaddr = b.originalAddress & JIT_ICACHEEX_MASK; + memset(iCacheEx + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } + else + { + u32 cacheaddr = b.originalAddress & JIT_ICACHE_MASK; + memset(iCache + cacheaddr, JIT_ICACHE_INVALID_BYTE, 4); + } #endif - DestroyBlock(it2->second, true); - it2++; - } - if (it1 != it2) - { - block_map.erase(it1, it2); + DestroyBlock(it2->second, true); + it2++; + } + if (it1 != it2) + { + block_map.erase(it1, it2); + } } #ifdef JIT_UNLIMITED_ICACHE diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index cc373d6114..4214f33875 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -18,6 +18,7 @@ #ifndef _JITCACHE_H #define _JITCACHE_H +#include #include #include @@ -84,6 +85,7 @@ class JitBlockCache int num_blocks; std::multimap links_to; std::map, u32> block_map; // (end_addr, start_addr) -> number + std::bitset<0x20000000 / 32> valid_block; #ifdef JIT_UNLIMITED_ICACHE u8 *iCache; u8 *iCacheEx; From a366521d130e2996cfb628aa842507c4b5c8993e Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 03:30:44 -0400 Subject: [PATCH 025/627] Correct the hotkey labels for undo load state, and load last overwritten state buttons --- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d24bd2f23e..8215b68efc 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -162,7 +162,7 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu); saveMenu->Append(IDM_SAVESTATEFILE, _("Save State...")); - loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State") + wxString(wxT("\tShift+F12"))); + loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State") + wxString(wxT("\tF12"))); saveMenu->AppendSeparator(); loadMenu->Append(IDM_LOADSTATEFILE, _("Load State...")); @@ -173,7 +173,7 @@ void CFrame::CreateMenu() else loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State") + wxString(wxT("\tF11"))); - loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tF12"))); + loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tShift+F12"))); loadMenu->AppendSeparator(); for (int i = 1; i <= 8; i++) { From 7f624cda104215c4e941c8bed07f936a054e707d Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 04:03:12 -0400 Subject: [PATCH 026/627] fix recording from save state --- Source/Core/Core/Src/Movie.cpp | 22 +++++++++++++++------- Source/Core/Core/Src/Movie.h | 1 + Source/Core/Core/Src/State.cpp | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index ba489dfcf6..435694c32d 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -217,6 +217,11 @@ bool IsJustStartingRecordingInputFromSaveState() return IsRecordingInputFromSaveState() && g_currentFrame == 0; } +bool IsJustStartingPlayingInputFromSaveState() +{ + return tmpHeader.bFromSaveState && g_currentFrame == 1; +} + bool IsPlayingInput() { return (g_playMode == MODE_PLAYING); @@ -287,6 +292,13 @@ bool BeginRecordingInput(int controllers) if(g_playMode != MODE_NONE || controllers == 0) return false; + g_numPads = controllers; + g_currentFrame = g_totalFrames = 0; + g_currentLagCount = g_totalLagCount = 0; + g_currentInputCount = g_totalInputCount = 0; + g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); + g_rerecords = 0; + if (Core::IsRunning()) { if(File::Exists(tmpStateFilename)) @@ -295,13 +307,6 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; } - - g_numPads = controllers; - g_currentFrame = g_totalFrames = 0; - g_currentLagCount = g_totalLagCount = 0; - g_currentInputCount = g_totalInputCount = 0; - g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); - g_rerecords = 0; g_playMode = MODE_RECORDING; delete [] tmpInput; @@ -548,6 +553,8 @@ bool PlayInput(const char *filename) if(File::Exists(stateFilename)) Core::SetStateFileName(stateFilename); g_bRecordingFromSaveState = true; + Movie::LoadInput(filename); + g_currentFrame = 0; } /* TODO: Put this verification somewhere we have the gameID of the played game @@ -877,6 +884,7 @@ void EndPlayInput(bool cont) g_currentByte = 0; g_playMode = MODE_NONE; Core::DisplayMessage("Movie End.", 2000); + tmpHeader.bFromSaveState = 0; // we don't clear these things because otherwise we can't resume playback if we load a movie state later //g_totalFrames = g_totalBytes = 0; //delete tmpInput; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 09a0f5d84a..ac28733221 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -113,6 +113,7 @@ bool IsAutoFiring(); bool IsRecordingInput(); bool IsRecordingInputFromSaveState(); bool IsJustStartingRecordingInputFromSaveState(); +bool IsJustStartingPlayingInputFromSaveState(); bool IsPlayingInput(); bool IsReadOnly(); u64 GetRecordingStartTime(); diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 8ef47467e8..f7d6523b05 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -413,7 +413,7 @@ void LoadAs(const std::string& filename) Core::DisplayMessage(StringFromFormat("Loaded state from %s", filename.c_str()).c_str(), 2000); if (File::Exists(filename + ".dtm")) Movie::LoadInput((filename + ".dtm").c_str()); - else if (!Movie::IsJustStartingRecordingInputFromSaveState()) + else if (!Movie::IsJustStartingRecordingInputFromSaveState() && !Movie::IsJustStartingPlayingInputFromSaveState()) Movie::EndPlayInput(false); } else From 6b99b746c822d85d65618b163d52c289550e276d Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 04:11:14 -0400 Subject: [PATCH 027/627] fix undo load state and load last overwritten state while recording --- Source/Core/Core/Src/State.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index f7d6523b05..9b5ae9edb3 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -196,9 +196,16 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) { if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")) File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")); + if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) + File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")); - if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")) + if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav") || !File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) Core::DisplayMessage("Failed to move previous state to state undo backup", 1000); + + if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) + Movie::SaveRecording((filename + ".dtm").c_str()); + else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) + File::Delete(filename + ".dtm"); } File::IOFile f(filename, "wb"); @@ -273,10 +280,6 @@ void SaveAs(const std::string& filename) if (p.GetMode() == PointerWrap::MODE_WRITE) { Core::DisplayMessage("Saving State...", 1000); - if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) - Movie::SaveRecording((filename + ".dtm").c_str()); - else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) - File::Delete(filename + ".dtm"); CompressAndDumpState_args save_args; save_args.buffer_vector = &g_current_buffer; @@ -386,6 +389,7 @@ void LoadAs(const std::string& filename) { std::lock_guard lk(g_cs_undo_load_buffer); SaveToBuffer(g_undo_load_buffer); + Movie::SaveRecording("undo.dtm"); } bool loaded = false; @@ -534,7 +538,16 @@ void UndoLoadState() { std::lock_guard lk(g_cs_undo_load_buffer); if (!g_undo_load_buffer.empty()) - LoadFromBuffer(g_undo_load_buffer); + { + if (File::Exists("undo.dtm") || (!Movie::IsRecordingInput() && !Movie::IsPlayingInput())) + { + LoadFromBuffer(g_undo_load_buffer); + if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) + Movie::LoadInput("undo.dtm"); + } + else + PanicAlert("No undo.dtm found, aborting undo load state to prevent movie desyncs"); + } else PanicAlert("There is nothing to undo!"); } @@ -542,7 +555,7 @@ void UndoLoadState() // Load the state that the last save state overwritten on void UndoSaveState() { - LoadAs((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav").c_str()); + LoadAs((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav").c_str()); } } // namespace State From 783409c765b9a0b83bf3057536b94f388259f826 Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 04:14:25 -0400 Subject: [PATCH 028/627] clear the save state loaded from a previous movie when starting emulation --- Source/Core/Core/Src/Movie.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 435694c32d..79c1cfd023 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -114,6 +114,8 @@ void Init() g_bFrameStop = false; g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); + if (!tmpHeader.bFromSaveState) + Core::SetStateFileName(""); for (int i = 0; i < 8; ++i) g_InputDisplay[i].clear(); From 79692a6c78879f9b199fca7bb0585a167b5f4cf6 Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 04:18:40 -0400 Subject: [PATCH 029/627] save settings necessary for syncing a movie to the .dtm, and load them upon playback --- Source/Core/Core/Src/BootManager.cpp | 15 ++ Source/Core/Core/Src/Core.cpp | 2 +- Source/Core/Core/Src/HW/CPU.cpp | 5 + .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 3 + Source/Core/Core/Src/Movie.cpp | 138 +++++++++++++++++- Source/Core/Core/Src/Movie.h | 31 +++- 6 files changed, 189 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 120355f029..709053a5e2 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -45,6 +45,7 @@ #include "Core.h" #include "Host.h" #include "VideoBackendBase.h" +#include "Movie.h" namespace BootManager @@ -115,6 +116,20 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); + if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) + { + Movie::Init(); + StartUp.bCPUThread = Movie::IsDualCore(); + StartUp.bSkipIdle = Movie::IsSkipIdle(); + StartUp.bDSPHLE = Movie::IsDSPHLE(); + StartUp.bProgressive = Movie::IsProgressive(); + StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); + if (Movie::g_bMemcard && Movie::g_bBlankMC) + { + if (File::Exists("Movie.raw")) + File::Delete("Movie.raw"); + } + } // Wii settings if (StartUp.bWii) { diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index ec3d0e8f70..da9b5795fa 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -434,7 +434,7 @@ void EmuThread() CBoot::BootUp(); // Setup our core, but can't use dynarec if we are compare server - if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer || + if (Movie::g_CPUCore && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient)) PowerPC::SetMode(PowerPC::MODE_JIT); else diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp index f760abcec6..a7a272e263 100644 --- a/Source/Core/Core/Src/HW/CPU.cpp +++ b/Source/Core/Core/Src/HW/CPU.cpp @@ -24,6 +24,7 @@ #include "../Core.h" #include "CPU.h" #include "DSP.h" +#include "Movie.h" #include "VideoBackendBase.h" @@ -36,6 +37,10 @@ namespace void CCPU::Init(int cpu_core) { + if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) + { + cpu_core = Movie::GetCPUMode(); + } PowerPC::Init(cpu_core); m_SyncEvent = 0; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 6f4bc502b6..106e41b16c 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,6 +52,9 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; + if (Movie::g_bMemcard && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::g_bBlankMC) + m_strFilename = "Movie.raw"; + // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardA" : "memcardB", FlushCallback); diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 79c1cfd023..94edd9dedf 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -30,6 +30,10 @@ #include "VideoBackendBase.h" #include "State.h" #include "Timer.h" +#include "VideoConfig.h" +#include "HW/EXI.h" +#include "HW/EXI_Device.h" +#include "HW/EXI_Channel.h" // large enough for just over 24 hours of single-player recording #define MAX_DTM_LENGTH (40 * 1024 * 1024) @@ -55,6 +59,16 @@ u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started +bool g_bSaveConfig = false; +bool g_bSkipIdle = false; +bool g_bDualCore = false; +bool g_bProgressive = false; +bool g_bDSPHLE = false; +bool g_bFastDiscSpeed = false; +std::string g_videoBackend = "opengl"; +int g_CPUCore = 1; +bool g_bMemcard; +bool g_bBlankMC = false; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -112,6 +126,30 @@ void Init() g_bPolled = false; g_bFrameStep = false; g_bFrameStop = false; + g_bSaveConfig = false; + g_CPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + g_bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + if (IsRecordingInput() || (!tmpHeader.bSaveConfig && IsPlayingInput())) + { + g_bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + g_bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + g_bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + g_bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + g_bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + g_bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + } + else if (IsPlayingInput() && tmpHeader.bSaveConfig) + { + g_bSaveConfig = tmpHeader.bSaveConfig; + g_bSkipIdle = tmpHeader.bSkipIdle; + g_bDualCore = tmpHeader.bDualCore; + g_bProgressive = tmpHeader.bProgressive; + g_bDSPHLE = tmpHeader.bDSPHLE; + g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; + g_CPUCore = tmpHeader.CPUCore; + g_bBlankMC = tmpHeader.bBlankMC; + } g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); if (!tmpHeader.bFromSaveState) @@ -249,6 +287,40 @@ bool IsUsingWiimote(int wiimote) return ((g_numPads & (1 << (wiimote + 4))) != 0); } +bool IsConfigSaved() +{ + return g_bSaveConfig; +} +bool IsDualCore() +{ + return g_bDualCore; +} + +bool IsProgressive() +{ + return g_bProgressive; +} + +bool IsSkipIdle() +{ + return g_bSkipIdle; +} + +bool IsDSPHLE() +{ + return g_bDSPHLE; +} + +bool IsFastDiscSpeed() +{ + return g_bFastDiscSpeed; +} + +int GetCPUMode() +{ + return g_CPUCore; +} + void ChangePads(bool instantly) { if (Core::GetState() == Core::CORE_UNINITIALIZED) @@ -311,10 +383,18 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; + g_bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + g_bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + g_bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + g_bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + g_bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + g_CPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; g_currentByte = g_totalBytes = 0; - + Core::DisplayMessage("Starting movie recording", 2000); return true; } @@ -580,6 +660,14 @@ bool PlayInput(const char *filename) g_totalInputCount = tmpHeader.inputCount; g_recordingStartTime = tmpHeader.recordingStartTime; + g_bSaveConfig = tmpHeader.bSaveConfig; + g_bSkipIdle = tmpHeader.bSkipIdle; + g_bDualCore = tmpHeader.bDualCore; + g_bProgressive = tmpHeader.bProgressive; + g_bDSPHLE = tmpHeader.bDSPHLE; + g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; + g_CPUCore = tmpHeader.CPUCore; + g_currentFrame = 0; g_currentLagCount = 0; g_currentInputCount = 0; @@ -720,6 +808,7 @@ void LoadInput(const char *filename) t_record.Close(); g_rerecords = tmpHeader.numRerecords; + g_bSaveConfig = tmpHeader.bSaveConfig; if (!afterEnd) { @@ -756,6 +845,21 @@ static void CheckInputEnd() void PlayController(SPADStatus *PadStatus, int controllerID) { + if (IsPlayingInput() && IsConfigSaved()) + { + SetGraphicsConfig(); + } + if (g_currentFrame == 1) + { + if (tmpHeader.bMemcard) + { + ExpansionInterface::ChangeDevice(0, EXIDEVICE_MEMORYCARD, 0); + } + else if (!tmpHeader.bMemcard) + { + ExpansionInterface::ChangeDevice(0, EXIDEVICE_NONE, 0); + } + } // Correct playback is entirely dependent on the emulator polling the controllers // in the same order done during recording if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) @@ -913,11 +1017,28 @@ void SaveRecording(const char *filename) header.inputCount = g_totalInputCount; header.numRerecords = g_rerecords; header.recordingStartTime = g_recordingStartTime; - + + header.bSaveConfig = true; + header.bSkipIdle = g_bSkipIdle; + header.bDualCore = g_bDualCore; + header.bProgressive = g_bProgressive; + header.bDSPHLE = g_bDSPHLE; + header.bFastDiscSpeed = g_bFastDiscSpeed; + strncpy((char *)header.videoBackend, g_videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); + header.CPUCore = g_CPUCore; + header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; + header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; + header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture; + header.bEFBCopyCacheEnable = g_ActiveConfig.bEFBCopyCacheEnable; + header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges; + header.bUseXFB = g_ActiveConfig.bUseXFB; + header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; + header.bMemcard = g_bMemcard; + header.bBlankMC = g_bBlankMC; + // TODO header.uniqueID = 0; // header.author; - // header.videoBackend; // header.audioEmulator; save_record.WriteArray(&header, 1); @@ -947,4 +1068,15 @@ void CallInputManip(SPADStatus *PadStatus, int controllerID) if (mfunc) (*mfunc)(PadStatus, controllerID); } + +void SetGraphicsConfig() +{ + g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable; + g_Config.bEFBCopyEnable = tmpHeader.bEFBCopyEnable; + g_Config.bCopyEFBToTexture = tmpHeader.bCopyEFBToTexture; + g_Config.bEFBCopyCacheEnable = tmpHeader.bEFBCopyCacheEnable; + g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges; + g_Config.bUseXFB = tmpHeader.bUseXFB; + g_Config.bUseRealXFB = tmpHeader.bUseRealXFB; +} }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index ac28733221..6a4cc6bbb1 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -60,6 +60,8 @@ struct ControllerState { // Global declarations extern bool g_bFrameStep, g_bPolled, g_bReadOnly; +extern bool g_bSaveConfig, g_bSkipIdle, g_bDualCore, g_bProgressive, g_bDSPHLE, g_bFastDiscSpeed, g_bMemcard, g_bBlankMC; +extern bool g_bEFBAccessEnable, g_bEFBCopyEnable; extern PlayMode g_playMode; extern u32 g_framesToSkip, g_frameSkipCounter; @@ -73,6 +75,8 @@ extern u64 g_currentByte, g_totalBytes; extern u64 g_currentFrame, g_totalFrames; extern u64 g_currentLagCount, g_totalLagCount; extern u64 g_currentInputCount, g_totalInputCount; +extern std::string g_videoBackend; +extern int g_CPUCore; extern u32 g_rerecords; @@ -99,7 +103,23 @@ struct DTMHeader { u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) - u8 reserved[119]; // Make heading 256 bytes, just because we can + bool bSaveConfig; + bool bSkipIdle; + bool bDualCore; + bool bProgressive; + bool bDSPHLE; + bool bFastDiscSpeed; + u8 CPUCore; + bool bEFBAccessEnable; + bool bEFBCopyEnable; + bool bCopyEFBToTexture; + bool bEFBCopyCacheEnable; + bool bEFBEmulateFormatChanges; + bool bUseXFB; + bool bUseRealXFB; + bool bMemcard; + bool bBlankMC; + u8 reserved[103]; // Make heading 256 bytes, just because we can }; #pragma pack(pop) @@ -118,6 +138,15 @@ bool IsPlayingInput(); bool IsReadOnly(); u64 GetRecordingStartTime(); +bool IsConfigSaved(); +bool IsDualCore(); +bool IsProgressive(); +bool IsSkipIdle(); +bool IsDSPHLE(); +bool IsFastDiscSpeed(); +int GetCPUMode(); +void SetGraphicsConfig(); + bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); void ChangePads(bool instantly = false); From b1dee5fc233b1a9fc83fdea4dd12a82b8da6b928 Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 18 Oct 2012 04:40:56 -0400 Subject: [PATCH 030/627] small fix for undo load state while not recording --- Source/Core/Core/Src/State.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 9b5ae9edb3..88d7c7720c 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -389,7 +389,10 @@ void LoadAs(const std::string& filename) { std::lock_guard lk(g_cs_undo_load_buffer); SaveToBuffer(g_undo_load_buffer); - Movie::SaveRecording("undo.dtm"); + if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) + Movie::SaveRecording("undo.dtm"); + else if (File::Exists("undo.dtm")) + File::Delete("undo.dtm"); } bool loaded = false; From 0384f61af3ef5427291e404e5b27b1e613580ce9 Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 19 Oct 2012 19:42:44 -0400 Subject: [PATCH 031/627] re-rearrange movie code so it actually works all of the time --- Source/Core/Core/Src/Movie.h | 6 +++--- Source/Core/Core/Src/State.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 6a4cc6bbb1..f7a1fd27e9 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -48,10 +48,10 @@ struct ControllerState { bool Start:1, A:1, B:1, X:1, Y:1, Z:1; // Binary buttons, 6 bits bool DPadUp:1, DPadDown:1, // Binary D-Pad buttons, 4 bits DPadLeft:1, DPadRight:1; - bool L:1, R:1; // Binary triggers, 2 bits + bool L:1, R:1; // Binary triggers, 2 bits bool reserved:4; // Reserved bits used for padding, 4 bits - u8 TriggerL, TriggerR; // Triggers, 16 bits + u8 TriggerL, TriggerR; // Triggers, 16 bits u8 AnalogStickX, AnalogStickY; // Main Stick, 16 bits u8 CStickX, CStickY; // Sub-Stick, 16 bits @@ -103,7 +103,7 @@ struct DTMHeader { u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) - bool bSaveConfig; + bool bSaveConfig; // Loads the settings below on startup if true bool bSkipIdle; bool bDualCore; bool bProgressive; diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 88d7c7720c..3f3e367349 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -201,12 +201,11 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav") || !File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) Core::DisplayMessage("Failed to move previous state to state undo backup", 1000); - - if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) - Movie::SaveRecording((filename + ".dtm").c_str()); - else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) - File::Delete(filename + ".dtm"); } + if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) + Movie::SaveRecording((filename + ".dtm").c_str()); + else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) + File::Delete(filename + ".dtm"); File::IOFile f(filename, "wb"); if (!f) From 5230146c7341eec2e541405043a2aa385d206a12 Mon Sep 17 00:00:00 2001 From: "rodolfoosvaldobogado@gmail.com" Date: Sat, 20 Oct 2012 10:22:15 -0300 Subject: [PATCH 032/627] Hey, long time no commits :). So to compensate lets bring back some speed to the emulation. change a little the way the vertex are send to the gpu, This first implementation changes dx9 a lot and dx11 a little to increase the parallelism between the cpu and gpu. ogl: is my next step in ogl is a little more trickier so i have to take a little more time. the original concept is Marcos idea, with my little touch to make it even more faster. what to look for: SPEEEEEDDD :). please test it a lot and let me know if you see any problem. in dx9 the code is prepared to fall back to the previous implementation if your card does not support the amount of buffers needed. So if you did not experience any speed gains you know where is the problem :). for the ones with more experience and compression of the code please test changing the amount and size of the buffers to tune this for your specific machine. The current values are the sweet spot for my machine. All must Thanks Marcos, I hate him for giving good ideas when I'm full of work. --- .../Core/VideoCommon/Src/VertexManagerBase.h | 5 +- .../Plugin_VideoDX11/Src/VertexManager.cpp | 96 +++--- .../Plugin_VideoDX11/Src/VertexManager.h | 16 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 15 +- .../Plugin_VideoDX9/Src/VertexManager.cpp | 298 +++++++++++++++--- .../Plugin_VideoDX9/Src/VertexManager.h | 17 + Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 6 +- .../Plugin_VideoOGL/Src/VertexManager.cpp | 10 + .../Plugin_VideoOGL/Src/VertexManager.h | 3 +- 9 files changed, 377 insertions(+), 89 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.h b/Source/Core/VideoCommon/Src/VertexManagerBase.h index bc30fa3fba..f3a4aa72e3 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.h +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.h @@ -21,7 +21,7 @@ public: // values from DX11 backend MAXVBUFFERSIZE = 0x50000, - MAXIBUFFERSIZE = 0x10000, + MAXIBUFFERSIZE = 0xFFFF, }; VertexManager(); @@ -46,7 +46,8 @@ public: static u8* GetVertexBuffer() { return LocalVBuffer; } static void DoState(PointerWrap& p); - + virtual void CreateDeviceObjects(){}; + virtual void DestroyDeviceObjects(){}; protected: // TODO: make private after Flush() is merged static void ResetBuffer(); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index 58bad98cc6..e2a8f4a547 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -39,32 +39,47 @@ namespace DX11 { // TODO: Find sensible values for these two -const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE*2 * 16; -const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16; +const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 12; +const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 8; +const UINT MAXVBUFFER_COUNT = 4; void VertexManager::CreateDeviceObjects() { D3D11_BUFFER_DESC bufdesc = CD3D11_BUFFER_DESC(IBUFFER_SIZE, D3D11_BIND_INDEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); - CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_indexBuffer)), - "Failed to create index buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)m_indexBuffer, "index buffer of VertexManager"); - - bufdesc.BindFlags = D3D11_BIND_VERTEX_BUFFER; - bufdesc.ByteWidth = VBUFFER_SIZE; - - CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertexBuffer)), - "Failed to create vertex buffer."); - D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertexBuffer, "vertex buffer of VertexManager"); - m_indexBufferCursor = 0; m_vertexBufferCursor = 0; m_vertexDrawOffset = 0; - m_triangleDrawIndex = 0; m_lineDrawIndex = 0; m_pointDrawIndex = 0; + m_indexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; + m_vertexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; + bool Fail = false; + for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) + { + m_indexBuffers[m_activeVertexBuffer] = NULL; + m_vertexBuffers[m_activeVertexBuffer] = NULL; + } + for (m_activeIndexBuffer = 0; m_activeIndexBuffer < MAXVBUFFER_COUNT; m_activeIndexBuffer++) + { + CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_indexBuffers[m_activeIndexBuffer])), + "Failed to create index buffer."); + D3D::SetDebugObjectName((ID3D11DeviceChild*)m_indexBuffers[m_activeIndexBuffer], "index buffer of VertexManager"); + } + bufdesc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + bufdesc.ByteWidth = VBUFFER_SIZE; + for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) + { + CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertexBuffers[m_activeVertexBuffer])), + "Failed to create vertex buffer."); + D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertexBuffers[m_activeVertexBuffer], "Vertex buffer of VertexManager"); + } + m_activeVertexBuffer = 0; + m_activeIndexBuffer = 0; + m_LastVertexBuffer = MAXVBUFFER_COUNT; + m_LastIndexBuffer = MAXVBUFFER_COUNT; m_lineShader.Init(); m_pointShader.Init(); @@ -74,9 +89,12 @@ void VertexManager::DestroyDeviceObjects() { m_pointShader.Shutdown(); m_lineShader.Shutdown(); - - SAFE_RELEASE(m_vertexBuffer); - SAFE_RELEASE(m_indexBuffer); + for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) + { + SAFE_RELEASE(m_vertexBuffers[m_activeVertexBuffer]); + SAFE_RELEASE(m_indexBuffers[m_activeVertexBuffer]); + } + } VertexManager::VertexManager() @@ -94,42 +112,41 @@ void VertexManager::LoadBuffers() D3D11_MAPPED_SUBRESOURCE map; UINT vSize = UINT(s_pCurBufferPointer - LocalVBuffer); - if (m_vertexBufferCursor + vSize >= VBUFFER_SIZE) + D3D11_MAP MapType = D3D11_MAP_WRITE_NO_OVERWRITE; + if (m_vertexBufferCursor + vSize >= VBUFFER_SIZE || m_activeVertexBuffer != m_LastVertexBuffer) { // Wrap around - D3D::context->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map); + m_activeVertexBuffer = (m_activeVertexBuffer + 1) % MAXVBUFFER_COUNT; m_vertexBufferCursor = 0; + MapType = D3D11_MAP_WRITE_DISCARD; } - else - { - // Append data - D3D::context->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map); - } + + D3D::context->Map(m_vertexBuffers[m_activeVertexBuffer], 0, MapType, 0, &map); + memcpy((u8*)map.pData + m_vertexBufferCursor, LocalVBuffer, vSize); - D3D::context->Unmap(m_vertexBuffer, 0); + D3D::context->Unmap(m_vertexBuffers[m_activeVertexBuffer], 0); m_vertexDrawOffset = m_vertexBufferCursor; m_vertexBufferCursor += vSize; UINT iCount = IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen(); - if (m_indexBufferCursor + iCount >= IBUFFER_SIZE/2) + MapType = D3D11_MAP_WRITE_NO_OVERWRITE; + if (m_indexBufferCursor + iCount >= IBUFFER_SIZE/2 || m_activeIndexBuffer != m_LastIndexBuffer) { // Wrap around - D3D::context->Map(m_indexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map); + m_activeIndexBuffer = (m_activeIndexBuffer + 1) % MAXVBUFFER_COUNT; m_indexBufferCursor = 0; + MapType = D3D11_MAP_WRITE_DISCARD; } - else - { - // Append data - D3D::context->Map(m_indexBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map); - } + D3D::context->Map(m_indexBuffers[m_activeIndexBuffer], 0, MapType, 0, &map); + m_triangleDrawIndex = m_indexBufferCursor; m_lineDrawIndex = m_triangleDrawIndex + IndexGenerator::GetTriangleindexLen(); m_pointDrawIndex = m_lineDrawIndex + IndexGenerator::GetLineindexLen(); memcpy((u16*)map.pData + m_triangleDrawIndex, TIBuffer, 2*IndexGenerator::GetTriangleindexLen()); memcpy((u16*)map.pData + m_lineDrawIndex, LIBuffer, 2*IndexGenerator::GetLineindexLen()); memcpy((u16*)map.pData + m_pointDrawIndex, PIBuffer, 2*IndexGenerator::GetPointindexLen()); - D3D::context->Unmap(m_indexBuffer, 0); + D3D::context->Unmap(m_indexBuffers[m_activeIndexBuffer], 0); m_indexBufferCursor += iCount; } @@ -139,9 +156,11 @@ static const float LINE_PT_TEX_OFFSETS[8] = { void VertexManager::Draw(UINT stride) { - D3D::context->IASetVertexBuffers(0, 1, &m_vertexBuffer, &stride, &m_vertexDrawOffset); - D3D::context->IASetIndexBuffer(m_indexBuffer, DXGI_FORMAT_R16_UINT, 0); - + D3D::context->IASetVertexBuffers(0, 1, &m_vertexBuffers[m_activeVertexBuffer], &stride, &m_vertexDrawOffset); + D3D::context->IASetIndexBuffer(m_indexBuffers[m_activeIndexBuffer], DXGI_FORMAT_R16_UINT, 0); + m_LastIndexBuffer = m_activeIndexBuffer; + m_LastVertexBuffer = m_activeVertexBuffer; + if (IndexGenerator::GetNumTriangles() > 0) { D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); @@ -260,12 +279,11 @@ void VertexManager::vFlush() GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); goto shader_fail; } - + LoadBuffers(); unsigned int stride = g_nativeVertexFmt->GetVertexStride(); g_nativeVertexFmt->SetupVertexPointers(); - g_renderer->ApplyState(useDstAlpha); - LoadBuffers(); + Draw(stride); GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h index a387be5155..2e8cfaa388 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h @@ -32,10 +32,11 @@ public: ~VertexManager(); NativeVertexFormat* CreateNativeVertexFormat(); - -private: void CreateDeviceObjects(); void DestroyDeviceObjects(); + +private: + void LoadBuffers(); void Draw(UINT stride); // temp @@ -46,9 +47,14 @@ private: UINT m_vertexDrawOffset; UINT m_triangleDrawIndex; UINT m_lineDrawIndex; - UINT m_pointDrawIndex; - ID3D11Buffer* m_indexBuffer; - ID3D11Buffer* m_vertexBuffer; + UINT m_pointDrawIndex; + UINT m_activeVertexBuffer; + UINT m_activeIndexBuffer; + UINT m_LastVertexBuffer; + UINT m_LastIndexBuffer; + typedef ID3D11Buffer* PID3D11Buffer; + PID3D11Buffer* m_indexBuffers; + PID3D11Buffer* m_vertexBuffers; LineGeometryShader m_lineShader; PointGeometryShader m_pointShader; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 45030c48df..653e387192 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -225,6 +225,7 @@ void SetupDeviceObjects() // To avoid shader compilation stutters, read back all shaders from cache. VertexShaderCache::Init(); PixelShaderCache::Init(); + g_vertex_manager->CreateDeviceObjects(); // Texture cache will recreate themselves over time. } @@ -243,6 +244,7 @@ void TeardownDeviceObjects() VertexShaderCache::Shutdown(); PixelShaderCache::Shutdown(); TextureConverter::Shutdown(); + g_vertex_manager->DestroyDeviceObjects(); } // Init functions @@ -1198,6 +1200,12 @@ void Renderer::ApplyState(bool bUseDstAlpha) { D3D::ChangeRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA); D3D::ChangeRenderState(D3DRS_ALPHABLENDENABLE, false); + if(bpmem.zmode.testenable && bpmem.zmode.updateenable) + { + D3D::ChangeRenderState(D3DRS_ZENABLE, TRUE); + D3D::ChangeRenderState(D3DRS_ZWRITEENABLE, false); + D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL); + } } } @@ -1205,7 +1213,12 @@ void Renderer::RestoreState() { D3D::RefreshRenderState(D3DRS_COLORWRITEENABLE); D3D::RefreshRenderState(D3DRS_ALPHABLENDENABLE); - + if(bpmem.zmode.testenable && bpmem.zmode.updateenable) + { + D3D::RefreshRenderState(D3DRS_ZENABLE); + D3D::RefreshRenderState(D3DRS_ZWRITEENABLE); + D3D::RefreshRenderState(D3DRS_ZFUNC); + } // TODO: Enable this code. Caused glitches for me however (neobrain) // for (unsigned int i = 0; i < 8; ++i) // D3D::dev->SetTexture(i, NULL); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index 9f55da15fa..e8e425cc96 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -39,7 +39,6 @@ // internal state for loading vertices extern NativeVertexFormat *g_nativeVertexFmt; - namespace DX9 { @@ -62,49 +61,259 @@ inline void DumpBadShaders() #endif } +void VertexManager::CreateDeviceObjects() +{ + NumVBuffers = 0; + CurrentIBufferIndex = 0; + CurrentVBufferIndex = 0; + CurrentVBufferSize = 8 * MAXVBUFFERSIZE; + CurrentIBufferSize = 12 * MAXIBUFFERSIZE; + D3DCAPS9 DeviceCaps = D3D::GetCaps(); + int maxdevicevbuffersize = DeviceCaps.MaxPrimitiveCount * 3 * DeviceCaps.MaxStreamStride; + if (CurrentVBufferSize > maxdevicevbuffersize) + { + CurrentVBufferSize = maxdevicevbuffersize; + } + if (CurrentIBufferSize > DeviceCaps.MaxVertexIndex) + { + CurrentIBufferSize = DeviceCaps.MaxVertexIndex; + } + if (CurrentIBufferSize < MAXIBUFFERSIZE) + { + return; + } + if (CurrentVBufferSize < MAXVBUFFERSIZE) + { + return; + } + VBuffers = new LPDIRECT3DVERTEXBUFFER9[MAX_VBufferCount]; + IBuffers = new LPDIRECT3DINDEXBUFFER9[MAX_VBufferCount]; + bool Fail = false; + for (CurrentVBuffer = 0; CurrentVBuffer < MAX_VBufferCount; CurrentVBuffer++) + { + VBuffers[CurrentVBuffer] = NULL; + IBuffers[CurrentVBuffer] = NULL; + } + for (CurrentVBuffer = 0; CurrentVBuffer < MAX_VBufferCount; CurrentVBuffer++) + { + if(FAILED( D3D::dev->CreateVertexBuffer( CurrentVBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &VBuffers[CurrentVBuffer], NULL ) ) ) + { + Fail = true; + break; + } + if( FAILED( D3D::dev->CreateIndexBuffer( CurrentIBufferSize * sizeof(u16), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &IBuffers[CurrentVBuffer], NULL ) ) ) + { + Fail = true; + return; + } + } + NumVBuffers = CurrentVBuffer; + CurrentVBuffer = 0; + CurrentIBuffer = 0; + LastVBuffer = NumVBuffers; + LastIBuffer = NumVBuffers; + if (Fail) + { + NumVBuffers--; + if (NumVBuffers < 2) + { + NumVBuffers = MAX_VBufferCount; + DestroyDeviceObjects(); + } + } + +} +void VertexManager::DestroyDeviceObjects() +{ + D3D::dev->SetStreamSource( 0, NULL, 0, 0); + D3D::dev->SetIndices(NULL); + for (int i = 0; i < MAX_VBufferCount; i++) + { + if(VBuffers) + { + if (VBuffers[i]) + { + VBuffers[i]->Release(); + VBuffers[i] = NULL; + } + } + + if (IBuffers[i]) + { + IBuffers[i]->Release(); + IBuffers[i] = NULL; + } + } + if(VBuffers) + delete [] VBuffers; + if(IBuffers) + delete [] IBuffers; + VBuffers = NULL; + IBuffers = NULL; +} + +VertexManager::VertexManager() +{ + //CreateDeviceObjects(); +} + +VertexManager::~VertexManager() +{ + //DestroyDeviceObjects(); +} + +void VertexManager::PrepareVBuffers(int stride) +{ + if (!NumVBuffers) + { + return; + } + u8* pVertices; + u16* pIndices; + int datasize = IndexGenerator::GetNumVerts() * stride; + int TdataSize = IndexGenerator::GetTriangleindexLen(); + int LDataSize = IndexGenerator::GetLineindexLen(); + int PDataSize = IndexGenerator::GetPointindexLen(); + int IndexDataSize = TdataSize + LDataSize + PDataSize; + DWORD LockMode = D3DLOCK_NOOVERWRITE; + + if (CurrentVBufferIndex > CurrentVBufferSize - datasize || LastVBuffer != CurrentVBuffer) + { + LockMode = D3DLOCK_DISCARD; + CurrentVBufferIndex = 0; + CurrentVBuffer = (CurrentVBuffer + 1) % NumVBuffers; + } + + if(FAILED(VBuffers[CurrentVBuffer]->Lock(CurrentVBufferIndex, datasize,(VOID**)(&pVertices), LockMode))) + { + DestroyDeviceObjects(); + return; + } + memcpy(pVertices, LocalVBuffer, datasize); + VBuffers[CurrentVBuffer]->Unlock(); + + LockMode = D3DLOCK_NOOVERWRITE; + + if (CurrentIBufferIndex > CurrentIBufferSize - IndexDataSize || LastIBuffer != CurrentIBuffer) + { + LockMode = D3DLOCK_DISCARD; + CurrentIBufferIndex = 0; + CurrentIBuffer = (CurrentIBuffer + 1) % NumVBuffers; + } + + if(FAILED(IBuffers[CurrentIBuffer]->Lock(CurrentIBufferIndex * sizeof(u16), IndexDataSize * sizeof(u16), (VOID**)(&pIndices), LockMode ))) + { + DestroyDeviceObjects(); + return; + } + if(TdataSize) + { + memcpy(pIndices, TIBuffer, TdataSize * sizeof(u16)); + pIndices += TdataSize; + } + if(LDataSize) + { + memcpy(pIndices, LIBuffer, LDataSize * sizeof(u16)); + pIndices += LDataSize; + } + if(PDataSize) + { + memcpy(pIndices, PIBuffer, PDataSize * sizeof(u16)); + } + IBuffers[CurrentIBuffer]->Unlock(); +} + void VertexManager::Draw(int stride) { - if (IndexGenerator::GetNumTriangles() > 0) + if(NumVBuffers) { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_TRIANGLELIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumTriangles(), - TIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) + if (IndexGenerator::GetNumTriangles() > 0) { - DumpBadShaders(); + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_TRIANGLELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex, + IndexGenerator::GetNumTriangles()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumLines() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_LINELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen(), + IndexGenerator::GetNumLines()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumPoints() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_POINTLIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen(), + IndexGenerator::GetNumPoints()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); } - if (IndexGenerator::GetNumLines() > 0) + else { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_LINELIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumLines(), - LIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) + if (IndexGenerator::GetNumTriangles() > 0) { - DumpBadShaders(); + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_TRIANGLELIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumTriangles(), + TIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } - if (IndexGenerator::GetNumPoints() > 0) - { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_POINTLIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumPoints(), - PIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) + if (IndexGenerator::GetNumLines() > 0) { - DumpBadShaders(); + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_LINELIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumLines(), + LIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumPoints() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_POINTLIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumPoints(), + PIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); } } @@ -153,7 +362,7 @@ void VertexManager::vFlush() // set global constants VertexShaderManager::SetConstants(); PixelShaderManager::SetConstants(); - + int stride = g_nativeVertexFmt->GetVertexStride(); if (!PixelShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components)) { GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); @@ -165,10 +374,18 @@ void VertexManager::vFlush() goto shader_fail; } - - int stride = g_nativeVertexFmt->GetVertexStride(); - g_nativeVertexFmt->SetupVertexPointers(); - + PrepareVBuffers(stride); + if (NumVBuffers) + { + D3D::dev->SetStreamSource( 0, VBuffers[CurrentVBuffer], CurrentVBufferIndex, stride); + if(LastIBuffer != CurrentIBuffer) + { + LastIBuffer = CurrentIBuffer; + D3D::dev->SetIndices(IBuffers[CurrentIBuffer]); + } + LastVBuffer = CurrentVBuffer; + } + g_nativeVertexFmt->SetupVertexPointers(); Draw(stride); bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && @@ -189,6 +406,11 @@ void VertexManager::vFlush() GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true); shader_fail: + if(NumVBuffers) + { + CurrentIBufferIndex += IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen(); + CurrentVBufferIndex += IndexGenerator::GetNumVerts() * stride; + } ResetBuffer(); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h index 0d12616ac5..a80f12276d 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h @@ -23,6 +23,7 @@ #include "VertexManagerBase.h" +#define MAX_VBufferCount 4 namespace DX9 { @@ -31,8 +32,24 @@ class VertexManager : public ::VertexManager public: NativeVertexFormat* CreateNativeVertexFormat(); void GetElements(NativeVertexFormat* format, D3DVERTEXELEMENT9** elems, int* num); + void CreateDeviceObjects(); + void DestroyDeviceObjects(); + VertexManager(); + ~VertexManager(); private: + u32 CurrentVBufferIndex; + u32 CurrentVBufferSize; + u32 CurrentIBufferIndex; + u32 CurrentIBufferSize; + u32 NumVBuffers; + u32 CurrentVBuffer; + u32 CurrentIBuffer; + u32 LastVBuffer; + u32 LastIBuffer; + LPDIRECT3DVERTEXBUFFER9 *VBuffers; + LPDIRECT3DINDEXBUFFER9 *IBuffers; + void PrepareVBuffers(int stride); void Draw(int stride); // temp void vFlush(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 5aeca6751d..d3fd6050bf 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -168,9 +168,9 @@ void VideoBackend::Video_Prepare() s_swapRequested = FALSE; // internal interfaces - g_renderer = new Renderer; - g_texture_cache = new TextureCache; g_vertex_manager = new VertexManager; + g_renderer = new Renderer; + g_texture_cache = new TextureCache; // VideoCommon BPInit(); Fifo_Init(); @@ -208,9 +208,9 @@ void VideoBackend::Shutdown() // internal interfaces PixelShaderCache::Shutdown(); VertexShaderCache::Shutdown(); - delete g_vertex_manager; delete g_texture_cache; delete g_renderer; + delete g_vertex_manager; g_renderer = NULL; g_texture_cache = NULL; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 0a37b0e654..501c4969e5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -69,6 +69,16 @@ VertexManager::VertexManager() GL_REPORT_ERRORD(); } +void VertexManager::CreateDeviceObjects() +{ + + +} +void VertexManager::DestroyDeviceObjects() +{ + +} + void VertexManager::Draw() { if (IndexGenerator::GetNumTriangles() > 0) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h index 0f22054855..5cec1bf97e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h @@ -33,7 +33,8 @@ public: VertexManager(); NativeVertexFormat* CreateNativeVertexFormat(); - + void CreateDeviceObjects(); + void DestroyDeviceObjects(); private: void Draw(); // temp From a6028b055b23ad998f6f15efda3525b21e3d23a1 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 20 Oct 2012 14:18:42 -0400 Subject: [PATCH 033/627] Save disc changes to .dtm, and load the full movie header every time it's loaded. --- Source/Core/Core/Src/HW/DVDInterface.cpp | 12 +++ Source/Core/Core/Src/Movie.cpp | 95 +++++++++++++++++++----- Source/Core/Core/Src/Movie.h | 18 +++-- 3 files changed, 99 insertions(+), 26 deletions(-) diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp index f2b387fbd6..214fb5dc02 100644 --- a/Source/Core/Core/Src/HW/DVDInterface.cpp +++ b/Source/Core/Core/Src/HW/DVDInterface.cpp @@ -29,6 +29,7 @@ #include "Memmap.h" #include "../VolumeHandler.h" #include "AudioInterface.h" +#include "../Movie.h" // Disc transfer rate measured in bytes per second static const u32 DISC_TRANSFER_RATE_GC = 3125 * 1024; @@ -334,6 +335,17 @@ void ChangeDisc(const char* _newFileName) std::string* _FileName = new std::string(_newFileName); CoreTiming::ScheduleEvent_Threadsafe(0, ejectDisc); CoreTiming::ScheduleEvent_Threadsafe(500000000, insertDisc, (u64)_FileName); + if (Movie::IsRecordingInput()) + { + Movie::g_bDiscChange = true; + std::string fileName = _newFileName; + int sizeofpath = fileName.find_last_of("/\\") + 1; + if (fileName.substr(sizeofpath).length() > 40) + { + PanicAlert("Saving iso filename to .dtm failed; max file name length is 40 characters."); + } + Movie::g_discChange = fileName.substr(sizeofpath); + } } void SetLidOpen(bool _bOpen) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 94edd9dedf..03f8752e84 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -34,6 +34,7 @@ #include "HW/EXI.h" #include "HW/EXI_Device.h" #include "HW/EXI_Channel.h" +#include "HW/DVDInterface.h" // large enough for just over 24 hours of single-player recording #define MAX_DTM_LENGTH (40 * 1024 * 1024) @@ -69,6 +70,9 @@ std::string g_videoBackend = "opengl"; int g_CPUCore = 1; bool g_bMemcard; bool g_bBlankMC = false; +bool g_bDiscChange = false; +std::string g_discChange = ""; +std::string author = ""; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -575,7 +579,8 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_padState.R = ((PadStatus->button & PAD_TRIGGER_R) != 0); g_padState.TriggerL = PadStatus->triggerLeft; g_padState.TriggerR = PadStatus->triggerRight; - + g_padState.disc = g_bDiscChange; + g_padState.AnalogStickX = PadStatus->stickX; g_padState.AnalogStickY = PadStatus->stickY; @@ -588,6 +593,11 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_totalBytes = g_currentByte; SetInputDisplayString(g_padState, controllerID); + + if (g_bDiscChange) + { + g_bDiscChange = false; + } } void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) @@ -608,6 +618,36 @@ void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf SetWiiInputDisplayString(wiimote, coreData, accelData, irData); } +void ReadHeader() +{ + g_numPads = tmpHeader.numControllers; + g_rerecords = tmpHeader.numRerecords; + + g_recordingStartTime = tmpHeader.recordingStartTime; + + g_bSaveConfig = tmpHeader.bSaveConfig; + g_bSkipIdle = tmpHeader.bSkipIdle; + g_bDualCore = tmpHeader.bDualCore; + g_bProgressive = tmpHeader.bProgressive; + g_bDSPHLE = tmpHeader.bDSPHLE; + g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; + g_CPUCore = tmpHeader.CPUCore; + + for (int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) + { + g_videoBackend[i] = tmpHeader.videoBackend[i]; + } + + for (int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++) + { + g_discChange[i] = tmpHeader.discChange[i]; + } + for (int i = 0; i < ARRAYSIZE(tmpHeader.author);i++) + { + author[i] = tmpHeader.author[i]; + } +} + bool PlayInput(const char *filename) { if(!filename || g_playMode != MODE_NONE) @@ -651,23 +691,11 @@ bool PlayInput(const char *filename) goto cleanup; } */ - - g_numPads = tmpHeader.numControllers; - g_rerecords = tmpHeader.numRerecords; + ReadHeader(); g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; - g_recordingStartTime = tmpHeader.recordingStartTime; - - g_bSaveConfig = tmpHeader.bSaveConfig; - g_bSkipIdle = tmpHeader.bSkipIdle; - g_bDualCore = tmpHeader.bDualCore; - g_bProgressive = tmpHeader.bProgressive; - g_bDSPHLE = tmpHeader.bDSPHLE; - g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; - g_CPUCore = tmpHeader.CPUCore; - g_currentFrame = 0; g_currentLagCount = 0; g_currentInputCount = 0; @@ -706,7 +734,7 @@ void DoState(PointerWrap &p) void LoadInput(const char *filename) { File::IOFile t_record(filename, "r+b"); - + t_record.ReadArray(&tmpHeader, 1); if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) @@ -715,7 +743,7 @@ void LoadInput(const char *filename) EndPlayInput(false); return; } - + ReadHeader(); if (!g_bReadOnly) { if (g_rerecords > tmpHeader.numRerecords) @@ -726,8 +754,7 @@ void LoadInput(const char *filename) t_record.Seek(0, SEEK_SET); t_record.WriteArray(&tmpHeader, 1); } - - g_numPads = tmpHeader.numControllers; + ChangePads(true); if (Core::g_CoreStartupParameter.bWii) ChangeWiiPads(true); @@ -925,6 +952,34 @@ void PlayController(SPADStatus *PadStatus, int controllerID) PadStatus->button |= PAD_TRIGGER_L; if(g_padState.R) PadStatus->button |= PAD_TRIGGER_R; + if (g_padState.disc) + { + // This implementation assumes the disc change will only happen once. Trying to change more than that will cause + // it to load the last disc every time. As far as i know though, there are no 3+ disc games, so this should be fine. + Core::SetState(Core::CORE_PAUSE); + int numPaths = (int)SConfig::GetInstance().m_ISOFolder.size(); + bool found = false; + std::string path; + for (int i = 0; i < numPaths; i++) + { + path = SConfig::GetInstance().m_ISOFolder[i]; + if (File::Exists((path + '/' + g_discChange.c_str()).c_str())) + { + found = true; + break; + } + } + if (found) + { + DVDInterface::ChangeDisc((path + '/' + g_discChange.c_str()).c_str()); + Core::SetState(Core::CORE_RUN); + } + else + { + Core::SetState(Core::CORE_PAUSE); + PanicAlert("Change the disc to %s", g_discChange.c_str()); + } + } SetInputDisplayString(g_padState, controllerID); @@ -1001,7 +1056,6 @@ void EndPlayInput(bool cont) void SaveRecording(const char *filename) { File::IOFile save_record(filename, "wb"); - // Create the real header now and write it DTMHeader header; memset(&header, 0, sizeof(DTMHeader)); @@ -1035,10 +1089,11 @@ void SaveRecording(const char *filename) header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; header.bMemcard = g_bMemcard; header.bBlankMC = g_bBlankMC; + strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); + strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); // TODO header.uniqueID = 0; - // header.author; // header.audioEmulator; save_record.WriteArray(&header, 1); diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index f7a1fd27e9..46ef457f3f 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -49,7 +49,8 @@ struct ControllerState { bool DPadUp:1, DPadDown:1, // Binary D-Pad buttons, 4 bits DPadLeft:1, DPadRight:1; bool L:1, R:1; // Binary triggers, 2 bits - bool reserved:4; // Reserved bits used for padding, 4 bits + bool disc:1; // Checks for disc being changed + bool reserved:3; // Reserved bits used for padding, 4 bits u8 TriggerL, TriggerR; // Triggers, 16 bits u8 AnalogStickX, AnalogStickY; // Main Stick, 16 bits @@ -59,7 +60,7 @@ struct ControllerState { #pragma pack(pop) // Global declarations -extern bool g_bFrameStep, g_bPolled, g_bReadOnly; +extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange; extern bool g_bSaveConfig, g_bSkipIdle, g_bDualCore, g_bProgressive, g_bDSPHLE, g_bFastDiscSpeed, g_bMemcard, g_bBlankMC; extern bool g_bEFBAccessEnable, g_bEFBCopyEnable; extern PlayMode g_playMode; @@ -77,6 +78,7 @@ extern u64 g_currentLagCount, g_totalLagCount; extern u64 g_currentInputCount, g_totalInputCount; extern std::string g_videoBackend; extern int g_CPUCore; +extern std::string g_discChange; extern u32 g_rerecords; @@ -96,7 +98,7 @@ struct DTMHeader { u64 uniqueID; // (not implemented) A Unique ID comprised of: md5(time + Game ID) u32 numRerecords; // Number of rerecords/'cuts' of this TAS u8 author[32]; // Author's name (encoded in UTF-8) - + u8 videoBackend[16]; // UTF-8 representation of the video backend u8 audioEmulator[16]; // UTF-8 representation of the audio emulator u8 padBackend[16]; // UTF-8 representation of the input backend @@ -109,7 +111,7 @@ struct DTMHeader { bool bProgressive; bool bDSPHLE; bool bFastDiscSpeed; - u8 CPUCore; + u8 CPUCore; // 0 = interpreter, 1 = JIT, 2 = JITIL bool bEFBAccessEnable; bool bEFBCopyEnable; bool bCopyEFBToTexture; @@ -118,8 +120,11 @@ struct DTMHeader { bool bUseXFB; bool bUseRealXFB; bool bMemcard; - bool bBlankMC; - u8 reserved[103]; // Make heading 256 bytes, just because we can + bool bBlankMC; // Create a new memory card when playing back a movie if true + u8 reserved[16]; + u8 discChange[40]; // Name of iso file to switch to, for two disc games. + u8 reserved2[60]; // Make heading 256 bytes, just because we can + }; #pragma pack(pop) @@ -165,6 +170,7 @@ void RecordWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeature bool PlayInput(const char *filename); void LoadInput(const char *filename); +void ReadHeader(); void PlayController(SPADStatus *PadStatus, int controllerID); bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); void EndPlayInput(bool cont); From c859aaae84642ded91fe046ef91404431c84f48b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 12:36:19 +0200 Subject: [PATCH 034/627] [optimization] TextureCacheBase: Slightly loosen the requirements for reusing mipmapped textures --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index a5c390df3d..65407f2a0e 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -363,8 +363,10 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } // 2. b) For normal textures, all texture parameters need to match + // NOTE: maxlevel is specified via render states, so it doesn't need to match exactly + // TODO: D3D9 doesn't support min_lod, so we should check for this here if (address == entry->addr && tex_hash == entry->hash && full_format == entry->format && - entry->num_mipmaps == maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) + entry->num_mipmaps > maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) { goto return_entry; } @@ -374,7 +376,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Don't we need to force texture decoding to RGBA8 for dynamic EFB copies? // TODO: Actually, it should be enough if the internal texture format matches... - if ((entry->type == TCET_NORMAL && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + if ((entry->type == TCET_NORMAL && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps > maxlevel) || (entry->type == TCET_EC_DYNAMIC && entry->native_width == width && entry->native_height == height)) { // reuse the texture @@ -421,9 +423,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // Sometimes, we can get around recreating a texture if only the number of mip levels changes // e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states // Thus, we don't update this member for every Load, but just whenever the texture gets recreated - // - // TODO: Won't we end up recreating textures all the time because maxlevel doesn't necessarily equal texLevels? - entry->num_mipmaps = maxlevel; // TODO: Does this actually work? We can't really adjust mipmap settings per-stage... + // TODO: D3D9 doesn't support min_lod. We should add a workaround for that here! + entry->num_mipmaps = maxlevel + 1; // TODO: Does this actually work? We can't really adjust mipmap settings per-stage... entry->type = TCET_NORMAL; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); From ee3d6d66d77dd40cc69e0cf219833d0c0a3a5be3 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:09:16 +0200 Subject: [PATCH 035/627] [cleanup] [bugfix] TextureCacheBase: Cleanup and simplify mipmapping logic. Possibly fixes a bug or two. --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 22 +++++++++---------- .../Core/VideoCommon/Src/TextureCacheBase.h | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 65407f2a0e..21e4a9d989 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -211,6 +211,9 @@ void TextureCache::ClearRenderTargets() bool TextureCache::CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels) { + if (levels == 1) + return false; + // Just checking if the necessary files exist, if they can't be loaded or have incorrect dimensions LODs will be black char texBasePathTemp[MAX_PATH]; char texPathTemp[MAX_PATH]; @@ -293,7 +296,7 @@ void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level) TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, u32 address, unsigned int width, unsigned int height, int texformat, - unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem) + unsigned int tlutaddr, int tlutfmt, bool use_mipmaps, unsigned int maxlevel, bool from_tmem) { if (0 == address) return NULL; @@ -363,8 +366,6 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } // 2. b) For normal textures, all texture parameters need to match - // NOTE: maxlevel is specified via render states, so it doesn't need to match exactly - // TODO: D3D9 doesn't support min_lod, so we should check for this here if (address == entry->addr && tex_hash == entry->hash && full_format == entry->format && entry->num_mipmaps > maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) { @@ -406,15 +407,12 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); - // TODO: Cleanup. Plus, we still autogenerate mipmaps in certain cases (we shouldn't do that) - bool isPow2; unsigned int texLevels; - isPow2 = !((width & (width - 1)) || (height & (height - 1))); - texLevels = (isPow2 && maxlevel) ? GetPow2(std::max(width, height)) : !isPow2; - texLevels = maxlevel ? std::min(texLevels, maxlevel + 1) : texLevels; + bool use_native_mips; + texLevels = use_mipmaps ? (maxlevel + 1) : 1; using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); - UseNativeMips = UseNativeMips && !using_custom_lods && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions - texLevels = (UseNativeMips || using_custom_lods) ? texLevels : !isPow2; + use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions + texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // create the entry/texture if (NULL == entry) { @@ -424,7 +422,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states // Thus, we don't update this member for every Load, but just whenever the texture gets recreated // TODO: D3D9 doesn't support min_lod. We should add a workaround for that here! - entry->num_mipmaps = maxlevel + 1; // TODO: Does this actually work? We can't really adjust mipmap settings per-stage... + entry->num_mipmaps = maxlevel + 1; entry->type = TCET_NORMAL; GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); @@ -443,7 +441,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, DumpTexture(entry, 0); // load mips - TODO: Loading mipmaps from tmem is untested! - if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && UseNativeMips) + if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && use_native_mips) { const unsigned int bsdepth = TexDecoder_GetTexelSizeInNibbles(texformat); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 4ef3b8a985..7197a639a7 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -116,7 +116,7 @@ public: virtual TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) = 0; static TCacheEntryBase* Load(unsigned int stage, u32 address, unsigned int width, unsigned int height, - int format, unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel, bool from_tmem); + int format, unsigned int tlutaddr, int tlutfmt, bool use_mipmaps, unsigned int maxlevel, bool from_tmem); static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); From 069d949a572ea2543e86819487c0ba34e5564af8 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:13:51 +0200 Subject: [PATCH 036/627] [cleanup] TextureCache: Kill the autogen_mipmap parameter --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 6 +++--- Source/Core/VideoCommon/Src/TextureCacheBase.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | 5 +---- Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h | 2 +- Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp | 3 +-- Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 13 ++----------- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h | 2 +- 8 files changed, 11 insertions(+), 24 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 21e4a9d989..dc80d98639 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -435,7 +435,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, else entry->type = TCET_NORMAL; // load texture - entry->Load(width, height, expandedWidth, 0, (texLevels == 0)); + entry->Load(width, height, expandedWidth, 0); if (g_ActiveConfig.bDumpTextures && !using_custom_texture) DumpTexture(entry, 0); @@ -470,7 +470,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, expandedHeight = (currentHeight + bsh) & (~bsh); TexDecoder_Decode(temp, *ptr, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); - entry->Load(currentWidth, currentHeight, expandedWidth, level, false); + entry->Load(currentWidth, currentHeight, expandedWidth, level); if (g_ActiveConfig.bDumpTextures) DumpTexture(entry, level); @@ -493,7 +493,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, unsigned int currentHeight = (mipHeight > 0) ? mipHeight : 1; LoadCustomTexture(tex_hash, texformat, level, currentWidth, currentHeight); - entry->Load(currentWidth, currentHeight, currentWidth, level, false); + entry->Load(currentWidth, currentHeight, currentWidth, level); mipWidth >>= 1; mipHeight >>= 1; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 7197a639a7..5d44341c7c 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -89,7 +89,7 @@ public: virtual bool Save(const char filename[], unsigned int level) = 0; virtual void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) = 0; + unsigned int expanded_width, unsigned int level) = 0; virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf, unsigned int cbufid, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 5f82a18fc0..844cf24b47 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -59,12 +59,9 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { D3D::ReplaceRGBATexture2D(texture->GetTex(), TextureCache::temp, width, height, expanded_width, level, usage); - - if (autogen_mips) - PD3DX11FilterTexture(D3D::context, texture->GetTex(), 0, D3DX11_DEFAULT); } TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h index 59d343017c..7876cb79ee 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h @@ -41,7 +41,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int levels, bool autogen_mips = false); + unsigned int expanded_width, unsigned int levels); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 2be29048d3..660fad7379 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -72,10 +72,9 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { D3D::ReplaceTexture2D(texture, temp, width, height, expanded_width, d3d_fmt, swap_r_b, level); - // D3D9 will automatically generate mip maps if necessary } void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFormat, diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h index 4a7cddd575..fc338e623f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h @@ -44,7 +44,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int levels, bool autogen_mips = false); + unsigned int expanded_width, unsigned int levels); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 7a62131f90..ab850d9af2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -201,7 +201,7 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, } void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips) + unsigned int expanded_width, unsigned int level) { //glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, texture); @@ -212,16 +212,7 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, if (expanded_width != width) glPixelStorei(GL_UNPACK_ROW_LENGTH, expanded_width); - if (bHaveMipMaps && autogen_mips) - { - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); - glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); - } - else - { - glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); - } + glTexImage2D(GL_TEXTURE_2D, level, gl_iformat, width, height, 0, gl_format, gl_type, temp); if (expanded_width != width) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h index 30f44b797d..a26aa4049e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h @@ -54,7 +54,7 @@ private: ~TCacheEntry(); void Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level, bool autogen_mips = false); + unsigned int expanded_width, unsigned int level); void FromRenderTarget(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, const EFBRectangle& srcRect, From 0706050b746e841227f0dcfd1572b62ddf184728 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:24:40 +0200 Subject: [PATCH 037/627] [cleanup] Vastly clean up backend-specific sampler state logic. --- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 6 +--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 8 ++--- .../Plugin_VideoOGL/Src/TextureCache.cpp | 29 ++++++------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 81efa3623f..cb9a0d32a0 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1382,14 +1382,10 @@ void Renderer::SetSamplerState(int stage, int texindex) const TexMode0 &tm0 = tex.texMode0[stage]; const TexMode1 &tm1 = tex.texMode1[stage]; - unsigned int mip; - mip = (tm0.min_filter == 8) ? TEXF_NONE:d3dMipFilters[tm0.min_filter & 3]; - if ((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) mip = TEXF_NONE; + unsigned int mip = d3dMipFilters[tm0.min_filter & 3]; if (texindex) stage += 4; - // TODO: Clarify whether these values are correct - // NOTE: since there's no "no filter" in DX11 we're using point filters in these cases if (g_ActiveConfig.bForceFiltering) { gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 653e387192..1bca963bd6 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1318,9 +1318,7 @@ void Renderer::SetSamplerState(int stage, int texindex) { min = (tm0.min_filter & 4) ? D3DTEXF_LINEAR : D3DTEXF_POINT; mag = tm0.mag_filter ? D3DTEXF_LINEAR : D3DTEXF_POINT; - mip = (tm0.min_filter == 8) ? D3DTEXF_NONE : d3dMipFilters[tm0.min_filter & 3]; - if((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) - mip = D3DTEXF_NONE; + mip = d3dMipFilters[tm0.min_filter & 3]; } if (texindex) stage += 4; @@ -1335,8 +1333,8 @@ void Renderer::SetSamplerState(int stage, int texindex) D3D::SetSamplerState(stage, D3DSAMP_ADDRESSU, d3dClamps[tm0.wrap_s]); D3D::SetSamplerState(stage, D3DSAMP_ADDRESSV, d3dClamps[tm0.wrap_t]); - //float SuperSampleCoeficient = (s_LastAA < 3)? s_LastAA + 1 : s_LastAA - 1;// uncoment this changes to conserve detail when incresing ssaa level - float lodbias = (tm0.lod_bias / 32.0f);// + (s_LastAA)?(log(SuperSampleCoeficient) / log(2.0f)):0; + + float lodbias = (tm0.lod_bias / 32.0f); D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index ab850d9af2..14c771b799 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -348,35 +348,24 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1) { - // TODO: not used anywhere - TexMode0 mode = newmode; - //mode1 = newmode1; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, - (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); + (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); - if (bHaveMipMaps) - { - // TODO: not used anywhere - if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4) - mode.min_filter += 4; // take equivalent forced linear + int filt = newmode.min_filter; + if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4) + filt += 4; // take equivalent forced linear - int filt = newmode.min_filter; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod >> 4); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod >> 4); - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (newmode.lod_bias / 32.0f)); - } - else - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, - (g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod / 16.f); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod / 16.f); + glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, newmode.lod_bias / 32.0f); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]); if (g_Config.iMaxAnisotropy >= 1) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, - (float)(1 << g_ActiveConfig.iMaxAnisotropy)); + (float)(1 << g_ActiveConfig.iMaxAnisotropy)); } TextureCache::~TextureCache() From 6c8a22de24e1e374c4357ca653ac584c8a6adfac Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:25:21 +0200 Subject: [PATCH 038/627] [bugfix] DX9::TextureCache: Use max_lod instead of min_lod where necessary. --- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 1bca963bd6..9299bf0b8f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1336,7 +1336,7 @@ void Renderer::SetSamplerState(int stage, int texindex) float lodbias = (tm0.lod_bias / 32.0f); D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); - D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4); + D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.max_lod >> 4); } void Renderer::SetInterlacingMode() From 9d5fc3d7f06b10d27438ea73bd29b09d2fd21ec2 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:27:35 +0200 Subject: [PATCH 039/627] [bugfix] Properly decode lod_bias. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index cb9a0d32a0..345cce580a 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1427,7 +1427,7 @@ void Renderer::SetSamplerState(int stage, int texindex) // When mipfilter is set to "none", just disable mipmapping altogether gx_state.sampdc[stage].MaxLOD = (mip == TEXF_NONE) ? 0.0f : (float)tm1.max_lod/16.f; gx_state.sampdc[stage].MinLOD = (float)tm1.min_lod/16.f; - gx_state.sampdc[stage].MipLODBias = (float)tm0.lod_bias/32.0f; + gx_state.sampdc[stage].MipLODBias = (s32)tm0.lod_bias/32.0f; } void Renderer::SetInterlacingMode() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 9299bf0b8f..019efe1682 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1334,7 +1334,7 @@ void Renderer::SetSamplerState(int stage, int texindex) D3D::SetSamplerState(stage, D3DSAMP_ADDRESSU, d3dClamps[tm0.wrap_s]); D3D::SetSamplerState(stage, D3DSAMP_ADDRESSV, d3dClamps[tm0.wrap_t]); - float lodbias = (tm0.lod_bias / 32.0f); + float lodbias = (s32)tm0.lod_bias / 32.0f; D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.max_lod >> 4); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 14c771b799..035c42248d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -358,7 +358,7 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod / 16.f); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod / 16.f); - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, newmode.lod_bias / 32.0f); + glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (s32)newmode.lod_bias / 32.0f); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]); From 52963584f0339be68c7f5fcc8d79da37cf0cba5b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 10 Aug 2012 13:29:19 +0200 Subject: [PATCH 040/627] [bugfix] Make sure to specify the correct max lod level. --- Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp | 4 ++-- Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index e2a8f4a547..2ab21e29ad 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -246,8 +246,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + ceil(tex.texMode1[i&3].max_lod / 16.f), tex.texImage1[i&3].image_type); if (tentry) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index e8e425cc96..47b40a93f9 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -345,8 +345,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + ceil(tex.texMode1[i&3].max_lod / 16.f), tex.texImage1[i&3].image_type); if (tentry) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 501c4969e5..05621ce838 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -164,8 +164,8 @@ void VertexManager::vFlush() tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - tex.texMode1[i&3].max_lod >> 4, + (tex.texMode0[i&3].min_filter & 3), + ceil(tex.texMode1[i&3].max_lod / 16.f), tex.texImage1[i&3].image_type); if (tentry) From 92d2f5dee21e19cccdba9d3ef0d10a9097dcb6d2 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 20 Oct 2012 15:58:29 -0400 Subject: [PATCH 041/627] keeping padding right is so hard --- Source/Core/Core/Src/Movie.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 46ef457f3f..f744fab130 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -123,7 +123,7 @@ struct DTMHeader { bool bBlankMC; // Create a new memory card when playing back a movie if true u8 reserved[16]; u8 discChange[40]; // Name of iso file to switch to, for two disc games. - u8 reserved2[60]; // Make heading 256 bytes, just because we can + u8 reserved2[47]; // Make heading 256 bytes, just because we can }; #pragma pack(pop) From 9070e7ff8c45a7ca4c0bcb0e728dd4720abab7be Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 20 Oct 2012 19:54:38 -0400 Subject: [PATCH 042/627] misc movie cleanup and fixes --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 8 +- Source/Core/Core/Src/Movie.cpp | 113 ++++++++++---------- Source/Core/Core/Src/Movie.h | 6 +- 3 files changed, 66 insertions(+), 61 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index b73757cad5..8a568448a3 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -26,6 +26,7 @@ #include "CoreAudioSoundStream.h" #include "OpenALStream.h" #include "PulseAudioStream.h" +#include "../../Core/Src/Movie.h" namespace AudioCommon { @@ -115,7 +116,12 @@ namespace AudioCommon return backends; } - bool UseJIT() { + bool UseJIT() + { + if (!Movie::IsDSPHLE() && Movie::IsPlayingInput() && Movie::IsConfigSaved()) + { + return true; + } return ac_Config.m_EnableJIT; } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 03f8752e84..e17190e1c5 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -60,12 +60,12 @@ u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started -bool g_bSaveConfig = false; -bool g_bSkipIdle = false; -bool g_bDualCore = false; -bool g_bProgressive = false; -bool g_bDSPHLE = false; -bool g_bFastDiscSpeed = false; +bool bSaveConfig = false; +bool bSkipIdle = false; +bool bDualCore = false; +bool bProgressive = false; +bool bDSPHLE = false; +bool bFastDiscSpeed = false; std::string g_videoBackend = "opengl"; int g_CPUCore = 1; bool g_bMemcard; @@ -130,29 +130,11 @@ void Init() g_bPolled = false; g_bFrameStep = false; g_bFrameStop = false; - g_bSaveConfig = false; - g_CPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; - g_bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; - if (IsRecordingInput() || (!tmpHeader.bSaveConfig && IsPlayingInput())) + bSaveConfig = false; + + if (IsPlayingInput()) { - g_bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; - g_bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; - g_bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; - g_bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; - g_bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; - g_bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); - } - else if (IsPlayingInput() && tmpHeader.bSaveConfig) - { - g_bSaveConfig = tmpHeader.bSaveConfig; - g_bSkipIdle = tmpHeader.bSkipIdle; - g_bDualCore = tmpHeader.bDualCore; - g_bProgressive = tmpHeader.bProgressive; - g_bDSPHLE = tmpHeader.bDSPHLE; - g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; - g_CPUCore = tmpHeader.CPUCore; - g_bBlankMC = tmpHeader.bBlankMC; + ReadHeader(); } g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); @@ -241,7 +223,7 @@ void FrameSkipping() g_frameSkipCounter++; if (g_frameSkipCounter > g_framesToSkip || Core::ShouldSkipFrame(g_frameSkipCounter) == false) g_frameSkipCounter = 0; - + g_video_backend->Video_SetRendering(!g_frameSkipCounter); } } @@ -293,31 +275,31 @@ bool IsUsingWiimote(int wiimote) bool IsConfigSaved() { - return g_bSaveConfig; + return bSaveConfig; } bool IsDualCore() { - return g_bDualCore; + return bDualCore; } bool IsProgressive() { - return g_bProgressive; + return bProgressive; } bool IsSkipIdle() { - return g_bSkipIdle; + return bSkipIdle; } bool IsDSPHLE() { - return g_bDSPHLE; + return bDSPHLE; } bool IsFastDiscSpeed() { - return g_bFastDiscSpeed; + return bFastDiscSpeed; } int GetCPUMode() @@ -387,11 +369,11 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; - g_bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; - g_bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; - g_bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; - g_bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; - g_bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; g_CPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; @@ -621,27 +603,45 @@ void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf void ReadHeader() { g_numPads = tmpHeader.numControllers; - g_rerecords = tmpHeader.numRerecords; - g_recordingStartTime = tmpHeader.recordingStartTime; + if (g_rerecords < tmpHeader.numRerecords); + g_rerecords = tmpHeader.numRerecords; - g_bSaveConfig = tmpHeader.bSaveConfig; - g_bSkipIdle = tmpHeader.bSkipIdle; - g_bDualCore = tmpHeader.bDualCore; - g_bProgressive = tmpHeader.bProgressive; - g_bDSPHLE = tmpHeader.bDSPHLE; - g_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; - g_CPUCore = tmpHeader.CPUCore; + if (tmpHeader.bSaveConfig) + { + bSaveConfig = true; + bSkipIdle = tmpHeader.bSkipIdle; + bDualCore = tmpHeader.bDualCore; + bProgressive = tmpHeader.bProgressive; + bDSPHLE = tmpHeader.bDSPHLE; + bFastDiscSpeed = tmpHeader.bFastDiscSpeed; + g_CPUCore = tmpHeader.CPUCore; + } + else + { + bSaveConfig = true; + bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + } + + g_videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); for (int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) { g_videoBackend[i] = tmpHeader.videoBackend[i]; } + g_discChange.resize(ARRAYSIZE(tmpHeader.discChange)); for (int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++) { g_discChange[i] = tmpHeader.discChange[i]; } + + author.resize(ARRAYSIZE(tmpHeader.author)); for (int i = 0; i < ARRAYSIZE(tmpHeader.author);i++) { author[i] = tmpHeader.author[i]; @@ -834,8 +834,7 @@ void LoadInput(const char *filename) } t_record.Close(); - g_rerecords = tmpHeader.numRerecords; - g_bSaveConfig = tmpHeader.bSaveConfig; + bSaveConfig = tmpHeader.bSaveConfig; if (!afterEnd) { @@ -1073,11 +1072,11 @@ void SaveRecording(const char *filename) header.recordingStartTime = g_recordingStartTime; header.bSaveConfig = true; - header.bSkipIdle = g_bSkipIdle; - header.bDualCore = g_bDualCore; - header.bProgressive = g_bProgressive; - header.bDSPHLE = g_bDSPHLE; - header.bFastDiscSpeed = g_bFastDiscSpeed; + header.bSkipIdle = bSkipIdle; + header.bDualCore = bDualCore; + header.bProgressive = bProgressive; + header.bDSPHLE = bDSPHLE; + header.bFastDiscSpeed = bFastDiscSpeed; strncpy((char *)header.videoBackend, g_videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); header.CPUCore = g_CPUCore; header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; @@ -1095,7 +1094,7 @@ void SaveRecording(const char *filename) // TODO header.uniqueID = 0; // header.audioEmulator; - + save_record.WriteArray(&header, 1); bool success = save_record.WriteArray(tmpInput, (size_t)g_totalBytes); diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index f744fab130..9ad69e6e64 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -61,8 +61,7 @@ struct ControllerState { // Global declarations extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange; -extern bool g_bSaveConfig, g_bSkipIdle, g_bDualCore, g_bProgressive, g_bDSPHLE, g_bFastDiscSpeed, g_bMemcard, g_bBlankMC; -extern bool g_bEFBAccessEnable, g_bEFBCopyEnable; +extern bool g_bMemcard, g_bBlankMC; extern PlayMode g_playMode; extern u32 g_framesToSkip, g_frameSkipCounter; @@ -124,8 +123,9 @@ struct DTMHeader { u8 reserved[16]; u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 reserved2[47]; // Make heading 256 bytes, just because we can - }; +static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes"); + #pragma pack(pop) void FrameUpdate(); From aece5310f34ec17c967e62b73ec3c0616ba9298d Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 21 Oct 2012 17:48:45 -0400 Subject: [PATCH 043/627] more movie cleanup. Removes the remaining globals that didn't need to be global, rearranges some code to make more sense, and removes some redundant code. --- Source/Core/Core/Src/BootManager.cpp | 2 +- Source/Core/Core/Src/Core.cpp | 2 +- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 83 +++++++++++-------- Source/Core/Core/Src/Movie.h | 8 +- 5 files changed, 55 insertions(+), 42 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 709053a5e2..187baf415c 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -124,7 +124,7 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bProgressive = Movie::IsProgressive(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); - if (Movie::g_bMemcard && Movie::g_bBlankMC) + if (Movie::IsUsingMemcard() && Movie::IsBlankMemcard()) { if (File::Exists("Movie.raw")) File::Delete("Movie.raw"); diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index da9b5795fa..d3c9fb7033 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -434,7 +434,7 @@ void EmuThread() CBoot::BootUp(); // Setup our core, but can't use dynarec if we are compare server - if (Movie::g_CPUCore && (!_CoreParameter.bRunCompareServer || + if (Movie::GetCPUMode() && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient)) PowerPC::SetMode(PowerPC::MODE_JIT); else diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 106e41b16c..f65d8c6b8b 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,7 +52,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; - if (Movie::g_bMemcard && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::g_bBlankMC) + if (Movie::IsUsingMemcard() && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsBlankMemcard()) m_strFilename = "Movie.raw"; // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index e17190e1c5..4c142a5820 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -66,10 +66,10 @@ bool bDualCore = false; bool bProgressive = false; bool bDSPHLE = false; bool bFastDiscSpeed = false; -std::string g_videoBackend = "opengl"; -int g_CPUCore = 1; -bool g_bMemcard; -bool g_bBlankMC = false; +std::string videoBackend = "opengl"; +int iCPUCore = 1; +bool bMemcard; +bool bBlankMC = false; bool g_bDiscChange = false; std::string g_discChange = ""; std::string author = ""; @@ -138,7 +138,7 @@ void Init() } g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); - if (!tmpHeader.bFromSaveState) + if (!tmpHeader.bFromSaveState || !IsPlayingInput()) Core::SetStateFileName(""); for (int i = 0; i < 8; ++i) g_InputDisplay[i].clear(); @@ -245,7 +245,7 @@ bool IsJustStartingRecordingInputFromSaveState() bool IsJustStartingPlayingInputFromSaveState() { - return tmpHeader.bFromSaveState && g_currentFrame == 1; + return IsRecordingInputFromSaveState() && g_currentFrame == 1 && IsPlayingInput(); } bool IsPlayingInput() @@ -304,7 +304,17 @@ bool IsFastDiscSpeed() int GetCPUMode() { - return g_CPUCore; + return iCPUCore; +} + +bool IsBlankMemcard() +{ + return bBlankMC; +} + +bool IsUsingMemcard() +{ + return bMemcard; } void ChangePads(bool instantly) @@ -374,8 +384,9 @@ bool BeginRecordingInput(int controllers) bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; - g_CPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -604,7 +615,7 @@ void ReadHeader() { g_numPads = tmpHeader.numControllers; g_recordingStartTime = tmpHeader.recordingStartTime; - if (g_rerecords < tmpHeader.numRerecords); + if (g_rerecords < tmpHeader.numRerecords) g_rerecords = tmpHeader.numRerecords; if (tmpHeader.bSaveConfig) @@ -615,24 +626,26 @@ void ReadHeader() bProgressive = tmpHeader.bProgressive; bDSPHLE = tmpHeader.bDSPHLE; bFastDiscSpeed = tmpHeader.bFastDiscSpeed; - g_CPUCore = tmpHeader.CPUCore; + iCPUCore = tmpHeader.CPUCore; + bBlankMC = tmpHeader.bBlankMC; } else { - bSaveConfig = true; + bSaveConfig = false; bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - g_videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); } - g_videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); + videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); for (int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) { - g_videoBackend[i] = tmpHeader.videoBackend[i]; + videoBackend[i] = tmpHeader.videoBackend[i]; } g_discChange.resize(ARRAYSIZE(tmpHeader.discChange)); @@ -655,19 +668,19 @@ bool PlayInput(const char *filename) if(!File::Exists(filename)) return false; - + File::IOFile g_recordfd; - + if (!g_recordfd.Open(filename, "rb")) return false; - + g_recordfd.ReadArray(&tmpHeader, 1); if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) { PanicAlertT("Invalid recording file"); goto cleanup; } - + // Load savestate (and skip to frame data) if(tmpHeader.bFromSaveState) { @@ -676,16 +689,15 @@ bool PlayInput(const char *filename) Core::SetStateFileName(stateFilename); g_bRecordingFromSaveState = true; Movie::LoadInput(filename); - g_currentFrame = 0; } - + /* TODO: Put this verification somewhere we have the gameID of the played game // TODO: Replace with Unique ID if(tmpHeader.uniqueID != 0) { PanicAlert("Recording Unique ID Verification Failed"); goto cleanup; } - + if(strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)) { PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", header.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); goto cleanup; @@ -708,9 +720,9 @@ bool PlayInput(const char *filename) g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes); g_currentByte = 0; g_recordfd.Close(); - + return true; - + cleanup: g_recordfd.Close(); return false; @@ -736,7 +748,7 @@ void LoadInput(const char *filename) File::IOFile t_record(filename, "r+b"); t_record.ReadArray(&tmpHeader, 1); - + if(tmpHeader.filetype[0] != 'D' || tmpHeader.filetype[1] != 'T' || tmpHeader.filetype[2] != 'M' || tmpHeader.filetype[3] != 0x1A) { PanicAlertT("Savestate movie %s is corrupted, movie recording stopping...", filename); @@ -871,7 +883,12 @@ static void CheckInputEnd() void PlayController(SPADStatus *PadStatus, int controllerID) { - if (IsPlayingInput() && IsConfigSaved()) + // Correct playback is entirely dependent on the emulator polling the controllers + // in the same order done during recording + if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) + return; + + if (IsConfigSaved()) { SetGraphicsConfig(); } @@ -886,10 +903,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) ExpansionInterface::ChangeDevice(0, EXIDEVICE_NONE, 0); } } - // Correct playback is entirely dependent on the emulator polling the controllers - // in the same order done during recording - if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) - return; if (g_currentByte + 8 > g_totalBytes) { @@ -1044,7 +1057,7 @@ void EndPlayInput(bool cont) g_currentByte = 0; g_playMode = MODE_NONE; Core::DisplayMessage("Movie End.", 2000); - tmpHeader.bFromSaveState = 0; + g_bRecordingFromSaveState = 0; // we don't clear these things because otherwise we can't resume playback if we load a movie state later //g_totalFrames = g_totalBytes = 0; //delete tmpInput; @@ -1077,8 +1090,8 @@ void SaveRecording(const char *filename) header.bProgressive = bProgressive; header.bDSPHLE = bDSPHLE; header.bFastDiscSpeed = bFastDiscSpeed; - strncpy((char *)header.videoBackend, g_videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); - header.CPUCore = g_CPUCore; + strncpy((char *)header.videoBackend, videoBackend.c_str(),ARRAYSIZE(header.videoBackend)); + header.CPUCore = iCPUCore; header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture; @@ -1086,8 +1099,8 @@ void SaveRecording(const char *filename) header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges; header.bUseXFB = g_ActiveConfig.bUseXFB; header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; - header.bMemcard = g_bMemcard; - header.bBlankMC = g_bBlankMC; + header.bMemcard = bMemcard; + header.bBlankMC = bBlankMC; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 9ad69e6e64..94e63a9e2b 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -57,11 +57,11 @@ struct ControllerState { u8 CStickX, CStickY; // Sub-Stick, 16 bits }; // Total: 60 + 4 = 64 bits per frame +static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes"); #pragma pack(pop) // Global declarations extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange; -extern bool g_bMemcard, g_bBlankMC; extern PlayMode g_playMode; extern u32 g_framesToSkip, g_frameSkipCounter; @@ -75,8 +75,6 @@ extern u64 g_currentByte, g_totalBytes; extern u64 g_currentFrame, g_totalFrames; extern u64 g_currentLagCount, g_totalLagCount; extern u64 g_currentInputCount, g_totalInputCount; -extern std::string g_videoBackend; -extern int g_CPUCore; extern std::string g_discChange; extern u32 g_rerecords; @@ -120,7 +118,7 @@ struct DTMHeader { bool bUseRealXFB; bool bMemcard; bool bBlankMC; // Create a new memory card when playing back a movie if true - u8 reserved[16]; + u8 reserved[16]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 reserved2[47]; // Make heading 256 bytes, just because we can }; @@ -150,6 +148,8 @@ bool IsSkipIdle(); bool IsDSPHLE(); bool IsFastDiscSpeed(); int GetCPUMode(); +bool IsBlankMemcard(); +bool IsUsingMemcard(); void SetGraphicsConfig(); bool IsUsingPad(int controller); From f7edfc0118afe02f06ddb5fe6a2462414c7edd79 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 22 Oct 2012 12:25:41 +0200 Subject: [PATCH 044/627] FifoPlayer: Copy selected object commands to clipboard when pressing ctrl+c --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 17 +++++++++++++++++ Source/Core/DolphinWX/Src/FifoPlayerDlg.h | 1 + 2 files changed, 18 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index cb467389ee..4579af762a 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -23,6 +23,7 @@ #include "FifoPlayer/FifoRecorder.h" #include "OpcodeDecoding.h" #include +#include DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) @@ -323,6 +324,13 @@ void FifoPlayerDlg::CreateGUIControls() m_searchField->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); m_searchField->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(FifoPlayerDlg::OnSearchFieldTextChanged), NULL, this); + // Setup command copying + wxAcceleratorEntry entry; + entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY); + wxAcceleratorTable accel(1, &entry); + m_objectCmdList->SetAcceleratorTable(accel); + m_objectCmdList->Connect(wxID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionCopy), NULL, this); + Connect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); Connect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); @@ -763,6 +771,15 @@ void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event) Fit(); } +void FifoPlayerDlg::OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event)) +{ + if (wxTheClipboard->Open()) + { + wxTheClipboard->SetData(new wxTextDataObject(m_objectCmdList->GetStringSelection())); + wxTheClipboard->Close(); + } +} + void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event)) { Hide(); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index 4e2c24fdd6..eb5f9a33e9 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -57,6 +57,7 @@ private: void OnFrameListSelectionChanged(wxCommandEvent& event); void OnObjectListSelectionChanged(wxCommandEvent& event); void OnObjectCmdListSelectionChanged(wxCommandEvent& event); + void OnObjectCmdListSelectionCopy(wxCommandEvent& WXUNUSED(event)); void UpdatePlayGui(); void UpdateRecorderGui(); From b2a01dc348138f2faf1335002e102aadabc436cf Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 22 Oct 2012 22:59:35 +1100 Subject: [PATCH 045/627] Changed the loop end address detection to an exact match with the current address for ADPCM audio. Fixes the non-looping music in PN03. Fixes issue 3998. --- Source/Core/Core/Src/DSP/DSPAccelerator.cpp | 6 +++++- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index b1452c249c..92651205a9 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -165,7 +165,11 @@ u16 dsp_read_accelerator() // Somehow, YN1 and YN2 must be initialized with their "loop" values, // so yeah, it seems likely that we should raise an exception to let // the DSP program do that, at least if DSP_FORMAT == 0x0A. - if (Address >= EndAddress) + + if (Address > EndAddress && g_dsp.ifx_regs[DSP_FORMAT] != 0x00) // PCM audio + Address = EndAddress; + + if (Address == EndAddress) { // Set address back to start address. Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index e6ee063ae3..7649a53091 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -232,7 +232,8 @@ inline void MixAddVoice(ParamBlockType &pb, temprbuffer[s] += right; // Control the behavior when we reach the end of the sample - if (samplePos >= sampleEnd) + if ((pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM && samplePos >= sampleEnd) || + (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM && samplePos == sampleEnd)) { if (pb.audio_addr.looping == 1) { From 421a75493cd2cd15ca72e9bc254812a6c4f7aa25 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 23 Oct 2012 00:30:01 +1100 Subject: [PATCH 046/627] Removed the fake DMA wait time as it is no longer needed after the aram-dma-fixes branch is merged. This fixes the Resident Evil 2/3 cutscene audio in DSP LLE mode. Fixes issue 2723. Removed the ADPCM format detection from the previous commit as it broke the audio looping in Knockout Kings 2003. --- Source/Core/Core/Src/DSP/DSPAccelerator.cpp | 9 +++------ Source/Core/Core/Src/HW/DSP.cpp | 6 ++---- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 6 +++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index 92651205a9..525750fc7d 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -165,14 +165,11 @@ u16 dsp_read_accelerator() // Somehow, YN1 and YN2 must be initialized with their "loop" values, // so yeah, it seems likely that we should raise an exception to let // the DSP program do that, at least if DSP_FORMAT == 0x0A. - - if (Address > EndAddress && g_dsp.ifx_regs[DSP_FORMAT] != 0x00) // PCM audio - Address = EndAddress; - - if (Address == EndAddress) + if (Address >= EndAddress) { // Set address back to start address. - Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; + if (Address == EndAddress) + Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; DSPCore_SetException(EXP_ACCOV); } diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index f2509555ed..e86231db43 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -697,14 +697,12 @@ void UpdateAudioDMA() void Do_ARAM_DMA() { - // Fake the DMA taking time to complete. The delay is not accurate, but - // seems like a good estimate - CoreTiming::ScheduleEvent_Threadsafe(g_arDMA.Cnt.count >> 1, et_GenerateDSPInterrupt, INT_ARAM | (1<<16)); - // Emulating the DMA wait time fixes Knockout Kings 2003 in DSP HLE mode if (!GetDSPEmulator()->IsLLE()) g_dspState.DSPControl.DMAState = 1; + GenerateDSPInterrupt(INT_ARAM, true); + // Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks if (g_arDMA.Cnt.dir) { diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 7649a53091..9a058afb83 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -232,12 +232,12 @@ inline void MixAddVoice(ParamBlockType &pb, temprbuffer[s] += right; // Control the behavior when we reach the end of the sample - if ((pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM && samplePos >= sampleEnd) || - (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM && samplePos == sampleEnd)) + if (samplePos >= sampleEnd) { if (pb.audio_addr.looping == 1) { - samplePos = loopPos; + if (samplePos == sampleEnd || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) + samplePos = loopPos; if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) { pb.adpcm.yn1 = pb.adpcm_loop_info.yn1; From 72cb1734ee35bb116bd841666338eb969e3d0f07 Mon Sep 17 00:00:00 2001 From: rodolfoosvaldobogado Date: Mon, 22 Oct 2012 19:37:26 -0300 Subject: [PATCH 047/627] Some code cleaning for my last commit. the amount and size of the buffer is now changed to "new hardware" frienly values and will fall back to the right values if hardware does not support them. my next commit will be to a branch, with my ogl work. --- .../Plugin_VideoDX11/Src/VertexManager.cpp | 35 +-- .../Plugin_VideoDX11/Src/VertexManager.h | 2 - Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 5 +- .../Plugin_VideoDX9/Src/VertexManager.cpp | 255 ++++++++---------- .../Plugin_VideoDX9/Src/VertexManager.h | 11 +- 5 files changed, 135 insertions(+), 173 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index e2a8f4a547..7026522cf6 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -39,31 +39,24 @@ namespace DX11 { // TODO: Find sensible values for these two -const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 12; -const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 8; -const UINT MAXVBUFFER_COUNT = 4; +const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 16 * sizeof(u16); +const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16; +const UINT MAXVBUFFER_COUNT = 2; void VertexManager::CreateDeviceObjects() { D3D11_BUFFER_DESC bufdesc = CD3D11_BUFFER_DESC(IBUFFER_SIZE, D3D11_BIND_INDEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); - m_indexBufferCursor = 0; - m_vertexBufferCursor = 0; m_vertexDrawOffset = 0; m_triangleDrawIndex = 0; m_lineDrawIndex = 0; m_pointDrawIndex = 0; m_indexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; - m_vertexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; - bool Fail = false; - for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) - { - m_indexBuffers[m_activeVertexBuffer] = NULL; - m_vertexBuffers[m_activeVertexBuffer] = NULL; - } + m_vertexBuffers = new PID3D11Buffer[MAXVBUFFER_COUNT]; for (m_activeIndexBuffer = 0; m_activeIndexBuffer < MAXVBUFFER_COUNT; m_activeIndexBuffer++) { + m_indexBuffers[m_activeIndexBuffer] = NULL; CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_indexBuffers[m_activeIndexBuffer])), "Failed to create index buffer."); D3D::SetDebugObjectName((ID3D11DeviceChild*)m_indexBuffers[m_activeIndexBuffer], "index buffer of VertexManager"); @@ -72,15 +65,15 @@ void VertexManager::CreateDeviceObjects() bufdesc.ByteWidth = VBUFFER_SIZE; for (m_activeVertexBuffer = 0; m_activeVertexBuffer < MAXVBUFFER_COUNT; m_activeVertexBuffer++) { + m_vertexBuffers[m_activeVertexBuffer] = NULL; CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertexBuffers[m_activeVertexBuffer])), "Failed to create vertex buffer."); D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertexBuffers[m_activeVertexBuffer], "Vertex buffer of VertexManager"); } m_activeVertexBuffer = 0; m_activeIndexBuffer = 0; - m_LastVertexBuffer = MAXVBUFFER_COUNT; - m_LastIndexBuffer = MAXVBUFFER_COUNT; - + m_indexBufferCursor = IBUFFER_SIZE; + m_vertexBufferCursor = VBUFFER_SIZE; m_lineShader.Init(); m_pointShader.Init(); } @@ -113,7 +106,7 @@ void VertexManager::LoadBuffers() UINT vSize = UINT(s_pCurBufferPointer - LocalVBuffer); D3D11_MAP MapType = D3D11_MAP_WRITE_NO_OVERWRITE; - if (m_vertexBufferCursor + vSize >= VBUFFER_SIZE || m_activeVertexBuffer != m_LastVertexBuffer) + if (m_vertexBufferCursor + vSize >= VBUFFER_SIZE) { // Wrap around m_activeVertexBuffer = (m_activeVertexBuffer + 1) % MAXVBUFFER_COUNT; @@ -131,7 +124,7 @@ void VertexManager::LoadBuffers() UINT iCount = IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen() + IndexGenerator::GetPointindexLen(); MapType = D3D11_MAP_WRITE_NO_OVERWRITE; - if (m_indexBufferCursor + iCount >= IBUFFER_SIZE/2 || m_activeIndexBuffer != m_LastIndexBuffer) + if (m_indexBufferCursor + iCount >= (IBUFFER_SIZE / sizeof(u16))) { // Wrap around m_activeIndexBuffer = (m_activeIndexBuffer + 1) % MAXVBUFFER_COUNT; @@ -143,9 +136,9 @@ void VertexManager::LoadBuffers() m_triangleDrawIndex = m_indexBufferCursor; m_lineDrawIndex = m_triangleDrawIndex + IndexGenerator::GetTriangleindexLen(); m_pointDrawIndex = m_lineDrawIndex + IndexGenerator::GetLineindexLen(); - memcpy((u16*)map.pData + m_triangleDrawIndex, TIBuffer, 2*IndexGenerator::GetTriangleindexLen()); - memcpy((u16*)map.pData + m_lineDrawIndex, LIBuffer, 2*IndexGenerator::GetLineindexLen()); - memcpy((u16*)map.pData + m_pointDrawIndex, PIBuffer, 2*IndexGenerator::GetPointindexLen()); + memcpy((u16*)map.pData + m_triangleDrawIndex, TIBuffer, sizeof(u16) * IndexGenerator::GetTriangleindexLen()); + memcpy((u16*)map.pData + m_lineDrawIndex, LIBuffer, sizeof(u16) * IndexGenerator::GetLineindexLen()); + memcpy((u16*)map.pData + m_pointDrawIndex, PIBuffer, sizeof(u16) * IndexGenerator::GetPointindexLen()); D3D::context->Unmap(m_indexBuffers[m_activeIndexBuffer], 0); m_indexBufferCursor += iCount; } @@ -158,8 +151,6 @@ void VertexManager::Draw(UINT stride) { D3D::context->IASetVertexBuffers(0, 1, &m_vertexBuffers[m_activeVertexBuffer], &stride, &m_vertexDrawOffset); D3D::context->IASetIndexBuffer(m_indexBuffers[m_activeIndexBuffer], DXGI_FORMAT_R16_UINT, 0); - m_LastIndexBuffer = m_activeIndexBuffer; - m_LastVertexBuffer = m_activeVertexBuffer; if (IndexGenerator::GetNumTriangles() > 0) { diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h index 2e8cfaa388..9e6b7f2dca 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h @@ -50,8 +50,6 @@ private: UINT m_pointDrawIndex; UINT m_activeVertexBuffer; UINT m_activeIndexBuffer; - UINT m_LastVertexBuffer; - UINT m_LastIndexBuffer; typedef ID3D11Buffer* PID3D11Buffer; PID3D11Buffer* m_indexBuffers; PID3D11Buffer* m_vertexBuffers; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 653e387192..a59adb4793 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1202,7 +1202,9 @@ void Renderer::ApplyState(bool bUseDstAlpha) D3D::ChangeRenderState(D3DRS_ALPHABLENDENABLE, false); if(bpmem.zmode.testenable && bpmem.zmode.updateenable) { - D3D::ChangeRenderState(D3DRS_ZENABLE, TRUE); + //This is needed to draw to the correct pixels in multi-pass algorithms + //this avoid z-figthing and grants that you write to the same pixels + //affected by the last pass D3D::ChangeRenderState(D3DRS_ZWRITEENABLE, false); D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_EQUAL); } @@ -1215,7 +1217,6 @@ void Renderer::RestoreState() D3D::RefreshRenderState(D3DRS_ALPHABLENDENABLE); if(bpmem.zmode.testenable && bpmem.zmode.updateenable) { - D3D::RefreshRenderState(D3DRS_ZENABLE); D3D::RefreshRenderState(D3DRS_ZWRITEENABLE); D3D::RefreshRenderState(D3DRS_ZFUNC); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index e8e425cc96..17a7aa1498 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -41,6 +41,10 @@ extern NativeVertexFormat *g_nativeVertexFmt; namespace DX9 { +//This are the initially requeted size for the buffers expresed in elements +const u32 IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 16; +const u32 VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16; +const u32 MAXVBUFFER_COUNT = 2; inline void DumpBadShaders() { @@ -64,37 +68,26 @@ inline void DumpBadShaders() void VertexManager::CreateDeviceObjects() { NumVBuffers = 0; - CurrentIBufferIndex = 0; - CurrentVBufferIndex = 0; - CurrentVBufferSize = 8 * MAXVBUFFERSIZE; - CurrentIBufferSize = 12 * MAXIBUFFERSIZE; + VBuffers = NULL; + IBuffers = NULL; D3DCAPS9 DeviceCaps = D3D::GetCaps(); - int maxdevicevbuffersize = DeviceCaps.MaxPrimitiveCount * 3 * DeviceCaps.MaxStreamStride; - if (CurrentVBufferSize > maxdevicevbuffersize) - { - CurrentVBufferSize = maxdevicevbuffersize; - } - if (CurrentIBufferSize > DeviceCaps.MaxVertexIndex) - { - CurrentIBufferSize = DeviceCaps.MaxVertexIndex; - } - if (CurrentIBufferSize < MAXIBUFFERSIZE) - { - return; - } - if (CurrentVBufferSize < MAXVBUFFERSIZE) - { - return; - } - VBuffers = new LPDIRECT3DVERTEXBUFFER9[MAX_VBufferCount]; - IBuffers = new LPDIRECT3DINDEXBUFFER9[MAX_VBufferCount]; + u32 devicevMaxBufferSize = DeviceCaps.MaxPrimitiveCount * 3 * DeviceCaps.MaxStreamStride; + //Calculate Device Dependant size + CurrentVBufferSize = (VBUFFER_SIZE > devicevMaxBufferSize) ? devicevMaxBufferSize : VBUFFER_SIZE; + CurrentIBufferSize = (IBUFFER_SIZE > DeviceCaps.MaxVertexIndex) ? DeviceCaps.MaxVertexIndex : IBUFFER_SIZE; + //if device caps are not enough for Vbuffer fall back to vertex arrays + if (CurrentIBufferSize < MAXIBUFFERSIZE || CurrentVBufferSize < MAXVBUFFERSIZE) return; + + VBuffers = new LPDIRECT3DVERTEXBUFFER9[MAXVBUFFER_COUNT]; + IBuffers = new LPDIRECT3DINDEXBUFFER9[MAXVBUFFER_COUNT]; + bool Fail = false; - for (CurrentVBuffer = 0; CurrentVBuffer < MAX_VBufferCount; CurrentVBuffer++) + for (CurrentVBuffer = 0; CurrentVBuffer < MAXVBUFFER_COUNT; CurrentVBuffer++) { VBuffers[CurrentVBuffer] = NULL; IBuffers[CurrentVBuffer] = NULL; } - for (CurrentVBuffer = 0; CurrentVBuffer < MAX_VBufferCount; CurrentVBuffer++) + for (CurrentVBuffer = 0; CurrentVBuffer < MAXVBUFFER_COUNT; CurrentVBuffer++) { if(FAILED( D3D::dev->CreateVertexBuffer( CurrentVBufferSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &VBuffers[CurrentVBuffer], NULL ) ) ) { @@ -110,24 +103,25 @@ void VertexManager::CreateDeviceObjects() NumVBuffers = CurrentVBuffer; CurrentVBuffer = 0; CurrentIBuffer = 0; - LastVBuffer = NumVBuffers; - LastIBuffer = NumVBuffers; + CurrentIBufferIndex = CurrentIBufferSize; + CurrentVBufferIndex = CurrentVBufferSize; + if (Fail) { NumVBuffers--; if (NumVBuffers < 2) { - NumVBuffers = MAX_VBufferCount; + //Error creating Vertex buffers. clean and fall to Vertex arrays + NumVBuffers = MAXVBUFFER_COUNT; DestroyDeviceObjects(); } - } - + } } void VertexManager::DestroyDeviceObjects() { D3D::dev->SetStreamSource( 0, NULL, 0, 0); D3D::dev->SetIndices(NULL); - for (int i = 0; i < MAX_VBufferCount; i++) + for (int i = 0; i < MAXVBUFFER_COUNT; i++) { if(VBuffers) { @@ -152,16 +146,6 @@ void VertexManager::DestroyDeviceObjects() IBuffers = NULL; } -VertexManager::VertexManager() -{ - //CreateDeviceObjects(); -} - -VertexManager::~VertexManager() -{ - //DestroyDeviceObjects(); -} - void VertexManager::PrepareVBuffers(int stride) { if (!NumVBuffers) @@ -177,7 +161,7 @@ void VertexManager::PrepareVBuffers(int stride) int IndexDataSize = TdataSize + LDataSize + PDataSize; DWORD LockMode = D3DLOCK_NOOVERWRITE; - if (CurrentVBufferIndex > CurrentVBufferSize - datasize || LastVBuffer != CurrentVBuffer) + if (CurrentVBufferIndex > CurrentVBufferSize - datasize) { LockMode = D3DLOCK_DISCARD; CurrentVBufferIndex = 0; @@ -194,7 +178,7 @@ void VertexManager::PrepareVBuffers(int stride) LockMode = D3DLOCK_NOOVERWRITE; - if (CurrentIBufferIndex > CurrentIBufferSize - IndexDataSize || LastIBuffer != CurrentIBuffer) + if (CurrentIBufferIndex > CurrentIBufferSize - IndexDataSize) { LockMode = D3DLOCK_DISCARD; CurrentIBufferIndex = 0; @@ -221,100 +205,104 @@ void VertexManager::PrepareVBuffers(int stride) memcpy(pIndices, PIBuffer, PDataSize * sizeof(u16)); } IBuffers[CurrentIBuffer]->Unlock(); + D3D::dev->SetStreamSource( 0, VBuffers[CurrentVBuffer], CurrentVBufferIndex, stride); + if(CurrentIBufferIndex == 0) + { + D3D::dev->SetIndices(IBuffers[CurrentIBuffer]); + } } -void VertexManager::Draw(int stride) +void VertexManager::DrawVB(int stride) { - if(NumVBuffers) + if (IndexGenerator::GetNumTriangles() > 0) { - if (IndexGenerator::GetNumTriangles() > 0) + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_TRIANGLELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex, + IndexGenerator::GetNumTriangles()))) { - if (FAILED(D3D::dev->DrawIndexedPrimitive( - D3DPT_TRIANGLELIST, - 0, - 0, - IndexGenerator::GetNumVerts(), - CurrentIBufferIndex, - IndexGenerator::GetNumTriangles()))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } - if (IndexGenerator::GetNumLines() > 0) - { - if (FAILED(D3D::dev->DrawIndexedPrimitive( - D3DPT_LINELIST, - 0, - 0, - IndexGenerator::GetNumVerts(), - CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen(), - IndexGenerator::GetNumLines()))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } - if (IndexGenerator::GetNumPoints() > 0) - { - if (FAILED(D3D::dev->DrawIndexedPrimitive( - D3DPT_POINTLIST, - 0, - 0, - IndexGenerator::GetNumVerts(), - CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen(), - IndexGenerator::GetNumPoints()))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); + DumpBadShaders(); } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); } - else + if (IndexGenerator::GetNumLines() > 0) { - if (IndexGenerator::GetNumTriangles() > 0) + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_LINELIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen(), + IndexGenerator::GetNumLines()))) { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_TRIANGLELIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumTriangles(), - TIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } - if (IndexGenerator::GetNumLines() > 0) - { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_LINELIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumLines(), - LIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); - } - if (IndexGenerator::GetNumPoints() > 0) - { - if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( - D3DPT_POINTLIST, - 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumPoints(), - PIBuffer, - D3DFMT_INDEX16, - LocalVBuffer, - stride))) - { - DumpBadShaders(); - } - INCSTAT(stats.thisFrame.numIndexedDrawCalls); + DumpBadShaders(); } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); } + if (IndexGenerator::GetNumPoints() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitive( + D3DPT_POINTLIST, + 0, + 0, + IndexGenerator::GetNumVerts(), + CurrentIBufferIndex + IndexGenerator::GetTriangleindexLen() + IndexGenerator::GetLineindexLen(), + IndexGenerator::GetNumPoints()))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + +} + +void VertexManager::DrawVA(int stride) +{ + if (IndexGenerator::GetNumTriangles() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_TRIANGLELIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumTriangles(), + TIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumLines() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_LINELIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumLines(), + LIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } + if (IndexGenerator::GetNumPoints() > 0) + { + if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( + D3DPT_POINTLIST, + 0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumPoints(), + PIBuffer, + D3DFMT_INDEX16, + LocalVBuffer, + stride))) + { + DumpBadShaders(); + } + INCSTAT(stats.thisFrame.numIndexedDrawCalls); + } } void VertexManager::vFlush() @@ -375,24 +363,13 @@ void VertexManager::vFlush() } PrepareVBuffers(stride); - if (NumVBuffers) - { - D3D::dev->SetStreamSource( 0, VBuffers[CurrentVBuffer], CurrentVBufferIndex, stride); - if(LastIBuffer != CurrentIBuffer) - { - LastIBuffer = CurrentIBuffer; - D3D::dev->SetIndices(IBuffers[CurrentIBuffer]); - } - LastVBuffer = CurrentVBuffer; - } g_nativeVertexFmt->SetupVertexPointers(); - Draw(stride); + if(NumVBuffers){ DrawVB(stride);} else { DrawVA(stride);} bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; if (useDstAlpha) { - DWORD write = 0; if (!PixelShaderCache::SetShader(DSTALPHA_ALPHA_PASS, g_nativeVertexFmt->m_components)) { GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR,true,{printf("Fail to set pixel shader\n");}); @@ -400,7 +377,7 @@ void VertexManager::vFlush() } // update alpha only g_renderer->ApplyState(true); - Draw(stride); + if(NumVBuffers){ DrawVB(stride);} else { DrawVA(stride);} g_renderer->RestoreState(); } GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h index a80f12276d..aa4e9ed57b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h @@ -23,7 +23,6 @@ #include "VertexManagerBase.h" -#define MAX_VBufferCount 4 namespace DX9 { @@ -34,23 +33,19 @@ public: void GetElements(NativeVertexFormat* format, D3DVERTEXELEMENT9** elems, int* num); void CreateDeviceObjects(); void DestroyDeviceObjects(); - VertexManager(); - ~VertexManager(); - private: u32 CurrentVBufferIndex; u32 CurrentVBufferSize; u32 CurrentIBufferIndex; - u32 CurrentIBufferSize; + u32 CurrentIBufferSize; u32 NumVBuffers; u32 CurrentVBuffer; u32 CurrentIBuffer; - u32 LastVBuffer; - u32 LastIBuffer; LPDIRECT3DVERTEXBUFFER9 *VBuffers; LPDIRECT3DINDEXBUFFER9 *IBuffers; void PrepareVBuffers(int stride); - void Draw(int stride); + void DrawVB(int stride); + void DrawVA(int stride); // temp void vFlush(); }; From b2e2e49fe49715a3dd77f138b8365046550d99b2 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 22 Oct 2012 16:45:37 -0700 Subject: [PATCH 048/627] fix Snow Leopard compatibility Checking for clang in Xcode bundle seems pointless, command line tools should be installed. Setting the path explicity to avoid fink/macports/homebrew prevents use of locally installed packages like clang and wxwidgets. Realistically using opencl means the minimum OSX version targetable is 10.6. Correct TARGET_SYSROOT check, add required -mmacosx-version-min to linker flags. also using wxwidgets gl component. --- CMakeLists.txt | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e4f14f5e..e8d484e68a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,12 +6,8 @@ cmake_minimum_required(VERSION 2.6) # Update compiler before calling project() if (APPLE) # Use clang compiler - set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang") - set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++") - if (NOT EXISTS "${CMAKE_CXX_COMPILER}") - set(CMAKE_C_COMPILER "clang") - set(CMAKE_CXX_COMPILER "clang++") - endif() + set(CMAKE_C_COMPILER "clang") + set(CMAKE_CXX_COMPILER "clang++") endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) @@ -126,10 +122,6 @@ if(UNIX AND NOT APPLE) endif() if(APPLE) - # Ignore MacPorts and Fink and any other locally installed packages that - # might prevent building a distributable binary. - set(CMAKE_SYSTEM_PREFIX_PATH /usr) - set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin) # Some of our code contains Objective C constructs. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") @@ -144,7 +136,7 @@ if(APPLE) # This is inserted into the Info.plist as well. # Note that the SDK determines the maximum version of which optional # features can be used, not the minimum required version to run. - set(OSX_MIN_VERSION "10.5.4") + set(OSX_MIN_VERSION "10.6") set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.6.sdk") set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk") @@ -153,9 +145,9 @@ if(APPLE) elseif(EXISTS "${SYSROOT_LEGACY_PATH}/") set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH}) endif() - if(${TARGET_SYSROOT}) + if(TARGET_SYSROOT) set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION} -Wl,-syslibroot,${TARGET_SYSROOT}") endif() # Do not warn about frameworks that are not available on all architectures. # This avoids a warning when linking with QuickTime. @@ -488,7 +480,7 @@ endif() option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) if(NOT DISABLE_WX) include(FindwxWidgets OPTIONAL) - FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) + FIND_PACKAGE(wxWidgets COMPONENTS core aui adv gl) if(wxWidgets_FOUND) EXECUTE_PROCESS( From 5133ac551b60ae0bfa635e2b2abc161efb823479 Mon Sep 17 00:00:00 2001 From: rog Date: Tue, 23 Oct 2012 01:52:50 -0400 Subject: [PATCH 049/627] merge relevant changes from bc61dbdf58a8 in otu0001-desync-fix clone --- Source/Core/Core/Core.vcxproj | 6 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 3 +- Source/Core/Core/Src/HW/Wiimote.cpp | 6 +- .../Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 65 +++++++++++++++++++ .../Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 6 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 1 + .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 1 + Source/Core/VideoCommon/VideoCommon.vcxproj | 8 ++- 8 files changed, 87 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e03d40e43a..0c2b4018a4 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -385,7 +385,11 @@ - + + false + false + false + Create Create diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 03b1d3b75b..bc50269037 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -193,7 +193,8 @@ bool CUCode_AXWii::AXTask(u32& _uMail) case 0x0004: // PBs are here now m_addressPBs = HLEMemory_Read_U32(uAddress); - soundStream->GetMixer()->SetHLEReady(true); + if (soundStream) + soundStream->GetMixer()->SetHLEReady(true); // soundStream->Update(); uAddress += 4; break; diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index 30ab7af141..0928deffb1 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -136,9 +136,9 @@ void DoState(unsigned char **ptr, int mode) { // TODO: - //PointerWrap p(ptr, mode); - //for (unsigned int i=0; i<4; ++i) - // ((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p); + PointerWrap p(ptr, mode); + for (unsigned int i=0; i<4; ++i) + ((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p); } // ___________________________________________________________________________ diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index e7036c8fcb..5a994d859e 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -601,6 +601,71 @@ void Wiimote::DoState(PointerWrap& p) // Reset(); // should cause a status report to be sent, then wii should re-setup wiimote //} //p.Do(m_reporting_channel); + + //TODO: save to minimize + p.Do(m_extension->active_extension); + p.Do(m_extension->switch_extension); + + p.Do(m_accel); + p.Do(m_index); + p.Do(ir_sin); + p.Do(ir_cos); + p.Do(m_rumble_on); + p.Do(m_speaker_mute); + p.Do(m_motion_plus_present); + p.Do(m_motion_plus_active); + p.Do(m_reporting_auto); + p.Do(m_reporting_mode); + p.Do(m_reporting_channel); + p.Do(m_shake_step); + p.Do(m_sensor_bar_on_top); + p.Do(m_status); + p.Do(m_adpcm_state); + p.Do(m_ext_key); + p.Do(m_eeprom); + p.Do(m_reg_motion_plus); + p.Do(m_reg_ir); + p.Do(m_reg_ext); + p.Do(m_reg_speaker); + + //Do 'm_read_requests' queue + { + u32 size; + if (p.mode == PointerWrap::MODE_READ) + { + //clear + while (m_read_requests.size()) + m_read_requests.pop(); + + p.Do(size); + while (size--) + { + ReadRequest tmp; + p.Do(tmp.address); + p.Do(tmp.position); + p.Do(tmp.size); + tmp.data = new u8[tmp.size]; + p.DoArray(tmp.data, tmp.size); + m_read_requests.push(tmp); + } + } + else + { + std::queue tmp_queue(m_read_requests); + size = m_read_requests.size(); + p.Do(size); + while (!tmp_queue.empty()) + { + ReadRequest tmp = tmp_queue.front(); + p.Do(tmp.address); + p.Do(tmp.position); + p.Do(tmp.size); + p.DoArray(tmp.data, tmp.size); + tmp_queue.pop(); + } + } + } + p.DoMarker("Wiimote"); } } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index c124bb4448..4eb4a3e554 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -62,7 +62,11 @@ public: virtual ~IWII_IPC_HLE_Device() { } - virtual void DoState(PointerWrap& p) { DoStateShared(p); } + virtual void DoState(PointerWrap& p) + { + DoStateShared(p); + p.Do(m_Active); + } void DoStateShared(PointerWrap& p); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index d53d1ebd2a..0b6de9b4f6 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -112,6 +112,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) std::deque m_EventQueue; */ + p.Do(m_ControllerBD); p.Do(m_CtrlSetup); p.Do(m_ACLSetup); p.Do(m_HCIEndpoint); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 8445eeffdc..e59e1b3208 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -102,6 +102,7 @@ void CWII_IPC_HLE_WiiMote::DoState(PointerWrap &p) p.Do(uclass); p.Do(features); p.Do(lmp_version); + p.Do(lmp_subversion); p.Do(m_LinkKey); p.Do(m_Name); diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 0869f33ff4..bf9122e6b5 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -111,7 +111,8 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - + false + true @@ -129,7 +130,7 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - true + false true @@ -141,7 +142,8 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - + false + true true From a1186d84df0559d6d367d5d19331324a4858765c Mon Sep 17 00:00:00 2001 From: rog Date: Tue, 23 Oct 2012 02:31:16 -0400 Subject: [PATCH 050/627] update state version --- Source/Core/Core/Src/State.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 3f3e367349..cf01b78d5e 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 8; +static const int STATE_VERSION = 9; struct StateHeader { From 4358f8384f5b32cc70337e5506354c84391b2388 Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 24 Oct 2012 15:16:41 -0400 Subject: [PATCH 051/627] readd memory card detection for movie code. I deleted this before, intending to move it elsewhere, but never did --- Source/Core/Core/Src/Movie.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 4c142a5820..a7129055f4 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -387,6 +387,7 @@ bool BeginRecordingInput(int controllers) videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -628,6 +629,8 @@ void ReadHeader() bFastDiscSpeed = tmpHeader.bFastDiscSpeed; iCPUCore = tmpHeader.CPUCore; bBlankMC = tmpHeader.bBlankMC; + bMemcard = tmpHeader.bMemcard; + } else { @@ -639,6 +642,7 @@ void ReadHeader() bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + g_bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; } From 7006cd12170c3b3dc3c6179a66945b5183995156 Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 24 Oct 2012 15:32:02 -0400 Subject: [PATCH 052/627] i'm still not using a branch to fix the name of a variable --- Source/Core/Core/Src/Movie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index a7129055f4..13f5ed26e8 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -642,7 +642,7 @@ void ReadHeader() bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); - g_bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; } From 7ee455ce3b0a23888354a448f1bed872aa66a553 Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 24 Oct 2012 16:35:52 -0400 Subject: [PATCH 053/627] When beginning recording, check settings in Init() instead of just in BeginRecordingInput(), since it's called after bootmanager.cpp reads the game's config. --- Source/Core/Core/Src/Movie.cpp | 37 +++++++++++++++++----------------- Source/Core/Core/Src/Movie.h | 1 + 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 13f5ed26e8..11ec6a899d 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -136,6 +136,10 @@ void Init() { ReadHeader(); } + if (IsRecordingInput()) + { + GetSettings(); + } g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); if (!tmpHeader.bFromSaveState || !IsPlayingInput()) @@ -378,16 +382,7 @@ bool BeginRecordingInput(int controllers) g_bRecordingFromSaveState = true; } g_playMode = MODE_RECORDING; - - bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; - bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; - bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; - bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; - bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; - iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; - bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); - bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + GetSettings(); delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -635,14 +630,7 @@ void ReadHeader() else { bSaveConfig = false; - bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; - bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; - bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; - bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; - bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; - videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; - bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); - bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + GetSettings(); } @@ -1150,4 +1138,17 @@ void SetGraphicsConfig() g_Config.bUseXFB = tmpHeader.bUseXFB; g_Config.bUseRealXFB = tmpHeader.bUseRealXFB; } + +void GetSettings() +{ + bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; + bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; + bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; + bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; + bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; + videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; + bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; +} }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 94e63a9e2b..46bc3ab124 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -151,6 +151,7 @@ int GetCPUMode(); bool IsBlankMemcard(); bool IsUsingMemcard(); void SetGraphicsConfig(); +void GetSettings(); bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); From 76a6917fdf244854bba1e3c989fc1b306173d06f Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 24 Oct 2012 19:37:51 -0400 Subject: [PATCH 054/627] Check game ID against what is recorded to the .dtm --- Source/Core/Core/Src/BootManager.cpp | 1 - Source/Core/Core/Src/Movie.cpp | 20 +++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 187baf415c..afe6a83dad 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -118,7 +118,6 @@ bool BootCore(const std::string& _rFilename) if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) { - Movie::Init(); StartUp.bCPUThread = Movie::IsDualCore(); StartUp.bSkipIdle = Movie::IsSkipIdle(); StartUp.bDSPHLE = Movie::IsDSPHLE(); diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 11ec6a899d..53b5e2a088 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -135,6 +135,11 @@ void Init() if (IsPlayingInput()) { ReadHeader(); + if ((strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6))) + { + PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); + EndPlayInput(false); + } } if (IsRecordingInput()) { @@ -683,19 +688,6 @@ bool PlayInput(const char *filename) Movie::LoadInput(filename); } - /* TODO: Put this verification somewhere we have the gameID of the played game - // TODO: Replace with Unique ID - if(tmpHeader.uniqueID != 0) { - PanicAlert("Recording Unique ID Verification Failed"); - goto cleanup; - } - - if(strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6)) { - PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", header.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); - goto cleanup; - } - */ - ReadHeader(); g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; @@ -1094,6 +1086,7 @@ void SaveRecording(const char *filename) header.bMemcard = bMemcard; header.bBlankMC = bBlankMC; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); + // TODO: prompt the user for author name. It's currently always blank, unless the user manually edits the .dtm file. strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); // TODO @@ -1141,6 +1134,7 @@ void SetGraphicsConfig() void GetSettings() { + bSaveConfig = true; bSkipIdle = SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle; bDualCore = SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread; bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive; From 8dfb12da3e130eccb348c030c247dac2de27a58d Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 24 Oct 2012 23:21:34 -0400 Subject: [PATCH 055/627] stuff --- Source/Core/Core/Src/Movie.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 53b5e2a088..ba4201f8f3 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -105,6 +105,13 @@ void FrameUpdate() g_totalFrames = g_currentFrame; g_totalLagCount = g_currentLagCount; } + if (IsPlayingInput() && IsConfigSaved()) + { + if (IsConfigSaved()) + { + SetGraphicsConfig(); + } + } if (g_bFrameStep) { @@ -149,6 +156,7 @@ void Init() memset(&g_padState, 0, sizeof(g_padState)); if (!tmpHeader.bFromSaveState || !IsPlayingInput()) Core::SetStateFileName(""); + for (int i = 0; i < 8; ++i) g_InputDisplay[i].clear(); @@ -388,6 +396,7 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; GetSettings(); + bSaveConfig = true; delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -475,15 +484,6 @@ void SetInputDisplayString(ControllerState padState, int controllerID) if(g_padState.DPadRight) g_InputDisplay[controllerID].append(" RIGHT"); - //if(g_padState.L) - //{ - // g_InputDisplay[controllerID].append(" L"); - //} - //if(g_padState.R) - //{ - // g_InputDisplay[controllerID].append(" R"); - //} - Analog1DToString(g_padState.TriggerL, " L", inp); g_InputDisplay[controllerID].append(inp); @@ -550,8 +550,6 @@ void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelD g_InputDisplay[controllerID].append("\n"); } - - void RecordInput(SPADStatus *PadStatus, int controllerID) { if(!IsRecordingInput() || !IsUsingPad(controllerID)) @@ -872,10 +870,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) return; - if (IsConfigSaved()) - { - SetGraphicsConfig(); - } if (g_currentFrame == 1) { if (tmpHeader.bMemcard) From 0bc202128482fb26b84e18cde213156cd40d297a Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 25 Oct 2012 02:44:30 -0400 Subject: [PATCH 056/627] save if a wii game's save data exists when starting recording. Probably not the best way to do this, and could result in a false negative if banner.bin exists, but the actual save file doesn't, but this should work well enough. --- Source/Core/Core/Src/BootManager.cpp | 2 +- .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 11 +++++++ Source/Core/Core/Src/Movie.cpp | 31 +++++++++++-------- Source/Core/Core/Src/Movie.h | 7 +++-- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index afe6a83dad..e0fac1da87 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -123,7 +123,7 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bProgressive = Movie::IsProgressive(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); - if (Movie::IsUsingMemcard() && Movie::IsBlankMemcard()) + if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii) { if (File::Exists("Movie.raw")) File::Delete("Movie.raw"); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index f65d8c6b8b..038eb6e9a9 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,7 +52,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; - if (Movie::IsUsingMemcard() && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsBlankMemcard()) + if (Movie::IsUsingMemcard() && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) m_strFilename = "Movie.raw"; // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ae389d7b69..246a1bd888 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -57,6 +57,7 @@ #include "NandPaths.h" #include "CommonPaths.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "../Movie.h" std::string CWII_IPC_HLE_Device_es::m_ContentFile; @@ -891,6 +892,16 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) File::CreateFullPath(tmdPath); File::CreateFullPath(Common::GetTitleDataPath(tmdTitleID)); + + Movie::g_titleID = tmdTitleID; + if (Movie::IsRecordingInput()) + { + // TODO: Check for the actual save data + if (File::Exists((Common::GetTitleDataPath(tmdTitleID) + "banner.bin").c_str())) + Movie::g_bClearSave = false; + else + Movie::g_bClearSave = true; + } if(!File::Exists(tmdPath)) { File::IOFile _pTMDFile(tmdPath, "wb"); diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index ba4201f8f3..10909e358b 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -35,6 +35,7 @@ #include "HW/EXI_Device.h" #include "HW/EXI_Channel.h" #include "HW/DVDInterface.h" +#include "../../Common/Src/NandPaths.h" // large enough for just over 24 hours of single-player recording #define MAX_DTM_LENGTH (40 * 1024 * 1024) @@ -60,19 +61,14 @@ u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started -bool bSaveConfig = false; -bool bSkipIdle = false; -bool bDualCore = false; -bool bProgressive = false; -bool bDSPHLE = false; -bool bFastDiscSpeed = false; +bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false; +bool bMemcard, g_bClearSave = false; std::string videoBackend = "opengl"; int iCPUCore = 1; -bool bMemcard; -bool bBlankMC = false; bool g_bDiscChange = false; std::string g_discChange = ""; std::string author = ""; +u64 g_titleID = 0; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -324,9 +320,9 @@ int GetCPUMode() return iCPUCore; } -bool IsBlankMemcard() +bool IsStartingFromClearSave() { - return bBlankMC; + return g_bClearSave; } bool IsUsingMemcard() @@ -393,6 +389,14 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; + + // This is only done here if starting from save state because otherwise we won't have the titleid. + // If not starting from save state, it's set in WII_IPC_HLE_Device_es.cpp. There's probably a way to get this in Movie::Init, but i can't find one. + // TODO: find a way to GetTitleDataPath() from Movie::Init() + if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str())) + Movie::g_bClearSave = false; + else + Movie::g_bClearSave = true; } g_playMode = MODE_RECORDING; GetSettings(); @@ -626,7 +630,7 @@ void ReadHeader() bDSPHLE = tmpHeader.bDSPHLE; bFastDiscSpeed = tmpHeader.bFastDiscSpeed; iCPUCore = tmpHeader.CPUCore; - bBlankMC = tmpHeader.bBlankMC; + g_bClearSave = tmpHeader.bClearSave; bMemcard = tmpHeader.bMemcard; } @@ -1078,7 +1082,7 @@ void SaveRecording(const char *filename) header.bUseXFB = g_ActiveConfig.bUseXFB; header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; header.bMemcard = bMemcard; - header.bBlankMC = bBlankMC; + header.bClearSave = g_bClearSave; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); // TODO: prompt the user for author name. It's currently always blank, unless the user manually edits the .dtm file. strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); @@ -1136,7 +1140,8 @@ void GetSettings() bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend; iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; - bBlankMC = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); + if (!Core::g_CoreStartupParameter.bWii) + g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; } }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 46bc3ab124..0152a66879 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -61,8 +61,9 @@ static_assert(sizeof(ControllerState) == 8, "ControllerState should be 8 bytes") #pragma pack(pop) // Global declarations -extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange; +extern bool g_bFrameStep, g_bPolled, g_bReadOnly, g_bDiscChange, g_bClearSave; extern PlayMode g_playMode; +extern u64 g_titleID; extern u32 g_framesToSkip, g_frameSkipCounter; @@ -117,7 +118,7 @@ struct DTMHeader { bool bUseXFB; bool bUseRealXFB; bool bMemcard; - bool bBlankMC; // Create a new memory card when playing back a movie if true + bool bClearSave; // Create a new memory card when playing back a movie if true u8 reserved[16]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 reserved2[47]; // Make heading 256 bytes, just because we can @@ -148,7 +149,7 @@ bool IsSkipIdle(); bool IsDSPHLE(); bool IsFastDiscSpeed(); int GetCPUMode(); -bool IsBlankMemcard(); +bool IsStartingFromClearSave(); bool IsUsingMemcard(); void SetGraphicsConfig(); void GetSettings(); From 8921fe0d09b7b941fcfe4a869e378919bd2192ab Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 26 Oct 2012 12:06:32 -0400 Subject: [PATCH 057/627] move wii saves to a backup if playing a movie that starts with no save --- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 41 ++++++++++++++++++- Source/Core/Core/Src/Movie.cpp | 25 ++++++----- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 246a1bd888..ee0d1b0a22 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -59,6 +59,9 @@ #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "../Movie.h" +#ifdef _WIN32 +#include +#endif std::string CWII_IPC_HLE_Device_es::m_ContentFile; @@ -892,16 +895,50 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) File::CreateFullPath(tmdPath); File::CreateFullPath(Common::GetTitleDataPath(tmdTitleID)); - + Movie::g_titleID = tmdTitleID; + std::string savePath = Common::GetTitleDataPath(tmdTitleID); if (Movie::IsRecordingInput()) { // TODO: Check for the actual save data - if (File::Exists((Common::GetTitleDataPath(tmdTitleID) + "banner.bin").c_str())) + if (File::Exists((savePath + "banner.bin").c_str())) Movie::g_bClearSave = false; else Movie::g_bClearSave = true; } + if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) + { + if (File::Exists((savePath + "banner.bin").c_str())) + { + if (File::Exists((savePath + "../backup/").c_str())) + { + // Dolphin must have crashed while playing back a movie previously, so we'll keep the backup, and just delete the current save + File::DeleteDirRecursively(savePath.c_str()); + } + else + { + #ifdef _WIN32 + MoveFile(savePath.c_str(), (savePath + "../backup/").c_str()); + #else + File::CopyDir(savePath.c_str(),(savePath + "../backup/").c_str()); + File::DeleteDirRecursively(savePath.c_str()); + #endif + } + } + } + else if (File::Exists((savePath + "../backup/").c_str())) + { + // Dolphin must have crashed while playing back a movie previously. Since we're not playing a movie now, we'll delete the save, and use the backup + if (File::Exists((savePath + "banner.bin").c_str())) + File::DeleteDirRecursively(savePath); + #ifdef _WIN32 + MoveFile((savePath + "../backup/").c_str(), savePath.c_str()); + #else + File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str()); + File::DeleteDirRecursively((savePath + "../backup/").c_str()); + #endif + } + if(!File::Exists(tmdPath)) { File::IOFile _pTMDFile(tmdPath, "wb"); diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 10909e358b..d6e9780ba3 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -103,10 +103,7 @@ void FrameUpdate() } if (IsPlayingInput() && IsConfigSaved()) { - if (IsConfigSaved()) - { - SetGraphicsConfig(); - } + SetGraphicsConfig(); } if (g_bFrameStep) @@ -390,8 +387,7 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; - // This is only done here if starting from save state because otherwise we won't have the titleid. - // If not starting from save state, it's set in WII_IPC_HLE_Device_es.cpp. There's probably a way to get this in Movie::Init, but i can't find one. + // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. // TODO: find a way to GetTitleDataPath() from Movie::Init() if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str())) Movie::g_bClearSave = false; @@ -400,7 +396,6 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; GetSettings(); - bSaveConfig = true; delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -636,8 +631,8 @@ void ReadHeader() } else { - bSaveConfig = false; GetSettings(); + bSaveConfig = false; } @@ -893,8 +888,7 @@ void PlayController(SPADStatus *PadStatus, int controllerID) return; } - // dtm files don't save the mic button or error bit. not sure if they're actually - // used, but better safe than sorry + // dtm files don't save the mic button or error bit. not sure if they're actually used, but better safe than sorry signed char e = PadStatus->err; memset(PadStatus, 0, sizeof(SPADStatus)); PadStatus->err = e; @@ -1028,6 +1022,17 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, void EndPlayInput(bool cont) { + if (IsPlayingInput() && IsConfigSaved() && IsStartingFromClearSave() && Core::g_CoreStartupParameter.bWii) + { + std::string savePath = Common::GetTitleDataPath(g_titleID); + File::DeleteDirRecursively(savePath.c_str()); + #ifdef _WIN32 + MoveFile((savePath + "../backup/").c_str(), savePath.c_str()); + #else + File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str()); + File::DeleteDirRecursively((savePath + "../backup/").c_str()); + #endif + } if (cont) { g_playMode = MODE_RECORDING; From 95d55ed1c7241ec6e78dd2a2a54dc3452aaedee8 Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 26 Oct 2012 20:04:06 -0400 Subject: [PATCH 058/627] fixes for backing up wii saves when playing a movie --- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 4 ++-- Source/Core/Core/Src/Movie.cpp | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ee0d1b0a22..4de2b0feb7 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -912,7 +912,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) { if (File::Exists((savePath + "../backup/").c_str())) { - // Dolphin must have crashed while playing back a movie previously, so we'll keep the backup, and just delete the current save + // The last run of this game must have been to play back a movie, so their save is already backed up. File::DeleteDirRecursively(savePath.c_str()); } else @@ -928,7 +928,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) } else if (File::Exists((savePath + "../backup/").c_str())) { - // Dolphin must have crashed while playing back a movie previously. Since we're not playing a movie now, we'll delete the save, and use the backup + // Delete the save made by a previous movie, and copy back the user's save. if (File::Exists((savePath + "banner.bin").c_str())) File::DeleteDirRecursively(savePath); #ifdef _WIN32 diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index d6e9780ba3..f98254e9a8 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -1022,17 +1022,6 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, void EndPlayInput(bool cont) { - if (IsPlayingInput() && IsConfigSaved() && IsStartingFromClearSave() && Core::g_CoreStartupParameter.bWii) - { - std::string savePath = Common::GetTitleDataPath(g_titleID); - File::DeleteDirRecursively(savePath.c_str()); - #ifdef _WIN32 - MoveFile((savePath + "../backup/").c_str(), savePath.c_str()); - #else - File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str()); - File::DeleteDirRecursively((savePath + "../backup/").c_str()); - #endif - } if (cont) { g_playMode = MODE_RECORDING; From 8c1d104ca36f1dba5e0b347940fe5ebc465e7758 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 27 Oct 2012 18:10:31 -0500 Subject: [PATCH 059/627] Change EFB copy location rectangles over to a Vertex array --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 1a9f02c37e..fa3c3ed5c5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -543,11 +543,13 @@ void Renderer::DrawDebugInfo() // Set Line Size glLineWidth(3.0f); - glBegin(GL_LINES); + GLfloat *RectPoints = new GLfloat[stats.efb_regions.size() * 16]; + GLfloat *Colours = new GLfloat[stats.efb_regions.size() * 3]; // Draw EFB copy regions rectangles + int a = 0; for (std::vector::const_iterator it = stats.efb_regions.begin(); - it != stats.efb_regions.end(); ++it) + it != stats.efb_regions.end(); ++it, ++a) { GLfloat halfWidth = EFB_WIDTH / 2.0f; GLfloat halfHeight = EFB_HEIGHT / 2.0f; @@ -556,22 +558,40 @@ void Renderer::DrawDebugInfo() GLfloat x2 = (GLfloat) -1.0f + ((GLfloat)it->right / halfWidth); GLfloat y2 = (GLfloat) 1.0f - ((GLfloat)it->bottom / halfHeight); - // Draw shadow of rect - glColor3f(0.0f, 0.0f, 0.0f); - glVertex2f(x, y - 0.01); glVertex2f(x2, y - 0.01); - glVertex2f(x, y2 - 0.01); glVertex2f(x2, y2 - 0.01); - glVertex2f(x + 0.005, y); glVertex2f(x + 0.005, y2); - glVertex2f(x2 + 0.005, y); glVertex2f(x2 + 0.005, y2); + Colours[a * 3] = 0.0f; + Colours[a * 3 + 1] = 1.0f; + Colours[a * 3 + 2] = 1.0f; - // Draw rect - glColor3f(0.0f, 1.0f, 1.0f); - glVertex2f(x, y); glVertex2f(x2, y); - glVertex2f(x, y2); glVertex2f(x2, y2); - glVertex2f(x, y); glVertex2f(x, y2); - glVertex2f(x2, y); glVertex2f(x2, y2); + RectPoints[a * 16] = x; + RectPoints[a * 16 + 1] = y; + + RectPoints[a * 16 + 2] = x2; + RectPoints[a * 16 + 3] = y; + + RectPoints[a * 16 + 4] = x; + RectPoints[a * 16 + 5] = y2; + + RectPoints[a * 16 + 6] = x2; + RectPoints[a * 16 + 7] = y2; + + RectPoints[a * 16 + 8] = x; + RectPoints[a * 16 + 9] = y; + + RectPoints[a * 16 + 10] = x; + RectPoints[a * 16 + 11] = y2; + + RectPoints[a * 16 + 12] = x2; + RectPoints[a * 16 + 13] = y; + + RectPoints[a * 16 + 14] = x2; + RectPoints[a * 16 + 15] = y2; } - - glEnd(); + + glColorPointer (3, GL_FLOAT, 0, Colours); + glVertexPointer(2, GL_FLOAT, 0, RectPoints); + glDrawArrays(GL_LINE_STRIP, 0, stats.efb_regions.size() * 8); + delete[] RectPoints; + delete[] Colours; // Restore Line Size glLineWidth(lSize); From dfb3c44d1a9b641f71ac4a93cd871b8d69dde542 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 27 Oct 2012 18:27:16 -0500 Subject: [PATCH 060/627] Remove glMatrixMode and glLoadIdentity calls in Render.cpp which do absolutely nothing. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index fa3c3ed5c5..12f38f89f3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -458,11 +458,6 @@ Renderer::Renderer() glViewport(0, 0, GetTargetWidth(), GetTargetHeight()); // Reset The Current Viewport - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glShadeModel(GL_SMOOTH); glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearDepth(1.0f); @@ -479,11 +474,6 @@ Renderer::Renderer() glBlendColorEXT(0, 0, 0, 0.5f); glClearDepth(1.0f); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - // legacy multitexturing: select texture channel only. glActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0); From fb92c338af83a56edaabaea13168696e3cf1c7c7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 27 Oct 2012 22:50:06 -0500 Subject: [PATCH 061/627] Bit of cleanup and fixing of one issue that was noticeable in SMS with Mario's shadow. --- .../Src/FramebufferManager.cpp | 24 +++++++-------- .../Src/NativeVertexFormat.cpp | 4 --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 14 +++++---- .../Plugin_VideoOGL/Src/TextureCache.cpp | 21 +++++++------- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 29 ++++++++++--------- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 79189d4309..76e4b8156b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -306,10 +306,10 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); GLfloat vtx1[] = { - drawrc.left, drawrc.bottom, 1, - drawrc.left, drawrc.top, 1, - drawrc.right, drawrc.top, 1, - drawrc.right, drawrc.bottom, 1 + drawrc.left, drawrc.bottom, + drawrc.left, drawrc.top, + drawrc.right, drawrc.top, + drawrc.right, drawrc.bottom, }; GLfloat tex1[] = { // For TEXTURE0 sourcerc.left, sourcerc.bottom, @@ -319,17 +319,17 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, }; glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); - // Is this correct? - glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); - glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); - glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); - glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); - - glVertexPointer(3, GL_FLOAT, 0, vtx1); + glMultiTexCoord2f(GL_TEXTURE1, 0, 0); + glMultiTexCoord2f(GL_TEXTURE1, 0, 1); + glMultiTexCoord2f(GL_TEXTURE1, 1, 1); + glMultiTexCoord2f(GL_TEXTURE1, 1, 0); + + glVertexPointer(2, GL_FLOAT, 0, vtx1); + glTexCoordPointer(2, GL_FLOAT, 0, tex1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index ae20649433..0cbf878799 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -274,10 +274,6 @@ void GLVertexFormat::EnableComponents(u32 components) if ((components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) { glClientActiveTexture(GL_TEXTURE0 + i); - if (components & (VB_HAS_UV0 << i)) - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - else - glDisableClientState(GL_TEXTURE_COORD_ARRAY); } } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 12f38f89f3..00f971a31b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -474,6 +474,7 @@ Renderer::Renderer() glBlendColorEXT(0, 0, 0, 0.5f); glClearDepth(1.0f); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); // legacy multitexturing: select texture channel only. glActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0); @@ -1154,18 +1155,19 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons }; glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); if (applyShader) { - glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); - glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); - glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); - glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); + glMultiTexCoord2f(GL_TEXTURE1, 0, 0); + glMultiTexCoord2f(GL_TEXTURE1, 0, 1); + glMultiTexCoord2f(GL_TEXTURE1, 1, 1); + glMultiTexCoord2f(GL_TEXTURE1, 1, 0); } - + glVertexPointer(3, GL_FLOAT, 0, vtx1); + glTexCoordPointer(2, GL_FLOAT, 0, tex1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + if(applyShader) PixelShaderCache::DisableShader(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 052727e1b0..797ba39c10 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -306,23 +306,22 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); GL_REPORT_ERRORD(); - GLfloat tex1[] = { - (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, - (GLfloat)targetSource.left, (GLfloat)targetSource.top, - (GLfloat)targetSource.right, (GLfloat)targetSource.top, - (GLfloat)targetSource.right, (GLfloat)targetSource.bottom + (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, + (GLfloat)targetSource.left, (GLfloat)targetSource.top, + (GLfloat)targetSource.right, (GLfloat)targetSource.top, + (GLfloat)targetSource.right, (GLfloat)targetSource.bottom }; GLfloat vtx1[] = { - -1, 1, 1, - -1, -1, 1, - 1, -1, 1, - 1, 1, 1 + -1.f, 1.f, + -1.f, -1.f, + 1.f, -1.f, + 1.f, 1.f }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(3, GL_FLOAT, 0, vtx1); + glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 64ac6ba888..306fa5e298 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -222,13 +222,14 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar (float)sourceRc.right, (float)sourceRc.top }; GLfloat vtx1[] = { - -1, -1, 1, - -1, 1, 1, - 1, 1, 1, - 1, -1, 1 + -1.f, -1.f, + -1.f, 1.f, + 1.f, 1.f, + 1.f, -1.f }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(3, GL_FLOAT, 0, vtx1); + glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); GL_REPORT_ERRORD(); @@ -389,20 +390,22 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur GLfloat tex1[] = { (float)srcFmtWidth, (float)srcHeight, - (float)srcFmtWidth, 0, - 0, 0, - 0, (float)srcHeight + (float)srcFmtWidth, 0.f, + 0.f, 0.f, + 0.f, (float)srcHeight }; GLfloat vtx1[] = { - 1, -1, 1, - 1, 1, 1, - -1, 1, 1, - -1, -1, 1 + 1.f, -1.f, + 1.f, 1.f, + -1.f, 1.f, + -1.f, -1.f }; + glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(3, GL_FLOAT, 0, vtx1); + glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + GL_REPORT_ERRORD(); // reset state From 303b0f6b6d3788b3ed8fd8e40e7daa4642d73ad1 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 29 Oct 2012 14:03:28 +1100 Subject: [PATCH 062/627] Test the audio loop with aligned addresses. Fixes the high pitched squeal in Muramasa. --- Source/Core/Core/Src/DSP/DSPAccelerator.cpp | 2 +- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index 525750fc7d..dcb79b7ac5 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -168,7 +168,7 @@ u16 dsp_read_accelerator() if (Address >= EndAddress) { // Set address back to start address. - if (Address == EndAddress) + if ((Address & ~0x1f) == (EndAddress & ~0x1f)) Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; DSPCore_SetException(EXP_ACCOV); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 9a058afb83..bf5e4d9b6b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -236,7 +236,7 @@ inline void MixAddVoice(ParamBlockType &pb, { if (pb.audio_addr.looping == 1) { - if (samplePos == sampleEnd || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) + if ((samplePos & ~0x1f) == (sampleEnd & ~0x1f) || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) samplePos = loopPos; if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) { From 5dd49edaecd9382b5e640128223604d62889861f Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Tue, 30 Oct 2012 02:45:42 +0000 Subject: [PATCH 063/627] Badaboom. Add in Memory include to CDUtils.cpp --- Source/Core/Common/Src/CDUtils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp index 4496302e46..42aa9bfe34 100644 --- a/Source/Core/Common/Src/CDUtils.cpp +++ b/Source/Core/Common/Src/CDUtils.cpp @@ -3,6 +3,7 @@ #include "CDUtils.h" #include "Common.h" +#include // for std::unique_ptr #ifdef _WIN32 #include #elif __APPLE__ From d032c40a58b84b01a98dd34a86bbff2e02dc27f2 Mon Sep 17 00:00:00 2001 From: sulokuTDCmago Date: Thu, 18 Oct 2012 00:01:45 -0700 Subject: [PATCH 064/627] - Added a new wilcard for importing savegames, which basically shows all saves (gci, gcs and sav). This is set as default (I really got frustrated of having to change the type every single time when making tests for GCMM, and I think it makes more sense at user level to just show all saves regardless the format) - In icon retrieving I removed the "format check" as it shouldn't really matter to have mixed icon formats. Also removed the "Time splitters hack" as there's no reason for it since we are only checking the last 3 bits and I'm pretty sure having bits 1 and 2 set is the same as having them unset. - Icon retrieving uses AnimSpeed as stop signal (every icon must have an speed set, the first speed that is 0 means there are no more icons) - Also, in icon retrieving I added support for "blank frames"(Luigi's Mansion and Pikmin that I know of). With this the base for icon animation is complete. - Fixed PSOIII savegame patch which was wrong before. Signed-off-by: LPFaint99 --- Source/Core/Common/Src/ColorUtil.cpp | 2 +- Source/Core/Core/Src/HW/GCMemcard.cpp | 80 +++++++++++++++----- Source/Core/Core/Src/HW/GCMemcard.h | 6 +- Source/Core/DolphinWX/Src/MemcardManager.cpp | 1 + 4 files changed, 68 insertions(+), 21 deletions(-) diff --git a/Source/Core/Common/Src/ColorUtil.cpp b/Source/Core/Common/Src/ColorUtil.cpp index 52ffec0803..5e5143549a 100644 --- a/Source/Core/Common/Src/ColorUtil.cpp +++ b/Source/Core/Common/Src/ColorUtil.cpp @@ -31,7 +31,7 @@ const int lut3to8[] = { 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF }; u32 Decode5A3(u16 val) { - const u32 bg_color = 0x00000000; + const u32 bg_color = 0xFFFFFFFF; int r, g, b, a; diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 381f942925..9b72a0313c 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -473,11 +473,20 @@ std::string GCMemcard::DEntry_IconFmt(u8 index) const return format; } -u16 GCMemcard::DEntry_AnimSpeed(u8 index) const +std::string GCMemcard::DEntry_AnimSpeed(u8 index) const { if (!m_valid || index > DIRLEN) - return 0xFF; - return BE16(CurrentDir->Dir[index].AnimSpeed); + return ""; + int x = CurrentDir->Dir[index].AnimSpeed[0]; + std::string speed; + for(int i = 0; i < 16; i++) + { + if (i == 8) x = CurrentDir->Dir[index].AnimSpeed[1]; + speed.push_back((x & 0x80) ? '1' : '0'); + x = x << 1; + } + speed.push_back(0); + return speed; } std::string GCMemcard::DEntry_Permissions(u8 index) const @@ -1086,15 +1095,18 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const // To ensure only one type of icon is used // Sonic Heroes it the only game I have seen that tries to use a CI8 and RGB5A3 icon - int fmtCheck = 0; + //int fmtCheck = 0; int formats = BE16(CurrentDir->Dir[index].IconFmt); int fdelays = BE16(CurrentDir->Dir[index].AnimSpeed); int flags = CurrentDir->Dir[index].BIFlags; - // Timesplitters 2 is the only game that I see this in + // Timesplitters 2 and 3 is the only game that I see this in // May be a hack - if (flags == 0xFB) flags = ~flags; + //if (flags == 0xFB) flags = ~flags; + // Batten Kaitos has 0x65 as flag too. Everything but the first 3 bytes seems irrelevant. + // Something similar happens with Wario Ware Inc. AnimSpeed + int bnrFormat = (flags&3); u32 DataOffset = BE32(CurrentDir->Dir[index].ImageOffset); @@ -1110,7 +1122,6 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const switch (bnrFormat) { case 1: - case 3: animData += 96*32 + 2*256; // image+palette break; case 2: @@ -1122,40 +1133,48 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const u8* data[8]; int frames = 0; - for (int i = 0; i < 8; i++) { fmts[i] = (formats >> (2*i))&3; - delays[i] = ((fdelays >> (2*i))&3) << 2; + delays[i] = ((fdelays >> (2*i))&3); data[i] = animData; - if (!fmtCheck) fmtCheck = fmts[i]; - if (fmtCheck == fmts[i]) + if (!delays[i]) + { + //First icon_speed = 0 indicates there aren't any more icons + break; + } + //If speed is set there is an icon (it can be a "blank frame") + frames++; + if (fmts[i] != 0) { switch (fmts[i]) { case CI8SHARED: // CI8 with shared palette animData += 32*32; - frames++; break; case RGB5A3: // RGB5A3 animData += 32*32*2; - frames++; break; case CI8: // CI8 with own palette animData += 32*32 + 2*256; - frames++; break; } } } u16* sharedPal = (u16*)(animData); + int j = 0; for (int i = 0; i < 8; i++) { - if (fmtCheck == fmts[i]) + if (!delays[i]) + { + //First icon_speed = 0 indicates there aren't any more icons + break; + } + if (fmts[i] != 0) { switch (fmts[i]) { @@ -1165,6 +1184,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const break; case RGB5A3: // RGB5A3 decode5A3image(buffer, (u16*)(data[i]), 32, 32); + buffer += 32*32; break; case CI8: // CI8 with own palette u16 *paldata = (u16*)(data[i] + 32*32); @@ -1173,6 +1193,33 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8 *delays) const break; } } + else + { + //Speed is set but there's no actual icon + //This is used to reduce animation speed in Pikmin and Luigi's Mansion for example + //These "blank frames" show the next icon + for(j=i; j<8;++j) + { + if (fmts[j] != 0) + { + switch (fmts[j]) + { + case CI8SHARED: // CI8 with shared palette + decodeCI8image(buffer,data[j],sharedPal,32,32); + break; + case RGB5A3: // RGB5A3 + decode5A3image(buffer, (u16*)(data[j]), 32, 32); + buffer += 32*32; + break; + case CI8: // CI8 with own palette + u16 *paldata = (u16*)(data[j] + 32*32); + decodeCI8image(buffer, data[j], paldata, 32, 32); + buffer += 32*32; + break; + } + } + } + } } return frames; @@ -1269,7 +1316,6 @@ void GCMemcard::FormatInternal(GCMC_Header &GCP) calc_checksumsBE((u16*)p_bat_backup+2, 0xFFE, &p_bat_backup->Checksum, &p_bat_backup->Checksum_Inv); } - void GCMemcard::CARD_GetSerialNo(u32 *serial1,u32 *serial2) { u32 serial[8]; @@ -1349,7 +1395,7 @@ s32 GCMemcard::PSO_MakeSaveGameValid(DEntry& direntry, std::vector &Fi if (strcmp((char*)direntry.Filename,"PSO_SYSTEM")!=0) { // check for PSO3 system file - if (strcmp((char*)&FileBuffer[0].block[0x08],"PSO3_SYSTEM")==0) + if (strcmp((char*)direntry.Filename,"PSO3_SYSTEM")==0) { // PSO3 data block size adjustment pso3offset = 0x10; diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h index d2de93effb..557187b384 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.h +++ b/Source/Core/Core/Src/HW/GCMemcard.h @@ -116,8 +116,8 @@ private: // bits 0 and 1: image format // 00 no banner // 01 CI8 banner - // 01 RGB5A3 banner - // 11 ? maybe ==01? haven't seen it + // 10 RGB5A3 banner + // 11 ? maybe ==00? Time Splitters 2 and 3 have it and don't have banner // u8 Filename[DENTRY_STRLEN]; //0x08 0x20 filename u8 ModTime[4]; //0x28 0x04 Time of file's last modification in seconds since 12am, January 1st, 2000 @@ -213,7 +213,7 @@ public: u32 DEntry_ModTime(u8 index) const; u32 DEntry_ImageOffset(u8 index) const; std::string DEntry_IconFmt(u8 index) const; - u16 DEntry_AnimSpeed(u8 index) const; + std::string DEntry_AnimSpeed(u8 index) const; std::string DEntry_Permissions(u8 index) const; u8 DEntry_CopyCounter(u8 index) const; // get first block for file diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index bf47a23c53..76c77a0543 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -520,6 +520,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) ? wxString::FromAscii("") : wxString::From8BitData(DefaultIOPath.c_str()), wxEmptyString, wxEmptyString, + _("GameCube Savegame files(*.gci;*.gcs;*.sav)") + wxString(wxT("|*.gci;*.gcs;*.sav|")) + _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), From 7b43e1869f6372c91ba7d464092cd4c72cb4e3b4 Mon Sep 17 00:00:00 2001 From: parlane Date: Fri, 2 Nov 2012 02:43:16 +0000 Subject: [PATCH 065/627] Fix: Readme with correct website link. --- Readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.txt b/Readme.txt index 3659d729d0..541c04adf6 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,6 +1,6 @@ Dolphin-emu - The Gamecube / Wii Emulator ========================================== -Homesite: http://dolphin-emulator.com/ +Homesite: http://dolphin-emu.org/ Project Site: http://code.google.com/p/dolphin-emu Dolphin-emu is a emulator for Gamecube, Wii, Triforce that lets From d13163380dd2f142ca818e06b8cfc567f5a4f3cc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 2 Nov 2012 01:33:00 +0100 Subject: [PATCH 066/627] Bye mamario, you won't be missed --- Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 8215b68efc..86cd372f51 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1289,7 +1289,7 @@ void CFrame::OnHelp(wxCommandEvent& event) } break; case IDM_HELPWEBSITE: - WxUtils::Launch("http://www.dolphin-emulator.com/"); + WxUtils::Launch("http://dolphin-emu.org/"); break; case IDM_HELPGOOGLECODE: WxUtils::Launch("http://code.google.com/p/dolphin-emu/"); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 4a7d7d5dce..e95558fc65 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -1055,7 +1055,7 @@ void CGameListCtrl::OnWiki(wxCommandEvent& WXUNUSED (event)) if (!iso) return; - std::string wikiUrl = "http://api.dolphin-emulator.com/wiki.html?id=[GAME_ID]&name=[GAME_NAME]"; + std::string wikiUrl = "http://wiki.dolphin-emu.org/dolphin-redirect.php?gameid=[GAME_ID]"; wikiUrl = ReplaceAll(wikiUrl, "[GAME_ID]", UriEncode(iso->GetUniqueID())); if (UriEncode(iso->GetName(0)).length() < 100) wikiUrl = ReplaceAll(wikiUrl, "[GAME_NAME]", UriEncode(iso->GetName(0))); From 6f21f5eb343439e8706f674e5de0c2b8da918b63 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 3 Nov 2012 15:36:40 +0100 Subject: [PATCH 067/627] Video_Software: Implement texture preloading --- .../Plugin_VideoSoftware/Src/BPMemLoader.cpp | 20 ++++++++++++++++++- .../Src/TextureSampler.cpp | 12 +++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index 95ec555181..3db8c5d493 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -111,7 +111,25 @@ void SWBPWritten(int address, int newvalue) PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5); break; } - + + case BPMEM_PRELOAD_MODE: + if (newvalue != 0) + { + // NOTE(neobrain): Apparently tmemodd doesn't affect hardware behavior at all (libogc uses it just as a buffe$ + BPS_TmemConfig& tmem_cfg = bpmem.tmem_config; + u8* ram_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); + u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; + u32 size = tmem_cfg.preload_tile_info.count * 32; + + // Check if the game has overflowed TMEM, and copy up to the limit. + // Paper Mario does this when entering the Great Boogly Tree (Chap 2) + if ((tmem_addr + size) > TMEM_SIZE) + size = TMEM_SIZE - tmem_addr; + + memcpy(texMem + tmem_addr, ram_ptr, size); + } + break; + case BPMEM_TEV_REGISTER_L: // Reg 1 case BPMEM_TEV_REGISTER_L+2: // Reg 2 case BPMEM_TEV_REGISTER_L+4: // Reg 3 diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp index cd984b987b..66b6b68e22 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp @@ -120,8 +120,16 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) TexImage0& ti0 = texUnit.texImage0[subTexmap]; TexTLUT& texTlut = texUnit.texTlut[subTexmap]; - u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5; - u8 *imageSrc = Memory::GetPointer(imageBase); + u8 *imageSrc; + if (texUnit.texImage1[subTexmap].image_type) + { + imageSrc = &texMem[texUnit.texImage1[subTexmap].tmem_even * TMEM_LINE_SIZE]; + } + else + { + u32 imageBase = texUnit.texImage3[subTexmap].image_base << 5; + imageSrc = Memory::GetPointer(imageBase); + } int imageWidth = ti0.width; int imageHeight = ti0.height; From f1f212b51b0ca876ddb38de469573aa40df606c7 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 4 Nov 2012 20:58:07 +1100 Subject: [PATCH 068/627] Removed the patches for Wave Race as they are no longer needed. Fixes issue 3921. --- Data/User/GameConfig/GWRE01.ini | 5 ----- Data/User/GameConfig/GWRP01.ini | 5 ----- 2 files changed, 10 deletions(-) diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/User/GameConfig/GWRE01.ini index 0e9d759f37..6bb9265887 100644 --- a/Data/User/GameConfig/GWRE01.ini +++ b/Data/User/GameConfig/GWRE01.ini @@ -4,11 +4,6 @@ EmulationStateId = 4 EmulationIssues = needs the frame cheats from ini [OnFrame] Add memory patches to be applied every frame here. -+$Patches -0x800FDCC0:dword:0x60000000 -0x800FB0F0:dword:0x60000000 -0x800FDF20:dword:0x60000000 -0x8002363C:dword:0x60000000 [ActionReplay] Add action replay cheats here. $(m) C4116318 00000800 diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/User/GameConfig/GWRP01.ini index 218585bb63..ff622dc857 100644 --- a/Data/User/GameConfig/GWRP01.ini +++ b/Data/User/GameConfig/GWRP01.ini @@ -4,11 +4,6 @@ EmulationStateId = 4 EmulationIssues = goes to before race with framepatch [OnFrame] Add memory patches to be applied every frame here. -+$Patches -0x800FDAD8:dword:0x60000000 -0x800FAF08:dword:0x60000000 -0x800FDD38:dword:0x60000000 -0x800235F0:dword:0x60000000 [Video] ProjectionHack = 0 [ActionReplay] Add action replay cheats here. From ab48e1154bd077e11e0f5b16a5362952c72e2dcb Mon Sep 17 00:00:00 2001 From: Rog Date: Thu, 8 Nov 2012 22:45:13 -0500 Subject: [PATCH 069/627] Stop saving undo buffer (and associated .dtm, and .sav) when starting playing back a movie from save state. This is completely useless, and just wastes time copying save states around. --- Source/Core/Core/Src/State.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 3f3e367349..ab2313be4e 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -385,6 +385,7 @@ void LoadAs(const std::string& filename) g_loadDepth++; // Save temp buffer for undo load state + if (!Movie::IsJustStartingRecordingInputFromSaveState()) { std::lock_guard lk(g_cs_undo_load_buffer); SaveToBuffer(g_undo_load_buffer); From e8c0fea16e96892e995af02fbe1ce346ebca3b6d Mon Sep 17 00:00:00 2001 From: Rog Date: Fri, 9 Nov 2012 12:08:03 -0500 Subject: [PATCH 070/627] Retain dsp JIT setting when switching to HLE. Fixes issue 5691. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 2534c4a9db..ef82810019 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -891,7 +891,8 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) { case ID_DSPENGINE: SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = DSPEngine->GetSelection() == 0; - ac_Config.m_EnableJIT = DSPEngine->GetSelection() == 1; + if (!DSPEngine->GetSelection() == 0) + ac_Config.m_EnableJIT = DSPEngine->GetSelection() == 1; ac_Config.Update(); break; From 35e5a1e5921e48a40d6cf46510def68ee8eccfcf Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 10 Nov 2012 21:57:31 -0500 Subject: [PATCH 071/627] Add an option to pause on the last frame of a movie. --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/ConfigManager.h | 1 + Source/Core/Core/Src/Movie.cpp | 4 ++++ Source/Core/DolphinWX/Src/Frame.cpp | 1 + Source/Core/DolphinWX/Src/Frame.h | 1 + Source/Core/DolphinWX/Src/FrameTools.cpp | 7 +++++++ Source/Core/DolphinWX/Src/Globals.h | 1 + 7 files changed, 17 insertions(+) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 0c4fa04566..714ca4cb75 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -131,6 +131,7 @@ void SConfig::SaveSettings() // General ini.Set("General", "LastFilename", m_LastFilename); + ini.Set("General", "PauseMovie", m_pauseMovie); // ISO folders // clear removed folders @@ -260,6 +261,7 @@ void SConfig::LoadSettings() // General { ini.Get("General", "LastFilename", &m_LastFilename); + ini.Get("General", "PauseMovie", &m_pauseMovie, false); m_ISOFolder.clear(); int numGCMPaths; diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 0c8f3f1af1..8b9a11881c 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -75,6 +75,7 @@ struct SConfig : NonCopyable bool m_ListKorea; bool m_ListTaiwan; bool m_ListUnknown; + bool m_pauseMovie; SysConf* m_SYSCONF; diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index f98254e9a8..aa6fa0bd81 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -92,6 +92,10 @@ std::string GetInputDisplay() void FrameUpdate() { + if (SConfig::GetInstance().m_pauseMovie && IsPlayingInput() && g_currentInputCount == g_totalInputCount -1) + { + Core::SetState(Core::CORE_PAUSE); + } g_currentFrame++; if(!g_bPolled) g_currentLagCount++; diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 6b0e7b7678..bf09915db4 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -244,6 +244,7 @@ EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording) EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport) EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly) EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput) +EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie) EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep) EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 770d459220..9aa434f6da 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -297,6 +297,7 @@ private: void OnRecordExport(wxCommandEvent& event); void OnRecordReadOnly(wxCommandEvent& event); void OnTASInput(wxCommandEvent& event); + void OnTogglePauseMovie(wxCommandEvent& event); void OnChangeDisc(wxCommandEvent& event); void OnScreenshot(wxCommandEvent& event); void OnActive(wxActivateEvent& event); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 8215b68efc..6691641292 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -142,6 +142,8 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING)); emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); + emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); + emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_pauseMovie); emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); @@ -702,6 +704,11 @@ void CFrame::OnTASInput(wxCommandEvent& event) g_TASInputDlg->Show(true); } +void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) +{ + SConfig::GetInstance().m_pauseMovie = !SConfig::GetInstance().m_pauseMovie; + SConfig::GetInstance().SaveSettings(); +} void CFrame::OnFrameStep(wxCommandEvent& event) { bool wasPaused = (Core::GetState() == Core::CORE_PAUSE); diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index 8089a2622c..854efb6235 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -80,6 +80,7 @@ enum IDM_RECORDEXPORT, IDM_RECORDREADONLY, IDM_TASINPUT, + IDM_TOGGLE_PAUSEMOVIE, IDM_FRAMESTEP, IDM_SCREENSHOT, IDM_BROWSE, From a5d210129d433cee7df6c7d8d52152ade13ebcd0 Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 11 Nov 2012 17:57:06 -0500 Subject: [PATCH 072/627] Add an on screen lag counter. --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/ConfigManager.h | 1 + Source/Core/DolphinWX/Src/Frame.cpp | 1 + Source/Core/DolphinWX/Src/Frame.h | 1 + Source/Core/DolphinWX/Src/FrameTools.cpp | 11 ++++++++++- Source/Core/DolphinWX/Src/Globals.h | 1 + Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 14 +++++++++++--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 15 ++++++++++++--- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++++ 9 files changed, 43 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 714ca4cb75..df0ce1aa02 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -132,6 +132,7 @@ void SConfig::SaveSettings() // General ini.Set("General", "LastFilename", m_LastFilename); ini.Set("General", "PauseMovie", m_pauseMovie); + ini.Set("General", "ShowLag", m_showLag); // ISO folders // clear removed folders @@ -262,6 +263,7 @@ void SConfig::LoadSettings() { ini.Get("General", "LastFilename", &m_LastFilename); ini.Get("General", "PauseMovie", &m_pauseMovie, false); + ini.Get("General", "ShowLag", &m_showLag, false); m_ISOFolder.clear(); int numGCMPaths; diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 8b9a11881c..1235e23eac 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -76,6 +76,7 @@ struct SConfig : NonCopyable bool m_ListTaiwan; bool m_ListUnknown; bool m_pauseMovie; + bool m_showLag; SysConf* m_SYSCONF; diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index bf09915db4..9d59ca1788 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -245,6 +245,7 @@ EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport) EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly) EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput) EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie) +EVT_MENU(IDM_SHOWLAG, CFrame::OnShowLag) EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep) EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 9aa434f6da..8c8285f842 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -298,6 +298,7 @@ private: void OnRecordReadOnly(wxCommandEvent& event); void OnTASInput(wxCommandEvent& event); void OnTogglePauseMovie(wxCommandEvent& event); + void OnShowLag(wxCommandEvent& event); void OnChangeDisc(wxCommandEvent& event); void OnScreenshot(wxCommandEvent& event); void OnActive(wxActivateEvent& event); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 6691641292..e4a7ed8986 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -144,9 +144,11 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_pauseMovie); + emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); + emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_showLag); emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); - + emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString); wxMenu *skippingMenu = new wxMenu; @@ -709,6 +711,13 @@ void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) SConfig::GetInstance().m_pauseMovie = !SConfig::GetInstance().m_pauseMovie; SConfig::GetInstance().SaveSettings(); } + +void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event)) +{ + SConfig::GetInstance().m_showLag = !SConfig::GetInstance().m_showLag; + SConfig::GetInstance().SaveSettings(); +} + void CFrame::OnFrameStep(wxCommandEvent& event) { bool wasPaused = (Core::GetState() == Core::CORE_PAUSE); diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index 854efb6235..36a37de6cc 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -81,6 +81,7 @@ enum IDM_RECORDREADONLY, IDM_TASINPUT, IDM_TOGGLE_PAUSEMOVIE, + IDM_SHOWLAG, IDM_FRAMESTEP, IDM_SCREENSHOT, IDM_BROWSE, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 81efa3623f..079692b76b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -45,6 +45,7 @@ #include "BPFunctions.h" #include "AVIDump.h" #include "FPSCounter.h" +#include "ConfigManager.h" namespace DX11 { @@ -1094,11 +1095,18 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps); } + if (SConfig::GetInstance().m_showLag) + { + char lag[10]; + StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); + D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag); + } + if (g_ActiveConfig.bShowInputDisplay) { char inputDisplay[1000]; StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str()); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, inputDisplay); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, inputDisplay); } Renderer::DrawDebugText(); @@ -1106,13 +1114,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { char buf[32768]; Statistics::ToString(buf); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, buf); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf); } else if (g_ActiveConfig.bOverlayProjStats) { char buf[32768]; Statistics::ToStringProj(buf); - D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, buf); + D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, buf); } OSD::DrawMessages(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index a59adb4793..c4e37e761e 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -55,6 +55,7 @@ #include "Movie.h" #include "BPFunctions.h" #include "FPSCounter.h" +#include "ConfigManager.h" namespace DX9 { @@ -1091,23 +1092,31 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps); } + if (SConfig::GetInstance().m_showLag) + { + char lag[10]; + StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); + D3D::font.DrawTextScaled(0, 18, 20, 20, 0.0f, 0xFF00FFFF, lag); + } + if (g_ActiveConfig.bShowInputDisplay) { char inputDisplay[1000]; StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str()); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay); } + Renderer::DrawDebugText(); if (g_ActiveConfig.bOverlayStats) { Statistics::ToString(st); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, st); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st); } else if (g_ActiveConfig.bOverlayProjStats) { Statistics::ToStringProj(st); - D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, st); + D3D::font.DrawTextScaled(0, 35, 20, 20, 0.0f, 0xFF00FFFF, st); } OSD::DrawMessages(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a6121e1436..4f74454ece 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -62,6 +62,7 @@ #include "Host.h" #include "BPFunctions.h" #include "FPSCounter.h" +#include "ConfigManager.h" #include "main.h" // Local #ifdef _WIN32 @@ -531,6 +532,9 @@ void Renderer::DrawDebugInfo() if (g_ActiveConfig.bShowFPS) p+=sprintf(p, "FPS: %d\n", s_fps); + if (SConfig::GetInstance().m_showLag) + p+=sprintf(p, "Lag: %d\n", Movie::g_currentLagCount); + if (g_ActiveConfig.bShowInputDisplay) p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str()); From ab03e9446a915b0e409e0ab7dead0a257b518ca3 Mon Sep 17 00:00:00 2001 From: parlane Date: Mon, 12 Nov 2012 01:48:51 +0000 Subject: [PATCH 073/627] From now on, use http://dolphin-emu.org/ , http://forums.dolphin-emu.org/ and http://wiki.dolphin-emu.org/ to access our website. --- Readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.txt b/Readme.txt index 541c04adf6..a00bf2a4c2 100644 --- a/Readme.txt +++ b/Readme.txt @@ -17,7 +17,7 @@ Please read the FAQ before use: http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions System Requirements: -* OS: Microsoft Windows (2000/XP/Vista or higher) or Linux or Apple Mac OS X. +* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X. * Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz). Dual Core for speed boost. * Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1. From 8eb6f9002e2663eababd0ade685e9f8107531cd2 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 12 Nov 2012 20:20:34 -0500 Subject: [PATCH 074/627] Fixes interpreter when not recording or playing back a movie. --- Source/Core/Core/Src/Movie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 13f5ed26e8..28c082ce70 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -131,7 +131,7 @@ void Init() g_bFrameStep = false; g_bFrameStop = false; bSaveConfig = false; - + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; if (IsPlayingInput()) { ReadHeader(); From 8fe5aa4ee8568bd502dade463be18c7f7504a0de Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 12 Nov 2012 11:39:33 -0500 Subject: [PATCH 075/627] movie cleanup --- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 12 ++++-------- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index 038eb6e9a9..c157e55d1b 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -52,7 +52,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index) , m_bDirty(false) { m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB; - if (Movie::IsUsingMemcard() && Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) + if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave()) m_strFilename = "Movie.raw"; // we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index aa6fa0bd81..189201a36a 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -92,7 +92,7 @@ std::string GetInputDisplay() void FrameUpdate() { - if (SConfig::GetInstance().m_pauseMovie && IsPlayingInput() && g_currentInputCount == g_totalInputCount -1) + if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1 && SConfig::GetInstance().m_pauseMovie) { Core::SetState(Core::CORE_PAUSE); } @@ -135,7 +135,7 @@ void Init() g_bFrameStep = false; g_bFrameStop = false; bSaveConfig = false; - + iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; if (IsPlayingInput()) { ReadHeader(); @@ -743,11 +743,8 @@ void LoadInput(const char *filename) ReadHeader(); if (!g_bReadOnly) { - if (g_rerecords > tmpHeader.numRerecords) - { - tmpHeader.numRerecords = g_rerecords; - } - tmpHeader.numRerecords++; + g_rerecords++; + tmpHeader.numRerecords = g_rerecords; t_record.Seek(0, SEEK_SET); t_record.WriteArray(&tmpHeader, 1); } @@ -968,7 +965,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) } else { - Core::SetState(Core::CORE_PAUSE); PanicAlert("Change the disc to %s", g_discChange.c_str()); } } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index c4e37e761e..226b7227c3 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1116,7 +1116,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons else if (g_ActiveConfig.bOverlayProjStats) { Statistics::ToStringProj(st); - D3D::font.DrawTextScaled(0, 35, 20, 20, 0.0f, 0xFF00FFFF, st); + D3D::font.DrawTextScaled(0, 36, 20, 20, 0.0f, 0xFF00FFFF, st); } OSD::DrawMessages(); From 16060290c2dc3cac5c1cb4643d460bb778cc121d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 13 Nov 2012 09:37:44 +0100 Subject: [PATCH 076/627] Fix missing notes in musics with DSPHLE. Tales of Symphonia and Skies of Arcadia Legends now have working musics with DSPHLE. Some other games with the same symptoms (missing instruments) should probably be fixed by that change too. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index da4b10f34e..c63929fe8f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -172,8 +172,6 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) if (!ReadPB(blockAddr, PB)) break; - ProcessUpdates(PB); - if (m_CRC != 0x3389a79e) VoiceHacks(PB); @@ -335,6 +333,24 @@ bool CUCode_AX::AXTask(u32& _uMail) PBaddr[numPBaddr] = HLEMemory_Read_U32(uAddress); numPBaddr++; + // HACK: process updates right now instead of waiting until + // Premix is called. Some games using sequenced music (Tales of + // Symphonia for example) thought PBs were unused because we + // were too slow to update them and set them as running. This + // happens because Premix is basically completely desync-ed + // from the emulation core (it's running in the audio thread). + // Fixing this would require rewriting most of the AX HLE. + u32 block_addr = uAddress; + AXPB pb; + while (block_addr) + { + if (!ReadPB(block_addr, pb)) + break; + ProcessUpdates(pb); + WritePB(block_addr, pb); + block_addr = (pb.next_pb_hi << 16) | pb.next_pb_lo; + } + m_addressPBs = HLEMemory_Read_U32(uAddress); // left in for now uAddress += 4; soundStream->GetMixer()->SetHLEReady(true); From 764cd455b35d8b1dc9328a8cc12846b1967fc3b9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 13 Nov 2012 10:22:56 +0100 Subject: [PATCH 077/627] Revert "fix Snow Leopard compatibility" This change broke compilation on some OSX 10.7 configurations. This reverts commit b2e2e49fe49715a3dd77f138b8365046550d99b2. --- CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d484e68a..37e4f14f5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,12 @@ cmake_minimum_required(VERSION 2.6) # Update compiler before calling project() if (APPLE) # Use clang compiler - set(CMAKE_C_COMPILER "clang") - set(CMAKE_CXX_COMPILER "clang++") + set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang") + set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++") + if (NOT EXISTS "${CMAKE_CXX_COMPILER}") + set(CMAKE_C_COMPILER "clang") + set(CMAKE_CXX_COMPILER "clang++") + endif() endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) @@ -122,6 +126,10 @@ if(UNIX AND NOT APPLE) endif() if(APPLE) + # Ignore MacPorts and Fink and any other locally installed packages that + # might prevent building a distributable binary. + set(CMAKE_SYSTEM_PREFIX_PATH /usr) + set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin) # Some of our code contains Objective C constructs. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c") @@ -136,7 +144,7 @@ if(APPLE) # This is inserted into the Info.plist as well. # Note that the SDK determines the maximum version of which optional # features can be used, not the minimum required version to run. - set(OSX_MIN_VERSION "10.6") + set(OSX_MIN_VERSION "10.5.4") set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}") set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.6.sdk") set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk") @@ -145,9 +153,9 @@ if(APPLE) elseif(EXISTS "${SYSROOT_LEGACY_PATH}/") set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH}) endif() - if(TARGET_SYSROOT) + if(${TARGET_SYSROOT}) set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION} -Wl,-syslibroot,${TARGET_SYSROOT}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}") endif() # Do not warn about frameworks that are not available on all architectures. # This avoids a warning when linking with QuickTime. @@ -480,7 +488,7 @@ endif() option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) if(NOT DISABLE_WX) include(FindwxWidgets OPTIONAL) - FIND_PACKAGE(wxWidgets COMPONENTS core aui adv gl) + FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) if(wxWidgets_FOUND) EXECUTE_PROCESS( From e4d18e3a8b7cd37cb90f277548ab45caa0efba81 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 13 Nov 2012 16:50:42 +0100 Subject: [PATCH 078/627] Bound the iteration on the PB list when processing updates. Fixes freezes introduced in 3.0-807 with DSPHLE on some AX games. Apparently logic doesn't apply inside the HW/DSPHLE/UCodes directory. --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index c63929fe8f..74c9d24db4 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -342,7 +342,7 @@ bool CUCode_AX::AXTask(u32& _uMail) // Fixing this would require rewriting most of the AX HLE. u32 block_addr = uAddress; AXPB pb; - while (block_addr) + for (int i = 0; block_addr && i < NUMBER_OF_PBS; i++) { if (!ReadPB(block_addr, pb)) break; From 319591674482f447ae86dfa5d1172c64f4d12731 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 05:08:04 +0100 Subject: [PATCH 079/627] Basic infrastructure for the new AX HLE, currently not doing anything besides answering mails --- Source/Core/Core/CMakeLists.txt | 1 + .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 106 ++++++++++++++++++ .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 51 +++++++++ .../Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp | 3 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 734d966781..3182d248f8 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -74,6 +74,7 @@ set(SRCS Src/ActionReplay.cpp Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp Src/HW/DSPHLE/UCodes/UCode_CARD.cpp Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp + Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp Src/HW/DSPHLE/UCodes/UCode_ROM.cpp Src/HW/DSPHLE/UCodes/UCodes.cpp Src/HW/DSPHLE/UCodes/UCode_GBA.cpp diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp new file mode 100644 index 0000000000..28ef93a9bb --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -0,0 +1,106 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "UCode_NewAX.h" +#include "../../DSP.h" + +CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) +{ + m_rMailHandler.PushMail(DSP_INIT); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); +} + +CUCode_NewAX::~CUCode_NewAX() +{ + m_rMailHandler.Clear(); +} + +void CUCode_NewAX::HandleCommandList(u32 addr) +{ + // Signal end of processing + m_rMailHandler.PushMail(DSP_YIELD); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); +} + +void CUCode_NewAX::HandleMail(u32 mail) +{ + // Indicates if the next message is a command list address. + static bool next_is_cmdlist = false; + bool set_next_is_cmdlist = false; + + if (next_is_cmdlist) + { + HandleCommandList(mail); + } + else if (m_UploadSetupInProgress) + { + PrepareBootUCode(mail); + } + else if (mail == MAIL_RESUME) + { + // Acknowledge the resume request + m_rMailHandler.PushMail(DSP_RESUME); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } + else if (mail == MAIL_NEWUCODE) + { + soundStream->GetMixer()->SetHLEReady(false); + m_UploadSetupInProgress = true; + } + else if (mail == MAIL_RESET) + { + m_DSPHLE->SetUCode(UCODE_ROM); + } + else if (mail == MAIL_CONTINUE) + { + // We don't have to do anything here - the CPU does not wait for a ACK + // and sends a cmdlist mail just after. + } + else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST) + { + // A command list address is going to be sent next. + set_next_is_cmdlist = true; + } + else + { + ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail); + } + + next_is_cmdlist = set_next_is_cmdlist; +} + +void CUCode_NewAX::MixAdd(short* out_buffer, int nsamples) +{ + // nsamples * 2 for left and right audio channel + memset(out_buffer, 0, nsamples * 2 * sizeof (short)); +} + +void CUCode_NewAX::Update(int cycles) +{ + // Used for UCode switching. + if (NeedsResumeMail()) + { + m_rMailHandler.PushMail(DSP_RESUME); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } +} + +void CUCode_NewAX::DoState(PointerWrap& p) +{ + DoStateShared(p); +} diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h new file mode 100644 index 0000000000..769f58d9d1 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -0,0 +1,51 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_NEWAX_H +#define _UCODE_NEWAX_H + +#include "UCodes.h" +#include "UCode_AXStructs.h" + +class CUCode_NewAX : public IUCode +{ +public: + CUCode_NewAX(DSPHLE* dsp_hle, u32 crc); + virtual ~CUCode_NewAX(); + + void HandleMail(u32 mail); + void MixAdd(short* out_buffer, int nsamples); + void Update(int cycles); + void DoState(PointerWrap& p); + +private: + enum MailType + { + MAIL_RESUME = 0xCDD10000, + MAIL_NEWUCODE = 0xCDD10001, + MAIL_RESET = 0xCDD10002, + MAIL_CONTINUE = 0xCDD10003, + + // CPU sends 0xBABE0000 | cmdlist_size to the DSP + MAIL_CMDLIST = 0xBABE0000, + MAIL_CMDLIST_MASK = 0xFFFF0000 + }; + + void HandleCommandList(u32 addr); +}; + +#endif // !_UCODE_NEWAX_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp index c04bf41403..58e6198205 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp @@ -19,6 +19,7 @@ #include "UCode_AX.h" #include "UCode_AXWii.h" +#include "UCode_NewAX.h" #include "UCode_Zelda.h" #include "UCode_ROM.h" #include "UCode_CARD.h" @@ -57,7 +58,7 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) case 0xe2136399: // billy hatcher, dragonballz, mario party 5, TMNT, ava1080 case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy) INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", _CRC); - return new CUCode_AX(dsp_hle, _CRC); + return new CUCode_NewAX(dsp_hle, _CRC); case 0x6ba3b3ea: // IPL - PAL case 0x24b22038: // IPL - NTSC/NTSC-JAP From 9e813502acf9d7240c648275277689007a637b16 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 05:33:04 +0100 Subject: [PATCH 080/627] Create a new thread for AX and make it handle the command lists --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 51 +++++++++++++++++-- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 16 ++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 28ef93a9bb..117dac63cb 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -20,6 +20,8 @@ CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) + , m_cmdlist_addr(0) + , m_axthread(&CUCode_NewAX::AXThread, this) { m_rMailHandler.PushMail(DSP_INIT); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); @@ -27,14 +29,46 @@ CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) CUCode_NewAX::~CUCode_NewAX() { + m_cmdlist_addr = (u32)-1; // Special value to signal end + NotifyAXThread(); + m_axthread.join(); + m_rMailHandler.Clear(); } +void CUCode_NewAX::AXThread() +{ + while (true) + { + { + std::unique_lock lk(m_cmdlist_mutex); + while (m_cmdlist_addr == 0) + m_cmdlist_cv.wait(lk); + } + + if (m_cmdlist_addr == (u32)-1) // End of thread signal + break; + + m_processing.lock(); + HandleCommandList(m_cmdlist_addr); + m_cmdlist_addr = 0; + + // Signal end of processing + m_rMailHandler.PushMail(DSP_YIELD); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + m_processing.unlock(); + } +} + +void CUCode_NewAX::NotifyAXThread() +{ + std::unique_lock lk(m_cmdlist_mutex); + m_cmdlist_cv.notify_one(); +} + void CUCode_NewAX::HandleCommandList(u32 addr) { - // Signal end of processing - m_rMailHandler.PushMail(DSP_YIELD); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + WARN_LOG(DSPHLE, "TODO: HandleCommandList(%08x)", addr); } void CUCode_NewAX::HandleMail(u32 mail) @@ -43,9 +77,15 @@ void CUCode_NewAX::HandleMail(u32 mail) static bool next_is_cmdlist = false; bool set_next_is_cmdlist = false; + // Wait for DSP processing to be done before answering any mail. This is + // safe to do because it matches what the DSP does on real hardware: there + // is no interrupt when a mail from CPU is received. + m_processing.lock(); + if (next_is_cmdlist) { - HandleCommandList(mail); + m_cmdlist_addr = mail; + NotifyAXThread(); } else if (m_UploadSetupInProgress) { @@ -81,6 +121,7 @@ void CUCode_NewAX::HandleMail(u32 mail) ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail); } + m_processing.unlock(); next_is_cmdlist = set_next_is_cmdlist; } @@ -102,5 +143,7 @@ void CUCode_NewAX::Update(int cycles) void CUCode_NewAX::DoState(PointerWrap& p) { + std::lock_guard lk(m_processing); + DoStateShared(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 769f58d9d1..a1f881bd38 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -45,6 +45,22 @@ private: MAIL_CMDLIST_MASK = 0xFFFF0000 }; + // Volatile because it's set by HandleMail and accessed in + // HandleCommandList, which are running in two different threads. + volatile u32 m_cmdlist_addr; + + std::thread m_axthread; + + // Sync objects + std::mutex m_processing; + std::condition_variable m_cmdlist_cv; + std::mutex m_cmdlist_mutex; + + // Send a notification to the AX thread to tell him a new cmdlist addr is + // available for processing. + void NotifyAXThread(); + + void AXThread(); void HandleCommandList(u32 addr); }; From 7535c6d9038684c2a27f7307dd4f2439829b5a2f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 06:15:55 +0100 Subject: [PATCH 081/627] Parse the AX command list in the AX thread --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 97 +++++++++++++++++-- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 35 ++++++- 2 files changed, 119 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 117dac63cb..31799f2675 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -20,7 +20,7 @@ CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) - , m_cmdlist_addr(0) + , m_cmdlist_size(0) , m_axthread(&CUCode_NewAX::AXThread, this) { m_rMailHandler.PushMail(DSP_INIT); @@ -29,7 +29,7 @@ CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) CUCode_NewAX::~CUCode_NewAX() { - m_cmdlist_addr = (u32)-1; // Special value to signal end + m_cmdlist_size = (u16)-1; // Special value to signal end NotifyAXThread(); m_axthread.join(); @@ -42,16 +42,16 @@ void CUCode_NewAX::AXThread() { { std::unique_lock lk(m_cmdlist_mutex); - while (m_cmdlist_addr == 0) + while (m_cmdlist_size == 0) m_cmdlist_cv.wait(lk); } - if (m_cmdlist_addr == (u32)-1) // End of thread signal + if (m_cmdlist_size == (u16)-1) // End of thread signal break; m_processing.lock(); - HandleCommandList(m_cmdlist_addr); - m_cmdlist_addr = 0; + HandleCommandList(); + m_cmdlist_size = 0; // Signal end of processing m_rMailHandler.PushMail(DSP_YIELD); @@ -66,15 +66,78 @@ void CUCode_NewAX::NotifyAXThread() m_cmdlist_cv.notify_one(); } -void CUCode_NewAX::HandleCommandList(u32 addr) +void CUCode_NewAX::HandleCommandList() { - WARN_LOG(DSPHLE, "TODO: HandleCommandList(%08x)", addr); + u16 pb_addr_hi, pb_addr_lo; + u32 pb_addr = 0; + + u32 curr_idx = 0; + bool end = false; + while (!end) + { + u16 cmd = m_cmdlist[curr_idx++]; + + switch (cmd) + { + + // A lot of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_STUDIO_ADDR: curr_idx += 2; break; + case CMD_UNK_01: curr_idx += 5; break; + + case CMD_PB_ADDR: + pb_addr_hi = m_cmdlist[curr_idx++]; + pb_addr_lo = m_cmdlist[curr_idx++]; + pb_addr = (pb_addr_hi << 16) | pb_addr_lo; + + WARN_LOG(DSPHLE, "PB addr: %08x", pb_addr); + break; + + case CMD_PROCESS: + ProcessPB(pb_addr); + break; + + case CMD_UNK_04: curr_idx += 4; break; + case CMD_UNK_05: curr_idx += 4; break; + case CMD_UNK_06: curr_idx += 2; break; + case CMD_SBUFFER_ADDR: curr_idx += 2; break; + case CMD_UNK_08: curr_idx += 10; break; // TODO: check + case CMD_UNK_09: curr_idx += 2; break; + case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; + case CMD_UNK_0B: break; // TODO: check other versions + case CMD_UNK_0C: break; // TODO: check other versions + case CMD_UNK_0D: curr_idx += 2; break; + case CMD_UNK_0E: curr_idx += 4; break; + + case CMD_END: + end = true; + break; + + case CMD_UNK_10: curr_idx += 4; break; + case CMD_UNK_11: curr_idx += 2; break; + case CMD_UNK_12: curr_idx += 1; break; + case CMD_UNK_13: curr_idx += 12; break; + + default: + ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); + end = true; + break; + } + } +} + +void CUCode_NewAX::ProcessPB(u32 pb_addr) +{ + NOTICE_LOG(DSPHLE, "TODO: process pb %08x", pb_addr); } void CUCode_NewAX::HandleMail(u32 mail) { // Indicates if the next message is a command list address. static bool next_is_cmdlist = false; + static u16 cmdlist_size = 0; + bool set_next_is_cmdlist = false; // Wait for DSP processing to be done before answering any mail. This is @@ -84,7 +147,7 @@ void CUCode_NewAX::HandleMail(u32 mail) if (next_is_cmdlist) { - m_cmdlist_addr = mail; + CopyCmdList(mail, cmdlist_size); NotifyAXThread(); } else if (m_UploadSetupInProgress) @@ -97,7 +160,7 @@ void CUCode_NewAX::HandleMail(u32 mail) m_rMailHandler.PushMail(DSP_RESUME); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } - else if (mail == MAIL_NEWUCODE) + else if (mail == MAIL_NEW_UCODE) { soundStream->GetMixer()->SetHLEReady(false); m_UploadSetupInProgress = true; @@ -115,6 +178,7 @@ void CUCode_NewAX::HandleMail(u32 mail) { // A command list address is going to be sent next. set_next_is_cmdlist = true; + cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK); } else { @@ -125,6 +189,19 @@ void CUCode_NewAX::HandleMail(u32 mail) next_is_cmdlist = set_next_is_cmdlist; } +void CUCode_NewAX::CopyCmdList(u32 addr, u16 size) +{ + if (size >= (sizeof (m_cmdlist) / sizeof (u16))) + { + ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size); + return; + } + + for (u32 i = 0; i < size; ++i, addr += 2) + m_cmdlist[i] = HLEMemory_Read_U16(addr); + m_cmdlist_size = size; +} + void CUCode_NewAX::MixAdd(short* out_buffer, int nsamples) { // nsamples * 2 for left and right audio channel diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index a1f881bd38..92184fe38f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -36,7 +36,7 @@ private: enum MailType { MAIL_RESUME = 0xCDD10000, - MAIL_NEWUCODE = 0xCDD10001, + MAIL_NEW_UCODE = 0xCDD10001, MAIL_RESET = 0xCDD10002, MAIL_CONTINUE = 0xCDD10003, @@ -45,9 +45,34 @@ private: MAIL_CMDLIST_MASK = 0xFFFF0000 }; + enum CmdType + { + CMD_STUDIO_ADDR = 0x00, + CMD_UNK_01 = 0x01, + CMD_PB_ADDR = 0x02, + CMD_PROCESS = 0x03, + CMD_UNK_04 = 0x04, + CMD_UNK_05 = 0x05, + CMD_UNK_06 = 0x06, + CMD_SBUFFER_ADDR = 0x07, + CMD_UNK_08 = 0x08, + CMD_UNK_09 = 0x09, + CMD_COMPRESSOR_TABLE_ADDR = 0x0A, + CMD_UNK_0B = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_UNK_0D = 0x0D, + CMD_UNK_0E = 0x0E, + CMD_END = 0x0F, + CMD_UNK_10 = 0x10, + CMD_UNK_11 = 0x11, + CMD_UNK_12 = 0x12, + CMD_UNK_13 = 0x13, + }; + // Volatile because it's set by HandleMail and accessed in // HandleCommandList, which are running in two different threads. - volatile u32 m_cmdlist_addr; + volatile u16 m_cmdlist[512]; + volatile u32 m_cmdlist_size; std::thread m_axthread; @@ -56,12 +81,16 @@ private: std::condition_variable m_cmdlist_cv; std::mutex m_cmdlist_mutex; + // Copy a command list from memory to our temp buffer + void CopyCmdList(u32 addr, u16 size); + // Send a notification to the AX thread to tell him a new cmdlist addr is // available for processing. void NotifyAXThread(); void AXThread(); - void HandleCommandList(u32 addr); + void HandleCommandList(); + void ProcessPB(u32 pb_addr); }; #endif // !_UCODE_NEWAX_H From 18f3630af50ce5ec5e0be97d7634daaf32d776bb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 06:53:36 +0100 Subject: [PATCH 082/627] PBs processing is now done, just need the output to be able to test --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 116 +++++++++++++++++- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 2 +- 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 31799f2675..e4a05c42ba 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "UCode_NewAX.h" +#include "UCode_AX_Voice.h" #include "../../DSP.h" CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) @@ -95,7 +96,7 @@ void CUCode_NewAX::HandleCommandList() break; case CMD_PROCESS: - ProcessPB(pb_addr); + ProcessPBList(pb_addr); break; case CMD_UNK_04: curr_idx += 4; break; @@ -127,9 +128,118 @@ void CUCode_NewAX::HandleCommandList() } } -void CUCode_NewAX::ProcessPB(u32 pb_addr) +// From old UCode_AX.cpp. +static void VoiceHacks(AXPB &pb) { - NOTICE_LOG(DSPHLE, "TODO: process pb %08x", pb_addr); + // get necessary values + const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; + const u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; + // const u32 updaddr = (u32)(pb.updates.data_hi << 16) | pb.updates.data_lo; + // const u16 updpar = HLEMemory_Read_U16(updaddr); + // const u16 upddata = HLEMemory_Read_U16(updaddr + 2); + + // ======================================================================================= + /* Fix problems introduced with the SSBM fix. Sometimes when a music stream ended sampleEnd + would end up outside of bounds while the block was still playing resulting in noise + a strange noise. This should take care of that. + */ + if ((sampleEnd > (0x017fffff * 2) || loopPos > (0x017fffff * 2))) // ARAM bounds in nibbles + { + pb.running = 0; + + // also reset all values if it makes any difference + pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; + pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; + pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; + + pb.src.cur_addr_frac = 0; pb.src.ratio_hi = 0; pb.src.ratio_lo = 0; + pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; + + pb.audio_addr.looping = 0; + pb.adpcm_loop_info.pred_scale = 0; + pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; + } + + /* + // the fact that no settings are reset (except running) after a SSBM type music stream or another + looping block (for example in Battle Stadium DON) has ended could cause loud garbled sound to be + played from one or more blocks. Perhaps it was in conjunction with the old sequenced music fix below, + I'm not sure. This was an attempt to prevent that anyway by resetting all. But I'm not sure if this + is needed anymore. Please try to play SSBM without it and see if it works anyway. + */ + if ( + // detect blocks that have recently been running that we should reset + pb.running == 0 && pb.audio_addr.looping == 1 + //pb.running == 0 && pb.adpcm_loop_info.pred_scale + + // this prevents us from ruining sequenced music blocks, may not be needed + /* + && !(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2] + || pb.updates.num_updates[3] || pb.updates.num_updates[4]) + */ + //&& !(updpar || upddata) + + && pb.mixer_control == 0 // only use this in SSBM + ) + { + // reset the detection values + pb.audio_addr.looping = 0; + pb.adpcm_loop_info.pred_scale = 0; + pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; + + //pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; + //pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; + //pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; + + //pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0; + //pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; + } +} + +static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) +{ + u32 start_idx = 0; + for (int i = 0; i < curr_ms; ++i) + start_idx += pb.updates.num_updates[i]; + + u32 update_addr = (pb.updates.data_hi << 16) | pb.updates.data_lo; + for (u32 i = start_idx; i < start_idx + pb.updates.num_updates[curr_ms]; ++i) + { + u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i); + u16 update_val = HLEMemory_Read_U16(update_addr + 4 * i + 2); + + ((u16*)&pb)[update_off] = update_val; + } +} + +void CUCode_NewAX::ProcessPBList(u32 pb_addr) +{ + static int tmp_mix_buffer_left[5 * 32], tmp_mix_buffer_right[5 * 32]; + + AXPB pb; + + while (pb_addr) + { + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 5; ++curr_ms) + { + ApplyUpdatesForMs(pb, curr_ms); + + // TODO: is that still needed? + if (m_CRC != 0x3389a79e) + VoiceHacks(pb); + + MixAddVoice(pb, tmp_mix_buffer_left + 32 * curr_ms, + tmp_mix_buffer_right + 32 * curr_ms, 32); + } + + WritePB(pb_addr, pb); + pb_addr = (pb.next_pb_hi << 16) | pb.next_pb_lo; + } + + // TODO: write the 5ms back to a buffer the audio interface can read from } void CUCode_NewAX::HandleMail(u32 mail) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 92184fe38f..70a06a7408 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -90,7 +90,7 @@ private: void AXThread(); void HandleCommandList(); - void ProcessPB(u32 pb_addr); + void ProcessPBList(u32 pb_addr); }; #endif // !_UCODE_NEWAX_H From 0b275c20af99ca601616d350e7cebf407470aea2 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 11:20:54 +0100 Subject: [PATCH 083/627] Added output support to NewAX. Now working fine with Tales of Symphonia. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 92 +++++++++++++++---- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 8 +- 2 files changed, 83 insertions(+), 17 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index e4a05c42ba..ea9dd57e3c 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -19,6 +19,12 @@ #include "UCode_AX_Voice.h" #include "../../DSP.h" +// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. +#define HILO_TO_32(name) \ + ((name##_hi << 16) | name##_lo) + +#define MIXBUF_MAX_SAMPLES 16000 // 500ms of stereo audio + CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) , m_cmdlist_size(0) @@ -69,7 +75,8 @@ void CUCode_NewAX::NotifyAXThread() void CUCode_NewAX::HandleCommandList() { - u16 pb_addr_hi, pb_addr_lo; + u16 addr_hi, addr_lo; + u32 pb_addr = 0; u32 curr_idx = 0; @@ -84,15 +91,18 @@ void CUCode_NewAX::HandleCommandList() // A lot of these commands are unknown, or unused in this AX HLE. // We still need to skip their arguments using "curr_idx += N". - case CMD_STUDIO_ADDR: curr_idx += 2; break; + case CMD_STUDIO_ADDR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); + break; + case CMD_UNK_01: curr_idx += 5; break; case CMD_PB_ADDR: - pb_addr_hi = m_cmdlist[curr_idx++]; - pb_addr_lo = m_cmdlist[curr_idx++]; - pb_addr = (pb_addr_hi << 16) | pb_addr_lo; - - WARN_LOG(DSPHLE, "PB addr: %08x", pb_addr); + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + pb_addr = HILO_TO_32(addr); break; case CMD_PROCESS: @@ -109,7 +119,15 @@ void CUCode_NewAX::HandleCommandList() case CMD_UNK_0B: break; // TODO: check other versions case CMD_UNK_0C: break; // TODO: check other versions case CMD_UNK_0D: curr_idx += 2; break; - case CMD_UNK_0E: curr_idx += 4; break; + + case CMD_OUTPUT: + // Skip the first address, we don't know what it's used for. + curr_idx += 2; + + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr)); + break; case CMD_END: end = true; @@ -202,7 +220,7 @@ static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) for (int i = 0; i < curr_ms; ++i) start_idx += pb.updates.num_updates[i]; - u32 update_addr = (pb.updates.data_hi << 16) | pb.updates.data_lo; + u32 update_addr = HILO_TO_32(pb.updates.data); for (u32 i = start_idx; i < start_idx + pb.updates.num_updates[curr_ms]; ++i) { u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i); @@ -212,9 +230,22 @@ static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) } } +void CUCode_NewAX::SetupProcessing(u32 studio_addr) +{ + // Initialize to 0. Real hardware initializes using values from studio_addr + // (to have volume ramps instead of 0), but we don't emulate this yet. + + (void)studio_addr; + + memset(m_samples_left, 0, sizeof (m_samples_left)); + memset(m_samples_right, 0, sizeof (m_samples_right)); +} + void CUCode_NewAX::ProcessPBList(u32 pb_addr) { - static int tmp_mix_buffer_left[5 * 32], tmp_mix_buffer_right[5 * 32]; + // Samples per millisecond. In theory DSP sampling rate can be changed from + // 32KHz to 48KHz, but AX always process at 32KHz. + u32 spms = 32; AXPB pb; @@ -231,15 +262,44 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) if (m_CRC != 0x3389a79e) VoiceHacks(pb); - MixAddVoice(pb, tmp_mix_buffer_left + 32 * curr_ms, - tmp_mix_buffer_right + 32 * curr_ms, 32); + MixAddVoice(pb, m_samples_left + spms * curr_ms, + m_samples_right + spms * curr_ms, spms); } WritePB(pb_addr, pb); - pb_addr = (pb.next_pb_hi << 16) | pb.next_pb_lo; + pb_addr = HILO_TO_32(pb.next_pb); } - // TODO: write the 5ms back to a buffer the audio interface can read from + // Clamp to 16 bits. + // TODO: check the clamping is done in this command and not in a later + // command. + for (u32 i = 0; i < 5 * spms; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + m_samples_left[i] = left; + m_samples_right[i] = right; + } +} + +void CUCode_NewAX::OutputSamples(u32 out_addr) +{ + // 32 samples per ms, 5 ms, 2 channels + short buffer[5 * 32 * 2]; + + for (u32 i = 0; i < 5 * 32; ++i) + { + buffer[2 * i] = Common::swap16(m_samples_left[i]); + buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + } + + memcpy(HLEMemory_Get_Pointer(out_addr), buffer, sizeof (buffer)); } void CUCode_NewAX::HandleMail(u32 mail) @@ -314,8 +374,8 @@ void CUCode_NewAX::CopyCmdList(u32 addr, u16 size) void CUCode_NewAX::MixAdd(short* out_buffer, int nsamples) { - // nsamples * 2 for left and right audio channel - memset(out_buffer, 0, nsamples * 2 * sizeof (short)); + // Should never be called: we do not set HLE as ready. + // We accurately send samples to RAM instead of directly to the mixer. } void CUCode_NewAX::Update(int cycles) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 70a06a7408..12886c5724 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -61,7 +61,7 @@ private: CMD_UNK_0B = 0x0B, CMD_UNK_0C = 0x0C, CMD_UNK_0D = 0x0D, - CMD_UNK_0E = 0x0E, + CMD_OUTPUT = 0x0E, CMD_END = 0x0F, CMD_UNK_10 = 0x10, CMD_UNK_11 = 0x11, @@ -69,6 +69,10 @@ private: CMD_UNK_13 = 0x13, }; + // 32 * 5 because 32 samples per millisecond, for 5 milliseconds. + int m_samples_left[32 * 5]; + int m_samples_right[32 * 5]; + // Volatile because it's set by HandleMail and accessed in // HandleCommandList, which are running in two different threads. volatile u16 m_cmdlist[512]; @@ -90,7 +94,9 @@ private: void AXThread(); void HandleCommandList(); + void SetupProcessing(u32 studio_addr); void ProcessPBList(u32 pb_addr); + void OutputSamples(u32 out_addr); }; #endif // !_UCODE_NEWAX_H From 6a1241c03e3adc3a74b5f6dda9ea42f7316ce049 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 11:25:27 +0100 Subject: [PATCH 084/627] Make a hack optional to fix 48KHz output mode with NewAX --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 11 ++++++++--- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index bf5e4d9b6b..1d35ed797a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -100,12 +100,17 @@ inline bool WritePB(u32 addr, AXPBWii &PB) template inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, - int _iSize) + int _iSize, bool resample = true) { if (pb.running) { - const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) - * /*ratioFactor:*/((float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate())); + float ratioFactor; + if (resample) + ratioFactor = (float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate(); + else + ratioFactor = 1.0; + + const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) * ratioFactor); u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index ea9dd57e3c..7df82287f7 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -263,7 +263,7 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) VoiceHacks(pb); MixAddVoice(pb, m_samples_left + spms * curr_ms, - m_samples_right + spms * curr_ms, spms); + m_samples_right + spms * curr_ms, spms, false); } WritePB(pb_addr, pb); From 24d430eba0026b2efbbed180c8b3b53b50e947a7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 11:32:57 +0100 Subject: [PATCH 085/627] Add NewAX to the VC++ project files --- Source/Core/Core/Core.vcxproj | 4 +++- Source/Core/Core/Core.vcxproj.filters | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e03d40e43a..fb2d0bafdf 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -265,6 +265,7 @@ + @@ -466,6 +467,7 @@ + @@ -592,4 +594,4 @@ - \ No newline at end of file + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 020cf76ad0..482b2bd9b5 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -206,6 +206,9 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -748,6 +751,9 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -1174,4 +1180,4 @@ {3e9e6e83-c1bf-45f9-aeff-231f98f60d29} - \ No newline at end of file + From db46ccd1757f763bbbf7108a8c47ed060b1df1c5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 12:08:41 +0100 Subject: [PATCH 086/627] More accurate mixing buffers initialization using parameters from command 00 --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 7df82287f7..1ee0c799f3 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -232,13 +232,38 @@ static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) void CUCode_NewAX::SetupProcessing(u32 studio_addr) { - // Initialize to 0. Real hardware initializes using values from studio_addr - // (to have volume ramps instead of 0), but we don't emulate this yet. + u16 studio_data[0x20]; - (void)studio_addr; + for (u32 i = 0; i < 0x20; ++i) + studio_data[i] = HLEMemory_Read_U16(studio_addr + 2 * i); - memset(m_samples_left, 0, sizeof (m_samples_left)); - memset(m_samples_right, 0, sizeof (m_samples_right)); + // studio_data[0, 1, 2] are for left samples volume ramping + s32 left_init = (s32)((studio_data[0] << 16) | studio_data[1]); + s16 left_delta = (s16)studio_data[2]; + if (!left_init) + memset(m_samples_left, 0, sizeof (m_samples_left)); + else + { + for (u32 i = 0; i < 32 * 5; ++i) + { + m_samples_left[i] = left_init; + left_init -= left_delta; + } + } + + // studio_data[3, 4, 5] are for right samples volume ramping + s32 right_init = (s32)((studio_data[0] << 16) | studio_data[1]); + s16 right_delta = (s16)studio_data[2]; + if (!right_init) + memset(m_samples_right, 0, sizeof (m_samples_right)); + else + { + for (u32 i = 0; i < 32 * 5; ++i) + { + m_samples_right[i] = right_init; + right_init -= right_delta; + } + } } void CUCode_NewAX::ProcessPBList(u32 pb_addr) From 61c1fab2c62e2f841590e91cbcd4450f5f432bfa Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 12:13:19 +0100 Subject: [PATCH 087/627] Fix Windows support again: std::thread can't take a member pointer with StdThread.h from Common --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 7 ++++++- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 1ee0c799f3..0662511f92 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -28,7 +28,7 @@ CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) , m_cmdlist_size(0) - , m_axthread(&CUCode_NewAX::AXThread, this) + , m_axthread(&SpawnAXThread, this) { m_rMailHandler.PushMail(DSP_INIT); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); @@ -43,6 +43,11 @@ CUCode_NewAX::~CUCode_NewAX() m_rMailHandler.Clear(); } +void CUCode_NewAX::SpawnAXThread(CUCode_NewAX* self) +{ + self->AXThread(); +} + void CUCode_NewAX::AXThread() { while (true) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 12886c5724..118d64e7ab 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -32,6 +32,10 @@ public: void Update(int cycles); void DoState(PointerWrap& p); + // Needed because StdThread.h std::thread implem does not support member + // pointers. + static void SpawnAXThread(CUCode_NewAX* self); + private: enum MailType { From 5ce7728b91400f0dbe63d89a67b3b2098ee6a596 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Wed, 14 Nov 2012 18:48:42 +0200 Subject: [PATCH 088/627] Gameini database update/additions for NBA LIVE 06, NBA LIVE 2005, NBA LIVE 2004, NBA Live 2003, Pokemon Colosseum, Dark Summit, 4x4 Evolution 2, Skies of Arcadia Legends, Need For Speed : Hot Pursuit 2, Mission: Impossible Operation Surma, TALES OF SYMPHONIA, CITY RACER, DISNEY'S TARZAN, Blowout, WAVE RACE / BLUE STORM, Pokepark Wii, ONEPIECE UNLIMITED ADVENTURE, ONEPIECE UNLIMITED CRUISE EPISODE 2, Mario & Sonic at the Olympic Winter Games, Worms Battle Islands, Shrek 2, Summoner 2, Rubik's Puzzle World, Kirby's Dream Collection Special Edition. --- Data/User/GameConfig/G3RD52.ini | 16 ++++++++++++++++ Data/User/GameConfig/G3RE52.ini | 16 ++++++++++++++++ Data/User/GameConfig/G3RF52.ini | 16 ++++++++++++++++ Data/User/GameConfig/G3RP52.ini | 16 ++++++++++++++++ Data/User/GameConfig/G6NE69.ini | 11 ++++++++++- Data/User/GameConfig/G6NP69.ini | 11 ++++++++++- Data/User/GameConfig/GC6E01.ini | 3 +-- Data/User/GameConfig/GC6P01.ini | 2 +- Data/User/GameConfig/GDSE78.ini | 17 ++++++++++++++--- Data/User/GameConfig/GDSP78.ini | 19 +++++++++++++++++++ Data/User/GameConfig/GE4E7D.ini | 13 +++++++++++-- Data/User/GameConfig/GEAE8P.ini | 2 +- Data/User/GameConfig/GEAP8P.ini | 2 +- Data/User/GameConfig/GH2E69.ini | 30 ++++++++++++++++++------------ Data/User/GameConfig/GH2P69.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GLYE69.ini | 12 +++++++++++- Data/User/GameConfig/GLYP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GMIE70.ini | 5 ++++- Data/User/GameConfig/GMIP70.ini | 5 ++++- Data/User/GameConfig/GN8E69.ini | 15 +++++++++++++++ Data/User/GameConfig/GN8P69.ini | 15 +++++++++++++++ Data/User/GameConfig/GNLE69.ini | 15 +++++++++++++++ Data/User/GameConfig/GQSDAF.ini | 2 +- Data/User/GameConfig/GQSEAF.ini | 3 +-- Data/User/GameConfig/GQSFAF.ini | 2 +- Data/User/GameConfig/GQSPAF.ini | 2 +- Data/User/GameConfig/GRQE41.ini | 15 +++++++++++++-- Data/User/GameConfig/GS2D78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GS2E78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GS2F78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GS2P78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GTZE41.ini | 15 +++++++++++++-- Data/User/GameConfig/GTZP41.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GWOE5G.ini | 14 ++++++++++++-- Data/User/GameConfig/GWRE01.ini | 2 +- Data/User/GameConfig/GWRP01.ini | 2 +- Data/User/GameConfig/R8AE01.ini | 2 ++ Data/User/GameConfig/RIPEAF.ini | 2 +- Data/User/GameConfig/RIPJAF.ini | 2 +- Data/User/GameConfig/RIPPAF.ini | 2 +- Data/User/GameConfig/RIUJAF.ini | 2 +- Data/User/GameConfig/RIUPAF.ini | 2 +- Data/User/GameConfig/ROLE8P.ini | 6 +++--- Data/User/GameConfig/ROLJ01.ini | 6 +++--- Data/User/GameConfig/ROLK01.ini | 6 +++--- Data/User/GameConfig/ROLP8P.ini | 6 +++--- Data/User/GameConfig/ROUJAF.ini | 2 +- Data/User/GameConfig/ROUPAF.ini | 2 +- Data/User/GameConfig/RRZEGY.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RRZPGY.ini | 18 ++++++++++++++++++ Data/User/GameConfig/S72E01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/S72J01.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SILE78.ini | 5 ++--- Data/User/GameConfig/SILP78.ini | 5 ++--- 54 files changed, 479 insertions(+), 65 deletions(-) create mode 100644 Data/User/GameConfig/G3RD52.ini create mode 100644 Data/User/GameConfig/G3RE52.ini create mode 100644 Data/User/GameConfig/G3RF52.ini create mode 100644 Data/User/GameConfig/G3RP52.ini create mode 100644 Data/User/GameConfig/GDSP78.ini create mode 100644 Data/User/GameConfig/GH2P69.ini create mode 100644 Data/User/GameConfig/GLYP69.ini create mode 100644 Data/User/GameConfig/GN8E69.ini create mode 100644 Data/User/GameConfig/GN8P69.ini create mode 100644 Data/User/GameConfig/GNLE69.ini create mode 100644 Data/User/GameConfig/GS2D78.ini create mode 100644 Data/User/GameConfig/GS2E78.ini create mode 100644 Data/User/GameConfig/GS2F78.ini create mode 100644 Data/User/GameConfig/GS2P78.ini create mode 100644 Data/User/GameConfig/GTZP41.ini create mode 100644 Data/User/GameConfig/RRZEGY.ini create mode 100644 Data/User/GameConfig/RRZPGY.ini create mode 100644 Data/User/GameConfig/S72E01.ini create mode 100644 Data/User/GameConfig/S72J01.ini diff --git a/Data/User/GameConfig/G3RD52.ini b/Data/User/GameConfig/G3RD52.ini new file mode 100644 index 0000000000..e939d6e28a --- /dev/null +++ b/Data/User/GameConfig/G3RD52.ini @@ -0,0 +1,16 @@ +# G3RD52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RE52.ini b/Data/User/GameConfig/G3RE52.ini new file mode 100644 index 0000000000..15a742f636 --- /dev/null +++ b/Data/User/GameConfig/G3RE52.ini @@ -0,0 +1,16 @@ +# G3RE52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RF52.ini b/Data/User/GameConfig/G3RF52.ini new file mode 100644 index 0000000000..cde2d9a8ca --- /dev/null +++ b/Data/User/GameConfig/G3RF52.ini @@ -0,0 +1,16 @@ +# G3RF52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G3RP52.ini b/Data/User/GameConfig/G3RP52.ini new file mode 100644 index 0000000000..bb42289bd9 --- /dev/null +++ b/Data/User/GameConfig/G3RP52.ini @@ -0,0 +1,16 @@ +# G3RP52 - Shrek 2 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need lle audio to be fixed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 1 +PH_ExtraParam = 0 +PH_ZNear = 20 +PH_ZFar = 1.99998 +[Gecko] diff --git a/Data/User/GameConfig/G6NE69.ini b/Data/User/GameConfig/G6NE69.ini index 832bea8e5f..9759e5911d 100644 --- a/Data/User/GameConfig/G6NE69.ini +++ b/Data/User/GameConfig/G6NE69.ini @@ -2,6 +2,15 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G6NP69.ini b/Data/User/GameConfig/G6NP69.ini index 8a35467139..314a7ae4f5 100644 --- a/Data/User/GameConfig/G6NP69.ini +++ b/Data/User/GameConfig/G6NP69.ini @@ -2,6 +2,15 @@ [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/User/GameConfig/GC6E01.ini index 6b8e2c10c3..b745ef89b2 100644 --- a/Data/User/GameConfig/GC6E01.ini +++ b/Data/User/GameConfig/GC6E01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE music drops notes, if EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur +EmulationIssues = If EFB scale is not integral, serious texture glitches occur. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -16,4 +16,3 @@ PH_ZFar = [Video_Settings] EFBScale = 1 SafeTextureCacheColorSamples = 0 - diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/User/GameConfig/GC6P01.ini index e5ed8f4587..4ebad29a0f 100644 --- a/Data/User/GameConfig/GC6P01.ini +++ b/Data/User/GameConfig/GC6P01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE music drops notes, if EFB scale is not integral, 1x, 2x or 3x serious texture glitches occur +EmulationIssues = If EFB scale is not integral, serious texture glitches occur. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GDSE78.ini b/Data/User/GameConfig/GDSE78.ini index 36adee24cc..d315811b96 100644 --- a/Data/User/GameConfig/GDSE78.ini +++ b/Data/User/GameConfig/GDSE78.ini @@ -1,8 +1,19 @@ # GDSE78 - Dark Summit [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GDSP78.ini b/Data/User/GameConfig/GDSP78.ini new file mode 100644 index 0000000000..acebf51c09 --- /dev/null +++ b/Data/User/GameConfig/GDSP78.ini @@ -0,0 +1,19 @@ +# GDSP78 - Dark Summit +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GE4E7D.ini b/Data/User/GameConfig/GE4E7D.ini index 234c5a4812..66d98e1fe3 100644 --- a/Data/User/GameConfig/GE4E7D.ini +++ b/Data/User/GameConfig/GE4E7D.ini @@ -1,8 +1,17 @@ # GE4E7D - 4x4 Evolution 2 [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Stuck at +EmulationStateId = 4 +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini index 95afa9f062..3cf24a25c5 100644 --- a/Data/User/GameConfig/GEAE8P.ini +++ b/Data/User/GameConfig/GEAE8P.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. +EmulationIssues = Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini index 92aa6472a9..e9fcefdcea 100644 --- a/Data/User/GameConfig/GEAP8P.ini +++ b/Data/User/GameConfig/GEAP8P.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches. +EmulationIssues = Gfx glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GH2E69.ini b/Data/User/GameConfig/GH2E69.ini index 8f8edf2532..b1f64e6ef7 100644 --- a/Data/User/GameConfig/GH2E69.ini +++ b/Data/User/GameConfig/GH2E69.ini @@ -1,12 +1,18 @@ -# GH2E69 - NFS: HP2 -[Core] Values set here will override the main dolphin settings. -MMU = 1 -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Intro videos are messed up, skip them. Game is slow (r6651) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] - +# GH2E69 - NFS: HP2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GH2P69.ini b/Data/User/GameConfig/GH2P69.ini new file mode 100644 index 0000000000..006dad78dc --- /dev/null +++ b/Data/User/GameConfig/GH2P69.ini @@ -0,0 +1,18 @@ +# GH2P69 - NFS: HP2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Intro videos are messed up, skip them. Needs LLE audio for proper sound and the game is slow. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GLYE69.ini b/Data/User/GameConfig/GLYE69.ini index 160e0444b8..da2c0b1537 100644 --- a/Data/User/GameConfig/GLYE69.ini +++ b/Data/User/GameConfig/GLYE69.ini @@ -1,6 +1,16 @@ # GLYE69 - NBA LIVE 2005 [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GLYP69.ini b/Data/User/GameConfig/GLYP69.ini new file mode 100644 index 0000000000..84392be595 --- /dev/null +++ b/Data/User/GameConfig/GLYP69.ini @@ -0,0 +1,16 @@ +# GLYP69 - NBA LIVE 2005 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GMIE70.ini b/Data/User/GameConfig/GMIE70.ini index f32657ffaa..7e3be02a66 100644 --- a/Data/User/GameConfig/GMIE70.ini +++ b/Data/User/GameConfig/GMIE70.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,3 +17,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GMIP70.ini b/Data/User/GameConfig/GMIP70.ini index 2738d6e0c4..1fb1521e83 100644 --- a/Data/User/GameConfig/GMIP70.ini +++ b/Data/User/GameConfig/GMIP70.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs Efb to Ram for Sonic Imager (gadgets). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -17,3 +17,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GN8E69.ini b/Data/User/GameConfig/GN8E69.ini new file mode 100644 index 0000000000..3129860bb7 --- /dev/null +++ b/Data/User/GameConfig/GN8E69.ini @@ -0,0 +1,15 @@ +# GN8E69 - NBA LIVE 2004 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GN8P69.ini b/Data/User/GameConfig/GN8P69.ini new file mode 100644 index 0000000000..f56f46bfcd --- /dev/null +++ b/Data/User/GameConfig/GN8P69.ini @@ -0,0 +1,15 @@ +# GN8P69 - NBA LIVE 2004 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GNLE69.ini b/Data/User/GameConfig/GNLE69.ini new file mode 100644 index 0000000000..68dcf3183b --- /dev/null +++ b/Data/User/GameConfig/GNLE69.ini @@ -0,0 +1,15 @@ +# GNLE69 - NBA Live 2003 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/User/GameConfig/GQSDAF.ini index bf754eb2c5..1b7d9a176c 100644 --- a/Data/User/GameConfig/GQSDAF.ini +++ b/Data/User/GameConfig/GQSDAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini index 5ab40734e7..df7fae9cf3 100644 --- a/Data/User/GameConfig/GQSEAF.ini +++ b/Data/User/GameConfig/GQSEAF.ini @@ -426,7 +426,7 @@ EmulationStateId = 4 # Max Affection codes # use only one of these codes at a time for your # favorite character to have max affection. -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] $(M) (Datel) @@ -790,4 +790,3 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] DlistCachingEnable = False - diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/User/GameConfig/GQSFAF.ini index 56bc287e7e..8eb054e980 100644 --- a/Data/User/GameConfig/GQSFAF.ini +++ b/Data/User/GameConfig/GQSFAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/User/GameConfig/GQSPAF.ini index 64132e6ca7..b7b70f5476 100644 --- a/Data/User/GameConfig/GQSPAF.ini +++ b/Data/User/GameConfig/GQSPAF.ini @@ -5,7 +5,7 @@ #The Emulation State. 1 is worst, 5 is best, 0 is not set. #Emulation state validated on r1648 EmulationStateId = 4 -EmulationIssues = Sound issues need LLE plugin to be solved.(r7184) +EmulationIssues = [OnFrame] [ActionReplay] [Video] diff --git a/Data/User/GameConfig/GRQE41.ini b/Data/User/GameConfig/GRQE41.ini index c4fbb2e36f..b03f78efd5 100644 --- a/Data/User/GameConfig/GRQE41.ini +++ b/Data/User/GameConfig/GRQE41.ini @@ -1,7 +1,18 @@ # GRQE41 - CITY RACER [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = Nothing +EmulationStateId = 2 +EmulationIssues = Needs lle audio for sound and real XFB for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2D78.ini b/Data/User/GameConfig/GS2D78.ini new file mode 100644 index 0000000000..85bcce0ad9 --- /dev/null +++ b/Data/User/GameConfig/GS2D78.ini @@ -0,0 +1,18 @@ +# GS2D78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2E78.ini b/Data/User/GameConfig/GS2E78.ini new file mode 100644 index 0000000000..ed66cb0da2 --- /dev/null +++ b/Data/User/GameConfig/GS2E78.ini @@ -0,0 +1,18 @@ +# GS2E78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2F78.ini b/Data/User/GameConfig/GS2F78.ini new file mode 100644 index 0000000000..baa39b549c --- /dev/null +++ b/Data/User/GameConfig/GS2F78.ini @@ -0,0 +1,18 @@ +# GS2F78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GS2P78.ini b/Data/User/GameConfig/GS2P78.ini new file mode 100644 index 0000000000..79fdc07d89 --- /dev/null +++ b/Data/User/GameConfig/GS2P78.ini @@ -0,0 +1,18 @@ +# GS2P78 - Summoner 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GTZE41.ini b/Data/User/GameConfig/GTZE41.ini index bf6dbaac1d..be20078a64 100644 --- a/Data/User/GameConfig/GTZE41.ini +++ b/Data/User/GameConfig/GTZE41.ini @@ -1,7 +1,18 @@ # GTZE41 - DISNEY'S TARZAN [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GTZP41.ini b/Data/User/GameConfig/GTZP41.ini new file mode 100644 index 0000000000..4a350e41c6 --- /dev/null +++ b/Data/User/GameConfig/GTZP41.ini @@ -0,0 +1,18 @@ +# GTZP41 - DISNEY'S TARZAN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for videos to display and LLE audio for proper sound and stability (hle freezes ingame). +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GWOE5G.ini b/Data/User/GameConfig/GWOE5G.ini index 7960d2dc81..44ebf853ef 100644 --- a/Data/User/GameConfig/GWOE5G.ini +++ b/Data/User/GameConfig/GWOE5G.ini @@ -1,7 +1,17 @@ # GWOE5G - Blowout [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -Issues="Does Nothing" +EmulationStateId = 4 +EmulationIssues = Needs LLE audio to get ingame. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/User/GameConfig/GWRE01.ini index 6bb9265887..17d0f32cdf 100644 --- a/Data/User/GameConfig/GWRE01.ini +++ b/Data/User/GameConfig/GWRE01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = needs the frame cheats from ini +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $(m) diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/User/GameConfig/GWRP01.ini index ff622dc857..bdeeeb8654 100644 --- a/Data/User/GameConfig/GWRP01.ini +++ b/Data/User/GameConfig/GWRP01.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = goes to before race with framepatch +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [Video] ProjectionHack = 0 diff --git a/Data/User/GameConfig/R8AE01.ini b/Data/User/GameConfig/R8AE01.ini index af8a1a8a8b..56e5afe685 100644 --- a/Data/User/GameConfig/R8AE01.ini +++ b/Data/User/GameConfig/R8AE01.ini @@ -13,6 +13,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/User/GameConfig/RIPEAF.ini index da321f88ce..6373ea5568 100644 --- a/Data/User/GameConfig/RIPEAF.ini +++ b/Data/User/GameConfig/RIPEAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/User/GameConfig/RIPJAF.ini index dbbee55ffb..1cf02a9079 100644 --- a/Data/User/GameConfig/RIPJAF.ini +++ b/Data/User/GameConfig/RIPJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/User/GameConfig/RIPPAF.ini index 64d6ac3fd5..b6b9edb6fb 100644 --- a/Data/User/GameConfig/RIPPAF.ini +++ b/Data/User/GameConfig/RIPPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/User/GameConfig/RIUJAF.ini index e18411c3ff..49dac820e4 100644 --- a/Data/User/GameConfig/RIUJAF.ini +++ b/Data/User/GameConfig/RIUJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RIUPAF.ini b/Data/User/GameConfig/RIUPAF.ini index 2192cb63bd..a557f4e1da 100644 --- a/Data/User/GameConfig/RIUPAF.ini +++ b/Data/User/GameConfig/RIUPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/ROLE8P.ini b/Data/User/GameConfig/ROLE8P.ini index 9fb165c654..607d412d7f 100644 --- a/Data/User/GameConfig/ROLE8P.ini +++ b/Data/User/GameConfig/ROLE8P.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLJ01.ini b/Data/User/GameConfig/ROLJ01.ini index 59e58e525a..43348472b6 100644 --- a/Data/User/GameConfig/ROLJ01.ini +++ b/Data/User/GameConfig/ROLJ01.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLK01.ini b/Data/User/GameConfig/ROLK01.ini index 51ee178104..0b49240afd 100644 --- a/Data/User/GameConfig/ROLK01.ini +++ b/Data/User/GameConfig/ROLK01.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROLP8P.ini b/Data/User/GameConfig/ROLP8P.ini index b969360e00..e39bc91547 100644 --- a/Data/User/GameConfig/ROLP8P.ini +++ b/Data/User/GameConfig/ROLP8P.ini @@ -2,16 +2,16 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use Direct 3d 11 backend. +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] -ProjectionHack = 0 +ProjectionHack = 1 PH_SZNear = 0 PH_SZFar = 0 PH_ExtraParam = 0 PH_ZNear = -PH_ZFar = +PH_ZFar = 0.01 [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/User/GameConfig/ROUJAF.ini index 5dea114bf6..ddea43bdf2 100644 --- a/Data/User/GameConfig/ROUJAF.ini +++ b/Data/User/GameConfig/ROUJAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/ROUPAF.ini b/Data/User/GameConfig/ROUPAF.ini index 5f9b8e0ce7..82f940a178 100644 --- a/Data/User/GameConfig/ROUPAF.ini +++ b/Data/User/GameConfig/ROUPAF.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use direct3D11 plugin (r6932) +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RRZEGY.ini b/Data/User/GameConfig/RRZEGY.ini new file mode 100644 index 0000000000..78a1056318 --- /dev/null +++ b/Data/User/GameConfig/RRZEGY.ini @@ -0,0 +1,18 @@ +# RRZEGY - Rubik's Puzzle World +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/RRZPGY.ini b/Data/User/GameConfig/RRZPGY.ini new file mode 100644 index 0000000000..b7b812a090 --- /dev/null +++ b/Data/User/GameConfig/RRZPGY.ini @@ -0,0 +1,18 @@ +# RRZPGY - Rubik's Puzzle World +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/S72E01.ini b/Data/User/GameConfig/S72E01.ini new file mode 100644 index 0000000000..fba45b8b64 --- /dev/null +++ b/Data/User/GameConfig/S72E01.ini @@ -0,0 +1,18 @@ +# S72E01 - Kirby's Dream Collection Special Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Classic games are unplayable. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/S72J01.ini b/Data/User/GameConfig/S72J01.ini new file mode 100644 index 0000000000..74c8225e3a --- /dev/null +++ b/Data/User/GameConfig/S72J01.ini @@ -0,0 +1,18 @@ +# S72J01 - Hoshi No Kirby: 20th Anniversary Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 3 +EmulationIssues = Classic games are unplayable. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/SILE78.ini b/Data/User/GameConfig/SILE78.ini index 7a7de8fcee..ec3df3964d 100644 --- a/Data/User/GameConfig/SILE78.ini +++ b/Data/User/GameConfig/SILE78.ini @@ -1,9 +1,10 @@ # SILE78 - Worms Battle Islands [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -14,7 +15,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Hardware] -VSync = False [Video_Settings] SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SILP78.ini b/Data/User/GameConfig/SILP78.ini index 3be5d8870f..0f5c7dd381 100644 --- a/Data/User/GameConfig/SILP78.ini +++ b/Data/User/GameConfig/SILP78.ini @@ -1,9 +1,10 @@ # SILP78 - Worms Battle Islands [Core] Values set here will override the main dolphin settings. TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Idleskipping causes speed issues(menus,etc.) [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -14,7 +15,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Hardware] -VSync = False [Video_Settings] SafeTextureCacheColorSamples = 512 From a630357c9e4e73032604e30ed59a446aea9489d9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 17:55:16 +0100 Subject: [PATCH 089/627] Add AUX mixing support as well as a send&return effect implementation --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 7 +- .../Src/HW/DSPHLE/UCodes/UCode_AXStructs.h | 11 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 10 +- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 40 ++++- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 154 +++++++++++++----- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 16 +- 6 files changed, 183 insertions(+), 55 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 74c9d24db4..d990d282d7 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -158,6 +158,11 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) memset(temprbuffer, 0, _iSize * sizeof(int)); AXPB PB; + AXBuffers buffers = {{ + templbuffer, + temprbuffer, + NULL + }}; for (int x = 0; x < numPBaddr; x++) { @@ -175,7 +180,7 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) if (m_CRC != 0x3389a79e) VoiceHacks(PB); - MixAddVoice(PB, templbuffer, temprbuffer, _iSize); + MixAddVoice(PB, buffers, _iSize); if (!WritePB(blockAddr, PB)) break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h index 7f082740de..3217448268 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -25,7 +25,16 @@ struct PBMixer u16 right; u16 right_delta; - u16 unknown3[8]; + u16 auxA_left; + u16 auxA_left_delta; + u16 auxA_right; + u16 auxA_right_delta; + + u16 auxB_left; + u16 auxB_left_delta; + u16 auxB_right; + u16 auxB_right_delta; + u16 unknown4[6]; }; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 03b1d3b75b..62d3bac6e4 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -101,15 +101,21 @@ void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize) if (!blockAddr) return; + AXBuffers buffers = {{ + templbuffer, + temprbuffer, + NULL + }}; + for (int i = 0; i < NUMBER_OF_PBS; i++) { if (!ReadPB(blockAddr, PB)) break; if (wiisportsHack) - MixAddVoice(*(AXPBWiiSports*)&PB, templbuffer, temprbuffer, _iSize); + MixAddVoice(*(AXPBWiiSports*)&PB, buffers, _iSize); else - MixAddVoice(PB, templbuffer, temprbuffer, _iSize); + MixAddVoice(PB, buffers, _iSize); if (!WritePB(blockAddr, PB)) break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 1d35ed797a..f59693698c 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -94,12 +94,26 @@ inline bool WritePB(u32 addr, AXPBWii &PB) return true; } +union AXBuffers +{ + struct + { + int* left; + int* right; + int* auxA_left; + int* auxA_right; + int* auxB_left; + int* auxB_right; + }; + + int* ptrs[6]; +}; + ////////////////////////////////////////////////////////////////////////// // TODO: fix handling of gc/wii PB differences // TODO: generally fix up the mess - looks crazy and kinda wrong template -inline void MixAddVoice(ParamBlockType &pb, - int *templbuffer, int *temprbuffer, +inline void MixAddVoice(ParamBlockType &pb, const AXBuffers& buffers, int _iSize, bool resample = true) { if (pb.running) @@ -230,11 +244,25 @@ inline void MixAddVoice(ParamBlockType &pb, int leftmix = pb.mixer.left >> 5; int rightmix = pb.mixer.right >> 5; + int auxAleftmix = pb.mixer.auxA_left >> 5; + int auxArightmix= pb.mixer.auxA_right >> 5; + int auxBleftmix = pb.mixer.auxB_left >> 5; + int auxBrightmix= pb.mixer.auxB_right >> 5; + int left = sample * leftmix >> 8; int right = sample * rightmix >> 8; + int auxAleft = sample * auxAleftmix >> 8; + int auxAright = sample * auxArightmix >> 8; + int auxBleft = sample * auxBleftmix >> 8; + int auxBright = sample * auxBrightmix >> 8; + // adpcm has to walk from oldSamplePos to samplePos here - templbuffer[s] += left; - temprbuffer[s] += right; + if ((pb.mixer_control & 1) && buffers.left) buffers.left[s] += left; + if ((pb.mixer_control & 2) && buffers.right) buffers.right [s] += right; + if ((pb.mixer_control & 16) && buffers.auxA_left) buffers.auxA_left[s] += auxAleft; + if ((pb.mixer_control & 32) && buffers.auxA_right) buffers.auxA_right[s] += auxAright; + if ((pb.mixer_control & 512) && buffers.auxB_left) buffers.auxB_left[s] += auxBleft; + if ((pb.mixer_control & 1024) && buffers.auxB_right) buffers.auxB_right[s] += auxBright; // Control the behavior when we reach the end of the sample if (samplePos >= sampleEnd) @@ -265,6 +293,10 @@ inline void MixAddVoice(ParamBlockType &pb, // Update volume pb.mixer.left = ADPCM_Vol(pb.mixer.left, pb.mixer.left_delta); pb.mixer.right = ADPCM_Vol(pb.mixer.right, pb.mixer.right_delta); + pb.mixer.auxA_left = ADPCM_Vol(pb.mixer.auxA_left, pb.mixer.auxA_left_delta); + pb.mixer.auxA_right = ADPCM_Vol(pb.mixer.auxA_right, pb.mixer.auxA_right_delta); + pb.mixer.auxB_left = ADPCM_Vol(pb.mixer.auxB_left, pb.mixer.auxB_left_delta); + pb.mixer.auxB_right = ADPCM_Vol(pb.mixer.auxB_right, pb.mixer.auxB_right_delta); pb.src.cur_addr_frac = (u16)frac; pb.audio_addr.cur_addr_hi = samplePos >> 16; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 0662511f92..6549c7dcad 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -80,7 +80,9 @@ void CUCode_NewAX::NotifyAXThread() void CUCode_NewAX::HandleCommandList() { + // Temp variables for addresses computation u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; u32 pb_addr = 0; @@ -96,7 +98,7 @@ void CUCode_NewAX::HandleCommandList() // A lot of these commands are unknown, or unused in this AX HLE. // We still need to skip their arguments using "curr_idx += N". - case CMD_STUDIO_ADDR: + case CMD_SETUP: addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; SetupProcessing(HILO_TO_32(addr)); @@ -114,9 +116,22 @@ void CUCode_NewAX::HandleCommandList() ProcessPBList(pb_addr); break; - case CMD_UNK_04: curr_idx += 4; break; - case CMD_UNK_05: curr_idx += 4; break; - case CMD_UNK_06: curr_idx += 2; break; + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + // These two commands are handled almost the same internally. + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd == CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + + case CMD_MIX_AUXB_NOWRITE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(false, 0, HILO_TO_32(addr)); + break; + case CMD_SBUFFER_ADDR: curr_idx += 2; break; case CMD_UNK_08: curr_idx += 10; break; // TODO: check case CMD_UNK_09: curr_idx += 2; break; @@ -126,7 +141,8 @@ void CUCode_NewAX::HandleCommandList() case CMD_UNK_0D: curr_idx += 2; break; case CMD_OUTPUT: - // Skip the first address, we don't know what it's used for. + // Skip the first address, it is used for surround audio + // output, which we don't support yet. curr_idx += 2; addr_hi = m_cmdlist[curr_idx++]; @@ -235,38 +251,43 @@ static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) } } -void CUCode_NewAX::SetupProcessing(u32 studio_addr) +void CUCode_NewAX::SetupProcessing(u32 init_addr) { - u16 studio_data[0x20]; + u16 init_data[0x20]; for (u32 i = 0; i < 0x20; ++i) - studio_data[i] = HLEMemory_Read_U16(studio_addr + 2 * i); + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); - // studio_data[0, 1, 2] are for left samples volume ramping - s32 left_init = (s32)((studio_data[0] << 16) | studio_data[1]); - s16 left_delta = (s16)studio_data[2]; - if (!left_init) - memset(m_samples_left, 0, sizeof (m_samples_left)); - else - { - for (u32 i = 0; i < 32 * 5; ++i) - { - m_samples_left[i] = left_init; - left_init -= left_delta; - } - } + // List of all buffers we have to initialize + int* buffers[] = { + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround + }; - // studio_data[3, 4, 5] are for right samples volume ramping - s32 right_init = (s32)((studio_data[0] << 16) | studio_data[1]); - s16 right_delta = (s16)studio_data[2]; - if (!right_init) - memset(m_samples_right, 0, sizeof (m_samples_right)); - else + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) { - for (u32 i = 0; i < 32 * 5; ++i) + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i], 0, 5 * 32 * sizeof (int)); + else { - m_samples_right[i] = right_init; - right_init -= right_delta; + for (u32 j = 0; j < 32 * 5; ++j) + { + buffers[i][j] = init_val; + init_val -= delta; + } } } } @@ -275,12 +296,21 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) { // Samples per millisecond. In theory DSP sampling rate can be changed from // 32KHz to 48KHz, but AX always process at 32KHz. - u32 spms = 32; + const u32 spms = 32; AXPB pb; while (pb_addr) { + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxB_left, + m_samples_auxB_right + }}; + if (!ReadPB(pb_addr, pb)) break; @@ -292,18 +322,62 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) if (m_CRC != 0x3389a79e) VoiceHacks(pb); - MixAddVoice(pb, m_samples_left + spms * curr_ms, - m_samples_right + spms * curr_ms, spms, false); + MixAddVoice(pb, buffers, spms, false); + + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; } WritePB(pb_addr, pb); pb_addr = HILO_TO_32(pb.next_pb); } +} - // Clamp to 16 bits. - // TODO: check the clamping is done in this command and not in a later - // command. - for (u32 i = 0; i < 5 * spms; ++i) +void CUCode_NewAX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) +{ + int buffers[3][5 * 32]; + + // First, we need to send the contents of our AUX buffers to the CPU. + if (write_addr) + { + for (u32 i = 0; i < 5 * 32; ++i) + { + if (AUXA) + { + buffers[0][i] = Common::swap32(m_samples_auxA_left[i]); + buffers[1][i] = Common::swap32(m_samples_auxA_right[i]); + buffers[2][i] = Common::swap32(m_samples_auxA_surround[i]); + } + else + { + buffers[0][i] = Common::swap32(m_samples_auxB_left[i]); + buffers[1][i] = Common::swap32(m_samples_auxB_right[i]); + buffers[2][i] = Common::swap32(m_samples_auxB_surround[i]); + } + } + memset(buffers, 0, sizeof (buffers)); + memcpy(HLEMemory_Get_Pointer(write_addr), buffers, sizeof (buffers)); + } + + // Then, we read the new buffers from the CPU and add to our current + // buffers. + memcpy(buffers, HLEMemory_Get_Pointer(read_addr), sizeof (buffers)); + for (u32 i = 0; i < 5 * 32; ++i) + { + m_samples_left[i] += Common::swap32(buffers[0][i]); + m_samples_right[i] += Common::swap32(buffers[1][i]); + m_samples_surround[i] += Common::swap32(buffers[2][i]); + } +} + +void CUCode_NewAX::OutputSamples(u32 out_addr) +{ + // 32 samples per ms, 5 ms, 2 channels + short buffer[5 * 32 * 2]; + + // Clamp internal buffers to 16 bits. + for (u32 i = 0; i < 5 * 32; ++i) { int left = m_samples_left[i]; int right = m_samples_right[i]; @@ -316,12 +390,6 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) m_samples_left[i] = left; m_samples_right[i] = right; } -} - -void CUCode_NewAX::OutputSamples(u32 out_addr) -{ - // 32 samples per ms, 5 ms, 2 channels - short buffer[5 * 32 * 2]; for (u32 i = 0; i < 5 * 32; ++i) { diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 118d64e7ab..af4a2a4895 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -51,13 +51,13 @@ private: enum CmdType { - CMD_STUDIO_ADDR = 0x00, + CMD_SETUP = 0x00, CMD_UNK_01 = 0x01, CMD_PB_ADDR = 0x02, CMD_PROCESS = 0x03, - CMD_UNK_04 = 0x04, - CMD_UNK_05 = 0x05, - CMD_UNK_06 = 0x06, + CMD_MIX_AUXA = 0x04, + CMD_MIX_AUXB = 0x05, + CMD_MIX_AUXB_NOWRITE = 0x06, CMD_SBUFFER_ADDR = 0x07, CMD_UNK_08 = 0x08, CMD_UNK_09 = 0x09, @@ -76,6 +76,13 @@ private: // 32 * 5 because 32 samples per millisecond, for 5 milliseconds. int m_samples_left[32 * 5]; int m_samples_right[32 * 5]; + int m_samples_surround[32 * 5]; + int m_samples_auxA_left[32 * 5]; + int m_samples_auxA_right[32 * 5]; + int m_samples_auxA_surround[32 * 5]; + int m_samples_auxB_left[32 * 5]; + int m_samples_auxB_right[32 * 5]; + int m_samples_auxB_surround[32 * 5]; // Volatile because it's set by HandleMail and accessed in // HandleCommandList, which are running in two different threads. @@ -100,6 +107,7 @@ private: void HandleCommandList(); void SetupProcessing(u32 studio_addr); void ProcessPBList(u32 pb_addr); + void MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr); void OutputSamples(u32 out_addr); }; From f84f15c5bf84f862c3c4e889b68633cb711e1fb0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 18:03:55 +0100 Subject: [PATCH 090/627] Oops, forgot a memset which removed all AUX effects --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 6549c7dcad..c482a8ce8a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -356,7 +356,6 @@ void CUCode_NewAX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) buffers[2][i] = Common::swap32(m_samples_auxB_surround[i]); } } - memset(buffers, 0, sizeof (buffers)); memcpy(HLEMemory_Get_Pointer(write_addr), buffers, sizeof (buffers)); } From 531cc6aaf31af3d22635bb2581f1c91ebaf0c253 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 14 Nov 2012 18:08:29 +0100 Subject: [PATCH 091/627] Fixed AUXB_NOWRITE command number and implemented UPLOAD_LRS command (06) --- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 25 ++++++++++++++++--- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 5 ++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index c482a8ce8a..9bc43b0f04 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -126,15 +126,21 @@ void CUCode_NewAX::HandleCommandList() MixAUXSamples(cmd == CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); break; + case CMD_UPLOAD_LRS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + UploadLRS(HILO_TO_32(addr)); + break; + + case CMD_SBUFFER_ADDR: curr_idx += 2; break; + case CMD_UNK_08: curr_idx += 10; break; // TODO: check + case CMD_MIX_AUXB_NOWRITE: addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; MixAUXSamples(false, 0, HILO_TO_32(addr)); break; - case CMD_SBUFFER_ADDR: curr_idx += 2; break; - case CMD_UNK_08: curr_idx += 10; break; // TODO: check - case CMD_UNK_09: curr_idx += 2; break; case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; case CMD_UNK_0B: break; // TODO: check other versions case CMD_UNK_0C: break; // TODO: check other versions @@ -370,6 +376,19 @@ void CUCode_NewAX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) } } +void CUCode_NewAX::UploadLRS(u32 dst_addr) +{ + int buffers[3][5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + { + buffers[0][i] = Common::swap32(m_samples_left[i]); + buffers[1][i] = Common::swap32(m_samples_right[i]); + buffers[2][i] = Common::swap32(m_samples_surround[i]); + } + memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); +} + void CUCode_NewAX::OutputSamples(u32 out_addr) { // 32 samples per ms, 5 ms, 2 channels diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index af4a2a4895..91aa495c0e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -57,10 +57,10 @@ private: CMD_PROCESS = 0x03, CMD_MIX_AUXA = 0x04, CMD_MIX_AUXB = 0x05, - CMD_MIX_AUXB_NOWRITE = 0x06, + CMD_UPLOAD_LRS = 0x06, CMD_SBUFFER_ADDR = 0x07, CMD_UNK_08 = 0x08, - CMD_UNK_09 = 0x09, + CMD_MIX_AUXB_NOWRITE = 0x09, CMD_COMPRESSOR_TABLE_ADDR = 0x0A, CMD_UNK_0B = 0x0B, CMD_UNK_0C = 0x0C, @@ -108,6 +108,7 @@ private: void SetupProcessing(u32 studio_addr); void ProcessPBList(u32 pb_addr); void MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr); + void UploadLRS(u32 dst_addr); void OutputSamples(u32 out_addr); }; From f5a3379d712a1a71e5f196aa9d95e1deccec4c6c Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 14 Nov 2012 14:28:38 -0500 Subject: [PATCH 092/627] Add config option for mac address. Fixes issue 5694. --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/ConfigManager.h | 1 + .../Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 29 +++++++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 0c4fa04566..dbb9bf52b6 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -155,6 +155,7 @@ void SConfig::SaveSettings() ini.Set("General", "RecursiveGCMPaths", m_RecursiveISOFolder); ini.Set("General", "NANDRoot", m_NANDPath); + ini.Set("General", "WirelessMac", m_WirelessMac); // Interface ini.Set("Interface", "ConfirmStop", m_LocalCoreStartupParameter.bConfirmStop); @@ -282,6 +283,7 @@ void SConfig::LoadSettings() m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, m_NANDPath); DiscIO::cUIDsys::AccessInstance().UpdateLocation(); DiscIO::CSharedContent::AccessInstance().UpdateLocation(); + ini.Get("General", "WirelessMac", &m_WirelessMac); } { diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 0c8f3f1af1..ae0dab119a 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -75,6 +75,7 @@ struct SConfig : NonCopyable bool m_ListKorea; bool m_ListTaiwan; bool m_ListUnknown; + std::string m_WirelessMac; SysConf* m_SYSCONF; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 75db39b994..df058a470d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -46,6 +46,7 @@ it failed) #endif #include "WII_IPC_HLE_Device_net.h" +#include "../ConfigManager.h" #include "FileUtil.h" #include #include @@ -276,11 +277,36 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress) // No idea why the fifth and sixth bytes are left untouched. { // hardcoded address as a fallback - // TODO: Make this configurable? Different MAC addresses MIGHT be needed for requesting a user id or encrypting content with NWC24 const u8 default_address[] = { 0x00, 0x19, 0x1e, 0xfd, 0x71, 0x84 }; INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS"); + if (!SConfig::GetInstance().m_WirelessMac.empty()) + { + int x = 0; + int tmpaddress[6]; + for (int i = 0; i < SConfig::GetInstance().m_WirelessMac.length() && x < 6; i++) + { + if (SConfig::GetInstance().m_WirelessMac[i] == ':' || SConfig::GetInstance().m_WirelessMac[i] == '-') + continue; + + std::stringstream ss; + ss << std::hex << SConfig::GetInstance().m_WirelessMac[i]; + if (SConfig::GetInstance().m_WirelessMac[i+1] != ':' && SConfig::GetInstance().m_WirelessMac[i+1] != '-') + { + ss << std::hex << SConfig::GetInstance().m_WirelessMac[i+1]; + i++; + } + ss >> tmpaddress[x]; + x++; + } + u8 address[6]; + for (int i = 0; i < 6;i++) + address[i] = tmpaddress[i]; + Memory::WriteBigEData(address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); + break; + } + #if defined(__linux__) const char *check_devices[3] = { "wlan0", "ath0", "eth0" }; int fd, ret; @@ -324,7 +350,6 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress) if (SUCCEEDED(ret)) Memory::WriteBigEData(adapter_info->Address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); else Memory::WriteBigEData(default_address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); - delete[] adapter_info; #else Memory::WriteBigEData(default_address, CommandBuffer.PayloadBuffer.at(1).m_Address, 4); From 11fc13aea46dabad49e9fccc4412307ee0398319 Mon Sep 17 00:00:00 2001 From: X-tra Fear Date: Wed, 14 Nov 2012 16:12:25 -0500 Subject: [PATCH 093/627] Fixed WiiMotes disconnecting when ES_LAUNCH is ran. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index ae389d7b69..198e54b2f2 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -783,14 +783,16 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } else { + static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; + for(int i = 0; i < s_Usb->m_WiiMotes.size(); i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true); WII_IPC_HLE_Interface::Init(); - - static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) { - if (s_Usb->m_WiiMotes[i].IsConnected()) + if (wiiMoteConnected[i]) { s_Usb->m_WiiMotes[i].Activate(false); s_Usb->m_WiiMotes[i].Activate(true); @@ -801,6 +803,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } } + delete wiiMoteConnected; WII_IPC_HLE_Interface::SetDefaultContentFile(tContentFile); } // Pass the "#002 check" From 14aa7150d9363ea7adafd9188feb7197e7ade2a6 Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 14 Nov 2012 16:21:54 -0500 Subject: [PATCH 094/627] Add option for author name for movies. Also, minor cleanup for previous options i've added. --- Source/Core/Core/Src/ConfigManager.cpp | 14 ++++++++++---- Source/Core/Core/Src/ConfigManager.h | 5 +++-- Source/Core/Core/Src/Movie.cpp | 4 ++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 8 ++++---- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index df0ce1aa02..433be735c2 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -131,8 +131,7 @@ void SConfig::SaveSettings() // General ini.Set("General", "LastFilename", m_LastFilename); - ini.Set("General", "PauseMovie", m_pauseMovie); - ini.Set("General", "ShowLag", m_showLag); + ini.Set("General", "ShowLag", m_ShowLag); // ISO folders // clear removed folders @@ -248,6 +247,10 @@ void SConfig::SaveSettings() // GFX Backend ini.Set("Core", "GFXBackend", m_LocalCoreStartupParameter.m_strVideoBackend); + // Movie + ini.Set("Movie", "PauseMovie", m_PauseMovie); + ini.Set("Movie", "Author", m_strMovieAuthor); + ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); m_SYSCONF->Save(); } @@ -262,8 +265,7 @@ void SConfig::LoadSettings() // General { ini.Get("General", "LastFilename", &m_LastFilename); - ini.Get("General", "PauseMovie", &m_pauseMovie, false); - ini.Get("General", "ShowLag", &m_showLag, false); + ini.Get("General", "ShowLag", &m_ShowLag, false); m_ISOFolder.clear(); int numGCMPaths; @@ -388,6 +390,10 @@ void SConfig::LoadSettings() // GFX Backend ini.Get("Core", "GFXBackend", &m_LocalCoreStartupParameter.m_strVideoBackend, ""); + + // Movie + ini.Get("General", "PauseMovie", &m_PauseMovie, false); + ini.Get("Movie", "Author", &m_strMovieAuthor, ""); } m_SYSCONF = new SysConf(); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 1235e23eac..f8733296b4 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -75,8 +75,9 @@ struct SConfig : NonCopyable bool m_ListKorea; bool m_ListTaiwan; bool m_ListUnknown; - bool m_pauseMovie; - bool m_showLag; + bool m_PauseMovie; + bool m_ShowLag; + std::string m_strMovieAuthor; SysConf* m_SYSCONF; diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 189201a36a..a03f1a568e 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -92,7 +92,7 @@ std::string GetInputDisplay() void FrameUpdate() { - if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1 && SConfig::GetInstance().m_pauseMovie) + if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1 && SConfig::GetInstance().m_PauseMovie) { Core::SetState(Core::CORE_PAUSE); } @@ -400,7 +400,7 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; GetSettings(); - + author = SConfig::GetInstance().m_strMovieAuthor; delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; g_currentByte = g_totalBytes = 0; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index e4a7ed8986..2d2b308799 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -143,9 +143,9 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); - emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_pauseMovie); + emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie); emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); - emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_showLag); + emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag); emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); @@ -708,13 +708,13 @@ void CFrame::OnTASInput(wxCommandEvent& event) void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) { - SConfig::GetInstance().m_pauseMovie = !SConfig::GetInstance().m_pauseMovie; + SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie; SConfig::GetInstance().SaveSettings(); } void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event)) { - SConfig::GetInstance().m_showLag = !SConfig::GetInstance().m_showLag; + SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag; SConfig::GetInstance().SaveSettings(); } diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 079692b76b..6a1a6c868c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1095,7 +1095,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps); } - if (SConfig::GetInstance().m_showLag) + if (SConfig::GetInstance().m_ShowLag) { char lag[10]; StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 226b7227c3..b0997225cf 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1092,7 +1092,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps); } - if (SConfig::GetInstance().m_showLag) + if (SConfig::GetInstance().m_ShowLag) { char lag[10]; StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 4f74454ece..cce93d2115 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -532,7 +532,7 @@ void Renderer::DrawDebugInfo() if (g_ActiveConfig.bShowFPS) p+=sprintf(p, "FPS: %d\n", s_fps); - if (SConfig::GetInstance().m_showLag) + if (SConfig::GetInstance().m_ShowLag) p+=sprintf(p, "Lag: %d\n", Movie::g_currentLagCount); if (g_ActiveConfig.bShowInputDisplay) From aa90f799b7a8a3dc71ccae435ff1b9c7d2ccc15e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 15 Nov 2012 16:30:05 +0100 Subject: [PATCH 095/627] Re-implementation of the AX voice mixing algorithm. Now with 100% less WTF. --- Source/Core/Core/Core.vcxproj | 1 + Source/Core/Core/Core.vcxproj.filters | 3 + .../Src/HW/DSPHLE/UCodes/UCode_AXStructs.h | 47 ++- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 87 +---- .../Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h | 304 ++++++++++++++++++ 6 files changed, 353 insertions(+), 91 deletions(-) create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index fb2d0bafdf..caab0a1e6d 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -468,6 +468,7 @@ + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 482b2bd9b5..e0df3bd31f 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -754,6 +754,9 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h index 3217448268..e7701e4698 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -35,7 +35,12 @@ struct PBMixer u16 auxB_right; u16 auxB_right_delta; - u16 unknown4[6]; + u16 auxB_surround; + u16 auxB_surround_delta; + u16 surround; + u16 surround_delta; + u16 auxA_surround; + u16 auxA_surround_delta; }; struct PBMixerWii @@ -212,6 +217,14 @@ struct PBADPCMLoopInfo u16 yn2; }; +struct PBLowPassFilter +{ + u16 enabled; + u16 yn1; + u16 a0; + u16 b0; +}; + struct AXPB { u16 next_pb_hi; @@ -236,15 +249,9 @@ struct AXPB PBADPCMInfo adpcm; PBSampleRateConverter src; PBADPCMLoopInfo adpcm_loop_info; - u16 unknown_maybe_padding[3]; -}; + PBLowPassFilter lpf; -struct PBLowPassFilter -{ - u16 enabled; - u16 yn1; - u16 a0; - u16 b0; + u16 padding[25]; }; struct PBBiquadFilter @@ -360,9 +367,29 @@ enum { }; enum { + SRCTYPE_POLYPHASE = 0, SRCTYPE_LINEAR = 1, SRCTYPE_NEAREST = 2, - MIXCONTROL_RAMPING = 8, +}; + +enum { + MIX_L = 0x0001, + MIX_R = 0x0002, + MIX_S = 0x0004, + MIX_RAMP = 0x0008, + + MIX_AUXA_L = 0x0010, + MIX_AUXA_R = 0x0020, + MIX_AUXA_RAMPLR = 0x0040, + MIX_AUXA_S = 0x0080, + MIX_AUXA_RAMPS = 0x0100, + + MIX_AUXB_L = 0x0200, + MIX_AUXB_R = 0x0400, + MIX_AUXB_RAMPLR = 0x0800, + MIX_AUXB_S = 0x1000, + MIX_AUXB_RAMPS = 0x2000, + MIX_AUXB_DPL2 = 0x4000 }; // Both may be used at once diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index f59693698c..f401cc630f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -230,7 +230,7 @@ inline void MixAddVoice(ParamBlockType &pb, const AXBuffers& buffers, int vol = pb.vol_env.cur_volume >> 9; sample = sample * vol >> 8; - if (pb.mixer_control & MIXCONTROL_RAMPING) + if (pb.mixer_control & MIX_RAMP) { int x = pb.vol_env.cur_volume; x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index 9bc43b0f04..a7e9c561f0 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -16,13 +16,9 @@ // http://code.google.com/p/dolphin-emu/ #include "UCode_NewAX.h" -#include "UCode_AX_Voice.h" +#include "UCode_NewAX_Voice.h" #include "../../DSP.h" -// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. -#define HILO_TO_32(name) \ - ((name##_hi << 16) | name##_lo) - #define MIXBUF_MAX_SAMPLES 16000 // 500ms of stereo audio CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) @@ -173,74 +169,6 @@ void CUCode_NewAX::HandleCommandList() } } -// From old UCode_AX.cpp. -static void VoiceHacks(AXPB &pb) -{ - // get necessary values - const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; - const u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; - // const u32 updaddr = (u32)(pb.updates.data_hi << 16) | pb.updates.data_lo; - // const u16 updpar = HLEMemory_Read_U16(updaddr); - // const u16 upddata = HLEMemory_Read_U16(updaddr + 2); - - // ======================================================================================= - /* Fix problems introduced with the SSBM fix. Sometimes when a music stream ended sampleEnd - would end up outside of bounds while the block was still playing resulting in noise - a strange noise. This should take care of that. - */ - if ((sampleEnd > (0x017fffff * 2) || loopPos > (0x017fffff * 2))) // ARAM bounds in nibbles - { - pb.running = 0; - - // also reset all values if it makes any difference - pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - pb.src.cur_addr_frac = 0; pb.src.ratio_hi = 0; pb.src.ratio_lo = 0; - pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; - - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - } - - /* - // the fact that no settings are reset (except running) after a SSBM type music stream or another - looping block (for example in Battle Stadium DON) has ended could cause loud garbled sound to be - played from one or more blocks. Perhaps it was in conjunction with the old sequenced music fix below, - I'm not sure. This was an attempt to prevent that anyway by resetting all. But I'm not sure if this - is needed anymore. Please try to play SSBM without it and see if it works anyway. - */ - if ( - // detect blocks that have recently been running that we should reset - pb.running == 0 && pb.audio_addr.looping == 1 - //pb.running == 0 && pb.adpcm_loop_info.pred_scale - - // this prevents us from ruining sequenced music blocks, may not be needed - /* - && !(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2] - || pb.updates.num_updates[3] || pb.updates.num_updates[4]) - */ - //&& !(updpar || upddata) - - && pb.mixer_control == 0 // only use this in SSBM - ) - { - // reset the detection values - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - - //pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - //pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - //pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - //pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0; - //pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; - } -} - static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) { u32 start_idx = 0; @@ -292,7 +220,7 @@ void CUCode_NewAX::SetupProcessing(u32 init_addr) for (u32 j = 0; j < 32 * 5; ++j) { buffers[i][j] = init_val; - init_val -= delta; + init_val += delta; } } } @@ -311,10 +239,13 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) AXBuffers buffers = {{ m_samples_left, m_samples_right, + m_samples_surround, m_samples_auxA_left, m_samples_auxA_right, + m_samples_auxA_surround, m_samples_auxB_left, - m_samples_auxB_right + m_samples_auxB_right, + m_samples_auxB_surround }}; if (!ReadPB(pb_addr, pb)) @@ -324,11 +255,7 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) { ApplyUpdatesForMs(pb, curr_ms); - // TODO: is that still needed? - if (m_CRC != 0x3389a79e) - VoiceHacks(pb); - - MixAddVoice(pb, buffers, spms, false); + Process1ms(pb, buffers); // Forward the buffers for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h new file mode 100644 index 0000000000..8ebbec2fd9 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h @@ -0,0 +1,304 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_NEWAX_VOICE_H +#define _UCODE_NEWAX_VOICE_H + +#include "Common.h" +#include "UCode_AXStructs.h" +#include "../../DSP.h" + +// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. +#define HILO_TO_32(name) \ + ((name##_hi << 16) | name##_lo) + +// Used to pass a large amount of buffers to the mixing function. +union AXBuffers +{ + struct + { + int* left; + int* right; + int* surround; + + int* auxA_left; + int* auxA_right; + int* auxA_surround; + + int* auxB_left; + int* auxB_right; + int* auxB_surround; + }; + + int* ptrs[9]; +}; + +// Read a PB from MRAM/ARAM +inline bool ReadPB(u32 addr, AXPB& pb) +{ + u16* dst = (u16*)&pb; + const u16* src = (const u16*)Memory::GetPointer(addr); + if (!src) + return false; + + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); + + return true; +} + +// Write a PB back to MRAM/ARAM +inline bool WritePB(u32 addr, const AXPB& pb) +{ + const u16* src = (const u16*)&pb; + u16* dst = (u16*)Memory::GetPointer(addr); + if (!dst) + return false; + + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); + + return true; +} + +// Simulated accelerator state. +static u32 acc_loop_addr, acc_end_addr; +static u32* acc_cur_addr; +static AXPB* acc_pb; + +// Sets up the simulated accelerator. +inline void AcceleratorSetup(AXPB* pb, u32* cur_addr) +{ + acc_pb = pb; + acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); + acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr); + acc_cur_addr = cur_addr; +} + +// Reads a sample from the simulated accelerator. +inline u16 AcceleratorGetSample() +{ + u16 ret; + + switch (acc_pb->audio_addr.sample_format) + { + case 0x00: // ADPCM + { + if ((*acc_cur_addr & 15) == 0) + { + acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1); + *acc_cur_addr += 2; + } + + int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF); + int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7; + + s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0]; + s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1]; + + int temp = (*acc_cur_addr & 1) ? + (DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) : + (DSP::ReadARAM(*acc_cur_addr >> 1) >> 4); + + if (temp >= 8) + temp -= 16; + + int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11); + + if (val > 0x7FFF) val = 0x7FFF; + else if (val < -0x7FFF) val = -0x7FFF; + + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = val; + *acc_cur_addr += 1; + ret = val; + break; + } + + case 0x0A: // 16-bit PCM audio + ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1); + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + case 0x19: // 8-bit PCM audio + ret = DSP::ReadARAM(*acc_cur_addr) << 8; + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + default: + ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format); + return 0; + } + + if (*acc_cur_addr >= acc_end_addr) + { + if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) + *acc_cur_addr = acc_loop_addr; + + // Simulate an ACC overflow interrupt. + if (acc_pb->audio_addr.looping) + { + acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale; + if (!acc_pb->is_stream) + { + acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1; + acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2; + } + } + else + { + acc_pb->running = 0; + } + } + + return ret; +} + +// Read 32 input samples from ARAM, decoding and converting rate if required. +inline void GetInputSamples(AXPB& pb, s16* samples) +{ + u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); + AcceleratorSetup(&pb, &cur_addr); + + // TODO: support polyphase interpolation if coefficients are available. + if (pb.src_type == SRCTYPE_POLYPHASE || pb.src_type == SRCTYPE_LINEAR) + { + u32 ratio = HILO_TO_32(pb.src.ratio); + + u32 curr_pos = pb.src.cur_addr_frac; + u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; + s16 real_samples[130]; // Max supported ratio is 4 + + real_samples[0] = pb.src.last_samples[2]; + real_samples[1] = pb.src.last_samples[3]; + for (u32 i = 0; i < real_samples_needed; ++i) + real_samples[i + 2] = AcceleratorGetSample(); + + for (u32 i = 0; i < 32; ++i) + { + u32 curr_int_pos = (curr_pos >> 16); + s32 curr_frac_pos = curr_pos & 0xFFFF; + s16 samp1 = real_samples[curr_int_pos]; + s16 samp2 = real_samples[curr_int_pos + 1]; + + s16 sample = samp1 + (s16)(((samp2 - samp1) * (s32)curr_frac_pos) >> 16); + samples[i] = sample; + + curr_pos += ratio; + } + + if (real_samples_needed >= 2) + memcpy(pb.src.last_samples, &real_samples[real_samples_needed + 2 - 4], 4 * sizeof (u16)); + else + { + memmove(pb.src.last_samples, &pb.src.last_samples[real_samples_needed], (4 - real_samples_needed) * sizeof (u16)); + memcpy(&pb.src.last_samples[4 - real_samples_needed], &real_samples[2], real_samples_needed * sizeof (u16)); + } + pb.src.cur_addr_frac = curr_pos & 0xFFFF; + } + else // SRCTYPE_NEAREST + { + for (u32 i = 0; i < 32; ++i) + samples[i] = AcceleratorGetSample(); + + memcpy(pb.src.last_samples, samples + 28, 4 * sizeof (u16)); + } + + pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16); + pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF); +} + +// Mix samples to an output buffer, with optional volume ramping. +inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) +{ + u16& volume = pvol[0]; + u16 volume_delta = pvol[1]; + if (!ramp) + volume_delta = 0; + + for (u32 i = 0; i < 32; ++i) + { + s64 sample = 2 * (s16)input[i] * (s16)volume; + out[i] += (s32)(sample >> 16); + volume += volume_delta; + } +} + +// Process 1ms of audio from a PB and mix it to the buffers. +inline void Process1ms(AXPB& pb, const AXBuffers& buffers) +{ + // If the voice is not running, nothing to do. + if (!pb.running) + return; + + // Read input samples, performing sample rate conversion if needed. + s16 samples[32]; + GetInputSamples(pb, samples); + + // Apply a global volume ramp using the volume envelope parameters. + for (u32 i = 0; i < 32; ++i) + { + s64 sample = 2 * (s16)samples[i] * (s16)pb.vol_env.cur_volume; + samples[i] = (s16)(sample >> 16); + pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta; + } + + // Optionally, execute a low pass filter + if (pb.lpf.enabled) + { + // TODO + } + + // Mix LRS, AUXA and AUXB depending on mixer_control + // TODO: Handle DPL2 on AUXB. + + // HACK: at the moment we don't mix surround into left and right, so always + // mix left and right in order to have sound even if a game uses surround + // only. + //if (pb.mixer_control & MIX_L) + MixAdd(buffers.left, samples, &pb.mixer.left, pb.mixer_control & MIX_RAMP); + //if (pb.mixer_control & MIX_R) + MixAdd(buffers.right, samples, &pb.mixer.right, pb.mixer_control & MIX_RAMP); + if (pb.mixer_control & MIX_S) + MixAdd(buffers.surround, samples, &pb.mixer.surround, pb.mixer_control & MIX_RAMP); + + if (pb.mixer_control & MIX_AUXA_L) + MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, pb.mixer_control & MIX_AUXA_RAMPLR); + if (pb.mixer_control & MIX_AUXA_R) + MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, pb.mixer_control & MIX_AUXA_RAMPLR); + if (pb.mixer_control & MIX_AUXA_S) + MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, pb.mixer_control & MIX_AUXA_RAMPS); + + if (pb.mixer_control & MIX_AUXB_L) + MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, pb.mixer_control & MIX_AUXB_RAMPLR); + if (pb.mixer_control & MIX_AUXB_R) + MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, pb.mixer_control & MIX_AUXB_RAMPLR); + if (pb.mixer_control & MIX_AUXB_S) + MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, pb.mixer_control & MIX_AUXB_RAMPS); + + // Optionally, phase shift left or right channel to simulate 3D sound. + if (pb.initial_time_delay.on) + { + // TODO + } +} + +#endif // !_UCODE_NEWAX_VOICE_H From 5a2d8661d7113ed2fd1c51d5f4e10b5ce385459a Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 15 Nov 2012 16:57:33 +0100 Subject: [PATCH 096/627] Add comments explaining how the voice processing works --- .../Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h | 59 +++++++++++++++++-- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h index 8ebbec2fd9..7c455d527e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h @@ -89,7 +89,9 @@ inline void AcceleratorSetup(AXPB* pb, u32* cur_addr) acc_cur_addr = cur_addr; } -// Reads a sample from the simulated accelerator. +// Reads a sample from the simulated accelerator. Also handles looping and +// disabling streams that reached the end (this is done by an exception raised +// by the accelerator on real hardware). inline u16 AcceleratorGetSample() { u16 ret; @@ -98,6 +100,7 @@ inline u16 AcceleratorGetSample() { case 0x00: // ADPCM { + // ADPCM decoding, not much to explain here. if ((*acc_cur_addr & 15) == 0) { acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1); @@ -148,14 +151,24 @@ inline u16 AcceleratorGetSample() return 0; } + // Have we reached the end address? + // + // On real hardware, this would raise an interrupt that is handled by the + // UCode. We simulate what this interrupt does here. if (*acc_cur_addr >= acc_end_addr) { + // If we are really at the end (and we don't simply have cur_addr > + // end_addr all the time), loop back to loop_addr. if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) *acc_cur_addr = acc_loop_addr; - // Simulate an ACC overflow interrupt. if (acc_pb->audio_addr.looping) { + // Set the ADPCM infos to continue processing at loop_addr. + // + // For some reason, yn1 and yn2 aren't set if the voice is not of + // stream type. This is what the AX UCode does and I don't really + // know why. acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale; if (!acc_pb->is_stream) { @@ -165,6 +178,7 @@ inline u16 AcceleratorGetSample() } else { + // Non looping voice reached the end -> running = 0. acc_pb->running = 0; } } @@ -181,12 +195,31 @@ inline void GetInputSamples(AXPB& pb, s16* samples) // TODO: support polyphase interpolation if coefficients are available. if (pb.src_type == SRCTYPE_POLYPHASE || pb.src_type == SRCTYPE_LINEAR) { + // Convert the input to a higher or lower sample rate using a linear + // interpolation algorithm. The input to output ratio is set in + // pb.src.ratio, which is a floating point num stored as a 32b integer: + // * Upper 16 bits of the ratio are the integer part + // * Lower 16 bits are the decimal part u32 ratio = HILO_TO_32(pb.src.ratio); + // We start getting samples not from sample 0, but 0.. + // This avoids discontinuties in the audio stream, especially with very + // low ratios which interpolate a lot of values between two "real" + // samples. u32 curr_pos = pb.src.cur_addr_frac; - u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; - s16 real_samples[130]; // Max supported ratio is 4 + // Compute the number of real samples we will need to read from the + // data source. We need to output 32 samples, so we need to read + // 32 * ratio + curr_pos samples. The maximum possible ratio available + // on the DSP is 4.0, so at most we will read 128 real samples. + s16 real_samples[130]; + u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; + + // The first two real samples are the ones we read at the previous + // iteration. That way we can interpolate before having read 2 new + // samples from the accelerator. + // + // The next real samples are read from the accelerator. real_samples[0] = pb.src.last_samples[2]; real_samples[1] = pb.src.last_samples[3]; for (u32 i = 0; i < real_samples_needed; ++i) @@ -194,17 +227,24 @@ inline void GetInputSamples(AXPB& pb, s16* samples) for (u32 i = 0; i < 32; ++i) { + // Get our current integer and fractional position. The integer + // position is used to get the two samples around us. The + // fractional position is used to compute the linear interpolation + // between these two samples. u32 curr_int_pos = (curr_pos >> 16); s32 curr_frac_pos = curr_pos & 0xFFFF; s16 samp1 = real_samples[curr_int_pos]; s16 samp2 = real_samples[curr_int_pos + 1]; + // Linear interpolation: s1 + (s2 - s1) * pos s16 sample = samp1 + (s16)(((samp2 - samp1) * (s32)curr_frac_pos) >> 16); samples[i] = sample; curr_pos += ratio; } + // Update the last_samples array. A bit tricky because we can't know + // for sure we have more than 4 real samples in our array. if (real_samples_needed >= 2) memcpy(pb.src.last_samples, &real_samples[real_samples_needed + 2 - 4], 4 * sizeof (u16)); else @@ -216,21 +256,28 @@ inline void GetInputSamples(AXPB& pb, s16* samples) } else // SRCTYPE_NEAREST { + // No sample rate conversion here: simply read 32 samples from the + // accelerator to the output buffer. for (u32 i = 0; i < 32; ++i) samples[i] = AcceleratorGetSample(); memcpy(pb.src.last_samples, samples + 28, 4 * sizeof (u16)); } + // Update current position in the PB. pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16); pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF); } -// Mix samples to an output buffer, with optional volume ramping. +// Add samples to an output buffer, with optional volume ramping. inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) { u16& volume = pvol[0]; u16 volume_delta = pvol[1]; + + // If volume ramping is disabled, set volume_delta to 0. That way, the + // mixing loop can avoid testing if volume ramping is enabled at each step, + // and just add volume_delta. if (!ramp) volume_delta = 0; @@ -242,7 +289,7 @@ inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) } } -// Process 1ms of audio from a PB and mix it to the buffers. +// Process 1ms of audio (32 samples) from a PB and mix it to the buffers. inline void Process1ms(AXPB& pb, const AXBuffers& buffers) { // If the voice is not running, nothing to do. From 5170d657118a1215392b782635233e317bb8e9a3 Mon Sep 17 00:00:00 2001 From: X-tra Fear Date: Thu, 15 Nov 2012 14:47:26 -0500 Subject: [PATCH 097/627] Fixed last commit. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 198e54b2f2..e9e2842da8 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -803,7 +803,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } } - delete wiiMoteConnected; + delete[] wiiMoteConnected; WII_IPC_HLE_Interface::SetDefaultContentFile(tContentFile); } // Pass the "#002 check" From a024d045836642595ab325c7616abc9e22332495 Mon Sep 17 00:00:00 2001 From: Braden Date: Thu, 15 Nov 2012 21:30:19 -0600 Subject: [PATCH 098/627] Patch by mwessel that fixes real wiimotes on OSX 10.8 --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 8e3586f7d9..9ee39e5b92 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -185,6 +185,11 @@ bool Wiimote::Connect() RealDisconnect(); return false; } + + // As of 10.8 these need explicit retaining or writing to the wiimote has a very high + // chance of crashing and burning. + [ichan retain]; + [cchan retain]; NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", index + 1, [[btd getAddressString] UTF8String]); @@ -215,7 +220,8 @@ void Wiimote::RealDisconnect() m_wiimote_thread.join(); [btd closeConnection]; - + [ichan release]; + [cchan release]; btd = NULL; cchan = NULL; ichan = NULL; From c8b2ba1bc6086f9ac954c84b39bbd62ac582000d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 16 Nov 2012 07:51:19 +0100 Subject: [PATCH 099/627] Implement the MORE command (0D) used to read more commands from the CPU --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 14 +++++++++++--- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index a7e9c561f0..ccb1c25661 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -79,6 +79,7 @@ void CUCode_NewAX::HandleCommandList() // Temp variables for addresses computation u16 addr_hi, addr_lo; u16 addr2_hi, addr2_lo; + u16 size; u32 pb_addr = 0; @@ -90,8 +91,7 @@ void CUCode_NewAX::HandleCommandList() switch (cmd) { - - // A lot of these commands are unknown, or unused in this AX HLE. + // Some of these commands are unknown, or unused in this AX HLE. // We still need to skip their arguments using "curr_idx += N". case CMD_SETUP: @@ -140,7 +140,15 @@ void CUCode_NewAX::HandleCommandList() case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; case CMD_UNK_0B: break; // TODO: check other versions case CMD_UNK_0C: break; // TODO: check other versions - case CMD_UNK_0D: curr_idx += 2; break; + + case CMD_MORE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + size = m_cmdlist[curr_idx++]; + + CopyCmdList(HILO_TO_32(addr), size); + curr_idx = 0; + break; case CMD_OUTPUT: // Skip the first address, it is used for surround audio diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 91aa495c0e..a6cbe071de 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -64,7 +64,7 @@ private: CMD_COMPRESSOR_TABLE_ADDR = 0x0A, CMD_UNK_0B = 0x0B, CMD_UNK_0C = 0x0C, - CMD_UNK_0D = 0x0D, + CMD_MORE = 0x0D, CMD_OUTPUT = 0x0E, CMD_END = 0x0F, CMD_UNK_10 = 0x10, From 78031c2d54b4acbca14747c57572b34e2530e474 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 29 Sep 2012 00:04:55 +0200 Subject: [PATCH 100/627] Move ComputeDrawRectangle() to Renderer::UpdateDrawRectangle(). --- Source/Core/VideoCommon/Src/RenderBase.cpp | 123 ++++++++++++++++++ Source/Core/VideoCommon/Src/RenderBase.h | 6 + Source/Core/VideoCommon/Src/VideoConfig.cpp | 122 ----------------- Source/Core/VideoCommon/Src/VideoConfig.h | 2 - .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 30 ++--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 34 +++-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 43 +++--- 7 files changed, 180 insertions(+), 180 deletions(-) diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index d968ab5fbb..84eac4ec7f 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -71,6 +71,8 @@ int Renderer::s_backbuffer_height; float Renderer::xScale; float Renderer::yScale; +TargetRectangle Renderer::target_rc; + int Renderer::s_LastEFBScale; bool Renderer::s_skipSwap; @@ -331,6 +333,127 @@ void Renderer::CalculateXYScale(const TargetRectangle& dst_rect) } } +// TODO: remove +extern bool g_aspect_wide; + +void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) +{ + float FloatGLWidth = (float)backbuffer_width; + float FloatGLHeight = (float)backbuffer_height; + float FloatXOffset = 0; + float FloatYOffset = 0; + + // The rendering window size + const float WinWidth = FloatGLWidth; + const float WinHeight = FloatGLHeight; + + // Handle aspect ratio. + // Default to auto. + bool use16_9 = g_aspect_wide; + + // Update aspect ratio hack values + // Won't take effect until next frame + // Don't know if there is a better place for this code so there isn't a 1 frame delay + if ( g_ActiveConfig.bWidescreenHack ) + { + float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f); + float target_aspect; + + switch ( g_ActiveConfig.iAspectRatio ) + { + case ASPECT_FORCE_16_9 : + target_aspect = 16.0f / 9.0f; + break; + case ASPECT_FORCE_4_3 : + target_aspect = 4.0f / 3.0f; + break; + case ASPECT_STRETCH : + target_aspect = WinWidth / WinHeight; + break; + default : + // ASPECT_AUTO == no hacking + target_aspect = source_aspect; + break; + } + + float adjust = source_aspect / target_aspect; + if ( adjust > 1 ) + { + // Vert+ + g_Config.fAspectRatioHackW = 1; + g_Config.fAspectRatioHackH = 1/adjust; + } + else + { + // Hor+ + g_Config.fAspectRatioHackW = adjust; + g_Config.fAspectRatioHackH = 1; + } + } + else + { + // Hack is disabled + g_Config.fAspectRatioHackW = 1; + g_Config.fAspectRatioHackH = 1; + } + + // Check for force-settings and override. + if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9) + use16_9 = true; + else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3) + use16_9 = false; + + if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH) + { + // The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio + float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f)); + // Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width. + if (Ratio > 1.0f) + { + // Scale down and center in the X direction. + FloatGLWidth /= Ratio; + FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f; + } + // The window is too high, we have to limit the height + else + { + // Scale down and center in the Y direction. + FloatGLHeight *= Ratio; + FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f; + } + } + + // ----------------------------------------------------------------------- + // Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10. + // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset + // ------------------ + if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop) + { + float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f))); + // The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted) + float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth; + float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight; + // The new width and height + FloatGLWidth = FloatGLWidth * Ratio; + FloatGLHeight = FloatGLHeight * Ratio; + // Adjust the X and Y offset + FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f); + FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f); + } + + int XOffset = (int)(FloatXOffset + 0.5f); + int YOffset = (int)(FloatYOffset + 0.5f); + int iWhidth = (int)ceil(FloatGLWidth); + int iHeight = (int)ceil(FloatGLHeight); + iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders + iHeight -= iHeight % 4; + + target_rc.left = XOffset; + target_rc.top = YOffset; + target_rc.right = XOffset + iWhidth; + target_rc.bottom = YOffset + iHeight; +} + void Renderer::SetWindowSize(int width, int height) { if (width < 1) diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 7f5e4743e6..3a3231ed5e 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -85,6 +85,10 @@ public: // Use this to convert a whole native EFB rect to backbuffer coordinates virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0; + static const TargetRectangle& GetTargetRectangle() { return target_rc; } + static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height); + + // Use this to upscale native EFB coordinates to IDEAL internal resolution static unsigned int EFBToScaledX(int x) { return x * GetTargetWidth() / EFB_WIDTH; } static unsigned int EFBToScaledY(int y) { return y * GetTargetHeight() / EFB_HEIGHT; } @@ -163,6 +167,8 @@ protected: static float xScale; static float yScale; + static TargetRectangle target_rc; + // can probably eliminate this static var static int s_LastEFBScale; diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index c5628c19a1..cd63871365 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -290,125 +290,3 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) iniFile.Save(game_ini); } - - -// TODO: remove -extern bool g_aspect_wide; - -// TODO: Figure out a better place for this function. -void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc) -{ - float FloatGLWidth = (float)backbuffer_width; - float FloatGLHeight = (float)backbuffer_height; - float FloatXOffset = 0; - float FloatYOffset = 0; - - // The rendering window size - const float WinWidth = FloatGLWidth; - const float WinHeight = FloatGLHeight; - - // Handle aspect ratio. - // Default to auto. - bool use16_9 = g_aspect_wide; - - // Update aspect ratio hack values - // Won't take effect until next frame - // Don't know if there is a better place for this code so there isn't a 1 frame delay - if ( g_ActiveConfig.bWidescreenHack ) - { - float source_aspect = use16_9 ? (16.0f / 9.0f) : (4.0f / 3.0f); - float target_aspect; - - switch ( g_ActiveConfig.iAspectRatio ) - { - case ASPECT_FORCE_16_9 : - target_aspect = 16.0f / 9.0f; - break; - case ASPECT_FORCE_4_3 : - target_aspect = 4.0f / 3.0f; - break; - case ASPECT_STRETCH : - target_aspect = WinWidth / WinHeight; - break; - default : - // ASPECT_AUTO == no hacking - target_aspect = source_aspect; - break; - } - - float adjust = source_aspect / target_aspect; - if ( adjust > 1 ) - { - // Vert+ - g_Config.fAspectRatioHackW = 1; - g_Config.fAspectRatioHackH = 1/adjust; - } - else - { - // Hor+ - g_Config.fAspectRatioHackW = adjust; - g_Config.fAspectRatioHackH = 1; - } - } - else - { - // Hack is disabled - g_Config.fAspectRatioHackW = 1; - g_Config.fAspectRatioHackH = 1; - } - - // Check for force-settings and override. - if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_16_9) - use16_9 = true; - else if (g_ActiveConfig.iAspectRatio == ASPECT_FORCE_4_3) - use16_9 = false; - - if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH) - { - // The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio - float Ratio = (WinWidth / WinHeight) / (!use16_9 ? (4.0f / 3.0f) : (16.0f / 9.0f)); - // Check if height or width is the limiting factor. If ratio > 1 the picture is too wide and have to limit the width. - if (Ratio > 1.0f) - { - // Scale down and center in the X direction. - FloatGLWidth /= Ratio; - FloatXOffset = (WinWidth - FloatGLWidth) / 2.0f; - } - // The window is too high, we have to limit the height - else - { - // Scale down and center in the Y direction. - FloatGLHeight *= Ratio; - FloatYOffset = FloatYOffset + (WinHeight - FloatGLHeight) / 2.0f; - } - } - - // ----------------------------------------------------------------------- - // Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10. - // Output: FloatGLWidth, FloatGLHeight, FloatXOffset, FloatYOffset - // ------------------ - if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH && g_ActiveConfig.bCrop) - { - float Ratio = !use16_9 ? ((4.0f / 3.0f) / (5.0f / 4.0f)) : (((16.0f / 9.0f) / (16.0f / 10.0f))); - // The width and height we will add (calculate this before FloatGLWidth and FloatGLHeight is adjusted) - float IncreasedWidth = (Ratio - 1.0f) * FloatGLWidth; - float IncreasedHeight = (Ratio - 1.0f) * FloatGLHeight; - // The new width and height - FloatGLWidth = FloatGLWidth * Ratio; - FloatGLHeight = FloatGLHeight * Ratio; - // Adjust the X and Y offset - FloatXOffset = FloatXOffset - (IncreasedWidth * 0.5f); - FloatYOffset = FloatYOffset - (IncreasedHeight * 0.5f); - } - - int XOffset = (int)(FloatXOffset + 0.5f); - int YOffset = (int)(FloatYOffset + 0.5f); - int iWhidth = (int)ceil(FloatGLWidth); - int iHeight = (int)ceil(FloatGLHeight); - iWhidth -= iWhidth % 4; // ensure divisibility by 4 to make it compatible with all the video encoders - iHeight -= iHeight % 4; - rc->left = XOffset; - rc->top = flip ? (int)(YOffset + iHeight) : YOffset; - rc->right = XOffset + iWhidth; - rc->bottom = flip ? YOffset : (int)(YOffset + iHeight); -} diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index da760e48b9..47cdd445d4 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -176,6 +176,4 @@ extern VideoConfig g_ActiveConfig; // Called every frame. void UpdateActiveConfig(); -void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc); - #endif // _VIDEO_CONFIG_H_ diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index b89226b410..38ccff0a9c 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -348,10 +348,8 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + CalculateXYScale(GetTargetRectangle()); s_LastAA = g_ActiveConfig.iMultisampleMode; s_LastEFBScale = g_ActiveConfig.iEFBScale; @@ -924,13 +922,12 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons ResetAPIState(); // Prepare to copy the XFBs to our backbuffer - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - int X = dst_rect.left; - int Y = dst_rect.top; - int Width = dst_rect.right - dst_rect.left; - int Height = dst_rect.bottom - dst_rect.top; + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // TODO: Redundant checks... if (X < 0) X = 0; @@ -1018,7 +1015,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // done with drawing the game stuff, good moment to save a screenshot if (s_bScreenshot) { - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, GetTargetRectangle()); s_bScreenshot = false; } @@ -1035,8 +1032,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex()); if (!bLastFrameDumped) { - s_recordWidth = dst_rect.GetWidth(); - s_recordHeight = dst_rect.GetHeight(); + s_recordWidth = GetTargetRectangle().GetWidth(); + s_recordHeight = GetTargetRectangle().GetHeight(); bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); if (!bAVIDumping) { @@ -1062,7 +1059,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons w = s_recordWidth; h = s_recordHeight; } - char* source_ptr = (char*)map.pData + dst_rect.left*4 + dst_rect.top*map.RowPitch; + char* source_ptr = (char*)map.pData + GetTargetRectangle().left*4 + GetTargetRectangle().top*map.RowPitch; formatBufferDump(source_ptr, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); AVIDump::AddFrame(frame_data); D3D::context->Unmap(s_screenshot_texture, 0); @@ -1178,9 +1175,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_backbuffer_height = D3D::GetBackBufferHeight(); } - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + CalculateXYScale(GetTargetRectangle()); s_LastEFBScale = g_ActiveConfig.iEFBScale; CalculateTargetSize(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 66656d5022..95302bd620 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -277,10 +277,8 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + CalculateXYScale(GetTargetRectangle()); s_LastAA = g_ActiveConfig.iMultisampleMode; int SupersampleCoeficient = (s_LastAA % 3) + 1; @@ -882,8 +880,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->SetDepthStencilSurface(NULL); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); D3DVIEWPORT9 vp; // Clear full target screen (edges, borders etc) @@ -903,10 +900,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } - int X = dst_rect.left; - int Y = dst_rect.top; - int Width = dst_rect.right - dst_rect.left; - int Height = dst_rect.bottom - dst_rect.top; + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // Sanity check if (X < 0) X = 0; @@ -970,8 +967,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // The following code disables auto stretch. Kept for reference. // scale draw area for a 1 to 1 pixel mapping with the draw target - //float vScale = (float)fbHeight / (float)dst_rect.GetHeight(); - //float hScale = (float)fbWidth / (float)dst_rect.GetWidth(); + //float vScale = (float)fbHeight / (float)GetTargetRectangle().GetHeight(); + //float hScale = (float)fbWidth / (float)GetTargetRectangle().GetWidth(); //drawRc.top *= vScale; //drawRc.bottom *= vScale; //drawRc.left *= hScale; @@ -1013,7 +1010,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (s_bScreenshot) { std::lock_guard lk(s_criticalScreenshot); - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, GetTargetRectangle()); s_bScreenshot = false; } @@ -1027,8 +1024,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface); if (!bLastFrameDumped) { - s_recordWidth = dst_rect.GetWidth(); - s_recordHeight = dst_rect.GetHeight(); + s_recordWidth = GetTargetRectangle().GetWidth(); + s_recordHeight = GetTargetRectangle().GetHeight(); bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight); if (!bAVIDumping) { @@ -1045,7 +1042,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (bAVIDumping) { D3DLOCKED_RECT rect; - if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, dst_rect.AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) + if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, GetTargetRectangle().AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) { if (!frame_data || w != s_recordWidth || h != s_recordHeight) { @@ -1139,9 +1136,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_LastAA = newAA; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + CalculateXYScale(GetTargetRectangle()); int SupersampleCoeficient = (s_LastAA % 3) + 1; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 16d3af59cc..838eda49ec 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -363,10 +363,8 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH); FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); - - CalculateXYScale(dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + CalculateXYScale(GetTargetRectangle()); s_LastEFBScale = g_ActiveConfig.iEFBScale; CalculateTargetSize(); @@ -1027,8 +1025,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons ResetAPIState(); - TargetRectangle dst_rect; - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, true, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); + TargetRectangle flipped_trc = GetTargetRectangle(); + + // Flip top and bottom for some reason; TODO: Fix the code to suck less? + int tmp = flipped_trc.top; + flipped_trc.top = flipped_trc.bottom; + flipped_trc.bottom = tmp; // Textured triangles are necessary because of post-processing shaders @@ -1037,7 +1040,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OGL::TextureCache::DisableStage(i); // Update GLViewPort - glViewport(dst_rect.left, dst_rect.bottom, dst_rect.GetWidth(), dst_rect.GetHeight()); + glViewport(flipped_trc.left, flipped_trc.bottom, flipped_trc.GetWidth(), flipped_trc.GetHeight()); GL_REPORT_ERRORD(); @@ -1089,8 +1092,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // The following code disables auto stretch. Kept for reference. // scale draw area for a 1 to 1 pixel mapping with the draw target - //float vScale = (float)fbHeight / (float)dst_rect.GetHeight(); - //float hScale = (float)fbWidth / (float)dst_rect.GetWidth(); + //float vScale = (float)fbHeight / (float)flipped_trc.GetHeight(); + //float hScale = (float)fbWidth / (float)flipped_trc.GetWidth(); //drawRc.top *= vScale; //drawRc.bottom *= vScale; //drawRc.left *= hScale; @@ -1167,7 +1170,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (s_bScreenshot) { std::lock_guard lk(s_criticalScreenshot); - SaveScreenshot(s_sScreenshotName, dst_rect); + SaveScreenshot(s_sScreenshotName, flipped_trc); // Reset settings s_sScreenshotName.clear(); s_bScreenshot = false; @@ -1178,16 +1181,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { std::lock_guard lk(s_criticalScreenshot); - if (!frame_data || w != dst_rect.GetWidth() || - h != dst_rect.GetHeight()) + if (!frame_data || w != flipped_trc.GetWidth() || + h != flipped_trc.GetHeight()) { if (frame_data) delete[] frame_data; - w = dst_rect.GetWidth(); - h = dst_rect.GetHeight(); + w = flipped_trc.GetWidth(); + h = flipped_trc.GetHeight(); frame_data = new char[3 * w * h]; } glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { if (!bLastFrameDumped) @@ -1242,11 +1245,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { std::lock_guard lk(s_criticalScreenshot); std::string movie_file_name; - w = dst_rect.GetWidth(); - h = dst_rect.GetHeight(); + w = GetTargetRectangle().GetWidth(); + h = GetTargetRectangle().GetHeight(); frame_data = new char[3 * w * h]; glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); if (GL_REPORT_ERROR() == GL_NO_ERROR) { if (!bLastFrameDumped) @@ -1311,9 +1314,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (xfbchanged || WindowResized || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)) { - ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); + UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(dst_rect); + CalculateXYScale(GetTargetRectangle()); if (CalculateTargetSize() || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)) { From a38bb488d205752dd3c3e59bae55924ae286c4ec Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 29 Sep 2012 00:19:28 +0200 Subject: [PATCH 101/627] Remove Renderer::xScale and Renderer::yScale. --- .../Src/FramebufferManagerBase.cpp | 28 ++++++++++++ .../VideoCommon/Src/FramebufferManagerBase.h | 3 ++ Source/Core/VideoCommon/Src/RenderBase.cpp | 43 +++++-------------- Source/Core/VideoCommon/Src/RenderBase.h | 11 +---- .../Src/FramebufferManager.cpp | 11 ++--- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 6 +-- .../Src/FramebufferManager.cpp | 11 ++--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 6 +-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 7 +-- 9 files changed, 56 insertions(+), 70 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index fbb042c227..be6109decf 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -229,3 +229,31 @@ void FramebufferManagerBase::ReplaceVirtualXFB() } } } + +unsigned int FramebufferManagerBase::ScaleToVirtualXfbWidth(unsigned int width, unsigned int backbuffer_width) +{ + if (g_ActiveConfig.RealXFBEnabled()) + return width; + + if (g_ActiveConfig.b3DVision) + { + // This works, yet the version in the else doesn't. No idea why. + return width * (backbuffer_width-1) / (FramebufferManagerBase::LastXfbWidth()-1); + } + else + return width * (Renderer::GetTargetRectangle().GetWidth() - 1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); +} + +unsigned int FramebufferManagerBase::ScaleToVirtualXfbHeight(unsigned int height, unsigned int backbuffer_height) +{ + if (g_ActiveConfig.RealXFBEnabled()) + return height; + + if (g_ActiveConfig.b3DVision) + { + // This works, yet the version in the else doesn't. No idea why. + return height * (backbuffer_height-1) / (FramebufferManagerBase::LastXfbHeight()-1); + } + else + return height * (Renderer::GetTargetRectangle().GetHeight() - 1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); +} diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index a28a941e5b..d915130ac4 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -55,6 +55,9 @@ public: static unsigned int LastXfbWidth() { return s_last_xfb_width; } static unsigned int LastXfbHeight() { return s_last_xfb_height; } + static unsigned int ScaleToVirtualXfbWidth(unsigned int width, unsigned int backbuffer_width); + static unsigned int ScaleToVirtualXfbHeight(unsigned int height, unsigned int backbuffer_height); + protected: struct VirtualXFB { diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 84eac4ec7f..8bb6ab6750 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -67,10 +67,6 @@ int Renderer::s_target_height; int Renderer::s_backbuffer_width; int Renderer::s_backbuffer_height; -// ratio of backbuffer size and render area size -float Renderer::xScale; -float Renderer::yScale; - TargetRectangle Renderer::target_rc; int Renderer::s_LastEFBScale; @@ -165,19 +161,23 @@ void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) } // return true if target size changed -bool Renderer::CalculateTargetSize(int multiplier) +bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier) { int newEFBWidth, newEFBHeight; switch (s_LastEFBScale) { case 0: // fractional - newEFBWidth = (int)(EFB_WIDTH * xScale); - newEFBHeight = (int)(EFB_HEIGHT * yScale); - break; case 1: // integral - newEFBWidth = EFB_WIDTH * (int)ceilf(xScale); - newEFBHeight = EFB_HEIGHT * (int)ceilf(yScale); + newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH, framebuffer_width); + newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT, framebuffer_height); + + if (s_LastEFBScale) + { + newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH; + newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT; + } break; + default: CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, newEFBWidth, newEFBHeight); break; @@ -310,29 +310,6 @@ void Renderer::DrawDebugText() } } -void Renderer::CalculateXYScale(const TargetRectangle& dst_rect) -{ - if (g_ActiveConfig.RealXFBEnabled()) - { - xScale = 1.0f; - yScale = 1.0f; - } - else - { - if (g_ActiveConfig.b3DVision) - { - // This works, yet the version in the else doesn't. No idea why. - xScale = (float)(s_backbuffer_width-1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); - yScale = (float)(s_backbuffer_height-1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); - } - else - { - xScale = (float)(dst_rect.right - dst_rect.left - 1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); - yScale = (float)(dst_rect.bottom - dst_rect.top - 1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); - } - } -} - // TODO: remove extern bool g_aspect_wide; diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 3a3231ed5e..534aa732fe 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -74,10 +74,6 @@ public: static int GetBackbufferWidth() { return s_backbuffer_width; } static int GetBackbufferHeight() { return s_backbuffer_height; } - // XFB scale - TODO: Remove this and add two XFBToScaled functions instead - static float GetXFBScaleX() { return xScale; } - static float GetXFBScaleY() { return yScale; } - static void SetWindowSize(int width, int height); // EFB coordinate conversion functions @@ -137,8 +133,7 @@ public: protected: static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); - static bool CalculateTargetSize(int multiplier = 1); - static void CalculateXYScale(const TargetRectangle& dst_rect); + static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1); static void CheckFifoRecording(); static void RecordVideoMemory(); @@ -163,10 +158,6 @@ protected: static int s_backbuffer_width; static int s_backbuffer_height; - // ratio of backbuffer size and render area size - TODO: Remove these! - static float xScale; - static float yScale; - static TargetRectangle target_rc; // can probably eliminate this static var diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp index 0389085fae..cb94884eb7 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp @@ -181,15 +181,12 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) { - const float scaleX = Renderer::GetXFBScaleX(); - const float scaleY = Renderer::GetXFBScaleY(); - TargetRectangle targetSource; - targetSource.top = (int)(sourceRc.top *scaleY); - targetSource.bottom = (int)(sourceRc.bottom *scaleY); - targetSource.left = (int)(sourceRc.left *scaleX); - targetSource.right = (int)(sourceRc.right * scaleX); + targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight()); + targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight()); + targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth()); + targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth()); *width = targetSource.right - targetSource.left; *height = targetSource.bottom - targetSource.top; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 38ccff0a9c..32456dec08 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -349,11 +349,10 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); s_LastAA = g_ActiveConfig.iMultisampleMode; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); SetupDeviceObjects(); @@ -1176,10 +1175,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp index 0a87a1baf5..1903bce989 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp @@ -149,15 +149,12 @@ XFBSourceBase* FramebufferManager::CreateXFBSource(unsigned int target_width, un void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) { - const float scaleX = Renderer::GetXFBScaleX(); - const float scaleY = Renderer::GetXFBScaleY(); - TargetRectangle targetSource; - targetSource.top = (int)(sourceRc.top *scaleY); - targetSource.bottom = (int)(sourceRc.bottom *scaleY); - targetSource.left = (int)(sourceRc.left *scaleX); - targetSource.right = (int)(sourceRc.right * scaleX); + targetSource.top = ScaleToVirtualXfbHeight(sourceRc.top, Renderer::GetBackbufferHeight()); + targetSource.bottom = ScaleToVirtualXfbHeight(sourceRc.bottom, Renderer::GetBackbufferHeight()); + targetSource.left = ScaleToVirtualXfbWidth(sourceRc.left, Renderer::GetBackbufferWidth()); + targetSource.right = ScaleToVirtualXfbWidth(sourceRc.right, Renderer::GetBackbufferWidth()); *width = targetSource.right - targetSource.left; *height = targetSource.bottom - targetSource.top; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 95302bd620..e80407e7ac 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -278,13 +278,12 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); s_LastAA = g_ActiveConfig.iMultisampleMode; int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); @@ -1137,12 +1136,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_LastAA = newAA; UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface()); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 838eda49ec..9f55ad47e4 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -364,10 +364,9 @@ Renderer::Renderer() FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT); UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height); // Because of the fixed framebuffer size we need to disable the resolution // options while running @@ -1316,9 +1315,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - CalculateXYScale(GetTargetRectangle()); - - if (CalculateTargetSize() || (s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode)) + if (CalculateTargetSize(s_backbuffer_width, s_backbuffer_height) || s_LastMultisampleMode != g_ActiveConfig.iMultisampleMode) { s_LastMultisampleMode = g_ActiveConfig.iMultisampleMode; s_MSAASamples = GetNumMSAASamples(s_LastMultisampleMode); From f88e7d3b73e99908e29b243c22210c4b8d47353b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 29 Sep 2012 23:08:17 +0200 Subject: [PATCH 102/627] Fix an off-by-one error. --- Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index be6109decf..090c1c7872 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -238,10 +238,10 @@ unsigned int FramebufferManagerBase::ScaleToVirtualXfbWidth(unsigned int width, if (g_ActiveConfig.b3DVision) { // This works, yet the version in the else doesn't. No idea why. - return width * (backbuffer_width-1) / (FramebufferManagerBase::LastXfbWidth()-1); + return width * backbuffer_width / FramebufferManagerBase::LastXfbWidth(); } else - return width * (Renderer::GetTargetRectangle().GetWidth() - 1) / (float)(FramebufferManagerBase::LastXfbWidth()-1); + return width * Renderer::GetTargetRectangle().GetWidth() / FramebufferManagerBase::LastXfbWidth(); } unsigned int FramebufferManagerBase::ScaleToVirtualXfbHeight(unsigned int height, unsigned int backbuffer_height) @@ -252,8 +252,8 @@ unsigned int FramebufferManagerBase::ScaleToVirtualXfbHeight(unsigned int height if (g_ActiveConfig.b3DVision) { // This works, yet the version in the else doesn't. No idea why. - return height * (backbuffer_height-1) / (FramebufferManagerBase::LastXfbHeight()-1); + return height * backbuffer_height / FramebufferManagerBase::LastXfbHeight(); } else - return height * (Renderer::GetTargetRectangle().GetHeight() - 1) / (float)(FramebufferManagerBase::LastXfbHeight()-1); + return height * Renderer::GetTargetRectangle().GetHeight() / FramebufferManagerBase::LastXfbHeight(); } From 101de62c8676677c55683c8bed22b6c8e87367c2 Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 16 Nov 2012 12:03:51 -0500 Subject: [PATCH 103/627] Remove an old TODO, and add a new one. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 ++ Source/Core/Core/Src/Movie.cpp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 4de2b0feb7..3d3fb0a12a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -906,6 +906,8 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz) else Movie::g_bClearSave = true; } + + // TODO: Force the game to save to another location, instead of moving the user's save. if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsStartingFromClearSave()) { if (File::Exists((savePath + "banner.bin").c_str())) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index a03f1a568e..af33458523 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -639,7 +639,6 @@ void ReadHeader() bSaveConfig = false; } - videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); for (int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) { @@ -1078,7 +1077,6 @@ void SaveRecording(const char *filename) header.bMemcard = bMemcard; header.bClearSave = g_bClearSave; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); - // TODO: prompt the user for author name. It's currently always blank, unless the user manually edits the .dtm file. strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); // TODO From a135512f9bf067eaf9ded6bcd5644d1a8448bf81 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 16 Nov 2012 23:46:28 +0100 Subject: [PATCH 104/627] Build fix. Fixes issue 5674. --- Source/Core/DolphinWX/Src/Main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index d38c90e07f..2a0b8a3de4 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -116,37 +116,37 @@ bool DolphinApp::OnInit() { { wxCMD_LINE_SWITCH, "h", "help", - _("Show this help message"), + "Show this help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { wxCMD_LINE_SWITCH, "d", "debugger", - _("Opens the debugger"), + "Opens the debugger", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_SWITCH, "l", "logger", - _("Opens the logger"), + "Opens the logger", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "e", "exec", - _("Loads the specified file (DOL,ELF,GCM,ISO,WAD)"), + "Loads the specified file (DOL,ELF,GCM,ISO,WAD)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_SWITCH, "b", "batch", - _("Exit Dolphin with emulator"), + "Exit Dolphin with emulator", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "V", "video_backend", - _("Specify a video backend"), + "Specify a video backend", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_OPTION, "A", "audio_emulation", - _("Low level (LLE) or high level (HLE) audio"), + "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { From d6697d50c774292158a0e7c16ccbea27f65dbc1e Mon Sep 17 00:00:00 2001 From: XtraFear Date: Fri, 16 Nov 2012 15:16:50 -0500 Subject: [PATCH 105/627] Added option to toggle the display of On-Screen Display messages in the Interface tab. --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/CoreParameter.cpp | 2 +- Source/Core/Core/Src/CoreParameter.h | 2 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 10 ++++++++++ Source/Core/DolphinWX/Src/ConfigMain.h | 2 ++ Source/Core/VideoCommon/Src/OnScreenDisplay.cpp | 3 +++ 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index cb274b5e4b..27c809717f 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -161,6 +161,7 @@ void SConfig::SaveSettings() // Interface ini.Set("Interface", "ConfirmStop", m_LocalCoreStartupParameter.bConfirmStop); ini.Set("Interface", "UsePanicHandlers", m_LocalCoreStartupParameter.bUsePanicHandlers); + ini.Set("Interface", "OnScreenDisplayMessages", m_LocalCoreStartupParameter.bOnScreenDisplayMessages); ini.Set("Interface", "HideCursor", m_LocalCoreStartupParameter.bHideCursor); ini.Set("Interface", "AutoHideCursor", m_LocalCoreStartupParameter.bAutoHideCursor); ini.Set("Interface", "Theme", m_LocalCoreStartupParameter.iTheme); @@ -296,6 +297,7 @@ void SConfig::LoadSettings() // Interface ini.Get("Interface", "ConfirmStop", &m_LocalCoreStartupParameter.bConfirmStop, false); ini.Get("Interface", "UsePanicHandlers", &m_LocalCoreStartupParameter.bUsePanicHandlers, true); + ini.Get("Interface", "OnScreenDisplayMessages", &m_LocalCoreStartupParameter.bOnScreenDisplayMessages, true); ini.Get("Interface", "HideCursor", &m_LocalCoreStartupParameter.bHideCursor, false); ini.Get("Interface", "AutoHideCursor", &m_LocalCoreStartupParameter.bAutoHideCursor, false); ini.Get("Interface", "Theme", &m_LocalCoreStartupParameter.iTheme, 0); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index ba72d47ffb..dee2452cb3 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -53,7 +53,7 @@ SCoreStartupParameter::SCoreStartupParameter() bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), bConfirmStop(false), bHideCursor(false), - bAutoHideCursor(false), bUsePanicHandlers(true), + bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true), iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640), iRenderWindowHeight(480), bRenderWindowAutoSize(false), bKeepWindowOnTop(false), diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 2eb261b589..e67935906b 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -122,7 +122,7 @@ struct SCoreStartupParameter bool bDisableWiimoteSpeaker; // Interface settings - bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers; + bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; // Hotkeys int iHotkey[NUM_HOTKEYS]; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ef82810019..76508daf7c 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -125,6 +125,7 @@ EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged) +EVT_CHECKBOX(ID_INTERFACE_ONSCREENDISPLAYMESSAGES, CConfigMain::DisplaySettingsChanged) EVT_RADIOBOX(ID_INTERFACE_THEME, CConfigMain::DisplaySettingsChanged) EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::DisplaySettingsChanged) EVT_BUTTON(ID_HOTKEY_CONFIG, CConfigMain::DisplaySettingsChanged) @@ -337,6 +338,7 @@ void CConfigMain::InitializeGUIValues() // Display - Interface ConfirmStop->SetValue(startup_params.bConfirmStop); UsePanicHandlers->SetValue(startup_params.bUsePanicHandlers); + OnScreenDisplayMessages->SetValue(startup_params.bOnScreenDisplayMessages); Theme->SetSelection(startup_params.iTheme); // need redesign for (unsigned int i = 0; i < sizeof(langIds) / sizeof(wxLanguage); i++) @@ -490,6 +492,7 @@ void CConfigMain::InitializeGUITooltips() // Display - Interface ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); + OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); // Display - Themes: Copyright notice Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]")); @@ -579,6 +582,8 @@ void CConfigMain::CreateGUIControls() wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, _("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + OnScreenDisplayMessages = new wxCheckBox(DisplayPage, ID_INTERFACE_ONSCREENDISPLAYMESSAGES, + _("On-Screen Display Messages"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL); sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); @@ -588,6 +593,7 @@ void CConfigMain::CreateGUIControls() sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); + sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5); sbInterface->Add(Theme, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5); @@ -865,6 +871,10 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers = UsePanicHandlers->IsChecked(); SetEnableAlert(UsePanicHandlers->IsChecked()); break; + case ID_INTERFACE_ONSCREENDISPLAYMESSAGES: + SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = OnScreenDisplayMessages->IsChecked(); + SetEnableAlert(OnScreenDisplayMessages->IsChecked()); + break; case ID_INTERFACE_THEME: SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme = Theme->GetSelection(); main_frame->InitBitmaps(); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index eae9f8996d..9b5dbf4243 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -86,6 +86,7 @@ private: // Interface settings ID_INTERFACE_CONFIRMSTOP, ID_INTERFACE_USEPANICHANDLERS, + ID_INTERFACE_ONSCREENDISPLAYMESSAGES, ID_INTERFACE_THEME, ID_INTERFACE_LANG, ID_HOTKEY_CONFIG, @@ -163,6 +164,7 @@ private: // Interface wxCheckBox* ConfirmStop; wxCheckBox* UsePanicHandlers; + wxCheckBox* OnScreenDisplayMessages; wxRadioBox* Theme; wxChoice* InterfaceLang; wxButton* HotkeyConfig; diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp index f24bfc31b3..10cf5b84af 100644 --- a/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.cpp @@ -19,6 +19,7 @@ #include "Common.h" +#include "ConfigManager.h" #include "OnScreenDisplay.h" #include "RenderBase.h" #include "Timer.h" @@ -47,6 +48,8 @@ void AddMessage(const char* pstr, u32 ms) void DrawMessages() { + if(!SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages) return; + if (s_listMsgs.size() > 0) { int left = 25, top = 15; From 69e8942dac4e0cb819ec80462b1f267d96b3ca36 Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 18 Nov 2012 01:07:48 -0500 Subject: [PATCH 106/627] Fixes pausing movies for some 30 fps games, in some situations. Thanks abahbob for testing. --- Source/Core/Core/Src/Movie.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index af33458523..0b6d3adae3 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -92,10 +92,6 @@ std::string GetInputDisplay() void FrameUpdate() { - if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1 && SConfig::GetInstance().m_PauseMovie) - { - Core::SetState(Core::CORE_PAUSE); - } g_currentFrame++; if(!g_bPolled) g_currentLagCount++; @@ -178,6 +174,9 @@ void InputUpdate() g_currentInputCount++; if (IsRecordingInput()) g_totalInputCount = g_currentInputCount; + + if (IsPlayingInput() && g_currentInputCount == (g_totalInputCount -1) && SConfig::GetInstance().m_PauseMovie) + Core::SetState(Core::CORE_PAUSE); } void SetFrameSkipping(unsigned int framesToSkip) From 9345501388ac07c8e14c02c71a3ef84836eba07f Mon Sep 17 00:00:00 2001 From: parlane Date: Mon, 19 Nov 2012 03:19:51 +0000 Subject: [PATCH 107/627] Dolphin was crashing after attempting to use a NULL on macosx. (turns out that passing NULL to string cmp funcs has "undefined behavior".) Thanks to Grant Paul for this quickfix! --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 5e03e36e68..c0fe69f6bb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -520,6 +520,8 @@ bool IsValidBluetoothName(const char* name) { "Nintendo RVL-CNT-01-TR", "Nintendo RVL-WBC-01", }; + if (name == NULL) + return false; for (size_t i = 0; i < ARRAYSIZE(kValidWiiRemoteBluetoothNames); i++) if (strcmp(name, kValidWiiRemoteBluetoothNames[i]) == 0) return true; From b02bb7617fe5bdcda524d065b5601834e0a3ed4a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 2 Oct 2012 22:11:15 +0200 Subject: [PATCH 108/627] Fix some fractional EFB scaling issues. --- .../Src/FramebufferManagerBase.cpp | 20 ++-- .../VideoCommon/Src/FramebufferManagerBase.h | 4 +- Source/Core/VideoCommon/Src/RenderBase.cpp | 108 ++++++++++++++---- Source/Core/VideoCommon/Src/RenderBase.h | 9 +- 4 files changed, 102 insertions(+), 39 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index 090c1c7872..c883714daf 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -10,8 +10,8 @@ XFBSourceBase *FramebufferManagerBase::m_realXFBSource; // Only used in Real XFB FramebufferManagerBase::VirtualXFBListType FramebufferManagerBase::m_virtualXFBList; // Only used in Virtual XFB mode const XFBSourceBase* FramebufferManagerBase::m_overlappingXFBArray[MAX_VIRTUAL_XFB]; -unsigned int FramebufferManagerBase::s_last_xfb_width; -unsigned int FramebufferManagerBase::s_last_xfb_height; +unsigned int FramebufferManagerBase::s_last_xfb_width = 1; +unsigned int FramebufferManagerBase::s_last_xfb_height = 1; FramebufferManagerBase::FramebufferManagerBase() { @@ -230,30 +230,30 @@ void FramebufferManagerBase::ReplaceVirtualXFB() } } -unsigned int FramebufferManagerBase::ScaleToVirtualXfbWidth(unsigned int width, unsigned int backbuffer_width) +int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width) { if (g_ActiveConfig.RealXFBEnabled()) - return width; + return x; if (g_ActiveConfig.b3DVision) { // This works, yet the version in the else doesn't. No idea why. - return width * backbuffer_width / FramebufferManagerBase::LastXfbWidth(); + return x * (int)backbuffer_width / (int)FramebufferManagerBase::LastXfbWidth(); } else - return width * Renderer::GetTargetRectangle().GetWidth() / FramebufferManagerBase::LastXfbWidth(); + return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth(); } -unsigned int FramebufferManagerBase::ScaleToVirtualXfbHeight(unsigned int height, unsigned int backbuffer_height) +int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height) { if (g_ActiveConfig.RealXFBEnabled()) - return height; + return y; if (g_ActiveConfig.b3DVision) { // This works, yet the version in the else doesn't. No idea why. - return height * backbuffer_height / FramebufferManagerBase::LastXfbHeight(); + return y * (int)backbuffer_height / (int)FramebufferManagerBase::LastXfbHeight(); } else - return height * Renderer::GetTargetRectangle().GetHeight() / FramebufferManagerBase::LastXfbHeight(); + return y * (int)Renderer::GetTargetRectangle().GetHeight() / (int)FramebufferManagerBase::LastXfbHeight(); } diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index d915130ac4..e529bb1a39 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -55,8 +55,8 @@ public: static unsigned int LastXfbWidth() { return s_last_xfb_width; } static unsigned int LastXfbHeight() { return s_last_xfb_height; } - static unsigned int ScaleToVirtualXfbWidth(unsigned int width, unsigned int backbuffer_width); - static unsigned int ScaleToVirtualXfbHeight(unsigned int height, unsigned int backbuffer_height); + static int ScaleToVirtualXfbWidth(int x, unsigned int backbuffer_width); + static int ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height); protected: struct VirtualXFB diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 8bb6ab6750..f83ce29e49 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -76,6 +76,11 @@ bool Renderer::XFBWrited; bool Renderer::s_EnableDLCachingAfterRecording; unsigned int Renderer::prev_efb_format = (unsigned int)-1; +unsigned int Renderer::efb_scale_numeratorX = 1; +unsigned int Renderer::efb_scale_numeratorY = 1; +unsigned int Renderer::efb_scale_denominatorX = 1; +unsigned int Renderer::efb_scale_denominatorY = 1; +unsigned int Renderer::ssaa_multiplier = 1; Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) @@ -93,6 +98,8 @@ Renderer::~Renderer() // invalidate previous efb format prev_efb_format = (unsigned int)-1; + efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = ssaa_multiplier = 1; + #if defined _WIN32 || defined HAVE_LIBAV if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping) AVIDump::Stop(); @@ -129,41 +136,86 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect } } -void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) +int Renderer::EFBToScaledX(int x) { switch (g_ActiveConfig.iEFBScale) { - case 3: // 1.5x - scaledX = (x / 2) * 3; - scaledY = (y / 2) * 3; - break; - case 4: // 2x - scaledX = x * 2; - scaledY = y * 2; - break; - case 5: // 2.5x - scaledX = (x / 2) * 5; - scaledY = (y / 2) * 5; - break; - case 6: // 3x - scaledX = x * 3; - scaledY = y * 3; - break; - case 7: // 4x - scaledX = x * 4; - scaledY = y * 4; - break; + case 0: // fractional + return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width); + default: - scaledX = x; - scaledY = y; - break; + return x * (int)ssaa_multiplier * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; }; } +int Renderer::EFBToScaledY(int y) +{ + switch (g_ActiveConfig.iEFBScale) + { + case 0: // fractional + return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height); + + default: + return y * (int)ssaa_multiplier * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; + }; +} + +void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) +{ + if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) + { + scaledX = x; + scaledY = y; + } + else + { + scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; + scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; + } +} + // return true if target size changed bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier) { int newEFBWidth, newEFBHeight; + + // TODO: Ugly. Clean up + switch (s_LastEFBScale) + { + case 2: // 1x + efb_scale_numeratorX = efb_scale_numeratorY = 1; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 3: // 1.5x + efb_scale_numeratorX = efb_scale_numeratorY = 3; + efb_scale_denominatorX = efb_scale_denominatorY = 2; + break; + + case 4: // 2x + efb_scale_numeratorX = efb_scale_numeratorY = 2; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 5: // 2.5x + efb_scale_numeratorX = efb_scale_numeratorY = 5; + efb_scale_denominatorX = efb_scale_denominatorY = 2; + break; + + case 6: // 3x + efb_scale_numeratorX = efb_scale_numeratorY = 3; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + case 7: // 4x + efb_scale_numeratorX = efb_scale_numeratorY = 4; + efb_scale_denominatorX = efb_scale_denominatorY = 1; + break; + + default: // fractional & integral handled later + break; + } + switch (s_LastEFBScale) { case 0: // fractional @@ -171,13 +223,18 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH, framebuffer_width); newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT, framebuffer_height); - if (s_LastEFBScale) + if (s_LastEFBScale == 1) { newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH; newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT; } + efb_scale_numeratorX = newEFBWidth; + efb_scale_denominatorX = EFB_WIDTH; + efb_scale_numeratorY = newEFBHeight; + efb_scale_denominatorY = EFB_HEIGHT; break; + default: CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, newEFBWidth, newEFBHeight); break; @@ -185,6 +242,7 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int newEFBWidth *= multiplier; newEFBHeight *= multiplier; + ssaa_multiplier = multiplier; if (newEFBWidth != s_target_width || newEFBHeight != s_target_height) { diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 534aa732fe..4da80c9752 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -86,8 +86,8 @@ public: // Use this to upscale native EFB coordinates to IDEAL internal resolution - static unsigned int EFBToScaledX(int x) { return x * GetTargetWidth() / EFB_WIDTH; } - static unsigned int EFBToScaledY(int y) { return y * GetTargetHeight() / EFB_HEIGHT; } + static int EFBToScaledX(int x); + static int EFBToScaledY(int y); // Floating point versions of the above - only use them if really necessary static float EFBToScaledXf(float x) { return x * ((float)GetTargetWidth() / (float)EFB_WIDTH); } @@ -170,6 +170,11 @@ protected: private: static unsigned int prev_efb_format; + static unsigned int efb_scale_numeratorX; + static unsigned int efb_scale_numeratorY; + static unsigned int efb_scale_denominatorX; + static unsigned int efb_scale_denominatorY; + static unsigned int ssaa_multiplier; }; extern Renderer *g_renderer; From 3541d33c255164a9a274341bedbb8cfe5add3794 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 19 Nov 2012 20:10:37 +0100 Subject: [PATCH 109/627] Support both versions of the mixer_control bitfield. Fixes Skies of Arcadia music being muted (and sounds being mixed only on the left audio channel), this time without a hack. --- .../Src/HW/DSPHLE/UCodes/UCode_AXStructs.h | 20 ------ .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 58 ++++++++++++++++- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 6 ++ .../Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h | 65 +++++++++++++------ 5 files changed, 108 insertions(+), 43 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h index e7701e4698..c9751afec2 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -372,26 +372,6 @@ enum { SRCTYPE_NEAREST = 2, }; -enum { - MIX_L = 0x0001, - MIX_R = 0x0002, - MIX_S = 0x0004, - MIX_RAMP = 0x0008, - - MIX_AUXA_L = 0x0010, - MIX_AUXA_R = 0x0020, - MIX_AUXA_RAMPLR = 0x0040, - MIX_AUXA_S = 0x0080, - MIX_AUXA_RAMPS = 0x0100, - - MIX_AUXB_L = 0x0200, - MIX_AUXB_R = 0x0400, - MIX_AUXB_RAMPLR = 0x0800, - MIX_AUXB_S = 0x1000, - MIX_AUXB_RAMPS = 0x2000, - MIX_AUXB_DPL2 = 0x4000 -}; - // Both may be used at once enum { FILTER_LOWPASS = 1, diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index f401cc630f..8315b702db 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -230,7 +230,7 @@ inline void MixAddVoice(ParamBlockType &pb, const AXBuffers& buffers, int vol = pb.vol_env.cur_volume >> 9; sample = sample * vol >> 8; - if (pb.mixer_control & MIX_RAMP) + if (pb.mixer_control & 8) { int x = pb.vol_env.cur_volume; x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp index ccb1c25661..4279fabc29 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp @@ -19,13 +19,12 @@ #include "UCode_NewAX_Voice.h" #include "../../DSP.h" -#define MIXBUF_MAX_SAMPLES 16000 // 500ms of stereo audio - CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) , m_cmdlist_size(0) , m_axthread(&SpawnAXThread, this) { + WARN_LOG(DSPHLE, "Instantiating CUCode_NewAX: crc=%08x", crc); m_rMailHandler.PushMail(DSP_INIT); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } @@ -83,6 +82,11 @@ void CUCode_NewAX::HandleCommandList() u32 pb_addr = 0; +// WARN_LOG(DSPHLE, "Command list:"); +// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) +// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); +// WARN_LOG(DSPHLE, "-------------"); + u32 curr_idx = 0; bool end = false; while (!end) @@ -193,6 +197,54 @@ static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) } } +AXMixControl CUCode_NewAX::ConvertMixerControl(u32 mixer_control) +{ + u32 ret = 0; + + // TODO: find other UCode versions with different mixer_control values + if (m_CRC == 0x4e8a8b21) + { + ret |= MIX_L | MIX_R; + if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R; + if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R; + if (mixer_control & 0x0004) + { + ret |= MIX_S; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S; + } + if (mixer_control & 0x0008) + { + ret |= MIX_L_RAMP | MIX_R_RAMP; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP; + if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP; + } + } + else + { + if (mixer_control & 0x0001) ret |= MIX_L; + if (mixer_control & 0x0002) ret |= MIX_R; + if (mixer_control & 0x0004) ret |= MIX_S; + if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP; + if (mixer_control & 0x0010) ret |= MIX_AUXA_L; + if (mixer_control & 0x0020) ret |= MIX_AUXA_R; + if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x0080) ret |= MIX_AUXA_S; + if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x0200) ret |= MIX_AUXB_L; + if (mixer_control & 0x0400) ret |= MIX_AUXB_R; + if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x1000) ret |= MIX_AUXB_S; + if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP; + + // TODO: 0x4000 is used for Dolby Pro 2 sound mixing + } + + return (AXMixControl)ret; +} + void CUCode_NewAX::SetupProcessing(u32 init_addr) { u16 init_data[0x20]; @@ -263,7 +315,7 @@ void CUCode_NewAX::ProcessPBList(u32 pb_addr) { ApplyUpdatesForMs(pb, curr_ms); - Process1ms(pb, buffers); + Process1ms(pb, buffers, ConvertMixerControl(pb.mixer_control)); // Forward the buffers for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index a6cbe071de..0aaa9b605c 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -20,6 +20,7 @@ #include "UCodes.h" #include "UCode_AXStructs.h" +#include "UCode_NewAX_Voice.h" class CUCode_NewAX : public IUCode { @@ -99,6 +100,11 @@ private: // Copy a command list from memory to our temp buffer void CopyCmdList(u32 addr, u16 size); + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + // Send a notification to the AX thread to tell him a new cmdlist addr is // available for processing. void NotifyAXThread(); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h index 7c455d527e..82e749dbf0 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h @@ -47,6 +47,33 @@ union AXBuffers int* ptrs[9]; }; +// We can't directly use the mixer_control field from the PB because it does +// not mean the same in all AX versions. The AX UCode converts the +// mixer_control value to an AXMixControl bitfield. +enum AXMixControl +{ + MIX_L = 0x00001, + MIX_L_RAMP = 0x00002, + MIX_R = 0x00004, + MIX_R_RAMP = 0x00008, + MIX_S = 0x00010, + MIX_S_RAMP = 0x00020, + + MIX_AUXA_L = 0x00040, + MIX_AUXA_L_RAMP = 0x00080, + MIX_AUXA_R = 0x00100, + MIX_AUXA_R_RAMP = 0x00200, + MIX_AUXA_S = 0x00400, + MIX_AUXA_S_RAMP = 0x00800, + + MIX_AUXB_L = 0x01000, + MIX_AUXB_L_RAMP = 0x02000, + MIX_AUXB_R = 0x04000, + MIX_AUXB_R_RAMP = 0x08000, + MIX_AUXB_S = 0x10000, + MIX_AUXB_S_RAMP = 0x20000 +}; + // Read a PB from MRAM/ARAM inline bool ReadPB(u32 addr, AXPB& pb) { @@ -290,7 +317,7 @@ inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) } // Process 1ms of audio (32 samples) from a PB and mix it to the buffers. -inline void Process1ms(AXPB& pb, const AXBuffers& buffers) +inline void Process1ms(AXPB& pb, const AXBuffers& buffers, AXMixControl mctrl) { // If the voice is not running, nothing to do. if (!pb.running) @@ -320,26 +347,26 @@ inline void Process1ms(AXPB& pb, const AXBuffers& buffers) // HACK: at the moment we don't mix surround into left and right, so always // mix left and right in order to have sound even if a game uses surround // only. - //if (pb.mixer_control & MIX_L) - MixAdd(buffers.left, samples, &pb.mixer.left, pb.mixer_control & MIX_RAMP); - //if (pb.mixer_control & MIX_R) - MixAdd(buffers.right, samples, &pb.mixer.right, pb.mixer_control & MIX_RAMP); - if (pb.mixer_control & MIX_S) - MixAdd(buffers.surround, samples, &pb.mixer.surround, pb.mixer_control & MIX_RAMP); + if (mctrl & MIX_L) + MixAdd(buffers.left, samples, &pb.mixer.left, mctrl & MIX_L_RAMP); + if (mctrl & MIX_R) + MixAdd(buffers.right, samples, &pb.mixer.right, mctrl & MIX_R_RAMP); + if (mctrl & MIX_S) + MixAdd(buffers.surround, samples, &pb.mixer.surround, mctrl & MIX_S_RAMP); - if (pb.mixer_control & MIX_AUXA_L) - MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, pb.mixer_control & MIX_AUXA_RAMPLR); - if (pb.mixer_control & MIX_AUXA_R) - MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, pb.mixer_control & MIX_AUXA_RAMPLR); - if (pb.mixer_control & MIX_AUXA_S) - MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, pb.mixer_control & MIX_AUXA_RAMPS); + if (mctrl & MIX_AUXA_L) + MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, mctrl & MIX_AUXA_L_RAMP); + if (mctrl & MIX_AUXA_R) + MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, mctrl & MIX_AUXA_R_RAMP); + if (mctrl & MIX_AUXA_S) + MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, mctrl & MIX_AUXA_S_RAMP); - if (pb.mixer_control & MIX_AUXB_L) - MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, pb.mixer_control & MIX_AUXB_RAMPLR); - if (pb.mixer_control & MIX_AUXB_R) - MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, pb.mixer_control & MIX_AUXB_RAMPLR); - if (pb.mixer_control & MIX_AUXB_S) - MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, pb.mixer_control & MIX_AUXB_RAMPS); + if (mctrl & MIX_AUXB_L) + MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, mctrl & MIX_AUXB_L_RAMP); + if (mctrl & MIX_AUXB_R) + MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, mctrl & MIX_AUXB_R_RAMP); + if (mctrl & MIX_AUXB_S) + MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, mctrl & MIX_AUXB_S_RAMP); // Optionally, phase shift left or right channel to simulate 3D sound. if (pb.initial_time_delay.on) From 4f88fee560d99ae9fbdb78e98a1a2abb678c9abb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 19 Nov 2012 20:25:57 +0100 Subject: [PATCH 110/627] Added a small TODO list of things missing in NewAX --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h index 0aaa9b605c..2614ea1389 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h @@ -15,6 +15,15 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +// High-level emulation for the AX Gamecube UCode. +// +// TODO: +// * Depop support +// * ITD support +// * Polyphase sample interpolation support (not very useful) +// * Surround sound mixing +// * Dolby Pro 2 mixing with recent AX versions + #ifndef _UCODE_NEWAX_H #define _UCODE_NEWAX_H From d7e65f03e4c729ef0bf6dd881e4a2328dfbefc9b Mon Sep 17 00:00:00 2001 From: parlane Date: Mon, 19 Nov 2012 19:44:44 +0000 Subject: [PATCH 111/627] Fix indentation [ using the web editor D: ] --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index c0fe69f6bb..c5dedba409 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -520,7 +520,7 @@ bool IsValidBluetoothName(const char* name) { "Nintendo RVL-CNT-01-TR", "Nintendo RVL-WBC-01", }; - if (name == NULL) + if (name == NULL) return false; for (size_t i = 0; i < ARRAYSIZE(kValidWiiRemoteBluetoothNames); i++) if (strcmp(name, kValidWiiRemoteBluetoothNames[i]) == 0) From 4f652c40861b80cddba341fc699f9bbb04a79565 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 19 Nov 2012 21:09:31 +0100 Subject: [PATCH 112/627] Partially revert "Check if BP and XF changes actually change values before flushing". Dolphin code sucks too much to get optimizations. This reverts commit 5a77cae2e3434fa5cbb3710f183328e36620fa5f. Fixes issue 5459. Fixes issue 5606. --- Source/Core/VideoCommon/Src/XFStructs.cpp | 67 ++++++----------------- 1 file changed, 18 insertions(+), 49 deletions(-) diff --git a/Source/Core/VideoCommon/Src/XFStructs.cpp b/Source/Core/VideoCommon/Src/XFStructs.cpp index f8330604ad..9f395bfecf 100644 --- a/Source/Core/VideoCommon/Src/XFStructs.cpp +++ b/Source/Core/VideoCommon/Src/XFStructs.cpp @@ -121,18 +121,12 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETVIEWPORT+3: case XFMEM_SETVIEWPORT+4: case XFMEM_SETVIEWPORT+5: - { - u8 size = std::min(transferSize * 4, 6 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - VertexShaderManager::SetViewportChanged(); - PixelShaderManager::SetViewportChanged(); - } + VertexManager::Flush(); + VertexShaderManager::SetViewportChanged(); + PixelShaderManager::SetViewportChanged(); - nextAddress = XFMEM_SETVIEWPORT + 6; - break; - } + nextAddress = XFMEM_SETVIEWPORT + 6; + break; case XFMEM_SETPROJECTION: case XFMEM_SETPROJECTION+1: @@ -141,21 +135,15 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETPROJECTION+4: case XFMEM_SETPROJECTION+5: case XFMEM_SETPROJECTION+6: - { - u8 size = std::min(transferSize * 4, 7 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - VertexShaderManager::SetProjectionChanged(); - } + VertexManager::Flush(); + VertexShaderManager::SetProjectionChanged(); - nextAddress = XFMEM_SETPROJECTION + 7; - break; - } + nextAddress = XFMEM_SETPROJECTION + 7; + break; case XFMEM_SETNUMTEXGENS: // GXSetNumTexGens if (xfregs.numTexGen.numTexGens != (newValue & 15)) - VertexManager::Flush(); + VertexManager::Flush(); break; case XFMEM_SETTEXMTXINFO: @@ -166,16 +154,10 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETTEXMTXINFO+5: case XFMEM_SETTEXMTXINFO+6: case XFMEM_SETTEXMTXINFO+7: - { - u8 size = std::min(transferSize * 4, 8 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - } + VertexManager::Flush(); - nextAddress = XFMEM_SETTEXMTXINFO + 8; - break; - } + nextAddress = XFMEM_SETTEXMTXINFO + 8; + break; case XFMEM_SETPOSMTXINFO: case XFMEM_SETPOSMTXINFO+1: @@ -185,16 +167,10 @@ void XFRegWritten(int transferSize, u32 baseAddress, u32 *pData) case XFMEM_SETPOSMTXINFO+5: case XFMEM_SETPOSMTXINFO+6: case XFMEM_SETPOSMTXINFO+7: - { - u8 size = std::min(transferSize * 4, 8 * 4); - if (memcmp((u32*)&xfregs + (address - 0x1000), pData + dataIndex, size)) - { - VertexManager::Flush(); - } + VertexManager::Flush(); - nextAddress = XFMEM_SETPOSMTXINFO + 8; - break; - } + nextAddress = XFMEM_SETPOSMTXINFO + 8; + break; // -------------- // Unknown Regs @@ -264,15 +240,8 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData) transferSize = 0; } - for (u32 i = 0; i < xfMemTransferSize; ++i) - { - if (((u32*)&xfmem[xfMemBase])[i] != pData[i]) - { - XFMemWritten(xfMemTransferSize, xfMemBase); - memcpy_gc(&xfmem[xfMemBase], pData, xfMemTransferSize * 4); - break; - } - } + XFMemWritten(xfMemTransferSize, xfMemBase); + memcpy_gc(&xfmem[xfMemBase], pData, xfMemTransferSize * 4); pData += xfMemTransferSize; } From e750bed2a996bfe13cc4f33656f967209b94c5c5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 19 Nov 2012 22:03:56 +0100 Subject: [PATCH 113/627] Rename NewAX -> AX and remove the old code. Time to work on AXWii. --- Source/Core/Core/CMakeLists.txt | 1 - Source/Core/Core/Core.vcxproj | 3 - Source/Core/Core/Core.vcxproj.filters | 9 - .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 828 +++++++++--------- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 127 ++- .../Src/HW/DSPHLE/UCodes/UCode_AXStructs.h | 3 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 9 +- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 602 +++++++------ .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp | 499 ----------- .../Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h | 130 --- .../Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h | 378 -------- .../Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp | 3 +- 12 files changed, 859 insertions(+), 1733 deletions(-) delete mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp delete mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h delete mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 3182d248f8..734d966781 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -74,7 +74,6 @@ set(SRCS Src/ActionReplay.cpp Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp Src/HW/DSPHLE/UCodes/UCode_CARD.cpp Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp - Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp Src/HW/DSPHLE/UCodes/UCode_ROM.cpp Src/HW/DSPHLE/UCodes/UCodes.cpp Src/HW/DSPHLE/UCodes/UCode_GBA.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index caab0a1e6d..d83fa7fcc7 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -265,7 +265,6 @@ - @@ -467,8 +466,6 @@ - - diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index e0df3bd31f..8e2592450c 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -206,9 +206,6 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -751,12 +748,6 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index d990d282d7..8c2e05dce4 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -12,480 +12,488 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "FileUtil.h" // For IsDirectory() -#include "StringUtil.h" // For StringFromFormat() -#include - -#include "Mixer.h" -#include "../MailHandler.h" -#include "../../DSP.h" -#include "UCodes.h" -#include "UCode_AXStructs.h" #include "UCode_AX.h" #include "UCode_AX_Voice.h" +#include "../../DSP.h" -CUCode_AX::CUCode_AX(DSPHLE *dsp_hle, u32 l_CRC) - : IUCode(dsp_hle, l_CRC) - , m_addressPBs(0xFFFFFFFF) +CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc) + : IUCode(dsp_hle, crc) + , m_cmdlist_size(0) + , m_axthread(&SpawnAXThread, this) { - // we got loaded + WARN_LOG(DSPHLE, "Instantiating CUCode_AX: crc=%08x", crc); m_rMailHandler.PushMail(DSP_INIT); - - templbuffer = new int[1024 * 1024]; - temprbuffer = new int[1024 * 1024]; + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } CUCode_AX::~CUCode_AX() { + m_cmdlist_size = (u16)-1; // Special value to signal end + NotifyAXThread(); + m_axthread.join(); + m_rMailHandler.Clear(); - delete [] templbuffer; - delete [] temprbuffer; } -// Needs A LOT of love! -static void ProcessUpdates(AXPB &PB) +void CUCode_AX::SpawnAXThread(CUCode_AX* self) { - // Make the updates we are told to do. When there are multiple updates for a block they - // are placed in memory directly following updaddr. They are mostly for initial time - // delays, sometimes for the FIR filter or channel volumes. We do all of them at once here. - // If we get both an on and an off update we chose on. Perhaps that makes the RE1 music - // work better. - int numupd = PB.updates.num_updates[0] - + PB.updates.num_updates[1] - + PB.updates.num_updates[2] - + PB.updates.num_updates[3] - + PB.updates.num_updates[4]; - if (numupd > 64) numupd = 64; // prevent crazy values TODO: LOL WHAT - const u32 updaddr = (u32)(PB.updates.data_hi << 16) | PB.updates.data_lo; - int on = 0, off = 0; - for (int j = 0; j < numupd; j++) + self->AXThread(); +} + +void CUCode_AX::AXThread() +{ + while (true) { - const u16 updpar = HLEMemory_Read_U16(updaddr + j*4); - const u16 upddata = HLEMemory_Read_U16(updaddr + j*4 + 2); - // some safety checks, I hope it's enough - if (updaddr > 0x80000000 && updaddr < 0x817fffff - && updpar < 63 && updpar > 3 // updpar > 3 because we don't want to change - // 0-3, those are important - //&& (upd0 || upd1 || upd2 || upd3 || upd4) // We should use these in some way to I think - // but I don't know how or when - ) { - ((u16*)&PB)[updpar] = upddata; // WTF ABOUNDS! + std::unique_lock lk(m_cmdlist_mutex); + while (m_cmdlist_size == 0) + m_cmdlist_cv.wait(lk); } - if (updpar == 7 && upddata != 0) on++; - if (updpar == 7 && upddata == 0) off++; - } - // hack: if we get both an on and an off select on rather than off - if (on > 0 && off > 0) PB.running = 1; -} -static void VoiceHacks(AXPB &pb) -{ - // get necessary values - const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; - const u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; - // const u32 updaddr = (u32)(pb.updates.data_hi << 16) | pb.updates.data_lo; - // const u16 updpar = HLEMemory_Read_U16(updaddr); - // const u16 upddata = HLEMemory_Read_U16(updaddr + 2); + if (m_cmdlist_size == (u16)-1) // End of thread signal + break; - // ======================================================================================= - /* Fix problems introduced with the SSBM fix. Sometimes when a music stream ended sampleEnd - would end up outside of bounds while the block was still playing resulting in noise - a strange noise. This should take care of that. - */ - if ((sampleEnd > (0x017fffff * 2) || loopPos > (0x017fffff * 2))) // ARAM bounds in nibbles - { - pb.running = 0; + m_processing.lock(); + HandleCommandList(); + m_cmdlist_size = 0; - // also reset all values if it makes any difference - pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - pb.src.cur_addr_frac = 0; pb.src.ratio_hi = 0; pb.src.ratio_lo = 0; - pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; - - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - } - - /* - // the fact that no settings are reset (except running) after a SSBM type music stream or another - looping block (for example in Battle Stadium DON) has ended could cause loud garbled sound to be - played from one or more blocks. Perhaps it was in conjunction with the old sequenced music fix below, - I'm not sure. This was an attempt to prevent that anyway by resetting all. But I'm not sure if this - is needed anymore. Please try to play SSBM without it and see if it works anyway. - */ - if ( - // detect blocks that have recently been running that we should reset - pb.running == 0 && pb.audio_addr.looping == 1 - //pb.running == 0 && pb.adpcm_loop_info.pred_scale - - // this prevents us from ruining sequenced music blocks, may not be needed - /* - && !(pb.updates.num_updates[0] || pb.updates.num_updates[1] || pb.updates.num_updates[2] - || pb.updates.num_updates[3] || pb.updates.num_updates[4]) - */ - //&& !(updpar || upddata) - - && pb.mixer_control == 0 // only use this in SSBM - ) - { - // reset the detection values - pb.audio_addr.looping = 0; - pb.adpcm_loop_info.pred_scale = 0; - pb.adpcm_loop_info.yn1 = 0; pb.adpcm_loop_info.yn2 = 0; - - //pb.audio_addr.cur_addr_hi = 0; pb.audio_addr.cur_addr_lo = 0; - //pb.audio_addr.end_addr_hi = 0; pb.audio_addr.end_addr_lo = 0; - //pb.audio_addr.loop_addr_hi = 0; pb.audio_addr.loop_addr_lo = 0; - - //pb.src.cur_addr_frac = 0; PBs[i].src.ratio_hi = 0; PBs[i].src.ratio_lo = 0; - //pb.adpcm.pred_scale = 0; pb.adpcm.yn1 = 0; pb.adpcm.yn2 = 0; + // Signal end of processing + m_rMailHandler.PushMail(DSP_YIELD); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + m_processing.unlock(); } } -void CUCode_AX::MixAdd(short* _pBuffer, int _iSize) +void CUCode_AX::NotifyAXThread() { - if (_iSize > 1024 * 1024) - _iSize = 1024 * 1024; + std::unique_lock lk(m_cmdlist_mutex); + m_cmdlist_cv.notify_one(); +} - memset(templbuffer, 0, _iSize * sizeof(int)); - memset(temprbuffer, 0, _iSize * sizeof(int)); +void CUCode_AX::HandleCommandList() +{ + // Temp variables for addresses computation + u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; + u16 size; - AXPB PB; - AXBuffers buffers = {{ - templbuffer, - temprbuffer, - NULL - }}; + u32 pb_addr = 0; - for (int x = 0; x < numPBaddr; x++) +// WARN_LOG(DSPHLE, "Command list:"); +// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) +// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); +// WARN_LOG(DSPHLE, "-------------"); + + u32 curr_idx = 0; + bool end = false; + while (!end) { - //u32 blockAddr = m_addressPBs; - u32 blockAddr = PBaddr[x]; + u16 cmd = m_cmdlist[curr_idx++]; - if (!blockAddr) - return; - - for (int i = 0; i < NUMBER_OF_PBS; i++) + switch (cmd) { - if (!ReadPB(blockAddr, PB)) + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_SETUP: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); break; - if (m_CRC != 0x3389a79e) - VoiceHacks(PB); + case CMD_UNK_01: curr_idx += 5; break; - MixAddVoice(PB, buffers, _iSize); - - if (!WritePB(blockAddr, PB)) + case CMD_PB_ADDR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + pb_addr = HILO_TO_32(addr); break; - // next PB, or done - blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; - if (!blockAddr) + case CMD_PROCESS: + ProcessPBList(pb_addr); + break; + + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + // These two commands are handled almost the same internally. + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd == CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + + case CMD_UPLOAD_LRS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + UploadLRS(HILO_TO_32(addr)); + break; + + case CMD_SBUFFER_ADDR: curr_idx += 2; break; + case CMD_UNK_08: curr_idx += 10; break; // TODO: check + + case CMD_MIX_AUXB_NOWRITE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(false, 0, HILO_TO_32(addr)); + break; + + case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; + case CMD_UNK_0B: break; // TODO: check other versions + case CMD_UNK_0C: break; // TODO: check other versions + + case CMD_MORE: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + size = m_cmdlist[curr_idx++]; + + CopyCmdList(HILO_TO_32(addr), size); + curr_idx = 0; + break; + + case CMD_OUTPUT: + // Skip the first address, it is used for surround audio + // output, which we don't support yet. + curr_idx += 2; + + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr)); + break; + + case CMD_END: + end = true; + break; + + case CMD_UNK_10: curr_idx += 4; break; + case CMD_UNK_11: curr_idx += 2; break; + case CMD_UNK_12: curr_idx += 1; break; + case CMD_UNK_13: curr_idx += 12; break; + + default: + ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); + end = true; break; } } +} - if (_pBuffer) +static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) +{ + u32 start_idx = 0; + for (int i = 0; i < curr_ms; ++i) + start_idx += pb.updates.num_updates[i]; + + u32 update_addr = HILO_TO_32(pb.updates.data); + for (u32 i = start_idx; i < start_idx + pb.updates.num_updates[curr_ms]; ++i) { - for (int i = 0; i < _iSize; i++) - { - // Clamp into 16-bit. Maybe we should add a volume compressor here. - int left = templbuffer[i] + _pBuffer[0]; - int right = temprbuffer[i] + _pBuffer[1]; - if (left < -32767) left = -32767; - if (left > 32767) left = 32767; - if (right < -32767) right = -32767; - if (right > 32767) right = 32767; - *_pBuffer++ = left; - *_pBuffer++ = right; - } + u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i); + u16 update_val = HLEMemory_Read_U16(update_addr + 4 * i + 2); + + ((u16*)&pb)[update_off] = update_val; } } - -// ------------------------------------------------------------------------------ -// Handle incoming mail -void CUCode_AX::HandleMail(u32 _uMail) +AXMixControl CUCode_AX::ConvertMixerControl(u32 mixer_control) { - if (m_UploadSetupInProgress) + u32 ret = 0; + + // TODO: find other UCode versions with different mixer_control values + if (m_CRC == 0x4e8a8b21) { - PrepareBootUCode(_uMail); - return; + ret |= MIX_L | MIX_R; + if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R; + if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R; + if (mixer_control & 0x0004) + { + ret |= MIX_S; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S; + } + if (mixer_control & 0x0008) + { + ret |= MIX_L_RAMP | MIX_R_RAMP; + if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP; + if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP; + } } - else { - if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST) - { - // We are expected to get a new CmdBlock - DEBUG_LOG(DSPHLE, "GetNextCmdBlock (%ibytes)", (u16)_uMail); - } - else if (_uMail == 0xCDD10000) // Action 0 - AX_ResumeTask(); - { - m_rMailHandler.PushMail(DSP_RESUME); - } - else if (_uMail == 0xCDD10001) // Action 1 - new ucode upload ( GC: BayBlade S.T.B,...) - { - DEBUG_LOG(DSPHLE,"DSP IROM - New Ucode!"); - // TODO find a better way to protect from HLEMixer? - soundStream->GetMixer()->SetHLEReady(false); - m_UploadSetupInProgress = true; - } - else if (_uMail == 0xCDD10002) // Action 2 - IROM_Reset(); ( GC: NFS Carbon, FF Crystal Chronicles,...) - { - DEBUG_LOG(DSPHLE,"DSP IROM - Reset!"); - m_DSPHLE->SetUCode(UCODE_ROM); - return; - } - else if (_uMail == 0xCDD10003) // Action 3 - AX_GetNextCmdBlock(); - { - } + else + { + if (mixer_control & 0x0001) ret |= MIX_L; + if (mixer_control & 0x0002) ret |= MIX_R; + if (mixer_control & 0x0004) ret |= MIX_S; + if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP; + if (mixer_control & 0x0010) ret |= MIX_AUXA_L; + if (mixer_control & 0x0020) ret |= MIX_AUXA_R; + if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x0080) ret |= MIX_AUXA_S; + if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x0200) ret |= MIX_AUXB_L; + if (mixer_control & 0x0400) ret |= MIX_AUXB_R; + if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x1000) ret |= MIX_AUXB_S; + if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP; + + // TODO: 0x4000 is used for Dolby Pro 2 sound mixing + } + + return (AXMixControl)ret; +} + +void CUCode_AX::SetupProcessing(u32 init_addr) +{ + u16 init_data[0x20]; + + for (u32 i = 0; i < 0x20; ++i) + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); + + // List of all buffers we have to initialize + int* buffers[] = { + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround + }; + + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) + { + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i], 0, 5 * 32 * sizeof (int)); else { - DEBUG_LOG(DSPHLE, " >>>> u32 MAIL : AXTask Mail (%08x)", _uMail); - AXTask(_uMail); + for (u32 j = 0; j < 32 * 5; ++j) + { + buffers[i][j] = init_val; + init_val += delta; + } } } } +void CUCode_AX::ProcessPBList(u32 pb_addr) +{ + // Samples per millisecond. In theory DSP sampling rate can be changed from + // 32KHz to 48KHz, but AX always process at 32KHz. + const u32 spms = 32; + + AXPB pb; + + while (pb_addr) + { + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround + }}; + + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 5; ++curr_ms) + { + ApplyUpdatesForMs(pb, curr_ms); + + Process1ms(pb, buffers, ConvertMixerControl(pb.mixer_control)); + + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; + } + + WritePB(pb_addr, pb); + pb_addr = HILO_TO_32(pb.next_pb); + } +} + +void CUCode_AX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) +{ + int buffers[3][5 * 32]; + + // First, we need to send the contents of our AUX buffers to the CPU. + if (write_addr) + { + for (u32 i = 0; i < 5 * 32; ++i) + { + if (AUXA) + { + buffers[0][i] = Common::swap32(m_samples_auxA_left[i]); + buffers[1][i] = Common::swap32(m_samples_auxA_right[i]); + buffers[2][i] = Common::swap32(m_samples_auxA_surround[i]); + } + else + { + buffers[0][i] = Common::swap32(m_samples_auxB_left[i]); + buffers[1][i] = Common::swap32(m_samples_auxB_right[i]); + buffers[2][i] = Common::swap32(m_samples_auxB_surround[i]); + } + } + memcpy(HLEMemory_Get_Pointer(write_addr), buffers, sizeof (buffers)); + } + + // Then, we read the new buffers from the CPU and add to our current + // buffers. + memcpy(buffers, HLEMemory_Get_Pointer(read_addr), sizeof (buffers)); + for (u32 i = 0; i < 5 * 32; ++i) + { + m_samples_left[i] += Common::swap32(buffers[0][i]); + m_samples_right[i] += Common::swap32(buffers[1][i]); + m_samples_surround[i] += Common::swap32(buffers[2][i]); + } +} + +void CUCode_AX::UploadLRS(u32 dst_addr) +{ + int buffers[3][5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + { + buffers[0][i] = Common::swap32(m_samples_left[i]); + buffers[1][i] = Common::swap32(m_samples_right[i]); + buffers[2][i] = Common::swap32(m_samples_surround[i]); + } + memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); +} + +void CUCode_AX::OutputSamples(u32 out_addr) +{ + // 32 samples per ms, 5 ms, 2 channels + short buffer[5 * 32 * 2]; + + // Clamp internal buffers to 16 bits. + for (u32 i = 0; i < 5 * 32; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + m_samples_left[i] = left; + m_samples_right[i] = right; + } + + for (u32 i = 0; i < 5 * 32; ++i) + { + buffer[2 * i] = Common::swap16(m_samples_left[i]); + buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + } + + memcpy(HLEMemory_Get_Pointer(out_addr), buffer, sizeof (buffer)); +} + +void CUCode_AX::HandleMail(u32 mail) +{ + // Indicates if the next message is a command list address. + static bool next_is_cmdlist = false; + static u16 cmdlist_size = 0; + + bool set_next_is_cmdlist = false; + + // Wait for DSP processing to be done before answering any mail. This is + // safe to do because it matches what the DSP does on real hardware: there + // is no interrupt when a mail from CPU is received. + m_processing.lock(); + + if (next_is_cmdlist) + { + CopyCmdList(mail, cmdlist_size); + NotifyAXThread(); + } + else if (m_UploadSetupInProgress) + { + PrepareBootUCode(mail); + } + else if (mail == MAIL_RESUME) + { + // Acknowledge the resume request + m_rMailHandler.PushMail(DSP_RESUME); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } + else if (mail == MAIL_NEW_UCODE) + { + soundStream->GetMixer()->SetHLEReady(false); + m_UploadSetupInProgress = true; + } + else if (mail == MAIL_RESET) + { + m_DSPHLE->SetUCode(UCODE_ROM); + } + else if (mail == MAIL_CONTINUE) + { + // We don't have to do anything here - the CPU does not wait for a ACK + // and sends a cmdlist mail just after. + } + else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST) + { + // A command list address is going to be sent next. + set_next_is_cmdlist = true; + cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK); + } + else + { + ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail); + } + + m_processing.unlock(); + next_is_cmdlist = set_next_is_cmdlist; +} + +void CUCode_AX::CopyCmdList(u32 addr, u16 size) +{ + if (size >= (sizeof (m_cmdlist) / sizeof (u16))) + { + ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size); + return; + } + + for (u32 i = 0; i < size; ++i, addr += 2) + m_cmdlist[i] = HLEMemory_Read_U16(addr); + m_cmdlist_size = size; +} + +void CUCode_AX::MixAdd(short* out_buffer, int nsamples) +{ + // Should never be called: we do not set HLE as ready. + // We accurately send samples to RAM instead of directly to the mixer. +} -// ------------------------------------------------------------------------------ -// Update with DSP Interrupt void CUCode_AX::Update(int cycles) { + // Used for UCode switching. if (NeedsResumeMail()) { m_rMailHandler.PushMail(DSP_RESUME); DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); } - // check if we have to send something - else if (!m_rMailHandler.IsEmpty()) - { - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - } } -// ============================================ -// AX seems to bootup one task only and waits for resume-callbacks -// everytime the DSP has "spare time" it sends a resume-mail to the CPU -// and the __DSPHandler calls a AX-Callback which generates a new AXFrame -bool CUCode_AX::AXTask(u32& _uMail) +void CUCode_AX::DoState(PointerWrap& p) { - u32 uAddress = _uMail; - DEBUG_LOG(DSPHLE, "Begin"); - DEBUG_LOG(DSPHLE, "====================================================================="); - DEBUG_LOG(DSPHLE, "%08x : AXTask - AXCommandList-Addr:", uAddress); - - u32 Addr__AXStudio; - u32 Addr__AXOutSBuffer; - u32 Addr__AXOutSBuffer_1; - u32 Addr__AXOutSBuffer_2; - u32 Addr__A; - u32 Addr__12; - u32 Addr__4_1; - u32 Addr__4_2; - //u32 Addr__4_3; - //u32 Addr__4_4; - u32 Addr__5_1; - u32 Addr__5_2; - u32 Addr__6; - u32 Addr__9; - - bool bExecuteList = true; - - numPBaddr = 0; - - while (bExecuteList) - { - static int last_valid_command = 0; - u16 iCommand = HLEMemory_Read_U16(uAddress); - uAddress += 2; - - switch (iCommand) - { - case AXLIST_STUDIOADDR: //00 - Addr__AXStudio = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST studio address: %08x", uAddress, Addr__AXStudio); - break; - - case 0x001: // 2byte x 10 - { - u32 address = HLEMemory_Read_U32(uAddress); - uAddress += 4; - u16 param1 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - u16 param2 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - u16 param3 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 1: %08x, %04x, %04x, %04x", uAddress, address, param1, param2, param3); - } - break; - - // - // Somewhere we should be getting a bitmask of AX_SYNC values - // that tells us what has been updated - // Dunno if important - // - case AXLIST_PBADDR: //02 - { - PBaddr[numPBaddr] = HLEMemory_Read_U32(uAddress); - numPBaddr++; - - // HACK: process updates right now instead of waiting until - // Premix is called. Some games using sequenced music (Tales of - // Symphonia for example) thought PBs were unused because we - // were too slow to update them and set them as running. This - // happens because Premix is basically completely desync-ed - // from the emulation core (it's running in the audio thread). - // Fixing this would require rewriting most of the AX HLE. - u32 block_addr = uAddress; - AXPB pb; - for (int i = 0; block_addr && i < NUMBER_OF_PBS; i++) - { - if (!ReadPB(block_addr, pb)) - break; - ProcessUpdates(pb); - WritePB(block_addr, pb); - block_addr = (pb.next_pb_hi << 16) | pb.next_pb_lo; - } - - m_addressPBs = HLEMemory_Read_U32(uAddress); // left in for now - uAddress += 4; - soundStream->GetMixer()->SetHLEReady(true); - DEBUG_LOG(DSPHLE, "%08x : AXLIST PB address: %08x", uAddress, m_addressPBs); - } - break; - - case 0x0003: - DEBUG_LOG(DSPHLE, "%08x : AXLIST command 0x0003 ????", uAddress); - break; - - case 0x0004: // AUX? - Addr__4_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - Addr__4_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 4_1 4_2 addresses: %08x %08x", uAddress, Addr__4_1, Addr__4_2); - break; - - case 0x0005: - Addr__5_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - Addr__5_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 5_1 5_2 addresses: %08x %08x", uAddress, Addr__5_1, Addr__5_2); - break; - - case 0x0006: - Addr__6 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 6 address: %08x", uAddress, Addr__6); - break; - - case AXLIST_SBUFFER: - Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST OutSBuffer address: %08x", uAddress, Addr__AXOutSBuffer); - break; - - case 0x0009: - Addr__9 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST 6 address: %08x", uAddress, Addr__9); - break; - - case AXLIST_COMPRESSORTABLE: // 0xa - Addr__A = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST CompressorTable address: %08x", uAddress, Addr__A); - break; - - case 0x000e: - Addr__AXOutSBuffer_1 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - - // Addr__AXOutSBuffer_2 is the address in RAM that we are supposed to mix to. - // Although we don't, currently. - Addr__AXOutSBuffer_2 = HLEMemory_Read_U32(uAddress); - uAddress += 4; - DEBUG_LOG(DSPHLE, "%08x : AXLIST sbuf2 addresses: %08x %08x", uAddress, Addr__AXOutSBuffer_1, Addr__AXOutSBuffer_2); - break; - - case AXLIST_END: - bExecuteList = false; - DEBUG_LOG(DSPHLE, "%08x : AXLIST end", uAddress); - break; - - case 0x0010: //Super Monkey Ball 2 - DEBUG_LOG(DSPHLE, "%08x : AXLIST 0x0010", uAddress); - //should probably read/skip stuff here - uAddress += 8; - break; - - case 0x0011: - uAddress += 4; - break; - - case 0x0012: - Addr__12 = HLEMemory_Read_U16(uAddress); - uAddress += 2; - break; - - case 0x0013: - uAddress += 6 * 4; // 6 Addresses. - break; - - default: - { - static bool bFirst = true; - if (bFirst) - { - char szTemp[2048]; - sprintf(szTemp, "Unknown AX-Command 0x%x (address: 0x%08x). Last valid: %02x\n", - iCommand, uAddress - 2, last_valid_command); - int num = -32; - while (num < 64+32) - { - char szTemp2[128] = ""; - sprintf(szTemp2, "%s0x%04x\n", num == 0 ? ">>" : " ", HLEMemory_Read_U16(uAddress + num)); - strcat(szTemp, szTemp2); - num += 2; - } - - PanicAlert("%s", szTemp); - // bFirst = false; - } - - // unknown command so stop the execution of this TaskList - bExecuteList = false; - } - break; - } - if (bExecuteList) - last_valid_command = iCommand; - } - DEBUG_LOG(DSPHLE, "AXTask - done, send resume"); - DEBUG_LOG(DSPHLE, "====================================================================="); - DEBUG_LOG(DSPHLE, "End"); - - m_rMailHandler.PushMail(DSP_YIELD); - return true; -} - -void CUCode_AX::DoState(PointerWrap &p) -{ - std::lock_guard lk(m_csMix); - - p.Do(numPBaddr); - p.Do(m_addressPBs); - p.Do(PBaddr); + std::lock_guard lk(m_processing); DoStateShared(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index edb52a2801..29509661ed 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -12,52 +12,119 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _UCODE_AX -#define _UCODE_AX +// High-level emulation for the AX Gamecube UCode. +// +// TODO: +// * Depop support +// * ITD support +// * Polyphase sample interpolation support (not very useful) +// * Surround sound mixing +// * Dolby Pro 2 mixing with recent AX versions -#include +#ifndef _UCODE_AX_H +#define _UCODE_AX_H + +#include "UCodes.h" #include "UCode_AXStructs.h" +#include "UCode_AX_Voice.h" -enum -{ - NUMBER_OF_PBS = 128 -}; - -class CUCode_AX : public IUCode +class CUCode_AX : public IUCode { public: - CUCode_AX(DSPHLE *dsp_hle, u32 _CRC); + CUCode_AX(DSPHLE* dsp_hle, u32 crc); virtual ~CUCode_AX(); - void HandleMail(u32 _uMail); - void MixAdd(short* _pBuffer, int _iSize); + void HandleMail(u32 mail); + void MixAdd(short* out_buffer, int nsamples); void Update(int cycles); - void DoState(PointerWrap &p); + void DoState(PointerWrap& p); - // PBs - u8 numPBaddr; - u32 PBaddr[8]; //2 needed for MP2 - u32 m_addressPBs; + // Needed because StdThread.h std::thread implem does not support member + // pointers. + static void SpawnAXThread(CUCode_AX* self); private: - enum + enum MailType { - MAIL_AX_ALIST = 0xBABE0000, - AXLIST_STUDIOADDR = 0x0000, - AXLIST_PBADDR = 0x0002, - AXLIST_SBUFFER = 0x0007, - AXLIST_COMPRESSORTABLE = 0x000A, - AXLIST_END = 0x000F + MAIL_RESUME = 0xCDD10000, + MAIL_NEW_UCODE = 0xCDD10001, + MAIL_RESET = 0xCDD10002, + MAIL_CONTINUE = 0xCDD10003, + + // CPU sends 0xBABE0000 | cmdlist_size to the DSP + MAIL_CMDLIST = 0xBABE0000, + MAIL_CMDLIST_MASK = 0xFFFF0000 }; - int *templbuffer; - int *temprbuffer; + enum CmdType + { + CMD_SETUP = 0x00, + CMD_UNK_01 = 0x01, + CMD_PB_ADDR = 0x02, + CMD_PROCESS = 0x03, + CMD_MIX_AUXA = 0x04, + CMD_MIX_AUXB = 0x05, + CMD_UPLOAD_LRS = 0x06, + CMD_SBUFFER_ADDR = 0x07, + CMD_UNK_08 = 0x08, + CMD_MIX_AUXB_NOWRITE = 0x09, + CMD_COMPRESSOR_TABLE_ADDR = 0x0A, + CMD_UNK_0B = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_MORE = 0x0D, + CMD_OUTPUT = 0x0E, + CMD_END = 0x0F, + CMD_UNK_10 = 0x10, + CMD_UNK_11 = 0x11, + CMD_UNK_12 = 0x12, + CMD_UNK_13 = 0x13, + }; - // ax task message handler - bool AXTask(u32& _uMail); + // 32 * 5 because 32 samples per millisecond, for 5 milliseconds. + int m_samples_left[32 * 5]; + int m_samples_right[32 * 5]; + int m_samples_surround[32 * 5]; + int m_samples_auxA_left[32 * 5]; + int m_samples_auxA_right[32 * 5]; + int m_samples_auxA_surround[32 * 5]; + int m_samples_auxB_left[32 * 5]; + int m_samples_auxB_right[32 * 5]; + int m_samples_auxB_surround[32 * 5]; + + // Volatile because it's set by HandleMail and accessed in + // HandleCommandList, which are running in two different threads. + volatile u16 m_cmdlist[512]; + volatile u32 m_cmdlist_size; + + std::thread m_axthread; + + // Sync objects + std::mutex m_processing; + std::condition_variable m_cmdlist_cv; + std::mutex m_cmdlist_mutex; + + // Copy a command list from memory to our temp buffer + void CopyCmdList(u32 addr, u16 size); + + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + + // Send a notification to the AX thread to tell him a new cmdlist addr is + // available for processing. + void NotifyAXThread(); + + void AXThread(); + void HandleCommandList(); + void SetupProcessing(u32 studio_addr); + void ProcessPBList(u32 pb_addr); + void MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr); + void UploadLRS(u32 dst_addr); + void OutputSamples(u32 out_addr); }; -#endif // _UCODE_AX +#endif // !_UCODE_AX_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h index c9751afec2..e3c6b7165b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -285,7 +285,8 @@ struct AXPBWii u16 src_type; // Type of sample rate converter (none, 4-tap, linear) u16 coef_select; // coef for the 4-tap src - u32 mixer_control; + u16 mixer_control_hi; + u16 mixer_control_lo; u16 running; // 1=RUN 0=STOP u16 is_stream; // 1 = stream, 0 = one shot diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 62d3bac6e4..73abc392df 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -22,7 +22,6 @@ #include "UCodes.h" #include "UCode_AXStructs.h" -#include "UCode_AX.h" // for some functions in CUCode_AX #include "UCode_AXWii.h" #include "UCode_AX_Voice.h" @@ -112,10 +111,10 @@ void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize) if (!ReadPB(blockAddr, PB)) break; - if (wiisportsHack) - MixAddVoice(*(AXPBWiiSports*)&PB, buffers, _iSize); - else - MixAddVoice(PB, buffers, _iSize); +// if (wiisportsHack) +// MixAddVoice(*(AXPBWiiSports*)&PB, buffers, _iSize); +// else +// MixAddVoice(PB, buffers, _iSize); if (!WritePB(blockAddr, PB)) break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 8315b702db..20fea41677 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -12,297 +12,369 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ #ifndef _UCODE_AX_VOICE_H #define _UCODE_AX_VOICE_H -#include "UCodes.h" -#include "UCode_AX_ADPCM.h" -#include "UCode_AX.h" -#include "Mixer.h" -#include "../../AudioInterface.h" +#include "Common.h" +#include "UCode_AXStructs.h" +#include "../../DSP.h" -// MRAM -> ARAM for GC -inline bool ReadPB(u32 addr, AXPB &PB) -{ - const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - u16* PB_in_aram = (u16*)&PB; - - for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) - { - PB_in_aram[p] = Common::swap16(PB_in_mram[p]); - } - - return true; -} - -// MRAM -> ARAM for Wii -inline bool ReadPB(u32 addr, AXPBWii &PB) -{ - const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - u16* PB_in_aram = (u16*)&PB; - - // preswap the mixer_control - PB.mixer_control = ((u32)PB_in_mram[7] << 16) | ((u32)PB_in_mram[6] >> 16); - - for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) - { - PB_in_aram[p] = Common::swap16(PB_in_mram[p]); - } - - return true; -} - -// ARAM -> MRAM for GC -inline bool WritePB(u32 addr, AXPB &PB) -{ - const u16* PB_in_aram = (const u16*)&PB; - u16* PB_in_mram = (u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - - for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) - { - PB_in_mram[p] = Common::swap16(PB_in_aram[p]); - } - - return true; -} - -// ARAM -> MRAM for Wii -inline bool WritePB(u32 addr, AXPBWii &PB) -{ - const u16* PB_in_aram = (const u16*)&PB; - u16* PB_in_mram = (u16*)Memory::GetPointer(addr); - if (PB_in_mram == NULL) - return false; - - // preswap the mixer_control - *(u32*)&PB_in_mram[6] = (PB.mixer_control << 16) | (PB.mixer_control >> 16); - - for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) - { - PB_in_mram[p] = Common::swap16(PB_in_aram[p]); - } - - return true; -} +// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. +#define HILO_TO_32(name) \ + ((name##_hi << 16) | name##_lo) +// Used to pass a large amount of buffers to the mixing function. union AXBuffers { struct { int* left; int* right; + int* surround; + int* auxA_left; int* auxA_right; + int* auxA_surround; + int* auxB_left; int* auxB_right; + int* auxB_surround; }; - int* ptrs[6]; + int* ptrs[9]; }; -////////////////////////////////////////////////////////////////////////// -// TODO: fix handling of gc/wii PB differences -// TODO: generally fix up the mess - looks crazy and kinda wrong -template -inline void MixAddVoice(ParamBlockType &pb, const AXBuffers& buffers, - int _iSize, bool resample = true) +// We can't directly use the mixer_control field from the PB because it does +// not mean the same in all AX versions. The AX UCode converts the +// mixer_control value to an AXMixControl bitfield. +enum AXMixControl { - if (pb.running) - { - float ratioFactor; - if (resample) - ratioFactor = (float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate(); - else - ratioFactor = 1.0; + MIX_L = 0x00001, + MIX_L_RAMP = 0x00002, + MIX_R = 0x00004, + MIX_R_RAMP = 0x00008, + MIX_S = 0x00010, + MIX_S_RAMP = 0x00020, - const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) * ratioFactor); - u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; - u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; + MIX_AUXA_L = 0x00040, + MIX_AUXA_L_RAMP = 0x00080, + MIX_AUXA_R = 0x00100, + MIX_AUXA_R_RAMP = 0x00200, + MIX_AUXA_S = 0x00400, + MIX_AUXA_S_RAMP = 0x00800, - u32 samplePos = (pb.audio_addr.cur_addr_hi << 16) | pb.audio_addr.cur_addr_lo; - u32 frac = pb.src.cur_addr_frac; + MIX_AUXB_L = 0x01000, + MIX_AUXB_L_RAMP = 0x02000, + MIX_AUXB_R = 0x04000, + MIX_AUXB_R_RAMP = 0x08000, + MIX_AUXB_S = 0x10000, + MIX_AUXB_S_RAMP = 0x20000 +}; - // ======================================================================================= - // Handle No-SRC streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0 - // and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This - // makes samplePos update in the correct way. I'm unsure how we are actually supposed to - // detect that this setting. Updates did not fix this automatically. - // --------------------------------------------------------------------------------------- - // Stream settings - // src_type = 2 (most other games have src_type = 0) - // Affected games: - // Baten Kaitos - Eternal Wings (2003) - // Baten Kaitos - Origins (2006)? - // Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps - // the sound format plays in to, Baten use ADPCM, SC2 use PCM16 - //if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) - if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) - { - pb.src.ratio_hi = 1; - } +// Read a PB from MRAM/ARAM +template +bool ReadPB(u32 addr, PBType& pb) +{ + u16* dst = (u16*)&pb; + const u16* src = (const u16*)Memory::GetPointer(addr); + if (!src) + return false; - // ======================================================================================= - // Games that use looping to play non-looping music streams - SSBM has info in all - // pb.adpcm_loop_info parameters but has pb.audio_addr.looping = 0. If we treat these streams - // like any other looping streams the music works. I'm unsure how we are actually supposed to - // detect that these kinds of blocks should be looping. It seems like pb.mixer_control == 0 may - // identify these types of blocks. Updates did not write any looping values. - if ( - (pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2) - && pb.mixer_control == 0 && pb.adpcm_loop_info.pred_scale <= 0x7F - ) - { - pb.audio_addr.looping = 1; - } + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); - - - // Top Spin 3 Wii - if (pb.audio_addr.sample_format > 25) - pb.audio_addr.sample_format = 0; - - // ======================================================================================= - // Walk through _iSize. _iSize = numSamples. If the game goes slow _iSize will be higher to - // compensate for that. _iSize can be as low as 100 or as high as 2000 some cases. - for (int s = 0; s < _iSize; s++) - { - int sample = 0; - u32 oldFrac = frac; - frac += ratio; - u32 newSamplePos = samplePos + (frac >> 16); //whole number of frac - - // ======================================================================================= - // Process sample format - switch (pb.audio_addr.sample_format) - { - case AUDIOFORMAT_PCM8: - pb.adpcm.yn2 = ((s8)DSP::ReadARAM(samplePos)) << 8; //current sample - pb.adpcm.yn1 = ((s8)DSP::ReadARAM(samplePos + 1)) << 8; //next sample - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; - - samplePos = newSamplePos; - break; - - case AUDIOFORMAT_PCM16: - pb.adpcm.yn2 = (s16)(u16)((DSP::ReadARAM(samplePos * 2) << 8) | (DSP::ReadARAM((samplePos * 2 + 1)))); //current sample - pb.adpcm.yn1 = (s16)(u16)((DSP::ReadARAM((samplePos + 1) * 2) << 8) | (DSP::ReadARAM(((samplePos + 1) * 2 + 1)))); //next sample - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; - - samplePos = newSamplePos; - break; - - case AUDIOFORMAT_ADPCM: - ADPCM_Step(pb.adpcm, samplePos, newSamplePos, frac); - - if (pb.src_type == SRCTYPE_NEAREST) - sample = pb.adpcm.yn2; - else // linear interpolation - sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac) + pb.adpcm.yn2) >> 16; //adpcm moves on frac - - break; - - default: - break; - } - - // =================================================================== - // Overall volume control. In addition to this there is also separate volume settings to - // different channels (left, right etc). - frac &= 0xffff; - - int vol = pb.vol_env.cur_volume >> 9; - sample = sample * vol >> 8; - - if (pb.mixer_control & 8) - { - int x = pb.vol_env.cur_volume; - x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game - // that use this? Or how does it work? - if (x < 0) - x = 0; - if (x >= 0x7fff) - x = 0x7fff; - pb.vol_env.cur_volume = x; // maybe not per sample?? :P - } - - int leftmix = pb.mixer.left >> 5; - int rightmix = pb.mixer.right >> 5; - int auxAleftmix = pb.mixer.auxA_left >> 5; - int auxArightmix= pb.mixer.auxA_right >> 5; - int auxBleftmix = pb.mixer.auxB_left >> 5; - int auxBrightmix= pb.mixer.auxB_right >> 5; - - int left = sample * leftmix >> 8; - int right = sample * rightmix >> 8; - int auxAleft = sample * auxAleftmix >> 8; - int auxAright = sample * auxArightmix >> 8; - int auxBleft = sample * auxBleftmix >> 8; - int auxBright = sample * auxBrightmix >> 8; - - // adpcm has to walk from oldSamplePos to samplePos here - if ((pb.mixer_control & 1) && buffers.left) buffers.left[s] += left; - if ((pb.mixer_control & 2) && buffers.right) buffers.right [s] += right; - if ((pb.mixer_control & 16) && buffers.auxA_left) buffers.auxA_left[s] += auxAleft; - if ((pb.mixer_control & 32) && buffers.auxA_right) buffers.auxA_right[s] += auxAright; - if ((pb.mixer_control & 512) && buffers.auxB_left) buffers.auxB_left[s] += auxBleft; - if ((pb.mixer_control & 1024) && buffers.auxB_right) buffers.auxB_right[s] += auxBright; - - // Control the behavior when we reach the end of the sample - if (samplePos >= sampleEnd) - { - if (pb.audio_addr.looping == 1) - { - if ((samplePos & ~0x1f) == (sampleEnd & ~0x1f) || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) - samplePos = loopPos; - if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) - { - pb.adpcm.yn1 = pb.adpcm_loop_info.yn1; - pb.adpcm.yn2 = pb.adpcm_loop_info.yn2; - pb.adpcm.pred_scale = pb.adpcm_loop_info.pred_scale; - } - } - else - { - pb.running = 0; - samplePos = loopPos; - //samplePos = samplePos - sampleEnd + loopPos; - memset(&pb.dpop, 0, sizeof(pb.dpop)); - memset(pb.src.last_samples, 0, 8); - break; - } - } - } // end of the _iSize loop - - // Update volume - pb.mixer.left = ADPCM_Vol(pb.mixer.left, pb.mixer.left_delta); - pb.mixer.right = ADPCM_Vol(pb.mixer.right, pb.mixer.right_delta); - pb.mixer.auxA_left = ADPCM_Vol(pb.mixer.auxA_left, pb.mixer.auxA_left_delta); - pb.mixer.auxA_right = ADPCM_Vol(pb.mixer.auxA_right, pb.mixer.auxA_right_delta); - pb.mixer.auxB_left = ADPCM_Vol(pb.mixer.auxB_left, pb.mixer.auxB_left_delta); - pb.mixer.auxB_right = ADPCM_Vol(pb.mixer.auxB_right, pb.mixer.auxB_right_delta); - - pb.src.cur_addr_frac = (u16)frac; - pb.audio_addr.cur_addr_hi = samplePos >> 16; - pb.audio_addr.cur_addr_lo = (u16)samplePos; - - } // if (pb.running) + return true; } -#endif +// Write a PB back to MRAM/ARAM +template +inline bool WritePB(u32 addr, const PBType& pb) +{ + const u16* src = (const u16*)&pb; + u16* dst = (u16*)Memory::GetPointer(addr); + if (!dst) + return false; + + for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) + dst[i] = Common::swap16(src[i]); + + return true; +} + +// Simulated accelerator state. +static u32 acc_loop_addr, acc_end_addr; +static u32* acc_cur_addr; +static AXPB* acc_pb; + +// Sets up the simulated accelerator. +inline void AcceleratorSetup(AXPB* pb, u32* cur_addr) +{ + acc_pb = pb; + acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); + acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr); + acc_cur_addr = cur_addr; +} + +// Reads a sample from the simulated accelerator. Also handles looping and +// disabling streams that reached the end (this is done by an exception raised +// by the accelerator on real hardware). +inline u16 AcceleratorGetSample() +{ + u16 ret; + + switch (acc_pb->audio_addr.sample_format) + { + case 0x00: // ADPCM + { + // ADPCM decoding, not much to explain here. + if ((*acc_cur_addr & 15) == 0) + { + acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1); + *acc_cur_addr += 2; + } + + int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF); + int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7; + + s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0]; + s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1]; + + int temp = (*acc_cur_addr & 1) ? + (DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) : + (DSP::ReadARAM(*acc_cur_addr >> 1) >> 4); + + if (temp >= 8) + temp -= 16; + + int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11); + + if (val > 0x7FFF) val = 0x7FFF; + else if (val < -0x7FFF) val = -0x7FFF; + + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = val; + *acc_cur_addr += 1; + ret = val; + break; + } + + case 0x0A: // 16-bit PCM audio + ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1); + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + case 0x19: // 8-bit PCM audio + ret = DSP::ReadARAM(*acc_cur_addr) << 8; + acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; + acc_pb->adpcm.yn1 = ret; + *acc_cur_addr += 1; + break; + + default: + ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format); + return 0; + } + + // Have we reached the end address? + // + // On real hardware, this would raise an interrupt that is handled by the + // UCode. We simulate what this interrupt does here. + if (*acc_cur_addr >= acc_end_addr) + { + // If we are really at the end (and we don't simply have cur_addr > + // end_addr all the time), loop back to loop_addr. + if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) + *acc_cur_addr = acc_loop_addr; + + if (acc_pb->audio_addr.looping) + { + // Set the ADPCM infos to continue processing at loop_addr. + // + // For some reason, yn1 and yn2 aren't set if the voice is not of + // stream type. This is what the AX UCode does and I don't really + // know why. + acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale; + if (!acc_pb->is_stream) + { + acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1; + acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2; + } + } + else + { + // Non looping voice reached the end -> running = 0. + acc_pb->running = 0; + } + } + + return ret; +} + +// Read 32 input samples from ARAM, decoding and converting rate if required. +inline void GetInputSamples(AXPB& pb, s16* samples) +{ + u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); + AcceleratorSetup(&pb, &cur_addr); + + // TODO: support polyphase interpolation if coefficients are available. + if (pb.src_type == SRCTYPE_POLYPHASE || pb.src_type == SRCTYPE_LINEAR) + { + // Convert the input to a higher or lower sample rate using a linear + // interpolation algorithm. The input to output ratio is set in + // pb.src.ratio, which is a floating point num stored as a 32b integer: + // * Upper 16 bits of the ratio are the integer part + // * Lower 16 bits are the decimal part + u32 ratio = HILO_TO_32(pb.src.ratio); + + // We start getting samples not from sample 0, but 0.. + // This avoids discontinuties in the audio stream, especially with very + // low ratios which interpolate a lot of values between two "real" + // samples. + u32 curr_pos = pb.src.cur_addr_frac; + + // Compute the number of real samples we will need to read from the + // data source. We need to output 32 samples, so we need to read + // 32 * ratio + curr_pos samples. The maximum possible ratio available + // on the DSP is 4.0, so at most we will read 128 real samples. + s16 real_samples[130]; + u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; + + // The first two real samples are the ones we read at the previous + // iteration. That way we can interpolate before having read 2 new + // samples from the accelerator. + // + // The next real samples are read from the accelerator. + real_samples[0] = pb.src.last_samples[2]; + real_samples[1] = pb.src.last_samples[3]; + for (u32 i = 0; i < real_samples_needed; ++i) + real_samples[i + 2] = AcceleratorGetSample(); + + for (u32 i = 0; i < 32; ++i) + { + // Get our current integer and fractional position. The integer + // position is used to get the two samples around us. The + // fractional position is used to compute the linear interpolation + // between these two samples. + u32 curr_int_pos = (curr_pos >> 16); + s32 curr_frac_pos = curr_pos & 0xFFFF; + s16 samp1 = real_samples[curr_int_pos]; + s16 samp2 = real_samples[curr_int_pos + 1]; + + // Linear interpolation: s1 + (s2 - s1) * pos + s16 sample = samp1 + (s16)(((samp2 - samp1) * (s32)curr_frac_pos) >> 16); + samples[i] = sample; + + curr_pos += ratio; + } + + // Update the last_samples array. A bit tricky because we can't know + // for sure we have more than 4 real samples in our array. + if (real_samples_needed >= 2) + memcpy(pb.src.last_samples, &real_samples[real_samples_needed + 2 - 4], 4 * sizeof (u16)); + else + { + memmove(pb.src.last_samples, &pb.src.last_samples[real_samples_needed], (4 - real_samples_needed) * sizeof (u16)); + memcpy(&pb.src.last_samples[4 - real_samples_needed], &real_samples[2], real_samples_needed * sizeof (u16)); + } + pb.src.cur_addr_frac = curr_pos & 0xFFFF; + } + else // SRCTYPE_NEAREST + { + // No sample rate conversion here: simply read 32 samples from the + // accelerator to the output buffer. + for (u32 i = 0; i < 32; ++i) + samples[i] = AcceleratorGetSample(); + + memcpy(pb.src.last_samples, samples + 28, 4 * sizeof (u16)); + } + + // Update current position in the PB. + pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16); + pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF); +} + +// Add samples to an output buffer, with optional volume ramping. +inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) +{ + u16& volume = pvol[0]; + u16 volume_delta = pvol[1]; + + // If volume ramping is disabled, set volume_delta to 0. That way, the + // mixing loop can avoid testing if volume ramping is enabled at each step, + // and just add volume_delta. + if (!ramp) + volume_delta = 0; + + for (u32 i = 0; i < 32; ++i) + { + s64 sample = 2 * (s16)input[i] * (s16)volume; + out[i] += (s32)(sample >> 16); + volume += volume_delta; + } +} + +// Process 1ms of audio (32 samples) from a PB and mix it to the buffers. +inline void Process1ms(AXPB& pb, const AXBuffers& buffers, AXMixControl mctrl) +{ + // If the voice is not running, nothing to do. + if (!pb.running) + return; + + // Read input samples, performing sample rate conversion if needed. + s16 samples[32]; + GetInputSamples(pb, samples); + + // Apply a global volume ramp using the volume envelope parameters. + for (u32 i = 0; i < 32; ++i) + { + s64 sample = 2 * (s16)samples[i] * (s16)pb.vol_env.cur_volume; + samples[i] = (s16)(sample >> 16); + pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta; + } + + // Optionally, execute a low pass filter + if (pb.lpf.enabled) + { + // TODO + } + + // Mix LRS, AUXA and AUXB depending on mixer_control + // TODO: Handle DPL2 on AUXB. + + // HACK: at the moment we don't mix surround into left and right, so always + // mix left and right in order to have sound even if a game uses surround + // only. + if (mctrl & MIX_L) + MixAdd(buffers.left, samples, &pb.mixer.left, mctrl & MIX_L_RAMP); + if (mctrl & MIX_R) + MixAdd(buffers.right, samples, &pb.mixer.right, mctrl & MIX_R_RAMP); + if (mctrl & MIX_S) + MixAdd(buffers.surround, samples, &pb.mixer.surround, mctrl & MIX_S_RAMP); + + if (mctrl & MIX_AUXA_L) + MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, mctrl & MIX_AUXA_L_RAMP); + if (mctrl & MIX_AUXA_R) + MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, mctrl & MIX_AUXA_R_RAMP); + if (mctrl & MIX_AUXA_S) + MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, mctrl & MIX_AUXA_S_RAMP); + + if (mctrl & MIX_AUXB_L) + MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, mctrl & MIX_AUXB_L_RAMP); + if (mctrl & MIX_AUXB_R) + MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, mctrl & MIX_AUXB_R_RAMP); + if (mctrl & MIX_AUXB_S) + MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, mctrl & MIX_AUXB_S_RAMP); + + // Optionally, phase shift left or right channel to simulate 3D sound. + if (pb.initial_time_delay.on) + { + // TODO + } +} + +#endif // !_UCODE_AX_VOICE_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp deleted file mode 100644 index 4279fabc29..0000000000 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.cpp +++ /dev/null @@ -1,499 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official Git repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "UCode_NewAX.h" -#include "UCode_NewAX_Voice.h" -#include "../../DSP.h" - -CUCode_NewAX::CUCode_NewAX(DSPHLE* dsp_hle, u32 crc) - : IUCode(dsp_hle, crc) - , m_cmdlist_size(0) - , m_axthread(&SpawnAXThread, this) -{ - WARN_LOG(DSPHLE, "Instantiating CUCode_NewAX: crc=%08x", crc); - m_rMailHandler.PushMail(DSP_INIT); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); -} - -CUCode_NewAX::~CUCode_NewAX() -{ - m_cmdlist_size = (u16)-1; // Special value to signal end - NotifyAXThread(); - m_axthread.join(); - - m_rMailHandler.Clear(); -} - -void CUCode_NewAX::SpawnAXThread(CUCode_NewAX* self) -{ - self->AXThread(); -} - -void CUCode_NewAX::AXThread() -{ - while (true) - { - { - std::unique_lock lk(m_cmdlist_mutex); - while (m_cmdlist_size == 0) - m_cmdlist_cv.wait(lk); - } - - if (m_cmdlist_size == (u16)-1) // End of thread signal - break; - - m_processing.lock(); - HandleCommandList(); - m_cmdlist_size = 0; - - // Signal end of processing - m_rMailHandler.PushMail(DSP_YIELD); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - m_processing.unlock(); - } -} - -void CUCode_NewAX::NotifyAXThread() -{ - std::unique_lock lk(m_cmdlist_mutex); - m_cmdlist_cv.notify_one(); -} - -void CUCode_NewAX::HandleCommandList() -{ - // Temp variables for addresses computation - u16 addr_hi, addr_lo; - u16 addr2_hi, addr2_lo; - u16 size; - - u32 pb_addr = 0; - -// WARN_LOG(DSPHLE, "Command list:"); -// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) -// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); -// WARN_LOG(DSPHLE, "-------------"); - - u32 curr_idx = 0; - bool end = false; - while (!end) - { - u16 cmd = m_cmdlist[curr_idx++]; - - switch (cmd) - { - // Some of these commands are unknown, or unused in this AX HLE. - // We still need to skip their arguments using "curr_idx += N". - - case CMD_SETUP: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - SetupProcessing(HILO_TO_32(addr)); - break; - - case CMD_UNK_01: curr_idx += 5; break; - - case CMD_PB_ADDR: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - pb_addr = HILO_TO_32(addr); - break; - - case CMD_PROCESS: - ProcessPBList(pb_addr); - break; - - case CMD_MIX_AUXA: - case CMD_MIX_AUXB: - // These two commands are handled almost the same internally. - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - addr2_hi = m_cmdlist[curr_idx++]; - addr2_lo = m_cmdlist[curr_idx++]; - MixAUXSamples(cmd == CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); - break; - - case CMD_UPLOAD_LRS: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - UploadLRS(HILO_TO_32(addr)); - break; - - case CMD_SBUFFER_ADDR: curr_idx += 2; break; - case CMD_UNK_08: curr_idx += 10; break; // TODO: check - - case CMD_MIX_AUXB_NOWRITE: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - MixAUXSamples(false, 0, HILO_TO_32(addr)); - break; - - case CMD_COMPRESSOR_TABLE_ADDR: curr_idx += 2; break; - case CMD_UNK_0B: break; // TODO: check other versions - case CMD_UNK_0C: break; // TODO: check other versions - - case CMD_MORE: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - size = m_cmdlist[curr_idx++]; - - CopyCmdList(HILO_TO_32(addr), size); - curr_idx = 0; - break; - - case CMD_OUTPUT: - // Skip the first address, it is used for surround audio - // output, which we don't support yet. - curr_idx += 2; - - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - OutputSamples(HILO_TO_32(addr)); - break; - - case CMD_END: - end = true; - break; - - case CMD_UNK_10: curr_idx += 4; break; - case CMD_UNK_11: curr_idx += 2; break; - case CMD_UNK_12: curr_idx += 1; break; - case CMD_UNK_13: curr_idx += 12; break; - - default: - ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); - end = true; - break; - } - } -} - -static void ApplyUpdatesForMs(AXPB& pb, int curr_ms) -{ - u32 start_idx = 0; - for (int i = 0; i < curr_ms; ++i) - start_idx += pb.updates.num_updates[i]; - - u32 update_addr = HILO_TO_32(pb.updates.data); - for (u32 i = start_idx; i < start_idx + pb.updates.num_updates[curr_ms]; ++i) - { - u16 update_off = HLEMemory_Read_U16(update_addr + 4 * i); - u16 update_val = HLEMemory_Read_U16(update_addr + 4 * i + 2); - - ((u16*)&pb)[update_off] = update_val; - } -} - -AXMixControl CUCode_NewAX::ConvertMixerControl(u32 mixer_control) -{ - u32 ret = 0; - - // TODO: find other UCode versions with different mixer_control values - if (m_CRC == 0x4e8a8b21) - { - ret |= MIX_L | MIX_R; - if (mixer_control & 0x0001) ret |= MIX_AUXA_L | MIX_AUXA_R; - if (mixer_control & 0x0002) ret |= MIX_AUXB_L | MIX_AUXB_R; - if (mixer_control & 0x0004) - { - ret |= MIX_S; - if (ret & MIX_AUXA_L) ret |= MIX_AUXA_S; - if (ret & MIX_AUXB_L) ret |= MIX_AUXB_S; - } - if (mixer_control & 0x0008) - { - ret |= MIX_L_RAMP | MIX_R_RAMP; - if (ret & MIX_AUXA_L) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; - if (ret & MIX_AUXB_L) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; - if (ret & MIX_AUXA_S) ret |= MIX_AUXA_S_RAMP; - if (ret & MIX_AUXB_S) ret |= MIX_AUXB_S_RAMP; - } - } - else - { - if (mixer_control & 0x0001) ret |= MIX_L; - if (mixer_control & 0x0002) ret |= MIX_R; - if (mixer_control & 0x0004) ret |= MIX_S; - if (mixer_control & 0x0008) ret |= MIX_L_RAMP | MIX_R_RAMP | MIX_S_RAMP; - if (mixer_control & 0x0010) ret |= MIX_AUXA_L; - if (mixer_control & 0x0020) ret |= MIX_AUXA_R; - if (mixer_control & 0x0040) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; - if (mixer_control & 0x0080) ret |= MIX_AUXA_S; - if (mixer_control & 0x0100) ret |= MIX_AUXA_S_RAMP; - if (mixer_control & 0x0200) ret |= MIX_AUXB_L; - if (mixer_control & 0x0400) ret |= MIX_AUXB_R; - if (mixer_control & 0x0800) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; - if (mixer_control & 0x1000) ret |= MIX_AUXB_S; - if (mixer_control & 0x2000) ret |= MIX_AUXB_S_RAMP; - - // TODO: 0x4000 is used for Dolby Pro 2 sound mixing - } - - return (AXMixControl)ret; -} - -void CUCode_NewAX::SetupProcessing(u32 init_addr) -{ - u16 init_data[0x20]; - - for (u32 i = 0; i < 0x20; ++i) - init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); - - // List of all buffers we have to initialize - int* buffers[] = { - m_samples_left, - m_samples_right, - m_samples_surround, - m_samples_auxA_left, - m_samples_auxA_right, - m_samples_auxA_surround, - m_samples_auxB_left, - m_samples_auxB_right, - m_samples_auxB_surround - }; - - u32 init_idx = 0; - for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) - { - s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); - s16 delta = (s16)init_data[init_idx + 2]; - - init_idx += 3; - - if (!init_val) - memset(buffers[i], 0, 5 * 32 * sizeof (int)); - else - { - for (u32 j = 0; j < 32 * 5; ++j) - { - buffers[i][j] = init_val; - init_val += delta; - } - } - } -} - -void CUCode_NewAX::ProcessPBList(u32 pb_addr) -{ - // Samples per millisecond. In theory DSP sampling rate can be changed from - // 32KHz to 48KHz, but AX always process at 32KHz. - const u32 spms = 32; - - AXPB pb; - - while (pb_addr) - { - AXBuffers buffers = {{ - m_samples_left, - m_samples_right, - m_samples_surround, - m_samples_auxA_left, - m_samples_auxA_right, - m_samples_auxA_surround, - m_samples_auxB_left, - m_samples_auxB_right, - m_samples_auxB_surround - }}; - - if (!ReadPB(pb_addr, pb)) - break; - - for (int curr_ms = 0; curr_ms < 5; ++curr_ms) - { - ApplyUpdatesForMs(pb, curr_ms); - - Process1ms(pb, buffers, ConvertMixerControl(pb.mixer_control)); - - // Forward the buffers - for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) - buffers.ptrs[i] += spms; - } - - WritePB(pb_addr, pb); - pb_addr = HILO_TO_32(pb.next_pb); - } -} - -void CUCode_NewAX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) -{ - int buffers[3][5 * 32]; - - // First, we need to send the contents of our AUX buffers to the CPU. - if (write_addr) - { - for (u32 i = 0; i < 5 * 32; ++i) - { - if (AUXA) - { - buffers[0][i] = Common::swap32(m_samples_auxA_left[i]); - buffers[1][i] = Common::swap32(m_samples_auxA_right[i]); - buffers[2][i] = Common::swap32(m_samples_auxA_surround[i]); - } - else - { - buffers[0][i] = Common::swap32(m_samples_auxB_left[i]); - buffers[1][i] = Common::swap32(m_samples_auxB_right[i]); - buffers[2][i] = Common::swap32(m_samples_auxB_surround[i]); - } - } - memcpy(HLEMemory_Get_Pointer(write_addr), buffers, sizeof (buffers)); - } - - // Then, we read the new buffers from the CPU and add to our current - // buffers. - memcpy(buffers, HLEMemory_Get_Pointer(read_addr), sizeof (buffers)); - for (u32 i = 0; i < 5 * 32; ++i) - { - m_samples_left[i] += Common::swap32(buffers[0][i]); - m_samples_right[i] += Common::swap32(buffers[1][i]); - m_samples_surround[i] += Common::swap32(buffers[2][i]); - } -} - -void CUCode_NewAX::UploadLRS(u32 dst_addr) -{ - int buffers[3][5 * 32]; - - for (u32 i = 0; i < 5 * 32; ++i) - { - buffers[0][i] = Common::swap32(m_samples_left[i]); - buffers[1][i] = Common::swap32(m_samples_right[i]); - buffers[2][i] = Common::swap32(m_samples_surround[i]); - } - memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); -} - -void CUCode_NewAX::OutputSamples(u32 out_addr) -{ - // 32 samples per ms, 5 ms, 2 channels - short buffer[5 * 32 * 2]; - - // Clamp internal buffers to 16 bits. - for (u32 i = 0; i < 5 * 32; ++i) - { - int left = m_samples_left[i]; - int right = m_samples_right[i]; - - if (left < -32767) left = -32767; - if (left > 32767) left = 32767; - if (right < -32767) right = -32767; - if (right > 32767) right = 32767; - - m_samples_left[i] = left; - m_samples_right[i] = right; - } - - for (u32 i = 0; i < 5 * 32; ++i) - { - buffer[2 * i] = Common::swap16(m_samples_left[i]); - buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); - } - - memcpy(HLEMemory_Get_Pointer(out_addr), buffer, sizeof (buffer)); -} - -void CUCode_NewAX::HandleMail(u32 mail) -{ - // Indicates if the next message is a command list address. - static bool next_is_cmdlist = false; - static u16 cmdlist_size = 0; - - bool set_next_is_cmdlist = false; - - // Wait for DSP processing to be done before answering any mail. This is - // safe to do because it matches what the DSP does on real hardware: there - // is no interrupt when a mail from CPU is received. - m_processing.lock(); - - if (next_is_cmdlist) - { - CopyCmdList(mail, cmdlist_size); - NotifyAXThread(); - } - else if (m_UploadSetupInProgress) - { - PrepareBootUCode(mail); - } - else if (mail == MAIL_RESUME) - { - // Acknowledge the resume request - m_rMailHandler.PushMail(DSP_RESUME); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - } - else if (mail == MAIL_NEW_UCODE) - { - soundStream->GetMixer()->SetHLEReady(false); - m_UploadSetupInProgress = true; - } - else if (mail == MAIL_RESET) - { - m_DSPHLE->SetUCode(UCODE_ROM); - } - else if (mail == MAIL_CONTINUE) - { - // We don't have to do anything here - the CPU does not wait for a ACK - // and sends a cmdlist mail just after. - } - else if ((mail & MAIL_CMDLIST_MASK) == MAIL_CMDLIST) - { - // A command list address is going to be sent next. - set_next_is_cmdlist = true; - cmdlist_size = (u16)(mail & ~MAIL_CMDLIST_MASK); - } - else - { - ERROR_LOG(DSPHLE, "Unknown mail sent to AX::HandleMail: %08x", mail); - } - - m_processing.unlock(); - next_is_cmdlist = set_next_is_cmdlist; -} - -void CUCode_NewAX::CopyCmdList(u32 addr, u16 size) -{ - if (size >= (sizeof (m_cmdlist) / sizeof (u16))) - { - ERROR_LOG(DSPHLE, "Command list at %08x is too large: size=%d", addr, size); - return; - } - - for (u32 i = 0; i < size; ++i, addr += 2) - m_cmdlist[i] = HLEMemory_Read_U16(addr); - m_cmdlist_size = size; -} - -void CUCode_NewAX::MixAdd(short* out_buffer, int nsamples) -{ - // Should never be called: we do not set HLE as ready. - // We accurately send samples to RAM instead of directly to the mixer. -} - -void CUCode_NewAX::Update(int cycles) -{ - // Used for UCode switching. - if (NeedsResumeMail()) - { - m_rMailHandler.PushMail(DSP_RESUME); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - } -} - -void CUCode_NewAX::DoState(PointerWrap& p) -{ - std::lock_guard lk(m_processing); - - DoStateShared(p); -} diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h deleted file mode 100644 index 2614ea1389..0000000000 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX.h +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official Git repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -// High-level emulation for the AX Gamecube UCode. -// -// TODO: -// * Depop support -// * ITD support -// * Polyphase sample interpolation support (not very useful) -// * Surround sound mixing -// * Dolby Pro 2 mixing with recent AX versions - -#ifndef _UCODE_NEWAX_H -#define _UCODE_NEWAX_H - -#include "UCodes.h" -#include "UCode_AXStructs.h" -#include "UCode_NewAX_Voice.h" - -class CUCode_NewAX : public IUCode -{ -public: - CUCode_NewAX(DSPHLE* dsp_hle, u32 crc); - virtual ~CUCode_NewAX(); - - void HandleMail(u32 mail); - void MixAdd(short* out_buffer, int nsamples); - void Update(int cycles); - void DoState(PointerWrap& p); - - // Needed because StdThread.h std::thread implem does not support member - // pointers. - static void SpawnAXThread(CUCode_NewAX* self); - -private: - enum MailType - { - MAIL_RESUME = 0xCDD10000, - MAIL_NEW_UCODE = 0xCDD10001, - MAIL_RESET = 0xCDD10002, - MAIL_CONTINUE = 0xCDD10003, - - // CPU sends 0xBABE0000 | cmdlist_size to the DSP - MAIL_CMDLIST = 0xBABE0000, - MAIL_CMDLIST_MASK = 0xFFFF0000 - }; - - enum CmdType - { - CMD_SETUP = 0x00, - CMD_UNK_01 = 0x01, - CMD_PB_ADDR = 0x02, - CMD_PROCESS = 0x03, - CMD_MIX_AUXA = 0x04, - CMD_MIX_AUXB = 0x05, - CMD_UPLOAD_LRS = 0x06, - CMD_SBUFFER_ADDR = 0x07, - CMD_UNK_08 = 0x08, - CMD_MIX_AUXB_NOWRITE = 0x09, - CMD_COMPRESSOR_TABLE_ADDR = 0x0A, - CMD_UNK_0B = 0x0B, - CMD_UNK_0C = 0x0C, - CMD_MORE = 0x0D, - CMD_OUTPUT = 0x0E, - CMD_END = 0x0F, - CMD_UNK_10 = 0x10, - CMD_UNK_11 = 0x11, - CMD_UNK_12 = 0x12, - CMD_UNK_13 = 0x13, - }; - - // 32 * 5 because 32 samples per millisecond, for 5 milliseconds. - int m_samples_left[32 * 5]; - int m_samples_right[32 * 5]; - int m_samples_surround[32 * 5]; - int m_samples_auxA_left[32 * 5]; - int m_samples_auxA_right[32 * 5]; - int m_samples_auxA_surround[32 * 5]; - int m_samples_auxB_left[32 * 5]; - int m_samples_auxB_right[32 * 5]; - int m_samples_auxB_surround[32 * 5]; - - // Volatile because it's set by HandleMail and accessed in - // HandleCommandList, which are running in two different threads. - volatile u16 m_cmdlist[512]; - volatile u32 m_cmdlist_size; - - std::thread m_axthread; - - // Sync objects - std::mutex m_processing; - std::condition_variable m_cmdlist_cv; - std::mutex m_cmdlist_mutex; - - // Copy a command list from memory to our temp buffer - void CopyCmdList(u32 addr, u16 size); - - // Convert a mixer_control bitfield to our internal representation for that - // value. Required because that bitfield has a different meaning in some - // versions of AX. - AXMixControl ConvertMixerControl(u32 mixer_control); - - // Send a notification to the AX thread to tell him a new cmdlist addr is - // available for processing. - void NotifyAXThread(); - - void AXThread(); - void HandleCommandList(); - void SetupProcessing(u32 studio_addr); - void ProcessPBList(u32 pb_addr); - void MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr); - void UploadLRS(u32 dst_addr); - void OutputSamples(u32 out_addr); -}; - -#endif // !_UCODE_NEWAX_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h deleted file mode 100644 index 82e749dbf0..0000000000 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAX_Voice.h +++ /dev/null @@ -1,378 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official Git repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef _UCODE_NEWAX_VOICE_H -#define _UCODE_NEWAX_VOICE_H - -#include "Common.h" -#include "UCode_AXStructs.h" -#include "../../DSP.h" - -// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. -#define HILO_TO_32(name) \ - ((name##_hi << 16) | name##_lo) - -// Used to pass a large amount of buffers to the mixing function. -union AXBuffers -{ - struct - { - int* left; - int* right; - int* surround; - - int* auxA_left; - int* auxA_right; - int* auxA_surround; - - int* auxB_left; - int* auxB_right; - int* auxB_surround; - }; - - int* ptrs[9]; -}; - -// We can't directly use the mixer_control field from the PB because it does -// not mean the same in all AX versions. The AX UCode converts the -// mixer_control value to an AXMixControl bitfield. -enum AXMixControl -{ - MIX_L = 0x00001, - MIX_L_RAMP = 0x00002, - MIX_R = 0x00004, - MIX_R_RAMP = 0x00008, - MIX_S = 0x00010, - MIX_S_RAMP = 0x00020, - - MIX_AUXA_L = 0x00040, - MIX_AUXA_L_RAMP = 0x00080, - MIX_AUXA_R = 0x00100, - MIX_AUXA_R_RAMP = 0x00200, - MIX_AUXA_S = 0x00400, - MIX_AUXA_S_RAMP = 0x00800, - - MIX_AUXB_L = 0x01000, - MIX_AUXB_L_RAMP = 0x02000, - MIX_AUXB_R = 0x04000, - MIX_AUXB_R_RAMP = 0x08000, - MIX_AUXB_S = 0x10000, - MIX_AUXB_S_RAMP = 0x20000 -}; - -// Read a PB from MRAM/ARAM -inline bool ReadPB(u32 addr, AXPB& pb) -{ - u16* dst = (u16*)&pb; - const u16* src = (const u16*)Memory::GetPointer(addr); - if (!src) - return false; - - for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) - dst[i] = Common::swap16(src[i]); - - return true; -} - -// Write a PB back to MRAM/ARAM -inline bool WritePB(u32 addr, const AXPB& pb) -{ - const u16* src = (const u16*)&pb; - u16* dst = (u16*)Memory::GetPointer(addr); - if (!dst) - return false; - - for (u32 i = 0; i < sizeof (pb) / sizeof (u16); ++i) - dst[i] = Common::swap16(src[i]); - - return true; -} - -// Simulated accelerator state. -static u32 acc_loop_addr, acc_end_addr; -static u32* acc_cur_addr; -static AXPB* acc_pb; - -// Sets up the simulated accelerator. -inline void AcceleratorSetup(AXPB* pb, u32* cur_addr) -{ - acc_pb = pb; - acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); - acc_end_addr = HILO_TO_32(pb->audio_addr.end_addr); - acc_cur_addr = cur_addr; -} - -// Reads a sample from the simulated accelerator. Also handles looping and -// disabling streams that reached the end (this is done by an exception raised -// by the accelerator on real hardware). -inline u16 AcceleratorGetSample() -{ - u16 ret; - - switch (acc_pb->audio_addr.sample_format) - { - case 0x00: // ADPCM - { - // ADPCM decoding, not much to explain here. - if ((*acc_cur_addr & 15) == 0) - { - acc_pb->adpcm.pred_scale = DSP::ReadARAM((*acc_cur_addr & ~15) >> 1); - *acc_cur_addr += 2; - } - - int scale = 1 << (acc_pb->adpcm.pred_scale & 0xF); - int coef_idx = (acc_pb->adpcm.pred_scale >> 4) & 0x7; - - s32 coef1 = acc_pb->adpcm.coefs[coef_idx * 2 + 0]; - s32 coef2 = acc_pb->adpcm.coefs[coef_idx * 2 + 1]; - - int temp = (*acc_cur_addr & 1) ? - (DSP::ReadARAM(*acc_cur_addr >> 1) & 0xF) : - (DSP::ReadARAM(*acc_cur_addr >> 1) >> 4); - - if (temp >= 8) - temp -= 16; - - int val = (scale * temp) + ((0x400 + coef1 * acc_pb->adpcm.yn1 + coef2 * acc_pb->adpcm.yn2) >> 11); - - if (val > 0x7FFF) val = 0x7FFF; - else if (val < -0x7FFF) val = -0x7FFF; - - acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; - acc_pb->adpcm.yn1 = val; - *acc_cur_addr += 1; - ret = val; - break; - } - - case 0x0A: // 16-bit PCM audio - ret = (DSP::ReadARAM(*acc_cur_addr * 2) << 8) | DSP::ReadARAM(*acc_cur_addr * 2 + 1); - acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; - acc_pb->adpcm.yn1 = ret; - *acc_cur_addr += 1; - break; - - case 0x19: // 8-bit PCM audio - ret = DSP::ReadARAM(*acc_cur_addr) << 8; - acc_pb->adpcm.yn2 = acc_pb->adpcm.yn1; - acc_pb->adpcm.yn1 = ret; - *acc_cur_addr += 1; - break; - - default: - ERROR_LOG(DSPHLE, "Unknown sample format: %d", acc_pb->audio_addr.sample_format); - return 0; - } - - // Have we reached the end address? - // - // On real hardware, this would raise an interrupt that is handled by the - // UCode. We simulate what this interrupt does here. - if (*acc_cur_addr >= acc_end_addr) - { - // If we are really at the end (and we don't simply have cur_addr > - // end_addr all the time), loop back to loop_addr. - if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) - *acc_cur_addr = acc_loop_addr; - - if (acc_pb->audio_addr.looping) - { - // Set the ADPCM infos to continue processing at loop_addr. - // - // For some reason, yn1 and yn2 aren't set if the voice is not of - // stream type. This is what the AX UCode does and I don't really - // know why. - acc_pb->adpcm.pred_scale = acc_pb->adpcm_loop_info.pred_scale; - if (!acc_pb->is_stream) - { - acc_pb->adpcm.yn1 = acc_pb->adpcm_loop_info.yn1; - acc_pb->adpcm.yn2 = acc_pb->adpcm_loop_info.yn2; - } - } - else - { - // Non looping voice reached the end -> running = 0. - acc_pb->running = 0; - } - } - - return ret; -} - -// Read 32 input samples from ARAM, decoding and converting rate if required. -inline void GetInputSamples(AXPB& pb, s16* samples) -{ - u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); - AcceleratorSetup(&pb, &cur_addr); - - // TODO: support polyphase interpolation if coefficients are available. - if (pb.src_type == SRCTYPE_POLYPHASE || pb.src_type == SRCTYPE_LINEAR) - { - // Convert the input to a higher or lower sample rate using a linear - // interpolation algorithm. The input to output ratio is set in - // pb.src.ratio, which is a floating point num stored as a 32b integer: - // * Upper 16 bits of the ratio are the integer part - // * Lower 16 bits are the decimal part - u32 ratio = HILO_TO_32(pb.src.ratio); - - // We start getting samples not from sample 0, but 0.. - // This avoids discontinuties in the audio stream, especially with very - // low ratios which interpolate a lot of values between two "real" - // samples. - u32 curr_pos = pb.src.cur_addr_frac; - - // Compute the number of real samples we will need to read from the - // data source. We need to output 32 samples, so we need to read - // 32 * ratio + curr_pos samples. The maximum possible ratio available - // on the DSP is 4.0, so at most we will read 128 real samples. - s16 real_samples[130]; - u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; - - // The first two real samples are the ones we read at the previous - // iteration. That way we can interpolate before having read 2 new - // samples from the accelerator. - // - // The next real samples are read from the accelerator. - real_samples[0] = pb.src.last_samples[2]; - real_samples[1] = pb.src.last_samples[3]; - for (u32 i = 0; i < real_samples_needed; ++i) - real_samples[i + 2] = AcceleratorGetSample(); - - for (u32 i = 0; i < 32; ++i) - { - // Get our current integer and fractional position. The integer - // position is used to get the two samples around us. The - // fractional position is used to compute the linear interpolation - // between these two samples. - u32 curr_int_pos = (curr_pos >> 16); - s32 curr_frac_pos = curr_pos & 0xFFFF; - s16 samp1 = real_samples[curr_int_pos]; - s16 samp2 = real_samples[curr_int_pos + 1]; - - // Linear interpolation: s1 + (s2 - s1) * pos - s16 sample = samp1 + (s16)(((samp2 - samp1) * (s32)curr_frac_pos) >> 16); - samples[i] = sample; - - curr_pos += ratio; - } - - // Update the last_samples array. A bit tricky because we can't know - // for sure we have more than 4 real samples in our array. - if (real_samples_needed >= 2) - memcpy(pb.src.last_samples, &real_samples[real_samples_needed + 2 - 4], 4 * sizeof (u16)); - else - { - memmove(pb.src.last_samples, &pb.src.last_samples[real_samples_needed], (4 - real_samples_needed) * sizeof (u16)); - memcpy(&pb.src.last_samples[4 - real_samples_needed], &real_samples[2], real_samples_needed * sizeof (u16)); - } - pb.src.cur_addr_frac = curr_pos & 0xFFFF; - } - else // SRCTYPE_NEAREST - { - // No sample rate conversion here: simply read 32 samples from the - // accelerator to the output buffer. - for (u32 i = 0; i < 32; ++i) - samples[i] = AcceleratorGetSample(); - - memcpy(pb.src.last_samples, samples + 28, 4 * sizeof (u16)); - } - - // Update current position in the PB. - pb.audio_addr.cur_addr_hi = (u16)(cur_addr >> 16); - pb.audio_addr.cur_addr_lo = (u16)(cur_addr & 0xFFFF); -} - -// Add samples to an output buffer, with optional volume ramping. -inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) -{ - u16& volume = pvol[0]; - u16 volume_delta = pvol[1]; - - // If volume ramping is disabled, set volume_delta to 0. That way, the - // mixing loop can avoid testing if volume ramping is enabled at each step, - // and just add volume_delta. - if (!ramp) - volume_delta = 0; - - for (u32 i = 0; i < 32; ++i) - { - s64 sample = 2 * (s16)input[i] * (s16)volume; - out[i] += (s32)(sample >> 16); - volume += volume_delta; - } -} - -// Process 1ms of audio (32 samples) from a PB and mix it to the buffers. -inline void Process1ms(AXPB& pb, const AXBuffers& buffers, AXMixControl mctrl) -{ - // If the voice is not running, nothing to do. - if (!pb.running) - return; - - // Read input samples, performing sample rate conversion if needed. - s16 samples[32]; - GetInputSamples(pb, samples); - - // Apply a global volume ramp using the volume envelope parameters. - for (u32 i = 0; i < 32; ++i) - { - s64 sample = 2 * (s16)samples[i] * (s16)pb.vol_env.cur_volume; - samples[i] = (s16)(sample >> 16); - pb.vol_env.cur_volume += pb.vol_env.cur_volume_delta; - } - - // Optionally, execute a low pass filter - if (pb.lpf.enabled) - { - // TODO - } - - // Mix LRS, AUXA and AUXB depending on mixer_control - // TODO: Handle DPL2 on AUXB. - - // HACK: at the moment we don't mix surround into left and right, so always - // mix left and right in order to have sound even if a game uses surround - // only. - if (mctrl & MIX_L) - MixAdd(buffers.left, samples, &pb.mixer.left, mctrl & MIX_L_RAMP); - if (mctrl & MIX_R) - MixAdd(buffers.right, samples, &pb.mixer.right, mctrl & MIX_R_RAMP); - if (mctrl & MIX_S) - MixAdd(buffers.surround, samples, &pb.mixer.surround, mctrl & MIX_S_RAMP); - - if (mctrl & MIX_AUXA_L) - MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, mctrl & MIX_AUXA_L_RAMP); - if (mctrl & MIX_AUXA_R) - MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, mctrl & MIX_AUXA_R_RAMP); - if (mctrl & MIX_AUXA_S) - MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, mctrl & MIX_AUXA_S_RAMP); - - if (mctrl & MIX_AUXB_L) - MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, mctrl & MIX_AUXB_L_RAMP); - if (mctrl & MIX_AUXB_R) - MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, mctrl & MIX_AUXB_R_RAMP); - if (mctrl & MIX_AUXB_S) - MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, mctrl & MIX_AUXB_S_RAMP); - - // Optionally, phase shift left or right channel to simulate 3D sound. - if (pb.initial_time_delay.on) - { - // TODO - } -} - -#endif // !_UCODE_NEWAX_VOICE_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp index 58e6198205..c04bf41403 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp @@ -19,7 +19,6 @@ #include "UCode_AX.h" #include "UCode_AXWii.h" -#include "UCode_NewAX.h" #include "UCode_Zelda.h" #include "UCode_ROM.h" #include "UCode_CARD.h" @@ -58,7 +57,7 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) case 0xe2136399: // billy hatcher, dragonballz, mario party 5, TMNT, ava1080 case 0x3389a79e: // MP1/MP2 Wii (Metroid Prime Trilogy) INFO_LOG(DSPHLE, "CRC %08x: AX ucode chosen", _CRC); - return new CUCode_NewAX(dsp_hle, _CRC); + return new CUCode_AX(dsp_hle, _CRC); case 0x6ba3b3ea: // IPL - PAL case 0x24b22038: // IPL - NTSC/NTSC-JAP From 954c55e35afbb1191f97e6da2f2b05be3696e2c4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 03:13:55 +0100 Subject: [PATCH 114/627] New AXWii now working properly in some games I tested --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 61 +-- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 104 ++-- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 451 ++++++++++-------- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h | 64 ++- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 74 +-- 5 files changed, 429 insertions(+), 325 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 8c2e05dce4..54bd50830d 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -16,9 +16,11 @@ // http://code.google.com/p/dolphin-emu/ #include "UCode_AX.h" -#include "UCode_AX_Voice.h" #include "../../DSP.h" +#define AX_GC +#include "UCode_AX_Voice.h" + CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc) : IUCode(dsp_hle, crc) , m_cmdlist_size(0) @@ -123,7 +125,7 @@ void CUCode_AX::HandleCommandList() addr_lo = m_cmdlist[curr_idx++]; addr2_hi = m_cmdlist[curr_idx++]; addr2_lo = m_cmdlist[curr_idx++]; - MixAUXSamples(cmd == CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); break; case CMD_UPLOAD_LRS: @@ -327,40 +329,41 @@ void CUCode_AX::ProcessPBList(u32 pb_addr) } } -void CUCode_AX::MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr) +void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) { - int buffers[3][5 * 32]; + int temp[3][5 * 32]; + int* buffers[3] = { 0 }; + + switch (aux_id) + { + case 0: + buffers[0] = m_samples_auxA_left; + buffers[1] = m_samples_auxA_right; + buffers[2] = m_samples_auxA_surround; + break; + + case 1: + buffers[0] = m_samples_auxB_left; + buffers[1] = m_samples_auxB_right; + buffers[2] = m_samples_auxB_surround; + break; + } // First, we need to send the contents of our AUX buffers to the CPU. if (write_addr) { - for (u32 i = 0; i < 5 * 32; ++i) - { - if (AUXA) - { - buffers[0][i] = Common::swap32(m_samples_auxA_left[i]); - buffers[1][i] = Common::swap32(m_samples_auxA_right[i]); - buffers[2][i] = Common::swap32(m_samples_auxA_surround[i]); - } - else - { - buffers[0][i] = Common::swap32(m_samples_auxB_left[i]); - buffers[1][i] = Common::swap32(m_samples_auxB_right[i]); - buffers[2][i] = Common::swap32(m_samples_auxB_surround[i]); - } - } - memcpy(HLEMemory_Get_Pointer(write_addr), buffers, sizeof (buffers)); + for (u32 i = 0; i < 3 * 32; ++i) + for (u32 j = 0; j < 3; ++j) + temp[j][i] = Common::swap32(buffers[j][i]); + memcpy(HLEMemory_Get_Pointer(write_addr), temp, sizeof (temp)); } - // Then, we read the new buffers from the CPU and add to our current - // buffers. - memcpy(buffers, HLEMemory_Get_Pointer(read_addr), sizeof (buffers)); + // Then, we read the new temp from the CPU and add to our current + // temp. + memcpy(temp, HLEMemory_Get_Pointer(read_addr), sizeof (temp)); for (u32 i = 0; i < 5 * 32; ++i) - { - m_samples_left[i] += Common::swap32(buffers[0][i]); - m_samples_right[i] += Common::swap32(buffers[1][i]); - m_samples_surround[i] += Common::swap32(buffers[2][i]); - } + for (u32 j = 0; j < 3; ++j) + buffers[j][i] += Common::swap32(temp[j][i]); } void CUCode_AX::UploadLRS(u32 dst_addr) @@ -495,5 +498,7 @@ void CUCode_AX::DoState(PointerWrap& p) { std::lock_guard lk(m_processing); + // TODO + DoStateShared(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 29509661ed..23bc786111 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -29,7 +29,40 @@ #include "UCodes.h" #include "UCode_AXStructs.h" -#include "UCode_AX_Voice.h" + +// We can't directly use the mixer_control field from the PB because it does +// not mean the same in all AX versions. The AX UCode converts the +// mixer_control value to an AXMixControl bitfield. +enum AXMixControl +{ + MIX_L = 0x000001, + MIX_L_RAMP = 0x000002, + MIX_R = 0x000004, + MIX_R_RAMP = 0x000008, + MIX_S = 0x000010, + MIX_S_RAMP = 0x000020, + + MIX_AUXA_L = 0x000040, + MIX_AUXA_L_RAMP = 0x000080, + MIX_AUXA_R = 0x000100, + MIX_AUXA_R_RAMP = 0x000200, + MIX_AUXA_S = 0x000400, + MIX_AUXA_S_RAMP = 0x000800, + + MIX_AUXB_L = 0x001000, + MIX_AUXB_L_RAMP = 0x002000, + MIX_AUXB_R = 0x004000, + MIX_AUXB_R_RAMP = 0x008000, + MIX_AUXB_S = 0x010000, + MIX_AUXB_S_RAMP = 0x020000, + + MIX_AUXC_L = 0x040000, + MIX_AUXC_L_RAMP = 0x080000, + MIX_AUXC_R = 0x100000, + MIX_AUXC_R_RAMP = 0x200000, + MIX_AUXC_S = 0x400000, + MIX_AUXC_S_RAMP = 0x800000 +}; class CUCode_AX : public IUCode { @@ -37,16 +70,16 @@ public: CUCode_AX(DSPHLE* dsp_hle, u32 crc); virtual ~CUCode_AX(); - void HandleMail(u32 mail); - void MixAdd(short* out_buffer, int nsamples); - void Update(int cycles); - void DoState(PointerWrap& p); + virtual void HandleMail(u32 mail); + virtual void MixAdd(short* out_buffer, int nsamples); + virtual void Update(int cycles); + virtual void DoState(PointerWrap& p); // Needed because StdThread.h std::thread implem does not support member // pointers. static void SpawnAXThread(CUCode_AX* self); -private: +protected: enum MailType { MAIL_RESUME = 0xCDD10000, @@ -59,31 +92,7 @@ private: MAIL_CMDLIST_MASK = 0xFFFF0000 }; - enum CmdType - { - CMD_SETUP = 0x00, - CMD_UNK_01 = 0x01, - CMD_PB_ADDR = 0x02, - CMD_PROCESS = 0x03, - CMD_MIX_AUXA = 0x04, - CMD_MIX_AUXB = 0x05, - CMD_UPLOAD_LRS = 0x06, - CMD_SBUFFER_ADDR = 0x07, - CMD_UNK_08 = 0x08, - CMD_MIX_AUXB_NOWRITE = 0x09, - CMD_COMPRESSOR_TABLE_ADDR = 0x0A, - CMD_UNK_0B = 0x0B, - CMD_UNK_0C = 0x0C, - CMD_MORE = 0x0D, - CMD_OUTPUT = 0x0E, - CMD_END = 0x0F, - CMD_UNK_10 = 0x10, - CMD_UNK_11 = 0x11, - CMD_UNK_12 = 0x12, - CMD_UNK_13 = 0x13, - }; - - // 32 * 5 because 32 samples per millisecond, for 5 milliseconds. + // 32 * 5 because 32 samples per millisecond, for max 5 milliseconds. int m_samples_left[32 * 5]; int m_samples_right[32 * 5]; int m_samples_surround[32 * 5]; @@ -119,12 +128,39 @@ private: void NotifyAXThread(); void AXThread(); - void HandleCommandList(); - void SetupProcessing(u32 studio_addr); + + virtual void HandleCommandList(); + + void SetupProcessing(u32 init_addr); void ProcessPBList(u32 pb_addr); - void MixAUXSamples(bool AUXA, u32 write_addr, u32 read_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); void OutputSamples(u32 out_addr); + +private: + enum CmdType + { + CMD_SETUP = 0x00, + CMD_UNK_01 = 0x01, + CMD_PB_ADDR = 0x02, + CMD_PROCESS = 0x03, + CMD_MIX_AUXA = 0x04, + CMD_MIX_AUXB = 0x05, + CMD_UPLOAD_LRS = 0x06, + CMD_SBUFFER_ADDR = 0x07, + CMD_UNK_08 = 0x08, + CMD_MIX_AUXB_NOWRITE = 0x09, + CMD_COMPRESSOR_TABLE_ADDR = 0x0A, + CMD_UNK_0B = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_MORE = 0x0D, + CMD_OUTPUT = 0x0E, + CMD_END = 0x0F, + CMD_UNK_10 = 0x10, + CMD_UNK_11 = 0x11, + CMD_UNK_12 = 0x12, + CMD_UNK_13 = 0x13, + }; }; #endif // !_UCODE_AX_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 73abc392df..a47d9b279b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -23,249 +23,294 @@ #include "UCodes.h" #include "UCode_AXStructs.h" #include "UCode_AXWii.h" + +#define AX_WII #include "UCode_AX_Voice.h" CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) - : IUCode(dsp_hle, l_CRC) - , m_addressPBs(0xFFFFFFFF) + : CUCode_AX(dsp_hle, l_CRC) { - // we got loaded - m_rMailHandler.PushMail(DSP_INIT); - - templbuffer = new int[1024 * 1024]; - temprbuffer = new int[1024 * 1024]; - - wiisportsHack = m_CRC == 0xfa450138; + WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii"); } CUCode_AXWii::~CUCode_AXWii() { - m_rMailHandler.Clear(); - delete [] templbuffer; - delete [] temprbuffer; } -void CUCode_AXWii::HandleMail(u32 _uMail) +void CUCode_AXWii::HandleCommandList() { - if (m_UploadSetupInProgress) + // Temp variables for addresses computation + u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; + u16 volume; + +// WARN_LOG(DSPHLE, "Command list:"); +// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) +// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); +// WARN_LOG(DSPHLE, "-------------"); + + u32 curr_idx = 0; + bool end = false; + while (!end) { - PrepareBootUCode(_uMail); - return; - } - else if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST) - { - // We are expected to get a new CmdBlock - DEBUG_LOG(DSPHLE, "GetNextCmdBlock (%ibytes)", (u16)_uMail); - } - else switch(_uMail) - { - case 0xCDD10000: // Action 0 - AX_ResumeTask() - m_rMailHandler.PushMail(DSP_RESUME); - break; + u16 cmd = m_cmdlist[curr_idx++]; - case 0xCDD10001: // Action 1 - new ucode upload - DEBUG_LOG(DSPHLE,"DSP IROM - New Ucode!"); - // TODO find a better way to protect from HLEMixer? - soundStream->GetMixer()->SetHLEReady(false); - m_UploadSetupInProgress = true; - break; - - case 0xCDD10002: // Action 2 - IROM_Reset(); ( WII: De Blob, Cursed Mountain,...) - DEBUG_LOG(DSPHLE,"DSP IROM - Reset!"); - m_DSPHLE->SetUCode(UCODE_ROM); - return; - - case 0xCDD10003: // Action 3 - AX_GetNextCmdBlock() - break; - - default: - DEBUG_LOG(DSPHLE, " >>>> u32 MAIL : AXTask Mail (%08x)", _uMail); - AXTask(_uMail); - break; - } -} - -void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize) -{ - AXPBWii PB; - - if (_iSize > 1024 * 1024) - _iSize = 1024 * 1024; - - memset(templbuffer, 0, _iSize * sizeof(int)); - memset(temprbuffer, 0, _iSize * sizeof(int)); - - u32 blockAddr = m_addressPBs; - if (!blockAddr) - return; - - AXBuffers buffers = {{ - templbuffer, - temprbuffer, - NULL - }}; - - for (int i = 0; i < NUMBER_OF_PBS; i++) - { - if (!ReadPB(blockAddr, PB)) - break; - -// if (wiisportsHack) -// MixAddVoice(*(AXPBWiiSports*)&PB, buffers, _iSize); -// else -// MixAddVoice(PB, buffers, _iSize); - - if (!WritePB(blockAddr, PB)) - break; - - // next PB, or done - blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; - if (!blockAddr) - break; - } - - // We write the sound to _pBuffer - if (_pBuffer) - { - for (int i = 0; i < _iSize; i++) + switch (cmd) { - // Clamp into 16-bit. Maybe we should add a volume compressor here. - int left = templbuffer[i] + _pBuffer[0]; - int right = temprbuffer[i] + _pBuffer[1]; - if (left < -32767) left = -32767; - else if (left > 32767) left = 32767; - if (right < -32767) right = -32767; - else if (right > 32767) right = 32767; - *_pBuffer++ = left; - *_pBuffer++ = right; + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_SETUP: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); + break; + + case CMD_UNK_01: curr_idx += 2; break; + case CMD_UNK_02: curr_idx += 2; break; + case CMD_UNK_03: curr_idx += 2; break; + + case CMD_PROCESS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + ProcessPBList(HILO_TO_32(addr)); + break; + + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + case CMD_MIX_AUXC: + curr_idx++; // TODO: Unknown u16 + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + + // These two go together and manipulate some AUX buffers. + case CMD_UNK_08: curr_idx += 13; break; + case CMD_UNK_09: curr_idx += 13; break; + + case CMD_UNK_0A: curr_idx += 4; break; + + case CMD_OUTPUT: + volume = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume); + break; + + case CMD_UNK_0C: curr_idx += 5; break; + + case CMD_UNK_0D: + // Wiimote output? + curr_idx += 8; + break; + + case CMD_END: + end = true; + break; } } } - -void CUCode_AXWii::Update(int cycles) +void CUCode_AXWii::SetupProcessing(u32 init_addr) { - if (NeedsResumeMail()) + // TODO: should be easily factorizable with AX + s16 init_data[60]; + + for (u32 i = 0; i < 60; ++i) + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); + + // List of all buffers we have to initialize + int* buffers[] = { + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround, + m_samples_auxC_left, + m_samples_auxC_right, + m_samples_auxC_surround + }; + + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) { - m_rMailHandler.PushMail(DSP_RESUME); - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); - } - // check if we have to send something - else if (!m_rMailHandler.IsEmpty()) - { - DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i], 0, 3 * 32 * sizeof (int)); + else + { + for (u32 j = 0; j < 3 * 32; ++j) + { + buffers[i][j] = init_val; + init_val += delta; + } + } } } -// AX seems to bootup one task only and waits for resume-callbacks -// everytime the DSP has "spare time" it sends a resume-mail to the CPU -// and the __DSPHandler calls a AX-Callback which generates a new AXFrame -bool CUCode_AXWii::AXTask(u32& _uMail) +AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control) { - u32 uAddress = _uMail; - u32 Addr__AXStudio; - u32 Addr__AXOutSBuffer; - bool bExecuteList = true; + u32 ret = 0; -/* - for (int i=0;i<64;i++) { - NOTICE_LOG(DSPHLE,"%x - %08x",uAddress+(i*4),HLEMemory_Read_U32(uAddress+(i*4))); - } -*/ + if (mixer_control & 0x00000001) ret |= MIX_L; + if (mixer_control & 0x00000002) ret |= MIX_R; + if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP; + if (mixer_control & 0x00000008) ret |= MIX_S; + if (mixer_control & 0x00000010) ret |= MIX_S_RAMP; + if (mixer_control & 0x00010000) ret |= MIX_AUXA_L; + if (mixer_control & 0x00020000) ret |= MIX_AUXA_R; + if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x00080000) ret |= MIX_AUXA_S; + if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x00200000) ret |= MIX_AUXB_L; + if (mixer_control & 0x00400000) ret |= MIX_AUXB_R; + if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x01000000) ret |= MIX_AUXB_S; + if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP; + if (mixer_control & 0x04000000) ret |= MIX_AUXC_L; + if (mixer_control & 0x08000000) ret |= MIX_AUXC_R; + if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP; + if (mixer_control & 0x20000000) ret |= MIX_AUXC_S; + if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP; - while (bExecuteList) + return (AXMixControl)ret; +} + +void CUCode_AXWii::ProcessPBList(u32 pb_addr) +{ + const u32 spms = 32; + + AXPBWii pb; + + while (pb_addr) { - u16 iCommand = HLEMemory_Read_U16(uAddress); - uAddress += 2; - //NOTICE_LOG(DSPHLE,"AXWII - AXLIST CMD %X",iCommand); + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround, + m_samples_auxC_left, + m_samples_auxC_right, + m_samples_auxC_surround + }}; - switch (iCommand) + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 3; ++curr_ms) { - case 0x0000: - Addr__AXStudio = HLEMemory_Read_U32(uAddress); - uAddress += 4; - break; + Process1ms(pb, buffers, ConvertMixerControl(HILO_TO_32(pb.mixer_control))); - case 0x0001: - uAddress += 4; - break; - - case 0x0003: - uAddress += 4; - break; - - case 0x0004: - // PBs are here now - m_addressPBs = HLEMemory_Read_U32(uAddress); - soundStream->GetMixer()->SetHLEReady(true); -// soundStream->Update(); - uAddress += 4; - break; - - case 0x0005: - if (!wiisportsHack) - uAddress += 10; - break; - - case 0x0006: - uAddress += 10; - break; - - case 0x0007: // AXLIST_SBUFFER - Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); - uAddress += 10; - break; - - case 0x0008: - uAddress += 26; - break; - - case 0x000a: - uAddress += wiisportsHack ? 4 : 8; // AXLIST_COMPRESSORTABLE - break; - - case 0x000b: - uAddress += wiisportsHack ? 2 : 10; - break; - - case 0x000c: - uAddress += wiisportsHack ? 8 : 10; - break; - - case 0x000d: - uAddress += 16; - break; - - case 0x000e: - if (wiisportsHack) - uAddress += 16; - else - bExecuteList = false; - break; - - case 0x000f: // only for Wii Sports uCode - bExecuteList = false; - break; - - default: - INFO_LOG(DSPHLE,"DSPHLE - AXwii - AXLIST - Unknown CMD: %x",iCommand); - // unknown command so stop the execution of this TaskList - bExecuteList = false; - break; + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; } + + WritePB(pb_addr, pb); + pb_addr = HILO_TO_32(pb.next_pb); + } +} + +void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) +{ + int temp[3][3 * 32]; + int* buffers[3] = { 0 }; + + switch (aux_id) + { + case 0: + buffers[0] = m_samples_auxA_left; + buffers[1] = m_samples_auxA_right; + buffers[2] = m_samples_auxA_surround; + break; + + case 1: + buffers[0] = m_samples_auxB_left; + buffers[1] = m_samples_auxB_right; + buffers[2] = m_samples_auxB_surround; + break; + + case 2: + buffers[0] = m_samples_auxC_left; + buffers[1] = m_samples_auxC_right; + buffers[2] = m_samples_auxC_surround; + break; } - m_rMailHandler.PushMail(DSP_YIELD); //its here in case there is a CMD fuckup - return true; + // Send the content of AUX buffers to the CPU + if (write_addr) + { + for (u32 i = 0; i < 3 * 32; ++i) + for (u32 j = 0; j < 3; ++j) + temp[j][i] = Common::swap32(buffers[j][i]); + memcpy(HLEMemory_Get_Pointer(write_addr), temp, sizeof (temp)); + } + + // Then read the buffers from the CPU and add to our current buffers. + memcpy(temp, HLEMemory_Get_Pointer(read_addr), sizeof (temp)); + for (u32 i = 0; i < 3 * 32; ++i) + for (u32 j = 0; j < 3; ++j) + buffers[j][i] += Common::swap32(temp[j][i]); +} + +void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) +{ + int surround_buffer[3 * 32] = { 0 }; + + for (u32 i = 0; i < 3 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + + short buffer[3 * 32 * 2]; + + // Clamp internal buffers to 16 bits. + for (u32 i = 0; i < 3 * 32; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + m_samples_left[i] = left; + m_samples_right[i] = right; + } + + for (u32 i = 0; i < 3 * 32; ++i) + { + buffer[2 * i] = Common::swap16(m_samples_left[i]); + buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + } + + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } void CUCode_AXWii::DoState(PointerWrap &p) { std::lock_guard lk(m_csMix); - p.Do(m_addressPBs); - p.Do(wiisportsHack); + // TODO DoStateShared(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h index 1e6cffcba0..d488bd046c 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -12,44 +12,58 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official SVN repository and contact information can be found at +// Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _UCODE_AXWII -#define _UCODE_AXWII +#ifndef _UCODE_AXWII_H +#define _UCODE_AXWII_H -#include "UCode_AXStructs.h" +#include "UCode_AX.h" -#define NUMBER_OF_PBS 128 - -class CUCode_AXWii : public IUCode +class CUCode_AXWii : public CUCode_AX { public: CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC); virtual ~CUCode_AXWii(); - void HandleMail(u32 _uMail); - void MixAdd(short* _pBuffer, int _iSize); - void Update(int cycles); - void DoState(PointerWrap &p); + virtual void DoState(PointerWrap &p); + +protected: + int m_samples_auxC_left[32 * 3]; + int m_samples_auxC_right[32 * 3]; + int m_samples_auxC_surround[32 * 3]; + + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + + virtual void HandleCommandList(); + + void SetupProcessing(u32 init_addr); + void ProcessPBList(u32 pb_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); + void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); private: - enum + enum CmdType { - MAIL_AX_ALIST = 0xBABE0000, + CMD_SETUP = 0x00, + CMD_UNK_01 = 0x01, + CMD_UNK_02 = 0x02, + CMD_UNK_03 = 0x03, + CMD_PROCESS = 0x04, + CMD_MIX_AUXA = 0x05, + CMD_MIX_AUXB = 0x06, + CMD_MIX_AUXC = 0x07, + CMD_UNK_08 = 0x08, + CMD_UNK_09 = 0x09, + CMD_UNK_0A = 0x0A, + CMD_OUTPUT = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_UNK_0D = 0x0D, + CMD_END = 0x0E }; - - // PBs - u32 m_addressPBs; - - bool wiisportsHack; - - int *templbuffer; - int *temprbuffer; - - // ax task message handler - bool AXTask(u32& _uMail); - void SendMail(u32 _uMail); }; #endif // _UCODE_AXWII diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 20fea41677..22ef0583ce 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -15,13 +15,27 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +// This file is UGLY (full of #ifdef) so that it can be used with both GC and +// Wii version of AX. Maybe it would be better to abstract away the parts that +// can be made common. + #ifndef _UCODE_AX_VOICE_H #define _UCODE_AX_VOICE_H +#if !defined(AX_GC) && !defined(AX_WII) +#error UCode_AX_Voice.h included without specifying version +#endif + #include "Common.h" #include "UCode_AXStructs.h" #include "../../DSP.h" +#ifdef AX_GC +# define PB_TYPE AXPB +#else +# define PB_TYPE AXPBWii +#endif + // Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. #define HILO_TO_32(name) \ ((name##_hi << 16) | name##_lo) @@ -42,41 +56,23 @@ union AXBuffers int* auxB_left; int* auxB_right; int* auxB_surround; + +#ifdef AX_WII + int* auxC_left; + int* auxC_right; + int* auxC_surround; +#endif }; +#ifdef AX_GC int* ptrs[9]; -}; - -// We can't directly use the mixer_control field from the PB because it does -// not mean the same in all AX versions. The AX UCode converts the -// mixer_control value to an AXMixControl bitfield. -enum AXMixControl -{ - MIX_L = 0x00001, - MIX_L_RAMP = 0x00002, - MIX_R = 0x00004, - MIX_R_RAMP = 0x00008, - MIX_S = 0x00010, - MIX_S_RAMP = 0x00020, - - MIX_AUXA_L = 0x00040, - MIX_AUXA_L_RAMP = 0x00080, - MIX_AUXA_R = 0x00100, - MIX_AUXA_R_RAMP = 0x00200, - MIX_AUXA_S = 0x00400, - MIX_AUXA_S_RAMP = 0x00800, - - MIX_AUXB_L = 0x01000, - MIX_AUXB_L_RAMP = 0x02000, - MIX_AUXB_R = 0x04000, - MIX_AUXB_R_RAMP = 0x08000, - MIX_AUXB_S = 0x10000, - MIX_AUXB_S_RAMP = 0x20000 +#else + int* ptrs[12]; +#endif }; // Read a PB from MRAM/ARAM -template -bool ReadPB(u32 addr, PBType& pb) +bool ReadPB(u32 addr, PB_TYPE& pb) { u16* dst = (u16*)&pb; const u16* src = (const u16*)Memory::GetPointer(addr); @@ -90,8 +86,7 @@ bool ReadPB(u32 addr, PBType& pb) } // Write a PB back to MRAM/ARAM -template -inline bool WritePB(u32 addr, const PBType& pb) +inline bool WritePB(u32 addr, const PB_TYPE& pb) { const u16* src = (const u16*)&pb; u16* dst = (u16*)Memory::GetPointer(addr); @@ -107,10 +102,10 @@ inline bool WritePB(u32 addr, const PBType& pb) // Simulated accelerator state. static u32 acc_loop_addr, acc_end_addr; static u32* acc_cur_addr; -static AXPB* acc_pb; +static PB_TYPE* acc_pb; // Sets up the simulated accelerator. -inline void AcceleratorSetup(AXPB* pb, u32* cur_addr) +inline void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) { acc_pb = pb; acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); @@ -216,7 +211,7 @@ inline u16 AcceleratorGetSample() } // Read 32 input samples from ARAM, decoding and converting rate if required. -inline void GetInputSamples(AXPB& pb, s16* samples) +inline void GetInputSamples(PB_TYPE& pb, s16* samples) { u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); AcceleratorSetup(&pb, &cur_addr); @@ -319,7 +314,7 @@ inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) } // Process 1ms of audio (32 samples) from a PB and mix it to the buffers. -inline void Process1ms(AXPB& pb, const AXBuffers& buffers, AXMixControl mctrl) +void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl) { // If the voice is not running, nothing to do. if (!pb.running) @@ -370,6 +365,15 @@ inline void Process1ms(AXPB& pb, const AXBuffers& buffers, AXMixControl mctrl) if (mctrl & MIX_AUXB_S) MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, mctrl & MIX_AUXB_S_RAMP); +#ifdef AX_WII + if (mctrl & MIX_AUXC_L) + MixAdd(buffers.auxC_left, samples, &pb.mixer.auxC_left, mctrl & MIX_AUXC_L_RAMP); + if (mctrl & MIX_AUXC_R) + MixAdd(buffers.auxC_right, samples, &pb.mixer.auxC_right, mctrl & MIX_AUXC_R_RAMP); + if (mctrl & MIX_AUXC_S) + MixAdd(buffers.auxC_surround, samples, &pb.mixer.auxC_surround, mctrl & MIX_AUXC_S_RAMP); +#endif + // Optionally, phase shift left or right channel to simulate 3D sound. if (pb.initial_time_delay.on) { From ae85159a9481a8eba49dcb9ec744c16dbbecd16d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 03:22:24 +0100 Subject: [PATCH 115/627] Add surround sound support to GC AX HLE --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 18 +++++++++++------- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 +-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 54bd50830d..8f372f3313 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -157,13 +157,11 @@ void CUCode_AX::HandleCommandList() break; case CMD_OUTPUT: - // Skip the first address, it is used for surround audio - // output, which we don't support yet. - curr_idx += 2; - addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; - OutputSamples(HILO_TO_32(addr)); + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr)); break; case CMD_END: @@ -379,8 +377,14 @@ void CUCode_AX::UploadLRS(u32 dst_addr) memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); } -void CUCode_AX::OutputSamples(u32 out_addr) +void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) { + int surround_buffer[5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + // 32 samples per ms, 5 ms, 2 channels short buffer[5 * 32 * 2]; @@ -405,7 +409,7 @@ void CUCode_AX::OutputSamples(u32 out_addr) buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); } - memcpy(HLEMemory_Get_Pointer(out_addr), buffer, sizeof (buffer)); + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } void CUCode_AX::HandleMail(u32 mail) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 23bc786111..d5f07fc13a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -21,7 +21,6 @@ // * Depop support // * ITD support // * Polyphase sample interpolation support (not very useful) -// * Surround sound mixing // * Dolby Pro 2 mixing with recent AX versions #ifndef _UCODE_AX_H @@ -135,7 +134,7 @@ protected: void ProcessPBList(u32 pb_addr); void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); - void OutputSamples(u32 out_addr); + void OutputSamples(u32 out_addr, u32 surround_addr); private: enum CmdType From 321e3a8421c00d3beede88fe73b402f37547f9c5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 03:32:29 +0100 Subject: [PATCH 116/627] Add global volume handling for AUX mixing and L/R output in AXWii --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 15 +++++++++++---- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index a47d9b279b..7f9879a8f6 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -80,12 +80,12 @@ void CUCode_AXWii::HandleCommandList() case CMD_MIX_AUXA: case CMD_MIX_AUXB: case CMD_MIX_AUXC: - curr_idx++; // TODO: Unknown u16 + volume = m_cmdlist[curr_idx++]; addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; addr2_hi = m_cmdlist[curr_idx++]; addr2_lo = m_cmdlist[curr_idx++]; - MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2)); + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume); break; // These two go together and manipulate some AUX buffers. @@ -230,7 +230,7 @@ void CUCode_AXWii::ProcessPBList(u32 pb_addr) } } -void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) +void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume) { int temp[3][3 * 32]; int* buffers[3] = { 0 }; @@ -269,7 +269,10 @@ void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) memcpy(temp, HLEMemory_Get_Pointer(read_addr), sizeof (temp)); for (u32 i = 0; i < 3 * 32; ++i) for (u32 j = 0; j < 3; ++j) - buffers[j][i] += Common::swap32(temp[j][i]); + { + s64 new_val = buffers[j][i] + Common::swap32(temp[j][i]); + buffers[j][i] = (new_val * volume) >> 15; + } } void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) @@ -288,6 +291,10 @@ void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) int left = m_samples_left[i]; int right = m_samples_right[i]; + // Apply global volume. Cast to s64 to avoid overflow. + left = ((s64)left * volume) >> 15; + right = ((s64)right * volume) >> 15; + if (left < -32767) left = -32767; if (left > 32767) left = 32767; if (right < -32767) right = -32767; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h index d488bd046c..aee6c45ea5 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -42,7 +42,7 @@ protected: void SetupProcessing(u32 init_addr); void ProcessPBList(u32 pb_addr); - void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume); void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); private: From 0d3c3f633975a8d88a124bc5d03d9408df710f43 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 04:18:48 +0100 Subject: [PATCH 117/627] Fix a crash in AXWii with SRC ratio > 4 (which I thought was impossible, but AXWii changed the SRC algorithm) --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 7f9879a8f6..3e67629226 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -315,7 +315,7 @@ void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) void CUCode_AXWii::DoState(PointerWrap &p) { - std::lock_guard lk(m_csMix); + std::lock_guard lk(m_processing); // TODO diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 22ef0583ce..5f43fc5b6e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -234,9 +234,15 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples) // Compute the number of real samples we will need to read from the // data source. We need to output 32 samples, so we need to read - // 32 * ratio + curr_pos samples. The maximum possible ratio available - // on the DSP is 4.0, so at most we will read 128 real samples. - s16 real_samples[130]; + // 32 * ratio + curr_pos samples. There does not seem to be a maximum + // value for the ratio in recent versions of AXWii (previously it was + // limited to 4.0), so we will limit it to 16.0 and clamp the ratio if + // needed. This is a HACK, and using another algorithm for linear + // interpolation might be a better idea. + if (ratio > 0x00100000) + ratio = 0x00100000; + + s16 real_samples[514]; u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; // The first two real samples are the ones we read at the previous @@ -341,9 +347,6 @@ void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl) // Mix LRS, AUXA and AUXB depending on mixer_control // TODO: Handle DPL2 on AUXB. - // HACK: at the moment we don't mix surround into left and right, so always - // mix left and right in order to have sound even if a game uses surround - // only. if (mctrl & MIX_L) MixAdd(buffers.left, samples, &pb.mixer.left, mctrl & MIX_L_RAMP); if (mctrl & MIX_R) From e858835c7ee9fa49ad99b5ab61d91e55d55940cc Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 04:26:07 +0100 Subject: [PATCH 118/627] Fixing the hack fix (I can't multiply 32x32) --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 5f43fc5b6e..d160b83c0f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -242,7 +242,7 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples) if (ratio > 0x00100000) ratio = 0x00100000; - s16 real_samples[514]; + s16 real_samples[1026]; u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; // The first two real samples are the ones we read at the previous From affdf08fd6e831f93f0b5d1e43ecd96765c2b32b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 09:49:27 +0100 Subject: [PATCH 119/627] Real fix for the crashes on Windows with AXWii --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index d160b83c0f..16df07e8a4 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -36,6 +36,10 @@ # define PB_TYPE AXPBWii #endif +// Put all of that in an anonymous namespace to avoid stupid compilers merging +// functions from AX GC and AX Wii. +namespace { + // Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. #define HILO_TO_32(name) \ ((name##_hi << 16) | name##_lo) @@ -242,7 +246,7 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples) if (ratio > 0x00100000) ratio = 0x00100000; - s16 real_samples[1026]; + s16 real_samples[514]; u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; // The first two real samples are the ones we read at the previous @@ -384,4 +388,6 @@ void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl) } } +} // namespace + #endif // !_UCODE_AX_VOICE_H From 9d85052a6608ed089d4d657f6779537098d6e29f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 20 Nov 2012 11:34:24 +0100 Subject: [PATCH 120/627] Implement Wiimote audio output in AXWii. Not very useful yet as no sound is currently being mixed to the wiimote channels. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 79 ++++++++++++++----- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h | 13 ++- 2 files changed, 73 insertions(+), 19 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 3e67629226..3eadc5a840 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -105,10 +105,18 @@ void CUCode_AXWii::HandleCommandList() case CMD_UNK_0C: curr_idx += 5; break; - case CMD_UNK_0D: - // Wiimote output? + case CMD_WM_OUTPUT: + { + u32 addresses[4] = { + (u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1], + (u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3], + (u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5], + (u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7], + }; curr_idx += 8; + OutputWMSamples(addresses); break; + } case CMD_END: end = true; @@ -126,19 +134,31 @@ void CUCode_AXWii::SetupProcessing(u32 init_addr) init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); // List of all buffers we have to initialize - int* buffers[] = { - m_samples_left, - m_samples_right, - m_samples_surround, - m_samples_auxA_left, - m_samples_auxA_right, - m_samples_auxA_surround, - m_samples_auxB_left, - m_samples_auxB_right, - m_samples_auxB_surround, - m_samples_auxC_left, - m_samples_auxC_right, - m_samples_auxC_surround + struct { + int* ptr; + u32 samples; + } buffers[] = { + { m_samples_left, 32 }, + { m_samples_right, 32 }, + { m_samples_surround, 32 }, + { m_samples_auxA_left, 32 }, + { m_samples_auxA_right, 32 }, + { m_samples_auxA_surround, 32 }, + { m_samples_auxB_left, 32 }, + { m_samples_auxB_right, 32 }, + { m_samples_auxB_surround, 32 }, + { m_samples_auxC_left, 32 }, + { m_samples_auxC_right, 32 }, + { m_samples_auxC_surround, 32 }, + + { m_samples_wm0, 6 }, + { m_samples_aux0, 6 }, + { m_samples_wm1, 6 }, + { m_samples_aux1, 6 }, + { m_samples_wm2, 6 }, + { m_samples_aux2, 6 }, + { m_samples_wm3, 6 }, + { m_samples_aux3, 6 } }; u32 init_idx = 0; @@ -150,12 +170,12 @@ void CUCode_AXWii::SetupProcessing(u32 init_addr) init_idx += 3; if (!init_val) - memset(buffers[i], 0, 3 * 32 * sizeof (int)); + memset(buffers[i].ptr, 0, 3 * buffers[i].samples * sizeof (int)); else { - for (u32 j = 0; j < 3 * 32; ++j) + for (u32 j = 0; j < 3 * buffers[i].samples; ++j) { - buffers[i][j] = init_val; + buffers[i].ptr[j] = init_val; init_val += delta; } } @@ -313,6 +333,29 @@ void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } +void CUCode_AXWii::OutputWMSamples(u32* addresses) +{ + int* buffers[] = { + m_samples_wm0, + m_samples_wm1, + m_samples_wm2, + m_samples_wm3 + }; + + for (u32 i = 0; i < 4; ++i) + { + int* in = buffers[i]; + u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]); + for (u32 j = 0; j < 3 * 6; ++j) + { + int sample = in[j]; + if (sample < -32767) sample = -32767; + if (sample > 32767) sample = 32767; + out[j] = Common::swap16((u16)sample); + } + } +} + void CUCode_AXWii::DoState(PointerWrap &p) { std::lock_guard lk(m_processing); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h index aee6c45ea5..3a66c30868 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -33,6 +33,16 @@ protected: int m_samples_auxC_right[32 * 3]; int m_samples_auxC_surround[32 * 3]; + // Wiimote buffers + int m_samples_wm0[6 * 3]; + int m_samples_aux0[6 * 3]; + int m_samples_wm1[6 * 3]; + int m_samples_aux1[6 * 3]; + int m_samples_wm2[6 * 3]; + int m_samples_aux2[6 * 3]; + int m_samples_wm3[6 * 3]; + int m_samples_aux3[6 * 3]; + // Convert a mixer_control bitfield to our internal representation for that // value. Required because that bitfield has a different meaning in some // versions of AX. @@ -44,6 +54,7 @@ protected: void ProcessPBList(u32 pb_addr); void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume); void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); + void OutputWMSamples(u32* addresses); // 4 addresses private: enum CmdType @@ -61,7 +72,7 @@ private: CMD_UNK_0A = 0x0A, CMD_OUTPUT = 0x0B, CMD_UNK_0C = 0x0C, - CMD_UNK_0D = 0x0D, + CMD_WM_OUTPUT = 0x0D, CMD_END = 0x0E }; }; From 0fcb246b7e0f599cb2b336378e127d10cb70a77e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 20 Nov 2012 17:54:48 +0100 Subject: [PATCH 121/627] Enable GFX debugger functionality in Release builds. --- Source/Core/VideoCommon/Src/Debugger.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h index bcce50f223..fde31e4268 100644 --- a/Source/Core/VideoCommon/Src/Debugger.h +++ b/Source/Core/VideoCommon/Src/Debugger.h @@ -72,21 +72,9 @@ void GFXDebuggerCheckAndPause(bool update); void GFXDebuggerToPause(bool update); void GFXDebuggerUpdateScreen(); -#undef ENABLE_GFX_DEBUGGER -#if defined(_DEBUG) || defined(DEBUGFAST) -#define ENABLE_GFX_DEBUGGER -#endif - -#ifdef ENABLE_GFX_DEBUGGER #define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);} #define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}} #define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}} -#else -// Disable debugging calls in Release build -#define GFX_DEBUGGER_PAUSE_AT(event,update) -#define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) -#define GFX_DEBUGGER_LOG_AT(event,dumpfunc) -#endif // ENABLE_GFX_DEBUGGER #endif // _GFX_DEBUGGER_H_ From 085c81da8633bc13c7ef4ebbf810706363d14e36 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 24 Nov 2012 00:04:28 +1100 Subject: [PATCH 122/627] Mapped the addco and subfco PowerPC instructions. Fixes Frogger: Hyper Arcade Edition. --- Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp | 2 ++ Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 2 ++ Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp index 33540bfb64..8ea35503bf 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -295,6 +295,7 @@ static GekkoOPTemplate table31_2[] = {266, Interpreter::addx, {"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {778, Interpreter::addx, {"addox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {10, Interpreter::addcx, {"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {522, Interpreter::addcx, {"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {138, Interpreter::addex, {"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {234, Interpreter::addmex, {"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {202, Interpreter::addzex, {"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, @@ -310,6 +311,7 @@ static GekkoOPTemplate table31_2[] = {40, Interpreter::subfx, {"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {552, Interpreter::subfx, {"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 0, 0, 0, 0}}, {8, Interpreter::subfcx, {"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {520, Interpreter::subfcx, {"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {136, Interpreter::subfex, {"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {232, Interpreter::subfmex, {"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {200, Interpreter::subfzex, {"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index 8d593a6742..ddb59903d2 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -308,6 +308,7 @@ static GekkoOPTemplate table31_2[] = {266, &Jit64::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {778, &Jit64::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {10, &Jit64::addcx}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {522, &Jit64::addcx}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &Jit64::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &Jit64::addmex}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &Jit64::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, @@ -323,6 +324,7 @@ static GekkoOPTemplate table31_2[] = {40, &Jit64::subfx}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {552, &Jit64::subfx}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {8, &Jit64::subfcx}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {520, &Jit64::subfcx}, //"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {136, &Jit64::subfex}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {232, &Jit64::subfmex}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {200, &Jit64::subfzex}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp index 9e8e36f9c3..9418030b9c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -309,6 +309,7 @@ static GekkoOPTemplate table31_2[] = {266, &JitIL::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {778, &JitIL::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {10, &JitIL::Default}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {522, &JitIL::Default}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &JitIL::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &JitIL::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &JitIL::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, @@ -324,6 +325,7 @@ static GekkoOPTemplate table31_2[] = {40, &JitIL::subfx}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {552, &JitIL::subfx}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, {8, &JitIL::subfcx}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {520, &JitIL::subfcx}, //"subfcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {136, &JitIL::subfex}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {232, &JitIL::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {200, &JitIL::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, From 1071ccbcd5823ccf15d9ffbb8cd23ec54360d2ba Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 24 Nov 2012 00:09:38 +1100 Subject: [PATCH 123/627] Added "EnableFPRF = True" to the Beach Spikers game ini. Fixes the flickering textures. Thanks to hk.konpie for the tip. Fixes issue 5730. --- Data/User/GameConfig/GBSE8P.ini | 1 + Data/User/GameConfig/GBSP8P.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/User/GameConfig/GBSE8P.ini index b774901496..61d1c769b9 100644 --- a/Data/User/GameConfig/GBSE8P.ini +++ b/Data/User/GameConfig/GBSE8P.ini @@ -1,5 +1,6 @@ # GBSE8P - BEACH SPIKERS [Core] Values set here will override the main dolphin settings. +EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 2 EmulationIssues = Controlls don't work ingame only walking works diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/User/GameConfig/GBSP8P.ini index 5ceadc46f8..fa68a7e996 100644 --- a/Data/User/GameConfig/GBSP8P.ini +++ b/Data/User/GameConfig/GBSP8P.ini @@ -1,5 +1,6 @@ # GBSP8P - BEACH SPIKERS [Core] Values set here will override the main dolphin settings. +EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. From ca650d44352f4cd994a51c6bbc813b3b3bb4adda Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 23 Nov 2012 22:23:58 -0500 Subject: [PATCH 124/627] Record md5 of game file to .dtm, and check it when playing back. --- Source/Core/Core/Src/Movie.cpp | 60 +++++++++++++++++++++++++++++++--- Source/Core/Core/Src/Movie.h | 3 +- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 0b6d3adae3..465a25b563 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -36,6 +36,8 @@ #include "HW/EXI_Channel.h" #include "HW/DVDInterface.h" #include "../../Common/Src/NandPaths.h" +#include "thread.h" +#include "Crypto/md5.h" // large enough for just over 24 hours of single-player recording #define MAX_DTM_LENGTH (40 * 1024 * 1024) @@ -69,6 +71,7 @@ bool g_bDiscChange = false; std::string g_discChange = ""; std::string author = ""; u64 g_titleID = 0; +unsigned char MD5[16]; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -167,6 +170,8 @@ void Init() //delete tmpInput; //tmpInput = NULL; } + else + std::thread md5thread(CheckMD5); } void InputUpdate() @@ -392,10 +397,13 @@ bool BeginRecordingInput(int controllers) // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. // TODO: find a way to GetTitleDataPath() from Movie::Init() - if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str())) - Movie::g_bClearSave = false; - else - Movie::g_bClearSave = true; + if (Core::g_CoreStartupParameter.bWii) + { + if (File::Exists((Common::GetTitleDataPath(g_titleID) + "banner.bin").c_str())) + Movie::g_bClearSave = false; + else + Movie::g_bClearSave = true; + } } g_playMode = MODE_RECORDING; GetSettings(); @@ -655,6 +663,9 @@ void ReadHeader() { author[i] = tmpHeader.author[i]; } + + for (int i = 0; i < 16; i++) + MD5[i] = tmpHeader.md5[i]; } bool PlayInput(const char *filename) @@ -1077,6 +1088,8 @@ void SaveRecording(const char *filename) header.bClearSave = g_bClearSave; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); + for (int i = 0; i < 16;i++) + header.md5[i] = MD5[i]; // TODO header.uniqueID = 0; @@ -1135,4 +1148,43 @@ void GetSettings() g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; } + +void CheckMD5() +{ + if (IsRecordingInput()) + { + Core::DisplayMessage("Calculating md5 of game file...", 2000); + for (int i = 0; i < 16; i++) + MD5[i] = 0; + } + else + { + for (int i=0; i<16; i++) + { + if (tmpHeader.md5[i] != 0) + continue; + if (i == 15) + return; + } + Core::DisplayMessage("Checking md5 of game file against recorded game...", 2000); + } + + unsigned char gameMD5[16]; + char game[255]; + memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); + md5_file(game, gameMD5); + + if (IsPlayingInput()) + { + if (memcmp(gameMD5,MD5,16) == 0) + Core::DisplayMessage("MD5 of playing game matches the recorded game.", 2000); + else + PanicAlert("MD5 of playing game does not match the recorded game!"); + } + else + { + memcpy(MD5, gameMD5,16); + Core::DisplayMessage("Finished Calculating md5.", 2000); + } +} }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 0152a66879..1626f9cfeb 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -99,7 +99,7 @@ struct DTMHeader { u8 videoBackend[16]; // UTF-8 representation of the video backend u8 audioEmulator[16]; // UTF-8 representation of the audio emulator - u8 padBackend[16]; // UTF-8 representation of the input backend + unsigned char md5[16]; // MD5 of game iso u64 recordingStartTime; // seconds since 1970 that recording started (used for RTC) @@ -178,6 +178,7 @@ bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& void EndPlayInput(bool cont); void SaveRecording(const char *filename); void DoState(PointerWrap &p); +void CheckMD5(); std::string GetInputDisplay(); From a374f9f0492f2cb0056dca336a0e61c7b529475d Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 23 Nov 2012 22:47:32 -0500 Subject: [PATCH 125/627] Check md5 when recording from save state too. --- Source/Core/Core/Src/Movie.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 465a25b563..16b9f7caa4 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -394,6 +394,7 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; + std::thread md5thread(CheckMD5); // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. // TODO: find a way to GetTitleDataPath() from Movie::Init() From f251704df23bea1fda8663dec6f94d0d55ee73d9 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 24 Nov 2012 01:10:07 -0500 Subject: [PATCH 126/627] The trick to multithreaded emulation is to include thread.h more than once. Also, rewords some awkardly written messages. --- Source/Core/Core/Src/Movie.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 16b9f7caa4..2bf0c73dba 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -36,7 +36,6 @@ #include "HW/EXI_Channel.h" #include "HW/DVDInterface.h" #include "../../Common/Src/NandPaths.h" -#include "thread.h" #include "Crypto/md5.h" // large enough for just over 24 hours of single-player recording @@ -1154,7 +1153,7 @@ void CheckMD5() { if (IsRecordingInput()) { - Core::DisplayMessage("Calculating md5 of game file...", 2000); + Core::DisplayMessage("Calculating checksum of game file...", 2000); for (int i = 0; i < 16; i++) MD5[i] = 0; } @@ -1167,7 +1166,7 @@ void CheckMD5() if (i == 15) return; } - Core::DisplayMessage("Checking md5 of game file against recorded game...", 2000); + Core::DisplayMessage("Verifying checksum...", 2000); } unsigned char gameMD5[16]; @@ -1178,14 +1177,14 @@ void CheckMD5() if (IsPlayingInput()) { if (memcmp(gameMD5,MD5,16) == 0) - Core::DisplayMessage("MD5 of playing game matches the recorded game.", 2000); + Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000); else - PanicAlert("MD5 of playing game does not match the recorded game!"); + PanicAlert("Checksum of current game does not match the recorded game!"); } else { memcpy(MD5, gameMD5,16); - Core::DisplayMessage("Finished Calculating md5.", 2000); + Core::DisplayMessage("Finished calculating checksum.", 2000); } } }; From d26c7fea177a123d40b3d9b8cbd14cfb17dd8cba Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 24 Nov 2012 01:40:34 -0500 Subject: [PATCH 127/627] Remove old, unused code. --- Source/Core/Core/Src/Movie.cpp | 3 +-- Source/Core/Core/Src/Movie.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 2bf0c73dba..fd86516c57 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -27,7 +27,6 @@ #include "HW/WiimoteEmu/WiimoteEmu.h" #include "HW/WiimoteEmu/WiimoteHid.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "VideoBackendBase.h" #include "State.h" #include "Timer.h" #include "VideoConfig.h" @@ -64,7 +63,7 @@ u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_recordingStartTime; // seconds since 1970 that recording started bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false; bool bMemcard, g_bClearSave = false; -std::string videoBackend = "opengl"; +std::string videoBackend = "unknown"; int iCPUCore = 1; bool g_bDiscChange = false; std::string g_discChange = ""; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 1626f9cfeb..42e7dc3e75 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -19,7 +19,6 @@ #define __MOVIE_H #include "Common.h" -#include "FileUtil.h" #include "../../InputCommon/Src/GCPadStatus.h" #include @@ -133,7 +132,6 @@ void Init(); void SetPolledDevice(); -bool IsAutoFiring(); bool IsRecordingInput(); bool IsRecordingInputFromSaveState(); bool IsJustStartingRecordingInputFromSaveState(); From 0c6dad6a3726b0073640165689ecb416b4510014 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 24 Nov 2012 18:27:20 -0500 Subject: [PATCH 128/627] Clear unneeded variables upon stopping emulation. --- Source/Core/Core/Src/Core.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 11 +++++++---- Source/Core/Core/Src/Movie.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index d3c9fb7033..f939f18f60 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -293,7 +293,7 @@ void Stop() // - Hammertime! SConfig::GetInstance().m_SYSCONF->Reload(); INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----"); - Movie::g_currentInputCount = 0; + Movie::Shutdown(); g_bStopping = false; } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index fd86516c57..cc4834b8b9 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -163,10 +163,6 @@ void Init() g_currentFrame = 0; g_currentLagCount = 0; g_currentInputCount = 0; - // we don't clear these things because otherwise we can't resume playback if we load a movie state later - //g_totalFrames = g_totalBytes = 0; - //delete tmpInput; - //tmpInput = NULL; } else std::thread md5thread(CheckMD5); @@ -1186,4 +1182,11 @@ void CheckMD5() Core::DisplayMessage("Finished calculating checksum.", 2000); } } + +void Shutdown() +{ + g_currentInputCount = g_totalInputCount = g_totalFrames = g_totalBytes = 0; + delete [] tmpInput; + tmpInput = NULL; +} }; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 42e7dc3e75..af8ed92c53 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -177,6 +177,7 @@ void EndPlayInput(bool cont); void SaveRecording(const char *filename); void DoState(PointerWrap &p); void CheckMD5(); +void Shutdown(); std::string GetInputDisplay(); From 1917f832440e6841de5661f11d859213681a2560 Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 25 Nov 2012 19:26:37 -0500 Subject: [PATCH 129/627] Cleanup and misc movie fixes. --- Source/Core/Core/Src/Movie.cpp | 62 ++++++++++++++-------------------- Source/Core/Core/Src/Movie.h | 1 + 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index cc4834b8b9..2cbbe33e56 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -136,6 +136,7 @@ void Init() if (IsPlayingInput()) { ReadHeader(); + std::thread md5thread(CheckMD5); if ((strncmp((char *)tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str(), 6))) { PanicAlert("The recorded game (%s) is not the same as the selected game (%s)", tmpHeader.gameID, Core::g_CoreStartupParameter.GetUniqueID().c_str()); @@ -164,8 +165,6 @@ void Init() g_currentLagCount = 0; g_currentInputCount = 0; } - else - std::thread md5thread(CheckMD5); } void InputUpdate() @@ -388,7 +387,6 @@ bool BeginRecordingInput(int controllers) State::SaveAs(tmpStateFilename.c_str()); g_bRecordingFromSaveState = true; - std::thread md5thread(CheckMD5); // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. // TODO: find a way to GetTitleDataPath() from Movie::Init() @@ -638,7 +636,6 @@ void ReadHeader() else { GetSettings(); - bSaveConfig = false; } videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); @@ -658,9 +655,7 @@ void ReadHeader() { author[i] = tmpHeader.author[i]; } - - for (int i = 0; i < 16; i++) - MD5[i] = tmpHeader.md5[i]; + memcpy(MD5, tmpHeader.md5, 16); } bool PlayInput(const char *filename) @@ -1083,8 +1078,7 @@ void SaveRecording(const char *filename) header.bClearSave = g_bClearSave; strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); - for (int i = 0; i < 16;i++) - header.md5[i] = MD5[i]; + memcpy(header.md5,MD5,16); // TODO header.uniqueID = 0; @@ -1142,45 +1136,41 @@ void GetSettings() if (!Core::g_CoreStartupParameter.bWii) g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + std::thread md5thread(GetMD5); } void CheckMD5() { - if (IsRecordingInput()) + for (int i=0, n=0; i<16; i++) { - Core::DisplayMessage("Calculating checksum of game file...", 2000); - for (int i = 0; i < 16; i++) - MD5[i] = 0; - } - else - { - for (int i=0; i<16; i++) - { - if (tmpHeader.md5[i] != 0) - continue; - if (i == 15) - return; - } - Core::DisplayMessage("Verifying checksum...", 2000); + if (tmpHeader.md5[i] != 0) + continue; + n++; + if (n == 16) + return; } + Core::DisplayMessage("Verifying checksum...", 2000); unsigned char gameMD5[16]; char game[255]; memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); md5_file(game, gameMD5); - if (IsPlayingInput()) - { - if (memcmp(gameMD5,MD5,16) == 0) - Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000); - else - PanicAlert("Checksum of current game does not match the recorded game!"); - } + if (memcmp(gameMD5,MD5,16) == 0) + Core::DisplayMessage("Checksum of current game matches the recorded game.", 2000); else - { - memcpy(MD5, gameMD5,16); - Core::DisplayMessage("Finished calculating checksum.", 2000); - } + PanicAlert("Checksum of current game does not match the recorded game!"); +} + +void GetMD5() +{ + Core::DisplayMessage("Calculating checksum of game file...", 2000); + for (int i = 0; i < 16; i++) + MD5[i] = 0; + char game[255]; + memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); + md5_file(game, MD5); + Core::DisplayMessage("Finished calculating checksum.", 2000); } void Shutdown() @@ -1189,4 +1179,4 @@ void Shutdown() delete [] tmpInput; tmpInput = NULL; } -}; +}; \ No newline at end of file diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index af8ed92c53..42ee6dd485 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -177,6 +177,7 @@ void EndPlayInput(bool cont); void SaveRecording(const char *filename); void DoState(PointerWrap &p); void CheckMD5(); +void GetMD5(); void Shutdown(); std::string GetInputDisplay(); From 0903e2081725bef65d61d50a326a8e13b94bada8 Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 25 Nov 2012 22:41:48 -0500 Subject: [PATCH 130/627] Expand input buffer as needed, instead of hardcoding it at 40 MiB. Patch (mostly) by Ilari. --- Source/Core/Core/Src/Movie.cpp | 40 +++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 2cbbe33e56..8d2b7c4c01 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -37,8 +37,8 @@ #include "../../Common/Src/NandPaths.h" #include "Crypto/md5.h" -// large enough for just over 24 hours of single-player recording -#define MAX_DTM_LENGTH (40 * 1024 * 1024) +// The chunk to allocate movie data in multiples of. +#define DTM_BASE_LENGTH (1024) std::mutex cs_frameSkip; @@ -56,6 +56,7 @@ u8 g_numPads = 0; ControllerState g_padState; DTMHeader tmpHeader; u8* tmpInput = NULL; +size_t tmpInputAllocated = 0; u64 g_currentByte = 0, g_totalBytes = 0; u64 g_currentFrame = 0, g_totalFrames = 0; // VI u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats @@ -81,6 +82,25 @@ std::string g_InputDisplay[8]; ManipFunction mfunc = NULL; +void EnsureTmpInputSize(size_t bound) +{ + if (tmpInputAllocated >= bound) + return; + // The buffer expands in powers of two of DTM_BASE_LENGTH + // (standard exponential buffer growth). + size_t newAlloc = DTM_BASE_LENGTH; + while (newAlloc < bound) + newAlloc *= 2; + u8* newTmpInput = new u8[newAlloc]; + tmpInputAllocated = newAlloc; + if (tmpInput != NULL) + { + if (g_totalBytes > 0) + memcpy(newTmpInput, tmpInput, g_totalBytes); + delete[] tmpInput; + } + tmpInput = newTmpInput; +} std::string GetInputDisplay() { @@ -401,8 +421,8 @@ bool BeginRecordingInput(int controllers) g_playMode = MODE_RECORDING; GetSettings(); author = SConfig::GetInstance().m_strMovieAuthor; - delete [] tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; + EnsureTmpInputSize(1); + g_currentByte = g_totalBytes = 0; Core::DisplayMessage("Starting movie recording", 2000); @@ -582,7 +602,7 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_padState.CStickX = PadStatus->substickX; g_padState.CStickY = PadStatus->substickY; - + EnsureTmpInputSize(g_currentByte + 8); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); g_currentByte += 8; g_totalBytes = g_currentByte; @@ -606,6 +626,7 @@ void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf u8 size = rptf.size; InputUpdate(); + EnsureTmpInputSize(g_currentByte + size + 1); tmpInput[g_currentByte++] = size; memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size; @@ -699,8 +720,7 @@ bool PlayInput(const char *filename) g_playMode = MODE_PLAYING; g_totalBytes = g_recordfd.GetSize() - 256; - delete tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; + EnsureTmpInputSize((size_t)g_totalBytes); g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes); g_currentByte = 0; g_recordfd.Close(); @@ -767,9 +787,8 @@ void LoadInput(const char *filename) g_totalLagCount = tmpHeader.lagCount; g_totalInputCount = tmpHeader.inputCount; + EnsureTmpInputSize((size_t)totalSavedBytes); g_totalBytes = totalSavedBytes; - delete [] tmpInput; - tmpInput = new u8[MAX_DTM_LENGTH]; t_record.ReadArray(tmpInput, (size_t)g_totalBytes); } else if (g_currentByte > 0) @@ -1178,5 +1197,6 @@ void Shutdown() g_currentInputCount = g_totalInputCount = g_totalFrames = g_totalBytes = 0; delete [] tmpInput; tmpInput = NULL; + tmpInputAllocated = 0; } -}; \ No newline at end of file +}; From 97f5b1665fa495a494eb2ad40034ececfac853d9 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 01:41:00 -0500 Subject: [PATCH 131/627] what is this even... --- Source/Core/Common/Src/Setup.h | 41 --- Source/Core/Common/Src/Thread.cpp | 1 - Source/Core/Core/CMakeLists.txt | 1 - Source/Core/Core/Core.vcxproj | 1 - Source/Core/Core/Src/Core.cpp | 5 +- Source/Core/Core/Src/Core.h | 15 -- Source/Core/Core/Src/CoreRerecording.cpp | 248 ------------------ Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 1 - Source/Core/Core/Src/Movie.h | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 8 - Source/Core/DolphinWX/Src/FrameTools.cpp | 3 - Source/Core/DolphinWX/Src/Main.cpp | 1 - Source/Core/VideoCommon/Src/Fifo.cpp | 1 - Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 1 - Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 1 - 15 files changed, 2 insertions(+), 328 deletions(-) delete mode 100644 Source/Core/Common/Src/Setup.h delete mode 100644 Source/Core/Core/Src/CoreRerecording.cpp diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h deleted file mode 100644 index c0faec3059..0000000000 --- a/Source/Core/Common/Src/Setup.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef _SETUP_H_ -#define _SETUP_H_ - -// ----------------------------------------------------------------------------------------------------- -// File description: -// Compilation settings. I avoid placing this in Common.h or some place where lots of files needs -// to be rebuilt if any of these settings are changed. I'd rather have it in as few files as possible. -// This file can be kept on the ignore list in your SVN program. It allows local optional settings -// depending on what works on your computer. -// ----------------------------------------------------------------------------------------------------- - -// ----------------------------------------------------------------------------------------------------- -// Settings: - -// This may remove sound artifacts in Wario Land Shake It and perhaps other games -//#define SETUP_AVOID_SOUND_ARTIFACTS - -// Build with playback rerecording options -//#define RERECORDING - -// ----------------------------------------------------------------------------------------------------- - -#endif // _SETUP_H_ - diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index ce91aac651..73f83c204f 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Setup.h" #include "Thread.h" #include "Common.h" diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 734d966781..d11c4a350a 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -5,7 +5,6 @@ set(SRCS Src/ActionReplay.cpp Src/Console.cpp Src/Core.cpp Src/CoreParameter.cpp - Src/CoreRerecording.cpp Src/CoreTiming.cpp Src/DSPEmulator.cpp Src/GeckoCodeConfig.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e03d40e43a..78f95bbce6 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -207,7 +207,6 @@ - diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index f939f18f60..e92b9088bc 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -18,9 +18,9 @@ #ifdef _WIN32 #include +#include "EmuWindow.h" #endif -#include "Setup.h" // Common #include "Atomic.h" #include "Thread.h" #include "Timer.h" @@ -61,9 +61,6 @@ #include "VideoBackendBase.h" #include "AudioCommon.h" #include "OnScreenDisplay.h" -#ifdef _WIN32 -#include "EmuWindow.h" -#endif #include "VolumeHandler.h" #include "FileMonitor.h" diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h index 448bd55bb6..312c446744 100644 --- a/Source/Core/Core/Src/Core.h +++ b/Source/Core/Core/Src/Core.h @@ -95,21 +95,6 @@ void RequestRefreshInfo(); // the return value of the first call should be passed in as the second argument of the second call. bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true); -#ifdef RERECORDING - -void FrameUpdate(); -void FrameAdvance(); -void FrameStepOnOff(); -void WriteStatus(); -void RerecordingStart(); -void RerecordingStop(); -void WindBack(int Counter); - -extern int g_FrameCounter,g_InputCounter; -extern bool g_FrameStep; - -#endif - } // namespace #endif diff --git a/Source/Core/Core/Src/CoreRerecording.cpp b/Source/Core/Core/Src/CoreRerecording.cpp deleted file mode 100644 index 3064ed37ad..0000000000 --- a/Source/Core/Core/Src/CoreRerecording.cpp +++ /dev/null @@ -1,248 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - - -#include "Setup.h" -#ifndef RERECORDING -bool rerecording = false; -#else - -// Include -// -------------- -#ifdef _WIN32 - #include -#endif - -#include "Thread.h" // Common - -#include "Timer.h" -#include "Common.h" - -#include "Console.h" -#include "Core.h" -#include "CPUDetect.h" -#include "CoreTiming.h" -#include "Boot/Boot.h" -#include "PatchEngine.h" - -#include "HW/Memmap.h" -#include "HW/ProcessorInterface.h" -#include "HW/GPFifo.h" -#include "HW/CPU.h" -#include "HW/HW.h" -#include "HW/DSP.h" -#include "HW/GPFifo.h" -#include "HW/AudioInterface.h" -#include "HW/VideoInterface.h" -#include "HW/CommandProcessor.h" -#include "HW/PixelEngine.h" -#include "HW/SystemTimers.h" - -#include "PowerPC/PowerPC.h" - -#include "ConfigManager.h" - -#include "MemTools.h" -#include "Host.h" -#include "LogManager.h" - - - - - -// File description: Rerecording Functions -/* --------------- - -How the timer works: We measure the time between drawn frames, not when the game is paused. So time -should be a fairly comparable measure of the time it took to play the game. However the time it takes -to draw a frame will be lower on a fast computer. Therefore we could perhaps measure time as an -internal game time that is adjusted by the average time it takes to draw a frame. Also if it only takes -ten or twenty milliseconds to draw a frame I'm not certain about how accurate the mmsystem timers are for -such short periods. - -//////////////////////////////////////*/ - - - -namespace Core -{ - - - -// Declarations and definitions -// --------------- -int g_FrameCounter = 0; -bool g_FrameStep = false; -Common::Timer ReRecTimer; - - - - -// Control Run, Pause, Stop and the Timer. -// --------------- - -// Subtract the paused time when we run again -void Run() -{ - ReRecTimer.AddTimeDifference(); -} -// Update the time -void Pause() -{ - ReRecTimer.Update(); -} - -// Start the timer when a game is booted -void RerecordingStart() -{ - g_FrameCounter = 0; - ReRecTimer.Start(); - - // Logging - //DEBUG_LOG(CONSOLE, "RerecordingStart: %i\n", g_FrameCounter); -} - -// Reset the frame counter -void RerecordingStop() -{ - // Write the final time and Stop the timer - ReRecTimer.Stop(); - - // Update status bar - WriteStatus(); -} - -/* Wind back the frame counter when a save state is loaded. Currently we don't know what that means in - time so we just guess that the time is proportional the the number of frames - - Todo: There are many assumptions here: We probably want to replace the time here by the actual time - that we save together with the save state or the input recording for example. And have it adjusted - for full speed playback (whether it's 30 fps or 60 fps or some other speed that the game is natively - capped at). Also the input interrupts do not occur as often as the frame renderings, they occur more - often. So we may want to move the input recording to fram updates, or perhaps sync the input interrupts - to frame updates. - */ -void WindBack(int Counter) -{ - /* Counter should be smaller than g_FrameCounter, however it currently updates faster than the - frames so currently it may not be the same. Therefore I use the abs() function. */ - int AbsoluteFrameDifference = abs(g_FrameCounter - Counter); - float FractionalFrameDifference = (float) AbsoluteFrameDifference / (float) g_FrameCounter; - - // Update the frame counter - g_FrameCounter = Counter; - - // Approximate a time to wind back the clock to - // Get the current time - u64 CurrentTimeMs = ReRecTimer.GetTimeElapsed(); - // Save the current time in seconds in a new double - double CurrentTimeSeconds = (double) (CurrentTimeMs / 1000); - // Reduce it by the same proportion as the counter was wound back - CurrentTimeSeconds = CurrentTimeSeconds * FractionalFrameDifference; - // Update the clock - ReRecTimer.WindBackStartingTime((u64)CurrentTimeSeconds * 1000); - - // Logging - DEBUG_LOG(CONSOLE, "WindBack: %i %u\n", Counter, (u64)CurrentTimeSeconds); -} - - - - -// Frame advance -// --------------- -void FrameAdvance() -{ - // Update status bar - WriteStatus(); - - // If a game is not started, return - if (Core::GetState() == Core::CORE_UNINITIALIZED) return; - - // Play to the next frame - if (g_FrameStep) - { - Run(); - Core::SetState(Core::CORE_RUN); - } -} - -// Turn on frame stepping -void FrameStepOnOff() -{ - /* Turn frame step on or off. If a game is running and we turn this on it means that the game - will pause after the next frame update */ - g_FrameStep = !g_FrameStep; - - // Update status bar - WriteStatus(); - - // If a game is not started, return - if(Core::GetState() == Core::CORE_UNINITIALIZED) return; - - // Run the emulation if we turned off framestepping - if (!g_FrameStep) - { - Run(); - Core::SetState(Core::CORE_RUN); - } -} - - - - -// General functions -// --------------- - -// Write to the status bar -void WriteStatus() -{ - std::string TmpStr = "Time: " + ReRecTimer.GetTimeElapsedFormatted(); - TmpStr += StringFromFormat(" Frame: %s", ThousandSeparate(g_FrameCounter).c_str()); - // The FPS is the total average since the game was booted - TmpStr += StringFromFormat(" FPS: %i", (g_FrameCounter * 1000) / ReRecTimer.GetTimeElapsed()); - TmpStr += StringFromFormat(" FrameStep: %s", g_FrameStep ? "On" : "Off"); - Host_UpdateStatusBar(TmpStr.c_str(), 1); -} - - -// When a new frame is drawn -void FrameUpdate() -{ - // Write to the status bar - WriteStatus(); - /* I don't think the frequent update has any material speed inpact at all, but should it - have you can controls the update speed by changing the "% 10" in this line */ - //if (g_FrameCounter % 10 == 0) WriteStatus(); - - // Pause if frame stepping is on - if(g_FrameStep) - { - Pause(); - Core::SetState(Core::CORE_PAUSE); - } - - // Count one frame - g_FrameCounter++; -} - - - -} // Core - - -#endif // RERECORDING diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index 66ee4bef84..817610ea0f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -20,7 +20,6 @@ #include "ChunkFile.h" #include "IniFile.h" #include "HLEMixer.h" -#include "Setup.h" #include "StringUtil.h" #include "LogManager.h" #include "IniFile.h" diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 42ee6dd485..401b28be50 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -189,4 +189,4 @@ void SetInputManip(ManipFunction); void CallInputManip(SPADStatus *PadStatus, int controllerID); }; -#endif // __FRAME_H +#endif // __MOVIE_H diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 9d59ca1788..da6c565ddf 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -26,7 +26,6 @@ #include "Common.h" // Common #include "FileUtil.h" #include "Timer.h" -#include "Setup.h" #include "Globals.h" // Local #include "Frame.h" @@ -458,13 +457,6 @@ CFrame::CFrame(wxFrame* parent, // Update controls UpdateGUI(); - - // If we are rerecording create the status bar now instead of later when a game starts - #ifdef RERECORDING - ModifyStatusBar(); - // It's to early for the OnHostMessage(), we will update the status when Ctrl or Space is pressed - //Core::WriteStatus(); - #endif } // Destructor CFrame::~CFrame() diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index a1f4355dd7..9011d5e844 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -27,9 +27,6 @@ window handle that is returned by CreateWindow() can be accessed from Core::GetWindowHandle(). */ - -#include "Setup.h" // Common - #include "NetWindow.h" #include "Common.h" // Common #include "FileUtil.h" diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 2a0b8a3de4..59c77f1e32 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -28,7 +28,6 @@ #include "CPUDetect.h" #include "IniFile.h" #include "FileUtil.h" -#include "Setup.h" #include "Host.h" // Core #include "HW/Wiimote.h" diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 565684297a..50aa21ebbf 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include "VideoConfig.h" -#include "Setup.h" #include "MemoryUtil.h" #include "Thread.h" #include "Atomic.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 5110023ee3..d6abb014c4 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -18,7 +18,6 @@ #include "Globals.h" #include "VideoConfig.h" #include "IniFile.h" -#include "Setup.h" #include "Core.h" #include "Host.h" #include "VideoBackend.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 543fb9824d..fb26ba2781 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -88,7 +88,6 @@ Make AA apply instantly during gameplay if possible #include "TextureConverter.h" #include "PostProcessing.h" #include "OnScreenDisplay.h" -#include "Setup.h" #include "DLCache.h" #include "FramebufferManager.h" #include "Core.h" From c2146921f99e783ea917e1428b4aeb46ec764ac8 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 03:04:17 -0500 Subject: [PATCH 132/627] Call InputUpdate() for wii games when using gc controller but not wiimote. --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index a9b708324d..8e8adf33fd 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -132,13 +132,13 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) if(Movie::IsPlayingInput()) { Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Core::g_CoreStartupParameter.bWii) + if(!Movie::IsUsingWiimote(0)) Movie::InputUpdate(); } else if(Movie::IsRecordingInput()) { Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Core::g_CoreStartupParameter.bWii) + if(!Movie::IsUsingWiimote(0)) Movie::InputUpdate(); } From 3d9712a99ee7a69ac59933c67d08bc6b2f80421f Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 03:48:04 -0500 Subject: [PATCH 133/627] Remove more unused code. --- Source/Core/Common/Src/Timer.cpp | 6 ------ Source/Core/Common/Src/Timer.h | 1 - 2 files changed, 7 deletions(-) diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 087f8fcead..b1beed2066 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -97,12 +97,6 @@ void Timer::AddTimeDifference() m_StartTime += GetTimeDifference(); } -// Wind back the starting time to a custom time -void Timer::WindBackStartingTime(u64 WindBack) -{ - m_StartTime += WindBack; -} - // Get the time elapsed since the Start() u64 Timer::GetTimeElapsed() { diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h index a638920409..152d4c60e6 100644 --- a/Source/Core/Common/Src/Timer.h +++ b/Source/Core/Common/Src/Timer.h @@ -35,7 +35,6 @@ public: // The time difference is always returned in milliseconds, regardless of alternative internal representation u64 GetTimeDifference(); void AddTimeDifference(); - void WindBackStartingTime(u64 WindBack); static void IncreaseResolution(); static void RestoreResolution(); From 0c33891aa186288395a6a25a889b9015ad6f9044 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 26 Nov 2012 14:31:55 +0200 Subject: [PATCH 134/627] Gameini database updates/additions for: TMNT3, Mystic Heroes, BEACH SPIKERS, Fantastic Four, King Arthur, I-Ninja, FFCC Echoes of Time, Just Dance, Disney Epic Mickey, Shark Tale, Pokemon Channel, Cars 2, Disney Epic Mickey 2: The Power of 2, THE LAST STORY. --- Data/User/GameConfig/G3QEA4.ini | 25 +++++-- Data/User/GameConfig/G9TD52.ini | 18 +++++ Data/User/GameConfig/G9TE52.ini | 18 +++++ Data/User/GameConfig/G9TF52.ini | 18 +++++ Data/User/GameConfig/G9TI52.ini | 18 +++++ Data/User/GameConfig/G9TP52.ini | 18 +++++ Data/User/GameConfig/GBHDC8.ini | 18 +++++ Data/User/GameConfig/GBHEC8.ini | 120 ++++++++++++-------------------- Data/User/GameConfig/GBHFC8.ini | 18 +++++ Data/User/GameConfig/GBHPC8.ini | 18 +++++ Data/User/GameConfig/GBSE8P.ini | 12 +++- Data/User/GameConfig/GBSP8P.ini | 9 +++ Data/User/GameConfig/GF4E52.ini | 26 +++++-- Data/User/GameConfig/GF4F52.ini | 19 +++++ Data/User/GameConfig/GF4P52.ini | 19 +++++ Data/User/GameConfig/GKHEA4.ini | 14 +++- Data/User/GameConfig/GKHPA4.ini | 13 +++- Data/User/GameConfig/GNJEAF.ini | 13 +++- Data/User/GameConfig/GPAE01.ini | 18 +++++ Data/User/GameConfig/GPAJ01.ini | 18 +++++ Data/User/GameConfig/GPAP01.ini | 18 +++++ Data/User/GameConfig/GPAU01.ini | 18 +++++ Data/User/GameConfig/RFFEGD.ini | 7 +- Data/User/GameConfig/RFFJGD.ini | 6 +- Data/User/GameConfig/RFFPGD.ini | 6 +- Data/User/GameConfig/SCYE4Q.ini | 15 ++++ Data/User/GameConfig/SCYP4Q.ini | 15 ++++ Data/User/GameConfig/SCYX4Q.ini | 15 ++++ Data/User/GameConfig/SCYY4Q.ini | 15 ++++ Data/User/GameConfig/SCYZ4Q.ini | 15 ++++ Data/User/GameConfig/SDNE41.ini | 4 +- Data/User/GameConfig/SDNP41.ini | 4 +- Data/User/GameConfig/SEME4Q.ini | 6 +- Data/User/GameConfig/SEMJ01.ini | 24 +++++++ Data/User/GameConfig/SEMP4Q.ini | 5 +- Data/User/GameConfig/SEMX4Q.ini | 5 +- Data/User/GameConfig/SEMY4Q.ini | 24 +++++++ Data/User/GameConfig/SEMZ4Q.ini | 24 +++++++ Data/User/GameConfig/SERE4Q.ini | 20 ++++++ Data/User/GameConfig/SERF4Q.ini | 20 ++++++ Data/User/GameConfig/SERP4Q.ini | 20 ++++++ Data/User/GameConfig/SLSEXJ.ini | 19 +++++ 42 files changed, 640 insertions(+), 115 deletions(-) create mode 100644 Data/User/GameConfig/G9TD52.ini create mode 100644 Data/User/GameConfig/G9TE52.ini create mode 100644 Data/User/GameConfig/G9TF52.ini create mode 100644 Data/User/GameConfig/G9TI52.ini create mode 100644 Data/User/GameConfig/G9TP52.ini create mode 100644 Data/User/GameConfig/GBHDC8.ini create mode 100644 Data/User/GameConfig/GBHFC8.ini create mode 100644 Data/User/GameConfig/GBHPC8.ini create mode 100644 Data/User/GameConfig/GF4F52.ini create mode 100644 Data/User/GameConfig/GF4P52.ini create mode 100644 Data/User/GameConfig/GPAE01.ini create mode 100644 Data/User/GameConfig/GPAJ01.ini create mode 100644 Data/User/GameConfig/GPAP01.ini create mode 100644 Data/User/GameConfig/GPAU01.ini create mode 100644 Data/User/GameConfig/SCYE4Q.ini create mode 100644 Data/User/GameConfig/SCYP4Q.ini create mode 100644 Data/User/GameConfig/SCYX4Q.ini create mode 100644 Data/User/GameConfig/SCYY4Q.ini create mode 100644 Data/User/GameConfig/SCYZ4Q.ini create mode 100644 Data/User/GameConfig/SEMJ01.ini create mode 100644 Data/User/GameConfig/SEMY4Q.ini create mode 100644 Data/User/GameConfig/SEMZ4Q.ini create mode 100644 Data/User/GameConfig/SERE4Q.ini create mode 100644 Data/User/GameConfig/SERF4Q.ini create mode 100644 Data/User/GameConfig/SERP4Q.ini create mode 100644 Data/User/GameConfig/SLSEXJ.ini diff --git a/Data/User/GameConfig/G3QEA4.ini b/Data/User/GameConfig/G3QEA4.ini index 19f71c3f7a..34471c842e 100644 --- a/Data/User/GameConfig/G3QEA4.ini +++ b/Data/User/GameConfig/G3QEA4.ini @@ -1,7 +1,18 @@ -# G3QEA4 - TMNT3 -[Core] Values set here will override the main dolphin settings. -TLBHack=1 -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. +# G3QEA4 - TMNT3 +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/G9TD52.ini b/Data/User/GameConfig/G9TD52.ini new file mode 100644 index 0000000000..95f5d1837b --- /dev/null +++ b/Data/User/GameConfig/G9TD52.ini @@ -0,0 +1,18 @@ +# G9TD52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TE52.ini b/Data/User/GameConfig/G9TE52.ini new file mode 100644 index 0000000000..8ce046e142 --- /dev/null +++ b/Data/User/GameConfig/G9TE52.ini @@ -0,0 +1,18 @@ +# G9TE52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TF52.ini b/Data/User/GameConfig/G9TF52.ini new file mode 100644 index 0000000000..625316cf7e --- /dev/null +++ b/Data/User/GameConfig/G9TF52.ini @@ -0,0 +1,18 @@ +# G9TF52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TI52.ini b/Data/User/GameConfig/G9TI52.ini new file mode 100644 index 0000000000..b4e063dc8e --- /dev/null +++ b/Data/User/GameConfig/G9TI52.ini @@ -0,0 +1,18 @@ +# G9TI52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/G9TP52.ini b/Data/User/GameConfig/G9TP52.ini new file mode 100644 index 0000000000..a00d3fb255 --- /dev/null +++ b/Data/User/GameConfig/G9TP52.ini @@ -0,0 +1,18 @@ +# G9TP52 - Shark Tale +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GBHDC8.ini b/Data/User/GameConfig/GBHDC8.ini new file mode 100644 index 0000000000..dbc0e46f56 --- /dev/null +++ b/Data/User/GameConfig/GBHDC8.ini @@ -0,0 +1,18 @@ +# GBHDC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHEC8.ini b/Data/User/GameConfig/GBHEC8.ini index e086dcbc61..30fa0f7380 100644 --- a/Data/User/GameConfig/GBHEC8.ini +++ b/Data/User/GameConfig/GBHEC8.ini @@ -1,147 +1,119 @@ # GBHEC8 - Mystic Heroes - [EmuState] #The Emulation State (as of Dolphin r1027) EmulationStateId = 4 - +EmulationIssues = Needs Real xfb for the videos to display. [OnFrame] -#Add memory patches here. - -#Add decrypted action replay cheats here. [ActionReplay] - -$(m) +$(m) 01180C36 88000000 C4201E68 0000FF00 - -$Max Health +$Max Health 01180C37 08000000 02264788 0000270F - -$Max Magic +$Max Magic 01180C38 08000000 0226478A 0000270F - -$Max Attack +$Max Attack 01180C39 08000000 0226478C 0000270F - -$Max Defense +$Max Defense 01180C3A 08000000 0226478E 0000270F - -$Max Rune Attack +$Max Rune Attack 01180C3B 08000000 02264790 0000270F - -$Max Rune Defense +$Max Rune Defense 01180C3C 08000000 02264792 0000270F - -$Have All Runes +$Have All Runes 01180C3D 08000000 022647C0 0005FFFF - -$Max Level All Magic Slots +$Max Level All Magic Slots 01180C3E 08000000 042647A8 09090909 - -$Start On Level 1-2 +$Start On Level 1-2 01180C3F 08000000 0226475A 00000102 - -$Start On Level 1-3 +$Start On Level 1-3 01180C40 08000000 0226475A 00000103 - -$Start On Level 2-1 +$Start On Level 2-1 01180C41 08000000 0226475A 00000201 - -$Start On Level 2-2 +$Start On Level 2-2 01180C42 08000000 0226475A 00000202 - -$Start On Level 2-3 +$Start On Level 2-3 01180C43 08000000 0226475A 00000203 - -$Start On Level 3-1 +$Start On Level 3-1 01180C44 08000000 0226475A 00000301 - -$Start On Level 3-2 +$Start On Level 3-2 01180C45 08000000 0226475A 00000302 - -$Start On Level 3-3 +$Start On Level 3-3 01180C46 08000000 0226475A 00000303 - -$Start On Level 4-1 +$Start On Level 4-1 01180C47 08000000 0226475A 00000401 - -$Start On Level 4-2 +$Start On Level 4-2 01180C48 08000000 0226475A 00000402 - -$Start On Level 4-3 +$Start On Level 4-3 01180C49 08000000 0226475A 00000403 - -$Start On Level 5-1 +$Start On Level 5-1 01180C4A 08000000 0226475A 00000501 - -$Start On Level 5-2 +$Start On Level 5-2 01180C4B 08000000 0226475A 00000502 - -$Start On Level 5-3 +$Start On Level 5-3 01180C4C 08000000 0226475A 00000503 - -$Start On Level 6-1 +$Start On Level 6-1 01180C4D 08000000 0226475A 00000601 - -$Start On Level 6-2 +$Start On Level 6-2 01180C4E 08000000 0226475A 00000602 - -$Start On Level 6-3 +$Start On Level 6-3 01180C4F 08000000 0226475A 00000603 - -$Start On Level 7-1 +$Start On Level 7-1 01180C50 08000000 0226475A 00000701 - -$Start On Level 7-2 +$Start On Level 7-2 01180C51 08000000 0226475A 00000702 - -$Start On Level 7-3 +$Start On Level 7-3 01180C52 08000000 0226475A 00000703 - -$Start On Level 7-4 +$Start On Level 7-4 01180C53 08000000 0226475A 00000704 - -$Start On Level 8-1 +$Start On Level 8-1 01180C54 08000000 0226475A 00000801 - -$Start On Level 8-2 +$Start On Level 8-2 01180C55 08000000 0226475A 00000802 - -$Start On Level 8-3 +$Start On Level 8-3 01180C56 08000000 0226475A 00000803 - -$Start On Level 8-4 +$Start On Level 8-4 01180C57 08000000 -0226475A 00000804 \ No newline at end of file +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHFC8.ini b/Data/User/GameConfig/GBHFC8.ini new file mode 100644 index 0000000000..e0ac6b2976 --- /dev/null +++ b/Data/User/GameConfig/GBHFC8.ini @@ -0,0 +1,18 @@ +# GBHFC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBHPC8.ini b/Data/User/GameConfig/GBHPC8.ini new file mode 100644 index 0000000000..59c0c5dd54 --- /dev/null +++ b/Data/User/GameConfig/GBHPC8.ini @@ -0,0 +1,18 @@ +# GBHPC8 - Mystic Heroes +[EmuState] +#The Emulation State (as of Dolphin r1027) +EmulationStateId = 4 +EmulationIssues = Needs Real xfb for the videos to display. +[OnFrame] +[ActionReplay] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/User/GameConfig/GBSE8P.ini index 61d1c769b9..5b91e4fe54 100644 --- a/Data/User/GameConfig/GBSE8P.ini +++ b/Data/User/GameConfig/GBSE8P.ini @@ -2,7 +2,15 @@ [Core] Values set here will override the main dolphin settings. EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Controlls don't work ingame only walking works +EmulationStateId = 4 +EmulationIssues = Needs lle audio to solve sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/User/GameConfig/GBSP8P.ini index fa68a7e996..c21ff6f50b 100644 --- a/Data/User/GameConfig/GBSP8P.ini +++ b/Data/User/GameConfig/GBSP8P.ini @@ -3,5 +3,14 @@ EnableFPRF = True [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 +EmulationIssues = Needs lle audio to solve sound issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GF4E52.ini b/Data/User/GameConfig/GF4E52.ini index 1d062e1846..9135101401 100644 --- a/Data/User/GameConfig/GF4E52.ini +++ b/Data/User/GameConfig/GF4E52.ini @@ -1,7 +1,19 @@ -# GF4E52 - Fantastic Four -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Can be slow -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. +# GF4E52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GF4F52.ini b/Data/User/GameConfig/GF4F52.ini new file mode 100644 index 0000000000..479efe3d49 --- /dev/null +++ b/Data/User/GameConfig/GF4F52.ini @@ -0,0 +1,19 @@ +# GF4F52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GF4P52.ini b/Data/User/GameConfig/GF4P52.ini new file mode 100644 index 0000000000..196d565967 --- /dev/null +++ b/Data/User/GameConfig/GF4P52.ini @@ -0,0 +1,19 @@ +# GF4P52 - Fantastic Four +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False diff --git a/Data/User/GameConfig/GKHEA4.ini b/Data/User/GameConfig/GKHEA4.ini index 635d743f83..4973a2955f 100644 --- a/Data/User/GameConfig/GKHEA4.ini +++ b/Data/User/GameConfig/GKHEA4.ini @@ -1,7 +1,17 @@ # GKHEA4 - King Arthur [Core] Values set here will override the main dolphin settings. +SkipIdle = 0 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Slow and screen on right side is cut off +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GKHPA4.ini b/Data/User/GameConfig/GKHPA4.ini index f3a70877f4..ab44a39965 100644 --- a/Data/User/GameConfig/GKHPA4.ini +++ b/Data/User/GameConfig/GKHPA4.ini @@ -1,6 +1,17 @@ # GKHPA4 - King Arthur [Core] Values set here will override the main dolphin settings. +SkipIdle = 0 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GNJEAF.ini b/Data/User/GameConfig/GNJEAF.ini index 2c46ed2f8b..7b86e03933 100644 --- a/Data/User/GameConfig/GNJEAF.ini +++ b/Data/User/GameConfig/GNJEAF.ini @@ -3,6 +3,17 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Cutscenes are black +EmulationIssues = Needs Real Xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GPAE01.ini b/Data/User/GameConfig/GPAE01.ini new file mode 100644 index 0000000000..2c4a579eca --- /dev/null +++ b/Data/User/GameConfig/GPAE01.ini @@ -0,0 +1,18 @@ +# GPAE01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAJ01.ini b/Data/User/GameConfig/GPAJ01.ini new file mode 100644 index 0000000000..2c41ef72f0 --- /dev/null +++ b/Data/User/GameConfig/GPAJ01.ini @@ -0,0 +1,18 @@ +# GPAJ01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAP01.ini b/Data/User/GameConfig/GPAP01.ini new file mode 100644 index 0000000000..15bc8aa8cf --- /dev/null +++ b/Data/User/GameConfig/GPAP01.ini @@ -0,0 +1,18 @@ +# GPAP01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GPAU01.ini b/Data/User/GameConfig/GPAU01.ini new file mode 100644 index 0000000000..21a7a58e23 --- /dev/null +++ b/Data/User/GameConfig/GPAU01.ini @@ -0,0 +1,18 @@ +# GPAU01 - PokemonChannelMainDisk +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs Efb to Ram for painting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/RFFEGD.ini b/Data/User/GameConfig/RFFEGD.ini index 0db2a572ee..5efa2dd980 100644 --- a/Data/User/GameConfig/RFFEGD.ini +++ b/Data/User/GameConfig/RFFEGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,7 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 - diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/User/GameConfig/RFFJGD.ini index 24d3099bc8..850bb88c9d 100644 --- a/Data/User/GameConfig/RFFJGD.ini +++ b/Data/User/GameConfig/RFFJGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,6 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/User/GameConfig/RFFPGD.ini index bb0471ea68..6c9c27abb4 100644 --- a/Data/User/GameConfig/RFFPGD.ini +++ b/Data/User/GameConfig/RFFPGD.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Use efb scale x1 for the black lines to disappear +EmulationIssues = Needs integral scaling for the black lines to disappear. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,6 +13,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] -EFBScale = 2 +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/SCYE4Q.ini b/Data/User/GameConfig/SCYE4Q.ini new file mode 100644 index 0000000000..1000cd8bcc --- /dev/null +++ b/Data/User/GameConfig/SCYE4Q.ini @@ -0,0 +1,15 @@ +# SCYE4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYP4Q.ini b/Data/User/GameConfig/SCYP4Q.ini new file mode 100644 index 0000000000..a7f2b779ff --- /dev/null +++ b/Data/User/GameConfig/SCYP4Q.ini @@ -0,0 +1,15 @@ +# SCYP4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYX4Q.ini b/Data/User/GameConfig/SCYX4Q.ini new file mode 100644 index 0000000000..6f1a2cf0b3 --- /dev/null +++ b/Data/User/GameConfig/SCYX4Q.ini @@ -0,0 +1,15 @@ +# SCYX4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYY4Q.ini b/Data/User/GameConfig/SCYY4Q.ini new file mode 100644 index 0000000000..b2637bb69c --- /dev/null +++ b/Data/User/GameConfig/SCYY4Q.ini @@ -0,0 +1,15 @@ +# SCYY4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SCYZ4Q.ini b/Data/User/GameConfig/SCYZ4Q.ini new file mode 100644 index 0000000000..9fad833875 --- /dev/null +++ b/Data/User/GameConfig/SCYZ4Q.ini @@ -0,0 +1,15 @@ +# SCYZ4Q - Cars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 1 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/SDNE41.ini b/Data/User/GameConfig/SDNE41.ini index c3ac08ad38..79dfb707c5 100644 --- a/Data/User/GameConfig/SDNE41.ini +++ b/Data/User/GameConfig/SDNE41.ini @@ -1,6 +1,6 @@ # SDNE41 - Just Dance [Video_Settings] -EFBScale = 0 +EFBScale = 1 [Video_Enhancements] MaxAnisotropy = 0 [Video] @@ -11,7 +11,7 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SDNP41.ini b/Data/User/GameConfig/SDNP41.ini index 07ac7ff92a..612ecdeddf 100644 --- a/Data/User/GameConfig/SDNP41.ini +++ b/Data/User/GameConfig/SDNP41.ini @@ -1,6 +1,6 @@ # SDNP41 - Just Dance [Video_Settings] -EFBScale = 0 +EFBScale = 1 [Video_Enhancements] MaxAnisotropy = 0 [Video] @@ -11,7 +11,7 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [EmuState] -EmulationStateId = 0 +EmulationStateId = 4 EmulationIssues = [OnFrame] [ActionReplay] diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini index 9b246a03d9..7e340985b3 100644 --- a/Data/User/GameConfig/SEME4Q.ini +++ b/Data/User/GameConfig/SEME4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,7 +13,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False @@ -21,4 +22,3 @@ ForceFiltering = False DlistCachingEnable = False [Wii] DisableWiimoteSpeaker = 1 - diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini new file mode 100644 index 0000000000..7dc481ea34 --- /dev/null +++ b/Data/User/GameConfig/SEMJ01.ini @@ -0,0 +1,24 @@ +# SEMJ01 - Disney Epic Mickey: Mickey Mouse and the Magic Brush +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini index 1bb265c49c..fa1afc01c2 100644 --- a/Data/User/GameConfig/SEMP4Q.ini +++ b/Data/User/GameConfig/SEMP4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,7 +13,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini index 09597ac5fa..b4c56197ea 100644 --- a/Data/User/GameConfig/SEMX4Q.ini +++ b/Data/User/GameConfig/SEMX4Q.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Enable progressive scan if the game has boot issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] @@ -13,7 +13,8 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Gecko] -[Video_Settings] +[Video_Settings] +EFBScale = 1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini new file mode 100644 index 0000000000..5d8798227d --- /dev/null +++ b/Data/User/GameConfig/SEMY4Q.ini @@ -0,0 +1,24 @@ +# SEMY4Q - Disney Epic Mickey +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini new file mode 100644 index 0000000000..eecaa23166 --- /dev/null +++ b/Data/User/GameConfig/SEMZ4Q.ini @@ -0,0 +1,24 @@ +# SEMZ4Q - Disney Epic Mickey +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Video_Enhancements] +ForceFiltering = False +[Video_Hacks] +DlistCachingEnable = False +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini new file mode 100644 index 0000000000..ef5f4edfb2 --- /dev/null +++ b/Data/User/GameConfig/SERE4Q.ini @@ -0,0 +1,20 @@ +# SERE4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini new file mode 100644 index 0000000000..b03abcf0e9 --- /dev/null +++ b/Data/User/GameConfig/SERF4Q.ini @@ -0,0 +1,20 @@ +# SERF4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini new file mode 100644 index 0000000000..e57bb14704 --- /dev/null +++ b/Data/User/GameConfig/SERP4Q.ini @@ -0,0 +1,20 @@ +# SERP4Q - Disney Epic Mickey 2: The Power of 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Enable progressive scan if the game has boot issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +EFBScale = 1 +SafeTextureCacheColorSamples = 0 +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SLSEXJ.ini b/Data/User/GameConfig/SLSEXJ.ini new file mode 100644 index 0000000000..3250f478c0 --- /dev/null +++ b/Data/User/GameConfig/SLSEXJ.ini @@ -0,0 +1,19 @@ +# SLSEXJ - THE LAST STORY +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +EFBCopyCacheEnable = True From 38e0d06e8c6d6e6638ace7950ac09e9c28c6708c Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 12:29:36 -0500 Subject: [PATCH 135/627] Whoops, was calling GetMD5() twice. --- Source/Core/Core/Src/Movie.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 8d2b7c4c01..e4f3fb3f29 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -166,7 +166,9 @@ void Init() if (IsRecordingInput()) { GetSettings(); + std::thread md5thread(GetMD5); } + g_frameSkipCounter = g_framesToSkip; memset(&g_padState, 0, sizeof(g_padState)); if (!tmpHeader.bFromSaveState || !IsPlayingInput()) @@ -417,6 +419,7 @@ bool BeginRecordingInput(int controllers) else Movie::g_bClearSave = true; } + std::thread md5thread(GetMD5); } g_playMode = MODE_RECORDING; GetSettings(); @@ -1155,7 +1158,6 @@ void GetSettings() if (!Core::g_CoreStartupParameter.bWii) g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; - std::thread md5thread(GetMD5); } void CheckMD5() @@ -1172,7 +1174,7 @@ void CheckMD5() unsigned char gameMD5[16]; char game[255]; - memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); + memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size()); md5_file(game, gameMD5); if (memcmp(gameMD5,MD5,16) == 0) @@ -1187,7 +1189,7 @@ void GetMD5() for (int i = 0; i < 16; i++) MD5[i] = 0; char game[255]; - memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); + memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(),SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size()); md5_file(game, MD5); Core::DisplayMessage("Finished calculating checksum.", 2000); } From fb1ecd90b092d26a09d5abd67e438bcfe99e2486 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 26 Nov 2012 23:34:18 +0100 Subject: [PATCH 136/627] Implemented command 13 in GC AX, used in some EA games (FIFA 06 now has broken sound, which is still better than no sound) --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 92 ++++++++++++++++++- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 4 +- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 8f372f3313..435e321010 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -84,10 +84,12 @@ void CUCode_AX::HandleCommandList() u32 pb_addr = 0; -// WARN_LOG(DSPHLE, "Command list:"); -// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) -// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); -// WARN_LOG(DSPHLE, "-------------"); +#if 0 + WARN_LOG(DSPHLE, "Command list:"); + for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) + WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); + WARN_LOG(DSPHLE, "-------------"); +#endif u32 curr_idx = 0; bool end = false; @@ -171,7 +173,40 @@ void CUCode_AX::HandleCommandList() case CMD_UNK_10: curr_idx += 4; break; case CMD_UNK_11: curr_idx += 2; break; case CMD_UNK_12: curr_idx += 1; break; - case CMD_UNK_13: curr_idx += 12; break; + + // Send the contents of MAIN LRS, AUXA LRS and AUXB S to RAM, and + // mix data to MAIN LR and AUXB LR. + case CMD_SEND_AUX_AND_MIX: + { + // Address for Main + AUXA LRS upload + u16 main_auxa_up_hi = m_cmdlist[curr_idx++]; + u16 main_auxa_up_lo = m_cmdlist[curr_idx++]; + + // Address for AUXB S upload + u16 auxb_s_up_hi = m_cmdlist[curr_idx++]; + u16 auxb_s_up_lo = m_cmdlist[curr_idx++]; + + // Address to read data for Main L + u16 main_l_dl_hi = m_cmdlist[curr_idx++]; + u16 main_l_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for Main R + u16 main_r_dl_hi = m_cmdlist[curr_idx++]; + u16 main_r_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for AUXB L + u16 auxb_l_dl_hi = m_cmdlist[curr_idx++]; + u16 auxb_l_dl_lo = m_cmdlist[curr_idx++]; + + // Address to read data for AUXB R + u16 auxb_r_dl_hi = m_cmdlist[curr_idx++]; + u16 auxb_r_dl_lo = m_cmdlist[curr_idx++]; + + SendAUXAndMix(HILO_TO_32(main_auxa_up), HILO_TO_32(auxb_s_up), + HILO_TO_32(main_l_dl), HILO_TO_32(main_r_dl), + HILO_TO_32(auxb_l_dl), HILO_TO_32(auxb_r_dl)); + break; + } default: ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); @@ -412,6 +447,53 @@ void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } +void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, + u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl) +{ + // Buffers to upload first + int* up_buffers[] = { + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround + }; + + // Upload Main LRS + AUXA LRS + int* ptr = (int*)HLEMemory_Get_Pointer(main_auxa_up); + for (u32 i = 0; i < sizeof (up_buffers) / sizeof (up_buffers[0]); ++i) + for (u32 j = 0; j < 32 * 5; ++j) + *ptr++ = Common::swap32(up_buffers[i][j]); + + // Upload AUXB S + ptr = (int*)HLEMemory_Get_Pointer(auxb_s_up); + for (u32 i = 0; i < 32 * 5; ++i) + *ptr++ = Common::swap32(m_samples_auxB_surround[i]); + + // Download buffers and addresses + int* dl_buffers[] = { + m_samples_left, + m_samples_right, + m_samples_auxB_left, + m_samples_auxB_right + }; + u32 dl_addrs[] = { + main_l_dl, + main_r_dl, + auxb_l_dl, + auxb_r_dl + }; + + // Download and mix + for (u32 i = 0; i < sizeof (dl_buffers) / sizeof (dl_buffers[0]); ++i) + { + int* dl_src = (int*)HLEMemory_Get_Pointer(dl_addrs[i]); + for (u32 j = 0; j < 32 * 5; ++j) + dl_buffers[i][j] += (int)Common::swap32(*dl_src++); + } +} + void CUCode_AX::HandleMail(u32 mail) { // Indicates if the next message is a command list address. diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index d5f07fc13a..a0c6374f95 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -135,6 +135,8 @@ protected: void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); void OutputSamples(u32 out_addr, u32 surround_addr); + void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, + u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl); private: enum CmdType @@ -158,7 +160,7 @@ private: CMD_UNK_10 = 0x10, CMD_UNK_11 = 0x11, CMD_UNK_12 = 0x12, - CMD_UNK_13 = 0x13, + CMD_SEND_AUX_AND_MIX = 0x13, }; }; From 706939e6328d894fcede80b5d9a44be6f7eb1de3 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 27 Nov 2012 00:03:02 +0100 Subject: [PATCH 137/627] Implement command 10, used by FIFA 06 and linked to AUXB mixing. Sound still broken in that game. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 34 ++++++++++++++++++- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 435e321010..0f97893455 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -170,7 +170,14 @@ void CUCode_AX::HandleCommandList() end = true; break; - case CMD_UNK_10: curr_idx += 4; break; + case CMD_MIX_AUXB_LR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXBLR(HILO_TO_32(addr), HILO_TO_32(addr2)); + break; + case CMD_UNK_11: curr_idx += 2; break; case CMD_UNK_12: curr_idx += 1; break; @@ -447,6 +454,31 @@ void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } +void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr) +{ + // Upload AUXB L/R + int* ptr = (int*)HLEMemory_Get_Pointer(ul_addr); + for (u32 i = 0; i < 5 * 32; ++i) + *ptr++ = Common::swap32(m_samples_auxB_left[i]); + for (u32 i = 0; i < 5 * 32; ++i) + *ptr++ = Common::swap32(m_samples_auxB_right[i]); + + // Mix AUXB L/R to MAIN L/R, and replace AUXB L/R + ptr = (int*)HLEMemory_Get_Pointer(dl_addr); + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = Common::swap32(*ptr++); + m_samples_auxB_left[i] = samp; + m_samples_left[i] += samp; + } + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = Common::swap32(*ptr++); + m_samples_auxB_right[i] = samp; + m_samples_right[i] += samp; + } +} + void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl) { diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index a0c6374f95..4ac23f7968 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -135,6 +135,7 @@ protected: void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); void OutputSamples(u32 out_addr, u32 surround_addr); + void MixAUXBLR(u32 ul_addr, u32 dl_addr); void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl); @@ -157,7 +158,7 @@ private: CMD_MORE = 0x0D, CMD_OUTPUT = 0x0E, CMD_END = 0x0F, - CMD_UNK_10 = 0x10, + CMD_MIX_AUXB_LR = 0x10, CMD_UNK_11 = 0x11, CMD_UNK_12 = 0x12, CMD_SEND_AUX_AND_MIX = 0x13, From 9b1a66245e316e8adce6e553d361f61f601f3e38 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 27 Nov 2012 00:03:40 +0100 Subject: [PATCH 138/627] Fix an AUX mixing issue introduced when implementing AXWii. Now FIFA 06 sounds great with AX HLE. --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 0f97893455..4352eea2ec 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -392,7 +392,7 @@ void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) // First, we need to send the contents of our AUX buffers to the CPU. if (write_addr) { - for (u32 i = 0; i < 3 * 32; ++i) + for (u32 i = 0; i < 5 * 32; ++i) for (u32 j = 0; j < 3; ++j) temp[j][i] = Common::swap32(buffers[j][i]); memcpy(HLEMemory_Get_Pointer(write_addr), temp, sizeof (temp)); From c0bb7aa8f334fab032ece0f14ef6340896de922d Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 18:17:07 -0500 Subject: [PATCH 139/627] Turns out you have to actually commit a change before merging if you want it to be included. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index 4eb4a3e554..d9f92801a4 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -21,8 +21,7 @@ #include #include "../HW/Memmap.h" -class PointerWrap; - +#include "Chunkfile.h" #define FS_SUCCESS (u32)0 // Success #define FS_EACCES (u32)-1 // Permission denied From aaeeef48da3e6b667d5eaf9dff43a216371684de Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 23:36:47 -0500 Subject: [PATCH 140/627] Compile fix for linux. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index d9f92801a4..d2e19558de 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -21,7 +21,7 @@ #include #include "../HW/Memmap.h" -#include "Chunkfile.h" +#include "../../Common/Src/ChunkFile.h" #define FS_SUCCESS (u32)0 // Success #define FS_EACCES (u32)-1 // Permission denied From 2120f536d55c37eae017d06c3e888ebcd5bdc018 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 27 Nov 2012 20:36:14 +0100 Subject: [PATCH 141/627] Implement command 07 in GC AX (download data to main LR and reset main surround) --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 19 ++++++++++++++++++- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 4352eea2ec..91a7b03625 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -136,7 +136,12 @@ void CUCode_AX::HandleCommandList() UploadLRS(HILO_TO_32(addr)); break; - case CMD_SBUFFER_ADDR: curr_idx += 2; break; + case CMD_SET_LR: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetMainLR(HILO_TO_32(addr)); + break; + case CMD_UNK_08: curr_idx += 10; break; // TODO: check case CMD_MIX_AUXB_NOWRITE: @@ -419,6 +424,18 @@ void CUCode_AX::UploadLRS(u32 dst_addr) memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); } +void CUCode_AX::SetMainLR(u32 src_addr) +{ + int* ptr = (int*)HLEMemory_Get_Pointer(src_addr); + for (u32 i = 0; i < 5 * 32; ++i) + { + int samp = (int)Common::swap32(*ptr++); + m_samples_left[i] = samp; + m_samples_right[i] = samp; + m_samples_surround[i] = 0; + } +} + void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) { int surround_buffer[5 * 32]; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 4ac23f7968..32083f675a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -134,6 +134,7 @@ protected: void ProcessPBList(u32 pb_addr); void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); + void SetMainLR(u32 src_addr); void OutputSamples(u32 out_addr, u32 surround_addr); void MixAUXBLR(u32 ul_addr, u32 dl_addr); void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, @@ -149,7 +150,7 @@ private: CMD_MIX_AUXA = 0x04, CMD_MIX_AUXB = 0x05, CMD_UPLOAD_LRS = 0x06, - CMD_SBUFFER_ADDR = 0x07, + CMD_SET_LR = 0x07, CMD_UNK_08 = 0x08, CMD_MIX_AUXB_NOWRITE = 0x09, CMD_COMPRESSOR_TABLE_ADDR = 0x0A, From 9270b628309b7994c67daeac7d3b07db83a99787 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 27 Nov 2012 20:36:34 +0100 Subject: [PATCH 142/627] Rewrite MixAUXSamples to make it more clean --- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 91a7b03625..e62e40735b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -376,7 +376,6 @@ void CUCode_AX::ProcessPBList(u32 pb_addr) void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) { - int temp[3][5 * 32]; int* buffers[3] = { 0 }; switch (aux_id) @@ -397,18 +396,18 @@ void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) // First, we need to send the contents of our AUX buffers to the CPU. if (write_addr) { - for (u32 i = 0; i < 5 * 32; ++i) - for (u32 j = 0; j < 3; ++j) - temp[j][i] = Common::swap32(buffers[j][i]); - memcpy(HLEMemory_Get_Pointer(write_addr), temp, sizeof (temp)); + int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 5 * 32; ++j) + *ptr++ = Common::swap32(buffers[i][j]); } // Then, we read the new temp from the CPU and add to our current // temp. - memcpy(temp, HLEMemory_Get_Pointer(read_addr), sizeof (temp)); - for (u32 i = 0; i < 5 * 32; ++i) - for (u32 j = 0; j < 3; ++j) - buffers[j][i] += Common::swap32(temp[j][i]); + int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 5 * 32; ++j) + buffers[i][j] += (int)Common::swap32(*ptr++); } void CUCode_AX::UploadLRS(u32 dst_addr) From 1a129abe0da5bd1ff51e2acf4aa14e5a5fe99b25 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 27 Nov 2012 21:48:59 +0100 Subject: [PATCH 143/627] AUX return data should be mixed to main buffers, not AUX buffers. Fixes a regression introduced by r954c55e35afb, now EA games sound works again. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 9 ++++--- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 26 +++++++++++-------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index e62e40735b..089e0c7933 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -405,9 +405,12 @@ void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr) // Then, we read the new temp from the CPU and add to our current // temp. int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); - for (u32 i = 0; i < 3; ++i) - for (u32 j = 0; j < 5 * 32; ++j) - buffers[i][j] += (int)Common::swap32(*ptr++); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_left[i] += (int)Common::swap32(*ptr++); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_right[i] += (int)Common::swap32(*ptr++); + for (u32 i = 0; i < 5 * 32; ++i) + m_samples_surround[i] += (int)Common::swap32(*ptr++); } void CUCode_AX::UploadLRS(u32 dst_addr) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 3eadc5a840..42b2d510da 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -252,8 +252,12 @@ void CUCode_AXWii::ProcessPBList(u32 pb_addr) void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume) { - int temp[3][3 * 32]; int* buffers[3] = { 0 }; + int* main_buffers[3] = { + m_samples_left, + m_samples_right, + m_samples_surround + }; switch (aux_id) { @@ -279,19 +283,19 @@ void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 // Send the content of AUX buffers to the CPU if (write_addr) { - for (u32 i = 0; i < 3 * 32; ++i) - for (u32 j = 0; j < 3; ++j) - temp[j][i] = Common::swap32(buffers[j][i]); - memcpy(HLEMemory_Get_Pointer(write_addr), temp, sizeof (temp)); + int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) + *ptr++ = Common::swap32(buffers[i][j]); } - // Then read the buffers from the CPU and add to our current buffers. - memcpy(temp, HLEMemory_Get_Pointer(read_addr), sizeof (temp)); - for (u32 i = 0; i < 3 * 32; ++i) - for (u32 j = 0; j < 3; ++j) + // Then read the buffers from the CPU and add to our main buffers. + int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) { - s64 new_val = buffers[j][i] + Common::swap32(temp[j][i]); - buffers[j][i] = (new_val * volume) >> 15; + s64 new_val = main_buffers[i][j] + Common::swap32(*ptr++); + main_buffers[i][j] = (new_val * volume) >> 15; } } From f11a40f85806e2fa69ef2bb8d7513d580fedff69 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 28 Nov 2012 01:48:27 +0100 Subject: [PATCH 144/627] Command 13 should upload only AUXA LRS, not MAIN LRS + AUXA LRS. Fixes more GC EA games sound/music (including FIFA 06, Madden 08). --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 089e0c7933..4bda7e2638 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -503,15 +503,12 @@ void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, { // Buffers to upload first int* up_buffers[] = { - m_samples_left, - m_samples_right, - m_samples_surround, m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround }; - // Upload Main LRS + AUXA LRS + // Upload AUXA LRS int* ptr = (int*)HLEMemory_Get_Pointer(main_auxa_up); for (u32 i = 0; i < sizeof (up_buffers) / sizeof (up_buffers[0]); ++i) for (u32 j = 0; j < 32 * 5; ++j) From 4cf285628460e7eef1d19b2ad32f05516a324e87 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 28 Nov 2012 03:31:46 +0100 Subject: [PATCH 145/627] Improve savestates support in AX and AXWii --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 19 +++++++++++++++++-- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 +++ .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 17 +++++++++++++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 4bda7e2638..eb2a71969b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -628,11 +628,26 @@ void CUCode_AX::Update(int cycles) } } +void CUCode_AX::DoAXState(PointerWrap& p) +{ + p.Do(m_cmdlist); + p.Do(m_cmdlist_size); + + p.Do(m_samples_left); + p.Do(m_samples_right); + p.Do(m_samples_surround); + p.Do(m_samples_auxA_left); + p.Do(m_samples_auxA_right); + p.Do(m_samples_auxA_surround); + p.Do(m_samples_auxB_left); + p.Do(m_samples_auxB_right); + p.Do(m_samples_auxB_surround); +} + void CUCode_AX::DoState(PointerWrap& p) { std::lock_guard lk(m_processing); - // TODO - DoStateShared(p); + DoAXState(p); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 32083f675a..7155a245bb 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -140,6 +140,9 @@ protected: void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl, u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl); + // Handle save states for main AX. + void DoAXState(PointerWrap& p); + private: enum CmdType { diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 42b2d510da..8c74c7a1e7 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -364,7 +364,20 @@ void CUCode_AXWii::DoState(PointerWrap &p) { std::lock_guard lk(m_processing); - // TODO - DoStateShared(p); + DoAXState(p); + + p.Do(m_samples_auxC_left); + p.Do(m_samples_auxC_right); + p.Do(m_samples_auxC_surround); + + p.Do(m_samples_wm0); + p.Do(m_samples_wm1); + p.Do(m_samples_wm2); + p.Do(m_samples_wm3); + + p.Do(m_samples_aux0); + p.Do(m_samples_aux1); + p.Do(m_samples_aux2); + p.Do(m_samples_aux3); } From 04b1ee0016f7ea492886aa9a3c93f096d3e6eec5 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 28 Nov 2012 15:21:54 +0100 Subject: [PATCH 146/627] Implemented command 01 (download data and mix to MAIN/AUXA/AUXB with volume control). Fixes missing weapon sounds in Metroid Prime 2. --- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 35 ++++++++++++++++++- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 +- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index eb2a71969b..176050affa 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -108,7 +108,16 @@ void CUCode_AX::HandleCommandList() SetupProcessing(HILO_TO_32(addr)); break; - case CMD_UNK_01: curr_idx += 5; break; + case CMD_DL_AND_VOL_MIX: + { + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + u16 vol_main = m_cmdlist[curr_idx++]; + u16 vol_auxa = m_cmdlist[curr_idx++]; + u16 vol_auxb = m_cmdlist[curr_idx++]; + DownloadAndMixWithVolume(HILO_TO_32(addr), vol_main, vol_auxa, vol_auxb); + break; + } case CMD_PB_ADDR: addr_hi = m_cmdlist[curr_idx++]; @@ -333,6 +342,30 @@ void CUCode_AX::SetupProcessing(u32 init_addr) } } +void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb) +{ + int* buffers_main[3] = { m_samples_left, m_samples_right, m_samples_surround }; + int* buffers_auxa[3] = { m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround }; + int* buffers_auxb[3] = { m_samples_auxB_left, m_samples_auxB_right, m_samples_auxB_surround }; + int** buffers[3] = { buffers_main, buffers_auxa, buffers_auxb }; + u16 volumes[3] = { vol_main, vol_auxa, vol_auxb }; + + for (u32 i = 0; i < 3; ++i) + { + int* ptr = (int*)HLEMemory_Get_Pointer(addr); + s16 volume = (s16)volumes[i]; + for (u32 j = 0; j < 3; ++j) + { + int* buffer = buffers[i][j]; + for (u32 k = 0; k < 5 * 32; ++k) + { + s64 sample = 2 * (s32)Common::swap32(*ptr++) * volume; + buffer[k] += (s32)(sample >> 16); + } + } + } +} + void CUCode_AX::ProcessPBList(u32 pb_addr) { // Samples per millisecond. In theory DSP sampling rate can be changed from diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 7155a245bb..7158c197e8 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -131,6 +131,7 @@ protected: virtual void HandleCommandList(); void SetupProcessing(u32 init_addr); + void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb); void ProcessPBList(u32 pb_addr); void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); @@ -147,7 +148,7 @@ private: enum CmdType { CMD_SETUP = 0x00, - CMD_UNK_01 = 0x01, + CMD_DL_AND_VOL_MIX = 0x01, CMD_PB_ADDR = 0x02, CMD_PROCESS = 0x03, CMD_MIX_AUXA = 0x04, From 3ca77cf077eed275d15d4f4c55e3cffb2d6f4478 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 1 Dec 2012 00:54:25 +0100 Subject: [PATCH 147/627] Fix samples clamping and interlacing in the OUTPUT command. Shouldn't have assumed previous AX HLE was doing something right. --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 176050affa..6464e47c72 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -482,7 +482,7 @@ void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) // 32 samples per ms, 5 ms, 2 channels short buffer[5 * 32 * 2]; - // Clamp internal buffers to 16 bits. + // Output samples clamped to 16 bits and interlaced RLRLRLRLRL... for (u32 i = 0; i < 5 * 32; ++i) { int left = m_samples_left[i]; @@ -493,14 +493,8 @@ void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) if (right < -32767) right = -32767; if (right > 32767) right = 32767; - m_samples_left[i] = left; - m_samples_right[i] = right; - } - - for (u32 i = 0; i < 5 * 32; ++i) - { - buffer[2 * i] = Common::swap16(m_samples_left[i]); - buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + buffer[2 * i] = Common::swap16(right); + buffer[2 * i + 1] = Common::swap16(left); } memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); From bed260aa147cdf82b6914ec476cc36821a046b0f Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 1 Dec 2012 14:23:24 +0100 Subject: [PATCH 148/627] VertexShaderManager: Fix redundant shader constant updates. Thanks to konpie for spotting this. Might give a fairly perceivable speedup in the D3D11 backend. --- Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 6ad877318f..8d24402b49 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -207,6 +207,7 @@ void VertexShaderManager::SetConstants() int endn = (nPostTransformMatricesChanged[1] + 3 ) / 4; const float* pstart = (const float*)&xfmem[XFMEM_POSTMATRICES + startn * 4]; SetMultiVSConstant4fv(C_POSTTRANSFORMMATRICES + startn, endn - startn, pstart); + nPostTransformMatricesChanged[0] = nPostTransformMatricesChanged[1] = -1; } if (nLightsChanged[0] >= 0) From 47aaca89eb0d36d307a9ac1f76293b9e5c9de257 Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 2 Dec 2012 02:08:27 -0500 Subject: [PATCH 149/627] Fix error message about state undo backup always appearing when no movie is active. --- Source/Core/Core/Src/State.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 35299688ad..e93b133413 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -199,8 +199,10 @@ void CompressAndDumpState(CompressAndDumpState_args save_args) if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) File::Delete((File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")); - if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav") || !File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm")) + if (!File::Rename(filename, File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav")) Core::DisplayMessage("Failed to move previous state to state undo backup", 1000); + else + File::Rename(filename + ".dtm", File::GetUserPath(D_STATESAVES_IDX) + "lastState.sav.dtm"); } if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState()) Movie::SaveRecording((filename + ".dtm").c_str()); From 983d5d1f733e6961daec258a9fab8595efd87019 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Mon, 3 Dec 2012 20:58:25 -0500 Subject: [PATCH 150/627] Making cheats manager resizeable, maximizable, hideable (parentless), higher by default. --- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index eb25117533..dec6648461 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -36,7 +36,7 @@ extern CFrame* main_frame; static wxCheatsWindow *g_cheat_window; wxCheatsWindow::wxCheatsWindow(wxWindow* const parent) - : wxDialog(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize) + : wxDialog(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxDIALOG_NO_PARENT) { ::g_cheat_window = this; @@ -57,6 +57,7 @@ wxCheatsWindow::wxCheatsWindow(wxWindow* const parent) } } + SetSize(wxSize(-1, 600)); Center(); Show(); } From 470a4eee8b9c75d231c2f6840b0b8559325b1375 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Mon, 3 Dec 2012 21:14:25 -0500 Subject: [PATCH 151/627] Fixing wiimote savestate and recording. --- .../Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 100 +++++------------- Source/Core/Core/Src/State.cpp | 2 +- 3 files changed, 28 insertions(+), 76 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index e5ed088b66..91882b2cb7 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -613,7 +613,7 @@ void Wiimote::DoState(PointerWrap& p) p.Do(m_status); p.Do(m_adpcm_state); p.Do(m_ext_key); - p.Do(m_eeprom); + p.DoArray(m_eeprom, sizeof(m_eeprom)); p.Do(m_reg_motion_plus); p.Do(m_reg_ir); p.Do(m_reg_ext); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 0b6de9b4f6..a6ea9fb577 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -104,14 +104,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::~CWII_IPC_HLE_Device_usb_oh1_57e_305() void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) { -/* - //things that do not get saved: (why not?) - - std::vector m_WiiMotes; - - std::deque m_EventQueue; - */ - + p.Do(m_Active); p.Do(m_ControllerBD); p.Do(m_CtrlSetup); p.Do(m_ACLSetup); @@ -120,75 +113,34 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) p.Do(m_last_ticks); p.DoArray(m_PacketCount,4); p.Do(m_ScanEnable); + p.Do(m_EventQueue); m_acl_pool.DoState(p); - bool storeFullData = (Movie::IsRecordingInput() || Movie::IsPlayingInput()); - p.Do(storeFullData); - p.DoMarker("storeFullData in CWII_IPC_HLE_Device_usb_oh1_57e_305"); - - if (!storeFullData) - { - if (p.GetMode() == PointerWrap::MODE_READ) - { - m_EventQueue.clear(); - - if (SConfig::GetInstance().m_WiimoteReconnectOnLoad) - { - // Reset the connection of all connected wiimotes - for (unsigned int i = 0; i < 4; i++) - { - if (!m_WiiMotes[i].IsInactive()) - { - m_WiiMotes[i].Activate(false); - m_WiiMotes[i].Activate(true); - } - else - { - m_WiiMotes[i].Activate(false); - } - } - } - } + for (unsigned int i = 0; i < 4; i++) + { + if (p.GetMode() == PointerWrap::MODE_READ && !(WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])) + continue; + m_WiiMotes[i].DoState(p); + } + + // Reset the connection of real and hybrid wiimotes + if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) + { + for (unsigned int i = 0; i < 4; i++) + { + if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i]) + continue; + // TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad. + m_EventQueue.clear(); + if (!m_WiiMotes[i].IsInactive()) + { + m_WiiMotes[i].Activate(false); + m_WiiMotes[i].Activate(true); + } + else + m_WiiMotes[i].Activate(false); + } } - else - { - // I'm not sure why these things aren't normally saved, but I think they can affect the emulation state, - // so if sync matters (e.g. if a movie is active), we really should save them. - // also, it's definitely not safe to do the above auto-reconnect hack either. - // (unless we can do it without changing anything that affects emulation state, which is not currently the case) - - p.Do(m_EventQueue); - p.DoMarker("m_EventQueue"); - - // m_WiiMotes is kind of annoying to save. maybe this could be done in a more general way. - u32 vec_size = (u32)m_WiiMotes.size(); - p.Do(vec_size); - for (u32 i = 0; i < vec_size; ++i) - { - if (i < m_WiiMotes.size()) - { - CWII_IPC_HLE_WiiMote& wiimote = m_WiiMotes[i]; - wiimote.DoState(p); - } - else - { - bdaddr_t tmpBD = BDADDR_ANY; - CWII_IPC_HLE_WiiMote wiimote = CWII_IPC_HLE_WiiMote(this, i, tmpBD, false); - wiimote.DoState(p); - if (p.GetMode() == PointerWrap::MODE_READ) - { - m_WiiMotes.push_back(wiimote); - _dbg_assert_(WII_IPC_WIIMOTE, m_WiiMotes.size() == i); - } - } - } - if (p.GetMode() == PointerWrap::MODE_READ) - while ((u32)m_WiiMotes.size() > vec_size) - m_WiiMotes.pop_back(); - p.DoMarker("m_WiiMotes"); - } - - DoStateShared(p); } bool CWII_IPC_HLE_Device_usb_oh1_57e_305::RemoteDisconnect(u16 _connectionHandle) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index e93b133413..d9ad3c6b5c 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 9; +static const int STATE_VERSION = 10; struct StateHeader { From 423024110e980ca52999c224d897be538ccfd6b1 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 4 Dec 2012 11:44:28 -0600 Subject: [PATCH 152/627] Includes are case sensitive and Common is in the include directories so including the file this way was silly. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index d2e19558de..d2907d7ee9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -21,7 +21,7 @@ #include #include "../HW/Memmap.h" -#include "../../Common/Src/ChunkFile.h" +#include "ChunkFile.h" #define FS_SUCCESS (u32)0 // Success #define FS_EACCES (u32)-1 // Permission denied From bbf7c3a4d02049680f3d2d5a476b5a49d6ad029f Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 5 Dec 2012 17:11:19 -0500 Subject: [PATCH 153/627] Fix a save state crash in some situation. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index a6ea9fb577..47a6712b68 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -117,11 +117,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) m_acl_pool.DoState(p); for (unsigned int i = 0; i < 4; i++) - { - if (p.GetMode() == PointerWrap::MODE_READ && !(WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])) - continue; m_WiiMotes[i].DoState(p); - } // Reset the connection of real and hybrid wiimotes if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) From aeb57823953cb308f6f3b05dcdae04c1f2304c7e Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 6 Dec 2012 21:16:27 +1100 Subject: [PATCH 154/627] Merge conflict. Fixes issue 5471. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index dfe63ee1ef..15214317d2 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -371,6 +371,8 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) p.Do(have_file_handle); p.Do(m_Mode); p.Do(seek); + p.Do(m_SeekPos); + p.Do(m_Filename); if (p.GetMode() == PointerWrap::MODE_READ) { From 30718230b2e673f318ca892d1a70ab70532528bd Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 6 Dec 2012 20:25:07 -0500 Subject: [PATCH 155/627] Fix some warnings. --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 5cdb4d3035..fb4a07e31e 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1094,7 +1094,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (SConfig::GetInstance().m_ShowLag) { char lag[10]; - StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); + StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount); D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 9dadf6ff5e..240f3470ef 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1091,7 +1091,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (SConfig::GetInstance().m_ShowLag) { char lag[10]; - StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount); + StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount); D3D::font.DrawTextScaled(0, 18, 20, 20, 0.0f, 0xFF00FFFF, lag); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8b63184caf..77bb91d48b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -531,7 +531,7 @@ void Renderer::DrawDebugInfo() p+=sprintf(p, "FPS: %d\n", s_fps); if (SConfig::GetInstance().m_ShowLag) - p+=sprintf(p, "Lag: %d\n", Movie::g_currentLagCount); + p+=sprintf(p, "Lag: %llu\n", Movie::g_currentLagCount); if (g_ActiveConfig.bShowInputDisplay) p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str()); From 4fc0125fb3b0c43cd169a5622cd6e576c6225606 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 7 Dec 2012 19:49:08 +0100 Subject: [PATCH 156/627] Fix OS X 10.6 compatibility. Patch by mathieudel. --- Externals/wxWidgets3/wx/wxcocoa.h | 10 +++++----- Source/Core/DolphinWX/CMakeLists.txt | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Externals/wxWidgets3/wx/wxcocoa.h b/Externals/wxWidgets3/wx/wxcocoa.h index 406621565c..841d17e949 100644 --- a/Externals/wxWidgets3/wx/wxcocoa.h +++ b/Externals/wxWidgets3/wx/wxcocoa.h @@ -996,25 +996,25 @@ #define HAVE_USLEEP 1 /* Define if you have wcscasecmp() function */ -#define HAVE_WCSCASECMP 1 +/* #undef HAVE_WCSCASECMP 1 */ /* Define if you have wcsncasecmp() function */ -#define HAVE_WCSNCASECMP 1 +/* #undef HAVE_WCSNCASECMP 1 */ /* Define if you have wcslen function */ #define HAVE_WCSLEN 1 /* Define if you have wcsdup function */ -#define HAVE_WCSDUP 1 +/* #undef HAVE_WCSDUP 1 */ /* Define if you have wcsftime() function */ #define HAVE_WCSFTIME 1 /* Define if you have strnlen() function */ -#define HAVE_STRNLEN 1 +/* #undef HAVE_STRNLEN 1 */ /* Define if you have wcsnlen() function */ -#define HAVE_WCSNLEN 1 +/* #undef HAVE_WCSNLEN 1 */ /* Define if you have wcstoull() and wcstoll() */ /* #undef HAVE_WCSTOULL */ diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 77ac9eb439..d03cf7c6b1 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -153,6 +153,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake " include(BundleUtilities) message(\"Fixing up application bundle: ${BUNDLE_PATH}\") + set(BU_CHMOD_BUNDLE_ITEMS ON) fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") ") add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD From 43d673b576c68407e4acd68a0a13ca8306bd0aad Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 8 Dec 2012 23:22:29 -0500 Subject: [PATCH 157/627] Save game list sorting. Fixes issue 5771. --- Source/Core/Core/Src/ConfigManager.cpp | 12 +++++++----- Source/Core/Core/Src/ConfigManager.h | 1 + Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 27c809717f..bb0b13b717 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -211,6 +211,7 @@ void SConfig::SaveSettings() ini.Set("GameList", "ListKorea", m_ListKorea); ini.Set("GameList", "ListTaiwan", m_ListTaiwan); ini.Set("GameList", "ListUnknown", m_ListUnknown); + ini.Set("GameList", "ListSort", m_ListSort); // Core ini.Set("Core", "HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2); @@ -344,11 +345,12 @@ void SConfig::LoadSettings() ini.Get("GameList", "ListPal", &m_ListPal, true); ini.Get("GameList", "ListUsa", &m_ListUsa, true); - ini.Get("GameList", "ListFrance", &m_ListFrance, true); - ini.Get("GameList", "ListItaly", &m_ListItaly, true); - ini.Get("GameList", "ListKorea", &m_ListKorea, true); - ini.Get("GameList", "ListTaiwan", &m_ListTaiwan, true); - ini.Get("GameList", "ListUnknown", &m_ListUnknown, true); + ini.Get("GameList", "ListFrance", &m_ListFrance, true); + ini.Get("GameList", "ListItaly", &m_ListItaly, true); + ini.Get("GameList", "ListKorea", &m_ListKorea, true); + ini.Get("GameList", "ListTaiwan", &m_ListTaiwan, true); + ini.Get("GameList", "ListUnknown", &m_ListUnknown, true); + ini.Get("GameList", "ListSort", &m_ListSort, 2); // Core ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 010dc40d2c..408461476b 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -62,6 +62,7 @@ struct SConfig : NonCopyable bool m_InterfaceLogWindow; bool m_InterfaceLogConfigWindow; bool m_InterfaceConsole; + int m_ListSort; bool m_ListDrives; bool m_ListWad; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index e95558fc65..5a24f6726e 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -320,7 +320,7 @@ void CGameListCtrl::Update() // Sort items by Title wxListEvent event; - event.m_col = COLUMN_TITLE; last_column = 0; + event.m_col = SConfig::GetInstance().m_ListSort; last_column = 0; OnColumnClick(event); SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); @@ -708,6 +708,7 @@ void CGameListCtrl::OnColumnClick(wxListEvent& event) last_sort = current_column; } + SConfig::GetInstance().m_ListSort = last_sort; caller = this; SortItems(wxListCompare, last_sort); } From e85438cba05c88d088a26572e88e3996b38d88ed Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 10 Dec 2012 00:40:28 -0600 Subject: [PATCH 158/627] Clean up gcc/g++ compiler warnings that have accumulated. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 3 +-- Source/Core/Common/Src/CPUDetect.cpp | 2 -- Source/Core/Common/Src/x64Analyzer.cpp | 6 ------ Source/Core/Common/Src/x64Emitter.cpp | 2 -- Source/Core/Core/Src/ActionReplay.cpp | 2 -- Source/Core/Core/Src/CoreTiming.cpp | 4 ++-- Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp | 4 ++-- Source/Core/Core/Src/GeckoCode.cpp | 2 +- Source/Core/Core/Src/GeckoCodeConfig.cpp | 3 --- Source/Core/Core/Src/HW/AudioInterface.cpp | 6 ------ Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 4 ++-- .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 8 ++++---- Source/Core/Core/Src/HW/GCMemcard.cpp | 14 ++++++-------- Source/Core/Core/Src/HW/Memmap.cpp | 2 ++ Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp | 4 ---- .../Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 2 +- .../Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 -- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 8 ++++---- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 3 ++- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 2 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 8 ++++---- Source/Core/Core/Src/Movie.cpp | 6 +++--- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 8 ++++---- Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 4 ++-- Source/Core/Core/Src/State.cpp | 2 +- Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp | 4 ++-- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 1 - Source/Core/DolphinWX/Src/FrameTools.cpp | 3 +-- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 +- Source/Core/DolphinWX/Src/ISOFile.cpp | 2 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 3 +-- Source/Core/DolphinWX/Src/Main.cpp | 6 +++--- Source/Core/DolphinWX/Src/X11Utils.cpp | 2 +- .../Src/ControllerInterface/Xlib/Xlib.cpp | 4 +++- Source/Core/VideoCommon/Src/DLCache.cpp | 8 ++++---- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 5 +++-- Source/Core/VideoCommon/Src/PixelShaderManager.cpp | 1 + Source/Core/VideoCommon/Src/VertexLoader.cpp | 10 +++++----- .../Core/VideoCommon/Src/VertexLoaderManager.cpp | 9 +++++---- .../Core/VideoCommon/Src/VertexShaderManager.cpp | 1 + .../Plugin_VideoSoftware/Src/SWVertexLoader.cpp | 14 +++++++------- 42 files changed, 82 insertions(+), 106 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 99220f0ed2..2abd357782 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -123,7 +123,6 @@ void OpenALStream::SoundLoop() { Common::SetCurrentThreadName("Audio thread - openal"); - ALenum err; u32 ulFrequency = m_mixer->GetSampleRate(); memset(uiBuffers, 0, OAL_NUM_BUFFERS * sizeof(ALuint)); @@ -144,8 +143,8 @@ void OpenALStream::SoundLoop() // Set the default sound volume as saved in the config file. alSourcef(uiSource, AL_GAIN, fVolume); - err = alGetError(); // TODO: Error handling + //ALenum err = alGetError(); ALint iBuffersFilled = 0; ALint iBuffersProcessed = 0; diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 93e9d25087..65cd6dbd0b 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -173,9 +173,7 @@ void CPUInfo::Detect() if (max_ex_fn >= 0x80000001) { // Check for more features. __cpuid(cpu_id, 0x80000001); - bool cmp_legacy = false; if (cpu_id[2] & 1) bLAHFSAHF64 = true; - if (cpu_id[2] & 2) cmp_legacy = true; //wtf is this? if ((cpu_id[3] >> 29) & 1) bLongMode = true; } diff --git a/Source/Core/Common/Src/x64Analyzer.cpp b/Source/Core/Common/Src/x64Analyzer.cpp index 2ea3e9a512..66a2fe217f 100644 --- a/Source/Core/Common/Src/x64Analyzer.cpp +++ b/Source/Core/Common/Src/x64Analyzer.cpp @@ -31,12 +31,9 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc info.hasImmediate = false; info.isMemoryWrite = false; - int addressSize = 8; u8 modRMbyte = 0; u8 sibByte = 0; bool hasModRM = false; - bool hasSIBbyte = false; - bool hasDisplacement = false; int displacementSize = 0; @@ -47,7 +44,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc } else if (*codePtr == 0x67) { - addressSize = 4; codePtr++; } @@ -113,7 +109,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc info.otherReg = (sibByte & 7); if (rex & 2) info.scaledReg += 8; if (rex & 1) info.otherReg += 8; - hasSIBbyte = true; } else { @@ -122,7 +117,6 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo &info, int acc } if (mrm.mod == 1 || mrm.mod == 2) { - hasDisplacement = true; if (mrm.mod == 1) displacementSize = 1; else diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index d4bd1adabf..19e96478d1 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -870,7 +870,6 @@ void XEmitter::BTC(int bits, OpArg dest, OpArg index) {WriteBitTest(bits, dest, //shift can be either imm8 or cl void XEmitter::SHRD(int bits, OpArg dest, OpArg src, OpArg shift) { - bool writeImm = false; if (dest.IsImm()) { _assert_msg_(DYNA_REC, 0, "SHRD - can't use imms as destination"); @@ -901,7 +900,6 @@ void XEmitter::SHRD(int bits, OpArg dest, OpArg src, OpArg shift) void XEmitter::SHLD(int bits, OpArg dest, OpArg src, OpArg shift) { - bool writeImm = false; if (dest.IsImm()) { _assert_msg_(DYNA_REC, 0, "SHLD - can't use imms as destination"); diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 1ef6ca81bc..77f5778061 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -285,7 +285,6 @@ bool RunCode(const ARCode &arcode) // used for conditional codes int skip_count = 0; - u32 addr_last = 0; u32 val_last = 0; current_code = &arcode; @@ -394,7 +393,6 @@ bool RunCode(const ARCode &arcode) { LogInfo("ZCode: Memory Copy"); doMemoryCopy = true; - addr_last = addr; val_last = data; } else diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp index bccadf30cc..525f7165f2 100644 --- a/Source/Core/Core/Src/CoreTiming.cpp +++ b/Source/Core/Core/Src/CoreTiming.cpp @@ -119,7 +119,7 @@ int RegisterEvent(const char *name, TimedCallback callback) // check for existing type with same name. // we want event type names to remain unique so that we can use them for serialization. - for (int i = 0; i < event_types.size(); ++i) + for (unsigned int i = 0; i < event_types.size(); ++i) { if (!strcmp(name, event_types[i].name)) { @@ -188,7 +188,7 @@ void EventDoState(PointerWrap &p, BaseEvent* ev) if (p.GetMode() == PointerWrap::MODE_READ) { bool foundMatch = false; - for (int i = 0; i < event_types.size(); ++i) + for (unsigned int i = 0; i < event_types.size(); ++i) { if (!strcmp(name.c_str(), event_types[i].name)) { diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp index 6bcbeca35e..ee5908889a 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp @@ -220,8 +220,8 @@ void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit) for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) { if (cache.regs[i].loc.GetSimpleReg() != regs[i].loc.GetSimpleReg() && - xregs[cache.regs[i].loc.GetSimpleReg()].guest_reg == - DSP_REG_NONE) { + xregs[cache.regs[i].loc.GetSimpleReg()].guest_reg == DSP_REG_NONE) + { movToHostReg(i, cache.regs[i].loc.GetSimpleReg(), true); diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 35b2f53392..2d5f694ded 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -171,7 +171,7 @@ bool InstallCodeHandler() Memory::Write_U8(1, 0x80001807); // Invalidate the icache - for (int i = 0; i < data.length(); i += 32) + for (unsigned int i = 0; i < data.length(); i += 32) { PowerPC::ppcState.iCache.Invalidate(0x80001800 + i); } diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp index a23d531f7e..10c2068e3e 100644 --- a/Source/Core/Core/Src/GeckoCodeConfig.cpp +++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp @@ -42,8 +42,6 @@ void LoadCodes(const IniFile& inifile, std::vector& gcodes) std::istringstream ss(*lines_iter); - int read_state = 0; - switch ((*lines_iter)[0]) { @@ -61,7 +59,6 @@ void LoadCodes(const IniFile& inifile, std::vector& gcodes) gcode.name = StripSpaces(gcode.name); // read the code creator name std::getline(ss, gcode.creator, ']'); - read_state = 0; break; // notes diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp index f4141818ae..0a33e7c773 100644 --- a/Source/Core/Core/Src/HW/AudioInterface.cpp +++ b/Source/Core/Core/Src/HW/AudioInterface.cpp @@ -354,9 +354,6 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples static s16 l1 = 0; static s16 l2 = 0; - static s16 r1 = 0; - static s16 r2 = 0; - if ( frac >= 0x10000 || frac == 0) { @@ -364,9 +361,6 @@ unsigned int Callback_GetStreaming(short* _pDestBuffer, unsigned int _numSamples l1 = l2; //current l2 = pcm[pos * 2]; //next - - r1 = r2; //current - r2 = pcm[pos * 2 + 1]; //next } pcm_l = ((l1 << 16) + (l2 - l1) * (u16)frac) >> 16; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 74c9d24db4..9524882a45 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -281,7 +281,7 @@ bool CUCode_AX::AXTask(u32& _uMail) u32 Addr__AXOutSBuffer_1; u32 Addr__AXOutSBuffer_2; u32 Addr__A; - u32 Addr__12; + //u32 Addr__12; u32 Addr__4_1; u32 Addr__4_2; //u32 Addr__4_3; @@ -429,7 +429,7 @@ bool CUCode_AX::AXTask(u32& _uMail) break; case 0x0012: - Addr__12 = HLEMemory_Read_U16(uAddress); + //Addr__12 = HLEMemory_Read_U16(uAddress); uAddress += 2; break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index bc50269037..1bbf8a9838 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -159,8 +159,8 @@ void CUCode_AXWii::Update(int cycles) bool CUCode_AXWii::AXTask(u32& _uMail) { u32 uAddress = _uMail; - u32 Addr__AXStudio; - u32 Addr__AXOutSBuffer; + //u32 Addr__AXStudio; + //u32 Addr__AXOutSBuffer; bool bExecuteList = true; /* @@ -178,7 +178,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) switch (iCommand) { case 0x0000: - Addr__AXStudio = HLEMemory_Read_U32(uAddress); + //Addr__AXStudio = HLEMemory_Read_U32(uAddress); uAddress += 4; break; @@ -209,7 +209,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) break; case 0x0007: // AXLIST_SBUFFER - Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); + //Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); uAddress += 10; break; diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp index 9b72a0313c..dd15a32914 100644 --- a/Source/Core/Core/Src/HW/GCMemcard.cpp +++ b/Source/Core/Core/Src/HW/GCMemcard.cpp @@ -265,7 +265,7 @@ bool GCMemcard::Save() mcdFile.WriteBytes(&dir_backup, BLOCK_SIZE); mcdFile.WriteBytes(&bat, BLOCK_SIZE); mcdFile.WriteBytes(&bat_backup, BLOCK_SIZE); - for (int i = 0; i < maxBlock - MC_FST_BLOCKS; ++i) + for (unsigned int i = 0; i < maxBlock - MC_FST_BLOCKS; ++i) { mcdFile.WriteBytes(mc_data_blocks[i].block, BLOCK_SIZE); } @@ -587,7 +587,7 @@ u16 GCMemcard::BlockAlloc::NextFreeBlock(u16 StartingBlock) const for (u16 i = StartingBlock; i < BAT_SIZE; ++i) if (Map[i-MC_FST_BLOCKS] == 0) return i; - for (u16 i = 0; i < StartingBlock; ++i) + for (u16 i = MC_FST_BLOCKS; i < StartingBlock; ++i) if (Map[i-MC_FST_BLOCKS] == 0) return i; } @@ -609,7 +609,7 @@ bool GCMemcard::BlockAlloc::ClearBlocks(u16 FirstBlock, u16 BlockCount) { return false; } - for (int i = 0; i < length; ++i) + for (unsigned int i = 0; i < length; ++i) Map[blocks.at(i)-MC_FST_BLOCKS] = 0; FreeBlocks = BE16(BE16(FreeBlocks) + BlockCount); @@ -625,7 +625,7 @@ u32 GCMemcard::GetSaveData(u8 index, std::vector & Blocks) const u16 block = DEntry_FirstBlock(index); u16 BlockCount = DEntry_BlockCount(index); - u16 memcardSize = BE16(hdr.SizeMb) * MBIT_TO_BLOCKS; + //u16 memcardSize = BE16(hdr.SizeMb) * MBIT_TO_BLOCKS; if ((block == 0xFFFF) || (BlockCount == 0xFFFF)) { @@ -669,12 +669,10 @@ u32 GCMemcard::ImportFile(DEntry& direntry, std::vector &saveBlocks) Directory UpdatedDir = *CurrentDir; // find first free dir entry - int index = -1; for (int i=0; i < DIRLEN; i++) { if (BE32(UpdatedDir.Dir[i].Gamecode) == 0xFFFFFFFF) { - index = i; UpdatedDir.Dir[i] = direntry; *(u16*)&UpdatedDir.Dir[i].FirstBlock = BE16(firstBlock); UpdatedDir.Dir[i].CopyCounter = UpdatedDir.Dir[i].CopyCounter+1; @@ -887,7 +885,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s std::vector saveData; saveData.reserve(size); - for (int i = 0; i < size; ++i) + for (unsigned int i = 0; i < size; ++i) { GCMBlock b; gci.ReadBytes(b.block, BLOCK_SIZE); @@ -1000,7 +998,7 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire return NOMEMCARD; } gci.Seek(DENTRY_SIZE + offset, SEEK_SET); - for (int i = 0; i < size; ++i) + for (unsigned int i = 0; i < size; ++i) { gci.WriteBytes(saveData[i].block, BLOCK_SIZE); } diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 1156d456ad..2da999eeac 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -656,8 +656,10 @@ u8 *GetPointer(const u32 _Address) case 0x9: case 0xd: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) + { if ((_Address & 0xfffffff) < EXRAM_SIZE) return m_pPhysicalEXRAM + (_Address & EXRAM_MASK); + } else break; diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp index 897b6d1227..3537ed3747 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp @@ -262,7 +262,6 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) { int cmd = *jvs_io++; - int unknown = 0; DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, cmd=%02x", node, cmd); switch (cmd) @@ -362,10 +361,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) } case 0xf0: if (*jvs_io++ == 0xD9) - { ERROR_LOG(AMBASEBOARDDEBUG, "JVS RESET"); - } else - unknown = 1; msg.addData(1); d10_1 |= 1; diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index 91882b2cb7..5c34fff9ac 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -621,7 +621,7 @@ void Wiimote::DoState(PointerWrap& p) //Do 'm_read_requests' queue { - u32 size; + u32 size = 0; if (p.mode == PointerWrap::MODE_READ) { //clear diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index c5dedba409..28ce6106c7 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -512,8 +512,6 @@ void StateChange(EMUSTATE_CHANGE newState) // TODO: disable/enable auto reporting, maybe } -#define ARRAYSIZE(_arr) (sizeof(_arr)/(sizeof(_arr[0]))) - bool IsValidBluetoothName(const char* name) { static const char* kValidWiiRemoteBluetoothNames[] = { "Nintendo RVL-CNT-01", diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index afa2b2ceb0..9508762742 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -321,7 +321,7 @@ void ExecuteCommand(u32 _Address) bool CmdSuccess = false; ECommandType Command = static_cast(Memory::Read_U32(_Address)); - volatile int DeviceID = Memory::Read_U32(_Address + 8); + volatile u32 DeviceID = Memory::Read_U32(_Address + 8); IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 15214317d2..6b490a1922 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -183,8 +183,8 @@ void CWII_IPC_HLE_Device_FileIO::CloseFile() bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { u32 ReturnValue = FS_RESULT_FATAL; - const s32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); - const s32 Mode = Memory::Read_U32(_CommandAddress + 0x10); + const u32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); + const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10); if (OpenFile()) @@ -205,7 +205,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) } case 1: { - s32 wantedPos = SeekPosition+m_SeekPos; + u32 wantedPos = SeekPosition+m_SeekPos; if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; @@ -215,7 +215,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) } case 2: { - s32 wantedPos = fileSize+m_SeekPos; + u64 wantedPos = fileSize+m_SeekPos; if (wantedPos >=0 && wantedPos <= fileSize) { m_SeekPos = wantedPos; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index fe53d46b0c..f409c88c83 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -789,7 +789,8 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) { static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; - for(int i = 0; i < s_Usb->m_WiiMotes.size(); i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + for(unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); + i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp index df058a470d..0ac752e867 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -285,7 +285,7 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress) { int x = 0; int tmpaddress[6]; - for (int i = 0; i < SConfig::GetInstance().m_WirelessMac.length() && x < 6; i++) + for (unsigned int i = 0; i < SConfig::GetInstance().m_WirelessMac.length() && x < 6; i++) { if (SConfig::GetInstance().m_WirelessMac[i] == ':' || SConfig::GetInstance().m_WirelessMac[i] == '-') continue; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 47a6712b68..af10e98d60 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -1467,9 +1467,9 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandWriteLinkPolicy(u8* _Input) DEBUG_LOG(WII_IPC_WIIMOTE, " ConnectionHandle: 0x%04x", pLinkPolicy->con_handle); DEBUG_LOG(WII_IPC_WIIMOTE, " Policy: 0x%04x", pLinkPolicy->settings); - hci_write_link_policy_settings_rp Reply; - Reply.status = 0x00; - Reply.con_handle = pLinkPolicy->con_handle; + //hci_write_link_policy_settings_rp Reply; + //Reply.status = 0x00; + //Reply.con_handle = pLinkPolicy->con_handle; SendEventCommandStatus(HCI_CMD_WRITE_LINK_POLICY_SETTINGS); @@ -1878,4 +1878,4 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::LOG_LinkKey(const u8* _pLinkKey) , _pLinkKey[0], _pLinkKey[1], _pLinkKey[2], _pLinkKey[3], _pLinkKey[4], _pLinkKey[5], _pLinkKey[6], _pLinkKey[7] , _pLinkKey[8], _pLinkKey[9], _pLinkKey[10], _pLinkKey[11], _pLinkKey[12], _pLinkKey[13], _pLinkKey[14], _pLinkKey[15]); -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index e4f3fb3f29..69120b2b9b 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -663,19 +663,19 @@ void ReadHeader() } videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend)); - for (int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++) { videoBackend[i] = tmpHeader.videoBackend[i]; } g_discChange.resize(ARRAYSIZE(tmpHeader.discChange)); - for (int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++) + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++) { g_discChange[i] = tmpHeader.discChange[i]; } author.resize(ARRAYSIZE(tmpHeader.author)); - for (int i = 0; i < ARRAYSIZE(tmpHeader.author);i++) + for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.author);i++) { author[i] = tmpHeader.author[i]; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 5aaf4b99f1..3d88d687e0 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -1097,7 +1097,7 @@ void Jit64::mulli(UGeckoInstruction inst) gpr.BindToRegister(d, (d == a), true); if (imm == 0) XOR(32, gpr.R(d), gpr.R(d)); - else if(imm == -1) + else if(imm == (u32)-1) { if (d != a) MOV(32, gpr.R(d), gpr.R(a)); @@ -1147,7 +1147,7 @@ void Jit64::mullwx(UGeckoInstruction inst) int src = gpr.R(a).IsImm() ? b : a; if (imm == 0) XOR(32, gpr.R(d), gpr.R(d)); - else if(imm == -1) + else if(imm == (u32)-1) { if (d != src) MOV(32, gpr.R(d), gpr.R(src)); @@ -1263,7 +1263,7 @@ void Jit64::divwux(UGeckoInstruction inst) while(!(divisor & (1 << shift))) shift--; - if (divisor == (1 << shift)) + if (divisor == (u32)(1 << shift)) { gpr.Lock(a, b, d); gpr.BindToRegister(d, d == a, true); @@ -1387,7 +1387,7 @@ void Jit64::divwx(UGeckoInstruction inst) if (gpr.R(a).IsImm() && gpr.R(b).IsImm()) { s32 i = (s32)gpr.R(a).offset, j = (s32)gpr.R(b).offset; - if( j == 0 || i == 0x80000000 && j == -1) + if( j == 0 || (i == (s32)0x80000000 && j == -1)) { gpr.SetImmediate32(d, (i >> 31) ^ j); if (inst.OE) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index e91291fa90..ce47e2c3ac 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -472,10 +472,10 @@ static OpArg regBuildMemAddress(RegInfo& RI, InstLoc I, InstLoc AI, #else // 64-bit if (Profiled) { - RI.Jit->LEA(32, EAX, M((void*)addr)); + RI.Jit->LEA(32, EAX, M((void*)(u64)addr)); return MComplex(RBX, EAX, SCALE_1, 0); } - return M((void*)addr); + return M((void*)(u64)addr); #endif } } diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index d9ad3c6b5c..a532ace217 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const int STATE_VERSION = 10; +static const u32 STATE_VERSION = 10; struct StateHeader { diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 0b6b366c88..2917f1637d 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -319,7 +319,7 @@ void CCodeWindow::UpdateLists() { int idx = callers->Append(wxString::FromAscii(StringFromFormat ("< %s (%08x)", caller_symbol->name.c_str(), caller_addr).c_str())); - callers->SetClientData(idx, (void*)caller_addr); + callers->SetClientData(idx, (void*)(u64)caller_addr); } } @@ -332,7 +332,7 @@ void CCodeWindow::UpdateLists() { int idx = calls->Append(wxString::FromAscii(StringFromFormat ("> %s (%08x)", call_symbol->name.c_str(), call_addr).c_str())); - calls->SetClientData(idx, (void*)call_addr); + calls->SetClientData(idx, (void*)(u64)call_addr); } } } diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 4579af762a..b5caf139d6 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -624,7 +624,6 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) int cmd = *objectdata++; int stream_size = Common::swap16(objectdata); objectdata += 2; - int vertex_size = (objectdata_end - objectdata) / stream_size; wxString newLabel = wxString::Format(wxT("%08X: %02X %04X "), obj_offset, cmd, stream_size); if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); while (objectdata < objectdata_end) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 9011d5e844..98649be181 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1320,9 +1320,8 @@ void CFrame::StatusBarMessage(const char * Text, ...) const int MAX_BYTES = 1024*10; char Str[MAX_BYTES]; va_list ArgPtr; - int Cnt; va_start(ArgPtr, Text); - Cnt = vsnprintf(Str, MAX_BYTES, Text, ArgPtr); + vsnprintf(Str, MAX_BYTES, Text, ArgPtr); va_end(ArgPtr); if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxString::FromAscii(Str),0); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 5a24f6726e..5312c4fabd 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -652,7 +652,7 @@ void CGameListCtrl::ScanForISOs() for (std::vector::const_iterator iter = drives.begin(); iter != drives.end(); ++iter) { - std::auto_ptr gli(new GameListItem(*iter)); + std::unique_ptr gli(new GameListItem(*iter)); if (gli->IsValid()) m_ISOFiles.push_back(gli.release()); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 9734e97131..a3d3761e62 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -285,7 +285,7 @@ bool GameListItem::GetName(std::wstring& wName, int index) const index++; if ((index >=0) && (index < 10)) { - if (m_wNames.size() > index) + if (m_wNames.size() > (size_t)index) { wName = m_wNames[index]; return true; diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index f004989055..61139d985f 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -687,14 +687,13 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event)) void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolder, const int partitionNum) { char exportName[512]; - u32 index[2] = {0, 0}, offsetShift = 0; + u32 index[2] = {0, 0}; std::vector fst; DiscIO::IFileSystem *FS = 0; if (DiscIO::IsVolumeWiiDisc(OpenISO)) { FS = WiiDisc.at(partitionNum).FileSystem; - offsetShift = 2; } else FS = pFileSystem; diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 59c77f1e32..8236513304 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -105,7 +105,7 @@ bool DolphinApp::OnInit() bool UseDebugger = false; bool UseLogger = false; bool selectVideoBackend = false; - bool selectAudioEmulation = false; + //bool selectAudioEmulation = false; wxString videoBackendName; wxString audioEmulationName; @@ -167,8 +167,8 @@ bool DolphinApp::OnInit() selectVideoBackend = parser.Found(wxT("video_backend"), &videoBackendName); // TODO: This currently has no effect. Implement or delete. - selectAudioEmulation = parser.Found(wxT("audio_emulation"), - &audioEmulationName); + //selectAudioEmulation = parser.Found(wxT("audio_emulation"), + // &audioEmulationName); #endif // wxUSE_CMDLINE_PARSER #if defined _DEBUG && defined _WIN32 diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp index fe4cd70829..da21c41cb2 100644 --- a/Source/Core/DolphinWX/Src/X11Utils.cpp +++ b/Source/Core/DolphinWX/Src/X11Utils.cpp @@ -225,7 +225,7 @@ void XRRConfiguration::Update() } else sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(), - "%a[^:]: %ux%u", &output_name, &fullWidth, &fullHeight); + "%m[^:]: %ux%u", &output_name, &fullWidth, &fullHeight); for (int i = 0; i < screenResources->noutput; i++) { diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index 450080bfd2..c2030a059d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -1,5 +1,7 @@ #include "Xlib.h" +#include + namespace ciface { namespace Xlib @@ -93,7 +95,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key KeySym keysym = 0; do { - keysym = XKeycodeToKeysym(m_display, keycode, i); + keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); i++; } while (keysym == NoSymbol && i < 8); diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/DLCache.cpp index 5499fa26f1..c828ea3a03 100644 --- a/Source/Core/VideoCommon/Src/DLCache.cpp +++ b/Source/Core/VideoCommon/Src/DLCache.cpp @@ -361,9 +361,9 @@ u32 AnalyzeAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices); num_draw_call++; - const int tc[12] = { + const u32 tc[12] = { g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; for(int i = 0; i < 12; i++) { @@ -563,9 +563,9 @@ void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) dl->InsertRegion(NewRegion); memcpy(NewRegion->start_address, StartAddress, Vdatasize); emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices, cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewRegion->start_address); - const int tc[12] = { + const u32 tc[12] = { g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; for(int i = 0; i < 12; i++) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index bc7a12304f..bb4d833034 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -131,6 +131,8 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) { + // TODO: This is all wrong. i in the else clause will always be out of range as a + // subscript for xfregs.texMtxInfo. NeoBrain?? if (18+i < 32) uid->values[0] |= xfregs.texMtxInfo[i].projection << (18+i); // 1 else @@ -158,7 +160,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] @@ -626,7 +628,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType } WRITE(p, " ) {\n"); - char* pmainstart = p; int Pretest = AlphaPreTest(); if(Pretest >= 0 && !DepthTextureEnable) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index 1533f9348e..f195cd805b 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -302,6 +302,7 @@ void PixelShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; + // TODO: This code is wrong. i goes out of range for xfregs.ambColor. for (int i = 0; i < 4; ++i) { if (nMaterialsChanged & (1 << i)) diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index fb34ce1bc1..5bffab8ee7 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -224,14 +224,14 @@ void VertexLoader::CompileVertexTranslator() #endif // Colors - const int col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + const u32 col[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; // TextureCoord // Since m_VtxDesc.Text7Coord is broken across a 32 bit word boundary, retrieve its value manually. // If we didn't do this, the vertex format would be read as one bit offset from where it should be, making // 01 become 00, and 10/11 become 01 - const int tc[8] = { + const u32 tc[8] = { m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, - m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const int)((m_VtxDesc.Hex >> 31) & 3) + m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, (const u32)((m_VtxDesc.Hex >> 31) & 3) }; // Reset pipeline @@ -770,7 +770,7 @@ void VertexLoader::AppendToString(std::string *dest) const dest->append(StringFromFormat("Nrm: %i %s-%s ", m_VtxAttr.NormalElements, posMode[m_VtxDesc.Normal], posFormats[m_VtxAttr.NormalFormat])); } - int color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; + u32 color_mode[2] = {m_VtxDesc.Color0, m_VtxDesc.Color1}; for (int i = 0; i < 2; i++) { if (color_mode[i]) @@ -778,7 +778,7 @@ void VertexLoader::AppendToString(std::string *dest) const dest->append(StringFromFormat("C%i: %i %s-%s ", i, m_VtxAttr.color[i].Elements, posMode[color_mode[i]], colorFormat[m_VtxAttr.color[i].Comp])); } } - int tex_mode[8] = { + u32 tex_mode[8] = { m_VtxDesc.Tex0Coord, m_VtxDesc.Tex1Coord, m_VtxDesc.Tex2Coord, m_VtxDesc.Tex3Coord, m_VtxDesc.Tex4Coord, m_VtxDesc.Tex5Coord, m_VtxDesc.Tex6Coord, m_VtxDesc.Tex7Coord }; diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp index 316941a639..4afa6e941b 100644 --- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp @@ -20,8 +20,8 @@ #include using stdext::hash_map; #else -#include -using __gnu_cxx::hash_map; +#include +using std::unordered_map; #endif #include #include @@ -44,20 +44,21 @@ namespace stdext { return uid.GetHash(); } } +typedef hash_map VertexLoaderMap; #else -namespace __gnu_cxx { +namespace std { template<> struct hash { size_t operator()(const VertexLoaderUID& uid) const { return uid.GetHash(); } }; } +typedef unordered_map VertexLoaderMap; #endif namespace VertexLoaderManager { -typedef hash_map VertexLoaderMap; static VertexLoaderMap g_VertexLoaderMap; // TODO - change into array of pointers. Keep a map of all seen so far. diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 8d24402b49..12445f283a 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -251,6 +251,7 @@ void VertexShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; + // TODO: This code is wrong. i goes out of range for xfregs.ambColor. for (int i = 0; i < 4; ++i) { if (nMaterialsChanged & (1 << i)) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp index 0e2cc7f99f..cc5ee66772 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp @@ -72,27 +72,27 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType) tcScale[7] = 1.0f / float(1 << m_CurrentVat->g2.Tex7Frac); //TexMtx - const int tmDesc[8] = { + const u32 tmDesc[8] = { g_VtxDesc.Tex0MatIdx, g_VtxDesc.Tex1MatIdx, g_VtxDesc.Tex2MatIdx, g_VtxDesc.Tex3MatIdx, g_VtxDesc.Tex4MatIdx, g_VtxDesc.Tex5MatIdx, g_VtxDesc.Tex6MatIdx, g_VtxDesc.Tex7MatIdx }; // Colors - const int colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1}; + const u32 colDesc[2] = {g_VtxDesc.Color0, g_VtxDesc.Color1}; colElements[0] = m_CurrentVat->g0.Color0Elements; colElements[1] = m_CurrentVat->g0.Color1Elements; - const int colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp}; + const u32 colComp[2] = {m_CurrentVat->g0.Color0Comp, m_CurrentVat->g0.Color1Comp}; // TextureCoord - const int tcDesc[8] = { + const u32 tcDesc[8] = { g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, - g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const int)((g_VtxDesc.Hex >> 31) & 3) + g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) }; - const int tcElements[8] = { + const u32 tcElements[8] = { m_CurrentVat->g0.Tex0CoordElements, m_CurrentVat->g1.Tex1CoordElements, m_CurrentVat->g1.Tex2CoordElements, m_CurrentVat->g1.Tex3CoordElements, m_CurrentVat->g1.Tex4CoordElements, m_CurrentVat->g2.Tex5CoordElements, m_CurrentVat->g2.Tex6CoordElements, m_CurrentVat->g2.Tex7CoordElements }; - const int tcFormat[8] = { + const u32 tcFormat[8] = { m_CurrentVat->g0.Tex0CoordFormat, m_CurrentVat->g1.Tex1CoordFormat, m_CurrentVat->g1.Tex2CoordFormat, m_CurrentVat->g1.Tex3CoordFormat, m_CurrentVat->g1.Tex4CoordFormat, m_CurrentVat->g2.Tex5CoordFormat, m_CurrentVat->g2.Tex6CoordFormat, m_CurrentVat->g2.Tex7CoordFormat From 330ea74d197d718bb69b0cd63f935f42117d295a Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 10 Dec 2012 06:20:06 -0500 Subject: [PATCH 159/627] Allow input displays to work without an active movie. --- .../Core/Src/HW/SI_DeviceGCController.cpp | 2 + .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 4 +- Source/Core/Core/Src/Movie.cpp | 66 ++++++++++++------- Source/Core/Core/Src/Movie.h | 4 +- 4 files changed, 50 insertions(+), 26 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 8e8adf33fd..74c020fd39 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -141,6 +141,8 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) if(!Movie::IsUsingWiimote(0)) Movie::InputUpdate(); } + else + Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); // Thankfully changing mode does not change the high bits ;) _Hi = (u32)((u8)PadStatus.stickY); diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 6f7f80ece7..b7652e973a 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -762,9 +762,9 @@ void Wiimote::Update() } } } - if (Movie::IsRecordingInput()) + if (!Movie::IsPlayingInput()) { - Movie::RecordWiimote(m_index, data, rptf, m_reg_ir.mode); + Movie::CheckWiimoteStatus(m_index, data, rptf, m_reg_ir.mode); } // don't send a data report if auto reporting is off diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 69120b2b9b..183dab77b7 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -104,6 +104,17 @@ void EnsureTmpInputSize(size_t bound) std::string GetInputDisplay() { + if (!IsPlayingInput() && !IsRecordingInput()) + { + g_numPads = 0; + for (int i = 0; i < 4; i++) + { + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + g_numPads |= (1 << i); + if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) + g_numPads |= (1 << (i + 4)); + } + } std::string inputDisplay = ""; for (int i = 0; i < 8; ++i) if ((g_numPads & (1 << i)) != 0) @@ -181,7 +192,6 @@ void Init() { g_bRecordingFromSaveState = false; g_rerecords = 0; - g_numPads = 0; g_currentByte = 0; g_currentFrame = 0; g_currentLagCount = 0; @@ -576,57 +586,69 @@ void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelD g_InputDisplay[controllerID].append("\n"); } -void RecordInput(SPADStatus *PadStatus, int controllerID) +void CheckPadStatus(SPADStatus *PadStatus, int controllerID) { - if(!IsRecordingInput() || !IsUsingPad(controllerID)) - return; - g_padState.A = ((PadStatus->button & PAD_BUTTON_A) != 0); g_padState.B = ((PadStatus->button & PAD_BUTTON_B) != 0); g_padState.X = ((PadStatus->button & PAD_BUTTON_X) != 0); g_padState.Y = ((PadStatus->button & PAD_BUTTON_Y) != 0); g_padState.Z = ((PadStatus->button & PAD_TRIGGER_Z) != 0); g_padState.Start = ((PadStatus->button & PAD_BUTTON_START) != 0); - + g_padState.DPadUp = ((PadStatus->button & PAD_BUTTON_UP) != 0); g_padState.DPadDown = ((PadStatus->button & PAD_BUTTON_DOWN) != 0); g_padState.DPadLeft = ((PadStatus->button & PAD_BUTTON_LEFT) != 0); g_padState.DPadRight = ((PadStatus->button & PAD_BUTTON_RIGHT) != 0); - + g_padState.L = ((PadStatus->button & PAD_TRIGGER_L) != 0); g_padState.R = ((PadStatus->button & PAD_TRIGGER_R) != 0); g_padState.TriggerL = PadStatus->triggerLeft; g_padState.TriggerR = PadStatus->triggerRight; - g_padState.disc = g_bDiscChange; g_padState.AnalogStickX = PadStatus->stickX; g_padState.AnalogStickY = PadStatus->stickY; - + g_padState.CStickX = PadStatus->substickX; g_padState.CStickY = PadStatus->substickY; + SetInputDisplayString(g_padState, controllerID); +} + +void RecordInput(SPADStatus *PadStatus, int controllerID) +{ + if (!IsRecordingInput() || !IsUsingPad(controllerID)) + return; + + CheckPadStatus(PadStatus, controllerID); + + if (g_bDiscChange) + { + g_padState.disc = g_bDiscChange; + g_bDiscChange = false; + } + EnsureTmpInputSize(g_currentByte + 8); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); g_currentByte += 8; g_totalBytes = g_currentByte; - - SetInputDisplayString(g_padState, controllerID); - - if (g_bDiscChange) - { - g_bDiscChange = false; - } } -void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) +void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) { - if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) - return; - u8* const coreData = rptf.core?(data+rptf.core):NULL; u8* const accelData = rptf.accel?(data+rptf.accel):NULL; u8* const irData = rptf.ir?(data+rptf.ir):NULL; u8 size = rptf.size; + SetWiiInputDisplayString(wiimote, coreData, accelData, irData); + + if (IsRecordingInput()) + RecordWiimote(wiimote, data, size); +} + +void RecordWiimote(int wiimote, u8 *data, u8 size) +{ + if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) + return; InputUpdate(); EnsureTmpInputSize(g_currentByte + size + 1); @@ -634,7 +656,6 @@ void RecordWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size; g_totalBytes = g_currentByte; - SetWiiInputDisplayString(wiimote, coreData, accelData, irData); } void ReadHeader() @@ -991,7 +1012,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) } SetInputDisplayString(g_padState, controllerID); - CheckInputEnd(); } @@ -1050,7 +1070,7 @@ void EndPlayInput(bool cont) } else if(g_playMode != MODE_NONE) { - g_numPads = g_rerecords = 0; + g_rerecords = 0; g_currentByte = 0; g_playMode = MODE_NONE; Core::DisplayMessage("Movie End.", 2000); diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 401b28be50..3d15d0ed61 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -166,7 +166,7 @@ void FrameSkipping(); bool BeginRecordingInput(int controllers); void RecordInput(SPADStatus *PadStatus, int controllerID); -void RecordWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); +void RecordWiimote(int wiimote, u8 *data, u8 size); bool PlayInput(const char *filename); void LoadInput(const char *filename); @@ -179,6 +179,8 @@ void DoState(PointerWrap &p); void CheckMD5(); void GetMD5(); void Shutdown(); +void CheckPadStatus(SPADStatus *PadStatus, int controllerID); +void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); std::string GetInputDisplay(); From f6df3d15134def6845dfe74fa7d38d1d6688e5a5 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 10 Dec 2012 08:40:27 -0600 Subject: [PATCH 160/627] OSX build fix for the unordered_map/hash_map issue. --- .../Core/VideoCommon/Src/VertexLoaderManager.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp index 4afa6e941b..153e69a8c3 100644 --- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp @@ -19,6 +19,9 @@ #ifdef _MSC_VER #include using stdext::hash_map; +#elif defined __APPLE__ +#include +using __gnu_cxx::hash_map; #else #include using std::unordered_map; @@ -44,15 +47,24 @@ namespace stdext { return uid.GetHash(); } } -typedef hash_map VertexLoaderMap; #else -namespace std { +#ifdef __APPLE__ +namespace __gnu_cxx +#else +namespace std +#endif +{ template<> struct hash { size_t operator()(const VertexLoaderUID& uid) const { return uid.GetHash(); } }; } +#endif + +#if defined _MSC_VER || defined __APPLE__ +typedef hash_map VertexLoaderMap; +#else typedef unordered_map VertexLoaderMap; #endif From c82136abdceb499bef33919a5c29cc323fbd2266 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 10 Dec 2012 16:13:22 +0100 Subject: [PATCH 161/627] PixelShaderGen: Drop some useless and potentially buggy code. Thanks to glennrics for noticing. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index bb4d833034..cc48276253 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -129,17 +129,11 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo return; } + // numtexgens should be <= 8 for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) - { - // TODO: This is all wrong. i in the else clause will always be out of range as a - // subscript for xfregs.texMtxInfo. NeoBrain?? - if (18+i < 32) - uid->values[0] |= xfregs.texMtxInfo[i].projection << (18+i); // 1 - else - uid->values[1] |= xfregs.texMtxInfo[i].projection << (i - 14); // 1 - } + uid->values[0] |= xfregs.texMtxInfo[i].projection << (18+i); // 1 - uid->values[1] = bpmem.genMode.numindstages << 2; // 3 + uid->values[1] = bpmem.genMode.numindstages; // 3 u32 indirectStagesUsed = 0; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) @@ -147,15 +141,15 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo assert(indirectStagesUsed == (indirectStagesUsed & 0xF)); - uid->values[1] |= indirectStagesUsed << 5; // 4; + uid->values[1] |= indirectStagesUsed << 3; // 4; for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i) { if (indirectStagesUsed & (1 << i)) { - uid->values[1] |= (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) << (9 + 3*i); // 1 + uid->values[1] |= (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) << (7 + 3*i); // 1 if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) - uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (10 + 3*i); // 2 + uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (8 + 3*i); // 2 } } From a6374f25fdf746797bfcb29fedda374384193d07 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 10 Dec 2012 10:31:08 -0600 Subject: [PATCH 162/627] Fix OSX build once again. Apparently OSX needs to get with the times. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 5312c4fabd..eedbf4e8dc 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -652,7 +652,11 @@ void CGameListCtrl::ScanForISOs() for (std::vector::const_iterator iter = drives.begin(); iter != drives.end(); ++iter) { + #ifdef __APPLE__ + std::auto_ptr gli(new GameListItem(*iter)); + #else std::unique_ptr gli(new GameListItem(*iter)); + #endif if (gli->IsValid()) m_ISOFiles.push_back(gli.release()); From db329bf027dde55560fd4ab5f5ccf3543839466d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 11 Dec 2012 08:14:34 -0600 Subject: [PATCH 163/627] Update translation pot file for changes in the code. --- Languages/po/ar.po | 1439 ++++++++++++++++----------------- Languages/po/ca.po | 1449 ++++++++++++++++----------------- Languages/po/cs.po | 1445 ++++++++++++++++----------------- Languages/po/de.po | 1417 +++++++++++++++++---------------- Languages/po/dolphin-emu.pot | 1367 ++++++++++++++++---------------- Languages/po/el.po | 1449 ++++++++++++++++----------------- Languages/po/en.po | 1367 ++++++++++++++++---------------- Languages/po/es.po | 1451 +++++++++++++++++----------------- Languages/po/fa.po | 1377 ++++++++++++++++---------------- Languages/po/fr.po | 1451 +++++++++++++++++----------------- Languages/po/he.po | 1367 ++++++++++++++++---------------- Languages/po/hu.po | 1451 +++++++++++++++++----------------- Languages/po/it.po | 1418 +++++++++++++++++---------------- Languages/po/ja.po | 1450 ++++++++++++++++----------------- Languages/po/ko.po | 1444 ++++++++++++++++----------------- Languages/po/nb.po | 1444 ++++++++++++++++----------------- Languages/po/nl.po | 1434 ++++++++++++++++----------------- Languages/po/pl.po | 1444 ++++++++++++++++----------------- Languages/po/pt.po | 1450 ++++++++++++++++----------------- Languages/po/pt_BR.po | 1449 ++++++++++++++++----------------- Languages/po/ru.po | 1413 +++++++++++++++++---------------- Languages/po/sr.po | 1392 ++++++++++++++++---------------- Languages/po/tr.po | 1447 ++++++++++++++++----------------- Languages/po/zh_CN.po | 1417 +++++++++++++++++---------------- Languages/po/zh_TW.po | 1413 +++++++++++++++++---------------- 25 files changed, 18008 insertions(+), 17637 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index c073eceb10..083a3b5917 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-12-27 08:27-0600\n" "Last-Translator: mansoor\n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(كثير جدا العرض)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d هرتز" @@ -146,7 +146,7 @@ msgstr "%sتصدير GCI%s" msgid "%sImport GCI%s" msgstr "%sاستيراد GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -155,147 +155,147 @@ msgstr "" msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&حول البرنامج " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&التشغيل من محرك الاقراص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&نقاط التوقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&استعراض الايزو " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&مدير الاسرار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&محاكاة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&ملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&الاطار المسبق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&ملء الشاشة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&مساعدة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&تحميل الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&بطاقه الذكره جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Ùتح" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&خيارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&وقÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&وضع للقراءة Ùقط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&تحديث القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&تسجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&إعادة اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&الصوت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&أدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Ùديو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&معلومات عن اللعبة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -311,27 +311,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(معروÙ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(ايقاÙ)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 بت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 بت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "الرؤية ثلاثية الأبعاد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 بت" @@ -339,7 +339,7 @@ msgstr "8 بت" msgid "" msgstr "<أدخل اسم هنا>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<لم يتم العثور على القرارات>" @@ -352,11 +352,11 @@ msgstr "<لا شيء>" msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<النظام>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -365,8 +365,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "ناÙذة اللعب عبر النت Ù…Ùتوح بالÙعل!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "اللعبة ليست قيد التشغيل حاليا." @@ -415,7 +415,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "اسرار" @@ -428,7 +428,7 @@ msgstr "ترجمة البرنامج بواسطة الررائع" msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "ضبط:" @@ -436,7 +436,7 @@ msgstr "ضبط:" msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -464,39 +464,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -507,27 +507,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "كرت الشاشه :" @@ -536,11 +536,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "أض٠باتش" @@ -550,7 +550,7 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "أضÙ" @@ -584,38 +584,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "إعدادات متقدمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" @@ -623,9 +623,10 @@ msgstr "جميع مضغوط GC/Wii ISO files (gcz)" msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -639,15 +640,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "تصÙية متباينة الخواص :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "تنعيم الحواÙ:" @@ -659,15 +660,15 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "تطبيق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -677,7 +678,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabic" @@ -686,18 +687,18 @@ msgstr "Arabic" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -705,12 +706,12 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "صوت الخلÙية :" @@ -718,24 +719,24 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "تلقائي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "تلقائي (Multiple of 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "تلقائي حجم الناÙذة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "ضبط حجم الناÙذة تلقائي " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -745,23 +746,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"إذا لم تكن متأكدا اترك هذا التحقق." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&تسجل" @@ -770,12 +759,12 @@ msgstr "&تسجل" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "إعدادات الخلÙية" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "الخلÙية:" @@ -792,7 +781,7 @@ msgstr "الى الوراء" msgid "Bad File Header" msgstr "سيء بداية المل٠" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "بنر" @@ -809,11 +798,11 @@ msgstr "بنر:" msgid "Bar" msgstr "شريط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -825,7 +814,7 @@ msgstr "صوت عميق" msgid "Block Allocation Table checksum failed" msgstr "كتلة الاختباري جدول تخصيص Ùشل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "كتل" @@ -842,7 +831,7 @@ msgid "Blue Right" msgstr "اليمين أزرق" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "أسÙÙ„" @@ -855,7 +844,7 @@ msgstr "يلزم التحكم: %lu" msgid "Broken" msgstr "معطلة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "أستعرض" @@ -863,11 +852,11 @@ msgstr "أستعرض" msgid "Browse for a directory to add" msgstr "لتصÙØ­ دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -881,7 +870,7 @@ msgstr "العازلة :" msgid "Buttons" msgstr "أزرار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -893,19 +882,19 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -921,7 +910,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -935,7 +924,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "إلغاء" @@ -951,7 +940,7 @@ msgstr "لا يمكن Ùتح %s" msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -962,7 +951,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -970,18 +959,18 @@ msgstr "" "لا يمكن استخدام هذا المل٠كبطاقة الذاكرة.\n" "هل تحاول استخدام Ù†Ùس المل٠ÙÙŠ كل من Ùتحات?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -989,7 +978,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1001,7 +990,7 @@ msgstr "مركز" msgid "Change" msgstr "تغيير" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "تغيير &القرص" @@ -1014,7 +1003,7 @@ msgstr "تغيير القرص" msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1030,8 +1019,8 @@ msgstr "Changes sign to zFar Parameter (بعد التصحيح)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (بعد التصحيح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" @@ -1043,7 +1032,7 @@ msgstr "شات" msgid "Cheat Code" msgstr "اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "بحث عن اسرار" @@ -1055,35 +1044,35 @@ msgstr "قائمة الاسرار" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1091,15 +1080,15 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1126,22 +1115,22 @@ msgstr "" "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك " "يدويا إيقا٠اللعبة." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "إغلاق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "رمز المعلومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "رمز: " @@ -1149,7 +1138,7 @@ msgstr "رمز: " msgid "Command" msgstr "الأمر" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "التعليق" @@ -1157,20 +1146,20 @@ msgstr "التعليق" msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "إعدادات" @@ -1189,17 +1178,17 @@ msgstr "إعدادات التحكم" msgid "Configure Pads" msgstr "تكوين منصات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" @@ -1208,11 +1197,11 @@ msgstr "تأكيد على التوقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr " توصيل ويموت%i" @@ -1237,7 +1226,7 @@ msgstr "توصيل ويموت 3" msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "توصيل" @@ -1257,7 +1246,7 @@ msgstr "GCIتحويل إلى " msgid "Copy failed" msgstr "Ùشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" @@ -1271,7 +1260,7 @@ msgstr "الأساسية" msgid "Could not create %s" msgstr "لا يمكن إنشاء %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "لا يمكن تهيئة الخلÙية %s." @@ -1305,7 +1294,7 @@ msgstr "" "تعذر تعيين منصات. وغادر لاعب أو لعبة قيد التشغيل حاليا!\n" "(منصات الإعداد أثناء قيد التشغيل اللعبة غير معتمد حتى الآن)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1318,11 +1307,11 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1330,8 +1319,8 @@ msgstr "" "لا يمكن التهيئة الأساسية.\n" "تحقق التكوين الخاص بك." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "الاحصاء :" @@ -1339,8 +1328,8 @@ msgstr "الاحصاء :" msgid "Country:" msgstr "البلد:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "إنشاء رموز اسرار" @@ -1349,21 +1338,21 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr " KDE-Look.org تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" " Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr " VistaIcons.com تم بواسطة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" " black_rider and published on ForumW.org > Web DevelopmentsCreated by " @@ -1378,11 +1367,11 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "محصول" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1396,7 +1385,7 @@ msgstr "" msgid "Crossfade" msgstr "الإبهات المتداخل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" @@ -1413,11 +1402,11 @@ msgstr "إعدادات هاك مخصص العرض" msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1425,36 +1414,36 @@ msgstr "" msgid "D-Pad" msgstr "الاسهم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Root:" @@ -1466,7 +1455,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "حجم البيانات" @@ -1474,8 +1463,8 @@ msgstr "حجم البيانات" msgid "Date:" msgstr "التاريخ :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1491,7 +1480,7 @@ msgstr "المنطقة الميتة" msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "التصحيح" @@ -1499,16 +1488,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" @@ -1516,7 +1505,7 @@ msgstr "ÙÙƒ ايزو" msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" @@ -1529,7 +1518,7 @@ msgstr "الخط الاÙتراضي" msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "حذ٠الحÙظ" @@ -1538,7 +1527,7 @@ msgstr "حذ٠الحÙظ" msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "الوصÙ" @@ -1558,8 +1547,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1583,28 +1572,20 @@ msgstr "" "Ùشل الدليل الاختباري\n" " Ùˆ Ùشل دليل الاختباري الاحتياطية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "تعطيل إضاءة" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "تعطيل العمق لكل بكسل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Texturesتعطيل " - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1618,7 +1599,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1634,16 +1615,6 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"texturing تعطل .\n" -"\n" -"إذا لم تكن متأكدا اترك هذا غير محددة." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "القرص" @@ -1653,11 +1624,11 @@ msgstr "القرص" msgid "Disc Read Error" msgstr "خطأ قراءة القرص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "العرض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1671,20 +1642,20 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "موقع دولÙين" @@ -1696,16 +1667,16 @@ msgstr "إعدادات دولÙين" msgid "Dolphin Emulated Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1713,7 +1684,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "دولÙين على مدونة قوقل" @@ -1753,23 +1724,23 @@ msgstr "الطبول" msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Dump Textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1779,7 +1750,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1789,7 +1760,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1800,23 +1771,23 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "خروج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1826,11 +1797,11 @@ msgstr "" msgid "EUROPE" msgstr "أوروبا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "بداية تحديث الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "تحرير" @@ -1846,7 +1817,7 @@ msgstr "تعديل الاعدادات" msgid "Edit Patch" msgstr "تعديل الباتش" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" @@ -1859,15 +1830,15 @@ msgstr "تحرير" msgid "Effect" msgstr "تأثير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالÙعل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1876,7 +1847,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1904,7 +1875,7 @@ msgstr "حالة المحاكاه: " msgid "Enable" msgstr "تمكين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1921,7 +1892,7 @@ msgstr "" "يتطلب ملء الشاشة للعمل.\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1937,11 +1908,11 @@ msgstr "تمكين منع الدمج" msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "تمكين الاسرار " @@ -1949,11 +1920,11 @@ msgstr "تمكين الاسرار " msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" @@ -1961,7 +1932,7 @@ msgstr "تمكين الاختصارات" msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" @@ -1970,11 +1941,11 @@ msgid "Enable MMU" msgstr "MMU تمكين" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" @@ -1982,11 +1953,11 @@ msgstr "تمكين شاشة التوقÙ" msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2008,11 +1979,11 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "تمكين صÙحات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2024,7 +1995,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2053,7 +2024,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2071,7 +2042,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2086,13 +2057,13 @@ msgid "End" msgstr "نهاية" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "تحسينات" @@ -2110,17 +2081,17 @@ msgstr "دخول %d/%d" msgid "Entry 1/%d" msgstr "دخول 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "خطأ" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2157,10 +2128,6 @@ msgstr "" msgid "Execute" msgstr "تنÙيذ" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "للخروج مع المحاكي" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Ùشل تصدير" @@ -2174,19 +2141,19 @@ msgstr "Ùشل تصدير" msgid "Export Recording" msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "تصدير جميع الحÙظ" @@ -2194,7 +2161,7 @@ msgstr "تصدير جميع الحÙظ" msgid "Export failed, try again?" msgstr "Ùشل تصدير، حاول مرة أخرى؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "تصدير Ø­Ùظ باسم" @@ -2202,7 +2169,7 @@ msgstr "تصدير Ø­Ùظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2238,28 +2205,28 @@ msgstr "استخراج الملÙات" msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "استخراج" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "بايت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "لاعبين" @@ -2283,7 +2250,7 @@ msgstr "لم اسمع!" msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2383,33 +2350,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps سريع" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "مل٠المعلومات" @@ -2455,43 +2418,43 @@ msgstr "" msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "العرض 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2503,7 +2466,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2515,7 +2478,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2535,17 +2498,17 @@ msgstr "" msgid "Forward" msgstr "إلى الأمام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "الإطار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "الإطار" @@ -2554,38 +2517,38 @@ msgstr "الإطار" msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "الإطار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "مجموعة الإطار " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "حد الإطار:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "French" @@ -2593,20 +2556,20 @@ msgstr "French" msgid "Frets" msgstr "الحنق" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "من" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "شاشه كامله" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "دقة العرض :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI File(*.gci)" @@ -2614,11 +2577,11 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2646,24 +2609,28 @@ msgstr "إعدادات معينه للعبه" msgid "GameConfig" msgstr "إعدادات اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "تحميل اسرار" @@ -2681,8 +2648,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "عام" @@ -2691,29 +2658,29 @@ msgid "General Settings" msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "German" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "أكبر من" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2729,7 +2696,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2749,11 +2716,11 @@ msgstr "اليمين أخضر" msgid "Guitar" msgstr "غيتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "هاك" @@ -2761,7 +2728,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -2773,7 +2740,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "مساعدة" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2794,11 +2761,11 @@ msgstr "" msgid "Hide" msgstr "إخÙاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "إخÙاء مؤشر الماوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2823,11 +2790,11 @@ msgstr "إعدادات الاختصارات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -2835,12 +2802,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "ويموت هجين" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2849,11 +2816,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -2873,7 +2840,7 @@ msgstr "IR حساسية:" msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2881,7 +2848,7 @@ msgstr "مجلد الايزو" msgid "ITALY" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr " أيقونة" @@ -2898,7 +2865,7 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2908,11 +2875,11 @@ msgstr "" "لجعلها Ùعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "تجاهل تنسيق التغييرات " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2926,7 +2893,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2940,7 +2907,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Ø­Ùظ استيراد" @@ -2964,7 +2931,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2976,16 +2943,6 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"يحسن الأداء لكن يؤدي الى اختÙاء الإضاءة ÙÙŠ معظم الألعاب.\n" -"\n" -"إذا لم تكن متأكدا ترك هذا غير محددة." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "تتعطل ÙÙŠ اللعبة" @@ -3015,7 +2972,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -3023,11 +2980,11 @@ msgstr "SD Card ادرج " msgid "Insert name here.." msgstr "أدخل اسم هنا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -3036,42 +2993,42 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "واجهة الإعدادات" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3080,15 +3037,15 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "حاول تحميل الحالة مرة أخرى" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" @@ -3101,7 +3058,7 @@ msgstr "تتعطل ÙÙŠ المقدمة" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "قيمة غير صالحة!" @@ -3114,7 +3071,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "غير صالح نوع الحدث %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "مل٠غير صالح" @@ -3126,29 +3083,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italian" @@ -3156,16 +3113,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" @@ -3173,7 +3130,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3184,7 +3141,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3193,8 +3150,8 @@ msgstr "" msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3212,16 +3169,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "الكتابة Ùوق آخر حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "آخر حالة محÙوظة" @@ -3256,11 +3213,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " @@ -3268,7 +3225,7 @@ msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" @@ -3312,20 +3269,20 @@ msgstr "7 تحميل حالة" msgid "Load State Slot 8" msgstr "8 تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3339,15 +3296,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوÙرة." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Lock Threads to Cores" @@ -3359,16 +3312,32 @@ msgstr "سجل" msgid "Log Configuration" msgstr "سجل الإعدادات" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع السجل" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"عرض عدد الإطارات ÙÙŠ الثانية المقدمة كمقياس لسرعة المضاهاة.\n" +"\n" +"إذا لم تكن متأكدا اترك هذا غير محددة." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "مختلÙان النواتج" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "تسجيل" @@ -3376,10 +3345,6 @@ msgstr "تسجيل" msgid "Lost connection to server!" msgstr "إنقطع الإتصال الملقم!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3395,8 +3360,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3426,7 +3391,7 @@ msgstr "بطاقة الذاكرة لديه بالÙعل باستثناء هذا msgid "Memcard already opened" msgstr "بطاقة الذاكرة Ùتحت بالÙعل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "ذاكرة بايت" @@ -3475,11 +3440,11 @@ msgstr "الميكروÙون" msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3488,7 +3453,7 @@ msgstr "إعدادات منوعة" msgid "Modifier" msgstr "معدل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3513,7 +3478,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3543,11 +3508,11 @@ msgstr "" "كتم صوت الويموت بإصلاح الانقطاع العشوائي على الويموت الحقيقي. أي تأثير على " "الويموت يحتذى به." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3641,28 +3606,28 @@ msgstr "Ùوق" msgid "Name:" msgstr "الاسم :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "الاسم :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI files(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "الصÙحة التالية" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "البحث التالي" @@ -3683,8 +3648,8 @@ msgstr "لم يتم العثور على الايزو " msgid "No banner file found for title %s" msgstr "لم يتم العثور على مل٠البنر %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3692,7 +3657,7 @@ msgstr "" msgid "No docking" msgstr "لا الالتحام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "لا يوجد مل٠تحميل" @@ -3700,7 +3665,7 @@ msgstr "لا يوجد مل٠تحميل" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "لا مل٠مسجل" @@ -3714,20 +3679,20 @@ msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "لا يساوي" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "غير متصل" @@ -3752,7 +3717,7 @@ msgstr "إشعار" msgid "Num Lock" msgstr "ارقام القÙÙ„" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "عدد من رموز :" @@ -3765,15 +3730,15 @@ msgstr "ننشوك" msgid "Nunchuk Acceleration" msgstr "تسريع ننشوك" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "الهدÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "إيقاÙ" @@ -3781,26 +3746,30 @@ msgstr "إيقاÙ" msgid "Offset:" msgstr "تعويض :" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Ùقط %d كتل متاحة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Ùتح الملÙ" @@ -3818,22 +3787,14 @@ msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "ÙŠÙتح المصحح" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "ÙŠÙتح المسجل" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3853,8 +3814,8 @@ msgstr "" "انقر بالزر الأيمن للتصدير كاÙØ© Ø­Ùظ,\n" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "أخرى" @@ -3870,7 +3831,7 @@ msgstr "" msgid "Output" msgstr "الإخراج" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "تشغيل التسجيل" @@ -3915,17 +3876,21 @@ msgstr "قسم %i" msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "وقÙØ©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" @@ -3938,10 +3903,10 @@ msgstr "مثالية" msgid "Perspective %d" msgstr "مشهد %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "بدأ اللعبه" @@ -3959,7 +3924,7 @@ msgstr "بدأ/ايقاÙ" msgid "Playable" msgstr "قابلة للتشغيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "خيارات التشغيل" @@ -3967,7 +3932,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3979,23 +3944,23 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "تحكم 4" @@ -4004,29 +3969,29 @@ msgstr "تحكم 4" msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4039,11 +4004,11 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "القيمة السابقة" @@ -4059,7 +4024,7 @@ msgstr "المل٠الشخصي" msgid "Properties" msgstr "خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "إزالة التخزين المؤقت" @@ -4086,7 +4051,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4103,7 +4068,7 @@ msgstr "قوه" msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "حقيقي" @@ -4115,7 +4080,7 @@ msgstr "ويموت حقيقي " msgid "Real Wiimotes" msgstr "ويموت حقيقي " -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "إعادة توصيل تأكيد ويموت" @@ -4123,17 +4088,17 @@ msgstr "إعادة توصيل تأكيد ويموت" msgid "Reconnect Wiimote on State Loading" msgstr "إعادة تحميل حالة ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "تسجيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "تسجيل معلومات" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "تسجيل الخيارات" @@ -4149,7 +4114,7 @@ msgstr "اليسار أحمر" msgid "Red Right" msgstr "اليمين أحمر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4164,7 +4129,7 @@ msgstr "" "إذا لم تكن متأكدا حدد لا شيء." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "تحديث" @@ -4174,18 +4139,18 @@ msgstr "تحديث" msgid "Refresh List" msgstr "تحديث قائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "إزالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4195,7 +4160,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" @@ -4205,7 +4170,7 @@ msgstr "تقدم إلى الشاشة الرئيسية" msgid "Reset" msgstr "إعادة ضبط" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "النتائج" @@ -4227,33 +4192,33 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "آمنة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "معدل العينة :" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI Ø­Ùظ باسم " @@ -4297,7 +4262,7 @@ msgstr "7 Ø­Ùظ حالة" msgid "Save State Slot 8" msgstr "8 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Ø­Ùظ حالة" @@ -4306,24 +4271,24 @@ msgstr "Ø­Ùظ حالة" msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" @@ -4340,7 +4305,7 @@ msgstr "بحث ايزو" msgid "Scanning..." msgstr "Ùحص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "التقاط صوره" @@ -4348,25 +4313,25 @@ msgstr "التقاط صوره" msgid "Scroll Lock" msgstr "انتقل تأمين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "بحث عن اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4381,16 +4346,16 @@ msgstr "" msgid "Select" msgstr "حدد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4408,23 +4373,23 @@ msgstr "اختر Ø­Ùظ مل٠للاستيراد" msgid "Select floating windows" msgstr "اختر النواÙØ° العائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4446,7 +4411,7 @@ msgstr "" msgid "Selected font" msgstr "تحديد الخط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4462,7 +4427,7 @@ msgstr "" "إذا لم تكن متأكدا، استخدم دقة سطح المكتب.\n" "إذا لم تكن متأكدا من ذلك ØŒ استخدم أعلى دقة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4490,11 +4455,11 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" @@ -4503,16 +4468,16 @@ msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4537,55 +4502,55 @@ msgstr "الاسم المختصر :" msgid "Shoulder Buttons" msgstr "أزرار الكتÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "اظهار &لوحة المراقبة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "اظهار السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "عرض شريط الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "أظهر شريط الأدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "أظهر عدد الاطارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "كوريا" @@ -4593,47 +4558,47 @@ msgstr "كوريا" msgid "Show Language:" msgstr "أظهر اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "عرض سجل الاعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "اوروبا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "عرض الاجهزه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "إظهار الإحصاءات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "امريكا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Wad اظهار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وق٠اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4643,27 +4608,39 @@ msgstr "" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "إظهار Ø­Ùظ التعليقات" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "إظهار كتل Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "إظهار أيقونة الحÙظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "إظهارعنوان الحÙظ " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4674,15 +4651,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "إظهار رسالة المساعدة" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4696,7 +4669,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4704,19 +4677,19 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4727,7 +4700,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4743,17 +4716,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B خانة " @@ -4776,11 +4749,11 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "إعدادات الصوت" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "غير صالحة %s خلÙية الصوت." @@ -4795,8 +4768,8 @@ msgid "Space" msgstr "مجال" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spanish" @@ -4804,7 +4777,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "مكبر الصوت:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4824,10 +4797,6 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد 528*640 ." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "حدد الخلÙية مل٠Ùيديو" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -4846,11 +4815,11 @@ msgstr "وحدة تحكم القياسية" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "بدء &اللعب عبر الشبكة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "بدء التسجيل" @@ -4872,15 +4841,15 @@ msgstr "Ø­Ùظ الحالة" msgid "Stick" msgstr "عصا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4894,7 +4863,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "امتداد لناÙذة" @@ -4919,8 +4888,8 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "نظام اللغة :" @@ -4928,7 +4897,7 @@ msgstr "نظام اللغة :" msgid "TAIWAN" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "الإدخال" @@ -4949,8 +4918,8 @@ msgstr "الجدول الأيسر" msgid "Table Right" msgstr "الجدول الأيمن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4964,15 +4933,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "اختبار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "" @@ -4988,13 +4957,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5033,7 +5002,7 @@ msgstr "يمكن أن يكون اسم لا تحتوي على الأحر٠'ØŒ'" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5050,7 +5019,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Ø­Ùظ تحاول نسخة له حجم مل٠غير صالح" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5082,15 +5051,15 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "ثيم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "اختيار ثيم خاظئ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5102,17 +5071,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "تجاوز هذه الإعدادات إعدادات دولÙين الأساسية ." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5131,7 +5100,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5152,13 +5121,13 @@ msgstr "بداية" msgid "Tilt" msgstr "إمالة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "العنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "إلى" @@ -5166,18 +5135,18 @@ msgstr "إلى" msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -5199,7 +5168,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5224,7 +5193,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "غير معروÙ" @@ -5252,24 +5221,24 @@ msgstr "" "decrypted code. Make sure you typed it correctly.\n" "هل ترغب ÙÙŠ تجاهل هذا الخط ØŒ ومواصلة تحليل?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "غير محدود %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "التراجع عن تحميل الحالة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "غير معروÙ" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -5294,7 +5263,7 @@ msgstr "" msgid "Up" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "التحديث" @@ -5303,23 +5272,23 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "استخدام شاشة كاملة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5332,7 +5301,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5346,15 +5315,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Ùائدة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "القيمة" @@ -5362,7 +5331,7 @@ msgstr "القيمة" msgid "Value:" msgstr "القيمة:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "القيمة:" @@ -5374,11 +5343,11 @@ msgstr "" msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "الصوت" @@ -5393,7 +5362,7 @@ msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" msgid "WAD installation failed: error creating ticket" msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5434,7 +5403,7 @@ msgstr "" "%s\n" "هل ترغب ÙÙŠ الاستمرار?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5447,7 +5416,7 @@ msgstr "" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5455,7 +5424,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5463,7 +5432,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5491,7 +5460,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5499,7 +5468,7 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "الوي" @@ -5507,15 +5476,15 @@ msgstr "الوي" msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5524,7 +5493,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: لا يمكن القراءة من الملÙ" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "تحكم الوي" @@ -5533,7 +5502,7 @@ msgstr "تحكم الوي" msgid "Wiimote %i" msgstr "ويموت %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5546,7 +5515,7 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "ويموت متصل" @@ -5554,7 +5523,7 @@ msgstr "ويموت متصل" msgid "Wiimote Motor" msgstr "محرك ويموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "إعدادات ويموت" @@ -5578,10 +5547,10 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "العمل" @@ -5617,7 +5586,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5639,11 +5608,11 @@ msgstr "لا يمكنك إغلاق أجزاء الصÙحات التي Ùيها." msgid "You must choose a game!!" msgstr "عليك اختيار لعبة!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "يجب إدخال اسم!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "يجب إدخال صالح العشري، أو الست عشرية قيمة ثماني." @@ -5651,7 +5620,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -5676,11 +5645,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP هاك" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5690,7 +5659,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[انتظار]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5706,7 +5675,7 @@ msgstr "" msgid "[Custom]" msgstr "[مخصص]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5724,7 +5693,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5742,7 +5711,7 @@ msgstr "" msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5769,7 +5738,7 @@ msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التق msgid "not a wii save or read failure for file header size %x" msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان المل٠%x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5778,7 +5747,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5862,6 +5831,17 @@ msgstr "أو" #~ "the EFB scale.\n" #~ "ومن الأÙضل Ù„ تعيين نسبة العرض إلى الارتÙاع لتمتد عند استخدامه." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا التحقق." + #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -5932,9 +5912,24 @@ msgstr "أو" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "تعطيل إضاءة" + +#~ msgid "Disable Textures" +#~ msgstr "Texturesتعطيل " + #~ msgid "Disable Wiimote Speaker" #~ msgstr "تعطيل سماعات ويموت" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "texturing تعطل .\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا غير محددة." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6073,6 +6068,9 @@ msgstr "أو" #~ msgid "Error opening file %s for recording" #~ msgstr "Error al abrir el archivo %s para grabación." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "للخروج مع المحاكي" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6086,6 +6084,9 @@ msgstr "أو" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps سريع" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6133,6 +6134,15 @@ msgstr "أو" #~ "Si un juego se tilda, y anda sólamente en el Intérprete, o Dolphin tiene " #~ "errores, esta opción puede arreglar el juego." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "يحسن الأداء لكن يؤدي الى اختÙاء الإضاءة ÙÙŠ معظم الألعاب.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا ترك هذا غير محددة." + #~ msgid "Input Source" #~ msgstr "مدخلات المصدر" @@ -6177,6 +6187,9 @@ msgstr "أو" #~ "Cargar los mipmaps nativos es la emulación mas precisa, pero puede " #~ "empeorar el rendimiento(los resultados pueden variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "الكتابة إلى وحدة التحكم" @@ -6213,6 +6226,12 @@ msgstr "أو" #~ msgid "OpenGL" #~ msgstr "Ùتح" +#~ msgid "Opens the debugger" +#~ msgstr "ÙŠÙتح المصحح" + +#~ msgid "Opens the logger" +#~ msgstr "ÙŠÙتح المسجل" + #, fuzzy #~ msgid "Plugins" #~ msgstr "Polish" @@ -6298,6 +6317,9 @@ msgstr "أو" #~ msgid "Show the number of frames rendered per second." #~ msgstr "إظهار عدد الإطارات المقدمة ÙÙŠ الثانية الواحدة" +#~ msgid "Show this help message" +#~ msgstr "إظهار رسالة المساعدة" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6340,6 +6362,9 @@ msgstr "أو" #~ "Las otras opciones son resoluciones fijas para elegir una calidad visual " #~ "independiente del tamaño del Display." +#~ msgid "Specify a video backend" +#~ msgstr "حدد الخلÙية مل٠Ùيديو" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "حدد الخلÙية مل٠Ùيديو" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 341b91946e..2ed147917d 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-08-19 08:36-0500\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -22,7 +22,7 @@ msgstr "" "X-Language: ca_ES\n" "X-Source-Language: C\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(masses per ensenyar)" @@ -50,7 +50,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -60,9 +60,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -159,7 +159,7 @@ msgstr "%sExportar com a GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" @@ -168,147 +168,147 @@ msgstr "%u blocs lliures; %u Entrades Lliures" msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Sobre ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Arrencar des de la unitat de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Punts d'interrupció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Cerca ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Gestor de &Trucs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Arxiu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Abança imatge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "Configuració de &gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Configuració de &tecles d'accés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Càrrega estat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Administrador de targeta de memòria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Obrir ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opcions" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Modalitat de només &lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&So" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Aturar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Visualitza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -324,27 +324,27 @@ msgstr "(-) + ZAprop" msgid "(UNKNOWN)" msgstr "(DESCONEGUT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(Deshabilitat)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bits" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bits" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bits" @@ -352,7 +352,7 @@ msgstr "8 bits" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -365,11 +365,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -378,8 +378,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Una finestra de «NetPlay» ja és oberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "No s'està executant cap joc actualment." @@ -431,7 +431,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-placa base" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Codis AR " @@ -444,7 +444,7 @@ msgstr "Sobre Dolphin" msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Precisió:" @@ -452,7 +452,7 @@ msgstr "Precisió:" msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -487,7 +487,7 @@ msgstr "" "Codi culpable: \n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -495,7 +495,7 @@ msgstr "" "Error d' «Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a codi afegit " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -503,7 +503,7 @@ msgid "" msgstr "" "Error d'«Action Replay»: Mida no vàlida (%08x: Adreça = %08X) a emplenar (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -512,7 +512,7 @@ msgstr "" "Error d' «Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a escriure i " "farciment de RAM (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -521,13 +521,13 @@ msgstr "" "Error d'«Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a l'escriure " "al punter (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error d'«Action Replay»: Valor no vàlid (%08x) en la copia de memòria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -540,27 +540,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error d'«Action Replay»: línia de codi AR no vàlida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "«Action Replay»: Codi condicional: Mida no vàlida %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipus de codi Normal no vàlid %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Codi Normal %i: %08x subtipus invàlid (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Codi Normal 0: Subtipus no vàlid %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adaptador:" @@ -569,11 +569,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -583,7 +583,7 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Afegir ..." @@ -631,38 +631,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar la pressió de control analògic per activar els botons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuració avançada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" @@ -670,9 +670,10 @@ msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -687,15 +688,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtrat anisotròpic:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -707,15 +708,15 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -725,7 +726,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Àrab" @@ -734,7 +735,7 @@ msgstr "Àrab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -742,13 +743,13 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -756,12 +757,12 @@ msgstr "Relació d'aspecte:" msgid "At least one pane must remain open." msgstr "Almenys un panell ha de romandre obert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -769,24 +770,24 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (Mida de la finestra)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Ajust automàtic de la mida de la finestra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -796,24 +797,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Generar automàticament mipmaps en contes de descodificar-lo des de la " -"memòria.\n" -"Incrementa el rendiment una mica, però pot causar defectes de textura.\n" -"\n" -"Si no n'esteu segur, deixeu-ho desmarcat." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registres" @@ -822,12 +810,12 @@ msgstr "&Registres" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuració del Suport" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Suport:" @@ -844,7 +832,7 @@ msgstr "Suport" msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Imatge" @@ -861,11 +849,11 @@ msgstr "Imatge:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -877,7 +865,7 @@ msgstr "Baix" msgid "Block Allocation Table checksum failed" msgstr "La comprovació de la «checksum» de la taula de blocs ha fallat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocs" @@ -894,7 +882,7 @@ msgid "Blue Right" msgstr "Blau dret" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Abaix" @@ -907,7 +895,7 @@ msgstr "Controls enllaçats: %lu" msgid "Broken" msgstr "Trencat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Examinar" @@ -915,11 +903,11 @@ msgstr "Examinar" msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -933,7 +921,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -945,19 +933,19 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -979,7 +967,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -1000,7 +988,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancel·lar" @@ -1016,7 +1004,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1027,7 +1015,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1035,18 +1023,18 @@ msgstr "" "No es pot usar aquest arxiu com una targeta de memòria. \n" "Està tractant d'usar el mateix arxiu en les dues ranures?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" @@ -1054,7 +1042,7 @@ msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Català" @@ -1066,7 +1054,7 @@ msgstr "Centre" msgid "Change" msgstr "Canviar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Canviar &Disc ..." @@ -1079,7 +1067,7 @@ msgstr "Canviar Disc" msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1095,8 +1083,8 @@ msgstr "Canvia el signe del paràmetre zLluny (després de correcció)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Canvia el signe del paràmetre zAprop (després de correcció)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" @@ -1108,7 +1096,7 @@ msgstr "Truc" msgid "Cheat Code" msgstr "Codi de trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Cerca trucs" @@ -1120,35 +1108,35 @@ msgstr "Administrador de trucs" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1156,7 +1144,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,8 +1152,8 @@ msgstr "" "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a " "partir de només els directoris)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1192,22 +1180,22 @@ msgstr "" "Client desconnectat mentre el joc s'estava executant! NetPlay s'ha " "desactivat. Haurà d'aturar manualment el joc." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Tancar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "&Configurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Codi d'Informació" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Codi:" @@ -1215,7 +1203,7 @@ msgstr "Codi:" msgid "Command" msgstr "Comanda" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentari" @@ -1223,20 +1211,20 @@ msgstr "Comentari" msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Comprimeix ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configuració" @@ -1255,17 +1243,17 @@ msgstr "Configurar Control" msgid "Configure Pads" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" @@ -1274,11 +1262,11 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Connectar Wiimote %i" @@ -1303,7 +1291,7 @@ msgstr "Connectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Connectant ..." @@ -1323,7 +1311,7 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" @@ -1337,7 +1325,7 @@ msgstr "Nucli" msgid "Could not create %s" msgstr "No s'ha pogut crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "No s'ha pogut inicialitzar el suport %s." @@ -1372,7 +1360,7 @@ msgstr "" "executant actualment! \n" "(Configurar els controls mentre el joc s'executa no està actualment suportat)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1385,11 +1373,11 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1397,8 +1385,8 @@ msgstr "" "No s'ha pogut inicialitzar el nucli. \n" "Verifiqueu la configuració." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Compta:" @@ -1406,8 +1394,8 @@ msgstr "Compta:" msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Crear Codi AR" @@ -1416,21 +1404,21 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Creat per KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Creat per VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" @@ -1442,11 +1430,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Retallar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1460,7 +1448,7 @@ msgstr "" msgid "Crossfade" msgstr "Atenuar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directori actual ha canviat de %s a %s després de wxFileSelector!" @@ -1477,11 +1465,11 @@ msgstr "Configuració de la projecció personalitzada" msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Txec" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1489,36 +1477,36 @@ msgstr "" msgid "D-Pad" msgstr "Direcció digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1530,7 +1518,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Mida de dades" @@ -1538,8 +1526,8 @@ msgstr "Mida de dades" msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Arxius Datel MaxDrive/Pro (*. sav)" @@ -1555,7 +1543,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Depuració" @@ -1563,16 +1551,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1580,7 +1568,7 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1593,7 +1581,7 @@ msgstr "Font per defecte" msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1602,7 +1590,7 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Descripció" @@ -1623,8 +1611,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1648,28 +1636,20 @@ msgstr "" "Ha fallat la suma de comprovació\n" "i també ha fallat la comprovació de la suma de la copia del directory" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deshabilitar l'il·luminació" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Deshabilitar la profunditat per-pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deshabilitar Textures" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1684,7 +1664,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1700,16 +1680,6 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar textures.\n" -"\n" -"Si no n'esteu segur, deixeu-ho desmarcat." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disc" @@ -1719,11 +1689,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Error de lectura de disc" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1737,20 +1707,20 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuració de gràfics de Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Lloc &Web Dolphin" @@ -1762,16 +1732,16 @@ msgstr "Configuració de Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuració de Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1779,7 +1749,7 @@ msgstr "Dolphin Pel·lícules TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuració Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" @@ -1821,23 +1791,23 @@ msgstr "Tambors" msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Bolcat de textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1848,7 +1818,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1858,7 +1828,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1869,23 +1839,23 @@ msgstr "" "Si no n'esteu segur, deixeu-ho desmarcat." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holandès" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Sortir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "Còpies EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1899,11 +1869,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Actualitzacions recents de memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Edita" @@ -1919,7 +1889,7 @@ msgstr "Modificar configuració" msgid "Edit Patch" msgstr "Modificar el pagat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Modificar perspectiva actual" @@ -1932,15 +1902,15 @@ msgstr "Modificació ..." msgid "Effect" msgstr "Efecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "El fil de l'emulador ja s'està executant" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1954,7 +1924,7 @@ msgstr "" "\n" "Si no n'esteu segur, activeu l'emulació virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1982,7 +1952,7 @@ msgstr "Estat d'emulació:" msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1999,7 +1969,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" @@ -2015,11 +1985,11 @@ msgstr "Habilitar fusió de Bloc" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Habilitar memòria cau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Activar Trucs" @@ -2027,11 +1997,11 @@ msgstr "Activar Trucs" msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" @@ -2039,7 +2009,7 @@ msgstr "Activar tecles d'accés ràpid" msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" @@ -2048,11 +2018,11 @@ msgid "Enable MMU" msgstr "Habilitar MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" @@ -2060,11 +2030,11 @@ msgstr "Habilitar el protector de pantalla" msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Habilitar malla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2084,11 +2054,11 @@ msgstr "" "Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " "ràpid, Desactivat = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Habilitar pàgines" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2100,7 +2070,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2134,7 +2104,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2154,7 +2124,7 @@ msgstr "" "Activa la memòria de la Unitat de Gestió, necessari per a alguns jocs. " "(Activat = compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2169,13 +2139,13 @@ msgid "End" msgstr "Fi" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Anglès" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Millores" @@ -2193,17 +2163,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " @@ -2243,10 +2213,6 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sortir de Dolphin amb emulador" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Fallada d'exportació" @@ -2260,19 +2226,19 @@ msgstr "Exportar fitxer" msgid "Export Recording" msgstr "Exportar gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2280,7 +2246,7 @@ msgstr "Exportar totes les partides desades" msgid "Export failed, try again?" msgstr "Exportació fallada, intenteu de nou?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Desar exportació com a..." @@ -2288,7 +2254,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2324,28 +2290,28 @@ msgstr "Extreure arxiu ..." msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extraient ..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2369,7 +2335,7 @@ msgstr "Error a l'escoltar!" msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2487,33 +2453,29 @@ msgstr "No s'ha pogut escriure la capçalera per %s" msgid "Failed to write header for file %d" msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps ràpids" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Jugador fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "informació del fitxer" @@ -2559,43 +2521,43 @@ msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forçar Filtrat de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2608,7 +2570,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2620,7 +2582,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2642,17 +2604,17 @@ msgstr "" msgid "Forward" msgstr "Endavant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Imatge" @@ -2661,38 +2623,38 @@ msgstr "Imatge" msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Rang d'imatges" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit d'imatges/s:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Visió lliure" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francès" @@ -2700,20 +2662,20 @@ msgstr "Francès" msgid "Frets" msgstr "Trasts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "de" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Pantalla completa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Resolució de pantalla a pantalla completa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Arxiu de GCI (*.gci)" @@ -2722,11 +2684,11 @@ msgstr "Arxiu de GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2754,24 +2716,28 @@ msgstr "Configuració de jocs específics" msgid "GameConfig" msgstr "Configuració de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Codis Gecko" @@ -2789,8 +2755,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "General" @@ -2799,31 +2765,31 @@ msgid "General Settings" msgstr "Configuració General" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Alemany" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "Aconseguir codi AR: l'índex és major que la grandària de la llista de codis " "%lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Més gran que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2841,7 +2807,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grec" @@ -2861,11 +2827,11 @@ msgstr "Verd dret" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "S'ha cridat HCI_CMD_INQUIRY , si us plau informeu!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Modificacions" @@ -2873,7 +2839,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -2885,7 +2851,7 @@ msgstr "Alçada" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2906,11 +2872,11 @@ msgstr "" msgid "Hide" msgstr "Oculta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Ocultar el cursor del ratolí" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2935,11 +2901,11 @@ msgstr "Tecla d'accés de configuració" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongarès" @@ -2947,14 +2913,14 @@ msgstr "Hongarès" msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Ha Tractat d'obtenir dades d'un bitllet desconegut:%08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2967,11 +2933,11 @@ msgstr "" "TitleID %016llx. \n" "Probablement Dolphin es penjarà ara." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -2991,7 +2957,7 @@ msgstr "Sensibilitat d'IR:" msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -2999,7 +2965,7 @@ msgstr "Directoris ISO:" msgid "ITALY" msgstr "ITÀLIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icona" @@ -3016,7 +2982,7 @@ msgstr "" "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = compatible, " "Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3027,11 +2993,11 @@ msgstr "" "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " "so DSP per a fer-ho efectiu." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignora els canvis de format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3045,7 +3011,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3059,7 +3025,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Desar importació" @@ -3087,7 +3053,7 @@ msgstr "" "L'Arxiu importat té extensio sav \n" "però la capçalera és incorrecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3099,17 +3065,6 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Millora el rendiment, però causa la desaparició de l'il·luminació en alguns " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desactivat." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "En Joc" @@ -3139,7 +3094,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3147,11 +3102,11 @@ msgstr "Inserir la targeta SD" msgid "Insert name here.." msgstr "Introduïu un nom aquí .." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3162,42 +3117,42 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Configuració d'interfície" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Error intern LZO - la compressió ha fallat" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3206,15 +3161,15 @@ msgstr "" "Error intern LZO - descompressió fallada (% d) (%li, %li) \n" "Intenteu carregar l'estat de nou" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error intern LZO - lzo_init () ha fallat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" @@ -3227,7 +3182,7 @@ msgstr "Introducció" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Mida no vàlida (%x) o paraula màgica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Valor invàlid!" @@ -3240,7 +3195,7 @@ msgstr "Invàlid bat.map o entrada al directori" msgid "Invalid event type %i" msgstr "Tipus d'esdeveniment invàlid %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Arxiu invàlid" @@ -3255,29 +3210,29 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Estat invàlid" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italià" @@ -3285,16 +3240,16 @@ msgstr "Italià" msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonès" @@ -3302,7 +3257,7 @@ msgstr "Japonès" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3313,7 +3268,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3322,8 +3277,8 @@ msgstr "" msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Corea" @@ -3341,16 +3296,16 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Últim estat sobreescrit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Últim estat desat" @@ -3390,11 +3345,11 @@ msgstr "" "Clic Esquerra/Dreta per més opcions. \n" "Clic Mig per deshabilitar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar per FPS " @@ -3402,7 +3357,7 @@ msgstr "Limitar per FPS " msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" @@ -3446,20 +3401,20 @@ msgstr "Carregar ranura d'estat 7" msgid "Load State Slot 8" msgstr "Carregar ranura d'estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3473,15 +3428,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carrega els valors preestablerts dels patrons disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloca els fils d'execució als nuclis" @@ -3493,16 +3444,33 @@ msgstr "Registre Log" msgid "Log Configuration" msgstr "Configuració del registre Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipus de registre Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostrar el nombre d'imatges rendaritzades per segon FPS com a mesura de la " +"velocitat d'emulació.\n" +"\n" +"Si no n'esteu segurs, deixeu-ho desmarcat." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sortides del registrador Log" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Inici de sessió" @@ -3510,10 +3478,6 @@ msgstr "Inici de sessió" msgid "Lost connection to server!" msgstr "Perdut la connexió amb el servidor!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Baix nivell (LLE) o alt nivell (HLE) d'àudio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botó M" @@ -3531,8 +3495,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arxius MadCatz Gameshark (*.gcs)" @@ -3562,7 +3526,7 @@ msgstr "La targeta de memòria ja té una entrada amb aquest títol." msgid "Memcard already opened" msgstr "Targeta de memòria ja oberta." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Byte de memòria" @@ -3614,11 +3578,11 @@ msgstr "Micròfon" msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3627,7 +3591,7 @@ msgstr "Altres Configuracions" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3652,7 +3616,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3683,11 +3647,11 @@ msgstr "" "Silencia l'altaveu del «Wiimote». Arregla desconnexions aleatòries en " "«wiimotes» reals. No afecta els «wiimotes» emulats." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3781,28 +3745,28 @@ msgstr "NP Amunt" msgid "Name:" msgstr "Nom:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Arxius natius GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Pàgina següent" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Següent escaneig" @@ -3823,8 +3787,8 @@ msgstr "No s'han trobat ISOs o WADs" msgid "No banner file found for title %s" msgstr "No s'ha trobat l'arxiu «banner» per el joc %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3832,7 +3796,7 @@ msgstr "" msgid "No docking" msgstr "No acoblament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "No s'ha carregat cap fitxer" @@ -3840,7 +3804,7 @@ msgstr "No s'ha carregat cap fitxer" msgid "No free dir index entries" msgstr "No hi ha entrades lliures a l'índex de directoris" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Arxiu no enregistrat" @@ -3854,20 +3818,20 @@ msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "No està connectat" @@ -3892,7 +3856,7 @@ msgstr "Avís" msgid "Num Lock" msgstr "Bloq Numèric" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Nombre de codis:" @@ -3905,15 +3869,15 @@ msgstr "Nunchukâ„¢" msgid "Nunchuk Acceleration" msgstr "Acceleració del Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objecte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Apagar" @@ -3921,26 +3885,30 @@ msgstr "Apagar" msgid "Offset:" msgstr "Desplaçament:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Només queden %d blocs disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Obre fitxer ..." @@ -3958,22 +3926,14 @@ msgstr "OpenAL: no es poden trobar dispositius de so" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no es pot obrir el dispositiu %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Obre el depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Obre el registrador Log" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3993,8 +3953,8 @@ msgstr "" "Feu clic dret i exporteu totes les partides desades,\n" "i importeu les partides desades una targeta de memòria nova\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Altres" @@ -4010,7 +3970,7 @@ msgstr "" msgid "Output" msgstr "Sortida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "&Reproduir gravació..." @@ -4055,17 +4015,21 @@ msgstr "Partició %i" msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" @@ -4078,10 +4042,10 @@ msgstr "Perfecte" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Executar" @@ -4099,7 +4063,7 @@ msgstr "Reproduir/Pausa" msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opcions de reproducció" @@ -4107,7 +4071,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4119,23 +4083,23 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4144,29 +4108,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4179,11 +4143,11 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valor anterior" @@ -4199,7 +4163,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Netejar memòria cau" @@ -4226,7 +4190,7 @@ msgstr "Botó R" msgid "R-Analog" msgstr "R-Analògic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4243,7 +4207,7 @@ msgstr "Rang" msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Real" @@ -4255,7 +4219,7 @@ msgstr "Wiimote real" msgid "Real Wiimotes" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar tornar a connectar el Wiimote" @@ -4263,17 +4227,17 @@ msgstr "Confirmar tornar a connectar el Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Tornar a connectar el Wiimote al carregar l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Enregistrar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Informació d'enregistrament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Enregistrant Opcions" @@ -4289,7 +4253,7 @@ msgstr "Vermell Esquerra" msgid "Red Right" msgstr "Vermell Dret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4305,7 +4269,7 @@ msgstr "" "Si no n'esteu segurs, seleccioneu Cap" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualitzar" @@ -4315,18 +4279,18 @@ msgstr "Actualitzar" msgid "Refresh List" msgstr "Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Treure" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4336,7 +4300,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" @@ -4346,7 +4310,7 @@ msgstr "Renderitzar a la finestra principal" msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultats" @@ -4368,33 +4332,33 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar DSP LLE en un fil d'execució dedicat (no recomanat)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rússia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Segur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Freqüència de mostreig:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Anomena i desa GCI..." @@ -4438,7 +4402,7 @@ msgstr "Desar ranura estat 7" msgid "Save State Slot 8" msgstr "Desar ranura estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Desar Estat ..." @@ -4447,24 +4411,24 @@ msgstr "Desar Estat ..." msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" @@ -4481,7 +4445,7 @@ msgstr "Cercant ISOs" msgid "Scanning..." msgstr "Cercant ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Capturar" @@ -4489,25 +4453,25 @@ msgstr "Capturar" msgid "Scroll Lock" msgstr "Bloc desplaçament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Cerca trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4522,16 +4486,16 @@ msgstr "La secció %s no trobada a SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4548,23 +4512,23 @@ msgstr "Seleccioneu un arxiu de salvar la importació" msgid "Select floating windows" msgstr "Seleccioneu finestres flotants" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4586,7 +4550,7 @@ msgstr "" msgid "Selected font" msgstr "Font seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4602,7 +4566,7 @@ msgstr "" "Si no n'esteu segurs, utilitzeu la resolució de l'escriptori.\n" "Si encara no n'esteu segurs, utilitzeu la resolució més alta que us funciona." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4630,11 +4594,11 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4645,16 +4609,16 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4681,55 +4645,55 @@ msgstr "Nom curt:" msgid "Shoulder Buttons" msgstr "Botons LR" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Mostrar &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Mostrar Barra d'e&stat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Mostrar Barra d'&eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Mostra FPS (imatges/s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Mostrar Itàlia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Mostrar Japó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Mostrar Corea" @@ -4737,47 +4701,47 @@ msgstr "Mostrar Corea" msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Mostrar la &Configuració del registre de log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Mostrar Plataformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Mostrar estadístiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar un missatge de confirmació abans d'aturar el joc." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4787,27 +4751,39 @@ msgstr "" "Deshabilitar d'això pot evitar els missatges molestos i no crítics, però " "també pot significar que Dolphin de sobte es pengi sense cap explicació." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostra desar un comentari" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Mostra títol desat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4819,15 +4795,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra aquest missatge d'ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Mostrar desconeguda" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4841,7 +4813,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Xinès simplificat" @@ -4849,19 +4821,19 @@ msgstr "Xinès simplificat" msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Salta l'accés d'EFB des de la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4873,7 +4845,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4890,17 +4862,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -4925,11 +4897,11 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configuració de so" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Suport de so %s invàlid." @@ -4944,8 +4916,8 @@ msgid "Space" msgstr "Espai" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Espanyol" @@ -4953,7 +4925,7 @@ msgstr "Espanyol" msgid "Speaker Volume:" msgstr "Volum de l'altaveu:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4974,10 +4946,6 @@ msgstr "" "\n" "Si no n'esteu segur, seleccioneu 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifiqueu un suport de vídeo." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -4996,11 +4964,11 @@ msgstr "Control estàndard" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Iniciar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Iniciar grava&ció" @@ -5022,15 +4990,15 @@ msgstr "Estats desats" msgid "Stick" msgstr "Palanca" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Aturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5044,7 +5012,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Ajustar a la finestra" @@ -5069,8 +5037,8 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5078,7 +5046,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5099,8 +5067,8 @@ msgstr "Taula esquerra" msgid "Table Right" msgstr "Taula dreta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5114,15 +5082,15 @@ msgstr "" msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5138,13 +5106,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5184,7 +5152,7 @@ msgstr "El nom no pot contenir el caràcter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El resultat del desxifratge el codi AR no conté cap línia." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5202,7 +5170,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "El fitxer de partida guardada que està intentant copiar té la mida invàlida" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5235,15 +5203,15 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Hi ha hagut un error a la selecció del tema visual." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5259,7 +5227,7 @@ msgstr "" "Aquesta configuració sobreescriu la configuració de Dolphin.\n" "Indeterminat vol dir que el joc utilitza el valor de Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5267,11 +5235,11 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5289,7 +5257,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5314,13 +5282,13 @@ msgstr "Llindar" msgid "Tilt" msgstr "Inclinació" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Títol" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "a" @@ -5328,18 +5296,18 @@ msgstr "a" msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Xinés tradicional" @@ -5363,7 +5331,7 @@ msgstr "" "Intentant de llegir des d'un SYSCONF invàlid \n" "identificadors de Wiimote bt no estan disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turc" @@ -5388,7 +5356,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONEGUT" @@ -5416,24 +5384,24 @@ msgstr "" "desenciptat vàlid. Assegureu-vos que l'heu escrit correctament.\n" "Voleu ignorar aquesta línia i continuar analitzant?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "%i Indefinit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Desfer la càrrega de l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Desconegut" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comanda de DVD desconeguda %08x - error crític" @@ -5459,7 +5427,7 @@ msgstr "" msgid "Up" msgstr "Amunt" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Actualitzar" @@ -5468,23 +5436,23 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Utilitzar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5497,7 +5465,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5512,15 +5480,15 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilitat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "Sincronització Vertical" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valor" @@ -5528,7 +5496,7 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valor:" @@ -5540,11 +5508,11 @@ msgstr "Verbositat" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" @@ -5559,7 +5527,7 @@ msgstr "instal·lació del WAD ha fallat: Error en crear %s" msgid "WAD installation failed: error creating ticket" msgstr "instal·lació del WAD ha fallat: Error en crear %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5601,7 +5569,7 @@ msgstr "" "%s \n" "Voleu continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5615,7 +5583,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5623,7 +5591,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5631,7 +5599,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5659,7 +5627,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5667,7 +5635,7 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5675,15 +5643,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5692,7 +5660,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No s'ha pogut llegir des de l'arxiu" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5701,7 +5669,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5714,7 +5682,7 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote connectat" @@ -5722,7 +5690,7 @@ msgstr "Wiimote connectat" msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Configuració de Wiimote" @@ -5746,10 +5714,10 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Treballant ..." @@ -5785,7 +5753,7 @@ msgstr "XAudio2 init ha fallat:%#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "La creació de la veu principal XAudio2 ha fallat:%#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5809,11 +5777,11 @@ msgstr "No pots tancar panells que tenen pàgines." msgid "You must choose a game!!" msgstr "Heu de triar un joc!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Heu d'introduir un nom!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." @@ -5821,7 +5789,7 @@ msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5848,11 +5816,11 @@ msgstr "" msgid "ZTP hack" msgstr "Modificador ZTP" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Codi Zero 3 no està suportat" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Codi Zero desconegut per Dolphin: %08x" @@ -5862,7 +5830,7 @@ msgstr "Codi Zero desconegut per Dolphin: %08x" msgid "[ waiting ]" msgstr "[ Esperant ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5878,7 +5846,7 @@ msgstr "" msgid "[Custom]" msgstr "[ Personalitzar ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5897,7 +5865,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5916,7 +5884,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5945,7 +5913,7 @@ msgstr "" "No és una partida guardada Wii o hi ha hagut un error de lectura de la mida " "de la capçalera del fitxer %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5954,7 +5922,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6011,6 +5979,18 @@ msgstr "| O" #~ "El millor és establir la relació d'aspecte perquè es pugui ajustar quant " #~ "s'utilitzi aquest." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Generar automàticament mipmaps en contes de descodificar-lo des de la " +#~ "memòria.\n" +#~ "Incrementa el rendiment una mica, però pot causar defectes de textura.\n" +#~ "\n" +#~ "Si no n'esteu segur, deixeu-ho desmarcat." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6047,9 +6027,24 @@ msgstr "| O" #~ msgid "Debug Only" #~ msgstr "Només per depuració" +#~ msgid "Disable Lighting" +#~ msgstr "Deshabilitar l'il·luminació" + +#~ msgid "Disable Textures" +#~ msgstr "Deshabilitar Textures" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar l'altaveu del «Wiimote»" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar textures.\n" +#~ "\n" +#~ "Si no n'esteu segur, deixeu-ho desmarcat." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6145,6 +6140,9 @@ msgstr "| O" #~ msgid "Error opening file %s for recording" #~ msgstr "Error a obrir el fitxer %s per a l'enregistrament" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sortir de Dolphin amb emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6154,6 +6152,9 @@ msgstr "| O" #~ "%s\n" #~ "Aquest fitxer és necessari per a utilitzar DSP LLE" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps ràpids" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6191,6 +6192,16 @@ msgstr "| O" #~ "Oculta el cursor quan està sobre la finestra de renderitzat i la finestra " #~ "de representació té el focus." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Millora el rendiment, però causa la desaparició de l'il·luminació en " +#~ "alguns jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desactivat." + #~ msgid "Input Source" #~ msgstr "Font d'entrada" @@ -6223,6 +6234,12 @@ msgstr "| O" #~ "Carregant mipmaps natius és un comportament més precís, però també podria " #~ "disminuir el rendiment." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Baix nivell (LLE) o alt nivell (HLE) d'àudio" + #~ msgid "" #~ "Modify textures to show the format they're using.\n" #~ "This is only useful for debugging purposes." @@ -6236,6 +6253,12 @@ msgstr "| O" #~ msgid "OK" #~ msgstr "Acceptar" +#~ msgid "Opens the debugger" +#~ msgstr "Obre el depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Obre el registrador Log" + #~ msgid "Overlay Information" #~ msgstr "Informació superposada" @@ -6301,6 +6324,9 @@ msgstr "| O" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra el nombre de d'imatges renderitzades per segon." +#~ msgid "Show this help message" +#~ msgstr "Mostra aquest missatge d'ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6333,6 +6359,9 @@ msgstr "| O" #~ "Les altres opcions són resolucions fixes per escollir la qualitat visual " #~ "independentment de la mida de la pantalla." +#~ msgid "Specify a video backend" +#~ msgstr "Especifiqueu un suport de vídeo." + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Començar renderitzat a pantalla completa" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 22c1d35917..ae5e829fb0 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-12-19 07:39+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(příliÅ¡ mnoho pro zobrazení)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%sExportovat GCI%s" msgid "%sImport GCI%s" msgstr "%sImportovat GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" @@ -160,147 +160,147 @@ msgstr "%u Volných Bloků; %u Volných Záznamů Adr" msgid "&& AND" msgstr "&& A" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "O Progr&amu..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Zavést z DVD Mechaniky..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Body pÅ™eruÅ¡ení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Procházet pro ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Správce &Cheatů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulace" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Soubor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Postup Snímkem" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Celá Obrazovka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Grafická Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&NápovÄ›da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Nastavení &Klávesových Zkratek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Nahrát Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "Správce Pa&měťových karet (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "Pa&měť" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Otevřít..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "V&olby" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Resetovat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "Za&stavit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "Nás&troje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Zobrazit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(vypnuto)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -344,7 +344,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" @@ -357,11 +357,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -370,8 +370,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay je už otevÅ™ené!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Hra v souÄasnosti neběží!" @@ -422,7 +422,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM Základní Deska" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Kódy AR" @@ -435,7 +435,7 @@ msgstr "O Dolphinu" msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "PÅ™esnost:" @@ -443,7 +443,7 @@ msgstr "PÅ™esnost:" msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -476,7 +476,7 @@ msgstr "" "Viníkem je Kód:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -484,7 +484,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -493,7 +493,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Naplnit a " "Sesunout (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -502,7 +502,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Ram Zápisu A " "NaplnÄ›ní (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -511,12 +511,12 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " "Ukazatele (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -528,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Chyba Action Replay: neplatný řádek kódu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Podmínkový kód: Neplatná Velikost %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Neplatný Normální Kód Typu %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adaptér:" @@ -557,11 +557,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -571,7 +571,7 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "PÅ™idat..." @@ -619,38 +619,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" @@ -658,9 +658,10 @@ msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -674,15 +675,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -694,15 +695,15 @@ msgstr "ZavadÄ›Ä aplikace má Å¡patnou velikost... je to vážnÄ› zavadÄ›Ä?" msgid "Apploader unable to load from file" msgstr "ZavadÄ›Ä aplikace nemohl naÄíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -712,7 +713,7 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ArabÅ¡tina" @@ -721,7 +722,7 @@ msgstr "ArabÅ¡tina" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,12 +730,12 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -742,12 +743,12 @@ msgstr "PomÄ›r Stran:" msgid "At least one pane must remain open." msgstr "Alespoň jeden panel musí být otevÅ™en." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Zvuku:" @@ -755,24 +756,24 @@ msgstr "Backend Zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -782,23 +783,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" -"Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registry" @@ -807,12 +796,12 @@ msgstr "&Registry" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Nastavení Backendu" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend:" @@ -829,7 +818,7 @@ msgstr "Dozadu" msgid "Bad File Header" msgstr "Å patná hlaviÄka souboru" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Plakát" @@ -846,11 +835,11 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Základní nastavení" @@ -862,7 +851,7 @@ msgstr "Basy" msgid "Block Allocation Table checksum failed" msgstr "Kontrolní souÄet AlokaÄní Tabulky Bloku selhal" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloky" @@ -879,7 +868,7 @@ msgid "Blue Right" msgstr "Modrá vpravo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Dole" @@ -892,7 +881,7 @@ msgstr "Spojené ovladaÄe: %lu" msgid "Broken" msgstr "Rozbité" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Procházet" @@ -900,11 +889,11 @@ msgstr "Procházet" msgid "Browse for a directory to add" msgstr "Procházet pro pÅ™idání adresáře" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -918,7 +907,7 @@ msgstr "Vyrovnávací paměť:" msgid "Buttons" msgstr "TlaÄítka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -930,19 +919,19 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -957,7 +946,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -972,7 +961,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -988,7 +977,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou oÄekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -999,7 +988,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1007,18 +996,18 @@ msgstr "" "Nelze použít tento soubor jako paměťovou kartu.\n" "Snažíte se použít stejný soubor v obou slotech?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba" @@ -1026,7 +1015,7 @@ msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KatalánÅ¡tina" @@ -1038,7 +1027,7 @@ msgstr "StÅ™ed" msgid "Change" msgstr "ZmÄ›nit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "VymÄ›nit &Disk..." @@ -1051,7 +1040,7 @@ msgstr "VymÄ›nit Disk" msgid "Change Game" msgstr "ZmÄ›nit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1067,8 +1056,8 @@ msgstr "ZmÄ›ní znaménko na Parametr zFar (po korekci)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "ZmÄ›ní znaménko na Parametr zNear (po korekci)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ZmÄ›na tohoto se neprojeví, pokud emulátor běží!" @@ -1080,7 +1069,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Hledání Cheatů" @@ -1092,35 +1081,35 @@ msgstr "Správce Cheatů" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1128,7 +1117,7 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,8 +1125,8 @@ msgstr "" "Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro " "disky sestavené z adresářů)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístÄ›ní extrakce" @@ -1163,22 +1152,22 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Zavřít" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "&Nastavit..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Informace o kódu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kód:" @@ -1186,7 +1175,7 @@ msgstr "Kód:" msgid "Command" msgstr "Příkaz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Komentář" @@ -1194,20 +1183,20 @@ msgstr "Komentář" msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Komprimuji ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Nastavení" @@ -1226,17 +1215,17 @@ msgstr "Nastavit Ovládání" msgid "Configure Pads" msgstr "Nastavit Pady" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" @@ -1245,11 +1234,11 @@ msgstr "PÅ™i zastavení Potvrdit" msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "PÅ™ipojit Wiimote %i" @@ -1274,7 +1263,7 @@ msgstr "PÅ™ipojit Wiimote 3" msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1294,7 +1283,7 @@ msgstr "PÅ™evést na GCI" msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" @@ -1308,7 +1297,7 @@ msgstr "Jádro" msgid "Could not create %s" msgstr "Nelze vytvoÅ™it %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Nezle spustit backend %s." @@ -1342,7 +1331,7 @@ msgstr "" "Nelze nastavit pady. HrÃ¡Ä odeÅ¡el, nebo hra v souÄasnosti běží!.\n" "(nastavení padů za bÄ›hu hry není jeÅ¡tÄ› podporováno)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1355,11 +1344,11 @@ msgstr "" "SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " "zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1367,8 +1356,8 @@ msgstr "" "Nelze spustit jádro.\n" "Zkontrolujte VaÅ¡e nastavení." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "PoÄet:" @@ -1376,8 +1365,8 @@ msgstr "PoÄet:" msgid "Country:" msgstr "ZemÄ›:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "VytvoÅ™it AR kód" @@ -1386,21 +1375,21 @@ msgstr "VytvoÅ™it AR kód" msgid "Create new perspective" msgstr "VytvoÅ™it novou perspektivu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "VytvoÅ™il KDE-look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "VytvoÅ™il VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "VytvoÅ™il black_rider a publikováno na ForumW.org > Web Developments" @@ -1412,11 +1401,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1430,7 +1419,7 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "SouÄasný adresář se zmÄ›nil z %s na %s po wxFileSelector!" @@ -1447,11 +1436,11 @@ msgstr "Nastavení Vlastního Hacku Projekce" msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ÄŒeÅ¡tina" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1459,36 +1448,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "KoÅ™en DVD:" @@ -1500,7 +1489,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Velikost data" @@ -1508,8 +1497,8 @@ msgstr "Velikost data" msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Soubory Datel MaxDrive/Pro(*.sav)" @@ -1525,7 +1514,7 @@ msgstr "Mrtvá Zóna" msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "LadÄ›ní" @@ -1533,16 +1522,16 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1550,7 +1539,7 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1563,7 +1552,7 @@ msgstr "Výchozí typ písma" msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1572,7 +1561,7 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Popis" @@ -1594,8 +1583,8 @@ msgstr "" msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1619,28 +1608,20 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Zakázat OsvÄ›tlení" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Zakázat Hloubku Podle Pixelu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Zakázat Textury" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1654,7 +1635,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1670,16 +1651,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Zakázat texturování.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disk" @@ -1689,11 +1660,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1707,20 +1678,20 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "&Webová stránka Dolphin" @@ -1732,16 +1703,16 @@ msgstr "Dolphin Nastavení" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Nastavení Emulovaného Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1749,7 +1720,7 @@ msgstr "Doplhin Filmy TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" @@ -1791,23 +1762,23 @@ msgstr "Bubny" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1817,7 +1788,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1827,7 +1798,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1838,23 +1809,23 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "NizozemÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Kopie" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1867,11 +1838,11 @@ msgstr "" msgid "EUROPE" msgstr "EVROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "PÅ™edÄasné Aktualizace PamÄ›ti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Upravit" @@ -1887,7 +1858,7 @@ msgstr "Upravit nastavení" msgid "Edit Patch" msgstr "Upravit záplatu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" @@ -1900,15 +1871,15 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1922,7 +1893,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1950,7 +1921,7 @@ msgstr "Stav Emulace:" msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1966,7 +1937,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Povolit protokolování AR" @@ -1982,11 +1953,11 @@ msgstr "Zapnout SluÄování Bloků" msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Povolit Cheaty" @@ -1994,11 +1965,11 @@ msgstr "Povolit Cheaty" msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" @@ -2006,7 +1977,7 @@ msgstr "Povolit klávesové zkratky" msgid "Enable Idle Skipping" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" @@ -2015,11 +1986,11 @@ msgid "Enable MMU" msgstr "Zapnout MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" @@ -2027,11 +1998,11 @@ msgstr "Povolit SpoÅ™iÄ Obrazovky" msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2053,11 +2024,11 @@ msgstr "" "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " "VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Zapnout stránky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2070,7 +2041,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2104,7 +2075,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2124,7 +2095,7 @@ msgstr "" "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2139,13 +2110,13 @@ msgid "End" msgstr "End" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2163,17 +2134,17 @@ msgstr "Záznam %d/%d" msgid "Entry 1/%d" msgstr "Záznam 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2213,10 +2184,6 @@ msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx% msgid "Execute" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "UkonÄit Dolphin s emulátorem" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Export Selhal" @@ -2230,19 +2197,19 @@ msgstr "Exportovat Soubor" msgid "Export Recording" msgstr "Exportovat Nahrávku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exportovat vÅ¡echny Uložené hry" @@ -2250,7 +2217,7 @@ msgstr "Exportovat vÅ¡echny Uložené hry" msgid "Export failed, try again?" msgstr "Exportování selhalo, zkusit znovu?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportovat Uloženou hru jako..." @@ -2258,7 +2225,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "VnÄ›jší Vyr. Paměť Snímků" @@ -2294,28 +2261,28 @@ msgstr "Extrahovat Soubor..." msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extrahuji..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO Bajt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "PÅ™ehrávaÄ FIFO" @@ -2339,7 +2306,7 @@ msgstr "Naslouchání Selhalo!!" msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2458,33 +2425,29 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Rychlé Mipmapy" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "PÅ™ehrávaÄ Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Informace o souboru" @@ -2530,43 +2493,43 @@ msgstr "FileIO: Neznámý režim otevÅ™ení : 0x%02x" msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2541,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2553,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2612,17 +2575,17 @@ msgstr "" msgid "Forward" msgstr "DopÅ™edu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Snímek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Snímek" @@ -2631,38 +2594,38 @@ msgstr "Snímek" msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Snímek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Rozsah Snímku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit Snímků:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2670,20 +2633,20 @@ msgstr "FrancouzÅ¡tina" msgid "Frets" msgstr "Pražce" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Soubor GCI(*.gci)" @@ -2691,11 +2654,11 @@ msgstr "Soubor GCI(*.gci)" msgid "GCMic Configuration" msgstr "Nastavení GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2723,24 +2686,28 @@ msgstr "Nastavení Konkrétní Hry" msgid "GameConfig" msgstr "Nastavení Hry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Kódy Gecko" @@ -2758,8 +2725,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Obecné" @@ -2768,29 +2735,29 @@ msgid "General Settings" msgstr "Obecná Nastavení" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "NÄ›mÄina" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index je vÄ›tší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Grafická nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2807,7 +2774,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ŘeÄtina" @@ -2827,11 +2794,11 @@ msgstr "Zelená vpravo" msgid "Guitar" msgstr "Kytara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacky" @@ -2839,7 +2806,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "HebrejÅ¡tina" @@ -2851,7 +2818,7 @@ msgstr "Výška" msgid "Help" msgstr "NápovÄ›da" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2871,11 +2838,11 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2900,11 +2867,11 @@ msgstr "Nastavení klávesových zkratek" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "MaÄarÅ¡tina" @@ -2912,12 +2879,12 @@ msgstr "MaÄarÅ¡tina" msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Pokus o získání dat z neznámého lístku: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2930,11 +2897,11 @@ msgstr "" "IDNázvu %016llx.\n" "Dolphin se teÄ pravdÄ›podobnÄ› zasekne" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -2954,7 +2921,7 @@ msgstr "Citlivost InfraÄer.:" msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -2962,7 +2929,7 @@ msgstr "Adresáře ISO" msgid "ITALY" msgstr "ITÃLIE" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikona" @@ -2981,7 +2948,7 @@ msgstr "" "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2991,11 +2958,11 @@ msgstr "" "Pokud nastavíte limit snímků vÄ›tší než plná rychlost hry (NTSC:60, PAL:50), " "mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP, aby to bylo úÄinné." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3009,7 +2976,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3023,7 +2990,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -3051,7 +3018,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3063,16 +3030,6 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Zlepší výkon, ale způsobí, že ve vÄ›tÅ¡inÄ› her zmizí osvÄ›tlení.\n" -"\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Ve HÅ™e" @@ -3102,7 +3059,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte ZaÅ¡ifrovaný nebo RozÅ¡ifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3110,11 +3067,11 @@ msgstr "Vložit SD Kartu" msgid "Insert name here.." msgstr "Zde vložte jméno..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" @@ -3125,42 +3082,42 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Nastavení Rozhraní" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "VnitÅ™ní chyba LZO - komprimace selhala" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3169,15 +3126,15 @@ msgstr "" "VnitÅ™ní chyba LZO - dekomprimace selhala (%d) (%ld, %ld) \n" "Zkuste znovu nahrát stav" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" @@ -3190,7 +3147,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Neplatná Velikost(%x) nebo Kouzelné slovo (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Neplatná Hodnota!" @@ -3203,7 +3160,7 @@ msgstr "Neplatný bat.map nebo záznam adr." msgid "Invalid event type %i" msgstr "Neplatná událost typu %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Neplatný soubor" @@ -3218,29 +3175,29 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Neplatný stav" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3248,16 +3205,16 @@ msgstr "ItalÅ¡tina" msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JaponÅ¡tina" @@ -3265,7 +3222,7 @@ msgstr "JaponÅ¡tina" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3276,7 +3233,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3285,8 +3242,8 @@ msgstr "" msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KorejÅ¡tina" @@ -3304,16 +3261,16 @@ msgstr "TlaÄítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Jazyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Poslední PÅ™epsaný Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Poslední Uložený Stav" @@ -3353,11 +3310,11 @@ msgstr "" "Levé/Pravé kliknutí pro více možností.\n" "ProstÅ™ední pro vymazání." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitovat podle SzS" @@ -3365,7 +3322,7 @@ msgstr "Limitovat podle SzS" msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" @@ -3409,20 +3366,20 @@ msgstr "Nahrát Slot Stavu 7" msgid "Load State Slot 8" msgstr "Nahrát Slot Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3436,15 +3393,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "NaÄíst pÅ™ednastavené hodnoty z dostupných hackových vzorů." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Uzamknout Vlákna do Jader" @@ -3456,16 +3409,33 @@ msgstr "Záznam" msgid "Log Configuration" msgstr "Nastavení Záznamu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy Záznamu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " +"emulace.\n" +"\n" +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Protokolování" @@ -3473,10 +3443,6 @@ msgstr "Protokolování" msgid "Lost connection to server!" msgstr "PÅ™ipojení k serveru ztraceno!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "TlaÄítko M" @@ -3494,8 +3460,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Soubory MadCatz Gameshark (*.gcs)" @@ -3525,7 +3491,7 @@ msgstr "Pam. karta už má uložení pro tento název" msgid "Memcard already opened" msgstr "Pam. karta již otevÅ™ena" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Bajt PamÄ›ti" @@ -3576,11 +3542,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3589,7 +3555,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3614,7 +3580,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3644,11 +3610,11 @@ msgstr "" "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " "Wiimote. Žádný efekt na emulovaná Wiimote." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3742,28 +3708,28 @@ msgstr "NK Nahoru" msgid "Name:" msgstr "Jméno:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Jméno: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Původní soubory CGI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Další Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Další Skenování" @@ -3784,8 +3750,8 @@ msgstr "Nenalezena žádná ISO nebo WADS" msgid "No banner file found for title %s" msgstr "Nebyl nalezen žádný plakát s názvem %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3793,7 +3759,7 @@ msgstr "" msgid "No docking" msgstr "Žádné pÅ™ipínání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Není naÄten žádný soubor" @@ -3801,7 +3767,7 @@ msgstr "Není naÄten žádný soubor" msgid "No free dir index entries" msgstr "Žádné volné záznamy indexu adresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Žádný soubor s nahrávkou" @@ -3815,20 +3781,20 @@ msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Nerovná se" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "NepÅ™ipojen" @@ -3853,7 +3819,7 @@ msgstr "UpozornÄ›ní" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "PoÄet Kódů:" @@ -3866,15 +3832,15 @@ msgstr "NunÄak" msgid "Nunchuk Acceleration" msgstr "Zrychlení NunÄaku" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Vypnuto" @@ -3882,26 +3848,30 @@ msgstr "Vypnuto" msgid "Offset:" msgstr "Logická Adresa:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Otevřít soubor..." @@ -3919,22 +3889,14 @@ msgstr "OpenAL: nelze nalézt zvuková zařízení" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Otevřít ladící program" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "OtevÅ™e protokol" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3954,8 +3916,8 @@ msgstr "" "KliknÄ›te pravým tlaÄítkem a exportujte vÅ¡echna uložení,\n" "a importujte je do nové paměťové karty\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Jiné" @@ -3970,7 +3932,7 @@ msgstr "" msgid "Output" msgstr "Výstup" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "S&pustit nahrávku..." @@ -4015,17 +3977,21 @@ msgstr "Oddíl %i" msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" @@ -4038,10 +4004,10 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Spustit" @@ -4059,7 +4025,7 @@ msgstr "PÅ™ehrát/Pozastavit" msgid "Playable" msgstr "Hratelné" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Možnosti PÅ™ehrávání" @@ -4067,7 +4033,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4079,23 +4045,23 @@ msgstr "PÅ™ed uložením si prosím vytvoÅ™te perspektivu" msgid "Plus-Minus" msgstr "Plus-Mínus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4104,29 +4070,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4139,11 +4105,11 @@ msgstr "PÅ™edvolby:" msgid "Prev Page" msgstr "PÅ™ed. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "PÅ™edchozí Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "PÅ™edchozí Hodnota" @@ -4159,7 +4125,7 @@ msgstr "Profil" msgid "Properties" msgstr "Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Zahodit Vyrovnávací Paměť" @@ -4186,7 +4152,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4203,7 +4169,7 @@ msgstr "Rozsah" msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Opravdová" @@ -4215,7 +4181,7 @@ msgstr "Opravdový Wiimote" msgid "Real Wiimotes" msgstr "Opravdové Wiimoty" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Potvrzení o znovupÅ™ipojení Wiimote" @@ -4223,17 +4189,17 @@ msgstr "Potvrzení o znovupÅ™ipojení Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Znovu pÅ™ipojit Wiimote pÅ™i Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Nahrávat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Informace o Nahrávání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Možnosti Nahrávání" @@ -4249,7 +4215,7 @@ msgstr "ÄŒervená vlevo" msgid "Red Right" msgstr "ÄŒervená vpravo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4264,7 +4230,7 @@ msgstr "" "Pokud si nejste jisti, vyberte Žádný." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Obnovit" @@ -4274,18 +4240,18 @@ msgstr "Obnovit" msgid "Refresh List" msgstr "Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4295,7 +4261,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" @@ -4305,7 +4271,7 @@ msgstr "Vykreslit do Hlavního okna" msgid "Reset" msgstr "Resetovat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Výsledky" @@ -4327,33 +4293,33 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Spustit DSP LLE na samostatném vláknÄ› (nedoporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "RuÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Uložit Sta&v" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "BezpeÄná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Vzorkovací frekvence:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Uložit" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Uložit GCI jako..." @@ -4397,7 +4363,7 @@ msgstr "Uložit do Slotu Stavu 7" msgid "Save State Slot 8" msgstr "Uložit do Slotu Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Uložit Stav..." @@ -4406,24 +4372,24 @@ msgstr "Uložit Stav..." msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" @@ -4440,7 +4406,7 @@ msgstr "Skenuji pro ISO" msgid "Scanning..." msgstr "Skenuji..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "SnímkObrz" @@ -4448,25 +4414,25 @@ msgstr "SnímkObrz" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Hledání Cheatů" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4481,16 +4447,16 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena" msgid "Select" msgstr "Vybrat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4508,23 +4474,23 @@ msgstr "Vyberte soubor s uloženou pozicí pro import" msgid "Select floating windows" msgstr "Vybrat plovoucí okna" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Vyberte stav k uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4544,7 +4510,7 @@ msgstr "" msgid "Selected font" msgstr "Vybraný typ písma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4561,7 +4527,7 @@ msgstr "" "Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " "funguje." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4589,11 +4555,11 @@ msgstr "UmístÄ›ní Senzorové TyÄe:" msgid "Separator" msgstr "OddÄ›lovaÄ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4604,16 +4570,16 @@ msgstr "" msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index je vÄ›tší než velikost seznamu ar kódu %lu" @@ -4638,55 +4604,55 @@ msgstr "Krátké Jméno:" msgid "Shoulder Buttons" msgstr "Zadní TlaÄítka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Zobrazit &Konzoli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Zobrazit Záznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Zobrazit &Stavový řádek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Zobrazit Panel Nás&trojů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Zobrazit Francii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Zobrazit Itálii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Zobrazit JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Zobrazit Koreu" @@ -4694,47 +4660,47 @@ msgstr "Zobrazit Koreu" msgid "Show Language:" msgstr "Jazyk Zobrazení:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Zobrazit Nastavení &Záznamu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Zobrazit PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Zobrazit Platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Zobrazit Statistiky" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Zobrazit Tchaj-wan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Zobrazit USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Zobrazit Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Zobrazí rámeÄek s potvrzením pÅ™ed zastavením hry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4744,27 +4710,39 @@ msgstr "" "Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " "může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Zobrazit komentář uložení" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4776,15 +4754,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Zobrazit tuto zprávu nápovÄ›dy" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4798,7 +4772,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" @@ -4806,19 +4780,19 @@ msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4830,7 +4804,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4846,17 +4820,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4881,11 +4855,11 @@ msgstr "" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Nastavení Zvuku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Zvukový backend %s je neplatný." @@ -4900,8 +4874,8 @@ msgid "Space" msgstr "Mezerník" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" @@ -4909,7 +4883,7 @@ msgstr "Å panÄ›lÅ¡tina" msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4929,10 +4903,6 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "UrÄit backend videa" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost pÅ™enosu Disku" @@ -4951,11 +4921,11 @@ msgstr "Standardní OvladaÄ" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Spustit &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "ZaÄít na&hrávat" @@ -4977,15 +4947,15 @@ msgstr "Ukládání stavu" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4999,7 +4969,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -5024,8 +4994,8 @@ msgstr "Uložení byly úspěšnÄ› importovány" msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Jazyk Systému:" @@ -5033,7 +5003,7 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5054,8 +5024,8 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5069,15 +5039,15 @@ msgstr "TaruKonga (Bonga)" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5093,13 +5063,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní souÄet byl úspěšnÄ› opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5139,7 +5109,7 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5156,7 +5126,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5189,15 +5159,15 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Vzhled" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "VýbÄ›r vzhledu se zvrtl" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5213,7 +5183,7 @@ msgstr "" "Tato nastavení potlaÄí hlavní nastavení Dolphinu.\n" "NeurÄený znamená, že hra použije nastavení Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5221,11 +5191,11 @@ msgstr "" "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5243,7 +5213,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5267,13 +5237,13 @@ msgstr "Práh" msgid "Tilt" msgstr "NaklánÄ›ní" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Název" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Do" @@ -5281,18 +5251,18 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" @@ -5316,7 +5286,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "TureÄtina" @@ -5341,7 +5311,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "NEZNÃMÃ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "NEZNÃMÃ" @@ -5369,24 +5339,24 @@ msgstr "" "rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" "ChtÄ›li byste tento řádek ignorovat a pokraÄovat v analýze?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Nedefinován %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Vrátit zpÄ›t Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Neznámé" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Neznámý příkaz DVD %08x - závažná chyba" @@ -5411,7 +5381,7 @@ msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" msgid "Up" msgstr "Nahoru" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Aktualizovat" @@ -5420,23 +5390,23 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5449,7 +5419,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5463,15 +5433,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Synch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Hodnota" @@ -5479,7 +5449,7 @@ msgstr "Hodnota" msgid "Value:" msgstr "Hodnota:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Hodnota:" @@ -5491,11 +5461,11 @@ msgstr "Úroveň" msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Hlasitost" @@ -5510,7 +5480,7 @@ msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5551,7 +5521,7 @@ msgstr "" "%s\n" "PÅ™ejete si pokraÄovat?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5564,7 +5534,7 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5576,7 +5546,7 @@ msgstr "" "mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze " "pro Ätení." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5588,7 +5558,7 @@ msgstr "" "naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " "desynchronizaci." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5630,7 +5600,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5638,7 +5608,7 @@ msgstr "Hack Å irokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5646,15 +5616,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5663,7 +5633,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5672,7 +5642,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5685,7 +5655,7 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" @@ -5693,7 +5663,7 @@ msgstr "Wiimote PÅ™ipojen" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote nastavení" @@ -5717,10 +5687,10 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Pracuji..." @@ -5756,7 +5726,7 @@ msgstr "XAudio2 spuÅ¡tÄ›ní selhalo: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 vytvoÅ™ení hlavního hlasu selhalo: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5780,11 +5750,11 @@ msgstr "Nemůžete zavřít panely, které mají uvnitÅ™ stránky." msgid "You must choose a game!!" msgstr "Musíte si zvolit hru!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Musíte zadat jméno!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " @@ -5794,7 +5764,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -5821,11 +5791,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Kód Zero 3 není podporován" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Nulový kód, který dolphin nezná: %08x" @@ -5835,7 +5805,7 @@ msgstr "Nulový kód, který dolphin nezná: %08x" msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5851,7 +5821,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5870,7 +5840,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5889,7 +5859,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -5916,7 +5886,7 @@ msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." msgid "not a wii save or read failure for file header size %x" msgstr "není uložená hra wii nebo nelze Äíst z hlaviÄky souboru o velikosti %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5925,7 +5895,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -6008,6 +5978,17 @@ msgstr "| NEBO" #~ "nastavená pomocí zmÄ›ny velikosti EFB.\n" #~ "PÅ™i používání tohoto je nejlepší nastavit pomÄ›r stran na roztáhnutí." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automaticky vytvoÅ™it mipmapy, radÄ›ji než dekódovat je z pamÄ›ti.\n" +#~ "Trochu zlepší výkon, ale může způsobit malé chyby pamÄ›ti.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6047,9 +6028,24 @@ msgstr "| NEBO" #~ msgid "Danish" #~ msgstr "DánÅ¡tina" +#~ msgid "Disable Lighting" +#~ msgstr "Zakázat OsvÄ›tlení" + +#~ msgid "Disable Textures" +#~ msgstr "Zakázat Textury" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Zakázat Reproduktor Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Zakázat texturování.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6151,6 +6147,9 @@ msgstr "| NEBO" #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "UkonÄit Dolphin s emulátorem" + #~ msgid "Failed to compile ps %s" #~ msgstr "Nelze zkompilovat ps %s" @@ -6166,6 +6165,9 @@ msgstr "| NEBO" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nelze nahrát DSP ROM : %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Rychlé Mipmapy" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6201,6 +6203,15 @@ msgstr "| NEBO" #~ "window has focus." #~ msgstr "Skrýt kurzor, když je nad vykreslovacím oknem a okno je aktivní" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Zlepší výkon, ale způsobí, že ve vÄ›tÅ¡inÄ› her zmizí osvÄ›tlení.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." + #~ msgid "Input Source" #~ msgstr "Zdroj Vstupu:" @@ -6239,6 +6250,12 @@ msgstr "| NEBO" #~ "Nahrání původních mipmap je správnÄ›jší chování, ale může také snížit " #~ "výkon (Váš užitek se ale může mÄ›nit)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" + #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Mixér: Nepodporovaná vzorkovací frekvence." @@ -6255,6 +6272,12 @@ msgstr "| NEBO" #~ msgid "OK" #~ msgstr "OK" +#~ msgid "Opens the debugger" +#~ msgstr "Otevřít ladící program" + +#~ msgid "Opens the logger" +#~ msgstr "OtevÅ™e protokol" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6319,6 +6342,9 @@ msgstr "| NEBO" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zobrazit poÄet snímků vykreslených za sekundu." +#~ msgid "Show this help message" +#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6353,6 +6379,9 @@ msgstr "| NEBO" #~ "Ostatní volby jsou pevná rozliÅ¡ení pro volbu kvality obrazu nezávislé na " #~ "Vaší velikosti displeje." +#~ msgid "Specify a video backend" +#~ msgstr "UrÄit backend videa" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Spustit vykreslovaÄe v Celé obrazovce" diff --git a/Languages/po/de.po b/Languages/po/de.po index 516316ed69..e1f0943053 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-02-17 01:23+0100\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (zu viele zum anzeigen)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%sGCI exportieren%s" msgid "%sImport GCI%s" msgstr "%sGCI importieren%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" @@ -160,147 +160,147 @@ msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" msgid "&& AND" msgstr "&& UND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "Ãœber &Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "Von &DVD-Laufwerk starten..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Haltepunkte" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "Nach ISOs &suchen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Cheat Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Datei" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Hilfe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "Status &laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Memory-Card Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Arbeitsspeicher" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "Ö&ffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Optionen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "Pau&se" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Register" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Sound" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "Sto&pp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Werkzeuge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Ansicht" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UNBEKANNT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(aus)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 Bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 Bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 Bit" @@ -344,7 +344,7 @@ msgstr "8 Bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -357,11 +357,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -370,8 +370,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Ein NetPlay Fenster ist bereits geöffnet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Es wird derzeit kein Spiel ausgeführt." @@ -423,7 +423,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR Codes" @@ -436,7 +436,7 @@ msgstr "Ãœber Dolphin" msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -444,7 +444,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -473,7 +473,7 @@ msgstr "" "Fehlerhafter Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -481,7 +481,7 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im folgendem " "Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, fuzzy, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -490,7 +490,7 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) in _Fill_ " "und _Slide_ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, fuzzy, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -499,7 +499,7 @@ msgstr "" "Action Replay Fehler: Ungültige Größe (%08x : address = %08x) in Ram " "schreiben und _Fill_ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -508,13 +508,13 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im " "geschriebennen Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x) im kopierten Speicher (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -527,27 +527,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fehler: Fehlerhafter AR-Code in Zeile: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, fuzzy, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: _Bedingungs_-Code: Fehlerhafte Größe %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, fuzzy, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ungültiger _Normal-Code-Type_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, fuzzy, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ %i: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, fuzzy, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ 0: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Grafikkarte:" @@ -556,11 +556,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -570,7 +570,7 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Hinzufügen..." @@ -618,38 +618,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" @@ -657,28 +657,31 @@ msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " +"Spielen, die richtige Nebel-Emulation benötigen." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Anisotropische Filterung:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -691,22 +694,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Ãœbernehmen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -715,7 +718,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -723,13 +726,13 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -737,12 +740,12 @@ msgstr "Seitenverhältnis:" msgid "At least one pane must remain open." msgstr "Mindestens eine Palette muss geöffnet bleiben." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -750,26 +753,26 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automatisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 #, fuzzy msgid "Auto (Window Size)" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 #, fuzzy msgid "Auto adjust Window Size" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -779,19 +782,11 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "Register" @@ -800,12 +795,12 @@ msgstr "Register" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Einstellungen" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "Audio Backend:" @@ -823,7 +818,7 @@ msgstr "Rückwärts" msgid "Bad File Header" msgstr "Ungültige Header-Datei" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -840,11 +835,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Leiste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -856,7 +851,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blockzuteilungs-Tabellen-Prüfsumme fehlerhaft." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blöcke" @@ -873,7 +868,7 @@ msgid "Blue Right" msgstr "Blau rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Unten" @@ -886,7 +881,7 @@ msgstr "" msgid "Broken" msgstr "Defekt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Durchsuchen" @@ -894,11 +889,11 @@ msgstr "Durchsuchen" msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -912,7 +907,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -925,20 +920,20 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -948,7 +943,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -957,7 +952,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Abbrechen" @@ -974,7 +969,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +979,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -993,18 +988,18 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" @@ -1012,7 +1007,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1024,7 +1019,7 @@ msgstr "Mitte" msgid "Change" msgstr "Wechseln" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Disc &wechseln..." @@ -1037,7 +1032,7 @@ msgstr "Disc wechseln" msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1055,8 +1050,8 @@ msgstr "Parameter _sign_ zu zFar ändern (nach Korrektur)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Parameter _sign_ zu zNear ändern (nach Korrektur)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." @@ -1069,7 +1064,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Cheat Suche" @@ -1081,36 +1076,36 @@ msgstr "Cheat Manager" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1118,15 +1113,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1153,22 +1148,22 @@ msgstr "" "Client kann während ein Spiel emmuliert wird, nicht verbunden werden! " "NetPlay ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Schließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "&Konfiguration" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Code: " @@ -1176,7 +1171,7 @@ msgstr "Code: " msgid "Command" msgstr "Befehl" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Kommentar" @@ -1184,20 +1179,20 @@ msgstr "Kommentar" msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Komprimiere ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Konfiguration" @@ -1216,17 +1211,17 @@ msgstr "Steuerung bearbeiten" msgid "Configure Pads" msgstr "Pads konfigurieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" @@ -1236,11 +1231,11 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote %i verbinden" @@ -1265,7 +1260,7 @@ msgstr "Wiimote 3 verbinden" msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Verbinden..." @@ -1285,7 +1280,7 @@ msgstr "Zu GCI konvertieren" msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" @@ -1299,7 +1294,7 @@ msgstr "Kern" msgid "Could not create %s" msgstr "%s konnte nicht erstellt werden" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Konnte Backend %s nicht initialisieren." @@ -1335,7 +1330,7 @@ msgstr "" "derzeit!\n" "(Pads während der Emulation einzustellen, wird noch nicht unterstützt.)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1348,11 +1343,11 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 #, fuzzy msgid "" "Couldn't init the core.\n" @@ -1361,8 +1356,8 @@ msgstr "" "Konnte denn _Core nicht init_.\n" "Kontrolliere deine Konfiguartion." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Anzahl:" @@ -1370,8 +1365,8 @@ msgstr "Anzahl:" msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "AR-Code erstellen" @@ -1380,21 +1375,21 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Erstellt von KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Erstellt von VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Erstellt von black_rider und veröffentlicht auf ForumW.org > Web Developments" @@ -1407,11 +1402,11 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Abschneiden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1422,7 +1417,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1440,11 +1435,11 @@ msgstr "Benutzerdefinierter Projection-Hack Einstellungen" msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tschechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1452,37 +1447,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1494,7 +1489,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Datengröße" @@ -1502,8 +1497,8 @@ msgstr "Datengröße" msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro Dateien(*.sav)" @@ -1519,7 +1514,7 @@ msgstr "Tote Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1528,16 +1523,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1545,7 +1540,7 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1558,7 +1553,7 @@ msgstr "Standard Schriftart" msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1567,7 +1562,7 @@ msgstr "Spielstand löschen" msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "Frage" @@ -1588,8 +1583,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1613,30 +1608,22 @@ msgstr "" "Die Verzeichnis-Prüfsumme ist fehlerhaft,\n" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "keine Beleuchtung" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Farbtiefe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "keine Texturen" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1645,7 +1632,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1655,13 +1642,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disc" @@ -1671,11 +1651,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Disc Lesefehler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Anzeige" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1686,20 +1666,20 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Webseite" @@ -1711,17 +1691,17 @@ msgstr "Dolphin Konfiguration" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulierte-Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1729,7 +1709,7 @@ msgstr "Dolphin TAS Filme (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" @@ -1771,30 +1751,30 @@ msgstr "Trommeln" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Texturen dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1802,7 +1782,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "Angezeigte Spieltexturen nach User/Dump/Textures// dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1810,24 +1790,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holländisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Beenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 #, fuzzy msgid "EFB Copies" msgstr "EFB Kopie-Regionen" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1841,11 +1821,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Bearbeiten" @@ -1861,7 +1841,7 @@ msgstr "Einstellungen bearbeiten" msgid "Edit Patch" msgstr "Patch bearbeiten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" @@ -1874,15 +1854,15 @@ msgstr "Bearbeiten..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emu-Thread läuft bereits." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1891,7 +1871,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1913,7 +1893,7 @@ msgstr "Emulierbarkeit:" msgid "Enable" msgstr "Aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1923,7 +1903,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "AR Logging aktivieren" @@ -1939,12 +1919,12 @@ msgstr "Blockvereinigung aktivieren" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Cheats aktivieren" @@ -1952,11 +1932,11 @@ msgstr "Cheats aktivieren" msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" @@ -1964,7 +1944,7 @@ msgstr "Tastenkürzel aktivieren" msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" @@ -1973,11 +1953,11 @@ msgid "Enable MMU" msgstr "MMU aktivieren" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" @@ -1986,11 +1966,11 @@ msgstr "Breitbildmodus" msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -2010,11 +1990,11 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Blättern verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2022,7 +2002,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2052,7 +2032,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2068,7 +2048,7 @@ msgstr "" "Aktiviert die Speicher-Verwaltungs-Einheit, die für einige Spiele gebraucht " "wird. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2080,13 +2060,13 @@ msgid "End" msgstr "Ende" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Englisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Erweiterungen" @@ -2104,17 +2084,17 @@ msgstr "Eintrag %d/%d" msgid "Entry 1/%d" msgstr "Eintrag 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Fehler" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " @@ -2155,10 +2135,6 @@ msgstr "" msgid "Execute" msgstr "Ausführen" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphin mit Emulator beenden." - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" @@ -2172,19 +2148,19 @@ msgstr "Datei exportieren" msgid "Export Recording" msgstr "Aufnahme exportieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2192,7 +2168,7 @@ msgstr "Alle Spielstände exportieren" msgid "Export failed, try again?" msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Spielstand exportieren als..." @@ -2200,7 +2176,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2237,28 +2213,28 @@ msgstr "Datei extrahieren..." msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extrahieren..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 #, fuzzy msgid "FIFO Player" msgstr "Spieler" @@ -2284,7 +2260,7 @@ msgstr "_Listen_ Fehlgeschlagen!!" msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2395,35 +2371,30 @@ msgstr "Fehler beim Schreiben eines Header für %s" msgid "Failed to write header for file %d" msgstr "Fehler beim Schreiben eines Header für Datei %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Native Mipmaps laden" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 #, fuzzy msgid "Fifo Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 #, fuzzy msgid "File Info" msgstr "Code Info" @@ -2470,45 +2441,45 @@ msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "16:9 erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Force Texture Filtering" msgstr "Filterung erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2521,7 +2492,7 @@ msgstr "" "Verbessert Textur-Qualität (besonders bei hoher interner Auflösung) aber " "verursacht Fehler in einigen Spielen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2532,7 +2503,7 @@ msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" "Dies kann Grafikfehler verursachen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2551,18 +2522,18 @@ msgstr "" msgid "Forward" msgstr "Vorwärts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 #, fuzzy msgid "Frame" msgstr "Nächster Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 #, fuzzy msgid "Frame " msgstr "Einzelbildwiedergabe" @@ -2572,40 +2543,40 @@ msgstr "Einzelbildwiedergabe" msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 #, fuzzy msgid "Frame Range" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Frei Umsehen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Französisch" @@ -2613,21 +2584,21 @@ msgstr "Französisch" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Vollbild" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Datei(*.gci)" @@ -2636,11 +2607,11 @@ msgstr "GCI Datei(*.gci)" msgid "GCMic Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2668,25 +2639,29 @@ msgstr "Spiel-Spezifische Einstellungen" msgid "GameConfig" msgstr "Spieleinstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2705,8 +2680,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Allgemein" @@ -2716,29 +2691,29 @@ msgid "General Settings" msgstr "Interface Einstellungen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Deutsch" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Der Index ist größer als AR-Codelisten-Größe %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Größer als" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2749,7 +2724,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griechisch" @@ -2769,11 +2744,11 @@ msgstr "Grün rechts" msgid "Guitar" msgstr "Gitarre" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2781,7 +2756,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebräisch" @@ -2793,7 +2768,7 @@ msgstr "Höhe" msgid "Help" msgstr "Hilfe" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2814,11 +2789,11 @@ msgstr "" msgid "Hide" msgstr "Verbergen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Mauszeiger verstecken" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2843,11 +2818,11 @@ msgstr "Tastenkürzel Einstellungen" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarisch" @@ -2855,14 +2830,14 @@ msgstr "Ungarisch" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Versucht Daten von einem unbekannten Ticket zu bekommen: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2875,11 +2850,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin wird wahrscheinlich jetzt hängen bleiben." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -2899,7 +2874,7 @@ msgstr "IR-Empfindlichkeit" msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Verzeichnisse" @@ -2907,7 +2882,7 @@ msgstr "ISO Verzeichnisse" msgid "ITALY" msgstr "ITALIEN" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Symbol" @@ -2924,7 +2899,7 @@ msgstr "" "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, OFF " "= Schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2935,12 +2910,12 @@ msgstr "" "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" "Einstellungen deaktiviert werden, damit dies wirksam wird." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 #, fuzzy msgid "Ignore Format Changes" msgstr "Formatänderungen emulieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2949,7 +2924,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2958,7 +2933,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Spielstand importieren" @@ -2986,7 +2961,7 @@ msgstr "" "Importierte Datei hat die Erweiterung sav,\n" "aber besitzt keinen korrekten Header." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2997,16 +2972,6 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " -"Beleuchtung in Spielen ab, die sie benutzen." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Ingame" @@ -3036,7 +3001,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3044,12 +3009,12 @@ msgstr "SD-Karte einlegen" msgid "Insert name here.." msgstr "Namen hier eingeben.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 #, fuzzy msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3060,44 +3025,44 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Interface Einstellungen" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Internationaler LZO-Fehler - Komprimierung fehlgeschlagen" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3107,16 +3072,16 @@ msgstr "" "%li) \n" "Versuche diesen Status nochmal zu laden." -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" @@ -3129,7 +3094,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ungültige Größe (%x) oder _Zauberwort_ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Ungültigen Wert!" @@ -3142,7 +3107,7 @@ msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" msgid "Invalid event type %i" msgstr "Ungültiger Ereignis-Typ %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ungültige Datei" @@ -3157,29 +3122,29 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Ungültiger Status" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italienisch" @@ -3187,16 +3152,16 @@ msgstr "Italienisch" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanisch" @@ -3204,7 +3169,7 @@ msgstr "Japanisch" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3214,7 +3179,7 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3223,8 +3188,8 @@ msgstr "" msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreanisch" @@ -3242,16 +3207,16 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Sprache:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Letzter überschriebener Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Letzter gespeicherter Status" @@ -3291,11 +3256,11 @@ msgstr "" "Links/Rechts-Klick für mehr Optionen.\n" "Mittlere Maustaste zum Löschen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3303,7 +3268,7 @@ msgstr "" msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" @@ -3348,21 +3313,21 @@ msgstr "Status aus Slot 7 laden" msgid "Load State Slot 8" msgstr "Status aus Slot 8 laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3375,15 +3340,11 @@ msgstr "Hochauflösende Texturen aus User/Load/Textures// laden" msgid "Load preset values from hack patterns available." msgstr "Lade _Preset_-Werte aus dem verfügbarren Hack-Struktur_-en_." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Threads an Cores binden" @@ -3397,18 +3358,30 @@ msgstr "Log" msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Typ" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Logging" @@ -3416,10 +3389,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "Die Verbindung zum Server wurde getrennt!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Wähle die 'low level' (LLE) oder 'high level' (HLE) Audioemulation" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Mittlere Taste" @@ -3437,8 +3406,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark Dateien(*.gcs)" @@ -3468,7 +3437,7 @@ msgstr "Memorycard hat bereits eine Spielstand für diesen Tittel" msgid "Memcard already opened" msgstr "Memorycard ist bereits geöffnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 #, fuzzy msgid "Memory Byte" msgstr "Speicher" @@ -3521,11 +3490,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3534,7 +3503,7 @@ msgstr "Sonstige Einstellungen" msgid "Modifier" msgstr "Modifikator" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3555,7 +3524,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3576,11 +3545,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3675,28 +3644,28 @@ msgstr "NP Hoch" msgid "Name:" msgstr "Name:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Name: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI Dateien(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Nächste Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Nächster Scan" @@ -3717,8 +3686,8 @@ msgstr "Keine ISOs oder WADs gefunden" msgid "No banner file found for title %s" msgstr "Keine Banner-Datei für Tittel %s gefunden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3726,7 +3695,7 @@ msgstr "" msgid "No docking" msgstr "Nicht Andocken" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3734,7 +3703,7 @@ msgstr "" msgid "No free dir index entries" msgstr "Keine freien Verzeichnis-Indexeinträge." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 #, fuzzy msgid "No recorded file" msgstr "Ungültige Aufnahmedatei" @@ -3749,20 +3718,20 @@ msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegisch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Ungleich" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Nicht Verbunden" @@ -3787,7 +3756,7 @@ msgstr "Notizen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Anzahl von Codes: " @@ -3800,15 +3769,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuck Beschleunigung" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Aus" @@ -3816,26 +3785,30 @@ msgstr "Aus" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Nur %d Blöcke verfügbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Datei öffnen..." @@ -3853,22 +3826,14 @@ msgstr "OpenAL: Kann kein Sound-Gerät finden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kann Gerät %s nicht öffnen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Öffnet den Debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Öffnet den Logger" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3889,8 +3854,8 @@ msgstr "" "klicke Rechts und exportiere alle Spielstände,\n" "und importiere die Spielstände auf eine neue Memorycard.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3906,7 +3871,7 @@ msgstr "" msgid "Output" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Au&fnahme abspielen..." @@ -3951,17 +3916,21 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" @@ -3975,10 +3944,10 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektive %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Start" @@ -3996,7 +3965,7 @@ msgstr "Start/Pause" msgid "Playable" msgstr "Spielbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 #, fuzzy msgid "Playback Options" msgstr "Optionen" @@ -4005,7 +3974,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -4017,23 +3986,23 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4042,30 +4011,30 @@ msgstr "Port 4" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4078,11 +4047,11 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Vorherige Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Vorheriger Wert" @@ -4098,7 +4067,7 @@ msgstr "Profil" msgid "Properties" msgstr "Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Cache löschen" @@ -4125,7 +4094,7 @@ msgstr "R Taste" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4142,7 +4111,7 @@ msgstr "Weite" msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Echt" @@ -4155,7 +4124,7 @@ msgstr "Echte Wiimote" msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Wiederverbindung Bestätigen" @@ -4164,19 +4133,19 @@ msgstr "Wiimote Wiederverbindung Bestätigen" msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote wiederverbinden, beim laden eines State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 #, fuzzy msgid "Recording Info" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -4192,7 +4161,7 @@ msgstr "Rot links" msgid "Red Right" msgstr "Rot rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4207,7 +4176,7 @@ msgstr "" "der Performance." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Aktualisieren" @@ -4217,18 +4186,18 @@ msgstr "Aktualisieren" msgid "Refresh List" msgstr "Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Entfernen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4238,7 +4207,7 @@ msgstr "" "Szene als Drahtgittermodell rendern.\n" "Dies ist nur für Debugging nützlich." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" @@ -4248,7 +4217,7 @@ msgstr "Im Hauptfenster Rendern" msgid "Reset" msgstr "Zurücksetzen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Ergebnisse" @@ -4270,33 +4239,33 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Sicher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Abtastrate:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Speichern" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "CGI speichern unter..." @@ -4340,7 +4309,7 @@ msgstr "Status in Slot 7 speichern" msgid "Save State Slot 8" msgstr "Status in Slot 8 speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Status speichern..." @@ -4349,24 +4318,24 @@ msgstr "Status speichern..." msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" @@ -4384,7 +4353,7 @@ msgstr "Suche nach ISOs" msgid "Scanning..." msgstr "Suche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ScrShot" @@ -4392,24 +4361,24 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Rollen Feststell" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Suche" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4424,17 +4393,17 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" msgid "Select" msgstr "Auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4452,23 +4421,23 @@ msgstr "Speicherdatei zum Importieren auswählen" msgid "Select floating windows" msgstr "Wähle unverankerte Fenster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4489,7 +4458,7 @@ msgstr "" msgid "Selected font" msgstr "Ausgewählte Schriftart" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4499,7 +4468,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4521,11 +4490,11 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4536,16 +4505,16 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4572,57 +4541,57 @@ msgstr "Kurzer Name:" msgid "Shoulder Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "&Konsole anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "&Log anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "&Statusleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "&Werkzeugleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "FPS anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Frankreich anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "JAP anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Korea anzeigen" @@ -4630,49 +4599,49 @@ msgstr "Korea anzeigen" msgid "Show Language:" msgstr "Sprache anzeigen:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 #, fuzzy msgid "Show Log &Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PAL anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Plattformen anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Taiwan anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "USA anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Wad anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4684,27 +4653,39 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Kommentar anzeigen" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Namen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4712,15 +4693,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Diese Hilfetexte anzeigen" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Unbekannte Anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4732,7 +4709,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" @@ -4740,21 +4717,21 @@ msgstr "Vereinfachtes Chinesisch" msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4762,7 +4739,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4772,17 +4749,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4802,11 +4779,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Sound Einstelungen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Sound-Backend %s ist ungültig." @@ -4821,8 +4798,8 @@ msgid "Space" msgstr "Leertaste" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spanisch" @@ -4830,7 +4807,7 @@ msgstr "Spanisch" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4842,10 +4819,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Wähle ein Video-Backend" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Ãœbertragungsrate beschleunigen" @@ -4864,11 +4837,11 @@ msgstr "Standard-Controller" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Starte &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "&Aufnahme starten" @@ -4890,15 +4863,15 @@ msgstr "Status" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4907,7 +4880,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "An Fenstergröße anpassen" @@ -4932,8 +4905,8 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systemsprache:" @@ -4941,7 +4914,7 @@ msgstr "Systemsprache:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4963,8 +4936,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4978,16 +4951,16 @@ msgstr "" msgid "Test" msgstr "Testen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -5004,13 +4977,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5052,7 +5025,7 @@ msgstr "Der Name darf nicht das Zeichen \",\" enthalten" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5066,7 +5039,7 @@ msgstr "" "Der Spielstand, denn Sie versuchen zu kopieren, hat eine ungültige " "Dateigröße." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5100,15 +5073,15 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Theme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Theme-Auswahl schiefgelaufen" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5125,7 +5098,7 @@ msgstr "" "Grau hinterlegte Kästchen bedeuten, dass die globalen Einstellungen benutzt " "werden." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5133,11 +5106,11 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5148,7 +5121,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5174,13 +5147,13 @@ msgstr "Schwelle" msgid "Tilt" msgstr "Neigung" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 #, fuzzy msgid "To" msgstr "Oben" @@ -5190,18 +5163,18 @@ msgstr "Oben" msgid "Toggle All Log Types" msgstr "Alle umschalten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" @@ -5225,7 +5198,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkisch" @@ -5250,7 +5223,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UNBEKANNT" @@ -5273,24 +5246,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Undefiniert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Status laden rückgängig machen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Unbekannt" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Unbekannter DVD-Befehl %08x - fataler Fehler" @@ -5316,7 +5289,7 @@ msgstr "" msgid "Up" msgstr "Hoch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Update" @@ -5325,24 +5298,24 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5350,7 +5323,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5359,15 +5332,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Hilfsmittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Wert" @@ -5375,7 +5348,7 @@ msgstr "Wert" msgid "Value:" msgstr "Wert:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Wert: " @@ -5387,11 +5360,11 @@ msgstr "Ausführung" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Lautstärke" @@ -5406,7 +5379,7 @@ msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" msgid "WAD installation failed: error creating ticket" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5443,7 +5416,7 @@ msgstr "" "%s\n" "Wollen Sie fortfahren?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5456,7 +5429,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5464,7 +5437,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5472,7 +5445,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5500,7 +5473,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5508,7 +5481,7 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5516,16 +5489,16 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5534,7 +5507,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Konnte die Datei nicht lesen" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5543,7 +5516,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5556,7 +5529,7 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" @@ -5564,7 +5537,7 @@ msgstr "Wiimote Verbunden" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote Einstellungen" @@ -5589,10 +5562,10 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Arbeite..." @@ -5629,7 +5602,7 @@ msgstr "XAudio2 _init_ fehlgeschlagen: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 _Master-Stimmenerstellung_ fehlgeschlagen: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5651,11 +5624,11 @@ msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten." msgid "You must choose a game!!" msgstr "Sie müssen ein Spiel auswählen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Sie müssen einen Namen eingeben!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 #, fuzzy msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" @@ -5664,7 +5637,7 @@ msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -5689,11 +5662,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP Hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 Code wird nicht unterstüzt" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" @@ -5703,7 +5676,7 @@ msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" msgid "[ waiting ]" msgstr "[ warte ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5715,7 +5688,7 @@ msgstr "" msgid "[Custom]" msgstr "[Benutzerdefiniert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5726,7 +5699,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5739,7 +5712,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5766,7 +5739,7 @@ msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." msgid "not a wii save or read failure for file header size %x" msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5775,7 +5748,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -5995,6 +5968,12 @@ msgstr "| ODER" #~ msgid "Data Type" #~ msgstr "Datentyp" +#~ msgid "Disable Lighting" +#~ msgstr "keine Beleuchtung" + +#~ msgid "Disable Textures" +#~ msgstr "keine Texturen" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6136,9 +6115,16 @@ msgstr "| ODER" #~ msgid "Error opening file %s for recording" #~ msgstr "Fehler beim Öffnen der Datei %s für die Aufnahme." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphin mit Emulator beenden." + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fehler beim Laden von DSP-ROM: %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Native Mipmaps laden" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6194,6 +6180,15 @@ msgstr "| ODER" #~ "Wenn ein Spiel einfriert, nur im Interpreter funktioniert, oder Dolphin " #~ "Abstürzt, könnte diese Option das beheben." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Beleuchtung Deaktivieren. Verbessert die Performance, aber schaltet " +#~ "Beleuchtung in Spielen ab, die sie benutzen." + #~ msgid "Input Source" #~ msgstr "Eingabequelle" @@ -6240,6 +6235,12 @@ msgstr "| ODER" #~ "Native Mipmaps zu laden ist genauer, aber könnte auch die Performance " #~ "verschlechtern (Leistung kann dennoch variieren)" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Wähle die 'low level' (LLE) oder 'high level' (HLE) Audioemulation" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script Konsole" @@ -6286,6 +6287,12 @@ msgstr "| ODER" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Öffnet den Debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Öffnet den Logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6376,6 +6383,9 @@ msgstr "| ODER" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zeigt die Anzahl der Bilder, die pro Sekunde gerendert werden." +#~ msgid "Show this help message" +#~ msgstr "Diese Hilfetexte anzeigen" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6420,6 +6430,9 @@ msgstr "| ODER" #~ "Die anderen Optionen sind feste Auflösungen um Qualität unabhängig der " #~ "Displaygröße zu wählen." +#~ msgid "Specify a video backend" +#~ msgstr "Wähle ein Video-Backend" + #~ msgid "Specify an audio plugin" #~ msgstr "Audio-Plugin auswählen" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index 8b165d6d39..b217b76fd7 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "" @@ -43,7 +43,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -53,9 +53,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -140,7 +140,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -149,147 +149,147 @@ msgstr "" msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -305,27 +305,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -346,11 +346,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -359,8 +359,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "" @@ -394,7 +394,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "" @@ -407,7 +407,7 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -415,7 +415,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -439,39 +439,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -482,27 +482,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "" @@ -511,11 +511,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "" @@ -525,7 +525,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "" @@ -559,36 +559,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -596,9 +596,9 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -608,15 +608,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "" @@ -628,22 +628,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -652,18 +652,18 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +671,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" @@ -684,43 +684,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "" @@ -728,12 +720,12 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "" @@ -750,7 +742,7 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "" @@ -767,11 +759,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -783,7 +775,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -800,7 +792,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "" @@ -813,7 +805,7 @@ msgstr "" msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "" @@ -821,11 +813,11 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "" @@ -839,7 +831,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -851,19 +843,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -873,7 +865,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -882,7 +874,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -898,7 +890,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -906,24 +898,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -931,7 +923,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -943,7 +935,7 @@ msgstr "" msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "" @@ -956,7 +948,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -970,8 +962,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -983,7 +975,7 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "" @@ -995,35 +987,35 @@ msgstr "" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "" @@ -1031,14 +1023,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "" @@ -1063,22 +1055,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "" @@ -1086,7 +1078,7 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" @@ -1094,20 +1086,20 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "" @@ -1126,17 +1118,17 @@ msgstr "" msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1145,11 +1137,11 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1174,7 +1166,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "" @@ -1194,7 +1186,7 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "" @@ -1208,7 +1200,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1237,7 +1229,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1246,18 +1238,18 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "" @@ -1265,8 +1257,8 @@ msgstr "" msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "" @@ -1275,20 +1267,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1300,11 +1292,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1315,7 +1307,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1332,11 +1324,11 @@ msgstr "" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1344,36 +1336,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" @@ -1385,7 +1377,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "" @@ -1393,8 +1385,8 @@ msgstr "" msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1410,7 +1402,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "" @@ -1418,16 +1410,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "" @@ -1435,7 +1427,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" @@ -1448,7 +1440,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "" @@ -1457,7 +1449,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "" @@ -1477,8 +1469,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1500,28 +1492,20 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1530,7 +1514,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1540,13 +1524,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "" @@ -1556,11 +1533,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1571,20 +1548,20 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "" @@ -1596,16 +1573,16 @@ msgstr "" msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1613,7 +1590,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "" @@ -1651,37 +1628,37 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1689,23 +1666,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1715,11 +1692,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "" @@ -1735,7 +1712,7 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1748,15 +1725,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1765,7 +1742,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1787,7 +1764,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1797,7 +1774,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1813,11 +1790,11 @@ msgstr "" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "" @@ -1825,11 +1802,11 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "" @@ -1837,7 +1814,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1846,11 +1823,11 @@ msgid "Enable MMU" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" @@ -1858,11 +1835,11 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1877,11 +1854,11 @@ msgid "" "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1889,7 +1866,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1914,7 +1891,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1928,7 +1905,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1940,13 +1917,13 @@ msgid "End" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "" @@ -1964,17 +1941,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2009,10 +1986,6 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "" @@ -2026,19 +1999,19 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "" @@ -2046,7 +2019,7 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" @@ -2054,7 +2027,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2090,28 +2063,28 @@ msgstr "" msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2135,7 +2108,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2232,33 +2205,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "" @@ -2300,43 +2269,43 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2344,7 +2313,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2352,7 +2321,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2369,17 +2338,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "" @@ -2388,37 +2357,37 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "" @@ -2426,20 +2395,20 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2447,11 +2416,11 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2479,24 +2448,28 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "" @@ -2512,8 +2485,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "" @@ -2522,29 +2495,29 @@ msgid "General Settings" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2555,7 +2528,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2575,11 +2548,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2587,7 +2560,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2599,7 +2572,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2613,11 +2586,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2639,11 +2612,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2651,12 +2624,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2665,11 +2638,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2689,7 +2662,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" @@ -2697,7 +2670,7 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2712,18 +2685,18 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2732,7 +2705,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2741,7 +2714,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "" @@ -2765,7 +2738,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2773,13 +2746,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "" @@ -2809,7 +2775,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2817,11 +2783,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "" @@ -2830,57 +2796,57 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" @@ -2893,7 +2859,7 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "" @@ -2906,7 +2872,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2918,29 +2884,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "" @@ -2948,16 +2914,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" @@ -2965,14 +2931,14 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -2981,8 +2947,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3000,16 +2966,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "" @@ -3042,11 +3008,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3054,7 +3020,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "" @@ -3098,20 +3064,20 @@ msgstr "" msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3122,15 +3088,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3142,16 +3104,28 @@ msgstr "" msgid "Log Configuration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "" @@ -3159,10 +3133,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3178,8 +3148,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3209,7 +3179,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "" @@ -3252,11 +3222,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3265,7 +3235,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3286,7 +3256,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3307,11 +3277,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3405,28 +3375,28 @@ msgstr "" msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "" @@ -3447,8 +3417,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3456,7 +3426,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3464,7 +3434,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "" @@ -3478,20 +3448,20 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "" @@ -3516,7 +3486,7 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "" @@ -3529,15 +3499,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3545,26 +3515,30 @@ msgstr "" msgid "Offset:" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "" @@ -3582,22 +3556,14 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3614,8 +3580,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3629,7 +3595,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "" @@ -3674,17 +3640,21 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "" @@ -3697,10 +3667,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "" @@ -3718,7 +3688,7 @@ msgstr "" msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "" @@ -3726,7 +3696,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "" @@ -3738,23 +3708,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3763,29 +3733,29 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3798,11 +3768,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "" @@ -3818,7 +3788,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "" @@ -3845,7 +3815,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "" @@ -3862,7 +3832,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "" @@ -3874,7 +3844,7 @@ msgstr "" msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -3882,17 +3852,17 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -3908,7 +3878,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3918,7 +3888,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3928,25 +3898,25 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "" @@ -3956,7 +3926,7 @@ msgstr "" msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "" @@ -3978,33 +3948,33 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" @@ -4048,7 +4018,7 @@ msgstr "" msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "" @@ -4057,24 +4027,24 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4091,7 +4061,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "" @@ -4099,23 +4069,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4130,16 +4100,16 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4154,23 +4124,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4185,7 +4155,7 @@ msgstr "" msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4195,7 +4165,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4217,11 +4187,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4230,16 +4200,16 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4264,55 +4234,55 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "" @@ -4320,74 +4290,85 @@ msgstr "" msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4395,15 +4376,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4414,7 +4391,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4422,19 +4399,19 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4442,7 +4419,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4452,17 +4429,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4482,11 +4459,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4501,8 +4478,8 @@ msgid "Space" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "" @@ -4510,7 +4487,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4522,10 +4499,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4544,11 +4517,11 @@ msgstr "" msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "" @@ -4570,15 +4543,15 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4587,7 +4560,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "" @@ -4612,8 +4585,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" @@ -4621,7 +4594,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4642,8 +4615,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4657,15 +4630,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "" @@ -4681,13 +4654,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4723,7 +4696,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4735,7 +4708,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4766,15 +4739,15 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -4786,17 +4759,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4807,7 +4780,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4828,13 +4801,13 @@ msgstr "" msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "" @@ -4842,18 +4815,18 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" @@ -4875,7 +4848,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -4900,7 +4873,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4923,24 +4896,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4965,7 +4938,7 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "" @@ -4974,23 +4947,23 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4998,7 +4971,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5007,15 +4980,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "" @@ -5023,7 +4996,7 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "" @@ -5035,11 +5008,11 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" @@ -5053,7 +5026,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5087,7 +5060,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5096,7 +5069,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5104,7 +5077,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5112,7 +5085,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5140,7 +5113,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5148,7 +5121,7 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" @@ -5156,15 +5129,15 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5173,7 +5146,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "" @@ -5182,7 +5155,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5191,7 +5164,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "" @@ -5199,7 +5172,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "" @@ -5223,10 +5196,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "" @@ -5261,7 +5234,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5283,11 +5256,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" @@ -5295,7 +5268,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5317,11 +5290,11 @@ msgstr "" msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5331,7 +5304,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5343,7 +5316,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5354,7 +5327,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5367,7 +5340,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5394,7 +5367,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5403,7 +5376,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 2ed1108db6..45db45d2cb 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-04-03 21:13+0200\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(πολλά αποτελέσματα για να εμφανιστοÏν)" @@ -47,7 +47,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -57,9 +57,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγÏαφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -157,7 +157,7 @@ msgstr "%sΕξαγωγή GCI%s" msgid "%sImport GCI%s" msgstr "%sΕισαγωγή GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φακέλων" @@ -166,147 +166,147 @@ msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φα msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&ΠεÏί..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Εκκίνηση από τον οδηγό DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Σημεία Διακοπής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&ΕÏÏεση ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&ΔιαχειÏιστής Cheat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Εξομοίωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&ΑÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Βοήθεια" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&ΔιαχειÏιστής ΚαÏτών Μνήμης (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Μνήμη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Άνοιγμα..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&ΠαÏση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&ΚαταχωÏητές" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Ήχος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Διακοπή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Βίντεο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&ΠÏοβολή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -322,27 +322,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(ανενεÏγό)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -350,7 +350,7 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" @@ -363,11 +363,11 @@ msgstr "<Τίποτα>" msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<Συστήματος>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -376,8 +376,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Ένα παÏάθυÏο NetPlay είναι ήδη ανοιχτό!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Αυτή τη στιγμή δεν εκτελείται κάπιο παιχνίδι." @@ -428,7 +428,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -441,7 +441,7 @@ msgstr "Σχετικά με το Dolphin" msgid "Acceleration" msgstr "Επιτάχυνση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "ΑκÏίβεια:" @@ -449,7 +449,7 @@ msgstr "ΑκÏίβεια:" msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -483,7 +483,7 @@ msgstr "" "ΠÏοβληματικός Κωδικός:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -491,7 +491,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -500,7 +500,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " "και Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -509,7 +509,7 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " "Write και Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -518,12 +518,12 @@ msgstr "" "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " "To Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -536,27 +536,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Σφάλμα Action Replay: μη έγκυÏη γÏαμμή κώδικα AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: Μη έγκυÏο μέγεθος %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Μη έγκυÏος Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυÏο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" @@ -565,11 +565,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -579,7 +579,7 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -615,38 +615,38 @@ msgstr "" "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " "ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" @@ -654,9 +654,10 @@ msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -670,15 +671,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -690,15 +691,15 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -708,7 +709,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ΑÏαβικά" @@ -717,7 +718,7 @@ msgstr "ΑÏαβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -725,14 +726,14 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -740,12 +741,12 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -753,24 +754,24 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -781,24 +782,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" -"Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα στις " -"υφές.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&ΚαταχωÏητές" @@ -807,12 +795,12 @@ msgstr "&ΚαταχωÏητές" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend:" @@ -829,7 +817,7 @@ msgstr "Πίσω" msgid "Bad File Header" msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Εικονίδιο" @@ -846,11 +834,11 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -862,7 +850,7 @@ msgstr "Μπάσο" msgid "Block Allocation Table checksum failed" msgstr "Αποτυχία ελέγχου checksum για τον BAT" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Μπλοκ" @@ -879,7 +867,7 @@ msgid "Blue Right" msgstr "Δεξί Μπλε" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Βάση" @@ -892,7 +880,7 @@ msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" msgid "Broken" msgstr "Χαλασμένο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "ΕÏÏεση" @@ -900,11 +888,11 @@ msgstr "ΕÏÏεση" msgid "Browse for a directory to add" msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" @@ -918,7 +906,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Κουμπιά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -930,19 +918,19 @@ msgstr "Stick ΚάμεÏας " msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -958,7 +946,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -973,7 +961,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -989,7 +977,7 @@ msgstr "Αποτυχία ανοίγματος %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1000,7 +988,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1008,18 +996,18 @@ msgstr "" "Αδυναμία χÏήσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου σαν κάÏτα μνήμης.\n" "ΠÏοσπαθείτε να χÏησιμοποιήσετε το ίδιο αÏχείο σε δÏο slot;" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interface: ΚÏίσιμο Σφάλμα" @@ -1027,7 +1015,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Καταλανικά" @@ -1039,7 +1027,7 @@ msgstr "ΚέντÏο" msgid "Change" msgstr "Αλλαγή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Αλλαγή &Δίσκου..." @@ -1052,7 +1040,7 @@ msgstr "Αλλαγή Δίσκου" msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1068,8 +1056,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" @@ -1081,7 +1069,7 @@ msgstr "Συνομιλία" msgid "Cheat Code" msgstr "Κωδικός Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Αναζήτηση Cheat" @@ -1093,35 +1081,35 @@ msgstr "ΔιαχείÏιση Cheat" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1129,7 +1117,7 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,8 +1125,8 @@ msgstr "" "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " "απαÏτίζονται μόνο από φακέλους)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1165,22 +1153,22 @@ msgstr "" "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " "απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Κλείσιμο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Ρυ&θμίσεις..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "ΠληÏοφοÏίες ΚωδικοÏ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Κωδικός: " @@ -1188,7 +1176,7 @@ msgstr "Κωδικός: " msgid "Command" msgstr "Εντολή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Σχόλιο" @@ -1196,20 +1184,20 @@ msgstr "Σχόλιο" msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Συμπίεση ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Ρυθμίσεις" @@ -1228,17 +1216,17 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίου" msgid "Configure Pads" msgstr "Ρυθμίσεις ΧειÏιστηÏίων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" @@ -1247,11 +1235,11 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "ΣÏνδεση Wiimote %i" @@ -1276,7 +1264,7 @@ msgstr "ΣÏνδεση Wiimote 3" msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1296,7 +1284,7 @@ msgstr "ΜετατÏοπή σε GCI" msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" @@ -1310,7 +1298,7 @@ msgstr "ΠυÏήνας" msgid "Could not create %s" msgstr "Αποτυχία δημιουÏγίας %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Αποτυχία εκκίνησης backend %s" @@ -1347,7 +1335,7 @@ msgstr "" "(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " "το παÏόν)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1360,11 +1348,11 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " "Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,8 +1360,8 @@ msgstr "" "Αδυναμία εκκίνησης του πυÏήνα.\n" "Ελέξγτε τις Ïυθμίσεις σας." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Πλήθος:" @@ -1381,8 +1369,8 @@ msgstr "Πλήθος:" msgid "Country:" msgstr "ΧώÏα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" @@ -1391,22 +1379,22 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "ΔημιουÏγήθηκε από VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " @@ -1420,11 +1408,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,7 +1426,7 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" @@ -1455,11 +1443,11 @@ msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Τσέχικα" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1467,36 +1455,36 @@ msgstr "" msgid "D-Pad" msgstr "Ψηφιακό Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1509,7 +1497,7 @@ msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" "DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" @@ -1517,8 +1505,8 @@ msgstr "Μέγεθος Δεδομένων" msgid "Date:" msgstr "ΗμεÏομηνία:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "ΑÏχεία Datel MaxDrive/Pro(*.sav)" @@ -1534,7 +1522,7 @@ msgstr "ÎεκÏή Ζώνη" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Debugging" @@ -1542,16 +1530,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1559,7 +1547,7 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" @@ -1572,7 +1560,7 @@ msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" msgid "Delete" msgstr "ΔιαγÏαφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" @@ -1581,7 +1569,7 @@ msgstr "ΔιαγÏαφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "ΠεÏιγÏαφή" @@ -1603,8 +1591,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1628,28 +1616,20 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "ΑπενεÏγοποίηση Υφών" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1663,7 +1643,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1679,16 +1659,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ΑπενεÏγοποίηση υφών.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Δίσκος" @@ -1698,11 +1668,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1716,20 +1686,20 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Ιστοσελίδα του &Dolphin" @@ -1741,16 +1711,16 @@ msgstr "Ρυθμίσεις Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1758,7 +1728,7 @@ msgstr "Dolphin TAS Ταινίες (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Ρυθμίσεις Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" @@ -1800,23 +1770,23 @@ msgstr "ΤÏμπανα" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1827,7 +1797,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1838,7 +1808,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1849,23 +1819,23 @@ msgstr "" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Ολλανδικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1879,11 +1849,11 @@ msgstr "" msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "ΕνημεÏώσεις Μνήμης ÎωÏίς" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "ΕπεξεÏγασία" @@ -1899,7 +1869,7 @@ msgstr "ΕπεξεÏγασία Ρυθμίσεων" msgid "Edit Patch" msgstr "ΕπεξεÏγασία Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" @@ -1912,15 +1882,15 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1935,7 +1905,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1963,7 +1933,7 @@ msgstr "Κατάσταση ΛειτουÏγίας:" msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1979,7 +1949,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" @@ -1995,11 +1965,11 @@ msgstr "ΕνεÏγοποίηση Block Merging" msgid "Enable Bounding Box Calculation" msgstr "ΕνεÏγοποίηση Bounding Box Υπολογισμών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" @@ -2007,11 +1977,11 @@ msgstr "ΕνεÏγοποίηση Cheat" msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" @@ -2019,7 +1989,7 @@ msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" @@ -2028,11 +1998,11 @@ msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" @@ -2040,11 +2010,11 @@ msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2067,11 +2037,11 @@ msgstr "" "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " "(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "ΕνεÏγοποίηση σελίδων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2084,7 +2054,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2118,7 +2088,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2138,7 +2108,7 @@ msgstr "" "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " "(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2153,13 +2123,13 @@ msgid "End" msgstr "Τέλος" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2177,17 +2147,17 @@ msgstr "ΕγγÏαφή %d/%d" msgid "Entry 1/%d" msgstr "ΕγγÏαφή 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " @@ -2230,10 +2200,6 @@ msgstr "" msgid "Execute" msgstr "Εκτέλεση" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" @@ -2247,19 +2213,19 @@ msgstr "Εξαγωγή ΑÏχείου" msgid "Export Recording" msgstr "Εξαγωγή ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Εξαγωγή ΕγγÏαφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεÏσεων" @@ -2267,7 +2233,7 @@ msgstr "Εξαγωγή όλων των αποθηκεÏσεων" msgid "Export failed, try again?" msgstr "Αποτυχία εξαγωγής, Ï€Ïοσπάθεια ξανά;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Εξαγωγή αποθήκευσης ως..." @@ -2275,7 +2241,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2311,28 +2277,28 @@ msgstr "Εξαγωγή ΑÏχείου..." msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "ΑναπαÏαγωγή FIFO" @@ -2356,7 +2322,7 @@ msgstr "Αποτυχία ακÏόασης!!" msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2473,23 +2439,19 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "ΠεÏσικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "ΓÏήγοÏα Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2497,11 +2459,11 @@ msgstr "" "ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε " "PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "ΑναπαÏαγωγή Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "ΠληÏοφοÏίες ΑÏχείου" @@ -2547,43 +2509,43 @@ msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ΠÏώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2596,7 +2558,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2608,7 +2570,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2631,17 +2593,17 @@ msgstr "" msgid "Forward" msgstr "ΜπÏοστά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "ΚαÏέ" @@ -2650,38 +2612,38 @@ msgstr "ΚαÏέ" msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "ΕÏÏος ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Γαλλικά" @@ -2689,20 +2651,20 @@ msgstr "Γαλλικά" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Από" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "ΑÏχεία GCI(*.gci)" @@ -2710,11 +2672,11 @@ msgstr "ΑÏχεία GCI(*.gci)" msgid "GCMic Configuration" msgstr "Ρυθμίσεις ΜικÏοφώνου GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2742,24 +2704,28 @@ msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις ΧειÏιστηÏίου Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" @@ -2779,8 +2745,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Γενικά" @@ -2789,31 +2755,31 @@ msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "ΓεÏμανικά" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " "κωδικών ar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "ΓÏαφικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2831,7 +2797,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Ελληνικά" @@ -2851,11 +2817,11 @@ msgstr "Δεξί ΠÏάσινο" msgid "Guitar" msgstr "ΚιθάÏα" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2863,7 +2829,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ΕβÏαϊκά" @@ -2875,7 +2841,7 @@ msgstr "Ύψος" msgid "Help" msgstr "Βοήθεια" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2895,11 +2861,11 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2925,11 +2891,11 @@ msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ΟυγγÏικά" @@ -2937,14 +2903,14 @@ msgstr "ΟυγγÏικά" msgid "Hybrid Wiimote" msgstr "ΥβÏιδικό Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2957,11 +2923,11 @@ msgstr "" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -2981,7 +2947,7 @@ msgstr "Ευαισθησία IR:" msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -2989,7 +2955,7 @@ msgstr "Φάκελοι ISO" msgid "ITALY" msgstr "ΙΤΑΛΙΑ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Εικονίδιο" @@ -3008,7 +2974,7 @@ msgstr "" "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " "Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3019,11 +2985,11 @@ msgstr "" "διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές " "θόÏυβο αναλόγα με το παιχνίδι)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3037,7 +3003,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3052,7 +3018,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -3080,7 +3046,7 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3092,17 +3058,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " -"πεÏισσότεÏα παιχνίδια.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" @@ -3132,7 +3087,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -3140,11 +3095,11 @@ msgstr "Εισαγωγή ΚάÏτας SD" msgid "Insert name here.." msgstr "Εισάγετε όνομα εδώ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" @@ -3155,42 +3110,42 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία συμπίεσης" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3199,15 +3154,15 @@ msgstr "" "ΕσωτεÏικό Σφάλμα LZO - αποτυχία αποσυμπίεσης (%d) (%ld, %ld) \n" "Δοκιμάστε να φοÏτώσετε ξανά το σημείο αποθήκευσης" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" @@ -3220,7 +3175,7 @@ msgstr "Εισαγωγή" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Μη έγκυÏο μέγεθος (%x) ή μαγική λέξη (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Μη έγκυÏη τιμή!" @@ -3233,7 +3188,7 @@ msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" msgid "Invalid event type %i" msgstr "Μη έγκυÏος Ï„Ïπος συμβάντος %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Μη έγκυÏο αÏχείο" @@ -3248,29 +3203,29 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Ιταλικά" @@ -3278,16 +3233,16 @@ msgstr "Ιταλικά" msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Ιαπωνικά" @@ -3295,7 +3250,7 @@ msgstr "Ιαπωνικά" msgid "KOREA" msgstr "ΚΟΡΕΑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3307,7 +3262,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3316,8 +3271,8 @@ msgstr "" msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "ΚοÏεάτικα" @@ -3335,16 +3290,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Γλώσσα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." @@ -3384,11 +3339,11 @@ msgstr "" "ΑÏιστεÏÏŒ/Δεξί κλικ για πεÏισσότεÏες επιλογές.\n" "Μεσαίο κλικ για καθάÏισμα." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" @@ -3396,7 +3351,7 @@ msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" @@ -3440,20 +3395,20 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 7" msgid "Load State Slot 8" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3467,15 +3422,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "ΦόÏτωση Ï€Ïοεπιλεγμένων τιμών από διαθέσιμα Ï€Ïότυπα hack." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " @@ -3487,16 +3438,33 @@ msgstr "ΚαταγÏαφή" msgid "Log Configuration" msgstr "Ρυθμίσεις ΚαταγÏαφής" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " +"μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"\n" +"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3504,10 +3472,6 @@ msgstr "ΚαταγÏαφή" msgid "Lost connection to server!" msgstr "Χάθηκε η σÏνδεση με τον διακομιστή!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Î§Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (LLE) ή Ï…ÏˆÎ·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (HLE) εξομοίωση ήχου" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3525,8 +3489,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" @@ -3556,7 +3520,7 @@ msgstr "Η κάÏτα μνήμης έχει ήδη αποθηκευμένα δε msgid "Memcard already opened" msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Memory Byte" @@ -3609,11 +3573,11 @@ msgstr "ΜικÏόφωνο" msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -3622,7 +3586,7 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3648,7 +3612,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3677,11 +3641,11 @@ msgstr "" "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " "Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3775,28 +3739,28 @@ msgstr "NP Up" msgid "Name:" msgstr "Όνομα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Όνομα: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ΑÏχεία Native GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Îέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Επόμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Επόμενη Ανίχνευση" @@ -3817,8 +3781,8 @@ msgstr "Δε βÏέθηκαν ISO ή WAD" msgid "No banner file found for title %s" msgstr "Δε βÏέθηκε αÏχείο εικονιδίου για τον τίτλο %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3826,7 +3790,7 @@ msgstr "" msgid "No docking" msgstr "ΑπενεÏγοποίηση του docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Δεν φοÏτώθηκε αÏχείο" @@ -3834,7 +3798,7 @@ msgstr "Δεν φοÏτώθηκε αÏχείο" msgid "No free dir index entries" msgstr "Δεν υπάÏχουν ελεÏθεÏες εγγÏαφές φακέλων" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Κανένα εγγεγÏαμένο αÏχείο" @@ -3848,20 +3812,20 @@ msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Όχι ίσο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Μη Συνδεδεμένο" @@ -3886,7 +3850,7 @@ msgstr "Σημείωση" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " @@ -3899,15 +3863,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Επιτάχυνση Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Αντικείμενο" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ΑνενεÏγός" @@ -3915,26 +3879,30 @@ msgstr "ΑνενεÏγός" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Άνοιγμα αÏχείου..." @@ -3952,22 +3920,14 @@ msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Άνοιγμα του debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Άνοιγμα της καταγÏαφής" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3988,8 +3948,8 @@ msgstr "" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Άλλα" @@ -4005,7 +3965,7 @@ msgstr "" msgid "Output" msgstr "Έξοδος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Αναπα&Ïαγωγή ΕγγÏαφής" @@ -4050,17 +4010,21 @@ msgstr "Κατάτμηση %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" @@ -4073,10 +4037,10 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4094,7 +4058,7 @@ msgstr "ΑναπαÏαγωγή/ΠαÏση" msgid "Playable" msgstr "Παίζεται" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Ρυθμίσεις ΑναπαÏαγωγής" @@ -4102,7 +4066,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4114,23 +4078,23 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ΘÏÏα 4" @@ -4139,29 +4103,29 @@ msgstr "ΘÏÏα 4" msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u > %u" @@ -4174,11 +4138,11 @@ msgstr "ΠÏοεπιλογές: " msgid "Prev Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "ΠÏοηγοÏμενη Τιμή" @@ -4194,7 +4158,7 @@ msgstr "ΠÏοφίλ" msgid "Properties" msgstr "Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "ΚαθαÏισμός Cache" @@ -4221,7 +4185,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4238,7 +4202,7 @@ msgstr "ΕÏÏος" msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "ΠÏαγματικό" @@ -4250,7 +4214,7 @@ msgstr "ΠÏαγματικό Wiimote" msgid "Real Wiimotes" msgstr "ΠÏαγματικά Wiimotes" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Επιβεβαίωση ΕπανασÏνδεσης Wiimote" @@ -4258,17 +4222,17 @@ msgstr "Επιβεβαίωση ΕπανασÏνδεσης Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "ΕπανασÏνδεση Wiimote Κατά Την ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "ΠληÏοφοÏίες ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Ρυθμίσεις ΕγγÏαφής" @@ -4284,7 +4248,7 @@ msgstr "ΑÏιστεÏÏŒ Κόκκινο" msgid "Red Right" msgstr "Δεξί Κόκκινο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4299,7 +4263,7 @@ msgstr "" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ανανέωση" @@ -4309,18 +4273,18 @@ msgstr "Ανανέωση" msgid "Refresh List" msgstr "Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4330,7 +4294,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" @@ -4340,7 +4304,7 @@ msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" msgid "Reset" msgstr "Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Αποτελέσματα" @@ -4362,33 +4326,33 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωÏιστό νήμα (δεν Ï€Ïοτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ρώσικα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Ασφαλής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Ρυθμός Δειγματοληψίας:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Αποθήκ." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Αποθήκευση GCI ως..." @@ -4432,7 +4396,7 @@ msgstr "Αποθήκευση Σημείου Αποθήκευσης 7" msgid "Save State Slot 8" msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Αποθήκευση Σημείου..." @@ -4441,26 +4405,26 @@ msgstr "Αποθήκευση Σημείου..." msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " "εγγÏαφής της ταινίας..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" @@ -4477,7 +4441,7 @@ msgstr "Αναζήτηση για ISOs" msgid "Scanning..." msgstr "Ανίχνευση..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Στιγμιότυπο" @@ -4485,25 +4449,25 @@ msgstr "Στιγμιότυπο" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Αναζήτηση Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4518,16 +4482,16 @@ msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" msgid "Select" msgstr "Επιλογή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4545,23 +4509,23 @@ msgstr "Επιλέξτε ένα αÏχείο αποθήκευσης για ει msgid "Select floating windows" msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4584,7 +4548,7 @@ msgstr "" msgid "Selected font" msgstr "Επιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4601,7 +4565,7 @@ msgstr "" "σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4629,11 +4593,11 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "ΣεÏβικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4644,16 +4608,16 @@ msgstr "" msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4680,55 +4644,55 @@ msgstr "ΣÏντομο Όνομα:" msgid "Shoulder Buttons" msgstr "Κουμπιά Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Εμφάνιση &Κονσόλας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Εμφάνιση ΠαÏαθÏÏου Κατα&γÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Εμφάνιση ΜπάÏας Κατάστασης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Εμφάνιση FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Εμφάνιση Γαλλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Εμφάνιση Ιταλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Εμφάνιση JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" @@ -4736,47 +4700,47 @@ msgstr "Εμφάνιση ΚοÏέας" msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Εμφάνιση Ρυθμίσεων &ΚαταγÏαφέα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Εμφάνιση PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Εμφάνιση ΠλατφόÏμας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Εμφάνιση Ταϊβάν" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Εμφάνιση USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Εμφάνιση Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή ενός παιχνιδιοÏ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4787,27 +4751,39 @@ msgstr "" "κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Εμφάνιση αποθηκευμένου σχολίου" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4819,15 +4795,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4841,7 +4813,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" @@ -4849,19 +4821,19 @@ msgstr "Κινέζικα Απλοποιημένα" msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4873,7 +4845,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4890,17 +4862,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Θέση Î’" @@ -4925,11 +4897,11 @@ msgstr "" "Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " "σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Το backend ήχου %s δεν είναι έγκυÏο." @@ -4944,8 +4916,8 @@ msgid "Space" msgstr "Space" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Ισπανικά" @@ -4953,7 +4925,7 @@ msgstr "Ισπανικά" msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4974,10 +4946,6 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Επιλέξτε ένα backend βίντεο" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από τον Δίσκο" @@ -4996,11 +4964,11 @@ msgstr "Τυπικός Controller" msgid "Start" msgstr "Εκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Εκκίνηση ΛειτουÏγίας &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Εκκίνηση Ε&γγÏαφής" @@ -5022,15 +4990,15 @@ msgstr "Σημεία Αποθήκευσης" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5044,7 +5012,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -5069,8 +5037,8 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -5078,7 +5046,7 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -5099,8 +5067,8 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5114,15 +5082,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Υφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Cache Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -5138,13 +5106,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5185,7 +5153,7 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5202,7 +5170,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5235,15 +5203,15 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Θέμα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5260,7 +5228,7 @@ msgstr "" "Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " "του Dolphin. " -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5268,13 +5236,13 @@ msgstr "" "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " "ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " "παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5294,7 +5262,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5320,13 +5288,13 @@ msgstr "Κατώφλι" msgid "Tilt" msgstr "Πλάγιασμα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Τίτλος" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Εώς" @@ -5334,18 +5302,18 @@ msgstr "Εώς" msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " @@ -5369,7 +5337,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ΤουÏκικά" @@ -5394,7 +5362,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ΑΓÎΩΣΤΟ" @@ -5423,24 +5391,24 @@ msgstr "" "τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Μη οÏισμένο %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Άγνωστο" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Άγνωστη εντολή DVD %08x - κÏίσιμο σφάλμα" @@ -5465,7 +5433,7 @@ msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκ msgid "Up" msgstr "Πάνω" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "ΕνημέÏωση" @@ -5474,23 +5442,23 @@ msgstr "ΕνημέÏωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5503,7 +5471,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5518,15 +5486,15 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Τιμή" @@ -5534,7 +5502,7 @@ msgstr "Τιμή" msgid "Value:" msgstr "Τιμή:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Τιμή: " @@ -5546,11 +5514,11 @@ msgstr "Αναλυτικότητα" msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ένταση" @@ -5564,7 +5532,7 @@ msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά Ï„ msgid "WAD installation failed: error creating ticket" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουÏγία του εισιτηÏίου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5607,7 +5575,7 @@ msgstr "" "%s\n" "Θέλετε να συνεχίσετε;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5621,7 +5589,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5633,7 +5601,7 @@ msgstr "" "φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων " "με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5646,7 +5614,7 @@ msgstr "" "την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " "ασυγχÏονισμός." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5690,7 +5658,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5698,7 +5666,7 @@ msgstr "Hack ΕυÏείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5706,15 +5674,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5723,7 +5691,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5732,7 +5700,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5745,7 +5713,7 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" @@ -5753,7 +5721,7 @@ msgstr "Συνδεδεμένο Wiimote" msgid "Wiimote Motor" msgstr "ÎœÎ¿Ï„Î­Ï Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Ρυθμίσεις Wiimote" @@ -5777,10 +5745,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Σε εÏγασία..." @@ -5815,7 +5783,7 @@ msgstr "Αποτυχία αÏχικοποίησης XAudio2: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Αποτυχία δημιουÏγίας κεντÏικής φωνής XAudio2: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5839,11 +5807,11 @@ msgstr "Δεν μποÏείτε να κλείσετε pane που έχουν σ msgid "You must choose a game!!" msgstr "ΠÏέπει να επιλέξετε ένα παιχνίδι!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "ΠÏέπει να εισάγετε ένα όνομα!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική ή δεκαεξαδική τιμή." @@ -5851,7 +5819,7 @@ msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -5879,11 +5847,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Δεν υποστηÏίζεται ο Zero 3 code" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Άγνωστος Zero code: %08x" @@ -5893,7 +5861,7 @@ msgstr "Άγνωστος Zero code: %08x" msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5909,7 +5877,7 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5928,7 +5896,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5946,7 +5914,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5975,7 +5943,7 @@ msgstr "" "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " "μεγέθους %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "." @@ -5984,7 +5952,7 @@ msgstr "." msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -6000,6 +5968,18 @@ msgstr "zNear ΔιόÏθωση: " msgid "| OR" msgstr "| OR" +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "ΔημιουÏγεί αυτόματα τα mipmaps αντί να τα αποκωδικοποιεί από την μνήμη.\n" +#~ "Αυξάνει λίγο τις επιδόσεις, αλλά μποÏεί να Ï€Ïοκαλέσει μικÏά ελαττώματα " +#~ "στις υφές.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -6007,12 +5987,61 @@ msgstr "| OR" #~ msgid "Clear failed." #~ msgstr "Το καθάÏισμα απέτυχε." +#~ msgid "Disable Lighting" +#~ msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" + +#~ msgid "Disable Textures" +#~ msgstr "ΑπενεÏγοποίηση Υφών" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ΑπενεÏγοποίηση υφών.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + #~ msgid "Enable Audio Throttle" #~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" #~ msgid "Enable DTK Music" #~ msgstr "ΕνεÏγοποίηση Μουσικής DTK" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" + +#~ msgid "Fast Mipmaps" +#~ msgstr "ΓÏήγοÏα Mipmaps" + +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί την εξαφάνιση του Ï†Ï‰Ï„Î¹ÏƒÎ¼Î¿Ï ÏƒÏ„Î± " +#~ "πεÏισσότεÏα παιχνίδια.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Î§Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (LLE) ή Ï…ÏˆÎ·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (HLE) εξομοίωση ήχου" + +#~ msgid "Opens the debugger" +#~ msgstr "Άνοιγμα του debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Άνοιγμα της καταγÏαφής" + +#~ msgid "Show this help message" +#~ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" + +#~ msgid "Specify a video backend" +#~ msgstr "Επιλέξτε ένα backend βίντεο" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/en.po b/Languages/po/en.po index a68862971a..33f3a1b2bd 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -52,9 +52,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -139,7 +139,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -148,147 +148,147 @@ msgstr "" msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -304,27 +304,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "" @@ -332,7 +332,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -345,11 +345,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -358,8 +358,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "" @@ -393,7 +393,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -414,7 +414,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -438,39 +438,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -481,27 +481,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "" @@ -510,11 +510,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "" @@ -524,7 +524,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "" @@ -558,36 +558,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -595,9 +595,9 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -607,15 +607,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "" @@ -627,22 +627,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -651,18 +651,18 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "" @@ -670,12 +670,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" @@ -683,43 +683,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "" @@ -727,12 +719,12 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "" @@ -749,7 +741,7 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "" @@ -766,11 +758,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -782,7 +774,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -799,7 +791,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "" @@ -812,7 +804,7 @@ msgstr "" msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "" @@ -820,11 +812,11 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "" @@ -838,7 +830,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -850,19 +842,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -872,7 +864,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -881,7 +873,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -897,7 +889,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -905,24 +897,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -930,7 +922,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -942,7 +934,7 @@ msgstr "" msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "" @@ -955,7 +947,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -969,8 +961,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -982,7 +974,7 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "" @@ -994,35 +986,35 @@ msgstr "" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "" @@ -1030,14 +1022,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "" @@ -1062,22 +1054,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "" @@ -1085,7 +1077,7 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" @@ -1093,20 +1085,20 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "" @@ -1125,17 +1117,17 @@ msgstr "" msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1144,11 +1136,11 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1173,7 +1165,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "" @@ -1193,7 +1185,7 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "" @@ -1207,7 +1199,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1236,7 +1228,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1245,18 +1237,18 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "" @@ -1264,8 +1256,8 @@ msgstr "" msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "" @@ -1274,20 +1266,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1299,11 +1291,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1314,7 +1306,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1331,11 +1323,11 @@ msgstr "" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1343,36 +1335,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" @@ -1384,7 +1376,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "" @@ -1392,8 +1384,8 @@ msgstr "" msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1409,7 +1401,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "" @@ -1417,16 +1409,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "" @@ -1434,7 +1426,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" @@ -1447,7 +1439,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "" @@ -1456,7 +1448,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "" @@ -1476,8 +1468,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1499,28 +1491,20 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1529,7 +1513,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1539,13 +1523,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "" @@ -1555,11 +1532,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1570,20 +1547,20 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "" @@ -1595,16 +1572,16 @@ msgstr "" msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1612,7 +1589,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "" @@ -1650,37 +1627,37 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1688,23 +1665,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1714,11 +1691,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "" @@ -1734,7 +1711,7 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1747,15 +1724,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1764,7 +1741,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1786,7 +1763,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1796,7 +1773,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1812,11 +1789,11 @@ msgstr "" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "" @@ -1824,11 +1801,11 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "" @@ -1836,7 +1813,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1845,11 +1822,11 @@ msgid "Enable MMU" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" @@ -1857,11 +1834,11 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1876,11 +1853,11 @@ msgid "" "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1888,7 +1865,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1913,7 +1890,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1927,7 +1904,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1939,13 +1916,13 @@ msgid "End" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "" @@ -1963,17 +1940,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2008,10 +1985,6 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "" @@ -2025,19 +1998,19 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "" @@ -2045,7 +2018,7 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" @@ -2053,7 +2026,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2089,28 +2062,28 @@ msgstr "" msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2134,7 +2107,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2231,33 +2204,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "" @@ -2299,43 +2268,43 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2343,7 +2312,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2351,7 +2320,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2368,17 +2337,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "" @@ -2387,37 +2356,37 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "" @@ -2425,20 +2394,20 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2446,11 +2415,11 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2478,24 +2447,28 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "" @@ -2511,8 +2484,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "" @@ -2521,29 +2494,29 @@ msgid "General Settings" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2554,7 +2527,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2574,11 +2547,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2586,7 +2559,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2598,7 +2571,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2612,11 +2585,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2638,11 +2611,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2650,12 +2623,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2664,11 +2637,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2688,7 +2661,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" @@ -2696,7 +2669,7 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2711,18 +2684,18 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2731,7 +2704,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2740,7 +2713,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "" @@ -2764,7 +2737,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2772,13 +2745,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "" @@ -2808,7 +2774,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2816,11 +2782,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "" @@ -2829,57 +2795,57 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" @@ -2892,7 +2858,7 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "" @@ -2905,7 +2871,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2917,29 +2883,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "" @@ -2947,16 +2913,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" @@ -2964,14 +2930,14 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -2980,8 +2946,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -2999,16 +2965,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "" @@ -3041,11 +3007,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3053,7 +3019,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "" @@ -3097,20 +3063,20 @@ msgstr "" msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3121,15 +3087,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3141,16 +3103,28 @@ msgstr "" msgid "Log Configuration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "" @@ -3158,10 +3132,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3177,8 +3147,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3208,7 +3178,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "" @@ -3251,11 +3221,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3264,7 +3234,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3285,7 +3255,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3306,11 +3276,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3404,28 +3374,28 @@ msgstr "" msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "" @@ -3446,8 +3416,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3455,7 +3425,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3463,7 +3433,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "" @@ -3477,20 +3447,20 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "" @@ -3515,7 +3485,7 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "" @@ -3528,15 +3498,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3544,26 +3514,30 @@ msgstr "" msgid "Offset:" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "" @@ -3581,22 +3555,14 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3613,8 +3579,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3628,7 +3594,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "" @@ -3673,17 +3639,21 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "" @@ -3696,10 +3666,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "" @@ -3717,7 +3687,7 @@ msgstr "" msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "" @@ -3725,7 +3695,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "" @@ -3737,23 +3707,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3762,29 +3732,29 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3797,11 +3767,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "" @@ -3817,7 +3787,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "" @@ -3844,7 +3814,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "" @@ -3861,7 +3831,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "" @@ -3873,7 +3843,7 @@ msgstr "" msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -3881,17 +3851,17 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -3907,7 +3877,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3917,7 +3887,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3927,25 +3897,25 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "" @@ -3955,7 +3925,7 @@ msgstr "" msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "" @@ -3977,33 +3947,33 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" @@ -4047,7 +4017,7 @@ msgstr "" msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "" @@ -4056,24 +4026,24 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4090,7 +4060,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "" @@ -4098,23 +4068,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4129,16 +4099,16 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4153,23 +4123,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4184,7 +4154,7 @@ msgstr "" msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4194,7 +4164,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4216,11 +4186,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4229,16 +4199,16 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4263,55 +4233,55 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "" @@ -4319,74 +4289,85 @@ msgstr "" msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4394,15 +4375,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4413,7 +4390,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4421,19 +4398,19 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4441,7 +4418,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4451,17 +4428,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4481,11 +4458,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4500,8 +4477,8 @@ msgid "Space" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "" @@ -4509,7 +4486,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4521,10 +4498,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4543,11 +4516,11 @@ msgstr "" msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "" @@ -4569,15 +4542,15 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4586,7 +4559,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "" @@ -4611,8 +4584,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" @@ -4620,7 +4593,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4641,8 +4614,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4656,15 +4629,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "" @@ -4680,13 +4653,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4722,7 +4695,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4734,7 +4707,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4765,15 +4738,15 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -4785,17 +4758,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4806,7 +4779,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4827,13 +4800,13 @@ msgstr "" msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "" @@ -4841,18 +4814,18 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" @@ -4874,7 +4847,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -4899,7 +4872,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4922,24 +4895,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4964,7 +4937,7 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "" @@ -4973,23 +4946,23 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4997,7 +4970,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5006,15 +4979,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "" @@ -5022,7 +4995,7 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "" @@ -5034,11 +5007,11 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" @@ -5052,7 +5025,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5086,7 +5059,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5095,7 +5068,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5103,7 +5076,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5111,7 +5084,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5139,7 +5112,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5147,7 +5120,7 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" @@ -5155,15 +5128,15 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5172,7 +5145,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "" @@ -5181,7 +5154,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5190,7 +5163,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "" @@ -5198,7 +5171,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "" @@ -5222,10 +5195,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "" @@ -5260,7 +5233,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5282,11 +5255,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" @@ -5294,7 +5267,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5316,11 +5289,11 @@ msgstr "" msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5330,7 +5303,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5342,7 +5315,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5353,7 +5326,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5366,7 +5339,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5393,7 +5366,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5402,7 +5375,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 6cb5a3a8dc..b0bde31334 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-07 14:20+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Spanish\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(demasiados para mostrar)" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,9 +55,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +154,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" @@ -163,147 +163,147 @@ msgstr "%u Bloques libres; %u entradas de dir. libres" msgid "&& AND" msgstr "&& Y" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Acerca de..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Iniciar desde unidad de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Puntos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Buscar ISO en..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Administrador de &trucos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Archivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "Avanzar &frame" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Configuración gráfica" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Ayuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Configuración de atajos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Cargar estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Administrador de tarjetas de memoria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opciones" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Modo de solo lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Sonido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Detener" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Herramientas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Vista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "'" @@ -319,27 +319,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONOCIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(off)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "Visión 3D" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -347,7 +347,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -360,11 +360,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -373,8 +373,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "¡¡Una ventana de NetPlay ya está abierta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Ningún juego está emulándose actualmente." @@ -426,7 +426,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "Placa base AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Códigos AR" @@ -439,7 +439,7 @@ msgstr "Acerca de Dolphin" msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Exactitud:" @@ -447,7 +447,7 @@ msgstr "Exactitud:" msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -481,7 +481,7 @@ msgstr "" "Código culpable:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -489,7 +489,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Añadido de código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -498,7 +498,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en Fill " "and Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -507,7 +507,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "escritura y llenado de RAM (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -516,13 +516,13 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Escribir con el puntero (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -535,27 +535,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error de Action Replay: Línea de código AR no válida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Error de Action Replay: Tipo de Código Normal no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código Normal %i: Subtipo no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo no válido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adaptador:" @@ -564,11 +564,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Añadir parche" @@ -578,7 +578,7 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Añadir..." @@ -627,38 +627,38 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajusta la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configuración avanzada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas las imágenes de GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" @@ -666,9 +666,10 @@ msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -682,15 +683,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtro anisotrópico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Antialias:" @@ -702,15 +703,15 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -720,7 +721,7 @@ msgstr "" "\n" "Si no estás seguro, selecciona (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -729,7 +730,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -737,12 +738,12 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -750,12 +751,12 @@ msgstr "Relación de aspecto:" msgid "At least one pane must remain open." msgstr "Al menos una ventana debe permancer abierta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Motor de Audio:" @@ -763,24 +764,24 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (tamaño de ventana)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,24 +791,11 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Generación automática de mipmaps en lugar de decodificación de la memoria.\n" -"Aumenta el rendimiento un poco, pero puede causar defectos de menor " -"importancia en la textura. \n" -"\n" -"Si no estás seguro, déjalo marcado." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "Registro BP" @@ -815,12 +803,12 @@ msgstr "Registro BP" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configuración del motor" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Motor:" @@ -837,7 +825,7 @@ msgstr "Atrás" msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Imagen" @@ -854,11 +842,11 @@ msgstr "Imagen:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configuración básica" @@ -870,7 +858,7 @@ msgstr "Bajo" msgid "Block Allocation Table checksum failed" msgstr "La suma de verificación de la Tabla de Localización de Bloques falló" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloques" @@ -887,7 +875,7 @@ msgid "Blue Right" msgstr "Azul derecha" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Inferior" @@ -900,7 +888,7 @@ msgstr "Controles asignados: %lu" msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Buscar" @@ -908,11 +896,11 @@ msgstr "Buscar" msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -926,7 +914,7 @@ msgstr "Búfer" msgid "Buttons" msgstr "Botones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -938,19 +926,19 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "Registro CP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -967,7 +955,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta marcada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -984,7 +972,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -1000,7 +988,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1011,7 +999,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1019,18 +1007,18 @@ msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" "¿Estás intentando usar el mismo archivo en ambas ranuras?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el título de conexión %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" @@ -1038,7 +1026,7 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalán" @@ -1050,7 +1038,7 @@ msgstr "Centro" msgid "Change" msgstr "Cambiar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Cambiar &disco..." @@ -1063,7 +1051,7 @@ msgstr "Cambiar disco" msgid "Change Game" msgstr "Cambiar juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1079,8 +1067,8 @@ msgstr "Cambia el signo del parámetro zFar (después de la corrección)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia el signo del parámetro zNear (después de la corrección)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" @@ -1093,7 +1081,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Código de truco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Buscar trucos" @@ -1105,35 +1093,35 @@ msgstr "Administrador de trucos" msgid "Check Partition Integrity" msgstr "Comprobar integridad de la partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "Comprobando integridad..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1141,7 +1129,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1149,8 +1137,8 @@ msgstr "" "Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1177,22 +1165,22 @@ msgstr "" "¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay " "ha sido deshabilitado. Debe detener el juego manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Cerrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Información del código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Código:" @@ -1200,7 +1188,7 @@ msgstr "Código:" msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentario" @@ -1208,20 +1196,20 @@ msgstr "Comentario" msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Comprimiendo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configuración" @@ -1240,17 +1228,17 @@ msgstr "Configurar control" msgid "Configure Pads" msgstr "Configurar mandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" @@ -1259,11 +1247,11 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1288,7 +1276,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Conectando..." @@ -1308,7 +1296,7 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" @@ -1322,7 +1310,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "No se pudo crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "No se pudo inicializar el motor %s." @@ -1358,7 +1346,7 @@ msgstr "" "(definir los pads mientras el juego está ejecutándose no está permitido " "todavía)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1371,11 +1359,11 @@ msgstr "" "¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1383,8 +1371,8 @@ msgstr "" "No se pudo iniciar el núcleo.\n" "Revisa tu configuración." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Cuenta:" @@ -1392,8 +1380,8 @@ msgstr "Cuenta:" msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Crear Código AR" @@ -1402,21 +1390,21 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Creado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Creado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" @@ -1428,11 +1416,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1446,7 +1434,7 @@ msgstr "" msgid "Crossfade" msgstr "Fundido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!" @@ -1463,11 +1451,11 @@ msgstr "Configuración del hack de proyección personalizado" msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1475,36 +1463,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad direccional" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1516,7 +1504,7 @@ msgstr "DVDLowRead - Error fatal: fallo al leer del volumen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Tamaño de datos" @@ -1524,8 +1512,8 @@ msgstr "Tamaño de datos" msgid "Date:" msgstr "Fecha:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Archivos Datel MaxDrive/Pro(*.sav)" @@ -1541,7 +1529,7 @@ msgstr "Zona muerta" msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Depurarando" @@ -1549,16 +1537,16 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1566,7 +1554,7 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Predeterminado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1579,7 +1567,7 @@ msgstr "Fuente por defecto" msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Borrar guardado" @@ -1588,7 +1576,7 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Descripción" @@ -1610,8 +1598,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1635,28 +1623,20 @@ msgstr "" "Falló la suma de verificación del directorio\n" " y falló la suma de verificación del directorio backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deshabilitar iluminación" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Desactivar profundidad por píxel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deshabilitar texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1671,7 +1651,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1687,16 +1667,6 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar texturas.\n" -"\n" -"Si no estás seguro, déjalo sin marcar." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disco" @@ -1706,11 +1676,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Error de lectura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1724,20 +1694,20 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuración gráfica %s de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "&Website de Dolphin" @@ -1749,16 +1719,16 @@ msgstr "Configuración de Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuración de wiimote emulado de Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1766,7 +1736,7 @@ msgstr "Películas TAS de Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuración de wiimote de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" @@ -1808,23 +1778,23 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Volcar texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1834,7 +1804,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1844,7 +1814,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1855,23 +1825,23 @@ msgstr "" "Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holandés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Salir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "Copias de EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1885,11 +1855,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Actualización frecuente de memoria " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Editar" @@ -1905,7 +1875,7 @@ msgstr "Editar configuración" msgid "Edit Patch" msgstr "Editar parche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Editar perspectiva actual" @@ -1918,15 +1888,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efecto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Búfer de fotogramas embebido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "El proceso de emulación ya está ejecutándose" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1941,7 +1911,7 @@ msgstr "" "\n" "Si no estás seguro, activa Emulación virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1969,7 +1939,7 @@ msgstr "Estado de emulación:" msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1985,7 +1955,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" @@ -2001,11 +1971,11 @@ msgstr "Habilitar asociación de bloques" msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Habilitar caché" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Habilitar trucos" @@ -2013,11 +1983,11 @@ msgstr "Habilitar trucos" msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Habilitar atajos" @@ -2025,7 +1995,7 @@ msgstr "Habilitar atajos" msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" @@ -2034,11 +2004,11 @@ msgid "Enable MMU" msgstr "Habilitar MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" @@ -2046,11 +2016,11 @@ msgstr "Habilitar salvapantallas" msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2072,11 +2042,11 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Habilitar páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2089,7 +2059,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2123,7 +2093,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2143,7 +2113,7 @@ msgstr "" "Habilita la Unidad de Manejo de Memoria(MMU), necesario para algunos juegos. " "(ON = Compatible, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2158,13 +2128,13 @@ msgid "End" msgstr "Fin" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Inglés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Mejoras" @@ -2182,17 +2152,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al predeterminado del " @@ -2233,10 +2203,6 @@ msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx" msgid "Execute" msgstr "Ejecutar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Cerrar Dolphin con el emulador" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Fallo al exportar" @@ -2250,19 +2216,19 @@ msgstr "Exportar archivo" msgid "Export Recording" msgstr "Exportar grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado a uno de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2270,7 +2236,7 @@ msgstr "Exportar todos los guardados" msgid "Export failed, try again?" msgstr "Fallo al exportar. ¿Intentar de nuevo?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar guardado como..." @@ -2278,7 +2244,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2314,28 +2280,28 @@ msgstr "Extraer archivo..." msgid "Extract Partition..." msgstr "Extraer partición..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Extrayendo directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extrayendo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Byte de FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2359,7 +2325,7 @@ msgstr "¡Fallo al escuchar!" msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Fallo al extraer a %s!" @@ -2477,23 +2443,19 @@ msgstr "Fallo al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Fallo al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "Iraní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rápidos" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2501,11 +2463,11 @@ msgstr "" "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !" "= %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Jugador Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Información del fichero" @@ -2551,43 +2513,43 @@ msgstr "FileIO: Modo desconocido de apertura : 0x%02x" msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "Encontrar siguiente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "Encontrar anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forzar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forzar filtrado de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2601,7 +2563,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2614,7 +2576,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2636,17 +2598,17 @@ msgstr "" msgid "Forward" msgstr "Adelante" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "%d coincidencias para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Frame " @@ -2655,37 +2617,37 @@ msgstr "Frame " msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "Info del frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Límite de fotogramas:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Cámara libre" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francés" @@ -2693,20 +2655,20 @@ msgstr "Francés" msgid "Frets" msgstr "Cuerdas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Desde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Pant. compl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Resolución en pantalla completa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Archivo GCI (*.gci)" @@ -2714,11 +2676,11 @@ msgstr "Archivo GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuración del micro de GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2746,24 +2708,28 @@ msgstr "Configuración específica del juego" msgid "GameConfig" msgstr "Configurar Juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2783,8 +2749,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "General" @@ -2793,30 +2759,30 @@ msgid "General Settings" msgstr "Ajustes generales" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Alemán" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: El índice es mayor que el tamaño de la lista de códigos AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Configuración gráfica" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Mayor que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2834,7 +2800,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Griego" @@ -2854,11 +2820,11 @@ msgstr "Verde derecha" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ha sido llamada; ¡por favor, comunícalo!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2866,7 +2832,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreo" @@ -2878,7 +2844,7 @@ msgstr "Altura" msgid "Help" msgstr "Ayuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2898,11 +2864,11 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Esconder cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2928,11 +2894,11 @@ msgstr "Configuración de atajos" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -2940,14 +2906,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Se trató de obtener los datos de un ticket desconocido: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2960,11 +2926,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin probablemente se bloqueará ahora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Configuración IPL" @@ -2984,7 +2950,7 @@ msgstr "Sensibilidad IR:" msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -2992,7 +2958,7 @@ msgstr "Directorios de ISO" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icono" @@ -3011,7 +2977,7 @@ msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3022,11 +2988,11 @@ msgstr "" "DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero " "puede causar ruido constante dependiendo del juego)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorar cambios de formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3040,7 +3006,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3054,7 +3020,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importar Guardado" @@ -3082,7 +3048,7 @@ msgstr "" "El archivo importado tiene extensión .sav,\n" "pero no tiene la cabecera correcta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3094,17 +3060,6 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Mejora el rendimiento, pero causa que desaparezca la iluminación en juegos " -"que la utilicen.\n" -"\n" -"Si no estás seguro, déjala sin marcar." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "En juego" @@ -3134,7 +3089,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3142,11 +3097,11 @@ msgstr "Insertar tarjeta SD" msgid "Insert name here.." msgstr "Insertar un nombre aquí.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3157,23 +3112,23 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "Error de comprobación de la integridad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "Comprobación de la integridad finalizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "Comprobación de la integridad finalizada. No se encontraron errores." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3182,19 +3137,19 @@ msgstr "" "Falló la comprobación de la integridad para la partición %d. Tu volcado está " "probablemente corrupto o ha sido parcheado incorrectamente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Configuración de la interfaz" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Error Interno de LZO - Fallo al comprimir" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3203,15 +3158,15 @@ msgstr "" "Error Interno de LZO - fallo al descomprimir (%d) (%li, %li) \n" "Tratando de cargar el estado de nuevo" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Error Interno de LZO - lzo_init() falló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" @@ -3224,7 +3179,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamaño no válido(%x) o Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "¡Valor no válido!" @@ -3237,7 +3192,7 @@ msgstr "bat.map o entrada de directorio no válido" msgid "Invalid event type %i" msgstr "Evento de tipo %i no válido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Archivo no válido" @@ -3252,29 +3207,29 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Parametros de búsqueda inválidos (ningun objeto seleccionado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "Cadena de búsqueda incorrecta(no se pudo convertir en un número)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Estado no válido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italiano" @@ -3282,16 +3237,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonés" @@ -3299,7 +3254,7 @@ msgstr "Japonés" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3309,7 +3264,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "Mantener la ventana siempre visible" @@ -3318,8 +3273,8 @@ msgstr "Mantener la ventana siempre visible" msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3337,16 +3292,16 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Último estado sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Último estado guardado" @@ -3386,11 +3341,11 @@ msgstr "" "Clic izq./der. para más opciones.\n" "Clic medio para borrar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Usar FPS para limitar" @@ -3398,7 +3353,7 @@ msgstr "Usar FPS para limitar" msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" @@ -3442,20 +3397,20 @@ msgstr "&Cargar estado 7" msgid "Load State Slot 8" msgstr "&Cargar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3469,15 +3424,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Cargar valores ya definidos de los patrones de hack disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Fijar procesos en núcleos" @@ -3489,16 +3440,33 @@ msgstr "Registrar" msgid "Log Configuration" msgstr "Configuración de registro" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de registro" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostar el número de fotogramas renderizados por segundo como una medida de " +"la velocidad de la emulación.\n" +"\n" +"Si no estás seguro, déjala sin marcar." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Salida de registro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Registrando" @@ -3506,10 +3474,6 @@ msgstr "Registrando" msgid "Lost connection to server!" msgstr "¡Se perdió la conexión con el servidor!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Especifica emulación de audio de bajo nivel (LLE) o alto nivel (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botón M" @@ -3527,8 +3491,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Archivos MadCatz Gameshark (*.gcs)" @@ -3558,7 +3522,7 @@ msgstr "La tarjeta de memoria ya tiene un guardado para este juego" msgid "Memcard already opened" msgstr "La tarjeta de memoria ya está abierta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Byte de memoria" @@ -3611,11 +3575,11 @@ msgstr "Mic" msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3624,7 +3588,7 @@ msgstr "Configuraciones varias" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3649,7 +3613,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3680,11 +3644,11 @@ msgstr "" "Silencia el altavoz del Wiimote. Arregla las desconexiones aleatorias en " "wiimotes reales. No tiene ningún efecto en wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "NOTA: El tamaño del flujo no coincide con la longitud actual de los datos\n" @@ -3779,28 +3743,28 @@ msgstr "NP Arriba" msgid "Name:" msgstr "Nombre:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nombre:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Archivos nativos GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Próxima página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Próximo escaneado" @@ -3821,8 +3785,8 @@ msgstr "Ninguna ISO o WAD ha sido encontrada." msgid "No banner file found for title %s" msgstr "No se encontró un archivo de banner para el juego %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "Sin descripción" @@ -3830,7 +3794,7 @@ msgstr "Sin descripción" msgid "No docking" msgstr "Sin uniones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "No se ha cargado ningún fichero" @@ -3838,7 +3802,7 @@ msgstr "No se ha cargado ningún fichero" msgid "No free dir index entries" msgstr "No hay entradas de índice de directorio libres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "No hay grabaciones guardadas" @@ -3852,20 +3816,20 @@ msgstr "No se encontró carpeta de guardado para el juego %s" msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "No definido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Sin conectar" @@ -3890,7 +3854,7 @@ msgstr "Aviso" msgid "Num Lock" msgstr "Bloq Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Número de códigos:" @@ -3903,15 +3867,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleración del nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Off" @@ -3919,26 +3883,30 @@ msgstr "Off" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Solo %d bloques disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Abrir archivo..." @@ -3956,22 +3924,14 @@ msgstr "OpenAL: no se encuentran dispositivos de sonido" msgid "OpenAL: can't open device %s" msgstr "OpenAL: no se puede abrir el dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abre el depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abre el registro" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3992,8 +3952,8 @@ msgstr "" "Haz clic derecho y exporta todos los guardados,\n" "e impórtalos a una nueva tarjeta de memoria\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Otros" @@ -4009,7 +3969,7 @@ msgstr "" msgid "Output" msgstr "Salida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "&Reproducir grabación" @@ -4054,17 +4014,21 @@ msgstr "Partición %i" msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" @@ -4077,10 +4041,10 @@ msgstr "Perfecto" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Reproducir" @@ -4098,7 +4062,7 @@ msgstr "Reproducir/pausa" msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opciones de reproducción" @@ -4106,7 +4070,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4118,23 +4082,23 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Puerto 4" @@ -4143,29 +4107,29 @@ msgstr "Puerto 4" msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematuro de la película en PlayWiimote. %u > %u" @@ -4178,11 +4142,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valor anterior" @@ -4198,7 +4162,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Limpiar caché" @@ -4225,7 +4189,7 @@ msgstr "R Botón" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4242,7 +4206,7 @@ msgstr "Rango" msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Real" @@ -4254,7 +4218,7 @@ msgstr "Wiimote real" msgid "Real Wiimotes" msgstr "Wiimotes reales" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar reconectar Wiimote" @@ -4262,17 +4226,17 @@ msgstr "Confirmar reconectar Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote al cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Grabar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opciones de grabación" @@ -4288,7 +4252,7 @@ msgstr "Rojo izquierda" msgid "Red Right" msgstr "Rojo derecha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4303,7 +4267,7 @@ msgstr "" "Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualizar" @@ -4313,18 +4277,18 @@ msgstr "Actualizar" msgid "Refresh List" msgstr "Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4334,7 +4298,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Renderizar a ventana principal" @@ -4344,7 +4308,7 @@ msgstr "Renderizar a ventana principal" msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultados" @@ -4366,33 +4330,33 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Arranca DSPLLE en un proceso dedicado (no recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Ruso" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Frecuencia del sonido:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Guardar GCI como..." @@ -4436,7 +4400,7 @@ msgstr "Guardar estado 7" msgid "Save State Slot 8" msgstr "Guardar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Guardar estado..." @@ -4445,26 +4409,26 @@ msgstr "Guardar estado..." msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "El estado guardado de la película %s está corrupto, deteniendo la " "grabación..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" @@ -4481,7 +4445,7 @@ msgstr "Buscando ISO" msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Pantallazo" @@ -4489,23 +4453,23 @@ msgstr "Pantallazo" msgid "Scroll Lock" msgstr "Bloq. desplazamiento" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "Buscar objeto actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "Busdar valor hexadecimal:" @@ -4520,16 +4484,16 @@ msgstr "No se ha encontrado la sección %s en SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4547,23 +4511,23 @@ msgstr "Selecciona un archivo de guardado para importar" msgid "Select floating windows" msgstr "Selecciona las ventanas flotantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4585,7 +4549,7 @@ msgstr "" msgid "Selected font" msgstr "Fuente seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4602,7 +4566,7 @@ msgstr "" "Si no estás seguro, elige la resolución que uses en el escritorio.\n" "Si sigues inseguro, elige la mayor resolución que te funcione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4630,11 +4594,11 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4645,16 +4609,16 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4681,55 +4645,55 @@ msgstr "Nombre corto:" msgid "Shoulder Buttons" msgstr "Botones laterales" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Mostrar &consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Mostrar ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Mostrar barra de e&stado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Mostrar barra de herramien&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Mostrar Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Mostrar Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Mostrar Corea" @@ -4737,47 +4701,47 @@ msgstr "Mostrar Corea" msgid "Show Language:" msgstr "Mostrar idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Mostrar configuración de ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Mostrar plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Mostar estadísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Mostrar Taiwán" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Mostrar USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Mostrar WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar una ventana de confirmación antes de detener un juego." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4788,27 +4752,39 @@ msgstr "" "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostrar comentario del guardado" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Mostrar título del guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4820,15 +4796,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostrar este mensaje de ayuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Mostrar desconocido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4842,7 +4814,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -4850,19 +4822,19 @@ msgstr "Chino simplificado" msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4874,7 +4846,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4891,17 +4863,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ranura B" @@ -4925,11 +4897,11 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si no estás seguro, " "elige No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configuración de sonido" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "El motor de sonido %s no es válido." @@ -4944,8 +4916,8 @@ msgid "Space" msgstr "Espacio" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Español" @@ -4953,7 +4925,7 @@ msgstr "Español" msgid "Speaker Volume:" msgstr "Volumen del altavoz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4973,10 +4945,6 @@ msgstr "" "\n" "Si no estás seguro, elige 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifica un motor de vídeo" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -4995,11 +4963,11 @@ msgstr "Control estándar" msgid "Start" msgstr "Comenzar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Comenzar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Comenzar graba&ción" @@ -5021,15 +4989,15 @@ msgstr "Estados guardados" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Detener" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5046,7 +5014,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Estirar a la ventana" @@ -5071,8 +5039,8 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5080,7 +5048,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWÃN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5101,8 +5069,8 @@ msgstr "Tabla izquierda" msgid "Table Right" msgstr "Tabla derecha" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5116,15 +5084,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Prueba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5140,13 +5108,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5187,7 +5155,7 @@ msgstr "El nombre no puede contener coma (,)" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5204,7 +5172,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "El guardado que está tratando de copiar tiene un tamaño de archivo no válido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5237,15 +5205,15 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema visual" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Hubo un error al seleccionar el tema" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5261,7 +5229,7 @@ msgstr "" "Estas opciones remplazan a las opciones de núcleo de Dolphin.\n" "Sin determinar significa que el juego usa la configuración de Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5269,12 +5237,12 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5294,7 +5262,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5319,13 +5287,13 @@ msgstr "Límite" msgid "Tilt" msgstr "Inclinar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "A" @@ -5333,18 +5301,18 @@ msgstr "A" msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chino tradicional" @@ -5368,7 +5336,7 @@ msgstr "" "Intentando leer de un SYSCONF no válido\n" "bt ids del Wiimote no están disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5393,7 +5361,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONOCIDO_%02X" @@ -5421,24 +5389,24 @@ msgstr "" "válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n" "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Deshacer cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "¿Llamada inesperada a 0x80? Cancelando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Desconocido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando desconocido de DVD %08x - error fatal" @@ -5464,7 +5432,7 @@ msgstr "" msgid "Up" msgstr "Arriba" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Actualizar" @@ -5473,23 +5441,23 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Usar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar advertencias" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5502,7 +5470,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5517,15 +5485,15 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilidad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valor" @@ -5533,7 +5501,7 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valor:" @@ -5545,11 +5513,11 @@ msgstr "Verbosidad" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volumen" @@ -5563,7 +5531,7 @@ msgstr "La instalación del WAD falló: error al crear %s" msgid "WAD installation failed: error creating ticket" msgstr "La instalación del WAD falló: error al crear el ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5606,7 +5574,7 @@ msgstr "" "%s\n" "¿Quiere continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5620,7 +5588,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5631,7 +5599,7 @@ msgstr "" "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5643,7 +5611,7 @@ msgstr "" "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5686,7 +5654,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -5694,7 +5662,7 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5702,15 +5670,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5719,7 +5687,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No se pudo leer el archivo" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5728,7 +5696,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5741,7 +5709,7 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote conectado" @@ -5749,7 +5717,7 @@ msgstr "Wiimote conectado" msgid "Wiimote Motor" msgstr "Motor Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Configuración Wiimote" @@ -5773,10 +5741,10 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Trabajando..." @@ -5811,7 +5779,7 @@ msgstr "XAudio2 init falló: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 creación de voz maestra falló: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "Registro XF" @@ -5835,11 +5803,11 @@ msgstr "No puede cerrar ventanas que tengan páginas en ellas." msgid "You must choose a game!!" msgstr "¡¡Debes elegir un juego!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "¡Debes escribir un nombre!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Debes introducir un valor decimal o hexadecimal válido." @@ -5847,7 +5815,7 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -5874,11 +5842,11 @@ msgstr "" msgid "ZTP hack" msgstr "Zelda TP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 no soportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código cero desconocido para Dolphin: %08x" @@ -5888,7 +5856,7 @@ msgstr "Código cero desconocido para Dolphin: %08x" msgid "[ waiting ]" msgstr "[ esperando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5904,7 +5872,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5924,7 +5892,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5943,7 +5911,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5972,7 +5940,7 @@ msgstr "" "no es un guardado de Wii o fallo de lectura para la cabecera de archivo de " "tamaño %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5981,7 +5949,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "¡wxExecute dio un -1 al iniciar la aplicación!" @@ -6063,6 +6031,19 @@ msgstr "| OR" #~ "Lo mejor es definir la relación de aspecto a \"Estirar\" cuando se " #~ "utiliza esta opción." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Generación automática de mipmaps en lugar de decodificación de la " +#~ "memoria.\n" +#~ "Aumenta el rendimiento un poco, pero puede causar defectos de menor " +#~ "importancia en la textura. \n" +#~ "\n" +#~ "Si no estás seguro, déjalo marcado." + #~ msgid "Bad gameini filename" #~ msgstr "Nombre de archivo gameini incorrecto" @@ -6130,9 +6111,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danés" +#~ msgid "Disable Lighting" +#~ msgstr "Deshabilitar iluminación" + +#~ msgid "Disable Textures" +#~ msgstr "Deshabilitar texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar altavoz del Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar texturas.\n" +#~ "\n" +#~ "Si no estás seguro, déjalo sin marcar." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6275,6 +6271,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Error al abrir el archivo %s para grabación." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Cerrar Dolphin con el emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6287,6 +6286,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Fallo al cargar ROM DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6336,6 +6338,16 @@ msgstr "| OR" #~ "Si un juego se tilda, y anda sólamente en el Intérprete, o Dolphin tiene " #~ "errores, esta opción puede arreglar el juego." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Mejora el rendimiento, pero causa que desaparezca la iluminación en " +#~ "juegos que la utilicen.\n" +#~ "\n" +#~ "Si no estás seguro, déjala sin marcar." + #~ msgid "Input Source" #~ msgstr "Fuente de entrada" @@ -6378,6 +6390,13 @@ msgstr "| OR" #~ "Cargar los mipmaps nativos es la emulación mas precisa, pero puede " #~ "empeorar el rendimiento(los resultados pueden variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "" +#~ "Especifica emulación de audio de bajo nivel (LLE) o alto nivel (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Consola de scripts LUA" @@ -6410,6 +6429,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Abre el depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Abre el registro" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6491,6 +6516,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostrar el número de frames renderizados por segundo." +#~ msgid "Show this help message" +#~ msgstr "Mostrar este mensaje de ayuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6532,6 +6560,9 @@ msgstr "| OR" #~ "Las otras opciones son resoluciones fijas para elegir una calidad visual " #~ "independiente del tamaño del Display." +#~ msgid "Specify a video backend" +#~ msgstr "Especifica un motor de vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifica un plugin de audio" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index 1d861175d7..859f068173 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-24 09:01-0500\n" "Last-Translator: Hamed Khakbiz \n" "Language-Team: Hamed Khakbiz \n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-Language: Persian\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(بسیار زیاد است برای نمایش دادن)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -141,7 +141,7 @@ msgstr "%sصادر کردن GCI%s" msgid "%sImport GCI%s" msgstr "%sوارد کردن GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -150,147 +150,147 @@ msgstr "" msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&درباره..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&بوت شدن از دی ÙˆÛŒ دی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&نقاط وقÙÙ‡" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&جوستوجو برای Ùایلهای ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&مدریت کدهای تقلب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&پاک کردن Ùایل ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&پاک کردن Ùایل ISO انطخاب شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&شبیه سازی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Ùایل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Ùریم پیشرÙته" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&تمام صÙحه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&تنظیمات گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&تنظیم شرت کاتها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&بارگیری حالت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&مدریت کارت حاÙظه (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&حاÙظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&باز کردن..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&اختیارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "ثبت کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&شروع دوباره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&صدا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&توقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&ابزارها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&ویدیو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&دیدن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&تنظیمات Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&ویکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -306,27 +306,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(ناشناخته)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(خاموش)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "Û±Û¶ بیت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "Û³Û² بیت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "نمایش سه بعدی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "Û¸ بیت" @@ -334,7 +334,7 @@ msgstr "Û¸ بیت" msgid "" msgstr "<اسم را اینجا وارد کنید>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<سایز تصویر پیدا نشد>" @@ -347,11 +347,11 @@ msgstr "<هیچ>" msgid "" msgstr "<Ùشار کلید>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<سیستم>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -360,8 +360,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "صÙحه NetPlay باز است!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "بازی اجرا نشده است." @@ -395,7 +395,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -408,7 +408,7 @@ msgstr "درباره دلÙین" msgid "Acceleration" msgstr "شتاب دهنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "دقت" @@ -416,7 +416,7 @@ msgstr "دقت" msgid "Accurate VBeam emulation" msgstr "شبیه سازی دقیق ÙˆÛŒ-بیم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -440,39 +440,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -483,27 +483,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "آداپتور" @@ -512,11 +512,11 @@ msgstr "آداپتور" msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -526,7 +526,7 @@ msgstr "اضاÙÙ‡ کردن تکه جدید" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." @@ -560,36 +560,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "پیشرÙته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "تنظیمات پیشرÙته" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "تمام اسناد Wii ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" @@ -597,9 +597,9 @@ msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" msgid "All files (*.*)|*.*" msgstr "تمام اسناد (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -609,15 +609,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "زمان بندی جایگزین برای ویموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "تحلیل کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Ùیلتر ناهمسانگر:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "آنتی الیاسینگ:" @@ -629,22 +629,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "بار گزار برنامه" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "اعمال کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "عربی" @@ -653,18 +653,18 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "نصبت طول به عرض تصویر:" @@ -672,12 +672,12 @@ msgstr "نصبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "پشتوانه صدا" @@ -685,43 +685,35 @@ msgstr "پشتوانه صدا" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "اتوماتیک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "اتوماتیک (ضریب Û¶Û´Û°xÛµÛ²Û¸)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "اتوماتیک (سایز پنجره)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "تنظیم اتوماتیک سایز پنجره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "ثبت کردن" @@ -730,12 +722,12 @@ msgstr "ثبت کردن" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "تنضیمات پشتوانه" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "پشتوانه:" @@ -752,7 +744,7 @@ msgstr "به عقب" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "نشان" @@ -769,11 +761,11 @@ msgstr "نشان:" msgid "Bar" msgstr "نوار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "بنیانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "تنظیمات بنیانی" @@ -785,7 +777,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "بلوک ها" @@ -802,7 +794,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "پائین" @@ -815,7 +807,7 @@ msgstr "" msgid "Broken" msgstr "خراب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "جوستجو" @@ -823,11 +815,11 @@ msgstr "جوستجو" msgid "Browse for a directory to add" msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "جوستجو برای پوشه ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "جوستجو برای پوشه خروجی" @@ -841,7 +833,7 @@ msgstr "" msgid "Buttons" msgstr "دکمه ها" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -853,19 +845,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "موتور جوستجو پردازشگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -875,7 +867,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -884,7 +876,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "لغو کردن" @@ -900,7 +892,7 @@ msgstr "قادر به باز گشایی نمی باشد %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -908,24 +900,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -933,7 +925,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "کاتالان" @@ -945,7 +937,7 @@ msgstr "مرکز" msgid "Change" msgstr "تغییر" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "تغییر &دیسک..." @@ -958,7 +950,7 @@ msgstr "تغییر دیسک" msgid "Change Game" msgstr "تغییر بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -974,8 +966,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" @@ -987,7 +979,7 @@ msgstr "Ú¯Ù¾ زدن" msgid "Cheat Code" msgstr "کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "جوستجو برای کد تقلب" @@ -999,35 +991,35 @@ msgstr "مدریت کدهای تقلب" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "انتخاب پوشه برای دی ÙˆÛŒ دی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "انتخاب پوشه برای NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "انتخاب ISO پیش Ùرز:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "انتخاب سند برای باز کردن" @@ -1035,14 +1027,14 @@ msgstr "انتخاب سند برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج در آن" @@ -1067,22 +1059,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "بستن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Ù¾ÛŒ&کربندی..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "مشخصات کد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "کد:" @@ -1090,7 +1082,7 @@ msgstr "کد:" msgid "Command" msgstr "دستور" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "توضیح" @@ -1098,20 +1090,20 @@ msgstr "توضیح" msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Ùشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Ùشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "در حال Ùشرده کردن ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "پیکربندی" @@ -1130,17 +1122,17 @@ msgstr "کنترل پیکربندی" msgid "Configure Pads" msgstr "پیکربندی گیم پدها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی سند" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "تائید برای توقÙ" @@ -1149,11 +1141,11 @@ msgstr "تائید برای توقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "اتصال Wiimote %i" @@ -1178,7 +1170,7 @@ msgstr "اتصال Wiimote Û³" msgid "Connect Wiimote 4" msgstr "اتصال Wiimote Û´" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "در حال اتصال..." @@ -1198,7 +1190,7 @@ msgstr "تبدیل به GCI" msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" @@ -1212,7 +1204,7 @@ msgstr "هسته" msgid "Could not create %s" msgstr "قادر به ساخت نمی باشد %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "قادر به نصب بخش مدیریت نمی باشد %s" @@ -1247,7 +1239,7 @@ msgstr "" "اجرا Ù…ÛŒ باشد!\n" "(نصب گیم پدها در حالی Ú©Ù‡ بازی در حال اجرا است Ùعلا امکان پذیر نمی باشد)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1260,11 +1252,11 @@ msgstr "" "شما بازی را از روی سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید؟ Ùˆ یا شاید Ùایل سیو " "رایت پوروتکت Ù…ÛŒ باشد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "قادر به یاÙتن دستور برای توسعه نمی باشد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1272,8 +1264,8 @@ msgstr "" "قادر به init کردن هسته نمی باشد.\n" "تنظیمات را Ú†Ú© کنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "شماردن:" @@ -1281,8 +1273,8 @@ msgstr "شماردن:" msgid "Country:" msgstr "کشور:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "ساخت کد اکشن ریپلی" @@ -1291,20 +1283,20 @@ msgstr "ساخت کد اکشن ریپلی" msgid "Create new perspective" msgstr "ساخت پرسپکتیو جدید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1316,11 +1308,11 @@ msgstr "سازنده:" msgid "Critical" msgstr "بحرانی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "حذ٠قسمتى تصوير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1331,7 +1323,7 @@ msgstr "" msgid "Crossfade" msgstr "ضرب دری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1348,11 +1340,11 @@ msgstr "" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "چکوسلواکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1360,36 +1352,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "موتور شبیه ساز صدا DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "تنظیمات صدا DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ریشه دی ÙˆÛŒ دی:" @@ -1401,7 +1393,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "سایزه داده" @@ -1409,8 +1401,8 @@ msgstr "سایزه داده" msgid "Date:" msgstr "تاریخ:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1426,7 +1418,7 @@ msgstr "منطقه مرده" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "" @@ -1434,16 +1426,16 @@ msgstr "" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ناهمÙشرده کردن ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "ناهمÙشرده کردن ISO انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "در حال ناهمÙشرده کردن ISO" @@ -1451,7 +1443,7 @@ msgstr "در حال ناهمÙشرده کردن ISO" msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "پیش Ùرز ISO:" @@ -1464,7 +1456,7 @@ msgstr "دست خط پیش Ùرز" msgid "Delete" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "پاک کردن Save" @@ -1473,7 +1465,7 @@ msgstr "پاک کردن Save" msgid "Delete the existing file '%s'?" msgstr "آیا سند موجود پاک شود '%s'ØŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "شرح" @@ -1493,8 +1485,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1516,28 +1508,20 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "غیر Ùعال" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "غیر Ùعال کردن مه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "غیر Ùعال کردن روشنایی" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "غیر Ùعال کردن Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "غیر Ùعال کردن باÙت اشیاء" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1546,7 +1530,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1556,13 +1540,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "دیسک" @@ -1572,11 +1549,11 @@ msgstr "دیسک" msgid "Disc Read Error" msgstr "خواندن دیسک با مشکل مواجه گردید" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "نمایش" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1587,20 +1564,20 @@ msgstr "" msgid "Divide" msgstr "تقسیم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "دلÙین" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "دلÙین %s پیکردی بندی گرÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "دلÙین &وب سایت" @@ -1612,16 +1589,16 @@ msgstr "پیکر بندی دلÙین" msgid "Dolphin Emulated Wiimote Configuration" msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "دلÙین FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی GCPad دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "دلÙین TAS Movies (*.dtm)" @@ -1629,7 +1606,7 @@ msgstr "دلÙین TAS Movies (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "پیکربندی Wiimote دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "دلÙین در &Google Code" @@ -1671,37 +1648,37 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "نسخه بردارى صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "نسخه بردارى Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1709,23 +1686,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "هلندی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "Ø®&روج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1735,11 +1712,11 @@ msgstr "" msgid "EUROPE" msgstr "اوروپا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "ویرایش" @@ -1755,7 +1732,7 @@ msgstr "ویرایش پيکربندى" msgid "Edit Patch" msgstr "ویرایش وصله" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1768,15 +1745,15 @@ msgstr "ویرایش..." msgid "Effect" msgstr "اÙکت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1785,7 +1762,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1807,7 +1784,7 @@ msgstr "" msgid "Enable" msgstr "Ùراهم کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1817,7 +1794,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1833,11 +1810,11 @@ msgstr "" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Ùعال کردن کدهای تقلب" @@ -1845,11 +1822,11 @@ msgstr "Ùعال کردن کدهای تقلب" msgid "Enable Dual Core" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Ùعال کردن شرت کاتها" @@ -1857,7 +1834,7 @@ msgstr "Ùعال کردن شرت کاتها" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1866,11 +1843,11 @@ msgid "Enable MMU" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" @@ -1878,11 +1855,11 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1897,11 +1874,11 @@ msgid "" "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1909,7 +1886,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1934,7 +1911,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1948,7 +1925,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1960,13 +1937,13 @@ msgid "End" msgstr "پایان" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "انگلیسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "بالا بردن" @@ -1984,17 +1961,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "همگن" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "خطا" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2029,10 +2006,6 @@ msgstr "" msgid "Execute" msgstr "اجرا کردن" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "خروج دلÙین با شبیه ساز" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" @@ -2046,19 +2019,19 @@ msgstr "صادر کردن سند" msgid "Export Recording" msgstr "صادر کردن ضبط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "صادر کردن Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Wii save (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "صادر کردن تمام Save ها" @@ -2066,7 +2039,7 @@ msgstr "صادر کردن تمام Save ها" msgid "Export failed, try again?" msgstr "صادر کردن با شکست مواجه شد, سعی دوباره؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "صادر کردن Save با عنوان..." @@ -2074,7 +2047,7 @@ msgstr "صادر کردن Save با عنوان..." msgid "Extension" msgstr "توسعه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2110,28 +2083,28 @@ msgstr "استخراج کردن سند..." msgid "Extract Partition..." msgstr "استخراج کردن پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "استخراج کردن تمامی اسناد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "استخراج کردن..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2155,7 +2128,7 @@ msgstr "" msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2252,33 +2225,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "پارسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "مشخصات سند" @@ -2320,43 +2289,43 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2364,7 +2333,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2372,7 +2341,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2389,17 +2358,17 @@ msgstr "" msgid "Forward" msgstr "جلو" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Ùریم" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Ùریم" @@ -2408,38 +2377,38 @@ msgstr "Ùریم" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "مشخصات سند" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "محدوده Ùریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "حد Ùریم:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "نگاه آذاد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Ùرانسوی" @@ -2447,20 +2416,20 @@ msgstr "Ùرانسوی" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "از" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "تمام صÙحه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "سایز برای حالت تمام صÙحه:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2469,11 +2438,11 @@ msgstr "" msgid "GCMic Configuration" msgstr "تنضیمات ثبت وقايع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2501,24 +2470,28 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "کدهای گیکو" @@ -2534,8 +2507,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Ú©Ù„ÛŒ" @@ -2544,29 +2517,29 @@ msgid "General Settings" msgstr "تنظیمات Ú©Ù„ÛŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "آلمانی" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "گرÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "تنظیمات گراÙیک" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "بزرگتر از" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2577,7 +2550,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "یونانی" @@ -2597,11 +2570,11 @@ msgstr "" msgid "Guitar" msgstr "گیتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2609,7 +2582,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "عبری" @@ -2621,7 +2594,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2635,11 +2608,11 @@ msgstr "" msgid "Hide" msgstr "مخÙÛŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "مخÙÛŒ کردن نشانگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2661,11 +2634,11 @@ msgstr "پیگربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "مجارستانی" @@ -2673,12 +2646,12 @@ msgstr "مجارستانی" msgid "Hybrid Wiimote" msgstr "ویموت مخلوط" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2687,11 +2660,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2711,7 +2684,7 @@ msgstr "" msgid "ISO Details" msgstr "جزئیات ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "پوشه های ISO" @@ -2719,7 +2692,7 @@ msgstr "پوشه های ISO" msgid "ITALY" msgstr "ايتاليا" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2734,18 +2707,18 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2754,7 +2727,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2763,7 +2736,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr " وارد کردن Save" @@ -2787,7 +2760,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2795,13 +2768,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "در بازی" @@ -2831,7 +2797,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "درج کارت SD" @@ -2839,11 +2805,11 @@ msgstr "درج کارت SD" msgid "Insert name here.." msgstr "درج اسم..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "نصب WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "نصب به منوی Wii" @@ -2852,57 +2818,57 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "در حال نصب WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "سایز داخلی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" @@ -2915,7 +2881,7 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "سایز نا معتبر (%x) یا Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "مقدار نا معتبر" @@ -2928,7 +2894,7 @@ msgstr "bat.map نا معتبر یا ورودی پوشه" msgid "Invalid event type %i" msgstr "واقعه نا معتبر %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "سند نا معتبر" @@ -2940,29 +2906,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "سند ضبط نا معتبر" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "وضیعت نا معتبر" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ایتالیائی" @@ -2970,16 +2936,16 @@ msgstr "ایتالیائی" msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ژاپنی" @@ -2987,14 +2953,14 @@ msgstr "ژاپنی" msgid "KOREA" msgstr "کره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3003,8 +2969,8 @@ msgstr "" msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "کره ای" @@ -3022,16 +2988,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "آخرین State بازنویسی شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "آخرین State ذخیره شده" @@ -3064,11 +3030,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3076,7 +3042,7 @@ msgstr "" msgid "Load" msgstr "بارگیری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "بارگیری باÙت اشیاء دلخواه" @@ -3120,20 +3086,20 @@ msgstr "بارگیری State شکا٠۷" msgid "Load State Slot 8" msgstr "بارگیری State شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "بارگیری State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3144,15 +3110,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3164,16 +3126,28 @@ msgstr "ثبت وقايع" msgid "Log Configuration" msgstr "تنضیمات ثبت وقايع" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "نوع ثبت وقايع" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "خروجی ثبت وقايع" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "در حال ثبت وقايع" @@ -3181,10 +3155,6 @@ msgstr "در حال ثبت وقايع" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3200,8 +3170,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3231,7 +3201,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "" @@ -3274,11 +3244,11 @@ msgstr "میکروÙÙ†" msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" @@ -3287,7 +3257,7 @@ msgstr "تنظیمات متÙرقه" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3308,7 +3278,7 @@ msgstr "" msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3329,11 +3299,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3427,28 +3397,28 @@ msgstr "" msgid "Name:" msgstr "اسم:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "اسم:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "صÙحه بعد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "" @@ -3469,8 +3439,8 @@ msgstr "هیچ ISO Ùˆ یا WAD یاÙت نشده است" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3478,7 +3448,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "هیچ سندی بارگیری نشده است" @@ -3486,7 +3456,7 @@ msgstr "هیچ سندی بارگیری نشده است" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "" @@ -3500,20 +3470,20 @@ msgstr "" msgid "None" msgstr "هیچکدام" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "بوکمال" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "" @@ -3538,7 +3508,7 @@ msgstr "توجه" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "" @@ -3551,15 +3521,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "شیی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "خاموش" @@ -3567,26 +3537,30 @@ msgstr "خاموش" msgid "Offset:" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "گشودن سند" @@ -3604,22 +3578,14 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3636,8 +3602,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "غیره" @@ -3651,7 +3617,7 @@ msgstr "" msgid "Output" msgstr "خروجی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "" @@ -3696,17 +3662,21 @@ msgstr "" msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "" @@ -3719,10 +3689,10 @@ msgstr "کامل" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "شروع بازی" @@ -3740,7 +3710,7 @@ msgstr "شروع بازی/Ù…Ú©Ø«" msgid "Playable" msgstr "قابل بازی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "" @@ -3748,7 +3718,7 @@ msgstr "" msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." @@ -3760,23 +3730,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "درگاه Û´" @@ -3785,29 +3755,29 @@ msgstr "درگاه Û´" msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "پرتقال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "پرتقال" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "اÙکت ها:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3820,11 +3790,11 @@ msgstr "حالت های از پيش تنظيم شده" msgid "Prev Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "مقدار قبلی" @@ -3840,7 +3810,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "" @@ -3867,7 +3837,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "" @@ -3884,7 +3854,7 @@ msgstr "محدوده" msgid "Read-only mode" msgstr "حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "واقعی" @@ -3896,7 +3866,7 @@ msgstr "Wiimote واقعی" msgid "Real Wiimotes" msgstr "ویموت واقعی" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -3904,17 +3874,17 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -3930,7 +3900,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3940,7 +3910,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "به روز کردن" @@ -3950,25 +3920,25 @@ msgstr "به روز کردن" msgid "Refresh List" msgstr "به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "به روز کردن لیست بازی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "نمایش در صÙحه اصلی" @@ -3978,7 +3948,7 @@ msgstr "نمایش در صÙحه اصلی" msgid "Reset" msgstr "شروع دوباره" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "نتایج" @@ -4000,33 +3970,33 @@ msgstr "" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "روسی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "ذخ&یره State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "نرخ نمونه برداری صدا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "ذخیره" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "ذخیره GCI با عنوان" @@ -4070,7 +4040,7 @@ msgstr "ذخیره State شکا٠۷" msgid "Save State Slot 8" msgstr "ذخیره State شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "ذخیره State..." @@ -4079,24 +4049,24 @@ msgstr "ذخیره State..." msgid "Save as..." msgstr "ذخیره با عنوان" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "ذخیره GCM/ISO Ùشرده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "ذخیره GCM/ISO ناهمÙشرده" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4113,7 +4083,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "" @@ -4121,24 +4091,24 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "جوستجو برای کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4153,16 +4123,16 @@ msgstr "" msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "انتخاب سند ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "انتخاب سند Wii WAD برای نصب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4177,23 +4147,23 @@ msgstr "انتخاب سند Save برای وارد کردن" msgid "Select floating windows" msgstr "انتخاب پنجره شناور" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "انتخاب سند برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "انتخاب سند Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "انتخاب State برای بارگیری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "انتخاب State برای ذخیره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4208,7 +4178,7 @@ msgstr "" msgid "Selected font" msgstr "دست خط انتخاب شده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4218,7 +4188,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4240,11 +4210,11 @@ msgstr "" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4253,16 +4223,16 @@ msgstr "" msgid "Set" msgstr "نصب" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4288,55 +4258,55 @@ msgstr "اسم کوتاه:" msgid "Shoulder Buttons" msgstr "دکمه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "نمایش &میز Ùرمان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "نمایش &ثبت وقايع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "نمایش &نوار وضیعت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "نمایش &نوار ابزار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "نمایش Ùریم بر سانیه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "نمایش Ùرانسه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "نمایش GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "نمایش ایتالیا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "نمایش ژاپن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "نمایش کره" @@ -4344,74 +4314,86 @@ msgstr "نمایش کره" msgid "Show Language:" msgstr "نمایش زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "نمایش ثبت وقايع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "نمایش PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "نمایش پایگاه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "نمایش منطقه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "نمایش آمار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "نمایش تایوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "نمایش آمریکا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "نمایش Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "نمایش Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "نمایش پنجره تعید قبل از متوق٠کردن بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "نمایش زبان:" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4419,15 +4401,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4438,7 +4416,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "چینی ساده شده" @@ -4446,19 +4424,19 @@ msgstr "چینی ساده شده" msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4466,7 +4444,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4476,17 +4454,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "شکا٠A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "شکا٠B" @@ -4506,11 +4484,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "تنضیمات صدا" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4525,8 +4503,8 @@ msgid "Space" msgstr "Ùضا" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "اسپانیائی" @@ -4534,7 +4512,7 @@ msgstr "اسپانیائی" msgid "Speaker Volume:" msgstr "حجم صدای اسپیکر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4546,10 +4524,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4568,11 +4542,11 @@ msgstr "" msgid "Start" msgstr "شروع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "" @@ -4594,15 +4568,15 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "توقÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4611,7 +4585,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "" @@ -4636,8 +4610,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "زبان سیستم:" @@ -4645,7 +4619,7 @@ msgstr "زبان سیستم:" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4667,8 +4641,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4682,15 +4656,15 @@ msgstr "" msgid "Test" msgstr "محک زدن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "ذخیره گاه باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "قالب بندی باÙت اشیاء" @@ -4706,13 +4680,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4748,7 +4722,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4760,7 +4734,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4791,15 +4765,15 @@ msgstr "" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -4811,17 +4785,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4832,7 +4806,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4853,13 +4827,13 @@ msgstr "" msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "عنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "به" @@ -4867,18 +4841,18 @@ msgstr "به" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "اوج" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "چینی سنتی" @@ -4900,7 +4874,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "ترکی" @@ -4925,7 +4899,7 @@ msgstr "" msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ناشناخته" @@ -4948,24 +4922,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "ناشناخته" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4990,7 +4964,7 @@ msgstr "" msgid "Up" msgstr "بالا" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "به روز کردن" @@ -4999,23 +4973,23 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5023,7 +4997,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5032,15 +5006,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "کاربردی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "مقدار" @@ -5048,7 +5022,7 @@ msgstr "مقدار" msgid "Value:" msgstr "مقدار:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "مقدار:" @@ -5060,11 +5034,11 @@ msgstr "" msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "حجم صدا" @@ -5078,7 +5052,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5112,7 +5086,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5121,7 +5095,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5129,7 +5103,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5137,7 +5111,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5165,7 +5139,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5173,7 +5147,7 @@ msgstr "" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" @@ -5181,15 +5155,15 @@ msgstr "" msgid "Wii Console" msgstr "ميز Ùرمان Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ریشه Wii NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "وارد کردن Wii Save" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "سند Wii save (*.bin)|*.bin" @@ -5198,7 +5172,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: قادر به خواندن از سند نیست" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "ویموت" @@ -5207,7 +5181,7 @@ msgstr "ویموت" msgid "Wiimote %i" msgstr "اتصال Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5216,7 +5190,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote متصل شد" @@ -5224,7 +5198,7 @@ msgstr "Wiimote متصل شد" msgid "Wiimote Motor" msgstr "موتور Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "تنضیمات Wiimote" @@ -5249,10 +5223,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "در حال کار کردن..." @@ -5287,7 +5261,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5309,11 +5283,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "شما باید بازی را انتخاب کنید!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "شما باید اسم را وارد کنید!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" @@ -5321,7 +5295,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5343,11 +5317,11 @@ msgstr "" msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5357,7 +5331,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[انتظار]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5369,7 +5343,7 @@ msgstr "" msgid "[Custom]" msgstr "[دستی]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5380,7 +5354,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5393,7 +5367,7 @@ msgstr "" msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5420,7 +5394,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5429,7 +5403,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5454,6 +5428,12 @@ msgstr "" #~ msgid "Danish" #~ msgstr "دانمارکی" +#~ msgid "Disable Lighting" +#~ msgstr "غیر Ùعال کردن روشنایی" + +#~ msgid "Disable Textures" +#~ msgstr "غیر Ùعال کردن باÙت اشیاء" + #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" #~ "Keep Dolphin portable?" @@ -5464,6 +5444,9 @@ msgstr "" #~ msgid "Enable DTK Music" #~ msgstr "Ùعال کردن موزیک DTK" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "خروج دلÙین با شبیه ساز" + #~ msgid "Hide Shader Errors" #~ msgstr "مخÙÛŒ کردن خطاهای Shader" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index ab87e4864d..89af23b5a7 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-13 10:37+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(trop nombreux pour être affichés)" @@ -45,7 +45,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,9 +55,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -152,7 +152,7 @@ msgstr "%sExporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" @@ -161,147 +161,147 @@ msgstr "%u blocs libres, %u entrées de rép. libres" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&A propos..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Démarrer à partir du lecteur..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Points d'arrêt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Rechercher des ISOs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Gestionnaire de &cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Fichier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Avancement d'image" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "Paramètres &Graphiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Aide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Paramètres des &Raccouris clavier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Charger l'état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "Gestionnaire de cartes &mémoires (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Ouvrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Options" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Mode &Lecture seule" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "Rafraîchir la &liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Son" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Vidéo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Affichage" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "'" @@ -317,27 +317,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(aucun)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -345,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -358,11 +358,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -371,8 +371,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Une fenêtre Netplay est déjà ouverte !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Il n'y a pas de jeu en cours d'émulation." @@ -424,7 +424,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Codes AR" @@ -437,7 +437,7 @@ msgstr "A propos de Dolphin" msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Précision :" @@ -445,7 +445,7 @@ msgstr "Précision :" msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -479,7 +479,7 @@ msgstr "" "Culprit Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +487,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " "code Ajout (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +496,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " "code Remplir et déplacer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +505,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " "l'écriture de la RAM et Remplir (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,13 +514,13 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " "vers Pointeur (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -532,27 +532,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erreur Action Replay : code AR non valide à la ligne %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay : Code Conditionnel : Taille non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay : Type de Code Normal non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay ; Code Normal %i : Sous-type non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay : Code Normal 0 : Sous-type non valide %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Carte :" @@ -561,11 +561,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Ajouter un patch" @@ -575,7 +575,7 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Ajouter..." @@ -624,38 +624,38 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajuste le contrôle analogique de pression requise pour activer les boutons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Paramètres avancés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" @@ -663,9 +663,10 @@ msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -679,15 +680,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "Analyser" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtrage anisotropique :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing :" @@ -699,15 +700,15 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Appliquer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,7 +719,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabe" @@ -727,7 +728,7 @@ msgstr "Arabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -750,12 +751,12 @@ msgstr "Format d'écran :" msgid "At least one pane must remain open." msgstr "Au moins un panneau doit rester ouvert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -763,24 +764,24 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (taille de la fenêtre)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Ajuster auto. la taille de la fenêtre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,25 +791,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Génère automatiquement des mipmaps plutôt que de les décoder depuis la " -"mémoire.\n" -"Améliore un peu les performances mais peut provoquer des défauts mineurs de " -"texture.\n" -"\n" -"Dans le doute, cochez cette case." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "Registres BP" @@ -816,12 +803,12 @@ msgstr "Registres BP" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Moteur :" @@ -838,7 +825,7 @@ msgstr "Arrière" msgid "Bad File Header" msgstr "Mauvaise entête de fichier" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Bannière" @@ -855,11 +842,11 @@ msgstr "Bannière :" msgid "Bar" msgstr "Barre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Paramètres de base" @@ -873,7 +860,7 @@ msgstr "" "Echec de la vérification de la somme de contrôle de la Table d'Allocation de " "Blocs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocs" @@ -890,7 +877,7 @@ msgid "Blue Right" msgstr "Bleu Droite" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Bas" @@ -903,7 +890,7 @@ msgstr "Contrôles liés : %lu" msgid "Broken" msgstr "Corrompu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Parcourir" @@ -911,11 +898,11 @@ msgstr "Parcourir" msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -929,7 +916,7 @@ msgstr "Buffer :" msgid "Buttons" msgstr "Boutons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -941,19 +928,19 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -970,7 +957,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -986,7 +973,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuler" @@ -1003,7 +990,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1014,7 +1001,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1022,19 +1009,19 @@ msgstr "" "Impossible d'utiliser ce fichier comme carte mémoire.\n" "Essayez-vous d'utiliser le même fichier sur les 2 slots ?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" @@ -1043,7 +1030,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalan" @@ -1055,7 +1042,7 @@ msgstr "Centre" msgid "Change" msgstr "Changer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "&Changer de disque..." @@ -1068,7 +1055,7 @@ msgstr "Changer de disque" msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1084,8 +1071,8 @@ msgstr "Change le signe du paramètre zFar (après correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Change le signe du paramètre zNear (après correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" @@ -1097,7 +1084,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Rechercher un cheat" @@ -1109,35 +1096,35 @@ msgstr "Gestionnaire de Cheats" msgid "Check Partition Integrity" msgstr "Vérifier l'intégrité de la partition" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "Vérification de l'intégrité..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1145,7 +1132,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1153,8 +1140,8 @@ msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1181,22 +1168,22 @@ msgstr "" "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " "désactivé. Vous devez arrêter le jeu manuellement." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Fermer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Co&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Info du code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Code :" @@ -1204,7 +1191,7 @@ msgstr "Code :" msgid "Command" msgstr "Commande" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Commentaire" @@ -1212,20 +1199,20 @@ msgstr "Commentaire" msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Compression de l'ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configurer" @@ -1244,17 +1231,17 @@ msgstr "Configurer le contrôle" msgid "Configure Pads" msgstr "Configurer les manettes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" @@ -1263,11 +1250,11 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" @@ -1292,7 +1279,7 @@ msgstr "Connecter la 3è Wiimote" msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Connexion..." @@ -1312,7 +1299,7 @@ msgstr "Convertir en GCI" msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" @@ -1326,7 +1313,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossible de créer %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Impossible d'initialiser le moteur %s." @@ -1363,7 +1350,7 @@ msgstr "" "(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " "pris en charge)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1376,11 +1363,11 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1388,8 +1375,8 @@ msgstr "" "Impossible d'initialiser les composants de base.\n" "Vérifiez votre configuration." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Nombre :" @@ -1397,8 +1384,8 @@ msgstr "Nombre :" msgid "Country:" msgstr "Pays :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Créer un code AR" @@ -1407,21 +1394,21 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Créé par KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Créé par VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" @@ -1433,11 +1420,11 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Couper" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1451,7 +1438,7 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" @@ -1468,11 +1455,11 @@ msgstr "Paramètres du hack de projection personnalisé" msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tchèque" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1480,36 +1467,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad numérique" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1521,7 +1508,7 @@ msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Taille des données" @@ -1529,8 +1516,8 @@ msgstr "Taille des données" msgid "Date:" msgstr "Date :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Fichiers Datel MaxDrive/Pro (*.sav)" @@ -1546,7 +1533,7 @@ msgstr "Zone morte" msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Débug" @@ -1554,16 +1541,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1571,7 +1558,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1584,7 +1571,7 @@ msgstr "Police par défaut" msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1593,7 +1580,7 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Description" @@ -1615,8 +1602,8 @@ msgstr "" msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1640,28 +1627,20 @@ msgstr "" "La vérification de la somme de contrôle du dossier a échoué\n" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Désactiver l'éclairage" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Désactiver la profondeur / pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Désactiver les textures" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1675,7 +1654,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1691,16 +1670,6 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Désactive l'application de textures.\n" -"\n" -"Dans le doute, décochez cette case." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disque" @@ -1710,11 +1679,11 @@ msgstr "Disque" msgid "Disc Read Error" msgstr "Erreur de lecture du disque" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1728,20 +1697,20 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuration des graphismes %s pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Site &web de Dolphin" @@ -1753,16 +1722,16 @@ msgstr "Configuration de Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1770,7 +1739,7 @@ msgstr "Films TAS Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" @@ -1812,23 +1781,23 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Copier les textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1839,7 +1808,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1849,7 +1818,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1860,23 +1829,23 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Néerlandais" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Quitter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "Copies de l'EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1890,11 +1859,11 @@ msgstr "" msgid "EUROPE" msgstr "Europe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Premières mises à jour de mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Editer" @@ -1910,7 +1879,7 @@ msgstr "Editer la configuration" msgid "Edit Patch" msgstr "Editer le patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" @@ -1923,15 +1892,15 @@ msgstr "Editer..." msgid "Effect" msgstr "Effets" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1945,7 +1914,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez plutôt Virtuel." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1973,7 +1942,7 @@ msgstr "Etat de l'émulation :" msgid "Enable" msgstr "Activer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1989,7 +1958,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Activer la journalisation AR" @@ -2005,11 +1974,11 @@ msgstr "Activer l'assemblage de blocs" msgid "Enable Bounding Box Calculation" msgstr "Active le calcul de la boîte liée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Activer le cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Activer les Cheats" @@ -2017,11 +1986,11 @@ msgstr "Activer les Cheats" msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" @@ -2029,7 +1998,7 @@ msgstr "Activer les touches de raccourci" msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" @@ -2038,11 +2007,11 @@ msgid "Enable MMU" msgstr "Activer le MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -2050,11 +2019,11 @@ msgstr "Activer l'économiseur d'écran" msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2077,11 +2046,11 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Activer les appels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2094,7 +2063,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2128,7 +2097,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2148,7 +2117,7 @@ msgstr "" "Activer le Memory Management Unit (unité de gestion de la mémoire), requis " "pour certains jeux. (ON = Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2163,13 +2132,13 @@ msgid "End" msgstr "Fin" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Anglais" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Améliorations" @@ -2187,17 +2156,17 @@ msgstr "Entrée %d/%d" msgid "Entry 1/%d" msgstr "Entrée 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Erreur" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " @@ -2239,10 +2208,6 @@ msgstr "" msgid "Execute" msgstr "Exécuter" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Quitter Dolphin avec l'émulateur" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Echec de l'exportation" @@ -2256,19 +2221,19 @@ msgstr "Exporter un fichier" msgid "Export Recording" msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2276,7 +2241,7 @@ msgstr "Exporter toutes les sauvegardes" msgid "Export failed, try again?" msgstr "L'exportation a échoué. Essayer de nouveau ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exporter l'enregistrement sous..." @@ -2284,7 +2249,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2320,28 +2285,28 @@ msgstr "Extraire un fichier..." msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extraction..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Octet FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "Lecteur FIFO" @@ -2365,7 +2330,7 @@ msgstr "Ecoute impossible !" msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2485,23 +2450,19 @@ msgstr "Impossible d'écrire l'entête de %s" msgid "Failed to write header for file %d" msgstr "Impossible d'écire l'entête du fichier %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "Perse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rapides" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2509,11 +2470,11 @@ msgstr "" "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Infos du fichier" @@ -2559,43 +2520,43 @@ msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "Trouver le suivant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "Trouver le précédent" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forcer 16/9è" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forcer le filtrage de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2608,7 +2569,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2621,7 +2582,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2643,17 +2604,17 @@ msgstr "" msgid "Forward" msgstr "Avant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "Trouvé %d résultats pour '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Image " @@ -2662,37 +2623,37 @@ msgstr "Image " msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "Info image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Plage d'images :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Image/s max :" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Vue libre" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Français" @@ -2700,20 +2661,20 @@ msgstr "Français" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Plein écran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Résolution en Plein écran :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Fichier GCI (*.gci)" @@ -2721,11 +2682,11 @@ msgstr "Fichier GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuration du micro GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2753,24 +2714,28 @@ msgstr "Paramètres spécifiques au jeu" msgid "GameConfig" msgstr "Config du Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Codes Gecko" @@ -2790,8 +2755,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Général" @@ -2800,30 +2765,30 @@ msgid "General Settings" msgstr "Paramètres généraux" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Allemand" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Graphismes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Paramètres graphiques" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Plus grand que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2842,7 +2807,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grèque" @@ -2862,11 +2827,11 @@ msgstr "Vert Droite" msgid "Guitar" msgstr "Guitare" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2874,7 +2839,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hébreu" @@ -2886,7 +2851,7 @@ msgstr "Hauteur" msgid "Help" msgstr "Aide" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2908,11 +2873,11 @@ msgstr "" msgid "Hide" msgstr "Cacher" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Masquer le curseur de la souris" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2938,11 +2903,11 @@ msgstr "Configuration des raccourcis clavier" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongrois" @@ -2950,14 +2915,14 @@ msgstr "Hongrois" msgid "Hybrid Wiimote" msgstr "Wiimote hybride" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " "inconnu : %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2970,11 +2935,11 @@ msgstr "" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2994,7 +2959,7 @@ msgstr "Sensibilité de l'IR" msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -3002,7 +2967,7 @@ msgstr "Dossiers des ISO" msgid "ITALY" msgstr "Italie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icône" @@ -3021,7 +2986,7 @@ msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3032,11 +2997,11 @@ msgstr "" "pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " "selon les jeux)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorer les changements de formats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3050,7 +3015,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3064,7 +3029,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3092,7 +3057,7 @@ msgstr "" "Le fichier importé a l'extension SAV\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3104,17 +3069,6 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Améliore les performances, mais peut faire disparaître l'éclairage dans la " -"plupart des jeux.\n" -"\n" -"Dans le doute, décochez cette case." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Dans le jeu" @@ -3144,7 +3098,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3152,11 +3106,11 @@ msgstr "Insérer une carte SD" msgid "Insert name here.." msgstr "Indiquer un nom ici..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3167,23 +3121,23 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "Erreur lors de la vérification de l'intégrité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "Vérification de l'intégrité terminée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3192,19 +3146,19 @@ msgstr "" "Echec de la vérification de l'intégrité pour la partition %d. Votre copie " "est certainement corrompue ou a été incorrectement patchée." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Paramètres de l'interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erreur interne LZO - échec de la compression" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3213,15 +3167,15 @@ msgstr "" "Erreur interne LZO - échec de la décompression (%d) (%li, %li) \n" "Essayez de charger à nouveau l'état" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" @@ -3234,7 +3188,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Taille invalide (%x) ou mot Magique (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Valeur non valide !" @@ -3247,7 +3201,7 @@ msgstr "bar.map ou entrée dir non valide" msgid "Invalid event type %i" msgstr "Type d'évènement non valide : %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Fichier non valide" @@ -3262,31 +3216,31 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Paramètres de recherche non valide (aucun objet sélectionné)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "Texte de recherche non valide (impossible à convertir en nombre)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" "Texte de recherche non valide (seules les longueurs de chaînes de caractères " "sont prises en charge)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Etat non valide" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italien" @@ -3294,16 +3248,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonais" @@ -3311,7 +3265,7 @@ msgstr "Japonais" msgid "KOREA" msgstr "Corée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3321,7 +3275,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "Toujours au premier plan" @@ -3330,8 +3284,8 @@ msgstr "Toujours au premier plan" msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coréen" @@ -3349,16 +3303,16 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Dernier état écrasé" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Dernier état sauvegardé" @@ -3398,11 +3352,11 @@ msgstr "" "Clic gauche/droit pour plus d'options.\n" "Clic sur molette pour effacer." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" @@ -3410,7 +3364,7 @@ msgstr "Nb de FPS comme limite" msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" @@ -3454,20 +3408,20 @@ msgstr "Charger l'état du Slot 7" msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3483,15 +3437,11 @@ msgstr "" "Charger les valeurs de pré-réglage à partir de la palette de hack " "disponibles." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Verrouiller les threads aux coeurs" @@ -3503,16 +3453,33 @@ msgstr "Journal" msgid "Log Configuration" msgstr "Configuration de la journalisation" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Types de journaux" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " +"d'émulation.\n" +"\n" +"Dans le doute, décochez cette case." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Sorties des journalisations" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Journalisation" @@ -3520,10 +3487,6 @@ msgstr "Journalisation" msgid "Lost connection to server!" msgstr "Connexion au serveur perdue !" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Emulation audio en bas niveau (LLE) ou en haut niveau (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Bouton M" @@ -3541,8 +3504,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Fichiers MadCatz Gameshark (*.gcs)" @@ -3572,7 +3535,7 @@ msgstr "La carte mémoire contient déjà une sauvegarde pour ce titre" msgid "Memcard already opened" msgstr "Carte mémoire déjà chargée" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Octet mémoire" @@ -3625,11 +3588,11 @@ msgstr "Micro" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3638,7 +3601,7 @@ msgstr "Paramètres divers" msgid "Modifier" msgstr "Modif." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3664,7 +3627,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3694,11 +3657,11 @@ msgstr "" "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " "aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "Note : La taille du flux est différente de la longueur actuelle des données\n" @@ -3793,28 +3756,28 @@ msgstr "NP Haut" msgid "Name:" msgstr "Nom :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nom :" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Fichiers natifs GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Page suivante" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Recherche suivante" @@ -3835,8 +3798,8 @@ msgstr "Aucun ISO ou WAD trouvé" msgid "No banner file found for title %s" msgstr "Aucune bannière trouvée pour le titre %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "Aucune description disponible" @@ -3844,7 +3807,7 @@ msgstr "Aucune description disponible" msgid "No docking" msgstr "Pas d'attachement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Aucun fichier chargé" @@ -3852,7 +3815,7 @@ msgstr "Aucun fichier chargé" msgid "No free dir index entries" msgstr "Aucune entrée de dossier d'index libre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Aucun fichier enregistré" @@ -3866,20 +3829,20 @@ msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Différent" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Non connectée" @@ -3904,7 +3867,7 @@ msgstr "Note" msgid "Num Lock" msgstr "Verr. Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Nombre de codes :" @@ -3917,15 +3880,15 @@ msgstr "Nunchuck" msgid "Nunchuk Acceleration" msgstr "Accéleration du Nunchuck" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Arrêt" @@ -3933,26 +3896,30 @@ msgstr "Arrêt" msgid "Offset:" msgstr "Offset :" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "%d blocs disponibles seulement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Ouvrir un fichier..." @@ -3970,22 +3937,14 @@ msgstr "OpenAL : impossible de trouver des périphériques audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL : impossible d'ouvrir le périphérique %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Ouvrir le débuggueur" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Ouvrir le journaliseur" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -4006,8 +3965,8 @@ msgstr "" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Autres" @@ -4023,7 +3982,7 @@ msgstr "" msgid "Output" msgstr "Sortie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Jouer l'enregistrement..." @@ -4068,17 +4027,21 @@ msgstr "Partition %i" msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" @@ -4091,10 +4054,10 @@ msgstr "Parfait" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Démarrer" @@ -4112,7 +4075,7 @@ msgstr "Démarrer/Arrêter" msgid "Playable" msgstr "Jouable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Options de lecture" @@ -4120,7 +4083,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4132,23 +4095,23 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4157,29 +4120,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)" @@ -4192,11 +4155,11 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Page précédente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valeur précédente" @@ -4212,7 +4175,7 @@ msgstr "Profil" msgid "Properties" msgstr "Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Vider le cache" @@ -4239,7 +4202,7 @@ msgstr "Bouton R" msgid "R-Analog" msgstr "R Analog." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4256,7 +4219,7 @@ msgstr "Etendue" msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Réel" @@ -4268,7 +4231,7 @@ msgstr "Wiimote physique" msgid "Real Wiimotes" msgstr "Wiimote physique" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Confirmation de reconnexion de la Wiimote" @@ -4276,17 +4239,17 @@ msgstr "Confirmation de reconnexion de la Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Reconnecter la Wiimote lors du chargement d'un état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Enregistrer" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Infos sur l'enregistrement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Options d'enregistrement" @@ -4302,7 +4265,7 @@ msgstr "Rouge Gauche" msgid "Red Right" msgstr "Rouge Droite" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4318,7 +4281,7 @@ msgstr "" "Dans le doute, sélectionnez Aucune." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Rafraîchir" @@ -4328,18 +4291,18 @@ msgstr "Rafraîchir" msgid "Refresh List" msgstr "Rafraîchir la liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Retirer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4349,7 +4312,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" @@ -4359,7 +4322,7 @@ msgstr "Rendu dans la fenêtre principale" msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Résultats" @@ -4381,33 +4344,33 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Sûr " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Echantillonnage :" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Sauver" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." @@ -4451,7 +4414,7 @@ msgstr "Sauvegarder l'état vers le Slot 7" msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Enregistrer l'état" @@ -4460,26 +4423,26 @@ msgstr "Enregistrer l'état" msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " "film..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" @@ -4496,7 +4459,7 @@ msgstr "Recherche d'ISO" msgid "Scanning..." msgstr "Recherche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Capt écran" @@ -4504,23 +4467,23 @@ msgstr "Capt écran" msgid "Scroll Lock" msgstr "Arrêt défil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Rechercher" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "Rechercher l'objet actuel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "Rechercher une valeur Hexadécimale :" @@ -4535,16 +4498,16 @@ msgstr "La section %s n'a pas été trouvée dans SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4562,23 +4525,23 @@ msgstr "Sélectionner un fichier de sauvegarde à importer" msgid "Select floating windows" msgstr "Sélectionner les fenêtres flottantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4601,7 +4564,7 @@ msgstr "" msgid "Selected font" msgstr "Police sélectionnée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4618,7 +4581,7 @@ msgstr "" "Si vous ne savez toujours pas, sélectionnez la plus haute résolution " "affichée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4646,11 +4609,11 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4661,16 +4624,16 @@ msgstr "" msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4697,55 +4660,55 @@ msgstr "Nom court :" msgid "Shoulder Buttons" msgstr "Boutons latéraux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Afficher la &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Afficher le &journal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Afficher la barre d'&état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Afficher la barre d'&outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Afficher les FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Afficher France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Afficher Italie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Afficher Japon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Afficher Corée" @@ -4753,47 +4716,47 @@ msgstr "Afficher Corée" msgid "Show Language:" msgstr "Afficher la langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Afficher la config. de journalisation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Afficher PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Afficher les plateformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Afficher les statistiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Afficher Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Afficher USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Afficher WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4804,27 +4767,39 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Afficher le commentaire de sauvegarde" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4836,15 +4811,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Affiche ce message d'aide" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Afficher les inconnus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4858,7 +4829,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinois simplifié" @@ -4866,19 +4837,19 @@ msgstr "Chinois simplifié" msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4890,7 +4861,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4907,17 +4878,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4942,11 +4913,11 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Paramètres audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Le moteur audio %s n'est pas valide" @@ -4961,8 +4932,8 @@ msgid "Space" msgstr "Espace" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Espagnol" @@ -4970,7 +4941,7 @@ msgstr "Espagnol" msgid "Speaker Volume:" msgstr "Volume du haut-parleur :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4990,10 +4961,6 @@ msgstr "" "\n" "Dans le doute, sélectionnez 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Sélectionner une interface pour les graphismes" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -5012,11 +4979,11 @@ msgstr "Contrôleur standard" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Démarrer &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Commencer l'enregistrement" @@ -5038,15 +5005,15 @@ msgstr "Etats" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Arrêter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5060,7 +5027,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Etirer à la fenêtre" @@ -5085,8 +5052,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Langue du système :" @@ -5094,7 +5061,7 @@ msgstr "Langue du système :" msgid "TAIWAN" msgstr "Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrée TAS" @@ -5115,8 +5082,8 @@ msgstr "Table Gauche" msgid "Table Right" msgstr "Table Droite" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5130,15 +5097,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5154,13 +5121,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5200,7 +5167,7 @@ msgstr "Le nom ne peut contenir le caractère ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Le code AR décrypté ne contient aucune ligne." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5217,7 +5184,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "La sauvegarde que vous essayez de copier a une taille de fichier non valide" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5250,15 +5217,15 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thème" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "La sélection du thème a rencontré un problème" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5274,7 +5241,7 @@ msgstr "" "Ces paramètres écrasent ceux de Dolphin.\n" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5282,11 +5249,11 @@ msgstr "" "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " "l'Action Replay lui-même." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5305,7 +5272,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5332,13 +5299,13 @@ msgstr "Seuil" msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Titre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "A" @@ -5346,18 +5313,18 @@ msgstr "A" msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Activer le plein écran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -5381,7 +5348,7 @@ msgstr "" "Essai de lecture à partir d'un SYSCONF non valide\n" "Les IDs BT de la Wiimote ne sont pas disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turque" @@ -5406,7 +5373,7 @@ msgstr "Wiimote UDP :" msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "Inconnu_%02X" @@ -5434,24 +5401,24 @@ msgstr "" "décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "%i non défini" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "&Annuler le lancement d'état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "Appel 0x80 inattendu. Abandon..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Inconnu" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Commande DVD inconnue %08x - erreur fatale" @@ -5477,7 +5444,7 @@ msgstr "" msgid "Up" msgstr "Haut" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Mettre à jour" @@ -5486,23 +5453,23 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5515,7 +5482,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5530,15 +5497,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilitaires" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "Synchro verticale" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valeur" @@ -5546,7 +5513,7 @@ msgstr "Valeur" msgid "Value:" msgstr "Valeur :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valeur" @@ -5558,11 +5525,11 @@ msgstr "Niveau de détail" msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" @@ -5576,7 +5543,7 @@ msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" msgid "WAD installation failed: error creating ticket" msgstr "Echec de l'installation du WAD : erreur lors de la création du ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5618,7 +5585,7 @@ msgstr "" "%s\n" "Voulez-vous continuer ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5632,7 +5599,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5644,7 +5611,7 @@ msgstr "" "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " "désactivant le mode Lecture seule." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5656,7 +5623,7 @@ msgstr "" "charger cet état en désactivant le mode Lecture seule. Dans le cas " "contraire, il y aura probablement une désynchronisation." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5699,7 +5666,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -5707,7 +5674,7 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5715,15 +5682,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5732,7 +5699,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD : impossible de lire le fichier" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5741,7 +5708,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5754,7 +5721,7 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote connectée" @@ -5762,7 +5729,7 @@ msgstr "Wiimote connectée" msgid "Wiimote Motor" msgstr "Vibreur de la Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Paramètres de la Wiimote" @@ -5786,10 +5753,10 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Travail..." @@ -5824,7 +5791,7 @@ msgstr "Echec de l'initialisation de XAudio2 : %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Echec de la création de la voix principale dans XAudio2 : %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "XF reg" @@ -5849,11 +5816,11 @@ msgstr "Vous ne pouvez pas fermer des panneaux contenant des appels." msgid "You must choose a game!!" msgstr "Vous devez choisir un jeu !!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Vous devez entrer un nom !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." @@ -5861,7 +5828,7 @@ msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -5888,11 +5855,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Code Zero 3 non pris en charge" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code inconnu pour Dolphin : %08x" @@ -5902,7 +5869,7 @@ msgstr "Zero code inconnu pour Dolphin : %08x" msgid "[ waiting ]" msgstr "[ attente ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5918,7 +5885,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personnalisé]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5937,7 +5904,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5955,7 +5922,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5984,7 +5951,7 @@ msgstr "" "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " "l'entête du fichier %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5993,7 +5960,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -6078,6 +6045,19 @@ msgstr "| OR" #~ "Il est préférable de régler le format d'écran sur Etirer lorsque vous " #~ "utilisez cette fonction." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Génère automatiquement des mipmaps plutôt que de les décoder depuis la " +#~ "mémoire.\n" +#~ "Améliore un peu les performances mais peut provoquer des défauts mineurs " +#~ "de texture.\n" +#~ "\n" +#~ "Dans le doute, cochez cette case." + #~ msgid "Bad gameini filename" #~ msgstr "Mauvais nom de fichier INI de jeu" @@ -6147,9 +6127,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danois" +#~ msgid "Disable Lighting" +#~ msgstr "Désactiver l'éclairage" + +#~ msgid "Disable Textures" +#~ msgstr "Désactiver les textures" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Désactiver le haut-parleur de la Wiimote." +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Désactive l'application de textures.\n" +#~ "\n" +#~ "Dans le doute, décochez cette case." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6286,6 +6281,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erreur d'ouverture du fichier %s pour l'enregistrement" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Quitter Dolphin avec l'émulateur" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6298,6 +6296,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Impossible de charger la ROM DSP %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rapides" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6347,6 +6348,16 @@ msgstr "| OR" #~ "Si un jeu bloque, fonctionne seulement avec l'Interpreteur ou que Dolphin " #~ "plante, cette option peut corriger le jeu." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Améliore les performances, mais peut faire disparaître l'éclairage dans " +#~ "la plupart des jeux.\n" +#~ "\n" +#~ "Dans le doute, décochez cette case." + #~ msgid "Input Source" #~ msgstr "Source d'entrée" @@ -6389,6 +6400,12 @@ msgstr "| OR" #~ "Charger les mipmaps natifs est plus fidèle, mais peut aussi réduire les " #~ "performances (la distance peut varier cependant)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Emulation audio en bas niveau (LLE) ou en haut niveau (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Script de console Lua" @@ -6423,6 +6440,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Ouvrir le débuggueur" + +#~ msgid "Opens the logger" +#~ msgstr "Ouvrir le journaliseur" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6510,6 +6533,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Afficher le nombre d'images rendues par seconde" +#~ msgid "Show this help message" +#~ msgstr "Affiche ce message d'aide" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6551,6 +6577,9 @@ msgstr "| OR" #~ "Les autres options sont des résolutions fixes pour choisir une qualité " #~ "visuelle indépendante de la taille de l'affichage." +#~ msgid "Specify a video backend" +#~ msgstr "Sélectionner une interface pour les graphismes" + #~ msgid "Specify an audio plugin" #~ msgstr "Sélectionner un plugin sonore" diff --git a/Languages/po/he.po b/Languages/po/he.po index 151dea89ae..8f03cb9bd0 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(×רוך מידי)" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -52,9 +52,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -139,7 +139,7 @@ msgstr "" msgid "%sImport GCI%s" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשיות" @@ -148,148 +148,148 @@ msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשי msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&×ודות" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&קובץ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&עזרה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 #, fuzzy msgid "&Hotkey Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&עצור" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -305,27 +305,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -346,11 +346,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -359,8 +359,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "" @@ -394,7 +394,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "" @@ -407,7 +407,7 @@ msgstr "" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -415,7 +415,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -439,39 +439,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -482,27 +482,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "" @@ -511,11 +511,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "" @@ -525,7 +525,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "" @@ -559,36 +559,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -596,9 +596,9 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -608,15 +608,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "" @@ -628,22 +628,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -652,18 +652,18 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +671,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" @@ -684,43 +684,35 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "" @@ -728,13 +720,13 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "" @@ -751,7 +743,7 @@ msgstr "" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "" @@ -768,11 +760,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "" @@ -784,7 +776,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -801,7 +793,7 @@ msgid "Blue Right" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "" @@ -814,7 +806,7 @@ msgstr "" msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "" @@ -822,11 +814,11 @@ msgstr "" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "" @@ -840,7 +832,7 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -852,19 +844,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -874,7 +866,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -883,7 +875,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -899,7 +891,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -907,24 +899,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -932,7 +924,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -944,7 +936,7 @@ msgstr "" msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "" @@ -957,7 +949,7 @@ msgstr "" msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -971,8 +963,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -984,7 +976,7 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "" @@ -996,35 +988,35 @@ msgstr "" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "" @@ -1032,14 +1024,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "" @@ -1064,22 +1056,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "" @@ -1087,7 +1079,7 @@ msgstr "" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" @@ -1095,20 +1087,20 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "" @@ -1127,17 +1119,17 @@ msgstr "" msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1146,11 +1138,11 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1175,7 +1167,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "" @@ -1195,7 +1187,7 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "" @@ -1209,7 +1201,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1238,7 +1230,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1247,18 +1239,18 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "" @@ -1266,8 +1258,8 @@ msgstr "" msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "" @@ -1276,20 +1268,20 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1301,11 +1293,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1316,7 +1308,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1333,11 +1325,11 @@ msgstr "" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1345,36 +1337,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" @@ -1386,7 +1378,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "" @@ -1394,8 +1386,8 @@ msgstr "" msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1411,7 +1403,7 @@ msgstr "" msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "" @@ -1419,16 +1411,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "" @@ -1436,7 +1428,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" @@ -1449,7 +1441,7 @@ msgstr "" msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "" @@ -1458,7 +1450,7 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "" @@ -1478,8 +1470,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "" @@ -1501,28 +1493,20 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1531,7 +1515,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1541,13 +1525,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "" @@ -1557,11 +1534,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1572,20 +1549,20 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, fuzzy, c-format msgid "Dolphin %s Graphics Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "" @@ -1597,17 +1574,17 @@ msgstr "" msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1615,7 +1592,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "" @@ -1653,37 +1630,37 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1691,23 +1668,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1717,11 +1694,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "" @@ -1737,7 +1714,7 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1750,15 +1727,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1767,7 +1744,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1789,7 +1766,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1799,7 +1776,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1815,11 +1792,11 @@ msgstr "" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "" @@ -1827,11 +1804,11 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "" @@ -1839,7 +1816,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1848,11 +1825,11 @@ msgid "Enable MMU" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" @@ -1860,11 +1837,11 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1879,11 +1856,11 @@ msgid "" "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1891,7 +1868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1916,7 +1893,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1930,7 +1907,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1942,13 +1919,13 @@ msgid "End" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "" @@ -1966,17 +1943,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2011,10 +1988,6 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "" @@ -2028,19 +2001,19 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "" @@ -2048,7 +2021,7 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" @@ -2056,7 +2029,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2092,28 +2065,28 @@ msgstr "" msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2137,7 +2110,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2234,33 +2207,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "" @@ -2302,43 +2271,43 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2346,7 +2315,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2354,7 +2323,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2371,17 +2340,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "" @@ -2390,37 +2359,37 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "" @@ -2428,21 +2397,21 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2451,11 +2420,11 @@ msgstr "" msgid "GCMic Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2483,25 +2452,29 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "" @@ -2517,8 +2490,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "" @@ -2528,29 +2501,29 @@ msgid "General Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2561,7 +2534,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2581,11 +2554,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2593,7 +2566,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2605,7 +2578,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2619,11 +2592,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2645,11 +2618,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2657,12 +2630,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2671,11 +2644,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2695,7 +2668,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" @@ -2703,7 +2676,7 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2718,18 +2691,18 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2738,7 +2711,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2747,7 +2720,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "" @@ -2771,7 +2744,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2779,13 +2752,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "" @@ -2815,7 +2781,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2823,11 +2789,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "" @@ -2836,57 +2802,57 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" @@ -2899,7 +2865,7 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "" @@ -2912,7 +2878,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2924,29 +2890,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "" @@ -2954,16 +2920,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "" @@ -2971,14 +2937,14 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -2987,8 +2953,8 @@ msgstr "" msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "" @@ -3006,16 +2972,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "" @@ -3048,11 +3014,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3060,7 +3026,7 @@ msgstr "" msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "" @@ -3104,20 +3070,20 @@ msgstr "" msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3128,15 +3094,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3149,16 +3111,28 @@ msgstr "" msgid "Log Configuration" msgstr "הגדרות גרפיקה" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "" @@ -3166,10 +3140,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3185,8 +3155,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3216,7 +3186,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "" @@ -3259,11 +3229,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3272,7 +3242,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3293,7 +3263,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3314,11 +3284,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3412,28 +3382,28 @@ msgstr "" msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "" @@ -3454,8 +3424,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3463,7 +3433,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3471,7 +3441,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "" @@ -3485,20 +3455,20 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "" @@ -3523,7 +3493,7 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "" @@ -3536,15 +3506,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "" @@ -3552,26 +3522,30 @@ msgstr "" msgid "Offset:" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "" @@ -3589,22 +3563,14 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3621,8 +3587,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3636,7 +3602,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "" @@ -3681,17 +3647,21 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "" @@ -3704,10 +3674,10 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "" @@ -3725,7 +3695,7 @@ msgstr "" msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "" @@ -3733,7 +3703,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "" @@ -3745,23 +3715,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "" @@ -3770,29 +3740,29 @@ msgstr "" msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3805,11 +3775,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "" @@ -3825,7 +3795,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "" @@ -3852,7 +3822,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "" @@ -3869,7 +3839,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "" @@ -3881,7 +3851,7 @@ msgstr "" msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -3889,17 +3859,17 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -3915,7 +3885,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3925,7 +3895,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3935,25 +3905,25 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "" @@ -3963,7 +3933,7 @@ msgstr "" msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "" @@ -3985,33 +3955,33 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "" @@ -4055,7 +4025,7 @@ msgstr "" msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "" @@ -4064,24 +4034,24 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4098,7 +4068,7 @@ msgstr "" msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "" @@ -4106,23 +4076,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4137,16 +4107,16 @@ msgstr "" msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4161,23 +4131,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4192,7 +4162,7 @@ msgstr "" msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4202,7 +4172,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4224,11 +4194,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4237,16 +4207,16 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4272,55 +4242,55 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "" @@ -4328,75 +4298,86 @@ msgstr "" msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 #, fuzzy msgid "Show Log &Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4404,15 +4385,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4423,7 +4400,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4431,19 +4408,19 @@ msgstr "" msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4451,7 +4428,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4461,17 +4438,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4491,11 +4468,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4510,8 +4487,8 @@ msgid "Space" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "" @@ -4519,7 +4496,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4531,10 +4508,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4553,11 +4526,11 @@ msgstr "" msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "" @@ -4579,15 +4552,15 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4596,7 +4569,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "" @@ -4621,8 +4594,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" @@ -4630,7 +4603,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4651,8 +4624,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4666,15 +4639,15 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "" @@ -4690,13 +4663,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4732,7 +4705,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4744,7 +4717,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4775,15 +4748,15 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -4795,17 +4768,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4816,7 +4789,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4837,13 +4810,13 @@ msgstr "" msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "" @@ -4851,18 +4824,18 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" @@ -4884,7 +4857,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -4909,7 +4882,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4932,24 +4905,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -4974,7 +4947,7 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "" @@ -4983,24 +4956,24 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5008,7 +4981,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5017,15 +4990,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "" @@ -5033,7 +5006,7 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "" @@ -5045,11 +5018,11 @@ msgstr "" msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "" @@ -5063,7 +5036,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5097,7 +5070,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5106,7 +5079,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5114,7 +5087,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5122,7 +5095,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5150,7 +5123,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5158,7 +5131,7 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" @@ -5166,15 +5139,15 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5183,7 +5156,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "" @@ -5192,7 +5165,7 @@ msgstr "" msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5201,7 +5174,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "" @@ -5209,7 +5182,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "" @@ -5233,10 +5206,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "" @@ -5271,7 +5244,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5293,11 +5266,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" @@ -5305,7 +5278,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5327,11 +5300,11 @@ msgstr "" msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5341,7 +5314,7 @@ msgstr "" msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5353,7 +5326,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5364,7 +5337,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5377,7 +5350,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5404,7 +5377,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5413,7 +5386,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index e00a7f87ae..3f91382e7c 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-12-28 09:44+0100\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Hungarian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (túl sok kijelzÅ‘)" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -55,9 +55,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -152,7 +152,7 @@ msgstr "%sGCI exportálás%s" msgid "%sImport GCI%s" msgstr "%sGCI importálás%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" @@ -161,147 +161,147 @@ msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" msgid "&& AND" msgstr "&& ÉS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Névjegy..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Bootolás DVD meghajtóról..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Töréspontok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&ISO fájlok tallózása..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emuláció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Fájl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Képkocka léptetés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Teljes nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Súgó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Ãllás betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Memóriakártya kezelÅ‘ (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Megnyitás..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Szünet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Regiszterek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Alapra állítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Hang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Leállítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Eszközök" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Kép" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -317,27 +317,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ISMERETLEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(ki)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -345,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -358,11 +358,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -371,8 +371,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Már egy NetPlay ablak nyitva van!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "A játék jelenleg nem fut." @@ -424,7 +424,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM alaplap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR kódok" @@ -437,7 +437,7 @@ msgstr "A Dolphin névjegye" msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Pontosság:" @@ -445,7 +445,7 @@ msgstr "Pontosság:" msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -479,7 +479,7 @@ msgstr "" "FelelÅ‘s kód:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +487,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " "hozzáadásban (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +496,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kitöltésben " "és regiszterben (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +505,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a RAM írásban " "és kitöltésben (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,12 +514,12 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " "írásában (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -530,27 +530,27 @@ msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (% msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay hiba: érvénytelen AR kód a(z) %s. sorban" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Feltételes kód: Érvénytelen méret %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Érvénytelen szabályszerű kód típus %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód %i: Érvénytelen alfaj %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód 0: Érvénytelen alfaj %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adapter:" @@ -559,11 +559,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -573,7 +573,7 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Hozzáadás..." @@ -623,38 +623,38 @@ msgstr "" "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " "beállítása." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Haladó beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" @@ -662,9 +662,10 @@ msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -678,15 +679,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Anizotrópikus szűrés:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Élsimítás:" @@ -699,15 +700,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "A betöltÅ‘ program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "BetöltÅ‘ program:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Alkalmaz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -717,7 +718,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arab" @@ -726,7 +727,7 @@ msgstr "Arab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -734,12 +735,12 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -747,12 +748,12 @@ msgstr "Képarány:" msgid "At least one pane must remain open." msgstr "Legalább egy mezÅ‘nek megnyitva kell maradnia." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -760,24 +761,24 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automatikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Automatikus (640x528 többszöröse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Automatikus (ablak méret)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Ablak méret automatikus állítása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -787,25 +788,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " -"memóriából.\n" -"Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " -"okozhat.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelölve." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Regiszterek" @@ -814,12 +801,12 @@ msgstr "&Regiszterek" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Feldolgozó:" @@ -836,7 +823,7 @@ msgstr "Vissza" msgid "Bad File Header" msgstr "Rossz fájl fejléc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Játék kép" @@ -853,11 +840,11 @@ msgstr "Játék kép:" msgid "Bar" msgstr "VevÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Alap beállítások" @@ -869,7 +856,7 @@ msgstr "Basszus" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table ellenÅ‘rzÅ‘ összege nem megfelelÅ‘" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokk" @@ -886,7 +873,7 @@ msgid "Blue Right" msgstr "Kék jobbra" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Gomb" @@ -899,7 +886,7 @@ msgstr "Összekötött irányítások: %lu" msgid "Broken" msgstr "Hibás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Tallózás" @@ -907,11 +894,11 @@ msgstr "Tallózás" msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -925,7 +912,7 @@ msgstr "Puffer:" msgid "Buttons" msgstr "Gombok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -937,19 +924,19 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -966,7 +953,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -981,7 +968,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Mégse" @@ -997,7 +984,7 @@ msgstr "%s nem nyitható meg" msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1008,7 +995,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1016,18 +1003,18 @@ msgstr "" "A fájl nem használható memóriakártyaként.\n" "Azonos fájlt próbálsz használni mindkét kártya helyén?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelÅ‘ szerint" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" @@ -1035,7 +1022,7 @@ msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalán" @@ -1047,7 +1034,7 @@ msgstr "Közép" msgid "Change" msgstr "Váltás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Lemez &váltás..." @@ -1060,7 +1047,7 @@ msgstr "Lemez váltás" msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1076,8 +1063,8 @@ msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!" @@ -1089,7 +1076,7 @@ msgstr "Csevegés" msgid "Cheat Code" msgstr "Csalás kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Csalás keresés" @@ -1101,35 +1088,35 @@ msgstr "Csalás kezelÅ‘" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1137,7 +1124,7 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1145,8 +1132,8 @@ msgstr "" "Válassz betöltÅ‘ programnak használandó fájlt: (csak könyvtárakból " "létrehozott lemezekre érvényesíthetÅ‘)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1173,22 +1160,22 @@ msgstr "" "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " "kell leállítanod a játékot." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Bezárás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Be&állítások..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Kód infó" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kód:" @@ -1196,7 +1183,7 @@ msgstr "Kód:" msgid "Command" msgstr "Parancs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Megjegyzés" @@ -1204,20 +1191,20 @@ msgstr "Megjegyzés" msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "ISO tömörítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Beállítások" @@ -1236,17 +1223,17 @@ msgstr "Irányítás beállítás" msgid "Configure Pads" msgstr "Irányítók beállítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" @@ -1255,11 +1242,11 @@ msgstr "Kilépéskor megerÅ‘sítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "%i Wiimote csatlakoztatása" @@ -1284,7 +1271,7 @@ msgstr "Wiimote 3 csatlakoztatása" msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1304,7 +1291,7 @@ msgstr "Konvertálás: GCI" msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" @@ -1318,7 +1305,7 @@ msgstr "Mag" msgid "Could not create %s" msgstr "%s nem hozható létre" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "%s hang feldolgozó iniciálása sikertelen." @@ -1352,7 +1339,7 @@ msgstr "" "Irányítók beállítása nem sikerült. A játékos kilépett vagy a játék épp fut!\n" "(irányítók beállítása még nem támogatott miközben a játék fut)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1364,11 +1351,11 @@ msgstr "" "\n" "CD/DVD lemezrÅ‘l futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1376,8 +1363,8 @@ msgstr "" "A mag nem iniciálható.\n" "EllenÅ‘rizd a beállításokat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Számláló:" @@ -1385,8 +1372,8 @@ msgstr "Számláló:" msgid "Country:" msgstr "Ország:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "AR kód létrehozása" @@ -1395,21 +1382,21 @@ msgstr "AR kód létrehozása" msgid "Create new perspective" msgstr "Új perspektíva készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Készítette: KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Készítette: VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" @@ -1422,11 +1409,11 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Levágás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1440,7 +1427,7 @@ msgstr "" msgid "Crossfade" msgstr "Kereszthalkítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ez a könyvtár megváltozott errÅ‘l: %s erre: %s a wxFileSelector után!" @@ -1457,11 +1444,11 @@ msgstr "Egyedi megjelenítési hack beállítások" msgid "Customize some Orthographic Projection parameters." msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Cseh" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1469,36 +1456,36 @@ msgstr "" msgid "D-Pad" msgstr "Digitális irányok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1510,7 +1497,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Adatok mérete" @@ -1518,8 +1505,8 @@ msgstr "Adatok mérete" msgid "Date:" msgstr "Dátum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro fájlok(*.sav)" @@ -1535,7 +1522,7 @@ msgstr "Holtsáv" msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Hibakeresés" @@ -1543,16 +1530,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1560,7 +1547,7 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1573,7 +1560,7 @@ msgstr "Alap betűtípus" msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Mentés törlése" @@ -1582,7 +1569,7 @@ msgstr "Mentés törlése" msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévÅ‘ '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Leírás" @@ -1604,8 +1591,8 @@ msgstr "" msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1629,28 +1616,20 @@ msgstr "" "Könyvtár ellenÅ‘rzÅ‘ összeg hibás\n" " és a könyvtár biztonsági mentés ellenÅ‘rzÅ‘ összeg hibás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Fényhatások kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Képpont mélység kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Textúrák kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1665,7 +1644,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1682,16 +1661,6 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Textúrák kikapcsolása.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelöletlenül." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Lemez" @@ -1701,11 +1670,11 @@ msgstr "Lemez" msgid "Disc Read Error" msgstr "Lemez olvasási hiba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "KijelzÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1719,20 +1688,20 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &weblap" @@ -1744,16 +1713,16 @@ msgstr "Dolphin beállítások" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin emulált Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1761,7 +1730,7 @@ msgstr "Dolphin TAS videók (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" @@ -1803,23 +1772,23 @@ msgstr "Dobok" msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Textúrák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1830,7 +1799,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1840,7 +1809,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1851,23 +1820,23 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holland" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "K&ilépés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB másolatok" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1881,11 +1850,11 @@ msgstr "" msgid "EUROPE" msgstr "EURÓPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Korai memória frissítés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Szerkesztés" @@ -1901,7 +1870,7 @@ msgstr "Beállítások szerkesztése" msgid "Edit Patch" msgstr "Patch szerkesztése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" @@ -1914,15 +1883,15 @@ msgstr "Szerkesztés..." msgid "Effect" msgstr "Effektus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Az emuláció már fut" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1936,7 +1905,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1964,7 +1933,7 @@ msgstr "Emuláció állapota:" msgid "Enable" msgstr "Használat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1980,7 +1949,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" @@ -1996,11 +1965,11 @@ msgstr "Blokk csatlakozás használata" msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Gyorsítótár használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Csalások használata" @@ -2008,11 +1977,11 @@ msgstr "Csalások használata" msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" @@ -2020,7 +1989,7 @@ msgstr "Gyorsbillentyűk használata" msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" @@ -2029,11 +1998,11 @@ msgid "Enable MMU" msgstr "MMU használata" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" @@ -2041,11 +2010,11 @@ msgstr "KépernyÅ‘védÅ‘ bekapcsolása" msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2067,11 +2036,11 @@ msgstr "" "Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " "KI = kompatibilis)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Oldalak bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2083,7 +2052,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2117,7 +2086,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2138,7 +2107,7 @@ msgstr "" "Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges " "néhány játékhoz. (BE = kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2153,13 +2122,13 @@ msgid "End" msgstr "Vége" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Angol" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Kép javítások" @@ -2177,17 +2146,17 @@ msgstr "%d/%d bejegyzés" msgid "Entry 1/%d" msgstr "1/%d bejegyzés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Hiba" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " @@ -2229,10 +2198,6 @@ msgstr "Kivétel kezelÅ‘ - memória terület alatti hozzáférés. %08llx%08llx" msgid "Execute" msgstr "Végrehajtás" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Kilépés a Dolphin emulátorból" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Exportálás sikertelen" @@ -2246,19 +2211,19 @@ msgstr "Fájl exportálása" msgid "Export Recording" msgstr "Felvétel exportálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2266,7 +2231,7 @@ msgstr "Minden mentés exportálása" msgid "Export failed, try again?" msgstr "Exportálás sikertelen. Újra megpróbálod?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportálás mentése másként..." @@ -2274,7 +2239,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2310,28 +2275,28 @@ msgstr "Fájl kitömörítése..." msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Kitömörítés..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO bájt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO lejátszó" @@ -2355,7 +2320,7 @@ msgstr "Meghallgatás sikertelen!" msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2474,33 +2439,29 @@ msgstr "Fejléc írása sikertelen a(z) %s számára" msgid "Failed to write header for file %d" msgstr "Fejléc írása sikertelen a(z) %d fájl számára" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Gyors mipmapek" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo lejátszó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Fájl infó" @@ -2546,43 +2507,43 @@ msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ElsÅ‘ blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Kényszerített 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Textúra szűrés kényszerítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2595,7 +2556,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2607,7 +2568,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2629,17 +2590,17 @@ msgstr "" msgid "Forward" msgstr "ElÅ‘re" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Képkocka" @@ -2648,38 +2609,38 @@ msgstr "Képkocka" msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Képkocka rendezés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Képkocka korlát:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Szabad nézet" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francia" @@ -2687,20 +2648,20 @@ msgstr "Francia" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "EttÅ‘l:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Teljes méret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Teljes kijelzÅ‘s felbontás:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI fájl(*.gci)" @@ -2708,11 +2669,11 @@ msgstr "GCI fájl(*.gci)" msgid "GCMic Configuration" msgstr "GCMic beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2740,24 +2701,28 @@ msgstr "A játék sajátos beállításai" msgid "GameConfig" msgstr "Játék konfig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko kódok" @@ -2775,8 +2740,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Ãltalános" @@ -2785,29 +2750,29 @@ msgid "General Settings" msgstr "Ãltalános beállítások" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Német" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Grafikai beállítások" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Nagyobb mint" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2825,7 +2790,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Görög" @@ -2845,11 +2810,11 @@ msgstr "Zöld jobbra" msgid "Guitar" msgstr "Gitár" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hackek" @@ -2857,7 +2822,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Héber" @@ -2869,7 +2834,7 @@ msgstr "Magasság" msgid "Help" msgstr "Súgó" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2890,11 +2855,11 @@ msgstr "" msgid "Hide" msgstr "Elrejtés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Egérmutató elrejtése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2919,11 +2884,11 @@ msgstr "Gyorsbillentyű beállítások" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Magyar" @@ -2931,14 +2896,14 @@ msgstr "Magyar" msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Adatok kinyerése megkísérelve egy ismeretlen jegybÅ‘l: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2951,11 +2916,11 @@ msgstr "" "TitleID %016llx.\n" " A Dolphin valószínűleg kifagy most" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL beállítások" @@ -2975,7 +2940,7 @@ msgstr "IR érzékenysége:" msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -2983,7 +2948,7 @@ msgstr "ISO könyvtárak" msgid "ITALY" msgstr "OLASZORSZÃG" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikon" @@ -3002,7 +2967,7 @@ msgstr "" "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " "kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3013,11 +2978,11 @@ msgstr "" "PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " "szabályozást is a DSP beállításoknál. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Formátum változások kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3031,7 +2996,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3046,7 +3011,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Mentés importálása" @@ -3074,7 +3039,7 @@ msgstr "" "Az importált fájl sav kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3086,17 +3051,6 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " -"játékban.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelöletlenül." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Elindul" @@ -3126,7 +3080,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3134,11 +3088,11 @@ msgstr "SD kártya behelyezése" msgid "Insert name here.." msgstr "Ãrj be ide nevet..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" @@ -3148,42 +3102,42 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Felület beállítások" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "BelsÅ‘ LZO hiba - tömörítés sikertelen" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3192,15 +3146,15 @@ msgstr "" "BelsÅ‘ LZO hiba - kitömörítés sikertelen (%d) (%li, %li) \n" "Próbáld újratölteni a mentést" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" @@ -3213,7 +3167,7 @@ msgstr "Intró" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Érvénytelen méret(%x) vagy mágikus szó (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Érvénytelen érték!" @@ -3226,7 +3180,7 @@ msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" msgid "Invalid event type %i" msgstr "Érvénytelen esemény fajta %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Érvénytelen fájl" @@ -3241,29 +3195,29 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Olasz" @@ -3271,16 +3225,16 @@ msgstr "Olasz" msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japán" @@ -3288,7 +3242,7 @@ msgstr "Japán" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3299,7 +3253,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3308,8 +3262,8 @@ msgstr "" msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreai" @@ -3327,16 +3281,16 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Nyelv:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Az utolsó felülírt mentés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Utolsó mentett állás" @@ -3376,11 +3330,11 @@ msgstr "" "Bal/jobb kattintás további beállításokhoz.\n" "KözépsÅ‘ kattintás a törléshez." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" @@ -3388,7 +3342,7 @@ msgstr "FPS alapú korlátozás" msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" @@ -3432,20 +3386,20 @@ msgstr "Ãllás betöltése a 7. helyrÅ‘l" msgid "Load State Slot 8" msgstr "Ãllás betöltése a 8. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Ãllás betöltése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3459,15 +3413,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Folyamatágak magokhoz zárolása" @@ -3479,16 +3429,33 @@ msgstr "Napló" msgid "Log Configuration" msgstr "Napló beállítások" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Napló típus" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"A másodpercenként megjelenített képkockák számát jelzi ki az emuláció " +"sebességének méréséhez.\n" +"\n" +"Ha bizonytalan vagy, hagyd kijelöletlenül." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Napló kimenetek" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Naplózás" @@ -3496,10 +3463,6 @@ msgstr "Naplózás" msgid "Lost connection to server!" msgstr "Kapcsolat elveszett a szerverrel!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Alacsony szintű (LLE) vagy magas szintű (HLE) hang" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M gomb" @@ -3517,8 +3480,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark fájlok (*.gcs)" @@ -3548,7 +3511,7 @@ msgstr "A memóriakártyán már van mentés ehhez a játékhoz" msgid "Memcard already opened" msgstr "A memóriakártya már meg van nyitva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Memória bájt" @@ -3599,11 +3562,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3612,7 +3575,7 @@ msgstr "Egyéb beállítások" msgid "Modifier" msgstr "Változó" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3637,7 +3600,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3667,11 +3630,11 @@ msgstr "" "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " "véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3765,28 +3728,28 @@ msgstr "NP Up" msgid "Name:" msgstr "Cím:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Név:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Natív GCI fájlok (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "KövetkezÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "KövetkezÅ‘ keresés" @@ -3807,8 +3770,8 @@ msgstr "Nem találhatók sem ISO sem WAD fájlok" msgid "No banner file found for title %s" msgstr "Nem található játék kép fájl a(z) %s játékhoz" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3816,7 +3779,7 @@ msgstr "" msgid "No docking" msgstr "Nincs dokkolás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Nincs fájl betöltve" @@ -3824,7 +3787,7 @@ msgstr "Nincs fájl betöltve" msgid "No free dir index entries" msgstr "Nincs üres könyvtári jelzÅ‘szám bejegyzés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Nincs rögzített fájl" @@ -3838,20 +3801,20 @@ msgstr "%s játékhoz nem található mentési mappa" msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvég" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Nem egyenlÅ‘" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Nincs csatlakoztatva" @@ -3876,7 +3839,7 @@ msgstr "Megjegyzés" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Kódok száma:" @@ -3889,15 +3852,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk gyorsítás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Elem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Ki" @@ -3905,26 +3868,30 @@ msgstr "Ki" msgid "Offset:" msgstr "Eltolás:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Csak %d blokk szabad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Fájl megnyitása..." @@ -3942,22 +3909,14 @@ msgstr "OpenAL: nem található hang eszköz" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s eszköz nem nyitható meg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Megnyitja a hibakeresÅ‘t" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Megnyitja a naplózót" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3977,8 +3936,8 @@ msgstr "" "Jobb kattintás az összes fájl exportálásához,\n" "és az állásmentések importálásához az új memóriakártyára\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Egyéb" @@ -3994,7 +3953,7 @@ msgstr "" msgid "Output" msgstr "Kimenet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "F&elvétel visszajátszása..." @@ -4039,17 +3998,21 @@ msgstr "%i partíció" msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Szünet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" @@ -4062,10 +4025,10 @@ msgstr "Tökéletes" msgid "Perspective %d" msgstr "%d perspektíva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Indítás" @@ -4083,7 +4046,7 @@ msgstr "Indítás/Szünet" msgid "Playable" msgstr "Játszható" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Visszajátszási lehetÅ‘ségek" @@ -4091,7 +4054,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4103,23 +4066,23 @@ msgstr "Hozz elÅ‘ször létre egy perspektívát mielÅ‘tt mentenél" msgid "Plus-Minus" msgstr "Plusz - minusz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "4. port" @@ -4128,29 +4091,29 @@ msgstr "4. port" msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" @@ -4163,11 +4126,11 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "ElÅ‘zÅ‘ érték" @@ -4183,7 +4146,7 @@ msgstr "Profil" msgid "Properties" msgstr "Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Gyorsítótár ürítése" @@ -4210,7 +4173,7 @@ msgstr "R gomb" msgid "R-Analog" msgstr "Jobb analóg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4227,7 +4190,7 @@ msgstr "Hatótáv" msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Valódi" @@ -4239,7 +4202,7 @@ msgstr "Valódi Wiimote" msgid "Real Wiimotes" msgstr "Valódi Wiimote-ok" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote újracsatlakoztatás megerÅ‘sítés" @@ -4247,17 +4210,17 @@ msgstr "Wiimote újracsatlakoztatás megerÅ‘sítés" msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote újracsatlakoztatása állás betöltéskor" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Rögzítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Rögzítési infó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Rögzítési beállítások" @@ -4273,7 +4236,7 @@ msgstr "Vörös balra" msgid "Red Right" msgstr "Vörös jobbra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4288,7 +4251,7 @@ msgstr "" "Ha bizonytalan vagy, válaszd ezt: Nincs. " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Frissítés" @@ -4298,18 +4261,18 @@ msgstr "Frissítés" msgid "Refresh List" msgstr "A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4319,7 +4282,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" @@ -4329,7 +4292,7 @@ msgstr "Megjelenítés a fÅ‘ablakban" msgid "Reset" msgstr "Alapra állítás" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Eredmények" @@ -4351,33 +4314,33 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE futtatása egy dedikált folyamatágon (nem ajánlott)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Orosz" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Ãl&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Biztonságos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Mintavételezési frekvencia:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Mentés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI mentése másként..." @@ -4421,7 +4384,7 @@ msgstr "Ãllás mentés a 7. helyre" msgid "Save State Slot 8" msgstr "Ãllás mentés a 8. helyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Ãllás mentése..." @@ -4430,24 +4393,24 @@ msgstr "Ãllás mentése..." msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" @@ -4464,7 +4427,7 @@ msgstr "ISO fájlok keresése" msgid "Scanning..." msgstr "Keresés..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Pillanatkép" @@ -4472,25 +4435,25 @@ msgstr "Pillanatkép" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Csalás keresés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4505,16 +4468,16 @@ msgstr "%s rész nem található a SYSCONF fájlban" msgid "Select" msgstr "Választás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4532,23 +4495,23 @@ msgstr "Válassz importálandó mentési fájlt" msgid "Select floating windows" msgstr "Válassz lebegÅ‘ ablakokat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4570,7 +4533,7 @@ msgstr "" msgid "Selected font" msgstr "Kiválasztott betűtípus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4586,7 +4549,7 @@ msgstr "" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működÅ‘ felbontást." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4615,11 +4578,11 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4629,16 +4592,16 @@ msgstr "" msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4664,55 +4627,55 @@ msgstr "Rövid cím:" msgid "Shoulder Buttons" msgstr "Oldalsó gombok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Konzol &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Napló &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Ãllapotsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Eszközsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "FPS kijelzése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Franciaország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Olaszország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "JAP mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Korea mutatása" @@ -4720,47 +4683,47 @@ msgstr "Korea mutatása" msgid "Show Language:" msgstr "A játék nyelve:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Napló &beállítások megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PAL mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Platformok mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Tajvan mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "USA mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Wad mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "A játék leállítása elÅ‘tt megjelenik egy megerÅ‘sítÅ‘ ablak." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4771,27 +4734,39 @@ msgstr "" "Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de " "ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Az elsÅ‘ blokk megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "MentendÅ‘ megjegyzések megjelenítése" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "MentendÅ‘ blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "MentendÅ‘ ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4803,15 +4778,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "A súgó üzenet megjelenítése" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Ismeretlen mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4825,7 +4796,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" @@ -4833,19 +4804,19 @@ msgstr "Egyszerűsített kínai" msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Az EFB processzor hozzáférésének átugrása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4857,7 +4828,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4844,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "B hely" @@ -4908,11 +4879,11 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " "válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Hang beállítások" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Érvénytelen %s hang feldolgozó." @@ -4927,8 +4898,8 @@ msgid "Space" msgstr "Szóköz" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spanyol" @@ -4936,7 +4907,7 @@ msgstr "Spanyol" msgid "Speaker Volume:" msgstr "Hangszóró hangerÅ‘:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4956,10 +4927,6 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Válassz videó feldolgozót" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -4978,11 +4945,11 @@ msgstr "Normál irányító" msgid "Start" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "&NetPlay indítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Felvétel in&dítása" @@ -5004,15 +4971,15 @@ msgstr "Ãllás mentések" msgid "Stick" msgstr "Kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Leállítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5027,7 +4994,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Ablakhoz igazítás" @@ -5052,8 +5019,8 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -5061,7 +5028,7 @@ msgstr "Rendszer nyelv:" msgid "TAIWAN" msgstr "TAJVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS bemenet" @@ -5082,8 +5049,8 @@ msgstr "Tábla balra" msgid "Table Right" msgstr "Tábla jobbra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5097,15 +5064,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Teszt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textúra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5121,13 +5088,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenÅ‘rzÅ‘ összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5167,7 +5134,7 @@ msgstr "A név nem tartalmazhatja a ',' karaktert" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5184,7 +5151,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5217,15 +5184,15 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Kinézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Kinézet választáskor hiba történt" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5241,7 +5208,7 @@ msgstr "" "Ezek a beállítások felülírják a Dolphin mag beállításait.\n" "A módosítatlan opcióknál a játék a Dolphin beállításait használja." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5249,11 +5216,11 @@ msgstr "" "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " "magát az Action Replay-t." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5272,7 +5239,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5297,13 +5264,13 @@ msgstr "Küszöbérték" msgid "Tilt" msgstr "Billentés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Cím" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "eddig:" @@ -5311,18 +5278,18 @@ msgstr "eddig:" msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Hagyományos kínai" @@ -5346,7 +5313,7 @@ msgstr "" "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n" "Nem találhatóak Wiimote bt azonosítók " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Török" @@ -5371,7 +5338,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ISMERETLEN" @@ -5399,24 +5366,24 @@ msgstr "" "történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Meghatározatlan %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Ãllás betöltés törlése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Ismeretlen" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Ismeretlen DVD parancs: %08x - végzetes hiba" @@ -5443,7 +5410,7 @@ msgstr "" msgid "Up" msgstr "Fel" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Frissítés" @@ -5452,23 +5419,23 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Teljes nézet használata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "HibakezelÅ‘k használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5481,7 +5448,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5496,15 +5463,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Kellékek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Érték" @@ -5512,7 +5479,7 @@ msgstr "Érték" msgid "Value:" msgstr "Érték:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Érték:" @@ -5524,11 +5491,11 @@ msgstr "Verbosity" msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "HangerÅ‘" @@ -5543,7 +5510,7 @@ msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" msgid "WAD installation failed: error creating ticket" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5584,7 +5551,7 @@ msgstr "" "%s\n" "Akarod folytatni?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5597,7 +5564,7 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5609,7 +5576,7 @@ msgstr "" "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5621,7 +5588,7 @@ msgstr "" "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5664,7 +5631,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5672,7 +5639,7 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5680,15 +5647,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wii mentés importálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5697,7 +5664,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Fájlból olvasás nem sikerült" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5706,7 +5673,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5719,7 +5686,7 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" @@ -5727,7 +5694,7 @@ msgstr "Wiimote csatlakoztatva" msgid "Wiimote Motor" msgstr "Wiimote motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote beállítások" @@ -5751,10 +5718,10 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Folyamatban..." @@ -5790,7 +5757,7 @@ msgstr "XAudio2 iniciálási hiba: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 fÅ‘ hang létrehozási hiba: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5814,11 +5781,11 @@ msgstr "Nem zárhatod be a lapokat tartalmazó táblákat." msgid "You must choose a game!!" msgstr "Választanod kell egy játékot!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Meg kell adnod egy nevet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." @@ -5827,7 +5794,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." @@ -5855,11 +5822,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 kód nem támogatott" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero ismeretlen az emulátor számára: %08x" @@ -5869,7 +5836,7 @@ msgstr "Zero ismeretlen az emulátor számára: %08x" msgid "[ waiting ]" msgstr "[ várakozás ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5885,7 +5852,7 @@ msgstr "" msgid "[Custom]" msgstr "[Egyedi]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5904,7 +5871,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5922,7 +5889,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -5949,7 +5916,7 @@ msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." msgid "not a wii save or read failure for file header size %x" msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5958,7 +5925,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6044,6 +6011,19 @@ msgstr "| VAGY" #~ "Ennek a funkciónak a használatakor legjobb a képarányt nyújtottra " #~ "állítani." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatikusan létrehozza a mipmapeket, inkább mintsem kikódolná azokat a " +#~ "memóriából.\n" +#~ "Egy keveset növel a teljesítményen, de kisebb textúra hiányosságokat " +#~ "okozhat.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelölve." + #~ msgid "Bad gameini filename" #~ msgstr "Rossz gameini fájlnév" @@ -6110,9 +6090,24 @@ msgstr "| VAGY" #~ msgid "Danish" #~ msgstr "Dán" +#~ msgid "Disable Lighting" +#~ msgstr "Fényhatások kikapcsolása" + +#~ msgid "Disable Textures" +#~ msgstr "Textúrák kikapcsolása" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Wiimote hangszóró kikapcsolása" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Textúrák kikapcsolása.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6255,6 +6250,9 @@ msgstr "| VAGY" #~ msgid "Error opening file %s for recording" #~ msgstr "Hiba a(z) %s fájl rögzítéshez történÅ‘ megnyitása közben" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Kilépés a Dolphin emulátorból" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6267,6 +6265,9 @@ msgstr "| VAGY" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP ROM betöltése sikertelen: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Gyors mipmapek" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6315,6 +6316,16 @@ msgstr "| VAGY" #~ "Ha a játék leáll, csak Interpreter módban működik vagy ha a Dolphin " #~ "kifagy, akkor ez a beállítás javíthat a játékon." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Növeli a teljesítményt, de használatával a fényhatások eltűnnek a legtöbb " +#~ "játékban.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelöletlenül." + #~ msgid "Input Source" #~ msgstr "Bemeneti forrás" @@ -6357,6 +6368,12 @@ msgstr "| VAGY" #~ "Natív mipmapek betöltése pontosabb eljárás, de teljesítmény csökkenést " #~ "okozhat (azonban adódhatnak eltérÅ‘ tapasztalatok)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Alacsony szintű (LLE) vagy magas szintű (HLE) hang" + #~ msgid "Lua Script Console" #~ msgstr "Lua parancsfájl konzol" @@ -6392,6 +6409,12 @@ msgstr "| VAGY" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Megnyitja a hibakeresÅ‘t" + +#~ msgid "Opens the logger" +#~ msgstr "Megnyitja a naplózót" + #~ msgid "Plugins" #~ msgstr "Pluginok" @@ -6474,6 +6497,9 @@ msgstr "| VAGY" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Kijelzi a másodpercenként megjelenített képkockák számát " +#~ msgid "Show this help message" +#~ msgstr "A súgó üzenet megjelenítése" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6514,6 +6540,9 @@ msgstr "| VAGY" #~ "A többi opció rögzített felbontású a vizuális minÅ‘ség választásához " #~ "függetlenül a kijelzÅ‘ méretétÅ‘l." +#~ msgid "Specify a video backend" +#~ msgstr "Válassz videó feldolgozót" + #~ msgid "Specify an audio plugin" #~ msgstr "Válassz hang plugint" diff --git a/Languages/po/it.po b/Languages/po/it.po index a8c56ab9d2..38b130f7c2 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-04-08 20:40+0100\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (troppi per la visualizzazione)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -150,7 +150,7 @@ msgstr "%sEsporta GCI%s" msgid "%sImport GCI%s" msgstr "%sImporta GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" @@ -159,147 +159,147 @@ msgstr "%u Blocchi Liberi; %u Voci Directory Libere" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&A proposito di..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Avvia da Unità DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Punti di interruzione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Cerca ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Gestore &Trucchi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&File" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "Impostazioni &Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Aiuto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Impostazioni &Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Carica Stato di Gioco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Gestore Memcard (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Apri..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opzioni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Modalità in &Sola-lettura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Resetta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Suono" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Arresta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Strumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Visualizza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -315,27 +315,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(SCONOSCIUTO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(nessuno)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -343,7 +343,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -356,11 +356,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -369,8 +369,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Una finestra di Gioco-Online risulta già aperta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Al momento non c'è alcun gioco in esecuzione." @@ -423,7 +423,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "Scheda basata su AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Codici AR" @@ -436,7 +436,7 @@ msgstr "A proposito di Dolphin" msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -444,7 +444,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -473,7 +473,7 @@ msgstr "" "Codice Incriminato:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -481,7 +481,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Aggiunta Codice (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -490,7 +490,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Riempimento e Scorrimento (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -499,7 +499,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Scrittura Ram e Riempimento (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -508,14 +508,14 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Scrittura Al Puntatore (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Errore Action Replay: Valore non valido (%08x) in operazioni di Copia " "Memoria (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -528,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Errore Action Replay: linea codice AR non valida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay - Codice Condizionale: Dimensioni non Valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo Codice Regolare %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay - Codice Regolare %i: Sottotipo %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay - Codice Regolare 0: Sottotipo %08x (%s) non valido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adattatore:" @@ -557,11 +557,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -571,7 +571,7 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Aggiungi..." @@ -623,38 +623,38 @@ msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" @@ -662,28 +662,29 @@ msgstr "Tutti i file compressi GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "Visualizza i tasti di input letti dall'emulatore." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotropico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -697,22 +698,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Applica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabo" @@ -721,7 +722,7 @@ msgstr "Arabo" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,13 +730,13 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -743,12 +744,12 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Interfaccia Audio:" @@ -756,26 +757,26 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 #, fuzzy msgid "Auto (Window Size)" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 #, fuzzy msgid "Auto adjust Window Size" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -783,19 +784,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "Registri" @@ -804,12 +797,12 @@ msgstr "Registri" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "Interfaccia Audio:" @@ -827,7 +820,7 @@ msgstr "all'Indietro" msgid "Bad File Header" msgstr "File di Intestazione (Header) difettoso" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -844,11 +837,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -861,7 +854,7 @@ msgid "Block Allocation Table checksum failed" msgstr "" "Verifica somma di controllo della Tabella di Allocazione Blocchi non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocchi" @@ -878,7 +871,7 @@ msgid "Blue Right" msgstr "Blu Destro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Sotto" @@ -891,7 +884,7 @@ msgstr "Controlli Associati: %lu" msgid "Broken" msgstr "Corrotto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Sfoglia" @@ -899,11 +892,11 @@ msgstr "Sfoglia" msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -917,7 +910,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -930,20 +923,20 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -953,7 +946,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -962,7 +955,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annulla" @@ -978,7 +971,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -988,7 +981,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,19 +989,19 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossibile trovate il WiiMote tramite bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" @@ -1016,7 +1009,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1028,7 +1021,7 @@ msgstr "Area Centrale" msgid "Change" msgstr "Cambia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Cambia &Disco..." @@ -1041,7 +1034,7 @@ msgstr "Cambia Disco" msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1057,8 +1050,8 @@ msgstr "Cambia segno al Parametro zFar (dopo la correzione)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia segno al Parametro zNear (dopo la correzione)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "La modifica di quest'opzione non avrà alcun effetto finchè l'emulatore " @@ -1072,7 +1065,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Codice Trucco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Cerca Trucco" @@ -1084,36 +1077,36 @@ msgstr "Gestore Trucchi" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1121,7 +1114,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1129,8 +1122,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1157,22 +1150,22 @@ msgstr "" "Client disconnesso durante l'esecuzione del gioco!! La modalità di Gioco-" "Online è disabilitata. E' necessario arrestare il gioco manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Chiudi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Co&nfigura..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Codice Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Codice: " @@ -1180,7 +1173,7 @@ msgstr "Codice: " msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Note" @@ -1188,20 +1181,20 @@ msgstr "Note" msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Compressione ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configurazione" @@ -1220,17 +1213,17 @@ msgstr "Configura Controllo" msgid "Configure Pads" msgstr "Configura Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" @@ -1240,11 +1233,11 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Collega Wiimote %i" @@ -1269,7 +1262,7 @@ msgstr "Collega Wiimote 3" msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1289,7 +1282,7 @@ msgstr "Converti a GCI" msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" @@ -1303,7 +1296,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossibile creare %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Impossibile inizializzare l'interfaccia %s." @@ -1339,7 +1332,7 @@ msgstr "" "(l'impostazione dei pads mentre il gioco è in esecuzione è una funzione al " "momento non supportata)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1352,11 +1345,11 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1364,8 +1357,8 @@ msgstr "" "Impossibile inizializzare il core.\n" "Verifica la tua configurazione." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Conteggio:" @@ -1373,8 +1366,8 @@ msgstr "Conteggio:" msgid "Country:" msgstr "Paese:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Crea codice AR" @@ -1383,21 +1376,21 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Creata da KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Creata da VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" @@ -1409,11 +1402,11 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1424,7 +1417,7 @@ msgstr "" msgid "Crossfade" msgstr "Dissolvenza Incrociata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!" @@ -1441,11 +1434,11 @@ msgstr "Impostazioni Hack Proiezione Personalizzato" msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Ceco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1453,37 +1446,37 @@ msgstr "" msgid "D-Pad" msgstr "Croce Direzionale" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Origine DVD:" @@ -1495,7 +1488,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Dimensione Dati" @@ -1503,8 +1496,8 @@ msgstr "Dimensione Dati" msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "File Datel MaxDrive/Pro(*.sav)" @@ -1520,7 +1513,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1529,16 +1522,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1546,7 +1539,7 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1559,7 +1552,7 @@ msgstr "Carattere predefinito" msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Elimina Save" @@ -1568,7 +1561,7 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" @@ -1591,8 +1584,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1616,30 +1609,22 @@ msgstr "" "Falliti 'checksum' Directory\n" " e 'checksum' Directory di backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Disabilita Illuminazione" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Profondità Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Disabilita Trame" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1648,7 +1633,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1658,13 +1643,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disco" @@ -1674,11 +1652,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Errore Lettura Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Aspetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1690,20 +1668,20 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin - Configurazione Video %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Sito &Web Dolphin" @@ -1715,16 +1693,16 @@ msgstr "Configurazione Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1732,7 +1710,7 @@ msgstr "Filmati TAS Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" @@ -1773,30 +1751,30 @@ msgstr "Percussioni/Batteria" msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1806,7 +1784,7 @@ msgstr "" "Effettua il trasferimento (dumping) delle trame di gioco in User/Dump/" "Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1814,24 +1792,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Olandese" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Esci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 #, fuzzy msgid "EFB Copies" msgstr "Individua Copie EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1845,11 +1823,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Aggiornamenti di Memoria Preliminari" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Modifica" @@ -1865,7 +1843,7 @@ msgstr "Modifica Configurazione" msgid "Edit Patch" msgstr "Modifica Pacth" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" @@ -1878,16 +1856,16 @@ msgstr "Modifica..." msgid "Effect" msgstr "Effetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 #, fuzzy msgid "Embedded Frame Buffer" msgstr "Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Processo dell'Emulatore già in esecuzione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1896,7 +1874,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1918,7 +1896,7 @@ msgstr "Stato dell'Emulazione: " msgid "Enable" msgstr "Attiva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1928,7 +1906,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" @@ -1944,12 +1922,12 @@ msgstr "Attiva Unione Blocchi" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Abilita Trucchi" @@ -1957,11 +1935,11 @@ msgstr "Abilita Trucchi" msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" @@ -1969,7 +1947,7 @@ msgstr "Attiva Tasti di Scelta Rapida" msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" @@ -1978,11 +1956,11 @@ msgid "Enable MMU" msgstr "Attiva MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" @@ -1991,11 +1969,11 @@ msgstr "Attiva WideScreen" msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -2016,11 +1994,11 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Attiva pagine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2028,7 +2006,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2059,7 +2037,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2075,7 +2053,7 @@ msgstr "" "Attiva l'Unità di Gestione della Memoria (MMU), necessaria per alcuni " "giochi. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2087,13 +2065,13 @@ msgid "End" msgstr "Fine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Inglese" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Miglioramenti" @@ -2111,17 +2089,17 @@ msgstr "Voce %d/%d" msgid "Entry 1/%d" msgstr "Voce 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Errore/i" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " @@ -2162,10 +2140,6 @@ msgstr "" msgid "Execute" msgstr "Esegui" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Esci dall'Emulatore Dolphin" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Esportazione non riuscita" @@ -2179,19 +2153,19 @@ msgstr "Esporta File" msgid "Export Recording" msgstr "Esporta Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2199,7 +2173,7 @@ msgstr "Esporta tutti i salvataggi" msgid "Export failed, try again?" msgstr "Esportazione non riuscita, riprovare?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Esporta salvataggio come..." @@ -2207,7 +2181,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2244,28 +2218,28 @@ msgstr "Estrai File..." msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Estrazione..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "Lettore FIFO" @@ -2289,7 +2263,7 @@ msgstr "Impossibile 'rimanere in ascolto'!!" msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2411,34 +2385,29 @@ msgstr "Scrittura intestazione per %s non riuscita" msgid "Failed to write header for file %d" msgstr "Scrittura intestazione per il file %d non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Carica Mip Maps precalcolate" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Lettore Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Info File" @@ -2484,45 +2453,45 @@ msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forza 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Force Texture Filtering" msgstr "Forza Filtro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2535,7 +2504,7 @@ msgstr "" "Migliora la qualità delle trame (specialmente quando si utilizza una\n" "risoluzione interna elevata) ma questo provoca anomalie in alcuni giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2546,7 +2515,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2565,17 +2534,17 @@ msgstr "" msgid "Forward" msgstr "in Avanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Fotogramma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Fotogramma " @@ -2584,39 +2553,39 @@ msgstr "Fotogramma " msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Fotogramma " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Intervallo Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Visuale Libera" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francese" @@ -2624,21 +2593,21 @@ msgstr "Francese" msgid "Frets" msgstr "Tasti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Schermo Intero" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "File GCI(*.gci)" @@ -2647,11 +2616,11 @@ msgstr "File GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2679,24 +2648,28 @@ msgstr "Impostazioni di Gioco Specifiche" msgid "GameConfig" msgstr "Configurazione di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Codici Gecko" @@ -2714,8 +2687,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Generale" @@ -2725,31 +2698,31 @@ msgid "General Settings" msgstr "Impostazioni Interfaccia" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Tedesco" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: Indice troppo grande rispetto alla dimensione dell'elenco dei " "codici AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Impostazioni Video" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Maggiore di" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2760,7 +2733,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greco" @@ -2780,11 +2753,11 @@ msgstr "Verde Destro" msgid "Guitar" msgstr "Chitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Chiamata a HCI_CMD_INQUIRY, per favore segnalare!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2792,7 +2765,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Ebreo" @@ -2804,7 +2777,7 @@ msgstr "Altezza" msgid "Help" msgstr "Aiuto" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2825,11 +2798,11 @@ msgstr "" msgid "Hide" msgstr "Nascondi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Nascondi il Cursore del Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2852,11 +2825,11 @@ msgstr "Configurazione Tasti di Scelta Rapida" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungherese" @@ -2864,14 +2837,14 @@ msgstr "Ungherese" msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Tentativo di accesso ai dati da un punto di ingresso " "sconosciuto: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2884,11 +2857,11 @@ msgstr "" "IDTitolo %016llx.\n" " Dolphin, adesso, probabile vada in blocco" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -2908,7 +2881,7 @@ msgstr "Sensibilità IR:" msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Directory ISO" @@ -2916,7 +2889,7 @@ msgstr "Directory ISO" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icona" @@ -2933,7 +2906,7 @@ msgstr "" "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2944,12 +2917,12 @@ msgstr "" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " "l'impostazione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 #, fuzzy msgid "Ignore Format Changes" msgstr "Emula i Cambiamenti di Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2958,7 +2931,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2967,7 +2940,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Salva Importazione" @@ -2995,7 +2968,7 @@ msgstr "" "Il file importato possiede l'estensione .sav\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -3006,16 +2979,6 @@ msgstr "" "Disabilita nebbia. Migliora le prestazioni ma provoca difetti nei giochi che " "richiedono l'effetto nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Disabilita illuminazione. Migliora le prestazioni ma provoca la scomparasa\n" -"dell'illuminazione stessa nei giochi che la utilizzano" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "In Game" @@ -3045,7 +3008,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3053,11 +3016,11 @@ msgstr "Inserisci SD Card" msgid "Insert name here.." msgstr "Inserire il nome qui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3068,43 +3031,43 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Errore Interno LZO - compressione non riuscita" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3113,16 +3076,16 @@ msgstr "" "Errore Interno LZO - decompressione non riuscita (%d) (%li, %li) \n" "Riprovare a verificare lo stato" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Errore Interno LZO - lzo_init() non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" @@ -3135,7 +3098,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Dimensione non Valida(%x) o Password (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Valore non Valido!" @@ -3148,7 +3111,7 @@ msgstr "bat.map o voce directory non valide" msgid "Invalid event type %i" msgstr "Tipo di evento %i non valido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "File non valido" @@ -3163,29 +3126,29 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "File di registrazione non valido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Stato non valido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italiano" @@ -3193,16 +3156,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Giapponese" @@ -3210,7 +3173,7 @@ msgstr "Giapponese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3218,7 +3181,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3227,8 +3190,8 @@ msgstr "" msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3246,16 +3209,16 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Ultimo stato di gioco sovrascritto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Ultimo stato di gioco salvato" @@ -3295,11 +3258,11 @@ msgstr "" "Click sinistro/destro per altre opzioni.\n" "Click Centrale del mouse per cancellare." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3307,7 +3270,7 @@ msgstr "" msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" @@ -3352,21 +3315,21 @@ msgstr "Carica Stato di Gioco dall'Ingresso 7" msgid "Load State Slot 8" msgstr "Carica Stato di Gioco dall'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3380,15 +3343,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carica valori preimpostati dai modelli hack disponibili." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "Blocca processi ai nuclei" @@ -3401,16 +3360,28 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configurazione Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipi di Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Destinazione Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Registrazione Eventi" @@ -3418,10 +3389,6 @@ msgstr "Registrazione Eventi" msgid "Lost connection to server!" msgstr "Connessione al server persa!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Audio LLE (a basso livello) o HLE (ad alto livello)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Pulsante M" @@ -3439,8 +3406,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "File MadCatz Gameshark(*.gcs)" @@ -3470,7 +3437,7 @@ msgstr "La Memcard possiede già un salvataggio per questo titolo" msgid "Memcard already opened" msgstr "La Memcard è già aperta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Byte" @@ -3522,11 +3489,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3535,7 +3502,7 @@ msgstr "Impostazioni Varie" msgid "Modifier" msgstr "Modificatore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3556,7 +3523,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3577,11 +3544,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3675,28 +3642,28 @@ msgstr "TN Su" msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome: " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "File GCI nativi(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Pagina Successiva" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Ricerca Successiva" @@ -3717,8 +3684,8 @@ msgstr "Nessun ISO o WAD trovata" msgid "No banner file found for title %s" msgstr "Nessun file di banner trovato per il titolo %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3726,7 +3693,7 @@ msgstr "" msgid "No docking" msgstr "Nessun aggancio" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Nessun file caricato" @@ -3734,7 +3701,7 @@ msgstr "Nessun file caricato" msgid "No free dir index entries" msgstr "Nessuna voce di directory libera" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Nessun file registrato" @@ -3748,20 +3715,20 @@ msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norvegese" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Diverso" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Non collegato" @@ -3786,7 +3753,7 @@ msgstr "Avviso/i" msgid "Num Lock" msgstr "Bloc Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Numero Di Codici:" @@ -3799,15 +3766,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Accelerazione Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Oggetto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Spento" @@ -3815,26 +3782,30 @@ msgstr "Spento" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Solo %d blocchi disponibili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Apri file..." @@ -3852,23 +3823,15 @@ msgstr "OpenAL: impossibile trovare la periferica audio" msgid "OpenAL: can't open device %s" msgstr "OpenAL: impossibile aprire il dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Apri il debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Apri il logger" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3890,8 +3853,8 @@ msgstr "" "successivamente eseguire l'importazione di questi ultimi in una nuova " "memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3907,7 +3870,7 @@ msgstr "" msgid "Output" msgstr "Output" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "&Avvia Riproduzione Registrazione..." @@ -3952,17 +3915,21 @@ msgstr "Partizione %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" @@ -3976,10 +3943,10 @@ msgstr "Perfetto" msgid "Perspective %d" msgstr "Prospettiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Gioca" @@ -3997,7 +3964,7 @@ msgstr "Gioca/Pausa" msgid "Playable" msgstr "Giocabile" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opzioni di Riproduzione" @@ -4005,7 +3972,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -4017,23 +3984,23 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4:" @@ -4042,30 +4009,30 @@ msgstr "Porta 4:" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 #, fuzzy msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4078,11 +4045,11 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valore Precedente" @@ -4098,7 +4065,7 @@ msgstr "Profilo" msgid "Properties" msgstr "Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Pulisci Cache" @@ -4125,7 +4092,7 @@ msgstr "Pulsante R" msgid "R-Analog" msgstr "R-Analogico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4142,7 +4109,7 @@ msgstr "Gamma" msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Reale" @@ -4155,7 +4122,7 @@ msgstr "Wiimote Reale" msgid "Real Wiimotes" msgstr "Wiimote Reale" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Conferma Ricollegamento Wiimote" @@ -4164,17 +4131,17 @@ msgstr "Conferma Ricollegamento Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Ricollega Wiimote al caricamento di uno Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Registra" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Info di Registrazione" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opzioni di Registrazione" @@ -4190,7 +4157,7 @@ msgstr "Rosso Sinistro" msgid "Red Right" msgstr "Rosso Destro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4205,7 +4172,7 @@ msgstr "" "prestazioni." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Aggiorna" @@ -4215,18 +4182,18 @@ msgstr "Aggiorna" msgid "Refresh List" msgstr "Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Rimuovi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4236,7 +4203,7 @@ msgstr "" "Renderizza la scena in modalità vettoriale (wireframe).\n" "Utile solo per il debug." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" @@ -4246,7 +4213,7 @@ msgstr "Rendering nella finestra Principale" msgid "Reset" msgstr "Resetta" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Risultati" @@ -4268,33 +4235,33 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Esegui DSP LLE in un thread dedicato (non raccomandato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Accurata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Frequenza di Campionamento:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Salva GCI come.." @@ -4338,7 +4305,7 @@ msgstr "Salva Stato di Gioco nell'Ingresso 7" msgid "Save State Slot 8" msgstr "Salva Stato di Gioco nell'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Salva Stato di Gioco..." @@ -4347,24 +4314,24 @@ msgstr "Salva Stato di Gioco..." msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 #, fuzzy msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" @@ -4382,7 +4349,7 @@ msgstr "Ricerca ISO" msgid "Scanning..." msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Istantanea" @@ -4390,24 +4357,24 @@ msgstr "Istantanea" msgid "Scroll Lock" msgstr "Bloc Scroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Cerca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search for hex Value:" msgstr "&Cerca per un op" @@ -4423,16 +4390,16 @@ msgstr "Sezione %s non trovata in SYSCONF" msgid "Select" msgstr "Seleziona" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4450,23 +4417,23 @@ msgstr "Seleziona un file da importare" msgid "Select floating windows" msgstr "Seleziona finestre libere/mobili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4488,7 +4455,7 @@ msgstr "" msgid "Selected font" msgstr "Carattere selezionato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4498,7 +4465,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4520,11 +4487,11 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4535,16 +4502,16 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4572,56 +4539,56 @@ msgstr "Nome breve:" msgid "Shoulder Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Mostra &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Mostra Finestra di &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Mostra Barra di &Stato" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Mostra Barra degli St&rumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Mostra FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Mostra Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Mostra Tasti di Input" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Mostra Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Mostra JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Mostra Corea" @@ -4629,48 +4596,48 @@ msgstr "Mostra Corea" msgid "Show Language:" msgstr "Mostra Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Mostra &Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Mostra PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Mostra Piattaforme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Mostra Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Mostra USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Mostra Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostra una messaggio di conferma prima di arrestare un gioco." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4682,27 +4649,39 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostra commento salvato" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Mostra titolo salvato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4710,15 +4689,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra questo messaggio di aiuto" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Mostra sconosciuto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4729,7 +4704,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Cinese Semplificato" @@ -4737,21 +4712,21 @@ msgstr "Cinese Semplificato" msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4759,7 +4734,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4769,17 +4744,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Ingresso B" @@ -4799,11 +4774,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Impostazioni Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "L'interfaccia audio %s non è valida." @@ -4818,8 +4793,8 @@ msgid "Space" msgstr "Spazio" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spagnolo" @@ -4827,7 +4802,7 @@ msgstr "Spagnolo" msgid "Speaker Volume:" msgstr "Volume Altoparlante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4839,10 +4814,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Seleziona un plugin video" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -4861,11 +4832,11 @@ msgstr "Controller Standard" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Avvia Gioco-&Online" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Avvia Re&gistrazione" @@ -4887,15 +4858,15 @@ msgstr "Stati di Gioco" msgid "Stick" msgstr "Levetta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Arresta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4904,7 +4875,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Adatta a Finestra" @@ -4929,8 +4900,8 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -4938,7 +4909,7 @@ msgstr "Lingua di Sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4960,8 +4931,8 @@ msgstr "Semipiano sinistro" msgid "Table Right" msgstr "Semipiano destro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4975,16 +4946,16 @@ msgstr "" msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -5001,13 +4972,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5046,7 +5017,7 @@ msgstr "Il nome non può contenere il carattere ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5060,7 +5031,7 @@ msgstr "" "Il file di salvataggio che si sta provando a copiare ha una dimensione non " "valida" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5093,15 +5064,15 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "La selezione del Tema non era corretta" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5118,20 +5089,20 @@ msgstr "" "Per impostazione 'indeterminata' si intende che il gioco utilizza " "l'impostazione di Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni " "giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5142,7 +5113,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5170,13 +5141,13 @@ msgstr "Sensibilità" msgid "Tilt" msgstr "Inclina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Titolo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "a" @@ -5184,18 +5155,18 @@ msgstr "a" msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" @@ -5219,7 +5190,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5244,7 +5215,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "SCONOSCIUTO" @@ -5267,24 +5238,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "%i non definito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Annulla Caricamento Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Sconosciuto" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando DVD %08x sconosciuto - errore fatale" @@ -5311,7 +5282,7 @@ msgstr "" msgid "Up" msgstr "Su" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Aggiorna" @@ -5320,24 +5291,24 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5345,7 +5316,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5354,15 +5325,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilità" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valore" @@ -5370,7 +5341,7 @@ msgstr "Valore" msgid "Value:" msgstr "Valore:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valore: " @@ -5382,11 +5353,11 @@ msgstr "Verboso" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" @@ -5401,7 +5372,7 @@ msgstr "Installazione WAD non riuscita: errore nella creazione di %s" msgid "WAD installation failed: error creating ticket" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5439,7 +5410,7 @@ msgstr "" "%s\n" "Vuoi proseguire?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5453,7 +5424,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5461,7 +5432,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5469,7 +5440,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5497,7 +5468,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5505,7 +5476,7 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5513,16 +5484,16 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5531,7 +5502,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Impossibile leggere dal file" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5540,7 +5511,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5553,7 +5524,7 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Collegato" @@ -5561,7 +5532,7 @@ msgstr "Wiimote Collegato" msgid "Wiimote Motor" msgstr "Vibrazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Impostazioni Wiimote" @@ -5586,10 +5557,10 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Attività in corso..." @@ -5625,7 +5596,7 @@ msgstr "Inizializzazione XAudio2 non riuscita: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Creazione voce principale XAudio2 non riuscita: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5647,11 +5618,11 @@ msgstr "Non è possibile chiudere riquadri che hanno pagine al loro interno" msgid "You must choose a game!!" msgstr "E' necessario selezionare un gioco!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "E' richiesto l'inserimento di un nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." @@ -5659,7 +5630,7 @@ msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -5687,11 +5658,11 @@ msgstr "" msgid "ZTP hack" msgstr "Hack ZTP" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 codice non supportato" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero codice sconosciuto per dolphin: %08x" @@ -5701,7 +5672,7 @@ msgstr "Zero codice sconosciuto per dolphin: %08x" msgid "[ waiting ]" msgstr "[ attesa ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5713,7 +5684,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizzata]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5724,7 +5695,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5737,7 +5708,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5766,7 +5737,7 @@ msgstr "" "non un salvataggio wii oppure accesso non riuscito al file con dimensione " "intestazione %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5775,7 +5746,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6133,6 +6104,12 @@ msgstr "| OR" #~ msgid "Data Type" #~ msgstr "Tipo Dati" +#~ msgid "Disable Lighting" +#~ msgstr "Disabilita Illuminazione" + +#~ msgid "Disable Textures" +#~ msgstr "Disabilita Trame" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6278,6 +6255,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Errore apertura file %s per la registrazione" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Esci dall'Emulatore Dolphin" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6290,6 +6270,10 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Caricamento ROM DSP: %s non riuscito" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Carica Mip Maps precalcolate" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6357,6 +6341,16 @@ msgstr "| OR" #~ "Dolphin va in crash,\n" #~ "questa operazione potrebbe correggere il problema" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Disabilita illuminazione. Migliora le prestazioni ma provoca la " +#~ "scomparasa\n" +#~ "dell'illuminazione stessa nei giochi che la utilizzano" + #~ msgid "Input Source" #~ msgstr "Sorgente d'Ingresso" @@ -6407,6 +6401,12 @@ msgstr "| OR" #~ "Caricare le mip maps in formato nativo è il metodo più accurato e " #~ "preciso, ma ciò potrebbe anche diminuire le prestazioni." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Audio LLE (a basso livello) o HLE (ad alto livello)" + #~ msgid "Lua Script Console" #~ msgstr "Console Script Lua" @@ -6462,6 +6462,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Apri il debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Apri il logger" + #~ msgid "PPC Size" #~ msgstr "Sezione PPC" @@ -6585,6 +6591,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra il numero di fotogrammi renderizzati al secondo" +#~ msgid "Show this help message" +#~ msgstr "Mostra questo messaggio di aiuto" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6631,6 +6640,9 @@ msgstr "| OR" #~ "- Le altre opzioni a risoluzione fissa sono per una scelta visiva " #~ "qualitativamente indipendente alla dimensione del display." +#~ msgid "Specify a video backend" +#~ msgstr "Seleziona un plugin video" + #~ msgid "Specify an audio plugin" #~ msgstr "Seleziona un plugin audio" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 33c4587fb6..2411938620 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-22 06:13+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(該当数ãŒå¤šã™ãŽã¾ã™)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii ã®ISOã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -54,9 +54,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%s エクスãƒãƒ¼ãƒˆ GCI %s" msgid "%sImport GCI%s" msgstr "%s インãƒãƒ¼ãƒˆ GCI %s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空ã | %u エントリ空ã" @@ -160,147 +160,147 @@ msgstr "%u ブロック空ã | %u エントリ空ã" msgid "&& AND" msgstr "&& (...ã¨...)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "Dolphinã«ã¤ã„ã¦(&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "DVDドライブã‹ã‚‰èµ·å‹•(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "ブレークãƒã‚¤ãƒ³ãƒˆ(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "ISOファイルã®ã‚るフォルダをé¸æŠž(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "エミュレーション(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "ファイル(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "Frame Advance(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "フルスクリーン表示(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "グラフィック設定(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "ヘルプ(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "ホットキーã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "ステートロード(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "GCメモリーカードマãƒãƒ¼ã‚¸ãƒ£(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memory" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "é–‹ã(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "設定(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "一時åœæ­¢(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "プロパティ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "ゲームリストをå†æ›´æ–°(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "レジスタ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "リセット(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "サウンド(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "ツール(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "æç”»(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "表示(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "補正有効" msgid "(UNKNOWN)" msgstr "(ä¸æ˜Ž)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "オフ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 ビット" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 ビット" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 ビット" @@ -344,7 +344,7 @@ msgstr "8 ビット" msgid "" msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" @@ -357,11 +357,11 @@ msgstr "ãªã—" msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -370,8 +370,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "ãƒãƒƒãƒˆãƒ—レイウィンドウã¯ã™ã§ã«é–‹ã‹ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "ゲームã¯ç¾åœ¨ã€èµ·å‹•ã•ã‚Œã¦ã„ã¾ã›ã‚“" @@ -421,7 +421,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "Triforce基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -434,7 +434,7 @@ msgstr "Dolphinã«ã¤ã„ã¦" msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "精度：" @@ -442,7 +442,7 @@ msgstr "精度：" msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -475,14 +475,14 @@ msgstr "" "å•é¡Œã®ã‚るコード：\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Add Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -491,7 +491,7 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Fill and Slide " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -500,7 +500,7 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Ram Write And " "Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -509,12 +509,12 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay エラー: ä¸æ­£ãªå€¤ (%08x) in Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -526,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "エラー: 無効ãªã‚³ãƒ¼ãƒ‰ ライン： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: æ¡ä»¶ä»˜ãコード: ä¸æ­£ãªã‚µã‚¤ã‚º %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: ä¸æ­£ãªç¨®é¡žã®é€šå¸¸ã‚³ãƒ¼ãƒ‰ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: 通常コード %i: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: 通常コード 0: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "ビデオカード：" @@ -555,11 +555,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -569,7 +569,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "追加" @@ -615,38 +615,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)|*.gcm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)|*.iso" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" @@ -654,9 +654,10 @@ msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -670,15 +671,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "分æž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "異方性フィルタリング：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚¹ï¼š" @@ -691,15 +692,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -709,7 +710,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "アラビア語" @@ -718,7 +719,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,12 +727,12 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -739,12 +740,12 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -752,24 +753,24 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "自動 (ゲーム解åƒåº¦ã®å€æ•°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "自動 (ウィンドウサイズã«æ‹¡å¤§)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "ウィンドウサイズを自動調整" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -779,23 +780,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"ミップマップをメモリã‹ã‚‰ãƒ‡ã‚³ãƒ¼ãƒ‰ã›ãšã€è‡ªå‹•ä½œæˆã—ãŸã‚‚ã®ã‚’使用ã—ã¾ã™ã€‚\n" -"若干ã®å‹•ä½œé€Ÿåº¦å‘上ãŒæœ›ã‚ã¾ã™ãŒã€å¾®å¦™ãªæç”»ãƒã‚°ãŒç™ºç”Ÿã™ã‚‹ã“ã¨ãŒ ã‚ã‚Šã¾ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "レジスタ(&R)" @@ -804,12 +793,12 @@ msgstr "レジスタ(&R)" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "出力設定" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "æç”»API：" @@ -826,7 +815,7 @@ msgstr "後方" msgid "Bad File Header" msgstr "ファイルヘッダã®ä¸è‰¯" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "ãƒãƒŠãƒ¼" @@ -843,11 +832,11 @@ msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" msgid "Bar" msgstr "ãƒãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -859,7 +848,7 @@ msgstr "ãƒã‚¹ãƒ‰ãƒ©" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸é©åˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "ブロック数" @@ -876,7 +865,7 @@ msgid "Blue Right" msgstr "é’ - å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "下部" @@ -889,7 +878,7 @@ msgstr "コマンド数: %lu" msgid "Broken" msgstr "ダメダメ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "フォルダ追加" @@ -897,11 +886,11 @@ msgstr "フォルダ追加" msgid "Browse for a directory to add" msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" @@ -915,7 +904,7 @@ msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" msgid "Buttons" msgstr "ボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -927,19 +916,19 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -955,7 +944,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -969,7 +958,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "キャンセル" @@ -985,7 +974,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -996,7 +985,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1004,18 +993,18 @@ msgstr "" "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“。\n" "両方ã®ã‚¹ãƒ­ãƒƒãƒˆã§åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—よã†ã¨ã—ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的ãªã‚¨ãƒ©ãƒ¼" @@ -1023,7 +1012,7 @@ msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "カタルーニャ語" @@ -1036,7 +1025,7 @@ msgstr "Center" msgid "Change" msgstr "変更" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ(&D)" @@ -1049,7 +1038,7 @@ msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1067,8 +1056,8 @@ msgstr "Changes sign to zFar Parameter (after correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (after correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" @@ -1080,7 +1069,7 @@ msgstr "ãƒãƒ£ãƒƒãƒˆ" msgid "Cheat Code" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "コードサーãƒ" @@ -1092,35 +1081,35 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" msgid "Check Partition Integrity" msgstr "パーティションã®æ•´åˆæ€§ã‚’ãƒã‚§ãƒƒã‚¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "ãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1128,7 +1117,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1136,8 +1125,8 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" @@ -1164,22 +1153,22 @@ msgstr "" "クライアントã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼ãƒãƒƒãƒˆãƒ—レイã¯ç¾åœ¨ç„¡åŠ¹ã§ã™ã€‚ゲームをåœ" "æ­¢ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "é–‰ã˜ã‚‹" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Dolphin本体ã®è¨­å®š(&N)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "コードã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "コード：" @@ -1187,7 +1176,7 @@ msgstr "コード：" msgid "Command" msgstr "Command" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "コメント" @@ -1195,20 +1184,20 @@ msgstr "コメント" msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "本体設定" @@ -1227,17 +1216,17 @@ msgstr "コントロールã®è¨­å®š" msgid "Configure Pads" msgstr "パッド設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" @@ -1246,11 +1235,11 @@ msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "%iPã®Wii リモコンを接続" @@ -1275,7 +1264,7 @@ msgstr "3Pã®Wii リモコンを接続" msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "接続中..." @@ -1295,7 +1284,7 @@ msgstr "GCIファイルã«å¤‰æ›" msgid "Copy failed" msgstr "コピーã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" @@ -1309,7 +1298,7 @@ msgstr "コア" msgid "Could not create %s" msgstr "%s を作æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Could not initialize backend %s." @@ -1343,7 +1332,7 @@ msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" "(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1356,11 +1345,11 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1368,8 +1357,8 @@ msgstr "" "コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸ\n" "設定を確èªã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "該当：" @@ -1377,8 +1366,8 @@ msgstr "該当：" msgid "Country:" msgstr "発売国" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "アクションリプレイコードを作æˆ" @@ -1387,21 +1376,21 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" @@ -1413,11 +1402,11 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "クロッピング" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1432,7 +1421,7 @@ msgstr "" msgid "Crossfade" msgstr "クロスフェーダー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" @@ -1449,11 +1438,11 @@ msgstr "Custom Projection Hack Settings" msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1461,36 +1450,36 @@ msgstr "D" msgid "D-Pad" msgstr "å字キー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVDルート" @@ -1502,7 +1491,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "データサイズ" @@ -1510,8 +1499,8 @@ msgstr "データサイズ" msgid "Date:" msgstr "発売日" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)" @@ -1527,7 +1516,7 @@ msgstr "'éŠã³'ã®èª¿æ•´" msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1535,16 +1524,16 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ISOファイルを解å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "解å‡ä¸­..." @@ -1552,7 +1541,7 @@ msgstr "解å‡ä¸­..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1565,7 +1554,7 @@ msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" @@ -1574,7 +1563,7 @@ msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "説明" @@ -1597,8 +1586,8 @@ msgstr "" msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1622,28 +1611,20 @@ msgstr "" "ディレクトリã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—\n" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Disable Lighting" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Disable Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1657,7 +1638,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1672,16 +1653,6 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"テクスãƒãƒ£ãƒªãƒ³ã‚°ã‚’無効化ã—ã¾ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disc" @@ -1691,11 +1662,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "ディスク読ã¿å–りエラー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "表示設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1709,20 +1680,20 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s グラフィック設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin Webサイト(&W)" @@ -1734,16 +1705,16 @@ msgstr "Dolphinã®è¨­å®š" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1751,7 +1722,7 @@ msgstr "Dolphin TAS ムービー (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Wiiリモコンã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状æ³(&G)" @@ -1793,23 +1764,23 @@ msgstr "ドラムコントローラ" msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1820,7 +1791,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1830,7 +1801,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1841,23 +1812,23 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "オランダ語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "終了" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1870,11 +1841,11 @@ msgstr "" msgid "EUROPE" msgstr "欧州" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "編集" @@ -1890,7 +1861,7 @@ msgstr "iniを編集" msgid "Edit Patch" msgstr "パッãƒã‚’編集" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1903,15 +1874,15 @@ msgstr "編集" msgid "Effect" msgstr "エフェクト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "エミュレーションスレッドã¯ã™ã§ã«ç¨¼åƒä¸­ã§ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1925,7 +1896,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Virtual】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1954,7 +1925,7 @@ msgstr "動作状æ³ï¼š" msgid "Enable" msgstr "有効" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1970,7 +1941,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" @@ -1986,11 +1957,11 @@ msgstr "Enable Block Merging" msgid "Enable Bounding Box Calculation" msgstr "Enable Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Enable Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" @@ -1998,11 +1969,11 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "ホットキーを使用" @@ -2010,7 +1981,7 @@ msgstr "ホットキーを使用" msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" @@ -2019,11 +1990,11 @@ msgid "Enable MMU" msgstr "Enable MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" @@ -2031,11 +2002,11 @@ msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2057,11 +2028,11 @@ msgstr "" "ディスクã®èª­ã¿å–り速度をå‘上ã•ã›ã¾ã™ã€‚å¿…è¦ã«ãªã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã¯ã‚ãšã‹ã§ã™ [有効ï¼" "ロード時間短縮ï¼ç„¡åŠ¹ï¼äº’æ›æ€§ãƒ»å®‰å®šæ€§é‡è¦–]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "ページ分ã‘ã—ã¦è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2073,7 +2044,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2106,7 +2077,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2126,7 +2097,7 @@ msgstr "" "メモリ管ç†æ©Ÿæ§‹ã‚’有効ã«ã—ã¾ã™ã€‚ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã§å¿…è¦ã§ã™ [有効ï¼äº’æ›æ€§ãƒ»å®‰å®š" "性é‡è¦–ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2141,13 +2112,13 @@ msgid "End" msgstr "End" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "英語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "画質å‘上ã®è¨­å®š" @@ -2165,17 +2136,17 @@ msgstr "エントリ %d/%d" msgid "Entry 1/%d" msgstr "エントリ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" @@ -2213,10 +2184,6 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphinを終了" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" @@ -2230,19 +2197,19 @@ msgstr "ファイルを抽出" msgid "Export Recording" msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" @@ -2250,7 +2217,7 @@ msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" msgid "Export failed, try again?" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚リトライã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" @@ -2258,7 +2225,7 @@ msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2294,28 +2261,28 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" msgid "Extract Partition..." msgstr "ã“ã® Partition を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "抽出中" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO ãƒã‚¤ãƒˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO プレーヤー" @@ -2339,7 +2306,7 @@ msgstr "Listenã«å¤±æ•—ï¼" msgid "Failed to download codes." msgstr "コードã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2454,23 +2421,19 @@ msgstr "Failed to write header for %s" msgid "Failed to write header for file %d" msgstr "Failed to write header for file %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "ペルシア語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Fast Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2478,11 +2441,11 @@ msgstr "" "致命的ãªdesyncãŒç™ºç”Ÿã—ãŸãŸã‚å†ç”Ÿã‚’中止ã—ã¾ã™ã€‚ (Error in PlayWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "ファイル情報" @@ -2528,43 +2491,43 @@ msgstr "FileIO: Unknown open mode : 0x%02x" msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "次ã¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "å‰ã¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "ブロック開始ä½ç½®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Force 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Force 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Force Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2541,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2553,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2613,17 +2576,17 @@ msgstr "" msgid "Forward" msgstr "å‰æ–¹" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "フレーム" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "フレーム" @@ -2632,37 +2595,37 @@ msgstr "フレーム" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "フレームã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "フレームã®ç¯„囲" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "フレームリミット：" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "フリールック" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "フランス語" @@ -2670,20 +2633,20 @@ msgstr "フランス語" msgid "Frets" msgstr "フレットボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "開始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "全画é¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "フルスクリーン表示時解åƒåº¦ï¼š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI ファイル (*.gci)" @@ -2691,11 +2654,11 @@ msgstr "GCI ファイル (*.gci)" msgid "GCMic Configuration" msgstr "マイクã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2723,24 +2686,28 @@ msgstr "固有設定" msgid "GameConfig" msgstr "ゲーム設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "ゲームキューブã®å…¥åŠ›è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Geckoコード" @@ -2760,8 +2727,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "一般" @@ -2770,30 +2737,30 @@ msgid "General Settings" msgstr "一般" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "ドイツ語" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾ã™ %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "ビデオ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "æç”»ã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "より大ãã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2809,7 +2776,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "ギリシア語" @@ -2829,11 +2796,11 @@ msgstr "ç·‘ - å³" msgid "Guitar" msgstr "ギターコントローラ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is called, please report!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "高速化(Hacks)" @@ -2841,7 +2808,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "ヘブライ語" @@ -2853,7 +2820,7 @@ msgstr "範囲(縦)" msgid "Help" msgstr "ヘルプ" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2874,11 +2841,11 @@ msgstr "" msgid "Hide" msgstr "éš ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "マウスカーソルを隠ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2904,11 +2871,11 @@ msgstr "ホットキーã®è¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" @@ -2916,12 +2883,12 @@ msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2934,11 +2901,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL設定" @@ -2958,7 +2925,7 @@ msgstr "感度" msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -2966,7 +2933,7 @@ msgstr "フォルダ一覧" msgid "ITALY" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "アイコン" @@ -2983,7 +2950,7 @@ msgid "" msgstr "" "FPSãŒå®‰å®šã—ãªã„ゲームã§åŠ¹æžœãŒã‚ã‚Šã¾ã™ [有効ï¼äº’æ›æ€§å‘上ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2993,11 +2960,11 @@ msgstr "" "実機(NTSC:60ï¼PAL:50)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignore Format Changes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3011,7 +2978,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3025,7 +2992,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "セーブデータをインãƒãƒ¼ãƒˆ" @@ -3053,7 +3020,7 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'sav'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3066,18 +3033,6 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"å…‰æºå‡¦ç†ã‚’無効化ã—ã¾ã™ã€‚\n" -"動作速度ãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€å¤šãã®ã‚¿ã‚¤ãƒˆãƒ«ã§ç”»é¢ãŒæ­£ã—ã表示ã•ã‚Œãªã ãªã‚Šã¾" -"ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "ソコソコ" @@ -3107,7 +3062,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3115,11 +3070,11 @@ msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" msgid "Insert name here.." msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3130,23 +3085,23 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "完了" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "ãƒã‚§ãƒƒã‚¯çµ‚了。整åˆæ€§ã«å•é¡Œã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3155,19 +3110,19 @@ msgstr "" "パーティション %d ã«å•é¡ŒãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ データãŒç ´æã—ã¦ã„ã‚‹ã‹ã€æ­£ã—ãパッ" "ãƒãŒå½“ã¦ã‚‰ã‚Œã¦ã„ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Internal LZO Error - 圧縮ã«å¤±æ•—" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3176,15 +3131,15 @@ msgstr "" "Internal LZO Error - 復元ã«å¤±æ•— (%d) (%li, %li) \n" "ã‚‚ã†ä¸€åº¦ãƒ­ãƒ¼ãƒ‰ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Internal LZO Error - lzo_init() failed" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" @@ -3197,7 +3152,7 @@ msgstr "イントロ" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Invalid Size(%x) or Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "無効ãªå€¤ã§ã™ï¼" @@ -3210,7 +3165,7 @@ msgstr "Invalid bat.map or dir entry" msgid "Invalid event type %i" msgstr "Invalid event type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "ä¸æ­£ãªãƒ•ã‚¡ã‚¤ãƒ«" @@ -3225,29 +3180,29 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "イタリア語" @@ -3255,16 +3210,16 @@ msgstr "イタリア語" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日本語" @@ -3272,7 +3227,7 @@ msgstr "日本語" msgid "KOREA" msgstr "韓国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3283,7 +3238,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "最å‰é¢ã«è¡¨ç¤º" @@ -3292,8 +3247,8 @@ msgstr "最å‰é¢ã«è¡¨ç¤º" msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韓国語" @@ -3311,16 +3266,16 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "GUI言語：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "最後ã«ä¸Šæ›¸ãã—ãŸã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" @@ -3360,11 +3315,11 @@ msgstr "" "å·¦ã‹å³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" "中クリックã§æ¶ˆåŽ»ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" @@ -3372,7 +3327,7 @@ msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" @@ -3416,20 +3371,20 @@ msgstr "ステートロード - スロット 7" msgid "Load State Slot 8" msgstr "ステートロード - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3444,15 +3399,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "特定ã®ã‚²ãƒ¼ãƒ å‘ã‘ã®è¨­å®šå€¤ã‚’読ã¿è¾¼ã¿ã¾ã™" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" @@ -3464,16 +3415,33 @@ msgstr "ログ" msgid "Log Configuration" msgstr "ログã®è¨­å®š" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"エミュレーション速度ã®æŒ‡æ¨™ã¨ã—ã¦ã€ç”»é¢å·¦ä¸Šã«æ¯Žç§’レンダリングã•ã‚ŒãŸ フレーム数" +"を表示ã—ã¾ã™ã€‚\n" +"\n" +"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "ログ出力先" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "ログ" @@ -3481,10 +3449,6 @@ msgstr "ログ" msgid "Lost connection to server!" msgstr "サーãƒãƒ¼ã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Low level (LLE) or high level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3502,8 +3466,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark セーブファイル(*.gcs)" @@ -3533,7 +3497,7 @@ msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®ã‚»ãƒ¼ãƒ–データã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™" msgid "Memcard already opened" msgstr "ã™ã§ã«é–‹ã„ã¦ã„ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" @@ -3582,11 +3546,11 @@ msgstr "マイク" msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3595,7 +3559,7 @@ msgstr "ãã®ä»–ã®è¨­å®š" msgid "Modifier" msgstr "感度変更" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3620,7 +3584,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3650,11 +3614,11 @@ msgstr "" "Wii リモコン内蔵ã®ã‚¹ãƒ”ーカーを無効化ã—ã¾ã™ã€‚実機Wii リモコン使用中ランダムã«" "切断ã•ã‚Œã‚‹å•é¡Œã‚’解消ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3748,28 +3712,28 @@ msgstr "NP Up" msgid "Name:" msgstr "åå‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "åå‰ï¼š " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ãƒã‚¤ãƒ†ã‚£ãƒ– GCI ファイル(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "æ–°è¦æ¤œç´¢" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "次ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "続ã‘ã¦æ¤œç´¢" @@ -3790,8 +3754,8 @@ msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" msgid "No banner file found for title %s" msgstr "%s ã®ãƒãƒŠãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "説明ãªã—" @@ -3799,7 +3763,7 @@ msgstr "説明ãªã—" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" @@ -3807,7 +3771,7 @@ msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" msgid "No free dir index entries" msgstr "空ãエントリãŒã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "録画ファイルãªã—" @@ -3821,20 +3785,20 @@ msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "未確èª" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "未接続" @@ -3859,7 +3823,7 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "行数：" @@ -3872,15 +3836,15 @@ msgstr "ヌンãƒãƒ£ã‚¯" msgid "Nunchuk Acceleration" msgstr "ヌンãƒãƒ£ã‚¯ã®åŠ é€Ÿåº¦" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "オブジェクト" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "オフ" @@ -3888,26 +3852,30 @@ msgstr "オフ" msgid "Offset:" msgstr "オフセット値：" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "é–‹ãファイルをé¸æŠž" @@ -3925,22 +3893,14 @@ msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" msgid "OpenAL: can't open device %s" msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "デãƒãƒƒã‚¬ã‚’é–‹ã" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "ログ画é¢ã‚’é–‹ã" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3960,8 +3920,8 @@ msgstr "" "å³ã‚¯ãƒªãƒƒã‚¯ã‹ã‚‰ã€Žå…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆã€ã‚’実行ã—ã¦ã€\n" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "ãã®ä»–" @@ -3977,7 +3937,7 @@ msgstr "" msgid "Output" msgstr "出力" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "録画ファイルをå†ç”Ÿ(&L)" @@ -4022,17 +3982,21 @@ msgstr "パーティション %i" msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "一時åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" @@ -4045,10 +4009,10 @@ msgstr "カンペキï¼" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "開始" @@ -4066,7 +4030,7 @@ msgstr "開始ï¼ä¸€æ™‚åœæ­¢" msgid "Playable" msgstr "サクサク" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "å†ç”Ÿã‚ªãƒ—ション" @@ -4074,7 +4038,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "確èª" @@ -4086,23 +4050,23 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" @@ -4111,29 +4075,29 @@ msgstr "ãƒãƒ¼ãƒˆ 4" msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4146,11 +4110,11 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "ã“ã“よりå‰" @@ -4166,7 +4130,7 @@ msgstr "プロファイル" msgid "Properties" msgstr "プロパティ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "キャッシュã®æ•´é “を実行" @@ -4193,7 +4157,7 @@ msgstr "Rボタン" msgid "R-Analog" msgstr "R (åŠæŠ¼ã—)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4210,7 +4174,7 @@ msgstr "å¼·ã•" msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Real" @@ -4222,7 +4186,7 @@ msgstr "実機Wii リモコンを接続" msgid "Real Wiimotes" msgstr "実機Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Wii リモコンã®å†æŽ¥ç¶š" @@ -4230,17 +4194,17 @@ msgstr "Wii リモコンã®å†æŽ¥ç¶š" msgid "Reconnect Wiimote on State Loading" msgstr "ステートロード時ã«Wii リモコンをå†æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "録画" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "録画情報" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "録画オプション" @@ -4256,7 +4220,7 @@ msgstr "赤 - å·¦" msgid "Red Right" msgstr "赤 - å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4272,7 +4236,7 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ãªã—】ã®ã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "å†æ›´æ–°" @@ -4282,18 +4246,18 @@ msgstr "å†æ›´æ–°" msgid "Refresh List" msgstr "ゲームリストをå†æ›´æ–°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "削除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4303,7 +4267,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" @@ -4313,7 +4277,7 @@ msgstr "メインウィンドウ部分ã«æç”»" msgid "Reset" msgstr "åˆæœŸåŒ–" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "çµæžœè¡¨ç¤ºæ¬„" @@ -4335,33 +4299,33 @@ msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEã®å‡¦ç†ã‚’別スレッドã«åˆ†é›¢ã—ã¦è¡Œã„ã¾ã™ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "ロシア語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Safe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "サンプルレート" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "ä¿å­˜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "セーブデータã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4405,7 +4369,7 @@ msgstr "ステートセーブ - スロット 7" msgid "Save State Slot 8" msgstr "ステートセーブ - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" @@ -4414,24 +4378,24 @@ msgstr "ファイルã¨ã—ã¦ä¿å­˜" msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" @@ -4448,7 +4412,7 @@ msgstr "確èªä¸­..." msgid "Scanning..." msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ç”»é¢æ’®å½±" @@ -4456,23 +4420,23 @@ msgstr "ç”»é¢æ’®å½±" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "検索" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "サブフォルダも検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "ç¾åœ¨ã®ã‚ªãƒ–ジェクトを検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "値を検索" @@ -4487,16 +4451,16 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4514,23 +4478,23 @@ msgstr "インãƒãƒ¼ãƒˆã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4552,7 +4516,7 @@ msgstr "" msgid "Selected font" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ³ãƒˆ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4568,7 +4532,7 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã®è§£åƒåº¦ã¨åŒã˜ã‚‚ã®ã‚’ã€\n" "ã‚‚ã—ãã¯ã€æ­£å¸¸ã«å‹•ä½œã™ã‚‹ä¸€ç•ªé«˜ã„解åƒåº¦ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4596,11 +4560,11 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" @@ -4609,16 +4573,16 @@ msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒ msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定ã¨ã—ã¦è¨­å®š" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4645,55 +4609,55 @@ msgstr "通称" msgid "Shoulder Buttons" msgstr "LRアナログ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "コンソール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "ログを表示(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "ステータスãƒãƒ¼(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "ツールãƒãƒ¼(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "FPSを表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "フランス" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "キー入力を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "韓国" @@ -4701,47 +4665,47 @@ msgstr "韓国" msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "ログã®è¨­å®šã‚’表示(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PALè¦æ ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "統計情報を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "アメリカåˆè¡†å›½" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "WAD(Wii ウェア)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ゲームåœæ­¢å‰ã«ç¢ºèªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4751,27 +4715,39 @@ msgstr "" "無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラーをプレイ中ã«è¡¨ç¤ºã•ã›ãšã«ã™ã¿ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥" "時ã«ã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "コメントを表示" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "タイトルを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4783,15 +4759,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4805,7 +4777,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "簡体字中国語" @@ -4813,19 +4785,19 @@ msgstr "簡体字中国語" msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4837,7 +4809,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4854,17 +4826,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "スロットB" @@ -4887,11 +4859,11 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "サウンド設定" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "サウンドAPI %s ã¯ç„¡åŠ¹ã§ã™ã€‚" @@ -4906,8 +4878,8 @@ msgid "Space" msgstr "Space" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "スペイン語" @@ -4915,7 +4887,7 @@ msgstr "スペイン語" msgid "Speaker Volume:" msgstr "リモコンスピーカーã®éŸ³é‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4935,10 +4907,6 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x Native】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "ビデオ出力APIを指定" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -4957,11 +4925,11 @@ msgstr "標準コントローラ" msgid "Start" msgstr "スタート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "ãƒãƒƒãƒˆãƒ—レイを開始(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "録画を開始(&C)" @@ -4983,15 +4951,15 @@ msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" msgid "Stick" msgstr "スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5005,7 +4973,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "ウィンドウã«åˆã‚ã›ã‚‹" @@ -5030,8 +4998,8 @@ msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" @@ -5039,7 +5007,7 @@ msgstr "システムã®è¨€èªžï¼š" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Input" @@ -5060,8 +5028,8 @@ msgstr "左テーブル" msgid "Table Right" msgstr "å³ãƒ†ãƒ¼ãƒ–ル" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5075,15 +5043,15 @@ msgstr "タルコンガ" msgid "Test" msgstr "テスト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" @@ -5099,13 +5067,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5146,7 +5114,7 @@ msgstr "',' ã‚’å«ã‚€åå‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5162,7 +5130,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "コピーã—よã†ã¨ã—ã¦ã„るセーブファイルã®ã‚µã‚¤ã‚ºãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5195,15 +5163,15 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "テーマ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5221,7 +5189,7 @@ msgstr "" "　　 本体設定ã§ãƒ‡ãƒ¥ã‚¢ãƒ«ã‚³ã‚¢å‡¦ç†ã‚’有効化ã—ã¦ã„ã‚‹å ´åˆã§ã‚‚ã€ã“ã®ã‚²ãƒ¼ãƒ ã®ã¿ã‚·ãƒ³ã‚°" "ルコア動作ãŒå¯èƒ½" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5229,13 +5197,13 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" "ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5254,7 +5222,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5278,13 +5246,13 @@ msgstr "ã—ãã„値" msgid "Tilt" msgstr "傾ã" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "タイトル" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "終了" @@ -5292,18 +5260,18 @@ msgstr "終了" msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" @@ -5327,7 +5295,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "トルコ語" @@ -5352,7 +5320,7 @@ msgstr "UDPã§æŽ¥ç¶š" msgid "UNKNOWN" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "UNKNOWN_%02X" @@ -5380,24 +5348,24 @@ msgstr "" "èªã—ã¦ä¸‹ã•ã„。\n" "ã“ã®è¡Œã‚’無視ã—ã¦è§£æžã‚’続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "未定義 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "フィルタ無ã—" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Unknown DVD command %08x - fatal error" @@ -5422,7 +5390,7 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" msgid "Up" msgstr "Up" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "å†å–å¾—" @@ -5431,23 +5399,23 @@ msgstr "å†å–å¾—" msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "フルスクリーンã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5459,7 +5427,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5474,15 +5442,15 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "ユーティリティ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "åž‚ç›´åŒæœŸ (V-Sync)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "値" @@ -5490,7 +5458,7 @@ msgstr "値" msgid "Value:" msgstr "値：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "値：" @@ -5502,11 +5470,11 @@ msgstr "Verbosityモード" msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" @@ -5520,7 +5488,7 @@ msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: %s 作æˆã‚¨ãƒ©ãƒ¼" msgid "WAD installation failed: error creating ticket" msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: error creating ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5562,7 +5530,7 @@ msgstr "" "%s\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5576,7 +5544,7 @@ msgstr "" "\n" "続ã‘ã¦ã‚‚ã„ã„ ?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, fuzzy, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5587,7 +5555,7 @@ msgstr "" "> %u)。作業を続行ã™ã‚‹å‰ã«ã€ä»–ã®ã‚»ãƒ¼ãƒ–をロードã€ã¾ãŸã¯èª­ã¿å–り専用モードをオフ" "ã«ã—ã¦ã“ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5599,7 +5567,7 @@ msgstr "" "ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ç¶šã‘ã‚‹ã¨ã€ãŠãらãDesyncã—ã¾" "ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5640,7 +5608,7 @@ msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5648,7 +5616,7 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5656,15 +5624,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NANDルート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5673,7 +5641,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ファイルã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "入力(Wii)" @@ -5682,7 +5650,7 @@ msgstr "入力(Wii)" msgid "Wiimote %i" msgstr "Wii リモコン %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5695,7 +5663,7 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" @@ -5703,7 +5671,7 @@ msgstr "Wii リモコン接続中" msgid "Wiimote Motor" msgstr "Wii リモコンã®æŒ¯å‹•ã‚’有効化" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wii リモコンã®è¨­å®šã‚’è¡Œã„ã¾ã™" @@ -5727,10 +5695,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "動作中..." @@ -5765,7 +5733,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "XF reg" @@ -5790,11 +5758,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "ゲームãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "åå‰ãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—ã¦ãã ã•ã„。" @@ -5802,7 +5770,7 @@ msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—㦠msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -5829,11 +5797,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "03コードã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" @@ -5843,7 +5811,7 @@ msgstr "Zero code unknown to dolphin: %08x" msgid "[ waiting ]" msgstr "[ 入力を待機... ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5859,7 +5827,7 @@ msgstr "" msgid "[Custom]" msgstr "[ カスタム設定 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5877,7 +5845,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5895,7 +5863,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5923,7 +5891,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "Wii ã®ã‚»ãƒ¼ãƒ–データã§ã¯ãªã„ã‹ã€ãƒ˜ãƒƒãƒ€ã‚µã‚¤ã‚ºãŒ %x ã§ã‚ã‚‹ãŸã‚読ã¿å–ã‚Šã«å¤±æ•— " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "　" @@ -5932,7 +5900,7 @@ msgstr "　" msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6031,6 +5999,18 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "ã“ã®ã‚ªãƒ—ションã¯æ画設定ã®ã€ã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”】を『ウィンドウã«åˆã‚ã›ã‚‹ã€ã«è¨­å®š" #~ "ã—ã¦ä½¿ç”¨ã™ã‚‹ã“ã¨ã‚’オススメã—ã¾ã™" +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "ミップマップをメモリã‹ã‚‰ãƒ‡ã‚³ãƒ¼ãƒ‰ã›ãšã€è‡ªå‹•ä½œæˆã—ãŸã‚‚ã®ã‚’使用ã—ã¾ã™ã€‚\n" +#~ "若干ã®å‹•ä½œé€Ÿåº¦å‘上ãŒæœ›ã‚ã¾ã™ãŒã€å¾®å¦™ãªæç”»ãƒã‚°ãŒç™ºç”Ÿã™ã‚‹ã“ã¨ãŒ ã‚ã‚Šã¾" +#~ "ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" + #~ msgid "Bleach Versus Crusade" #~ msgstr "BLEACH ãƒãƒ¼ã‚µã‚¹ãƒ»ã‚¯ãƒ«ã‚»ã‚¤ãƒ‰ - " @@ -6091,9 +6071,24 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Danish" #~ msgstr "デンマーク語" +#~ msgid "Disable Lighting" +#~ msgstr "Disable Lighting" + +#~ msgid "Disable Textures" +#~ msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Wii リモコンスピーカー無効 (Disable Wiimote Speaker)" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "テクスãƒãƒ£ãƒªãƒ³ã‚°ã‚’無効化ã—ã¾ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6211,9 +6206,15 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "%s プラグインã®èª­ã¿è¾¼ã¿ã«å¤±æ•—： ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。å†é¸æŠžã—ã¦ãã ã•" #~ "ã„" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphinを終了" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSPロム (%s) ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + #~ msgid "Force Bi/Trilinear Filtering" #~ msgstr "Force Bi/Trilinear Filtering" @@ -6245,6 +6246,17 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgstr "" #~ "動作中ã¯ãƒžã‚¦ã‚¹ã‚«ãƒ¼ã‚½ãƒ«ã‚’表示ã—ãªã„よã†ã«ã—ã¾ã™ã€‚（フォーカスãŒã‚る時ã®ã¿ï¼‰" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "å…‰æºå‡¦ç†ã‚’無効化ã—ã¾ã™ã€‚\n" +#~ "動作速度ãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€å¤šãã®ã‚¿ã‚¤ãƒˆãƒ«ã§ç”»é¢ãŒæ­£ã—ã表示ã•ã‚Œãªã ãªã‚Šã¾" +#~ "ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" + #~ msgid "Input Source" #~ msgstr "入力デãƒã‚¤ã‚¹" @@ -6279,6 +6291,12 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "より正確ãªå‹•ä½œãŒæœŸå¾…ã§ãã¾ã™ãŒã€ 速度低下を引ãèµ·ã“ã™ã“ã¨ã‚‚ã‚ã‚Šã¾ã™(タイト" #~ "ルã¨ç’°å¢ƒã«ã‚ˆã‚Šå·¦å³ã•ã‚Œã‚‹)" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Low level (LLE) or high level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Luaコンソール" @@ -6314,6 +6332,12 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "デãƒãƒƒã‚¬ã‚’é–‹ã" + +#~ msgid "Opens the logger" +#~ msgstr "ログ画é¢ã‚’é–‹ã" + #~ msgid "Plugins" #~ msgstr "プラグイン" @@ -6391,6 +6415,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Show the number of frames rendered per second." #~ msgstr "ç”»é¢å·¦ä¸Šã«FPSを表示ã—ã¾ã™" +#~ msgid "Show this help message" +#~ msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6428,6 +6455,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ "ãŒå¯èƒ½ã§ã™\n" #~ "ãã®ä»–ã®ã‚ªãƒ—ションã¯è¡¨ç¤ºè§£åƒåº¦ã«é–¢ä¿‚ãªã固定ã•ã‚ŒãŸå€çŽ‡ã§å‡ºåŠ›ã™ã‚‹ã‚‚ã®ã§ã™" +#~ msgid "Specify a video backend" +#~ msgstr "ビデオ出力APIを指定" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "全画é¢è¡¨ç¤ºã§é–‹å§‹" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index ce10509d26..d362fd4f58 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-01-19 11:47+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Korean\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (í‘œì‹œí•˜ê¸°ì— ë„ˆë¬´ 많ì€)" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -55,9 +55,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%sGCI 내보내기%s" msgid "%sImport GCI%s" msgstr "%sGCI 가져오기%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" @@ -160,147 +160,147 @@ msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "ëŒí•€ì— 대해(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "DVD ë“œë¼ì´ë¸Œì—ì„œ 부트(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "브레ì´í¬í¬ì¸íŠ¸(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "ISO í´ë”íƒìƒ‰(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "치트 매니저(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "ì—뮬레ì´ì…˜(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "파ì¼(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "프레임 진행(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "전체화면(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "그래픽 설정(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "ë„움(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "단축키 설정(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "ìƒíƒœ 로드(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "메모리 ì¹´ë“œ 매니저(GC) (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "메모리(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "열기(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "옵션(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "ì¼ì‹œì •ì§€(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "ì†ì„±(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "ê²Œìž„ëª©ë¡ ìƒˆë¡œ 고침(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "레지스터들(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "리셋(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "사운드(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "중지(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "ë„구(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "비디오(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "보기(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "위키(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "(-)+z근거리" msgid "(UNKNOWN)" msgstr "(알려지지 ì•ŠìŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(ë”)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 비트" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 비트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D 비전" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 비트" @@ -344,7 +344,7 @@ msgstr "8 비트" msgid "" msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" @@ -357,11 +357,11 @@ msgstr "<ì—†ìŒ>" msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<시스템>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -370,8 +370,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "ë„·í”Œë ˆì´ ìœˆë„ìš°ê°€ ì´ë¯¸ 열려있습니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "현재 ê²Œìž„ì´ êµ¬ë™ë˜ê³  있지 않습니다." @@ -422,7 +422,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-기반보드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR 코드" @@ -435,7 +435,7 @@ msgstr "ëŒí•€ì— 대해" msgid "Acceleration" msgstr "ê°€ì†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "정확성:" @@ -443,7 +443,7 @@ msgstr "정확성:" msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -476,14 +476,14 @@ msgstr "" "ë²”ì¸ ì½”ë“œ:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 코드 추가 (%s)ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -492,7 +492,7 @@ msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 채우기와 슬ë¼ì´ë“œ(%s)" "ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -501,7 +501,7 @@ msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 램 쓰기와 채우기 (%s)" "ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -509,12 +509,12 @@ msgid "" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) í¬ì¸í„° (%s)ì— ì“°ê¸°ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x), 메모리 복사 (%s)ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -526,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© AR 코드 ë¼ì¸: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¡°ê±´ì  ì½”ë“œ: 비ì í•© í¬ê¸° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: 비ì í•© ì¼ë°˜ 코드 타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 %i: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 0: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "어댑터:" @@ -555,11 +555,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "패치 추가" @@ -569,7 +569,7 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "추가..." @@ -617,38 +617,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "고급 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" @@ -656,9 +656,10 @@ msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -672,15 +673,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "위모트 타ì´ë° 대안" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "비등방성 í•„í„°ë§:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "안티-앨리어싱:" @@ -692,15 +693,15 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "앱로ë”:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "ì ìš©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -710,7 +711,7 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "ì•„ëžì–´" @@ -719,7 +720,7 @@ msgstr "ì•„ëžì–´" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -727,12 +728,12 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -740,12 +741,12 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -753,24 +754,24 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "ìžë™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "ìžë™ (640x528ì˜ ë°°ìˆ˜)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "ìžë™ (윈ë„ìš° í¬ê¸°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "윈ë„ìš° í¬ê¸° ìžë™ ì¡°ì •" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -780,23 +781,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"메모리ì—ì„œ ë°‰ë§µë“¤ì„ ë””ì½”ë”©í•˜ëŠ” ëŒ€ì‹ ì— ìžë™ì ìœ¼ë¡œ ìƒì„±í•©ë‹ˆë‹¤.\n" -"성능향ìƒì„ 조금 가져옵니다만 미약한 í…스처 ê²°í•¨ì´ ë°œìƒí• ì§€ë„ 모릅니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "레지스터들(&R)" @@ -805,12 +794,12 @@ msgstr "레지스터들(&R)" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "백엔드 설정" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "백엔드:" @@ -827,7 +816,7 @@ msgstr "뒤로" msgid "Bad File Header" msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr " 배너" @@ -844,11 +833,11 @@ msgstr "배너:" msgid "Bar" msgstr "ë°”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "기본 설정" @@ -860,7 +849,7 @@ msgstr "ë² ì´ìŠ¤" msgid "Block Allocation Table checksum failed" msgstr "블럭 할당 í…Œì´ë¸” ì²´í¬ì„¬ì„ 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "블럭들" @@ -877,7 +866,7 @@ msgid "Blue Right" msgstr "파랑 오른쪽" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "아래" @@ -890,7 +879,7 @@ msgstr "바운드 컨트롤들: %lu" msgid "Broken" msgstr "고장남" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "í´ë”íƒìƒ‰" @@ -898,11 +887,11 @@ msgstr "í´ë”íƒìƒ‰" msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -916,7 +905,7 @@ msgstr "버í¼:" msgid "Buttons" msgstr "버튼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -928,19 +917,19 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -955,7 +944,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -969,7 +958,7 @@ msgstr "" "\n" "모르겠으면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "취소" @@ -985,7 +974,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -996,7 +985,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1004,18 +993,18 @@ msgstr "" "ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" "ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: ì¹˜ëª…ì  ì—러" @@ -1023,7 +1012,7 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "카탈로니아어" @@ -1035,7 +1024,7 @@ msgstr "중앙" msgid "Change" msgstr "변경" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "ë””ìŠ¤í¬ ë³€ê²½(&D)..." @@ -1048,7 +1037,7 @@ msgstr "ë””ìŠ¤í¬ ë³€ê²½" msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1064,8 +1053,8 @@ msgstr "표시를 zì›ê±°ë¦¬ 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" @@ -1077,7 +1066,7 @@ msgstr "채팅" msgid "Cheat Code" msgstr "치트 코드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "치트 찾기" @@ -1089,35 +1078,35 @@ msgstr "치트들 관리ìž" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1125,15 +1114,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로ë”ë¡œ 사용할 파ì¼ì„ ì„ íƒ: (디렉토리들로만 êµ¬ì„±ëœ ë””ìŠ¤í¬ë“¤ì—게만 ì ìš©ë¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1160,22 +1149,22 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— í´ë¼ì´ì–¸íŠ¸ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥. 수ë™ìœ¼ë¡œ 게임" "ì„ ì¤‘ì§€í•´ì•¼í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "닫기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "환경설정(&n)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "코드 ì •ë³´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "코드:" @@ -1183,7 +1172,7 @@ msgstr "코드:" msgid "Command" msgstr "명령" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "주ì„" @@ -1191,20 +1180,20 @@ msgstr "주ì„" msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "ISO 압축하기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr " 환경 " @@ -1223,17 +1212,17 @@ msgstr "컨트롤 설정" msgid "Configure Pads" msgstr "패드들 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "중지시 확ì¸" @@ -1242,11 +1231,11 @@ msgstr "중지시 확ì¸" msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "위모트 %i ì—°ê²°" @@ -1271,7 +1260,7 @@ msgstr "위모트 3 ì—°ê²°" msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "연결중..." @@ -1291,7 +1280,7 @@ msgstr "GCI ë¡œ 변환" msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" @@ -1305,7 +1294,7 @@ msgstr "코어" msgid "Could not create %s" msgstr "%s 를 ìƒì„±í•  수 없었습니다" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "백엔드 %s 를 초기화할 수 없었습니다" @@ -1339,7 +1328,7 @@ msgstr "" "íŒ¨ë“œë“¤ì„ ì„¤ì •í•  수 없었습니다. 플레ì´ì–´ê°€ 떠났거나 ê²Œìž„ì´ í˜„ìž¬ 구ë™ì¤‘!\n" "(ê²Œìž„ì´ êµ¬ë™ì¤‘ì¼ ë•Œ íŒ¨ë“œë“¤ì„ ì„¤ì •í•˜ê¸°ëŠ” ì•„ì§ ì§€ì›ë˜ì§€ 않습니다)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1351,11 +1340,11 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1363,8 +1352,8 @@ msgstr "" "코어를 초기화할 수 없었습니다\n" "ë‹¹ì‹ ì˜ í™˜ê²½ì„¤ì •ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "카운트:" @@ -1372,8 +1361,8 @@ msgstr "카운트:" msgid "Country:" msgstr "êµ­ê°€:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "AR 코드 ìƒì„±" @@ -1382,22 +1371,22 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]ì— ì˜í•´ 만들어" "ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " @@ -1410,11 +1399,11 @@ msgstr "만든ì´:" msgid "Critical" msgstr "치명ì " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "ìžë¥´ê¸°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1428,7 +1417,7 @@ msgstr "" msgid "Crossfade" msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" @@ -1445,11 +1434,11 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "ì²´ì½”" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1457,36 +1446,36 @@ msgstr "" msgid "D-Pad" msgstr "D-패드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 루트:" @@ -1498,7 +1487,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" @@ -1506,8 +1495,8 @@ msgstr "ë°ì´í„° í¬ê¸°" msgid "Date:" msgstr "날짜:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro 파ì¼ë“¤(*.sav)" @@ -1523,7 +1512,7 @@ msgstr "ë°ë“œ ì¡´" msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "디버깅" @@ -1531,16 +1520,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1548,7 +1537,7 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1561,7 +1550,7 @@ msgstr "기본 í°íŠ¸" msgid "Delete" msgstr "ì‚­ì œ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "저장 지우기" @@ -1570,7 +1559,7 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "설명" @@ -1592,8 +1581,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "장비 설정" @@ -1617,28 +1606,20 @@ msgstr "" "디렉토리 ì²´í¬ì„¬ì´ 실패했습니다\n" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ê´‘ì› ë”" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "í…스처들 ë”" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1652,7 +1633,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1666,16 +1647,6 @@ msgstr "" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"í…스처ë§ì„ 비활성합니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "디스í¬" @@ -1685,11 +1656,11 @@ msgstr "디스í¬" msgid "Disc Read Error" msgstr "ë””ìŠ¤í¬ ì½ê¸° ì—러" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "화면표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1703,20 +1674,20 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "ëŒí•€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ëŒí•€ %s 그래픽 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "ëŒí•€ 웹 사ì´íŠ¸(&W)" @@ -1728,16 +1699,16 @@ msgstr "ëŒí•€ 환경설정" msgid "Dolphin Emulated Wiimote Configuration" msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1745,7 +1716,7 @@ msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "ëŒí•€ 위모트 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "ëŒí•€ 구글 코드(&G)" @@ -1787,23 +1758,23 @@ msgstr "드럼" msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1813,7 +1784,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1823,7 +1794,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1834,23 +1805,23 @@ msgstr "" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "네ëœëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "종료(&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB 복사" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1863,11 +1834,11 @@ msgstr "" msgid "EUROPE" msgstr "유럽" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "빠른 메모리 ì—…ë°ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "편집" @@ -1883,7 +1854,7 @@ msgstr "환경 편집" msgid "Edit Patch" msgstr "패치 편집" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" @@ -1896,15 +1867,15 @@ msgstr "편집..." msgid "Effect" msgstr "효과" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버í¼" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "ì—뮬 쓰레드가 ì´ë¯¸ 구ë™ì¤‘ìž„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1918,7 +1889,7 @@ msgstr "" "\n" "모르겠으면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1946,7 +1917,7 @@ msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" msgid "Enable" msgstr "활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1962,7 +1933,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "AR 로깅 활성" @@ -1978,11 +1949,11 @@ msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "치트 활성" @@ -1990,11 +1961,11 @@ msgstr "치트 활성" msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" @@ -2002,7 +1973,7 @@ msgstr "단축키 활성(그래픽 컨트롤)" msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" @@ -2011,11 +1982,11 @@ msgid "Enable MMU" msgstr "MMU 활성" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" @@ -2023,11 +1994,11 @@ msgstr "스í¬ë¦° 세ì´ë²„ 활성" msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2048,11 +2019,11 @@ msgid "" msgstr "" "빠른 ë””ìŠ¤í¬ ì—‘ì„¸ìŠ¤ 활성. ì¼ë¶€ 게임들ì—ì„œ 요구ë¨. (켬 = 빠른, ë” = 호환성)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "페ì´ì§€ 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2064,7 +2035,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2097,7 +2068,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2115,7 +2086,7 @@ msgid "" "OFF = Fast)" msgstr "ì¼ë¶€ ê²Œìž„ë“¤ì— í•„ìš”í•œ 메모리 관리 유닛 활성. (켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2130,13 +2101,13 @@ msgid "End" msgstr "ë" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "ì˜ì–´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "í–¥ìƒ" @@ -2154,17 +2125,17 @@ msgstr "엔트리 %d/%d" msgid "Entry 1/%d" msgstr "엔트리 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "ì—러" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2203,10 +2174,6 @@ msgstr "예외 핸들러 - 메모리 공간 아래를 ì ‘ê·¼. %08llx%08llx" msgid "Execute" msgstr "실행" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "내보내기 실패했습니다" @@ -2220,19 +2187,19 @@ msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" msgid "Export Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" @@ -2240,7 +2207,7 @@ msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" msgid "Export failed, try again?" msgstr "내보내기 실패했습니다, 다시 ì‹œë„?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." @@ -2248,7 +2215,7 @@ msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2284,28 +2251,28 @@ msgstr "íŒŒì¼ ì••ì¶• 풀기..." msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "압축풀기..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO ë°”ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO 플레ì´ì–´" @@ -2329,7 +2296,7 @@ msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2447,33 +2414,29 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "빠른 밉맵" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "FIFO 플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "íŒŒì¼ ì •ë³´" @@ -2519,43 +2482,43 @@ msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "ê°•ì œ 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "ê°•ì œ í…스처 í•„í„°ë§" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2567,7 +2530,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2579,7 +2542,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2601,17 +2564,17 @@ msgstr "" msgid "Forward" msgstr "앞으로" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "프레임" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "프레임" @@ -2620,38 +2583,38 @@ msgstr "프레임" msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "프레임" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "프레임 범위" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "프레임제한:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "프랑스어" @@ -2659,20 +2622,20 @@ msgstr "프랑스어" msgid "Frets" msgstr "프렛들" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "From" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "전체화면" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "전체화면 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 파ì¼(*.gci)" @@ -2680,11 +2643,11 @@ msgstr "GCI 파ì¼(*.gci)" msgid "GCMic Configuration" msgstr "GCMic 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2712,24 +2675,28 @@ msgstr "게임-ìƒì„¸ 설정" msgid "GameConfig" msgstr "게임환경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "게임í브 패드 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko 코드" @@ -2747,8 +2714,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "ì¼ë°˜" @@ -2757,29 +2724,29 @@ msgid "General Settings" msgstr "ì¼ë°˜ 설정" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "ë…ì¼ì–´" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: ì¸ë±ìŠ¤ê°€ ar 코드 리스트 í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤ " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "그래픽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "그래픽 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "보다 í°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2796,7 +2763,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "그리스어" @@ -2816,11 +2783,11 @@ msgstr "ì´ˆë¡ ì˜¤ë¥¸ìª½" msgid "Guitar" msgstr "기타" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRYê°€ 호출ë¨, 보고해주세요!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "핵" @@ -2828,7 +2795,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "히브리어" @@ -2840,7 +2807,7 @@ msgstr "높ì´" msgid "Help" msgstr "ë„움" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2861,11 +2828,11 @@ msgstr "" msgid "Hide" msgstr "숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "마우스 커서 숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2890,11 +2857,11 @@ msgstr "단축키 설정" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "í—가리어" @@ -2902,14 +2869,14 @@ msgstr "í—가리어" msgid "Hybrid Wiimote" msgstr "하ì´ë¸Œë¦¬ë“œ 위모트" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: 알려지지 ì•Šì€ í‹°ì¼“: %08x/%08x ì—ì„œ ë°ì´í„°ë¥¼ 얻으려 ì‹œë„í–ˆ" "습니다" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2922,11 +2889,11 @@ msgstr "" "TitleID %016llx.\n" " ëŒí•€ì€ ì´ì œ 멈추려할 것ì´ë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 설정" @@ -2946,7 +2913,7 @@ msgstr "IR ê°ë„:" msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -2954,7 +2921,7 @@ msgstr "ISO 디렉토리들" msgid "ITALY" msgstr "ì´íƒˆë¦¬ì•„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "ì•„ì´ì½˜" @@ -2973,7 +2940,7 @@ msgstr "" "FPSê°€ 불규칙ì ì´ë©´, ì´ ì˜µì…˜ì´ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (켬 = 호환성, ë” = ë¹ " "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2983,11 +2950,11 @@ msgstr "" "í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하면, DSPì—ì„œ " "오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "í¬ë©§ ë³€ê²½ë“¤ì„ ë¬´ì‹œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3001,7 +2968,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3015,7 +2982,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" @@ -3043,7 +3010,7 @@ msgstr "" "가져온 파ì¼ì´ sav 확장ìžë¥¼ 지닌다\n" "하지만 올바른 í•´ë”를 지니지 않는다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3054,16 +3021,6 @@ msgstr "" "발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "게임안" @@ -3093,7 +3050,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3101,11 +3058,11 @@ msgstr "SD ì¹´ë“œ 삽입" msgid "Insert name here.." msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3116,42 +3073,42 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "내부 LZO ì—러 - 압축 실패했습니다" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3160,15 +3117,15 @@ msgstr "" "내부 LZO ì—러 - 압축해제 실패했습니다 (%d) (%li, %li) \n" "ìƒíƒœ ë¡œë”©ì„ ë‹¤ì‹œ 해보세요" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" @@ -3181,7 +3138,7 @@ msgstr "소개화면" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "비ì í•© í¬ê¸°(%x) í˜¹ì€ ë§ˆë²• ë‚±ë§ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "비ì í•© ê°’!" @@ -3194,7 +3151,7 @@ msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" msgid "Invalid event type %i" msgstr "비ì í•© ì´ë²¤íŠ¸ 타입 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "비ì í•© 파ì¼" @@ -3209,29 +3166,29 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3239,16 +3196,16 @@ msgstr "ì´íƒˆë¦¬ì•„ì–´" msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "ì¼ë³¸ì–´" @@ -3256,7 +3213,7 @@ msgstr "ì¼ë³¸ì–´" msgid "KOREA" msgstr "한국" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3267,7 +3224,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3276,8 +3233,8 @@ msgstr "" msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "한국어" @@ -3295,16 +3252,16 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "언어:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "마지막 ë®ì–´ì¨ì§„ ìƒíƒœ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" @@ -3344,11 +3301,11 @@ msgstr "" "좌/ìš°-í´ë¦­ 옵션들 ë”.\n" "중-í´ë¦­ 지우기." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" @@ -3356,7 +3313,7 @@ msgstr "FPSë¡œ 제한" msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" @@ -3400,20 +3357,20 @@ msgstr "슬롯7 ìƒíƒœ 로드" msgid "Load State Slot 8" msgstr "슬롯8 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3427,15 +3384,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "핵 패턴들로 부터 사용 가능한 사전설정 ê°’ì„ ë¡œë“œí•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" @@ -3447,16 +3400,32 @@ msgstr "로그" msgid "Log Configuration" msgstr "로그 환경설정" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "로그 타입" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"ì—뮬레ì´ì…˜ ì†ë„ì˜ ì¸¡ì •ìœ¼ë¡œ 초당 ë Œë”ë˜ëŠ” 프레임 수치를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"\n" +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "로거 출력" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "로깅" @@ -3464,10 +3433,6 @@ msgstr "로깅" msgid "Lost connection to server!" msgstr "ì„œë²„ì— ì—°ê²°ì„ ìžƒì–´ë²„ë¦¼!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "저수준(LLE) í˜¹ì€ ê³ ìˆ˜ì¤€(HLE)ì—뮬 오디오" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M 버튼" @@ -3485,8 +3450,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" @@ -3516,7 +3481,7 @@ msgstr "메모리카드가 ì´ íƒ€ì´í‹€ì— 대해 ì €ìž¥ì„ ì´ë¯¸ ê°€ì§" msgid "Memcard already opened" msgstr "메모리카드가 ì´ë¯¸ ì—´ë ¤ì§" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" @@ -3567,11 +3532,11 @@ msgstr "마ì´í¬" msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "기타 설정" @@ -3580,7 +3545,7 @@ msgstr "기타 설정" msgid "Modifier" msgstr "수정ìž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3605,7 +3570,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3635,11 +3600,11 @@ msgstr "" "위모트 스피커를 ìŒì†Œê±°í•©ë‹ˆë‹¤. 실제 위모트 ìƒì—ì„œ ëžœë¤ ì—°ê²°í•´ì œë“¤ì„ ê³ ì¹©ë‹ˆë‹¤. " "ì—ë®¬ëœ ìœ„ëª¨íŠ¸ ìƒì—서는 효과 ì—†ìŒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3733,28 +3698,28 @@ msgstr "NP 위" msgid "Name:" msgstr "ì´ë¦„:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ì´ë¦„:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "ì›ë³¸ GCI 파ì¼ë“¤(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "ë‹¤ìŒ íŽ˜ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "ë‹¤ìŒ ìŠ¤ìº”" @@ -3775,8 +3740,8 @@ msgstr "ISO나 WADSê°€ ì—†ìŒ" msgid "No banner file found for title %s" msgstr "%s 타ì´í‹€ì— 대한 배너 파ì¼ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3784,7 +3749,7 @@ msgstr "" msgid "No docking" msgstr "ë„킹 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" @@ -3792,7 +3757,7 @@ msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" msgid "No free dir index entries" msgstr "빈 디렉토리 ëª©ë¡ ì—”íŠ¸ë¦¬ë“¤ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "ë…¹í™”ëœ íŒŒì¼ì´ ì—†ìŒ" @@ -3806,20 +3771,20 @@ msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "같지 ì•ŠìŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" @@ -3844,7 +3809,7 @@ msgstr "알림" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "코드 번호:" @@ -3857,15 +3822,15 @@ msgstr "눈처í¬" msgid "Nunchuk Acceleration" msgstr "ëˆˆì²˜í¬ ê°€ì†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "오브ì íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "ë”" @@ -3873,26 +3838,30 @@ msgstr "ë”" msgid "Offset:" msgstr "오프셋:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "%d 블럭들만 유용한" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "íŒŒì¼ ì—´ê¸°..." @@ -3910,22 +3879,14 @@ msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "디버거 연다" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "로거를 연다" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3942,8 +3903,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "다른 것들" @@ -3959,7 +3920,7 @@ msgstr "" msgid "Output" msgstr "출력" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ(&l)..." @@ -4004,17 +3965,21 @@ msgstr "파티션 %i" msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" @@ -4027,10 +3992,10 @@ msgstr "완벽한" msgid "Perspective %d" msgstr "ê´€ì  %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr " 실행 " @@ -4048,7 +4013,7 @@ msgstr "실행/ì¼ì‹œì •ì§€" msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "ìž¬ìƒ ì˜µì…˜" @@ -4056,7 +4021,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4068,23 +4033,23 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "í¬íŠ¸ 4" @@ -4093,29 +4058,29 @@ msgstr "í¬íŠ¸ 4" msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4128,11 +4093,11 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "ì´ì „ ê°’" @@ -4148,7 +4113,7 @@ msgstr "프로파ì¼" msgid "Properties" msgstr "ì†ì„±" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "ìºì‰¬ 제거(Purge)" @@ -4175,7 +4140,7 @@ msgstr "R 버튼" msgid "R-Analog" msgstr "R-아날로그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "램" @@ -4192,7 +4157,7 @@ msgstr "범위" msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "실제" @@ -4204,7 +4169,7 @@ msgstr "실제 위모트" msgid "Real Wiimotes" msgstr "리얼 위모트" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "위모트 재연결 확ì¸" @@ -4212,17 +4177,17 @@ msgstr "위모트 재연결 확ì¸" msgid "Reconnect Wiimote on State Loading" msgstr "ìƒíƒœ 로딩시 위모트 재연결" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "녹화" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "녹화 ì •ë³´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "녹화 옵션" @@ -4238,7 +4203,7 @@ msgstr "빨강 왼쪽" msgid "Red Right" msgstr "빨강 오른쪽" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4253,7 +4218,7 @@ msgstr "" "모르겠으면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "갱신" @@ -4263,18 +4228,18 @@ msgstr "갱신" msgid "Refresh List" msgstr "ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "제거" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4284,7 +4249,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" @@ -4294,7 +4259,7 @@ msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" msgid "Reset" msgstr "리셋" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "ê²°ê³¼" @@ -4316,33 +4281,33 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진ë™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 ì „ìš© 쓰레드ìƒì—ì„œ 구ë™í•˜ê¸° (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "러시아어" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "안전" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "샘플율:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "저장" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "다른 ì´ë¦„으로 GCI 저장..." @@ -4386,7 +4351,7 @@ msgstr "슬롯7 ìƒíƒœ 저장" msgid "Save State Slot 8" msgstr "슬롯8 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "ìƒíƒœ 저장..." @@ -4395,24 +4360,24 @@ msgstr "ìƒíƒœ 저장..." msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" @@ -4429,7 +4394,7 @@ msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" msgid "Scanning..." msgstr "스ìºë‹..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "스í¬ë¦°ìƒ·" @@ -4437,25 +4402,25 @@ msgstr "스í¬ë¦°ìƒ·" msgid "Scroll Lock" msgstr "스í¬ë¡¤ ë½" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "치트 찾기" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4470,16 +4435,16 @@ msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Select" msgstr "ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4497,23 +4462,23 @@ msgstr "가져올 저장 파ì¼ì„ ì„ íƒ" msgid "Select floating windows" msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4535,7 +4500,7 @@ msgstr "" msgid "Selected font" msgstr "ì„ íƒëœ í°íŠ¸" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4551,7 +4516,7 @@ msgstr "" "모르겠으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" "ê·¸ëž˜ë„ ëª¨ë¥´ê² ìœ¼ë©´, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4579,11 +4544,11 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" @@ -4592,16 +4557,16 @@ msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c ë¡œ 설정" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목ë¡ì´ ar 코드 ëª©ë¡ í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤" @@ -4626,55 +4591,55 @@ msgstr "단축 ì´ë¦„:" msgid "Shoulder Buttons" msgstr "ìˆ„ë” ë²„íŠ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "콘솔 보기(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "로그 보기(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "ìƒíƒœë°” 표시(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "툴바 표시(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "FPS 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "ì´íƒˆë¦¬ì•„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "JAP (ì¼ë³¸ ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "한국" @@ -4682,47 +4647,47 @@ msgstr "한국" msgid "Show Language:" msgstr "언어 보기:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "로그 환경설정(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PAL (유럽 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "í”Œëž«í¼ í‘œì‹œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "통계들" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "USA (미국 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "ê²Œìž„ì„ ë©ˆì¶”ê¸° ì „ì— í™•ì¸ ìƒìž 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4732,27 +4697,39 @@ msgstr "" "ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " "ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "저장 ì£¼ì„ ë³´ê¸°" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "저장 ì£¼ì„ ë³´ê¸°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "저장 ì•„ì´ì½˜ 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4763,15 +4740,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "ì´ ë„움 메시지 보기" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4785,7 +4758,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "간소화 중국어" @@ -4793,19 +4766,19 @@ msgstr "간소화 중국어" msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "CPUë¡œ 부터 EFB 엑세스를 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4817,7 +4790,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4833,17 +4806,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "슬롯 B" @@ -4866,11 +4839,11 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "사운드 설정" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "사운드 백엔드 %s는 ì í•©í•˜ì§€ 않습니다." @@ -4885,8 +4858,8 @@ msgid "Space" msgstr "스페ì´ìŠ¤" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "스페ì¸ì–´" @@ -4894,7 +4867,7 @@ msgstr "스페ì¸ì–´" msgid "Speaker Volume:" msgstr "스피커 볼륨:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4914,10 +4887,6 @@ msgstr "" "\n" "모르겠으면, 640x528를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "비디오 백엔드 명시" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" @@ -4936,11 +4905,11 @@ msgstr "표준 컨트롤러" msgid "Start" msgstr "시작" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "ë„·í”Œë ˆì´ ì‹œìž‘(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘(&c)" @@ -4962,15 +4931,15 @@ msgstr "ìƒíƒœ 저장" msgid "Stick" msgstr "스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "중지" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4983,7 +4952,7 @@ msgstr "" "ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "윈ë„ìš°ë¡œ 늘림" @@ -5008,8 +4977,8 @@ msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "시스템 언어:" @@ -5017,7 +4986,7 @@ msgstr "시스템 언어:" msgid "TAIWAN" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS ìž…ë ¥" @@ -5038,8 +5007,8 @@ msgstr "í…Œì´ë¸” 왼쪽" msgid "Table Right" msgstr "í…Œì´ë¸” 오른쪽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5053,15 +5022,15 @@ msgstr "타루콩가 (봉고스)" msgid "Test" msgstr "테스트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "í…스처" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "í…스처 ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -5077,13 +5046,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5123,7 +5092,7 @@ msgstr "ì´ë¥¸ì€ ',' 문ìžë¥¼ í¬í•¨í•  수 없습니다" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5139,7 +5108,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "ë‹¹ì‹ ì´ ë³µì‚¬í•˜ë ¤ëŠ” ì €ìž¥ì€ ë¹„ì í•© íŒŒì¼ í¬ê¸°ìž…니다." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5172,15 +5141,15 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "테마" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5196,7 +5165,7 @@ msgstr "" "ì´ ì„¤ì •ë“¤ì€ í•µì‹¬ ëŒí•€ ì„¤ì •ë“¤ì„ ë®ì–´ì”니다.\n" "ê²°ì •ë˜ì§€ì•Šì€ ê²ƒì€ ê²Œìž„ì´ ëŒí•€ì˜ ì„¤ì •ì„ ì‚¬ìš©í•¨ì„ ëœ»í•©ë‹ˆë‹¤." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5204,11 +5173,11 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5226,7 +5195,7 @@ msgstr "" "\n" "모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5251,13 +5220,13 @@ msgstr "한계ì " msgid "Tilt" msgstr "기울기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr " 제목" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "To" @@ -5265,18 +5234,18 @@ msgstr "To" msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "전체화면 토글" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "전통 중국어" @@ -5300,7 +5269,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "터키어" @@ -5325,7 +5294,7 @@ msgstr "UDP 위모트" msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "알려지지 ì•ŠìŒ" @@ -5353,24 +5322,24 @@ msgstr "" "니다. 올바로 타ì´í•‘했는지 확ì¸í•˜ì„¸ìš”\n" "ì´ ë¼ì¸ì„ 무시하고 분ì„ì„ ê³„ì†í•˜ê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "ì •ì˜ë˜ì§€ ì•Šì€ %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "알려지지 ì•Šì€" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "알려지지 ì•Šì€ DVD 명령 %08x - ì¹˜ëª…ì  ì—러" @@ -5396,7 +5365,7 @@ msgstr "" msgid "Up" msgstr "위" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "ì—…ë°ì´íŠ¸" @@ -5405,23 +5374,23 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "전체화면 사용" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5433,7 +5402,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5447,15 +5416,15 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "유틸리티" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "수ì§-ë™ê¸°í™”" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "ê°’" @@ -5463,7 +5432,7 @@ msgstr "ê°’" msgid "Value:" msgstr "ê°’:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "ê°’:" @@ -5475,11 +5444,11 @@ msgstr "ìƒì„¸ì„¤ëª…" msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "볼륨" @@ -5494,7 +5463,7 @@ msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5535,7 +5504,7 @@ msgstr "" "%s\n" "계ì†í•˜ê³  싶습니까?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5548,7 +5517,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5559,7 +5528,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5570,7 +5539,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5612,7 +5581,7 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" @@ -5620,7 +5589,7 @@ msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5628,15 +5597,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5645,7 +5614,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 파ì¼ë¡œ 부터 ì½ì„ 수 없었습니다" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "위모트" @@ -5654,7 +5623,7 @@ msgstr "위모트" msgid "Wiimote %i" msgstr "위모트 %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5667,7 +5636,7 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" @@ -5675,7 +5644,7 @@ msgstr "위모트가 ì—°ê²°ë¨" msgid "Wiimote Motor" msgstr "위모트 모터" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "위모트 설정" @@ -5699,10 +5668,10 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "ìž‘ë™ì¤‘..." @@ -5738,7 +5707,7 @@ msgstr "XAudio2 초기화 실패: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 매스터 ë³´ì´ìŠ¤ ìƒì„± 실패: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5762,11 +5731,11 @@ msgstr "ë‹¹ì‹ ì€ íŽ˜ì´ì§€ë“¤ì„ 가진 ì°½ì„ ë‹«ì„ ìˆ˜ 없습니다." msgid "You must choose a game!!" msgstr "ê²Œìž„ì„ ì„ íƒí•´ì•¼ 합니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." @@ -5774,7 +5743,7 @@ msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -5801,11 +5770,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP 핵" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 코드는 지ì›ë˜ì§€ 않습니다" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "ëŒí•€ì— 알려지지 ì•Šì€ Zero 코드: %08x" @@ -5815,7 +5784,7 @@ msgstr "ëŒí•€ì— 알려지지 ì•Šì€ Zero 코드: %08x" msgid "[ waiting ]" msgstr "[ 대기 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5831,7 +5800,7 @@ msgstr "" msgid "[Custom]" msgstr "[ì‚¬ìš©ìž ì§€ì •]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5849,7 +5818,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5867,7 +5836,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -5894,7 +5863,7 @@ msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." msgid "not a wii save or read failure for file header size %x" msgstr "wii ì €ìž¥ì´ ì•„ë‹ˆê±°ë‚˜ íŒŒì¼ í—¤ë” í¬ê¸° %xì— ëŒ€í•œ ì½ê¸° 실패 " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "들" @@ -5903,7 +5872,7 @@ msgstr "들" msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -5984,6 +5953,17 @@ msgstr "| OR" #~ "ì •.\n" #~ "ì´ê²ƒì„ 사용할 ë•Œ 종횡비를 늘림으로 설정하는 ê²ƒì´ ê°€ìž¥ì¢‹ë‹¤." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "메모리ì—ì„œ ë°‰ë§µë“¤ì„ ë””ì½”ë”©í•˜ëŠ” ëŒ€ì‹ ì— ìžë™ì ìœ¼ë¡œ ìƒì„±í•©ë‹ˆë‹¤.\n" +#~ "성능향ìƒì„ 조금 가져옵니다만 미약한 í…스처 ê²°í•¨ì´ ë°œìƒí• ì§€ë„ 모릅니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." + #~ msgid "Bad gameini filename" #~ msgstr "ë°°ë“œ gameini 파ì¼ì´ë¦„" @@ -6052,9 +6032,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "ë´ë§ˆí¬ì–´" +#~ msgid "Disable Lighting" +#~ msgstr "ê´‘ì› ë”" + +#~ msgid "Disable Textures" +#~ msgstr "í…스처들 ë”" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "위모트 스피커 비활성" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "í…스처ë§ì„ 비활성합니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6195,6 +6190,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "기ë¡í•˜ê¸° 위한 %s íŒŒì¼ ì—´ê¸° ì—러" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "ì—뮬레ì´í„°ì™€ 함께 ëŒí•€ 종료" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6207,6 +6205,9 @@ msgstr "| OR" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "DSP 롬: %s ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" +#~ msgid "Fast Mipmaps" +#~ msgstr "빠른 밉맵" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6254,6 +6255,15 @@ msgstr "| OR" #~ "ë§Œì¼ ê²Œìž„ì´ ë©ˆì¶”ê³ , ì¸í„°í”„리터로만 ìž‘ë™í•˜ê±°ë‚˜ ëŒí•€ì´ 깨진다면, ì´ ì˜µì…˜ì€ " #~ "ê·¸ ê²Œìž„ì„ ê³ ì¹ ì§€ 모른다." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ì„±ëŠ¥ì´ í–¥ìƒë˜ì§€ë§Œ ëŒ€ë¶€ë¶„ì˜ ê²Œìž„ì—ì„œ ë¹›ì´ ì‚¬ë¼ì§ì„ 유발합니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." + #~ msgid "Input Source" #~ msgstr "소스 ìž…ë ¥" @@ -6295,6 +6305,12 @@ msgstr "| OR" #~ "ì›ë³¸ ë°‰ë§µë“¤ì„ ë¡œë“œí•˜ëŠ” ê²ƒì€ ì¢€ ë” ì •í™•í•œ í–‰ë™ì´ë‹¤, 하지만 ì„±ëŠ¥ì„ ê°ì†Œì‹œí‚¬" #~ "ì§€ë„ ëª¨ë¥¸ë‹¤ (마ì¼ë¦¬ì§€ê°€ 다양할지는 몰ë¼ë„)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "저수준(LLE) í˜¹ì€ ê³ ìˆ˜ì¤€(HLE)ì—뮬 오디오" + #~ msgid "Lua Script Console" #~ msgstr "Lua 스í¬ë¦½íŠ¸ 콘솔" @@ -6329,6 +6345,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "디버거 연다" + +#~ msgid "Opens the logger" +#~ msgstr "로거를 연다" + #~ msgid "Plugins" #~ msgstr "플러그ì¸" @@ -6413,6 +6435,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "초당 ë Œë”ë˜ëŠ” 프레임수 보기." +#~ msgid "Show this help message" +#~ msgstr "ì´ ë„움 메시지 보기" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6451,6 +6476,9 @@ msgstr "| OR" #~ "다른 ì˜µì…˜ë“¤ì€ ë‹¹ì‹ ì˜ í™”ë©´í‘œì‹œ í¬ê¸°ì˜ ë…립ì ì¸ 비주얼 품질 ì„ íƒì—대한 í•´ìƒ" #~ "ë„ë¡œ ê³ ì •ëœë‹¤." +#~ msgid "Specify a video backend" +#~ msgstr "비디오 백엔드 명시" + #~ msgid "Specify an audio plugin" #~ msgstr "오디오 í”ŒëŸ¬ê·¸ì¸ ëª…ì‹œ" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 872c6cfe6a..43f03e0bd6 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-06-06 20:15+0100\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -19,7 +19,7 @@ msgstr "" "X-Poedit-Country: NORWAY\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,24,-1,-1,-1\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(for mange til til Ã¥ vises)" @@ -47,7 +47,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -57,9 +57,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%sEksporter GCI%s" msgid "%sImport GCI%s" msgstr "%sImporter GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" @@ -160,147 +160,147 @@ msgstr "%u Ledige Blokker; %u Ledige Dir Entries" msgid "&& AND" msgstr "&& OG" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Om..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Start fra DVD-stasjon..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Breakpoints" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Bla etter ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Jukse&kode-manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Bilde Forover" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Fullskjerm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Konfigurer Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Hjelp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Innstillinger for &Hot-tast" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "Last &inn Save State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Minnekort Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Minne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Ã…pne..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Les-kun &modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Restart" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Lyd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "S&topp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Verktøy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "Vi&s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UKJENT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(av)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16-bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32-bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8-bit" @@ -344,7 +344,7 @@ msgstr "8-bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -357,11 +357,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -370,8 +370,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Et NetPlay-vindu er allerede oppe!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Det kjøres ingen spill nÃ¥." @@ -423,7 +423,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "" @@ -436,7 +436,7 @@ msgstr "Om Dolphin" msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Nøyaktighet:" @@ -444,7 +444,7 @@ msgstr "Nøyaktighet:" msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -479,7 +479,7 @@ msgstr "" "Skyldig-kode:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +487,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Legg Til " "Kode (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +496,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) in Fyll Og " "Skli (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +505,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Ram-skriv " "Og Fyll (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,12 +514,12 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Skriv Til " "Peker (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Feil: Ugyldig verdi (%08x) i Minnekopi (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -531,27 +531,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Feil: Ugyldig AR-kode linje: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Kondisjonsbasert Kode: Ugyldig Størrelse %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ugyldig Normal Kodetype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kode %i: ugyldig Sub-type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kode 0: Ugyldig Sub-type %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adapter:" @@ -560,11 +560,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Legg til Patch" @@ -574,7 +574,7 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Legg til..." @@ -622,38 +622,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Juster analogkontrolltrykket som kreves for Ã¥ aktivere knapper." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" @@ -661,9 +661,10 @@ msgstr "Alle komprimerte GC/Wii-filer (gcz)" msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -678,15 +679,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Anisotropisk Filtrering:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Kantutjevning:" @@ -700,15 +701,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applikasjonslaster:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Bruk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,7 +719,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisk" @@ -727,7 +728,7 @@ msgstr "Arabisk" msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker pÃ¥ at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -750,12 +751,12 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -763,24 +764,24 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automatisk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiplum av 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Automatisk (Vindusstørrelse):" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Automatisk juster Vindusstørrelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,23 +791,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatisk generer mipmaps isteden for Ã¥ dekode dem fra minne.\n" -"Øker ytelsen litt, men kan forÃ¥rsake mindre teksturkorrupsjoner.\n" -"\n" -"Hvis usikker, la stÃ¥ pÃ¥." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registre" @@ -815,12 +804,12 @@ msgstr "&Registre" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend-innstillinger" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend:" @@ -837,7 +826,7 @@ msgstr "Bakover" msgid "Bad File Header" msgstr "DÃ¥rlig Fil-header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -854,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -870,7 +859,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blokkallokasjontabellsjekksum feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokker" @@ -887,7 +876,7 @@ msgid "Blue Right" msgstr "BlÃ¥ Høyre" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Bunn" @@ -900,7 +889,7 @@ msgstr "Bundede Kontroller: %lu" msgid "Broken" msgstr "Ødelagt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Bla i" @@ -908,11 +897,11 @@ msgstr "Bla i" msgid "Browse for a directory to add" msgstr "Bla etter en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -926,7 +915,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -939,19 +928,19 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cacher Display-lister" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -966,7 +955,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -980,7 +969,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Avbryt" @@ -996,7 +985,7 @@ msgstr "Kan ikke Ã¥pne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1006,7 +995,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1014,18 +1003,18 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" @@ -1033,7 +1022,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalansk" @@ -1045,7 +1034,7 @@ msgstr "Senter" msgid "Change" msgstr "Endre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Endre &Disk..." @@ -1058,7 +1047,7 @@ msgstr "Endre Disk" msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1074,8 +1063,8 @@ msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Ã… endre dette vil ikke ha noen effekt mens emulatoren kjører!" @@ -1087,7 +1076,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Juksekode" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Juksekodesøk" @@ -1099,35 +1088,35 @@ msgstr "Juksekode Manager" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1135,7 +1124,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1143,8 +1132,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Velg mappen Ã¥ ekstrahere til" @@ -1171,22 +1160,22 @@ msgstr "" "Klientfrakobling mens spillet kjørte!! NetPlay er slÃ¥tt av. Du mÃ¥ manuelt " "stoppe spillet." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Lukk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Ko&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Kodeinfo" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kode:" @@ -1194,7 +1183,7 @@ msgstr "Kode:" msgid "Command" msgstr "Kommando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Kommentar" @@ -1202,20 +1191,20 @@ msgstr "Kommentar" msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Komprimerer ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Konfig" @@ -1234,17 +1223,17 @@ msgstr "Konfigurer Kontroller" msgid "Configure Pads" msgstr "Konfigurer Kontrollere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" @@ -1253,11 +1242,11 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Koble til Wiimote %i" @@ -1282,7 +1271,7 @@ msgstr "Koble til Wiimote 3" msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Kobler til..." @@ -1302,7 +1291,7 @@ msgstr "Konverter til GCI" msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" @@ -1316,7 +1305,7 @@ msgstr "Kjerne" msgid "Could not create %s" msgstr "Kunne ikke lage %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Kunne ikke initialisere backend %s." @@ -1351,7 +1340,7 @@ msgstr "" "spillet kjører ikke!\n" "(Ã… stille inn kontrollere mens spillet kjøret er foreløpig ikke støttet)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1363,11 +1352,11 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1375,8 +1364,8 @@ msgstr "" "Kunne ikke initialisere kjernen.\n" "Sjekk kofigurasjonen din." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Antall:" @@ -1384,8 +1373,8 @@ msgstr "Antall:" msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Lag AR-kode" @@ -1394,21 +1383,21 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Laget av KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Laget av VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" @@ -1420,11 +1409,11 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Krum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,7 +1427,7 @@ msgstr "" msgid "Crossfade" msgstr "Kryssutfase" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "NÃ¥værende mappesti endret fra %s til %s etter wxFilVelger!" @@ -1455,11 +1444,11 @@ msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjekkisk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1467,36 +1456,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1508,7 +1497,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Datastørrelse" @@ -1516,8 +1505,8 @@ msgstr "Datastørrelse" msgid "Date:" msgstr "Dato:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro-filer(*.sav)" @@ -1533,7 +1522,7 @@ msgstr "Dødsone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Debugging" @@ -1541,16 +1530,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1558,7 +1547,7 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1571,7 +1560,7 @@ msgstr "Standard tekst-font" msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1580,7 +1569,7 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Beskrivelse" @@ -1602,8 +1591,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1627,28 +1616,20 @@ msgstr "" "Mappestisjekksum misyktes\n" " og mappesti backup-sjekksummen mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Deaktiver lyseffekter" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Deaktiver Per-Pikseldybde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Deaktiver teksturer" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1662,7 +1643,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1678,16 +1659,6 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Deaktiver teksturer.\n" -"\n" -"Hvis usikker, la stÃ¥ avslÃ¥tt." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disk" @@ -1697,11 +1668,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Feil ved lesing av disk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Visning" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1715,20 +1686,20 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafikkinstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Webside" @@ -1740,16 +1711,16 @@ msgstr "Konfigurer Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulert Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1757,7 +1728,7 @@ msgstr "Dolphin TAS-Filmer (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin pÃ¥ &Google Code" @@ -1799,23 +1770,23 @@ msgstr "Trommer" msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Dump teksturer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1825,7 +1796,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1835,7 +1806,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1846,23 +1817,23 @@ msgstr "" "Hvis usikker, la stÃ¥ avslÃ¥tt." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Nederlansk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Avslutt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB-kopier" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1875,11 +1846,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Tidlige Minneoppdateringer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Endre" @@ -1895,7 +1866,7 @@ msgstr "Endre Konfigurasjon" msgid "Edit Patch" msgstr "Endre Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" @@ -1908,15 +1879,15 @@ msgstr "Endre..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emulator-CPU-trÃ¥den kjører allerede" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1930,7 +1901,7 @@ msgstr "" "\n" "Hvis usikker, benytt virtuell XFB isteden." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1958,7 +1929,7 @@ msgstr "Emulasjonsstatus:" msgid "Enable" msgstr "Aktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1974,7 +1945,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Aktiver AR-logging" @@ -1990,11 +1961,11 @@ msgstr "Aktiver Block Merging" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Aktiver cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" @@ -2002,11 +1973,11 @@ msgstr "Aktiver Juksekoder" msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" @@ -2014,7 +1985,7 @@ msgstr "Aktiver Snarveistaster" msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" @@ -2023,11 +1994,11 @@ msgid "Enable MMU" msgstr "Aktiver MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" @@ -2035,11 +2006,11 @@ msgstr "Aktiver Skjermsparer" msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2060,11 +2031,11 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen fÃ¥ spill. (PÃ… = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Aktiver sider" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2076,7 +2047,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2110,7 +2081,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2131,7 +2102,7 @@ msgstr "" "Tillater Memory Management Unit (MMU), som trengs for noen spill. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2146,13 +2117,13 @@ msgid "End" msgstr "Slutt" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Engelsk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Forbedringer" @@ -2170,17 +2141,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Feil" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2217,10 +2188,6 @@ msgstr "Unntakshandler - tilgang under minneomrÃ¥de. %08llx%08llx" msgid "Execute" msgstr "Kjør" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Avslutt Dolphin med emulator" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Eksportering mislyktes" @@ -2234,19 +2201,19 @@ msgstr "Eksporter Fil" msgid "Export Recording" msgstr "Eksporter Opptak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2254,7 +2221,7 @@ msgstr "Eksporter alle lagringsfiler" msgid "Export failed, try again?" msgstr "Eksportering mislyktes, prøv igjen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Eksporter lagringsfil som..." @@ -2262,7 +2229,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2298,28 +2265,28 @@ msgstr "Ekstraher Fil..." msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Ekstraherer..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO-Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO-spiller" @@ -2343,7 +2310,7 @@ msgstr "Lytting Mislyktes!" msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2461,33 +2428,29 @@ msgstr "Kunne ikke skrive header for %s" msgid "Failed to write header for file %d" msgstr "Kunne ikke skrive header for filen %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Raske Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo-spiller" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Filinformasjon" @@ -2533,43 +2496,43 @@ msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Tving 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Tving Teksturfiltrering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2582,7 +2545,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2594,7 +2557,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2616,17 +2579,17 @@ msgstr "" msgid "Forward" msgstr "Send frem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Stillbilde" @@ -2635,38 +2598,38 @@ msgstr "Stillbilde" msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Bilderekkevidde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Fri Utkikk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Fransk" @@ -2674,20 +2637,20 @@ msgstr "Fransk" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Fra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "FullSkj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Fullskjermsoppløsning:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Fil(*.gci)" @@ -2696,11 +2659,11 @@ msgstr "GCI Fil(*.gci)" msgid "GCMic Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2728,24 +2691,28 @@ msgstr "Spill-spesifikke Innstillinger" msgid "GameConfig" msgstr "SpillKonfigurasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko-juksekoder" @@ -2763,8 +2730,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Generelt" @@ -2773,29 +2740,29 @@ msgid "General Settings" msgstr "Generelle Innstillinger" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Tysk" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeksen er større enn AR-kodelistens størrelse %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Innstillinger for Grafikk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Større Enn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2813,7 +2780,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Gresk" @@ -2833,11 +2800,11 @@ msgstr "Grønn Høyre" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2845,7 +2812,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraisk" @@ -2857,7 +2824,7 @@ msgstr "Høyde" msgid "Help" msgstr "Hjelp" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2877,11 +2844,11 @@ msgstr "" msgid "Hide" msgstr "Gjem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Gjem Musepeker" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2906,11 +2873,11 @@ msgstr "Konfigurer Snarveistaster" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Ungarsk" @@ -2918,12 +2885,12 @@ msgstr "Ungarsk" msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Forsøkte Ã¥ fÃ¥ data fra en ukjent billett: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2936,11 +2903,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin vil sannsynligvis krasje nÃ¥" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -2960,7 +2927,7 @@ msgstr "IR-sensitivitet:" msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO-mapper" @@ -2968,7 +2935,7 @@ msgstr "ISO-mapper" msgid "ITALY" msgstr "ITALIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikon" @@ -2985,7 +2952,7 @@ msgstr "" "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2996,11 +2963,11 @@ msgstr "" "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " "gjøre endringen effektiv." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorer Formatendringer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3014,7 +2981,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3028,7 +2995,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3056,7 +3023,7 @@ msgstr "" "Importert fil har .sav-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3067,16 +3034,6 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Øker ytelsen, men forÃ¥rsaker at lys forsvinner i de fleste spill.\n" -"\n" -"Hvis usikker, la stÃ¥ avslÃ¥tt." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "I spillet" @@ -3106,7 +3063,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3114,11 +3071,11 @@ msgstr "Sett inn SD-kort" msgid "Insert name here.." msgstr "Sett inn navn her..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3127,42 +3084,42 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Intern LZO-feil - komprimering mislyktes" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3171,15 +3128,15 @@ msgstr "" "Intern LZO-feil - dekomprimering mislyktes (%d) (%li, %li) \n" "Prøv Ã¥ laste Save State'en igjen" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Intern LZO-feil - lzo_init() mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" @@ -3192,7 +3149,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ugyldig størrelse (%x) eller magisk ord (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Ugyldig verdi!" @@ -3205,7 +3162,7 @@ msgstr "Ugyldig bat.map eller mappesti" msgid "Invalid event type %i" msgstr "Ugyldig event-type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ugyldig fil" @@ -3220,29 +3177,29 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Ugyldig save state" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italiensk" @@ -3250,16 +3207,16 @@ msgstr "Italiensk" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japansk" @@ -3267,7 +3224,7 @@ msgstr "Japansk" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3278,7 +3235,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3287,8 +3244,8 @@ msgstr "" msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreansk" @@ -3306,16 +3263,16 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Siste Overskrevne Save State:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Siste Save State:" @@ -3355,11 +3312,11 @@ msgstr "" "Venstre/Høyre-klikk for flere alternativer.\n" "Middelklikk for Ã¥ tømme." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" @@ -3367,7 +3324,7 @@ msgstr "Begrens med FPS (bilder-per-sekund)" msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" @@ -3411,20 +3368,20 @@ msgstr "Last Inn Save State Slot 7" msgid "Load State Slot 8" msgstr "Last Inn Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3438,15 +3395,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" @@ -3458,16 +3411,32 @@ msgstr "Logg" msgid "Log Configuration" msgstr "Konfigurer Logg" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Loggtyper" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Vis antall bilder rendert per sekund som et mÃ¥l pÃ¥ emulasjonsfart.\n" +"\n" +"Hvis usikker, la stÃ¥ avslÃ¥tt." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger utdata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Logging" @@ -3475,10 +3444,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "Mistet koblingen til server!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Lavt level emulert (LLE) eller høyt level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M-knappen" @@ -3496,8 +3461,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark-filer(*.gcs)" @@ -3527,7 +3492,7 @@ msgstr "Minnekortet har allerede en lagringsfil for denne tittelen." msgid "Memcard already opened" msgstr "Minnekort allerede Ã¥pnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Memory Byte" @@ -3578,11 +3543,11 @@ msgstr "Mic" msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3591,7 +3556,7 @@ msgstr "Diverse Innstillinger" msgid "Modifier" msgstr "Modifiserer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3616,7 +3581,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3646,11 +3611,11 @@ msgstr "" "Deaktiver Wiimote-høytaleren. Fikser tilfeldige avkoblinger pÃ¥ ekte Wiimote-" "er. Har ingen effekt pÃ¥ emulert Wii-kontroll." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3744,28 +3709,28 @@ msgstr "NP Opp" msgid "Name:" msgstr "Navn:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Navn:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Maskinvare-innfødte GCI-filer(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Neste Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Neste Søk" @@ -3786,8 +3751,8 @@ msgstr "Ingen ISO- eller WAD-filer funnet" msgid "No banner file found for title %s" msgstr "Inngen banner-fil funnet for tittelen %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3795,7 +3760,7 @@ msgstr "" msgid "No docking" msgstr "Ingen dokking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Ingen fil lastet" @@ -3803,7 +3768,7 @@ msgstr "Ingen fil lastet" msgid "No free dir index entries" msgstr "Ingen ledige mappestiindeks-entries" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Ingen opptaksfil" @@ -3817,20 +3782,20 @@ msgstr "Ingen lagringsmappe funnet for tittel %s" msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Ikke Lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Ikke tilkoblet" @@ -3855,7 +3820,7 @@ msgstr "Merknad" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Antall koder:" @@ -3868,15 +3833,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk Aksellerasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Av" @@ -3884,26 +3849,30 @@ msgstr "Av" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Kun %d blokker tilgjengelig" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Ã…pne fil..." @@ -3921,22 +3890,14 @@ msgstr "OpenAL: Kan ikke finne lyd-device" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan ikke Ã¥pne device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Ã…pner debuggeren" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Ã…pner loggeren" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3956,8 +3917,8 @@ msgstr "" "Høyreklikk og eksporter all lagringsfilene,\n" "og importer lagringsfilene til et nytt minnekort\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Annet" @@ -3973,7 +3934,7 @@ msgstr "" msgid "Output" msgstr "Utdata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Spi&llopptak..." @@ -4018,17 +3979,21 @@ msgstr "Partisjon %i" msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" @@ -4041,10 +4006,10 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektiv %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Spill" @@ -4062,7 +4027,7 @@ msgstr "Spill/Pause" msgid "Playable" msgstr "Spillbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Avspillingsalterntiver" @@ -4070,7 +4035,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4082,23 +4047,23 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4107,29 +4072,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4142,11 +4107,11 @@ msgstr "ForhÃ¥ndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Forrige Verdi" @@ -4162,7 +4127,7 @@ msgstr "Profil" msgid "Properties" msgstr "Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Tøm Cache" @@ -4189,7 +4154,7 @@ msgstr "R-knappen" msgid "R-Analog" msgstr "Høyre-analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4206,7 +4171,7 @@ msgstr "Rekkevidde" msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Ekte" @@ -4219,7 +4184,7 @@ msgstr "Ekte Wiimote" msgid "Real Wiimotes" msgstr "Ekte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Gjenntilkoble Wiimote bekreftelse" @@ -4227,17 +4192,17 @@ msgstr "Gjenntilkoble Wiimote bekreftelse" msgid "Reconnect Wiimote on State Loading" msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Opptak" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Opptaksinformasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opptaksinnstillinger" @@ -4253,7 +4218,7 @@ msgstr "Rød Venstre" msgid "Red Right" msgstr "Rød Høyre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4269,7 +4234,7 @@ msgstr "" "Hvis usikker, velg ingen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Oppdater" @@ -4279,18 +4244,18 @@ msgstr "Oppdater" msgid "Refresh List" msgstr "Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Fjern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4300,7 +4265,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Render til Hovedvindu" @@ -4310,7 +4275,7 @@ msgstr "Render til Hovedvindu" msgid "Reset" msgstr "Restart" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultater" @@ -4332,33 +4297,33 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Kjør DSP LLE pÃ¥ en dedikert CPU-trÃ¥d (ikke anbefalt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Sikker" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Samplingsratio:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Lagre" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Lagre GCI som..." @@ -4402,7 +4367,7 @@ msgstr "Lagre Save State Slot 7" msgid "Save State Slot 8" msgstr "Lagre Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Lagre Save State..." @@ -4411,24 +4376,24 @@ msgstr "Lagre Save State..." msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" @@ -4445,7 +4410,7 @@ msgstr "Søker etter ISO-filer" msgid "Scanning..." msgstr "Søker..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "SkjDump" @@ -4453,25 +4418,25 @@ msgstr "SkjDump" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Juksekodesøk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4486,16 +4451,16 @@ msgstr "Seksjon %s ikke funnet i SYSCONF" msgid "Select" msgstr "Velg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4513,23 +4478,23 @@ msgstr "Velg en lagringsfil Ã¥ importere" msgid "Select floating windows" msgstr "Velg flytvindu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4551,7 +4516,7 @@ msgstr "" msgid "Selected font" msgstr "Valgt font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4567,7 +4532,7 @@ msgstr "" "Hvis usikker, velg skrivebordsoppløsningen din.\n" "Hvis fortsatt usikker, bruk den høyeste oppløsingen som fungerer for deg." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4595,11 +4560,11 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" @@ -4608,16 +4573,16 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu" @@ -4643,55 +4608,55 @@ msgstr "Kortnavn:" msgid "Shoulder Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Vis &Konsoll" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Vis &Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Vis &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Vis &Verktøylinje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Vis Bildefrekvens (FPS)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Vis Frankrike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Vis Inndata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Vis Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Vis JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Vis Korea" @@ -4699,47 +4664,47 @@ msgstr "Vis Korea" msgid "Show Language:" msgstr "Vis SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Vis Loggk&onfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Vis PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Vis Plattformer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Vis Statistikker" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Vis Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Vis USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Vis WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4750,27 +4715,39 @@ msgstr "" "men det kan ogsÃ¥ forÃ¥rsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Vis lagringskommentar" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Vis lagringstittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4781,15 +4758,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Vis denne hjelpemelding" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Vis ukjent" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4803,7 +4776,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" @@ -4811,19 +4784,19 @@ msgstr "Simplifisert Kinesisk" msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Dropp EFB Access fra CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4835,7 +4808,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4851,17 +4824,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4884,11 +4857,11 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Innstillinger for Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Audio backend %s er ugyldig" @@ -4903,8 +4876,8 @@ msgid "Space" msgstr "Mellomrom" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spansk" @@ -4912,7 +4885,7 @@ msgstr "Spansk" msgid "Speaker Volume:" msgstr "Høytalervolum:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4931,10 +4904,6 @@ msgstr "" "\n" "Hvis usikker, velg 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Spesifiser en programvareutvidelse for video" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -4953,11 +4922,11 @@ msgstr "Standardkontroller" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Begynn &Opptak" @@ -4979,15 +4948,15 @@ msgstr "Save State-lagringsfiler" msgid "Stick" msgstr "Joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5001,7 +4970,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Strekk til Vindu" @@ -5026,8 +4995,8 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "SystemsprÃ¥k:" @@ -5035,7 +5004,7 @@ msgstr "SystemsprÃ¥k:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -5057,8 +5026,8 @@ msgstr "Tabell Venstre" msgid "Table Right" msgstr "Tabell Høyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5072,15 +5041,15 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5096,13 +5065,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5142,7 +5111,7 @@ msgstr "navnet kan ikke inneholde tegnet ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Den dekrypterte AR-koden inneholder ingen linjer." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5159,7 +5128,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Lagringsfilen du forsøker Ã¥ Ã¥pne har en ugyldig filstørrelse" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5191,15 +5160,15 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Velging av tema gikk feil" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5214,7 +5183,7 @@ msgstr "" "Disse innstillingene overstyrer Dolphins kjerneinnstillinger.\n" "Ubestemt betyr at spillet bruker Dolphins kjerneinnstillinger." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5222,11 +5191,11 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5244,7 +5213,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5269,13 +5238,13 @@ msgstr "Terskel" msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Tittel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Til" @@ -5283,18 +5252,18 @@ msgstr "Til" msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" @@ -5318,7 +5287,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Tyrkisk" @@ -5343,7 +5312,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UKJENT" @@ -5369,24 +5338,24 @@ msgstr "" "kryptert eller dekryptert kode. Sørg for at du tastet den inn korrekt.\n" "Ønsker du Ã¥ ignorere denne linjen og fortsette parsering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Udefinert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Angre Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Ukjent" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Ukjent DVD-kommando%08x - fatal feil" @@ -5411,7 +5380,7 @@ msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" msgid "Up" msgstr "Opp" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Oppdater" @@ -5420,23 +5389,23 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Bruk Fullskjerm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5449,7 +5418,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5463,15 +5432,15 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Verktøyet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "Vertikal Synkronisering" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Verdi" @@ -5479,7 +5448,7 @@ msgstr "Verdi" msgid "Value:" msgstr "Verdi:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Verdi:" @@ -5491,11 +5460,11 @@ msgstr "Verbøsitet" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volum" @@ -5510,7 +5479,7 @@ msgstr "WAD-installasjon feilet: Skaper feil %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD-installasjon feilet: Skaper feil %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5551,7 +5520,7 @@ msgstr "" "%s\n" "Ønsker du Ã¥ fortsette?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5564,7 +5533,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5572,7 +5541,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5580,7 +5549,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5608,7 +5577,7 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5616,7 +5585,7 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5624,15 +5593,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5641,7 +5610,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunne ikke lese fra fil" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5650,7 +5619,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5663,7 +5632,7 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" @@ -5671,7 +5640,7 @@ msgstr "Wiimote Tilkoblet" msgid "Wiimote Motor" msgstr "Wiimote-motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Innstillinger for Wiimote" @@ -5696,10 +5665,10 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Arbeider..." @@ -5735,7 +5704,7 @@ msgstr "XAudio2-initialisering mislyktes: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice-laging mislyktes: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5757,11 +5726,11 @@ msgstr "Du kan ikke lukke panelene som har sider/faner i dem." msgid "You must choose a game!!" msgstr "Du mÃ¥ velge et spill!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Du mÃ¥ skrive inn et navn!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Du mÃ¥ skrive inn en gyldig desimal, hexadesimal eller octal verdi." @@ -5769,7 +5738,7 @@ msgstr "Du mÃ¥ skrive inn en gyldig desimal, hexadesimal eller octal verdi." msgid "You must enter a valid profile name." msgstr "Du mÃ¥ skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du mÃ¥ restarte Dolphin for at endringen skal tre i kraft." @@ -5796,11 +5765,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP-hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3-kode støttes ikke" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero-kode ukjent for Dolphin: %08x" @@ -5810,7 +5779,7 @@ msgstr "Zero-kode ukjent for Dolphin: %08x" msgid "[ waiting ]" msgstr "[ venter ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5825,7 +5794,7 @@ msgstr "" msgid "[Custom]" msgstr "[Selvdefinert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5844,7 +5813,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5862,7 +5831,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -5889,7 +5858,7 @@ msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." msgid "not a wii save or read failure for file header size %x" msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5898,7 +5867,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -5970,6 +5939,17 @@ msgstr "| ELLER" #~ "justert med EFB-skalering.\n" #~ "Det er best Ã¥ sette aspektratioen til strekk nÃ¥r dette benyttes." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatisk generer mipmaps isteden for Ã¥ dekode dem fra minne.\n" +#~ "Øker ytelsen litt, men kan forÃ¥rsake mindre teksturkorrupsjoner.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ pÃ¥." + #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" @@ -6019,9 +5999,24 @@ msgstr "| ELLER" #~ msgid "Danish" #~ msgstr "Dansk" +#~ msgid "Disable Lighting" +#~ msgstr "Deaktiver lyseffekter" + +#~ msgid "Disable Textures" +#~ msgstr "Deaktiver teksturer" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Deaktiver Wiimote-høytaler" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Deaktiver teksturer.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ avslÃ¥tt." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6127,6 +6122,9 @@ msgstr "| ELLER" #~ msgid "Error opening file %s for recording" #~ msgstr "Feil ved Ã¥pning av fil %s for opptak" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Avslutt Dolphin med emulator" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6136,6 +6134,9 @@ msgstr "| ELLER" #~ "%s\n" #~ "Denne filen kreves for Ã¥ bruke DSP LLE." +#~ msgid "Fast Mipmaps" +#~ msgstr "Raske Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6184,6 +6185,15 @@ msgstr "| ELLER" #~ "Hvis et spill fryser til, fungerer kun i Interpreter-modus, eller Dolphin " #~ "krasjer, kan dette alternativet muligens fikse spillet." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Øker ytelsen, men forÃ¥rsaker at lys forsvinner i de fleste spill.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ avslÃ¥tt." + #~ msgid "Input Source" #~ msgstr "Kilde For Inndata" @@ -6218,6 +6228,12 @@ msgstr "| ELLER" #~ "Ã… laste mipmaps er den nøyaktigste oppførserselen i forhold til GC/Wii, " #~ "men det kan redusere ytelsen." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Lavt level emulert (LLE) eller høyt level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script-Konsoll" @@ -6248,6 +6264,12 @@ msgstr "| ELLER" #~ msgid "OpenGL" #~ msgstr "Ã…pne" +#~ msgid "Opens the debugger" +#~ msgstr "Ã…pner debuggeren" + +#~ msgid "Opens the logger" +#~ msgstr "Ã…pner loggeren" + #~ msgid "Plugins" #~ msgstr "Programvareutvidelser" @@ -6330,6 +6352,9 @@ msgstr "| ELLER" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Vis antall bilder rendert per sekund (FPS)." +#~ msgid "Show this help message" +#~ msgstr "Vis denne hjelpemelding" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6372,6 +6397,9 @@ msgstr "| ELLER" #~ "De andre alternativene er forhÃ¥ndsbestemte oppløsninger for Ã¥ velge en " #~ "visuell kvalitet uavhengig av din skjermoppløsning." +#~ msgid "Specify a video backend" +#~ msgstr "Spesifiser en programvareutvidelse for video" + #~ msgid "Specify an audio plugin" #~ msgstr "Spesifiser en programvareutvidelse for audio" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index 50592ad0ae..da4144d917 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-08-07 16:43+0100\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(te veel om te weergeven)" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -56,9 +56,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -150,7 +150,7 @@ msgstr "%sExporteer GCI%s" msgid "%sImport GCI%s" msgstr "%sImporteer GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" @@ -159,147 +159,147 @@ msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" msgid "&& AND" msgstr "&& EN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Over..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Start van DVD Drive..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Breekpunten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Zoek voor ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Cheats Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulatie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Frame Avanceren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Volledig Scherm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Grafische Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Help" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Sneltoets Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Laad staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Geheugenkaart Manager (GC) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Geheugen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Open..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opties " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pauze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Eigenschappen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Lijst Vernieuwen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Geluid " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Gereedschap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Bekijk " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -315,27 +315,27 @@ msgstr "(-)+zDichtbij" msgid "(UNKNOWN)" msgstr "(ONBEKEND)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(uit) " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -343,7 +343,7 @@ msgstr "8 bit" msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr " " @@ -356,11 +356,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -369,8 +369,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Er is al een NetPlay venster geopend!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Er staat geen spel aan." @@ -423,7 +423,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR Codes" @@ -436,7 +436,7 @@ msgstr "Over Dolphin" msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -444,7 +444,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -479,7 +479,7 @@ msgstr "" "Boosdoener Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +487,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : address = %08x) in Voeg Code " "Toe (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +496,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Vul en Schuif " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +505,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Ram Schrijf " "En Vul (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,12 +514,12 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Schrijf Naar " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Fout: Verkeerde waarde (%08x) in Geheugen Kopie (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -532,27 +532,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fout: foutive AR code regel: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditionele Code: Onjuiste Grootte %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Onjuiste Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Onjuist subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Onjuist Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adapter:" @@ -561,11 +561,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -575,7 +575,7 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Voeg toe..." @@ -623,38 +623,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Stel de vereiste analoge control druk in om de knop te activeren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" @@ -662,9 +662,10 @@ msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -679,15 +680,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Anisotropic Filteren:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -700,15 +701,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Applader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Toepassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,7 +719,7 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabisch" @@ -727,7 +728,7 @@ msgstr "Arabisch" msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -750,12 +751,12 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -763,24 +764,24 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Veelvoud van 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Automatisch (Venster Grootte)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Venster grootte automatisch aanpassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,19 +791,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registers" @@ -811,12 +804,12 @@ msgstr "&Registers" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Backend Instellingen" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Geluids backend:" @@ -833,7 +826,7 @@ msgstr "Terug" msgid "Bad File Header" msgstr "Verkeerde bestands header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -850,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Balk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -866,7 +859,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum is mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blokken" @@ -883,7 +876,7 @@ msgid "Blue Right" msgstr "Blauw Rechts" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Onder" @@ -896,7 +889,7 @@ msgstr "Gekoppelde controls: %lu" msgid "Broken" msgstr "Defect" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Zoek" @@ -904,11 +897,11 @@ msgstr "Zoek" msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -922,7 +915,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knoppen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -934,19 +927,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -962,7 +955,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -978,7 +971,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuleer" @@ -994,7 +987,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1004,7 +997,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1012,18 +1005,18 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" @@ -1031,7 +1024,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalaans" @@ -1043,7 +1036,7 @@ msgstr "Middelpunt" msgid "Change" msgstr "Verander" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Verander &Schijf" @@ -1056,7 +1049,7 @@ msgstr "Verander Schijf" msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1072,8 +1065,8 @@ msgstr "Verandert teken van zVer parameter (na correctie)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Verandert teken van zDichtbij parameter (na correctie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!" @@ -1085,7 +1078,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Cheat Zoeken" @@ -1097,35 +1090,35 @@ msgstr "Cheats Manager" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1133,7 +1126,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1141,8 +1134,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1169,22 +1162,22 @@ msgstr "" "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. " "Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Sluit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "In&stellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Code: " @@ -1192,7 +1185,7 @@ msgstr "Code: " msgid "Command" msgstr "Commando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Reactie" @@ -1200,20 +1193,20 @@ msgstr "Reactie" msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Config" @@ -1232,17 +1225,17 @@ msgstr "Configureer Besturing" msgid "Configure Pads" msgstr "Configureer Besturing Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" @@ -1252,11 +1245,11 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Verbind Wiimote %i" @@ -1281,7 +1274,7 @@ msgstr "Verbind Wiimote 3" msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Verbinden..." @@ -1301,7 +1294,7 @@ msgstr "Omzetten naar GCI" msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" @@ -1315,7 +1308,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Het volgende bestanden kon niet gemaakt worden %s " -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Kon de %s backend niet initialiseren." @@ -1350,7 +1343,7 @@ msgstr "" "draait nog!\n" "(pads instellen terwijl het spel draait wordt nog niet ondersteund)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1363,11 +1356,11 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1375,8 +1368,8 @@ msgstr "" "Kon de kern niet initialiseren.\n" "Controleer je instellingen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Tel:" @@ -1384,8 +1377,8 @@ msgstr "Tel:" msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Maak AR Code" @@ -1394,20 +1387,20 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Gemaakt door KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Gemaakt door VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Gemaakt door black_rider and published on ForumW.org > Web Developments" @@ -1420,11 +1413,11 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Bijsnijden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1438,7 +1431,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!" @@ -1455,11 +1448,11 @@ msgstr "Aangepaste Projectie Instellingen" msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tsjechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1467,36 +1460,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Station:" @@ -1508,7 +1501,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Data grootte" @@ -1516,8 +1509,8 @@ msgstr "Data grootte" msgid "Date:" msgstr "Datum:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro bestanden(*.sav)" @@ -1533,7 +1526,7 @@ msgstr "Dode Zone" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1542,16 +1535,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1559,7 +1552,7 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1572,7 +1565,7 @@ msgstr "Standaard font" msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Verwijder Save" @@ -1581,7 +1574,7 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Beschrijving" @@ -1603,8 +1596,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1628,29 +1621,21 @@ msgstr "" "Map checksum is mislukt\n" " en map backup checksum is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Schakel Lighting uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Schakel Pixel Diepte uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Schakel Textures uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1664,7 +1649,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1680,16 +1665,6 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Schakel texturing uit.\n" -"\n" -"In geval van twijfel leeg laten." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Schijf" @@ -1699,11 +1674,11 @@ msgstr "Schijf" msgid "Disc Read Error" msgstr "Schijf Lees Fout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1717,20 +1692,20 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafische Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1742,16 +1717,16 @@ msgstr "Dolphin Configuratie" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Geëmuleerde Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1759,7 +1734,7 @@ msgstr "Dolphin TAS Film (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" @@ -1800,23 +1775,23 @@ msgstr "Drums" msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Dump texturen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1826,7 +1801,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1836,7 +1811,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1847,23 +1822,23 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Nederlands" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "Sl&uiten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Regio kopie" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1876,11 +1851,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Vroege Geheugen Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Wijzig" @@ -1896,7 +1871,7 @@ msgstr "Wijzig Configuratie" msgid "Edit Patch" msgstr "Wijzig Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" @@ -1909,15 +1884,15 @@ msgstr "Wijzig..." msgid "Effect" msgstr "Effect" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emu Thread draait al!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1931,7 +1906,7 @@ msgstr "" "\n" "In geval van twijfel selecteer virtuele XFB emulatie." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1959,7 +1934,7 @@ msgstr "Emulatie Staat:" msgid "Enable" msgstr "Activeer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1975,7 +1950,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Activeer AR Logging" @@ -1991,12 +1966,12 @@ msgstr "Activeer Block Merging" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Activeer Cheats" @@ -2004,11 +1979,11 @@ msgstr "Activeer Cheats" msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" @@ -2016,7 +1991,7 @@ msgstr "Activeer Sneltoetsen" msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" @@ -2025,11 +2000,11 @@ msgid "Enable MMU" msgstr "Activeer MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" @@ -2037,11 +2012,11 @@ msgstr "Activeer Schermbeveiliger" msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Activeer Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2063,11 +2038,11 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Activeer Pagina's" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2079,7 +2054,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2113,7 +2088,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2134,7 +2109,7 @@ msgstr "" "Schakel de Memory Management Unit in, die nodig is voor sommige games. (AAN " "= Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2149,13 +2124,13 @@ msgid "End" msgstr "Einde" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Engels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Verbeteringen" @@ -2173,17 +2148,17 @@ msgstr "Toegang %d/%d" msgid "Entry 1/%d" msgstr "Toegang 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Error (Fout)" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " @@ -2223,10 +2198,6 @@ msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx" msgid "Execute" msgstr "Uitvoeren" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sluit Dolphin met emulator" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Exporteren Mislukt" @@ -2240,19 +2211,19 @@ msgstr "Exporteer Bestand" msgid "Export Recording" msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2260,7 +2231,7 @@ msgstr "Exporteer alle saves..." msgid "Export failed, try again?" msgstr "Uitpakken is mislukt, opnieuw proberen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exporteer save als..." @@ -2268,7 +2239,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2304,28 +2275,28 @@ msgstr "Bestand Uitpakken" msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Uitpakken..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO Speler" @@ -2349,7 +2320,7 @@ msgstr "Luisteren Mislukt!!" msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2468,34 +2439,29 @@ msgstr "Het schrijven van header voor %s is mislukt" msgid "Failed to write header for file %d" msgstr "Het schrijven van header voor bestanden %d is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Laad Native Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo Speler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Bestands Info" @@ -2541,44 +2507,44 @@ msgstr "FileIO: Onbekende open mode: 0x%02x" msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Herstel Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forceer 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forceer Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2591,7 +2557,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2603,7 +2569,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2626,17 +2592,17 @@ msgstr "" msgid "Forward" msgstr "Vooruit" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "" @@ -2645,38 +2611,38 @@ msgstr "" msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Frame Bereik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Framelimiet:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Vrije kijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Frans" @@ -2684,21 +2650,21 @@ msgstr "Frans" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Van" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Volledig scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "Volledige Scherm Resolutie:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Bestand(*.gci)" @@ -2707,11 +2673,11 @@ msgstr "GCI Bestand(*.gci)" msgid "GCMic Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2739,24 +2705,28 @@ msgstr "Spel Specifieke Instellingen" msgid "GameConfig" msgstr "Spel Config" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2774,8 +2744,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Algemeen" @@ -2784,29 +2754,29 @@ msgid "General Settings" msgstr "Algemene Instellingen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Duits" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is groter dan de grootte van de AR code lijst %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafische" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Grafische instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Grooter dan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2824,7 +2794,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grieks" @@ -2844,11 +2814,11 @@ msgstr "Groen Rechts" msgid "Guitar" msgstr "Gitaar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2856,7 +2826,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreeuws" @@ -2868,7 +2838,7 @@ msgstr "Hoogte" msgid "Help" msgstr "Help" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2888,11 +2858,11 @@ msgstr "" msgid "Hide" msgstr "Verberg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Verberg Muis Cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2917,11 +2887,11 @@ msgstr "Sneltoets Configuratie" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hongaarse" @@ -2929,14 +2899,14 @@ msgstr "Hongaarse" msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Poging tot verkrijgen van data van een onbekende ticket: " "%08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2949,11 +2919,11 @@ msgstr "" "TitleID %016llx.\n" "Dolphin zal waarschijnlijk blijven hangen." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -2973,7 +2943,7 @@ msgstr "IR Gevoeligheid:" msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO Map" @@ -2981,7 +2951,7 @@ msgstr "ISO Map" msgid "ITALY" msgstr "ITALIË" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icoon" @@ -2998,7 +2968,7 @@ msgstr "" "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT = " "Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3009,11 +2979,11 @@ msgstr "" "50),\n" "dan moet je ook Audio Throttle DSP uitschakelen om het effectief te maken." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Negeer formaat veranderingen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3027,7 +2997,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3041,7 +3011,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importeer Save" @@ -3069,7 +3039,7 @@ msgstr "" "Geimporteerd bestand heeft sav extension\n" "maar heeft geen juiste header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3081,17 +3051,6 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Verbeterd performance, maar zorgt ervoor dat belichting in meeste games " -"verdwijnt. \n" -"\n" -"In geval van twijfel leeg laten." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "In Game" @@ -3121,7 +3080,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3129,11 +3088,11 @@ msgstr "Schakel SD Card in" msgid "Insert name here.." msgstr "Voeg naam hier toe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3144,43 +3103,43 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Interface Instellingen" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Interne LZO fout - compressie is mislukt" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3189,15 +3148,15 @@ msgstr "" "Interne LZO fout - decompressie is mislukt (%d) (%li, %li) \n" "Probeer de staat opnieuw te laden" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Interne LZO fout - lzo_init() is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" @@ -3210,7 +3169,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Onjuiste grootte (%x) of Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Onjuiste waarde!" @@ -3223,7 +3182,7 @@ msgstr "Onjuiste bat.map of map vermelding" msgid "Invalid event type %i" msgstr "Onjuist event type %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Onjuist bestand" @@ -3238,29 +3197,29 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Onjuist opname bestand" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Onjuiste staat" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italië" @@ -3268,16 +3227,16 @@ msgstr "Italië" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japans" @@ -3285,7 +3244,7 @@ msgstr "Japans" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3296,7 +3255,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3305,8 +3264,8 @@ msgstr "" msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Koreaans" @@ -3324,16 +3283,16 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Laatste Overgeschreven Staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Laatste Opgeslagen Staat" @@ -3373,11 +3332,11 @@ msgstr "" "Links / Rechts-klik voor meer opties.\n" "Midden-klik om te wissen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" @@ -3385,7 +3344,7 @@ msgstr "Limiteer met behulp van FPS" msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" @@ -3429,21 +3388,21 @@ msgstr "Laad staat 7" msgid "Load State Slot 8" msgstr "Laad staat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3457,15 +3416,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Vergrendel Threads aan CPU cores" @@ -3477,16 +3432,33 @@ msgstr "Logboek" msgid "Log Configuration" msgstr "Logboek configuratie" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Log Types" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Weergeef het aantal frames dat per seconde wordt gerendered als een meting " +"van de emulatie snelheid,\n" +"\n" +"In geval van twijfel leeg laten." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Uitvoer" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Logboek Bijhouden" @@ -3494,10 +3466,6 @@ msgstr "Logboek Bijhouden" msgid "Lost connection to server!" msgstr "Verbinding met de server verloren!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Laag niveau (LLE) of Hoog niveau (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Knop" @@ -3515,8 +3483,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark bestanden(*.gcs)" @@ -3546,7 +3514,7 @@ msgstr "De geheugenkaart heeft al een save voor deze titel" msgid "Memcard already opened" msgstr "De geheugenkaart is al geopend" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Geheugen Byte" @@ -3597,11 +3565,11 @@ msgstr "Microfoon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3610,7 +3578,7 @@ msgstr "Overige Instellingen" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3635,7 +3603,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3666,11 +3634,11 @@ msgstr "" "Dempt de Wiimote speaker. Fixt willekeurige loskoppelingen van echte " "wiimotes. Heeft geen effect op geëmuleerde wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3764,28 +3732,28 @@ msgstr "NP Omhoog" msgid "Name:" msgstr "Naam:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Naam:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Native GCI-bestanden (*. GCI)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Volgende Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Volgende Scan" @@ -3806,8 +3774,8 @@ msgstr "Geen ISOs of WADS gevonden." msgid "No banner file found for title %s" msgstr "Geen banner gevonden voor titel %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3815,7 +3783,7 @@ msgstr "" msgid "No docking" msgstr "Geen docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Geen bestand geladen" @@ -3823,7 +3791,7 @@ msgstr "Geen bestand geladen" msgid "No free dir index entries" msgstr "Geen vrije map indexes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Geen opgenomen bestand" @@ -3837,20 +3805,20 @@ msgstr "Geen save map gevonden voor titel %s" msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Niet gelijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Niet verbonden" @@ -3875,7 +3843,7 @@ msgstr "Opmerkingen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Aantal Codes:" @@ -3888,15 +3856,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk Acceleratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Uit" @@ -3904,26 +3872,30 @@ msgstr "Uit" msgid "Offset:" msgstr "Afstand:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Er zijn maar %d blocks beschikaarr" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Open Wii &save map" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Open Bestand..." @@ -3941,22 +3913,14 @@ msgstr "OpenAL: Kan geen geluids devices vinden" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan device %s niet openen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Open de debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Open de logger" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3977,8 +3941,8 @@ msgstr "" "Rechts-klik en exporteer alle save bestanden,\n" "en importeer de saves naar een nieuwe geheugenkaart\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Overige" @@ -3994,7 +3958,7 @@ msgstr "" msgid "Output" msgstr "Uitgang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Opname afspelen" @@ -4039,17 +4003,21 @@ msgstr "Partitie %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauze" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" @@ -4062,10 +4030,10 @@ msgstr "Perfect" msgid "Perspective %d" msgstr "Perspectief %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Speel" @@ -4083,7 +4051,7 @@ msgstr "Spel/Pauze" msgid "Playable" msgstr "Speelbaar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Terugspeel Opties" @@ -4091,7 +4059,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4103,23 +4071,23 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Poort 4" @@ -4128,29 +4096,29 @@ msgstr "Poort 4" msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4163,11 +4131,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Vorige waarden" @@ -4183,7 +4151,7 @@ msgstr "Profiel" msgid "Properties" msgstr "Eigenschappen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Cache leegmaken" @@ -4210,7 +4178,7 @@ msgstr "R Knop" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4227,7 +4195,7 @@ msgstr "Afstand" msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Echt" @@ -4240,7 +4208,7 @@ msgstr "Echte Wiimote" msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Bevestig herverbinding van Wiimote " @@ -4249,17 +4217,17 @@ msgstr "Bevestig herverbinding van Wiimote " msgid "Reconnect Wiimote on State Loading" msgstr "Herverbind Wiimote Bij Staat Laden" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Speel Opnemen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Opname Informatie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opname Opties" @@ -4275,7 +4243,7 @@ msgstr "Rood Links" msgid "Red Right" msgstr "Rood Rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4290,7 +4258,7 @@ msgstr "" "In geval van twijfel selecteer Geen." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Ververs" @@ -4300,18 +4268,18 @@ msgstr "Ververs" msgid "Refresh List" msgstr "Lijst Verversen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4322,7 +4290,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" @@ -4332,7 +4300,7 @@ msgstr "Geef weer op hoofdscherm" msgid "Reset" msgstr "Opnieuw" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultaten" @@ -4354,33 +4322,33 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Zet DSP LLE op een aparte core (niet aanbevolen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Sample Rate:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Sla GCI op als..." @@ -4424,7 +4392,7 @@ msgstr "Sla Staat 7 Op" msgid "Save State Slot 8" msgstr "Sla Staat 8 Op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Sla staat op als..." @@ -4433,24 +4401,24 @@ msgstr "Sla staat op als..." msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" @@ -4468,7 +4436,7 @@ msgstr "Scannen voor ISO's" msgid "Scanning..." msgstr "Scannen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ScrShot" @@ -4476,25 +4444,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Slot" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Cheat Zoeken" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4509,16 +4477,16 @@ msgstr "Sectie %s niet gevonden in SYSCONF" msgid "Select" msgstr "Selecteer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4536,23 +4504,23 @@ msgstr "Selecteer een save file om te importeren" msgid "Select floating windows" msgstr "Selecteer zwevende vensters" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4572,7 +4540,7 @@ msgstr "" msgid "Selected font" msgstr "Geselecteerde font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4589,7 +4557,7 @@ msgstr "" "In geval van twijfel, gebruik je desktop resolutie. \n" "Als je nog steeds twijfelt, gebruik de hoogste resolutie die voor jou werkt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4617,11 +4585,11 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4631,16 +4599,16 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4666,55 +4634,55 @@ msgstr "Korte Naam:" msgid "Shoulder Buttons" msgstr "Schouder Knoppen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Toon &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Toon &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Toon &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Toon &Toolbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Toon FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Toon Frans" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Toon Input Venster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Toon Italië" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Toon JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Toon Korea" @@ -4722,47 +4690,47 @@ msgstr "Toon Korea" msgid "Show Language:" msgstr "Toon Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Bekijk Log &Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Toon PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Toon Platformen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Weergeef statistieken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Toon Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Toon USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Toon Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Toon een bevestigingsvenster voordat u stopt met een spel." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4772,27 +4740,39 @@ msgstr "" "Als je dit uitschakeld zie je geen irritante berichten, maar het betekend " "ook dat Dolphin spontaan uit kan vallen zonder enige reden." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Toon save commentaar" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Toon save titel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4804,15 +4784,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Toon dit help bericht" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Toon onbekend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4826,7 +4802,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" @@ -4834,20 +4810,20 @@ msgstr "Vereenvoudigd Chinees" msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Sla EFB toegang van de CPU over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4859,7 +4835,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4869,17 +4845,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4903,11 +4879,11 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Geluids Instellingen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Geluids backend %s is niet juist." @@ -4922,8 +4898,8 @@ msgid "Space" msgstr "Ruimte" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spaans" @@ -4931,7 +4907,7 @@ msgstr "Spaans" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4951,10 +4927,6 @@ msgstr "" "\n" "In geval van twijfel selecteer 640x528" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Geef een video-plugin aan" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -4973,11 +4945,11 @@ msgstr "" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Start &netplay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Start Op&nemen" @@ -4999,15 +4971,15 @@ msgstr "Opgeslage Staten" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5016,7 +4988,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Uitrekken naar Venster" @@ -5041,8 +5013,8 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Systeem Taal:" @@ -5050,7 +5022,7 @@ msgstr "Systeem Taal:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Ingang" @@ -5071,8 +5043,8 @@ msgstr "Linker Tabel" msgid "Table Right" msgstr "Rechter Tabel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5086,16 +5058,16 @@ msgstr "" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textuur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5111,13 +5083,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5158,7 +5130,7 @@ msgstr "De naam mag niet het volgende teken bevatten ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "De resulterende gedecodeerde AR code bevat geen regels." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5172,7 +5144,7 @@ msgstr "" "Het save bestand dat je probeert te kopiëren heeft een onjuiste bestands " "grootte" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5205,15 +5177,15 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Thema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Thema selectie ging fout" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5229,7 +5201,7 @@ msgstr "" "Deze instellingen overschrijven interne Dolphin instellingen.\n" "Onbepaald betekent dat het spel maakt gebruik van Dolphin's instellingen." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5237,11 +5209,11 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5259,7 +5231,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5284,13 +5256,13 @@ msgstr "Drempelwaarde" msgid "Tilt" msgstr "Kantelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Naar" @@ -5298,18 +5270,18 @@ msgstr "Naar" msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" @@ -5333,7 +5305,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turks" @@ -5358,7 +5330,7 @@ msgstr "UDP Wiimote " msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ONBEKEND" @@ -5385,24 +5357,24 @@ msgstr "" "manier hebt ingevoerd. \n" "Wil je deze regel negeren en verder gaan met verwerken?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Onbepaalde %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Ongedaan maken van Load staat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Onbekend" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Onbekend DVD commando %08x - fatale fout" @@ -5429,7 +5401,7 @@ msgstr "" msgid "Up" msgstr "Omhoog" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Update" @@ -5438,23 +5410,23 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Gebruik &Volledig Scherm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5467,7 +5439,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5481,15 +5453,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Hulpprogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Waarde" @@ -5497,7 +5469,7 @@ msgstr "Waarde" msgid "Value:" msgstr "Waarde:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Waarde:" @@ -5509,11 +5481,11 @@ msgstr "Breedsprakigheid" msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" @@ -5528,7 +5500,7 @@ msgstr "WAD installatie mislukt: fout bij het creëren van %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installatie mislukt: fout bij het creëren van %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5570,7 +5542,7 @@ msgstr "" "%s\n" "Weet je zeker dat je door wil gaan?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5583,7 +5555,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5591,7 +5563,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5599,7 +5571,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5627,7 +5599,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5635,7 +5607,7 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5643,15 +5615,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5660,7 +5632,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kon het bestand niet lezen" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5669,7 +5641,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5682,7 +5654,7 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Connected" @@ -5690,7 +5662,7 @@ msgstr "Wiimote Connected" msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote instellingen" @@ -5715,10 +5687,10 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Werken..." @@ -5754,7 +5726,7 @@ msgstr "XAudio2 initialisatie mislukt: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creatie mislukt: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5776,11 +5748,11 @@ msgstr "U kunt geen panelen sluiten die paginas bevatten." msgid "You must choose a game!!" msgstr "Je moet een spel kiezen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Je moet een naam invoeren!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" @@ -5788,7 +5760,7 @@ msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -5815,11 +5787,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 code niet ondersteund" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code onbekend voor Dolphin: %08x" @@ -5829,7 +5801,7 @@ msgstr "Zero code onbekend voor Dolphin: %08x" msgid "[ waiting ]" msgstr "[ wachten ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5845,7 +5817,7 @@ msgstr "" msgid "[Custom]" msgstr "[Aangepast]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5862,7 +5834,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5880,7 +5852,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "applader (.img)" @@ -5908,7 +5880,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "geen wii save of het lezen van de grootte van bestandsheader %x is mislukt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5917,7 +5889,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6028,9 +6000,24 @@ msgstr "| OF" #~ msgid "Danish" #~ msgstr "Deens" +#~ msgid "Disable Lighting" +#~ msgstr "Schakel Lighting uit" + +#~ msgid "Disable Textures" +#~ msgstr "Schakel Textures uit" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Schakel Wiimote speaker uit" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Schakel texturing uit.\n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6127,9 +6114,16 @@ msgstr "| OF" #~ "Afhankelijk van hoe het spel gebruik maakt van deze functie, hits van de " #~ "snelheid veroorzaakt door deze optie variëren van geen tot kritisch." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sluit Dolphin met emulator" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Mislukt om DSP ROM te laden vanuit: %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Laad Native Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6179,6 +6173,16 @@ msgstr "| OF" #~ "Als een spel hangt, werkt alleen in de Interpreter anders crasht Dolphin, " #~ "Deze optie kan het spel fixen" +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Verbeterd performance, maar zorgt ervoor dat belichting in meeste games " +#~ "verdwijnt. \n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "Input Source" #~ msgstr "Invoer bron" @@ -6211,6 +6215,12 @@ msgstr "| OF" #~ "Laden native mipmaps is het nauwkeuriger gedrag, maar kan ook de " #~ "prestaties doen afnemen (uw kilometerstand kan zich evenwel verschillen)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Laag niveau (LLE) of Hoog niveau (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Lua Script Console" @@ -6242,6 +6252,12 @@ msgstr "| OF" #~ msgid "OpenGL" #~ msgstr "Open" +#~ msgid "Opens the debugger" +#~ msgstr "Open de debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Open de logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6289,6 +6305,9 @@ msgstr "| OF" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Toon het aantal frames per seconde." +#~ msgid "Show this help message" +#~ msgstr "Toon dit help bericht" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6331,6 +6350,9 @@ msgstr "| OF" #~ "De andere opties zijn vaste resoluties voor het kiezen van een visuele " #~ "kwaliteit, onafhankelijk van uw beeldscherm grootte." +#~ msgid "Specify a video backend" +#~ msgstr "Geef een video-plugin aan" + #~ msgid "Specify an audio plugin" #~ msgstr "Geef een audio-plugin" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index ed66a17a00..02daed4bf6 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-23 11:42+0100\n" "Last-Translator: Krzysztof Baszczok \n" "Language-Team: Polish \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(za dużo do wyÅ›wietlenia)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -54,9 +54,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -152,7 +152,7 @@ msgstr "%sEksportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" @@ -161,147 +161,147 @@ msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&O programie..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&ZaÅ‚aduj z napÄ™du DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Breakpointy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&ZaÅ‚aduj z ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Menadżer cheatów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulacja" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Plik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&PeÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Ustawienia &hotkey'ów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Wczytaj stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Menadżer karty pamiÄ™ci (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Pamięć" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Otwórz..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opcje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Wstrzymaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Tryb &Read-only" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Rejestry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&DźwiÄ™k" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&NarzÄ™dzia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Wideo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Widok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "'" @@ -317,27 +317,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(Nieznany)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(wyÅ‚Ä…czone)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bitów" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bity" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bitów" @@ -345,7 +345,7 @@ msgstr "8 bitów" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -358,11 +358,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -371,8 +371,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay jest już otwarte!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Gra nie jest aktualnie uruchomiona." @@ -422,7 +422,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Kody AR" @@ -435,7 +435,7 @@ msgstr "O Dolphin" msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "DokÅ‚adność:" @@ -443,7 +443,7 @@ msgstr "DokÅ‚adność:" msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -476,7 +476,7 @@ msgstr "" "Kod:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -484,7 +484,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -493,7 +493,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Fill and " "Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -502,7 +502,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Ram Write " "And Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -511,12 +511,12 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwa wartość (%08x) w Memory Copy (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -529,27 +529,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "BÅ‚Ä…d Action Replay: niewÅ‚aÅ›ciwa linia kodu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: NiewÅ‚aÅ›ciwy rozmiar %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: NiewÅ‚aÅ›ciwy typ Normal Code %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adapter:" @@ -558,11 +558,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -572,7 +572,7 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Dodaj..." @@ -620,36 +620,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Reguluje siÅ‚Ä™ nacisku wymaganego do aktywacji przycisków." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" @@ -657,9 +657,10 @@ msgstr "Spakowane obrazy GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -673,15 +674,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Alternate Wiimote Timing" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "Analizuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtrowanie anizotropowe:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Antyaliasing:" @@ -693,15 +694,15 @@ msgstr "Apploader niewÅ‚aÅ›ciwego rozmiaru... Czy to rzeczywiÅ›cie apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógÅ‚ wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Zastosuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -711,7 +712,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arabski" @@ -720,7 +721,7 @@ msgstr "Arabski" msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteÅ› pewny by usunÄ…c \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -728,12 +729,12 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -741,12 +742,12 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -754,24 +755,24 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Wiele z 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (rozmiar okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Auto-dopasowanie rozmiaru okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -781,23 +782,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" -"ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "BP rejestr" @@ -805,12 +794,12 @@ msgstr "BP rejestr" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Ustawienia Backend'u" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend :" @@ -827,7 +816,7 @@ msgstr "W tyÅ‚" msgid "Bad File Header" msgstr "ZÅ‚y nagłówek pliku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Baner" @@ -844,11 +833,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Wajcha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -860,7 +849,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Suma kontrolna Block Allocation Table nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloki" @@ -877,7 +866,7 @@ msgid "Blue Right" msgstr "Niebieski prawo" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Dół" @@ -890,7 +879,7 @@ msgstr "Bound Controls: %lu" msgid "Broken" msgstr "Zepsuty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Szukaj" @@ -898,11 +887,11 @@ msgstr "Szukaj" msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" @@ -916,7 +905,7 @@ msgstr "Bufor:" msgid "Buttons" msgstr "Przyciski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -928,19 +917,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -955,7 +944,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -968,7 +957,7 @@ msgstr "" "Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować bÅ‚Ä™dy.\\nW razie " "wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Anuluj" @@ -984,7 +973,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeÅ„ podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -995,7 +984,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1003,18 +992,18 @@ msgstr "" "Tego pliku nie można użyć jako karty pamiÄ™ci.\n" "Chcesz użyć tego samego pliku w obu slotach?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle poÅ‚Ä…czenia %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" @@ -1022,7 +1011,7 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "KataloÅ„ski" @@ -1034,7 +1023,7 @@ msgstr "Åšrodek" msgid "Change" msgstr "ZmieÅ„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "ZmieÅ„ &dysk" @@ -1047,7 +1036,7 @@ msgstr "ZmieÅ„ dysk" msgid "Change Game" msgstr "ZmieÅ„ grÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1063,8 +1052,8 @@ msgstr "Zmienia symbol do parametru zFar (po poprawce)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Zmienia symbol do parametru zNear (po poprawce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Zmiana tego nie bÄ™dzie miaÅ‚a wpÅ‚ywu jeÅ›li emulator jest w trakcie pracy!" @@ -1077,7 +1066,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Szukaj cheatów" @@ -1089,35 +1078,35 @@ msgstr "Menadżer cheatów" msgid "Check Partition Integrity" msgstr "Sprawdź integralność partycji" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "Sprawdzanie integralnoÅ›ci..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1125,7 +1114,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1133,8 +1122,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1161,22 +1150,22 @@ msgstr "" "Klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " "rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Zamknij" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Ko&nfiguruj..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Info kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kod:" @@ -1184,7 +1173,7 @@ msgstr "Kod:" msgid "Command" msgstr "Polecenie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Komentarz" @@ -1192,20 +1181,20 @@ msgstr "Komentarz" msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Kompresowanie ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Konfig" @@ -1224,17 +1213,17 @@ msgstr "Konfiguracja sterowania" msgid "Configure Pads" msgstr "Konfiguracja padów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" @@ -1243,11 +1232,11 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "PoÅ‚Ä…cz Wiilot %i" @@ -1272,7 +1261,7 @@ msgstr "PoÅ‚Ä…cz Wiilot 3" msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1292,7 +1281,7 @@ msgstr "Konwertuj do GCI" msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" @@ -1306,7 +1295,7 @@ msgstr "RdzeÅ„" msgid "Could not create %s" msgstr "Nie można utworzyć %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Beckend %s nie mógÅ‚ zostać zainicjalizowany." @@ -1340,7 +1329,7 @@ msgstr "" "Nie można ustawić pada. Gracz odszedÅ‚ lub gra jest uruchomiona!\n" "(Ustawienie padów podczas uruchomionej gry, nie jest jeszcze wspierane)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1353,11 +1342,11 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1365,8 +1354,8 @@ msgstr "" "Nie można zainicjować rdzenia.\n" "Sprawdź konfiguracjÄ™." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Ilość:" @@ -1374,8 +1363,8 @@ msgstr "Ilość:" msgid "Country:" msgstr "Kraj:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Utwórz kod AR" @@ -1384,22 +1373,22 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nowÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Utworzone przez KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." "com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Utworzone przez VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Utworzone przez black_rider and published on ForumW.org > Web Developments" @@ -1412,11 +1401,11 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "ObciÄ™cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1430,7 +1419,7 @@ msgstr "" msgid "Crossfade" msgstr "Suwak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!" @@ -1447,11 +1436,11 @@ msgstr "Ustawienia Custom Projection Hack" msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czeski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1459,36 +1448,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" @@ -1500,7 +1489,7 @@ msgstr "DVDLowRead - Fatal Error: bÅ‚Ä…d odczytu dysku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: bÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Rozmiar danych" @@ -1508,8 +1497,8 @@ msgstr "Rozmiar danych" msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Pliki Datel MaxDrive/Pro(*.sav)" @@ -1525,7 +1514,7 @@ msgstr "Dead Zone" msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Debugowanie" @@ -1533,16 +1522,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1550,7 +1539,7 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" @@ -1563,7 +1552,7 @@ msgstr "DomyÅ›lna czcionka" msgid "Delete" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "UsuÅ„ zapis" @@ -1572,7 +1561,7 @@ msgstr "UsuÅ„ zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Opis" @@ -1594,8 +1583,8 @@ msgstr "" msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1619,28 +1608,20 @@ msgstr "" "Suma kontrolna folderu oraz \n" "folderu zapasowego nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "WyÅ‚Ä…cz Per-Pixel Depth" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "WyÅ‚Ä…cz tekstury" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1654,7 +1635,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1670,16 +1651,6 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"WyÅ‚Ä…cza teksturowanie.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Dysk" @@ -1689,11 +1660,11 @@ msgstr "Dysk" msgid "Disc Read Error" msgstr "DÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1707,20 +1678,20 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ustawienia graficzne %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin strona &WWW" @@ -1732,16 +1703,16 @@ msgstr "Konfiguracja Dolphin'a" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Konfiguracja emulowanego Wiilota" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1749,7 +1720,7 @@ msgstr "Filmy TAS (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Konfiguracja Wiilot'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" @@ -1791,23 +1762,23 @@ msgstr "Perkusja" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Zrzut Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Zrzut ramek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Zrzut tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1817,7 +1788,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1827,7 +1798,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1838,23 +1809,23 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holenderski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&WyjÅ›cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Copies" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1867,11 +1838,11 @@ msgstr "" msgid "EUROPE" msgstr "Europa" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Edycja" @@ -1887,7 +1858,7 @@ msgstr "Edytuj konfiguracjÄ™" msgid "Edit Patch" msgstr "Edytuj patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" @@ -1900,15 +1871,15 @@ msgstr "Edytuj..." msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "WÄ…tek emulacji jest już uruchomiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1923,7 +1894,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz wirtualnÄ… emulacjÄ™ XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1951,7 +1922,7 @@ msgstr "Stan emulacji:" msgid "Enable" msgstr "WÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1967,7 +1938,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" @@ -1983,11 +1954,11 @@ msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" msgid "Enable Bounding Box Calculation" msgstr "WÅ‚Ä…cz Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" @@ -1995,11 +1966,11 @@ msgstr "WÅ‚Ä…cz kody" msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" @@ -2007,7 +1978,7 @@ msgstr "WÅ‚Ä…cz skróty klawiszowe" msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" @@ -2016,11 +1987,11 @@ msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" @@ -2028,11 +1999,11 @@ msgstr "WÅ‚Ä…cz wygaszacz ekranu" msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2054,11 +2025,11 @@ msgstr "" "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "WÅ‚Ä…cz strony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2070,7 +2041,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2104,7 +2075,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2124,7 +2095,7 @@ msgstr "" "WÅ‚Ä…cza Memory Management Unit, wymagane dla niektórych gier. (ON = " "kompatybilny, OFF = szybko)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2139,13 +2110,13 @@ msgid "End" msgstr "Koniec" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Angielski" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Ulepszenia" @@ -2163,17 +2134,17 @@ msgstr "WejÅ›cie %d/%d" msgid "Entry 1/%d" msgstr "WejÅ›cie 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "BÅ‚Ä…d" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2212,10 +2183,6 @@ msgstr "Handler wyjÄ…tku - dostÄ™p poniżej obszaru pamiÄ™ci. %08llx%08llx" msgid "Execute" msgstr "Wykonaj" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "WyjÅ›cie z Dolphina" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Eksportuj nieudany" @@ -2229,19 +2196,19 @@ msgstr "Eksportuj plik" msgid "Export Recording" msgstr "Eksportuj nagranie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2249,7 +2216,7 @@ msgstr "Eksportuj wszystkie zapisy" msgid "Export failed, try again?" msgstr "Eksport nieudany, ponowić?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Eksportuj zapis jako..." @@ -2257,7 +2224,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2293,28 +2260,28 @@ msgstr "Wypakuj plik..." msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Wypakowywanie..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Bajt FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO Player" @@ -2338,7 +2305,7 @@ msgstr "NasÅ‚uchiwanie nieudane!" msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2456,23 +2423,19 @@ msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" msgid "Failed to write header for file %d" msgstr "BÅ‚Ä…d zapisu nagłówka do pliku %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "Farsi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Fast Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2480,11 +2443,11 @@ msgstr "" "Fatal desync. Anulowanie playback'u. (BÅ‚Ä…d w PlayWiimote: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Informacja o pliku" @@ -2530,43 +2493,43 @@ msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "NastÄ™pny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "Poprzedni" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "WymuÅ› 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "WymuÅ› filtrowanie tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2578,7 +2541,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚aczone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2590,7 +2553,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2612,17 +2575,17 @@ msgstr "" msgid "Forward" msgstr "W przód" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "Znaleziono %d dla '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Ramka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Ramka" @@ -2631,37 +2594,37 @@ msgstr "Ramka" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Zrzuty ramek używajÄ… FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "Frame Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "ZasiÄ™g ramki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limit ramek:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Ramki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Free Look" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francuski" @@ -2669,20 +2632,20 @@ msgstr "Francuski" msgid "Frets" msgstr "Gryfy" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "FullScr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Rozdzielczość peÅ‚noekranowa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Plik GCI(*.gci)" @@ -2690,11 +2653,11 @@ msgstr "Plik GCI(*.gci)" msgid "GCMic Configuration" msgstr "Konfiguracja GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2722,24 +2685,28 @@ msgstr "Specyficzne ustawienia gry" msgid "GameConfig" msgstr "Konfiguracja gry" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Kody Gecko" @@ -2759,8 +2726,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Główne" @@ -2769,29 +2736,29 @@ msgid "General Settings" msgstr "Ustawienia ogólne" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Niemiecki" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeks jest wiÄ™kszy niż rozmiar listy kodów AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "WiÄ™kszy niż" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2809,7 +2776,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grecki" @@ -2829,11 +2796,11 @@ msgstr "Zielony prawo" msgid "Guitar" msgstr "Gitara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wywoÅ‚any, raportuj!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacki" @@ -2841,7 +2808,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrajski" @@ -2853,7 +2820,7 @@ msgstr "Wysokość" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2872,11 +2839,11 @@ msgstr "" msgid "Hide" msgstr "Ukryj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Ukryj kursor myszy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2901,11 +2868,11 @@ msgstr "Konfiguracja skrótów klawiszowych" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "WÄ™gierski" @@ -2913,13 +2880,13 @@ msgstr "WÄ™gierski" msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS: Próba otrzymania danych z nieznanego ticket'u: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2932,11 +2899,11 @@ msgstr "" "TitleID %016llx.\n" "Program teraz chyba siÄ™ zawiesi :C" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -2956,7 +2923,7 @@ msgstr "CzuÅ‚ość IR" msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Foldery ISO" @@ -2964,7 +2931,7 @@ msgstr "Foldery ISO" msgid "ITALY" msgstr "WÅ‚ochy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ikona" @@ -2983,7 +2950,7 @@ msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2993,11 +2960,11 @@ msgstr "" "ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale może " "spowodować trwaÅ‚y szum zależnie od gry)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignoruj zmiany formatu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3011,7 +2978,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3025,7 +2992,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importuj zapis" @@ -3053,7 +3020,7 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie sav\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3065,16 +3032,6 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "W grze" @@ -3104,7 +3061,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3112,11 +3069,11 @@ msgstr "Włóż kartÄ™ SD" msgid "Insert name here.." msgstr "Wprowadź nazwÄ™ tutaj..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3126,23 +3083,23 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "BÅ‚Ä…d sprawdzania integralnoÅ›ci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone. Nie znaleziono bÅ‚Ä™dów." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3151,19 +3108,19 @@ msgstr "" "Sprawdzenie integralnoÅ›ci dla partycji %d nie powiodÅ‚o siÄ™. Twój zrzut jest " "prawdopodobnie uszkodzony lub zostaÅ‚ źle spatchowany." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Ustawienia interfejsu" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - kompresja nie powiodÅ‚a siÄ™" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3172,15 +3129,15 @@ msgstr "" "WewnÄ™trzny bÅ‚Ä…d LZO - dekompresja nie powiodÅ‚a siÄ™ (%d) (%li, %li) \n" "Wczytaj stan ponownie" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" @@ -3193,7 +3150,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "NiewÅ‚aÅ›ciwy rozmiar (%x) lub Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "NiewÅ‚aÅ›ciwa wartość!" @@ -3206,7 +3163,7 @@ msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" msgid "Invalid event type %i" msgstr "NiewÅ‚aÅ›ciwy typ zdarzenia %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "NiewÅ‚aÅ›ciwy plik" @@ -3221,31 +3178,31 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "NiewÅ‚aÅ›ciwy parametr przeszukiwania (nie wybrano obiektu)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (nie udaÅ‚o siÄ™ zamienić na liczbÄ™)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (wspierane sÄ… tylko równe dÅ‚ugoÅ›ci " "Å‚aÅ„cucha)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "WÅ‚oski" @@ -3253,16 +3210,16 @@ msgstr "WÅ‚oski" msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "JapoÅ„ski" @@ -3270,7 +3227,7 @@ msgstr "JapoÅ„ski" msgid "KOREA" msgstr "Korea" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3280,7 +3237,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÄ…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "Okno na wierzchu" @@ -3289,8 +3246,8 @@ msgstr "Okno na wierzchu" msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "KoreaÅ„ski" @@ -3308,16 +3265,16 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "JÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Ostatni nadpisany stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Ostatni zapisany stan" @@ -3357,11 +3314,11 @@ msgstr "" "LPM/PPM wiÄ™cej opcji.\n" "ÅšPM by wyczyÅ›cić." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limit FPS" @@ -3369,7 +3326,7 @@ msgstr "Limit FPS" msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" @@ -3413,20 +3370,20 @@ msgstr "Wczytaj stan Slot 7" msgid "Load State Slot 8" msgstr "Wczytaj stan Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3440,15 +3397,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Åaduje wartoÅ›ci wczeÅ›niej ustawione z dostÄ™pnych hack patterns" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Przypisz wÄ…tki do rdzeni" @@ -3460,16 +3413,32 @@ msgstr "Log" msgid "Log Configuration" msgstr "Konfiguracja Logu" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy logów" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Pokaż liczbÄ™ renderowanych ramek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" +"\n" +"W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Logger Outputs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Logging" @@ -3477,10 +3446,6 @@ msgstr "Logging" msgid "Lost connection to server!" msgstr "PoÅ‚Ä…czenie z serwerem przerwane!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Llow level (LLE) lub high level (HLE) audio" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Button" @@ -3498,8 +3463,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Speed Hack" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Pliki MadCatz Gameshark(*.gcs)" @@ -3529,7 +3494,7 @@ msgstr "Karta pamiÄ™ci już posiada zapis dla tego tytuÅ‚u" msgid "Memcard already opened" msgstr "Karta pamiÄ™ci już otwarta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" @@ -3580,11 +3545,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3593,7 +3558,7 @@ msgstr "Ustawienia różne" msgid "Modifier" msgstr "Zmiennik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3618,7 +3583,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3648,11 +3613,11 @@ msgstr "" " Wycisza gÅ‚oÅ›nik Wiilota. Naprawia losowe rozÅ‚Ä…czenia z prawdziwymi " "Wiilotami. Brak efektu na emulowanych Wiilotach." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "Notka: Wielkość strumienia nie zgadza siÄ™ z wÅ‚aÅ›ciwÄ… dÅ‚ugoÅ›ciÄ… danych\n" @@ -3747,28 +3712,28 @@ msgstr "NP Up" msgid "Name:" msgstr "Nazwa:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nazwa:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Natywne pliki GCI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "NastÄ™pna strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "NastÄ™pne skanowanie" @@ -3789,8 +3754,8 @@ msgstr "Nie odnaleziono IOS/WAD" msgid "No banner file found for title %s" msgstr "Nie odnaleziono pliku banera dla tytuÅ‚u %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "Brak opisu" @@ -3798,7 +3763,7 @@ msgstr "Brak opisu" msgid "No docking" msgstr "Brak dokowania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Nie wczytano żadnego pliku" @@ -3806,7 +3771,7 @@ msgstr "Nie wczytano żadnego pliku" msgid "No free dir index entries" msgstr "Brak wolnych wejść folderów" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Brak nagranego pliku" @@ -3820,20 +3785,20 @@ msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norweski" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Nie równe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" @@ -3858,7 +3823,7 @@ msgstr "Uwagi" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Liczba kodów:" @@ -3871,15 +3836,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Acelerator Nunchak'a" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "ZasiÄ™g objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "WyÅ‚Ä…czone" @@ -3887,26 +3852,30 @@ msgstr "WyÅ‚Ä…czone" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "DostÄ™pnych tylko %d bloków" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Otwórz plik..." @@ -3924,22 +3893,14 @@ msgstr "OpenAL: nie można odnaleźć urzÄ…dzeÅ„ dźwiÄ™kowych" msgid "OpenAL: can't open device %s" msgstr "OpenAL: nie można otworzyć urzÄ…dzenia %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Otwiera debugera" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Otwiera logera" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3959,8 +3920,8 @@ msgstr "" "PPM i wyeksportuj wszystkie zapisy,\n" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "PozostaÅ‚e" @@ -3976,7 +3937,7 @@ msgstr "" msgid "Output" msgstr "WyjÅ›cie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Od&twórz nagranie" @@ -4021,17 +3982,21 @@ msgstr "Partycja %i" msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Åšcieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" @@ -4044,10 +4009,10 @@ msgstr "Perfekcyjny" msgid "Perspective %d" msgstr "Perspekrtywa %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Play" @@ -4065,7 +4030,7 @@ msgstr "Play/Pause" msgid "Playable" msgstr "Grywalny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opcje playback'u" @@ -4073,7 +4038,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Potwierdź..." @@ -4085,23 +4050,23 @@ msgstr "ProszÄ™ utworzyć perspektywÄ™ przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4110,29 +4075,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Premature movie end in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Premature movie end in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Premature movie end in PlayWiimote. %u > %u" @@ -4145,11 +4110,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Poprzednia wartość" @@ -4165,7 +4130,7 @@ msgstr "Profil" msgid "Properties" msgstr "WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Purge Cache" @@ -4192,7 +4157,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4209,7 +4174,7 @@ msgstr "ZasiÄ™g" msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Prawdziwy" @@ -4221,7 +4186,7 @@ msgstr "Prawdziwy Wiilot" msgid "Real Wiimotes" msgstr "Prawdziwe Wiiloty" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Potwierdzenie ponownego poÅ‚Ä…czenia Wiilota" @@ -4229,17 +4194,17 @@ msgstr "Potwierdzenie ponownego poÅ‚Ä…czenia Wiilota" msgid "Reconnect Wiimote on State Loading" msgstr "PodÅ‚acz ponownie Wiilota gdy wczytywany jest stan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Nagranie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Informacje nagrywania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opcje nagrywania" @@ -4255,7 +4220,7 @@ msgstr "Czerwony lewo" msgid "Red Right" msgstr "Czerwony prawo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4270,7 +4235,7 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, wybierz Å»adne." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "OdÅ›wież" @@ -4280,18 +4245,18 @@ msgstr "OdÅ›wież" msgid "Refresh List" msgstr "OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4301,7 +4266,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Generuj w oknie głównym" @@ -4311,7 +4276,7 @@ msgstr "Generuj w oknie głównym" msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Wynik" @@ -4333,33 +4298,33 @@ msgstr "GaÅ‚ka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wÄ…tku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rosyjski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Bezpieczny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Wskaźnik próbkowania:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Zapisz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Zapisz GCI jako..." @@ -4403,7 +4368,7 @@ msgstr "Zapisz stan Slot 8" msgid "Save State Slot 8" msgstr "Zapisz stan Slot 9" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Zapisz stan..." @@ -4412,24 +4377,24 @@ msgstr "Zapisz stan..." msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" @@ -4446,7 +4411,7 @@ msgstr "PrzeszukujÄ™ obrazy ISO" msgid "Scanning..." msgstr "PrzeszukujÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ScrShot" @@ -4454,23 +4419,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "Przeszukaj bieżący obiekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "Szukaj wartoÅ›ci hex:" @@ -4485,16 +4450,16 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF" msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4512,23 +4477,23 @@ msgstr "Wybierz plik zapisu do importowania" msgid "Select floating windows" msgstr "Select floating windows" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4550,7 +4515,7 @@ msgstr "" msgid "Selected font" msgstr "Wybrana czcionka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4566,7 +4531,7 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, użyj rozdzielczoÅ›ci komputera.\n" "JeÅ›li nadal masz wÄ…tpliwoÅ›ci, użyj najwyższej dziaÅ‚ajÄ…cej rozdzielczoÅ›ci." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4593,11 +4558,11 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" @@ -4606,16 +4571,16 @@ msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Indeks jest wiÄ™kszy niz rozmiar listy kodu AR %lu" @@ -4640,55 +4605,55 @@ msgstr "Krótka nazwa:" msgid "Shoulder Buttons" msgstr "Przyciski tylnie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Pokaż &konsolÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Pokaż &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Pokaż pasek &stanu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Pokaż pasek &narzÄ™dzi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Pokaż FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Pokaż FrancjÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Pokaż Input Display" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Pokaż WÅ‚ochy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Pokaż JaponiÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Pokaż KoreÄ™" @@ -4696,47 +4661,47 @@ msgstr "Pokaż KoreÄ™" msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Pokaż &konfiguracjÄ™ logu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Pokaż PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Pokaż platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Pokaż statystyki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Pokaż Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Pokaż USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Pokaż WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4746,27 +4711,39 @@ msgstr "" "WyÅ‚Ä…czenie tego pozwoli uniknąć denerwujÄ…cych i maÅ‚o ważnych wiadomoÅ›ci, ale " "może spowodować zamkniÄ™cie programu bez żadnego ostrzeżenia." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Pokaż komentarz zapisu" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Pokaż ikonÄ™ zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4777,15 +4754,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Pokaż wiadomość pomocy" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Pokaż niewiadome" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4799,7 +4772,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" @@ -4807,19 +4780,19 @@ msgstr "ChiÅ„ski uproszczony" msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "PomiÅ„ EFB Access z CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4831,7 +4804,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4847,17 +4820,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4881,11 +4854,11 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "NiewÅ‚aÅ›ciwy sound beckend %s." @@ -4900,8 +4873,8 @@ msgid "Space" msgstr "Space" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "HiszpaÅ„ski" @@ -4909,7 +4882,7 @@ msgstr "HiszpaÅ„ski" msgid "Speaker Volume:" msgstr "Poziom gÅ‚oÅ›nika:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4929,10 +4902,6 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Wybierz video backend" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -4951,11 +4920,11 @@ msgstr "Standard Controller" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "&Rozpocznij nagrywanie" @@ -4977,15 +4946,15 @@ msgstr "Stany zapisu" msgid "Stick" msgstr "GaÅ‚ka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4999,7 +4968,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "RozciÄ…gnij do okna" @@ -5024,8 +4993,8 @@ msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "JÄ™zyk systemu:" @@ -5033,7 +5002,7 @@ msgstr "JÄ™zyk systemu:" msgid "TAIWAN" msgstr "Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "WejÅ›cie TAS" @@ -5054,8 +5023,8 @@ msgstr "Talerz lewo" msgid "Table Right" msgstr "Talerz prawo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5069,15 +5038,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Tekstura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5093,13 +5062,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5139,7 +5108,7 @@ msgstr "Nazwa nie może zawierać znaku ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5155,7 +5124,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Zapis, który chcesz skopiować posiada niewÅ‚aÅ›ciwÄ… wielkość pliku." -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5187,15 +5156,15 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Styl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Wybór stylu nieudany" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5211,7 +5180,7 @@ msgstr "" "Te ustawienia przewyższaja źródÅ‚owe ustawienia programu.\n" "NieokreÅ›lone ustawienia odczytywane sÄ… ze źródÅ‚owych." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5219,11 +5188,11 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5241,7 +5210,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5265,13 +5234,13 @@ msgstr "Threshold" msgid "Tilt" msgstr "Przechylenie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "TytuÅ‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Do" @@ -5279,18 +5248,18 @@ msgstr "Do" msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" @@ -5314,7 +5283,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turecki" @@ -5339,7 +5308,7 @@ msgstr "UDP Wiilot" msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "Nieznany_%X" @@ -5367,24 +5336,24 @@ msgstr "" "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" "Czy chcesz pominąć liniÄ™ i kontynuować analizÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Niezdefiniowane %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Cofnij wczytywanie stanu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "Nieoczekiwane wywoÅ‚anie 0x80? Przerywanie..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Nieznany" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Nieznane polecenie DVD %08x - poważny bÅ‚Ä…d" @@ -5409,7 +5378,7 @@ msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" msgid "Up" msgstr "Góra" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Aktualizuj" @@ -5418,23 +5387,23 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Użyj trybu peÅ‚noekranowego" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5446,7 +5415,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5461,15 +5430,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "NarzÄ™dzie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Wartość" @@ -5477,7 +5446,7 @@ msgstr "Wartość" msgid "Value:" msgstr "Wartość:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Wartość:" @@ -5489,11 +5458,11 @@ msgstr "Verbosity" msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Poziom" @@ -5507,7 +5476,7 @@ msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia biletu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5548,7 +5517,7 @@ msgstr "" "%s\n" "Kontynuować?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5561,7 +5530,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5572,7 +5541,7 @@ msgstr "" "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed " "kontynuacjÄ… lub wczytaj ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5584,7 +5553,7 @@ msgstr "" "ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu. W przeciwnym razie może " "nastÄ…pić desynchronizacja." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5626,7 +5595,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5634,7 +5603,7 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5642,15 +5611,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5659,7 +5628,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: nie moża odczytać z pliku" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiilot" @@ -5668,7 +5637,7 @@ msgstr "Wiilot" msgid "Wiimote %i" msgstr "Wiilot %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5681,7 +5650,7 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" @@ -5689,7 +5658,7 @@ msgstr "Wiilot poÅ‚Ä…czony" msgid "Wiimote Motor" msgstr "Wiilot Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Ustawienia Wiilota" @@ -5713,10 +5682,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "PracujÄ™..." @@ -5751,7 +5720,7 @@ msgstr "Inicjalizacja XAudio2 nie powiodÅ‚a siÄ™: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Utworzenie XAudio2 master voice nie powiodÅ‚o siÄ™: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "XF reg" @@ -5775,11 +5744,11 @@ msgstr "Nie możesz zamknąć paneli jeÅ›li sÄ… w nich strony." msgid "You must choose a game!!" msgstr "Wybierz grÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Musisz wprowadzić nazwÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musisz wprowadzić poprawnÄ… wartość dziesiÄ™tnÄ…, szestnastkowÄ… lub ósemkowÄ…." @@ -5788,7 +5757,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5815,11 +5784,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Kod 3 zero niewspierany" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Kod zero nieznany dla programu: %08x" @@ -5829,7 +5798,7 @@ msgstr "Kod zero nieznany dla programu: %08x" msgid "[ waiting ]" msgstr "[ czekam ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5845,7 +5814,7 @@ msgstr "" msgid "[Custom]" msgstr "[WÅ‚asne]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5864,7 +5833,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5882,7 +5851,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5909,7 +5878,7 @@ msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." msgid "not a wii save or read failure for file header size %x" msgstr "to nie jest zapis Wii lub bÅ‚Ä…d odczytu rozmiaru nagłówka pliku %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5918,7 +5887,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -5999,6 +5968,17 @@ msgstr "| OR" #~ "Dla lepszego efektu najlepiej ustawić proporcje ekranu na rozciÄ…gniete do " #~ "okna, gdy używasz tej opcji." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" +#~ "ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." + #~ msgid "Bad gameini filename" #~ msgstr "ZÅ‚a nazwa pliku gameini" @@ -6067,9 +6047,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "DuÅ„ski" +#~ msgid "Disable Lighting" +#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" + +#~ msgid "Disable Textures" +#~ msgstr "WyÅ‚Ä…cz tekstury" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "WyÅ‚Ä…cza teksturowanie.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6210,9 +6205,15 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "BÅ‚Ä…d otwarcia pliku %s do nagrania." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "WyjÅ›cie z Dolphina" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nieudane Å‚adowanie romu DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6260,6 +6261,15 @@ msgstr "| OR" #~ "JeÅ›li gra siÄ™ zawiesza, dziaÅ‚a tylko w Interpreter lub Dolphin siÄ™ " #~ "zawiesza, ta opcja może naprawić dziaÅ‚anie gry." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "Input Source" #~ msgstr "ŹródÅ‚o wejÅ›cia" @@ -6301,6 +6311,12 @@ msgstr "| OR" #~ "Wczytywanie natywnych mipmap jest bardziej dokÅ‚adnym zachowaniem, ale " #~ "może obniżyć wydajność." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Llow level (LLE) lub high level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Konsola skryptów Lua" @@ -6335,6 +6351,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Otwiera debugera" + +#~ msgid "Opens the logger" +#~ msgstr "Otwiera logera" + #~ msgid "Plugins" #~ msgstr "Wtyczki" @@ -6414,6 +6436,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Pokazuje iloÅ›c generowanych ramek na sekundÄ™." +#~ msgid "Show this help message" +#~ msgstr "Pokaż wiadomość pomocy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6453,6 +6478,9 @@ msgstr "| OR" #~ "PozostaÅ‚e opcje to ustawione rozdzielczoÅ›cie niezależne od wielkoÅ›ci " #~ "ekranu." +#~ msgid "Specify a video backend" +#~ msgstr "Wybierz video backend" + #~ msgid "Specify an audio plugin" #~ msgstr "Wybierz wtyczkÄ™ audio" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index a14b91f916..73ca8e58b4 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-07-23 15:53-0000\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(demasiados para mostrar)" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -56,9 +56,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -151,7 +151,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" @@ -160,147 +160,147 @@ msgstr "%u Blocos livres; %u Entradas de directórios livres" msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Arrancar através da unidade de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Pontos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Procurar ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Gestor de Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Ficheiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "&Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Definições Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Definições de Teclas de Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Gestor de Cartão de Memória(GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Modo só de leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -316,27 +316,27 @@ msgstr "(-)+zPerto" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -344,7 +344,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -357,11 +357,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -370,8 +370,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Uma janela NetPlay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Nenhum jogo actualmente a correr." @@ -423,7 +423,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Códigos AR" @@ -436,7 +436,7 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Precisão:" @@ -444,7 +444,7 @@ msgstr "Precisão:" msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -479,7 +479,7 @@ msgstr "" "Culprit Code:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -487,7 +487,7 @@ msgstr "" "Erro Action Replay: Tamanho Inválido (%08x : address = %08x) em Adição de " "Código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,7 +496,7 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em " "Preenchimento e Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -505,7 +505,7 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita e " "Preenchimento Ram (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -514,12 +514,12 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita para " "Ponteiro (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro Action Replay: Valor inválido (%08x) em cópia de memória (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -532,27 +532,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro Action Replay: linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay:Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de código normal inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código normal %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo Inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adaptador:" @@ -561,11 +561,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Adicionar Patch" @@ -575,7 +575,7 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Adicionar..." @@ -624,38 +624,38 @@ msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajustar a pressão de controlo analógico necessária para activar os botões." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Definições avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" @@ -663,9 +663,10 @@ msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -680,15 +681,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotrópico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Serrilhamento" @@ -700,15 +701,15 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,7 +719,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -727,7 +728,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,14 +736,14 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -750,12 +751,12 @@ msgstr "Proporção de ecrã:" msgid "At least one pane must remain open." msgstr "Pelo menos um painel deve manter-se aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ãudio Backend :" @@ -763,24 +764,24 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Automático (Multiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (Dimensão da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Ajuste Automático da Dimensão da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -790,24 +791,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Automaticamente gera mipmaps em vez de descodifica-los através da memória.\n" -"Aumenta ligeiramente o desempenho mas poderá causar defeitos mínimos nas " -"texturas.\n" -"\n" -"Em caso de dúvida, mantenha esta opção activada." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registos" @@ -816,12 +804,12 @@ msgstr "&Registos" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Definições Backend" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend:" @@ -838,7 +826,7 @@ msgstr "Retroceder" msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -855,11 +843,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Definições Básicas" @@ -871,7 +859,7 @@ msgstr "Baixo" msgid "Block Allocation Table checksum failed" msgstr "Verificação da Tabela de Atribuição de Blocos falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocos" @@ -888,7 +876,7 @@ msgid "Blue Right" msgstr "Azul Direita" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Inferior" @@ -901,7 +889,7 @@ msgstr "Controlos agregados: %lu" msgid "Broken" msgstr "Inactivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Procurar" @@ -909,11 +897,11 @@ msgstr "Procurar" msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -927,7 +915,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -939,19 +927,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -968,7 +956,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -984,7 +972,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -1000,7 +988,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1010,7 +998,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1018,19 +1006,19 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Não foi possível encontrar WiiMote por esta conexão %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fatal" @@ -1038,7 +1026,7 @@ msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fata msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1050,7 +1038,7 @@ msgstr "Centro" msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Mudar &Disco..." @@ -1063,7 +1051,7 @@ msgstr "Mudar Disco" msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1079,8 +1067,8 @@ msgstr "Alterações assinaladas a parâmetro zFar (após correcção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Alterações não vão surtir efeito enquanto o emulador estiver em execução!" @@ -1093,7 +1081,7 @@ msgstr "Conversa" msgid "Cheat Code" msgstr "Código de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Procura de Cheats" @@ -1105,35 +1093,35 @@ msgstr "Gestor de Cheats" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1141,7 +1129,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1149,8 +1137,8 @@ msgstr "" "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos " "construídos através de pastas)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1177,22 +1165,22 @@ msgstr "" "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá " "que parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Info de Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Código:" @@ -1200,7 +1188,7 @@ msgstr "Código:" msgid "Command" msgstr "Comando" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentário" @@ -1208,20 +1196,20 @@ msgstr "Comentário" msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "A comprimir ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configurar" @@ -1240,17 +1228,17 @@ msgstr "Configuração de Controlos" msgid "Configure Pads" msgstr "Configuração de Comandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" @@ -1259,11 +1247,11 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1288,7 +1276,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "A conectar..." @@ -1308,7 +1296,7 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" @@ -1322,7 +1310,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Não foi possível criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível iniciar o backend %s." @@ -1357,7 +1345,7 @@ msgstr "" "execução!\n" "(definir os controlos enquanto o jogo está em execução ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1370,11 +1358,11 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1382,8 +1370,8 @@ msgstr "" "Não foi possível iniciar o core.\n" "Verifique a sua configuração." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Contador:" @@ -1391,8 +1379,8 @@ msgstr "Contador:" msgid "Country:" msgstr "País" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Criar um código AR" @@ -1401,21 +1389,21 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" @@ -1427,11 +1415,11 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Recortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1445,7 +1433,7 @@ msgstr "" msgid "Crossfade" msgstr "Desvanecimento cruzado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!" @@ -1462,11 +1450,11 @@ msgstr "Definições de Hack de projecção customizada" msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1474,36 +1462,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1515,7 +1503,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Dimensão de Dados" @@ -1523,8 +1511,8 @@ msgstr "Dimensão de Dados" msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro files(*.sav)" @@ -1540,7 +1528,7 @@ msgstr "Zona morta" msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Depuração" @@ -1548,16 +1536,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1565,7 +1553,7 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1578,7 +1566,7 @@ msgstr "Tipo de letra Padrão" msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1587,7 +1575,7 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Descrição" @@ -1609,8 +1597,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1634,28 +1622,20 @@ msgstr "" "Verificação de pasta falhou\n" " e verificação da cópia de segurança de pasta falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Desactivar Luminosidade" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Desactivar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Desactivar Texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1669,7 +1649,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1685,16 +1665,6 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desactivar texturas.\n" -"\n" -"Em caso de duvida, mantenha esta opção desactivada." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disco" @@ -1704,11 +1674,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro de leitura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1722,20 +1692,20 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Configurações Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1747,16 +1717,16 @@ msgstr "Configurações Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração da emulação de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1764,7 +1734,7 @@ msgstr "Dolphin TAS filmes (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuração Dolphin do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" @@ -1806,23 +1776,23 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Depositar Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1833,7 +1803,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1843,7 +1813,7 @@ msgstr "" "\n" "Em caso de dúvida. mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1854,23 +1824,23 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "S&air" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "Cópias EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1884,11 +1854,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Actualizações de Memória Inicial" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Editar" @@ -1904,7 +1874,7 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Editar perspectiva actual" @@ -1917,15 +1887,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Thread de Emulador já em execução" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1939,7 +1909,7 @@ msgstr "" "\n" "Em caso de dúvida, active a opção emulação virtual XFB como alternativa." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1967,7 +1937,7 @@ msgstr "Estado da Emulação:" msgid "Enable" msgstr "Activar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1983,7 +1953,7 @@ msgstr "" "Necessita de ecrã inteiro para funcionar.\n" "Em caso de dúvida mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" @@ -1999,11 +1969,11 @@ msgstr "Activar Fusão de blocos" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Activar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Activar Cheats" @@ -2011,11 +1981,11 @@ msgstr "Activar Cheats" msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" @@ -2023,7 +1993,7 @@ msgstr "Activar Teclas de Atalho" msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" @@ -2032,11 +2002,11 @@ msgid "Enable MMU" msgstr "Activar MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" @@ -2044,11 +2014,11 @@ msgstr "Activar Protector de Ecrã" msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Activar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2070,11 +2040,11 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Activar Páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2087,7 +2057,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2121,7 +2091,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2141,7 +2111,7 @@ msgstr "" "Activa a Unidade de Gestão de Memória, necessária em alguns jogos. (ON = " "Compatível, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2156,13 +2126,13 @@ msgid "End" msgstr "Fim" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Melhorias" @@ -2180,17 +2150,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " @@ -2230,10 +2200,6 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sair do Dolphin com emulador" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "A Exportação Falhou" @@ -2247,19 +2213,19 @@ msgstr "Exportar Ficheiro" msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2267,7 +2233,7 @@ msgstr "Exportar todos os jogos guardados" msgid "Export failed, try again?" msgstr "Exportação falhou, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar guardar como..." @@ -2275,7 +2241,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2311,28 +2277,28 @@ msgstr "Extrair Ficheiro..." msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "A Extrair..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "Reprodutor FIFO" @@ -2356,7 +2322,7 @@ msgstr "A Escuta Falhou!!" msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2476,33 +2442,29 @@ msgstr "Falha ao escrever cabeçalho para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever cabeçalho para o ficheiro %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps rápidos" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Reprodutor Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Informação de Ficheiro" @@ -2548,43 +2510,43 @@ msgstr "FileIO: Modo aberto desconhecido : 0x%02x" msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2597,7 +2559,7 @@ msgstr "" "jogos.\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2609,7 +2571,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2631,17 +2593,17 @@ msgstr "" msgid "Forward" msgstr "Frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Quadro" @@ -2650,38 +2612,38 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Alcance de Quadros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limite de Quadros:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Vista Livre" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francês" @@ -2689,20 +2651,20 @@ msgstr "Francês" msgid "Frets" msgstr "Trastes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Resolução em ecrã Inteiro:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Ficheiro GCI(*.gci)" @@ -2711,11 +2673,11 @@ msgstr "Ficheiro GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2743,24 +2705,28 @@ msgstr "Definições específicas por jogo" msgid "GameConfig" msgstr "Configuração de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2778,8 +2744,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Geral" @@ -2788,29 +2754,29 @@ msgid "General Settings" msgstr "Definições Gerais" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Alemão" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index é maior que o tamanho da lista de código %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Definições Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Maior Que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2827,7 +2793,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -2847,11 +2813,11 @@ msgstr "Verde Direita" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2859,7 +2825,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebraico" @@ -2871,7 +2837,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2891,11 +2857,11 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Esconder o cursor do rato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2920,11 +2886,11 @@ msgstr "Configuração de Teclas de atalho" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -2932,14 +2898,14 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentativa de obter dados de um ticket desconhecido: %08x/" "%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2952,11 +2918,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin irá provavelmente bloquear agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições IPL" @@ -2976,7 +2942,7 @@ msgstr "Sensibilidade de Infra Vermelhos" msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Pastas ISO" @@ -2984,7 +2950,7 @@ msgstr "Pastas ISO" msgid "ITALY" msgstr "Itália" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Ãcone" @@ -3001,7 +2967,7 @@ msgstr "" "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -3012,11 +2978,11 @@ msgstr "" "(NTSC:60, PAL:50), também terá que desactivar o Regulador Ãudio em DSP para " "torna-lo eficaz." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3030,7 +2996,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3044,7 +3010,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3072,7 +3038,7 @@ msgstr "" "O ficheiro importado tem a extensão sav\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3084,17 +3050,6 @@ msgstr "" "\n" "Em caso de dúvida, manteha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Melhora a performance mas provoca que a iluminação desapareca na maioria " -"dos jogos.\n" -"\n" -"Em caso de dúvida, mantenha esta opção desactivada" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Em Jogo" @@ -3124,7 +3079,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3132,11 +3087,11 @@ msgstr "Inserir Cartão SD" msgid "Insert name here.." msgstr "Introduza o nome aqui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3146,42 +3101,42 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Definições de interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erro interno de LZO - compressão falhou" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3190,15 +3145,15 @@ msgstr "" "Erro interno de LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente carregar o estado novamente" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro interno de LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" @@ -3211,7 +3166,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra mágica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Valor inválido!" @@ -3224,7 +3179,7 @@ msgstr "bat.map inválido ou entrada de pasta" msgid "Invalid event type %i" msgstr "Tipo de evento inválido %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ficheiro inválido" @@ -3239,29 +3194,29 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Estado Inválido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italiano" @@ -3269,16 +3224,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" @@ -3286,7 +3241,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "COREIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3297,7 +3252,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3306,8 +3261,8 @@ msgstr "" msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3325,16 +3280,16 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Último estado Substituído" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Último Estado Guardado" @@ -3374,11 +3329,11 @@ msgstr "" "Clique Esquerdo/Direito para mais opções.\n" "Botão do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3386,7 +3341,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3430,20 +3385,20 @@ msgstr "Carregar Estado Slot 7" msgid "Load State Slot 8" msgstr "Carregar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3457,15 +3412,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar Valores de origem para padrões de hack disponíveis." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Bloqueia as threads aos núcleos" @@ -3477,16 +3428,33 @@ msgstr "Relatório" msgid "Log Configuration" msgstr "Configuração de Relatório" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de Relatório" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostra o número de quadros renderizados por segundo como medição da " +"velocidade de emulação.\n" +"\n" +"Em caso de dúvida, mantenha esta opção desactivada." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Relatório em execução" @@ -3494,10 +3462,6 @@ msgstr "Relatório em execução" msgid "Lost connection to server!" msgstr "A ligação ao servidor perdeu-se!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Ãudio em baixo nível (LLE) ou alto nível (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Botão M" @@ -3515,8 +3479,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "ficheiros MadCatz Gameshark(*.gcs)" @@ -3546,7 +3510,7 @@ msgstr "O cartão de memória já tem um jogo guardado para este título" msgid "Memcard already opened" msgstr "O cartão de memória já abriu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Byte de Memória" @@ -3597,11 +3561,11 @@ msgstr "Mic" msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3610,7 +3574,7 @@ msgstr "Configurações Diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3635,7 +3599,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3666,11 +3630,11 @@ msgstr "" "Silencía o altifalante Wiimote. Corrige desconexões aleatórias em wiimotes " "reais. Sem efeito em wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3764,28 +3728,28 @@ msgstr "NP Cima" msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Ficheiros GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Próxima Procura" @@ -3806,8 +3770,8 @@ msgstr "Nenhum ISO ou WAD encontrado" msgid "No banner file found for title %s" msgstr "Nenhum ficheiro banner foi encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3815,7 +3779,7 @@ msgstr "" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Nenhum ficheiro carregado" @@ -3823,7 +3787,7 @@ msgstr "Nenhum ficheiro carregado" msgid "No free dir index entries" msgstr "Sem entradas de índice para pastas livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Nenhum ficheiro de gravação" @@ -3837,20 +3801,20 @@ msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Não igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Não conectado" @@ -3875,7 +3839,7 @@ msgstr "Noticia" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Número De Códigos" @@ -3888,15 +3852,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleração Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objecto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -3904,26 +3868,30 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Abrir ficheiro..." @@ -3941,22 +3909,14 @@ msgstr "OpenAL: não foram encontrados dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abre o depurador" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abre o gerador de relatórios" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3976,8 +3936,8 @@ msgstr "" "Botão direito e exporte todos os jogos guardados,\n" "e importe os jogos guardados para um novo cartão de memória\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Outro" @@ -3993,7 +3953,7 @@ msgstr "" msgid "Output" msgstr "Destino" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "R&eproduzir Gravação..." @@ -4038,17 +3998,21 @@ msgstr "Partição %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" @@ -4061,10 +4025,10 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Começar" @@ -4082,7 +4046,7 @@ msgstr "Começar/Pausar" msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opções de Reprodução" @@ -4090,7 +4054,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4102,23 +4066,23 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -4127,29 +4091,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4162,11 +4126,11 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valor anterior" @@ -4182,7 +4146,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Limpar Cache" @@ -4209,7 +4173,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4226,7 +4190,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Real" @@ -4239,7 +4203,7 @@ msgstr "Wiimote Real" msgid "Real Wiimotes" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de Reconexão de Wiimote" @@ -4247,17 +4211,17 @@ msgstr "Confirmação de Reconexão de Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao Carregar Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Informação de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4273,7 +4237,7 @@ msgstr "Vermelho Esquerda" msgid "Red Right" msgstr "Vermelho Direita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4289,7 +4253,7 @@ msgstr "" "Em caso de dúvida, seleccione Nenhum." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Actualizar" @@ -4299,18 +4263,18 @@ msgstr "Actualizar" msgid "Refresh List" msgstr "Actualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4320,7 +4284,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" @@ -4330,7 +4294,7 @@ msgstr "Renderizar para a Janela Principal" msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultados" @@ -4352,33 +4316,33 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Correr DSP LLE numa thread dedicada (não recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Guardar GCI como..." @@ -4422,7 +4386,7 @@ msgstr "Guardar Estado Slot 7" msgid "Save State Slot 8" msgstr "Guardar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Guardar Estado..." @@ -4431,24 +4395,24 @@ msgstr "Guardar Estado..." msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" @@ -4465,7 +4429,7 @@ msgstr "A procurar ISOs" msgid "Scanning..." msgstr "Em Analise..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ScrShot" @@ -4473,25 +4437,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Procura de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4506,16 +4470,16 @@ msgstr "Selecção %s não encontrada em SYSCONF" msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4533,23 +4497,23 @@ msgstr "Seleccione um ficheiro de jogo guardado para importar" msgid "Select floating windows" msgstr "Seleccionar janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4571,7 +4535,7 @@ msgstr "" msgid "Selected font" msgstr "Tipo de letra seleccionado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4587,7 +4551,7 @@ msgstr "" "Em caso de dúvida, utilize a resolução do ambiente de trabalho.\n" "Se ainda tiver dúvidas, utilize a resolução mais alta que funcione melhor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4615,11 +4579,11 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4630,16 +4594,16 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu" @@ -4664,55 +4628,55 @@ msgstr "Abreviatura:" msgid "Shoulder Buttons" msgstr "Botões Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Mostrar &Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Mostrar &Barra de estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Mostrar Barra de Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Mostrar Japão" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Mostrar Coreia" @@ -4720,47 +4684,47 @@ msgstr "Mostrar Coreia" msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Mostrar Pal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma caixa de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4770,27 +4734,39 @@ msgstr "" "Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também " "poderá não explicar o motivo pelo qual o Dolphin crashe de repente." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostrar guardar comentário" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4802,15 +4778,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostrar esta mensagem de ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Mostrar desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4824,7 +4796,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -4832,19 +4804,19 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Ignorar o acesso do EFB a partir do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4856,7 +4828,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4845,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4908,11 +4880,11 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Definições de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Backend de Som %s não é válido" @@ -4927,8 +4899,8 @@ msgid "Space" msgstr "Espaço" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Espanhol" @@ -4936,7 +4908,7 @@ msgstr "Espanhol" msgid "Speaker Volume:" msgstr "Volume do Altifalante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4956,10 +4928,6 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifique um plugin de vídeo" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -4978,11 +4946,11 @@ msgstr "Comando padrão" msgid "Start" msgstr "Começar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Começar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "&Começar Gravação" @@ -5004,15 +4972,15 @@ msgstr "Estados Guardados" msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5026,7 +4994,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Ajustar à janela" @@ -5051,8 +5019,8 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do sistema:" @@ -5060,7 +5028,7 @@ msgstr "Idioma do sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5081,8 +5049,8 @@ msgstr "Table Esquerda" msgid "Table Right" msgstr "Table Direita" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5096,15 +5064,15 @@ msgstr "" msgid "Test" msgstr "Teste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5120,13 +5088,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5168,7 +5136,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O resultado do código AR desencriptado não contém quaisquer linhas." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5186,7 +5154,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Jogo Guardado que está a tentar copiar tem um tamanho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5219,15 +5187,15 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Selecção de tema correu mal" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5243,7 +5211,7 @@ msgstr "" "Estas definições substituem as definições raiz do Dolphin .\n" "Indeterminado significa que o jogo usa as definições do Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5251,11 +5219,11 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5275,7 +5243,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5300,13 +5268,13 @@ msgstr "Limite" msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Para" @@ -5314,18 +5282,18 @@ msgstr "Para" msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5349,7 +5317,7 @@ msgstr "" "Tentativa de leitura inválida de SYSCONF\n" " ids bt de wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5374,7 +5342,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO" @@ -5400,24 +5368,24 @@ msgstr "" "encriptado ou desencriptado válido. Verifique se o escreveu correctamente.\n" "Quer ignorar esta linha e continuar a analisar?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Retroceder Carregamento de Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Desconhecido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando de DVD desconhecido %08x - Erro fatal" @@ -5444,7 +5412,7 @@ msgstr "" msgid "Up" msgstr "Cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Actualizar" @@ -5453,23 +5421,23 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Utilizar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5482,7 +5450,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5497,15 +5465,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valor" @@ -5513,7 +5481,7 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valor: " @@ -5525,11 +5493,11 @@ msgstr "Verbosidade" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" @@ -5544,7 +5512,7 @@ msgstr "Instalação WAD falhou: erro ao criar %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalação WAD falhou: erro ao criar %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5587,7 +5555,7 @@ msgstr "" "%s\n" "Deseja continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5600,7 +5568,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5608,7 +5576,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5616,7 +5584,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5644,7 +5612,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5652,7 +5620,7 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5660,15 +5628,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5677,7 +5645,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler do ficheiro" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5686,7 +5654,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5700,7 +5668,7 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5708,7 +5676,7 @@ msgstr "Wiimote Conectado" msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Definições de Wiimote" @@ -5733,10 +5701,10 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "A trabalhar..." @@ -5772,7 +5740,7 @@ msgstr "Inicialização do XAudio2 falhou: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Criação de master voice do XAudio2 falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5794,11 +5762,11 @@ msgstr "Não pode fechar painéis que contenham páginas." msgid "You must choose a game!!" msgstr "Tem que escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Tem que introduzir um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." @@ -5806,7 +5774,7 @@ msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -5833,11 +5801,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP hack" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 não é suportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido para o Dolphin: %08x" @@ -5847,7 +5815,7 @@ msgstr "Código Zero desconhecido para o Dolphin: %08x" msgid "[ waiting ]" msgstr "[ em espera ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5863,7 +5831,7 @@ msgstr "" msgid "[Custom]" msgstr "[Costumizar]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5882,7 +5850,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5901,7 +5869,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5929,7 +5897,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "não é uma falha de gravação ou de leitura Wii para o cabeçalho do ficheiro %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5938,7 +5906,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6002,6 +5970,19 @@ msgstr "| OU" #~ "do jogo ajustada pela escala EFB.\n" #~ "É melhor definir a proporção do ecrã para esticar quando isto é usado." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automaticamente gera mipmaps em vez de descodifica-los através da " +#~ "memória.\n" +#~ "Aumenta ligeiramente o desempenho mas poderá causar defeitos mínimos nas " +#~ "texturas.\n" +#~ "\n" +#~ "Em caso de dúvida, mantenha esta opção activada." + #~ msgid "Bad gameini filename" #~ msgstr "nome de ficheiro gameini inválido" @@ -6050,9 +6031,24 @@ msgstr "| OU" #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Lighting" +#~ msgstr "Desactivar Luminosidade" + +#~ msgid "Disable Textures" +#~ msgstr "Desactivar Texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desactivar Altifalante do Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desactivar texturas.\n" +#~ "\n" +#~ "Em caso de duvida, mantenha esta opção desactivada." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6149,6 +6145,9 @@ msgstr "| OU" #~ msgid "Error opening file %s for recording" #~ msgstr "Erro ao abrir o ficheiro %s para gravação" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sair do Dolphin com emulador" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6161,6 +6160,9 @@ msgstr "| OU" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Falha ao carregar ROM DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6198,6 +6200,16 @@ msgstr "| OU" #~ "Esconder o cursor quando está sobre a janela de renderização e quando " #~ "esta está focada." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Melhora a performance mas provoca que a iluminação desapareca na maioria " +#~ "dos jogos.\n" +#~ "\n" +#~ "Em caso de dúvida, mantenha esta opção desactivada" + #~ msgid "Input Source" #~ msgstr "Fonte de Entrada" @@ -6236,6 +6248,12 @@ msgstr "| OU" #~ "Carregar mipmaps nativos é a forma mais precisa, mas também poderá " #~ "diminuir o desempenho (poderá ser variável)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Ãudio em baixo nível (LLE) ou alto nível (HLE)" + #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Misturador: Taxa de amostragem não suportada." @@ -6252,6 +6270,12 @@ msgstr "| OU" #~ msgid "OK" #~ msgstr "OK" +#~ msgid "Opens the debugger" +#~ msgstr "Abre o depurador" + +#~ msgid "Opens the logger" +#~ msgstr "Abre o gerador de relatórios" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6323,6 +6347,9 @@ msgstr "| OU" #~ msgstr "" #~ "Mostrar o número de quadros renderizados por segundo (frames per second)" +#~ msgid "Show this help message" +#~ msgstr "Mostrar esta mensagem de ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6358,6 +6385,9 @@ msgstr "| OU" #~ "As outras opções são resoluções fixas para escolher uma qualidade visual " #~ "independentemente do tamanho ou resolução do ecrã." +#~ msgid "Specify a video backend" +#~ msgstr "Especifique um plugin de vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifique um plugin de audio" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 66d5476b64..7f87057e25 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-07 19:13-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (muitos para mostrar)" @@ -45,7 +45,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -55,9 +55,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -152,7 +152,7 @@ msgstr "%sExportar GCI%s" msgid "%sImport GCI%s" msgstr "%sImportar GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" @@ -161,147 +161,147 @@ msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Carregar a Partir do Drive de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "&Pontos de Interrupção" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Procurar por ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Gerenciador de &Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Arquivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Tela Cheia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "Configurações de &Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "Configurações de &Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "Gerenciador de Cartão de &Memória (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pausar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "&Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Recarregar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registradores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "'" @@ -317,27 +317,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -345,7 +345,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -358,11 +358,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -371,8 +371,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Uma janela de Netplay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Não tem nenhum jogo rodando no momento." @@ -425,7 +425,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "Códigos AR" @@ -438,7 +438,7 @@ msgstr "Sobre o Dolphin" msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "Precisão:" @@ -446,7 +446,7 @@ msgstr "Precisão:" msgid "Accurate VBeam emulation" msgstr "Emulação correta do VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -480,7 +480,7 @@ msgstr "" "Código Culpado:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -488,7 +488,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -497,7 +497,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Fill e " "Slide (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -506,7 +506,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em RAM Write " "e Fill (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -515,12 +515,12 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -533,27 +533,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro no Action Replay: Linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de Normal Code Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Subtipo inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adaptador:" @@ -562,11 +562,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Adicionar Código de ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Adicionar Patch" @@ -576,7 +576,7 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Adicionar..." @@ -624,38 +624,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "Configurações Avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" @@ -663,9 +663,10 @@ msgstr "Todos os arquivos ISO GC/Wii comprimidos" msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -679,15 +680,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Tempo Alternativo de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtragem Anisotrópica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -699,15 +700,15 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -717,7 +718,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Ãrabe" @@ -726,7 +727,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -734,14 +735,14 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -749,12 +750,12 @@ msgstr "Proporção:" msgid "At least one pane must remain open." msgstr "Pelo menos um painél deve permanecer aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -762,24 +763,24 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Auto (Tamanho da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Ajustar Automaticamente o Tamanho da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -789,24 +790,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Gera os mipmaps automaticamente ao invés de decodificá-los da memória.\n" -"Aumenta um pouco a velocidade de emulação mas pode causar pequenos defeitos " -"nas texturas.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "Registrador BP" @@ -814,12 +802,12 @@ msgstr "Registrador BP" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Configurações do Backend" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Backend:" @@ -836,7 +824,7 @@ msgstr "Para trás" msgid "Bad File Header" msgstr "Header de Arquivo Ruim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Banner" @@ -853,11 +841,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Alavanca" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -869,7 +857,7 @@ msgstr "Baixo" msgid "Block Allocation Table checksum failed" msgstr "Falha no teste de Mesa de Alocação de Blocos" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Blocos" @@ -886,7 +874,7 @@ msgid "Blue Right" msgstr "Azul Direito" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Embaixo" @@ -899,7 +887,7 @@ msgstr "Controles Acoplados: %lu" msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Procurar" @@ -907,11 +895,11 @@ msgstr "Procurar" msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Procurar por um diretório de output" @@ -925,7 +913,7 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -937,19 +925,19 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -966,7 +954,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -980,7 +968,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -996,7 +984,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1007,7 +995,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1015,20 +1003,20 @@ msgstr "" "Não é possível usar aquele arquivo como um Memory Card.\n" "Você está tentando usar o mesmo arquivo nos dois slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar o Wiimote pelo bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" "Não foi possível encontrar o Wiimote pelo identificador de conexão %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" @@ -1036,7 +1024,7 @@ msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Catalão" @@ -1048,7 +1036,7 @@ msgstr "Centralizar" msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Mudar &Disco..." @@ -1061,7 +1049,7 @@ msgstr "Mudar o Disco" msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1077,8 +1065,8 @@ msgstr "Muda o sinal para o parâmetro do zFar (após a correção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Muda o sinal para o parâmetro do zNear (após a correção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!" @@ -1090,7 +1078,7 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Códigos de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Busca de Cheats" @@ -1102,35 +1090,35 @@ msgstr "Gerenciador de Cheat" msgid "Check Partition Integrity" msgstr "Checar Integridade da Partição" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "Checando Integridade..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1138,7 +1126,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1146,8 +1134,8 @@ msgstr "" "Escolher um arquivo para ser usado como apploader: (aplicável somente para " "discos construídos de diretórios)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1174,22 +1162,22 @@ msgstr "" "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " "Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Informação do Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Código:" @@ -1197,7 +1185,7 @@ msgstr "Código:" msgid "Command" msgstr "Comandos" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Comentário" @@ -1205,20 +1193,20 @@ msgstr "Comentário" msgid "Comment:" msgstr "Comentário:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Comprimindo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Configurar" @@ -1237,17 +1225,17 @@ msgstr "Configurar Controle" msgid "Configure Pads" msgstr "Configurar Controles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" @@ -1256,11 +1244,11 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" @@ -1285,7 +1273,7 @@ msgstr "Conectar Wiimote 3" msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Conectando..." @@ -1305,7 +1293,7 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" @@ -1319,7 +1307,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "Não pôde criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível inicializar o Backend 5s. %s" @@ -1354,7 +1342,7 @@ msgstr "" "no momento!\n" "(Definir os controles durante o jogo ainda não é suportado)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1367,11 +1355,11 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1379,8 +1367,8 @@ msgstr "" "Não foi possível iniciar o Núcleo (core). \n" "Cheque suas configurações" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Contagem:" @@ -1388,8 +1376,8 @@ msgstr "Contagem:" msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Criar Código AR" @@ -1398,21 +1386,21 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Criado por KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Criado por VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" @@ -1424,11 +1412,11 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1442,7 +1430,7 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "O diretório atual mudou de %s para %s depois do wxFileSelector!" @@ -1459,11 +1447,11 @@ msgstr "Configurações de Hack de Projeção Customizado" msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Tcheco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1471,36 +1459,36 @@ msgstr "D" msgid "D-Pad" msgstr "Direcional Digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1512,7 +1500,7 @@ msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Tamanho de Arquivo" @@ -1520,8 +1508,8 @@ msgstr "Tamanho de Arquivo" msgid "Date:" msgstr "Data:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Arquivos Datel Maxdrive/Pro (*.sav)" @@ -1537,7 +1525,7 @@ msgstr "Zona Morta" msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Debugging" @@ -1545,16 +1533,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1562,7 +1550,7 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1575,7 +1563,7 @@ msgstr "Fonte Padrão" msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Excluir Save" @@ -1584,7 +1572,7 @@ msgstr "Excluir Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Descrição" @@ -1606,8 +1594,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1631,28 +1619,20 @@ msgstr "" "A checagem de diretório falhou\n" " e a checagem de Backup de Diretório falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Desativar Iluminação" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Desativar Profundidade por Pixel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Desativar Texturas" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1666,7 +1646,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1682,16 +1662,6 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Desabilitar Texturas.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disco" @@ -1701,11 +1671,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro na leitura do Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1719,20 +1689,20 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configurações %s Gráficas do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "&Web Site do Dolphin" @@ -1744,16 +1714,16 @@ msgstr "Configuração do Dolphin" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração de Wiimote Emulado do Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1761,7 +1731,7 @@ msgstr "Filmes TAS Dolphin (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Configuração de Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" @@ -1803,23 +1773,23 @@ msgstr "Bateria" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Extrair Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1830,7 +1800,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1839,7 +1809,7 @@ msgstr "" "Extrair texturas do jogo para Usuário/Despejo/Texturas//\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1850,23 +1820,23 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Sair" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "Cópias de EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1880,11 +1850,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Atualizações prévias de Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Editar" @@ -1900,7 +1870,7 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Editar perspectiva atual" @@ -1913,15 +1883,15 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Este Segmento de Emulação já está rodando" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1935,7 +1905,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Virtual." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1963,7 +1933,7 @@ msgstr "Estado de Emulação" msgid "Enable" msgstr "Ativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1979,7 +1949,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Ativar Registro AR" @@ -1995,11 +1965,11 @@ msgstr "Ativar Block Merging" msgid "Enable Bounding Box Calculation" msgstr "Ativar Cálculo de Caixas Limitadoras" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Ativar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Ativar Cheats" @@ -2007,11 +1977,11 @@ msgstr "Ativar Cheats" msgid "Enable Dual Core" msgstr "Ativar Modo de Dois Núcleos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" @@ -2019,7 +1989,7 @@ msgstr "Ativar Hotkeys" msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" @@ -2028,11 +1998,11 @@ msgid "Enable MMU" msgstr "Ativar MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" @@ -2040,11 +2010,11 @@ msgstr "Ativar Salva-Tela" msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Ativar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2067,11 +2037,11 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Ativar Paginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2083,7 +2053,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2117,7 +2087,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2137,7 +2107,7 @@ msgstr "" "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " "(ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2152,13 +2122,13 @@ msgid "End" msgstr "Fim" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "Improvisos" @@ -2176,17 +2146,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2226,10 +2196,6 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Sair do Dolphin com o emulador" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Falha na Exportação" @@ -2243,19 +2209,19 @@ msgstr "Exportar Arquivo" msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2263,7 +2229,7 @@ msgstr "Exportar todos os saves" msgid "Export failed, try again?" msgstr "Falha na exportação, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Exportar Salvar como..." @@ -2271,7 +2237,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2307,28 +2273,28 @@ msgstr "Extrair Arquivo..." msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Extraindo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "Byte do FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO Player" @@ -2352,7 +2318,7 @@ msgstr "Não foi possível Ouvir!!" msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2470,23 +2436,19 @@ msgstr "Falha ao escrever o header para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever o header para o arquivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "Persa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Mipmaps Rápidos" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2494,11 +2456,11 @@ msgstr "" "Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, " "byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Informações do Arquivo" @@ -2544,43 +2506,43 @@ msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "Achar Próximo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "Achar Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2593,7 +2555,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2605,7 +2567,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2627,17 +2589,17 @@ msgstr "" msgid "Forward" msgstr "Para frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "%d resultados encontrados para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Quadro" @@ -2646,37 +2608,37 @@ msgstr "Quadro" msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "Informação do Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Alcanço do Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Limitador de FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Olhar Livre" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Francês" @@ -2684,20 +2646,20 @@ msgstr "Francês" msgid "Frets" msgstr "Notas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Tela Cheia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Resolução da Tela Cheia:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Arquivo GCI(*.gci)" @@ -2705,11 +2667,11 @@ msgstr "Arquivo GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração do GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2737,24 +2699,28 @@ msgstr "Opções especificas do jogo" msgid "GameConfig" msgstr "Opçõesdojogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2774,8 +2740,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Geral" @@ -2784,29 +2750,29 @@ msgid "General Settings" msgstr "Configurações Gerais" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Alemão" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Configurações Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Maior do que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2824,7 +2790,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Grego" @@ -2844,11 +2810,11 @@ msgstr "Verde Direito" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hacks" @@ -2856,7 +2822,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebreu" @@ -2868,7 +2834,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2889,11 +2855,11 @@ msgstr "" msgid "Hide" msgstr "Ocultar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Esconder Cursor Do Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2918,11 +2884,11 @@ msgstr "Configuração de hotkey" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Húngaro" @@ -2930,13 +2896,13 @@ msgstr "Húngaro" msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" "IOCTL_ES_GETVIEWS:Tentou adiquirir dados de um ticket desconhecido: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2949,11 +2915,11 @@ msgstr "" "TitleID %016llx.\n" " O Dolphin vai provavelmente travar agora" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "Definições de IPL" @@ -2973,7 +2939,7 @@ msgstr "Sensibilidade IR:" msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -2981,7 +2947,7 @@ msgstr "Diretórios de ISO" msgid "ITALY" msgstr "ITÃLIA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Icone" @@ -3000,7 +2966,7 @@ msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3011,11 +2977,11 @@ msgstr "" "consertar cortes no áudio mas pode causar ruído constante dependendo do " "jogo)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3029,7 +2995,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3043,7 +3009,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Importar Save" @@ -3071,7 +3037,7 @@ msgstr "" "O arquivo importado tem a extensão sav\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3083,17 +3049,6 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Melhora a performance mas faz a iluminação desaparecer na maioria dos " -"jogos.\n" -"\n" -"Se estiver em dúvida, deixe esta opção desativada." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Funciona" @@ -3123,7 +3078,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3131,11 +3086,11 @@ msgstr "Insira cartão SD" msgid "Insert name here.." msgstr "Insira nome aqui.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3146,23 +3101,23 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "Erro na Checagem de Integridade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "Checagem de Integridade completa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3171,19 +3126,19 @@ msgstr "" "Checagem de Integridade para a partição %d falhou. Sua cópia deve estar " "corrompida ou foi incorretamente corrigido (patch)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Opções de interface" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "Erro Interno do LZO - A compressão falhou" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3192,15 +3147,15 @@ msgstr "" "Erro Interno do LZO - a descompressão falhou (%d) (%li, %li) \n" "Tente recarregar o Estado Salvo" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro Interno do LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" @@ -3213,7 +3168,7 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra Mágica(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Valor Inválido!" @@ -3226,7 +3181,7 @@ msgstr "Bat.map ou entrada de Diretório inválidas" msgid "Invalid event type %i" msgstr "Tipo de evento %i inválido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Arquivo inválido" @@ -3241,31 +3196,31 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Parâmetros de busca inválidos (nenhum objeto selecionado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "String de busca inválida (não foi possível converter para número)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" "String de busca inválida (apenas comprimentos correspondentes de string são " "suportados)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Estado Salvo Inválido" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italiano" @@ -3273,16 +3228,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonês" @@ -3290,7 +3245,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "CORÉIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3300,7 +3255,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "Manter Janela no Topo" @@ -3309,8 +3264,8 @@ msgstr "Manter Janela no Topo" msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Coreano" @@ -3328,16 +3283,16 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Linguagem:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Último State sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Último State Salvo" @@ -3377,11 +3332,11 @@ msgstr "" "Clique da Esquerda/Direita para mais opções.\n" "Clique do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "Limitar por FPS" @@ -3389,7 +3344,7 @@ msgstr "Limitar por FPS" msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" @@ -3433,20 +3388,20 @@ msgstr "Carregar Estado do Slot 7" msgid "Load State Slot 8" msgstr "Carregar Estado do Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3461,15 +3416,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Separar tarefas em núcleos" @@ -3481,16 +3432,33 @@ msgstr "Log" msgid "Log Configuration" msgstr "Configuração do Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipo de Log" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Mostra o número de quadros renderizados por segundo como uma forma de medir " +"a velocidade da emulação.\n" +"\n" +"Se estiver em dúvida, deixe isto desativado." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "Resposta do Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Logando" @@ -3498,10 +3466,6 @@ msgstr "Logando" msgid "Lost connection to server!" msgstr "A conexão com o servidor foi perdida!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Emulação do Audio em Low level (LLE) ou high level (HLE)" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "Butão M" @@ -3519,8 +3483,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Arquivos de Gameshark MadCatz(*.gcs)" @@ -3550,7 +3514,7 @@ msgstr "O Memory Card já tem um arquivo de salva deste título" msgid "Memcard already opened" msgstr "O Memory Card já está aberto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Byte de Memória" @@ -3601,11 +3565,11 @@ msgstr "Microfone" msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Opções diversas" @@ -3614,7 +3578,7 @@ msgstr "Opções diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3640,7 +3604,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3670,11 +3634,11 @@ msgstr "" "Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em " "Wiimotes Reais. Não faz efeito em Wiimotes Emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOTA: O tamanho do stream não corresponde ao comprimento dos dados\n" @@ -3768,28 +3732,28 @@ msgstr "NP Cima" msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Nome:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Arquivos GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Próxima Busca" @@ -3810,8 +3774,8 @@ msgstr "Sem ISOs ou WADs achados" msgid "No banner file found for title %s" msgstr "Nenhum arquivo de banner encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "Descrição indisponível" @@ -3819,7 +3783,7 @@ msgstr "Descrição indisponível" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Nenhum arquivo carregado" @@ -3827,7 +3791,7 @@ msgstr "Nenhum arquivo carregado" msgid "No free dir index entries" msgstr "Não há entradas de índice de diretório livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "Nenhum arquivo gravado" @@ -3841,20 +3805,20 @@ msgstr "Nenhuma pasta de salva encontrada para o título %s" msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Não igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Não conectado" @@ -3879,7 +3843,7 @@ msgstr "Noticía" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Números dos códigos:" @@ -3892,15 +3856,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleração do Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Desligado" @@ -3908,26 +3872,30 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Abrir Arquivo..." @@ -3945,22 +3913,14 @@ msgstr "OpenAL: Não foi possível encontrar dispositivos de som" msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir o dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Abrir o debugger" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Abrir o logger" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3980,8 +3940,8 @@ msgstr "" "Clique com o botão direito e exporte todos os salvas,\n" "e importe-os para um novo Memory Card\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "Outros" @@ -3997,7 +3957,7 @@ msgstr "" msgid "Output" msgstr "Saída" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "R&eproduzir gravação..." @@ -4042,17 +4002,21 @@ msgstr "Partição %i" msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" @@ -4065,10 +4029,10 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Executar" @@ -4086,7 +4050,7 @@ msgstr "Executar/Pausar" msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Opções de Reprodução" @@ -4094,7 +4058,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4106,23 +4070,23 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Porta 4" @@ -4131,29 +4095,29 @@ msgstr "Porta 4" msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u" @@ -4166,11 +4130,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Valor anterior" @@ -4186,7 +4150,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "Limpar o Cache" @@ -4213,7 +4177,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4230,7 +4194,7 @@ msgstr "Alcance" msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Real" @@ -4242,7 +4206,7 @@ msgstr "Wiimote Real" msgid "Real Wiimotes" msgstr "Wiimotes Reais" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de reconexão do Wiimote" @@ -4250,17 +4214,17 @@ msgstr "Confirmação de reconexão do Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao carregar Estado Salvo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Informações de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4276,7 +4240,7 @@ msgstr "Vermelho Esquerdo" msgid "Red Right" msgstr "Vermelho Direito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4291,7 +4255,7 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Atualizar" @@ -4301,18 +4265,18 @@ msgstr "Atualizar" msgid "Refresh List" msgstr "Atualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4322,7 +4286,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" @@ -4332,7 +4296,7 @@ msgstr "Renderizar na Janela Principal" msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Resultados" @@ -4354,33 +4318,33 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar o DSP LLE em um segmento dedicado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Sal&var Instante Atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Taxa de Amostragem:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Salvar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Salvar GCI como..." @@ -4424,7 +4388,7 @@ msgstr "Salvar Instante Atual no Slot 7" msgid "Save State Slot 8" msgstr "Salvar Instante Atual no Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Salvar Instante Atual..." @@ -4433,24 +4397,24 @@ msgstr "Salvar Instante Atual..." msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" @@ -4467,7 +4431,7 @@ msgstr "Procurando por ISOs" msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "ScrShot" @@ -4475,23 +4439,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Busca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "Pesquisar Objeto atual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "Buscar valor hexadecimal:" @@ -4506,16 +4470,16 @@ msgstr "A seção %s não foi encontrada no SYSCONF" msgid "Select" msgstr "Selecionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4532,23 +4496,23 @@ msgstr "Selecione um arquivo de jogo salvo para importar" msgid "Select floating windows" msgstr "Selecionar Janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Selecione um instante para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Selecione um instante para salvar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4570,7 +4534,7 @@ msgstr "" msgid "Selected font" msgstr "Fonte Selecionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4586,7 +4550,7 @@ msgstr "" "Se estiver em dúvida, use a resolução da sua Ãrea de Trabalho.\n" "Se ainda estiver em dúvida, use a maior disponível.." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4614,11 +4578,11 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4629,16 +4593,16 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4664,55 +4628,55 @@ msgstr "Nome Curto:" msgid "Shoulder Buttons" msgstr "Botões Superiores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Mostrar &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "Mostrar Janela de &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Mostrar barra de &Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Show Barra de &Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Mostrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Mostrar Coréia" @@ -4720,47 +4684,47 @@ msgstr "Mostrar Coréia" msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma janela de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4770,27 +4734,39 @@ msgstr "" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Mostar comentário do save" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Mostrar título do salva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4802,15 +4778,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Mostra esta menssagem de ajuda" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Mostra desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4824,7 +4796,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Chinês Simplificado" @@ -4832,19 +4804,19 @@ msgstr "Chinês Simplificado" msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "Não permite o acesso da CPU ao EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4856,7 +4828,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4873,17 +4845,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4907,11 +4879,11 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Configurações de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "O Backend de Som %s não é válido." @@ -4926,8 +4898,8 @@ msgid "Space" msgstr "Barra de Espaço" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Espanhol" @@ -4935,7 +4907,7 @@ msgstr "Espanhol" msgid "Speaker Volume:" msgstr "Volume do Auto-Falante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4955,10 +4927,6 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 640x528." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Especifique um Backend de Vídeo" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -4977,11 +4945,11 @@ msgstr "Controle Padrão" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Iniciar NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Iniciar Ca&ptura" @@ -5003,15 +4971,15 @@ msgstr "Estados Salvos" msgid "Stick" msgstr "Analógico" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5025,7 +4993,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Redimensionar para a Tela" @@ -5050,8 +5018,8 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Idioma do Systema:" @@ -5059,7 +5027,7 @@ msgstr "Idioma do Systema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Input do TAS" @@ -5080,8 +5048,8 @@ msgstr "Esquerda da Mesa" msgid "Table Right" msgstr "Direita da Mesa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5095,15 +5063,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Testar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5119,13 +5087,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5165,7 +5133,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O código AR resultante da derciptação não contém nenhuma linha." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5182,7 +5150,7 @@ msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5215,15 +5183,15 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "A seleção do tema deu errado" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5239,7 +5207,7 @@ msgstr "" "Estas configurações substituem as configurações do núcleo do Dolphin.\n" "Indeterminado significa que o jogo usa as configurações do Dolphin." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5247,12 +5215,12 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5271,7 +5239,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5296,13 +5264,13 @@ msgstr "Threshold" msgid "Tilt" msgstr "Inclinar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Para" @@ -5310,18 +5278,18 @@ msgstr "Para" msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Chinês Tradicional" @@ -5345,7 +5313,7 @@ msgstr "" "Tentando ler de um SYSCONF inválido\n" "Os Bt IDs do Wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turco" @@ -5370,7 +5338,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO_%02X" @@ -5399,24 +5367,24 @@ msgstr "" "corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "%i indefinido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Desfazer carregamento de estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "Chamada 0x80 inesperada? Abortando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Desconhecido" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Comando de DVD desconhecido %08x - Erro Fatal" @@ -5442,7 +5410,7 @@ msgstr "" msgid "Up" msgstr "Para cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Atualizar" @@ -5451,23 +5419,23 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Usar Tela Cheia" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5480,7 +5448,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5495,15 +5463,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Utilitário" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Valor" @@ -5511,7 +5479,7 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "Valor:" @@ -5523,11 +5491,11 @@ msgstr "Verbosidade" msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Volume" @@ -5541,7 +5509,7 @@ msgstr "Falha na instalação da WAD: Erro na criação de %s" msgid "WAD installation failed: error creating ticket" msgstr "Falha na instalação da WAD: Erro na criação do ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5583,7 +5551,7 @@ msgstr "" "%s\n" "Deseja continuar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5596,7 +5564,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5607,7 +5575,7 @@ msgstr "" "(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, " "ou carregar este instante com o modo somente-leitura desligado." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5619,7 +5587,7 @@ msgstr "" "este instante com o modo somente-leitura desligado. Caso contrário você " "provavelmente terá uma desincronização." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5662,7 +5630,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -5670,7 +5638,7 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5678,15 +5646,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" @@ -5695,7 +5663,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler o arquivo" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5704,7 +5672,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5717,7 +5685,7 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote Conectado" @@ -5725,7 +5693,7 @@ msgstr "Wiimote Conectado" msgid "Wiimote Motor" msgstr "Motor do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Configurações do Wiimote" @@ -5749,10 +5717,10 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Funcionando..." @@ -5787,7 +5755,7 @@ msgstr "XAudio2 Falha na inicialização: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 Criação de Master Voice falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "XF reg" @@ -5812,11 +5780,11 @@ msgstr "Você não pode fechar painéis que têm páginas neles." msgid "You must choose a game!!" msgstr "Você deve escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Você deve digitar um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." @@ -5824,7 +5792,7 @@ msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -5851,11 +5819,11 @@ msgstr "" msgid "ZTP hack" msgstr "Hack do ZTB" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Código Zero 3 não é suportado" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido pelo Dolphin: %08x" @@ -5865,7 +5833,7 @@ msgstr "Código Zero desconhecido pelo Dolphin: %08x" msgid "[ waiting ]" msgstr "[ Aguardando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5881,7 +5849,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5900,7 +5868,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5919,7 +5887,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5948,7 +5916,7 @@ msgstr "" "Não é um save de Wii ou houve erro de leitura no tamanho do header do " "arquivo %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5957,7 +5925,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retornou -1 ao rodar o aplicativo!" @@ -6025,6 +5993,18 @@ msgstr "| OR" #~ "jogo ajustada pela Escala do EFB.\n" #~ "É melhor deixar a Proporção em Redimensionar quando usar isso." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Gera os mipmaps automaticamente ao invés de decodificá-los da memória.\n" +#~ "Aumenta um pouco a velocidade de emulação mas pode causar pequenos " +#~ "defeitos nas texturas.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe isto desativado." + #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" @@ -6074,9 +6054,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Dinamarquês" +#~ msgid "Disable Lighting" +#~ msgstr "Desativar Iluminação" + +#~ msgid "Disable Textures" +#~ msgstr "Desativar Texturas" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "Desabilitar o Auto-Falante do Wiimote" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Desabilitar Texturas.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe isto desativado." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6183,6 +6178,12 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Erro ao abrir o arquivo %s para gravação" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Sair do Dolphin com o emulador" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Mipmaps Rápidos" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6231,6 +6232,16 @@ msgstr "| OR" #~ "Se o jogo trava, funciona apenas no interpretador ou o dophin dá erro, " #~ "essa opção pode corrigir o jogo." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Melhora a performance mas faz a iluminação desaparecer na maioria dos " +#~ "jogos.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe esta opção desativada." + #~ msgid "Input Source" #~ msgstr "Fonte de Entrada" @@ -6266,6 +6277,12 @@ msgstr "| OR" #~ "Carregar os mipmaps nativos é mais preciso todavia, mas pode diminuir a " #~ "perfomance (embora sua mudança possa variar)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Emulação do Audio em Low level (LLE) ou high level (HLE)" + #~ msgid "Lua Script Console" #~ msgstr "Console de script lua" @@ -6292,6 +6309,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "Abrir" +#~ msgid "Opens the debugger" +#~ msgstr "Abrir o debugger" + +#~ msgid "Opens the logger" +#~ msgstr "Abrir o logger" + #~ msgid "Plugins" #~ msgstr "Plugins" @@ -6373,6 +6396,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Mostra o número de quadros por segundo." +#~ msgid "Show this help message" +#~ msgstr "Mostra esta menssagem de ajuda" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6414,6 +6440,9 @@ msgstr "| OR" #~ "As outras opções são resoluções fixas para escolher a qualidade visual " #~ "independentemente do tamanho do seu monitor." +#~ msgid "Specify a video backend" +#~ msgstr "Especifique um Backend de Vídeo" + #~ msgid "Specify an audio plugin" #~ msgstr "Especifique um Plugin de Ãudio" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 99fefcfc12..3418effb66 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-01-20 14:40+0300\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(Ñлишком много)" @@ -46,7 +46,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" неверный образ GCM/ISO, или не ÑвлÑетÑÑ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼ игры Ð´Ð»Ñ GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -56,9 +56,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Гц" @@ -150,7 +150,7 @@ msgstr "%sЭкÑпоритровать GCI%s" msgid "%sImport GCI%s" msgstr "%sИмпортировать GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, fuzzy, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей каталогов" @@ -160,149 +160,149 @@ msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&О программе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&ЗапуÑтить игру Ñ DVD-диÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Выбрать папку Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Менеджер &читов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&ЭмулÑциÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Файл" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 #, fuzzy msgid "&Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Опции видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Помощь" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 #, fuzzy msgid "&Hotkey Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Менеджер карт памÑти (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "Па&мÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "Выбор &файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Опции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Пауза" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&РегиÑтры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&СброÑить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "З&вук" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&ОÑтановить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&ИнÑтрументы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Вид" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -319,27 +319,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(отключен)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 бит" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 бита" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 бит" @@ -347,7 +347,7 @@ msgstr "8 бит" msgid "" msgstr "<Введите название>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -360,11 +360,11 @@ msgstr "<Ðичего>" msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<СиÑтемный>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -373,8 +373,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Окно Ñетевой игры уже открыто!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Игра не запущена." @@ -425,7 +425,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR-коды" @@ -438,7 +438,7 @@ msgstr "Об ÑмулÑторе Dolphin" msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -446,7 +446,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -470,7 +470,7 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" @@ -478,33 +478,33 @@ msgstr "" "Ошибка ActionReplay: неверный размер (%08x : Ð°Ð´Ñ€ÐµÑ = %08x) в добавлÑемом " "коде (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -515,27 +515,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Ðдаптер:" @@ -544,11 +544,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Добавление патча" @@ -558,7 +558,7 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Добавить..." @@ -592,38 +592,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" @@ -631,28 +631,31 @@ msgstr "Сжатые образа диÑков GC/Wii (gcz)" msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " +"играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "Сглаживание:" @@ -664,22 +667,22 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Загрузчик:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Применить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -688,7 +691,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -696,12 +699,12 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -709,12 +712,12 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" @@ -723,26 +726,26 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Ðвто" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 #, fuzzy msgid "Auto (Window Size)" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 #, fuzzy msgid "Auto adjust Window Size" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -752,19 +755,11 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&РегиÑтры" @@ -773,13 +768,13 @@ msgstr "&РегиÑтры" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "СиÑтема вывода" @@ -797,7 +792,7 @@ msgstr "Взмах" msgid "Bad File Header" msgstr "Ðеверный заголовок файла" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Логотип" @@ -814,11 +809,11 @@ msgstr "Логотип:" msgid "Bar" msgstr "Панель" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -830,7 +825,7 @@ msgstr "" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -847,7 +842,7 @@ msgid "Blue Right" msgstr "СинÑÑ Ñправа" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Ñнизу" @@ -860,7 +855,7 @@ msgstr "" msgid "Broken" msgstr "Ðе работает" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Обзор" @@ -868,11 +863,11 @@ msgstr "Обзор" msgid "Browse for a directory to add" msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" @@ -886,7 +881,7 @@ msgstr "Буфер:" msgid "Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -898,19 +893,19 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -920,7 +915,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -929,7 +924,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Отмена" @@ -945,7 +940,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -955,7 +950,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -963,18 +958,18 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -982,7 +977,7 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -994,7 +989,7 @@ msgstr "Центр" msgid "Change" msgstr "Сменить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Сменить &диÑк..." @@ -1008,7 +1003,7 @@ msgstr "Сменить &диÑк..." msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1024,8 +1019,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." @@ -1038,7 +1033,7 @@ msgstr "Чат" msgid "Cheat Code" msgstr "Чит-код" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "ПоиÑк кодов" @@ -1050,37 +1045,37 @@ msgstr "Менеджер чит-кодов" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1088,14 +1083,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1122,22 +1117,22 @@ msgstr "" "Клиент отÑоединилÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹! Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð° оÑтановлена. Ð’Ñ‹ должны " "оÑтановить игру." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Закрыть" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "&ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Код:" @@ -1145,7 +1140,7 @@ msgstr "Код:" msgid "Command" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Комментарий" @@ -1153,20 +1148,20 @@ msgstr "Комментарий" msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Сжатие образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "ÐаÑтройки" @@ -1185,17 +1180,17 @@ msgstr "ÐаÑтройка управлениÑ" msgid "Configure Pads" msgstr "ÐаÑтроить контроллеры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" @@ -1205,11 +1200,11 @@ msgstr "Потверждение при оÑтановке ÑмулÑции" msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Подключить Wiimote %i" @@ -1234,7 +1229,7 @@ msgstr "Подключить Wiimote 3" msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Подключение..." @@ -1254,7 +1249,7 @@ msgstr "Конвертировать в GCI" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" @@ -1268,7 +1263,7 @@ msgstr "Ядро" msgid "Could not create %s" msgstr "Ðе удалоÑÑŒ Ñоздать %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1300,7 +1295,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1312,18 +1307,18 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Счетчик:" @@ -1331,8 +1326,8 @@ msgstr "Счетчик:" msgid "Country:" msgstr "Страна:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Создать новый AR-код" @@ -1341,21 +1336,21 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Стиль от KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Стиль от VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" @@ -1368,11 +1363,11 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "обрезать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1383,7 +1378,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" @@ -1402,11 +1397,11 @@ msgstr "Projection-хак: " msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1414,39 +1409,39 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD-диÑк:" @@ -1458,7 +1453,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Размер данных" @@ -1466,8 +1461,8 @@ msgstr "Размер данных" msgid "Date:" msgstr "Дата:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Файлы Datel MaxDrive/Pro (*.sav)" @@ -1483,7 +1478,7 @@ msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1492,16 +1487,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "" @@ -1509,7 +1504,7 @@ msgstr "" msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1522,7 +1517,7 @@ msgstr "Шрифт по умолчанию" msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Удалить Ñохранение" @@ -1531,7 +1526,7 @@ msgstr "Удалить Ñохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "ВопроÑ" @@ -1552,8 +1547,8 @@ msgstr "" msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1575,30 +1570,22 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Отключить оÑвещение" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "Глубина пикÑелÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Отключить текÑтуры" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1607,7 +1594,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1617,13 +1604,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "ДиÑк" @@ -1633,11 +1613,11 @@ msgstr "ДиÑк" msgid "Disc Read Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð¸Ñка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Изображение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1648,20 +1628,20 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ÐаÑтройки графики %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "&Веб-Ñайт ÑмулÑтора" @@ -1673,17 +1653,17 @@ msgstr "ÐаÑтройки ÑмулÑции" msgid "Dolphin Emulated Wiimote Configuration" msgstr "ÐаÑтройки Ñмулируемого Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1691,7 +1671,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "ÐаÑтройка Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" @@ -1733,30 +1713,30 @@ msgstr "Барабаны" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1764,7 +1744,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "СохранÑет текÑтуры игры в User/Dump/Textures// " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1772,25 +1752,25 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 #, fuzzy msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "&Закрыть" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 #, fuzzy msgid "EFB Copies" msgstr "Регионы копии EFB" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1803,11 +1783,11 @@ msgstr "" msgid "EUROPE" msgstr "ЕВРОПÐ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Изменить" @@ -1823,7 +1803,7 @@ msgstr "Править вручную" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Изменить точку" @@ -1836,15 +1816,15 @@ msgstr "Изменить..." msgid "Effect" msgstr "Эффект" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1853,7 +1833,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1875,7 +1855,7 @@ msgstr "КачеÑтво ÑмулÑции:" msgid "Enable" msgstr "Включить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1885,7 +1865,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" @@ -1901,12 +1881,12 @@ msgstr "Включить Ñовмещение блоков" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Включить чит-коды" @@ -1914,11 +1894,11 @@ msgstr "Включить чит-коды" msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" @@ -1926,7 +1906,7 @@ msgstr "Включить горÑчие клавиши" msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" @@ -1935,11 +1915,11 @@ msgid "Enable MMU" msgstr "Включить MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" @@ -1948,11 +1928,11 @@ msgstr "Включить широкий Ñкран" msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1973,11 +1953,11 @@ msgstr "" "Ðктивирует режим быÑтрого доÑтуп к диÑку, необходим Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(отключите Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÑовмеÑтимоÑти)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1985,7 +1965,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2015,7 +1995,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2031,7 +2011,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2044,14 +2024,14 @@ msgid "End" msgstr "End" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 #, fuzzy msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "УлучшениÑ" @@ -2069,17 +2049,17 @@ msgstr "ЗапиÑÑŒ %d/%d" msgid "Entry 1/%d" msgstr "ЗапиÑÑŒ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Ошибки" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2117,10 +2097,6 @@ msgstr "" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Закрыть Dolphin Ñ ÑмулÑтором" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 #, fuzzy msgid "Export Failed" @@ -2136,19 +2112,19 @@ msgstr "ЭкÑпортирование файла" msgid "Export Recording" msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "ЭкÑпортировать вÑе ÑохранениÑ" @@ -2157,7 +2133,7 @@ msgstr "ЭкÑпортировать вÑе ÑохранениÑ" msgid "Export failed, try again?" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "&ЭкÑпортировать Ñохранение как..." @@ -2165,7 +2141,7 @@ msgstr "&ЭкÑпортировать Ñохранение как..." msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2201,28 +2177,28 @@ msgstr "Извлечь файл..." msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2246,7 +2222,7 @@ msgstr "" msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2344,33 +2320,29 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 #, fuzzy msgid "File Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" @@ -2417,45 +2389,45 @@ msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Force Texture Filtering" msgstr "Включить фильтрацию" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2463,7 +2435,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2471,7 +2443,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2490,18 +2462,18 @@ msgstr "" msgid "Forward" msgstr "Вперед" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 #, fuzzy msgid "Frame" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 #, fuzzy msgid "Frame " msgstr "РаÑширенные" @@ -2512,39 +2484,39 @@ msgstr "РаÑширенные" msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 #, fuzzy msgid "Frame Range" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Свободный обзор" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 #, fuzzy msgid "French" msgstr "French" @@ -2553,21 +2525,21 @@ msgstr "French" msgid "Frets" msgstr "Лады" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "ПолнЭкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "Файл GCI(*.gci)" @@ -2576,11 +2548,11 @@ msgstr "Файл GCI(*.gci)" msgid "GCMic Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2608,25 +2580,29 @@ msgstr "ПерÑональные наÑтройки игр" msgid "GameConfig" msgstr "ÐаÑтройки игры" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "ÐаÑтройка контроллера GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko-коды" @@ -2642,8 +2618,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Общие" @@ -2653,30 +2629,30 @@ msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 #, fuzzy msgid "German" msgstr "German" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "ÐаÑтройка видео" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Больше чем" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2687,7 +2663,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2708,11 +2684,11 @@ msgstr "Ð—ÐµÐ»ÐµÐ½Ð°Ñ Ñправа" msgid "Guitar" msgstr "Гитара" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Вызван HCI_CMD_INQUIRY, пожалуйÑта Ñообщите!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2720,7 +2696,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2733,7 +2709,7 @@ msgstr "Ð’Ñ‹Ñота" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2754,11 +2730,11 @@ msgstr "" msgid "Hide" msgstr "СпрÑтать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Скрывать курÑор мыши" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2783,11 +2759,11 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Hungarian" msgstr "Hungarian" @@ -2796,12 +2772,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,11 +2790,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin cкорее вÑего завиÑнет" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" @@ -2838,7 +2814,7 @@ msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" @@ -2846,7 +2822,7 @@ msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" msgid "ITALY" msgstr "ИТÐЛИЯ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2864,7 +2840,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2877,12 +2853,12 @@ msgstr "" "Throttle\n" "в опциÑÑ… аудиоплагина." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 #, fuzzy msgid "Ignore Format Changes" msgstr "Эмулировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2891,7 +2867,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2900,7 +2876,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Импортировать Ñохранение" @@ -2928,7 +2904,7 @@ msgstr "" "Импортированный файл имеет раÑширение sav\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2939,16 +2915,6 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " -"пропадет в играх, которые его иÑпользуют." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Почти играбельна" @@ -2978,7 +2944,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -2986,12 +2952,12 @@ msgstr "Ð’Ñтавить SD-карту" msgid "Insert name here.." msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 #, fuzzy msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -3001,44 +2967,44 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка ÑжатиÑ" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3047,16 +3013,16 @@ msgstr "" "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка раÑпаковки (%d) (%li, %li) \n" "Попробуйте звгрузить опÑÑ‚ÑŒ" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" @@ -3069,7 +3035,7 @@ msgstr "ЗаÑтавка" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Ðеверное значение!" @@ -3082,7 +3048,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "Ðеверный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Ðеверный файл" @@ -3097,29 +3063,29 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Ðеверное Ñохранение" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 #, fuzzy msgid "Italian" msgstr "Italian" @@ -3128,16 +3094,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Japanese" msgstr "Japanese" @@ -3146,7 +3112,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "КОРЕЯ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3156,7 +3122,7 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3165,8 +3131,8 @@ msgstr "" msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3186,16 +3152,16 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Язык" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "ПоÑледнее перезапиÑанное Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "ПоÑледнее Ñохранение" @@ -3230,11 +3196,11 @@ msgstr "" "Левый/Правый клик Ð´Ð»Ñ Ð´Ð¾Ð¿. опций\n" "Средний-клик - очиÑтить." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3242,7 +3208,7 @@ msgstr "" msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" @@ -3295,21 +3261,21 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State Slot 8" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3321,16 +3287,11 @@ msgstr "Загрузить текÑтуры выÑокой четкоÑти из msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -#, fuzzy -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "\"ПривÑзать\" потоки данных к Ñдрам" @@ -3344,17 +3305,29 @@ msgstr "Лог" msgid "Log Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 #, fuzzy msgid "Log Types" msgstr "Тип:" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "Окно лога" @@ -3362,10 +3335,6 @@ msgstr "Окно лога" msgid "Lost connection to server!" msgstr "Соединение Ñ Ñервером потерÑно!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3383,8 +3352,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "Файлы Gameshark MadCatz (*.gcs)" @@ -3414,7 +3383,7 @@ msgstr "Ðа карте памÑти уже еÑÑ‚ÑŒ Ñохранение Ñто msgid "Memcard already opened" msgstr "Карта памÑти уже открыта" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 #, fuzzy msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" @@ -3459,11 +3428,11 @@ msgstr "Мик." msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "Разное" @@ -3472,7 +3441,7 @@ msgstr "Разное" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3493,7 +3462,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3514,11 +3483,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3612,28 +3581,28 @@ msgstr "NP Вверх" msgid "Name:" msgstr "ИмÑ:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "ИмÑ:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "Стандартные CGI-файлы (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Ðовый поиÑк" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "След. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "ИÑкать далее" @@ -3654,8 +3623,8 @@ msgstr "ISO/WAD-файлов не обнаружено" msgid "No banner file found for title %s" msgstr "Ðе найден баннер Ð´Ð»Ñ %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3663,7 +3632,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3671,7 +3640,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 #, fuzzy msgid "No recorded file" msgstr "Ðеверный файл запиÑи" @@ -3686,21 +3655,21 @@ msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "Ðе равно" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "ÐеизвеÑтно" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "Ðе подключено" @@ -3725,7 +3694,7 @@ msgstr "УведомлениÑ" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Кол-во кодов:" @@ -3738,15 +3707,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Выкл" @@ -3754,26 +3723,30 @@ msgstr "Выкл" msgid "Offset:" msgstr "Смещение:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "ДоÑтупно только %d блоков" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Выбор файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." @@ -3791,22 +3764,14 @@ msgstr "OpenAL: не найдена аудио-карта" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Открывает отладчик" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "Открывает окно лога" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3823,8 +3788,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3838,7 +3803,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Про&играть запиÑÑŒ процеÑÑа" @@ -3883,17 +3848,21 @@ msgstr "Раздел %i" msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Пауза" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" @@ -3907,10 +3876,10 @@ msgstr "Отлично" msgid "Perspective %d" msgstr "Точка %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "ЗапуÑк" @@ -3929,7 +3898,7 @@ msgstr "Старт/Пауза" msgid "Playable" msgstr "Играбельна" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 #, fuzzy msgid "Playback Options" msgstr "Опции" @@ -3938,7 +3907,7 @@ msgstr "Опции" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "" @@ -3950,27 +3919,27 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -3980,32 +3949,32 @@ msgstr "Порт :" msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 #, fuzzy msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4019,11 +3988,11 @@ msgstr "<Ðажмите кнопку>" msgid "Prev Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Предыдущее значение" @@ -4039,7 +4008,7 @@ msgstr "Профиль" msgid "Properties" msgstr "СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "ОчиÑтить кÑш" @@ -4067,7 +4036,7 @@ msgstr "" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" @@ -4084,7 +4053,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "ÐаÑтоÑщий" @@ -4097,7 +4066,7 @@ msgstr "Реальный Wimote" msgid "Real Wiimotes" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -4106,19 +4075,19 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "Подключить Wiimote 1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 #, fuzzy msgid "Recording Info" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -4134,7 +4103,7 @@ msgstr "КраÑÐ½Ð°Ñ Ñлева" msgid "Red Right" msgstr "КраÑÐ½Ð°Ñ Ñправа" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4148,7 +4117,7 @@ msgstr "" "произврдительноÑÑ‚ÑŒ." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Обновить" @@ -4159,18 +4128,18 @@ msgstr "Обновить" msgid "Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4180,7 +4149,7 @@ msgstr "" "Показывает только ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹.\n" "Полезно только при отладке." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" @@ -4190,7 +4159,7 @@ msgstr "Выводить изображение в главное окно" msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Результаты" @@ -4212,34 +4181,34 @@ msgstr "" msgid "Rumble" msgstr "ВидбрациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "ЗапуÑкает обработку DSP LLE в отдельном потоке (не рекомендуетÑÑ)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "РуÑÑкий" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "безопаÑное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 #, fuzzy msgid "Sample Rate:" msgstr "ЧаÑтота" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Сохр." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Сохранить CGI-файл как..." @@ -4291,7 +4260,7 @@ msgstr "БыÑтрое &Ñохранение" msgid "Save State Slot 8" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Сохранить игру как..." @@ -4300,24 +4269,24 @@ msgstr "Сохранить игру как..." msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4334,7 +4303,7 @@ msgstr "ПоиÑк образов диÑков" msgid "Scanning..." msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Скриншот" @@ -4342,25 +4311,25 @@ msgstr "Скриншот" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "ПоиÑк кодов" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4375,17 +4344,17 @@ msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" msgid "Select" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4403,23 +4372,23 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4440,7 +4409,7 @@ msgstr "" msgid "Selected font" msgstr "Выбранный шрифт" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4450,7 +4419,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4472,11 +4441,11 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4487,16 +4456,16 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "УÑтановить картой памÑти по умолчанию %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4523,58 +4492,58 @@ msgstr "Короткое имÑ:" msgid "Shoulder Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Отображать &конÑоль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 #, fuzzy msgid "Show &Log" msgstr "Отображать окно &лога" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Отображать панель &ÑтатуÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Отображать панель &инÑтрументов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Показывать FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Франции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 #, fuzzy msgid "Show Input Display" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Кореи" @@ -4582,49 +4551,49 @@ msgstr "Кореи" msgid "Show Language:" msgstr "Отображать Ñзык:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 #, fuzzy msgid "Show Log &Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Отображать игры платформ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "ТайванÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "WAD-файлы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Ðктивирует Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± оÑтановке процеÑÑа ÑмулÑции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 #, fuzzy msgid "" "Show a message box when a potentially serious error has occured.\n" @@ -4637,28 +4606,40 @@ msgstr "" "во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹, однако в Ñлучае вылета ÑмулÑтора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Показать комментарий" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Показать заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4666,15 +4647,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Показывает Ñто ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "ÐеизвеÑтные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4686,7 +4663,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4695,20 +4672,20 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4716,7 +4693,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4726,18 +4703,18 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, fuzzy, c-format msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -4758,11 +4735,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4777,8 +4754,8 @@ msgid "Space" msgstr "Пробел" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 #, fuzzy msgid "Spanish" msgstr "Spanish" @@ -4787,7 +4764,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4799,11 +4776,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -#, fuzzy -msgid "Specify a video backend" -msgstr "Ðазначает видео-плагин" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" @@ -4822,11 +4794,11 @@ msgstr "" msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "&Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" @@ -4850,15 +4822,15 @@ msgstr "Удалить Ñохранение" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Стоп" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4867,7 +4839,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "РаÑÑ‚Ñнуть по окну" @@ -4892,8 +4864,8 @@ msgstr "Сохранение уÑпешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Язык ÑиÑтемы:" @@ -4901,7 +4873,7 @@ msgstr "Язык ÑиÑтемы:" msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4922,8 +4894,8 @@ msgstr "Ð›ÐµÐ²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" msgid "Table Right" msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4937,16 +4909,16 @@ msgstr "" msgid "Test" msgstr "Проверить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "ТекÑтура" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "ОчиÑтить кÑш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -4963,13 +4935,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5009,7 +4981,7 @@ msgstr "Ð˜Ð¼Ñ Ð½Ðµ может Ñодержать знак ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5021,7 +4993,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Сохранение, которое вы пытаетеÑÑŒ Ñкопировать имеет неверный размер" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5053,15 +5025,15 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Стиль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Ошибка выбора темы" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5081,7 +5053,7 @@ msgstr "" "включена, выключена и неопределена (применÑетÑÑ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¾Ðµ значение данной " "опции)." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5089,13 +5061,13 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " "некоторых играх." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5106,7 +5078,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -5132,13 +5104,13 @@ msgstr "Порог" msgid "Tilt" msgstr "Ðаклон" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "Ðазвание" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 #, fuzzy msgid "To" msgstr "Ñверху" @@ -5148,18 +5120,18 @@ msgstr "Ñверху" msgid "Toggle All Log Types" msgstr "Включить вÑе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -5182,7 +5154,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5208,7 +5180,7 @@ msgstr "" msgid "UNKNOWN" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ÐЕИЗВЕСТÐО" @@ -5231,24 +5203,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Отменить загрузку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "ÐеизвеÑтно" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð¼Ð°Ð½Ð´Ð° DVD %08x - критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -5273,7 +5245,7 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d о msgid "Up" msgstr "Вверх" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Обновить" @@ -5283,24 +5255,24 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5308,7 +5280,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5317,15 +5289,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Утилиты" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "Значение" @@ -5333,7 +5305,7 @@ msgstr "Значение" msgid "Value:" msgstr "Значение:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "" @@ -5345,11 +5317,11 @@ msgstr "Глубина анализа" msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" @@ -5364,7 +5336,7 @@ msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" msgid "WAD installation failed: error creating ticket" msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5400,7 +5372,7 @@ msgstr "" "Предупреждение: Советуем Ñоздать резервную копию файлов папки: %s\n" "Хотите продолжить?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5413,7 +5385,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5421,7 +5393,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5429,7 +5401,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5457,7 +5429,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5465,7 +5437,7 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5473,16 +5445,16 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5491,7 +5463,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ файл" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5500,7 +5472,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5509,7 +5481,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote подключен" @@ -5517,7 +5489,7 @@ msgstr "Wiimote подключен" msgid "Wiimote Motor" msgstr "Включить поддержку мотора" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "ÐаÑтройка Wiimote" @@ -5545,10 +5517,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Подождите..." @@ -5585,7 +5557,7 @@ msgstr "XAudio2 ошибка инициализации: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ master voice: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5607,11 +5579,11 @@ msgstr "Ð’Ñ‹ не можете закрыть панель, в которой е msgid "You must choose a game!!" msgstr "Выберите игру!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Введите название!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцатиричное чиÑло." @@ -5619,7 +5591,7 @@ msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5644,11 +5616,11 @@ msgstr "" msgid "ZTP hack" msgstr "Включить ZTP-хак" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5658,7 +5630,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[ жду ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5670,7 +5642,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5681,7 +5653,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5695,7 +5667,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5722,7 +5694,7 @@ msgstr "iCacheJIT: Чтение кода операции из %x. Пожалу msgid "not a wii save or read failure for file header size %x" msgstr "Ñто Ñохранение не от Wii или ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° размером %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5731,7 +5703,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -5864,6 +5836,12 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "Отключить оÑвещение" + +#~ msgid "Disable Textures" +#~ msgstr "Отключить текÑтуры" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5947,6 +5925,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Закрыть Dolphin Ñ ÑмулÑтором" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Ошибка загрузки DSP ROM: %s" @@ -5980,6 +5961,15 @@ msgstr "| OR" #~ "ЕÑли игра завиÑает, или работает только в режиме Интерпретатора,\n" #~ "или вообще приводит к вылету ÑмулÑтора - Ð´Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ *может* помочь." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Отключение оÑÐ²ÐµÑ‰ÐµÐ½Ð¸Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐ°ÐµÑ‚ производительноÑÑ‚ÑŒ, но оÑвещение полноÑтью " +#~ "пропадет в играх, которые его иÑпользуют." + #~ msgid "Input Source" #~ msgstr "ИÑточник ввода" @@ -5999,6 +5989,10 @@ msgstr "| OR" #~ msgid "Load Script..." #~ msgstr "Загрузить Ñкрипт..." +#, fuzzy +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO)" + #~ msgid "Lua Script Console" #~ msgstr "LUA-конÑоль" @@ -6033,6 +6027,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "Открыть" +#~ msgid "Opens the debugger" +#~ msgstr "Открывает отладчик" + +#~ msgid "Opens the logger" +#~ msgstr "Открывает окно лога" + #~ msgid "Plugins" #~ msgstr "Плагины" @@ -6083,6 +6083,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Показывать кол-во отриÑовываемых кадров в Ñекунду." +#~ msgid "Show this help message" +#~ msgstr "Показывает Ñто ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6100,6 +6103,10 @@ msgstr "| OR" #~ msgid "Sonic and the Black Knight" #~ msgstr "Sonic and the Black Knight" +#, fuzzy +#~ msgid "Specify a video backend" +#~ msgstr "Ðазначает видео-плагин" + #~ msgid "Specify an audio plugin" #~ msgstr "Выберите аудио-плагин" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index f3bba97086..7f203c0100 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "&" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -55,9 +55,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "" @@ -142,7 +142,7 @@ msgstr "%sExportuj GCI%s" msgid "%sImport GCI%s" msgstr "%sImportuj GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" @@ -151,147 +151,147 @@ msgstr "" msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "&O" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "&Bootuj sa DVD drajvera" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "&Trazi \"ISO\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "&Chit Meneger " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emulacija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "&Fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Graficke Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "&Hotkey Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "Loaduj Savestate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "&Memorijska kartica (Meneger za GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "&Memorija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "&Otvori..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "&Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "&Pribor/Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "&Refresuj listu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "&Alat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "&Pogledaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -307,27 +307,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEPOZNAT/O)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(iskljucen/o)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -335,7 +335,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "" @@ -348,11 +348,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -361,8 +361,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "Netplay prozor je vec otvoren!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Nijedna igra trenutno nije pokrenuta." @@ -396,7 +396,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR Kodovi" @@ -409,7 +409,7 @@ msgstr "O Dolphin-u" msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -417,7 +417,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -441,39 +441,39 @@ msgid "" "%s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -484,27 +484,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Adapter" @@ -513,11 +513,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Dodaj Patch " @@ -527,7 +527,7 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Dodaj..." @@ -561,36 +561,36 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -598,27 +598,29 @@ msgstr "" msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" +"Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "" @@ -630,22 +632,22 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Primeni " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -654,7 +656,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -662,12 +664,12 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "" @@ -675,12 +677,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "" @@ -688,24 +690,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -714,19 +716,11 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "&Registri" @@ -735,12 +729,12 @@ msgstr "&Registri" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "Nazad " @@ -758,7 +752,7 @@ msgstr "U nazad" msgid "Bad File Header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "Baner" @@ -775,11 +769,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -791,7 +785,7 @@ msgstr "Bas" msgid "Block Allocation Table checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "" @@ -808,7 +802,7 @@ msgid "Blue Right" msgstr "Blue right " #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Donji deo/dno" @@ -821,7 +815,7 @@ msgstr "" msgid "Broken" msgstr "Ostecen/a/nje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Trazi" @@ -829,11 +823,11 @@ msgstr "Trazi" msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "" @@ -847,7 +841,7 @@ msgstr "" msgid "Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -860,19 +854,19 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -882,7 +876,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -891,7 +885,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Odustani" @@ -907,7 +901,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -915,24 +909,24 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "" @@ -940,7 +934,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -952,7 +946,7 @@ msgstr "Centar " msgid "Change" msgstr "Promeni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "Promeni &Disk..." @@ -965,7 +959,7 @@ msgstr "Promeni Disk" msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -981,8 +975,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" @@ -994,7 +988,7 @@ msgstr "Chat/Caskanje" msgid "Cheat Code" msgstr "Chit kod" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Trazi Chit" @@ -1006,35 +1000,35 @@ msgstr "Chit Meneger" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1042,14 +1036,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1076,22 +1070,22 @@ msgstr "" "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras " "manualno zaustaviti igru." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Zatvori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kod:" @@ -1099,7 +1093,7 @@ msgstr "Kod:" msgid "Command" msgstr "Komanda" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "" @@ -1107,20 +1101,20 @@ msgstr "" msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Podesi" @@ -1139,17 +1133,17 @@ msgstr "" msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "" @@ -1158,11 +1152,11 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "" @@ -1187,7 +1181,7 @@ msgstr "" msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "Povezivanje..." @@ -1207,7 +1201,7 @@ msgstr "Konvertuj u GCI" msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" @@ -1221,7 +1215,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1250,7 +1244,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1259,18 +1253,18 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "" @@ -1278,8 +1272,8 @@ msgstr "" msgid "Country:" msgstr "Zemlja:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "Kreiraj AR Kod" @@ -1288,20 +1282,20 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" @@ -1313,11 +1307,11 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Izseci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1328,7 +1322,7 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1345,11 +1339,11 @@ msgstr "" msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1357,36 +1351,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "" @@ -1398,7 +1392,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "" @@ -1406,8 +1400,8 @@ msgstr "" msgid "Date:" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "" @@ -1423,7 +1417,7 @@ msgstr "Mrtva Zona " msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "" @@ -1431,16 +1425,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "" @@ -1448,7 +1442,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "" @@ -1461,7 +1455,7 @@ msgstr "" msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Obrisi save" @@ -1470,7 +1464,7 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "Pitanje " @@ -1491,8 +1485,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1514,29 +1508,21 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Onemoguci \"Lighting\"" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Onemoguci \"Textures\" " - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1545,7 +1531,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1555,13 +1541,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disk" @@ -1571,11 +1550,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Error tokom ucitavanje diska" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1586,20 +1565,20 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Graficka Podesavanja " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sajt" @@ -1611,17 +1590,17 @@ msgstr "Dolphin podesavanja/konfiguracija" msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1629,7 +1608,7 @@ msgstr "" msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "" @@ -1667,37 +1646,37 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1705,23 +1684,23 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1731,11 +1710,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "" @@ -1751,7 +1730,7 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "" @@ -1764,15 +1743,15 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1781,7 +1760,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1803,7 +1782,7 @@ msgstr "" msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1813,7 +1792,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "" @@ -1829,11 +1808,11 @@ msgstr "" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "" @@ -1841,11 +1820,11 @@ msgstr "" msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "" @@ -1853,7 +1832,7 @@ msgstr "" msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "" @@ -1862,11 +1841,11 @@ msgid "Enable MMU" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "" @@ -1874,11 +1853,11 @@ msgstr "" msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1893,11 +1872,11 @@ msgid "" "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1905,7 +1884,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1930,7 +1909,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1944,7 +1923,7 @@ msgid "" "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1956,13 +1935,13 @@ msgid "End" msgstr "Kraj" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "" @@ -1980,17 +1959,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2025,10 +2004,6 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "" @@ -2042,19 +2017,19 @@ msgstr "" msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "" @@ -2062,7 +2037,7 @@ msgstr "" msgid "Export failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "" @@ -2070,7 +2045,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "" @@ -2106,28 +2081,28 @@ msgstr "" msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "" @@ -2151,7 +2126,7 @@ msgstr "" msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2248,34 +2223,29 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "Ucitaj Native Mipmaps" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 #, fuzzy msgid "File Info" msgstr "Informacija o kodu " @@ -2318,43 +2288,43 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2362,7 +2332,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2370,7 +2340,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2387,17 +2357,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "" @@ -2406,38 +2376,38 @@ msgstr "" msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "" @@ -2445,21 +2415,21 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "" @@ -2468,11 +2438,11 @@ msgstr "" msgid "GCMic Configuration" msgstr "Dolphin podesavanja/konfiguracija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2500,24 +2470,28 @@ msgstr "" msgid "GameConfig" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "" @@ -2533,8 +2507,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "" @@ -2544,29 +2518,29 @@ msgid "General Settings" msgstr "Opcije Uredjaja " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Nemacki " -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Grafike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Graficke opcije/podesavanja/konfiguracije..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2577,7 +2551,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "" @@ -2597,11 +2571,11 @@ msgstr "" msgid "Guitar" msgstr "Gitara " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2609,7 +2583,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "" @@ -2621,7 +2595,7 @@ msgstr "" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2635,11 +2609,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2663,11 +2637,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "" @@ -2675,12 +2649,12 @@ msgstr "" msgid "Hybrid Wiimote" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2689,11 +2663,11 @@ msgid "" " Dolphin will likely hang now" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "" @@ -2713,7 +2687,7 @@ msgstr "" msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "" @@ -2721,7 +2695,7 @@ msgstr "" msgid "ITALY" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "" @@ -2736,18 +2710,18 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2756,7 +2730,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2765,7 +2739,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "" @@ -2789,7 +2763,7 @@ msgid "" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2799,16 +2773,6 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " -"\"lightning\" nestane u igrama koje ga koriste." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "" @@ -2838,7 +2802,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "" @@ -2846,12 +2810,12 @@ msgstr "" msgid "Insert name here.." msgstr "Ubaci ime ovde..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 #, fuzzy msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "" @@ -2860,58 +2824,58 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "" @@ -2924,7 +2888,7 @@ msgstr "Uvod" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "" @@ -2937,7 +2901,7 @@ msgstr "" msgid "Invalid event type %i" msgstr "" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "" @@ -2949,29 +2913,29 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italianski " @@ -2979,16 +2943,16 @@ msgstr "Italianski " msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanski " @@ -2996,7 +2960,7 @@ msgstr "Japanski " msgid "KOREA" msgstr "KOREA " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3005,7 +2969,7 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3014,8 +2978,8 @@ msgstr "" msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korejski " @@ -3033,16 +2997,16 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "" @@ -3075,11 +3039,11 @@ msgid "" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3087,7 +3051,7 @@ msgstr "" msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " @@ -3132,21 +3096,21 @@ msgstr "Ucitaj State Slot 7" msgid "Load State Slot 8" msgstr "Ucitaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3157,15 +3121,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "" @@ -3177,16 +3137,28 @@ msgstr "" msgid "Log Configuration" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "" @@ -3194,10 +3166,6 @@ msgstr "" msgid "Lost connection to server!" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "" @@ -3213,8 +3181,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "" @@ -3244,7 +3212,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 #, fuzzy msgid "Memory Byte" msgstr "&Memorija" @@ -3288,11 +3256,11 @@ msgstr "" msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "" @@ -3301,7 +3269,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3322,7 +3290,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3343,11 +3311,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3441,28 +3409,28 @@ msgstr "" msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "" @@ -3483,8 +3451,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3492,7 +3460,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3500,7 +3468,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "" @@ -3514,20 +3482,20 @@ msgstr "" msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "" @@ -3552,7 +3520,7 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "" @@ -3565,15 +3533,15 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Izskljucen/o" @@ -3581,26 +3549,30 @@ msgstr "Izskljucen/o" msgid "Offset:" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Otvori fajl..." @@ -3618,22 +3590,14 @@ msgstr "" msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3650,8 +3614,8 @@ msgid "" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3665,7 +3629,7 @@ msgstr "" msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "" @@ -3710,17 +3674,21 @@ msgstr "" msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauza " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" @@ -3734,10 +3702,10 @@ msgstr "Perfektno " msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Pokreni " @@ -3755,7 +3723,7 @@ msgstr "" msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 #, fuzzy msgid "Playback Options" msgstr "Opcije " @@ -3764,7 +3732,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "" @@ -3776,23 +3744,23 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "Port 4" @@ -3801,29 +3769,29 @@ msgstr "Port 4" msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3836,11 +3804,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "" @@ -3856,7 +3824,7 @@ msgstr "Profil" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "" @@ -3883,7 +3851,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM " @@ -3900,7 +3868,7 @@ msgstr "" msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "" @@ -3912,7 +3880,7 @@ msgstr "" msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "" @@ -3920,19 +3888,19 @@ msgstr "" msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 #, fuzzy msgid "Recording Info" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -3948,7 +3916,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3958,7 +3926,7 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "" @@ -3968,25 +3936,25 @@ msgstr "" msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "" @@ -3996,7 +3964,7 @@ msgstr "" msgid "Reset" msgstr "Reset/Restart " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Rezultati " @@ -4018,33 +3986,33 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Siguran " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Snimaj" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "Snimaj GCI kao..." @@ -4088,7 +4056,7 @@ msgstr "Snimaj State Slot 7 " msgid "Save State Slot 8" msgstr "Snimaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Snimaj state..." @@ -4097,24 +4065,24 @@ msgstr "Snimaj state..." msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "" @@ -4131,7 +4099,7 @@ msgstr "Skeniranje za ISO fajlove " msgid "Scanning..." msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "" @@ -4139,24 +4107,24 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "Trazi Chit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4171,17 +4139,17 @@ msgstr "" msgid "Select" msgstr "Izaberi " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4199,23 +4167,23 @@ msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4230,7 +4198,7 @@ msgstr "" msgid "Selected font" msgstr "Odabrani font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4240,7 +4208,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4262,11 +4230,11 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4275,16 +4243,16 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" @@ -4310,55 +4278,55 @@ msgstr "" msgid "Shoulder Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "" @@ -4366,74 +4334,85 @@ msgstr "" msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +msgid "Show lag counter" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4441,15 +4420,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4460,7 +4435,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "" @@ -4468,20 +4443,20 @@ msgstr "" msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4489,7 +4464,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4499,17 +4474,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "" @@ -4529,11 +4504,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4548,8 +4523,8 @@ msgid "Space" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "" @@ -4557,7 +4532,7 @@ msgstr "" msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4569,10 +4544,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4591,11 +4562,11 @@ msgstr "" msgid "Start" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "Pokreni &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Pokreni Sni&manje" @@ -4617,15 +4588,15 @@ msgstr "" msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr " Zaustavi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4634,7 +4605,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "" @@ -4659,8 +4630,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "" @@ -4668,7 +4639,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4689,8 +4660,8 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4704,17 +4675,17 @@ msgstr "" msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Texture" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "" @@ -4730,13 +4701,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4772,7 +4743,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4784,7 +4755,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4815,15 +4786,15 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -4835,17 +4806,17 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4856,7 +4827,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4877,13 +4848,13 @@ msgstr "" msgid "Tilt" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "" @@ -4891,18 +4862,18 @@ msgstr "" msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "" @@ -4924,7 +4895,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "" @@ -4949,7 +4920,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "(NEPOZNAT/O)" @@ -4972,24 +4943,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Nepoznat/o" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "" @@ -5014,7 +4985,7 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Updejt " @@ -5023,24 +4994,24 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5048,7 +5019,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5057,15 +5028,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "" @@ -5073,7 +5044,7 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "" @@ -5085,11 +5056,11 @@ msgstr "" msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Jacina zvuka " @@ -5103,7 +5074,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5137,7 +5108,7 @@ msgid "" "Do you wish to continue?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5151,7 +5122,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5159,7 +5130,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5167,7 +5138,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5195,7 +5166,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "" @@ -5203,7 +5174,7 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "" @@ -5211,15 +5182,15 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5228,7 +5199,7 @@ msgid "WiiWAD: Could not read from file" msgstr "" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "" @@ -5237,7 +5208,7 @@ msgstr "" msgid "Wiimote %i" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5246,7 +5217,7 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "" @@ -5254,7 +5225,7 @@ msgstr "" msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "" @@ -5279,10 +5250,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Radi..." @@ -5317,7 +5288,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5339,11 +5310,11 @@ msgstr "" msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" @@ -5351,7 +5322,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5373,11 +5344,11 @@ msgstr "" msgid "ZTP hack" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "" @@ -5387,7 +5358,7 @@ msgstr "" msgid "[ waiting ]" msgstr "[ cekanje ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5399,7 +5370,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5410,7 +5381,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5423,7 +5394,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "" @@ -5450,7 +5421,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5459,7 +5430,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5493,6 +5464,12 @@ msgstr "| ILI" #~ msgid "Danish" #~ msgstr "Danski" +#~ msgid "Disable Lighting" +#~ msgstr "Onemoguci \"Lighting\"" + +#~ msgid "Disable Textures" +#~ msgstr "Onemoguci \"Textures\" " + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5507,6 +5484,10 @@ msgstr "| ILI" #~ "Onemoguci alpha-setting pass.\n" #~ "Onemogucava neke efekte ali moze pomoci performansu/brzini" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "Ucitaj Native Mipmaps" + #~ msgid "GFX Config" #~ msgstr "GFX podesavanja" @@ -5514,6 +5495,15 @@ msgstr "| ILI" #~ msgid "Hide Shader Errors" #~ msgstr "Error tokom ucitavanje diska" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Onemoguci \"lighting\". Poboljsava performans/brzinu ali uzrokuje da " +#~ "\"lightning\" nestane u igrama koje ga koriste." + #~ msgid "OK" #~ msgstr "OK" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 7bfe0fe02b..6f519194fa 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2012-06-11 23:41+0200\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -18,7 +18,7 @@ msgstr "" "X-Poedit-Language: Turkish\n" "X-Poedit-Country: TURKEY\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr "(Göstermek için çok fazla)" @@ -48,7 +48,7 @@ msgstr "" "\"%s\" hatalı bir GCM veya ISO dosyası, veya herhangi bir GC veya Wii kalıbı " "deÄŸil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "%08X: " @@ -58,9 +58,9 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -154,7 +154,7 @@ msgstr "%sGCI Ver%s" msgid "%sImport GCI%s" msgstr "%sGCI Al%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" @@ -163,147 +163,147 @@ msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" msgid "&& AND" msgstr "&& VE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "Hakkında... (&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "DVD Sürücüden Önyükle... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "Kesme noktaları (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "Kalıplara Gözat... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "Hile Yöneti&cisi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "&Emülasyon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "Dosya (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "GeliÅŸmiÅŸ Kareleme (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "Tam Ekran (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "&Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "Yardım (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "TuÅŸ ayarları (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "Durumu Yük&le" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "GC Hafıza Kartı Yönetici (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "Hafıza (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "Aç...(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "Seçenekler (&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "Duraklat (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "Özellikler (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "Salt okunu&r mod" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "Listeyi Yenile (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "Kayıtla&r" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "Sıfı&rla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "&Ses" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "Durdur (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "Araçlar (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "Görüntü (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "Görünüm (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "'" @@ -319,27 +319,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(BÄ°LÄ°NMEYEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(kapalı)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 bit" @@ -347,7 +347,7 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<Çözünürlük bulunamadı>" @@ -360,11 +360,11 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "A" @@ -373,8 +373,8 @@ msgstr "A" msgid "A NetPlay window is already open!!" msgstr "Bir NetPlay penceresi zaten açık!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "Bir oyun ÅŸu anda düzgün çalışmıyor." @@ -425,7 +425,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR Kodları" @@ -438,7 +438,7 @@ msgstr "Dolphin Hakkında" msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "DoÄŸruluk:" @@ -446,7 +446,7 @@ msgstr "DoÄŸruluk:" msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -479,14 +479,14 @@ msgstr "" "Suçlu Kod:\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" "Action Replay Hatası: Kod eklemede (%08x : adres = %08x) hatalı boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -495,7 +495,7 @@ msgstr "" "Action Replay Hatası: Doldurma ve kaydırmada (%08x : adres = %08x) hatalı " "boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -504,7 +504,7 @@ msgstr "" "Action Replay Hatası: Anabellek yazma ve doldurmasında (%08x : adres = %08x) " "hatalı boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -513,12 +513,12 @@ msgstr "" "Action Replay Hatası: Ä°ÅŸaretleyiciye yazarken (%08x : address = %08x) hatalı " "boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Hatası: Hafıza kopyalamada (%08x) hatalı deÄŸer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -529,27 +529,27 @@ msgstr "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Hatası: Hatalı AR kod satırı: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Åžartlı Kod: Hatalı Boyut %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Hatalı Normal Kod Türü %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kod %i: Hatalı alt tür %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kod 0: Hatalı alt tür %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "Dönüştürücü:" @@ -558,11 +558,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "Yama Ekle" @@ -572,7 +572,7 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "Ekle..." @@ -622,38 +622,38 @@ msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" @@ -661,9 +661,10 @@ msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." @@ -677,15 +678,15 @@ msgstr "" msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "Analiz et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "Filtreleme:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "KeskinleÅŸtirme:" @@ -697,15 +698,15 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "Uygula" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -715,7 +716,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "Arapça" @@ -724,7 +725,7 @@ msgstr "Arapça" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,14 +733,14 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -747,12 +748,12 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En az bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" @@ -760,24 +761,24 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "Otomatik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "Otomatik (640x528'in katları)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Window Size)" msgstr "Otomatik (Pencere Boyutu)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Auto adjust Window Size" msgstr "Pencere Boyutunu Otomatik Ayarla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -787,23 +788,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"MipMap'leri hafızadan çözmek yerine otomatik olarak oluÅŸtur. \n" -"Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretli bırakın." - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " msgstr "BP kaydı" @@ -811,12 +800,12 @@ msgstr "BP kaydı" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "Çözücü Ayarları" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" msgstr "Çözücü:" @@ -833,7 +822,7 @@ msgstr "Geri" msgid "Bad File Header" msgstr "Kötü Dosya Başı" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "AfiÅŸ" @@ -850,11 +839,11 @@ msgstr "AfiÅŸ:" msgid "Bar" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -866,7 +855,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Blok Ayırma Tablosu saÄŸlaması baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "Bloklar" @@ -883,7 +872,7 @@ msgid "Blue Right" msgstr "Mavi SaÄŸ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "Alt" @@ -896,7 +885,7 @@ msgstr "BaÄŸlı Denetimler: %lu" msgid "Broken" msgstr "Bozuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "Gözat..." @@ -904,11 +893,11 @@ msgstr "Gözat..." msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -922,7 +911,7 @@ msgstr "Tampon:" msgid "Buttons" msgstr "Düğmeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "C" @@ -934,19 +923,19 @@ msgstr "C ÇubuÄŸu" msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "CP kaydı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -962,7 +951,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -977,7 +966,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Ä°ptal" @@ -993,7 +982,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1004,7 +993,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1012,18 +1001,18 @@ msgstr "" "Bu dosya bir hafıza kartı olarak kullanılamıyor.\n" "2 slot için de aynı dosyayı deniyor olabilir misiniz?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" @@ -1031,7 +1020,7 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "Katalanca" @@ -1043,7 +1032,7 @@ msgstr "Merkez" msgid "Change" msgstr "DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "&Diski DeÄŸiÅŸtir" @@ -1056,7 +1045,7 @@ msgstr "Diski DeÄŸiÅŸtir" msgid "Change Game" msgstr "Oyunu DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1072,8 +1061,8 @@ msgstr "zFar Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" @@ -1086,7 +1075,7 @@ msgstr "Sohbet" msgid "Cheat Code" msgstr "Hile Kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "Hile Arama" @@ -1098,35 +1087,35 @@ msgstr "Hile Yöneticisi" msgid "Check Partition Integrity" msgstr "Bölüm Düzgünlüğünü Denetle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "Düzgünlük denetleniyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1134,7 +1123,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1142,8 +1131,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "GeniÅŸletmek için bir klasör seçin" @@ -1170,22 +1159,22 @@ msgstr "" "Oyun çalışırken istemci baÄŸlantısı kesildi!! NetPlay iptal edildi. Oyunu " "elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "Kapat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "Yapıla&ndır" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "Kod Bilgisi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "Kod:" @@ -1193,7 +1182,7 @@ msgstr "Kod:" msgid "Command" msgstr "Komut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "Yorum" @@ -1201,20 +1190,20 @@ msgstr "Yorum" msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "Yapılandırma" @@ -1233,17 +1222,17 @@ msgstr "Denetimleri Yapılandır" msgid "Configure Pads" msgstr "Kolları Yapılandır" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" @@ -1252,11 +1241,11 @@ msgstr "Durdurma Onayı Ä°ste" msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote'u BaÄŸla : %i" @@ -1281,7 +1270,7 @@ msgstr "Wiimote 3'ü BaÄŸla" msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1301,7 +1290,7 @@ msgstr "GCI'ya dönüştür" msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" @@ -1315,7 +1304,7 @@ msgstr "Çekirdek" msgid "Could not create %s" msgstr "%s oluÅŸturulamadı." -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "Çözücü %s baÅŸlatılamadı." @@ -1349,7 +1338,7 @@ msgstr "" "Kollar ayarlanamadı. Oyuncu ayrıldı veya oyun ÅŸu anda çalışıyor! \n" "(Oyunlar çalışırken kolların ayarlanması henüz desteklenmemektedir)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1361,11 +1350,11 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1373,8 +1362,8 @@ msgstr "" "Çekirdek baÅŸlatılamadı. \n" "Yapılandırmanızı denetleyin." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "Sayı:" @@ -1382,8 +1371,8 @@ msgstr "Sayı:" msgid "Country:" msgstr "Ãœlke:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "AR Kodu OluÅŸtur" @@ -1392,22 +1381,22 @@ msgstr "AR Kodu OluÅŸtur" msgid "Create new perspective" msgstr "Yeni perspektif oluÅŸtur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " "oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" "black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " @@ -1421,11 +1410,11 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "Kırp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1439,7 +1428,7 @@ msgstr "" msgid "Crossfade" msgstr "GeçiÅŸli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" @@ -1457,11 +1446,11 @@ msgstr "Özel Görüntüleme Hilesi Ayarları" msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Çekçe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "D" @@ -1469,36 +1458,36 @@ msgstr "D" msgid "D-Pad" msgstr "Yön TuÅŸları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1510,7 +1499,7 @@ msgstr "DVDLowRead - Kritik Hata: Birimden okuma baÅŸarısız." msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Kritik Hata: Birimden okuma baÅŸarısız." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "Veri Boyutu" @@ -1518,8 +1507,8 @@ msgstr "Veri Boyutu" msgid "Date:" msgstr "Tarih:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro dosyaları (*.sav)" @@ -1535,7 +1524,7 @@ msgstr "Ölü Bölge" msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" msgstr "Hata ayıklama" @@ -1543,16 +1532,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." @@ -1560,7 +1549,7 @@ msgstr "Kalıp geniÅŸletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1573,7 +1562,7 @@ msgstr "Varsayılan yazı tipi" msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "Kaydı sil" @@ -1582,7 +1571,7 @@ msgstr "Kaydı sil" msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediÄŸinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" msgstr "Açıklama" @@ -1603,8 +1592,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1628,28 +1617,20 @@ msgstr "" "Konum doÄŸrulama baÅŸarısız \n" "ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "Işıklandırmayı Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" msgstr "Piksel DerinliÄŸini Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "Dokuları Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1663,7 +1644,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1679,16 +1660,6 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Dokulandırmayı iptal et. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretsiz bırakın." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "Disk" @@ -1698,11 +1669,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Disk Okuma Hatası" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1716,20 +1687,20 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Görüntü Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sitesi" @@ -1741,16 +1712,16 @@ msgstr "Dolphin Yapılandırması" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Taklit Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1758,7 +1729,7 @@ msgstr "Dolphin TAS Filmleri (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" @@ -1800,23 +1771,23 @@ msgstr "Davullar" msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "Dokuları Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1827,7 +1798,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1837,7 +1808,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1848,23 +1819,23 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Flemenkçe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "Çıkış (&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" msgstr "EFB Kopyaları" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1877,11 +1848,11 @@ msgstr "" msgid "EUROPE" msgstr "AVRUPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "Erken Hafıza Güncellemeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "Düzen" @@ -1897,7 +1868,7 @@ msgstr "Yapılandırmayı Düzenle" msgid "Edit Patch" msgstr "Yamayı Düzenle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" @@ -1910,15 +1881,15 @@ msgstr "Düzenle..." msgid "Effect" msgstr "Etki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "Gömülü Çerçeve Tamponu" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "Emülasyon Ä°ÅŸlem Birimi zaten çalışıyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1932,7 +1903,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, bunun yerine sanal XFB emülasyonunu seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1960,7 +1931,7 @@ msgstr "Emülasyon Durumu:" msgid "Enable" msgstr "Ä°zin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1976,7 +1947,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" @@ -1992,11 +1963,11 @@ msgstr "Blok BirleÅŸimine Ä°zin Ver" msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" @@ -2004,11 +1975,11 @@ msgstr "Hilelere Ä°zin Ver" msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" @@ -2016,7 +1987,7 @@ msgstr "Kısayol TuÅŸlarına Ä°zin Ver" msgid "Enable Idle Skipping" msgstr "BoÅŸta Atlamaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" @@ -2025,11 +1996,11 @@ msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" @@ -2037,11 +2008,11 @@ msgstr "Ekran Koruyucusuna Ä°zin Ver" msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2063,11 +2034,11 @@ msgstr "" "Disk eriÅŸimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Sayfalara izin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2081,7 +2052,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2115,7 +2086,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2135,7 +2106,7 @@ msgstr "" "Hafıza Yönetim Ãœnitesini etkinleÅŸtirir. Bazı oyunlarda gereklidir. (Açık = " "Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2150,13 +2121,13 @@ msgid "End" msgstr "Son" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "Ä°ngilizce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "GeliÅŸtirmeler" @@ -2174,17 +2145,17 @@ msgstr "GiriÅŸ %d/%d" msgid "Entry 1/%d" msgstr "GiriÅŸ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "Hata" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2223,10 +2194,6 @@ msgstr "Özel durum iÅŸleyicisi - bellek alanı altında eriÅŸim. %08llx%08llx" msgid "Execute" msgstr "Yürüt" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Dolphin Emülatöründen Çık" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "Verme baÅŸarısız." @@ -2240,19 +2207,19 @@ msgstr "Dosya Ver" msgid "Export Recording" msgstr "Çekimi Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2260,7 +2227,7 @@ msgstr "Tüm Kayıtları Ver" msgid "Export failed, try again?" msgstr "Verme baÅŸarısız, tekrar dene?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "Kaydı farklı ver..." @@ -2268,7 +2235,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2304,28 +2271,28 @@ msgstr "Dosyayı GeniÅŸlet..." msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "FIFO Bayt'ı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" msgstr "FIFO Oynatıcısı" @@ -2349,7 +2316,7 @@ msgstr "Dinleme baÅŸarısız!" msgid "Failed to download codes." msgstr "Kod indirme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2467,23 +2434,19 @@ msgstr "%s için baÅŸlık yazılamadı." msgid "Failed to write header for file %d" msgstr "%d dosyası için baÅŸlık yazılamadı." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "Farsça" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -msgid "Fast Mipmaps" -msgstr "Hızlı MipMap'ler" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2491,11 +2454,11 @@ msgstr "" "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, " "bayt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" msgstr "Dosya Bilgisi" @@ -2541,43 +2504,43 @@ msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "Sonrakini bul" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "Öncekini bul" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "Ä°lk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "16:9 'a zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" msgstr "Doku Filtrelemesine Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2589,7 +2552,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2601,7 +2564,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2623,17 +2586,17 @@ msgstr "" msgid "Forward" msgstr "Ä°leri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "Bunun için %d sonuçlarını bul: '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" msgstr "Çerçeve" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " msgstr "Çerçeve" @@ -2642,37 +2605,37 @@ msgstr "Çerçeve" msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" msgstr "Çerçeve Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" msgstr "Çerçeve Aralığı" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "Serbest Bakış" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "Fransızca" @@ -2680,20 +2643,20 @@ msgstr "Fransızca" msgid "Frets" msgstr "Perdeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "Buradan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "Tam Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" msgstr "Tam Ekran Çözünürlüğü:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI Dosyası (*.gci)" @@ -2701,11 +2664,11 @@ msgstr "GCI Dosyası (*.gci)" msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2733,24 +2696,28 @@ msgstr "Oyuna Özel Ayarlar" msgid "GameConfig" msgstr "Oyun Yapılandırması" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko Kodları" @@ -2770,8 +2737,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "Genel" @@ -2780,29 +2747,29 @@ msgid "General Settings" msgstr "Genel Ayarlar" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "Almanca" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Ana sayfa kod liste boyutundan (%lu) daha büyük." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "Daha Büyük" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2818,7 +2785,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Yunanca" @@ -2838,11 +2805,11 @@ msgstr "YeÅŸil SaÄŸ" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY çaÄŸrıldı, lütfen bildirin!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "Hack'ler" @@ -2850,7 +2817,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Ä°branice" @@ -2862,7 +2829,7 @@ msgstr "Yükseklik" msgid "Help" msgstr "Yardım" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2882,11 +2849,11 @@ msgstr "" msgid "Hide" msgstr "Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "Fare Ä°ÅŸaretçisini Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2911,11 +2878,11 @@ msgstr "Kısayol TuÅŸu Yapılandırması" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Macarca" @@ -2923,12 +2890,12 @@ msgstr "Macarca" msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Bilinmeyen biletten veri alma denemesi: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2941,11 +2908,11 @@ msgstr "" "BaÅŸlık ID %016llx.\n" " Dolphin çakılacak gibi gözüküyor." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -2965,7 +2932,7 @@ msgstr "Kızılötesi Hassasiyeti:" msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -2973,7 +2940,7 @@ msgstr "Kalıp Konumları" msgid "ITALY" msgstr "Ä°TALYA" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "Simge" @@ -2992,7 +2959,7 @@ msgstr "" "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " "= Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -3002,11 +2969,11 @@ msgstr "" "ile Ses hızlandırıcısı kullanın. (Ses takılmalarını düzeltebilir, ancak " "(oyuna baÄŸlı olarak) sürekli gürültüye de neden olabilir.)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" msgstr "Birim deÄŸiÅŸimini yoksay" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3020,7 +2987,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3034,7 +3001,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "Kayıt Al" @@ -3062,7 +3029,7 @@ msgstr "" "Alınan dosya sav uzantısına sahip\n" "ama baÅŸlığı düzgün deÄŸil." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3074,17 +3041,6 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakır." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Performansı artırır ancak bazı oyunların karanlık kalmasına neden " -"olabilir. \n" -"\n" -"Emin deÄŸilseniz, iÅŸaretsiz bırakın." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "Oyun İçi" @@ -3114,7 +3070,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3122,11 +3078,11 @@ msgstr "SD Kart Ekle" msgid "Insert name here.." msgstr "Adı buraya yazın..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3137,23 +3093,23 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "Düzgünlük Denetleme Hatası" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "Düzgünlük denetlemesi tamamlandı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3162,19 +3118,19 @@ msgstr "" "Bölüntü %d için düzgünlük denetlemesi baÅŸarısız. Dökümünüz hasar görmüş veya " "yanlış yamanmış olabilir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "Arabirim Ayarları" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "İç LZO Hatası - Sıkıştırma baÅŸarısız." -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3183,15 +3139,15 @@ msgstr "" "İç LZO Hatası - GeniÅŸletme baÅŸarısız (%d) (%li, %li) \n" "Durumu tekrar yüklemeyi deneyin." -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" @@ -3204,7 +3160,7 @@ msgstr "Ä°ntro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Yanlış boyut (%x) veya Sihirli kelime (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "Hatalı DeÄŸer!" @@ -3217,7 +3173,7 @@ msgstr "Hatalı bat.map veya konum giriÅŸi" msgid "Invalid event type %i" msgstr "Hatalı olay türü: %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "Hatalı dosya" @@ -3232,29 +3188,29 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "Geçersiz arama parametre(ler)i (nesne seçilmedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "Geçersiz arama dizesi (sadece düz dize uzunluÄŸu destekleniyor)" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Hatalı durum" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Ä°talyanca" @@ -3262,16 +3218,16 @@ msgstr "Ä°talyanca" msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japonca" @@ -3279,7 +3235,7 @@ msgstr "Japonca" msgid "KOREA" msgstr "KORE" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3289,7 +3245,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "Pencereyi üstte tut" @@ -3298,8 +3254,8 @@ msgstr "Pencereyi üstte tut" msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korece" @@ -3317,16 +3273,16 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "Dil:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "Son Ãœzerine Yazılan Durum" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "Son Kayıtlı Durum" @@ -3366,11 +3322,11 @@ msgstr "" "Daha çok seçenek için sol veya saÄŸ, \n" "temizlemek için orta tıklatın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "FPS Sınırlaması" @@ -3378,7 +3334,7 @@ msgstr "FPS Sınırlaması" msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" @@ -3422,20 +3378,20 @@ msgstr "Durumu Yükle : 7" msgid "Load State Slot 8" msgstr "Durumu Yükle : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3449,15 +3405,11 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz." -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" @@ -3469,16 +3421,33 @@ msgstr "GeçmiÅŸ" msgid "Log Configuration" msgstr "GeçmiÅŸ Yapılandırması" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "GeçmiÅŸ Türü" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#, fuzzy +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" +"Emülasyon hızını ölçmek için 1 saniye içerisinde yorumlanan çerçeve sayısını " +"göster. \n" +"\n" +"Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "GeçmiÅŸ" @@ -3486,10 +3455,6 @@ msgstr "GeçmiÅŸ" msgid "Lost connection to server!" msgstr "Sunucu baÄŸlantısı kayboldu!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "Düşük düzeyde (LLE) veya Yüksek düzeyde (HLE) ses." - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M Düğmesi" @@ -3507,8 +3472,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark dosyaları(*.gcs)" @@ -3538,7 +3503,7 @@ msgstr "Hafıza kartı bu baÅŸlık için zaten bir kayda sahip. " msgid "Memcard already opened" msgstr "Hafıza kartı zaten açık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" msgstr "Hafıza Baytı" @@ -3589,11 +3554,11 @@ msgstr "Mikrofon" msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3602,7 +3567,7 @@ msgstr "ÇeÅŸitli Ayarlar" msgid "Modifier" msgstr "DeÄŸiÅŸtirici" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3627,7 +3592,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3657,11 +3622,11 @@ msgstr "" "WiiMote hoparlörünün sesini kapatır. Gerçek WiiMote'lardaki rastgele " "baÄŸlantı kesilmelerini önler. Taklit WiiMote'ları etkilemez." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOT: Yayın boyutu asıl veri boyutuyla eÅŸleÅŸmiyor.\n" @@ -3755,28 +3720,28 @@ msgstr "NP Yukarı" msgid "Name:" msgstr "Ä°sim:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "Ä°sim:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "DoÄŸal GCI Dosyaları(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "Sonraki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "Sonraki Tarama" @@ -3797,8 +3762,8 @@ msgstr "Kalıp bulunamadı" msgid "No banner file found for title %s" msgstr "BaÅŸlık %s için afiÅŸ dosyası bulunamadı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "Açıklama yok" @@ -3806,7 +3771,7 @@ msgstr "Açıklama yok" msgid "No docking" msgstr "YerleÅŸtirme yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "Dosya Yüklenmedi" @@ -3814,7 +3779,7 @@ msgstr "Dosya Yüklenmedi" msgid "No free dir index entries" msgstr "BoÅŸ dizin indeks giriÅŸi yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" msgstr "ÇekilmiÅŸ Dosya Yok" @@ -3828,20 +3793,20 @@ msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "EÅŸit DeÄŸil" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "BaÄŸlı deÄŸil" @@ -3866,7 +3831,7 @@ msgstr "Duyuru" msgid "Num Lock" msgstr "Sayı Kilidi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "Kod Sayısı:" @@ -3879,15 +3844,15 @@ msgstr "Nunchuck" msgid "Nunchuk Acceleration" msgstr "Nunchuck Hızlandırma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "Nesne" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "Kapalı" @@ -3895,26 +3860,30 @@ msgstr "Kapalı" msgid "Offset:" msgstr "Uzantı:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "Sadece %d blok kullanılabilir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "Dosya aç..." @@ -3932,22 +3901,14 @@ msgstr "OpenAL: Ses sürücüleri bulunamıyor" msgid "OpenAL: can't open device %s" msgstr "OpenAL: Sürücü %s açılamıyor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "Hata ayıklayıcıyı açar" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "GeçmiÅŸi açar" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3967,8 +3928,8 @@ msgstr "" "Tüm kayıtları vermek için saÄŸ tıklatın, \n" "ve kayıtları yeni bir hafıza kartına alın.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "DiÄŸer" @@ -3984,7 +3945,7 @@ msgstr "" msgid "Output" msgstr "Çıkış" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "Çekimi Oynat... (&L)" @@ -4029,17 +3990,21 @@ msgstr "Bölüntü %i" msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Duraklat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" @@ -4052,10 +4017,10 @@ msgstr "Mükemmel" msgid "Perspective %d" msgstr "Perspektif %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "Oynat" @@ -4073,7 +4038,7 @@ msgstr "Oynat/Duraklat" msgid "Playable" msgstr "Oynanabilir" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" msgstr "Oynatma Seçenekleri" @@ -4081,7 +4046,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4093,23 +4058,23 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluÅŸturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" @@ -4118,29 +4083,29 @@ msgstr "BaÄŸ. Nok. 4:" msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" @@ -4153,11 +4118,11 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "Önceki DeÄŸer" @@ -4173,7 +4138,7 @@ msgstr "Profil" msgid "Properties" msgstr "Özellikler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "ÖnbelleÄŸi Temizle" @@ -4200,7 +4165,7 @@ msgstr "R Düğmesi" msgid "R-Analog" msgstr "R Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "Anabellek" @@ -4217,7 +4182,7 @@ msgstr "Aralık" msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "Gerçek" @@ -4229,7 +4194,7 @@ msgstr "Gerçek Wiimote" msgid "Real Wiimotes" msgstr "Gerçek Wiimote'lar" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Tekrar BaÄŸlama Onayı" @@ -4237,17 +4202,17 @@ msgstr "Wiimote Tekrar BaÄŸlama Onayı" msgid "Reconnect Wiimote on State Loading" msgstr "Durum yüklemesinde Wiimote'u yeniden baÄŸla" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Çek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" msgstr "Çekim Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "Çekim Seçenekleri" @@ -4263,7 +4228,7 @@ msgstr "Kırmızı Sol" msgid "Red Right" msgstr "Kırmızı SaÄŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4278,7 +4243,7 @@ msgstr "" "Emin deÄŸilseniz, hiçbiri seçin." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "Yenile" @@ -4288,18 +4253,18 @@ msgstr "Yenile" msgid "Refresh List" msgstr "Listeyi Yenile" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "Kaldır" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4309,7 +4274,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "Ana pencerede yorumla" @@ -4319,7 +4284,7 @@ msgstr "Ana pencerede yorumla" msgid "Reset" msgstr "Sıfırla" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "Sonuçlar" @@ -4341,33 +4306,33 @@ msgstr "SaÄŸ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSPLLE'yi ayrı iÅŸlem biriminde çalıştır (önerilmez)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Rusça" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "Güvenli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "Örnek Oran:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "Kaydet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "GCI'yı farklı kaydet..." @@ -4411,7 +4376,7 @@ msgstr "Durumu Kaydet : 7" msgid "Save State Slot 8" msgstr "Durumu Kaydet : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "Durumu Kaydet..." @@ -4420,24 +4385,24 @@ msgstr "Durumu Kaydet..." msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "Åžu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" @@ -4454,7 +4419,7 @@ msgstr "Kalıplar taranıyor" msgid "Scanning..." msgstr "Taranıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "Ekran Görüntüsü" @@ -4462,23 +4427,23 @@ msgstr "Ekran Görüntüsü" msgid "Scroll Lock" msgstr "Kaydırma Kilidi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 msgid "Search" msgstr "Ara" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" msgstr "Åžu anki nesneyi ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "Hex deÄŸerini ara:" @@ -4493,16 +4458,16 @@ msgstr "SYSCONF içinde %s bölümü bulunamadı" msgid "Select" msgstr "Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4520,23 +4485,23 @@ msgstr "Almak için bir kayıt dosyası seçin" msgid "Select floating windows" msgstr "Sabit olmayan pencereyi seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4558,7 +4523,7 @@ msgstr "" msgid "Selected font" msgstr "Seçilen yazı tipi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4574,7 +4539,7 @@ msgstr "" "Emin deÄŸilseniz, masaüstü çözünürlüğünüzü seçin.\n" "Hala emin deÄŸilseniz, kullanabildiÄŸiniz en yüksek çözünürlüğü seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4602,11 +4567,11 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4616,16 +4581,16 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük." @@ -4650,55 +4615,55 @@ msgstr "Kısa Ä°sim:" msgid "Shoulder Buttons" msgstr "Shoulder Düğmeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "Konsolu Göster (&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "GeçmiÅŸi Göster (&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "Durum ÇubuÄŸunu Gö&ster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "Araç ÇubuÄŸunu Gös&ter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "Kare Sayısını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "Fransızları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "Ä°talyanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "Japonları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "Korelileri Göster" @@ -4706,47 +4671,47 @@ msgstr "Korelileri Göster" msgid "Show Language:" msgstr "Gösterme Dili:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "GeçmiÅŸ Yapılandırmasını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "PAL'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "Platformları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "Tayvanlıları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "Amerikanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "WAD'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "Oyunu durdurmadan önce onay kutusu görüntüle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4756,27 +4721,39 @@ msgstr "" "Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde " "hiçbir uyarı vermeden aniden kapanır." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "Ä°lk bloÄŸu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "Kayıt yorumunu göster" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4788,15 +4765,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "Bu yardım mesajını göster." - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "Bilinmeyenleri göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4810,7 +4783,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" @@ -4818,19 +4791,19 @@ msgstr "BasitleÅŸtirilmiÅŸ Çince" msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "CPU'dan EFB'ye eriÅŸimi atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4841,7 +4814,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4856,17 +4829,17 @@ msgstr "" "doÄŸruluÄŸunu artırmayı deneyin.\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "Slot B" @@ -4890,11 +4863,11 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "Ses Ayarları" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "Ses arkaucu %s geçerli deÄŸil." @@ -4909,8 +4882,8 @@ msgid "Space" msgstr "BoÅŸluk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Ä°spanyolca" @@ -4918,7 +4891,7 @@ msgstr "Ä°spanyolca" msgid "Speaker Volume:" msgstr "Hoparlör Ses Seviyesi:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4938,10 +4911,6 @@ msgstr "" "\n" "Emin deÄŸilseniz, 640x528'i seçin." -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "Bir görüntü arka ucu belirtin" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -4960,11 +4929,11 @@ msgstr "Varsayılan Denetim Aygıtı" msgid "Start" msgstr "BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "&NetPlay'i BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "Çekimi BaÅŸlat (&C)" @@ -4986,15 +4955,15 @@ msgstr "Durum Kayıtları" msgid "Stick" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "Durdur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5008,7 +4977,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "Pencereye Göre Ayarla" @@ -5033,8 +5002,8 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "Sistem Dili:" @@ -5042,7 +5011,7 @@ msgstr "Sistem Dili:" msgid "TAIWAN" msgstr "TAYVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS GiriÅŸi" @@ -5063,8 +5032,8 @@ msgstr "Tablo Sol" msgid "Table Right" msgstr "Tablo SaÄŸ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -5078,15 +5047,15 @@ msgstr "TaruKonga (Bongos)" msgid "Test" msgstr "Sınama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "Doku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" msgstr "Doku Ön BelleÄŸi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5102,13 +5071,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "SaÄŸlama baÅŸarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -5148,7 +5117,7 @@ msgstr "Ä°sim ',' karakterini içeremez" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Ortaya çıkan ÅŸifresi çözülmüş AR kodu herhangi bir satır içermiyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5164,7 +5133,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "Kopyalamayı denediÄŸiniz kaydın boyutu hatalı" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5197,15 +5166,15 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "Tema seçiminde hata" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5221,18 +5190,18 @@ msgstr "" "Bu ayarlar Dolphin'in kendi ayarları yerine kullanılır. \n" "Dolu kareler oyunun Dolphin'in ayarlarını kullandığını gösterir." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaÅŸlamaya neden olabilir." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5250,7 +5219,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5275,13 +5244,13 @@ msgstr "EÅŸik" msgid "Tilt" msgstr "EÄŸim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "BaÅŸlık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 msgid "To" msgstr "Buraya" @@ -5289,18 +5258,18 @@ msgstr "Buraya" msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Geleneksel Çince" @@ -5324,7 +5293,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Türkçe" @@ -5349,7 +5318,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "BÄ°LÄ°NMEYEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, c-format msgid "UNKNOWN_%02X" msgstr "BÄ°LÄ°NMEYEN_%02X" @@ -5377,24 +5346,24 @@ msgstr "" "kod olarak ayrıştırılamadı. Kodu doÄŸru yazdığınızdan emin olun.\n" "Bu satırı yoksayıp ayrıştırmaya devam etmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "Belirsiz %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "Durum Yüklemeyi Geri Al" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "Beklenmedik 0x80 çaÄŸrısı? Çıkılıyor..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "Bilinmeyen" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "Bilinmeyen DVD komutu %08x - önemli hata" @@ -5419,7 +5388,7 @@ msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" msgid "Up" msgstr "Yukarı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "Güncelle" @@ -5428,23 +5397,23 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" msgstr "Tam Ekran Kullan" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5456,7 +5425,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5470,15 +5439,15 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "Gereçler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "Dikey EÅŸitleme" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "DeÄŸer" @@ -5486,7 +5455,7 @@ msgstr "DeÄŸer" msgid "Value:" msgstr "DeÄŸer:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "DeÄŸer:" @@ -5498,11 +5467,11 @@ msgstr "Duyuru/Hata/Uyarı" msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "Ses" @@ -5516,7 +5485,7 @@ msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" msgid "WAD installation failed: error creating ticket" msgstr "WAD kurulumu baÅŸarısız: Ticket oluÅŸturma hatası." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5557,7 +5526,7 @@ msgstr "" "%s\n" "Devam edilsin mi?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5571,7 +5540,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5583,7 +5552,7 @@ msgstr "" "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5595,7 +5564,7 @@ msgstr "" "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5638,7 +5607,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" @@ -5646,7 +5615,7 @@ msgstr "GeniÅŸ Ekran Hilesi" msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5654,15 +5623,15 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5671,7 +5640,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Dosyadan okuma baÅŸarısız" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5680,7 +5649,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5693,7 +5662,7 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" @@ -5701,7 +5670,7 @@ msgstr "Wiimote BaÄŸlandı" msgid "Wiimote Motor" msgstr "Wiimote Motoru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote ayarları" @@ -5725,10 +5694,10 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "Çalışıyor..." @@ -5763,7 +5732,7 @@ msgstr "XAudio2 baÅŸlatılamadı: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ana ses oluÅŸturulamadı: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "XF kaydı" @@ -5787,11 +5756,11 @@ msgstr "Sayfalı bölmeleri kapatamazsınız." msgid "You must choose a game!!" msgstr "Bir oyun seçmelisiniz!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "Bir isim girmelisiniz!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "DoÄŸru bir sekizlik,onluk veya onaltılık deÄŸer girmelisiniz." @@ -5799,7 +5768,7 @@ msgstr "DoÄŸru bir sekizlik,onluk veya onaltılık deÄŸer girmelisiniz." msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "DeÄŸiÅŸikliÄŸin etkili olması için Dolphin'i yeniden baÅŸlatmalısınız." @@ -5826,11 +5795,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP Hilesi" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Sıfır-Üç kodu desteklenmemektedir." -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Dolphin Sıfır kodu bilinmiyor: %08x" @@ -5840,7 +5809,7 @@ msgstr "Dolphin Sıfır kodu bilinmiyor: %08x" msgid "[ waiting ]" msgstr "[ bekleniyor ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5856,7 +5825,7 @@ msgstr "" msgid "[Custom]" msgstr "[Özel]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5874,7 +5843,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5892,7 +5861,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5919,7 +5888,7 @@ msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." msgid "not a wii save or read failure for file header size %x" msgstr "Bir Wii kaydı deÄŸil veya bu baÅŸlık boyutu için okuma hatası: %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "s" @@ -5928,7 +5897,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6015,6 +5984,17 @@ msgstr "| VEYA" #~ "En iyisi bunu kullanırken en-boy oranını \"pencereye göre\" olarak " #~ "ayarlamaktır." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "MipMap'leri hafızadan çözmek yerine otomatik olarak oluÅŸtur. \n" +#~ "Performansı artırır ancak küçük doku bozukluklarına neden olur. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." + #~ msgid "Bad gameini filename" #~ msgstr "Kötü oyun .ini dosya adı" @@ -6093,9 +6073,24 @@ msgstr "| VEYA" #~ msgid "Danish" #~ msgstr "Ä°spanyolca" +#~ msgid "Disable Lighting" +#~ msgstr "Işıklandırmayı Ä°ptal Et" + +#~ msgid "Disable Textures" +#~ msgstr "Dokuları Ä°ptal Et" + #~ msgid "Disable Wiimote Speaker" #~ msgstr "WiiMote Hoparlörünü Ä°ptal Et" +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Dokulandırmayı iptal et. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6247,6 +6242,9 @@ msgstr "| VEYA" #~ msgid "Error opening file %s for recording" #~ msgstr "Kayıt için %s dosyasını açarken hata." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Dolphin Emülatöründen Çık" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -6260,6 +6258,9 @@ msgstr "| VEYA" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Kod indirme baÅŸarısız." +#~ msgid "Fast Mipmaps" +#~ msgstr "Hızlı MipMap'ler" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6310,6 +6311,16 @@ msgstr "| VEYA" #~ "EÄŸer bir oyun çakılırsa, sadece Interpreter'da çalışıyorsa veya Dolphin " #~ "çökerse, bu seçenek oyunu düzeltebilir." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Performansı artırır ancak bazı oyunların karanlık kalmasına neden " +#~ "olabilir. \n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretsiz bırakın." + #~ msgid "Input Source" #~ msgstr "GiriÅŸ Kaynağı" @@ -6354,6 +6365,12 @@ msgstr "| VEYA" #~ "Mipmap'leri oluÅŸturmak yerine doÄŸal olanlarını yükler. \n" #~ "DoÄŸruluÄŸu artırır ama performansı düşürebilir." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Düşük düzeyde (LLE) veya Yüksek düzeyde (HLE) ses." + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "Konsola Yaz" @@ -6392,6 +6409,12 @@ msgstr "| VEYA" #~ msgid "OpenGL" #~ msgstr "Aç" +#~ msgid "Opens the debugger" +#~ msgstr "Hata ayıklayıcıyı açar" + +#~ msgid "Opens the logger" +#~ msgstr "GeçmiÅŸi açar" + #~ msgid "Plugins" #~ msgstr "Eklentiler" @@ -6480,6 +6503,9 @@ msgstr "| VEYA" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Saniyede kaç karenin görüntülendiÄŸini göster." +#~ msgid "Show this help message" +#~ msgstr "Bu yardım mesajını göster." + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6520,6 +6546,9 @@ msgstr "| VEYA" #~ "DiÄŸer seçenekler görüntü boyutundan bağımsız olarak seçilen düzeltilmiÅŸ " #~ "çözünürlüklerdir." +#~ msgid "Specify a video backend" +#~ msgstr "Bir görüntü arka ucu belirtin" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "Bir görüntü arka ucu belirtin" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index f0fef85cee..1070990f75 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-01-09 13:55-0800\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (è¦æ˜¾ç¤ºçš„项目太多)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii é•œåƒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -148,7 +148,7 @@ msgstr "%s导出 GCI%s" msgid "%sImport GCI%s" msgstr "%s导入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区å—; %u 空闲目录项目" @@ -157,147 +157,147 @@ msgstr "%u 空闲区å—; %u 空闲目录项目" msgid "&& AND" msgstr "&& 与" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "关于(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "光驱å¯åŠ¨(&V)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "断点(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "æµè§ˆé•œåƒ(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "作弊ç ç®¡ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "模拟(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "文件(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "帧数步进(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "图形设置(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "帮助(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "热键设置(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "å³æ—¶ç¼–译器(&J)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "载入状æ€(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "内存å¡ç®¡ç†å™¨(&GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "内存(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "打开镜åƒ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "选项(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "æš‚åœæ¸¸æˆ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "属性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "åªè¯»æ¨¡å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "刷新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "é‡ç½®æ¸¸æˆ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "声音(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "åœæ­¢æ¸¸æˆ(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "视频(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "视图(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "百科(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -313,27 +313,27 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(å…³)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 ä½" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 ä½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 ä½" @@ -341,7 +341,7 @@ msgstr "8 ä½" msgid "" msgstr "<在这里æ’å…¥å称>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<未找到分辨率>" @@ -354,11 +354,11 @@ msgstr "<æ— >" msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系统>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -367,8 +367,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "网上对战窗å£å·²ç»æ‰“å¼€!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "ç›®å‰æ²¡æœ‰æ¸¸æˆè¿è¡Œ." @@ -419,7 +419,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "动作回放代ç " @@ -432,7 +432,7 @@ msgstr "关于 Dolphin" msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -440,7 +440,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -469,39 +469,39 @@ msgstr "" "错误代ç :\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 æ·»åŠ ä»£ç  (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 填充和滑动 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 内存写入和填充 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 写入到指针 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "动作回放错误: 无效数值 (%08x) 于 内存å¤åˆ¶ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -512,27 +512,27 @@ msgstr "动作回放错误: 主代ç å’Œå†™å…¥åˆ° CCXXXXXX ä¸æ”¯æŒ (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "动作回放错误: 无效动作回放代ç è¡Œ: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "动作回放: æ¡ä»¶ä»£ç : æ— æ•ˆå¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "动作回放: 无效正常代ç ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  %i: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  0: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "适é…器:" @@ -541,11 +541,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "添加补ä¸" @@ -555,7 +555,7 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "添加..." @@ -589,38 +589,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "高级设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" @@ -628,28 +628,29 @@ msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "按模拟器显示输入读å–" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "抗锯齿:" @@ -661,22 +662,22 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "应用载入器:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "应用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -685,7 +686,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -693,12 +694,12 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -706,12 +707,12 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "音频åŽç«¯:" @@ -719,26 +720,26 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "自动" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 #, fuzzy msgid "Auto (Window Size)" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 #, fuzzy msgid "Auto adjust Window Size" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -746,19 +747,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -767,12 +760,12 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "音频åŽç«¯:" @@ -790,7 +783,7 @@ msgstr "Backward" msgid "Bad File Header" msgstr "无效文件头" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "标志" @@ -807,11 +800,11 @@ msgstr "标志:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本 设置" @@ -823,7 +816,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "Block Allocation Table checksum failed" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "区å—" @@ -840,7 +833,7 @@ msgid "Blue Right" msgstr "è“ å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "底部" @@ -853,7 +846,7 @@ msgstr "绑定控制器: %lu" msgid "Broken" msgstr "æŸå" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "æµè§ˆ" @@ -861,11 +854,11 @@ msgstr "æµè§ˆ" msgid "Browse for a directory to add" msgstr "æµè§ˆè¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" @@ -879,7 +872,7 @@ msgstr "缓冲区:" msgid "Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -892,20 +885,20 @@ msgstr "C-摇æ†" msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -915,7 +908,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -924,7 +917,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -940,7 +933,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -950,7 +943,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -958,18 +951,18 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" @@ -977,7 +970,7 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -989,7 +982,7 @@ msgstr "Center" msgid "Change" msgstr "切æ¢" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "切æ¢å…‰ç›˜(&D)..." @@ -1002,7 +995,7 @@ msgstr "切æ¢å…‰ç›˜" msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1018,8 +1011,8 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" @@ -1031,7 +1024,7 @@ msgstr "金手指" msgid "Cheat Code" msgstr "作弊ç " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "作弊ç æœç´¢" @@ -1043,36 +1036,36 @@ msgstr "金手指管ç†" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1080,7 +1073,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1088,8 +1081,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1116,22 +1109,22 @@ msgstr "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "关闭" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "程åºè®¾ç½®(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "代ç :" @@ -1139,7 +1132,7 @@ msgstr "代ç :" msgid "Command" msgstr "命令" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "注释" @@ -1147,20 +1140,20 @@ msgstr "注释" msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "设置" @@ -1179,17 +1172,17 @@ msgstr "设置é¢æ¿" msgid "Configure Pads" msgstr "设置手柄" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" @@ -1199,11 +1192,11 @@ msgstr "åœæ­¢æ—¶ç¡®è®¤" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "连接 Wiimote %i" @@ -1228,7 +1221,7 @@ msgstr "连接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "连接中..." @@ -1248,7 +1241,7 @@ msgstr "转æ¢åˆ° GCI" msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" @@ -1262,7 +1255,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "ä¸èƒ½åˆ›å»º %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "ä¸èƒ½åˆå§‹åŒ–åŽç«¯ %s" @@ -1296,7 +1289,7 @@ msgstr "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1308,11 +1301,11 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1320,8 +1313,8 @@ msgstr "" "ä¸èƒ½åˆå§‹åŒ–核心.\n" "检查你的é…ç½®." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "æ•°é‡:" @@ -1329,8 +1322,8 @@ msgstr "æ•°é‡:" msgid "Country:" msgstr "国家:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "创建动作回放代ç " @@ -1339,21 +1332,21 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "Created by KDE-Look.org" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "Created by VistaIcons.com" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "Created by black_rider and published on ForumW.org > Web Developments" @@ -1365,11 +1358,11 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "è£åˆ‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1380,7 +1373,7 @@ msgstr "" msgid "Crossfade" msgstr "淡入淡出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" @@ -1397,11 +1390,11 @@ msgstr "自定义投影修正设置" msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "æ·å…‹è¯­" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1409,37 +1402,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1451,7 +1444,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "æ•°æ®å¤§å°" @@ -1459,8 +1452,8 @@ msgstr "æ•°æ®å¤§å°" msgid "Date:" msgstr "日期:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro files(*.sav)" @@ -1476,7 +1469,7 @@ msgstr "死区" msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1485,16 +1478,16 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" @@ -1502,7 +1495,7 @@ msgstr "解压缩镜åƒä¸­" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "默认镜åƒ:" @@ -1515,7 +1508,7 @@ msgstr "默认字体" msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "删除存档" @@ -1524,7 +1517,7 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "询问" @@ -1547,8 +1540,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "设备设置" @@ -1572,30 +1565,22 @@ msgstr "" "目录校检失败\n" "和目录备份校检失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "ç¦ç”¨å…‰çº¿" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "ç¦ç”¨æè´¨" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1604,7 +1589,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1614,13 +1599,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "光盘" @@ -1630,11 +1608,11 @@ msgstr "光盘" msgid "Disc Read Error" msgstr "光盘读å–错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "显示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1646,20 +1624,20 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 图形设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin 网站(&W)" @@ -1671,17 +1649,17 @@ msgstr "Dolphin é…ç½®" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模拟 Wiimote 设置" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1689,7 +1667,7 @@ msgstr "Dolphin TAS 电影 (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote é…ç½®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin 于 &Google Code" @@ -1727,30 +1705,30 @@ msgstr "鼓" msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "转储æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1758,7 +1736,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "转储游æˆæ质到 User/Dump/Textures/<æ¸¸æˆ ID>/" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1766,24 +1744,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "è·å…°è¯­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "退出模拟(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 #, fuzzy msgid "EFB Copies" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1797,11 +1775,11 @@ msgstr "" msgid "EUROPE" msgstr "欧版" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "编辑" @@ -1817,7 +1795,7 @@ msgstr "编辑设置" msgid "Edit Patch" msgstr "编辑补ä¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" @@ -1830,15 +1808,15 @@ msgstr "编辑..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "模拟线程已ç»åœ¨è¿è¡Œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1847,7 +1825,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1869,7 +1847,7 @@ msgstr "模拟器状æ€: " msgid "Enable" msgstr "å¯ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1879,7 +1857,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" @@ -1895,12 +1873,12 @@ msgstr "å¯ç”¨åŒºå—åˆå¹¶" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" @@ -1908,11 +1886,11 @@ msgstr "å¯ç”¨ä½œå¼Š" msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" @@ -1920,7 +1898,7 @@ msgstr "å¯ç”¨çƒ­é”®" msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" @@ -1929,11 +1907,11 @@ msgid "Enable MMU" msgstr "å¯ç”¨ MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" @@ -1942,11 +1920,11 @@ msgstr "å¯ç”¨å®½å±" msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1964,11 +1942,11 @@ msgid "" "Compatible)" msgstr "å¯ç”¨å¿«é€Ÿå…‰ç›˜è®¿é—®. 部分游æˆéœ€è¦. (ON = 快速, OFF = 兼容)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "Enable pages" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1976,7 +1954,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2006,7 +1984,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2020,7 +1998,7 @@ msgid "" "OFF = Fast)" msgstr "å¯ç”¨å†…存管ç†å•å…ƒ,一些游æˆéœ€è¦(ON = 兼容,OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2032,13 +2010,13 @@ msgid "End" msgstr "End" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "英语" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "增强" @@ -2056,17 +2034,17 @@ msgstr "项目 %d/%d" msgid "Entry 1/%d" msgstr "项目 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "错误" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2103,10 +2081,6 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "执行" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "Exit Dolphin with emulator" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "导出失败" @@ -2120,19 +2094,19 @@ msgstr "导出文件" msgid "Export Recording" msgstr "导出录制" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "导出所有存档" @@ -2140,7 +2114,7 @@ msgstr "导出所有存档" msgid "Export failed, try again?" msgstr "导出失败,需è¦é‡è¯•å—?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "导出存档为..." @@ -2148,7 +2122,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2185,28 +2159,28 @@ msgstr "解压缩文件..." msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "解压缩中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2231,7 +2205,7 @@ msgstr "监å¬å¤±è´¥!!" msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2342,35 +2316,30 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "载人原始纹ç†" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 #, fuzzy msgid "File Info" msgstr "代ç ä¿¡æ¯" @@ -2417,45 +2386,45 @@ msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "第一个区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "修正校检和" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "强制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Force Texture Filtering" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2467,7 +2436,7 @@ msgstr "" "Improves texture quality (especially when using a high internal resolution) " "but causes glitches in some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2478,7 +2447,7 @@ msgstr "" "Force the game to output graphics for widescreen resolutions.\n" "Note that this might cause graphical glitches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2497,18 +2466,18 @@ msgstr "" msgid "Forward" msgstr "Forward" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 #, fuzzy msgid "Frame" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 #, fuzzy msgid "Frame " msgstr "Frame Advance" @@ -2518,40 +2487,40 @@ msgstr "Frame Advance" msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 #, fuzzy msgid "Frame Range" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "自由视点" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "法语" @@ -2559,21 +2528,21 @@ msgstr "法语" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "å…¨å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 文件(*.gci)" @@ -2582,11 +2551,11 @@ msgstr "GCI 文件(*.gci)" msgid "GCMic Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2614,24 +2583,28 @@ msgstr "游æˆç‰¹æ®Šè®¾ç½®" msgid "GameConfig" msgstr "游æˆé…ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko 代ç " @@ -2649,8 +2622,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "常规" @@ -2660,29 +2633,29 @@ msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "德语" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "图形" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "图形设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "大于" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2693,7 +2666,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "希腊语" @@ -2713,11 +2686,11 @@ msgstr "绿 å³" msgid "Guitar" msgstr "å‰å®ƒ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2725,7 +2698,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "希伯æ¥è¯­" @@ -2737,7 +2710,7 @@ msgstr "高度" msgid "Help" msgstr "帮助" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2757,11 +2730,11 @@ msgstr "" msgid "Hide" msgstr "éšè—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "éšè—鼠标光标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2784,11 +2757,11 @@ msgstr "热键设置" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "匈牙利语" @@ -2796,12 +2769,12 @@ msgstr "匈牙利语" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,11 +2787,11 @@ msgstr "" "TitleID %016llx.\n" " Dolphin will likely hang now" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 设置" @@ -2838,7 +2811,7 @@ msgstr "红外çµæ•åº¦:" msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" @@ -2846,7 +2819,7 @@ msgstr "é•œåƒç›®å½•" msgid "ITALY" msgstr "æ„大利" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "图标" @@ -2862,7 +2835,7 @@ msgid "" msgstr "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2872,12 +2845,12 @@ msgstr "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 #, fuzzy msgid "Ignore Format Changes" msgstr "模拟格å¼ä¿®æ”¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2886,7 +2859,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2895,7 +2868,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "导入存档" @@ -2923,7 +2896,7 @@ msgstr "" "导入的文件有一个 sav 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2934,16 +2907,6 @@ msgstr "" "Disable fog. Improves performance but causes glitches in games which rely on " "proper fog emulation." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" -"Disable lighting. Improves performance but causes lighting to disappear in " -"games which use it." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "进游æˆ" @@ -2973,7 +2936,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -2981,12 +2944,12 @@ msgstr "æ’å…¥SDå¡" msgid "Insert name here.." msgstr "在这里æ’å…¥å称..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 #, fuzzy msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -2996,44 +2959,44 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "内部 LZO 错误 - 压缩失败" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3042,16 +3005,16 @@ msgstr "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "内部 LZO 错误 - lzo_init() 失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" @@ -3064,7 +3027,7 @@ msgstr "片头" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "无效大å°(%x) 或 魔字(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "无效值!" @@ -3077,7 +3040,7 @@ msgstr "无效 bat.map 或 目录项目" msgid "Invalid event type %i" msgstr "无效事件类型 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "无效文件" @@ -3092,29 +3055,29 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "无效录制文件" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "Invalid state" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "æ„大利语" @@ -3122,16 +3085,16 @@ msgstr "æ„大利语" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "日语" @@ -3139,7 +3102,7 @@ msgstr "日语" msgid "KOREA" msgstr "韩国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3147,7 +3110,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3156,8 +3119,8 @@ msgstr "" msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "韩语" @@ -3175,16 +3138,16 @@ msgstr "L é”®" msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "最åŽè¦†ç›–状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "最åŽä¿å­˜çŠ¶æ€" @@ -3224,11 +3187,11 @@ msgstr "" "å·¦/å³å•å‡»å¾—到更多选项.\n" "中键å•å‡»æ¸…除" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3236,7 +3199,7 @@ msgstr "" msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" @@ -3281,21 +3244,21 @@ msgstr "载入存档æ’槽 7" msgid "Load State Slot 8" msgstr "载入存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3307,15 +3270,11 @@ msgstr "Load high-resolution textures from User/Load/Textures//" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "é”定线程到核心" @@ -3328,16 +3287,28 @@ msgstr "日志" msgid "Log Configuration" msgstr "记录设置" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "记录类型" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "记录输出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "记录中" @@ -3345,10 +3316,6 @@ msgstr "记录中" msgid "Lost connection to server!" msgstr "丢失æœåŠ¡å™¨è¿žæŽ¥!" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "低级(LLE)或者高级(HLE)音频" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M é”®" @@ -3366,8 +3333,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU 速度破解" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 文件(*.gcs)" @@ -3397,7 +3364,7 @@ msgstr "Memcard already has a save for this title" msgid "Memcard already opened" msgstr "内存å¡å·²ç»æ‰“å¼€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 #, fuzzy msgid "Memory Byte" msgstr "内存(&M)" @@ -3448,11 +3415,11 @@ msgstr "Mic" msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它设置" @@ -3461,7 +3428,7 @@ msgstr "其它设置" msgid "Modifier" msgstr "修改者" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3482,7 +3449,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3503,11 +3470,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3601,28 +3568,28 @@ msgstr "NP Up" msgid "Name:" msgstr "å称:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å称:" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "内部 GCI 文件(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "新建扫æ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "下一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "下一扫æ" @@ -3643,8 +3610,8 @@ msgstr "未找到镜åƒæˆ–者WAD" msgid "No banner file found for title %s" msgstr "没有找到标题为 %s 的标志文件" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3652,7 +3619,7 @@ msgstr "" msgid "No docking" msgstr "No docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3660,7 +3627,7 @@ msgstr "" msgid "No free dir index entries" msgstr "没有空闲目录索引项目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 #, fuzzy msgid "No recorded file" msgstr "无效录制文件" @@ -3675,20 +3642,20 @@ msgstr "No save folder found for title %s" msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "未连接" @@ -3713,7 +3680,7 @@ msgstr "æ示" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "代ç æ•°é‡: " @@ -3726,15 +3693,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "关闭" @@ -3742,26 +3709,30 @@ msgstr "关闭" msgid "Offset:" msgstr "å移é‡:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "åªæœ‰ %d 区å—有效" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "打开文件..." @@ -3779,22 +3750,14 @@ msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "打开调试器" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "打开日志" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3814,8 +3777,8 @@ msgstr "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3831,7 +3794,7 @@ msgstr "" msgid "Output" msgstr "输出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "播放录制(&L)..." @@ -3876,17 +3839,21 @@ msgstr "分区 %i" msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš‚åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" @@ -3900,10 +3867,10 @@ msgstr "完美" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "开始" @@ -3921,7 +3888,7 @@ msgstr "开始/æš‚åœ" msgid "Playable" msgstr "å¯ä»¥çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 #, fuzzy msgid "Playback Options" msgstr "选项" @@ -3930,7 +3897,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "请确认..." @@ -3942,23 +3909,23 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "ç«¯å£ 4" @@ -3967,30 +3934,30 @@ msgstr "ç«¯å£ 4" msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4003,11 +3970,11 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "上一个值" @@ -4023,7 +3990,7 @@ msgstr "é…ç½®" msgid "Properties" msgstr "属性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "清除缓存" @@ -4050,7 +4017,7 @@ msgstr "R é”®" msgid "R-Analog" msgstr "R-摇æ†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "内存" @@ -4067,7 +4034,7 @@ msgstr "范围" msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "真实" @@ -4080,7 +4047,7 @@ msgstr "真实 Wiimote" msgid "Real Wiimotes" msgstr "真实 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "确认 Wiimote é‡è¿ž" @@ -4089,19 +4056,19 @@ msgstr "确认 Wiimote é‡è¿ž" msgid "Reconnect Wiimote on State Loading" msgstr "Reconnect Wiimote On Load State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 #, fuzzy msgid "Recording Info" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -4117,7 +4084,7 @@ msgstr "红 å·¦" msgid "Red Right" msgstr "红 å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4131,7 +4098,7 @@ msgstr "" "performance." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "刷新" @@ -4141,18 +4108,18 @@ msgstr "刷新" msgid "Refresh List" msgstr "刷新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4162,7 +4129,7 @@ msgstr "" "Render the scene as a wireframe.\n" "This is only useful for debugging purposes." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "附加到主窗å£" @@ -4172,7 +4139,7 @@ msgstr "附加到主窗å£" msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "结果" @@ -4194,33 +4161,33 @@ msgstr "å³æ‘‡æ†" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (not recommended)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "俄语" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "采样率:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "ä¿å­˜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "ä¿å­˜GCI为..." @@ -4264,7 +4231,7 @@ msgstr "存档æ’槽 7" msgid "Save State Slot 8" msgstr "存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." @@ -4273,24 +4240,24 @@ msgstr "ä¿å­˜çŠ¶æ€..." msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" @@ -4308,7 +4275,7 @@ msgstr "扫æé•œåƒä¸­" msgid "Scanning..." msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "截图" @@ -4316,25 +4283,25 @@ msgstr "截图" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "作弊ç æœç´¢" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4349,17 +4316,17 @@ msgstr "Section %s not found in SYSCONF" msgid "Select" msgstr "选择" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4377,23 +4344,23 @@ msgstr "选择è¦å¯¼å…¥çš„存档" msgid "Select floating windows" msgstr "选择浮动窗å£" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4414,7 +4381,7 @@ msgstr "" msgid "Selected font" msgstr "所选字体" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4424,7 +4391,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4446,11 +4413,11 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" @@ -4460,16 +4427,16 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" @@ -4495,56 +4462,56 @@ msgstr "短å称:" msgid "Shoulder Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "显示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "显示日志(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "显示状æ€æ (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "显示工具æ (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "显示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "显示法国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "显示输入显示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "显示æ„大利" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "显示日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "显示韩国" @@ -4552,48 +4519,48 @@ msgstr "显示韩国" msgid "Show Language:" msgstr "显示语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "显示日志设置(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "显示PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "显示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "显示å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "显示美国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "显示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "åœæ­¢æ¸¸æˆæ—¶æ˜¾ç¤ºç¡®è®¤å¯¹è¯æ¡†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4603,27 +4570,39 @@ msgstr "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "显示第一区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "显示存档注释" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "显示存档区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "显示存档标题" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4631,15 +4610,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "显示这个帮助消æ¯" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "显示未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4650,7 +4625,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "简体中文" @@ -4658,21 +4633,21 @@ msgstr "简体中文" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4680,7 +4655,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4690,17 +4665,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4720,11 +4695,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "声音设置" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "声音åŽç«¯ %s 无效." @@ -4739,8 +4714,8 @@ msgid "Space" msgstr "空格" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "西ç­ç‰™è¯­" @@ -4748,7 +4723,7 @@ msgstr "西ç­ç‰™è¯­" msgid "Speaker Volume:" msgstr "扬声器音é‡:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4760,10 +4735,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "指定一个视频åŽç«¯" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "æå‡å…‰ç›˜ä¼ è¾“率" @@ -4782,11 +4753,11 @@ msgstr "标准控制器" msgid "Start" msgstr "开始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "开始网络对战(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "开始录制(&C)" @@ -4808,15 +4779,15 @@ msgstr "State Saves" msgid "Stick" msgstr "摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4825,7 +4796,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "附加到窗å£" @@ -4850,8 +4821,8 @@ msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系统语言" @@ -4859,7 +4830,7 @@ msgstr "系统语言" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4881,8 +4852,8 @@ msgstr "Table Left" msgid "Table Right" msgstr "Table Right" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4896,16 +4867,16 @@ msgstr "" msgid "Test" msgstr "测试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -4922,13 +4893,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4968,7 +4939,7 @@ msgstr "å称ä¸èƒ½åŒ…å«å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4980,7 +4951,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "The save you are trying to copy has an invalid file size" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5013,15 +4984,15 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "主题" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "选择主题出现错误" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5037,7 +5008,7 @@ msgstr "" "这些设置将覆盖Dolphi核心设置.\n" "未决设置将使用Dolphi的设置." -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." @@ -5045,11 +5016,11 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5060,7 +5031,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5085,13 +5056,13 @@ msgstr "闸值" msgid "Tilt" msgstr "Tilt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "标题" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 #, fuzzy msgid "To" msgstr "顶部" @@ -5100,18 +5071,18 @@ msgstr "顶部" msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" @@ -5135,7 +5106,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "土耳其语" @@ -5160,7 +5131,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5183,24 +5154,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "未定义的 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "撤销载入状æ€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "未知" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "未知 DVD 命令 %08x - 致命错误" @@ -5225,7 +5196,7 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "æ›´æ–°" @@ -5234,24 +5205,24 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "使用警告程åº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5259,7 +5230,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5268,15 +5239,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "实用扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "值" @@ -5284,7 +5255,7 @@ msgstr "值" msgid "Value:" msgstr "值:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "值: " @@ -5296,11 +5267,11 @@ msgstr "详细" msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" @@ -5315,7 +5286,7 @@ msgstr "WAD 安装失败: 创建 %s 错误" msgid "WAD installation failed: error creating ticket" msgstr "WAD 安装失败: 创建 %s 错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5352,7 +5323,7 @@ msgstr "" "%s\n" "Do you wish to continue?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5365,7 +5336,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5373,7 +5344,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5381,7 +5352,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5409,7 +5380,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" @@ -5417,7 +5388,7 @@ msgstr "宽å±ç ´è§£" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5425,16 +5396,16 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5443,7 +5414,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ä¸èƒ½ä»Žæ–‡ä»¶è¯»å–" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5452,7 +5423,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5465,7 +5436,7 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote 已连接" @@ -5473,7 +5444,7 @@ msgstr "Wiimote 已连接" msgid "Wiimote Motor" msgstr "Wiimote 马达" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote 设置" @@ -5498,10 +5469,10 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "工作中..." @@ -5537,7 +5508,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5559,11 +5530,11 @@ msgstr "You can't close panes that have pages in them." msgid "You must choose a game!!" msgstr "您必须选择一个游æˆ!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "您必须输入一个å称!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必须输入一个å进制或者å六进制值." @@ -5571,7 +5542,7 @@ msgstr "您必须输入一个å进制或者å六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5596,11 +5567,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP 破解" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "Zero 3 代ç ä¸æ”¯æŒ" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" @@ -5610,7 +5581,7 @@ msgstr "Zero code unknown to dolphin: %08x" msgid "[ waiting ]" msgstr "[ 等待中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5622,7 +5593,7 @@ msgstr "" msgid "[Custom]" msgstr "[自定义]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5633,7 +5604,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5646,7 +5617,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -5673,7 +5644,7 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "not a wii save or read failure for file header size %x" msgstr "not a wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5682,7 +5653,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5828,6 +5799,12 @@ msgstr "| 或" #~ msgid "Danish" #~ msgstr "丹麦语" +#~ msgid "Disable Lighting" +#~ msgstr "ç¦ç”¨å…‰çº¿" + +#~ msgid "Disable Textures" +#~ msgstr "ç¦ç”¨æè´¨" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5960,6 +5937,9 @@ msgstr "| 或" #~ msgid "Error opening file %s for recording" #~ msgstr "Error opening file %s for recording" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "Exit Dolphin with emulator" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -5973,6 +5953,10 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "下载代ç å¤±è´¥." +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "载人原始纹ç†" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6022,6 +6006,15 @@ msgstr "| 或" #~ "If a game hangs, works only in the Interpreter or Dolphin crashes, this " #~ "option may fix the game." +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "Disable lighting. Improves performance but causes lighting to disappear " +#~ "in games which use it." + #~ msgid "Input Source" #~ msgstr "输入æ¥æº" @@ -6065,6 +6058,12 @@ msgstr "| 或" #~ "Loading native mipmaps is the more accurate behavior, but might also " #~ "decrease performance (your mileage might vary though)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "低级(LLE)或者高级(HLE)音频" + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "写入到控制å°" @@ -6100,6 +6099,12 @@ msgstr "| 或" #~ msgid "OpenGL" #~ msgstr "打开" +#~ msgid "Opens the debugger" +#~ msgstr "打开调试器" + +#~ msgid "Opens the logger" +#~ msgstr "打开日志" + #~ msgid "Plugins" #~ msgstr "æ’件" @@ -6170,6 +6175,9 @@ msgstr "| 或" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Show the number of frames rendered per second." +#~ msgid "Show this help message" +#~ msgstr "显示这个帮助消æ¯" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6212,6 +6220,9 @@ msgstr "| 或" #~ "The other options are fixed resolutions for choosing a visual quality " #~ "independent of your display size." +#~ msgid "Specify a video backend" +#~ msgstr "指定一个视频åŽç«¯" + #, fuzzy #~ msgid "Specify an audio plugin" #~ msgstr "指定一个视频åŽç«¯" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index d04d0447d1..58a6c87044 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 06:27-0500\n" +"POT-Creation-Date: 2012-12-11 08:14-0600\n" "PO-Revision-Date: 2011-03-15 02:51+0800\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:511 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" msgstr " (è¦é¡¯ç¤ºçš„項目太多)" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:713 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " msgstr "" @@ -54,9 +54,9 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:364 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:612 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:613 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" msgstr "%d Hz" @@ -148,7 +148,7 @@ msgstr "%s匯出 GCI%s" msgid "%sImport GCI%s" msgstr "%s匯入 GCI%s" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:775 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" @@ -157,147 +157,147 @@ msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" msgid "&& AND" msgstr "å’Œ(&&)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:308 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." msgstr "關於(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:116 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." msgstr "從 DVD 光碟機啟動(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" msgstr "中斷點(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." msgstr "ç€è¦½ ISO 檔(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" msgstr "作弊檔管ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:901 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:183 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" msgstr "模擬器(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" msgstr "檔案(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" msgstr "畫格步進(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:365 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:189 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" msgstr "å½±åƒè¨­å®š(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" msgstr "說明(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" msgstr "å¿«æ·éµè¨­å®š(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" msgstr "讀å–進度(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:203 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" msgstr "GC 記憶å¡ç®¡ç†å™¨(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" msgstr "記憶å¡(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 msgid "&Open..." msgstr "é–‹å•Ÿ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" msgstr "é¸é …(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:337 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" msgstr "æš«åœ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:883 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 msgid "&Properties" msgstr "屬性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:361 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 msgid "&Read-only mode" msgstr "唯讀模å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 msgid "&Refresh List" msgstr "更新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:243 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" msgstr "é‡æ–°å•Ÿå‹•(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" msgstr "è²éŸ³(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:220 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 msgid "&Video" msgstr "å½±åƒ(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" msgstr "檢視(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" msgstr "" @@ -313,27 +313,27 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:383 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 msgid "(off)" msgstr "(關閉)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:646 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" msgstr "16 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 msgid "32 bit" msgstr "32 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "8 bit" msgstr "8 ä½å…ƒ" @@ -341,7 +341,7 @@ msgstr "8 ä½å…ƒ" msgid "" msgstr "<æ’å…¥å稱>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:263 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" msgstr "<無解æžåº¦è¨­å®š>" @@ -354,11 +354,11 @@ msgstr "<ç„¡>" msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:290 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" msgstr "<系統>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:687 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" msgstr "" @@ -367,8 +367,8 @@ msgstr "" msgid "A NetPlay window is already open!!" msgstr "已經開啟一個網路å°æˆ°è¦–窗ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:365 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." msgstr "ç›®å‰æ²’有執行éŠæˆ²ã€‚" @@ -417,7 +417,7 @@ msgstr "" msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:128 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 msgid "AR Codes" msgstr "AR 代碼" @@ -430,7 +430,7 @@ msgstr "關於 Dolphin" msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:469 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" msgstr "" @@ -438,7 +438,7 @@ msgstr "" msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -467,20 +467,20 @@ msgstr "" "兇手代碼：\n" "%s" -#: Source/Core/Core/Src/ActionReplay.cpp:669 +#: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於添加的代碼 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:756 +#: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於輸入 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:549 +#: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " @@ -488,7 +488,7 @@ msgid "" msgstr "" "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) æ–¼ Ram å¯«å…¥åŠ è¼¸å…¥ (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:609 +#: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " @@ -496,12 +496,12 @@ msgid "" msgstr "" "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於寫入至 指示器 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:803 +#: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay 錯誤：無效的數值 (%08x) 於記憶體複製 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:684 +#: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" @@ -512,27 +512,27 @@ msgstr "Action Replay 錯誤：主碼åŠå¯«å…¥è‡³ CCXXXXXX 沒有執行 (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay 錯誤：無效的 AR 代碼行： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:873 +#: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay：有æ¢ä»¶çš„ä»£ç¢¼ï¼šç„¡æ•ˆçš„å¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:946 +#: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay：無效的一般代碼類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:897 +#: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:839 +#: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" msgstr "é…接器：" @@ -541,11 +541,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1312 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1241 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 msgid "Add Patch" msgstr "新增修正" @@ -555,7 +555,7 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:743 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 msgid "Add..." msgstr "新增..." @@ -602,38 +602,38 @@ msgstr "" msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:558 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 msgid "Advanced Settings" msgstr "進階設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:666 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1195 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1501 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1193 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1213 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" @@ -641,28 +641,29 @@ msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:125 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5, 6 and 7 within the " +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." -msgstr "" +msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:279 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:374 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" msgstr "å„å‘異性éŽæ¿¾ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:357 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" msgstr "邊緣抗鋸齒：" @@ -674,22 +675,22 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" msgstr "程å¼è®€å–器：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:135 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" msgstr "套用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" msgstr "" @@ -698,7 +699,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1027 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -706,12 +707,12 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1018 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -719,12 +720,12 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -732,26 +733,26 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:344 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 #, fuzzy msgid "Auto (Window Size)" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 #, fuzzy msgid "Auto adjust Window Size" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -759,19 +760,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Automatically generate mipmaps rather than decoding them from memory.\n" -"Increases performance a bit but might cause minor texture defects.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:688 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:746 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -780,12 +773,12 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:214 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 #, fuzzy msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -803,7 +796,7 @@ msgstr "å‘後" msgid "Bad File Header" msgstr "æ壞的檔頭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:624 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 msgid "Banner" msgstr "æ©«å¹…" @@ -820,11 +813,11 @@ msgstr "橫幅：" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:315 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 msgid "Basic Settings" msgstr "基本設定" @@ -836,7 +829,7 @@ msgstr "Bass" msgid "Block Allocation Table checksum failed" msgstr "å€å¡Šåˆ†é…表校驗失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" msgstr "å€å¡Š" @@ -853,7 +846,7 @@ msgid "Blue Right" msgstr "è— å³" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 msgid "Bottom" msgstr "下方" @@ -866,7 +859,7 @@ msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" msgid "Broken" msgstr "ç ´æ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" msgstr "ç€è¦½" @@ -874,11 +867,11 @@ msgstr "ç€è¦½" msgid "Browse for a directory to add" msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1093 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" @@ -892,7 +885,7 @@ msgstr "ç·©è¡ï¼š" msgid "Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" msgstr "" @@ -905,20 +898,20 @@ msgstr "C-æ–æ¡¿" msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:755 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:543 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -928,7 +921,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -937,7 +930,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:137 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -953,7 +946,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -963,7 +956,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1034 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -971,18 +964,18 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1906 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1920 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:667 -#: Source/Core/Core/Src/HW/DVDInterface.cpp:677 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:679 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" @@ -990,7 +983,7 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" msgstr "" @@ -1002,7 +995,7 @@ msgstr "中心" msgid "Change" msgstr "更改" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." msgstr "æ›´æ›å…‰ç¢Ÿ(&D)..." @@ -1015,7 +1008,7 @@ msgstr "æ›´æ›å…‰ç¢Ÿ" msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1031,8 +1024,8 @@ msgstr "更改 zFar åƒæ•¸ç¬¦è™Ÿ (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear åƒæ•¸çš„符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:505 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此é¸é …在模擬器執行時沒有效果ï¼" @@ -1044,7 +1037,7 @@ msgstr "èŠå¤©" msgid "Cheat Code" msgstr "作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" msgstr "尋找作弊代碼" @@ -1056,36 +1049,36 @@ msgstr "作弊代碼管ç†å™¨" msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1160 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:998 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1093,14 +1086,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "é¸æ“‡ä½œç‚ºç¨‹å¼è®€å–器的檔案：(åƒ…ç”¨æ–¼ä¾†è®€å– å…‰ç¢Ÿçš„ç›®éŒ„çµæ§‹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:788 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:827 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1125,22 +1118,22 @@ msgid "" "manually stop the game." msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉。您必須手動åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:292 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:590 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 msgid "Close" msgstr "關閉" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:187 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 msgid "Co&nfigure..." msgstr "設定(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Code Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:568 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 msgid "Code: " msgstr "代碼：" @@ -1148,7 +1141,7 @@ msgstr "代碼：" msgid "Command" msgstr "命令" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 msgid "Comment" msgstr "註釋" @@ -1156,20 +1149,20 @@ msgstr "註釋" msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:908 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:920 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" msgstr "正在壓縮 ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" msgstr "設定" @@ -1188,17 +1181,17 @@ msgstr "設定控制器" msgid "Configure Pads" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:442 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1158 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1223 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" @@ -1208,11 +1201,11 @@ msgstr "確èªåœæ­¢" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:375 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" msgstr "連接 Wiimote %i" @@ -1237,7 +1230,7 @@ msgstr "連接 Wiimote 3" msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." msgstr "正在連接..." @@ -1257,7 +1250,7 @@ msgstr "轉æ›ç‚º GCI" msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 #, c-format msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" @@ -1271,7 +1264,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "無法建立 %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:68 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." msgstr "無法åˆå§‹åŒ– backend %s。" @@ -1305,7 +1298,7 @@ msgstr "" "無法設置控制器。有玩家存留或者éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼\n" "(é‚„ä¸æ”¯æ´åœ¨éŠæˆ²åŸ·è¡Œæ™‚設定控制器)" -#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:120 +#: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" @@ -1317,11 +1310,11 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1144 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" -#: Source/Core/Core/Src/BootManager.cpp:125 +#: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1329,8 +1322,8 @@ msgstr "" "無法åˆå§‹åŒ–核心。\n" "請檢查您的設定。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:183 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:507 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 msgid "Count:" msgstr "數é‡ï¼š" @@ -1338,8 +1331,8 @@ msgstr "數é‡ï¼š" msgid "Country:" msgstr "國別：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:186 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:562 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 msgid "Create AR Code" msgstr "建立 AR 代碼" @@ -1348,20 +1341,20 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" msgstr "ç”± KDE-Look.org 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "ç”± Milosz Wlazlo è£½åš [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" msgstr "ç”± VistaIcons.com 製åš" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" @@ -1373,11 +1366,11 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:559 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" msgstr "剪è£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1388,7 +1381,7 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:676 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" @@ -1405,11 +1398,11 @@ msgstr "自訂投影修正設定" msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" msgstr "Czech" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:689 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" msgstr "" @@ -1417,37 +1410,37 @@ msgstr "" msgid "D-Pad" msgstr "åå­—æ–¹å‘éµ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:600 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:602 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:770 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" msgstr "DVD 根：" @@ -1459,7 +1452,7 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:176 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" msgstr "資料大å°" @@ -1467,8 +1460,8 @@ msgstr "資料大å°" msgid "Date:" msgstr "日期：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" msgstr "Datel MaxDrive/Pro 檔案(*.sav)" @@ -1484,7 +1477,7 @@ msgstr "éžä½œç”¨å€" msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1493,16 +1486,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:921 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1099 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1510,7 +1503,7 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" @@ -1523,7 +1516,7 @@ msgstr "é è¨­çš„å­—åž‹" msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" msgstr "刪除存檔" @@ -1532,7 +1525,7 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:683 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 #, fuzzy msgid "Description" msgstr "å•é¡Œ" @@ -1555,8 +1548,8 @@ msgstr "" msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1580,30 +1573,22 @@ msgstr "" "目錄校驗失敗\n" " 並且目錄備份校驗失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:481 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:499 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 -msgid "Disable Lighting" -msgstr "關閉光æº" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 #, fuzzy msgid "Disable Per-Pixel Depth" msgstr "åƒç´ æ·±åº¦" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:529 -msgid "Disable Textures" -msgstr "關閉紋ç†" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1612,7 +1597,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1622,13 +1607,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 -msgid "" -"Disable texturing.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" msgstr "光碟" @@ -1638,11 +1616,11 @@ msgstr "光碟" msgid "Disc Read Error" msgstr "光碟讀å–錯誤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:319 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 msgid "Display" msgstr "顯示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1654,20 +1632,20 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1084 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:933 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:190 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:305 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" msgstr "Dolphin 官網(&W)" @@ -1679,17 +1657,17 @@ msgstr "Dolphin 模擬器設定" msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模擬 Wiimote 設定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:381 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1236 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:748 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1697,7 +1675,7 @@ msgstr "Dolphin TAS 影片 (*.dtm)" msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote 設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" @@ -1735,30 +1713,30 @@ msgstr "Drums" msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:603 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:542 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" msgstr "轉儲紋ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1766,7 +1744,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "轉儲éŠæˆ²ç´‹ç†è‡³ User/Dump/Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1774,24 +1752,24 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:129 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 msgid "E&xit" msgstr "離開(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 #, fuzzy msgid "EFB Copies" msgstr "EFB 複製範åœ" -#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:249 -#, c-format +#: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 +#, fuzzy, c-format msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." @@ -1803,11 +1781,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPE" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:150 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" msgstr "編輯" @@ -1823,7 +1801,7 @@ msgstr "編輯 ini 設定檔" msgid "Edit Patch" msgstr "編輯修正" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" @@ -1836,15 +1814,15 @@ msgstr "編輯..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" msgstr "" -#: Source/Core/Core/Src/Core.cpp:205 +#: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1853,7 +1831,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1875,7 +1853,7 @@ msgstr "模擬狀態：" msgid "Enable" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1885,7 +1863,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:111 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" @@ -1901,12 +1879,12 @@ msgstr "é–‹å•Ÿå¡Šåˆä½µ" msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:442 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" msgstr "開啟作弊" @@ -1914,11 +1892,11 @@ msgstr "開啟作弊" msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" @@ -1926,7 +1904,7 @@ msgstr "é–‹å•Ÿå¿«æ·éµ" msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" @@ -1935,11 +1913,11 @@ msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:566 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:708 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" @@ -1948,11 +1926,11 @@ msgstr "開啟寬螢幕" msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" msgstr "開啟線框" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1970,11 +1948,11 @@ msgid "" "Compatible)" msgstr "開啟快速光碟存å–。部份éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" msgstr "開啟分é ç€è¦½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1982,7 +1960,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2009,7 +1987,7 @@ msgstr "" msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2023,7 +2001,7 @@ msgid "" "OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2035,13 +2013,13 @@ msgid "End" msgstr "End" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:336 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:413 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" msgstr "增強" @@ -2059,17 +2037,17 @@ msgstr "é …ç›® %d/%d" msgid "Entry 1/%d" msgstr "é …ç›® 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "Error" msgstr "錯誤" -#: Source/Core/DolphinWX/Src/Main.cpp:346 +#: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2105,10 +2083,6 @@ msgstr "處ç†ç•°å¸¸ - å­˜å–下列記憶體空間。 %08llx%08llx" msgid "Execute" msgstr "執行" -#: Source/Core/DolphinWX/Src/Main.cpp:139 -msgid "Exit Dolphin with emulator" -msgstr "離開 Dolphin" - #: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 msgid "Export Failed" msgstr "匯出失敗" @@ -2122,19 +2096,19 @@ msgstr "匯出檔案" msgid "Export Recording" msgstr "匯出錄åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:358 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 msgid "Export Recording..." msgstr "匯出錄åƒ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:890 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2142,7 +2116,7 @@ msgstr "匯出所有存檔" msgid "Export failed, try again?" msgstr "匯出失敗，è¦é‡è©¦å—Žï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:556 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." msgstr "匯出存檔為..." @@ -2150,7 +2124,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2187,28 +2161,28 @@ msgstr "æå–檔案..." msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:745 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:728 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:731 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." msgstr "æå–中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:39 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2233,7 +2207,7 @@ msgstr "監è½å¤±æ•—ï¼ï¼" msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:848 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2344,35 +2318,30 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:473 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 -#, fuzzy -msgid "Fast Mipmaps" -msgstr "讀å–原始紋ç†" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:93 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 #, fuzzy msgid "File Info" msgstr "代碼訊æ¯" @@ -2419,45 +2388,45 @@ msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1137 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" msgstr "首數據å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" msgstr "修正校驗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" msgstr "強制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 #, fuzzy msgid "Force Texture Filtering" msgstr "強制éŽæ¿¾" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2468,7 +2437,7 @@ msgstr "" "強制雙線型紋ç†éŽæ¿¾ç„¡è«–éŠæˆ²æ˜¯å¦æ˜Žç¢ºè¡¨ç¤ºæ˜¯å¦ç¦ç”¨å®ƒã€‚\n" "改進紋ç†å“質 (特別是使用高解æžåº¦ç´‹ç†æ™‚)但是å¯èƒ½å°Žè‡´æŸäº›éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2479,7 +2448,7 @@ msgstr "" "強制éŠæˆ²è¼¸å‡ºå¯¬èž¢å¹•è§£æžåº¦çš„å½±åƒã€‚\n" "注æ„這å¯èƒ½å°Žè‡´åœ–å½¢å•é¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:488 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2498,18 +2467,18 @@ msgstr "" msgid "Forward" msgstr "å‘å‰" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:497 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:839 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:907 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 #, fuzzy msgid "Frame" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:849 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 #, fuzzy msgid "Frame " msgstr "畫格步進" @@ -2519,40 +2488,40 @@ msgstr "畫格步進" msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:546 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:221 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 #, fuzzy msgid "Frame Info" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:110 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 #, fuzzy msgid "Frame Range" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:549 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:198 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:544 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" msgstr "自由視點" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "French" msgstr "French" @@ -2560,21 +2529,21 @@ msgstr "French" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:112 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:131 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 msgid "FullScr" msgstr "全螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:264 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 #, fuzzy msgid "Fullscreen resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:531 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" msgstr "GCI 檔案(*.gci)" @@ -2583,11 +2552,11 @@ msgstr "GCI 檔案(*.gci)" msgid "GCMic Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:650 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2615,24 +2584,28 @@ msgstr "éŠæˆ²è¦æ ¼è¨­å®š" msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1002 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 msgid "Gecko Codes" msgstr "Gecko 代碼" @@ -2650,8 +2623,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:527 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:205 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 msgid "General" msgstr "一般" @@ -2661,29 +2634,29 @@ msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "German" msgstr "German" -#: Source/Core/Core/Src/ActionReplay.cpp:451 +#: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" msgstr "å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 msgid "Greater Than" msgstr "大於" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2694,7 +2667,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" msgstr "Greek" @@ -2714,11 +2687,11 @@ msgstr "綠 å³" msgid "Guitar" msgstr "Guitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1298 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被調用，請回報ï¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:427 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" msgstr "" @@ -2726,7 +2699,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" msgstr "Hebrew" @@ -2738,7 +2711,7 @@ msgstr "高度" msgid "Help" msgstr "說明" -#: Source/Core/DolphinWX/Src/Main.cpp:196 +#: Source/Core/DolphinWX/Src/Main.cpp:195 msgid "" "Hi,\n" "\n" @@ -2758,11 +2731,11 @@ msgstr "" msgid "Hide" msgstr "éš±è—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:306 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 msgid "Hide Mouse Cursor" msgstr "éš±è—滑鼠游標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2785,11 +2758,11 @@ msgstr "å¿«æ·éµè¨­å®š" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:572 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" msgstr "Hungarian" @@ -2797,12 +2770,12 @@ msgstr "Hungarian" msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:527 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "IOCTL_ES_GETVIEWS：試圖å–得資料從未知的標簽： %08x/%08x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:781 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" "IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " @@ -2814,11 +2787,11 @@ msgstr "" "標題 ID %016llx.\n" " Dolphin å¯èƒ½æœƒç•¶" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:308 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" msgstr "IPL 設定" @@ -2838,7 +2811,7 @@ msgstr "IR éˆæ•åº¦ï¼š" msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2846,7 +2819,7 @@ msgstr "ISO 資料夾" msgid "ITALY" msgstr "ITALY" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:627 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" msgstr "圖示" @@ -2861,7 +2834,7 @@ msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2871,12 +2844,12 @@ msgstr "" "如果您è¦è¨­å®šç•«æ ¼æ•¸é™åˆ¶å¤§æ–¼éŠæˆ²çš„速度 (NTSC:60, PAL:50)，您就需è¦åŒæ™‚關閉 DSP " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 #, fuzzy msgid "Ignore Format Changes" msgstr "模擬格å¼è®ŠåŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2885,7 +2858,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2894,7 +2867,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" msgstr "匯入存檔" @@ -2922,7 +2895,7 @@ msgstr "" "匯入的檔案有 sav 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2931,14 +2904,6 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉霧化。改善效能，但是å¯èƒ½å°Žè‡´éœ€è¦é©ç•¶éœ§åŒ–模擬的éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy -msgid "" -"Improves performance but causes lighting to disappear in most games.\n" -"\n" -"If unsure, leave this unchecked." -msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" msgstr "éŠæˆ²ä¸­" @@ -2968,7 +2933,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -2976,11 +2941,11 @@ msgstr "æ’å…¥ SD å¡" msgid "Insert name here.." msgstr "在這裡æ’å…¥å稱.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:209 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:910 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -2989,43 +2954,43 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:906 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:912 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:903 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:528 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:588 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/Core/Src/State.cpp:232 +#: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" msgstr "內部 LZO 錯誤 - 壓縮失敗" -#: Source/Core/Core/Src/State.cpp:344 +#: Source/Core/Core/Src/State.cpp:348 #, c-format msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" @@ -3034,16 +2999,16 @@ msgstr "" "內部 LZO 錯誤 - 解壓縮失敗 (%d) (%li, %li) \n" "è«‹é‡è©¦è®€å–" -#: Source/Core/Core/Src/State.cpp:476 +#: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" msgstr "內部 LZO 錯誤 - lzo_init() 失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 #, fuzzy msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:245 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" @@ -3056,7 +3021,7 @@ msgstr "標題" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "無效大å°(%x) 或 Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:612 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" msgstr "無效的數值ï¼" @@ -3069,7 +3034,7 @@ msgstr "無效的 bat.map 或目錄項目" msgid "Invalid event type %i" msgstr "無效的事件類型 %i" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:325 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" msgstr "無效的檔案" @@ -3084,29 +3049,29 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:540 +#: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:464 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:431 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:531 +#: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" msgstr "無效的狀態" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" msgstr "Italian" @@ -3114,16 +3079,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:283 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Japanese" msgstr "Japanese" @@ -3131,7 +3096,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3139,7 +3104,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:305 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" msgstr "" @@ -3148,8 +3113,8 @@ msgstr "" msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Korean" msgstr "Korean" @@ -3167,16 +3132,16 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" msgstr "語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" msgstr "最後覆蓋的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:172 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" msgstr "最後使用的進度" @@ -3216,11 +3181,11 @@ msgstr "" "å·¦/å³éµå–得更多é¸é …。\n" "中éµæ¸…除。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" msgstr "" @@ -3228,7 +3193,7 @@ msgstr "" msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:541 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" @@ -3273,21 +3238,21 @@ msgstr "讀å–儲存格 7" msgid "Load State Slot 8" msgstr "讀å–儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:168 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1430 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1425 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3299,15 +3264,11 @@ msgstr "從 User/Load/Textures// 讀å–高解æžåº¦ç´‹ç†" msgid "Load preset values from hack patterns available." msgstr "讀å–å¯ç”¨çš„修正設定é è¨­æª”" -#: Source/Core/DolphinWX/Src/Main.cpp:134 -msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" - #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 #, fuzzy msgid "Lock Threads to Cores" msgstr "鎖定線程至內核" @@ -3320,16 +3281,28 @@ msgstr "記錄" msgid "Log Configuration" msgstr "記錄設定" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +msgid "Log FPS to file" +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "記錄類型" +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +msgid "" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" +"\n" +"If unsure, leave this unchecked." +msgstr "" + #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" msgstr "記錄輸出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 -#: Source/Core/DolphinWX/Src/Frame.cpp:398 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 +#: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" msgstr "日誌" @@ -3337,10 +3310,6 @@ msgstr "日誌" msgid "Lost connection to server!" msgstr "éºå¤±èˆ‡ä¼ºæœå™¨çš„連接" -#: Source/Core/DolphinWX/Src/Main.cpp:149 -msgid "Low level (LLE) or high level (HLE) audio" -msgstr "指定低階 (LLE) 或高階 (HLE) è²éŸ³æ¨¡æ“¬å™¨" - #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" msgstr "M 鈕" @@ -3358,8 +3327,8 @@ msgstr "" msgid "MMU Speed Hack" msgstr "MMU 速度修正" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" msgstr "MadCatz Gameshark 檔案(*.gcs)" @@ -3389,7 +3358,7 @@ msgstr "記憶å¡ä¸­å·²ç¶“存在一個此標題的存檔" msgid "Memcard already opened" msgstr "記憶å¡å·²ç¶“é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:894 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 #, fuzzy msgid "Memory Byte" msgstr "記憶å¡(&M)" @@ -3440,11 +3409,11 @@ msgstr "麥克風" msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:580 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "Misc Settings" msgstr "其它設定" @@ -3453,7 +3422,7 @@ msgstr "其它設定" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3474,7 +3443,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:666 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3495,11 +3464,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:642 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:621 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3593,28 +3562,28 @@ msgstr "NP Up" msgid "Name:" msgstr "å稱：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:295 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:565 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Name: " msgstr "å稱：" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:559 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" msgstr "原始 GCI 檔案(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:161 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" msgstr "æ–°çš„æœå°‹" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 msgid "Next Page" msgstr "下一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:165 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" msgstr "尋找下一個" @@ -3635,8 +3604,8 @@ msgstr "找ä¸åˆ° ISO 或 WAD" msgid "No banner file found for title %s" msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的圖示檔案" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" msgstr "" @@ -3644,7 +3613,7 @@ msgstr "" msgid "No docking" msgstr "ä¸åœé " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:841 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" msgstr "" @@ -3652,7 +3621,7 @@ msgstr "" msgid "No free dir index entries" msgstr "沒有剩餘的目錄索引項目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:877 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 #, fuzzy msgid "No recorded file" msgstr "無效的錄åƒæª”" @@ -3667,20 +3636,20 @@ msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:820 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" msgstr "未連接" @@ -3705,7 +3674,7 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:88 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " msgstr "代碼數é‡ï¼š" @@ -3718,15 +3687,15 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:859 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:129 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" msgstr "關閉" @@ -3734,26 +3703,30 @@ msgstr "關閉" msgid "Offset:" msgstr "å移：" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +msgid "On-Screen Display Messages" +msgstr "" + #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" msgstr "僅 %d 個å€å¡Šå¯ç”¨" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:892 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." msgstr "開啟檔案..." @@ -3771,22 +3744,14 @@ msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:502 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:503 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:124 -msgid "Opens the debugger" -msgstr "開啟除錯器" - -#: Source/Core/DolphinWX/Src/Main.cpp:129 -msgid "Opens the logger" -msgstr "開啟日誌記錄器" - #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" @@ -3806,8 +3771,8 @@ msgstr "" "按å³éµåŒ¯å‡ºæ‰€æœ‰å­˜æª”，\n" "並匯入存檔至一張新的記憶å¡ä¸­\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:323 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:505 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 msgid "Other" msgstr "" @@ -3821,7 +3786,7 @@ msgstr "其它客戶端在éŠæˆ²åŸ·è¡Œæ™‚連接埠å£ï¼ï¼å·²é—œé–‰ç¶²è·¯å°æˆ° msgid "Output" msgstr "輸出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." msgstr "播放錄åƒ(&L)..." @@ -3866,17 +3831,21 @@ msgstr "åˆ†å‰²å€ %i" msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1635 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1636 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš«åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +msgid "Pause at end of movie" +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" @@ -3890,10 +3859,10 @@ msgstr "完美" msgid "Perspective %d" msgstr "ç‰ˆå¼ %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:159 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:437 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1644 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1645 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 msgid "Play" msgstr "執行" @@ -3911,7 +3880,7 @@ msgstr "執行/æš«åœ" msgid "Playable" msgstr "å¯çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:148 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 #, fuzzy msgid "Playback Options" msgstr "é¸é …" @@ -3920,7 +3889,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1085 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 msgid "Please confirm..." msgstr "請確èª..." @@ -3932,23 +3901,23 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:664 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:665 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:666 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Port 4" msgstr "åŸ å£ 4" @@ -3957,30 +3926,30 @@ msgstr "åŸ å£ 4" msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 #, fuzzy msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:757 +#: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:828 +#: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3993,11 +3962,11 @@ msgstr "é è¨­ï¼š" msgid "Prev Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 msgid "Previous Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:196 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 msgid "Previous Value" msgstr "上一個數值" @@ -4013,7 +3982,7 @@ msgstr "設定檔" msgid "Properties" msgstr "屬性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" msgstr "清ç†å¿«å–" @@ -4040,7 +4009,7 @@ msgstr "R 鈕" msgid "R-Analog" msgstr "R-類比" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:441 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" msgstr "RAM" @@ -4057,7 +4026,7 @@ msgstr "範åœ" msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:483 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 msgid "Real" msgstr "實體" @@ -4070,7 +4039,7 @@ msgstr "實體 Wiimote" msgid "Real Wiimotes" msgstr "實體 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:163 +#: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" msgstr "確èªé‡æ–°é€£æŽ¥ Wiimote" @@ -4079,19 +4048,19 @@ msgstr "確èªé‡æ–°é€£æŽ¥ Wiimote" msgid "Reconnect Wiimote on State Loading" msgstr "讀å–進度後é‡æ–°é€£æŽ¥ Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:187 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:211 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:773 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:168 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 #, fuzzy msgid "Recording Info" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" msgstr "" @@ -4107,7 +4076,7 @@ msgstr "ç´… å·¦" msgid "Red Right" msgstr "ç´… å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4120,7 +4089,7 @@ msgstr "" "é¿å…ç•«é¢çœ‹èµ·ä¾†åƒæ˜¯å¡Šç‹€åœ–形，但也大é‡é™ä½Žæ•ˆèƒ½ã€‚" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 msgid "Refresh" msgstr "æ›´æ–°" @@ -4130,18 +4099,18 @@ msgstr "æ›´æ–°" msgid "Refresh List" msgstr "更新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:744 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4151,7 +4120,7 @@ msgstr "" "場景渲染線框。\n" "這個僅用於除錯的目的使用。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:307 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" msgstr "渲染至主視窗" @@ -4161,7 +4130,7 @@ msgstr "渲染至主視窗" msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:190 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 msgid "Results" msgstr "çµæžœ" @@ -4183,33 +4152,33 @@ msgstr "å³ æ–æ¡¿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在ç¨ç«‹çš„線程中執行 DSP LLE (ä¸æŽ¨è–¦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" msgstr "Russian" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:471 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:628 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" msgstr "å–樣率：" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:190 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Save" msgstr "儲存" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:529 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." msgstr "å¦å­˜ GCI ..." @@ -4253,7 +4222,7 @@ msgstr "儲存至儲存格 7" msgid "Save State Slot 8" msgstr "儲存至儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." @@ -4262,24 +4231,24 @@ msgstr "å¦å­˜é€²åº¦..." msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1209 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:459 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:617 +#: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:403 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" @@ -4297,7 +4266,7 @@ msgstr "正在掃瞄 ISO" msgid "Scanning..." msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" msgstr "截圖" @@ -4305,25 +4274,25 @@ msgstr "截圖" msgid "Scroll Lock" msgstr "滾動鎖定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:258 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 #, fuzzy msgid "Search" msgstr "尋找作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:227 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:742 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:244 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 #, fuzzy msgid "Search current Object" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:248 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" msgstr "" @@ -4338,16 +4307,16 @@ msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" msgid "Select" msgstr "é¸æ“‡" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:746 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1174 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1383 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4365,23 +4334,23 @@ msgstr "é¸æ“‡è¦åŒ¯å…¥çš„存檔" msgid "Select floating windows" msgstr "é¸æ“‡æµ®å‹•è¦–窗" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:664 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1485 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1499 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4402,7 +4371,7 @@ msgstr "" msgid "Selected font" msgstr "é¸æ“‡å­—åž‹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4412,7 +4381,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4434,11 +4403,11 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" @@ -4447,16 +4416,16 @@ msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:893 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" -#: Source/Core/Core/Src/ActionReplay.cpp:462 +#: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" @@ -4482,56 +4451,56 @@ msgstr "短å：" msgid "Shoulder Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" msgstr "顯示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" msgstr "顯示日誌視窗(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:225 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" msgstr "顯示狀態欄(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:223 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" msgstr "顯示工具列(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:526 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" msgstr "顯示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" msgstr "顯示 France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:270 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:558 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" msgstr "輸入顯示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:286 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 msgid "Show Italy" msgstr "顯示 Italy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 msgid "Show JAP" msgstr "顯示 JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:288 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 msgid "Show Korea" msgstr "顯示 Korea" @@ -4539,48 +4508,48 @@ msgstr "顯示 Korea" msgid "Show Language:" msgstr "顯示語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" msgstr "日誌記錄設定(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" msgstr "顯示 PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:267 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" msgstr "顯示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:276 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:527 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:290 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 msgid "Show Taiwan" msgstr "顯示 Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" msgstr "顯示 USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:272 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" msgstr "顯示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." msgstr "在åœæ­¢éŠæˆ²å¾Œé¡¯ç¤ºä¸€å€‹ç¢ºèªæ¡†ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:492 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " @@ -4590,27 +4559,39 @@ msgstr "" "關閉此é¸é …å¯ä»¥é˜»æ­¢å…¨éƒ¨éžé—œéµçš„錯誤訊æ¯ï¼Œä½†æ˜¯å®ƒå¯èƒ½å°Žè‡´ Dolphin 在沒有任何徵兆" "的情æ³ä¸‹å´©æ½°ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "顯示第一個å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#, fuzzy +msgid "Show lag counter" +msgstr "顯示存檔æè¿°" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +msgid "" +"Show messages on the emulation screen area.\n" +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." +msgstr "" + +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" msgstr "顯示存檔å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:821 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" msgstr "顯示存檔標題" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4618,15 +4599,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:119 -msgid "Show this help message" -msgstr "顯示此說明訊æ¯" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" msgstr "顯示 未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Show various statistics.\n" "\n" @@ -4637,7 +4614,7 @@ msgstr "" msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" msgstr "Simplified Chinese" @@ -4645,21 +4622,21 @@ msgstr "Simplified Chinese" msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:501 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:450 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4667,7 +4644,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:127 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4677,17 +4654,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:387 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:399 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 #, c-format msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:651 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:652 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" msgstr "æ’槽 B" @@ -4707,11 +4684,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:616 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:70 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." msgstr "è²éŸ³ backend %s 是無效的。" @@ -4726,8 +4703,8 @@ msgid "Space" msgstr "Space" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" msgstr "Spanish" @@ -4735,7 +4712,7 @@ msgstr "Spanish" msgid "Speaker Volume:" msgstr "æšè²å™¨éŸ³é‡ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4747,10 +4724,6 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:144 -msgid "Specify a video backend" -msgstr "指定影åƒæ’件" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -4769,11 +4742,11 @@ msgstr "標準控制器" msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" msgstr "開始網路å°æˆ°(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" msgstr "開始錄製(&C)" @@ -4795,15 +4768,15 @@ msgstr "å³æ™‚存檔" msgid "Stick" msgstr "æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:407 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4812,7 +4785,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:283 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" msgstr "拉伸至視窗" @@ -4837,8 +4810,8 @@ msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:676 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:724 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 msgid "System Language:" msgstr "系統語系：" @@ -4846,7 +4819,7 @@ msgstr "系統語系：" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4868,8 +4841,8 @@ msgstr "Table å·¦" msgid "Table Right" msgstr "Table å³" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:368 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" @@ -4883,16 +4856,16 @@ msgstr "" msgid "Test" msgstr "測試" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" msgstr "ç´‹ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:457 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 #, fuzzy msgid "Texture Cache" msgstr "清ç†å¿«å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:528 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -4909,13 +4882,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1166 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1128 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1156 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1222 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 #, c-format msgid "" "The file %s already exists.\n" @@ -4953,7 +4926,7 @@ msgstr "å稱ä¸èƒ½å«æœ‰å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4965,7 +4938,7 @@ msgstr "" msgid "The save you are trying to copy has an invalid file size" msgstr "您嘗試複製的檔案有一個無效的檔案大å°" -#: Source/Core/DolphinWX/Src/Main.cpp:353 +#: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4996,15 +4969,15 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" msgstr "佈景主題" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:602 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" msgstr "佈景主題é¸æ“‡éŒ¯èª¤" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:471 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." @@ -5018,17 +4991,17 @@ msgstr "" "這些設定將替代核心 Dolphin 設定。\n" "未確定表示éŠæˆ²ä½¿ç”¨ Dolphin 的設定。" -#: Source/Core/Core/Src/ActionReplay.cpp:356 +#: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5039,7 +5012,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:484 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5062,13 +5035,13 @@ msgstr "閾值" msgid "Tilt" msgstr "傾斜" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 msgid "Title" msgstr "標題" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:119 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:138 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 #, fuzzy msgid "To" msgstr "上方" @@ -5077,18 +5050,18 @@ msgstr "上方" msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" msgstr "Traditional Chinese" @@ -5112,7 +5085,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" msgstr "Turkish" @@ -5137,7 +5110,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:747 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5160,24 +5133,24 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" msgstr "未指定 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" msgstr "å–消讀å–進度" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:709 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" msgstr "未知" -#: Source/Core/Core/Src/HW/DVDInterface.cpp:959 +#: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" msgstr "未知的 DVD 命令 %08x - 致命錯誤" @@ -5202,7 +5175,7 @@ msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:108 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 msgid "Update" msgstr "æ›´æ–°" @@ -5211,24 +5184,24 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:709 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:294 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 #, fuzzy msgid "Use Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:575 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5236,7 +5209,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:128 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5245,15 +5218,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" msgstr "工具" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:293 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:209 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" msgstr "數值" @@ -5261,7 +5234,7 @@ msgstr "數值" msgid "Value:" msgstr "數值：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:572 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 msgid "Value: " msgstr "數值：" @@ -5273,11 +5246,11 @@ msgstr "事件" msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:482 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:621 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 msgid "Volume" msgstr "音é‡" @@ -5292,7 +5265,7 @@ msgstr "WAD installation 失敗：錯誤於建立 %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installation 失敗：錯誤於建立 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5329,7 +5302,7 @@ msgstr "" "%s\n" "您è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:582 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format msgid "" "Warning: This will overwrite any existing saves that are in the folder:\n" @@ -5342,7 +5315,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:665 +#: Source/Core/Core/Src/Movie.cpp:825 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5350,7 +5323,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:682 +#: Source/Core/Core/Src/Movie.cpp:842 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5358,7 +5331,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:691 +#: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5386,7 +5359,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:562 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5394,7 +5367,7 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" msgstr "Wii" @@ -5402,16 +5375,16 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1342 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5420,7 +5393,7 @@ msgid "WiiWAD: Could not read from file" msgstr "WiiWAD：無法從檔案中讀å–" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote" msgstr "Wiimote" @@ -5429,7 +5402,7 @@ msgstr "Wiimote" msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5442,7 +5415,7 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:598 +#: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" msgstr "Wiimote 已連接" @@ -5450,7 +5423,7 @@ msgstr "Wiimote 已連接" msgid "Wiimote Motor" msgstr "Wiimote 馬é”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" msgstr "Wiimote 設定" @@ -5475,10 +5448,10 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1396 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:885 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1100 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." msgstr "執行中..." @@ -5514,7 +5487,7 @@ msgstr "XAudio2 åˆå§‹åŒ–失敗： %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 主è²éŸ³å»ºç«‹å¤±æ•—： %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:757 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" msgstr "" @@ -5536,11 +5509,11 @@ msgstr "您ä¸èƒ½é—œé–‰æœ‰é é¢çš„é¢æ¿ã€‚" msgid "You must choose a game!!" msgstr "您必須é¸æ“‡ä¸€å€‹éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:605 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" msgstr "您必須輸入一個å稱ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:450 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數值。" @@ -5548,7 +5521,7 @@ msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:874 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5575,11 +5548,11 @@ msgstr "" msgid "ZTP hack" msgstr "ZTP 修正" -#: Source/Core/Core/Src/ActionReplay.cpp:388 +#: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" msgstr "ä¸æ”¯æ´ Zero 3 代碼" -#: Source/Core/Core/Src/ActionReplay.cpp:410 +#: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code 未知於 dolphin: %08x" @@ -5589,7 +5562,7 @@ msgstr "Zero code 未知於 dolphin: %08x" msgid "[ waiting ]" msgstr "[ 等候中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5601,7 +5574,7 @@ msgstr "" msgid "[Custom]" msgstr "[自訂]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5612,7 +5585,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5625,7 +5598,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5652,7 +5625,7 @@ msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" msgid "not a wii save or read failure for file header size %x" msgstr "ä¸æ˜¯ä¸€å€‹ wii 存檔或讀å–檔案頭部大å°å¤±æ•— %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:917 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" msgstr "" @@ -5661,7 +5634,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1147 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -5790,6 +5763,12 @@ msgstr "| 或" #~ msgid "Danish" #~ msgstr "Danish" +#~ msgid "Disable Lighting" +#~ msgstr "關閉光æº" + +#~ msgid "Disable Textures" +#~ msgstr "關閉紋ç†" + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -5918,6 +5897,9 @@ msgstr "| 或" #~ msgid "Error opening file %s for recording" #~ msgstr "開啟檔案 %s 用於錄製出錯" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "離開 Dolphin" + #~ msgid "" #~ "Failed to load DSP ROM:\n" #~ "%s\n" @@ -5930,6 +5912,10 @@ msgstr "| 或" #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "è®€å– DSP ROM 失敗： %s" +#, fuzzy +#~ msgid "Fast Mipmaps" +#~ msgstr "讀å–原始紋ç†" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -5976,6 +5962,13 @@ msgstr "| 或" #~ "如果一個éŠæˆ²æŽ›èµ·, 僅在解釋器或者 Dolphin 崩潰時有效，此é¸é …å¯èƒ½æœƒä¿®å¾©æŸäº›" #~ "éŠæˆ²ã€‚" +#, fuzzy +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "關閉光æºã€‚改善效能，但是如果在éŠæˆ²ä¸­éœ€è¦ä½¿ç”¨å…‰ç…§æ•ˆæžœå‰‡æœƒç„¡æ³•ä½œç”¨ã€‚" + #~ msgid "Input Source" #~ msgstr "輸入æº" @@ -6015,6 +6008,12 @@ msgstr "| 或" #~ "讀å–原始的系列紋ç†ã€‚\n" #~ "讀å–原始的系列紋ç†æ˜¯è¼ƒç²¾æº–çš„æ–¹å¼ï¼Œä½†å®ƒå¯èƒ½æœƒé™ä½Žæ•ˆèƒ½ã€‚" +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "指定低階 (LLE) 或高階 (HLE) è²éŸ³æ¨¡æ“¬å™¨" + #~ msgid "Lua Script Console" #~ msgstr "Lua 腳本控制å°" @@ -6043,6 +6042,12 @@ msgstr "| 或" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "開啟除錯器" + +#~ msgid "Opens the logger" +#~ msgstr "開啟日誌記錄器" + #~ msgid "Plugins" #~ msgstr "æ’件" @@ -6116,6 +6121,9 @@ msgstr "| 或" #~ msgid "Show the number of frames rendered per second." #~ msgstr "顯示æ¯ç§’的畫格數。" +#~ msgid "Show this help message" +#~ msgstr "顯示此說明訊æ¯" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6152,6 +6160,9 @@ msgstr "| 或" #~ "是較慢。\n" #~ "其它é¸é …åªæ˜¯ç”¨ä¾†ä¿®æ­£ç”¨ï¼Œç•¶ä½¿ç”¨äº†å…¶å®ƒçš„顯示/視窗 尺寸。" +#~ msgid "Specify a video backend" +#~ msgstr "指定影åƒæ’件" + #~ msgid "Specify an audio plugin" #~ msgstr "指定è²éŸ³æ’件" From 888b5fb061363d6ce644d7ebacb76b82778801c4 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 7 Dec 2012 14:40:52 +0100 Subject: [PATCH 164/627] remove usage of glMultiTexCoord2f Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/FramebufferManager.cpp | 15 +++++++++------ Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 14 +++++++++----- .../Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 1 + .../Plugin_VideoOGL/Src/TextureConverter.cpp | 2 ++ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 76e4b8156b..7e3244f634 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -317,16 +317,19 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, sourcerc.right, sourcerc.top, sourcerc.right, sourcerc.bottom }; + GLfloat tex2[] = { // For TEXTURE1 + 0.0f, 0.0f, + 0.0f, 1.0f, + 1.0f, 1.0f, + 1.0f, 0.0f + }; - glClientActiveTexture(GL_TEXTURE0); - - glMultiTexCoord2f(GL_TEXTURE1, 0, 0); - glMultiTexCoord2f(GL_TEXTURE1, 0, 1); - glMultiTexCoord2f(GL_TEXTURE1, 1, 1); - glMultiTexCoord2f(GL_TEXTURE1, 1, 0); glVertexPointer(2, GL_FLOAT, 0, vtx1); + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glClientActiveTexture(GL_TEXTURE1); + glTexCoordPointer(2, GL_FLOAT, 0, tex2); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 00f971a31b..d912277150 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1153,18 +1153,22 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons right, top, right, bottom }; + GLfloat tex2[] = { // For TEXTURE1 + 0.0f, 0.0f, + 0.0f, 1.0f, + 1.0f, 1.0f, + 1.0f, 0.0f + }; - glClientActiveTexture(GL_TEXTURE0); if (applyShader) { - glMultiTexCoord2f(GL_TEXTURE1, 0, 0); - glMultiTexCoord2f(GL_TEXTURE1, 0, 1); - glMultiTexCoord2f(GL_TEXTURE1, 1, 1); - glMultiTexCoord2f(GL_TEXTURE1, 1, 0); + glClientActiveTexture(GL_TEXTURE1); + glTexCoordPointer(2, GL_FLOAT, 0, tex2); } glVertexPointer(3, GL_FLOAT, 0, vtx1); + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 797ba39c10..6827539ce8 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -319,6 +319,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo 1.f, 1.f }; + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 306fa5e298..86e4d09301 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -228,6 +228,7 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar 1.f, -1.f }; + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); @@ -401,6 +402,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur -1.f, -1.f }; + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glVertexPointer(2, GL_FLOAT, 0, vtx1); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); From 6864b40e26354f6b366e8fe8c2ff4f6680f09189 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 7 Dec 2012 21:09:48 +0100 Subject: [PATCH 165/627] reset glEnableClientState befor every draw should be done with VAO, but atm, this is not possible :-( this also partial revert the fix in fb92c338af83 (activating texture0 globally). Signed-off-by: Ryan Houdek --- .../Src/FramebufferManager.cpp | 17 +++++++++ .../Src/NativeVertexFormat.cpp | 38 ++++++++++--------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 33 ++++++++++++++-- .../Plugin_VideoOGL/Src/TextureCache.cpp | 15 ++++++++ .../Plugin_VideoOGL/Src/TextureConverter.cpp | 15 ++++++++ .../Plugin_VideoOGL/Src/VertexManager.cpp | 3 -- 6 files changed, 97 insertions(+), 24 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 7e3244f634..8c3c3f3fca 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -17,6 +17,7 @@ #include "Globals.h" #include "FramebufferManager.h" +#include "VertexShaderGen.h" #include "TextureConverter.h" #include "Render.h" @@ -324,6 +325,22 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, 1.0f, 0.0f }; + // disable all pointer, TODO: use VAO + glEnableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); + glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glClientActiveTexture(GL_TEXTURE1); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + for(int i=2; i<8; i++) { + glClientActiveTexture(GL_TEXTURE0 + i); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } glVertexPointer(2, GL_FLOAT, 0, vtx1); glClientActiveTexture(GL_TEXTURE0); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index 0cbf878799..14035c0634 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -27,8 +27,9 @@ #define COMPILED_CODE_SIZE 4096 -// TODO: this guy is never initialized -u32 s_prevcomponents; // previous state set +// TODO: Use this again for performance, but without VAO we never know exactly the last configuration +static u32 s_prevcomponents; // previous state set + /* #ifdef _WIN32 #ifdef _M_IX86 @@ -64,7 +65,6 @@ public: virtual void Initialize(const PortableVertexDeclaration &_vtx_decl); virtual void SetupVertexPointers(); - virtual void EnableComponents(u32 components); }; namespace OGL @@ -219,34 +219,32 @@ void GLVertexFormat::SetupVertexPointers() { glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.posmtx_offset)); } #endif -} -void GLVertexFormat::EnableComponents(u32 components) -{ - if (s_prevcomponents != components) +// if (s_prevcomponents != m_components) { - VertexManager::Flush(); + // vertices + glEnableClientState(GL_VERTEX_ARRAY); // matrices - if ((components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) +// if ((m_components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) { - if (components & VB_HAS_POSMTXIDX) + if (m_components & VB_HAS_POSMTXIDX) glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB); else glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); } // normals - if ((components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) +// if ((m_components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) { - if (components & VB_HAS_NRM0) + if (m_components & VB_HAS_NRM0) glEnableClientState(GL_NORMAL_ARRAY); else glDisableClientState(GL_NORMAL_ARRAY); } - if ((components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) +// if ((m_components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) { - if (components & VB_HAS_NRM1) { + if (m_components & VB_HAS_NRM1) { glEnableVertexAttribArray(SHADER_NORM1_ATTRIB); glEnableVertexAttribArray(SHADER_NORM2_ATTRIB); } @@ -259,9 +257,9 @@ void GLVertexFormat::EnableComponents(u32 components) // color for (int i = 0; i < 2; ++i) { - if ((components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) +// if ((m_components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) { - if (components & (VB_HAS_COL0 << i)) + if (m_components & (VB_HAS_COL0 << i)) glEnableClientState(i ? GL_SECONDARY_COLOR_ARRAY : GL_COLOR_ARRAY); else glDisableClientState(i ? GL_SECONDARY_COLOR_ARRAY : GL_COLOR_ARRAY); @@ -271,12 +269,16 @@ void GLVertexFormat::EnableComponents(u32 components) // tex for (int i = 0; i < 8; ++i) { - if ((components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) +// if ((m_components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) { glClientActiveTexture(GL_TEXTURE0 + i); + if (m_components & (VB_HAS_UV0 << i)) + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + else + glDisableClientState(GL_TEXTURE_COORD_ARRAY); } } - s_prevcomponents = components; + s_prevcomponents = m_components; } } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index d912277150..3b7205867d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -474,7 +474,6 @@ Renderer::Renderer() glBlendColorEXT(0, 0, 0, 0.5f); glClearDepth(1.0f); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); // legacy multitexturing: select texture channel only. glActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0); @@ -578,6 +577,19 @@ void Renderer::DrawDebugInfo() RectPoints[a * 16 + 15] = y2; } + // disable all pointer, TODO: use VAO + glEnableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); + glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); + glEnableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + for(int i=0; i<8; i++) { + glClientActiveTexture(GL_TEXTURE0 + i); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } + glColorPointer (3, GL_FLOAT, 0, Colours); glVertexPointer(2, GL_FLOAT, 0, RectPoints); glDrawArrays(GL_LINE_STRIP, 0, stats.efb_regions.size() * 8); @@ -1159,14 +1171,29 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons 1.0f, 1.0f, 1.0f, 0.0f }; - + + // disable all pointer, TODO: use VAO + glEnableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); + glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + for(int i=1; i<8; i++) { + glClientActiveTexture(GL_TEXTURE0 + i); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } if (applyShader) { glClientActiveTexture(GL_TEXTURE1); glTexCoordPointer(2, GL_FLOAT, 0, tex2); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); } - + glVertexPointer(3, GL_FLOAT, 0, vtx1); glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 6827539ce8..5441a65901 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -319,6 +319,21 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo 1.f, 1.f }; + // disable all pointer, TODO: use VAO + glEnableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); + glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + for(int i=1; i<8; i++) { + glClientActiveTexture(GL_TEXTURE0 + i); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glVertexPointer(2, GL_FLOAT, 0, vtx1); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 86e4d09301..3159909789 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -228,6 +228,21 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar 1.f, -1.f }; + // disable all pointer, TODO: use VAO + glEnableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); + glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + for(int i=1; i<8; i++) { + glClientActiveTexture(GL_TEXTURE0 + i); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } + glClientActiveTexture(GL_TEXTURE0); glTexCoordPointer(2, GL_FLOAT, 0, tex1); glVertexPointer(2, GL_FLOAT, 0, vtx1); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 501c4969e5..3725d87add 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -64,9 +64,6 @@ VertexManager::VertexManager() // max_Index_size = MAXIBUFFERSIZE; // //GL_REPORT_ERRORD(); - - glEnableClientState(GL_VERTEX_ARRAY); - GL_REPORT_ERRORD(); } void VertexManager::CreateDeviceObjects() From 8b62be20253a282edc8308cd3ce541be5ecbbb70 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 7 Dec 2012 22:49:18 +0100 Subject: [PATCH 166/627] fix ShowEFBCopyRegions those fancy colors were the result of the usage of non-allocated heap Signed-off-by: Ryan Houdek --- Source/Core/VideoCommon/Src/BPFunctions.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 122 +++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index cddeae3000..b9a76ba7b6 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -236,7 +236,7 @@ bool GetConfig(const int &type) case CONFIG_DISABLEFOG: return g_ActiveConfig.bDisableFog; case CONFIG_SHOWEFBREGIONS: - return false; + return g_ActiveConfig.bShowEFBCopyRegions; default: PanicAlert("GetConfig Error: Unknown Config Type!"); return false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 3b7205867d..56991457e1 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -533,13 +533,15 @@ void Renderer::DrawDebugInfo() // Set Line Size glLineWidth(3.0f); - GLfloat *RectPoints = new GLfloat[stats.efb_regions.size() * 16]; - GLfloat *Colours = new GLfloat[stats.efb_regions.size() * 3]; + // 2*Coords + 3*Color + GLfloat *Vertices = new GLfloat[stats.efb_regions.size() * (2+3)*2*6]; // Draw EFB copy regions rectangles int a = 0; + GLfloat color[3] = {0.0f, 1.0f, 1.0f}; + for (std::vector::const_iterator it = stats.efb_regions.begin(); - it != stats.efb_regions.end(); ++it, ++a) + it != stats.efb_regions.end(); ++it) { GLfloat halfWidth = EFB_WIDTH / 2.0f; GLfloat halfHeight = EFB_HEIGHT / 2.0f; @@ -548,33 +550,88 @@ void Renderer::DrawDebugInfo() GLfloat x2 = (GLfloat) -1.0f + ((GLfloat)it->right / halfWidth); GLfloat y2 = (GLfloat) 1.0f - ((GLfloat)it->bottom / halfHeight); - Colours[a * 3] = 0.0f; - Colours[a * 3 + 1] = 1.0f; - Colours[a * 3 + 2] = 1.0f; - - RectPoints[a * 16] = x; - RectPoints[a * 16 + 1] = y; + Vertices[a++] = x; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; - RectPoints[a * 16 + 2] = x2; - RectPoints[a * 16 + 3] = y; + Vertices[a++] = x2; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; - RectPoints[a * 16 + 4] = x; - RectPoints[a * 16 + 5] = y2; - - RectPoints[a * 16 + 6] = x2; - RectPoints[a * 16 + 7] = y2; - - RectPoints[a * 16 + 8] = x; - RectPoints[a * 16 + 9] = y; - - RectPoints[a * 16 + 10] = x; - RectPoints[a * 16 + 11] = y2; - - RectPoints[a * 16 + 12] = x2; - RectPoints[a * 16 + 13] = y; - - RectPoints[a * 16 + 14] = x2; - RectPoints[a * 16 + 15] = y2; + + Vertices[a++] = x2; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + Vertices[a++] = x2; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + + Vertices[a++] = x2; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + Vertices[a++] = x; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + + Vertices[a++] = x; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + Vertices[a++] = x; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + + Vertices[a++] = x; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + Vertices[a++] = x2; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + + Vertices[a++] = x2; + Vertices[a++] = y; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + Vertices[a++] = x; + Vertices[a++] = y2; + Vertices[a++] = color[0]; + Vertices[a++] = color[1]; + Vertices[a++] = color[2]; + + // TO DO: build something nicer here + GLfloat temp = color[0]; + color[0] = color[1]; + color[1] = color[2]; + color[2] = temp; } // disable all pointer, TODO: use VAO @@ -590,11 +647,10 @@ void Renderer::DrawDebugInfo() glDisableClientState(GL_TEXTURE_COORD_ARRAY); } - glColorPointer (3, GL_FLOAT, 0, Colours); - glVertexPointer(2, GL_FLOAT, 0, RectPoints); - glDrawArrays(GL_LINE_STRIP, 0, stats.efb_regions.size() * 8); - delete[] RectPoints; - delete[] Colours; + glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, Vertices+2); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, Vertices); + glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); + delete[] Vertices; // Restore Line Size glLineWidth(lSize); From 6b3125728be4041e44cc2805e561737ac0d28375 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 7 Dec 2012 23:34:38 +0100 Subject: [PATCH 167/627] use vbo for ShowEFBCopyRegions Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 56991457e1..a282939dfb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -106,10 +106,10 @@ namespace OGL // Declarations and definitions // ---------------------------- -int s_fps=0; +static int s_fps = 0; +static GLuint s_ShowEFBCopyRegions_VBO = 0; - -RasterFont* s_pfont = NULL; +static RasterFont* s_pfont = NULL; // 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA. static int s_MSAASamples = 1; @@ -125,9 +125,9 @@ static std::thread scrshotThread; #endif // EFB cache related -const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. -const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up -const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; +static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. +static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up +static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; static std::vector s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR @@ -250,6 +250,7 @@ Renderer::Renderer() OSDInternalH = 0; s_fps=0; + s_ShowEFBCopyRegions_VBO = 0; s_blendMode = 0; InitFPSCounter(); @@ -452,6 +453,9 @@ Renderer::Renderer() cgGLSetDebugMode(GL_FALSE); #endif #endif + + // creating buffers + glGenBuffers(1, &s_ShowEFBCopyRegions_VBO); glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); @@ -489,6 +493,10 @@ Renderer::~Renderer() { g_Config.bRunning = false; UpdateActiveConfig(); + + glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO); + s_ShowEFBCopyRegions_VBO = 0; + delete s_pfont; s_pfont = 0; @@ -534,7 +542,9 @@ void Renderer::DrawDebugInfo() glLineWidth(3.0f); // 2*Coords + 3*Color - GLfloat *Vertices = new GLfloat[stats.efb_regions.size() * (2+3)*2*6]; + glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO); + glBufferData(GL_ARRAY_BUFFER, stats.efb_regions.size() * sizeof(GLfloat) * (2+3)*2*6, NULL, GL_STREAM_DRAW); + GLfloat *Vertices = (GLfloat*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); // Draw EFB copy regions rectangles int a = 0; @@ -633,6 +643,7 @@ void Renderer::DrawDebugInfo() color[1] = color[2]; color[2] = temp; } + glUnmapBuffer(GL_ARRAY_BUFFER); // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); @@ -647,13 +658,15 @@ void Renderer::DrawDebugInfo() glDisableClientState(GL_TEXTURE_COORD_ARRAY); } - glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, Vertices+2); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, Vertices); + glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, (GLfloat*)NULL+2); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, NULL); glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); - delete[] Vertices; // Restore Line Size glLineWidth(lSize); + + // disable buffer TODO: remove this, after everting is in vbo + glBindBuffer(GL_ARRAY_BUFFER, 0); // Clear stored regions stats.efb_regions.clear(); From d44228f1b7ec13db032ff558a6e3bc87e5789216 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Dec 2012 00:54:38 +0100 Subject: [PATCH 168/627] TextureCache::TCacheEntry::FromRenderTarget as vbo Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/TextureCache.cpp | 47 ++++++++++++------- .../Plugin_VideoOGL/Src/TextureCache.h | 1 + 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 5441a65901..30b67119df 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -57,6 +57,7 @@ namespace OGL { static u32 s_TempFramebuffer = 0; +static GLuint s_VBO = 0; static const GLint c_MinLinearFilter[8] = { GL_NEAREST, @@ -306,19 +307,20 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); GL_REPORT_ERRORD(); - GLfloat tex1[] = { - (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, - (GLfloat)targetSource.left, (GLfloat)targetSource.top, - (GLfloat)targetSource.right, (GLfloat)targetSource.top, - (GLfloat)targetSource.right, (GLfloat)targetSource.bottom - }; - GLfloat vtx1[] = { - -1.f, 1.f, - -1.f, -1.f, - 1.f, -1.f, - 1.f, 1.f + GLfloat vertices[] = { + -1.f, 1.f, + (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, + -1.f, -1.f, + (GLfloat)targetSource.left, (GLfloat)targetSource.top, + 1.f, -1.f, + (GLfloat)targetSource.right, (GLfloat)targetSource.top, + 1.f, 1.f, + (GLfloat)targetSource.right, (GLfloat)targetSource.bottom }; + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); @@ -335,9 +337,12 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo } glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(2, GL_FLOAT, 0, vtx1); + glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, 0); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // TODO: this should be removed if we use vbo everywhere + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); @@ -415,13 +420,21 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co (float)(1 << g_ActiveConfig.iMaxAnisotropy)); } +TextureCache::TextureCache() +{ + glGenBuffers(1, &s_VBO); +} + + TextureCache::~TextureCache() { - if (s_TempFramebuffer) + glDeleteBuffers(1, &s_VBO); + + if (s_TempFramebuffer) { - glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); - s_TempFramebuffer = 0; - } + glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); + s_TempFramebuffer = 0; + } } void TextureCache::DisableStage(unsigned int stage) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h index 30f44b797d..91245237d9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h @@ -32,6 +32,7 @@ namespace OGL class TextureCache : public ::TextureCache { public: + TextureCache(); static void DisableStage(unsigned int stage); private: From 8ea2ddbc5056bc25ba67329dc9b6be192fddafda Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Dec 2012 01:32:58 +0100 Subject: [PATCH 169/627] XFBSource::Draw in vbo Signed-off-by: Ryan Houdek --- .../Src/FramebufferManager.cpp | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 8c3c3f3fca..1f70c75d69 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -28,6 +28,8 @@ namespace OGL extern bool s_bHaveFramebufferBlit; // comes from Render.cpp. ugly. +static GLuint s_VBO = 0; + int FramebufferManager::m_targetWidth; int FramebufferManager::m_targetHeight; int FramebufferManager::m_msaaSamples; @@ -170,6 +172,8 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms // Create XFB framebuffer; targets will be created elsewhere. glGenFramebuffersEXT(1, &m_xfbFramebuffer); + + glGenBuffers(1, &s_VBO); // EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f glViewport(0, 0, m_targetWidth, m_targetHeight); @@ -182,6 +186,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms FramebufferManager::~FramebufferManager() { glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + glDeleteBuffers(1, &s_VBO); GLuint glObj[3]; @@ -306,25 +311,24 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - GLfloat vtx1[] = { + GLfloat vertices[] = { drawrc.left, drawrc.bottom, - drawrc.left, drawrc.top, - drawrc.right, drawrc.top, - drawrc.right, drawrc.bottom, - }; - GLfloat tex1[] = { // For TEXTURE0 sourcerc.left, sourcerc.bottom, - sourcerc.left, sourcerc.top, - sourcerc.right, sourcerc.top, - sourcerc.right, sourcerc.bottom - }; - GLfloat tex2[] = { // For TEXTURE1 0.0f, 0.0f, + drawrc.left, drawrc.top, + sourcerc.left, sourcerc.top, 0.0f, 1.0f, + drawrc.right, drawrc.top, + sourcerc.right, sourcerc.top, 1.0f, 1.0f, + drawrc.right, drawrc.bottom, + sourcerc.right, sourcerc.bottom, 1.0f, 0.0f }; + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); @@ -342,13 +346,15 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glDisableClientState(GL_TEXTURE_COORD_ARRAY); } - glVertexPointer(2, GL_FLOAT, 0, vtx1); + glVertexPointer(2, GL_FLOAT, 6*sizeof(GLfloat), NULL); glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+2); glClientActiveTexture(GL_TEXTURE1); - glTexCoordPointer(2, GL_FLOAT, 0, tex2); + glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + // TODO: this need to be removed in future + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); } From b41c06a9aca4c280af3bb81f3fb0a2f20a3ed6a7 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Dec 2012 01:48:15 +0100 Subject: [PATCH 170/627] EncodeToRamUsingShader in vbo Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 3159909789..02ddd8d42d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -57,6 +57,8 @@ static FRAGMENTSHADER s_yuyvToRgbProgram; const u32 NUM_ENCODING_PROGRAMS = 64; static FRAGMENTSHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS]; +static GLuint s_VBO = 0; + void CreateRgbToYuyvProgram() { // Output is BGRA because that is slightly faster than RGBA. @@ -140,6 +142,8 @@ FRAGMENTSHADER &GetOrCreateEncodingShader(u32 format) void Init() { glGenFramebuffersEXT(1, &s_texConvFrameBuffer); + + glGenBuffers(1, &s_VBO); glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); @@ -162,6 +166,7 @@ void Shutdown() glDeleteTextures(1, &s_srcTexture); glDeleteRenderbuffersEXT(1, &s_dstRenderBuffer); glDeleteFramebuffersEXT(1, &s_texConvFrameBuffer); + glDeleteBuffers(1, &s_VBO); s_rgbToYuyvProgram.Destroy(); s_yuyvToRgbProgram.Destroy(); @@ -215,18 +220,19 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar GL_REPORT_ERRORD(); - GLfloat tex1[] = { + GLfloat vertices[] = { + -1.f, -1.f, (float)sourceRc.left, (float)sourceRc.top, + -1.f, 1.f, (float)sourceRc.left, (float)sourceRc.bottom, + 1.f, 1.f, (float)sourceRc.right, (float)sourceRc.bottom, + 1.f, -1.f, (float)sourceRc.right, (float)sourceRc.top }; - GLfloat vtx1[] = { - -1.f, -1.f, - -1.f, 1.f, - 1.f, 1.f, - 1.f, -1.f - }; + + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); @@ -244,10 +250,13 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar } glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(2, GL_FLOAT, 0, vtx1); + glTexCoordPointer(2, GL_FLOAT, 4*sizeof(GLfloat), (GLfloat*)NULL + 2); + glVertexPointer(2, GL_FLOAT, 4*sizeof(GLfloat), NULL); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + // TODO: remove this + glBindBuffer(GL_ARRAY_BUFFER, 0); + GL_REPORT_ERRORD(); // .. and then read back the results. From bbcb442983857d79d318b9bf8e5019602734361f Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 8 Dec 2012 02:01:35 +0100 Subject: [PATCH 171/627] in the end, also Renderer::Swap in vbo two last draw-calls are missing: VertexManager::Draw (see Graphic_Update branch) RasterFont::printString (perhaps reimplement with an texture) Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a282939dfb..9350b4ca46 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -108,6 +108,7 @@ namespace OGL // ---------------------------- static int s_fps = 0; static GLuint s_ShowEFBCopyRegions_VBO = 0; +static GLuint s_Swap_VBO = 0; static RasterFont* s_pfont = NULL; @@ -251,6 +252,7 @@ Renderer::Renderer() s_fps=0; s_ShowEFBCopyRegions_VBO = 0; + s_Swap_VBO = 0; s_blendMode = 0; InitFPSCounter(); @@ -456,6 +458,7 @@ Renderer::Renderer() // creating buffers glGenBuffers(1, &s_ShowEFBCopyRegions_VBO); + glGenBuffers(1, &s_Swap_VBO); glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); @@ -495,6 +498,7 @@ Renderer::~Renderer() UpdateActiveConfig(); glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO); + glDeleteBuffers(1, &s_Swap_VBO); s_ShowEFBCopyRegions_VBO = 0; delete s_pfont; @@ -1217,29 +1221,26 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); // switch to the window backbuffer glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); - GLfloat vtx1[] = { - -1, -1, 1, - -1, 1, 1, - 1, 1, 1, - 1, -1, 1 - }; - GLfloat top = (GLfloat)targetRc.top; - GLfloat right = (GLfloat)targetRc.right; - GLfloat bottom = (GLfloat)targetRc.bottom; - GLfloat left = (GLfloat)targetRc.left; - - GLfloat tex1[] = { // For TEXTURE0 - left, bottom, - left, top, - right, top, - right, bottom - }; - GLfloat tex2[] = { // For TEXTURE1 + GLfloat vertices[] = { + -1.0f, -1.0f, 1.0f, + (GLfloat)targetRc.left, (GLfloat)targetRc.bottom, 0.0f, 0.0f, + + -1.0f, 1.0f, 1.0f, + (GLfloat)targetRc.left, (GLfloat)targetRc.top, 0.0f, 1.0f, + + 1.0f, 1.0f, 1.0f, + (GLfloat)targetRc.right, (GLfloat)targetRc.top, 1.0f, 1.0f, + + 1.0f, -1.0f, 1.0f, + (GLfloat)targetRc.right, (GLfloat)targetRc.bottom, 1.0f, 0.0f }; + + glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); + glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); @@ -1259,14 +1260,18 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (applyShader) { glClientActiveTexture(GL_TEXTURE1); - glTexCoordPointer(2, GL_FLOAT, 0, tex2); glEnableClientState(GL_TEXTURE_COORD_ARRAY); } - glVertexPointer(3, GL_FLOAT, 0, vtx1); + glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); + glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); + glClientActiveTexture(GL_TEXTURE1); + glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // TODO: also remove this + glBindBuffer(GL_ARRAY_BUFFER, 0); if(applyShader) PixelShaderCache::DisableShader(); From d0c4332d99b77d0869f4f9dc23a77452d0cbb381 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 9 Dec 2012 19:22:21 +0100 Subject: [PATCH 172/627] don't update vbo, if there are no changes in Renderer::Swap Signed-off-by: Ryan Houdek --- Source/Core/Common/Src/MathUtil.h | 2 + Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 51 ++++++++++++------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h index a6290ff602..c5f613ada1 100644 --- a/Source/Core/Common/Src/MathUtil.h +++ b/Source/Core/Common/Src/MathUtil.h @@ -117,6 +117,8 @@ struct Rectangle Rectangle(T theLeft, T theTop, T theRight, T theBottom) : left(theLeft), top(theTop), right(theRight), bottom(theBottom) { } + + bool operator==(const Rectangle& r) { return left==r.left && top==r.top && right==r.right && bottom==r.bottom; } T GetWidth() const { return abs(right - left); } T GetHeight() const { return abs(bottom - top); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 9350b4ca46..8df239700e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -109,6 +109,7 @@ namespace OGL static int s_fps = 0; static GLuint s_ShowEFBCopyRegions_VBO = 0; static GLuint s_Swap_VBO = 0; +static TargetRectangle s_old_targetRc; static RasterFont* s_pfont = NULL; @@ -254,6 +255,13 @@ Renderer::Renderer() s_ShowEFBCopyRegions_VBO = 0; s_Swap_VBO = 0; s_blendMode = 0; + + // should be invalid, so there will be an upload on the first call + s_old_targetRc.bottom = -1; + s_old_targetRc.top = -1; + s_old_targetRc.left = -1; + s_old_targetRc.right = -1; + InitFPSCounter(); @@ -1221,26 +1229,33 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); // switch to the window backbuffer glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); - GLfloat vertices[] = { - -1.0f, -1.0f, 1.0f, - (GLfloat)targetRc.left, (GLfloat)targetRc.bottom, - 0.0f, 0.0f, + if(!(s_old_targetRc == targetRc)) { + GLfloat vertices[] = { + -1.0f, -1.0f, 1.0f, + (GLfloat)targetRc.left, (GLfloat)targetRc.bottom, + 0.0f, 0.0f, + + -1.0f, 1.0f, 1.0f, + (GLfloat)targetRc.left, (GLfloat)targetRc.top, + 0.0f, 1.0f, + + 1.0f, 1.0f, 1.0f, + (GLfloat)targetRc.right, (GLfloat)targetRc.top, + 1.0f, 1.0f, + + 1.0f, -1.0f, 1.0f, + (GLfloat)targetRc.right, (GLfloat)targetRc.bottom, + 1.0f, 0.0f + }; - -1.0f, 1.0f, 1.0f, - (GLfloat)targetRc.left, (GLfloat)targetRc.top, - 0.0f, 1.0f, + glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); + glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - 1.0f, 1.0f, 1.0f, - (GLfloat)targetRc.right, (GLfloat)targetRc.top, - 1.0f, 1.0f, - - 1.0f, -1.0f, 1.0f, - (GLfloat)targetRc.right, (GLfloat)targetRc.bottom, - 1.0f, 0.0f - }; - - glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); - glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + s_old_targetRc = targetRc; + } else { + // TODO: remove this after switch to VAO + glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); + } // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); From 34b1451fbea2798f943be7c84f0677f95a81ed84 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 9 Dec 2012 20:30:29 +0100 Subject: [PATCH 173/627] cache vbos in TextureCache::TCacheEntry::FromRenderTarget Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 14 ++--- .../Plugin_VideoOGL/Src/TextureCache.cpp | 58 ++++++++++++++----- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 8df239700e..30907bde8b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -109,7 +109,7 @@ namespace OGL static int s_fps = 0; static GLuint s_ShowEFBCopyRegions_VBO = 0; static GLuint s_Swap_VBO = 0; -static TargetRectangle s_old_targetRc; +static TargetRectangle s_cached_targetRc; static RasterFont* s_pfont = NULL; @@ -257,10 +257,10 @@ Renderer::Renderer() s_blendMode = 0; // should be invalid, so there will be an upload on the first call - s_old_targetRc.bottom = -1; - s_old_targetRc.top = -1; - s_old_targetRc.left = -1; - s_old_targetRc.right = -1; + s_cached_targetRc.bottom = -1; + s_cached_targetRc.top = -1; + s_cached_targetRc.left = -1; + s_cached_targetRc.right = -1; InitFPSCounter(); @@ -1229,7 +1229,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); // switch to the window backbuffer glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); - if(!(s_old_targetRc == targetRc)) { + if(!( s_cached_targetRc == targetRc)) { GLfloat vertices[] = { -1.0f, -1.0f, 1.0f, (GLfloat)targetRc.left, (GLfloat)targetRc.bottom, @@ -1251,7 +1251,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - s_old_targetRc = targetRc; + s_cached_targetRc = targetRc; } else { // TODO: remove this after switch to VAO glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 30b67119df..6685d8a176 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -56,8 +56,13 @@ namespace OGL { +struct VBOCache { + GLuint vbo; + TargetRectangle targetSource; +}; +static std::map s_VBO; + static u32 s_TempFramebuffer = 0; -static GLuint s_VBO = 0; static const GLint c_MinLinearFilter[8] = { GL_NEAREST, @@ -305,21 +310,41 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo GL_REPORT_ERRORD(); TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); - GL_REPORT_ERRORD(); - GLfloat vertices[] = { - -1.f, 1.f, - (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, - -1.f, -1.f, - (GLfloat)targetSource.left, (GLfloat)targetSource.top, - 1.f, -1.f, - (GLfloat)targetSource.right, (GLfloat)targetSource.top, - 1.f, 1.f, - (GLfloat)targetSource.right, (GLfloat)targetSource.bottom - }; - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // should be unique enough, if not, vbo will "only" be uploaded to much + u32 targetSourceHash = targetSource.left<<24 | targetSource.top<<16 | targetSource.right<<8 | targetSource.bottom; + std::map::iterator vbo_it = s_VBO.find(targetSourceHash); + + if(vbo_it == s_VBO.end()) { + VBOCache item; + item.targetSource.bottom = -1; + item.targetSource.top = -1; + item.targetSource.left = -1; + item.targetSource.right = -1; + glGenBuffers(1, &item.vbo); + vbo_it = s_VBO.insert(std::pair(targetSourceHash, item)).first; + } + if(!(vbo_it->second.targetSource == targetSource)) { + GLfloat vertices[] = { + -1.f, 1.f, + (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, + -1.f, -1.f, + (GLfloat)targetSource.left, (GLfloat)targetSource.top, + 1.f, -1.f, + (GLfloat)targetSource.right, (GLfloat)targetSource.top, + 1.f, 1.f, + (GLfloat)targetSource.right, (GLfloat)targetSource.bottom + }; + + glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); + glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + + vbo_it->second.targetSource = targetSource; + } else { + // TODO: remove after switched to VAO + glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); + } // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); @@ -422,13 +447,14 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co TextureCache::TextureCache() { - glGenBuffers(1, &s_VBO); } TextureCache::~TextureCache() { - glDeleteBuffers(1, &s_VBO); + for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { + glGenBuffers(1, &it->second.vbo); + } if (s_TempFramebuffer) { From 1f1b32b663a93838a5560ba49e8ff4a2153be56e Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 9 Dec 2012 20:44:13 +0100 Subject: [PATCH 174/627] only update vbo on changes in XFBSource::Draw Signed-off-by: Ryan Houdek --- .../Src/FramebufferManager.cpp | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 1f70c75d69..7452e12a97 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -29,6 +29,8 @@ namespace OGL extern bool s_bHaveFramebufferBlit; // comes from Render.cpp. ugly. static GLuint s_VBO = 0; +static MathUtil::Rectangle s_cached_sourcerc; +static MathUtil::Rectangle s_cached_drawrc; int FramebufferManager::m_targetWidth; int FramebufferManager::m_targetHeight; @@ -56,6 +58,15 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms m_resolvedDepthTexture = 0; m_xfbFramebuffer = 0; + s_cached_sourcerc.bottom = -1; + s_cached_sourcerc.left = -1; + s_cached_sourcerc.right = -1; + s_cached_sourcerc.top = -1; + s_cached_drawrc.bottom = -1; + s_cached_drawrc.left = -1; + s_cached_drawrc.right = -1; + s_cached_drawrc.top = -1; + m_targetWidth = targetWidth; m_targetHeight = targetHeight; @@ -311,23 +322,32 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - GLfloat vertices[] = { - drawrc.left, drawrc.bottom, - sourcerc.left, sourcerc.bottom, - 0.0f, 0.0f, - drawrc.left, drawrc.top, - sourcerc.left, sourcerc.top, - 0.0f, 1.0f, - drawrc.right, drawrc.top, - sourcerc.right, sourcerc.top, - 1.0f, 1.0f, - drawrc.right, drawrc.bottom, - sourcerc.right, sourcerc.bottom, - 1.0f, 0.0f - }; - - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + if(!(s_cached_sourcerc == sourcerc) || !(s_cached_drawrc == drawrc)) { + GLfloat vertices[] = { + drawrc.left, drawrc.bottom, + sourcerc.left, sourcerc.bottom, + 0.0f, 0.0f, + drawrc.left, drawrc.top, + sourcerc.left, sourcerc.top, + 0.0f, 1.0f, + drawrc.right, drawrc.top, + sourcerc.right, sourcerc.top, + 1.0f, 1.0f, + drawrc.right, drawrc.bottom, + sourcerc.right, sourcerc.bottom, + 1.0f, 0.0f + }; + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + + s_cached_sourcerc = sourcerc; + s_cached_drawrc = drawrc; + } + else + { + // TODO: remove on VAO + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + } // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); From 5c8800968a0f8f08229ce4a59365ff9c66bc5a19 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 9 Dec 2012 20:56:58 +0100 Subject: [PATCH 175/627] also check for vbo updates in EncodeToRamUsingShader Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/TextureCache.cpp | 1 + .../Plugin_VideoOGL/Src/TextureConverter.cpp | 38 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 6685d8a176..95ddd80e94 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -455,6 +455,7 @@ TextureCache::~TextureCache() for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { glGenBuffers(1, &it->second.vbo); } + s_VBO.clear(); if (s_TempFramebuffer) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 02ddd8d42d..4dab390d09 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -58,6 +58,7 @@ const u32 NUM_ENCODING_PROGRAMS = 64; static FRAGMENTSHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS]; static GLuint s_VBO = 0; +static TargetRectangle s_cached_sourceRc; void CreateRgbToYuyvProgram() { @@ -144,6 +145,10 @@ void Init() glGenFramebuffersEXT(1, &s_texConvFrameBuffer); glGenBuffers(1, &s_VBO); + s_cached_sourceRc.top = -1; + s_cached_sourceRc.bottom = -1; + s_cached_sourceRc.left = -1; + s_cached_sourceRc.right = -1; glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); @@ -219,20 +224,25 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar PixelShaderCache::SetCurrentShader(shader.glprogid); GL_REPORT_ERRORD(); - - GLfloat vertices[] = { - -1.f, -1.f, - (float)sourceRc.left, (float)sourceRc.top, - -1.f, 1.f, - (float)sourceRc.left, (float)sourceRc.bottom, - 1.f, 1.f, - (float)sourceRc.right, (float)sourceRc.bottom, - 1.f, -1.f, - (float)sourceRc.right, (float)sourceRc.top - }; - - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + if(!(s_cached_sourceRc == sourceRc)) { + GLfloat vertices[] = { + -1.f, -1.f, + (float)sourceRc.left, (float)sourceRc.top, + -1.f, 1.f, + (float)sourceRc.left, (float)sourceRc.bottom, + 1.f, 1.f, + (float)sourceRc.right, (float)sourceRc.bottom, + 1.f, -1.f, + (float)sourceRc.right, (float)sourceRc.top + }; + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + + s_cached_sourceRc = sourceRc; + } else { + // TODO: remove + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + } // disable all pointer, TODO: use VAO glEnableClientState(GL_VERTEX_ARRAY); From c207422987a3f39032ee348fed4bde1b67a21fcc Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 9 Dec 2012 22:49:58 +0100 Subject: [PATCH 176/627] using of vao, warning: ARB_vertex_array_object is needed Signed-off-by: Ryan Houdek --- .gitignore | 1 + .../Src/FramebufferManager.cpp | 50 ++++----- .../Src/NativeVertexFormat.cpp | 4 + Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 93 +++++++--------- .../Plugin_VideoOGL/Src/TextureCache.cpp | 45 +++----- .../Plugin_VideoOGL/Src/TextureConverter.cpp | 105 ++++++++++-------- 6 files changed, 141 insertions(+), 157 deletions(-) diff --git a/.gitignore b/.gitignore index 3cc8a1d8a4..6eaaaf119a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ Source/Core/Common/Src/scmrev.h *.ipch .sconsign.dblite Externals/scons-local/* +*~ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 7452e12a97..9c66396226 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -29,6 +29,7 @@ namespace OGL extern bool s_bHaveFramebufferBlit; // comes from Render.cpp. ugly. static GLuint s_VBO = 0; +static GLuint s_VAO = 0; static MathUtil::Rectangle s_cached_sourcerc; static MathUtil::Rectangle s_cached_drawrc; @@ -184,7 +185,22 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms glGenFramebuffersEXT(1, &m_xfbFramebuffer); + // Generate VBO & VAO - and initialize the VAO for "Draw" glGenBuffers(1, &s_VBO); + glGenVertexArrays(1, &s_VAO); + glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBindVertexArray(s_VAO); + + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(2, GL_FLOAT, 6*sizeof(GLfloat), NULL); + + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+2); + + glClientActiveTexture(GL_TEXTURE1); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); // EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f glViewport(0, 0, m_targetWidth, m_targetHeight); @@ -198,6 +214,7 @@ FramebufferManager::~FramebufferManager() { glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); glDeleteBuffers(1, &s_VBO); + glDeleteVertexArrays(1, &s_VAO); GLuint glObj[3]; @@ -339,42 +356,13 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, }; glBindBuffer(GL_ARRAY_BUFFER, s_VBO); glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - + s_cached_sourcerc = sourcerc; s_cached_drawrc = drawrc; } - else - { - // TODO: remove on VAO - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - } - - // disable all pointer, TODO: use VAO - glEnableClientState(GL_VERTEX_ARRAY); - glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); - glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); - glDisableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_SECONDARY_COLOR_ARRAY); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glClientActiveTexture(GL_TEXTURE1); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - for(int i=2; i<8; i++) { - glClientActiveTexture(GL_TEXTURE0 + i); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } - glVertexPointer(2, GL_FLOAT, 6*sizeof(GLfloat), NULL); - glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+2); - glClientActiveTexture(GL_TEXTURE1); - glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); + glBindVertexArray(s_VAO); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this need to be removed in future - glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index 14035c0634..724212d208 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -187,6 +187,10 @@ void GLVertexFormat::SetupVertexPointers() { #ifdef USE_JIT ((void (*)())(void*)m_compiledCode)(); #else + // TODO: use this :-) + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + glVertexPointer(3, GL_FLOAT, vtx_decl.stride, VertexManager::s_pBaseBufferPointer); if (vtx_decl.num_normals >= 1) { glNormalPointer(VarToGL(vtx_decl.normal_gl_type), vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[0])); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 30907bde8b..d19cdfd41e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -108,7 +108,9 @@ namespace OGL // ---------------------------- static int s_fps = 0; static GLuint s_ShowEFBCopyRegions_VBO = 0; +static GLuint s_ShowEFBCopyRegions_VAO = 0; static GLuint s_Swap_VBO = 0; +static GLuint s_Swap_VAO[2]; static TargetRectangle s_cached_targetRc; static RasterFont* s_pfont = NULL; @@ -322,6 +324,13 @@ Renderer::Renderer() bSuccess = false; } + if (!GLEW_ARB_vertex_array_object) + { + ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" + "GPU: Does your video card support OpenGL 3.0?"); + bSuccess = false; + } + s_bHaveFramebufferBlit = strstr(ptoken, "GL_EXT_framebuffer_blit") != NULL; s_bHaveCoverageMSAA = strstr(ptoken, "GL_NV_framebuffer_multisample_coverage") != NULL; @@ -466,7 +475,33 @@ Renderer::Renderer() // creating buffers glGenBuffers(1, &s_ShowEFBCopyRegions_VBO); + glGenVertexArrays(1, &s_ShowEFBCopyRegions_VAO); + glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO); + glBindVertexArray( s_ShowEFBCopyRegions_VAO ); + glEnableClientState(GL_COLOR_ARRAY); + glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, (GLfloat*)NULL+2); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, NULL); + glGenBuffers(1, &s_Swap_VBO); + glGenVertexArrays(2, s_Swap_VAO); + glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); + glBindVertexArray(s_Swap_VAO[0]); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); + + glBindVertexArray(s_Swap_VAO[1]); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); + glClientActiveTexture(GL_TEXTURE1); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); @@ -506,7 +541,9 @@ Renderer::~Renderer() UpdateActiveConfig(); glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO); + glDeleteVertexArrays(1, &s_ShowEFBCopyRegions_VAO); glDeleteBuffers(1, &s_Swap_VBO); + glDeleteVertexArrays(2, s_Swap_VAO); s_ShowEFBCopyRegions_VBO = 0; delete s_pfont; @@ -657,28 +694,11 @@ void Renderer::DrawDebugInfo() } glUnmapBuffer(GL_ARRAY_BUFFER); - // disable all pointer, TODO: use VAO - glEnableClientState(GL_VERTEX_ARRAY); - glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); - glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); - glEnableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_SECONDARY_COLOR_ARRAY); - for(int i=0; i<8; i++) { - glClientActiveTexture(GL_TEXTURE0 + i); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } - - glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, (GLfloat*)NULL+2); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, NULL); + glBindVertexArray( s_ShowEFBCopyRegions_VAO ); glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); // Restore Line Size glLineWidth(lSize); - - // disable buffer TODO: remove this, after everting is in vbo - glBindBuffer(GL_ARRAY_BUFFER, 0); // Clear stored regions stats.efb_regions.clear(); @@ -1252,41 +1272,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); s_cached_targetRc = targetRc; - } else { - // TODO: remove this after switch to VAO - glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); - } - - // disable all pointer, TODO: use VAO - glEnableClientState(GL_VERTEX_ARRAY); - glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); - glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); - glDisableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_SECONDARY_COLOR_ARRAY); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - for(int i=1; i<8; i++) { - glClientActiveTexture(GL_TEXTURE0 + i); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } - - if (applyShader) - { - glClientActiveTexture(GL_TEXTURE1); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - } - - glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); - glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); - glClientActiveTexture(GL_TEXTURE1); - glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + } - // TODO: also remove this - glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(s_Swap_VAO[applyShader]); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); if(applyShader) PixelShaderCache::DisableShader(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 95ddd80e94..046ab4bcf2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -58,6 +58,7 @@ namespace OGL struct VBOCache { GLuint vbo; + GLuint vao; TargetRectangle targetSource; }; static std::map s_VBO; @@ -323,6 +324,18 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo item.targetSource.left = -1; item.targetSource.right = -1; glGenBuffers(1, &item.vbo); + glGenVertexArrays(1, &item.vao); + + glBindBuffer(GL_ARRAY_BUFFER, item.vbo); + glBindVertexArray(item.vao); + + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, 0); + + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2); + vbo_it = s_VBO.insert(std::pair(targetSourceHash, item)).first; } if(!(vbo_it->second.targetSource == targetSource)) { @@ -336,38 +349,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo 1.f, 1.f, (GLfloat)targetSource.right, (GLfloat)targetSource.bottom }; - + glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); vbo_it->second.targetSource = targetSource; - } else { - // TODO: remove after switched to VAO - glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); - } - - // disable all pointer, TODO: use VAO - glEnableClientState(GL_VERTEX_ARRAY); - glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); - glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); - glDisableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_SECONDARY_COLOR_ARRAY); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - for(int i=1; i<8; i++) { - glClientActiveTexture(GL_TEXTURE0 + i); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } + } - glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, 0); + glBindVertexArray(vbo_it->second.vao); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this should be removed if we use vbo everywhere - glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); @@ -453,7 +443,8 @@ TextureCache::TextureCache() TextureCache::~TextureCache() { for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { - glGenBuffers(1, &it->second.vbo); + glDeleteBuffers(1, &it->second.vbo); + glDeleteVertexArrays(1, &it->second.vao); } s_VBO.clear(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 4dab390d09..e2ebe65581 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -57,8 +57,13 @@ static FRAGMENTSHADER s_yuyvToRgbProgram; const u32 NUM_ENCODING_PROGRAMS = 64; static FRAGMENTSHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS]; -static GLuint s_VBO = 0; +static GLuint s_encode_VBO = 0; +static GLuint s_encode_VAO = 0; +static GLuint s_decode_VBO = 0; +static GLuint s_decode_VAO = 0; static TargetRectangle s_cached_sourceRc; +static int s_cached_srcWidth = 0; +static int s_cached_srcHeight = 0; void CreateRgbToYuyvProgram() { @@ -144,14 +149,37 @@ void Init() { glGenFramebuffersEXT(1, &s_texConvFrameBuffer); - glGenBuffers(1, &s_VBO); + glGenBuffers(1, &s_encode_VBO ); + glGenVertexArrays(1, &s_encode_VAO ); + glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); + glBindVertexArray( s_encode_VAO ); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(2, GL_FLOAT, 4*sizeof(GLfloat), NULL); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 4*sizeof(GLfloat), (GLfloat*)NULL + 2); s_cached_sourceRc.top = -1; s_cached_sourceRc.bottom = -1; s_cached_sourceRc.left = -1; s_cached_sourceRc.right = -1; + + glGenBuffers(1, &s_decode_VBO ); + glGenVertexArrays(1, &s_decode_VAO ); + glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); + glBindVertexArray( s_decode_VAO ); + s_cached_srcWidth = -1; + s_cached_srcHeight = -1; + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, NULL); + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL+2); + + glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); + glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, renderBufferWidth, renderBufferHeight); s_srcTextureWidth = 0; @@ -171,7 +199,10 @@ void Shutdown() glDeleteTextures(1, &s_srcTexture); glDeleteRenderbuffersEXT(1, &s_dstRenderBuffer); glDeleteFramebuffersEXT(1, &s_texConvFrameBuffer); - glDeleteBuffers(1, &s_VBO); + glDeleteBuffers(1, &s_encode_VBO ); + glDeleteVertexArrays(1, &s_encode_VAO ); + glDeleteBuffers(1, &s_decode_VBO ); + glDeleteVertexArrays(1, &s_decode_VAO ); s_rgbToYuyvProgram.Destroy(); s_yuyvToRgbProgram.Destroy(); @@ -235,38 +266,15 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar 1.f, -1.f, (float)sourceRc.right, (float)sourceRc.top }; - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); + glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); s_cached_sourceRc = sourceRc; - } else { - // TODO: remove - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - } + } - // disable all pointer, TODO: use VAO - glEnableClientState(GL_VERTEX_ARRAY); - glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableVertexAttribArray(SHADER_NORM1_ATTRIB); - glDisableVertexAttribArray(SHADER_NORM2_ATTRIB); - glDisableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_SECONDARY_COLOR_ARRAY); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - for(int i=1; i<8; i++) { - glClientActiveTexture(GL_TEXTURE0 + i); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } - - glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 4*sizeof(GLfloat), (GLfloat*)NULL + 2); - glVertexPointer(2, GL_FLOAT, 4*sizeof(GLfloat), NULL); + glBindVertexArray( s_encode_VAO ); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - // TODO: remove this - glBindBuffer(GL_ARRAY_BUFFER, 0); - GL_REPORT_ERRORD(); // .. and then read back the results. @@ -422,32 +430,35 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur PixelShaderCache::SetCurrentShader(s_yuyvToRgbProgram.glprogid); GL_REPORT_ERRORD(); - - GLfloat tex1[] = { - (float)srcFmtWidth, (float)srcHeight, - (float)srcFmtWidth, 0.f, - 0.f, 0.f, - 0.f, (float)srcHeight - }; - GLfloat vtx1[] = { - 1.f, -1.f, - 1.f, 1.f, - -1.f, 1.f, - -1.f, -1.f - }; - glClientActiveTexture(GL_TEXTURE0); - glTexCoordPointer(2, GL_FLOAT, 0, tex1); - glVertexPointer(2, GL_FLOAT, 0, vtx1); + if(s_cached_srcHeight != srcHeight || s_cached_srcWidth != srcWidth) { + GLfloat vertices[] = { + 1.f, -1.f, + (float)srcFmtWidth, (float)srcHeight, + 1.f, 1.f, + (float)srcFmtWidth, 0.f, + -1.f, 1.f, + 0.f, 0.f, + -1.f, -1.f, + 0.f, (float)srcHeight + }; + + glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); + glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat)*4*4, vertices, GL_STREAM_DRAW); + + s_cached_srcHeight = srcHeight; + s_cached_srcWidth = srcWidth; + } + + glBindVertexArray( s_decode_VAO ); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - GL_REPORT_ERRORD(); // reset state glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, 0, 0); - TextureCache::DisableStage(0); + TextureCache::DisableStage(0); VertexShaderManager::SetViewportChanged(); From 75dd48247f908aca7f3dbd945a7411edadbd318c Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 11 Dec 2012 12:37:08 +0100 Subject: [PATCH 177/627] initial release of new RasterFont without color support this new design will once create a texture for all chars. while rendering a string, a list of polygons (position on screen + texture) for this string is generated on the fly and print at once by glDrawArrays. atm, there is no support for colors, so everything will display white. Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/RasterFont.cpp | 196 ++++++++++-------- .../Plugins/Plugin_VideoOGL/Src/RasterFont.h | 17 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 7 +- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 5 +- 4 files changed, 120 insertions(+), 105 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index da53fae6d5..a5467c6e6a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -22,7 +22,13 @@ #include "RasterFont.h" // globals -const GLubyte rasters[][13] = { + +static const u32 char_width = 8; +static const u32 char_height = 13; +static const u32 char_offset = 32; +static const u32 char_count = 95; + +const u8 rasters[char_count][char_height] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, @@ -122,102 +128,122 @@ const GLubyte rasters[][13] = { RasterFont::RasterFont() { - // set GL modes - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - // create the raster font - fontOffset = glGenLists(128); - for (int i = 32; i < 127; i++) { - glNewList(i + fontOffset, GL_COMPILE); - glBitmap(8, 13, 0.0f, 2.0f, 10.0f, 0.0f, rasters[i - 32]); - glEndList(); + // generate the texture + glEnable(GL_TEXTURE_RECTANGLE); + glGenTextures(1, &texture); + glBindTexture(GL_TEXTURE_RECTANGLE, texture); + u32* texture_data = new u32[char_width*char_count*char_height]; + for(u32 y=0; y= TEMP_BUFFER_SIZE) - length = TEMP_BUFFER_SIZE - 1; - - // Sanitize string to avoid GL errors. - char *s2 = temp_buffer; - memcpy(s2, s, length); - s2[length] = 0; - for (int i = 0; i < length; i++) { - if (s2[i] < 32 || s2[i] > 126) - s2[i] = '!'; - } - - // go to the right spot - glRasterPos3d(x, y, z); - GL_REPORT_ERRORD(); - - glPushAttrib (GL_LIST_BIT); - glListBase(fontOffset); - glCallLists((GLsizei)strlen(s2), GL_UNSIGNED_BYTE, (GLubyte *) s2); - GL_REPORT_ERRORD(); - glPopAttrib(); - GL_REPORT_ERRORD(); -} - -void RasterFont::printCenteredString(const char *s, double y, int screen_width, double z) -{ - int length = (int)strlen(s); - int x = (int)(screen_width/2.0 - (length/2.0)*char_width); - printString(s, x, y, z); -} - -void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight) -{ - double x = start_x; - double y = start_y; - char temp[1024]; - char *t = temp; - while (*text) - { - if (*text == '\n') - { - *t = 0; - printString(temp, x, y, z); - y -= char_height * 2.0f / bbHeight; + return; // nothing to do + + glBindVertexArray(VAO); + glBindBuffer(GL_ARRAY_BUFFER, VBO); + glBufferData(GL_ARRAY_BUFFER, length*4*6*sizeof(GLfloat), NULL, GL_STREAM_DRAW); + GLfloat *vertices = (GLfloat*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + + int usage = 0; + GLfloat delta_x = 2*char_width/GLfloat(bbWidth); + GLfloat delta_y = 2*char_height/GLfloat(bbHeight); + GLfloat border_x = 1*2/GLfloat(bbWidth); + GLfloat border_y = 2*2/GLfloat(bbHeight); + + GLfloat x = start_x; + GLfloat y = start_y; + + for(int i=0; i= char_count+char_offset) continue; + + vertices[usage++] = x; + vertices[usage++] = y; + vertices[usage++] = (c-char_offset)*char_width; + vertices[usage++] = 0; + + vertices[usage++] = x+delta_x; + vertices[usage++] = y; + vertices[usage++] = (c-char_offset+1)*char_width; + vertices[usage++] = 0; + + vertices[usage++] = x+delta_x; + vertices[usage++] = y+delta_y; + vertices[usage++] = (c-char_offset+1)*char_width; + vertices[usage++] = char_height; + + vertices[usage++] = x; + vertices[usage++] = y; + vertices[usage++] = (c-char_offset)*char_width; + vertices[usage++] = 0; + + vertices[usage++] = x+delta_x; + vertices[usage++] = y+delta_y; + vertices[usage++] = (c-char_offset+1)*char_width; + vertices[usage++] = char_height; + + vertices[usage++] = x; + vertices[usage++] = y+delta_y; + vertices[usage++] = (c-char_offset)*char_width; + vertices[usage++] = char_height; + + x += delta_x + border_x; } + glUnmapBuffer(GL_ARRAY_BUFFER); + + // no printable char, so also nothing to do + if(!usage) return; - // ???? - if (t != text) - { - *t = 0; - printString(temp, x, y, z); - } + glEnable(GL_BLEND); + glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_RECTANGLE, texture); + glEnable(GL_TEXTURE_RECTANGLE); + glDrawArrays(GL_TRIANGLES, 0, usage/4); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h index 3ebc684dd0..e1cd8b87b9 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h @@ -23,20 +23,13 @@ public: RasterFont(); ~RasterFont(void); static int debug; - - // some useful constants - enum {char_width = 10}; - enum {char_height = 15}; - - // and the happy helper functions - void printString(const char *s, double x, double y, double z=0.0); - void printCenteredString(const char *s, double y, int screen_width, double z=0.0); - void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight); + void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight, u32 color); private: - int fontOffset; - char *temp_buffer; - enum {TEMP_BUFFER_SIZE = 64 * 1024}; + + u32 VBO; + u32 VAO; + u32 texture; }; #endif // _RASTERFONT_H_ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index d19cdfd41e..b1191e383c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -722,14 +722,11 @@ void Renderer::RenderText(const char *text, int left, int top, u32 color) { const int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); const int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); - - glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, - ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); - + s_pfont->printMultilineText(text, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight); + 0, nBackbufferWidth, nBackbufferHeight, color); GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3923ed0840..0fefa16a93 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -101,12 +101,11 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); - glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, - ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); + s_pfont->printMultilineText(pstr, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight); + 0, nBackbufferWidth, nBackbufferHeight, color); } void SWRenderer::DrawDebugText() From 23a3336f9a545e88dd7e5f2b96d363c61f9004be Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 11 Dec 2012 17:25:53 +0100 Subject: [PATCH 178/627] increase hash size to u64 Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 046ab4bcf2..94304f9c44 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -61,7 +61,7 @@ struct VBOCache { GLuint vao; TargetRectangle targetSource; }; -static std::map s_VBO; +static std::map s_VBO; static u32 s_TempFramebuffer = 0; @@ -314,8 +314,8 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo GL_REPORT_ERRORD(); // should be unique enough, if not, vbo will "only" be uploaded to much - u32 targetSourceHash = targetSource.left<<24 | targetSource.top<<16 | targetSource.right<<8 | targetSource.bottom; - std::map::iterator vbo_it = s_VBO.find(targetSourceHash); + u64 targetSourceHash = u64(targetSource.left)<<48 | u64(targetSource.top)<<32 | u64(targetSource.right)<<16 | u64(targetSource.bottom); + std::map::iterator vbo_it = s_VBO.find(targetSourceHash); if(vbo_it == s_VBO.end()) { VBOCache item; @@ -336,7 +336,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo glEnableClientState(GL_TEXTURE_COORD_ARRAY); glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2); - vbo_it = s_VBO.insert(std::pair(targetSourceHash, item)).first; + vbo_it = s_VBO.insert(std::pair(targetSourceHash, item)).first; } if(!(vbo_it->second.targetSource == targetSource)) { GLfloat vertices[] = { @@ -442,7 +442,7 @@ TextureCache::TextureCache() TextureCache::~TextureCache() { - for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { + for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { glDeleteBuffers(1, &it->second.vbo); glDeleteVertexArrays(1, &it->second.vao); } From 1bd21f44b28858d5d891b386e6bfb47df9c885a4 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 11 Dec 2012 22:08:53 +0100 Subject: [PATCH 179/627] custom shader for RasterFont, fix color support OpenGL2.0 compatible Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/RasterFont.cpp | 65 ++++++++++++++++--- .../Plugins/Plugin_VideoOGL/Src/RasterFont.h | 3 + 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index a5467c6e6a..ba0135146f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -126,6 +126,23 @@ const u8 rasters[char_count][char_height] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} }; +static const char *s_vertex_shader = + "attribute vec2 vertexPosition;\n" + "attribute vec2 texturePosition;\n" + "varying vec2 tpos;\n" + "void main(void) {\n" + " gl_Position = vec4(vertexPosition,0,1);\n" + " tpos = texturePosition;\n" + "}\n"; + +static const char *s_fragment_shader = + "uniform sampler2DRect textureSampler;\n" + "uniform vec4 color;\n" + "varying vec2 tpos;\n" + "void main(void) {\n" + " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" + "}\n"; + RasterFont::RasterFont() { // generate the texture @@ -149,12 +166,35 @@ RasterFont::RasterFont() glGenVertexArrays(1, &VAO); glBindBuffer(GL_ARRAY_BUFFER, VBO); glBindVertexArray(VAO); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, NULL); - glEnable(GL_TEXTURE_RECTANGLE); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL+2); + glEnableVertexAttribArray(0); // vertexPosition + glVertexAttribPointer(0, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL); + glEnableVertexAttribArray(1); // texturePosition + glVertexAttribPointer(1, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2); + + // generate shader + GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER); + GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER); + shader_program = glCreateProgram(); + + glShaderSource(vertex_shader, 1, &s_vertex_shader, NULL); + glCompileShader(vertex_shader); + glShaderSource(fragment_shader, 1, &s_fragment_shader, NULL); + glCompileShader(fragment_shader); + glAttachShader(shader_program, vertex_shader); + glAttachShader(shader_program, fragment_shader); + glBindAttribLocation(shader_program, 0, "vertexPosition"); + glBindAttribLocation(shader_program, 1, "texturePosition"); + glLinkProgram(shader_program); + glDeleteShader(vertex_shader); + glDeleteShader(fragment_shader); + + // bound uniforms + glUseProgram(shader_program); + glUniform1i(glGetUniformLocation(shader_program,"textureSampler"), 0); // GL_TEXTURE0 + uniform_color_id = glGetUniformLocation(shader_program,"color"); + glUniform4f(uniform_color_id, 1, 1, 1, 1); + cached_color = -1; + glUseProgram(0); } RasterFont::~RasterFont() @@ -162,12 +202,11 @@ RasterFont::~RasterFont() glDeleteTextures(1, &texture); glDeleteBuffers(1, &VBO); glDeleteVertexArrays(1, &VAO); + glDeleteProgram(shader_program); } void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color) { - if(!(color & 0xffffff)) return; // color are not supported atm, so do not draw black shadows - int length = (int)strlen(text); if (!length) return; // nothing to do @@ -240,10 +279,20 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta // no printable char, so also nothing to do if(!usage) return; + glUseProgram(shader_program); + + if(color != cached_color) { + glUniform4f(uniform_color_id, ((color>>0)&0xff)/255.f,((color>>8)&0xff)/255.f,((color>>16)&0xff)/255.f,((color>>24)&0xff)/255.f); + cached_color = color; + } + + glDisable(GL_DEPTH_TEST); glEnable(GL_BLEND); glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_RECTANGLE, texture); glEnable(GL_TEXTURE_RECTANGLE); glDrawArrays(GL_TRIANGLES, 0, usage/4); + + glUseProgram(0); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h index e1cd8b87b9..fcbfdfff61 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h @@ -30,6 +30,9 @@ private: u32 VBO; u32 VAO; u32 texture; + u32 shader_program; + u32 uniform_color_id; + u32 cached_color; }; #endif // _RASTERFONT_H_ From 48812f7bf7defc334a9fb2c9503a589a250b5603 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 11 Dec 2012 22:46:02 +0100 Subject: [PATCH 180/627] update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index ba0135146f..6c98824341 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -127,18 +127,22 @@ const u8 rasters[char_count][char_height] = { }; static const char *s_vertex_shader = - "attribute vec2 vertexPosition;\n" - "attribute vec2 texturePosition;\n" - "varying vec2 tpos;\n" + "#version 330 core\n" + "layout(location = 0) in vec2 vertexPosition;\n" + "layout(location = 1) in vec2 texturePosition;\n" + "out vec2 tpos;\n" "void main(void) {\n" " gl_Position = vec4(vertexPosition,0,1);\n" " tpos = texturePosition;\n" "}\n"; static const char *s_fragment_shader = + "#version 330 core\n" + "#extension GL_ARB_texture_rectangle : enable\n" "uniform sampler2DRect textureSampler;\n" "uniform vec4 color;\n" - "varying vec2 tpos;\n" + "in vec2 tpos;\n" + "out vec4 gl_FragColor;\n" "void main(void) {\n" " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" "}\n"; @@ -182,8 +186,6 @@ RasterFont::RasterFont() glCompileShader(fragment_shader); glAttachShader(shader_program, vertex_shader); glAttachShader(shader_program, fragment_shader); - glBindAttribLocation(shader_program, 0, "vertexPosition"); - glBindAttribLocation(shader_program, 1, "texturePosition"); glLinkProgram(shader_program); glDeleteShader(vertex_shader); glDeleteShader(fragment_shader); From 61836f8c51e84083a98c3d852f572e6f03d28e8b Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 12 Dec 2012 10:40:03 +0100 Subject: [PATCH 181/627] helper for compiling glsl Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 64 +++++++++++++++++++ Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 6 ++ .../Plugin_VideoOGL/Src/RasterFont.cpp | 14 +--- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 5110023ee3..574ca33a05 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -629,6 +629,70 @@ void OpenGL_Shutdown() #endif } +GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) +{ + // generate objects + GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); + GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); + GLuint programID = glCreateProgram(); + GLint Result = GL_FALSE; + char stringBuffer[1024]; + GLsizei stringBufferUsage = 0; + + // compile vertex shader + glShaderSource(vertexShaderID, 1, &vertexShader, NULL); + glCompileShader(vertexShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader); + } else { + DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader); + } + bool shader_errors = !Result; +#endif + + // compile fragment shader + glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL); + glCompileShader(fragmentShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader); + } else { + DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader); + } + shader_errors |= !Result; +#endif + + // link them + glAttachShader(programID, vertexShaderID); + glAttachShader(programID, fragmentShaderID); + glLinkProgram(programID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetProgramiv(programID, GL_LINK_STATUS, &Result); + glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); + } else if(!Result && !shader_errors) { + ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); + } +#endif + + // cleanup + glDeleteShader(vertexShaderID); + glDeleteShader(fragmentShaderID); + + return programID; +} + + GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) { GLint err = glGetError(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 23c31a1bb7..61f3ef6085 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -96,6 +96,9 @@ u32 OpenGL_GetBackbufferHeight(); // Set things void OpenGL_SetWindowText(const char *text); +// Helpers +GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); + // Error reporting - use the convenient macros. void OpenGL_ReportARBProgramError(); GLuint OpenGL_ReportGLError(const char *function, const char *file, int line); @@ -126,4 +129,7 @@ extern CGprofile g_cgvProf, g_cgfProf; // use GLSL shaders across the whole pipeline. Yikes! //#define USE_DUAL_SOURCE_BLEND +// TODO: should be removed if we use glsl a lot +#define DEBUG_GLSL + #endif // _GLINIT_H_ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 6c98824341..29166e4bc0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -176,19 +176,7 @@ RasterFont::RasterFont() glVertexAttribPointer(1, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2); // generate shader - GLuint vertex_shader = glCreateShader(GL_VERTEX_SHADER); - GLuint fragment_shader = glCreateShader(GL_FRAGMENT_SHADER); - shader_program = glCreateProgram(); - - glShaderSource(vertex_shader, 1, &s_vertex_shader, NULL); - glCompileShader(vertex_shader); - glShaderSource(fragment_shader, 1, &s_fragment_shader, NULL); - glCompileShader(fragment_shader); - glAttachShader(shader_program, vertex_shader); - glAttachShader(shader_program, fragment_shader); - glLinkProgram(shader_program); - glDeleteShader(vertex_shader); - glDeleteShader(fragment_shader); + shader_program = OpenGL_CompileProgram(s_vertex_shader, s_fragment_shader); // bound uniforms glUseProgram(shader_program); From 09274e2483abd7ea0ae26daa32f9cf3f7a3e2b16 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 12 Dec 2012 16:57:00 +0100 Subject: [PATCH 182/627] Check texture params before updateing them Signed-off-by: Ryan Houdek --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 4 ---- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 9 ++++++++- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 29166e4bc0..e3575eef4e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -17,8 +17,6 @@ #include "GLUtil.h" -#include - #include "RasterFont.h" // globals @@ -150,7 +148,6 @@ static const char *s_fragment_shader = RasterFont::RasterFont() { // generate the texture - glEnable(GL_TEXTURE_RECTANGLE); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_RECTANGLE, texture); u32* texture_data = new u32[char_width*char_count*char_height]; @@ -281,7 +278,6 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_RECTANGLE, texture); - glEnable(GL_TEXTURE_RECTANGLE); glDrawArrays(GL_TRIANGLES, 0, usage/4); glUseProgram(0); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 94304f9c44..4f05ccb777 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -113,6 +113,8 @@ TextureCache::TCacheEntry::~TCacheEntry() TextureCache::TCacheEntry::TCacheEntry() { glGenTextures(1, &texture); + currmode.hex = 0; + currmode1.hex = 0; GL_REPORT_ERRORD(); } @@ -125,7 +127,9 @@ void TextureCache::TCacheEntry::Bind(unsigned int stage) // TODO: is this already done somewhere else? TexMode0 &tm0 = bpmem.tex[stage >> 2].texMode0[stage & 3]; TexMode1 &tm1 = bpmem.tex[stage >> 2].texMode1[stage & 3]; - SetTextureParameters(tm0, tm1); + + if(currmode.hex != tm0.hex || currmode1.hex != tm1.hex) + SetTextureParameters(tm0, tm1); } bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) @@ -404,6 +408,9 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1) { + currmode = newmode; + currmode1 = newmode1; + // TODO: not used anywhere TexMode0 mode = newmode; //mode1 = newmode1; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h index 91245237d9..dc560e098b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h @@ -67,6 +67,8 @@ private: private: void SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1); + TexMode0 currmode; + TexMode1 currmode1; }; ~TextureCache(); From 79a7ce4827de774bc0d454ad2e679f99e1da96fe Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 13 Dec 2012 15:48:42 +0100 Subject: [PATCH 183/627] move glBindBuffer and glBindVertexArray out of VertexManager Signed-off-by: Ryan Houdek --- .../Plugin_VideoOGL/Src/FramebufferManager.cpp | 12 +++++++++++- .../Plugin_VideoOGL/Src/NativeVertexFormat.cpp | 15 ++++++--------- .../Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 8 ++++++++ Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 15 +++++++++++++++ .../Plugin_VideoOGL/Src/TextureCache.cpp | 6 ++++++ .../Plugin_VideoOGL/Src/TextureConverter.cpp | 18 ++++++++++++++++-- 6 files changed, 62 insertions(+), 12 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 9c66396226..0220e54806 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -201,7 +201,11 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms glClientActiveTexture(GL_TEXTURE1); glEnableClientState(GL_TEXTURE_COORD_ARRAY); glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); - + + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + // EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f glViewport(0, 0, m_targetWidth, m_targetHeight); glScissor(0, 0, m_targetWidth, m_targetHeight); @@ -356,6 +360,9 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, }; glBindBuffer(GL_ARRAY_BUFFER, s_VBO); glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); s_cached_sourcerc = sourcerc; s_cached_drawrc = drawrc; @@ -363,6 +370,9 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindVertexArray(s_VAO); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // TODO: this after merging with graphic_update + glBindVertexArray(0); GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index 724212d208..a435be0dca 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -187,9 +187,6 @@ void GLVertexFormat::SetupVertexPointers() { #ifdef USE_JIT ((void (*)())(void*)m_compiledCode)(); #else - // TODO: use this :-) - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindVertexArray(0); glVertexPointer(3, GL_FLOAT, vtx_decl.stride, VertexManager::s_pBaseBufferPointer); if (vtx_decl.num_normals >= 1) { @@ -224,13 +221,13 @@ void GLVertexFormat::SetupVertexPointers() { } #endif -// if (s_prevcomponents != m_components) + if (s_prevcomponents != m_components) { // vertices glEnableClientState(GL_VERTEX_ARRAY); // matrices -// if ((m_components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) + if ((m_components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) { if (m_components & VB_HAS_POSMTXIDX) glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB); @@ -239,14 +236,14 @@ void GLVertexFormat::SetupVertexPointers() { } // normals -// if ((m_components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) + if ((m_components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) { if (m_components & VB_HAS_NRM0) glEnableClientState(GL_NORMAL_ARRAY); else glDisableClientState(GL_NORMAL_ARRAY); } -// if ((m_components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) + if ((m_components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) { if (m_components & VB_HAS_NRM1) { glEnableVertexAttribArray(SHADER_NORM1_ATTRIB); @@ -261,7 +258,7 @@ void GLVertexFormat::SetupVertexPointers() { // color for (int i = 0; i < 2; ++i) { -// if ((m_components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) + if ((m_components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) { if (m_components & (VB_HAS_COL0 << i)) glEnableClientState(i ? GL_SECONDARY_COLOR_ARRAY : GL_COLOR_ARRAY); @@ -273,7 +270,7 @@ void GLVertexFormat::SetupVertexPointers() { // tex for (int i = 0; i < 8; ++i) { -// if ((m_components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) + if ((m_components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) { glClientActiveTexture(GL_TEXTURE0 + i); if (m_components & (VB_HAS_UV0 << i)) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index e3575eef4e..13e0cb6210 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -182,6 +182,10 @@ RasterFont::RasterFont() glUniform4f(uniform_color_id, 1, 1, 1, 1); cached_color = -1; glUseProgram(0); + + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); } RasterFont::~RasterFont() @@ -280,5 +284,9 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta glBindTexture(GL_TEXTURE_RECTANGLE, texture); glDrawArrays(GL_TRIANGLES, 0, usage/4); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + glUseProgram(0); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index b1191e383c..59f61b6a60 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -503,6 +503,10 @@ Renderer::Renderer() glEnableClientState(GL_TEXTURE_COORD_ARRAY); glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); @@ -696,6 +700,10 @@ void Renderer::DrawDebugInfo() glBindVertexArray( s_ShowEFBCopyRegions_VAO ); glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); + + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); // Restore Line Size glLineWidth(lSize); @@ -1268,12 +1276,19 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + s_cached_targetRc = targetRc; } glBindVertexArray(s_Swap_VAO[applyShader]); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // TODO: this after merging with graphic_update + glBindVertexArray(0); + if(applyShader) PixelShaderCache::DisableShader(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 4f05ccb777..40dac17df6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -357,11 +357,17 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + vbo_it->second.targetSource = targetSource; } glBindVertexArray(vbo_it->second.vao); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // TODO: this after merging with graphic_update + glBindVertexArray(0); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index e2ebe65581..f45277f759 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -175,7 +175,9 @@ void Init() glEnableClientState(GL_TEXTURE_COORD_ARRAY); glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL+2); - + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); @@ -269,12 +271,18 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + s_cached_sourceRc = sourceRc; } glBindVertexArray( s_encode_VAO ); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + // TODO: this after merging with graphic_update + glBindVertexArray(0); + GL_REPORT_ERRORD(); // .. and then read back the results. @@ -446,13 +454,19 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat)*4*4, vertices, GL_STREAM_DRAW); + // TODO: this after merging with graphic_update + glBindBuffer(GL_ARRAY_BUFFER, 0); + s_cached_srcHeight = srcHeight; s_cached_srcWidth = srcWidth; } glBindVertexArray( s_decode_VAO ); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - + + // TODO: this after merging with graphic_update + glBindVertexArray(0); + GL_REPORT_ERRORD(); // reset state From 532fdada966c2e374216f162223c1059f16e1d2d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Dec 2012 11:37:26 -0600 Subject: [PATCH 184/627] Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e2c. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642. --- Data/Sys/Wii/setting-kor.txt | Bin 0 -> 256 bytes Source/Core/Common/Src/CommonPaths.h | 1 + Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Data/Sys/Wii/setting-kor.txt diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt new file mode 100644 index 0000000000000000000000000000000000000000..8c0485555498314da6e852416b9bf1cdce02578c GIT binary patch literal 256 zcmdnJY|W%ute3Ov-Zo#VH(vPsx$W%c+-~=y6Moo!+f=%1^}drg@2zD%Q)PYY-%}og z)$?~GPI)N#&wJs7|4CQhSgqN-_2iAm)63TLyI%S`!BAnzybmg`9&o-eeQ@!E-lShn MTi1X8$1tb?07>;b#{d8T literal 0 HcmV?d00001 diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index decf2aef97..430a0c0cd8 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -128,6 +128,7 @@ #define WII_EUR_SETTING "setting-eur.txt" #define WII_USA_SETTING "setting-usa.txt" #define WII_JAP_SETTING "setting-jpn.txt" +#define WII_KOR_SETTING "setting-kor.txt" #define GECKO_CODE_HANDLER "codehandler.bin" diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index 788b8c317c..bd789fa82b 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -187,8 +187,10 @@ bool CBoot::SetupWiiMemory(unsigned int _CountryCode) switch((DiscIO::IVolume::ECountry)_CountryCode) { case DiscIO::IVolume::COUNTRY_KOREA: + region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_KOR_SETTING; + break; case DiscIO::IVolume::COUNTRY_TAIWAN: - // TODO: Determine if Korea / Taiwan have their own specific settings. + // TODO: Determine if Taiwan has their own specific settings. case DiscIO::IVolume::COUNTRY_JAPAN: region_filename = File::GetSysDirectory() + WII_SYS_DIR + DIR_SEP + WII_JAP_SETTING; break; From 3b559d89ec39b4479bf97aa376f7e685997db0a3 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Dec 2012 11:47:12 -0600 Subject: [PATCH 185/627] If the HOME environment variable isn't set, fall back on to PWD. Closes 5584. --- Source/Core/Common/Src/FileUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 4650c6e1ba..691685e99d 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -649,7 +649,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; else - paths[D_USER_IDX] = std::string(getenv("HOME")) + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; + paths[D_USER_IDX] = std::string(getenv("HOME") ? getenv("HOME") : getenv("PWD")) + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; #endif INFO_LOG(COMMON, "GetUserPath: Setting user directory to %s:", paths[D_USER_IDX].c_str()); From 88b890824b6691c90e0cd5828b212a65f07443e7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Dec 2012 12:15:01 -0600 Subject: [PATCH 186/627] (CoreAudio) Retain volume value until initialization. Makes volume slider work when game isn't running. Fixes issue 5383. --- Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp | 8 ++++++++ Source/Core/AudioCommon/Src/CoreAudioSoundStream.h | 1 + 2 files changed, 9 insertions(+) diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp index d09bce85f9..f6d5d31bed 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp @@ -87,6 +87,13 @@ bool CoreAudioSound::Start() return false; } + err = AudioUnitSetParameter(audioUnit, + kHALOutputParam_Volume, + kAudioUnitParameterFlag_Output, 0, + m_volume / 100., 0); + if (err != noErr) + ERROR_LOG(AUDIO, "error setting volume"); + err = AudioUnitInitialize(audioUnit); if (err != noErr) { ERROR_LOG(AUDIO, "error initializing audiounit"); @@ -105,6 +112,7 @@ bool CoreAudioSound::Start() void CoreAudioSound::SetVolume(int volume) { OSStatus err; + m_volume = volume; err = AudioUnitSetParameter(audioUnit, kHALOutputParam_Volume, diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h index b7f7d96f53..581e4aabd8 100644 --- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h @@ -47,6 +47,7 @@ public: private: AudioUnit audioUnit; + int m_volume; static OSStatus callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, From 884006e4c8f43e7f4e6e67912f19c622b090be98 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Dec 2012 15:19:22 -0600 Subject: [PATCH 187/627] Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956. --- Source/Core/DolphinWX/Src/Frame.cpp | 6 +++--- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index da6c565ddf..8f68d738b1 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -514,14 +514,14 @@ void CFrame::OnActive(wxActivateEvent& event) m_RenderParent->SetFocus(); #endif - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) - m_RenderParent->SetCursor(cursor_transparent); + ::wxSetCursor(cursor_transparent); } else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxNullCursor); + ::wxSetCursor(wxNullCursor); } } event.Skip(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 98649be181..370f951807 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1055,7 +1055,7 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + ::wxSetCursor(wxNullCursor); } else { @@ -1075,7 +1075,7 @@ void CFrame::DoPause() Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - m_RenderParent->SetCursor(cursor_transparent); + ::wxSetCursor(cursor_transparent); } UpdateGUI(); } From 8838944cd360148b8aa30d7429b68596ca9e76c7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 15 Dec 2012 00:04:10 -0600 Subject: [PATCH 188/627] Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956." This reverts commit 884006e4c8f43e7f4e6e67912f19c622b090be98. --- Source/Core/DolphinWX/Src/Frame.cpp | 6 +++--- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 8f68d738b1..da6c565ddf 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -514,14 +514,14 @@ void CFrame::OnActive(wxActivateEvent& event) m_RenderParent->SetFocus(); #endif - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) - ::wxSetCursor(cursor_transparent); + m_RenderParent->SetCursor(cursor_transparent); } else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - ::wxSetCursor(wxNullCursor); + m_RenderParent->SetCursor(wxNullCursor); } } event.Skip(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 370f951807..98649be181 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1055,7 +1055,7 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - ::wxSetCursor(wxNullCursor); + m_RenderParent->SetCursor(wxCURSOR_ARROW); } else { @@ -1075,7 +1075,7 @@ void CFrame::DoPause() Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - ::wxSetCursor(cursor_transparent); + m_RenderParent->SetCursor(cursor_transparent); } UpdateGUI(); } From 351979795c552be522468fcd6df821f278e05fc7 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 16 Dec 2012 15:29:25 -0800 Subject: [PATCH 189/627] revert changes to banner background color --- Source/Core/Common/Src/ColorUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ColorUtil.cpp b/Source/Core/Common/Src/ColorUtil.cpp index 5e5143549a..52ffec0803 100644 --- a/Source/Core/Common/Src/ColorUtil.cpp +++ b/Source/Core/Common/Src/ColorUtil.cpp @@ -31,7 +31,7 @@ const int lut3to8[] = { 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF }; u32 Decode5A3(u16 val) { - const u32 bg_color = 0xFFFFFFFF; + const u32 bg_color = 0x00000000; int r, g, b, a; From d1a812231ee2b533434cbce9639f3e59413e1cd9 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 16 Dec 2012 21:32:14 -0600 Subject: [PATCH 190/627] Rework the way that windows mouse cursor hiding is done to use the built in wxWidgets methods. --- Source/Core/DolphinWX/Dolphin.vcxproj | 3 ++ Source/Core/DolphinWX/DolphinWX.rc | 1 + Source/Core/DolphinWX/Src/Frame.cpp | 52 ++++-------------------- Source/Core/DolphinWX/Src/FrameTools.cpp | 19 ++------- 4 files changed, 14 insertions(+), 61 deletions(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 72c40a3db4..dc6aa2affa 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -201,6 +201,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) + + C:\Archives\Dolphin-emu\dolphin-emu-git\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + diff --git a/Source/Core/DolphinWX/DolphinWX.rc b/Source/Core/DolphinWX/DolphinWX.rc index e9c06a8fa9..e0c095c885 100644 --- a/Source/Core/DolphinWX/DolphinWX.rc +++ b/Source/Core/DolphinWX/DolphinWX.rc @@ -1,4 +1,5 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +#include IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index da6c565ddf..99c4f65f1f 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -71,30 +71,7 @@ extern "C" { }; -// Windows functions. Setting the cursor with wxSetCursor() did not work in -// this instance. Probably because it's somehow reset from the WndProc() in -// the child window #ifdef _WIN32 -// Declare a blank icon and one that will be the normal cursor -HCURSOR hCursor = NULL, hCursorBlank = NULL; - -// Create the default cursor -void CreateCursor() -{ - hCursor = LoadCursor( NULL, IDC_ARROW ); -} - -void MSWSetCursor(bool Show) -{ - if(Show) - SetCursor(hCursor); - else - { - SetCursor(hCursorBlank); - //wxSetCursor(wxCursor(wxNullCursor)); - } -} - // I could not use FindItemByHWND() instead of this, it crashed on that occation I used it */ HWND MSWGetParent_(HWND Parent) { @@ -133,10 +110,11 @@ CPanel::CPanel( case WM_USER_SETCURSOR: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && - main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN) - MSWSetCursor(!SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor); + main_frame->RendererHasFocus() && Core::GetState() == Core::CORE_RUN && + SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) + SetCursor(wxCURSOR_BLANK); else - MSWSetCursor(true); + SetCursor(wxCURSOR_ARROW); break; case WIIMOTE_DISCONNECT: @@ -435,9 +413,7 @@ CFrame::CFrame(wxFrame* parent, // Commit m_Mgr->Update(); - // Create cursors #ifdef _WIN32 - CreateCursor(); SetToolTip(wxT("")); GetToolTip()->SetAutoPop(25000); #endif @@ -494,20 +470,6 @@ void CFrame::OnActive(wxActivateEvent& event) { if (event.GetActive() && event.GetEventObject() == m_RenderFrame) { - // 32x32, 8bpp b/w image - // We want all transparent, so we can just use the same buffer for - // the "image" as for the transparency mask - static const char cursor_data[32 * 32] = { 0 }; - -#ifdef __WXGTK__ - wxCursor cursor_transparent = wxCursor(cursor_data, 32, 32, 6, 14, - cursor_data, wxWHITE, wxBLACK); -#else - wxBitmap cursor_bitmap(cursor_data, 32, 32); - cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); - wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); -#endif - #ifdef __WXMSW__ ::SetFocus((HWND)m_RenderParent->GetHandle()); #else @@ -516,12 +478,12 @@ void CFrame::OnActive(wxActivateEvent& event) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) - m_RenderParent->SetCursor(cursor_transparent); + m_RenderParent->SetCursor(wxCURSOR_BLANK); } else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxNullCursor); + m_RenderParent->SetCursor(wxCURSOR_ARROW); } } event.Skip(); @@ -646,12 +608,12 @@ void CFrame::OnHostMessage(wxCommandEvent& event) } break; -#ifdef __WXGTK__ case WM_USER_CREATE: if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxCURSOR_BLANK); break; +#ifdef __WXGTK__ case IDM_PANIC: { wxString caption = event.GetString().BeforeFirst(':'); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 98649be181..d52427ed6e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -139,9 +139,9 @@ void CFrame::CreateMenu() emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING)); emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK); emulationMenu->Append(IDM_TASINPUT, _("TAS Input")); - emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); + emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie")); emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie); - emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); + emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter")); emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag); emulationMenu->Check(IDM_RECORDREADONLY, true); emulationMenu->AppendSeparator(); @@ -1059,23 +1059,10 @@ void CFrame::DoPause() } else { - // 32x32, 8bpp b/w image - // We want all transparent, so we can just use the same buffer for - // the "image" as for the transparency mask - static const char cursor_data[32 * 32] = { 0 }; -#ifdef __WXGTK__ - wxCursor cursor_transparent = wxCursor(cursor_data, 32, 32, 6, 14, - cursor_data, wxWHITE, wxBLACK); -#else - wxBitmap cursor_bitmap(cursor_data, 32, 32); - cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); - wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); -#endif - Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - m_RenderParent->SetCursor(cursor_transparent); + m_RenderParent->SetCursor(wxCURSOR_BLANK); } UpdateGUI(); } From a581c75a37c45073acc5dda0caacb95e39928ed5 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 16 Dec 2012 22:52:29 -0600 Subject: [PATCH 191/627] Make the resource include path relative. --- Source/Core/DolphinWX/Dolphin.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index dc6aa2affa..1ddf0a94cf 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -202,7 +202,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - C:\Archives\Dolphin-emu\dolphin-emu-git\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) @@ -390,4 +390,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + From d34fb84734f00074c7bcf0edf70f6e6fcdab450e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 16 Dec 2012 23:21:11 -0600 Subject: [PATCH 192/627] Add the resource inclusion to the other builds. --- Source/Core/DolphinWX/Dolphin.vcxproj | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 1ddf0a94cf..84295733da 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -155,6 +155,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) + + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + @@ -171,6 +174,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) + + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + @@ -202,7 +208,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) @@ -218,6 +224,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) + + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + @@ -390,4 +399,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - + \ No newline at end of file From 832a5a0b26a61e76f5b67cd6ec6f5b4945aafbe1 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 16 Dec 2012 23:39:05 -0600 Subject: [PATCH 193/627] Add the resource include in only one place for all builds. --- Source/Core/DolphinWX/Dolphin.vcxproj | 12 +----------- Source/VSProps/Base.props | 3 +++ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 84295733da..1556eb5687 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -155,9 +155,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - - ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) - @@ -174,9 +171,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - - ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) - @@ -208,7 +202,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) @@ -224,9 +217,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / Copying Data\* to $(TargetDir) - - ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) - @@ -399,4 +389,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 4bd98b9d70..bb2f7e6efa 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -20,6 +20,9 @@ true 0x00400000 + + ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories) + \ No newline at end of file From ff7041804c0974a858747a6e8febfcea544a5ecc Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 16 Dec 2012 23:55:22 -0600 Subject: [PATCH 194/627] Make sure that the wxWidgets manifest does not override the dolphin one. --- Source/Core/DolphinWX/DolphinWX.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/DolphinWX.rc b/Source/Core/DolphinWX/DolphinWX.rc index e0c095c885..960758e696 100644 --- a/Source/Core/DolphinWX/DolphinWX.rc +++ b/Source/Core/DolphinWX/DolphinWX.rc @@ -1,5 +1,6 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +#define wxUSE_NO_MANIFEST 1 #include IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" From 0a918782cfd430620776cb8f84699147b617a1d3 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Dec 2012 00:11:59 -0600 Subject: [PATCH 195/627] Reorder the inclusions to hopefully fix the icon issue. --- Source/Core/DolphinWX/DolphinWX.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/DolphinWX.rc b/Source/Core/DolphinWX/DolphinWX.rc index 960758e696..6a992a7e74 100644 --- a/Source/Core/DolphinWX/DolphinWX.rc +++ b/Source/Core/DolphinWX/DolphinWX.rc @@ -1,6 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" #define wxUSE_NO_MANIFEST 1 #include -IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" + From 4c7b63cf0e333a071498971be66183774ac20beb Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 17 Dec 2012 06:08:45 -0500 Subject: [PATCH 196/627] Save secondary list sorting. Allow sorting by platform ascending. Fixes issue 5774. --- Source/Core/Core/Src/ConfigManager.cpp | 4 +++- Source/Core/Core/Src/ConfigManager.h | 4 +++- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 26 ++++++++++++++++------ Source/Core/DolphinWX/Src/GameListCtrl.h | 3 ++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index bb0b13b717..180e6c981d 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -212,6 +212,7 @@ void SConfig::SaveSettings() ini.Set("GameList", "ListTaiwan", m_ListTaiwan); ini.Set("GameList", "ListUnknown", m_ListUnknown); ini.Set("GameList", "ListSort", m_ListSort); + ini.Set("GameList", "ListSortSecondary", m_ListSort2); // Core ini.Set("Core", "HLE_BS2", m_LocalCoreStartupParameter.bHLE_BS2); @@ -350,7 +351,8 @@ void SConfig::LoadSettings() ini.Get("GameList", "ListKorea", &m_ListKorea, true); ini.Get("GameList", "ListTaiwan", &m_ListTaiwan, true); ini.Get("GameList", "ListUnknown", &m_ListUnknown, true); - ini.Get("GameList", "ListSort", &m_ListSort, 2); + ini.Get("GameList", "ListSort", &m_ListSort, 3); + ini.Get("GameList", "ListSortSecondary",&m_ListSort2, 0); // Core ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 408461476b..cbe1b4d1cb 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -62,7 +62,6 @@ struct SConfig : NonCopyable bool m_InterfaceLogWindow; bool m_InterfaceLogConfigWindow; bool m_InterfaceConsole; - int m_ListSort; bool m_ListDrives; bool m_ListWad; @@ -76,6 +75,9 @@ struct SConfig : NonCopyable bool m_ListKorea; bool m_ListTaiwan; bool m_ListUnknown; + int m_ListSort; + int m_ListSort2; + std::string m_WirelessMac; bool m_PauseMovie; bool m_ShowLag; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index eedbf4e8dc..414138d41f 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -51,6 +51,7 @@ size_t CGameListCtrl::m_currentItem = 0; size_t CGameListCtrl::m_numberItem = 0; std::string CGameListCtrl::m_currentFilename; +bool sorted = false; static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2, long sortData = CGameListCtrl::COLUMN_TITLE) @@ -284,6 +285,7 @@ void CGameListCtrl::Update() InitBitmaps(); // add columns + InsertColumn(COLUMN_DUMMY,_T("")); InsertColumn(COLUMN_PLATFORM, _T("")); InsertColumn(COLUMN_BANNER, _("Banner")); InsertColumn(COLUMN_TITLE, _("Title")); @@ -303,6 +305,7 @@ void CGameListCtrl::Update() #endif // set initial sizes for columns + SetColumnWidth(COLUMN_DUMMY,0); SetColumnWidth(COLUMN_PLATFORM, 35 + platform_padding); SetColumnWidth(COLUMN_BANNER, 96 + platform_padding); SetColumnWidth(COLUMN_TITLE, 200 + platform_padding); @@ -320,9 +323,14 @@ void CGameListCtrl::Update() // Sort items by Title wxListEvent event; - event.m_col = SConfig::GetInstance().m_ListSort; last_column = 0; + event.m_col = SConfig::GetInstance().m_ListSort2; + last_column = 1; OnColumnClick(event); + event.m_col = SConfig::GetInstance().m_ListSort; + OnColumnClick(event); + sorted = true; + SetColumnWidth(COLUMN_SIZE, wxLIST_AUTOSIZE); } else @@ -414,9 +422,11 @@ void CGameListCtrl::InsertItemInReportView(long _Index) GameListItem& rISOFile = *m_ISOFiles[_Index]; m_gamePath.append(rISOFile.GetFileName() + '\n'); - // Insert a first row with the platform image, that will be used as the Index - long ItemIndex = InsertItem(_Index, wxEmptyString, - m_PlatformImageIndex[rISOFile.GetPlatform()]); + // Insert a first row with nothing in it, that will be used as the Index + long ItemIndex = InsertItem(_Index, wxEmptyString); + + // Insert the platform's image in the first (visible) column + SetItemColumnImage(_Index, COLUMN_PLATFORM, m_PlatformImageIndex[rISOFile.GetPlatform()]); if (rISOFile.GetImage().IsOk()) ImageIndex = m_imageListSmall->Add(rISOFile.GetImage()); @@ -702,17 +712,19 @@ void CGameListCtrl::OnColumnClick(wxListEvent& event) { int current_column = event.GetColumn(); - if(last_column == current_column) + if (last_column == current_column) { last_sort = -last_sort; } else { + if (sorted) + SConfig::GetInstance().m_ListSort2 = last_sort; last_column = current_column; last_sort = current_column; } - - SConfig::GetInstance().m_ListSort = last_sort; + if (sorted) + SConfig::GetInstance().m_ListSort = last_sort; caller = this; SortItems(wxListCompare, last_sort); } diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h index 274cfdb7ee..5d97c12724 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.h +++ b/Source/Core/DolphinWX/Src/GameListCtrl.h @@ -57,7 +57,8 @@ public: enum { - COLUMN_PLATFORM = 0, + COLUMN_DUMMY = 0, + COLUMN_PLATFORM, COLUMN_BANNER, COLUMN_TITLE, COLUMN_NOTES, From f1cc5c2ff9f41582bfa7c2cbab4ee0167cdb6451 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Dec 2012 08:33:42 -0600 Subject: [PATCH 197/627] Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not. --- Source/Core/DolphinWX/DolphinWX.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/DolphinWX.rc b/Source/Core/DolphinWX/DolphinWX.rc index 6a992a7e74..550e08c35a 100644 --- a/Source/Core/DolphinWX/DolphinWX.rc +++ b/Source/Core/DolphinWX/DolphinWX.rc @@ -2,6 +2,7 @@ // #include "resource.h" IDI_ICON1 ICON "..\\..\\..\\Installer\\Dolphin.ico" +"dolphin" ICON "..\\..\\..\\Installer\\Dolphin.ico" #define wxUSE_NO_MANIFEST 1 #include From 42acee04aa3423c47c537c5180b12f0c5cc5ff60 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Dec 2012 09:32:25 -0600 Subject: [PATCH 198/627] Add updated translations for Polish, Farsi/Parsi/Persian??, and Czech languages. --- Languages/po/cs.po | 224 +++-- Languages/po/fa.po | 2002 ++++++++++++++++++++++++++++---------------- Languages/po/pl.po | 298 +++---- 3 files changed, 1557 insertions(+), 967 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index ae5e829fb0..d2d536b891 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -1,20 +1,22 @@ # Translation of dolphin-emu.pot to Czech -# Copyright (C) 2003-2011 +# Copyright (C) 2003-2012 # This file is distributed under the same license as the dolphin-emu package. -# ZbynÄ›k Schwarz , 2011. +# ZbynÄ›k Schwarz , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-12-19 07:39+0100\n" +"PO-Revision-Date: 2012-12-12 12:07+0100\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" +"X-Poedit-Basepath: D:\\cygwin\\home\\Administrátor\\dolphin-emu\n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" @@ -47,7 +49,7 @@ msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format @@ -162,7 +164,7 @@ msgstr "&& A" #: Source/Core/DolphinWX/Src/FrameTools.cpp:309 msgid "&About..." -msgstr "O Progr&amu..." +msgstr "O progr&amu..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." @@ -202,15 +204,15 @@ msgstr "&Soubor" #: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" -msgstr "&Postup Snímkem" +msgstr "&Postup snímkem" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" -msgstr "&Celá Obrazovka" +msgstr "&Celá obrazovka" #: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" -msgstr "&Grafická Nastavení" +msgstr "&Grafická nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" @@ -218,7 +220,7 @@ msgstr "&NápovÄ›da" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" -msgstr "Nastavení &Klávesových Zkratek" +msgstr "Nastavení &klávesových zkratek" #: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" @@ -302,7 +304,7 @@ msgstr "&Wiki" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -322,7 +324,7 @@ msgstr "(vypnuto)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" -msgstr "" +msgstr "0x44" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" @@ -363,7 +365,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" -msgstr "" +msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:221 @@ -628,14 +630,12 @@ msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, ciso, gcz)" +msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" @@ -659,14 +659,13 @@ msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Umožní pÅ™epínání jistých možností pomocí horkých kláves 3, 4, 5, 6 a 7 " +"Umožní pÅ™epínání jistých možností pomocí klávesových zkratek 3, 4, 5 a 6 " "uvnitÅ™ okna emulace.\n" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." @@ -677,7 +676,7 @@ msgstr "Střídat Äasování Wiimote" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" -msgstr "" +msgstr "Analyzovat" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" @@ -750,7 +749,7 @@ msgstr "Audio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" -msgstr "Backend Zvuku:" +msgstr "Podpůrná vrstva zvuku:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" @@ -785,12 +784,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" -msgstr "" +msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "&Registry" +msgstr "Registr BP" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -798,12 +796,12 @@ msgstr "ZpÄ›t" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" -msgstr "Nastavení Backendu" +msgstr "Nastavení podpůrné vrstvy" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 msgid "Backend:" -msgstr "Backend:" +msgstr "Podpůrná vrstva:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 @@ -909,7 +907,7 @@ msgstr "TlaÄítka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" -msgstr "" +msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" @@ -921,7 +919,7 @@ msgstr "Kr-Stick" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" -msgstr "" +msgstr "CP reg" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" @@ -1079,11 +1077,11 @@ msgstr "Správce Cheatů" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Check Partition Integrity" -msgstr "" +msgstr "Zkontrolovat celistvost oddílu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." -msgstr "" +msgstr "Kontrolování celistvosti..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" @@ -1300,7 +1298,7 @@ msgstr "Nelze vytvoÅ™it %s" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." -msgstr "Nezle spustit backend %s." +msgstr "Nelze spustit podpůrnou vrstvu %s." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1442,7 +1440,7 @@ msgstr "ÄŒeÅ¡tina" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" @@ -1483,11 +1481,11 @@ msgstr "KoÅ™en DVD:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 msgid "DVDLowRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowRead - Fatální chyba: nelze Äíst ze svazku" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze pÅ™eÄíst svazek" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" @@ -1823,7 +1821,7 @@ msgid "EFB Copies" msgstr "EFB Kopie" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " @@ -1831,8 +1829,8 @@ msgid "" "driver." msgstr "" "CHYBA: Tato verze Dolphinu vyžaduje ovladaÄ TAP-Win32 verze alespoň %d.%d -- " -"Pokud jste nedávno VaÅ¡i instalaci Dolphin aktualizovali, je zapotÅ™ebí v " -"tomto bodÄ› restartovat, aby Windows uvidÄ›l nový ovladaÄ." +"Pokud jste nedávno vaÅ¡i instalaci Dolphin aktualizovali, je v tomto bodÄ› " +"pravdÄ›podobnÄ› tÅ™eba restartovat, aby Windows uvidÄ›l nový ovladaÄ." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -2227,7 +2225,7 @@ msgstr "Rozšíření" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" -msgstr "VnÄ›jší Vyr. Paměť Snímků" +msgstr "VnÄ›jší vyrovnávací paměť Snímků" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" @@ -2348,15 +2346,15 @@ msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"Nelze Äíst uložená data\n" -"(0xA000-)\n" -"Data v paměťové kartÄ› můžou být zkrácená" +"Nelze pÅ™eÄíst blok uložených dat %d\n" +"Data v paměťové kartÄ› můžou být zkrácena\n" +"Pozice souboru: %llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2427,7 +2425,7 @@ msgstr "Selhal zápis hlaviÄky souboru %d" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" -msgstr "" +msgstr "PerÅ¡tina" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" @@ -2442,6 +2440,8 @@ msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"závažná desynchronizace. PÅ™ehrávání ukonÄeno. (Chyba v PlayWiimote: %u != " +"%u, bajt %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" @@ -2499,11 +2499,11 @@ msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" -msgstr "" +msgstr "Najít další" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" -msgstr "" +msgstr "Najít pÅ™edchozí" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" @@ -2578,7 +2578,7 @@ msgstr "DopÅ™edu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "Nalezeno %d výsledků pro '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 @@ -2599,9 +2599,8 @@ msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 -#, fuzzy msgid "Frame Info" -msgstr "Snímek" +msgstr "Informace o snímku" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" @@ -2660,7 +2659,7 @@ msgstr "GCPad" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Game ID:" @@ -2688,7 +2687,7 @@ msgstr "Nastavení Hry" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -2713,7 +2712,7 @@ msgid "Gecko Codes" msgstr "Kódy Gecko" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2721,7 +2720,7 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" -"(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován.)" +"(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován. Zkuste použít )" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2949,14 +2948,14 @@ msgstr "" "VYPNUTO = Rychlé)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 -#, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" "Pokud nastavíte limit snímků vÄ›tší než plná rychlost hry (NTSC:60, PAL:50), " -"mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP, aby to bylo úÄinné." +"mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP (v závislosti na hÅ™e může " +"spravit klikání zvuku, ale také může způsobit neustálý hluk)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" @@ -3088,15 +3087,15 @@ msgstr "Instaluji WAD..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" -msgstr "" +msgstr "Chyba v kontrole celistvosti" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" -msgstr "" +msgstr "Kontrola celistvosti dokonÄena" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "Kontrola celistvosti dokonÄena. Nebyly nalezeny žádné chyby." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format @@ -3104,6 +3103,8 @@ msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"Kontrola celistvosti oddílu %d selhala. Váš výpis ISO je pravÄ›podobnÄ› " +"poÅ¡kozen nebo byl nesprávnÄ› opraven." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" @@ -3181,15 +3182,15 @@ msgstr "Neplatný soubor s nahrávkou" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "Neplatné parametry hledání (není vybrán žádný objekt)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" -msgstr "" +msgstr "Neplatný Å™etÄ›zec hledání (nelze pÅ™evést na Äíslo)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "Neplatný Å™etÄ›zec hledání (jsou podporovány pouze sudé délky Å™etÄ›zce)" #: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" @@ -3223,19 +3224,18 @@ msgid "KOREA" msgstr "KOREA" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 -#, fuzzy msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Skryje kurzor myÅ¡i, pokud je nad oknem emulace.\n" +"Okno hry bude vždy navrchu ostatních oken.\n" "\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." +"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" -msgstr "" +msgstr "Okno vždy navrchu" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 @@ -3411,24 +3411,23 @@ msgstr "Nastavení Záznamu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "Zaznamenat SzS do souboru" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy Záznamu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Zobrazí poÄet snímků vykreslených za sekundu jako měřítko rychlosti " -"emulace.\n" +"Zaznamenat poÄet snímků vykreslených za sekundu do User/Logs/fps.txt. Tuto " +"funkci využijte pro měření výkonu Dolphin\n" "\n" -"Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." +".Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" @@ -3612,11 +3611,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" -msgstr "" +msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" +"POZNÃMKA: Velikost proudu se neshoduje se\n" +"skuteÄnou délkou dat\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3753,7 +3754,7 @@ msgstr "Nebyl nalezen žádný plakát s názvem %s" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" -msgstr "" +msgstr "Žádný popis není dostupný" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" @@ -3850,7 +3851,7 @@ msgstr "Logická Adresa:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "Zobrazovat zprávy na obrazovce" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -3989,7 +3990,7 @@ msgstr "Pozastavit" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "Pozastavit na konci filmu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4415,9 +4416,8 @@ msgid "Scroll Lock" msgstr "Scroll Lock" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 -#, fuzzy msgid "Search" -msgstr "Hledání Cheatů" +msgstr "Hledat" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" @@ -4428,13 +4428,12 @@ msgid "Search Subfolders" msgstr "Hledat Podadresáře" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 -#, fuzzy msgid "Search current Object" -msgstr "Uložit souÄasnou perspektivu" +msgstr "Hledat v souÄasném objektu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" -msgstr "" +msgstr "Hledat hexadecimální hodnotu:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4539,7 +4538,7 @@ msgstr "" "Zvolí jaké bude vnitÅ™nÄ› grafické API použito.\n" "Direct3D 9 je vÄ›tÅ¡inou nejrychlejší. OpenGL je ale nejpÅ™esnÄ›jší. Direct3D 11 " "je nÄ›kde mezi nimi.\n" -"Nezapomeňte, že backendy Direct3D jsou dostupné pouze ve Windows.\n" +"Nezapomeňte, že podpůrné vrstvy Direct3D jsou dostupné pouze ve Windows.\n" "\n" "Pokud si nejste jisti, použijte Direct3D 9" @@ -4715,9 +4714,8 @@ msgid "Show first block" msgstr "Zobrazit první blok" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Zobrazit komentář uložení" +msgstr "Zobrazit poÄítadlo zpoždÄ›ní" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4725,6 +4723,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Zobrazit zprávy v oblasti obrazovky emulace.\n" +"Tyto zprávy zahrnují zápisy do paměťových karet, podpůrné vrstvy videa a " +"informace o CPU a ÄiÅ¡tÄ›ní mezipamÄ›ti JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -4850,7 +4851,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" "Softwarové vykreslování je řádovÄ› pomalejší, než pÅ™i použití ostatních " -"backendů.\n" +"podpůrných vrstev.\n" "Je užiteÄné pouze pro úÄely ladÄ›ní.\n" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." @@ -4862,7 +4863,7 @@ msgstr "Nastavení Zvuku" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." -msgstr "Zvukový backend %s je neplatný." +msgstr "Podpůrná vrstva zvuku %s je neplatná." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format @@ -5110,7 +5111,6 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5120,7 +5120,7 @@ msgstr "" "Čím bezpeÄnÄ›jší toto bude, tím bude ménÄ› pravdÄ›podobné, že emulátoru budou " "chybÄ›t jakékoliv aktualizace textur z RAM.\n" "\n" -"Pokud si nejste jisti, použijte druhou nejrychlejší hodnotu zprava." +"Pokud si nejste jisti, použijte hodnotu zcela vpravo." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 msgid "The save you are trying to copy has an invalid file size" @@ -5312,9 +5312,9 @@ msgid "UNKNOWN" msgstr "NEZNÃMÃ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 -#, fuzzy, c-format +#, c-format msgid "UNKNOWN_%02X" -msgstr "NEZNÃMÃ" +msgstr "NEZNÃMÉ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5350,7 +5350,7 @@ msgstr "Vrátit zpÄ›t Nahrání Stavu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "NeoÄekávané volání 0x80? UkonÄování..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" @@ -5476,9 +5476,8 @@ msgid "WAD installation failed: error creating %s" msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 -#, fuzzy msgid "WAD installation failed: error creating ticket" -msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" +msgstr "Instalace WAD selhala: chyba pÅ™i vytváření lístku" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -5699,9 +5698,8 @@ msgid "Write to Console" msgstr "Zapsat do Konzole" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 -#, fuzzy msgid "Write to Debugger" -msgstr "Zapsat do Souboru" +msgstr "Zapsat do LadiÄe" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" @@ -5728,7 +5726,7 @@ msgstr "XAudio2 vytvoÅ™ení hlavního hlasu selhalo: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5911,6 +5909,27 @@ msgstr "Korekce zNear:" msgid "| OR" msgstr "| NEBO" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "UkonÄit Dolphin s emulátorem" + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" + +#~ msgid "Opens the debugger" +#~ msgstr "Otevřít ladící program" + +#~ msgid "Opens the logger" +#~ msgstr "OtevÅ™e protokol" + +#~ msgid "Show this help message" +#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" + +#~ msgid "Specify a video backend" +#~ msgstr "UrÄit backend videa" + #~ msgid "(Default)" #~ msgstr "(Výchozí)" @@ -6147,9 +6166,6 @@ msgstr "| NEBO" #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" -#~ msgid "Exit Dolphin with emulator" -#~ msgstr "UkonÄit Dolphin s emulátorem" - #~ msgid "Failed to compile ps %s" #~ msgstr "Nelze zkompilovat ps %s" @@ -6250,12 +6266,6 @@ msgstr "| NEBO" #~ "Nahrání původních mipmap je správnÄ›jší chování, ale může také snížit " #~ "výkon (Váš užitek se ale může mÄ›nit)." -#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" - -#~ msgid "Low level (LLE) or high level (HLE) audio" -#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" - #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Mixér: Nepodporovaná vzorkovací frekvence." @@ -6272,12 +6282,6 @@ msgstr "| NEBO" #~ msgid "OK" #~ msgstr "OK" -#~ msgid "Opens the debugger" -#~ msgstr "Otevřít ladící program" - -#~ msgid "Opens the logger" -#~ msgstr "OtevÅ™e protokol" - #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6342,9 +6346,6 @@ msgstr "| NEBO" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zobrazit poÄet snímků vykreslených za sekundu." -#~ msgid "Show this help message" -#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" - #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6379,9 +6380,6 @@ msgstr "| NEBO" #~ "Ostatní volby jsou pevná rozliÅ¡ení pro volbu kvality obrazu nezávislé na " #~ "Vaší velikosti displeje." -#~ msgid "Specify a video backend" -#~ msgstr "UrÄit backend videa" - #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Spustit vykreslovaÄe v Celé obrazovce" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index 859f068173..1e78f5e761 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -8,19 +8,17 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-24 09:01-0500\n" -"Last-Translator: Hamed Khakbiz \n" -"Language-Team: Hamed Khakbiz \n" +"PO-Revision-Date: 2012-12-17 09:31-0600\n" +"Last-Translator: H.Khakbiz\n" +"Language-Team: H.Khakbiz\n" "Language: Farsi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Persian\n" -"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" -msgstr "(بسیار زیاد است برای نمایش دادن)" +msgstr "(برای نمایش دادن بسیار زیاد است)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:256 #: Source/Core/DolphinWX/Src/NetWindow.cpp:484 @@ -30,7 +28,7 @@ msgstr "بازی :" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "! NOT" -msgstr "! خیر" +msgstr "! نه" #: Source/Core/Core/Src/HW/GCMemcard.cpp:70 #, c-format @@ -38,44 +36,48 @@ msgid "" "\"%s\" does not exist.\n" " Create a new 16MB Memcard?" msgstr "" +"\"%s\" وجود ندارد.\n" +"یک کارت حاÙظه Û±Û¶ مگا بایتی جدید ساخته شود؟" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" +"\"%s\" این یک Ùایل گیم کیوب/ÙˆÛŒ Ùاقد اعتبار است، یا این Ùایل آیزو گیم کیوب/ÙˆÛŒ " +"نیست." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format msgid "%1$sCopy%1$s" -msgstr "" +msgstr "%1$sÚ©Ù¾ÛŒ%1$s" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 #, c-format msgid "%d Hz" -msgstr "" +msgstr "%d Hz" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 -#, fuzzy, c-format +#, c-format msgid "%i connected" -msgstr "Wiimote متصل شد" +msgstr "%i ارتباط برقرار شده" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 #, c-format msgid "%s already exists, overwrite?" -msgstr "" +msgstr "%s وجود دارد، بازنویسی شود؟" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "" +msgstr "%s تمیز کارى آیزو با شکست مواجه شد. شاید Ùایل آیزو خراب است." #: Source/Core/Core/Src/HW/GCMemcard.cpp:95 #, c-format @@ -83,6 +85,8 @@ msgid "" "%s failed to load as a memorycard \n" " Card file size is invalid (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"حجم Ùایل کارت نامعتبر است (0x%x بایت)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:110 #, c-format @@ -90,6 +94,8 @@ msgid "" "%s failed to load as a memorycard \n" " Card size is invalid (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"حجم کارت حاÙظه نامعتبر است (0x%x بایت)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:90 #, c-format @@ -97,11 +103,13 @@ msgid "" "%s failed to load as a memorycard \n" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" +"%s بارگذاری بعنوان کارت حاÙظه با شکست مواجه شد \n" +"Ùایل به اندازه کاÙÛŒ بزرگ نیست Ú©Ù‡ یک Ùایل کارت حاÙظه معتبر باشد (0x%x بایت)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format msgid "%s failed to open" -msgstr "" +msgstr "%s بازکردن با شکست مواجه شد" #: Source/Core/Core/Src/DSP/DSPCore.cpp:97 #, c-format @@ -110,41 +118,44 @@ msgid "" "Would you like to stop now to fix the problem?\n" "If you select \"No\", audio will be garbled." msgstr "" +"%s دارای یک درهم‌ساز نا درست است.\n" +"آیا مایل هستید برابرسازی حالا متوق٠شود تا مشکل را اصلاح کنید؟اگر شما \"نه\" " +"را انتخاب کنید، صدا مغشوش خواهد شد." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:360 #, c-format msgid "%s is a 0 byte file" -msgstr "" +msgstr "%s یک Ùایل با حجم Û° بایت است" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:159 #, c-format msgid "%s is already compressed! Cannot compress it further." -msgstr "" +msgstr "%s Ùشرده شده است! توان Ùشرده سازی بیشتر را ندارد." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "" +msgstr "%s برای اسم Ùایل بسیار دراز است، حداکثر تعداد کاراکترها Û´Ûµ است" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format msgid "%sDelete%s" -msgstr "%sپاک کردن%s" +msgstr "%sحذÙ%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:198 #, c-format msgid "%sExport GCI%s" -msgstr "%sصادر کردن GCI%s" +msgstr "%sصادر کردن جی سی Ø¢ÛŒ%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:196 #, c-format msgid "%sImport GCI%s" -msgstr "%sوارد کردن GCI%s" +msgstr "%sوارد کردن جی سی Ø¢ÛŒ%s" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:776 #, c-format msgid "%u Free Blocks; %u Free Dir Entries" -msgstr "" +msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "&& AND" @@ -156,35 +167,35 @@ msgstr "&درباره..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&Boot from DVD Drive..." -msgstr "&بوت شدن از دی ÙˆÛŒ دی" +msgstr "&بوت شدن از درایو دی ÙˆÛŒ دی..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:245 msgid "&Breakpoints" -msgstr "&نقاط وقÙÙ‡" +msgstr "&نقاط انÙصال" #: Source/Core/DolphinWX/Src/FrameTools.cpp:124 msgid "&Browse for ISOs..." -msgstr "&جوستوجو برای Ùایلهای ISO" +msgstr "&مرور برای Ùایل های آیزو..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:206 msgid "&Cheats Manager" -msgstr "&مدریت کدهای تقلب" +msgstr "مدیریت کدهای &تقلب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "&DSP Settings" -msgstr "&تنظیمات صدا DSP" +msgstr "تنظیمات پردازشگر &صدای دلÙین" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 msgid "&Delete ISO..." -msgstr "&پاک کردن Ùایل ISO" +msgstr "&حذ٠آیزو..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "&Delete selected ISOs..." -msgstr "&پاک کردن Ùایل ISO انطخاب شده" +msgstr "&حذ٠آیزو های انتخاب شده..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:184 msgid "&Emulation" -msgstr "&شبیه سازی" +msgstr "&برابرسازی" #: Source/Core/DolphinWX/Src/FrameTools.cpp:127 msgid "&File" @@ -192,7 +203,7 @@ msgstr "&Ùایل" #: Source/Core/DolphinWX/Src/FrameTools.cpp:349 msgid "&Frame Advance" -msgstr "&Ùریم پیشرÙته" +msgstr "&پيشروى Ùریم" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" @@ -200,7 +211,7 @@ msgstr "&تمام صÙحه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" -msgstr "&تنظیمات گراÙیک" +msgstr "تنظیمات &گراÙیک" #: Source/Core/DolphinWX/Src/FrameTools.cpp:310 msgid "&Help" @@ -208,19 +219,19 @@ msgstr "&Ú©Ù…Ú©" #: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "&Hotkey Settings" -msgstr "&تنظیم شرت کاتها" +msgstr "تنظیم &شرت کاتها" #: Source/Core/DolphinWX/Src/FrameTools.cpp:247 msgid "&JIT" -msgstr "&JIT" +msgstr "&جیت" #: Source/Core/DolphinWX/Src/FrameTools.cpp:162 msgid "&Load State" -msgstr "&بارگیری حالت" +msgstr "&بارگذاری وضعیت" #: Source/Core/DolphinWX/Src/FrameTools.cpp:204 msgid "&Memcard Manager (GC)" -msgstr "&مدریت کارت حاÙظه (GC)" +msgstr "مدیر &کارت حاÙظه (گیم کیوب)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:246 msgid "&Memory" @@ -232,7 +243,7 @@ msgstr "&باز کردن..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:200 msgid "&Options" -msgstr "&اختیارات" +msgstr "&گزینه ها" #: Source/Core/DolphinWX/Src/FrameTools.cpp:338 msgid "&Pause" @@ -260,7 +271,7 @@ msgstr "ثبت کردن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:346 msgid "&Reset" -msgstr "&شروع دوباره" +msgstr "شروع &دوباره" #: Source/Core/DolphinWX/Src/FrameTools.cpp:248 msgid "&Sound" @@ -280,11 +291,11 @@ msgstr "&ویدیو" #: Source/Core/DolphinWX/Src/FrameTools.cpp:298 msgid "&View" -msgstr "&دیدن" +msgstr "&دیدگاه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:193 msgid "&Wiimote Settings" -msgstr "&تنظیمات Wiimote" +msgstr "تنظیمات &ویموت" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 msgid "&Wiki" @@ -292,15 +303,15 @@ msgstr "&ویکی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" -msgstr "" +msgstr "دورz+(-)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:53 msgid "(-)+zNear" -msgstr "" +msgstr "نزدیکz+(-)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:98 msgid "(UNKNOWN)" @@ -312,7 +323,7 @@ msgstr "(خاموش)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" -msgstr "" +msgstr "Û°xÛ´Û´" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" @@ -345,7 +356,7 @@ msgstr "<هیچ>" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 msgid "" -msgstr "<Ùشار کلید>" +msgstr "<تکمه Ùشارى>" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 msgid "" @@ -353,23 +364,25 @@ msgstr "<سیستم>" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" -msgstr "" +msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:221 msgid "A NetPlay window is already open!!" -msgstr "صÙحه NetPlay باز است!!" +msgstr "پنجره نت پلی از قبل باز است!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 msgid "A game is not currently running." -msgstr "بازی اجرا نشده است." +msgstr "بازی در حال حاضر اجرا نشده است." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 msgid "" "A supported bluetooth device was not found!\n" "(Only the Microsoft bluetooth stack is supported.)" msgstr "" +"دستگاه بلوتوث مورد پشتیبانی پیدا نشد!\n" +"(Ùقط نرم اÙزار پیاده سازی بلوتوث ماکروساÙت پشتیبانی میشود.)" #: Source/Core/DolphinWX/Src/NetWindow.cpp:92 msgid "" @@ -389,11 +402,27 @@ msgid "" "\n" "You must forward TCP port to host!!" msgstr "" +"اخطار:\n" +"\n" +"در حال حاضر نت پلی تنها زمانی به درستی کار خواهد کرد Ú©Ù‡ از تنظیمات زیر " +"استÙاده Ù…ÛŒ کند:\n" +"- پردازنده با دو هسته یا بیشتر [خاموش]\n" +"- دریچه صدا [خاموش]\n" +"- برابرسازی سطح بالای پردازشگر صدای دلÙین با \"Null Audio\" یا برابرسازی سطح " +"پائین پردازشگر صدای دلÙین\n" +"- تعداد دقیق کنترولر هایی Ú©Ù‡ استÙاده خواهند شد را به صورت دستی تنظیم کنید " +"[کنترولر استاندارد]\n" +"تمام بازیکنان باید سعی کنند Ú©Ù‡ از همان تنظیمات Ùˆ نسخه دلÙین استÙاده کنند.\n" +"تمام کارت های حاÙظه را از کار بیاندازید یا پیش از شروع آنها را به تمام " +"بازیکنان بÙرستید.\n" +"پشتیبانی ویموت اجرا نشده است.\n" +"\n" +"شما باید درگاه TCP را به میزبان ارسال کنید!!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "AM-Baseboard" -msgstr "" +msgstr "بÙرد٠مادر ای ام" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 @@ -406,15 +435,15 @@ msgstr "درباره دلÙین" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Acceleration" -msgstr "شتاب دهنده" +msgstr "شتاب" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Accuracy:" -msgstr "دقت" +msgstr "دقت:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "Accurate VBeam emulation" -msgstr "شبیه سازی دقیق ÙˆÛŒ-بیم" +msgstr "برابرسازی دقیق ÙˆÛŒ بیم" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" @@ -424,6 +453,11 @@ msgid "" "\n" "If unsure, check EFB to Texture instead." msgstr "" +"دقیقا Ú©Ù¾ÛŒ های ای ا٠بی را برابرسازی Ù…ÛŒ کند.\n" +"برخی از بازی ها برای اÙکت های گراÙیکی معین یا کارکرد بازی متکی به Ú©Ù¾ÛŒ های ای " +"ا٠بی اند.\n" +"اگر در این مورد اطمینان ندارید، به جای آن گزینه ای ا٠بی به باÙت اشیاء را " +"انتخاب کنید." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 @@ -439,12 +473,18 @@ msgid "" "Culprit Code:\n" "%s" msgstr "" +"خطای کدگشایی کد اکشن ریپلی:\n" +"بررسی بیت توازن (پریتی) با شکست مواجه شد\n" +"\n" +"کد خراب:\n" +"%s" #: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در اضاÙÙ‡ کردن کد (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format @@ -452,6 +492,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " "(%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر Ùˆ اسلاید کردن (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format @@ -459,6 +500,8 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " "Fill (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در پر کردن Ùˆ نوشتن حاÙظه " +"(%s)" #: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format @@ -466,46 +509,47 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Write To " "Pointer (%s)" msgstr "" +"خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در نوشتن به اشاره گر (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: مقدار نامعتبر (%08x) در Ú©Ù¾ÛŒ حاÙظه (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد مستر Ùˆ نوشتن در CCXXXXXX تکمیل نشده است (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" -msgstr "" +msgstr "خطای اکشن ریپلی: خط کد نامعتبر اکشن ریپلی: %s" #: Source/Core/Core/Src/ActionReplay.cpp:871 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد نامعلوم: سایز نامعتبر %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:944 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: الگوی کد عادی نامعتبر %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:895 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد عادی %i: کد Ùرعی نامعتبر %08x (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:837 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" -msgstr "" +msgstr "خطای اکشن ریپلی: کد عادی Û°: کد Ùرعی نامعتبر %08x (%s)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 msgid "Adapter:" -msgstr "آداپتور" +msgstr "آداپتور:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:76 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:75 @@ -544,6 +588,13 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" +"اضاÙÙ‡ کنید مقدار مشخص شده را به پارامتر zدور.\n" +"دو راه ابراز مقادیر ممیز شناور.\n" +"نمونه: مستقیما وارد کنید \"Û²Û°Û°\" یا \"Û°.Û°Û°Û°Û²\"ØŒ اثر تولید شده یکسان است، " +"مقدار بدست آمده \"Û°.Û°Û°Û°Û²\" خواهد بود.\n" +"مقادیر: (Û°-<+/-انتیجر) یا (Û°-<+/-FP [Û¶ شماره دقیق])\n" +"\n" +"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:52 msgid "" @@ -555,10 +606,17 @@ msgid "" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" +"اضاÙÙ‡ کنید مقدار مشخص شده را به پارامتر zنزدیک.\n" +"دو راه ابراز مقادیر ممیز شناور.\n" +"نمونه: مستقیما وارد کنید \"Û²Û°Û°\" یا \"Û°.Û°Û°Û°Û²\"ØŒ اثر تولید شده یکسان است، " +"مقدار بدست آمده \"Û°.Û°Û°Û°Û²\" خواهد بود.\n" +"مقادیر: (Û°-<+/-انتیجر) یا (Û°-<+/-FP [Û¶ شماره دقیق])\n" +"\n" +"توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" +msgstr "تنظیم Ùشار کنترل آنالوگ برای Ùعال کردن دکمه ها لازم است." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" @@ -570,32 +628,32 @@ msgstr "تنظیمات پیشرÙته" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "" +msgstr "همه Ùایل های گیم کیوب/ÙˆÛŒ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "" +msgstr "همه ایمیجهای گیم کیوب/ÙˆÛŒ (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" -msgstr "" +msgstr "همه Ùایل های گیم کیوب جی سی ام (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 msgid "All Save States (sav, s##)" -msgstr "" +msgstr "همه وضعیت های ذخیره (sav, s##)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" -msgstr "تمام اسناد Wii ISO" +msgstr "همه Ùایل های آیزو ÙˆÛŒ (iso)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" -msgstr "تمام اسناد Ùشرده شده GC/Wii ISO" +msgstr "همه Ùایل های آیزو Ùشرده شده گیم کیوب/ÙˆÛŒ (gcz)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "All files (*.*)|*.*" -msgstr "تمام اسناد (*.*)|*.*" +msgstr "همه Ùایل ها (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" @@ -604,6 +662,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"اجازه کنترل برخی گزینه ها توسط کلیدهای میانبر ۳، Û´ØŒ Ûµ Ùˆ Û¶ در داخل پنجره " +"برابرساز را میدهد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Alternate Wiimote Timing" @@ -619,19 +681,19 @@ msgstr "Ùیلتر ناهمسانگر:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 msgid "Anti-Aliasing:" -msgstr "آنتی الیاسینگ:" +msgstr "آنتی آلیاسینگ:" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:309 msgid "Apploader is the wrong size...is it really an apploader?" -msgstr "" +msgstr "سایز بارگذار برنامه اشتباه است...آیا این واقعا بارگذار برنامه است؟" #: Source/Core/DiscIO/Src/VolumeDirectory.cpp:303 msgid "Apploader unable to load from file" -msgstr "" +msgstr "بارگذار برنامه ناتوان در بارگذاری از Ùایل" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Apploader:" -msgstr "بار گزار برنامه" +msgstr "بار گذار برنامه:" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 msgid "Apply" @@ -643,6 +705,9 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" +"اعمال کردن یک اÙکت پس پردازی بعد از اتمام یک Ùریم.\n" +"\n" +"اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 msgid "Arabic" @@ -651,26 +716,30 @@ msgstr "عربی" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "" +msgstr "آیا شما مطمئن هستید Ú©Ù‡ میخواهید \"%s\" را حذ٠کنید؟" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" +"آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایلها را حذ٠کنید؟\n" +"این Ùایل ها برای همیشه از بین خواهند رÙت!" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" +"آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایل را حذ٠کنید؟ این Ùایل برای همیشه " +"از بین خواهند رÙت!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 msgid "Aspect Ratio:" -msgstr "نصبت طول به عرض تصویر:" +msgstr "نسبت طول به عرض تصویر:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:69 msgid "At least one pane must remain open." -msgstr "" +msgstr "حداقل یک قطه Ù…ÛŒ بایست باز بماند." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 @@ -679,11 +748,11 @@ msgstr "صدا" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 msgid "Audio Backend:" -msgstr "پشتوانه صدا" +msgstr "پشتوانه صدا:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" -msgstr "" +msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 @@ -708,15 +777,17 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"تنظیم اتوماتیک سایز پنجره با توجه به وضوح داخلی.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" -msgstr "" +msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "ثبت کردن" +msgstr "ثبت اشاره گر پایه" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -724,7 +795,7 @@ msgstr "برگشت" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 msgid "Backend Settings" -msgstr "تنضیمات پشتوانه" +msgstr "تنظیمات پشتوانه" #: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 @@ -742,7 +813,7 @@ msgstr "به عقب" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:264 msgid "Bad File Header" -msgstr "" +msgstr "سرخط ناصحیح Ùایل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 @@ -771,11 +842,11 @@ msgstr "تنظیمات بنیانی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Bass" -msgstr "" +msgstr "بم" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "" +msgstr "Ú†Ú© سام جدول تخصیص بلوک با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" @@ -787,11 +858,11 @@ msgstr "آبی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Blue Left" -msgstr "" +msgstr "آبی Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Blue Right" -msgstr "" +msgstr "آبی راست" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 @@ -801,7 +872,7 @@ msgstr "پائین" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 #, c-format msgid "Bound Controls: %lu" -msgstr "" +msgstr "کنترل های محدودیت: %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "Broken" @@ -809,23 +880,23 @@ msgstr "خراب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" -msgstr "جوستجو" +msgstr "مرور" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 msgid "Browse for a directory to add" -msgstr "جوستجو پوشه برای اضاÙÙ‡ کردن" +msgstr "مرور برای پوشه جهت اضاÙÙ‡ کردن" #: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse for an ISO directory..." -msgstr "جوستجو برای پوشه ISO..." +msgstr "مرور برای پوشه آیزو..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 msgid "Browse for output directory" -msgstr "جوستجو برای پوشه خروجی" +msgstr "مرور برای پوشه خروجی" #: Source/Core/DolphinWX/Src/NetWindow.cpp:314 msgid "Buffer:" -msgstr "" +msgstr "حاÙظه موقت:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 @@ -835,27 +906,27 @@ msgstr "دکمه ها" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" -msgstr "" +msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" -msgstr "" +msgstr "استیک سی" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:77 msgid "C-Stick" -msgstr "" +msgstr "استیک سی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" -msgstr "" +msgstr "ثبت سی Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" -msgstr "موتور جوستجو پردازشگر" +msgstr "موتور پردازشگر برابرساز" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Cache Display Lists" -msgstr "" +msgstr "لیست های حاÙظه ميانى تصویر" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" @@ -866,6 +937,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"محاسبه مقادیر عمق هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" +"در تضاد با نورپردازی پیکسل (Ú©Ù‡ صرÙا یک بهبود است)ØŒ محاسبات عمق هر پیکسل برای " +"به طور صحیح برابرسازی کردن تعداد Ú©Ù…ÛŒ از بازی ها لازم است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" @@ -875,6 +951,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"محاسبه نورپردازی هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" +"سرعت برابرسازی را چند درصد Ú©Ù… میکند (بسته به قدرت پردازشگر گراÙیک شما).\n" +"معمولا این یک بهبود بی خطر است، اما گاه امکان بروز مسائلی وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 @@ -886,11 +967,11 @@ msgstr "لغو کردن" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:240 #, c-format msgid "Cannot open %s" -msgstr "قادر به باز گشایی نمی باشد %s" +msgstr "قادر به باز گشایی نیست %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "" +msgstr "رویدادهایی را Ú©Ù‡ معوق اند نمی تواند از ثبت درآورد." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format @@ -899,31 +980,37 @@ msgid "" "%s\n" "is not a valid gamecube memory card file" msgstr "" +"قادر به استÙاده از این Ùایل به عنوان کارت حاÙظه نیست.\n" +"%s\n" +"این یک Ùایل کارت حاÙظه معتبر گیم کیوب نیست" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" +"قادر به استÙاده از این Ùایل به عنوان کارت حاÙظه نیست.\n" +"آیا شما سعی دارید از یک Ùایل برای هر دو شکا٠استÙاده کنید؟" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" +"قادر به یاÙتن ویموت بواسطه دستگاه بلوتوث نیست: %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 #, c-format msgid "Cant find WiiMote by connection handle %02x" -msgstr "" +msgstr "قادر به یاÙتن ویموت بواسطه دستگذار اتصال %02x نیست" #: Source/Core/Core/Src/HW/DVDInterface.cpp:679 #: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" +msgstr "قادر به خواندن از پلاگ-این دی ÙˆÛŒ دی نیست - واسط دی ÙˆÛŒ دی: خطای مهلک" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" -msgstr "" +msgstr "کپس لاک" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "Catalan" @@ -935,20 +1022,20 @@ msgstr "مرکز" #: Source/Core/DolphinWX/Src/NetWindow.cpp:561 msgid "Change" -msgstr "تغییر" +msgstr "تعویض" #: Source/Core/DolphinWX/Src/FrameTools.cpp:330 msgid "Change &Disc..." -msgstr "تغییر &دیسک..." +msgstr "تعویض &دیسک..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 msgid "Change Disc" -msgstr "تغییر دیسک" +msgstr "تعویض دیسک" #: Source/Core/DolphinWX/Src/NetWindow.cpp:549 msgid "Change Game" -msgstr "تغییر بازی" +msgstr "تعویض بازی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "" @@ -960,16 +1047,17 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 msgid "Changes sign to zFar Parameter (after correction)" -msgstr "" +msgstr "تغییرات علامت به پارامتر z-دور (بعد از تصحیح)" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:54 msgid "Changes sign to zNear Parameter (after correction)" -msgstr "" +msgstr "تغییرات علامت به پارامتر z-نزدیک (بعد از تصحیح)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 msgid "Changing this will have no effect while the emulator is running!" -msgstr "این تغییر در زمانی Ú©Ù‡ شبیه ساز در حال کار Ù…ÛŒ باشد اثری نخواهد داشت!" +msgstr "" +"تغییر دادن این مورد در حالی Ú©Ù‡ برابرساز در حال اجراست اثری نخواهد داشت!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:281 msgid "Chat" @@ -981,19 +1069,19 @@ msgstr "کد تقلب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 msgid "Cheat Search" -msgstr "جوستجو برای کد تقلب" +msgstr "جستجوی کد تقلب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 msgid "Cheats Manager" -msgstr "مدریت کدهای تقلب" +msgstr "مدیر کدهای تقلب" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Check Partition Integrity" -msgstr "" +msgstr "برسی عدم نقص پارتیشن" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." -msgstr "" +msgstr "برسی عدم نقص..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" @@ -1005,15 +1093,15 @@ msgstr "چینی (سنتی)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" -msgstr "انتخاب پوشه برای دی ÙˆÛŒ دی:" +msgstr "انتخاب یک پوشه ریشه برای دی ÙˆÛŒ دی:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" -msgstr "انتخاب پوشه برای NAND:" +msgstr "انتخاب یک پوشه ریشه برای نند:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" -msgstr "انتخاب ISO پیش Ùرز:" +msgstr "انتخاب آیزو پیش Ùرض:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 msgid "Choose a directory to add" @@ -1021,7 +1109,7 @@ msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 msgid "Choose a file to open" -msgstr "انتخاب سند برای باز کردن" +msgstr "انتخاب Ùایل برای باز کردن" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:215 msgid "Choose a memory card:" @@ -1032,15 +1120,17 @@ msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" +"انتخاب Ùایل برای استÙاده بعنوان بارگذار برنامه: (به دیسک هایی Ú©Ù‡ Ùقط از پوشه " +"ها ساخته شده اند اعمال Ù…ÛŒ کند)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" -msgstr "انتخاب پوشه برای استخراج در آن" +msgstr "انتخاب پوشه برای استخراج به آن" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" -msgstr "" +msgstr "استیک دایره" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:52 msgid "Classic" @@ -1058,6 +1148,8 @@ msgid "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." msgstr "" +"ارتباط مشتری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی از کار اÙتاد. شما " +"باید بازی را دستی متوق٠کنید." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 @@ -1092,16 +1184,16 @@ msgstr "توضیح:" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 msgid "Compress ISO..." -msgstr "Ùشرده کردن ISO..." +msgstr "Ùشرده کردن آیزو..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "Compress selected ISOs..." -msgstr "Ùشرده کردن ISO انتخاب شده..." +msgstr "Ùشرده کردن آیزو های انتخاب شده..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Compressing ISO" -msgstr "در حال Ùشرده کردن ISO" +msgstr "در حال Ùشرده کردن آیزو" #: Source/Core/DolphinWX/Src/FrameTools.cpp:443 msgid "Config" @@ -1130,7 +1222,7 @@ msgstr "پیکربندی..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 msgid "Confirm File Overwrite" -msgstr "تائید بازنویسی سند" +msgstr "تائید بازنویسی Ùایل" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 msgid "Confirm on Stop" @@ -1148,27 +1240,27 @@ msgstr "اتصال کیبورد USB" #: Source/Core/DolphinWX/Src/FrameTools.cpp:376 #, c-format msgid "Connect Wiimote %i" -msgstr "اتصال Wiimote %i" +msgstr "اتصال ویموت %i" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 msgid "Connect Wiimote 1" -msgstr "اتصال Wiimote Û±" +msgstr "اتصال ویموت Û±" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Connect Wiimote 2" -msgstr "اتصال Wiimote Û²" +msgstr "اتصال ویموت Û²" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Connect Wiimote 3" -msgstr "اتصال Wiimote Û³" +msgstr "اتصال ویموت Û³" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Connect Wiimote 4" -msgstr "اتصال Wiimote Û´" +msgstr "اتصال ویموت Û´" #: Source/Core/DolphinWX/Src/Main.cpp:596 msgid "Connecting..." @@ -1176,7 +1268,7 @@ msgstr "در حال اتصال..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:154 msgid "Console" -msgstr "ميز Ùرمان" +msgstr "میز Ùرمان" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 msgid "Control" @@ -1184,7 +1276,7 @@ msgstr "کنترل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:187 msgid "Convert to GCI" -msgstr "تبدیل به GCI" +msgstr "تبدیل به جی سی Ø¢ÛŒ" #: Source/Core/Core/Src/CoreParameter.cpp:377 msgid "Copy failed" @@ -1202,12 +1294,12 @@ msgstr "هسته" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:152 #, c-format msgid "Could not create %s" -msgstr "قادر به ساخت نمی باشد %s" +msgstr "قادر به ساخت نیست %s" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 #, c-format msgid "Could not initialize backend %s." -msgstr "قادر به نصب بخش مدیریت نمی باشد %s" +msgstr "قادر به نصب پشتوانه نیست %s" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format @@ -1216,28 +1308,28 @@ msgid "" "backup. Please note that original Gamecube and Wii discs cannot be read by " "most PC DVD drives." msgstr "" -"قادر به خواندن نمی باشد \"%s\". درایو خالی است. Ùˆ یا دیسک شامل اطلاعات Wii/" -"GC نمی باشد. توجه داشته باشید دیسک های Wii/GC توسط اکثر دی ÙˆÛŒ دی درایوها " -"قابل خواندن نمی باشد." +"قادر به خواندن \"%s\" نیست. دیسک در درایو نیست، یا این یک بکاپ گیم کیوب/ÙˆÛŒ " +"نیست. لطÙا توجه داشته باشید Ú©Ù‡ دیسک های اصلی گیم کیوب/ÙˆÛŒ توسط اکثر دی ÙˆÛŒ دی " +"درایوهای کامپیوتر قابل خواندن نیستند." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" -msgstr "قادر به تشخیص Ùایل ISO نمی باشد %s" +msgstr "قادر به تشخیص Ùایل آیزو %s نبود" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 #, c-format msgid "Could not save %s" -msgstr "قادر به ذخیره کردن نمی باشد %s" +msgstr "قادر به ذخیره کردن نیست %s" #: Source/Core/DolphinWX/Src/NetWindow.cpp:544 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"قادر به نصب گیم پدها نمی باشد. بازی Ú©Ù† بازی را ترک کرده Ùˆ یا بازی در حال " -"اجرا Ù…ÛŒ باشد!\n" -"(نصب گیم پدها در حالی Ú©Ù‡ بازی در حال اجرا است Ùعلا امکان پذیر نمی باشد)" +"قادر به ست کردن گیم پدها نیست. بازی Ú©Ù† بازی را ترک کرده Ùˆ یا بازی در حال " +"اجرا است!\n" +"(ست کردن گیم پدها در حالی Ú©Ù‡ بازی در حال اجرا است Ùعلا پشتیبانی نمی شود)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format @@ -1247,22 +1339,22 @@ msgid "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" msgstr "" -"قادر به نوشتن یر روی کارت حاÙطه نمی باشد %s.\n" +"قادر به نوشتن Ùایل کارت حاÙظه نیست %s.\n" "\n" -"شما بازی را از روی سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید؟ Ùˆ یا شاید Ùایل سیو " -"رایت پوروتکت Ù…ÛŒ باشد." +"آیا شما بازی را از روی یک سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید، Ùˆ یا شاید Ùایل " +"ذخیره محاÙظت شده (Write Protect) است." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" -msgstr "قادر به یاÙتن دستور برای توسعه نمی باشد 'ini'!" +msgstr "قادر به یاÙتن دستور باز برای پسوند 'ini' نیست!" #: Source/Core/Core/Src/BootManager.cpp:144 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -"قادر به init کردن هسته نمی باشد.\n" -"تنظیمات را Ú†Ú© کنید." +"قادر به اينيت کردن هسته نیست.\n" +"تنظیمات خود را Ú†Ú© کنید." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 @@ -1285,20 +1377,22 @@ msgstr "ساخت پرسپکتیو جدید" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 msgid "Created by KDE-Look.org" -msgstr "" +msgstr "ساخته شده توسط KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" msgstr "" +"ساخته شده توسط Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" -msgstr "" +msgstr "ساخته شده توسط VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" msgstr "" +"ساخته شده توسط black_rider Ùˆ منتشر شده در ForumW.org > Web Developments" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " @@ -1310,7 +1404,7 @@ msgstr "بحرانی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 msgid "Crop" -msgstr "حذ٠قسمتى تصوير" +msgstr "حذ٠قسمتی از تصوير" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" @@ -1318,6 +1412,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"حذ٠قسمتی از تصویر از Û´:Û³ به Ûµ:Û´ یا از Û±Û¶:Û¹ به Û±Û¶:Û±Û°.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" @@ -1326,19 +1423,19 @@ msgstr "ضرب دری" #: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" -msgstr "" +msgstr "بعد از انتخابگر Ùایل wx پوشه Ùعلی از %s به %s تغییر کرد!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Custom Projection Hack" -msgstr "" +msgstr "Ù‡Ú© کردن دستی تصویر" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "" +msgstr "تنظیمات مربوط به Ù‡Ú© کردن دستی تصویر" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Customize some Orthographic Projection parameters." -msgstr "" +msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Czech" @@ -1346,40 +1443,40 @@ msgstr "چکوسلواکی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" -msgstr "" +msgstr "پد هدایتی" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP" -msgstr "صدا DSP" +msgstr "پردازشگر صدای دلÙین" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 msgid "DSP Emulator Engine" -msgstr "موتور شبیه ساز صدا DSP" +msgstr "موتور برابرساز پردازشگر صدای دلÙین" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 msgid "DSP HLE emulation (fast)" -msgstr "" +msgstr "برابرسازی سطح بالای پردازشگر صدای دلÙین (سریع)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 msgid "DSP LLE interpreter (slow)" -msgstr "" +msgstr "Ù…Ùسر سطح پائین پردازشگر صدای دلÙین (کند)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 msgid "DSP LLE on Thread" -msgstr "" +msgstr "قرار دادن برابرساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 msgid "DSP LLE recompiler" -msgstr "" +msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلÙین" #: Source/Core/DolphinWX/Src/FrameTools.cpp:445 msgid "DSP settings" -msgstr "تنظیمات صدا DSP" +msgstr "تنظیمات پردازشگر صدای دلÙین" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "DVD Root:" @@ -1388,14 +1485,17 @@ msgstr "ریشه دی ÙˆÛŒ دی:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 msgid "DVDLowRead - Fatal Error: failed to read from volume" msgstr "" +"خواندن سطح پائین دی ÙˆÛŒ دی - خطای مهلک: خواندن از روی دیسک با شکست مواجه شد" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" +"خواندن سطح پائین کد گشایی شده دی ÙˆÛŒ دی - خطای مهلک: خواندن از روی دیسک با " +"شکست مواجه شد" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" -msgstr "سایزه داده" +msgstr "اندازه داده" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 msgid "Date:" @@ -1404,7 +1504,7 @@ msgstr "تاریخ:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:526 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:562 msgid "Datel MaxDrive/Pro files(*.sav)" -msgstr "" +msgstr "Ùایل های داتل مکس درایو/حرÙÙ‡ ای (*,sav)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:242 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:259 @@ -1416,11 +1516,11 @@ msgstr "منطقه مرده" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Debug" -msgstr "" +msgstr "اشکال زدائی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 msgid "Debugging" -msgstr "" +msgstr "اشکال زدائی کردن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:79 msgid "Decimal" @@ -1428,16 +1528,16 @@ msgstr "دسیمال" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." -msgstr "ناهمÙشرده کردن ISO..." +msgstr "ناهمÙشرده کردن آیزو..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." -msgstr "ناهمÙشرده کردن ISO انتخاب شده..." +msgstr "ناهمÙشرده کردن آیزو های انتخاب شده..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" -msgstr "در حال ناهمÙشرده کردن ISO" +msgstr "در حال ناهمÙشرده کردن آیزو" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Default" @@ -1445,7 +1545,7 @@ msgstr "پیش Ùرز" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 msgid "Default ISO:" -msgstr "پیش Ùرز ISO:" +msgstr "آیزو پیش Ùرز:" #: Source/Core/DolphinWX/Src/LogWindow.cpp:130 msgid "Default font" @@ -1454,16 +1554,16 @@ msgstr "دست خط پیش Ùرز" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 msgid "Delete" -msgstr "پاک کردن" +msgstr "حذÙ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 msgid "Delete Save" -msgstr "پاک کردن Save" +msgstr "حذ٠ذخیره" #: Source/Core/VideoCommon/Src/AVIDump.cpp:77 #, c-format msgid "Delete the existing file '%s'?" -msgstr "آیا سند موجود پاک شود '%s'ØŸ" +msgstr "Ùایل موجود '%s' حذ٠شود؟" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 msgid "Description" @@ -1479,6 +1579,8 @@ msgid "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." msgstr "" +"کوشش برای خواند داده بیشتر از دی ÙˆÛŒ دی نسبت به داده ای Ú©Ù‡ در حاÙظه میانجی " +"گنجانده شده یاÙت شد. مهار کردن." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1496,30 +1598,32 @@ msgstr "شماره گیری" #: Source/Plugins/Plugin_VideoDX11/Src/main.cpp:146 msgid "Direct3D11" -msgstr "" +msgstr "Direct3D Û±Û±" #: Source/Plugins/Plugin_VideoDX9/Src/main.cpp:128 msgid "Direct3D9" -msgstr "" +msgstr "Direct3D Û¹" #: Source/Core/Core/Src/HW/GCMemcard.cpp:167 msgid "" "Directory checksum failed\n" " and Directory backup checksum failed" msgstr "" +"Ú†Ú© سام پوشه با شکست مواجه شد\n" +" Ùˆ Ú†Ú© سام بکاپ پوشه با شکست مواجه شد" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Disable" -msgstr "غیر Ùعال" +msgstr "از کارانداختن" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "Disable Fog" -msgstr "غیر Ùعال کردن مه" +msgstr "از کارانداختن مه" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "Disable Per-Pixel Depth" -msgstr "غیر Ùعال کردن Per-Pixel Depth" +msgstr "از کارانداختن Per-Pixel Depth" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" @@ -1529,6 +1633,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"از کار انداختن تمام برابرسازی های اکس ا٠بی (XFB).\n" +"سرعت برابرسازی را بسیار بالا میبرد اما سبب خرابی های سنگینی در بسیاری از " +"بازی هایی Ú©Ù‡ به برابرسازی اکس ا٠بی وابسته اند Ù…ÛŒ گردد (بویژه برنامه های " +"خانگی).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" @@ -1539,6 +1649,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"از کارانداختن برابرسازی Ú©Ù¾ÛŒ های ای ا٠بی (EFB).\n" +"Ú©Ù¾ÛŒ های ای ا٠بی اغلب برای اÙکت های اعمال شده به باÙت اشیاء یا پس پردازی " +"استÙاده Ù…ÛŒ شوند، بنابراین در حالیکه بررسی کردن این تنظیمات اÙزایش سرعت " +"بالایی Ù…ÛŒ دهد تقریبا همیشه سبب مشکلاتی نیز Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" @@ -1559,6 +1675,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش ورودی های خوانده شده توسط برابرساز.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:80 msgid "Divide" @@ -1566,7 +1685,7 @@ msgstr "تقسیم" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 msgid "Do you want to stop the current emulation?" -msgstr "" +msgstr "آیا Ù…ÛŒ خواهید برابرسازی Ùعلی را متوق٠کنید؟" #: Source/Core/DolphinWX/Src/FrameTools.cpp:949 msgid "Dolphin" @@ -1575,11 +1694,11 @@ msgstr "دلÙین" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 #, c-format msgid "Dolphin %s Graphics Configuration" -msgstr "دلÙین %s پیکردی بندی گرÙیک" +msgstr "دلÙین %s پیکربندی گراÙیک" #: Source/Core/DolphinWX/Src/FrameTools.cpp:306 msgid "Dolphin &Web Site" -msgstr "دلÙین &وب سایت" +msgstr "&وب سایت دلÙین" #: Source/Core/DolphinWX/Src/ConfigMain.h:37 msgid "Dolphin Configuration" @@ -1587,35 +1706,35 @@ msgstr "پیکر بندی دلÙین" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 msgid "Dolphin Emulated Wiimote Configuration" -msgstr "پیکربندی Wiimote شبیه سازی شده دلÙین" +msgstr "پیکربندی ویمیوت برابرسازی شده دلÙین" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 msgid "Dolphin FIFO" -msgstr "دلÙین FIFO" +msgstr "دلÙین ÙÛŒÙÙˆ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 msgid "Dolphin GCPad Configuration" -msgstr "پیکربندی GCPad دلÙین" +msgstr "پیکربندی گیم پد گیم کیوب دلÙین" #: Source/Core/DolphinWX/Src/FrameTools.cpp:764 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 msgid "Dolphin TAS Movies (*.dtm)" -msgstr "دلÙین TAS Movies (*.dtm)" +msgstr "Ùیلم های تاس دلÙین (*.dtm)" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 msgid "Dolphin Wiimote Configuration" -msgstr "پیکربندی Wiimote دلÙین" +msgstr "پیکربندی ویموت دلÙین" #: Source/Core/DolphinWX/Src/FrameTools.cpp:307 msgid "Dolphin at &Google Code" -msgstr "دلÙین در &Google Code" +msgstr "دلÙین در &Ú¯ÙˆÚ¯Ù„ کد" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -"دلÙین قادر به پیدا کردن ISOهای GC/Wii نمی باشد. برای جستجو اسناد دو بار " +"دلÙین قادر به پیدا کردن آیزو های گیم کیوب/ÙˆÛŒ نیست. برای مرور Ùایل ها دو بار " "اینجا کلیک کنید..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 @@ -1623,8 +1742,8 @@ msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -"دلÙین در حال حاضر طوری ست شده است Ú©Ù‡ تمامی بازی ها را مخÙÛŒ کند. برای نمایش " -"بازی ها دو بار اینجا کلیک کنید..." +"دلÙین در حال حاضر ست شده است Ú©Ù‡ همه بازی ها را مخÙÛŒ کند. برای نمایش بازی ها " +"دو بار اینجا کلیک کنید..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -1633,36 +1752,36 @@ msgstr "پائین" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" -msgstr "دانلود کدها (WiiRD Database)" +msgstr "دانلود کدها (WiiRD بانک اطلاعاتی)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format msgid "Downloaded %lu codes. (added %lu)" -msgstr "کدهای %lu دانلود شده. (added %lu)" +msgstr "%lu کد دانلود شد. (%lu عدد اضاÙÙ‡ شد)" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:31 msgid "Drums" -msgstr "" +msgstr "طبل ها" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 msgid "Dummy" -msgstr "" +msgstr "مصنوعی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" -msgstr "نسخه بردارى صدا" +msgstr "نسخه برداری صدا" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" -msgstr "" +msgstr "نسخه برداری نشان حاÙظه میانجی Ùریم جاساز شده (EFB)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" -msgstr "نسخه بردارى Ùریم" +msgstr "نسخه برداری Ùریم ها" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" -msgstr "" +msgstr "نسخه برداری باÙت اشیاء" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 msgid "" @@ -1670,6 +1789,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری از همه Ùریم های نمایش داده شده در قالب Ùایل AVI در پوشه User/" +"Dump/Frames/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" @@ -1677,6 +1800,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری باÙت اشیاء کدبرداری شده بازی در پوشه User/Dump/Textures/" +"game_id/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" @@ -1684,6 +1811,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نسخه برداری محتوی Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB) در پوشه User/" +"Dump/Textures/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 @@ -1697,7 +1828,7 @@ msgstr "Ø®&روج" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 msgid "EFB Copies" -msgstr "" +msgstr "Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB)" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format @@ -1707,14 +1838,18 @@ msgid "" "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" +"خطا: این نسخه دلÙین نیازمند درایور با حداقل نسخه %d برای TAP-Win32 Ù…ÛŒ باشد." +"%d -- اگر شما بتازگى نسخه توزیع کننده دلÙین را بالا برده اید، شاید راه " +"اندازی مجدد در این مرحله برای اینکه ویندوز درایور جدید را شناسایی کند لازم " +"باشد." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" -msgstr "اوروپا" +msgstr "اروپا" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 msgid "Early Memory Updates" -msgstr "" +msgstr "به روز شدن های اولیه حاÙظه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit" @@ -1722,11 +1857,11 @@ msgstr "ویرایش" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.h:30 msgid "Edit ActionReplay Code" -msgstr "ویریش کدهای اکشن ریپلی" +msgstr "ویرایش کدهای اکشن ریپلی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "Edit Config" -msgstr "ویرایش پيکربندى" +msgstr "ویرایش پیکربندی" #: Source/Core/DolphinWX/Src/PatchAddEdit.h:30 msgid "Edit Patch" @@ -1734,7 +1869,7 @@ msgstr "ویرایش وصله" #: Source/Core/DolphinWX/Src/FrameTools.cpp:461 msgid "Edit current perspective" -msgstr "" +msgstr "ویرایش چشم انداز جاری" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 @@ -1747,11 +1882,11 @@ msgstr "اÙکت" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 msgid "Embedded Frame Buffer" -msgstr "" +msgstr "حاÙظه میانجی Ùریم جاساز شده (EFB)" #: Source/Core/Core/Src/Core.cpp:202 msgid "Emu Thread already running" -msgstr "" +msgstr "ریسمان شبیه ساز قبلا اجرا شده است" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" @@ -1761,6 +1896,11 @@ msgid "" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" +"برابرسازی دقیق اکس ا٠بی ها.\n" +"سرعت برابرسازی را بسیار پائین Ù…ÛŒ آورد Ùˆ رندر کردن با تÙکیک پذیری بالا را " +"قدغن Ù…ÛŒ کند اما برای اجرای درست تعدادی از بازی ها لازم است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، گزینه اکس ا٠بی مجازی را Ùعال کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" @@ -1771,14 +1911,21 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"برابرسازی اکس ا٠بی ها توسط باÙت اشیای پردازشگر گراÙیک.\n" +"درست کردن تعداد زیادی از بازی هایی Ú©Ù‡ بدون برابرسازی اکس ا٠بی کار نمی کنند " +"در حالی Ú©Ù‡ به اندازه اکس ا٠بی واقعی کند نخواهد بود. بهر حال، این ممکن است " +"برای تعداد زیادی از بازی های دیگر با شکست مواجه شود (بویژه برای برنامه ای " +"خانگی).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Emulated Wiimote" -msgstr "ویموت شبیه سازی شده" +msgstr "ویموت برابرسازی شده" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Emulation State: " -msgstr "" +msgstr "وضعیت برابرساز:" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Enable" @@ -1793,26 +1940,32 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùعال کردن برجسته سازی سه بعدی توسط تکنولوژی Nvidia 3D Vision با توجه به این " +"Ú©Ù‡ پردازشگر گراÙیک شما از این امر پشتیبانی کند.\n" +"امکان بروز خطا وجود دارد.\n" +"پیش نیاز این امر حالت تمام صÙحه میباشد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 msgid "Enable AR Logging" -msgstr "" +msgstr "Ùعال کردن واقعه نگاری اکشن ریپلی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Enable BAT" -msgstr "" +msgstr "Ùعال کردن انتقال آدرس بلوک" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 msgid "Enable Block Merging" -msgstr "" +msgstr "Ùعال کردن ادغام بلوک" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 msgid "Enable Bounding Box Calculation" -msgstr "" +msgstr "Ùعال کردن محاسبه حد جعبه" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 msgid "Enable Cache" -msgstr "" +msgstr "Ùعال کردن حاÙظه ميانى" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Enable Cheats" @@ -1820,11 +1973,11 @@ msgstr "Ùعال کردن کدهای تقلب" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Dual Core" -msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر" +msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Enable Dual Core (speedup)" -msgstr "Ùعال کردن پردانده با دو هسته یا بیشتر (بالا بردن سرعت)" +msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 msgid "Enable Hotkeys" @@ -1832,32 +1985,32 @@ msgstr "Ùعال کردن شرت کاتها" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable Idle Skipping" -msgstr "" +msgstr "Ùعال کردن جهش بیکاری" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Enable Idle Skipping (speedup)" -msgstr "" +msgstr "Ùعال کردن جهش بیکاری (بالا بردن سرعت)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "Enable MMU" -msgstr "" +msgstr "Ùعال کردن واحد مدیریت حاÙظه" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 msgid "Enable Progressive Scan" -msgstr "" +msgstr "Ùعال کردن پويش تصاعدی (Progressive Scan)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 msgid "Enable Screen Saver" -msgstr "" +msgstr "Ùعال کردن اسکیرین سیور" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "Enable WideScreen" -msgstr "" +msgstr "Ùعال کردن صÙحه عریض" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Enable Wireframe" -msgstr "" +msgstr "Ùعال کردن خطوط Ùریم" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" @@ -1867,16 +2020,23 @@ msgid "" "\n" "If unsure, select 1x." msgstr "" +"Ùعال کردن Ùیلتر ناهمسانگرد.\n" +"ارتقا Ú©ÛŒÙیت باÙت اشیاء Ú©Ù‡ در زوایای مورب قرار دارند.\n" +"امکان بروز مشکل در تعداد Ú©Ù…ÛŒ از بازی ها وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" +"Ùعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها " +"لازم است. (ON=سریع، OFF=سازگار)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" -msgstr "" +msgstr "Ùعال کردن صÙحات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" @@ -1885,6 +2045,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"این گزینه به شما اجازه میدهد تا از تمام صÙحه برای نمایش تصویر استÙاده کنید.\n" +"اگر این گزینه غیر Ùعال باشد پنجره صÙحه نمایش به جای آن ساخته میشود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" @@ -1893,12 +2057,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"اگر میخواهید به جای پنجره جداگانه از پنجره اصلی دلÙین برای نمایش بازی " +"استÙاده کنید این گزینه را Ùعال کنید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" +"برای بالا بردن سرعت بازی اÙسانه زلدا: شاهدخت سپیده دم این گزینه را Ùعال " +"کنید. غیرÙعال برای هر بازی دیگر." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "" @@ -1906,10 +2076,12 @@ msgid "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" +"انتقال آدرس بلوک را Ùعال Ù…ÛŒ کند; کارایی واحد مدیریت حاÙظه. بالا بردن دقت سخت " +"اÙزار، اما سبب کند شدن برابرسازی میگردد. (روشن = سازگار، خاموش = سریع)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Enables Custom Projection Hack" -msgstr "" +msgstr "Ùعال کردن پروژه Ù‡Ú© دستی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" @@ -1918,12 +2090,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùعال کردن پويش تصاعدی اگر توسط نرم اÙزار برابرسازی شده پشتیبانی شود.\n" +"اکثر بازی به این موضوع اهمیت نمی دهند.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" +"Ùعال کردن واحد مدیریت حاÙظه، برای بعضی از بازی ها لازم است. (روشن = سازگار، " +"خاموش = سریع)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -1931,6 +2109,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"کدگذاری Ùریم نسخه برداری شده توسط کدک FFV1.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:53 msgid "End" @@ -1945,21 +2126,21 @@ msgstr "انگلیسی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 msgid "Enhancements" -msgstr "بالا بردن" +msgstr "بهسازی" #: Source/Core/DolphinWX/Src/FrameAui.cpp:606 msgid "Enter a name for the new perspective:" -msgstr "" +msgstr "یک اسم برای چشم انداز جدید وارد کنید:" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:190 #, c-format msgid "Entry %d/%d" -msgstr "" +msgstr "ورودی %d/%d" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:84 #, c-format msgid "Entry 1/%d" -msgstr "" +msgstr "ورودی 1/%d" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Equal" @@ -1974,6 +2155,7 @@ msgstr "خطا" #: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." msgstr "" +"بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش Ùرض سیستم." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format @@ -1981,6 +2163,8 @@ msgid "" "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " "Aborting savestate load..." msgstr "" +"خطا: بعد از \"%s\"ØŒ %d (0x%X) به جای نشان ذخیره %d (0x%X) پیدا شد. خاتمه " +"بارگذاری وضعیت ذخیره..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format @@ -1988,6 +2172,8 @@ msgid "" "Error: Trying to access %s fonts but they are not loaded. Games may not show " "fonts correctly, or crash." msgstr "" +"خطا: تلاش برای دسترسی به Ùونت های %s اما آنها بارگذاری نشده اند. ممکن است " +"بازی ها Ùونت ها را به درستی نمایش ندهند، یا خرابی به بار آورند." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -1995,12 +2181,12 @@ msgstr "گریختن" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:26 msgid "Euphoria" -msgstr "" +msgstr "خوشی" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" +msgstr "دستگذار استثناء - دسترسی Ùضای پایینی حاÙظه. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" @@ -2012,7 +2198,7 @@ msgstr "صادر کردن با شکست مواجه شد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 msgid "Export File" -msgstr "صادر کردن سند" +msgstr "صادر کردن Ùایل" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 @@ -2025,63 +2211,63 @@ msgstr "صادر کردن ضبط..." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 msgid "Export Save" -msgstr "صادر کردن Save" +msgstr "صادر کردن ذخیره" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 msgid "Export Wii save (Experimental)" -msgstr "صادر کردن Wii save (آزمایشی)" +msgstr "صادر کردن Ùایل ذخیره ÙˆÛŒ (آزمایشی)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Export all saves" -msgstr "صادر کردن تمام Save ها" +msgstr "صادر کردن همه ذخیره ها" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:80 msgid "Export failed, try again?" -msgstr "صادر کردن با شکست مواجه شد, سعی دوباره؟" +msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره؟" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:557 msgid "Export save as..." -msgstr "صادر کردن Save با عنوان..." +msgstr "صادر کردن ذخیره بعنوان..." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 msgid "Extension" -msgstr "توسعه" +msgstr "پسوند" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "External Frame Buffer" -msgstr "" +msgstr "حاÙظه میانجی خارجی Ùریم" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:60 msgid "Extra Parameter" -msgstr "" +msgstr "پارامتر اضاÙÛŒ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "" +msgstr "پارامترهای یدکی Ù…Ùید تنها برای \"Metroid Other M\"." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract All Files..." -msgstr "استخراج کردن تمامی اسناد..." +msgstr "استخراج همه Ùایل ها..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 msgid "Extract Apploader..." -msgstr "استخراج کردن Apploader..." +msgstr "استخراج بارگذار برنامه..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 msgid "Extract DOL..." -msgstr "استخراج کردن DOL..." +msgstr "استخراج دال..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 msgid "Extract Directory..." -msgstr "استخراج کردن پوشه..." +msgstr "استخراج پوشه..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Extract File..." -msgstr "استخراج کردن سند..." +msgstr "استخراج Ùایل..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract Partition..." -msgstr "استخراج کردن پارتیشن..." +msgstr "استخراج پارتیشن..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format @@ -2090,7 +2276,7 @@ msgstr "استخراج کردن %s" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting All Files" -msgstr "استخراج کردن تمامی اسناد" +msgstr "استخراج کردن همه Ùایل ها" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 msgid "Extracting Directory" @@ -2102,11 +2288,11 @@ msgstr "استخراج کردن..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" -msgstr "" +msgstr "بایت ÙÛŒÙÙˆ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 msgid "FIFO Player" -msgstr "" +msgstr "پخش کننده ÙÛŒÙÙˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:174 msgid "FRANCE" @@ -2114,7 +2300,7 @@ msgstr "Ùرانسه" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 msgid "FST Size:" -msgstr "" +msgstr "اندازه ا٠اس تی:" #: Source/Core/Core/Src/NetPlayClient.cpp:77 msgid "Failed to Connect!" @@ -2122,7 +2308,7 @@ msgstr "اتصال با شکست مواجه شد!" #: Source/Core/DolphinWX/Src/NetWindow.cpp:211 msgid "Failed to Listen!!" -msgstr "" +msgstr "پذیرÙتن با شکست مواجه شد!!" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 msgid "Failed to download codes." @@ -2131,7 +2317,7 @@ msgstr "دانلود کدها با شکست مواجه شد." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 #, c-format msgid "Failed to extract to %s!" -msgstr "" +msgstr "استخراج به %s با شکست مواجه شد!" #: Source/Core/Core/Src/DSP/DSPCore.cpp:66 #, c-format @@ -2145,20 +2331,29 @@ msgid "" "You may use the DSP HLE engine which does not require ROM dumps.\n" "(Choose it from the \"Audio\" tab of the configuration dialog.)" msgstr "" +"بارگذاری حاÙظه Ùقط خواندنی پردازشگر صدای دلÙین با شکست مواجه شد:\t%s\n" +"\n" +"این Ùایل برای استÙاده از برابرساز سطح پائین پردازشگر صدای دلÙین لازم است.\n" +"دلÙین به دلیل حق انتشار شامل این Ùایل نیست.\n" +"از نرم اÙزار DSPSpy برای نسخه برداری از کنسول واقعی خود استÙاده کنید.\n" +"\n" +"شما Ù…ÛŒ توانید از موتور برابر ساز سطح بالای پردازشگر صدای دلÙین استÙاده کنید " +"Ú©Ù‡ نیازی به Ùایل حاÙظه Ùقط خواندنی ندارد.\n" +"(نوع پردازشگر را از تب \"صدا\" در پنجره پیکر بندی انتخاب کنید.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "" +msgstr "بارگذاری bthprops.cpl با شکست مواجه شد" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "" +msgstr "بارگذاری hid.dll با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" -msgstr "" +msgstr "خواندن banner.bin با شکست مواجه شد" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 #, c-format @@ -2167,63 +2362,76 @@ msgid "" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" +"خواندن بلوک %d داده ذخیره با شکست مواجه شد\n" +"امکان ناقص بودن کارت حاÙظه وجود دارد\n" +"موقعیت Ùایل:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" +"خواندن صحیح بکاپ جدول تخصیص بلوک با شکست مواجه شد\n" +"(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:142 msgid "" "Failed to read block allocation table correctly\n" "(0x6000-0x7FFF)" msgstr "" +"خواندن صحیح جدول تخصیص بلوک با شکست مواجه شد\n" +"(0x6000-0x7FFF)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286 #, c-format msgid "Failed to read data from file %d" -msgstr "" +msgstr "خواندن داده از Ùایل با شکست مواجه شد %d" #: Source/Core/Core/Src/HW/GCMemcard.cpp:136 msgid "" "Failed to read directory backup correctly\n" "(0x4000-0x5FFF)" msgstr "" +"خواندن صحیح بکاپ پوشه با شکست مواجه شد\n" +"(0x4000-0x5FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:130 msgid "" "Failed to read directory correctly\n" "(0x2000-0x3FFF)" msgstr "" +"خواندن صحیح پوشه با شکست مواجه شد\n" +"(0x2000-0x3FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:119 msgid "" "Failed to read header correctly\n" "(0x0000-0x1FFF)" msgstr "" +"خواندن سرخط با شکست مواجه شد\n" +"(0x0000-0x1FFF)" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "" +msgstr "خواندن Ø¢ÛŒ دی یگانه از ایمیج دیسک با شکست مواجه شد" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84 msgid "Failed to write BT.DINF to SYSCONF" -msgstr "" +msgstr "نوشتن BT.DINF به SYSCONF با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:228 msgid "Failed to write bkhdr" -msgstr "" +msgstr "نوشتن bkhdr با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:164 #, c-format msgid "Failed to write header for %s" -msgstr "" +msgstr "نوشتن سرخط برای %s با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:258 #, c-format msgid "Failed to write header for file %d" -msgstr "" +msgstr "نوشتن سرخط برای Ùایل %d با شکست مواجه شد" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" @@ -2235,35 +2443,38 @@ msgstr "سریع" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Fast version of the MMU. Does not work for every game." -msgstr "" +msgstr "نسخه سریع واحد مدیریت حاÙظه. برای همه بازی ها عمل نمی کند." #: Source/Core/Core/Src/Movie.cpp:1039 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"همگاه سازی مجدد مهلک. خروج نمایش. (خطا در ویموت پخش: %u !=%u, بایت %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" -msgstr "" +msgstr "پخش کننده ÙÛŒÙÙˆ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 msgid "File Info" -msgstr "مشخصات سند" +msgstr "مشخصات Ùایل" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 msgid "File contained no codes." -msgstr "" +msgstr "Ùایل شامل کدی نیست." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 msgid "File converted to .gci" -msgstr "" +msgstr "Ùایل تبدیل شده است به .gci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 msgid "" "File could not be opened\n" "or does not have a valid extension" msgstr "" +"Ùایل قادر به باز شدن نیست\n" +"یا دارای پسوند معتبر نیست" #: Source/Core/Core/Src/HW/GCMemcard.cpp:84 #, c-format @@ -2271,59 +2482,61 @@ msgid "" "File has the extension \"%s\"\n" "valid extensions are (.raw/.gcp)" msgstr "" +"Ùایل پسوند \"%s\" دارد\n" +"پسوند های معتبر عبارتند از (.raw/,gcp)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 msgid "File is not recognized as a memcard" -msgstr "" +msgstr "Ùایل به عنوان کارت حاÙظه شناخته نشده است" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:294 msgid "File not compressed" -msgstr "" +msgstr "Ùایل Ùشرده نیست" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp:171 #, c-format msgid "FileIO: Unknown open mode : 0x%02x" -msgstr "" +msgstr "ورودی/خروجی Ùایل: حالت گشودن ناشناس : 0x%02x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 msgid "Filesystem" -msgstr "" +msgstr "Ùایل سیستم" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 msgid "Filetype 'ini' is unknown! Will not open!" -msgstr "" +msgstr "نوع Ùایل 'ini' ناشناس است! باز نخواهد شد!" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" -msgstr "" +msgstr "پیدا کردن بعدی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" -msgstr "" +msgstr "پیدا کردن قبلی" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" -msgstr "" +msgstr "بلوک اول" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 msgid "Fix Checksums" -msgstr "" +msgstr "درست کردن Ú†Ú© سام ها" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" -msgstr "" +msgstr "Û±Û¶:Û¹ اجباری" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" -msgstr "" +msgstr "Û´:Û³ اجباری" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" -msgstr "" +msgstr "کنسول به عنوان NTSC-J اجباری" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "Force Texture Filtering" -msgstr "" +msgstr "Ùیلتر کردن باÙت اشیاء اجباری" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" @@ -2332,6 +2545,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ùیلتر کردن باÙت اشیاء اجباری حتی اگر بازی برابرسازی شده صریحا آنرا غیرÙعال " +"کرده باشد.\n" +"بهبود ناچیز Ú©ÛŒÙیت باÙت اشیاء Ú©Ù‡ باعث بروز اشکال در بعضی از بازی ها Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" @@ -2340,6 +2558,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"اجباری کردن خروجی گراÙیک بازی برای وضوح صÙحه عریض.\n" +"سبب خرابی های گراÙیکی در برخی از بازی ها Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" @@ -2347,12 +2569,17 @@ msgid "" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " "setting when playing Japanese games." msgstr "" +"حالت NTSC-J اجباری برای استÙاده Ùونت رام ژاپنی.\n" +"این گزینه را رها کنید، حالت پیش Ùرض دلÙین NTSC-U Ù…ÛŒ باشد, دلÙین به طور " +"خودکار این گزینه را برای بازی های ژاپنی Ùعال Ù…ÛŒ کند." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" "Format as ascii (NTSC\\PAL)?\n" "Choose no for sjis (NTSC-J)" msgstr "" +"قالب بندی بعنوان اسکی (NTSC\\PAL)?\n" +"انتخاب پاسخ منÙÛŒ برای SJIS (NTSC-J)" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:278 msgid "Forward" @@ -2361,7 +2588,7 @@ msgstr "جلو" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "پیدا کردن نتایج %d برای '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 @@ -2375,16 +2602,15 @@ msgstr "Ùریم" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Frame Advance" -msgstr "" +msgstr "پيشروى Ùریم" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" -msgstr "" +msgstr "نسخه برداری Ùریم از FFV1 استÙاده Ù…ÛŒ کند" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 -#, fuzzy msgid "Frame Info" -msgstr "مشخصات سند" +msgstr "مشخصات Ùریم" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" @@ -2392,7 +2618,7 @@ msgstr "محدوده Ùریم" #: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" -msgstr "" +msgstr "پری&دن از روی Ùریم" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" @@ -2400,11 +2626,11 @@ msgstr "حد Ùریم:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" -msgstr "" +msgstr "Ùریم ها برای ضبط شدن" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" -msgstr "نگاه آذاد" +msgstr "نگاه آزاد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 @@ -2414,7 +2640,7 @@ msgstr "Ùرانسوی" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38 msgid "Frets" -msgstr "" +msgstr "تحریک" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 @@ -2427,32 +2653,31 @@ msgstr "تمام صÙحه" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" -msgstr "سایز برای حالت تمام صÙحه:" +msgstr "وضوح حالت تمام صÙحه:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" -msgstr "" +msgstr "Ùایل جی سی Ø¢ÛŒ(*.gci)" #: Source/Core/DolphinWX/Src/GCMicDlg.h:44 -#, fuzzy msgid "GCMic Configuration" -msgstr "تنضیمات ثبت وقايع" +msgstr "پیکربندی میکروÙÙ† گیم کیوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "GCPad" -msgstr "" +msgstr "گیم پد گیم کیوب" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Game ID:" -msgstr "Ø¢ÛŒ دی بازی" +msgstr "Ø¢ÛŒ دی بازی:" #: Source/Core/Core/Src/NetPlay.cpp:228 msgid "Game is already running!" -msgstr "بازی در حال اجراست!" +msgstr "بازی قبلا اجرا شده است!" #: Source/Core/Core/Src/NetPlay.cpp:258 msgid "Game isn't running!" @@ -2464,32 +2689,32 @@ msgstr "بازی پیدا نشد!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 msgid "Game-Specific Settings" -msgstr "" +msgstr "تنظیمات مشخصات بازی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 msgid "GameConfig" -msgstr "" +msgstr "پیکربندی بازی" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Ùایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" -msgstr "" +msgstr "گیم کیوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "Gamecube &Pad Settings" -msgstr "" +msgstr "تنظیمات &دسته گیم کیوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" -msgstr "" +msgstr "کارت های حاÙظه گیم کیوب (*.raw.*.gcp)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" -msgstr "" +msgstr "تنظیمات دسته گیم کیوب" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 @@ -2504,6 +2729,10 @@ msgid "" "native code handler by placing the codehandler.bin file into the Sys " "directory and restarting Dolphin.)" msgstr "" +"اجرای کد گیکو با شکست مواجه شد (CT%i CST%i) (%s)\n" +"(Ú†Ù‡ یک کد بد Ú†Ù‡ نوع کد هنوز پشتیبانی نشده است. سعی کنید از دستگذار کد محلی " +"توسط قرار دادن Ùایل codehandler.bin در داخل پوشه Sys Ùˆ شروع مجدد دلÙین " +"استÙاده کنید.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2514,7 +2743,7 @@ msgstr "Ú©Ù„ÛŒ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 msgid "General Settings" -msgstr "تنظیمات Ú©Ù„ÛŒ" +msgstr "تنظیمات جامع" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 @@ -2525,11 +2754,11 @@ msgstr "آلمانی" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" +msgstr "گرÙتن کد اکشن ریپلی: Ùهرست بزرگتر از سایز لیست است %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" -msgstr "گرÙیک" +msgstr "گراÙیک" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics settings" @@ -2549,6 +2778,12 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"Ú©ÛŒÙیت باÙت اشیائی را Ú©Ù‡ تولید شده است به شدت اÙزایش Ù…ÛŒ دهد در حالی Ú©Ù‡ از " +"رندر برای اÙکت های باÙت اشیا استÙاده Ù…ÛŒ کند.\n" +"بالا بردن وضوح داخلی تاثیر این تنظیم را بهبود خواهد بخشید.\n" +"کارآئی را اندکی کاهش Ù…ÛŒ دهد Ùˆ شاید مشکلاتی را سبب شود (گرچه غیر ممکن است).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "Greek" @@ -2560,11 +2795,11 @@ msgstr "سبز" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Green Left" -msgstr "" +msgstr "سبز Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Green Right" -msgstr "" +msgstr "سبز راست" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:35 msgid "Guitar" @@ -2572,15 +2807,15 @@ msgstr "گیتار" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 msgid "HCI_CMD_INQUIRY is called, please report!" -msgstr "" +msgstr "HCI_CMD_INQUIY Ùرا خوانده شد، لطÙا گزارش دهید!" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 msgid "Hacks" -msgstr "" +msgstr "Ù‡Ú©" #: Source/Core/Core/Src/HW/GCMemcard.cpp:158 msgid "Header checksum failed" -msgstr "" +msgstr "Ú†Ú© کردن سر خط برای یاÙتن خطا با شکست مواجه شد" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" @@ -2603,6 +2838,14 @@ msgid "" "\n" "Sayonara!\n" msgstr "" +"درود،\n" +"\n" +"دلÙین برای اجرا شدن نیاز دارد Ú©Ù‡ پردازنده شما از پسوند های SSE2 پشتیبانی " +"کند.\n" +"متاسÙانه پردازنده شما از پسوند های SSE2 پشتیبانی نمی کند, بنابراین دلÙین " +"اجرا نخواهد شد.\n" +"\n" +"سایونارا!\n" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 msgid "Hide" @@ -2618,6 +2861,9 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"مخÙÛŒ کردن نشانه گر ماوس اگر بر روی پنجره برابرساز باشد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:54 msgid "Home" @@ -2630,13 +2876,13 @@ msgstr "میزبان" #: Source/Core/DolphinWX/Src/HotkeyDlg.h:44 msgid "Hotkey Configuration" -msgstr "پیگربندی شرت کات" +msgstr "پیکربندی شرت کات" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 msgid "Hotkeys" -msgstr "کاتها" +msgstr "شرت کاتها" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Hungarian" @@ -2650,6 +2896,7 @@ msgstr "ویموت مخلوط" #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" msgstr "" +"IOCTL_ES_GETVIEWS: آزمایش برای گرÙتن داده از یک بلیط ناشناخته: %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format @@ -2659,53 +2906,61 @@ msgid "" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" +"IOCTL_ES_LAUNCH: بازی بارگذاری آیزوها یا یک عنوان Ú©Ù‡ در نند نسخه برداری شده " +"شماست را آزمایش کرد\n" +"Ø¢ÛŒ دی عنوان %016llx.\n" +" احتمالا اینک دلÙین هنگ خواهد کرد" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:312 msgid "IOCTL_ES_READCONTENT - bad destination" -msgstr "" +msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 msgid "IPL Settings" -msgstr "" +msgstr "تنظیمات Ø¢ÛŒ Ù¾ÛŒ ال" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 msgid "IR" -msgstr "" +msgstr "Ùروسرخ" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "IR Pointer" -msgstr "" +msgstr "اشاره گر Ùروسرخ" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 msgid "IR Sensitivity:" -msgstr "" +msgstr "میزان حساسیت Ùروسرخ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 msgid "ISO Details" -msgstr "جزئیات ISO" +msgstr "جزئیات آیزو" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "ISO Directories" -msgstr "پوشه های ISO" +msgstr "پوشه های آیزو" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:177 msgid "ITALY" -msgstr "ايتاليا" +msgstr "ایتالیا" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:628 msgid "Icon" -msgstr "" +msgstr "تندیس" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" +"اگر انتخاب شود، ثبت حد جعبه به روز خواهد شد. از سوی بازی های پیپر ماریو " +"استÙاده Ù…ÛŒ شود." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" +"اگر تعداد Ùریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به رÙع " +"آن Ú©Ù…Ú© کند. (روشن = سازگار، خاموش = سریع)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 msgid "" @@ -2713,10 +2968,13 @@ msgid "" "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" +"اگر شما حد Ùریم را بالاتر از سرعت کامل بازی تنظیم کنید (NTSC:Û¶Û°ØŒ PAL:ÛµÛ°). " +"استÙاده کنید از دریچه صدا با استÙاده از پردازشگر صدای دلÙین (شاید صدا های " +"تیک را درست کند اما همچنین Ù…ÛŒ تواند موجب نویز ثابت بسته به بازی شود)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" -msgstr "" +msgstr "تغییرات قالب بندی نادیده گرÙته شود" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" @@ -2726,6 +2984,11 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"همه تغییرات قالب بندی حاÙظه میانجی Ùریم جاساز شده (EFB) را نادیده بگیر.\n" +"کارآئى را در بسیاری از بازی ها بدون اثری منÙÛŒ بالا Ù…ÛŒ برد. گرچه سبب نقص های " +"گراÙیکی در تعداد Ú©Ù…ÛŒ از بازی های دیگر Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" @@ -2735,30 +2998,40 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نادیده گرÙتن هر درخواستی از پردازنده برای خواندن Ùˆ یا نوشتن به حاÙظه میانجی " +"Ùریم جاساز شده (EFB).\n" +"کارآئى را در بعضی از بازی ها را بالا Ù…ÛŒ برد، اما سبب از کار اÙتادن برخی " +"امکانات بازی Ùˆ یا نقص های گراÙیکی Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 msgid "Import Save" -msgstr " وارد کردن Save" +msgstr "وارد کردن ذخیره" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:59 msgid "Import failed, try again?" -msgstr "وارد کردن با شکست مواجه شد, سعی دوباره؟" +msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" +"پسوند Ùایل وارد شده جی اس سی است\n" +"اما دارای سرخط صحیح نمی باشد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 msgid "Imported file has invalid length" -msgstr "" +msgstr "طول Ùایل وارد شده نامعتبر Ù…ÛŒ باشد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" +"پسوند Ùایل وارد شده اس ای ÙˆÛŒ Ù…ÛŒ باشد\n" +"اما دارای سرخط صحیح نمی باشد" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" @@ -2767,6 +3040,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"کارآئى را بالا Ù…ÛŒ برد اما سبب نقص های گراÙیکی در اکثر بازی هایی Ú©Ù‡ بر " +"برابرسازی مه تکیه Ù…ÛŒ کنند Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "In Game" @@ -2774,7 +3051,7 @@ msgstr "در بازی" #: Source/Core/DolphinWX/Src/NetWindow.cpp:591 msgid "In-Game" -msgstr "در-بازی" +msgstr "در بازی" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 @@ -2795,11 +3072,11 @@ msgstr "درج" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:175 msgid "Insert Encrypted or Decrypted code here..." -msgstr "درج کد رمز شده Ùˆ یا کش٠رمز..." +msgstr "درج کد رمز شده Ùˆ یا کش٠شده..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Insert SD Card" -msgstr "درج کارت SD" +msgstr "درج کارت اس دی" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:33 msgid "Insert name here.." @@ -2807,32 +3084,34 @@ msgstr "درج اسم..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Install WAD" -msgstr "نصب WAD" +msgstr "نصب واد" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" -msgstr "نصب به منوی Wii" +msgstr "نصب به Ùهرست انتخاب ÙˆÛŒ" #: Source/Core/Core/Src/MemTools.cpp:248 msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" +"نصب دستگذار استثناء Ùراخوانده شد، اما این پلتÙورم هنوز از این امکان پشتیبانی " +"نمی کند." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." -msgstr "در حال نصب WAD..." +msgstr "در حال نصب واد..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" -msgstr "" +msgstr "خطای بررسی درست بودن" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" -msgstr "" +msgstr "بررسی درست بودن به پایان رسید" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format @@ -2840,18 +3119,20 @@ msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد " +"خراب یا نادرست وصله خورده است." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" -msgstr "" +msgstr "واسط گراÙیک" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 msgid "Interface Settings" -msgstr "" +msgstr "تنظیمات واسط گراÙیک" #: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" -msgstr "" +msgstr "خطای داخلی LZO - Ùشرده سازی با شکست مواجه شد" #: Source/Core/Core/Src/State.cpp:348 #, c-format @@ -2859,44 +3140,46 @@ msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" +"خطای داخلی LZO - ناهمÙشرده سازی با شکست مواجه شد (%d) (%li, %li) \n" +"سعی مجدد برای بار گذاری وضعیت" #: Source/Core/Core/Src/State.cpp:485 msgid "Internal LZO Error - lzo_init() failed" -msgstr "" +msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 msgid "Internal Resolution:" -msgstr "سایز داخلی:" +msgstr "وضوح داخلی:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 msgid "Interpreter (VERY slow)" -msgstr "" +msgstr "Ù…Ùسر (بسیار کند)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Intro" -msgstr "" +msgstr "صÙحه نخست" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:194 #, c-format msgid "Invalid Size(%x) or Magic word (%x)" -msgstr "سایز نا معتبر (%x) یا Magic word (%x)" +msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 msgid "Invalid Value!" -msgstr "مقدار نا معتبر" +msgstr "مقدار نامعتبر!" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 msgid "Invalid bat.map or dir entry" -msgstr "bat.map نا معتبر یا ورودی پوشه" +msgstr "bat.map نامعتبر یا ورودی پوشه" #: Source/Core/Core/Src/CoreTiming.cpp:548 #, c-format msgid "Invalid event type %i" -msgstr "واقعه نا معتبر %i" +msgstr "نوع واقعه نامعتبر %i" #: Source/Core/Core/Src/HW/DVDInterface.cpp:326 msgid "Invalid file" -msgstr "سند نا معتبر" +msgstr "Ùایل نامعتبر" #: Source/Core/DiscIO/Src/BannerLoaderGC.cpp:40 #, c-format @@ -2905,32 +3188,35 @@ msgid "" "%s\n" " You may need to redump this game." msgstr "" +"در gcm زیر opening.bnr نامعتبر پیدا شد:\n" +"%s\n" +"شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید." #: Source/Core/Core/Src/Movie.cpp:722 msgid "Invalid recording file" -msgstr "سند ضبط نا معتبر" +msgstr "Ùایل ضبط نامعتبر" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "پارامتر های جستجوی نامعتبر (هیچ شیئ انتخاب نشده)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" -msgstr "" +msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عدد نیست)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "رشته جستجوی نامعتبر (Ùقط رشته های با طول زوج پشتیبانی Ù…ÛŒ شود)" #: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" -msgstr "وضیعت نا معتبر" +msgstr "وضعیت نامعتبر" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Italian" -msgstr "ایتالیائی" +msgstr "ایتالیایی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:188 msgid "JAPAN" @@ -2938,11 +3224,11 @@ msgstr "ژاپن" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 msgid "JIT Recompiler (recommended)" -msgstr "" +msgstr "ری کامپایلر جیت (تایید شده)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 msgid "JITIL experimental recompiler" -msgstr "" +msgstr "ری کامپایلر آزمایشی جیتیل" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 @@ -2959,10 +3245,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"Ù†Ú¯Ù‡ داشتن پنجره بازی بر روی پنجره های دیگر.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" -msgstr "" +msgstr "پنجره را بر راس Ù†Ú¯Ù‡ دار" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 @@ -2977,16 +3266,16 @@ msgstr "کره ای" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 msgid "L" -msgstr "" +msgstr "ال" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:39 msgid "L Button" -msgstr "" +msgstr "دکمه ال" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "" +msgstr "ال آنالوگ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" @@ -2994,12 +3283,12 @@ msgstr "زبان:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:166 msgid "Last Overwritten State" -msgstr "آخرین State بازنویسی شده" +msgstr "آخرین وضعیت بازنویسی شده" #: Source/Core/DolphinWX/Src/FrameTools.cpp:173 #: Source/Core/DolphinWX/Src/FrameTools.cpp:175 msgid "Last Saved State" -msgstr "آخرین State ذخیره شده" +msgstr "آخرین وضعیت ذخیره شده" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -3008,7 +3297,7 @@ msgstr "Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60 msgid "Left Stick" -msgstr "" +msgstr "استیک Ú†Ù¾" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 @@ -3016,6 +3305,8 @@ msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" +"کلیک Ú†Ù¾ برای کش٠کلیدهای Ùوری.\n" +"کلید Ùاصله برای پاک کردن." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 msgid "" @@ -3023,81 +3314,86 @@ msgid "" "Middle-click to clear.\n" "Right-click for more options." msgstr "" +"کلیک Ú†Ù¾ برای کش٠ورودی.\n" +"کلیک وسط برای پاک کردن.\n" +"کلیک راست برای گزینه های بیشتر." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" +"کلیک Ú†Ù¾/راست برای گزینه های بیشتر.\n" +"کلیک وسط برای پاک کردن." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 msgid "Less Than" -msgstr "" +msgstr "کمتر از" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 msgid "Limit by FPS" -msgstr "" +msgstr "محدود کردن توسط تعداد Ùریم ها بر ثانیه" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Load" -msgstr "بارگیری" +msgstr "بارگذاری" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Load Custom Textures" -msgstr "بارگیری باÙت اشیاء دلخواه" +msgstr "بارگذاری باÙت اشیاء دلخواه" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 1" -msgstr "بارگیری State شکا٠۱" +msgstr "بارگذاری وضعیت - شکا٠۱" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 2" -msgstr "بارگیری State شکا٠۲" +msgstr "بارگذاری وضعیت - شکا٠۲" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 3" -msgstr "بارگیری State شکا٠۳" +msgstr "بارگذاری وضعیت - شکا٠۳" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 4" -msgstr "بارگیری State شکا٠۴" +msgstr "بارگذاری وضعیت - شکا٠۴" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 msgid "Load State Slot 5" -msgstr "بارگیری State شکا٠۵" +msgstr "بارگذاری وضعیت - شکا٠۵" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Load State Slot 6" -msgstr "بارگیری State شکا٠۶" +msgstr "بارگذاری وضعیت - شکا٠۶" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Load State Slot 7" -msgstr "بارگیری State شکا٠۷" +msgstr "بارگذاری وضعیت - شکا٠۷" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" -msgstr "بارگیری State شکا٠۸" +msgstr "بارگذاری وضعیت - شکا٠۸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:169 msgid "Load State..." -msgstr "بارگیری State..." +msgstr "بارگذاری وضعیت..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 msgid "Load Wii System Menu" -msgstr "" +msgstr "بارگذاری منوی سیستم ÙˆÛŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 #, c-format msgid "Load Wii System Menu %d%c" -msgstr "" +msgstr "بارگذاری منوی سیستم ÙˆÛŒ %d%c" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 msgid "" @@ -3105,10 +3401,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"بارگذاری باÙت اشیاء دستی از User/Load/Textures/game_id/\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "" +msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای Ù‡Ú© موجود است." #: Source/Core/DolphinWX/Src/NetWindow.cpp:589 msgid "Local" @@ -3116,23 +3415,23 @@ msgstr "محلی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Lock Threads to Cores" -msgstr "" +msgstr "Ù‚ÙÙ„ کردن ریسمان ها به هسته های پردازنده (اینتل اچ تی)" #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" -msgstr "ثبت وقايع" +msgstr "ثبت وقایع" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 msgid "Log Configuration" -msgstr "تنضیمات ثبت وقايع" +msgstr "پیکر بندی ثبت وقایع" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "ثبت Ùریم بر ثانیه به Ùایل" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" -msgstr "نوع ثبت وقايع" +msgstr "انواع ثبت وقایع" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" @@ -3141,23 +3440,27 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"ثبت تعداد Ùریم های پردازش شده در هر ثانیه به User/Logs/fps.txt. زمانی از این " +"ویژگی استÙاده کنید Ú©Ù‡ میخواهید کارائى دلÙین را بسنجید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 msgid "Logger Outputs" -msgstr "خروجی ثبت وقايع" +msgstr "خروجی های واقعه نگار" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 #: Source/Core/DolphinWX/Src/Frame.cpp:399 msgid "Logging" -msgstr "در حال ثبت وقايع" +msgstr "واقعه نگاری" #: Source/Core/Core/Src/NetPlayClient.cpp:255 msgid "Lost connection to server!" -msgstr "" +msgstr "ارتباط با سرور قطع شد!" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:42 msgid "M Button" -msgstr "" +msgstr "دکمه ام" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:119 #, c-format @@ -3165,20 +3468,22 @@ msgid "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" msgstr "" +"Ú†Ú© سام MD5 ناهمسان است\n" +" %016llx%016llx != %016llx%016llx" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "MMU Speed Hack" -msgstr "" +msgstr "Ù‡Ú© کردن سرعت واحد مدیریت حاÙظه" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:525 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:561 msgid "MadCatz Gameshark files(*.gcs)" -msgstr "" +msgstr "Ùایل های گیم شارک مد کتذ (*.gcs)" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:76 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:51 msgid "Main Stick" -msgstr "" +msgstr "استیک اصلی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 msgid "Maker ID:" @@ -3195,15 +3500,15 @@ msgstr "حداکثر" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 msgid "Memcard already has a save for this title" -msgstr "" +msgstr "کارت حاÙظه Ùایل ذخیره برای این عنوان را دارد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 msgid "Memcard already opened" -msgstr "" +msgstr "کارت حاÙظه قبلا باز شده است" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 msgid "Memory Byte" -msgstr "" +msgstr "بایت حاÙظه" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 @@ -3215,6 +3520,8 @@ msgid "" "Memory Card Manager WARNING-Make backups before using, should be fixed but " "could mangle stuff!" msgstr "" +"اخطار: قبل از استÙاده از کارت حاÙظه بک آپ بگیرید، شاید درست شود اما اطلاعات " +"از بین خواهد رÙت!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3226,10 +3533,16 @@ msgid "" "%s\n" "Would you like to copy the old file to this new location?\n" msgstr "" +"اسم کارت حاÙظه در شکا٠%c ناقص است\n" +"منطقه مشخص نشده است\n" +"\n" +"مسیر شکا٠%c تغییر کرده است به\n" +"%s\n" +"آیا مایل هستید Ùایل قبلی را به مکان جدید Ú©Ù¾ÛŒ کنید؟\n" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "" +msgstr "سایز کارت حاÙظه با سرخط تطابق ندارد" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" @@ -3255,7 +3568,7 @@ msgstr "تنظیمات متÙرقه" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:240 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:294 msgid "Modifier" -msgstr "" +msgstr "پیراینده" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" @@ -3264,14 +3577,18 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"تغییر باÙت اشیاء برای نمایش قالبی Ú©Ù‡ در آن کدگشایی شده اند. شروع دوباره " +"برابرسازی در اکثر موارد لازم است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/LogWindow.cpp:131 msgid "Monospaced font" -msgstr "" +msgstr "Ùونت هم عرض" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 msgid "Motion Plus" -msgstr "" +msgstr "موشن پلاس" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 @@ -3288,6 +3605,14 @@ msgid "" "\n" "\n" msgstr "" +"اشاره گر ماوس را بر روی گزینه ها حرکت دهید تا تشریح با جزئیات نمایش داده " +"شود.\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:75 msgid "Multiply" @@ -3298,98 +3623,100 @@ msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." msgstr "" +"Ø®ÙÙ‡ کردن اسپیکر ویموت. درست کردن قطعی های تصادÙÛŒ ویموت های واقعی. هیچ تاثیری " +"بر ویموت های برابرسازی شده ندارد." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" -msgstr "" +msgstr "ناپ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "توجه: سایز مسیل با طول حقیقی داده برابر نیست\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" -msgstr "" +msgstr "اضاÙÙ‡ کردن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:124 msgid "NP Begin" -msgstr "" +msgstr "شروع ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:132 msgid "NP Decimal" -msgstr "" +msgstr "دسیمال ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:126 msgid "NP Delete" -msgstr "" +msgstr "حذ٠ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:133 msgid "NP Divide" -msgstr "" +msgstr "جداکردن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:120 msgid "NP Down" -msgstr "" +msgstr "پایین ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:123 msgid "NP End" -msgstr "" +msgstr "پایان ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:111 msgid "NP Enter" -msgstr "" +msgstr "وارد شدن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:127 msgid "NP Equal" -msgstr "" +msgstr "یکسان ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:116 msgid "NP Home" -msgstr "" +msgstr "خانه ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:125 msgid "NP Insert" -msgstr "" +msgstr "درج ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:117 msgid "NP Left" -msgstr "" +msgstr "Ú†Ù¾ ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:128 msgid "NP Multiply" -msgstr "" +msgstr "تکثیر ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:122 msgid "NP Page Down" -msgstr "" +msgstr "صÙحه پایین ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:121 msgid "NP Page Up" -msgstr "" +msgstr "صÙحه بالا ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:119 msgid "NP Right" -msgstr "" +msgstr "راست ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:130 msgid "NP Separator" -msgstr "" +msgstr "جدا ساز ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:109 msgid "NP Space" -msgstr "" +msgstr "Ùاصله ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:131 msgid "NP Subtract" -msgstr "" +msgstr "کاستن ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:110 msgid "NP Tab" -msgstr "" +msgstr "تب ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:118 msgid "NP Up" -msgstr "" +msgstr "بالا ان Ù¾ÛŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 @@ -3407,11 +3734,11 @@ msgstr "اسم:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:524 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:560 msgid "Native GCI files(*.gci)" -msgstr "" +msgstr "Ùایل های جی سی Ø¢ÛŒ محلی(*.gci)" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 msgid "New Scan" -msgstr "" +msgstr "پویش جدید" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 @@ -3420,72 +3747,72 @@ msgstr "صÙحه بعد" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 msgid "Next Scan" -msgstr "" +msgstr "پویش بعدی" #: Source/Core/DolphinWX/Src/NetWindow.cpp:51 msgid "Nickname :" -msgstr "اسم مستعار" +msgstr "اسم مستعار :" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:201 msgid "No Country (SDK)" -msgstr "" +msgstr "بدون کشور (SDK)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 msgid "No ISOs or WADS found" -msgstr "هیچ ISO Ùˆ یا WAD یاÙت نشده است" +msgstr "هیچ آیزو یا وادی پیدا نشد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:508 #, c-format msgid "No banner file found for title %s" -msgstr "" +msgstr "Ùایل نشان برای عنوان %s پیدا نشد" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" -msgstr "" +msgstr "تشریحی دردسترس نیست" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" -msgstr "" +msgstr "بدون جاخالی کردن" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 msgid "No file loaded" -msgstr "هیچ سندی بارگیری نشده است" +msgstr "هیچ Ùایلی بارگذاری نشده" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 msgid "No free dir index entries" -msgstr "" +msgstr "بدون مقادیر اطلاعاتی Ùهرست پوشه آزاد" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 msgid "No recorded file" -msgstr "" +msgstr "بدون Ùایل ضبط شده" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:501 #, c-format msgid "No save folder found for title %s" -msgstr "" +msgstr "پوشه Ùایل ذخیره برای عنوان %s پیدا نشد" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 #: Source/Core/DolphinWX/Src/NetWindow.cpp:597 msgid "None" -msgstr "هیچکدام" +msgstr "هیچ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Norwegian Bokmaal" -msgstr "بوکمال" +msgstr "بوکمال نروژی" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Not Equal" -msgstr "" +msgstr "برابر نیست" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 msgid "Not Set" -msgstr "" +msgstr "ست نشده است" #: Source/Core/DolphinWX/Src/Main.cpp:595 msgid "Not connected" -msgstr "" +msgstr "متصل نشده است" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 msgid "Notes" @@ -3506,20 +3833,20 @@ msgstr "توجه" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:105 msgid "Num Lock" -msgstr "" +msgstr "Ù‚ÙÙ„ کلید نام لاک" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 msgid "Number Of Codes: " -msgstr "" +msgstr "تعداد کدها:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 msgid "Nunchuk" -msgstr "" +msgstr "ننچاک" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 msgid "Nunchuk Acceleration" -msgstr "" +msgstr "شتاب دهنده ننچاک" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 msgid "Object" @@ -3527,7 +3854,7 @@ msgstr "شیی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 msgid "Object Range" -msgstr "" +msgstr "محدوده شیی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 msgid "Off" @@ -3535,16 +3862,16 @@ msgstr "خاموش" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:61 msgid "Offset:" -msgstr "" +msgstr "اÙست:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "پیام های روی صÙحه نمایش" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format msgid "Only %d blocks available" -msgstr "" +msgstr "Ùقط بلوک های %d موجود است" #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 @@ -3554,42 +3881,42 @@ msgstr "گشودن" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 msgid "Open &containing folder" -msgstr "" +msgstr "باز کردن پوشه &شامل" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 msgid "Open Wii &save folder" -msgstr "" +msgstr "باز کردن پوشه &ذخیره ÙˆÛŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." -msgstr "گشودن سند" +msgstr "گشودن Ùایل..." #: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 #, c-format msgid "OpenAL: can't create context for device %s" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در ساخت زمینه برای دستگاه %s" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 msgid "OpenAL: can't find sound devices" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در پیدا کردن دستگاهای صدا" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 #, c-format msgid "OpenAL: can't open device %s" -msgstr "" +msgstr "اپن ای ال (OpenAL): ناتوان در باز کردن دستگاه صدا %s" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" -msgstr "" +msgstr "کدبرداری باÙت اشیاء توسط OpenCL" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 msgid "OpenMP Texture Decoder" -msgstr "" +msgstr "کدبرداری باÙت اشیاء توسط OpenMP" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" -msgstr "اختیارات" +msgstr "گزینه ها" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Orange" @@ -3601,6 +3928,9 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" +"ترتیب Ùایل ها در پوشه Ùایل با ترتیب بلوک یکسان نیست\n" +"کلیک راست کنید Ùˆ تمام ذخیره ها را صادر کنید،\n" +"Ùˆ ذخیره ها را به کارت حاÙظه ای جدید وارد کنید\n" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 @@ -3612,6 +3942,8 @@ msgid "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." msgstr "" +"مشتری دیگری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی غیر Ùعال است. بازی " +"را دستی متوق٠کنید." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -3619,7 +3951,7 @@ msgstr "خروجی" #: Source/Core/DolphinWX/Src/FrameTools.cpp:356 msgid "P&lay Recording..." -msgstr "" +msgstr "ض&بط کردن بازی..." #: Source/Core/Core/Src/HW/GCPad.cpp:29 msgid "Pad" @@ -3635,7 +3967,7 @@ msgstr "گیم پد ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:108 msgid "Page Down" -msgstr "صÙحه پائینی" +msgstr "صÙحه پايينی" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:107 msgid "Page Up" @@ -3643,20 +3975,20 @@ msgstr "صÙحه بالایی" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 msgid "Pair Up" -msgstr "" +msgstr "جÙت شدن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:35 msgid "Paragraph" -msgstr "" +msgstr "پاراگراÙ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:63 msgid "Parameters" -msgstr "" +msgstr "پارامترها" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 #, c-format msgid "Partition %i" -msgstr "" +msgstr "پارتیشن %i" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 msgid "Patches" @@ -3674,11 +4006,11 @@ msgstr "Ù…Ú©Ø«" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "Ù…Ú©Ø« در پایان Ùیلم" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" -msgstr "" +msgstr "نورپردازی به ازای هر پیکسل" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 msgid "Perfect" @@ -3687,7 +4019,7 @@ msgstr "کامل" #: Source/Core/DolphinWX/Src/FrameAui.cpp:608 #, c-format msgid "Perspective %d" -msgstr "" +msgstr "چشم انداز %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 #: Source/Core/DolphinWX/Src/FrameTools.cpp:438 @@ -3712,7 +4044,7 @@ msgstr "قابل بازی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 msgid "Playback Options" -msgstr "" +msgstr "گزینه های بازنواخت" #: Source/Core/DolphinWX/Src/NetWindow.cpp:287 msgid "Players" @@ -3724,11 +4056,11 @@ msgstr "لطÙا تایید کنید..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:578 msgid "Please create a perspective before saving" -msgstr "" +msgstr "لطÙا قبل از ذخیره کردن یک چشم انداز بسازید" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:36 msgid "Plus-Minus" -msgstr "" +msgstr "مینوس پلاس" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Polish" @@ -3757,11 +4089,11 @@ msgstr "درگاه :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Portuguese" -msgstr "پرتقال" +msgstr "پرتقالی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Portuguese (Brazilian)" -msgstr "پرتقال" +msgstr "پرتقالی (برزیلی)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 msgid "Post-Processing Effect:" @@ -3770,21 +4102,21 @@ msgstr "اÙکت ها:" #: Source/Core/Core/Src/Movie.cpp:929 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در کنترل کننده پخش. %u + 8 > %u" #: Source/Core/Core/Src/Movie.cpp:1048 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u + %d > %u" #: Source/Core/Core/Src/Movie.cpp:1025 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" -msgstr "" +msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u > %u" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:47 msgid "Presets: " -msgstr "حالت های از پيش تنظيم شده" +msgstr "حالت های از پیش تنظیم شده:" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:203 msgid "Prev Page" @@ -3804,15 +4136,15 @@ msgstr "چاپ" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 msgid "Profile" -msgstr "" +msgstr "پروÙایل" #: Source/Core/DolphinWX/Src/ISOProperties.h:55 msgid "Properties" -msgstr "" +msgstr "خواص" #: Source/Core/DolphinWX/Src/FrameTools.cpp:297 msgid "Purge Cache" -msgstr "" +msgstr "پاکسازی حاÙظه ميانى" #: Source/Core/Common/Src/MsgHandler.cpp:66 msgid "Question" @@ -3826,20 +4158,20 @@ msgstr "خارج شدن" #. i18n: Right #: Source/Core/Core/Src/HW/GCPadEmu.cpp:59 msgid "R" -msgstr "" +msgstr "آر" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:40 msgid "R Button" -msgstr "" +msgstr "دکمه آر" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "" +msgstr "آر آنالوگ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" -msgstr "" +msgstr "حاÙطه رم" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:180 msgid "RUSSIA" @@ -3860,19 +4192,19 @@ msgstr "واقعی" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 msgid "Real Wiimote" -msgstr "Wiimote واقعی" +msgstr "ویموت واقعی" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 msgid "Real Wiimotes" -msgstr "ویموت واقعی" +msgstr "ویموت های واقعی" #: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" -msgstr "" +msgstr "تایید اتصال ویموت" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Reconnect Wiimote on State Loading" -msgstr "" +msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 @@ -3882,11 +4214,11 @@ msgstr "ضبط" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 msgid "Recording Info" -msgstr "" +msgstr "اطلاعات ضبط" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 msgid "Recording Options" -msgstr "" +msgstr "گزینه های ضبط" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Red" @@ -3894,11 +4226,11 @@ msgstr "قرمز" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:24 msgid "Red Left" -msgstr "" +msgstr "قرمز Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:25 msgid "Red Right" -msgstr "" +msgstr "قرمز راست" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" @@ -3908,6 +4240,12 @@ msgid "" "\n" "If unsure, select None." msgstr "" +"مقدار بدنمایی تصویر (آلیاسینگ) ایجاد شده از طریق بیت مپ ساختن تصاویر گراÙیک " +"سه بعدی را کاهش Ù…ÛŒ دهد.\n" +"این امر سبب Ù…ÛŒ شود لبه های تصویر پردازش شده هموارتر به نظر برسد.\n" +"سرعت برابرسازی را به شدت کاهش میدهد Ùˆ گاهی اوقات مسائلی را سبب Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، \"هیچ\" را انتخاب کنید." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 #: Source/Core/DolphinWX/Src/FrameTools.cpp:435 @@ -3937,10 +4275,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش صحنه به صورت Ùریم سیمی.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 msgid "Render to Main Window" -msgstr "نمایش در صÙحه اصلی" +msgstr "نمایش در پنجره اصلی" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 @@ -3963,7 +4304,7 @@ msgstr "راست" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61 msgid "Right Stick" -msgstr "" +msgstr "استیک راست" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 @@ -3973,6 +4314,8 @@ msgstr "شوک" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" +"اجرای شبیه ساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه (توصیه " +"نمی شود)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Russian" @@ -3980,7 +4323,7 @@ msgstr "روسی" #: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Sa&ve State" -msgstr "ذخ&یره State" +msgstr "ذخ&یره وضعیت" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Safe" @@ -3988,7 +4331,7 @@ msgstr "بی خطر" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 msgid "Sample Rate:" -msgstr "نرخ نمونه برداری صدا" +msgstr "نرخ نمونه برداری:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 #: Source/Core/DolphinWX/Src/FrameTools.cpp:460 @@ -3998,125 +4341,124 @@ msgstr "ذخیره" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:530 msgid "Save GCI as..." -msgstr "ذخیره GCI با عنوان" +msgstr "ذخیره جی سی Ø¢ÛŒ بعنوان..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" -msgstr "ذخیره State شکا٠۱" +msgstr "ذخیره وضعیت - شکا٠۱" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" -msgstr "ذخیره State شکا٠۲" +msgstr "ذخیره وضعیت - شکا٠۲" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" -msgstr "ذخیره State شکا٠۳" +msgstr "ذخیره وضعیت - شکا٠۳" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" -msgstr "ذخیره State شکا٠۴" +msgstr "ذخیره وضعیت - شکا٠۴" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" -msgstr "ذخیره State شکا٠۵" +msgstr "ذخیره وضعیت - شکا٠۵" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" -msgstr "ذخیره State شکا٠۶" +msgstr "ذخیره وضعیت - شکا٠۶" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" -msgstr "ذخیره State شکا٠۷" +msgstr "ذخیره وضعیت - شکا٠۷" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" -msgstr "ذخیره State شکا٠۸" +msgstr "ذخیره وضعیت - شکا٠۸" #: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." -msgstr "ذخیره State..." +msgstr "ذخیره وضعیت..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 msgid "Save as..." -msgstr "ذخیره با عنوان" +msgstr "ذخیره بعنوان..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 msgid "Save compressed GCM/ISO" -msgstr "ذخیره GCM/ISO Ùشرده" +msgstr "ذخیره جی سی ام/آیزو Ùشرده شده" #: Source/Core/DolphinWX/Src/FrameTools.cpp:460 msgid "Save current perspective" -msgstr "" +msgstr "دخیره چشم انداز Ùعلی" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" -msgstr "ذخیره GCM/ISO ناهمÙشرده" +msgstr "ذخیره جی سی ام/آیزو ناهمÙشرده شده" #: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" +msgstr "ذخیره وضعیت Ùیلم %s خراب است، ضبط Ùیلم میایستد..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" -msgstr "" +msgstr "Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB) تغییر سایز یاÙته" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 #, c-format msgid "Scanning %s" -msgstr "" +msgstr "در حال پویش %s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 msgid "Scanning for ISOs" -msgstr "" +msgstr "پویش برای Ùایل های آیزو" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 msgid "Scanning..." -msgstr "" +msgstr "در حال پویش..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" -msgstr "" +msgstr "عکس Ùوری" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:106 msgid "Scroll Lock" -msgstr "" +msgstr "اسکرول لاک" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 -#, fuzzy msgid "Search" -msgstr "جوستجو برای کد تقلب" +msgstr "جستجو" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" -msgstr "" +msgstr "Ùیلتر جستجو" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 msgid "Search Subfolders" -msgstr "" +msgstr "جستجوی پوشه های Ùرعی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 msgid "Search current Object" -msgstr "" +msgstr "جستجوی موضوع Ùعلی" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" -msgstr "" +msgstr "جستجو برای مقدار هگزا:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" -msgstr "" +msgstr "بخش %s در SYSCONF پیدا نشد" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 @@ -4126,42 +4468,45 @@ msgstr "انتخاب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:762 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 msgid "Select The Recording File" -msgstr "انتخاب سند ضبط شده" +msgstr "انتخاب Ùایل ضبط شده" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 msgid "Select a Wii WAD file to install" -msgstr "انتخاب سند Wii WAD برای نصب" +msgstr "انتخاب Ùایل ÙˆÛŒ واد برای نصب" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Select a hardware adapter to use.\n" "\n" "If unsure, use the first one." -msgstr "انتخاب آداپتور سخت اÙزاری" +msgstr "" +"یک آداپتور سخت اÙزاری برای استÙاده انتخاب کنید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، گزینه اول را انتخاب کنید." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:518 msgid "Select a save file to import" -msgstr "انتخاب سند Save برای وارد کردن" +msgstr "یک Ùایل ذخیره برای وارد کردن انتخاب کنید" #: Source/Core/DolphinWX/Src/FrameAui.cpp:362 msgid "Select floating windows" -msgstr "انتخاب پنجره شناور" +msgstr "انتخاب پنجره های شناور" #: Source/Core/DolphinWX/Src/FrameTools.cpp:665 msgid "Select the file to load" -msgstr "انتخاب سند برای بارگیری" +msgstr "انتخاب Ùایل برای بارگذاری" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 msgid "Select the save file" -msgstr "انتخاب سند Save" +msgstr "انتخاب Ùایل ذخیره" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 msgid "Select the state to load" -msgstr "انتخاب State برای بارگیری" +msgstr "انتخاب وضعیت برای بارگذاری" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 msgid "Select the state to save" -msgstr "انتخاب State برای ذخیره" +msgstr "انتخاب وضعیت برای ذخیره" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" @@ -4173,6 +4518,14 @@ msgid "" "\n" "If unsure, select Auto." msgstr "" +"انتخاب کنید زمانی Ú©Ù‡ پردازش تصویر انجام Ù…ÛŒ شود کدام نسبت طول به عرض استÙاده " +"شود:\n" +"اتوماتیک: نسبت طول به عرض معین استÙاده Ù…ÛŒ شود\n" +"Û±Û¶:Û¹ به اجبار: کشیدن تصویر به نسبت طول به عرض Û±Û¶:Û¹.\n" +"Û´:Û³ به اجبار: کشیدن تصویر به نسبت طول به عرض Û´:Û³.\n" +"کشیدن به پنجره: کشیدن تصویر به اندازه پنجره.\n" +"\n" +"اگر در این مورد اطمینان ندارید، اتوماتیک را انتخاب کنید." #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4187,6 +4540,13 @@ msgid "" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" +"انتخاب Ù…ÛŒ کند وضوح تصویری را Ú©Ù‡ در حالت تمام صÙحه استÙاده شده است.\n" +"این اندازه باید همیشه بزرگ تر یا برابر با وضوح داخلی باشد. تاثیر این بر " +"کارائى ناچیز است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از وضوح میز کارتان استÙاده کنید.\n" +"اگر همچنان اطمینان ندارید، از بالاترین وضوحی Ú©Ù‡ برای شما کار Ù…ÛŒ کند استÙاده " +"کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" @@ -4197,6 +4557,13 @@ msgid "" "\n" "If unsure, use Direct3D 9." msgstr "" +"انتخاب کنید Ú©Ù‡ Ú†Ù‡ رابط گراÙیکی به طور داخلی بکار گرÙته شود.\n" +"معمولا Direct3D Û¹ سریع ترین است. گرچه OpenGL دقیق تر است. Direct3D Û±Û± چیزی " +"است بین این دو.\n" +"توجه داشته باشید Ú©Ù‡ پشتوانه Direct3D Ùقط در ویندوز موجود است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از Direct3D Û¹ برای ویندوز Ùˆ از OpenGL برای " +"گینو لینوکس/مکینتاش استÙاده کنید." #: Source/Core/DolphinWX/Src/NetWindow.cpp:274 msgid "Send" @@ -4204,7 +4571,7 @@ msgstr "Ùرستادن" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 msgid "Sensor Bar Position:" -msgstr "" +msgstr "موقعیت سنسور بار:" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:77 msgid "Separator" @@ -4218,32 +4585,36 @@ msgstr "صربستانی" msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" +"درگاه سریال Û± - این درگاهی است Ú©Ù‡ دستگاه هایی مانند آداپتور شبکه از آن " +"استÙاده Ù…ÛŒ کنند" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" -msgstr "نصب" +msgstr "ست" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 msgid "Set as &default ISO" -msgstr "" +msgstr "ست کردن بعنوان آیزو &پیش Ùرض" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 #, c-format msgid "Set as default Memcard %c" -msgstr "" +msgstr "ست کردن بعنوان کارت حاÙظه پیش Ùرض %c" #: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" +"ست کردن کد اکشن ریپلی_Ùعال است: Ùهرست بزرگتر از سایز لیست کد اکشن ریپلی است " +"%lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Settings..." -msgstr "تنظیمات" +msgstr "تنظیمات..." #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" -msgstr "" +msgstr "برپاکردن حاÙظه ÙˆÛŒ: ناتوان در پیدا کردن Ùایل تنظیم" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 msgid "Shake" @@ -4254,9 +4625,8 @@ msgid "Short Name:" msgstr "اسم کوتاه:" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103 -#, fuzzy msgid "Shoulder Buttons" -msgstr "دکمه ها" +msgstr "دکمه های شانه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" @@ -4264,15 +4634,15 @@ msgstr "نمایش &میز Ùرمان" #: Source/Core/DolphinWX/Src/FrameTools.cpp:229 msgid "Show &Log" -msgstr "نمایش &ثبت وقايع" +msgstr "نمایش &ثبت وقایع" #: Source/Core/DolphinWX/Src/FrameTools.cpp:226 msgid "Show &Statusbar" -msgstr "نمایش &نوار وضیعت" +msgstr "نمایش نوار &وضعیت" #: Source/Core/DolphinWX/Src/FrameTools.cpp:224 msgid "Show &Toolbar" -msgstr "نمایش &نوار ابزار" +msgstr "نمایش نوار &ابزار" #: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "Show Drives" @@ -4280,11 +4650,11 @@ msgstr "نمایش درایوها" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 msgid "Show EFB Copy Regions" -msgstr "نمایش منطقه Ú©Ù¾ÛŒ EFB" +msgstr "نمایش مناطق Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Show FPS" -msgstr "نمایش Ùریم بر سانیه" +msgstr "نمایش Ùریم بر ثانیه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:285 msgid "Show France" @@ -4292,7 +4662,7 @@ msgstr "نمایش Ùرانسه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show GameCube" -msgstr "نمایش GameCube" +msgstr "نمایش گیم کیوب" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 msgid "Show Input Display" @@ -4316,19 +4686,19 @@ msgstr "نمایش زبان:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "Show Log &Configuration" -msgstr "نمایش ثبت وقايع" +msgstr "نمایش &پیکربندی ثبت وقایع" #: Source/Core/DolphinWX/Src/FrameTools.cpp:280 msgid "Show PAL" -msgstr "نمایش PAL" +msgstr "نمایش پال" #: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show Platforms" -msgstr "نمایش پایگاه" +msgstr "نمایش پایگاه ها" #: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Regions" -msgstr "نمایش منطقه" +msgstr "نمایش مناطق" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Show Statistics" @@ -4340,19 +4710,19 @@ msgstr "نمایش تایوان" #: Source/Core/DolphinWX/Src/FrameTools.cpp:282 msgid "Show USA" -msgstr "نمایش آمریکا" +msgstr "نمایش ایالات متحده آمریکا" #: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" -msgstr "نمایش Wad" +msgstr "نمایش واد" #: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" -msgstr "نمایش Wii" +msgstr "نمایش ÙˆÛŒ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "Show a confirmation box before stopping a game." -msgstr "نمایش پنجره تعید قبل از متوق٠کردن بازی" +msgstr "نمایش پنجره تایید قبل از متوق٠کردن بازی." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" @@ -4360,15 +4730,18 @@ msgid "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" +"نمایش یک پنجره پیام زمانی Ú©Ù‡ خطای جدی رخ داده است.\n" +"غیر Ùعال کردن این گزینه شاید از نمایش پیام های غیر ضروری Ùˆ آزار دهنده پیش " +"گیری کند، اما همچنین بدان معناست Ú©Ù‡ دلÙین بدون هیچ توضیحی بطور ناگهانی خراب " +"Ù…ÛŒ شود." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" -msgstr "" +msgstr "نمایش بلوک اول" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "نمایش زبان:" +msgstr "نمایش شمارنده تاخیر" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4376,22 +4749,25 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"نمایش پیام ها روی مناطق صÙحه برابرساز.\n" +"این پیام ها شامل نوشتن کارت حاÙظه، پشتوانه ویدیویی Ùˆ اطلاعات پردازشگر Ùˆ " +"پاکسازی حاÙظه نهانگاه جیت Ù…ÛŒ شود." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" -msgstr "" +msgstr "نمایش بلوک های ذخیره" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 msgid "Show save comment" -msgstr "" +msgstr "نمایش توضیح ذخیره" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 msgid "Show save icon" -msgstr "" +msgstr "نمایش تندیس ذخیره" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 msgid "Show save title" -msgstr "" +msgstr "نمایش عنوان ذخیره" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" @@ -4400,10 +4776,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش تعداد Ùریم های پردازش شده بر ثانیه به عنوان سنجش سرعت برابرساز.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Show unknown" -msgstr "" +msgstr "نمایش ناشناخته" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" @@ -4411,10 +4790,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"نمایش آمار های متÙرقه.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 msgid "Sideways Wiimote" -msgstr "" +msgstr "ویموت Ùرعی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 msgid "Simplified Chinese" @@ -4426,15 +4808,15 @@ msgstr "سایز" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 msgid "Skip BIOS" -msgstr "" +msgstr "جهش از روی بایوس" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 msgid "Skip Dest. Alpha Pass" -msgstr "" +msgstr "از قلم انداختن مقصد آلÙا پاس" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 msgid "Skip EFB Access from CPU" -msgstr "" +msgstr "از قلم انداختن دسترسی حاÙظه میانجی Ùریم جاساز شده (EFB) به پردازنده" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" @@ -4443,6 +4825,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"از قلم انداختن مقصد آلÙا پاس در بسیاری از بازی ها برای اÙکت های متÙرقه " +"گراÙیک استÙاده Ù…ÛŒ شود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 msgid "" @@ -4453,6 +4839,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"سرعت Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB) به رم را از طریق Ùدا کردن دقت " +"برابرسازی اندکی بالا Ù…ÛŒ برد.\n" +"همچنین بعضی اوقات Ú©ÛŒÙیت بصری را بالا Ù…ÛŒ برد.\n" +"اگر شما با مسئله ای مواجه شدید، بالا بردن دقت حاÙظه میانی باÙت اشیاء را " +"امتحان کنید یا این گزینه را غیر Ùعال کنید.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/FrameTools.cpp:388 #: Source/Core/DolphinWX/Src/FrameTools.cpp:400 @@ -4462,15 +4855,15 @@ msgstr "شکا٠%i" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 msgid "Slot A" -msgstr "شکا٠A" +msgstr "شکا٠ای" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 msgid "Slot B" -msgstr "شکا٠B" +msgstr "شکا٠بی" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:62 msgid "Snapshot" -msgstr "عکس Ùورى" +msgstr "عکس Ùوری" #: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 msgid "Software Renderer" @@ -4483,20 +4876,25 @@ msgid "" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" +"پشتوانه پردازش تصویر نرم اÙزار دستوری است Ú©Ù‡ کندتر از استÙاده کردن دیگر " +"پشتوانه ها است.\n" +"این گزینه تنها برای اهدا٠نسخه برداری Ù…Ùید است.\n" +"آیا شما واقعا قصد Ùعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان " +"ندارید، 'نه' را انتخاب کنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" -msgstr "تنضیمات صدا" +msgstr "تنظیمات صدا" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." -msgstr "" +msgstr "پشتوانه صدا %s معتبر نیست." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format msgid "Sound buffer creation failed: %s" -msgstr "" +msgstr "ایجاد حاÙظه میانجی صدا با شکست مواجه شد: %s" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:31 msgid "Space" @@ -4506,11 +4904,11 @@ msgstr "Ùضا" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Spanish" -msgstr "اسپانیائی" +msgstr "اسپانیایی" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Speaker Volume:" -msgstr "حجم صدای اسپیکر" +msgstr "حجم صدای اسپیکر:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" @@ -4523,18 +4921,25 @@ msgid "" "\n" "If unsure, select 640x528." msgstr "" +"مشخص کردن وضوح تصویر Ú©Ù‡ پردازش تصویر در آن انجام Ù…ÛŒ شود. وضوح تصویر بالا " +"Ú©ÛŒÙیت تصویر را بسیار زیاد بالا خواهد برد اما برای بازده بسیار سنگین است Ùˆ " +"ممکن است باعث اختلالاتی در برخی از بازی ها شود.\n" +"\"ضریب Û¶Û´Û°xÛµÛ²Û¸\" Ú©Ù…ÛŒ کندتر از \"سایز پنجره\" است اما حاصل مسائل کمتری است. " +"بطور کلی، هر چقدر وضوح داخلی پایین تر باشد، کارائى بهتر خواهد بود.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه \"Û¶Û´Û°xÛµÛ²Û¸\" را انتخاب کنید." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "Speed up Disc Transfer Rate" -msgstr "" +msgstr "بالا بردن نرخ نقل Ùˆ انتقال دادهای دیسک" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:243 msgid "Square Stick" -msgstr "" +msgstr "استیک مربع" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" -msgstr "" +msgstr "کنترولر استاندارد" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 @@ -4544,29 +4949,29 @@ msgstr "شروع" #: Source/Core/DolphinWX/Src/FrameTools.cpp:208 msgid "Start &NetPlay" -msgstr "" +msgstr "شروع &نت پلی" #: Source/Core/DolphinWX/Src/FrameTools.cpp:353 msgid "Start Re&cording" -msgstr "" +msgstr "شروع &ضبط" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 msgid "Start Recording" -msgstr "" +msgstr "شروع ضبط" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "State" -msgstr "" +msgstr "وضعیت" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 msgid "State Saves" -msgstr "" +msgstr "ذخیره های وضعیت" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" -msgstr "" +msgstr "استیک" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 #: Source/Core/DolphinWX/Src/FrameTools.cpp:439 @@ -4584,14 +4989,19 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" +"نگهداری Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده در باÙت اشیاء پردازشگر گراÙیک.\n" +"این گزینه دقیق نیست، اما برای اکثر بازی ها به خوبی کار Ù…ÛŒ کند Ùˆ نسبت به Ú©Ù¾ÛŒ " +"ای ا٠بی به رم سرعت را به شدت اÙزایش Ù…ÛŒ دهد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Stretch to Window" -msgstr "" +msgstr "کشیدن تصویر به سایز Ùعلی پنجره" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:43 msgid "Strum" -msgstr "" +msgstr "مرتعش کردن" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:78 msgid "Subtract" @@ -4600,15 +5010,15 @@ msgstr "کاستن" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:77 #, c-format msgid "Successfully exported file to %s" -msgstr "" +msgstr "صادر کردن Ùایل به %s با موÙقیت انجام شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:56 msgid "Successfully imported save files" -msgstr "" +msgstr "Ùایل های ذخیره با موÙقیت وارد شدند" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 msgid "Swing" -msgstr "" +msgstr "نوسان" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 @@ -4617,44 +5027,43 @@ msgstr "زبان سیستم:" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:196 msgid "TAIWAN" -msgstr "" +msgstr "تایوان" #: Source/Core/DolphinWX/Src/FrameTools.cpp:141 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 -#, fuzzy msgid "TAS Input" -msgstr "ورودی" +msgstr "ورودی تاس" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:28 msgid "Tab" -msgstr "" +msgstr "تب" #: Source/Core/DolphinWX/Src/FrameAui.cpp:509 msgid "Tab split" -msgstr "" +msgstr "جدا کردن تب" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:37 msgid "Table Left" -msgstr "" +msgstr "جدول Ú†Ù¾" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:38 msgid "Table Right" -msgstr "" +msgstr "جدول راست" #: Source/Core/DolphinWX/Src/FrameTools.cpp:369 #: Source/Core/DolphinWX/Src/FrameTools.cpp:441 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" -msgstr "" +msgstr "گرÙتن عکس Ùوری" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" -msgstr "" +msgstr "تارو کونگا (بنگوس)" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 msgid "Test" -msgstr "محک زدن" +msgstr "آزمودن" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Texture" @@ -4662,7 +5071,7 @@ msgstr "باÙت اشیاء" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 msgid "Texture Cache" -msgstr "ذخیره گاه باÙت اشیاء" +msgstr "حاÙظه ميانى باÙت اشیاء" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 msgid "Texture Format Overlay" @@ -4670,7 +5079,7 @@ msgstr "قالب بندی باÙت اشیاء" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" -msgstr "" +msgstr "واد با موÙقیت نصب شد" #: Source/Core/Core/Src/ActionReplay.cpp:197 msgid "The address is invalid" @@ -4678,11 +5087,11 @@ msgstr "آدرس بی اعتبار است" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:507 msgid "The checksum was successfully fixed" -msgstr "" +msgstr "Ú†Ú© سام با موÙقیت درست شد" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 msgid "The chosen directory is already in the list" -msgstr "" +msgstr "پوشه برگزیده قبلا در لیست بوده است" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 @@ -4692,6 +5101,8 @@ msgid "" "The file %s already exists.\n" "Do you wish to replace it?" msgstr "" +"Ùایل %s قبلا به وجود آمده.\n" +"آیا مایل هستید این Ùایل را جایگزین کنید؟" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format @@ -4699,28 +5110,30 @@ msgid "" "The file %s could not be opened for writing. Please check if it's already " "opened by another program." msgstr "" +"Ùایل %s نمی تواند برای نوشتن باز شود. لطÙا بررسی کنید Ú©Ù‡ این Ùایل قبلا توسط " +"برنامه دیگری باز نشده باشد." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." -msgstr "" +msgstr "Ùایل %s قبلا باز بود، سرخط Ùایل نوشته نخواهد شد." #: Source/Core/Core/Src/Boot/Boot.cpp:319 #, c-format msgid "The file you specified (%s) does not exist" -msgstr "" +msgstr "Ùایلی Ú©Ù‡ شما مشخص (%s) کرده اید وجود ندارد" #: Source/Core/DolphinWX/Src/FrameAui.cpp:627 msgid "The name can not be empty" -msgstr "" +msgstr "اسم نمی تواند خالی باشد" #: Source/Core/DolphinWX/Src/FrameAui.cpp:619 msgid "The name can not contain the character ','" -msgstr "" +msgstr "اسم نمی تواند شامل کاراکتر 'ØŒ' باشد" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "" +msgstr "نتیجه کد رمزگشایی شده اکشن ریپلی شامل هیچ خطی نیست." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" @@ -4729,37 +5142,42 @@ msgid "" "\n" "If unsure, use the rightmost value." msgstr "" +"هر Ú†Ù‡ قدر شما این گزینه را ایمن تر میزان کنید، برابرساز باÙت اشیاء به روز " +"شده Ú©Ù… تری را از رم از دست خواهد داد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، از Ú†Ù¾ ترین مقدار استÙاده کنید." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 msgid "The save you are trying to copy has an invalid file size" -msgstr "" +msgstr "سایز Ùایل ذخیره ای Ú©Ù‡ سعی در Ú©Ù¾ÛŒ کردن آن دارید بی اعتبار است" #: Source/Core/DolphinWX/Src/Main.cpp:352 msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" +"زبان انتخاب شده توسط سیستم شما پشتیبانی نمی شود. برگشت به زبان پیش Ùرض سیستم." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" -msgstr "" +msgstr "نسخه سرور Ùˆ نت پلی مشتری نا سازگار است!" #: Source/Core/Core/Src/NetPlayClient.cpp:40 msgid "The server is full!" -msgstr "" +msgstr "سرور پر شده است!" #: Source/Core/Core/Src/NetPlayClient.cpp:46 msgid "The server responded: the game is currently running!" -msgstr "" +msgstr "سرور پاسخ داد: بازی در حال اجراست!" #: Source/Core/Core/Src/NetPlayClient.cpp:49 msgid "The server sent an unknown error message!" -msgstr "" +msgstr "سرور یک پیغام خطای ناشناخته Ùرستاد!" #: Source/Core/Core/Src/CoreParameter.cpp:121 #, c-format msgid "The specified file \"%s\" does not exist" -msgstr "" +msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" #: Source/Core/Core/Src/ActionReplay.cpp:198 msgid "The value is invalid" @@ -4767,33 +5185,39 @@ msgstr "مقدار بی اعتبار است" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 msgid "Theme" -msgstr "" +msgstr "تم" #: Source/Core/DolphinWX/Src/FrameTools.cpp:603 msgid "Theme selection went wrong" -msgstr "" +msgstr "انتخاب تم اشتباه شد" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" +"باید بلیطی برای Û°Û°Û°Û°Û°Û°Û°Û±/Û°Û°Û°Û°Û°Û°Û°Û² وجود داشته باشد. نسخه برداری نند شما " +"احتمالا ناقص است." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" +"این تنظیمات تنظیمات هسته دلÙین را خنثی Ù…ÛŒ کند.\n" +"نامعین یعنی بازی از تنظیمات دلÙین استÙاده Ù…ÛŒ کند." #: Source/Core/Core/Src/ActionReplay.cpp:355 msgid "" "This action replay simulator does not support codes that modify Action " "Replay itself." msgstr "" +"این شبیه ساز اکشن ریپلی از کدهایی Ú©Ù‡ توسط خود اکشن ریپلی پیراسته شده باشد " +"پشتیبانی نمی کند." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." -msgstr "" +msgstr "این مورد میتواند سبب کند شدن منوی ÙˆÛŒ Ùˆ تعدادی از بازی ها شود." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" @@ -4805,6 +5229,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"این امکان به شما اجاز Ù…ÛŒ دهد تا جای دوربین در بازی را تغيير دهید.\n" +"کلید سمت راست ماوس را Ù†Ú¯Ù‡ دارید Ùˆ با حرکت ماوس دوربین را بگردانید. کلید Ø´ÛŒÙت " +"را Ù†Ú¯Ù‡ دارید Ùˆ با Ùشار یکی از کلید های ص/Ø´/س/ÛŒ دوربین را پله پله حرکت دهید " +"(Ø´ÛŒÙت+Û° برای حرکت سریع تر Ùˆ Ø´ÛŒÙت+Û¹ برای حرکت کندتر) Ùشار کلید Ø´ÛŒÙت+Ù‚ برای " +"بازنشاندن دوربین.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" @@ -4813,19 +5244,23 @@ msgid "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." msgstr "" +"این گزینه ریسمان های ویدیو Ùˆ پردازنده را جدا Ù…ÛŒ کند، بنابراین این ریسمان ها " +"Ù…ÛŒ توانند بر روی هسته های جداگانه اجرا شوند.\n" +"سبب اÙزایش چشم گیر سرعت روی کامپیوترهایی با بیش از یک هسته Ù…ÛŒ شود، اما " +"همچنین Ù…ÛŒ تواند خرابی های گاه Ùˆ بی گاه را سبب شود." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 msgid "This will let you Manually Edit the INI config file" -msgstr "" +msgstr "این مورد به شما اجازه خواهد داد تا Ùایل پیکربندی INI را ویرایش کنید" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 msgid "Threshold" -msgstr "" +msgstr "سرحد" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 msgid "Tilt" -msgstr "" +msgstr "لرزیدن" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 @@ -4839,18 +5274,18 @@ msgstr "به" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 msgid "Toggle All Log Types" -msgstr "" +msgstr "تبدیل انواع ثبت وقایع" #: Source/Core/DolphinWX/Src/FrameTools.cpp:440 #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Toggle Fullscreen" -msgstr "" +msgstr "تبدیل حالت تمام صÙحه" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 msgid "Top" -msgstr "اوج" +msgstr "بالا" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 msgid "Traditional Chinese" @@ -4858,21 +5293,23 @@ msgstr "چینی سنتی" #: Source/Core/Core/Src/Boot/Boot.cpp:413 msgid "Tried to load an unknown file type." -msgstr "" +msgstr "آزمایش برای بارگذاری Ùایل ناشناخته." #: Source/Core/Core/Src/HW/GCPadEmu.cpp:80 msgid "Triggers" -msgstr "" +msgstr "دکمه ها" #: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" -msgstr "" +msgstr "تلاش برای خواندن از روی SYSCONF نامعتبر" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:44 msgid "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" msgstr "" +"تلاش برای خواندن از SYSCONF نامعتبر\n" +"Ø¢ÛŒ دی های بلوتوث ویموت موجود نیست" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Turkish" @@ -4888,31 +5325,33 @@ msgstr "نوع" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 msgid "UDP Port:" -msgstr "" +msgstr "درگاه UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 msgid "UDP Wiimote" -msgstr "" +msgstr "ویموت UDP" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:204 msgid "UNKNOWN" msgstr "ناشناخته" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 -#, fuzzy, c-format +#, c-format msgid "UNKNOWN_%02X" -msgstr "ناشناخته" +msgstr "ناشناخته_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" -msgstr "آمریکا" +msgstr "ایالات متحده آمریکا" #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:224 msgid "" "Unable to create patch from given values.\n" "Entry not modified." msgstr "" +"قادر به ساختن وصله از مقادیر داده شده نیست.\n" +"ورودی اصلاح نشد." #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format @@ -4921,19 +5360,22 @@ msgid "" "decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" +"ناتوان در تجزیه خط %lu از کد اکشن ریپلی به عنوان کد رمز شده یا رمز گشایی شده " +"معتبر. وارسی کنید Ú©Ù‡ کد را درست وارد کرده باشید.\n" +"آیا مایل هستید Ú©Ù‡ این خط را نادیده بگیرید Ùˆ به تجزیه ادامه دهید؟" #: Source/Core/DolphinWX/Src/FrameTools.cpp:405 #, c-format msgid "Undefined %i" -msgstr "" +msgstr "تعری٠نشده %i" #: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "Undo Load State" -msgstr "" +msgstr "خنثی کردن وضعیت بارگذاری" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Ùرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوق٠می شود..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" @@ -4942,22 +5384,22 @@ msgstr "ناشناخته" #: Source/Core/Core/Src/HW/DVDInterface.cpp:971 #, c-format msgid "Unknown DVD command %08x - fatal error" -msgstr "" +msgstr "دستور دی ÙˆÛŒ دی ناشناخته %08x - خطای مهلک" #: Source/Core/Common/Src/SysConf.cpp:145 #, c-format msgid "Unknown entry type %i in SYSCONF (%s@%x)!" -msgstr "" +msgstr "نوع ورودی ناشناخته %i در SYSCONF (%s@%x)!" #: Source/Core/Core/Src/NetPlayClient.cpp:228 #, c-format msgid "Unknown message received with id : %d" -msgstr "" +msgstr "پیام ناشناخته با Ø¢ÛŒ دی %d دریاÙت شد" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" +msgstr "پیام ناشناخته با Ø¢ÛŒ دی:%d از بازیکن:%d بیرون انداختن بازیکن!" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 @@ -4971,23 +5413,23 @@ msgstr "به روز کردن" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 msgid "Upright Wiimote" -msgstr "" +msgstr "ویموت عمودی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 msgid "Use EuRGB60 Mode (PAL60)" -msgstr "" +msgstr "استÙاده از حالت پال Û¶Û° هرتز (PAL60)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 msgid "Use Fullscreen" -msgstr "" +msgstr "استÙاده از حالت تمام صÙحه" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 msgid "Use Hex" -msgstr "" +msgstr "استÙاده از حالت شانزده شانزدهی" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 msgid "Use Panic Handlers" -msgstr "" +msgstr "استÙاده از دستگذار پنیک" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" @@ -4996,6 +5438,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"استÙاده از ریسمان های چندگانه برای کدبرداری باÙت اشیاء.\n" +"در نتیجه بالا رÙتن سرعت ممکن است (مخصوصا بر روی پردازندهایی با بیش از دو " +"هسته).\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" @@ -5005,6 +5452,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"معمولا اگر کامپایل سایه اÙÚ©Ù† با شکست مواجه شود، یک پیغام خطا نمایش داده Ù…ÛŒ " +"شود.\n" +"اگرچه, این گزینه ممکن است سبب عدم نمایش پنجره های خطا شود تا بازی بدون " +"مزاحمت را از طریق Ùعال کردن این گزینه امکان پذیر سازد.\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 msgid "Utility" @@ -5012,7 +5464,7 @@ msgstr "کاربردی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 msgid "V-Sync" -msgstr "" +msgstr "هماهنگ کردن Ùرکانس عمودی بازی با صÙحه نمایش" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 msgid "Value" @@ -5028,7 +5480,7 @@ msgstr "مقدار:" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 msgid "Verbosity" -msgstr "" +msgstr "دراز نویسی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 msgid "Video" @@ -5046,11 +5498,11 @@ msgstr "حجم صدا" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "" +msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 msgid "WAD installation failed: error creating ticket" -msgstr "" +msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -5059,24 +5511,27 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"هماهنگ کننده Ùرکانس عمودی برای Ú©Ù… کردن پارگی تصویر.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Common/Src/MsgHandler.cpp:67 #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" -msgstr "اختار" +msgstr "اخطار" #: Source/Core/Core/Src/Boot/Boot.cpp:278 msgid "Warning - starting DOL in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع دال در حالت کنسول اشتباه!" #: Source/Core/Core/Src/Boot/Boot.cpp:328 msgid "Warning - starting ELF in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع ای ال ا٠در حالت کنسول اشتباه!" #: Source/Core/Core/Src/Boot/Boot.cpp:221 msgid "Warning - starting ISO in wrong console mode!" -msgstr "" +msgstr "اخطار - شروع آیزو در حالت کنسول اشتباه!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 #, c-format @@ -5085,6 +5540,9 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" +"اخطار! این خردمندانه است Ú©Ù‡ از همه Ùایل های درون پوشه بکاپ بگیرید:\n" +"%s\n" +"آیا مایل به ادامه هستید؟" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format @@ -5094,6 +5552,10 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" +"اخطار: این هر ذخیره موجودی Ú©Ù‡ در پوشه است را بازنویسی خواهد کرد:\n" +"%s\n" +"Ùˆ داشتن اسم یکسان مانند یک Ùایل در کارت حاÙظه شما\n" +"ادامه Ù…ÛŒ دهید؟" #: Source/Core/Core/Src/Movie.cpp:825 #, c-format @@ -5102,6 +5564,10 @@ msgid "" "%u > %u) (frame %u > %u). You should load another save before continuing, or " "load this state with read-only mode off." msgstr "" +"اخطار: شما Ùایل دخیره ای را بارگذاری کرده‌اید Ú©Ù‡ پس از پایان Ùیلم در حال " +"نمایش است. (بایت %u > %u) (Ùریم %u > %u). پیش از ادامه شما باید Ùایل ذخیره " +"دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط خواندنی خاموش بارگذاری " +"کنید." #: Source/Core/Core/Src/Movie.cpp:842 #, c-format @@ -5110,6 +5576,9 @@ msgid "" "should load another save before continuing, or load this state with read-" "only mode off. Otherwise you'll probably get a desync." msgstr "" +"اخطار: شما ذخیره Ùیلمی را بارگذاری کرده اید Ú©Ù‡ با بایت %d (0x%X) مطابقت " +"ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را " +"با حالت Ùقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید." #: Source/Core/Core/Src/Movie.cpp:851 #, c-format @@ -5129,19 +5598,33 @@ msgid "" "Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" +"اخطار: شما ذخیره Ùیلمی را بارگذاری کرده اید Ú©Ù‡ با Ùریم %d مطابقت ندارد. قبل " +"از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط " +"خواندنی خاموش بارگذاری کنید. وگرنه شاید شما.\n" +"\n" +"اطلاعات بیشتر: طول Ùریم های Ùیلم Ùعلی %d است Ùˆ طول Ùریم های Ùیلم ذخیره شده " +"%d است.\n" +"\n" +"روی Ùریم %dØŒ Ùیلم Ùعلی چاپ شده است:\n" +"شروع=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"\n" +"روی Ùریم %dØŒ Ùیلم Ùعلی ذخیره شده چاپ شده است:\n" +"شروع=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." -msgstr "" +msgstr "نویسنده Ùایل ویو - Ùایل باز نیست." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" -msgstr "" +msgstr "بد شانسی" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 msgid "Widescreen Hack" -msgstr "" +msgstr "Ù‡Ú© کردن صÙحه عریض" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Width" @@ -5149,27 +5632,27 @@ msgstr "عرض" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 msgid "Wii" -msgstr "" +msgstr "ÙˆÛŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 msgid "Wii Console" -msgstr "ميز Ùرمان Wii" +msgstr "میز Ùرمان ÙˆÛŒ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Wii NAND Root:" -msgstr "ریشه Wii NAND:" +msgstr "ریشه ÙˆÛŒ نند:" #: Source/Core/DolphinWX/Src/FrameTools.cpp:205 msgid "Wii Save Import" -msgstr "وارد کردن Wii Save" +msgstr "وارد کردن Ùایل ذخیره ÙˆÛŒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" -msgstr "سند Wii save (*.bin)|*.bin" +msgstr "Ùایل های ذخیره ÙˆÛŒ (*.bin)|*.bin" #: Source/Core/DiscIO/Src/WiiWad.cpp:81 msgid "WiiWAD: Could not read from file" -msgstr "WiiWAD: قادر به خواندن از سند نیست" +msgstr "ÙˆÛŒ واد: ناتوان در خواندن از Ùایل" #: Source/Core/Core/Src/HW/Wiimote.cpp:16 #: Source/Core/DolphinWX/Src/FrameTools.cpp:447 @@ -5177,9 +5660,9 @@ msgid "Wiimote" msgstr "ویموت" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 -#, fuzzy, c-format +#, c-format msgid "Wiimote %i" -msgstr "اتصال Wiimote %i" +msgstr "ویموت %i" #: Source/Core/DolphinWX/Src/Frame.cpp:161 #, c-format @@ -5189,81 +5672,84 @@ msgid "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" msgstr "" +"ویموت %i توسط سیستم قطع شد.\n" +"شاید این بازی از مولتی ویموت پشتیبانی نمی کند،\n" +"یا شاید این قطعی ناشی از وقÙÙ‡ بیهوده یا دلیلی دیگر باشد.\n" +"آیا Ù…ÛŒ خواهید بی درنگ از نو متصل شوید؟" #: Source/Core/DolphinWX/Src/Main.cpp:597 msgid "Wiimote Connected" -msgstr "Wiimote متصل شد" +msgstr "ویموت متصل شد" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 msgid "Wiimote Motor" -msgstr "موتور Wiimote" +msgstr "موتور ویموت" #: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Wiimote settings" -msgstr "تنضیمات Wiimote" +msgstr "تنظیمات ویموت" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 -#, fuzzy msgid "Wiimotes" -msgstr "Wiimote واقعی" +msgstr "ویموت ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:134 msgid "Windows Left" -msgstr "" +msgstr "پنجره ها Ú†Ù¾" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:136 msgid "Windows Menu" -msgstr "" +msgstr "Ùهرست پنجره ها" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:135 msgid "Windows Right" -msgstr "" +msgstr "پنجره ها راست" #: Source/Core/DolphinWX/Src/LogWindow.cpp:147 msgid "Word Wrap" -msgstr "" +msgstr "پیچیدن کلمه" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 msgid "Working..." -msgstr "در حال کار کردن..." +msgstr "در حال کار..." #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 msgid "Write to Console" -msgstr "" +msgstr "نوشتن در میز Ùرمان" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 msgid "Write to Debugger" -msgstr "" +msgstr "نوشتن به صورت اشکال زدایی" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" -msgstr "" +msgstr "نوشتن به Ùایل" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 msgid "Write to Window" -msgstr "" +msgstr "نوشتن در پنجره" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:60 #, c-format msgid "XAudio2 CreateSourceVoice failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - ساخت آوای منبع با شکست مواجه شد: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:114 #, c-format msgid "XAudio2 init failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - اينيت با شکست مواجه شد: %#X" #: Source/Core/AudioCommon/Src/XAudio2Stream.cpp:124 #, c-format msgid "XAudio2 master voice creation failed: %#X" -msgstr "" +msgstr "صدای اکس Û² (XAdudio2) - ساخت آوای مستر منبع با شکست مواجه شد: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "" +msgstr "ثبت اکس اÙ" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5274,36 +5760,41 @@ msgid "" "You are using free dsp roms made by Dolphin Team.\n" "Only Zelda ucode games will work correctly with them.\n" msgstr "" +"شما از رام های پردازشگر صدای دلÙین مجانی Ú©Ù‡ توسط تیم دلÙین ساخته شده استÙاده " +"Ù…ÛŒ کنید.\n" +"Ùقط بازی های ماکرو کد زلدا درست با این رام ها کار Ù…ÛŒ کنند.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." -msgstr "" +msgstr "شما نمی توانید قطعاتی Ú©Ù‡ حاوی صÙحات Ù…ÛŒ باشند را ببندید." #: Source/Core/DolphinWX/Src/NetWindow.cpp:193 msgid "You must choose a game!!" -msgstr "شما باید بازی را انتخاب کنید!!" +msgstr "شما باید یک بازی انتخاب کنید!!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" -msgstr "شما باید اسم را وارد کنید!" +msgstr "شما باید یک اسم وارد کنید!" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 msgid "You must enter a valid decimal, hexadecimal or octal value." -msgstr "" +msgstr "شما باید یک مقدار صحیح برای دسیمال، هگزادسیمال یا اکتال وارد کنید." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 msgid "You must enter a valid profile name." -msgstr "" +msgstr "شما باید یک اسم معتبر برای پروÙایل وارد کنید." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" +msgstr "برای اعمال تغییرات شما باید دلÙین را از نو اجرا کنید." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" "Your GCM/ISO file seems to be invalid (invalid country).\n" "Continue with PAL region?" msgstr "" +"به نظر Ù…ÛŒ رسد Ùایل آیزو/جی سی ام شما نامعتبر Ù…ÛŒ باشد (کشور نامعتبر).\n" +"ادامه با ناحیه پال؟" #: Source/Core/Common/Src/SysConf.cpp:58 #, c-format @@ -5312,24 +5803,27 @@ msgid "" "It should be 0x%04x (but is 0x%04llx)\n" "Do you want to generate a new one?" msgstr "" +"سایز Ùایل SYSCONF شما اشتباه است.\n" +"سایز Ùایل باید 0x%04x باشد (اما سایز این Ùایل 0x%04llx است)\n" +"آیا میخواهید یک Ùایل جدید تولید شود؟" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 msgid "ZTP hack" -msgstr "" +msgstr "Ù‡Ú© اÙسانه زلدا: شاهدخت سپیده دم" #: Source/Core/Core/Src/ActionReplay.cpp:387 msgid "Zero 3 code not supported" -msgstr "" +msgstr "کد صÙر Û³ پشتیبانی نمی شود" #: Source/Core/Core/Src/ActionReplay.cpp:408 #, c-format msgid "Zero code unknown to dolphin: %08x" -msgstr "" +msgstr "کد ناشناخته صÙر به دلÙین: %08x" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 msgid "[ waiting ]" -msgstr "[انتظار]" +msgstr "[ منتظر بمانید ]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" @@ -5338,6 +5832,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[خراب]\n" +"مشخص کردن مناطقی Ú©Ù‡ حاÙظه میانجی Ùریم جاساز شده از آن Ú©Ù¾ÛŒ شده است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/PHackSettings.cpp:90 msgid "[Custom]" @@ -5353,6 +5851,14 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[آزمایشی]\n" +"با هد٠بالا بردن سرعت برابرسازی از طریق بارگذاری کردن کدگشایی باÙت اشیاء به " +"پردازشگر گراÙیکی Ú©Ù‡ استÙاده Ù…ÛŒ کند از چهارچوب OpenCL .\n" +"اگر چه، درحال حاضر این شناخته شده است Ú©Ù‡ کاستی های باÙت اشیاء را در بازی های " +"گوناگون سبب Ù…ÛŒ شود. همچنین این در اکثر موارد کندتر از کدگشایی باÙت اشیاء " +"توسط پردازنده عادی است.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" @@ -5362,6 +5868,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" +"[آزمایشی]\n" +"سرعت برابرسازی را با ذخیره کردن Ùهرست های نمایش اندکی بالا Ù…ÛŒ برد.\n" +"گرچه امکان بروز مشکل وجود دارد.\n" +"\n" +"اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 msgid "^ ADD" @@ -5369,89 +5880,168 @@ msgstr "^ اضاÙÙ‡ کردن" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 msgid "apploader (.img)" -msgstr "" +msgstr "بارگذار برنامه (.img)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:185 msgid "failed to read bk header" -msgstr "" +msgstr "خواندن سرخط بی Ú©ÛŒ با شکست مواجه شد" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375 #, c-format msgid "failed to read data from file: %s" -msgstr "" +msgstr "خواندن دادها از Ùایل با شکست مواجه شد: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97 msgid "failed to read header" -msgstr "" +msgstr "خواندن سرخط با شکست مواجه شد" #: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." -msgstr "" +msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطÙا گزارش دهید." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" +msgstr "یک ذخیره ÙˆÛŒ نیست یا شکست برای خواندن سایز سرخط Ùایل %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" -msgstr "" +msgstr "s" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:456 #, c-format msgid "unknown cmd 0x%08x" -msgstr "" +msgstr "Ùرمان ناشناخته 0x%08x" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 msgid "wxExecute returned -1 on application run!" -msgstr "" +msgstr "خطای 1- wxExecute در اجرای برنامه!" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:55 msgid "zFar Correction: " -msgstr "" +msgstr "اصلاح z دور:" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:50 msgid "zNear Correction: " -msgstr "" +msgstr "اصلاح z نزدیک:" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 msgid "| OR" -msgstr "" +msgstr "| یا" + +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "تولید میپ مپ بطور خودکار نسبت به کدگشایی آنها از حاÙظه.\n" +#~ "کارائى را اندکی اÙزایش Ù…ÛŒ دهد اما ممکن است سبب نقص باÙت اشیاء شود.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." #~ msgid "Clear failed." #~ msgstr "پاک کردن با شکست مواجه شد." #~ msgid "Connected to %i Wiimotes" -#~ msgstr "اتصال به Wiimotes %i" +#~ msgstr "اتصال به ویموت ها %i" #~ msgid "Danish" #~ msgstr "دانمارکی" #~ msgid "Disable Lighting" -#~ msgstr "غیر Ùعال کردن روشنایی" +#~ msgstr "از کارانداختن روشنایی" #~ msgid "Disable Textures" -#~ msgstr "غیر Ùعال کردن باÙت اشیاء" +#~ msgstr "از کارانداختن باÙت اشیاء" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "از کارانداختن باÙت اشیاء.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #~ msgid "" #~ "Dolphin has not been configured with an install location,\n" #~ "Keep Dolphin portable?" #~ msgstr "" #~ "دلÙین با مکان نصب شده پيکربندى نشده است.\n" -#~ "دلÙین را Portable نگاه دارم؟" +#~ "دلÙین را سبک نگاه دارم؟" + +#~ msgid "Enable Audio Throttle" +#~ msgstr "Ùعال کردن دریچه صدا" #~ msgid "Enable DTK Music" -#~ msgstr "Ùعال کردن موزیک DTK" +#~ msgstr "Ùعال کردن موزیک دی تی Ú©ÛŒ" + +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "خطا در ویموت پخش. %u != %uØŒ بایت %d.\n" +#~ "ببخشید، ضبط ÙˆÛŒ بطور موقتی خراب است." #~ msgid "Exit Dolphin with emulator" -#~ msgstr "خروج دلÙین با شبیه ساز" +#~ msgstr "خروج دلÙین با برابرساز" + +#~ msgid "Fast Mipmaps" +#~ msgstr "میپ مپ های سریع" #~ msgid "Hide Shader Errors" -#~ msgstr "مخÙÛŒ کردن خطاهای Shader" +#~ msgstr "مخÙÛŒ کردن خطاهای سایه زن" + +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "کارآئى را بالا Ù…ÛŒ برد اما سبب از بین رÙتن روشنایی در اکثر بازی ها Ù…ÛŒ " +#~ "شود.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #~ msgid "Input Source" #~ msgstr "منبع ورودی" #~ msgid "Install directory could not be saved" #~ msgstr "نصب پوشه قابل ذخیره شدن نیست" + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "بارگذاری Ùایل مشخص شده (DOL,ELF,GCM,ISO,WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "صدای سطح پائین (ال ال ای) Ùˆ یا سطح بالا (اچ ال ای)" + +#~ msgid "Opens the debugger" +#~ msgstr "باز کردن اشکال یاب" + +#~ msgid "Opens the logger" +#~ msgstr "باز کردن واقعه نگار" + +#~ msgid "Show this help message" +#~ msgstr "نمایش این پیام Ú©Ù…Ú©ÛŒ" + +#~ msgid "Specify a video backend" +#~ msgstr "مشخص کردن یک پشتوانه ویدیو" + +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "این گزینه استÙاده Ù…ÛŒ شود برای کنترل سرعت بازی توسط دریچه صدا.\n" +#~ "از کار انداختن این گزینه سبب سرعت نابهنجار بازی میگردد، از قبیل سرعت خیلی " +#~ "زیاد.\n" +#~ "اما گاهی اوقات Ùعال کردن این گزینه سبب بروز نویز ثابت Ù…ÛŒ شود.\n" +#~ "\n" +#~ "میان بر کیبورد : Ùشار دهید برای از کار انداختن Ùوری دریچه صدا." + +#~ msgid "This is used to play music tracks, like BGM." +#~ msgstr "" +#~ "این گزینه استÙاده Ù…ÛŒ شود برای پخش ترک های موزیک، مانند موزیک پس زمینه." diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 02daed4bf6..01f3442461 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -8,13 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-23 11:42+0100\n" -"Last-Translator: Krzysztof Baszczok \n" +"PO-Revision-Date: 2012-12-16 20:16+0100\n" +"Last-Translator: Baszta \n" "Language-Team: Polish \n" "Language: Polish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" @@ -658,14 +659,13 @@ msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Pozwala przeÅ‚Ä…czać okreÅ›lone opcje przez skróty klawiszowe 3, 4, 5, 6 i 7 w " +"Pozwala przeÅ‚Ä…czać okreÅ›lone opcje przez skróty klawiszowe 3, 4, 5 i 6 w " "oknie emulacji.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -708,7 +708,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Stosuje efekt post-processingowy po zakonczeniu ramki.\n" +"Stosuje efekt post-processingowy po zakonczeniu klatki.\n" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." @@ -1764,7 +1764,7 @@ msgstr "Atrapa" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 msgid "Dump Audio" -msgstr "Zrzut Audio" +msgstr "Zrzut audio" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 msgid "Dump EFB Target" @@ -1772,7 +1772,7 @@ msgstr "Zrzut EFB Target" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Dump Frames" -msgstr "Zrzut ramek" +msgstr "Zrzut klatek" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Textures" @@ -1784,7 +1784,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Zrzuca wszystkie renderowane ramki do pliku AVI w User/Dump/Frames/\n" +"Zrzuca wszystkie renderowane klatki do pliku AVI w User/Dump/Frames/\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -1823,16 +1823,16 @@ msgid "EFB Copies" msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"BÅÄ„D: Ta wersja programu wymaga sterownika TAP-Win32 w najnowszej wersji %d. " -"%d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie systemu " -"jest wymagane by sterownik zaczÄ…Å‚ dziaÅ‚ać." +"BÅÄ„D: Ta wersja programu wymaga sterownika TAP-Win32 w wersji przynajmniej " +"%d. %d -- JeÅ›li ostatnio aktualizowaÅ‚eÅ› program, ponowne uruchomienie " +"systemu jest wymagane aby sterownik zaczÄ…Å‚ dziaÅ‚ać." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -2101,7 +2101,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Koduj zrzuty ramek używajÄ…c kodeka FFV1.\n" +"Koduj zrzuty klatek używajÄ…c kodeka FFV1.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -2583,11 +2583,11 @@ msgstr "Znaleziono %d dla '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 msgid "Frame" -msgstr "Ramka" +msgstr "Klatka" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 msgid "Frame " -msgstr "Ramka" +msgstr "Klatka" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 @@ -2596,7 +2596,7 @@ msgstr "Frame Advance" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Frame Dumps use FFV1" -msgstr "Zrzuty ramek używajÄ… FFV1" +msgstr "Zrzuty klatek używajÄ… FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 msgid "Frame Info" @@ -2604,7 +2604,7 @@ msgstr "Frame Info" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" -msgstr "ZasiÄ™g ramki" +msgstr "ZasiÄ™g klatki" #: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Frame S&kipping" @@ -2612,11 +2612,11 @@ msgstr "Frame S&kipping" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "Framelimit:" -msgstr "Limit ramek:" +msgstr "Limit klatek:" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 msgid "Frames To Record" -msgstr "Ramki do nagrania" +msgstr "Klatki do nagrania" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 msgid "Free Look" @@ -2687,7 +2687,7 @@ msgstr "Konfiguracja gry" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -2956,9 +2956,9 @@ msgid "" "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -"JeÅ›li ustawisz limit ramek wiÄ™kszy niż peÅ‚na szybkość gry (NTSC:60, PAL:50), " -"ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale może " -"spowodować trwaÅ‚y szum zależnie od gry)." +"JeÅ›li ustawisz limitu klatek wiÄ™kszego niż peÅ‚na szybkość gry (NTSC:60, " +"PAL:50), ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale " +"może spowodować trwaÅ‚y szum zależnie od gry)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" @@ -3415,21 +3415,21 @@ msgstr "Konfiguracja Logu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "Zapisz FPS do pliku" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Typy logów" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Pokaż liczbÄ™ renderowanych ramek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" +"Zapisz liczbÄ™ renderowanych klatek na sekundÄ™ do User/Logs/fps.txt. Użyj tej " +"opcji jeÅ›li chcesz zmierzyć wydajność programu.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -3854,7 +3854,7 @@ msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "On-Screen Display Messages" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -3994,7 +3994,7 @@ msgstr "Pause" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "Zatrzymaj na koncu filmu" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4331,42 +4331,42 @@ msgstr "Zapisz GCI jako..." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 1" -msgstr "Zapisz stan Slot 1" +msgstr "Slot stanu 1" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 2" -msgstr "Zapisz stan Slot 2" +msgstr "Slot stanu 2" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 3" -msgstr "Zapisz stan Slot 3" +msgstr "Slot stanu 3" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 4" -msgstr "Zapisz stan Slot 4" +msgstr "Slot stanu 4" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 msgid "Save State Slot 5" -msgstr "Zapisz stan Slot 5" +msgstr "Slot stanu 5" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 msgid "Save State Slot 6" -msgstr "Zapisz stan Slot 6" +msgstr "Slot stanu 6" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 msgid "Save State Slot 7" -msgstr "Zapisz stan Slot 8" +msgstr "Slot stanu 8" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" -msgstr "Zapisz stan Slot 9" +msgstr "Slot stanu 9" #: Source/Core/DolphinWX/Src/FrameTools.cpp:165 msgid "Save State..." @@ -4409,7 +4409,7 @@ msgstr "PrzeszukujÄ™ obrazy ISO" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 msgid "Scanning..." -msgstr "PrzeszukujÄ™" +msgstr "PrzeszukujÄ™..." #: Source/Core/DolphinWX/Src/FrameTools.cpp:441 msgid "ScrShot" @@ -4716,9 +4716,8 @@ msgid "Show first block" msgstr "Pokaż pierwszy blok" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Pokaż komentarz zapisu" +msgstr "Pokaż licznik opóźnienia" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4726,6 +4725,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"WyÅ›wietla wiadomoÅ›ci na ekrnie emulacji.\n" +"WiadomoÅ›ci zawierajÄ… informacje o zapisach do karty pamiÄ™ci, video backend, " +"informacje o procesorze oraz oczyszczaniu cache'u JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -4750,7 +4752,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Pokaż liczbÄ™ renderowanych ramek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" +"Pokaż liczbÄ™ renderowanych klatek na sekundÄ™ jako miara szybkoÅ›ci emulacji.\n" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." @@ -4912,7 +4914,7 @@ msgstr "Square Stick" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 msgid "Standard Controller" -msgstr "Standard Controller" +msgstr "Standardowy kontroler" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 @@ -5903,6 +5905,113 @@ msgstr "zNear Correction: " msgid "| OR" msgstr "| OR" +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" +#~ "ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." + +#~ msgid "Disable Lighting" +#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" + +#~ msgid "Disable Textures" +#~ msgstr "WyÅ‚Ä…cz tekstury" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "WyÅ‚Ä…cza teksturowanie.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "WyjÅ›cie z Dolphina" + +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Llow level (LLE) lub high level (HLE) audio" + +#~ msgid "Opens the debugger" +#~ msgstr "Otwiera debugera" + +#~ msgid "Opens the logger" +#~ msgstr "Otwiera logera" + +#~ msgid "Show this help message" +#~ msgstr "Pokaż wiadomość pomocy" + +#~ msgid "Specify a video backend" +#~ msgstr "Wybierz video backend" + +#~ msgid "Clear failed." +#~ msgstr "Czyszczenie nie powiodÅ‚o siÄ™." + +#~ msgid "Enable DTK Music" +#~ msgstr "WÅ‚Ä…cz muzykÄ™ DTK" + +#~ msgid "This is used to play music tracks, like BGM." +#~ msgstr "Jest to używane do odtwarzania muzyki, BGM." + +#~ msgid "Enable Audio Throttle" +#~ msgstr "WÅ‚Ä…cz Audio Throttle" + +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "BÅ‚Ä…d w PlayWiimote. %u != %u, bajt %d.\n" +#~ "Przepraszamy, nagrywanie Wii jest tymczasowo niesprawne." + +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez " +#~ "sound throttle(spowalnianie dźwiÄ™ku).\n" +#~ "WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt " +#~ "szybkie dziaÅ‚anie.\n" +#~ "Czasami powoduje staÅ‚y szum.\n" +#~ "\n" +#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " +#~ "Throttle." + +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Nie można nagrywać filmów w trybie tylko do odczytu." + +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" + +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Nieznany wskaźnik %#08x\n" +#~ "Kontynuować?" + #~ msgid "%d %%" #~ msgstr "%d %%" @@ -5968,17 +6077,6 @@ msgstr "| OR" #~ "Dla lepszego efektu najlepiej ustawić proporcje ekranu na rozciÄ…gniete do " #~ "okna, gdy używasz tej opcji." -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" -#~ "ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - #~ msgid "Bad gameini filename" #~ msgstr "ZÅ‚a nazwa pliku gameini" @@ -6005,12 +6103,6 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Nie można otworzyć %s, ma brakujÄ…cÄ… funkcjÄ™" -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Nie można nagrywać filmów w trybie tylko do odczytu." - -#~ msgid "Clear failed." -#~ msgstr "Czyszczenie nie powiodÅ‚o siÄ™." - #~ msgid "Config..." #~ msgstr "Konfiguracja..." @@ -6047,24 +6139,6 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "DuÅ„ski" -#~ msgid "Disable Lighting" -#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" - -#~ msgid "Disable Textures" -#~ msgstr "WyÅ‚Ä…cz tekstury" - -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" - -#~ msgid "" -#~ "Disable texturing.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "WyÅ‚Ä…cza teksturowanie.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6125,18 +6199,12 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Ustawienia ekranu emulatora" -#~ msgid "Enable Audio Throttle" -#~ msgstr "WÅ‚Ä…cz Audio Throttle" - #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" #~ msgid "Enable Copy to EFB" #~ msgstr "WÅ‚Ä…cz kopiowanie do EFB" -#~ msgid "Enable DTK Music" -#~ msgstr "WÅ‚Ä…cz muzykÄ™ DTK" - #~ msgid "Enable EFB To Texture" #~ msgstr "WÅ‚Ä…cz EFB To Texture" @@ -6186,13 +6254,6 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "BÅ‚Ä…d alokacji bufora" -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "BÅ‚Ä…d w PlayWiimote. %u != %u, bajt %d.\n" -#~ "Przepraszamy, nagrywanie Wii jest tymczasowo niesprawne." - #~ msgid "Error loading %s: can't read info" #~ msgstr "BÅ‚Ä…d wczytywania %s: nie można odczytać informacji" @@ -6205,15 +6266,9 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "BÅ‚Ä…d otwarcia pliku %s do nagrania." -#~ msgid "Exit Dolphin with emulator" -#~ msgstr "WyjÅ›cie z Dolphina" - #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nieudane Å‚adowanie romu DSP: %s" -#~ msgid "Fast Mipmaps" -#~ msgstr "Fast Mipmaps" - #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6261,15 +6316,6 @@ msgstr "| OR" #~ "JeÅ›li gra siÄ™ zawiesza, dziaÅ‚a tylko w Interpreter lub Dolphin siÄ™ " #~ "zawiesza, ta opcja może naprawić dziaÅ‚anie gry." -#~ msgid "" -#~ "Improves performance but causes lighting to disappear in most games.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - #~ msgid "Input Source" #~ msgstr "ŹródÅ‚o wejÅ›cia" @@ -6311,12 +6357,6 @@ msgstr "| OR" #~ "Wczytywanie natywnych mipmap jest bardziej dokÅ‚adnym zachowaniem, ale " #~ "może obniżyć wydajność." -#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" - -#~ msgid "Low level (LLE) or high level (HLE) audio" -#~ msgstr "Llow level (LLE) lub high level (HLE) audio" - #~ msgid "Lua Script Console" #~ msgstr "Konsola skryptów Lua" @@ -6351,12 +6391,6 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" -#~ msgid "Opens the debugger" -#~ msgstr "Otwiera debugera" - -#~ msgid "Opens the logger" -#~ msgstr "Otwiera logera" - #~ msgid "Plugins" #~ msgstr "Wtyczki" @@ -6436,9 +6470,6 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Pokazuje iloÅ›c generowanych ramek na sekundÄ™." -#~ msgid "Show this help message" -#~ msgstr "Pokaż wiadomość pomocy" - #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6478,9 +6509,6 @@ msgstr "| OR" #~ "PozostaÅ‚e opcje to ustawione rozdzielczoÅ›cie niezależne od wielkoÅ›ci " #~ "ekranu." -#~ msgid "Specify a video backend" -#~ msgstr "Wybierz video backend" - #~ msgid "Specify an audio plugin" #~ msgstr "Wybierz wtyczkÄ™ audio" @@ -6493,25 +6521,6 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" -#~ msgid "" -#~ "This is used to control game speed by sound throttle.\n" -#~ "Disabling this could cause abnormal game speed, such as too fast.\n" -#~ "But sometimes enabling this could cause constant noise.\n" -#~ "\n" -#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." -#~ msgstr "" -#~ "Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez " -#~ "sound throttle(spowalnianie dźwiÄ™ku).\n" -#~ "WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt " -#~ "szybkie dziaÅ‚anie.\n" -#~ "Czasami powoduje staÅ‚y szum.\n" -#~ "\n" -#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " -#~ "Throttle." - -#~ msgid "This is used to play music tracks, like BGM." -#~ msgstr "Jest to używane do odtwarzania muzyki, BGM." - #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "To zazwyczaj jest używane do odtwarza gÅ‚osów i efektów dźwiÄ™kowych." @@ -6521,13 +6530,6 @@ msgstr "| OR" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Typ %d konfiguracji nie jest wspierany przez wtyczkÄ™ %s" -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Nieznany wskaźnik %#08x\n" -#~ "Kontynuować?" - #~ msgid "Use FPS For Limiting" #~ msgstr "Użyj FPS do limitowania" From 98bb0f18851dc6dc88fee30497b0be829c6d4c6e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Dec 2012 09:39:01 -0600 Subject: [PATCH 199/627] Oops. Forgot to sanitize these files. --- Languages/po/cs.po | 42 ++++----- Languages/po/pl.po | 214 ++++++++++++++++++++++----------------------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/Languages/po/cs.po b/Languages/po/cs.po index d2d536b891..20786807b1 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -5909,27 +5909,6 @@ msgstr "Korekce zNear:" msgid "| OR" msgstr "| NEBO" -#~ msgid "Exit Dolphin with emulator" -#~ msgstr "UkonÄit Dolphin s emulátorem" - -#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" - -#~ msgid "Low level (LLE) or high level (HLE) audio" -#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" - -#~ msgid "Opens the debugger" -#~ msgstr "Otevřít ladící program" - -#~ msgid "Opens the logger" -#~ msgstr "OtevÅ™e protokol" - -#~ msgid "Show this help message" -#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" - -#~ msgid "Specify a video backend" -#~ msgstr "UrÄit backend videa" - #~ msgid "(Default)" #~ msgstr "(Výchozí)" @@ -6166,6 +6145,9 @@ msgstr "| NEBO" #~ msgid "Error opening file %s for recording" #~ msgstr "Chyba pÅ™i otevírání souboru %s pro nahrávání" +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "UkonÄit Dolphin s emulátorem" + #~ msgid "Failed to compile ps %s" #~ msgstr "Nelze zkompilovat ps %s" @@ -6266,6 +6248,12 @@ msgstr "| NEBO" #~ "Nahrání původních mipmap je správnÄ›jší chování, ale může také snížit " #~ "výkon (Váš užitek se ale může mÄ›nit)." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" + #~ msgid "Mixer: Unsupported sample rate." #~ msgstr "Mixér: Nepodporovaná vzorkovací frekvence." @@ -6282,6 +6270,12 @@ msgstr "| NEBO" #~ msgid "OK" #~ msgstr "OK" +#~ msgid "Opens the debugger" +#~ msgstr "Otevřít ladící program" + +#~ msgid "Opens the logger" +#~ msgstr "OtevÅ™e protokol" + #~ msgid "" #~ "Portable Setting could not be saved\n" #~ " Are you running Dolphin from read only media or from a directory that " @@ -6346,6 +6340,9 @@ msgstr "| NEBO" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Zobrazit poÄet snímků vykreslených za sekundu." +#~ msgid "Show this help message" +#~ msgstr "Zobrazit tuto zprávu nápovÄ›dy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6380,6 +6377,9 @@ msgstr "| NEBO" #~ "Ostatní volby jsou pevná rozliÅ¡ení pro volbu kvality obrazu nezávislé na " #~ "Vaší velikosti displeje." +#~ msgid "Specify a video backend" +#~ msgstr "UrÄit backend videa" + #~ msgid "Start Renderer in Fullscreen" #~ msgstr "Spustit vykreslovaÄe v Celé obrazovce" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 01f3442461..49c5dd1732 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -5905,113 +5905,6 @@ msgstr "zNear Correction: " msgid "| OR" msgstr "| OR" -#~ msgid "" -#~ "Automatically generate mipmaps rather than decoding them from memory.\n" -#~ "Increases performance a bit but might cause minor texture defects.\n" -#~ "\n" -#~ "If unsure, leave this checked." -#~ msgstr "" -#~ "Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" -#~ "ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - -#~ msgid "Disable Lighting" -#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" - -#~ msgid "Disable Textures" -#~ msgstr "WyÅ‚Ä…cz tekstury" - -#~ msgid "" -#~ "Disable texturing.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "WyÅ‚Ä…cza teksturowanie.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - -#~ msgid "Exit Dolphin with emulator" -#~ msgstr "WyjÅ›cie z Dolphina" - -#~ msgid "Fast Mipmaps" -#~ msgstr "Fast Mipmaps" - -#~ msgid "" -#~ "Improves performance but causes lighting to disappear in most games.\n" -#~ "\n" -#~ "If unsure, leave this unchecked." -#~ msgstr "" -#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" -#~ "\n" -#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." - -#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" -#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" - -#~ msgid "Low level (LLE) or high level (HLE) audio" -#~ msgstr "Llow level (LLE) lub high level (HLE) audio" - -#~ msgid "Opens the debugger" -#~ msgstr "Otwiera debugera" - -#~ msgid "Opens the logger" -#~ msgstr "Otwiera logera" - -#~ msgid "Show this help message" -#~ msgstr "Pokaż wiadomość pomocy" - -#~ msgid "Specify a video backend" -#~ msgstr "Wybierz video backend" - -#~ msgid "Clear failed." -#~ msgstr "Czyszczenie nie powiodÅ‚o siÄ™." - -#~ msgid "Enable DTK Music" -#~ msgstr "WÅ‚Ä…cz muzykÄ™ DTK" - -#~ msgid "This is used to play music tracks, like BGM." -#~ msgstr "Jest to używane do odtwarzania muzyki, BGM." - -#~ msgid "Enable Audio Throttle" -#~ msgstr "WÅ‚Ä…cz Audio Throttle" - -#~ msgid "" -#~ "Error in PlayWiimote. %u != %u, byte %d.\n" -#~ "Sorry, Wii recording is temporarily broken." -#~ msgstr "" -#~ "BÅ‚Ä…d w PlayWiimote. %u != %u, bajt %d.\n" -#~ "Przepraszamy, nagrywanie Wii jest tymczasowo niesprawne." - -#~ msgid "" -#~ "This is used to control game speed by sound throttle.\n" -#~ "Disabling this could cause abnormal game speed, such as too fast.\n" -#~ "But sometimes enabling this could cause constant noise.\n" -#~ "\n" -#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." -#~ msgstr "" -#~ "Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez " -#~ "sound throttle(spowalnianie dźwiÄ™ku).\n" -#~ "WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt " -#~ "szybkie dziaÅ‚anie.\n" -#~ "Czasami powoduje staÅ‚y szum.\n" -#~ "\n" -#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " -#~ "Throttle." - -#~ msgid "Cannot record movies in read-only mode." -#~ msgstr "Nie można nagrywać filmów w trybie tylko do odczytu." - -#~ msgid "Disable Wiimote Speaker" -#~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" - -#~ msgid "" -#~ "Unknown pointer %#08x\n" -#~ "Continue?" -#~ msgstr "" -#~ "Nieznany wskaźnik %#08x\n" -#~ "Kontynuować?" - #~ msgid "%d %%" #~ msgstr "%d %%" @@ -6077,6 +5970,17 @@ msgstr "| OR" #~ "Dla lepszego efektu najlepiej ustawić proporcje ekranu na rozciÄ…gniete do " #~ "okna, gdy używasz tej opcji." +#~ msgid "" +#~ "Automatically generate mipmaps rather than decoding them from memory.\n" +#~ "Increases performance a bit but might cause minor texture defects.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Automatycznie generuje mipmapy zamiast dekodowania ich z pamiÄ™ci.\n" +#~ "ZwiÄ™ksza wydajność, ale może powodować defekty tekstur.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." + #~ msgid "Bad gameini filename" #~ msgstr "ZÅ‚a nazwa pliku gameini" @@ -6103,6 +6007,12 @@ msgstr "| OR" #~ msgid "Can't open %s, it has a missing function" #~ msgstr "Nie można otworzyć %s, ma brakujÄ…cÄ… funkcjÄ™" +#~ msgid "Cannot record movies in read-only mode." +#~ msgstr "Nie można nagrywać filmów w trybie tylko do odczytu." + +#~ msgid "Clear failed." +#~ msgstr "Czyszczenie nie powiodÅ‚o siÄ™." + #~ msgid "Config..." #~ msgstr "Konfiguracja..." @@ -6139,6 +6049,24 @@ msgstr "| OR" #~ msgid "Danish" #~ msgstr "DuÅ„ski" +#~ msgid "Disable Lighting" +#~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" + +#~ msgid "Disable Textures" +#~ msgstr "WyÅ‚Ä…cz tekstury" + +#~ msgid "Disable Wiimote Speaker" +#~ msgstr "WyÅ‚Ä…cz gÅ‚oÅ›nik Wiilota" + +#~ msgid "" +#~ "Disable texturing.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "WyÅ‚Ä…cza teksturowanie.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "" #~ "Disable texturing.\n" #~ "This is only useful for debugging purposes." @@ -6199,12 +6127,18 @@ msgstr "| OR" #~ msgid "Emulator Display Settings" #~ msgstr "Ustawienia ekranu emulatora" +#~ msgid "Enable Audio Throttle" +#~ msgstr "WÅ‚Ä…cz Audio Throttle" + #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" #~ msgid "Enable Copy to EFB" #~ msgstr "WÅ‚Ä…cz kopiowanie do EFB" +#~ msgid "Enable DTK Music" +#~ msgstr "WÅ‚Ä…cz muzykÄ™ DTK" + #~ msgid "Enable EFB To Texture" #~ msgstr "WÅ‚Ä…cz EFB To Texture" @@ -6254,6 +6188,13 @@ msgstr "| OR" #~ msgid "Error allocating buffer" #~ msgstr "BÅ‚Ä…d alokacji bufora" +#~ msgid "" +#~ "Error in PlayWiimote. %u != %u, byte %d.\n" +#~ "Sorry, Wii recording is temporarily broken." +#~ msgstr "" +#~ "BÅ‚Ä…d w PlayWiimote. %u != %u, bajt %d.\n" +#~ "Przepraszamy, nagrywanie Wii jest tymczasowo niesprawne." + #~ msgid "Error loading %s: can't read info" #~ msgstr "BÅ‚Ä…d wczytywania %s: nie można odczytać informacji" @@ -6266,9 +6207,15 @@ msgstr "| OR" #~ msgid "Error opening file %s for recording" #~ msgstr "BÅ‚Ä…d otwarcia pliku %s do nagrania." +#~ msgid "Exit Dolphin with emulator" +#~ msgstr "WyjÅ›cie z Dolphina" + #~ msgid "Failed to load DSP ROM: %s" #~ msgstr "Nieudane Å‚adowanie romu DSP: %s" +#~ msgid "Fast Mipmaps" +#~ msgstr "Fast Mipmaps" + #~ msgid "" #~ "Faster variants look at fewer pixels and thus have more potential for " #~ "errors.\n" @@ -6316,6 +6263,15 @@ msgstr "| OR" #~ "JeÅ›li gra siÄ™ zawiesza, dziaÅ‚a tylko w Interpreter lub Dolphin siÄ™ " #~ "zawiesza, ta opcja może naprawić dziaÅ‚anie gry." +#~ msgid "" +#~ "Improves performance but causes lighting to disappear in most games.\n" +#~ "\n" +#~ "If unsure, leave this unchecked." +#~ msgstr "" +#~ "ZwiÄ™ksza wydajność, ale powoduje znikniÄ™cie Å›wiateÅ‚ w wiÄ™kszoÅ›ci grach.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." + #~ msgid "Input Source" #~ msgstr "ŹródÅ‚o wejÅ›cia" @@ -6357,6 +6313,12 @@ msgstr "| OR" #~ "Wczytywanie natywnych mipmap jest bardziej dokÅ‚adnym zachowaniem, ale " #~ "może obniżyć wydajność." +#~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" +#~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" + +#~ msgid "Low level (LLE) or high level (HLE) audio" +#~ msgstr "Llow level (LLE) lub high level (HLE) audio" + #~ msgid "Lua Script Console" #~ msgstr "Konsola skryptów Lua" @@ -6391,6 +6353,12 @@ msgstr "| OR" #~ msgid "OpenGL" #~ msgstr "OpenGL" +#~ msgid "Opens the debugger" +#~ msgstr "Otwiera debugera" + +#~ msgid "Opens the logger" +#~ msgstr "Otwiera logera" + #~ msgid "Plugins" #~ msgstr "Wtyczki" @@ -6470,6 +6438,9 @@ msgstr "| OR" #~ msgid "Show the number of frames rendered per second." #~ msgstr "Pokazuje iloÅ›c generowanych ramek na sekundÄ™." +#~ msgid "Show this help message" +#~ msgstr "Pokaż wiadomość pomocy" + #~ msgid "" #~ "Show various statistics.\n" #~ "This is only useful for debugging purposes." @@ -6509,6 +6480,9 @@ msgstr "| OR" #~ "PozostaÅ‚e opcje to ustawione rozdzielczoÅ›cie niezależne od wielkoÅ›ci " #~ "ekranu." +#~ msgid "Specify a video backend" +#~ msgstr "Wybierz video backend" + #~ msgid "Specify an audio plugin" #~ msgstr "Wybierz wtyczkÄ™ audio" @@ -6521,6 +6495,25 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" +#~ msgid "" +#~ "This is used to control game speed by sound throttle.\n" +#~ "Disabling this could cause abnormal game speed, such as too fast.\n" +#~ "But sometimes enabling this could cause constant noise.\n" +#~ "\n" +#~ "Keyboard Shortcut : Hold down to instantly disable Throttle." +#~ msgstr "" +#~ "Ustawienia te wykorzystywane sÄ… do kontrolowania szybkoÅ›ci gry przez " +#~ "sound throttle(spowalnianie dźwiÄ™ku).\n" +#~ "WyÅ‚Ä…czenie tego może spowodować nienormalne dziaÅ‚anie gry, np. zbyt " +#~ "szybkie dziaÅ‚anie.\n" +#~ "Czasami powoduje staÅ‚y szum.\n" +#~ "\n" +#~ "Skrót klawiszowy : Przytrzymaj by natychmiastowo wyÅ‚Ä…czyc Audio " +#~ "Throttle." + +#~ msgid "This is used to play music tracks, like BGM." +#~ msgstr "Jest to używane do odtwarzania muzyki, BGM." + #~ msgid "This is usually used to play voice and sound effects." #~ msgstr "To zazwyczaj jest używane do odtwarza gÅ‚osów i efektów dźwiÄ™kowych." @@ -6530,6 +6523,13 @@ msgstr "| OR" #~ msgid "Type %d config not supported in plugin %s" #~ msgstr "Typ %d konfiguracji nie jest wspierany przez wtyczkÄ™ %s" +#~ msgid "" +#~ "Unknown pointer %#08x\n" +#~ "Continue?" +#~ msgstr "" +#~ "Nieznany wskaźnik %#08x\n" +#~ "Kontynuować?" + #~ msgid "Use FPS For Limiting" #~ msgstr "Użyj FPS do limitowania" From 98ed34d50b158e4a6a88ca309d2904b714964d5b Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 17 Dec 2012 11:32:10 -0600 Subject: [PATCH 200/627] Use wxNullCursor to put the cursor back to its default instead of explicitly setting the cursor to the arrow. --- Source/Core/DolphinWX/Src/Frame.cpp | 4 ++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 99c4f65f1f..c9408203ea 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -114,7 +114,7 @@ CPanel::CPanel( SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) SetCursor(wxCURSOR_BLANK); else - SetCursor(wxCURSOR_ARROW); + SetCursor(wxNullCursor); break; case WIIMOTE_DISCONNECT: @@ -483,7 +483,7 @@ void CFrame::OnActive(wxActivateEvent& event) else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + m_RenderParent->SetCursor(wxNullCursor); } } event.Skip(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d52427ed6e..db2d591308 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1055,7 +1055,7 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + m_RenderParent->SetCursor(wxNullCursor); } else { @@ -1138,7 +1138,7 @@ void CFrame::DoStop() wxMouseEventHandler(CFrame::OnMouse), (wxObject*)0, this); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) m_RenderFrame->Destroy(); From 081131160473868c0deb19358b199a5832c8e71e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 17 Dec 2012 19:31:52 +0100 Subject: [PATCH 201/627] TextureCacheBase: Delete textures completely instead of just invalidating them in ClearRenderTargets. That's what would've been done in the next TCB::Load() call, anyway. Fixes issue 5742. Additionally, change efb copies to specify 1 as the number of mipmaps because that makes more sense than anything else. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index a5c390df3d..7c47c35bb6 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -205,8 +205,11 @@ void TextureCache::ClearRenderTargets() tcend = textures.end(); for (; iter!=tcend; ++iter) - if (iter->second->type != TCET_EC_DYNAMIC) - iter->second->type = TCET_NORMAL; + if (iter->second->type == TCET_EC_VRAM) + { + delete iter->second; + textures.erase(iter++); + } } bool TextureCache::CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels) @@ -782,7 +785,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat textures[dstAddr] = entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h); // TODO: Using the wrong dstFormat, dumb... - entry->SetGeneralParameters(dstAddr, 0, dstFormat, 0); + entry->SetGeneralParameters(dstAddr, 0, dstFormat, 1); entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h); entry->SetHashes(TEXHASH_INVALID); entry->type = TCET_EC_VRAM; From b78f5debe69822dc1cde338b48d9b685a901616d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 14:54:20 -0600 Subject: [PATCH 202/627] Initial push of GLES and GLUtil file breakup. --- CMakeLists.txt | 6 + Source/Core/Common/Src/VideoBackendBase.cpp | 4 + Source/Core/Core/CMakeLists.txt | 6 +- Source/Core/DolphinWX/CMakeLists.txt | 27 +- Source/Plugins/CMakeLists.txt | 4 +- Source/Plugins/Plugin_VideoOGL/CMakeLists.txt | 15 +- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 653 +++--------------- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 68 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 18 +- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 7 +- .../Plugin_VideoSoftware/CMakeLists.txt | 16 +- .../Plugin_VideoSoftware/Src/EfbCopy.cpp | 3 +- .../Plugin_VideoSoftware/Src/HwRasterizer.cpp | 300 ++++++-- .../Plugin_VideoSoftware/Src/HwRasterizer.h | 3 + .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 194 +++--- .../Src/SWVideoConfig.cpp | 2 +- .../Plugin_VideoSoftware/Src/SWmain.cpp | 66 +- 17 files changed, 582 insertions(+), 810 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e4f14f5e..15cd489dd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,6 +218,12 @@ if(FASTLOG) add_definitions(-DDEBUGFAST) endif() +option(USE_GLES "Enables GLES, disables OGL" OFF) +if(USE_GLES) + message("GLES rendering enabled") + add_definitions(-DUSE_GLES) + add_definitions(-DUSE_EGL) +endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) ######################################## diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 339cb016c1..d0ec7819bc 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -22,7 +22,9 @@ #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h" #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h" #endif +#ifndef USE_GLES #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h" +#endif #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h" std::vector g_available_video_backends; @@ -52,7 +54,9 @@ void VideoBackend::PopulateList() if (IsGteVista()) g_available_video_backends.push_back(new DX11::VideoBackend); #endif +#ifndef USE_GLES g_available_video_backends.push_back(new OGL::VideoBackend); +#endif g_available_video_backends.push_back(new SW::VideoSoftware); g_video_backend = g_available_video_backends.front(); diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index d11c4a350a..47276dd172 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -191,7 +191,11 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/JitCommon/JitCache.cpp Src/PowerPC/JitCommon/Jit_Util.cpp) -set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network) +set(LIBS bdisasm inputcommon videosoftware sfml-network) + +if(NOT USE_GLES) + set(LIBS ${LIBS} videoogl) +endif() if(WIN32) set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index d03cf7c6b1..fcc531029c 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -8,7 +8,6 @@ set(LIBS core z sfml-network ${GTK2_LIBRARIES} - ${OPENGL_LIBRARIES} ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) @@ -31,7 +30,8 @@ if(LIBAV_FOUND) endif() if(wxWidgets_FOUND) - set(SRCS Src/ARCodeAddEdit.cpp + set(SRCS + Src/ARCodeAddEdit.cpp Src/AboutDolphin.cpp Src/CheatsWindow.cpp Src/ConfigMain.cpp @@ -79,7 +79,28 @@ if(wxWidgets_FOUND) set(WXLIBS ${wxWidgets_LIBRARIES}) else() - set(SRCS Src/MainNoGUI.cpp) + set(SRCS + Src/MainNoGUI.cpp) +endif() + +if(USE_EGL) + set(SRCS ${SRCS} + Src/VideoInterface/EGL.cpp + ) +else() + if(WIN32) + set(SRCS ${SRCS} + Src/VideoInterface/GLW.cpp + ) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(SRCS ${SRCS} + Src/VideoInterface/AGL.cpp + ) + else() + set(SRCS ${SRCS} + Src/VideoInterface/GLX.cpp + ) + endif() endif() if(WIN32) diff --git a/Source/Plugins/CMakeLists.txt b/Source/Plugins/CMakeLists.txt index 0a0412377a..7dfdbaca83 100644 --- a/Source/Plugins/CMakeLists.txt +++ b/Source/Plugins/CMakeLists.txt @@ -1,3 +1,5 @@ -add_subdirectory(Plugin_VideoOGL) +if(NOT USE_GLES) + add_subdirectory(Plugin_VideoOGL) +endif() add_subdirectory(Plugin_VideoSoftware) # TODO: Add other backends here! diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt index b506087106..43b127f5ef 100644 --- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt @@ -12,11 +12,22 @@ set(SRCS Src/FramebufferManager.cpp Src/VertexManager.cpp) set(LIBS videocommon - GLEW SOIL common - ${OPENGL_LIBRARIES} ${X11_LIBRARIES}) +if(USE_EGL) + set(LIBS ${LIBS} + EGL) +endif() + +if(USE_GLES) + set(LIBS ${LIBS} + GLESv2) +else() + set(LIBS ${LIBS} + GLEW + ${OPENGL_LIBRARIES}) +endif() if(wxWidgets_FOUND) set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index d6abb014c4..17986a4921 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -28,59 +28,8 @@ #include "GLUtil.h" -#if defined(_WIN32) -#include "EmuWindow.h" -static HDC hDC = NULL; // Private GDI Device Context -static HGLRC hRC = NULL; // Permanent Rendering Context -#else GLWindow GLWin; -#endif - -// Handles OpenGL and the window - -// Window dimensions. -static int s_backbuffer_width; -static int s_backbuffer_height; - -void OpenGL_SwapBuffers() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->SwapBuffers(); -#elif defined(__APPLE__) - [GLWin.cocoaCtx flushBuffer]; -#elif defined(_WIN32) - SwapBuffers(hDC); -#elif defined(HAVE_X11) && HAVE_X11 - glXSwapBuffers(GLWin.dpy, GLWin.win); -#endif -} - -u32 OpenGL_GetBackbufferWidth() -{ - return s_backbuffer_width; -} - -u32 OpenGL_GetBackbufferHeight() -{ - return s_backbuffer_height; -} - -void OpenGL_SetWindowText(const char *text) -{ -#if defined(USE_WX) && USE_WX - // Handled by Host_UpdateTitle() -#elif defined(__APPLE__) - [GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]]; -#elif defined(_WIN32) - TCHAR temp[512]; - swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text); - EmuWindow::SetWindowText(temp); -#elif defined(HAVE_X11) && HAVE_X11 - // Tell X to ask the window manager to set the window title. - // (X itself doesn't provide window title functionality.) - XStoreName(GLWin.dpy, GLWin.win, text); -#endif -} +cInterfaceBase *GLInterface; namespace OGL { @@ -88,20 +37,7 @@ namespace OGL // Draw messages on top of the screen unsigned int VideoBackend::PeekMessages() { -#ifdef _WIN32 - // TODO: peekmessage - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -#else - return false; -#endif + return GLInterface->PeekMessages(); } // Show the current FPS @@ -109,523 +45,86 @@ void VideoBackend::UpdateFPSDisplay(const char *text) { char temp[100]; snprintf(temp, sizeof temp, "%s | OpenGL | %s", scm_rev_str, text); - OpenGL_SetWindowText(temp); + return GLInterface->UpdateFPSDisplay(temp); } } - -#if defined(HAVE_X11) && HAVE_X11 -void XEventThread(); - -void CreateXWindow(void) +void InitInterface() { - Atom wmProtocols[1]; - - // Setup window attributes - GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, - GLWin.parent, GLWin.vi->visual, AllocNone); - GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; - GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); - GLWin.attr.border_pixel = 0; - - // Create the window - GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, - GLWin.vi->depth, InputOutput, GLWin.vi->visual, - CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); - wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); - XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); - XMapRaised(GLWin.evdpy, GLWin.win); - XSync(GLWin.evdpy, True); - - GLWin.xEventThread = std::thread(XEventThread); + #if defined(USE_EGL) && USE_EGL + GLInterface = new cInterfaceEGL; + #elif defined(USE_WX) && USE_WX + GLInterface = new cInterfaceWX; + #elif defined(__APPLE__) + GLInterface = new cInterfaceAGL; + #elif defined(_WIN32) + GLInterface = new cInterfaceWGL; + #elif defined(HAVE_X11) && HAVE_X11 + GLInterface = new cInterfaceGLX; + #endif } -void DestroyXWindow(void) +GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) { - XUnmapWindow(GLWin.dpy, GLWin.win); - GLWin.win = 0; - if (GLWin.xEventThread.joinable()) - GLWin.xEventThread.join(); - XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); -} - -void XEventThread() -{ - // Free look variables - static bool mouseLookEnabled = false; - static bool mouseMoveEnabled = false; - static float lastMouse[2]; - while (GLWin.win) - { - XEvent event; - KeySym key; - for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) - { - XNextEvent(GLWin.evdpy, &event); - switch(event.type) { - case KeyPress: - key = XLookupKeysym((XKeyEvent*)&event, 0); - switch (key) - { - case XK_3: - OSDChoice = 1; - // Toggle native resolution - g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; - break; - case XK_4: - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - break; - case XK_5: - OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - break; - case XK_6: - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - break; - default: - break; - } - if (g_Config.bFreeLook) - { - static float debugSpeed = 1.0f; - switch (key) - { - case XK_parenleft: - debugSpeed /= 2.0f; - break; - case XK_parenright: - debugSpeed *= 2.0f; - break; - case XK_w: - VertexShaderManager::TranslateView(0.0f, debugSpeed); - break; - case XK_s: - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - break; - case XK_a: - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - break; - case XK_d: - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - break; - case XK_r: - VertexShaderManager::ResetView(); - break; - } - } - break; - case ButtonPress: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseMoveEnabled = true; - break; - case 3: // Right button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseLookEnabled = true; - break; - } - } - break; - case ButtonRelease: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - mouseMoveEnabled = false; - break; - case 3: // Right button - mouseLookEnabled = false; - break; - } - } - break; - case MotionNotify: - if (g_Config.bFreeLook) - { - if (mouseLookEnabled) - { - VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, - (event.xmotion.y - lastMouse[1]) / 200.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - - if (mouseMoveEnabled) - { - VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, - (event.xmotion.y - lastMouse[1]) / 50.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - } - break; - case ConfigureNotify: - Window winDummy; - unsigned int borderDummy, depthDummy; - XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, - &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); - s_backbuffer_width = GLWin.width; - s_backbuffer_height = GLWin.height; - break; - case ClientMessage: - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) - Host_Message(WM_USER_STOP); - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "RESIZE", False)) - XMoveResizeWindow(GLWin.evdpy, GLWin.win, - event.xclient.data.l[1], event.xclient.data.l[2], - event.xclient.data.l[3], event.xclient.data.l[4]); - break; - default: - break; - } - } - Common::SleepCurrentThread(20); - } -} -#endif - -// Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool OpenGL_Create(void *&window_handle) -{ - int _tx, _ty, _twidth, _theight; - Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); - - // Control window size and picture scaling - s_backbuffer_width = _twidth; - s_backbuffer_height = _theight; - -#if defined(USE_WX) && USE_WX - GLWin.panel = (wxPanel *)window_handle; - GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, - wxPoint(0, 0), wxSize(_twidth, _theight)); - GLWin.glCanvas->Show(true); - if (GLWin.glCtxt == NULL) // XXX dirty hack - GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); - -#elif defined(__APPLE__) - NSRect size; - NSUInteger style = NSMiniaturizableWindowMask; - NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 }; - NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] - initWithAttributes: attr]; - if (fmt == nil) { - ERROR_LOG(VIDEO, "failed to create pixel format"); - return NULL; - } - - GLWin.cocoaCtx = [[NSOpenGLContext alloc] - initWithFormat: fmt shareContext: nil]; - [fmt release]; - if (GLWin.cocoaCtx == nil) { - ERROR_LOG(VIDEO, "failed to create context"); - return NULL; - } - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { - size = [[NSScreen mainScreen] frame]; - style |= NSBorderlessWindowMask; - } else { - size = NSMakeRect(_tx, _ty, _twidth, _theight); - style |= NSResizableWindowMask | NSTitledWindowMask; - } - - GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size - styleMask: style backing: NSBackingStoreBuffered defer: NO]; - if (GLWin.cocoaWin == nil) { - ERROR_LOG(VIDEO, "failed to create window"); - return NULL; - } - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { - CGDisplayCapture(CGMainDisplayID()); - [GLWin.cocoaWin setLevel: CGShieldingWindowLevel()]; - } - - [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; - [GLWin.cocoaWin makeKeyAndOrderFront: nil]; - -#elif defined(_WIN32) - window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait...")); - if (window_handle == NULL) - { - Host_SysMessage("failed to create window"); - return false; - } - - // Show the window - EmuWindow::Show(); - - PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - 32, // Select Our Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // 8bit Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 24Bit Z-Buffer (Depth Buffer) - 8, // 8bit Stencil Buffer - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored - }; - - GLuint PixelFormat; // Holds The Results After Searching For A Match - - if (!(hDC=GetDC(EmuWindow::GetWnd()))) { - PanicAlert("(1) Can't create an OpenGL Device context. Fail."); - return false; - } - if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) { - PanicAlert("(2) Can't find a suitable PixelFormat."); - return false; - } - if (!SetPixelFormat(hDC, PixelFormat, &pfd)) { - PanicAlert("(3) Can't set the PixelFormat."); - return false; - } - if (!(hRC = wglCreateContext(hDC))) { - PanicAlert("(4) Can't create an OpenGL rendering context."); - return false; - } - // -------------------------------------- - -#elif defined(HAVE_X11) && HAVE_X11 - int glxMajorVersion, glxMinorVersion; - - // attributes for a single buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - None}; - - // attributes for a double buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, - GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, - None }; - - int attrListDefault[] = { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - None }; - - GLWin.dpy = XOpenDisplay(0); - GLWin.evdpy = XOpenDisplay(0); - GLWin.parent = (Window)window_handle; - GLWin.screen = DefaultScreen(GLWin.dpy); - if (GLWin.parent == 0) - GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); - - glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); - NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); - - // Get an appropriate visual - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); - if (GLWin.vi == NULL) - { - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl); - if (GLWin.vi != NULL) - { - ERROR_LOG(VIDEO, "Only single buffered visual!"); - } - else - { - GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault); - if (GLWin.vi == NULL) - { - ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)"); - return false; - } - } - } - else - NOTICE_LOG(VIDEO, "Got double buffered visual!"); - - // Create a GLX context. - GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE); - if (!GLWin.ctx) - { - PanicAlert("Unable to create GLX context."); - return false; - } - - GLWin.x = _tx; - GLWin.y = _ty; - GLWin.width = _twidth; - GLWin.height = _theight; - - CreateXWindow(); - window_handle = (void *)GLWin.win; -#endif - return true; -} - -bool OpenGL_MakeCurrent() -{ - // connect the glx-context to the window -#if defined(USE_WX) && USE_WX - return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); -#elif defined(__APPLE__) - [GLWin.cocoaCtx makeCurrentContext]; -#elif defined(_WIN32) - return wglMakeCurrent(hDC, hRC) ? true : false; -#elif defined(HAVE_X11) && HAVE_X11 -#if defined(HAVE_WX) && (HAVE_WX) - Host_GetRenderWindowSize(GLWin.x, GLWin.y, - (int&)GLWin.width, (int&)GLWin.height); - XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y, - GLWin.width, GLWin.height); -#endif - return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); -#endif - return true; -} - -// Update window width, size and etc. Called from Render.cpp -void OpenGL_Update() -{ -#if defined(USE_WX) && USE_WX - int width, height; - - GLWin.panel->GetSize(&width, &height); - if (width == s_backbuffer_width && height == s_backbuffer_height) - return; - - GLWin.glCanvas->SetFocus(); - GLWin.glCanvas->SetSize(0, 0, width, height); - GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(__APPLE__) - int width, height; - - width = [[GLWin.cocoaWin contentView] frame].size.width; - height = [[GLWin.cocoaWin contentView] frame].size.height; - if (width == s_backbuffer_width && height == s_backbuffer_height) - return; - - [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; - [GLWin.cocoaCtx update]; - [GLWin.cocoaCtx makeCurrentContext]; - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(_WIN32) - RECT rcWindow; - if (!EmuWindow::GetParentWnd()) - { - // We are not rendering to a child window - use client size. - GetClientRect(EmuWindow::GetWnd(), &rcWindow); - } - else - { - // We are rendering to a child window - use parent size. - GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); - } - - // Get the new window width and height - // See below for documentation - int width = rcWindow.right - rcWindow.left; - int height = rcWindow.bottom - rcWindow.top; - - // If we are rendering to a child window - if (EmuWindow::GetParentWnd() != 0 && - (s_backbuffer_width != width || s_backbuffer_height != height) && - width >= 4 && height >= 4) - { - ::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE); - s_backbuffer_width = width; - s_backbuffer_height = height; - } -#endif -} - -// Close backend -void OpenGL_Shutdown() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->Hide(); - // XXX GLWin.glCanvas->Destroy(); - // XXX delete GLWin.glCtxt; -#elif defined(__APPLE__) - [GLWin.cocoaWin close]; - [GLWin.cocoaCtx clearDrawable]; - [GLWin.cocoaCtx release]; -#elif defined(_WIN32) - if (hRC) - { - if (!wglMakeCurrent(NULL, NULL)) - NOTICE_LOG(VIDEO, "Could not release drawing context."); - - if (!wglDeleteContext(hRC)) - ERROR_LOG(VIDEO, "Release Rendering Context Failed."); - - hRC = NULL; - } - - if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) - { - ERROR_LOG(VIDEO, "Release Device Context Failed."); - hDC = NULL; - } + // generate objects + GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); + GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); + GLuint programID = glCreateProgram(); + GLint Result = GL_FALSE; + char stringBuffer[1024]; + GLsizei stringBufferUsage = 0; -#elif defined(HAVE_X11) && HAVE_X11 - DestroyXWindow(); - if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL)) - NOTICE_LOG(VIDEO, "Could not release drawing context."); - if (GLWin.ctx) - { - glXDestroyContext(GLWin.dpy, GLWin.ctx); - XCloseDisplay(GLWin.dpy); - XCloseDisplay(GLWin.evdpy); - GLWin.ctx = NULL; + // compile vertex shader + glShaderSource(vertexShaderID, 1, &vertexShader, NULL); + glCompileShader(vertexShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader); + } else { + DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader); + } + bool shader_errors = !Result; +#endif + + // compile fragment shader + glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL); + glCompileShader(fragmentShaderID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); + glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader); + } else if(!Result) { + ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader); + } else { + DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader); + } + shader_errors |= !Result; +#endif + + // link them + glAttachShader(programID, vertexShaderID); + glAttachShader(programID, fragmentShaderID); + glLinkProgram(programID); +#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) + glGetProgramiv(programID, GL_LINK_STATUS, &Result); + glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); + if(Result && stringBufferUsage) { + ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); + } else if(!Result && !shader_errors) { + ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); } #endif + + // cleanup + glDeleteShader(vertexShaderID); + glDeleteShader(fragmentShaderID); + + return programID; } GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) @@ -633,14 +132,15 @@ GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) GLint err = glGetError(); if (err != GL_NO_ERROR) { - ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x - %s\n", - file, line, function, err, gluErrorString(err)); + ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n", + file, line, function, err); } return err; } void OpenGL_ReportARBProgramError() { +#ifndef USE_GLES const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB); if (pstr != NULL && pstr[0] != 0) { @@ -650,10 +150,12 @@ void OpenGL_ReportARBProgramError() ERROR_LOG(VIDEO, "%s", (char*)pstr); ERROR_LOG(VIDEO, "\n"); } +#endif } bool OpenGL_ReportFBOError(const char *function, const char *file, int line) { +#ifndef USE_GLES unsigned int fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); if (fbo_status != GL_FRAMEBUFFER_COMPLETE_EXT) { @@ -686,6 +188,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line) file, line, function, error); return false; } +#endif return true; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 23c31a1bb7..ae83401f38 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -20,26 +20,7 @@ #include "VideoConfig.h" #include "MathUtil.h" -#include "Thread.h" - -#ifdef _WIN32 -#define GLEW_STATIC -#include -#include -#elif defined HAVE_X11 && HAVE_X11 -#include -#include -#include -#include -#elif defined __APPLE__ -#include -#import -#endif - -#if defined USE_WX && USE_WX -#include "wx/wx.h" -#include "wx/glcanvas.h" -#endif +#include "GLVideoInterface.h" #ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils #define GL_DEPTH_STENCIL_EXT 0x84F9 @@ -52,49 +33,11 @@ #include -typedef struct { -#if defined(USE_WX) && USE_WX - wxGLCanvas *glCanvas; - wxGLContext *glCtxt; - wxPanel *panel; -#elif defined(__APPLE__) - NSWindow *cocoaWin; - NSOpenGLContext *cocoaCtx; -#elif defined(HAVE_X11) && HAVE_X11 - int screen; - Window win; - Window parent; - // dpy used for glx stuff, evdpy for window events etc. - // evdpy is to be used by XEventThread only - Display *dpy, *evdpy; - XVisualInfo *vi; - GLXContext ctx; - XSetWindowAttributes attr; - std::thread xEventThread; - int x, y; - unsigned int width, height; #endif -} GLWindow; +void InitInterface(); -extern GLWindow GLWin; - -#endif - -// Public OpenGL util - -// Initialization / upkeep -bool OpenGL_Create(void *&); -void OpenGL_Shutdown(); -void OpenGL_Update(); -bool OpenGL_MakeCurrent(); -void OpenGL_SwapBuffers(); - -// Get status -u32 OpenGL_GetBackbufferWidth(); -u32 OpenGL_GetBackbufferHeight(); - -// Set things -void OpenGL_SetWindowText(const char *text); +// Helpers +GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); // Error reporting - use the convenient macros. void OpenGL_ReportARBProgramError(); @@ -126,4 +69,7 @@ extern CGprofile g_cgvProf, g_cgfProf; // use GLSL shaders across the whole pipeline. Yikes! //#define USE_DUAL_SOURCE_BLEND +// TODO: should be removed if we use glsl a lot +#define DEBUG_GLSL + #endif // _GLINIT_H_ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 77bb91d48b..2c43100b4c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -323,8 +323,8 @@ Renderer::Renderer() return; // TODO: fail // Decide frambuffer size - s_backbuffer_width = (int)OpenGL_GetBackbufferWidth(); - s_backbuffer_height = (int)OpenGL_GetBackbufferHeight(); + s_backbuffer_width = (int)GLInterface->GetBackBufferWidth(); + s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); // Handle VSync on/off #ifdef __APPLE__ @@ -521,7 +521,7 @@ Renderer::~Renderer() void Renderer::DrawDebugInfo() { // Reset viewport for drawing text - glViewport(0, 0, OpenGL_GetBackbufferWidth(), OpenGL_GetBackbufferHeight()); + glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight()); // Draw various messages on the screen, like FPS, statistics, etc. char debugtext_buffer[8192]; char *p = debugtext_buffer; @@ -598,8 +598,8 @@ void Renderer::DrawDebugInfo() void Renderer::RenderText(const char *text, int left, int top, u32 color) { - const int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); - const int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); + const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); + const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); @@ -1294,7 +1294,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons SetWindowSize(fbWidth, fbHeight); - OpenGL_Update(); // just updates the render window position and the backbuffer size + GLInterface->Update(); // just updates the render window position and the backbuffer size bool xfbchanged = false; @@ -1308,8 +1308,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } bool WindowResized = false; - int W = (int)OpenGL_GetBackbufferWidth(); - int H = (int)OpenGL_GetBackbufferHeight(); + int W = (int)GLInterface->GetBackBufferWidth(); + int H = (int)GLInterface->GetBackBufferHeight(); if (W != s_backbuffer_width || H != s_backbuffer_height || s_LastEFBScale != g_ActiveConfig.iEFBScale) { WindowResized = true; @@ -1354,7 +1354,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons GL_REPORT_ERRORD(); // Copy the rendered frame to the real window - OpenGL_SwapBuffers(); + GLInterface->SwapBuffers(); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index fb26ba2781..f52ec917e2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -165,7 +165,8 @@ bool VideoBackend::Initialize(void *&window_handle) g_Config.VerifyValidity(); UpdateActiveConfig(); - if (!OpenGL_Create(window_handle)) + InitInterface(); + if (!GLInterface->CreateWindow(window_handle)) return false; s_BackendInitialized = true; @@ -177,7 +178,7 @@ bool VideoBackend::Initialize(void *&window_handle) // Run from the graphics thread void VideoBackend::Video_Prepare() { - OpenGL_MakeCurrent(); + GLInterface->MakeCurrent(); g_renderer = new Renderer; @@ -236,7 +237,7 @@ void VideoBackend::Shutdown() g_renderer = NULL; g_texture_cache = NULL; } - OpenGL_Shutdown(); + GLInterface->Shutdown(); } } diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt index 0ba90d1537..15db15e654 100644 --- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt @@ -26,13 +26,25 @@ if(wxWidgets_FOUND) endif(wxWidgets_FOUND) set(LIBS videocommon - GLEW SOIL common - ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${wxWidgets_LIBRARIES}) +if(USE_EGL) + set(LIBS ${LIBS} + EGL) +endif() +if(USE_GLES) + set(SRCS ${SRCS} + ../Plugin_VideoOGL/Src/GLUtil.cpp) + set(LIBS ${LIBS} + GLESv2) +else() + set(LIBS ${LIBS} + GLEW + ${OPENGL_LIBRARIES}) +endif() if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) set(LIBS ${LIBS} clrun) endif() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp index 50e6998a74..95566d0e26 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp @@ -25,7 +25,6 @@ #include "DebugUtil.h" #include "HwRasterizer.h" #include "SWCommandProcessor.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" #include "HW/Memmap.h" #include "Core.h" @@ -33,7 +32,7 @@ namespace EfbCopy { void CopyToXfb() { - OpenGL_Update(); // just updates the render window position and the backbuffer size + GLInterface->Update(); // just updates the render window position and the backbuffer size if (!g_SWVideoConfig.bHwRasterizer) { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index 8736066524..a31fdaedd8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -26,6 +26,17 @@ #include "DebugUtil.h" #define TEMP_SIZE (1024*1024*4) +#ifdef USE_GLES +#define PREC "highp" +#define TEX2D GL_TEXTURE_2D +#define TEXTYPE "sampler2D" +#define TEXFUNC "texture2D" +#else +#define PREC +#define TEX2D GL_TEXTURE_RECTANGLE_ARB +#define TEXTYPE "sampler2DRect" +#define TEXFUNC "texture2DRect" +#endif namespace HwRasterizer { @@ -35,6 +46,75 @@ namespace HwRasterizer u8 *temp; + // Programs + static GLuint colProg, texProg, clearProg; + + // Color + static GLint col_apos = -1, col_atex = -1; + // Tex + static GLint tex_apos = -1, tex_atex = -1, tex_utex = -1; + // Clear shader + static GLint clear_apos = -1, clear_ucol = -1; + + void CreateShaders() + { + // Color Vertices + static const char *fragcolText = + "varying " PREC " vec4 TexCoordOut;\n" + "void main() {\n" + " gl_FragColor = TexCoordOut;\n" + "}\n"; + // Texture Vertices + static const char *fragtexText = + "varying " PREC " vec4 TexCoordOut;\n" + "uniform " TEXTYPE " Texture;\n" + "void main() {\n" + " " PREC " vec4 tmpcolor;\n" + " tmpcolor = " TEXFUNC "(Texture, TexCoordOut.xy);\n" + " gl_FragColor = tmpcolor;\n" + "}\n"; + // Clear shader + static const char *fragclearText = + "uniform vec4 Color;\n" + "void main() {\n" + " gl_FragColor = Color;\n" + "}\n"; + // Generic passthrough vertice shaders + static const char *vertShaderText = + "attribute vec4 pos;\n" + "attribute vec4 TexCoordIn;\n " + "varying vec4 TexCoordOut;\n " + "void main() {\n" + " gl_Position = pos;\n" + " TexCoordOut = TexCoordIn;\n" + "}\n"; + static const char *vertclearText = + "attribute vec4 pos;\n" + "void main() {\n" + " gl_Position = pos;\n" + "}\n"; + + // Color Program + colProg = OpenGL_CompileProgram(vertShaderText, fragcolText); + + // Texture Program + texProg = OpenGL_CompileProgram(vertShaderText, fragtexText); + + // Clear Program + clearProg = OpenGL_CompileProgram(vertclearText, fragclearText); + + // Color attributes + col_apos = glGetAttribLocation(colProg, "pos"); + col_atex = glGetAttribLocation(colProg, "TexCoordIn"); + // Texture attributes + tex_apos = glGetAttribLocation(texProg, "pos"); + tex_atex = glGetAttribLocation(texProg, "TexCoordIn"); + tex_utex = glGetUniformLocation(texProg, "Texture"); + // Clear attributes + clear_apos = glGetAttribLocation(clearProg, "pos"); + clear_ucol = glGetUniformLocation(clearProg, "Color"); + } + void Init() { efbHalfWidth = EFB_WIDTH / 2.0f; @@ -42,23 +122,72 @@ namespace HwRasterizer temp = (u8*)AllocateMemoryPages(TEMP_SIZE); } + void Shutdown() + { + glDeleteProgram(colProg); + glDeleteProgram(texProg); + glDeleteProgram(clearProg); + } + void Prepare() + { + //legacy multitexturing: select texture channel only. + glActiveTexture(GL_TEXTURE0); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment +#ifndef USE_GLES + glShadeModel(GL_SMOOTH); + glDisable(GL_BLEND); + glClearDepth(1.0f); + glEnable(GL_SCISSOR_TEST); + glDisable(GL_LIGHTING); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glClientActiveTexture(GL_TEXTURE0); + glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glEnable(GL_TEXTURE_RECTANGLE_ARB); + glStencilFunc(GL_ALWAYS, 0, 0); + glDisable(GL_STENCIL_TEST); +#endif + // used by hw rasterizer if it enables blending and depth test + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDepthFunc(GL_LEQUAL); + + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + + CreateShaders(); + GL_REPORT_ERRORD(); + } + static float width, height; void LoadTexture() { FourTexUnits &texUnit = bpmem.tex[0]; u32 imageAddr = texUnit.texImage3[0].image_base; - + // Texture Rectangle uses pixel coordinates + // While GLES uses texture coordinates +#ifdef USE_GLES + width = texUnit.texImage0[0].width; + height = texUnit.texImage0[0].height; +#else + width = 1; + height = 1; +#endif TexCacheEntry &cacheEntry = textures[imageAddr]; cacheEntry.Update(); + GL_REPORT_ERRORD(); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, cacheEntry.texture); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + glBindTexture(TEX2D, cacheEntry.texture); + glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); + glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + GL_REPORT_ERRORD(); } void BeginTriangles() { // disabling depth test sometimes allows more things to be visible + GL_REPORT_ERRORD(); glEnable(GL_DEPTH_TEST); glEnable(GL_BLEND); @@ -66,51 +195,121 @@ namespace HwRasterizer if (hasTexture) LoadTexture(); + GL_REPORT_ERRORD(); } void EndTriangles() { - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); - + glBindTexture(TEX2D, 0); glDisable(GL_DEPTH_TEST); glDisable(GL_BLEND); } - void DrawColorVertex(OutputVertexData *v) + void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) { - glColor3ub(v->color[0][OutputVertexData::RED_C], v->color[0][OutputVertexData::GRN_C], v->color[0][OutputVertexData::BLU_C]); - glVertex3f(v->screenPosition.x / efbHalfWidth - 1.0f, 1.0f - v->screenPosition.y / efbHalfHeight, v->screenPosition.z / (float)0x00ffffff); + float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; + float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); + float z0 = v0->screenPosition.z / (float)0x00ffffff; + + float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; + float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); + float z1 = v1->screenPosition.z / (float)0x00ffffff; + + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; + float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); + float z2 = v2->screenPosition.z / (float)0x00ffffff; + + float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f; + float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f; + float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f; + + float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f; + float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f; + float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f; + + float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f; + float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f; + float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f; + + static const GLfloat verts[3][3] = { + { x0, y0, z0 }, + { x1, y1, z1 }, + { x2, y2, z2 } + }; + static const GLfloat col[3][4] = { + { r0, g0, b0, 0.1f }, + { r1, g1, b1, 0.1f }, + { r2, g2, b2, 0.1f } + }; + { + glUseProgram(colProg); + glEnableVertexAttribArray(col_apos); + glEnableVertexAttribArray(col_atex); + + glVertexAttribPointer(col_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(col_atex, 4, GL_FLOAT, GL_FALSE, 0, col); + glDrawArrays(GL_TRIANGLES, 0, 3); + glDisableVertexAttribArray(col_atex); + glDisableVertexAttribArray(col_apos); + } + GL_REPORT_ERRORD(); } - void DrawTextureVertex(OutputVertexData *v) + void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) { - float s = v->texCoords[0].x; - float t = v->texCoords[0].y; - glTexCoord2f(s, t); + float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; + float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); + float z0 = v0->screenPosition.z; - float x = (v->screenPosition.x / efbHalfWidth) - 1.0f; - float y = 1.0f - (v->screenPosition.y / efbHalfHeight); - float z = v->screenPosition.z; - glVertex3f(x, y, z); + float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; + float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); + float z1 = v1->screenPosition.z; + + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; + float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); + float z2 = v2->screenPosition.z; + + float s0 = v0->texCoords[0].x / width; + float t0 = v0->texCoords[0].y / height; + + float s1 = v1->texCoords[0].x / width; + float t1 = v1->texCoords[0].y / height; + + float s2 = v2->texCoords[0].x / width; + float t2 = v2->texCoords[0].y / width; + + static const GLfloat verts[3][3] = { + { x0, y0, z0 }, + { x1, y1, z1 }, + { x2, y2, z2 } + }; + static const GLfloat tex[3][2] = { + { s0, t0 }, + { s1, t1 }, + { s2, t2 } + }; + { + glUseProgram(texProg); + glEnableVertexAttribArray(tex_apos); + glEnableVertexAttribArray(tex_atex); + + glVertexAttribPointer(tex_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(tex_atex, 2, GL_FLOAT, GL_FALSE, 0, tex); + glUniform1i(tex_utex, 0); + glDrawArrays(GL_TRIANGLES, 0, 3); + glDisableVertexAttribArray(tex_atex); + glDisableVertexAttribArray(tex_apos); + } + GL_REPORT_ERRORD(); } void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) { - glBegin(GL_TRIANGLES); - if (hasTexture) - { - DrawTextureVertex(v0); - DrawTextureVertex(v1); - DrawTextureVertex(v2); - } - else - { - DrawColorVertex(v0); - DrawColorVertex(v1); - DrawColorVertex(v2); - } - glEnd(); - } + if (hasTexture) + DrawTextureVertex(v0, v1, v2); + else + DrawColorVertex(v0, v1, v2); + } void Clear() { @@ -124,17 +323,21 @@ namespace HwRasterizer GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f; GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight; GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff; - - glBegin(GL_QUADS); - glColor4ub(r, g, b, a); - glVertex3f(left, top, depth); - glColor4ub(r, g, b, a); - glVertex3f(right, top, depth); - glColor4ub(r, g, b, a); - glVertex3f(right, bottom, depth); - glColor4ub(r, g, b, a); - glVertex3f(left, bottom, depth); - glEnd(); + static const GLfloat verts[4][3] = { + { left, top, depth }, + { right, top, depth }, + { right, bottom, depth }, + { left, bottom, depth } + }; + { + glUseProgram(clearProg); + glVertexAttribPointer(clear_apos, 3, GL_FLOAT, GL_FALSE, 0, verts); + glUniform4f(clear_ucol, r, g, b, a); + glEnableVertexAttribArray(col_apos); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDisableVertexAttribArray(col_apos); + } + GL_REPORT_ERRORD(); } TexCacheEntry::TexCacheEntry() @@ -158,9 +361,14 @@ namespace HwRasterizer DebugUtil::GetTextureBGRA(temp, 0, 0, width, height); glGenTextures(1, (GLuint *)&texture); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); - } + glBindTexture(TEX2D, texture); +#ifdef USE_GLES + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); +#else + glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); +#endif + GL_REPORT_ERRORD(); + } void TexCacheEntry::Destroy() { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h index 568c313215..9f07a44b19 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h @@ -28,6 +28,9 @@ struct OutputVertexData; namespace HwRasterizer { void Init(); + void Shutdown(); + + void Prepare(); void BeginTriangles(); void EndTriangles(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3923ed0840..982a8f11da 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -16,17 +16,35 @@ // http://code.google.com/p/dolphin-emu/ #include "Common.h" +#include #include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "../../Plugin_VideoOGL/Src/RasterFont.h" #include "SWRenderer.h" #include "SWStatistics.h" -#include "../../Plugin_VideoOGL/Src/RasterFont.h" - -#define VSYNC_ENABLED 0 static GLuint s_RenderTarget = 0; +static GLint attr_pos = -1, attr_tex = -1; +static GLint uni_tex = -1; +static GLuint program; + +#ifdef USE_GLES +#define PREC "highp" +#define TEX2D GL_TEXTURE_2D +#define TEXTYPE "sampler2D" +#define TEXFUNC "texture2D" +#else +#define PREC +#define TEX2D GL_TEXTURE_RECTANGLE_ARB +#define TEXTYPE "sampler2DRect" +#define TEXFUNC "texture2DRect" +#endif + + +#ifndef USE_GLES RasterFont* s_pfont = NULL; +#endif void SWRenderer::Init() { @@ -34,79 +52,68 @@ void SWRenderer::Init() void SWRenderer::Shutdown() { + glDeleteProgram(program); glDeleteTextures(1, &s_RenderTarget); +#ifndef USE_GLES + delete s_pfont; + s_pfont = 0; +#endif +} - delete s_pfont; - s_pfont = 0; +void CreateShaders() +{ + static const char *fragShaderText = + "varying " PREC " vec2 TexCoordOut;\n" + "uniform " TEXTYPE " Texture;\n" + "void main() {\n" + " " PREC " vec4 tmpcolor;\n" + " tmpcolor = " TEXFUNC "(Texture, TexCoordOut);\n" + " gl_FragColor = tmpcolor;\n" + "}\n"; + static const char *vertShaderText = + "attribute vec4 pos;\n" + "attribute vec2 TexCoordIn;\n " + "varying vec2 TexCoordOut;\n " + "void main() {\n" + " gl_Position = pos;\n" + " TexCoordOut = TexCoordIn;\n" + "}\n"; + + program = OpenGL_CompileProgram(vertShaderText, fragShaderText); + + glUseProgram(program); + + uni_tex = glGetUniformLocation(program, "Texture"); + attr_pos = glGetAttribLocation(program, "pos"); + attr_tex = glGetAttribLocation(program, "TexCoordIn"); } void SWRenderer::Prepare() { - OpenGL_MakeCurrent(); - - // Init extension support. - if (glewInit() != GLEW_OK) { - ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); - return; - } - - // Handle VSync on/off -#ifdef _WIN32 - if (WGLEW_EXT_swap_control) - wglSwapIntervalEXT(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?"); -#elif defined(HAVE_X11) && HAVE_X11 - if (glXSwapIntervalSGI) - glXSwapIntervalSGI(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)"); -#endif - - glStencilFunc(GL_ALWAYS, 0, 0); - // used by hw rasterizer if it enables blending and depth test - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDepthFunc(GL_LEQUAL); - - glShadeModel(GL_SMOOTH); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glClearDepth(1.0f); - glEnable(GL_SCISSOR_TEST); - + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment - - glDisable(GL_LIGHTING); - glDisable(GL_BLEND); - glDisable(GL_STENCIL_TEST); - //glDisable(GL_SCISSOR_TEST); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - s_pfont = new RasterFont(); - - // legacy multitexturing: select texture channel only. - glActiveTexture(GL_TEXTURE0); - glClientActiveTexture(GL_TEXTURE0); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - glGenTextures(1, &s_RenderTarget); + + CreateShaders(); +#ifndef USE_GLES + s_pfont = new RasterFont(); glEnable(GL_TEXTURE_RECTANGLE_ARB); +#endif + GL_REPORT_ERRORD(); } void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { - int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); - int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); + int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); + int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); +#ifndef USE_GLES glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); - s_pfont->printMultilineText(pstr, - left * 2.0f / (float)nBackbufferWidth - 1, - 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight); + s_pfont->printMultilineText(pstr, + left * 2.0f / (float)nBackbufferWidth - 1, + 1 - top * 2.0f / (float)nBackbufferHeight, + 0, nBackbufferWidth, nBackbufferHeight); +#endif } void SWRenderer::DrawDebugText() @@ -139,31 +146,56 @@ void SWRenderer::DrawDebugText() void SWRenderer::DrawTexture(u8 *texture, int width, int height) { - GLsizei glWidth = (GLsizei)OpenGL_GetBackbufferWidth(); - GLsizei glHeight = (GLsizei)OpenGL_GetBackbufferHeight(); + GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); + GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight(); // Update GLViewPort glViewport(0, 0, glWidth, glHeight); glScissor(0, 0, glWidth, glHeight); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, s_RenderTarget); - glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glBindTexture(TEX2D, s_RenderTarget); - GL_REPORT_ERRORD(); + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); + glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); GLfloat u_max = (GLfloat)width; GLfloat v_max = (GLfloat)glHeight; - - glBegin(GL_QUADS); - glTexCoord2f(0, v_max); glVertex2f(-1, -1); - glTexCoord2f(0, 0); glVertex2f(-1, 1); - glTexCoord2f(u_max, 0); glVertex2f( 1, 1); - glTexCoord2f(u_max, v_max); glVertex2f( 1, -1); - glEnd(); + + static const GLfloat verts[4][2] = { + { -1, -1}, // Left top + { -1, 1}, // left bottom + { 1, 1}, // right bottom + { 1, -1} // right top + }; + //Texture rectangle uses pixel coordinates +#ifndef USE_GLES + static const GLfloat texverts[4][2] = { + {0, v_max}, + {0, 0}, + {u_max, 0}, + {u_max, v_max} + }; +#else + static const GLfloat texverts[4][2] = { + {0, 1}, + {0, 0}, + {1, 0}, + {1, 1} + }; +#endif + glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); + glEnableVertexAttribArray(attr_pos); + glEnableVertexAttribArray(attr_tex); + glActiveTexture(GL_TEXTURE0); + glUniform1i(uni_tex, 0); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glDisableVertexAttribArray(attr_pos); + glDisableVertexAttribArray(attr_tex); - glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); + glBindTexture(TEX2D, 0); + GL_REPORT_ERRORD(); } void SWRenderer::SwapBuffer() @@ -172,15 +204,13 @@ void SWRenderer::SwapBuffer() glFlush(); - OpenGL_SwapBuffers(); + GLInterface->SwapBuffers(); - GL_REPORT_ERRORD(); - swstats.ResetFrame(); - // Clear framebuffer - glClearColor(0, 0, 0, 0); - glClearDepth(1.0); +#ifndef USE_GLES + glClearDepth(1.0f); +#endif glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp index 05a6cdddf2..7f7ef6b0f8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp @@ -51,7 +51,7 @@ void SWVideoConfig::Load(const char* ini_file) iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); - iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); + iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, true); iniFile.Get("Info", "ShowStats", &bShowStats, false); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 3c6fdcca38..1c18b1c165 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -40,6 +40,8 @@ #include "VideoBackend.h" #include "Core.h" +#define VSYNC_ENABLED 0 + namespace SW { @@ -69,8 +71,9 @@ void VideoSoftware::ShowConfig(void *_hParent) bool VideoSoftware::Initialize(void *&window_handle) { g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); + InitInterface(); - if (!OpenGL_Create(window_handle)) + if (!GLInterface->CreateWindow(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); return false; @@ -83,8 +86,10 @@ bool VideoSoftware::Initialize(void *&window_handle) OpcodeDecoder::Init(); Clipper::Init(); Rasterizer::Init(); - HwRasterizer::Init(); - SWRenderer::Init(); + if (g_SWVideoConfig.bHwRasterizer) + HwRasterizer::Init(); + else + SWRenderer::Init(); DebugUtil::Init(); return true; @@ -124,14 +129,44 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState) void VideoSoftware::Shutdown() { - SWRenderer::Shutdown(); - OpenGL_Shutdown(); + if (g_SWVideoConfig.bHwRasterizer) + HwRasterizer::Shutdown(); + else + SWRenderer::Shutdown(); + GLInterface->Shutdown(); } // This is called after Video_Initialize() from the Core void VideoSoftware::Video_Prepare() -{ - SWRenderer::Prepare(); +{ + GLInterface->MakeCurrent(); + // Init extension support. + { +#ifndef USE_GLES + if (glewInit() != GLEW_OK) { + ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); + return; + } + + // Handle VSync on/off +#ifdef _WIN32 + if (WGLEW_EXT_swap_control) + wglSwapIntervalEXT(VSYNC_ENABLED); + else + ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?"); +#elif defined(HAVE_X11) && HAVE_X11 + if (glXSwapIntervalSGI) + glXSwapIntervalSGI(VSYNC_ENABLED); + else + ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)"); +#endif +#endif + } + + if (g_SWVideoConfig.bHwRasterizer) + HwRasterizer::Prepare(); + else + SWRenderer::Prepare(); INFO_LOG(VIDEO, "Video backend initialized."); } @@ -273,20 +308,7 @@ writeFn32 VideoSoftware::Video_PEWrite32() // Draw messages on top of the screen unsigned int VideoSoftware::PeekMessages() { -#ifdef _WIN32 - // TODO: peekmessage - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -#else - return false; -#endif + return GLInterface->PeekMessages(); } // Show the current FPS @@ -294,7 +316,7 @@ void VideoSoftware::UpdateFPSDisplay(const char *text) { char temp[100]; snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text); - OpenGL_SetWindowText(temp); + GLInterface->UpdateFPSDisplay(temp); } } From 3cb5dffbc932cf0d9cde8ba9cf922eff17676cba Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 15:01:52 -0600 Subject: [PATCH 203/627] Missed the video interface files. --- Source/Core/DolphinWX/Src/GLVideoInterface.h | 75 ++++ .../Core/DolphinWX/Src/VideoInterface/AGL.cpp | 123 ++++++ .../Core/DolphinWX/Src/VideoInterface/AGL.h | 37 ++ .../Core/DolphinWX/Src/VideoInterface/EGL.cpp | 383 ++++++++++++++++++ .../Core/DolphinWX/Src/VideoInterface/EGL.h | 43 ++ .../Core/DolphinWX/Src/VideoInterface/GLX.cpp | 342 ++++++++++++++++ .../Core/DolphinWX/Src/VideoInterface/GLX.h | 41 ++ .../Src/VideoInterface/InterfaceBase.h | 36 ++ .../Core/DolphinWX/Src/VideoInterface/WGL.cpp | 179 ++++++++ .../Core/DolphinWX/Src/VideoInterface/WGL.h | 41 ++ .../Core/DolphinWX/Src/VideoInterface/WX.cpp | 82 ++++ Source/Core/DolphinWX/Src/VideoInterface/WX.h | 41 ++ 12 files changed, 1423 insertions(+) create mode 100644 Source/Core/DolphinWX/Src/GLVideoInterface.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/AGL.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/EGL.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/GLX.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/WGL.h create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/WX.cpp create mode 100644 Source/Core/DolphinWX/Src/VideoInterface/WX.h diff --git a/Source/Core/DolphinWX/Src/GLVideoInterface.h b/Source/Core/DolphinWX/Src/GLVideoInterface.h new file mode 100644 index 0000000000..3469b1d3c1 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLVideoInterface.h @@ -0,0 +1,75 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _VIDEOINTERFACE_H_ +#define _VIDEOINTERFACE_H_ + +#include "Thread.h" + +#if defined(USE_EGL) && USE_EGL +#include "VideoInterface/EGL.h" +#elif defined(USE_WX) && USE_WX +#include "VideoInterface/WX.h" +#elif defined(__APPLE__) +#include "VideoInterface/AGL.h" +#elif defined(_WIN32) +#include "VideoInterface/GLW.h" +#elif defined(HAVE_X11) && HAVE_X11 +#include "VideoInterface/GLX.h" +#endif + +typedef struct { +#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop + int screen; + Display *x_dpy; + Display *x_evdpy; + Window win; + Window parent; + EGLSurface egl_surf; + EGLContext egl_ctx; + EGLDisplay egl_dpy; + XVisualInfo *vi; + XSetWindowAttributes attr; + std::thread xEventThread; + int x, y; + unsigned int width, height; +#elif defined(USE_WX) && USE_WX + wxGLCanvas *glCanvas; + wxGLContext *glCtxt; + wxPanel *panel; +#elif defined(__APPLE__) + NSWindow *cocoaWin; + NSOpenGLContext *cocoaCtx; +#elif defined(HAVE_X11) && HAVE_X11 + int screen; + Window win; + Window parent; + // dpy used for glx stuff, evdpy for window events etc. + // evdpy is to be used by XEventThread only + Display *dpy, *evdpy; + XVisualInfo *vi; + GLXContext ctx; + XSetWindowAttributes attr; + std::thread xEventThread; + int x, y; + unsigned int width, height; +#endif +} GLWindow; + +extern cInterfaceBase *GLInterface; +extern GLWindow GLWin; + +#endif diff --git a/Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp b/Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp new file mode 100644 index 0000000000..465f77c972 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp @@ -0,0 +1,123 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLVideoInterface.h" +#include "AGL.h" + +void cInterfaceAGL::SwapBuffers() +{ + [GLWin.cocoaCtx flushBuffer]; +} + +// Show the current FPS +void cInterfaceAGL::UpdateFPSDisplay(const char *text) +{ + [GLWin.cocoaWin setTitle: [NSString stringWithUTF8String: text]]; +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceAGL::Create(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + NSRect size; + NSUInteger style = NSMiniaturizableWindowMask; + NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 }; + NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] + initWithAttributes: attr]; + if (fmt == nil) { + ERROR_LOG(VIDEO, "failed to create pixel format"); + return NULL; + } + + GLWin.cocoaCtx = [[NSOpenGLContext alloc] + initWithFormat: fmt shareContext: nil]; + [fmt release]; + if (GLWin.cocoaCtx == nil) { + ERROR_LOG(VIDEO, "failed to create context"); + return NULL; + } + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { + size = [[NSScreen mainScreen] frame]; + style |= NSBorderlessWindowMask; + } else { + size = NSMakeRect(_tx, _ty, _twidth, _theight); + style |= NSResizableWindowMask | NSTitledWindowMask; + } + + GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size + styleMask: style backing: NSBackingStoreBuffered defer: NO]; + if (GLWin.cocoaWin == nil) { + ERROR_LOG(VIDEO, "failed to create window"); + return NULL; + } + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) { + CGDisplayCapture(CGMainDisplayID()); + [GLWin.cocoaWin setLevel: CGShieldingWindowLevel()]; + } + + [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; + [GLWin.cocoaWin makeKeyAndOrderFront: nil]; + + return true; +} + +bool cInterfaceAGL::MakeCurrent() +{ + [GLWin.cocoaCtx makeCurrentContext]; + return true; +} + +// Update window width, size and etc. Called from Render.cpp +void cInterfaceAGL::Update() +{ + int width, height; + + width = [[GLWin.cocoaWin contentView] frame].size.width; + height = [[GLWin.cocoaWin contentView] frame].size.height; + if (width == s_backbuffer_width && height == s_backbuffer_height) + return; + + [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; + [GLWin.cocoaCtx update]; + [GLWin.cocoaCtx makeCurrentContext]; + s_backbuffer_width = width; + s_backbuffer_height = height; +} + +// Close backend +void cInterfaceAGL::Shutdown() +{ + [GLWin.cocoaWin close]; + [GLWin.cocoaCtx clearDrawable]; + [GLWin.cocoaCtx release]; +} + + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/AGL.h b/Source/Core/DolphinWX/Src/VideoInterface/AGL.h new file mode 100644 index 0000000000..1e73f3c6b8 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/AGL.h @@ -0,0 +1,37 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEAGL_H_ +#define _INTERFACEAGL_H_ + +#ifdef __APPLE__ +#include +#import +#endif + +#include "InterfaceBase.h" + +class cInterfaceAGL : public cInterfaceBase +{ +public: + void SwapBuffers(); + void UpdateFPSDisplay(const char *Text); + bool CreateWindow(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp b/Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp new file mode 100644 index 0000000000..bcf7acaff5 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp @@ -0,0 +1,383 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLVideoInterface.h" +#include "EGL.h" + +void cInterfaceEGL::CreateXWindow(void) +{ + Atom wmProtocols[1]; + + // Setup window attributes + GLWin.attr.colormap = XCreateColormap(GLWin.x_evdpy, + GLWin.parent, GLWin.vi->visual, AllocNone); + GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; + GLWin.attr.background_pixel = BlackPixel(GLWin.x_evdpy, GLWin.screen); + GLWin.attr.border_pixel = 0; + + // Create the window + GLWin.win = XCreateWindow(GLWin.x_evdpy, GLWin.parent, + GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + GLWin.vi->depth, InputOutput, GLWin.vi->visual, + CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); + wmProtocols[0] = XInternAtom(GLWin.x_evdpy, "WM_DELETE_WINDOW", True); + XSetWMProtocols(GLWin.x_evdpy, GLWin.win, wmProtocols, 1); + XSetStandardProperties(GLWin.x_evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XMapRaised(GLWin.x_evdpy, GLWin.win); + XSync(GLWin.x_evdpy, True); + + GLWin.xEventThread = std::thread(&cInterfaceEGL::XEventThread, this); +} + +void cInterfaceEGL::DestroyXWindow(void) +{ + XUnmapWindow(GLWin.x_dpy, GLWin.win); + GLWin.win = 0; + if (GLWin.xEventThread.joinable()) + GLWin.xEventThread.join(); + XFreeColormap(GLWin.x_dpy, GLWin.attr.colormap); +} + +void cInterfaceEGL::XEventThread() +{ + // Free look variables + static bool mouseLookEnabled = false; + static bool mouseMoveEnabled = false; + static float lastMouse[2]; + while (GLWin.win) + { + XEvent event; + KeySym key; + for (int num_events = XPending(GLWin.x_evdpy); num_events > 0; num_events--) + { + XNextEvent(GLWin.x_evdpy, &event); + switch(event.type) { + case KeyPress: + key = XLookupKeysym((XKeyEvent*)&event, 0); + switch (key) + { + case XK_3: + OSDChoice = 1; + // Toggle native resolution + g_Config.iEFBScale = g_Config.iEFBScale + 1; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + break; + case XK_4: + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + break; + case XK_5: + OSDChoice = 3; + // Toggle EFB copy + if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + { + g_Config.bEFBCopyEnable ^= true; + g_Config.bCopyEFBToTexture = false; + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + break; + case XK_6: + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + break; + default: + break; + } + if (g_Config.bFreeLook) + { + static float debugSpeed = 1.0f; + switch (key) + { + case XK_parenleft: + debugSpeed /= 2.0f; + break; + case XK_parenright: + debugSpeed *= 2.0f; + break; + case XK_w: + VertexShaderManager::TranslateView(0.0f, debugSpeed); + break; + case XK_s: + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + break; + case XK_a: + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + break; + case XK_d: + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + break; + case XK_r: + VertexShaderManager::ResetView(); + break; + } + } + break; + case ButtonPress: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseMoveEnabled = true; + break; + case 3: // Right button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseLookEnabled = true; + break; + } + } + break; + case ButtonRelease: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + mouseMoveEnabled = false; + break; + case 3: // Right button + mouseLookEnabled = false; + break; + } + } + break; + case MotionNotify: + if (g_Config.bFreeLook) + { + if (mouseLookEnabled) + { + VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, + (event.xmotion.y - lastMouse[1]) / 200.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + + if (mouseMoveEnabled) + { + VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, + (event.xmotion.y - lastMouse[1]) / 50.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + } + break; + case ConfigureNotify: + Window winDummy; + unsigned int borderDummy, depthDummy; + XGetGeometry(GLWin.x_dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, + &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); + s_backbuffer_width = GLWin.width; + s_backbuffer_height = GLWin.height; + break; + case ClientMessage: + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.x_dpy, "WM_DELETE_WINDOW", False)) + Host_Message(WM_USER_STOP); + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.x_dpy, "RESIZE", False)) + XMoveResizeWindow(GLWin.x_dpy, GLWin.win, + event.xclient.data.l[1], event.xclient.data.l[2], + event.xclient.data.l[3], event.xclient.data.l[4]); + break; + default: + break; + } + } + Common::SleepCurrentThread(20); + } +} + +// Show the current FPS +void cInterfaceEGL::UpdateFPSDisplay(const char *text) +{ + XStoreName(GLWin.x_dpy, GLWin.win, text); +} +void cInterfaceEGL::SwapBuffers() +{ + eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceEGL::CreateWindow(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + const char *s; + EGLint egl_major, egl_minor; + + GLWin.x_dpy = XOpenDisplay(NULL); + + if (!GLWin.x_dpy) { + printf("Error: couldn't open display\n"); + return false; + } + + GLWin.egl_dpy = eglGetDisplay(GLWin.x_dpy); + if (!GLWin.egl_dpy) { + printf("Error: eglGetDisplay() failed\n"); + return false; + } + + if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) { + printf("Error: eglInitialize() failed\n"); + return false; + } + + s = eglQueryString(GLWin.egl_dpy, EGL_VERSION); + printf("EGL_VERSION = %s\n", s); + + s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR); + printf("EGL_VENDOR = %s\n", s); + + s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS); + printf("EGL_EXTENSIONS = %s\n", s); + + s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS); + printf("EGL_CLIENT_APIS = %s\n", s); + + // attributes for a visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attribs[] = { + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_DEPTH_SIZE, 24, +#ifdef USE_GLES + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, +#else + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, +#endif + EGL_NONE }; + + static const EGLint ctx_attribs[] = { +#ifdef USE_GLES + EGL_CONTEXT_CLIENT_VERSION, 2, +#endif + EGL_NONE + }; + + GLWin.x_evdpy = XOpenDisplay(NULL); + GLWin.parent = (Window)window_handle; + GLWin.screen = DefaultScreen(GLWin.x_dpy); + if (GLWin.parent == 0) + GLWin.parent = RootWindow(GLWin.x_dpy, GLWin.screen); + + unsigned long mask; + XVisualInfo visTemplate; + int num_visuals; + EGLConfig config; + EGLint num_configs; + EGLint vid; + + if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) { + printf("Error: couldn't get an EGL visual config\n"); + exit(1); + } + + if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { + printf("Error: eglGetConfigAttrib() failed\n"); + exit(1); + } + + /* The X window visual must match the EGL config */ + visTemplate.visualid = vid; + GLWin.vi = XGetVisualInfo(GLWin.x_dpy, VisualIDMask, &visTemplate, &num_visuals); + if (!GLWin.vi) { + printf("Error: couldn't get X visual\n"); + exit(1); + } + + GLWin.x = _tx; + GLWin.y = _ty; + GLWin.width = _twidth; + GLWin.height = _theight; + + CreateXWindow(); +#ifdef USE_GLES + eglBindAPI(EGL_OPENGL_ES_API); +#else + eglBindAPI(EGL_OPENGL_API); +#endif + GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs ); + if (!GLWin.egl_ctx) { + printf("Error: eglCreateContext failed\n"); + exit(1); + } + + GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL); + if (!GLWin.egl_surf) { + printf("Error: eglCreateWindowSurface failed\n"); + exit(1); + } + + if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) { + + printf("Error: eglMakeCurrent() failed\n"); + return false; + } + + + printf("GL_VENDOR: %s\n", glGetString(GL_VENDOR)); + printf("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); + printf("GL_VERSION: %s\n", glGetString(GL_VERSION)); + printf("GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS)); + /* Set initial projection/viewing transformation. + * We can't be sure we'll get a ConfigureNotify event when the window + * first appears. + */ + glViewport(0, 0, (GLint) _twidth, (GLint) _theight); + window_handle = (void *)GLWin.win; + return true; +} + +bool cInterfaceEGL::MakeCurrent() +{ + return eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx); +} +// Close backend +void cInterfaceEGL::Shutdown() +{ + DestroyXWindow(); + if (GLWin.egl_ctx && !eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + if (GLWin.egl_ctx) + { + eglDestroyContext(GLWin.egl_dpy, GLWin.egl_ctx); + eglDestroySurface(GLWin.egl_dpy, GLWin.egl_surf); + eglTerminate(GLWin.egl_dpy); + GLWin.egl_ctx = NULL; + } +} + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/EGL.h b/Source/Core/DolphinWX/Src/VideoInterface/EGL.h new file mode 100644 index 0000000000..afb57b2ac2 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/EGL.h @@ -0,0 +1,43 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEGLX_H_ +#define _INTERFACEGLX_H_ + +#include +#ifdef USE_GLES +#include +#else +#include +#include +#endif +#include "InterfaceBase.h" + +class cInterfaceEGL : public cInterfaceBase +{ +private: + void CreateXWindow(); + void DestroyXWindow(); + void XEventThread(); +public: + void SwapBuffers(); + void UpdateFPSDisplay(const char *Text); + bool CreateWindow(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp b/Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp new file mode 100644 index 0000000000..63458f7a4d --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp @@ -0,0 +1,342 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLVideoInterface.h" +#include "GLX.h" + +void cInterfaceGLX::CreateXWindow(void) +{ + Atom wmProtocols[1]; + + // Setup window attributes + GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, + GLWin.parent, GLWin.vi->visual, AllocNone); + GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; + GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); + GLWin.attr.border_pixel = 0; + + // Create the window + GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, + GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + GLWin.vi->depth, InputOutput, GLWin.vi->visual, + CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); + wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); + XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); + XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XMapRaised(GLWin.evdpy, GLWin.win); + XSync(GLWin.evdpy, True); + + GLWin.xEventThread = std::thread(&cInterfaceGLX::XEventThread, this); +} + +void cInterfaceGLX::DestroyXWindow(void) +{ + XUnmapWindow(GLWin.dpy, GLWin.win); + GLWin.win = 0; + if (GLWin.xEventThread.joinable()) + GLWin.xEventThread.join(); + XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); +} + +void cInterfaceGLX::XEventThread() +{ + // Free look variables + static bool mouseLookEnabled = false; + static bool mouseMoveEnabled = false; + static float lastMouse[2]; + while (GLWin.win) + { + XEvent event; + KeySym key; + for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) + { + XNextEvent(GLWin.evdpy, &event); + switch(event.type) { + case KeyPress: + key = XLookupKeysym((XKeyEvent*)&event, 0); + switch (key) + { + case XK_3: + OSDChoice = 1; + // Toggle native resolution + g_Config.iEFBScale = g_Config.iEFBScale + 1; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + break; + case XK_4: + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + break; + case XK_5: + OSDChoice = 3; + // Toggle EFB copy + if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + { + g_Config.bEFBCopyEnable ^= true; + g_Config.bCopyEFBToTexture = false; + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + break; + case XK_6: + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + break; + default: + break; + } + if (g_Config.bFreeLook) + { + static float debugSpeed = 1.0f; + switch (key) + { + case XK_parenleft: + debugSpeed /= 2.0f; + break; + case XK_parenright: + debugSpeed *= 2.0f; + break; + case XK_w: + VertexShaderManager::TranslateView(0.0f, debugSpeed); + break; + case XK_s: + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + break; + case XK_a: + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + break; + case XK_d: + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + break; + case XK_r: + VertexShaderManager::ResetView(); + break; + } + } + break; + case ButtonPress: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseMoveEnabled = true; + break; + case 3: // Right button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseLookEnabled = true; + break; + } + } + break; + case ButtonRelease: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + mouseMoveEnabled = false; + break; + case 3: // Right button + mouseLookEnabled = false; + break; + } + } + break; + case MotionNotify: + if (g_Config.bFreeLook) + { + if (mouseLookEnabled) + { + VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, + (event.xmotion.y - lastMouse[1]) / 200.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + + if (mouseMoveEnabled) + { + VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, + (event.xmotion.y - lastMouse[1]) / 50.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + } + break; + case ConfigureNotify: + Window winDummy; + unsigned int borderDummy, depthDummy; + XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, + &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); + s_backbuffer_width = GLWin.width; + s_backbuffer_height = GLWin.height; + break; + case ClientMessage: + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) + Host_Message(WM_USER_STOP); + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "RESIZE", False)) + XMoveResizeWindow(GLWin.evdpy, GLWin.win, + event.xclient.data.l[1], event.xclient.data.l[2], + event.xclient.data.l[3], event.xclient.data.l[4]); + break; + default: + break; + } + } + Common::SleepCurrentThread(20); + } +} + +// Show the current FPS +void cInterfaceGLX::UpdateFPSDisplay(const char *text) +{ + XStoreName(GLWin.dpy, GLWin.win, text); +} +void cInterfaceGLX::SwapBuffers() +{ + glXSwapBuffers(GLWin.dpy, GLWin.win); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceGLX::CreateWindow(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + int glxMajorVersion, glxMinorVersion; + + // attributes for a single buffered visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + None}; + + // attributes for a double buffered visual in RGBA format with at least + // 8 bits per color and a 24 bit depth buffer + int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, + GLX_SAMPLES_ARB, g_Config.iMultisampleMode != MULTISAMPLE_OFF?1:0, + None }; + + int attrListDefault[] = { + GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DOUBLEBUFFER, + GLX_DEPTH_SIZE, 1, + None }; + + GLWin.dpy = XOpenDisplay(0); + GLWin.evdpy = XOpenDisplay(0); + GLWin.parent = (Window)window_handle; + GLWin.screen = DefaultScreen(GLWin.dpy); + if (GLWin.parent == 0) + GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); + + glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); + NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); + + // Get an appropriate visual + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); + if (GLWin.vi == NULL) + { + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl); + if (GLWin.vi != NULL) + { + ERROR_LOG(VIDEO, "Only single buffered visual!"); + } + else + { + GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault); + if (GLWin.vi == NULL) + { + ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)"); + return false; + } + } + } + else + NOTICE_LOG(VIDEO, "Got double buffered visual!"); + + // Create a GLX context. + GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE); + if (!GLWin.ctx) + { + PanicAlert("Unable to create GLX context."); + return false; + } + + GLWin.x = _tx; + GLWin.y = _ty; + GLWin.width = _twidth; + GLWin.height = _theight; + + CreateXWindow(); + window_handle = (void *)GLWin.win; + return true; +} + +bool cInterfaceGLX::MakeCurrent() +{ + // connect the glx-context to the window + #if defined(HAVE_WX) && (HAVE_WX) + Host_GetRenderWindowSize(GLWin.x, GLWin.y, + (int&)GLWin.width, (int&)GLWin.height); + XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y, + GLWin.width, GLWin.height); + #endif + return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); +} +// Close backend +void cInterfaceGLX::Shutdown() +{ + DestroyXWindow(); + if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + if (GLWin.ctx) + { + glXDestroyContext(GLWin.dpy, GLWin.ctx); + XCloseDisplay(GLWin.dpy); + XCloseDisplay(GLWin.evdpy); + GLWin.ctx = NULL; + } +} + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/GLX.h b/Source/Core/DolphinWX/Src/VideoInterface/GLX.h new file mode 100644 index 0000000000..bea58cb862 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/GLX.h @@ -0,0 +1,41 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEGLX_H_ +#define _INTERFACEGLX_H_ + +#include +#include +#include +#include + +#include "InterfaceBase.h" + +class cInterfaceGLX : public cInterfaceBase +{ +private: + void CreateXWindow(); + void DestroyXWindow(); + void XEventThread(); +public: + void SwapBuffers(); + void UpdateFPSDisplay(const char *Text); + bool CreateWindow(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h new file mode 100644 index 0000000000..8fa4cc1b12 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h @@ -0,0 +1,36 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +class cInterfaceBase +{ +protected: + // Window dimensions. + u32 s_backbuffer_width; + u32 s_backbuffer_height; +public: + virtual void SwapBuffers() = 0; + virtual void UpdateFPSDisplay(const char *Text) = 0; + virtual bool CreateWindow(void *&window_handle) = 0; + virtual bool MakeCurrent() = 0; + virtual void Shutdown() = 0; + + virtual u32 GetBackBufferWidth() { return s_backbuffer_width; } + virtual u32 GetBackBufferHeight() { return s_backbuffer_height; } + virtual void Update() { } + virtual bool PeekMessages() { return false; } +}; + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp b/Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp new file mode 100644 index 0000000000..9abcd52fc6 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp @@ -0,0 +1,179 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLVideoInterface.h" +#include "WGL.h" + +#include "EmuWindow.h" +static HDC hDC = NULL; // Private GDI Device Context +static HGLRC hRC = NULL; // Permanent Rendering Context + +void cInterfaceWGL::SwapBuffers() +{ + SwapBuffers(hDC); +} + +// Draw messages on top of the screen +bool cInterfaceWGL::PeekMessages() +{ + // TODO: peekmessage + MSG msg; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + return FALSE; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + return TRUE; +} + +// Show the current FPS +void cInterfaceWGL::UpdateFPSDisplay(const char *text) +{ + TCHAR temp[512]; + swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs"), text); + EmuWindow::SetWindowText(temp); +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceWGL::CreateWindow(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait...")); + if (window_handle == NULL) + { + Host_SysMessage("failed to create window"); + return false; + } + + // Show the window + EmuWindow::Show(); + + PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be + { + sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor + 1, // Version Number + PFD_DRAW_TO_WINDOW | // Format Must Support Window + PFD_SUPPORT_OPENGL | // Format Must Support OpenGL + PFD_DOUBLEBUFFER, // Must Support Double Buffering + PFD_TYPE_RGBA, // Request An RGBA Format + 32, // Select Our Color Depth + 0, 0, 0, 0, 0, 0, // Color Bits Ignored + 0, // 8bit Alpha Buffer + 0, // Shift Bit Ignored + 0, // No Accumulation Buffer + 0, 0, 0, 0, // Accumulation Bits Ignored + 24, // 24Bit Z-Buffer (Depth Buffer) + 8, // 8bit Stencil Buffer + 0, // No Auxiliary Buffer + PFD_MAIN_PLANE, // Main Drawing Layer + 0, // Reserved + 0, 0, 0 // Layer Masks Ignored + }; + + GLuint PixelFormat; // Holds The Results After Searching For A Match + + if (!(hDC=GetDC(EmuWindow::GetWnd()))) { + PanicAlert("(1) Can't create an OpenGL Device context. Fail."); + return false; + } + if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) { + PanicAlert("(2) Can't find a suitable PixelFormat."); + return false; + } + if (!SetPixelFormat(hDC, PixelFormat, &pfd)) { + PanicAlert("(3) Can't set the PixelFormat."); + return false; + } + if (!(hRC = wglCreateContext(hDC))) { + PanicAlert("(4) Can't create an OpenGL rendering context."); + return false; + } + return true; +} + +bool cInterfaceWGL::MakeCurrent() +{ + return wglMakeCurrent(hDC, hRC) ? true : false; +} + +// Update window width, size and etc. Called from Render.cpp +void cInterfaceWGL::Update() +{ + RECT rcWindow; + if (!EmuWindow::GetParentWnd()) + { + // We are not rendering to a child window - use client size. + GetClientRect(EmuWindow::GetWnd(), &rcWindow); + } + else + { + // We are rendering to a child window - use parent size. + GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); + } + + // Get the new window width and height + // See below for documentation + int width = rcWindow.right - rcWindow.left; + int height = rcWindow.bottom - rcWindow.top; + + // If we are rendering to a child window + if (EmuWindow::GetParentWnd() != 0 && + (s_backbuffer_width != width || s_backbuffer_height != height) && + width >= 4 && height >= 4) + { + ::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE); + s_backbuffer_width = width; + s_backbuffer_height = height; + } +} + +// Close backend +void cInterfaceWGL::Shutdown() +{ + if (hRC) + { + if (!wglMakeCurrent(NULL, NULL)) + NOTICE_LOG(VIDEO, "Could not release drawing context."); + + if (!wglDeleteContext(hRC)) + ERROR_LOG(VIDEO, "Release Rendering Context Failed."); + + hRC = NULL; + } + + if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) + { + ERROR_LOG(VIDEO, "Release Device Context Failed."); + hDC = NULL; + } +} + + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WGL.h b/Source/Core/DolphinWX/Src/VideoInterface/WGL.h new file mode 100644 index 0000000000..4ef6943623 --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/WGL.h @@ -0,0 +1,41 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEWGL_H_ +#define _INTERFACEWGL_H_ + +#ifdef _WIN32 +#define GLEW_STATIC +#include +#include +#endif + +#include "InterfaceBase.h" + +class cInterfaceWGL : public cInterfaceBase +{ +public: + void SwapBuffers(); + void UpdateFPSDisplay(const char *Text); + bool CreateWindow(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); + + void Update(); + bool PeekMessages(); +}; +#endif + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.cpp b/Source/Core/DolphinWX/Src/VideoInterface/WX.cpp new file mode 100644 index 0000000000..7126ccb8ba --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/WX.cpp @@ -0,0 +1,82 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "VideoConfig.h" +#include "Host.h" +#include "RenderBase.h" + +#include "VertexShaderManager.h" +#include "../GLVideoInterface.h" +#include "WX.h" + +void cInterfaceWX::SwapBuffers() +{ + GLWin.glCanvas->SwapBuffers(); +} + +void cInterfaceWX::UpdateFPSDisplay(const char *text) +{ + // Handled by Host_UpdateTitle() +} + +// Create rendering window. +// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() +bool cInterfaceWX::CreateCreate(void *&window_handle) +{ + int _tx, _ty, _twidth, _theight; + Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); + + // Control window size and picture scaling + s_backbuffer_width = _twidth; + s_backbuffer_height = _theight; + + GLWin.panel = (wxPanel *)window_handle; + GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, + wxPoint(0, 0), wxSize(_twidth, _theight)); + GLWin.glCanvas->Show(true); + if (GLWin.glCtxt == NULL) // XXX dirty hack + GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); +} + +bool cInterfaceWX::MakeCurrent() +{ + return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); +} + +// Update window width, size and etc. Called from Render.cpp +void cInterfaceWX::Update() +{ + int width, height; + + GLWin.panel->GetSize(&width, &height); + if (width == s_backbuffer_width && height == s_backbuffer_height) + return; + + GLWin.glCanvas->SetFocus(); + GLWin.glCanvas->SetSize(0, 0, width, height); + GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); + s_backbuffer_width = width; + s_backbuffer_height = height; +} + +// Close backend +void cInterfaceWX::Shutdown() +{ + GLWin.glCanvas->Hide(); +} + + diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.h b/Source/Core/DolphinWX/Src/VideoInterface/WX.h new file mode 100644 index 0000000000..290b0262ed --- /dev/null +++ b/Source/Core/DolphinWX/Src/VideoInterface/WX.h @@ -0,0 +1,41 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _INTERFACEWX_H_ +#define _INTERFACEWX_H_ + +#include +#include +#if defined USE_WX && USE_WX +#include "wx/wx.h" +#include "wx/glcanvas.h" +#endif + +#include "InterfaceBase.h" + +class cInterfaceWX : public cInterfaceBase +{ +public: + void SwapBuffers(); + void UpdateFPSDisplay(const char *Text); + bool CreateWindow(void *&window_handle); + bool MakeCurrent(); + void Shutdown(); + + void Update(); +}; +#endif + From 8082323c4432951494729ff1f53a4e794bf781f2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 15:29:38 -0600 Subject: [PATCH 204/627] Should hopefully fix OSX --- Source/Core/DolphinWX/Src/VideoInterface/WX.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.h b/Source/Core/DolphinWX/Src/VideoInterface/WX.h index 290b0262ed..6b2cf90692 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/WX.h +++ b/Source/Core/DolphinWX/Src/VideoInterface/WX.h @@ -17,8 +17,14 @@ #ifndef _INTERFACEWX_H_ #define _INTERFACEWX_H_ +#ifdef HAVE_X11 && HAVE_X11 #include #include +#elif defined __APPLE__ +#include +#import +#endif + #if defined USE_WX && USE_WX #include "wx/wx.h" #include "wx/glcanvas.h" From 6099148541b1b8e6d238233c62a6bf530e1e5e74 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 15:33:19 -0600 Subject: [PATCH 205/627] Blind coding fail --- Source/Core/DolphinWX/Src/VideoInterface/WX.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.h b/Source/Core/DolphinWX/Src/VideoInterface/WX.h index 6b2cf90692..d15044e503 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/WX.h +++ b/Source/Core/DolphinWX/Src/VideoInterface/WX.h @@ -17,7 +17,7 @@ #ifndef _INTERFACEWX_H_ #define _INTERFACEWX_H_ -#ifdef HAVE_X11 && HAVE_X11 +#if defined HAVE_X11 && HAVE_X11 #include #include #elif defined __APPLE__ From 512cae69f8dd077fc6e97b43b931f9d4436e4bcf Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 15:55:34 -0600 Subject: [PATCH 206/627] Add a useful comment to DSP.cpp --- Source/Core/Core/Src/HW/DSP.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index e86231db43..5945cb7141 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -718,6 +718,8 @@ void Do_ARAM_DMA() { while (g_arDMA.Cnt.count) { + // These are logically seperated in code to show that a memory map has been set up + // See below in the write section for more information if ((g_ARAM_Info.Hex & 0xf) == 3) { Memory::Write_U64_Swap(*(u64*)&g_ARAM.ptr[g_arDMA.ARAddr & g_ARAM.mask], g_arDMA.MMAddr); From f2004b2474b007b693f3bb8a48437fb3876e69da Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 16:19:55 -0600 Subject: [PATCH 207/627] Blindly add WGL.cpp file to the Windows project file. Just for Neo --- Source/Core/DolphinWX/Dolphin.vcxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 72c40a3db4..d945e395f9 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -265,6 +265,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + Create Create @@ -387,4 +388,4 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - \ No newline at end of file + From f6ef6fa0d949d911103566e1b49286849af8377c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 17 Dec 2012 16:23:02 -0600 Subject: [PATCH 208/627] I had the wrong header for Windows in GLVideoInterface.h --- Source/Core/DolphinWX/Src/GLVideoInterface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GLVideoInterface.h b/Source/Core/DolphinWX/Src/GLVideoInterface.h index 3469b1d3c1..d688335259 100644 --- a/Source/Core/DolphinWX/Src/GLVideoInterface.h +++ b/Source/Core/DolphinWX/Src/GLVideoInterface.h @@ -26,7 +26,7 @@ #elif defined(__APPLE__) #include "VideoInterface/AGL.h" #elif defined(_WIN32) -#include "VideoInterface/GLW.h" +#include "VideoInterface/WGL.h" #elif defined(HAVE_X11) && HAVE_X11 #include "VideoInterface/GLX.h" #endif From ed59f8ff1d9a527e47b2429734e94f7bf1aed12c Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 05:55:40 +0100 Subject: [PATCH 209/627] Remove UCode_AX_ADPCM.h, now useless (incorporated into UCode_AX_Voice.h) --- Source/Core/Core/Core.vcxproj | 1 - Source/Core/Core/Core.vcxproj.filters | 3 - .../Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h | 92 ------------------- 3 files changed, 96 deletions(-) delete mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index d83fa7fcc7..dca0d072fc 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -461,7 +461,6 @@ - diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 8e2592450c..68953aef07 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -727,9 +727,6 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h deleted file mode 100644 index 9130bb9da4..0000000000 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef _UCODE_AX_ADPCM_H -#define _UCODE_AX_ADPCM_H - -#include "../../DSP.h" - -static inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac) -{ - while (samplePos < newSamplePos) - { - if ((samplePos & 15) == 0) - { - adpcm.pred_scale = DSP::ReadARAM((samplePos & ~15) >> 1); - samplePos += 2; - newSamplePos += 2; - } - - int scale = 1 << (adpcm.pred_scale & 0xF); - int coef_idx = (adpcm.pred_scale >> 4) & 7; - - s32 coef1 = adpcm.coefs[coef_idx * 2 + 0]; - s32 coef2 = adpcm.coefs[coef_idx * 2 + 1]; - - int temp = (samplePos & 1) ? - (DSP::ReadARAM(samplePos >> 1) & 0xF) : - (DSP::ReadARAM(samplePos >> 1) >> 4); - - if (temp >= 8) - temp -= 16; - - // 0x400 = 0.5 in 11-bit fixed point - int val = (scale * temp) + ((0x400 + coef1 * adpcm.yn1 + coef2 * adpcm.yn2) >> 11); - - if (val > 0x7FFF) - val = 0x7FFF; - else if (val < -0x7FFF) - val = -0x7FFF; - - adpcm.yn2 = adpcm.yn1; - adpcm.yn1 = val; - - samplePos++; - } - - return adpcm.yn1; -} - -// TODO: WTF is going on here?!? -// Volume control (ramping) -static inline u16 ADPCM_Vol(u16 vol, u16 delta) -{ - int x = vol; - if (delta && delta < 0x5000) - x += delta * 20 * 8; // unsure what the right step is - //x += 1 * 20 * 8; - else if (delta && delta > 0x5000) - //x -= (0x10000 - delta); // this is to small, it's often 1 - x -= (0x10000 - delta) * 20 * 16; // if this was 20 * 8 the sounds in Fire Emblem and Paper Mario - // did not have time to go to zero before the were closed - //x -= 1 * 20 * 16; - - // make lower limits - if (x < 0) x = 0; - //if (pb.mixer_control < 1000 && x < pb.mixer_control) x = pb.mixer_control; // does this make - // any sense? - - // make upper limits - //if (mixer_control > 1000 && x > mixer_control) x = mixer_control; // maybe mixer_control also - // has a volume target? - //if (x >= 0x7fff) x = 0x7fff; // this seems a little high - //if (x >= 0x4e20) x = 0x4e20; // add a definitive limit at 20 000 - if (x >= 0x8000) x = 0x8000; // clamp to 32768; - return x; // update volume -} - -#endif // _UCODE_AX_ADPCM_H From 70b3980f46c8160f9d174496e03e30a95a58c181 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 06:58:47 +0100 Subject: [PATCH 210/627] Fix AX HLE command 12 arguments: takes 4 u16, not 1 --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 6464e47c72..0ad33870db 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -193,7 +193,16 @@ void CUCode_AX::HandleCommandList() break; case CMD_UNK_11: curr_idx += 2; break; - case CMD_UNK_12: curr_idx += 1; break; + + case CMD_UNK_12: + { + u16 samp_val = m_cmdlist[curr_idx++]; + u16 idx = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + // TODO + break; + } // Send the contents of MAIN LRS, AUXA LRS and AUXB S to RAM, and // mix data to MAIN LR and AUXB LR. From 1abbfd4b151e51eb9f90f6a495e217eab8eed108 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 07:00:04 +0100 Subject: [PATCH 211/627] Remove some useless 'inline' attributes from the AX HLE voice mixing functions --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 16df07e8a4..16a9870b9e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -90,7 +90,7 @@ bool ReadPB(u32 addr, PB_TYPE& pb) } // Write a PB back to MRAM/ARAM -inline bool WritePB(u32 addr, const PB_TYPE& pb) +bool WritePB(u32 addr, const PB_TYPE& pb) { const u16* src = (const u16*)&pb; u16* dst = (u16*)Memory::GetPointer(addr); @@ -109,7 +109,7 @@ static u32* acc_cur_addr; static PB_TYPE* acc_pb; // Sets up the simulated accelerator. -inline void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) +void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) { acc_pb = pb; acc_loop_addr = HILO_TO_32(pb->audio_addr.loop_addr); @@ -120,7 +120,7 @@ inline void AcceleratorSetup(PB_TYPE* pb, u32* cur_addr) // Reads a sample from the simulated accelerator. Also handles looping and // disabling streams that reached the end (this is done by an exception raised // by the accelerator on real hardware). -inline u16 AcceleratorGetSample() +u16 AcceleratorGetSample() { u16 ret; @@ -215,7 +215,7 @@ inline u16 AcceleratorGetSample() } // Read 32 input samples from ARAM, decoding and converting rate if required. -inline void GetInputSamples(PB_TYPE& pb, s16* samples) +void GetInputSamples(PB_TYPE& pb, s16* samples) { u32 cur_addr = HILO_TO_32(pb.audio_addr.cur_addr); AcceleratorSetup(&pb, &cur_addr); @@ -304,7 +304,7 @@ inline void GetInputSamples(PB_TYPE& pb, s16* samples) } // Add samples to an output buffer, with optional volume ramping. -inline void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) +void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) { u16& volume = pvol[0]; u16 volume_delta = pvol[1]; From faaaa97c9e6cea7fa865312ce07a9c222983e50a Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 07:00:24 +0100 Subject: [PATCH 212/627] Added a utility function to dump an AX PB for debugging --- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 16a9870b9e..155965dfea 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -103,6 +103,26 @@ bool WritePB(u32 addr, const PB_TYPE& pb) return true; } +// Dump the value of a PB for debugging +#define DUMP_U16(field) WARN_LOG(DSPHLE, " %04x (%s)", pb.field, #field) +#define DUMP_U32(field) WARN_LOG(DSPHLE, " %08x (%s)", HILO_TO_32(pb.field), #field) +void DumpPB(const PB_TYPE& pb) +{ + DUMP_U32(next_pb); + DUMP_U32(this_pb); + DUMP_U16(src_type); + DUMP_U16(coef_select); +#ifdef AX_GC + DUMP_U16(mixer_control); +#else + DUMP_U32(mixer_control); +#endif + DUMP_U16(running); + DUMP_U16(is_stream); + + // TODO: complete as needed +} + // Simulated accelerator state. static u32 acc_loop_addr, acc_end_addr; static u32* acc_cur_addr; From 1cecbaedced4d8a44461f1eadda5d3b1949634c1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 07:01:22 +0100 Subject: [PATCH 213/627] Fix MixAdd with volume. The previous volume formula completely failed with volumes >= 1.0 (0x8000). Fixes Tomb Raider Legends (GC) music. --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 155965dfea..bf13c7114d 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -337,8 +337,11 @@ void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) for (u32 i = 0; i < 32; ++i) { - s64 sample = 2 * (s16)input[i] * (s16)volume; - out[i] += (s32)(sample >> 16); + s64 sample = input[i]; + sample *= volume; + sample >>= 15; + + out[i] += (s32)sample; volume += volume_delta; } } From 9734eaedb15a51b6f3119c5734903bbb7314923b Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 18 Dec 2012 08:30:05 -0600 Subject: [PATCH 214/627] Update Korean translations. --- Languages/po/ko.po | 155 ++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 80 deletions(-) diff --git a/Languages/po/ko.po b/Languages/po/ko.po index d362fd4f58..aca262ad75 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-01-19 11:47+0900\n" +"PO-Revision-Date: 2012-12-18 17:21+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -48,7 +48,7 @@ msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format @@ -302,7 +302,7 @@ msgstr "위키(&W)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -322,7 +322,7 @@ msgstr "(ë”)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" -msgstr "" +msgstr "0x44" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" @@ -363,7 +363,7 @@ msgstr "<시스템>" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" -msgstr "" +msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:221 @@ -626,14 +626,12 @@ msgid "Advanced Settings" msgstr "고급 설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, ciso, gcz)" +msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" @@ -657,17 +655,15 @@ msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ì—뮬레ì´ì…˜ 창안ì—ì„œ 3, 4, 5, 6, 7 í•«í‚¤ë“¤ì„ í†µí•´ 특정 옵션들 í† ê¸€ì„ í—ˆìš©í•©ë‹ˆ" -"다.\n" +"ì—뮬레ì´ì…˜ 창안ì—ì„œ 3, 4, 5, 6 í•«í‚¤ë“¤ì„ í†µí•´ 특정 옵션들 í† ê¸€ì„ í—ˆìš©í•©ë‹ˆë‹¤.\n" "\n" -"확신 없으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Alternate Wiimote Timing" @@ -675,7 +671,7 @@ msgstr "위모트 타ì´ë° 대안" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" -msgstr "" +msgstr "분ì„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" @@ -783,12 +779,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" -msgstr "" +msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "레지스터들(&R)" +msgstr "BP 레지스터" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -907,7 +902,7 @@ msgstr "버튼" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" -msgstr "" +msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" @@ -919,7 +914,7 @@ msgstr "C-스틱" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" -msgstr "" +msgstr "CP 레지" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" @@ -1076,11 +1071,11 @@ msgstr "치트들 관리ìž" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Check Partition Integrity" -msgstr "" +msgstr "파티션 완전성 ì²´í¬" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." -msgstr "" +msgstr "파티션 완전성 ì²´í¬ì¤‘..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" @@ -1440,7 +1435,7 @@ msgstr "ì²´ì½”" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" @@ -1481,11 +1476,11 @@ msgstr "DVD 루트:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 msgid "DVDLowRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVD저수준ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했습니다" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVD저수준비암호화ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했습니다." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" @@ -1819,16 +1814,16 @@ msgid "EFB Copies" msgstr "EFB 복사" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"ì—러: ì´ ë²„ì „ì˜ ëŒí•€ì€ ì ì–´ë„ 버전 %d.%dì¸ TAP-Win32 ë“œë¼ì´ë²„ê°€ 필요하다 " -"-- ë‹¹ì‹ ì´ ìµœê·¼ì— ë‹¹ì‹ ì˜ ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼" -"ì´ë²„를 알게 하려는 ì‹œì ì—ì„œ ì•„ë§ˆë„ ìž¬ë¶€íŒ…ì´ í•„ìš”í•©ë‹ˆë‹¤." +"ì—러: ì´ ë²„ì „ì˜ ëŒí•€ì€ ì ì–´ë„ %d.%d 버전 TAP-Win32 ë“œë¼ì´ë²„ê°€ 필요합니다. " +"-- ìµœê·¼ì— ëŒí•€ ë°°í¬ë¥¼ 업그레ì´ë“œí–ˆë‹¤ë©´, 윈ë„우즈가 새로운 ë“œë¼ì´ë²„를 ì¸ì‹í•˜" +"는 ê´€ì ì—ì„œ ìž¬ë¶€íŒ…ì´ í•„ìš”í•  ê²ë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -2337,15 +2332,15 @@ msgid "Failed to read banner.bin" msgstr "banner.bin ì½ê¸°ì— 실패했습니다" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"저장 ë°ì´í„°ë¥¼ ì½ê¸°ì— 실패했습니다\n" -"(0xA000-)\n" -"메모리카드가 ìž˜ë ¸ì„ ì§€ë„" +"저장 ë°ì´í„°ì˜ %d 블럭 ì½ê¸°ì— 실패했습니다\n" +"메모리카드가 ìž˜ë ¸ì„ ì§€ë„\n" +"파ì¼ìœ„치:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2416,7 +2411,7 @@ msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Farsi" -msgstr "" +msgstr "페르시아어" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 msgid "Fast" @@ -2431,6 +2426,8 @@ msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다. msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" +"ì¹˜ëª…ì  ë¹„ë™ê¸°. 재ìƒì„ 중단합니다. (PlayWiimoteì—ì„œ ì—러: %u != %u, byte " +"%u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" @@ -2488,11 +2485,11 @@ msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" -msgstr "" +msgstr "ë‹¤ìŒ ì°¾ê¸°" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" -msgstr "" +msgstr "ì´ì „ 찾기" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" @@ -2567,7 +2564,7 @@ msgstr "앞으로" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "%d ê°œ 찾았습니다 '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 @@ -2588,9 +2585,8 @@ msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 -#, fuzzy msgid "Frame Info" -msgstr "프레임" +msgstr "프레임 ì •ë³´" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" @@ -2649,7 +2645,7 @@ msgstr "GC패드" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Game ID:" @@ -2677,7 +2673,7 @@ msgstr "게임환경" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "게임í브 게임저장 파ì¼(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -2702,7 +2698,7 @@ msgid "Gecko Codes" msgstr "Gecko 코드" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2710,7 +2706,8 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" "Gecko코드가 (CT%i CST%i) (%s) 구ë™ì— 실패했습니다\n" -"(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ì•Šëœë‹¤.)" +"(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ë˜ì§€ 않습니다. codehandler.bin 파ì¼" +"ì„ Sys í´ë”ì— ìœ„ì¹˜ì‹œí‚¤ê³  ëŒí•€ì„ 재시작해서 ì›ë³¸ 코드 핸들러를 사용해보세요.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2941,14 +2938,14 @@ msgstr "" "름)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 -#, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -"í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하면, DSPì—ì„œ " -"오디오 ë³‘ëª©ë„ êº¼ì•¼ ê·¸ê²ƒì´ íš¨ê³¼ë¥¼ 냅니다." +"í”„ë ˆìž„ì œí•œì„ ê²Œìž„ í’€ 스피드 (NTSC:60, PAL:50)보다 ë” ë†’ê²Œ 설정하려면, DSP를 " +"ì´ìš©í•´ 오디오 ë³‘ëª©ì„ ì‚¬ìš©í•˜ì„¸ìš” (ê²Œìž„ì— ë”°ë¼ì„œëŠ” 소리 ëŠê¹€ë“¤ì„ 고칠지 모르지" +"만 ë˜í•œ 지ì†ì ì¸ ìž¡ìŒì„ 유발할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" @@ -3079,15 +3076,15 @@ msgstr "WAD 설치하기..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" -msgstr "" +msgstr "완전성 ì²´í¬ ì—러" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" -msgstr "" +msgstr "완전성 ì²´í¬ ì™„ë£Œë¨" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "완전성 ì²´í¬ê°€ 완료ë˜ì—ˆìŠµë‹ˆë‹¤. ì—러가 발견ë˜ì§€ 않었습니다." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format @@ -3095,6 +3092,8 @@ msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" +"파티션 %d ì— ëŒ€í•œ 완전성 ì²´í¬ê°€ 실패하였습니다. ë‹¹ì‹ ì˜ ë¤í”„ê°€ 오염ë˜ì—ˆê±°ë‚˜ 잘" +"못 íŒ¨ì¹˜ëœ ê²ƒ 같습니다." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" @@ -3172,15 +3171,15 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "비ì í•© 찾기 파ë¼ë¯¸í„° (ì„ íƒëœ 오브ì íŠ¸ ì—†ìŒ)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" -msgstr "" +msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (숫ìžë¡œ ë³€í™˜ë  ìˆ˜ 없었습니다)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (ì§ìˆ˜ ê¸¸ì´ ìŠ¤íŠ¸ë§ë§Œ 지ì›ë©ë‹ˆë‹¤)" #: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" @@ -3214,19 +3213,18 @@ msgid "KOREA" msgstr "한국" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 -#, fuzzy msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ì—뮬레ì´ì…˜ 윈ë„ìš° ìœ„ì— ë§ˆìš°ìŠ¤ 커서가 ìžˆì„ ë•Œ 숨ê¹ë‹ˆë‹¤.\n" +"게임 윈ë„우를 다른 모든 윈ë„ìš°ë“¤ì˜ ë§¨ìœ„ë¡œ 유지합니다.\n" "\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." +"모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" -msgstr "" +msgstr "윈ë„우를 맨위로 유지" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 @@ -3402,21 +3400,21 @@ msgstr "로그 환경설정" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "FPS를 파ì¼ì— 기ë¡" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "로그 타입" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ì—뮬레ì´ì…˜ ì†ë„ì˜ ì¸¡ì •ìœ¼ë¡œ 초당 ë Œë”ë˜ëŠ” 프레임 수치를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"초당 ë Œë”ë˜ëŠ” 프레임 수치를 User/Logs/fps.txt ì— ê¸°ë¡í•©ë‹ˆë‹¤. ëŒí•€ì˜ ì„±ëŠ¥ì„ ì¸¡" +"정하고 싶ì„ë•Œ ì´ ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ì„¸ìš”.\n" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." @@ -3602,11 +3600,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" -msgstr "" +msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "알림: 스트림 사ì´ì¦ˆê°€ 실제 ë°ì´í„° 길ì´ì™€ 매치ë˜ì§€ 않습니다\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3743,7 +3741,7 @@ msgstr "%s 타ì´í‹€ì— 대한 배너 파ì¼ì´ ì—†ìŒ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" -msgstr "" +msgstr "ì í•©í•œ ìƒì„¸ì„¤ëª… ì—†ìŒ" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" @@ -3840,7 +3838,7 @@ msgstr "오프셋:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "온-스í¬ë¦° 메시지 보여주기" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -3977,7 +3975,7 @@ msgstr "ì¼ì‹œì •ì§€" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "ë¬´ë¹„ì˜ ëì—ì„œ 멈추기" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4403,9 +4401,8 @@ msgid "Scroll Lock" msgstr "스í¬ë¡¤ ë½" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 -#, fuzzy msgid "Search" -msgstr "치트 찾기" +msgstr "찾기" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" @@ -4416,13 +4413,12 @@ msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 -#, fuzzy msgid "Search current Object" -msgstr "현재 ê´€ì ì„ 저장" +msgstr "최근 오브ì íŠ¸ 찾기" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" -msgstr "" +msgstr "헥스 ê°’ 찾기:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4702,9 +4698,8 @@ msgid "Show first block" msgstr "첫번째 블럭 보기" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "저장 ì£¼ì„ ë³´ê¸°" +msgstr "ëž™ 계측기 보여주기" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4712,6 +4707,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"ì—뮬레ì´ì…˜ 화면ìƒì— ë©”ì‹œì§€ë“¤ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"ì´ ë©”ì‹œì§€ë“¤ì€ ë©”ëª¨ë¦¬ ì¹´ë“œ 쓰기, 비디오 백엔드와 CPU ì •ë³´, 그리고 JIT ìºì‹œ 비" +"우기를 í¬í•¨í•©ë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -5093,7 +5091,6 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 -#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5102,7 +5099,7 @@ msgid "" msgstr "" "ì´ê²ƒì„ 안전하게 ì •í•  수ë¡, ì—뮬레ì´í„°ê°€ 램으로 부터 í…스처 ì—…ë°ì´íŠ¸ë“¤ì„ ëœ ë†“" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" -"모르겠으면, 오른쪽ì—ì„œ ë‘번째-ê°€ìž¥ë¹ ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”." +"모르겠으면, 가장 오른쪽 ê°’ì„ ì‚¬ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 msgid "The save you are trying to copy has an invalid file size" @@ -5295,9 +5292,9 @@ msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 -#, fuzzy, c-format +#, c-format msgid "UNKNOWN_%02X" -msgstr "알려지지 ì•ŠìŒ" +msgstr "알려지지않ì€_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5333,7 +5330,7 @@ msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "예ìƒí•˜ì§€ 못한 0x80 콜? 중단시킴..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" @@ -5459,9 +5456,8 @@ msgid "WAD installation failed: error creating %s" msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 -#, fuzzy msgid "WAD installation failed: error creating ticket" -msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" +msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± 티켓" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -5680,9 +5676,8 @@ msgid "Write to Console" msgstr "ì½˜ì†”ì— ì“°ê¸°" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 -#, fuzzy msgid "Write to Debugger" -msgstr "파ì¼ì— 쓰기" +msgstr "ë””ë²„ê±°ì— ê¸°ë¡" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 msgid "Write to File" @@ -5709,7 +5704,7 @@ msgstr "XAudio2 매스터 ë³´ì´ìŠ¤ ìƒì„± 실패: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" From 2c10ca4e46e18696b39798b00866de3a29e09272 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 18 Dec 2012 17:38:41 +0100 Subject: [PATCH 215/627] Rewrite the linear sample rate conversion algorithm to make it less hacky and to support arbitrarly big ratios --- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 60 +++++++------------ 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index bf13c7114d..a6d1f760a5 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -256,56 +256,38 @@ void GetInputSamples(PB_TYPE& pb, s16* samples) // samples. u32 curr_pos = pb.src.cur_addr_frac; - // Compute the number of real samples we will need to read from the - // data source. We need to output 32 samples, so we need to read - // 32 * ratio + curr_pos samples. There does not seem to be a maximum - // value for the ratio in recent versions of AXWii (previously it was - // limited to 4.0), so we will limit it to 16.0 and clamp the ratio if - // needed. This is a HACK, and using another algorithm for linear - // interpolation might be a better idea. - if (ratio > 0x00100000) - ratio = 0x00100000; - - s16 real_samples[514]; - u32 real_samples_needed = (32 * ratio + curr_pos) >> 16; - - // The first two real samples are the ones we read at the previous - // iteration. That way we can interpolate before having read 2 new - // samples from the accelerator. - // - // The next real samples are read from the accelerator. - real_samples[0] = pb.src.last_samples[2]; - real_samples[1] = pb.src.last_samples[3]; - for (u32 i = 0; i < real_samples_needed; ++i) - real_samples[i + 2] = AcceleratorGetSample(); + // These are the two samples between which we interpolate. The initial + // values are stored in the PB, and we update them when resampling the + // input data. + s16 curr0 = pb.src.last_samples[2]; + s16 curr1 = pb.src.last_samples[3]; for (u32 i = 0; i < 32; ++i) { - // Get our current integer and fractional position. The integer - // position is used to get the two samples around us. The - // fractional position is used to compute the linear interpolation - // between these two samples. - u32 curr_int_pos = (curr_pos >> 16); + // Get our current fractional position, used to know how much of + // curr0 and how much of curr1 the output sample should be. s32 curr_frac_pos = curr_pos & 0xFFFF; - s16 samp1 = real_samples[curr_int_pos]; - s16 samp2 = real_samples[curr_int_pos + 1]; // Linear interpolation: s1 + (s2 - s1) * pos - s16 sample = samp1 + (s16)(((samp2 - samp1) * (s32)curr_frac_pos) >> 16); + s16 sample = curr0 + (s16)(((curr1 - curr0) * (s32)curr_frac_pos) >> 16); samples[i] = sample; curr_pos += ratio; + + // While our current position is >= 1.0, shift to the next 2 + // samples for interpolation. + while ((curr_pos >> 16) != 0) + { + curr0 = curr1; + curr1 = AcceleratorGetSample(); + curr_pos -= 0x10000; + } } - // Update the last_samples array. A bit tricky because we can't know - // for sure we have more than 4 real samples in our array. - if (real_samples_needed >= 2) - memcpy(pb.src.last_samples, &real_samples[real_samples_needed + 2 - 4], 4 * sizeof (u16)); - else - { - memmove(pb.src.last_samples, &pb.src.last_samples[real_samples_needed], (4 - real_samples_needed) * sizeof (u16)); - memcpy(&pb.src.last_samples[4 - real_samples_needed], &real_samples[2], real_samples_needed * sizeof (u16)); - } + // Update the two last_samples values in the PB as well as the current + // position. + pb.src.last_samples[2] = curr0; + pb.src.last_samples[3] = curr1; pb.src.cur_addr_frac = curr_pos & 0xFFFF; } else // SRCTYPE_NEAREST From 16ac7803f15a52973a90b94fd630ffacd7364b05 Mon Sep 17 00:00:00 2001 From: rog Date: Tue, 18 Dec 2012 23:19:15 -0500 Subject: [PATCH 216/627] Add support for recording bongos. --- Source/Core/Core/Src/HW/SI.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 21 ++++++++++++++++----- Source/Core/Core/Src/Movie.h | 4 +++- Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp index 84a3744d6f..0f563806ce 100644 --- a/Source/Core/Core/Src/HW/SI.cpp +++ b/Source/Core/Core/Src/HW/SI.cpp @@ -273,7 +273,7 @@ void Init() g_Channel[i].m_InLo.Hex = 0; if (Movie::IsRecordingInput() || Movie::IsPlayingInput()) - AddDevice(Movie::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + AddDevice(Movie::IsUsingPad(i) ? (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); else AddDevice(SConfig::GetInstance().m_SIDevice[i], i); } diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 183dab77b7..4e5f3a3365 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -71,6 +71,7 @@ std::string g_discChange = ""; std::string author = ""; u64 g_titleID = 0; unsigned char MD5[16]; +u8 bongos; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -109,7 +110,7 @@ std::string GetInputDisplay() g_numPads = 0; for (int i = 0; i < 4; i++) { - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) g_numPads |= (1 << i); if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) g_numPads |= (1 << (i + 4)); @@ -311,6 +312,11 @@ bool IsUsingPad(int controller) return ((g_numPads & (1 << controller)) != 0); } +bool IsUsingBongo(int controller) +{ + return ((bongos & (1 << controller)) != 0); +} + bool IsUsingWiimote(int wiimote) { return ((g_numPads & (1 << (wiimote + 4))) != 0); @@ -368,7 +374,7 @@ void ChangePads(bool instantly) int controllers = 0; for (int i = 0; i < 4; i++) - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) controllers |= (1 << i); if (instantly && (g_numPads & 0x0F) == controllers) @@ -376,9 +382,9 @@ void ChangePads(bool instantly) for (int i = 0; i < 4; i++) if (instantly) // Changes from savestates need to be instantaneous - SerialInterface::AddDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + SerialInterface::AddDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); else - SerialInterface::ChangeDevice(IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i); + SerialInterface::ChangeDevice(IsUsingPad(i) ? (IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i); } void ChangeWiiPads(bool instantly) @@ -412,6 +418,10 @@ bool BeginRecordingInput(int controllers) g_recordingStartTime = Common::Timer::GetLocalTimeSinceJan1970(); g_rerecords = 0; + for (int i = 0; i < 4; i++) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) + bongos |= (1 << i); + if (Core::IsRunning()) { if(File::Exists(tmpStateFilename)) @@ -676,7 +686,7 @@ void ReadHeader() iCPUCore = tmpHeader.CPUCore; g_bClearSave = tmpHeader.bClearSave; bMemcard = tmpHeader.bMemcard; - + bongos = tmpHeader.bongos; } else { @@ -1121,6 +1131,7 @@ void SaveRecording(const char *filename) strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); memcpy(header.md5,MD5,16); + header.bongos = bongos; // TODO header.uniqueID = 0; diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 3d15d0ed61..2cb4c78e23 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -118,7 +118,8 @@ struct DTMHeader { bool bUseRealXFB; bool bMemcard; bool bClearSave; // Create a new memory card when playing back a movie if true - u8 reserved[16]; // Padding for any new config options + u8 bongos; + u8 reserved[15]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 reserved2[47]; // Make heading 256 bytes, just because we can }; @@ -154,6 +155,7 @@ void GetSettings(); bool IsUsingPad(int controller); bool IsUsingWiimote(int wiimote); +bool IsUsingBongo(int controller); void ChangePads(bool instantly = false); void ChangeWiiPads(bool instantly = false); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index db2d591308..fa326adecc 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -745,7 +745,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event)) } for (int i = 0; i < 4; i++) { - if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA) controllers |= (1 << i); if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE) From 071b27f0bb248069cfb38f4da7cecee2015a60ad Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Dec 2012 05:56:57 +0100 Subject: [PATCH 217/627] Fix volume mixing in DownloadAndMixWithVolume (same issue with >1.0 volumes) --- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 0ad33870db..57032a774e 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -362,14 +362,15 @@ void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u for (u32 i = 0; i < 3; ++i) { int* ptr = (int*)HLEMemory_Get_Pointer(addr); - s16 volume = (s16)volumes[i]; + u16 volume = volumes[i]; for (u32 j = 0; j < 3; ++j) { int* buffer = buffers[i][j]; for (u32 k = 0; k < 5 * 32; ++k) { - s64 sample = 2 * (s32)Common::swap32(*ptr++) * volume; - buffer[k] += (s32)(sample >> 16); + s64 sample = (s64)(s32)Common::swap32(*ptr++); + sample *= volume; + buffer[k] += (s32)(sample >> 15); } } } From 2db4549174620aa130ef012af26c2e1760c4928c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 18 Dec 2012 23:35:28 -0600 Subject: [PATCH 218/627] Fix a memory leak based on Lioncash's patches. --- Source/Core/Common/Src/FileUtil.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 691685e99d..77aac45418 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -299,7 +299,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename) ERROR_LOG(COMMON, "Copy: failed reading from source, %s --> %s: %s", srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg()); - return false; + goto bail; } } @@ -310,13 +310,19 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename) ERROR_LOG(COMMON, "Copy: failed writing to output, %s --> %s: %s", srcFilename.c_str(), destFilename.c_str(), GetLastErrorMsg()); - return false; + goto bail; } } // close flushs fclose(input); fclose(output); return true; +bail: + if (input) + fclose(input); + if (output) + fclose(output); + return false; #endif } From b0cbac174b0c4d419cb6f93b24bf18fc5090c42e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Dec 2012 08:31:17 +0100 Subject: [PATCH 219/627] Implemented dpop samples support --- .../Src/HW/DSPHLE/UCodes/UCode_AXStructs.h | 12 +++++++- .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 30 ++++++++++--------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h index e3c6b7165b..c92196dd49 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -128,7 +128,17 @@ struct PBUpdates // and ramped down on a per-sample basis to provide a gentle "roll off." struct PBDpop { - s16 unknown[9]; + s16 left; + s16 auxA_left; + s16 auxB_left; + + s16 right; + s16 auxA_right; + s16 auxB_right; + + s16 surround; + s16 auxA_surround; + s16 auxB_surround; }; struct PBDpopWii diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index a6d1f760a5..625b761b80 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -306,7 +306,7 @@ void GetInputSamples(PB_TYPE& pb, s16* samples) } // Add samples to an output buffer, with optional volume ramping. -void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) +void MixAdd(int* out, const s16* input, u16* pvol, s16* dpop, bool ramp) { u16& volume = pvol[0]; u16 volume_delta = pvol[1]; @@ -323,8 +323,10 @@ void MixAdd(int* out, const s16* input, u16* pvol, bool ramp) sample *= volume; sample >>= 15; - out[i] += (s32)sample; + out[i] += (s16)sample; volume += volume_delta; + + *dpop = (s16)sample; } } @@ -357,33 +359,33 @@ void Process1ms(PB_TYPE& pb, const AXBuffers& buffers, AXMixControl mctrl) // TODO: Handle DPL2 on AUXB. if (mctrl & MIX_L) - MixAdd(buffers.left, samples, &pb.mixer.left, mctrl & MIX_L_RAMP); + MixAdd(buffers.left, samples, &pb.mixer.left, &pb.dpop.left, mctrl & MIX_L_RAMP); if (mctrl & MIX_R) - MixAdd(buffers.right, samples, &pb.mixer.right, mctrl & MIX_R_RAMP); + MixAdd(buffers.right, samples, &pb.mixer.right, &pb.dpop.right, mctrl & MIX_R_RAMP); if (mctrl & MIX_S) - MixAdd(buffers.surround, samples, &pb.mixer.surround, mctrl & MIX_S_RAMP); + MixAdd(buffers.surround, samples, &pb.mixer.surround, &pb.dpop.surround, mctrl & MIX_S_RAMP); if (mctrl & MIX_AUXA_L) - MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, mctrl & MIX_AUXA_L_RAMP); + MixAdd(buffers.auxA_left, samples, &pb.mixer.auxA_left, &pb.dpop.auxA_left, mctrl & MIX_AUXA_L_RAMP); if (mctrl & MIX_AUXA_R) - MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, mctrl & MIX_AUXA_R_RAMP); + MixAdd(buffers.auxA_right, samples, &pb.mixer.auxA_right, &pb.dpop.auxA_right, mctrl & MIX_AUXA_R_RAMP); if (mctrl & MIX_AUXA_S) - MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, mctrl & MIX_AUXA_S_RAMP); + MixAdd(buffers.auxA_surround, samples, &pb.mixer.auxA_surround, &pb.dpop.auxA_surround, mctrl & MIX_AUXA_S_RAMP); if (mctrl & MIX_AUXB_L) - MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, mctrl & MIX_AUXB_L_RAMP); + MixAdd(buffers.auxB_left, samples, &pb.mixer.auxB_left, &pb.dpop.auxB_left, mctrl & MIX_AUXB_L_RAMP); if (mctrl & MIX_AUXB_R) - MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, mctrl & MIX_AUXB_R_RAMP); + MixAdd(buffers.auxB_right, samples, &pb.mixer.auxB_right, &pb.dpop.auxB_right, mctrl & MIX_AUXB_R_RAMP); if (mctrl & MIX_AUXB_S) - MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, mctrl & MIX_AUXB_S_RAMP); + MixAdd(buffers.auxB_surround, samples, &pb.mixer.auxB_surround, &pb.dpop.auxB_surround, mctrl & MIX_AUXB_S_RAMP); #ifdef AX_WII if (mctrl & MIX_AUXC_L) - MixAdd(buffers.auxC_left, samples, &pb.mixer.auxC_left, mctrl & MIX_AUXC_L_RAMP); + MixAdd(buffers.auxC_left, samples, &pb.mixer.auxC_left, &pb.dpop.auxC_left, mctrl & MIX_AUXC_L_RAMP); if (mctrl & MIX_AUXC_R) - MixAdd(buffers.auxC_right, samples, &pb.mixer.auxC_right, mctrl & MIX_AUXC_R_RAMP); + MixAdd(buffers.auxC_right, samples, &pb.mixer.auxC_right, &pb.dpop.auxC_right, mctrl & MIX_AUXC_R_RAMP); if (mctrl & MIX_AUXC_S) - MixAdd(buffers.auxC_surround, samples, &pb.mixer.auxC_surround, mctrl & MIX_AUXC_S_RAMP); + MixAdd(buffers.auxC_surround, samples, &pb.mixer.auxC_surround, &pb.dpop.auxC_surround, mctrl & MIX_AUXC_S_RAMP); #endif // Optionally, phase shift left or right channel to simulate 3D sound. From 05c6d11d483448308d97f897cea069662c2ab193 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 20 Dec 2012 08:26:27 -0600 Subject: [PATCH 220/627] Update Spanish translations. --- Languages/po/es.po | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/Languages/po/es.po b/Languages/po/es.po index b0bde31334..077b2b12f9 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-07 14:20+0100\n" -"Last-Translator: Petiso Carambanal \n" +"PO-Revision-Date: 2012-12-19 10:25+0100\n" +"Last-Translator: Puniasterus \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Spanish\n" +"X-Generator: Poedit 1.5.4\n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" @@ -636,12 +636,10 @@ msgid "Advanced Settings" msgstr "Configuración avanzada" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, ciso, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas las imágenes de GC/Wii (gcm, iso, ciso, gcz)" @@ -677,7 +675,7 @@ msgstr "" "Permite alternar algunas opciones a través de las teclas de acceso rápido 3, " "4, 5, 6 y 7 en la ventana de emulación.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Alternate Wiimote Timing" @@ -782,6 +780,7 @@ msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -789,7 +788,7 @@ msgid "" msgstr "" "Ajusta automáticamente el tamaño de la ventana a tu resolución interna.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" @@ -2060,6 +2059,7 @@ msgstr "" "Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#, fuzzy msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2069,7 +2069,7 @@ msgstr "" "Active esto si quiere usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 msgid "" @@ -2366,7 +2366,7 @@ msgid "Failed to read banner.bin" msgstr "Fallo al leer banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2709,8 +2709,9 @@ msgid "GameConfig" msgstr "Configurar Juego" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 +#, fuzzy msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Tipos de partidas guardadas GameCube(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -3441,8 +3442,9 @@ msgid "Log Configuration" msgstr "Configuración de registro" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#, fuzzy msgid "Log FPS to file" -msgstr "" +msgstr "Guardar FPS en un archivo" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" @@ -3884,8 +3886,9 @@ msgid "Offset:" msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#, fuzzy msgid "On-Screen Display Messages" -msgstr "" +msgstr "Mensajes de arranque" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -4025,8 +4028,9 @@ msgid "Pause" msgstr "Pausa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#, fuzzy msgid "Pause at end of movie" -msgstr "" +msgstr "Pausar al final de la película" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4762,11 +4766,15 @@ msgid "Show lag counter" msgstr "Mostrar comentario del guardado" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#, fuzzy msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Mostrar mensajes en la pantalla de emulación.\n" +"Estos mensajes incluyen escrituras a la tarjeta de memória, motor gráfico, " +"información de la CPU y limpieza caché JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" From 9b7eb9cf35da759ffb26c271e0585baf9c29eea4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 20 Dec 2012 20:42:22 -0600 Subject: [PATCH 221/627] Update Brazilian Portuguese translations. --- Languages/po/pt_BR.po | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 7f87057e25..74e0736634 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,13 +8,14 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-07 19:13-0300\n" -"Last-Translator: Runo \n" +"PO-Revision-Date: 2012-12-20 22:53-0300\n" +"Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 msgid " (too many to display)" @@ -633,12 +634,10 @@ msgid "Advanced Settings" msgstr "Configurações Avançadas" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" @@ -664,15 +663,14 @@ msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permite Ligar/Desligar algumas opções através das teclas 3, 4, 5, 6 e 7 " -"enquanto o emulador está funcionando.\n" +"Permite Ligar/Desligar algumas opções através das teclas 3, 4, 5 e 6 estando " +"na janela de emulação.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -1834,14 +1832,14 @@ msgid "EFB Copies" msgstr "Cópias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " "reboot is probably required at this point to get Windows to see the new " "driver." msgstr "" -"ERRO: Esta versão do Dolphin precisa de um driver TAP-Win32 no mínimo com a " +"ERRO: Essa versão do Dolphin precisa de um driver TAP-Win32 no mínimo com a " "versão %d.%d -- Se você mudou a versão do Dolphin recentemente, reiniciar o " "PC é provavelmente necessário no momento para que o Windows veja o novo " "driver." @@ -2359,7 +2357,7 @@ msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2701,7 +2699,7 @@ msgstr "Opçõesdojogo" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -3434,22 +3432,21 @@ msgstr "Configuração do Log" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "Registrar FPS em arquivo" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipo de Log" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Mostra o número de quadros renderizados por segundo como uma forma de medir " -"a velocidade da emulação.\n" +"Registra o número de quadros renderizados por segundo em User/Logs/fps.txt. " +"Use este recurso para medir a performance do Dolphin.\n" "\n" "Se estiver em dúvida, deixe isto desativado." @@ -3874,7 +3871,7 @@ msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "Mostrar Mensagens na Tela" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -4014,7 +4011,7 @@ msgstr "Pausar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "Pausar no fim do vídeo" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4739,9 +4736,8 @@ msgid "Show first block" msgstr "Mostrar o primeiro bloco" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Mostar comentário do save" +msgstr "Mostar o contador de lag" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4749,6 +4745,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Mostra mensagens na área da tela de emulação.\n" +"Essas mensagens incluem acesso ao Memory Card, informações sobre o backend " +"de vídeo e a CPU, e limpeza do cache do JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -5656,7 +5655,7 @@ msgstr "Importar Save de Wii" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 msgid "Wii save files (*.bin)|*.bin" -msgstr "Arquivos de Salva do Wii (*.bin)|*.bin" +msgstr "Arquivos de Save do Wii (*.bin)|*.bin" #: Source/Core/DiscIO/Src/WiiWad.cpp:81 msgid "WiiWAD: Could not read from file" From cb54b822a681f5dbd94f365185053fd5bbe440cd Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 21 Dec 2012 07:41:41 -0600 Subject: [PATCH 222/627] Update Japanese translations. --- Languages/po/ja.po | 225 ++++++++++++++++++++++----------------------- 1 file changed, 110 insertions(+), 115 deletions(-) diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 2411938620..99f8a5c7db 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-22 06:13+0900\n" +"PO-Revision-Date: 2012-12-19 12:29+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Japanese\n" @@ -36,8 +36,8 @@ msgid "" "\"%s\" does not exist.\n" " Create a new 16MB Memcard?" msgstr "" -"メモリーカード \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“\n" -"容é‡16MBã§æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" +"メモリーカードファイル \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“。\n" +" 容é‡16MBã§æ–°ãŸã«ä½œæˆã—ã¾ã™ã‹ ?" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format @@ -84,7 +84,7 @@ msgid "" " Card file size is invalid (0x%x bytes)" msgstr "" "%s メモリーカードã®èª­ã¿è¾¼ã¿ã«å¤±æ•—\n" -" ä¸æ­£ãªã‚«ãƒ¼ãƒ‰å®¹é‡ã§ã™ (0x%x ãƒã‚¤ãƒˆ)" +" ä¸æ­£ãªã‚«ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã§ã™ (0x%x ãƒã‚¤ãƒˆ)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:110 #, c-format @@ -134,7 +134,7 @@ msgstr "%s ã¯åœ§ç¸®æ¸ˆã¿ã§ã™ï¼ã“れ以上圧縮ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã› #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ«åãŒé•·ã™ãŽã¾ã™ã€45文字ã¾ã§ã«ã—ã¦ãã ã•ã„" +msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ«åãŒé•·ã™ãŽã¾ã™ã€45文字ã¾ã§ã«åŽã‚ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format @@ -206,7 +206,7 @@ msgstr "Frame Advance(&F)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:366 msgid "&Fullscreen" -msgstr "フルスクリーン表示(&F)" +msgstr "全画é¢è¡¨ç¤º(&F)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Graphics Settings" @@ -346,7 +346,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 msgid "" -msgstr "<対応解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" +msgstr "<対応ã§ãる解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 msgid "" @@ -405,8 +405,8 @@ msgstr "" "\n" "ç¾åœ¨ãƒãƒƒãƒˆãƒ—レイã¯ä»¥ä¸‹ã®è¨­å®šã§ã—ã‹ã†ã¾ã動作ã—ã¾ã›ã‚“。\n" " - ãƒ‡ãƒ¥ã‚¢ãƒ«ã‚³ã‚¢å‡¦ç† ã€ç„¡åŠ¹ã€‘\n" -" - Enable Audio Throttle ã€ç„¡åŠ¹ã€‘\n" -" - DSP-HLE ã‚’ \"No Audio Output\"ã«è¨­å®šã€ã¾ãŸã¯ DSP-LLE を使用\n" +" - Audio Throttle ã€ç„¡åŠ¹ã€‘\n" +" - サウンド出力API ã‚’ \"No Audio Output\"ã«è¨­å®šã€ã¾ãŸã¯ DSP-LLE を使用\n" " - コントローラã®æ•°ã‚’æ­£ã—ã設定ã™ã‚‹ã€‚ã¾ãŸç¾åœ¨ã¯ [標準コントローラ] ã®ã¿å‹•ä½œ\n" "\n" "å…¨ã¦ã®ãƒ—レーヤーã¯Dolphinã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’åŒä¸€ã«æƒãˆã€è¨­å®šã‚‚統一ã™ã‚‹ã“ã¨ã€‚\n" @@ -624,18 +624,16 @@ msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" -msgstr "GC GCMファイル (gcm)|*.gcm" +msgstr "GC GCMファイル (gcm)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 #: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 @@ -644,7 +642,7 @@ msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 msgid "All Wii ISO files (iso)" -msgstr "Wii ISOファイル (iso)|*.iso" +msgstr "Wii ISOファイル (iso)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 msgid "All compressed GC/Wii ISO files (gcz)" @@ -655,7 +653,6 @@ msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -785,9 +782,8 @@ msgid "B" msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "レジスタ(&R)" +msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -846,7 +842,7 @@ msgstr "ãƒã‚¹ãƒ‰ãƒ©" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "Block Allocation Table ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¸é©åˆ" +msgstr "Block Allocation Table checksum failed" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" @@ -880,7 +876,7 @@ msgstr "ダメダメ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:436 msgid "Browse" -msgstr "フォルダ追加" +msgstr "é¸æŠž" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 msgid "Browse for a directory to add" @@ -952,7 +948,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ピクセルå˜ä½ã§ã®å…‰æºå‡¦ç†ã‚’è¡Œã†ã‚ˆã†ã«ã—ã¾ã™ã€‚\n" +"ピクセルå˜ä½ã§ã®å…‰æºå‡¦ç†ã‚’è¡Œã„ã¾ã™ã€‚\n" "GPUã®æ€§èƒ½ã«ã‚‚よりã¾ã™ãŒã€æ•°ãƒ‘ーセント程度ã€å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ã€‚\n" "ã“ã®ã‚ªãƒ—ションã¯é€šå¸¸å®‰å…¨ã§ã™ãŒã€æ™‚ã«æç”»ãƒã‚°ã‚’引ãèµ·ã“ã™ã“ã¨ã‚‚ã‚ã‚Šã¾ ã™ã€‚\n" "\n" @@ -1006,7 +1002,7 @@ msgstr "Cant find WiiMote by connection handle %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:679 #: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "DVD_Pluginã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒä¸å¯èƒ½ - DVD-Interface: 致命的ãªã‚¨ãƒ©ãƒ¼" +msgstr "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" @@ -1044,7 +1040,7 @@ msgid "" "Requires restart." msgstr "" "Dolphin本体ã®è¡¨ç¤ºè¨€èªžã‚’変更ã—ã¾ã™\n" -"変更時ã«ã¯å†èµ·å‹•ãŒå¿…è¦ã§ã™" +"変更ã®ãŸã‚ã«å†èµ·å‹•ãŒå¿…è¦ã§ã™" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:59 #, fuzzy @@ -1063,7 +1059,7 @@ msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" #: Source/Core/DolphinWX/Src/NetWindow.cpp:281 msgid "Chat" -msgstr "ãƒãƒ£ãƒƒãƒˆ" +msgstr "ãƒãƒ£ãƒƒãƒˆæ¬„" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:46 msgid "Cheat Code" @@ -1095,11 +1091,11 @@ msgstr "ç¹ä½“字中国語" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 msgid "Choose a DVD root directory:" -msgstr "DVDルートフォルダをé¸æŠž" +msgstr "DVDルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Choose a NAND root directory:" -msgstr "NANDã®ã‚るルートフォルダをé¸æŠž" +msgstr "NANDã®ã‚るルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 msgid "Choose a default ISO:" @@ -1128,7 +1124,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 msgid "Choose the folder to extract to" -msgstr "抽出先ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠž" +msgstr "ä¿å­˜å…ˆã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:297 msgid "Circle Stick" @@ -1270,7 +1266,7 @@ msgstr "接続中..." #: Source/Core/DolphinWX/Src/FrameAui.cpp:154 msgid "Console" -msgstr "Console" +msgstr "コンソール" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:46 msgid "Control" @@ -1312,7 +1308,7 @@ msgid "" msgstr "" "\"%s\" を読ã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ディスクãŒå…¥ã£ã¦ã„ãªã„ã‹ã€GC/Wii ã®ãƒãƒƒã‚¯ã‚¢ãƒƒ" "プディスクã§ã¯ã‚ã‚Šã¾ã›ã‚“。オリジナルã®GC/Wii ã®ãƒ‡ã‚£ã‚¹ã‚¯ã¯ã»ã¨ã‚“ã©ã®PC用DVDド" -"ライブã§ã¯èª­ã¿è¾¼ã‚ãªã„ã“ã¨ã«ç•™æ„ã—ã¦ãã ã•ã„" +"ライブã§ã¯èª­ã¿è¾¼ã‚ãªã„点ã«ç•™æ„ã—ã¦ãã ã•ã„" #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1330,7 +1326,7 @@ msgid "" "(setting pads while the game is running is not yet supported)" msgstr "" "ç¾åœ¨ãƒ‘ッド設定を行ãˆã¾ã›ã‚“。 プレーヤーãŒæ®‹ã£ã¦ã„ã‚‹ã‹ã‚²ãƒ¼ãƒ ãŒèµ·å‹•ä¸­ã§ã™ï¼\n" -"(ゲーム中ã®ãƒ‘ッド設定ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" +"(ゲーム中ã®è¨­å®šå¤‰æ›´ã¯ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format @@ -1354,8 +1350,8 @@ msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -"コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸ\n" -"設定を確èªã—ã¦ãã ã•ã„" +"コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" +"設定を確èªã—ã¦ãã ã•ã„。" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 @@ -1424,7 +1420,7 @@ msgstr "クロスフェーダー" #: Source/Core/DolphinWX/Src/FrameTools.cpp:680 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" -msgstr "カレントフォルダ㯠wxFileSelector ã®å¾Œã« %s ã‹ã‚‰ %s ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼" +msgstr "Current dir changed from %s to %s after wxFileSelector!" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Custom Projection Hack" @@ -1432,7 +1428,7 @@ msgstr "Custom Projection Hack" #: Source/Core/DolphinWX/Src/PHackSettings.h:30 msgid "Custom Projection Hack Settings" -msgstr "Custom Projection Hack Settings" +msgstr "Custom Projection Hackã®è¨­å®š" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 msgid "Customize some Orthographic Projection parameters." @@ -1485,11 +1481,11 @@ msgstr "DVDルート" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:238 msgid "DVDLowRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowRead - Fatal Error: failed to read from volume" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" +msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" @@ -1526,16 +1522,16 @@ msgstr "Decimal" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 msgid "Decompress ISO..." -msgstr "ISOファイルを解å‡" +msgstr "ISOファイルã¸å¾©å…ƒ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Decompress selected ISOs..." -msgstr "é¸æŠžã—ãŸISOファイルを全ã¦è§£å‡" +msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦ISOファイルã¸å¾©å…ƒ" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 msgid "Decompressing ISO" -msgstr "解å‡ä¸­..." +msgstr "復元中..." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Default" @@ -1655,7 +1651,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 msgid "Disc" -msgstr "Disc" +msgstr "ディスク" #: Source/Core/DiscIO/Src/DriveBlob.cpp:109 #: Source/Core/DiscIO/Src/DriveBlob.cpp:128 @@ -1745,11 +1741,11 @@ msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" -msgstr "Down" +msgstr "下" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 msgid "Download Codes (WiiRD Database)" -msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’ダウンロード (WiiRD Database)" +msgstr "Webã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’入手 (WiiRD Database)" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 #, c-format @@ -1826,7 +1822,7 @@ msgid "EFB Copies" msgstr "EFB Copies" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " @@ -1934,8 +1930,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ステレオスコピック3D(立体視)表示を有効ã«ã—ã¾ã™ã€‚使用ã™ã‚‹ã«ã¯ GPUã«ã‚ˆã‚‹Nvidia " -"3D Visionã®ã‚µãƒãƒ¼ãƒˆãŒå¿…è¦ã§ã™ã€‚\n" +"立体視表示を有効ã«ã—ã¾ã™ã€‚使用ã™ã‚‹ã«ã¯GPUã«ã‚ˆã‚‹ Nvidia 3D Vision ã®ã‚µãƒãƒ¼ãƒˆãŒ" +"å¿…è¦ã§ã™ã€‚\n" "ã»ã¨ã‚“ã©ã®å ´åˆä½•ã‹ã—らã®å•é¡ŒãŒç™ºç”Ÿã™ã‚‹ã§ã—ょã†ã€‚\n" "ã“ã®æ©Ÿèƒ½ã¯ãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³è¡¨ç¤ºæ™‚ã®ã¿å‹•ä½œã—ã¾ã™ã€‚\n" "\n" @@ -2235,7 +2231,7 @@ msgstr "特殊パラメータ" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰åŠ¹ãªè¨­å®šã§ã™" +msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰ç”¨ãªè¨­å®šã§ã™" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 msgid "Extract All Files..." @@ -2259,7 +2255,7 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 msgid "Extract Partition..." -msgstr "ã“ã® Partition を抽出" +msgstr "ã“ã®ãƒ‘ーティションを抽出" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 #, c-format @@ -2276,7 +2272,7 @@ msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 msgid "Extracting..." -msgstr "抽出中" +msgstr "抽出ã—ã¦ã„ã¾ã™..." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 msgid "FIFO Byte" @@ -2325,26 +2321,26 @@ msgid "" msgstr "" "DSP ROMã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸï¼š\t%s\n" "\n" -"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯DSP-LLEを使用ã™ã‚‹ã®ã«å¿…è¦ã§ã™\n" +"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯DSP-LLEを使用ã™ã‚‹ã®ã«å¿…è¦ãªã‚‚ã®ã§ã™\n" "ã“ã‚Œã¯è‘—作権をæŒã¤ãƒ‡ãƒ¼ã‚¿ãªã®ã§Dolphinã«ã¯å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“\n" "DSPSpyを使用ã—ã¦ã‚ãªãŸã®GC/Wii 実機よりダンプを行ã£ã¦ä¸‹ã•ã„\n" "\n" "ダンプãŒé›£ã—ã„環境ã§ã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸è¦ãªDSP-HLEエンジンを使用ã—ã¦ãã ã•ã„\n" -"(Dolphin本体ã®è¨­å®šâ†’\"サウンド設定\"ã§é¸æŠžã§ãã¾ã™)" +"(本体設定→\"サウンド\"ã§é¸æŠžã§ãã¾ã™)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:119 msgid "Failed to load bthprops.cpl" -msgstr "bthprops.cpl ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to load bthprops.cpl" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:83 #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:92 msgid "Failed to load hid.dll" -msgstr "hid.dll ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to load hid.dll" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" -msgstr "banner.bin ã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to read banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 #, c-format @@ -2353,6 +2349,9 @@ msgid "" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" +"Failed to read block %d of the save data\n" +"Memcard may be truncated\n" +"FilePosition:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2373,7 +2372,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:286 #, c-format msgid "Failed to read data from file %d" -msgstr "ファイル %d ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã®èª­ã¿å–ã‚Šã«å¤±æ•—" +msgstr "Failed to read data from file %d" #: Source/Core/Core/Src/HW/GCMemcard.cpp:136 msgid "" @@ -2401,7 +2400,7 @@ msgstr "" #: Source/Core/DiscIO/Src/VolumeGC.cpp:61 msgid "Failed to read unique ID from disc image" -msgstr "ディスクイメージã‹ã‚‰ã®ãƒ¦ãƒ‹ãƒ¼ã‚¯IDã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "Failed to read unique ID from disc image" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:84 msgid "Failed to write BT.DINF to SYSCONF" @@ -2455,7 +2454,7 @@ msgstr "コードをå«ã¾ãªã„ファイルã§ã™" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 msgid "File converted to .gci" -msgstr "ファイルã¯GCIã«å¤‰æ›ã•ã‚Œã¾ã—ãŸ" +msgstr "ファイルã¯GCIã¸å¤‰æ›ã•ã‚Œã¾ã—ãŸ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 msgid "" @@ -2513,11 +2512,11 @@ msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 16:9" -msgstr "Force 16:9" +msgstr "強制的㫠16:9 ã«ã™ã‚‹" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 msgid "Force 4:3" -msgstr "Force 4:3" +msgstr "強制的㫠4:3 ã«ã™ã‚‹" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 msgid "Force Console as NTSC-J" @@ -2644,7 +2643,7 @@ msgstr "全画é¢" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 msgid "Fullscreen resolution:" -msgstr "フルスクリーン表示時解åƒåº¦ï¼š" +msgstr "全画é¢è¡¨ç¤ºæ™‚ã®è§£åƒåº¦ï¼š" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:532 msgid "GCI File(*.gci)" @@ -2688,7 +2687,7 @@ msgstr "ゲーム設定" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -2701,7 +2700,7 @@ msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 msgid "Gamecube Memory Cards (*.raw,*.gcp)" -msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp" +msgstr "メモリーカードファイル (*.raw,*.gcp)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Gamecube Pad settings" @@ -2806,7 +2805,7 @@ msgstr "高速化(Hacks)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:158 msgid "Header checksum failed" -msgstr "ヘッダã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—" +msgstr "Header checksum failed" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "Hebrew" @@ -3076,7 +3075,7 @@ msgstr "Wiiメニューã«WADファイルを追加" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 msgid "Install to Wii Menu" -msgstr "Wiiメニューã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" +msgstr "Wiiメニューã¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" #: Source/Core/Core/Src/MemTools.cpp:248 msgid "" @@ -3087,11 +3086,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." -msgstr "WADファイルを追加ã—ã¦ã„ã¾ã™..." +msgstr "追加ã—ã¦ã„ã¾ã™..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" -msgstr "エラー" +msgstr "エラーãŒç¢ºèªã•ã‚Œã¾ã—ãŸï¼" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" @@ -3120,7 +3119,7 @@ msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" #: Source/Core/Core/Src/State.cpp:240 msgid "Internal LZO Error - compression failed" -msgstr "Internal LZO Error - 圧縮ã«å¤±æ•—" +msgstr "Internal LZO Error - compression failed" #: Source/Core/Core/Src/State.cpp:348 #, c-format @@ -3128,7 +3127,7 @@ msgid "" "Internal LZO Error - decompression failed (%d) (%li, %li) \n" "Try loading the state again" msgstr "" -"Internal LZO Error - 復元ã«å¤±æ•— (%d) (%li, %li) \n" +"Internal LZO Error - decompression failed (%d) (%li, %li) \n" "ã‚‚ã†ä¸€åº¦ãƒ­ãƒ¼ãƒ‰ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„" #: Source/Core/Core/Src/State.cpp:485 @@ -3198,7 +3197,7 @@ msgstr "" #: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" -msgstr "ä¸æ­£ãªã‚»ãƒ¼ãƒ–ï¼ãƒ­ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«" +msgstr "ä¸æ­£ãªã‚¹ãƒ†ãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 @@ -3264,7 +3263,7 @@ msgstr "Lボタン" #. i18n: Left-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:61 msgid "L-Analog" -msgstr "L (åŠæŠ¼ã—)" +msgstr "L (アナログ)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 msgid "Language:" @@ -3282,7 +3281,7 @@ msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" -msgstr "Left" +msgstr "å·¦" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:60 msgid "Left Stick" @@ -3312,7 +3311,7 @@ msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -"å·¦ã‹å³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" +"å·¦orå³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" "中クリックã§æ¶ˆåŽ»ã—ã¾ã™" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 @@ -3417,22 +3416,20 @@ msgstr "ログã®è¨­å®š" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "FPSã®ãƒ­ã‚°ã‚’ä¿å­˜" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"エミュレーション速度ã®æŒ‡æ¨™ã¨ã—ã¦ã€ç”»é¢å·¦ä¸Šã«æ¯Žç§’レンダリングã•ã‚ŒãŸ フレーム数" -"を表示ã—ã¾ã™ã€‚\n" +"FPSã®ãƒ­ã‚°ã‚’ User/Logs/fps.txt ã«ä¿å­˜ã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" @@ -3854,7 +3851,7 @@ msgstr "オフセット値：" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "オンスクリーンメッセージを表示" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -3877,7 +3874,7 @@ msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:434 msgid "Open file..." -msgstr "é–‹ãファイルをé¸æŠž" +msgstr "èµ·å‹•ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 #, c-format @@ -3886,12 +3883,12 @@ msgstr "OpenAL: can't create context for device %s" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 msgid "OpenAL: can't find sound devices" -msgstr "OpenAL: サウンドデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +msgstr "OpenAL: can't find sound devices" #: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 #, c-format msgid "OpenAL: can't open device %s" -msgstr "OpenAL: デãƒã‚¤ã‚¹ %s ãŒé–‹ã‘ã¾ã›ã‚“" +msgstr "OpenAL: can't open device %s" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "OpenCL Texture Decoder" @@ -3994,7 +3991,7 @@ msgstr "一時åœæ­¢" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "å†ç”Ÿçµ‚了時ã«ä¸€æ™‚åœæ­¢" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4155,7 +4152,7 @@ msgstr "Rボタン" #. i18n: Right-Analog #: Source/Core/Core/Src/HW/GCPadEmu.cpp:63 msgid "R-Analog" -msgstr "R (åŠæŠ¼ã—)" +msgstr "R (アナログ)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 msgid "RAM" @@ -4167,7 +4164,7 @@ msgstr "ロシア" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 msgid "Range" -msgstr "å¼·ã•" +msgstr "範囲ï¼å¼·ã•" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 @@ -4184,7 +4181,7 @@ msgstr "実機Wii リモコンを接続" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 msgid "Real Wiimotes" -msgstr "実機Wii リモコンを接続" +msgstr "実機Wii リモコンã®è¨­å®š" #: Source/Core/DolphinWX/Src/Frame.cpp:162 msgid "Reconnect Wiimote Confirm" @@ -4283,12 +4280,12 @@ msgstr "çµæžœè¡¨ç¤ºæ¬„" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:29 msgid "Return" -msgstr "Enter" +msgstr "Return" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:277 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:57 msgid "Right" -msgstr "Right" +msgstr "å³" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp:61 msgid "Right Stick" @@ -4388,7 +4385,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 msgid "Save decompressed GCM/ISO" -msgstr "解å‡ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" +msgstr "復元ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" #: Source/Core/Core/Src/Movie.cpp:782 #, c-format @@ -4402,7 +4399,7 @@ msgstr "Scaled EFB Copy" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 #, c-format msgid "Scanning %s" -msgstr "確èªä¸­... .%s" +msgstr "確èªã—ã¦ã„ã¾ã™... .%s" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 msgid "Scanning for ISOs" @@ -4506,9 +4503,7 @@ msgid "" msgstr "" "レンダリング時ã®ã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”ã‚’é¸æŠžã—ã¾ã™ã€‚\n" "自動： ãƒã‚¤ãƒ†ã‚£ãƒ–ã®ã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" -"Force 16:9： 強制的㫠16:9 ã«è¨­å®šã—ã¾ã™ã€‚\n" -"Force 4:3： 強制的㫠4:3 ã«è¨­å®šã—ã¾ã™ã€‚\n" -"ウィンドウã«åˆã‚ã›ã‚‹: ウィンドウサイズã«åˆã£ãŸã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" +"ウィンドウã«åˆã‚ã›ã‚‹ï¼š ウィンドウサイズã«åˆã£ãŸã‚¢ã‚¹ãƒšã‚¯ãƒˆæ¯”を使用ã—ã¾ã™ã€‚\n" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" @@ -4595,7 +4590,7 @@ msgstr "設定" #: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 msgid "SetupWiiMem: Cant find setting file" -msgstr "SetupWiiMem: 設定ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +msgstr "SetupWiiMem: Cant find setting file" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 msgid "Shake" @@ -4607,7 +4602,7 @@ msgstr "通称" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:103 msgid "Shoulder Buttons" -msgstr "LRアナログ" +msgstr "LRトリガー" #: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "Show &Console" @@ -4695,7 +4690,7 @@ msgstr "アメリカåˆè¡†å›½" #: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Wad" -msgstr "WAD(Wii ウェア)" +msgstr "WAD(Wiiウェア/VC/ãƒãƒ£ãƒ³ãƒãƒ«)" #: Source/Core/DolphinWX/Src/FrameTools.cpp:269 msgid "Show Wii" @@ -4712,17 +4707,16 @@ msgid "" "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "潜在的ã«æ·±åˆ»ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆã«ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’表示ã—ã¾ã™\n" -"無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラーをプレイ中ã«è¡¨ç¤ºã•ã›ãšã«ã™ã¿ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥" -"時ã«ã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" +"無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラー表示ã«æ‚©ã¾ã•ã‚Œãªããªã‚Šã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥æ™‚ã«ã‚¨" +"ラー表示ãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "コメントを表示" +msgstr "ラグカウンターを表示" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4730,6 +4724,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"エミュレーションウインドウ上ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚\n" +"メモリーカードã¸ã®æ›¸ãè¾¼ã¿ã€èµ·å‹•æ™‚ã®ã‚·ã‚¹ãƒ†ãƒ æƒ…報〠JIT cacheã®æ¶ˆåŽ»ãªã©ãŒå«ã¾" +"ã‚Œã¾ã™ã€‚" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -4856,7 +4853,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" "ã€Software Renderer】ã¯ä»–ã®æç”»APIã«æ¯”ã¹ã€éžå¸¸ã«ä½Žé€Ÿã§ã™ã€‚\n" -"デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿ä¾¿åˆ©ãªã‚‚ã®ã§ã™ã€‚\n" +"デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿æœ‰ç”¨ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 @@ -4866,7 +4863,7 @@ msgstr "サウンド設定" #: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 #, c-format msgid "Sound backend %s is not valid." -msgstr "サウンドAPI %s ã¯ç„¡åŠ¹ã§ã™ã€‚" +msgstr "Sound backend %s is not valid." #: Source/Core/AudioCommon/Src/DSoundStream.cpp:59 #, c-format @@ -5033,7 +5030,7 @@ msgstr "å³ãƒ†ãƒ¼ãƒ–ル" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Take Screenshot" -msgstr "スクリーンショット" +msgstr "ç”»é¢æ’®å½±" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 msgid "TaruKonga (Bongos)" @@ -5057,7 +5054,7 @@ msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" #: Source/Core/Core/Src/CoreParameter.cpp:228 msgid "The WAD has been installed successfully" -msgstr "WADファイルã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«æˆåŠŸ" +msgstr "WADファイルã®è¿½åŠ ã«æˆåŠŸ" #: Source/Core/Core/Src/ActionReplay.cpp:197 msgid "The address is invalid" @@ -5183,8 +5180,7 @@ msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" -"ã“ã“ã§è¨­å®šã—ãŸé …目㯠''ã“ã®ã‚²ãƒ¼ãƒ ã«é™ã‚Š'' Dolphinやプラグインã®è¨­å®šã‚’上書ãã—" -"ã¾ã™\n" +"ã“ã“ã§è¨­å®šã—ãŸé …目㯠''ã“ã®ã‚²ãƒ¼ãƒ ã«é™ã‚Š'' Dolphinã®åŸºæœ¬è¨­å®šã‚’上書ãã—ã¾ã™\n" "例) ã“ã“ã§ã€ŒEnable Dual Coreã€ã®ãƒã‚§ãƒƒã‚¯ã‚’外ã—ã¦ãŠãã¨\n" "　　 本体設定ã§ãƒ‡ãƒ¥ã‚¢ãƒ«ã‚³ã‚¢å‡¦ç†ã‚’有効化ã—ã¦ã„ã‚‹å ´åˆã§ã‚‚ã€ã“ã®ã‚²ãƒ¼ãƒ ã®ã¿ã‚·ãƒ³ã‚°" "ルコア動作ãŒå¯èƒ½" @@ -5359,7 +5355,7 @@ msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Unexpected 0x80 call? Aborting..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" @@ -5388,7 +5384,7 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 msgid "Up" -msgstr "Up" +msgstr "上" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 @@ -5482,11 +5478,11 @@ msgstr "音é‡" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:527 #, c-format msgid "WAD installation failed: error creating %s" -msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: %s 作æˆã‚¨ãƒ©ãƒ¼" +msgstr "WAD installation failed: error creating %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 msgid "WAD installation failed: error creating ticket" -msgstr "WADã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—: error creating ticket" +msgstr "WAD installation failed: error creating ticket" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" @@ -5509,15 +5505,15 @@ msgstr "警告" #: Source/Core/Core/Src/Boot/Boot.cpp:278 msgid "Warning - starting DOL in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§DOLãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting DOL in wrong console mode!" #: Source/Core/Core/Src/Boot/Boot.cpp:328 msgid "Warning - starting ELF in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ELFãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting ELF in wrong console mode!" #: Source/Core/Core/Src/Boot/Boot.cpp:221 msgid "Warning - starting ISO in wrong console mode!" -msgstr "警告 - 誤ã£ãŸãƒ¢ãƒ¼ãƒ‰ã§ISOãŒèµ·å‹•ã•ã‚Œã¦ã„ã¾ã™ï¼" +msgstr "Warning - starting ISO in wrong console mode!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 #, c-format @@ -5542,7 +5538,7 @@ msgstr "" "%s\n" "注æ„：ã™ã§ã«ãƒ•ã‚©ãƒ«ãƒ€ãŒã‚ã‚‹å ´åˆã€ä¸­ã®ã‚»ãƒ¼ãƒ–ファイルã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚\n" "\n" -"続ã‘ã¦ã‚‚ã„ã„ ?" +"続ã‘ã¾ã™ã‹ï¼Ÿ" #: Source/Core/Core/Src/Movie.cpp:825 #, fuzzy, c-format @@ -5602,7 +5598,7 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 msgid "WaveFileWriter - file not open." -msgstr "WaveFileWriter - ファイルãŒé–‹ã‹ã‚Œã¦ã„ã¾ã›ã‚“" +msgstr "WaveFileWriter - file not open." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" @@ -5756,7 +5752,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/NetWindow.cpp:193 msgid "You must choose a game!!" -msgstr "ゲームãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" +msgstr "ソフトãŒé¸ã°ã‚Œã¦ã„ã¾ã›ã‚“" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 msgid "You must enter a name!" @@ -5874,11 +5870,11 @@ msgstr "failed to read bk header" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:375 #, c-format msgid "failed to read data from file: %s" -msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿èª­ã¿è¾¼ã¿ã«å¤±æ•—: %s" +msgstr "failed to read data from file: %s" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:97 msgid "failed to read header" -msgstr "ヘッダã®èª­ã¿è¾¼ã¿ã«å¤±æ•—" +msgstr "failed to read header" #: Source/Core/Core/Src/HW/Memmap.cpp:495 #, c-format @@ -5888,8 +5884,7 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Wii ã®ã‚»ãƒ¼ãƒ–データã§ã¯ãªã„ã‹ã€ãƒ˜ãƒƒãƒ€ã‚µã‚¤ã‚ºãŒ %x ã§ã‚ã‚‹ãŸã‚読ã¿å–ã‚Šã«å¤±æ•— " +msgstr "not a wii save or read failure for file header size %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" From 2df0c31d13372bc29d488cf7e80d4adb9cf28b46 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 21 Dec 2012 21:04:53 +0100 Subject: [PATCH 223/627] add invalid flag for BPStructs (fix issue 5790) this flag will be set on loading a state and checked before every rendering. --- Source/Core/VideoCommon/Src/BPStructs.cpp | 75 +++++++++++-------- Source/Core/VideoCommon/Src/BPStructs.h | 1 + Source/Core/VideoCommon/Src/MainBase.cpp | 2 +- .../VideoCommon/Src/VertexManagerBase.cpp | 4 + 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 179196e412..1e13a36f96 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -34,9 +34,10 @@ using namespace BPFunctions; -u32 mapTexAddress; -bool mapTexFound; -int numWrites; +static u32 mapTexAddress; +static bool mapTexFound; +static int numWrites; +static bool s_invalid; extern volatile bool g_bSkipCurrentFrame; @@ -56,6 +57,7 @@ void BPInit() mapTexAddress = 0; numWrites = 0; mapTexFound = false; + s_invalid = false; } void RenderToXFB(const BPCmd &bp, const EFBRectangle &rc, float yScale, float xfbLines, u32 xfbAddr, const u32 dstWidth, const u32 dstHeight, float gamma) @@ -81,6 +83,9 @@ void BPWritten(const BPCmd& bp) just stuff geometry in them and don't put state changes there ---------------------------------------------------------------------------------------------------------------- */ + + // check for invalid state, else unneeded configuration are built + BPReload(); // Debugging only, this lets you skip a bp update //static int times = 0; @@ -680,32 +685,42 @@ void BPWritten(const BPCmd& bp) // Called when loading a saved state. void BPReload() { - // restore anything that goes straight to the renderer. - // let's not risk actually replaying any writes. - // note that PixelShaderManager is already covered since it has its own DoState. - SetGenerationMode(); - SetScissor(); - SetLineWidth(); - SetDepthMode(); - SetLogicOpMode(); - SetDitherMode(); - SetBlendMode(); - SetColorMask(); - OnPixelFormatChange(); - { - BPCmd bp = {BPMEM_TX_SETMODE0, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0])}; - SetTextureMode(bp); - } - { - BPCmd bp = {BPMEM_TX_SETMODE0_4, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0_4])}; - SetTextureMode(bp); - } - { - BPCmd bp = {BPMEM_FIELDMASK, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMASK])}; - SetInterlacingMode(bp); - } - { - BPCmd bp = {BPMEM_FIELDMODE, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMODE])}; - SetInterlacingMode(bp); + if(s_invalid) { + s_invalid = false; + + // restore anything that goes straight to the renderer. + // let's not risk actually replaying any writes. + // note that PixelShaderManager is already covered since it has its own DoState. + SetGenerationMode(); + SetScissor(); + SetLineWidth(); + SetDepthMode(); + SetLogicOpMode(); + SetDitherMode(); + SetBlendMode(); + SetColorMask(); + OnPixelFormatChange(); + { + BPCmd bp = {BPMEM_TX_SETMODE0, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0])}; + SetTextureMode(bp); + } + { + BPCmd bp = {BPMEM_TX_SETMODE0_4, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0_4])}; + SetTextureMode(bp); + } + { + BPCmd bp = {BPMEM_FIELDMASK, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMASK])}; + SetInterlacingMode(bp); + } + { + BPCmd bp = {BPMEM_FIELDMODE, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMODE])}; + SetInterlacingMode(bp); + } } } + +void BPInvalidate() +{ + s_invalid = true; +} + diff --git a/Source/Core/VideoCommon/Src/BPStructs.h b/Source/Core/VideoCommon/Src/BPStructs.h index 38b3d3a3d4..1c1bc23e06 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.h +++ b/Source/Core/VideoCommon/Src/BPStructs.h @@ -23,5 +23,6 @@ void BPInit(); void LoadBPReg(u32 value0); void BPReload(); +void BPInvalidate(); #endif // _BPSTRUCTS_H_ diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index cb6dc7ae5b..b5e72b1d8d 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -198,7 +198,7 @@ void VideoBackendHardware::DoState(PointerWrap& p) // Refresh state. if (p.GetMode() == PointerWrap::MODE_READ) { - BPReload(); + BPInvalidate(); RecomputeCachedArraybases(); // Clear all caches that touch RAM diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 4118e3dcbd..23f355fe3b 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -9,6 +9,7 @@ #include "NativeVertexFormat.h" #include "TextureCacheBase.h" #include "RenderBase.h" +#include "BPStructs.h" #include "VertexManagerBase.h" #include "VideoConfig.h" @@ -159,6 +160,9 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { + // loading a state will invalidate BP, so check for it + BPReload(); + g_vertex_manager->vFlush(); } From 65f88567b54f60661b7e52d2212c61541ac685ec Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 22 Dec 2012 10:51:41 +0100 Subject: [PATCH 224/627] Added Tools/buildbot-try.sh. See http://code.google.com/p/dolphin-emu/wiki/BuildbotTry for documentation about that feature. --- Tools/buildbot-try.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 Tools/buildbot-try.sh diff --git a/Tools/buildbot-try.sh b/Tools/buildbot-try.sh new file mode 100755 index 0000000000..e71e92b61a --- /dev/null +++ b/Tools/buildbot-try.sh @@ -0,0 +1,35 @@ +#! /bin/bash +# +# Submits a "buildbot try" message to the Dolphin buildbot with all the +# required options. + +opt_file=$HOME/.buildbot/options + +if ! [ -f "$opt_file" ]; then + echo >&2 "error: no .buildbot/options configuration file found" + echo >&2 "Read the docs: http://code.google.com/p/dolphin-emu/wiki/BuildbotTry" + exit 1 +fi + +if ! which buildbot >/dev/null 2>&1; then + echo >&2 "error: buildbot is not installed" + echo >&2 "Install it from your package manager, or use 'pip install buildbot'" + exit 1 +fi + +if ! git branch | grep -q '^* '; then + echo "Unable to determine the current Git branch. Input the Git branch name:" + read branchname +else + branchname=$(git branch | grep '^* ' | cut -d ' ' -f 2-) +fi + +shortrev=$(git describe --always --long --dirty=+ | sed 's/-g[0-9a-f]*\(+*\)$/\1/') + +author=$(grep try_username "$opt_file" | cut -d "'" -f 2) + +echo "Branch name: $branchname" +echo "Change author: $author" +echo "Short rev: $shortrev" + +buildbot try --properties=branchname=$branchname,author=$author,shortrev=$shortrev $* From ffddfd8662bda4fedcfcc8cad73f02bd7a522925 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 22 Dec 2012 17:30:13 +0100 Subject: [PATCH 225/627] do only invalid hashes instead of all textures on loading this is a hack, but only the gpu thread is allowed to call ogl commands suggestion: create an unused texture cache, so we can move all textures there --- Source/Core/VideoCommon/Src/MainBase.cpp | 2 +- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 12 ++++++++++++ Source/Core/VideoCommon/Src/TextureCacheBase.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index b5e72b1d8d..6e0fb530db 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -203,7 +203,7 @@ void VideoBackendHardware::DoState(PointerWrap& p) // Clear all caches that touch RAM // (? these don't appear to touch any emulation state that gets saved. moved to on load only.) - TextureCache::Invalidate(); + TextureCache::InvalidateHashes(); VertexLoaderManager::MarkAllDirty(); } } diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 7c47c35bb6..2bcaead19c 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -72,6 +72,18 @@ void TextureCache::Invalidate() textures.clear(); } +// this function is dirty hack to work around a OGL bug. +// it is only used on loading states. It will work for normal textures, +// but for efb2ram, it wouldn't be checked. So there may be glitches on loading +void TextureCache::InvalidateHashes() +{ + TexCache::iterator + iter = textures.begin(), + tcend = textures.end(); + for (; iter != tcend; ++iter) + iter->second->hash = TEXHASH_INVALID; +} + TextureCache::~TextureCache() { Invalidate(); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 4ef3b8a985..4d7124f215 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -106,6 +106,7 @@ public: static void Cleanup(); static void Invalidate(); + static void InvalidateHashes(); static void InvalidateRange(u32 start_address, u32 size); static void MakeRangeDynamic(u32 start_address, u32 size); static void ClearRenderTargets(); // currently only used by OGL From d66dd970cd8fb554dec5dd5b8693a6940295db47 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 22 Dec 2012 18:25:52 -0500 Subject: [PATCH 226/627] Implement select audio backend CLI option. Fixes issue 4920. --- Source/Core/DolphinWX/Src/Main.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 8236513304..7cb2aa7f68 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -105,7 +105,7 @@ bool DolphinApp::OnInit() bool UseDebugger = false; bool UseLogger = false; bool selectVideoBackend = false; - //bool selectAudioEmulation = false; + bool selectAudioEmulation = false; wxString videoBackendName; wxString audioEmulationName; @@ -166,9 +166,8 @@ bool DolphinApp::OnInit() BatchMode = parser.Found(wxT("batch")); selectVideoBackend = parser.Found(wxT("video_backend"), &videoBackendName); - // TODO: This currently has no effect. Implement or delete. - //selectAudioEmulation = parser.Found(wxT("audio_emulation"), - // &audioEmulationName); + selectAudioEmulation = parser.Found(wxT("audio_emulation"), + &audioEmulationName); #endif // wxUSE_CMDLINE_PARSER #if defined _DEBUG && defined _WIN32 @@ -236,6 +235,12 @@ bool DolphinApp::OnInit() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend = std::string(videoBackendName.mb_str()); + if (selectAudioEmulation) + if (audioEmulationName == "HLE") + SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true; + else if (audioEmulationName == "LLE") + SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false; + VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend); // Enable the PNG image handler for screenshots From 3a0782ff332cd792f55e54983cf3f7ff7a2dc52c Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 22 Dec 2012 23:05:02 -0600 Subject: [PATCH 227/627] Update French and Spanish translations. --- Languages/po/es.po | 65 +++++++++++++++++++++------------------------- Languages/po/fr.po | 33 ++++++++++++----------- 2 files changed, 45 insertions(+), 53 deletions(-) diff --git a/Languages/po/es.po b/Languages/po/es.po index 077b2b12f9..55b75fc93d 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-19 10:25+0100\n" -"Last-Translator: Puniasterus \n" +"PO-Revision-Date: 2012-12-15 02:01+0100\n" +"Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" "MIME-Version: 1.0\n" @@ -637,11 +637,11 @@ msgstr "Configuración avanzada" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, ciso, wad)" +msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "Todas las imágenes de GC/Wii (gcm, iso, ciso, gcz)" +msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" @@ -675,7 +675,7 @@ msgstr "" "Permite alternar algunas opciones a través de las teclas de acceso rápido 3, " "4, 5, 6 y 7 en la ventana de emulación.\n" "\n" -"Si no estás seguro, déjala sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 msgid "Alternate Wiimote Timing" @@ -780,7 +780,6 @@ msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 -#, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -788,7 +787,7 @@ msgid "" msgstr "" "Ajusta automáticamente el tamaño de la ventana a tu resolución interna.\n" "\n" -"Si no estás seguro, déjala sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" @@ -855,7 +854,7 @@ msgstr "Bajo" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "La suma de verificación de la Tabla de Localización de Bloques falló" +msgstr "La suma de verificación de la tabla de localización de bloques falló" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" @@ -1355,7 +1354,7 @@ msgid "" msgstr "" "No se pudo escribir el archivo de tarjeta de memoria %s.\n" "\n" -"¿Está ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " +"¿Estás ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 @@ -1838,7 +1837,7 @@ msgid "EFB Copies" msgstr "Copias de EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " @@ -1846,9 +1845,9 @@ msgid "" "driver." msgstr "" "ERROR: Esta versión de Dolphin requiere un controlador TAP-Win32 que sea por " -"lo menos de versión %d.%d. Si actualizaste recientemente tu distribución de " -"Dolphin, puede que se necesite reiniciar para que Windows reconozca el nuevo " -"controlador." +"lo menos de versión %d.%d -- Si actualizaste recientemente tu distribución " +"de Dolphin, puede que se necesite reiniciar para que Windows reconozca el " +"nuevo controlador." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -2059,7 +2058,6 @@ msgstr "" "Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 -#, fuzzy msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2069,7 +2067,7 @@ msgstr "" "Active esto si quiere usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si no estás seguro, déjala sin marcar." +"Si no estás seguro, déjalo sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 msgid "" @@ -2709,9 +2707,8 @@ msgid "GameConfig" msgstr "Configurar Juego" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 -#, fuzzy msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "Tipos de partidas guardadas GameCube(*.gci;*.gcs;*.sav)" +msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -3213,12 +3210,13 @@ msgid "Invalid recording file" msgstr "Archivo de grabación no válido" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 +#, fuzzy msgid "Invalid search parameters (no object selected)" -msgstr "Parametros de búsqueda inválidos (ningun objeto seleccionado)" +msgstr "Parametros de búsqueda inválidos (ningún objeto seleccionado)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" -msgstr "Cadena de búsqueda incorrecta(no se pudo convertir en un número)" +msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" @@ -3442,24 +3440,23 @@ msgid "Log Configuration" msgstr "Configuración de registro" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 -#, fuzzy msgid "Log FPS to file" -msgstr "Guardar FPS en un archivo" +msgstr "Escribir FPS en un fichero" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Tipos de registro" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Mostar el número de fotogramas renderizados por segundo como una medida de " -"la velocidad de la emulación.\n" +"Registrar el número de fotogramas renderizados por segundo a User/Logs/fps." +"txt. Usa esta característica cuando quieras medir el rendimiento de " +"Dolphin.\n" "\n" "Si no estás seguro, déjala sin marcar." @@ -3886,9 +3883,8 @@ msgid "Offset:" msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 -#, fuzzy msgid "On-Screen Display Messages" -msgstr "Mensajes de arranque" +msgstr "Mensajes en pantalla" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -4028,9 +4024,8 @@ msgid "Pause" msgstr "Pausa" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 -#, fuzzy msgid "Pause at end of movie" -msgstr "Pausar al final de la película" +msgstr "Pausar al acabar la película" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4761,20 +4756,18 @@ msgid "Show first block" msgstr "Mostrar primer bloque" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Mostrar comentario del guardado" +msgstr "Mostrar contador de lag" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 -#, fuzzy msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -"Mostrar mensajes en la pantalla de emulación.\n" -"Estos mensajes incluyen escrituras a la tarjeta de memória, motor gráfico, " -"información de la CPU y limpieza caché JIT." +"Mostrar mensajes en el área de emulación. Estos mensajes incluyen escritura " +"de tarjetas de memoria,sobre el motor de vídeo,información sobre la CPU y " +"limpieza de la cache JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -5571,7 +5564,7 @@ msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 -#, c-format +#, fuzzy, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" "%s\n" @@ -5580,7 +5573,7 @@ msgstr "" "¡Advertencia! Es recomendable hacer una copia de todos los archivos en la " "carpeta:\n" "%s\n" -"¿Quiere continuar?" +"¿Quieres continuar?" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:583 #, c-format diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 89af23b5a7..fc4577e7f9 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-13 10:37+0100\n" +"PO-Revision-Date: 2012-12-22 10:47+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -633,12 +633,10 @@ msgid "Advanced Settings" msgstr "Paramètres avancés" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" @@ -664,15 +662,14 @@ msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, 6 et " -"7 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 " +"dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -1843,7 +1840,7 @@ msgid "EFB Copies" msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format +#, c-format msgid "" "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " "version %d.%d -- If you recently upgraded your Dolphin distribution, a " @@ -2372,7 +2369,7 @@ msgid "Failed to read banner.bin" msgstr "Impossible de lire banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" @@ -2716,7 +2713,7 @@ msgstr "Config du Jeu" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -3455,22 +3452,22 @@ msgstr "Configuration de la journalisation" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "Enregistrer le nombre de FPS" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "Types de journaux" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " -"d'émulation.\n" +"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/" +"fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de " +"Dolphin.\n" "\n" "Dans le doute, décochez cette case." @@ -3898,7 +3895,7 @@ msgstr "Offset :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "Afficher les messages informatifs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -4039,7 +4036,7 @@ msgstr "Pause" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "Faire une pause à la fin du film" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4772,9 +4769,8 @@ msgid "Show first block" msgstr "Afficher le premier bloc" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Afficher le commentaire de sauvegarde" +msgstr "Afficher le compteur de lag" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" @@ -4782,6 +4778,9 @@ msgid "" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" +"Affiche les messages par-dessus la zone d'émulation.\n" +"Ces messages incluent les écritures de carte mémoire, la moteur de rendu " +"vidéo et les infos du processeur, et l'effacement du cache JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" From 1c01fd9c9de6fcfd5a67fa217c13acb073be18a6 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 19:24:30 +1300 Subject: [PATCH 228/627] Remove warning about ambigious if/else. --- Source/Core/DolphinWX/Src/Main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 7cb2aa7f68..a5b19eca4c 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -236,10 +236,12 @@ bool DolphinApp::OnInit() std::string(videoBackendName.mb_str()); if (selectAudioEmulation) + { if (audioEmulationName == "HLE") SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = true; else if (audioEmulationName == "LLE") SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = false; + } VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend); From a76059377d9246da827e0148c0f6a95ae11c43cd Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 19:24:57 +1300 Subject: [PATCH 229/627] Warning free SOIL lib. --- Externals/SOIL/stb_image_aug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Externals/SOIL/stb_image_aug.c b/Externals/SOIL/stb_image_aug.c index 2bbb50b1bf..450d6c4b8c 100644 --- a/Externals/SOIL/stb_image_aug.c +++ b/Externals/SOIL/stb_image_aug.c @@ -2394,6 +2394,7 @@ static int parse_png_file(png *z, int scan, int req_comp) // if critical, fail if ((c.type & (1 << 29)) == 0) { #ifndef STBI_NO_FAILURE_STRINGS + #ifndef STBI_FAILURE_USERMSG // not threadsafe static char invalid_chunk[] = "XXXX chunk not known"; invalid_chunk[0] = (uint8) (c.type >> 24); @@ -2401,6 +2402,7 @@ static int parse_png_file(png *z, int scan, int req_comp) invalid_chunk[2] = (uint8) (c.type >> 8); invalid_chunk[3] = (uint8) (c.type >> 0); #endif + #endif return e(invalid_chunk, "PNG not supported: unknown chunk type"); } skip(s, c.length); @@ -2584,7 +2586,7 @@ static int shiftsigned(int v, int shift, int bits) static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp) { uint8 *out; - unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0; + unsigned int mr=0,mg=0,mb=0,ma=0; stbi_uc pal[256][4]; int psize=0,i,j,compress=0,width; int bpp, flip_vertically, pad, target, offset, hsz; @@ -2634,7 +2636,6 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp) mg = 0xff << 8; mb = 0xff << 0; ma = 0xff << 24; - fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255 } else { mr = 31 << 10; mg = 31 << 5; From 3a2c0b778ab092f2c73823656f1794947e9dc2f8 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 19:53:15 +1300 Subject: [PATCH 230/627] Fixed stupid bool to int conversion warnings. --- Source/Core/DolphinWX/Src/VideoConfigDiag.h | 2 +- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h index e6b13a4092..c7a19c6cb8 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h @@ -112,7 +112,7 @@ protected: void Event_ProgressiveScan(wxCommandEvent &ev) { SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", ev.GetInt()); - SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.GetInt(); + SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ev.IsChecked(); ev.Skip(); } diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index faa17dff2e..2b2e60de4a 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -61,7 +61,7 @@ public: } void OnReconnectOnLoad(wxCommandEvent& event) { - SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.GetInt(); + SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.IsChecked(); event.Skip(); } From 089434b719750b4fc3e173b0cb2a25d6021ec377 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 20:01:58 +1300 Subject: [PATCH 231/627] Apply same force to float fix as has already been done for DX11. --- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 240f3470ef..b9ba968211 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -704,8 +704,8 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) // If GX viewport is off the render target, we must clamp our viewport // within the bounds. Use the correction matrix to compensate. ViewportCorrectionMatrix(vpCorrection, - intendedX, intendedY, intendedWd, intendedHt, - X, Y, Wd, Ht); + (float)intendedX, (float)intendedY, (float)intendedWd, (float)intendedHt, + (float)X, (float)Y, (float)Wd, (float)Ht); D3DVIEWPORT9 vp; vp.X = X; From e3eebdf5911cb89c846edfe9a6eb3dfda790ff2b Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 20:25:11 +1300 Subject: [PATCH 232/627] Fixes swprintf_s issues hopefully. Also fixed an include not using correct caps. According to: http://connect.microsoft.com/VisualStudio/feedback/details/646532 --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 4 +++- Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index fb4a07e31e..830f16a9f6 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include -#include #include "Timer.h" @@ -46,6 +45,7 @@ #include "AVIDump.h" #include "FPSCounter.h" #include "ConfigManager.h" +#include namespace DX11 { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index b9ba968211..a26b041ba0 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "StringUtil.h" #include "Common.h" @@ -57,6 +56,9 @@ #include "FPSCounter.h" #include "ConfigManager.h" +#include + + namespace DX9 { diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index d3fd6050bf..5a80100a08 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -49,7 +49,7 @@ #include "D3DUtil.h" #include "EmuWindow.h" #include "VideoState.h" -#include "render.h" +#include "Render.h" #include "DLCache.h" #include "IniFile.h" #include "Core.h" From 3aa990161844d7b46ae0374e8b2bad4214476272 Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Sun, 23 Dec 2012 21:33:52 +1300 Subject: [PATCH 233/627] support retina display --- .../DolphinWX/Src/Debugger/DSPDebugWindow.h | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 37 ++++++++- Source/Core/DolphinWX/Src/Frame.h | 4 + Source/Core/DolphinWX/Src/FrameTools.cpp | 82 +++++++++++++------ Source/Core/DolphinWX/Src/TASInputDlg.cpp | 4 +- Source/Core/DolphinWX/Src/TASInputDlg.h | 4 +- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 8 ++ 7 files changed, 107 insertions(+), 34 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h index 95bd3b4286..4aa685e916 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h @@ -50,7 +50,7 @@ public: DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); virtual ~DSPDebuggerLLE(); - void Refresh(); + virtual void Refresh(); private: DECLARE_EVENT_TABLE(); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index c9408203ea..ac5bf7e4af 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -450,11 +450,26 @@ CFrame::~CFrame() bool CFrame::RendererIsFullscreen() { + bool fullscreen = false; + if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) { - return m_RenderFrame->IsFullScreen(); + fullscreen = m_RenderFrame->IsFullScreen(); } - return false; + +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + if (m_RenderFrame != NULL) + { + NSView *view = (NSView *) m_RenderFrame->GetHandle(); + NSWindow *window = [view window]; + + if ([window respondsToSelector:@selector(toggleFullScreen:)]) { + fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); + } + } +#endif + + return fullscreen; } void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event)) @@ -1002,7 +1017,23 @@ void CFrame::DoFullscreen(bool bF) { ToggleDisplayMode(bF); - m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + NSView *view = (NSView *) m_RenderFrame->GetHandle(); + NSWindow *window = [view window]; + + if ([window respondsToSelector:@selector(toggleFullScreen:)]) + { + if (bF != RendererIsFullscreen()) + { + [window toggleFullScreen:nil]; + } + } + else +#endif + { + m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); + } + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) { if (bF) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 8c8285f842..e974d9939d 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -29,6 +29,10 @@ #include #include +#ifdef __APPLE__ +#include +#endif + #include "CDUtils.h" #include "Debugger/CodeWindow.h" #include "LogWindow.h" diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index fa326adecc..5434901032 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -876,39 +876,46 @@ void CFrame::ToggleDisplayMode(bool bFullscreen) #elif defined(HAVE_XRANDR) && HAVE_XRANDR m_XRRConfig->ToggleDisplayMode(bFullscreen); #elif defined __APPLE__ - if (!bFullscreen) { - CGRestorePermanentDisplayConfiguration(); - CGDisplayRelease(CGMainDisplayID()); - return; - } +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + NSView *view = (NSView *) m_RenderFrame->GetHandle(); + NSWindow *window = [view window]; - CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID()); - for (CFIndex i = 0; i < CFArrayGetCount(modes); i++) + if (![window respondsToSelector:@selector(toggleFullScreen:)]) +#endif { - CFDictionaryRef mode; - CFNumberRef ref; - int x, y, w, h, d; + if (!bFullscreen) { + CGRestorePermanentDisplayConfiguration(); + CGDisplayRelease(CGMainDisplayID()); + return; + } - sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.\ - strFullscreenResolution.c_str(), "%dx%d", &x, &y); + CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID()); + for (CFIndex i = 0; i < CFArrayGetCount(modes); i++) + { + CFDictionaryRef mode; + CFNumberRef ref; + int x, y, w, h, d; - mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth); - CFNumberGetValue(ref, kCFNumberIntType, &w); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight); - CFNumberGetValue(ref, kCFNumberIntType, &h); - ref = (CFNumberRef)CFDictionaryGetValue(mode, - kCGDisplayBitsPerPixel); - CFNumberGetValue(ref, kCFNumberIntType, &d); + sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.\ + strFullscreenResolution.c_str(), "%dx%d", &x, &y); - if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched)) - continue; - if (w != x || h != y || d != 32) - continue;; + mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); + ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth); + CFNumberGetValue(ref, kCFNumberIntType, &w); + ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight); + CFNumberGetValue(ref, kCFNumberIntType, &h); + ref = (CFNumberRef)CFDictionaryGetValue(mode, + kCGDisplayBitsPerPixel); + CFNumberGetValue(ref, kCFNumberIntType, &d); - CGDisplaySwitchToMode(CGMainDisplayID(), mode); + if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched)) + continue; + if (w != x || h != y || d != 32) + continue;; + + CGDisplaySwitchToMode(CGMainDisplayID(), mode); + } } - #endif } @@ -968,6 +975,14 @@ void CFrame::StartGame(const std::string& filename) m_RenderFrame->Show(); } +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + NSView *view = (NSView *) m_RenderFrame->GetHandle(); + NSWindow *window = [view window]; + + if ([window respondsToSelector:@selector(setCollectionBehavior:)]) + [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; +#endif + wxBeginBusyCursor(); DoFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen); @@ -1140,8 +1155,23 @@ void CFrame::DoStop() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) + { m_RenderFrame->Destroy(); + } +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + else + { + // Disable the full screen button when not in a game. + NSView *view = (NSView *) m_RenderFrame->GetHandle(); + NSWindow *window = [view window]; + + if ([window respondsToSelector:@selector(setCollectionBehavior:)]) + [window setCollectionBehavior:NSWindowCollectionBehaviorDefault]; + } +#endif + m_RenderParent = NULL; // Clean framerate indications from the status bar. diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index e566068ff1..03ef6fbdca 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -680,7 +680,7 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event) } } -bool TASInputDlg::HasFocus() +bool TASInputDlg::HasFocus() const { //allows numbers to be used as hotkeys if(TextBoxHasFocus()) @@ -695,7 +695,7 @@ bool TASInputDlg::HasFocus() return false; } -bool TASInputDlg::TextBoxHasFocus() +bool TASInputDlg::TextBoxHasFocus() const { if(wxWindow::FindFocus() == wx_mainX_t) return true; diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h index 6e901edee5..bdd1b5befc 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.h +++ b/Source/Core/DolphinWX/Src/TASInputDlg.h @@ -45,8 +45,8 @@ class TASInputDlg : public wxDialog void SetTurboFalse(wxMouseEvent& event); void ButtonTurbo(); void GetKeyBoardInput(SPADStatus *PadStatus); - bool TextBoxHasFocus(); - bool HasFocus(); + virtual bool TextBoxHasFocus() const; + virtual bool HasFocus() const; wxBitmap CreateStickBitmap(int x, int y); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 20bd4dfb38..0750dbef78 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -252,6 +252,14 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxFlexGridSizer* const szr_display = new wxFlexGridSizer(2, 5, 5); { + +#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + NSView *view = (NSView *) parent->GetHandle(); + NSWindow *window = [view window]; + + if (![window respondsToSelector:@selector(toggleFullScreen:)]) +#endif + // display resolution { wxArrayString res_list = GetListOfResolutions(); From 589222857f52c2512a262a63f6f6c74bed3d3dfd Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 23:59:10 +1300 Subject: [PATCH 234/627] Someone changed this to a u32... it's definitely a s32 :) --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 9508762742..db45802e6f 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -321,7 +321,7 @@ void ExecuteCommand(u32 _Address) bool CmdSuccess = false; ECommandType Command = static_cast(Memory::Read_U32(_Address)); - volatile u32 DeviceID = Memory::Read_U32(_Address + 8); + volatile s32 DeviceID = Memory::Read_U32(_Address + 8); IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL; From 4dbd2ed7fbfc07d34e7f52b328f9fbcd0bb9bdd7 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 23 Dec 2012 23:59:44 +1300 Subject: [PATCH 235/627] Unused variable. --- Source/Core/DolphinWX/Src/TASInputDlg.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index 03ef6fbdca..cea09f23c4 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -751,7 +751,6 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event) return; } - wxPoint ptM(event.GetPosition()); *x = 128; *y = 128; From 7839676c871415cba89de266b2db2879fb9233b1 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 00:00:04 +1300 Subject: [PATCH 236/627] Uninitialized usage.. or so it thought. --- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 8a7b817212..170044b2e3 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -144,7 +144,7 @@ void Init(int cpu_core) #ifdef _WIN32 _control87(_PC_53, MCW_PC); #else - unsigned short _mode; + unsigned short _mode = 0; asm ("fstcw %0" : : "m" (_mode)); _mode = (_mode & ~FPU_PREC_MASK) | FPU_PREC_53; asm ("fldcw %0" : : "m" (_mode)); From a8ddc3e0699c517a1d32b1ecb1661ccdd784c3bc Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 00:00:25 +1300 Subject: [PATCH 237/627] Function definition was not updated. --- Source/Core/Common/Src/DebugInterface.h | 2 +- Source/Core/Core/Src/Debugger/PPCDebugInterface.h | 2 +- Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp | 2 +- Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/DebugInterface.h b/Source/Core/Common/Src/DebugInterface.h index 15c58e4f57..317cd0bb43 100644 --- a/Source/Core/Common/Src/DebugInterface.h +++ b/Source/Core/Common/Src/DebugInterface.h @@ -30,7 +30,7 @@ public: virtual void step() {} virtual void runToBreakpoint() {} virtual void breakNow() {} - virtual void insertBLR(unsigned int /*address*/, unsigned int) {} + virtual void insertBLR(unsigned int /*address*/, unsigned int /*value*/) {} virtual void showJitResults(unsigned int /*address*/) {}; virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} virtual std::string getDescription(unsigned int /*address*/) = 0; diff --git a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h index c305235049..5f9e41bb39 100644 --- a/Source/Core/Core/Src/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Src/Debugger/PPCDebugInterface.h @@ -34,7 +34,7 @@ public: virtual void step() {} virtual void breakNow(); virtual void runToBreakpoint(); - virtual void insertBLR(unsigned int address, unsigned int); + virtual void insertBLR(unsigned int address, unsigned int value); virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); virtual void showJitResults(u32 address); diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp index 2e2816ae77..58534f137a 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp @@ -134,7 +134,7 @@ void DSPDebugInterface::toggleMemCheck(unsigned int address) PanicAlert("MemCheck functionality not supported in DSP module."); } -void DSPDebugInterface::insertBLR(unsigned int address) +void DSPDebugInterface::insertBLR(unsigned int address, unsigned int value) { PanicAlert("insertBLR functionality not supported in DSP module."); } diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h index 5ace467ae6..dafe91f28b 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.h @@ -27,7 +27,7 @@ public: virtual void setPC(unsigned int address); virtual void step() {} virtual void runToBreakpoint(); - virtual void insertBLR(unsigned int address); + virtual void insertBLR(unsigned int address, unsigned int value); virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); }; From f865450b5aa620db070e300f4ca8524c95d193f8 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 00:00:45 +1300 Subject: [PATCH 238/627] Changed to non conflicting overload. --- Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp | 6 +++--- Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp index cec986ad90..a4591d3994 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.cpp @@ -139,7 +139,7 @@ void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event) if (DSPCore_GetState() == DSPCORE_STEPPING) { DSPCore_Step(); - Refresh(); + Update(); } break; @@ -155,10 +155,10 @@ void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event) void Host_RefreshDSPDebuggerWindow() { if (m_DebuggerFrame) - m_DebuggerFrame->Refresh(); + m_DebuggerFrame->Update(); } -void DSPDebuggerLLE::Refresh() +void DSPDebuggerLLE::Update() { #if defined __WXGTK__ if (!wxIsMainThread()) diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h index 4aa685e916..8e7c869dc0 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h @@ -50,7 +50,7 @@ public: DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); virtual ~DSPDebuggerLLE(); - virtual void Refresh(); + virtual void Update(); private: DECLARE_EVENT_TABLE(); From bd0abb3d2fe5047554bb6b87fa8e3f6aa3f42e0b Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 23 Dec 2012 13:32:23 +0100 Subject: [PATCH 239/627] revert last commit, add CheckInvalidState to VideoBackend --- Source/Core/Common/Src/VideoBackendBase.h | 8 +++ Source/Core/VideoCommon/Src/BPStructs.cpp | 68 ++++++++----------- Source/Core/VideoCommon/Src/BPStructs.h | 1 - Source/Core/VideoCommon/Src/MainBase.cpp | 14 +++- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 12 ---- .../Core/VideoCommon/Src/TextureCacheBase.h | 1 - .../VideoCommon/Src/VertexManagerBase.cpp | 2 +- .../Plugin_VideoSoftware/Src/SWmain.cpp | 5 ++ .../Plugin_VideoSoftware/Src/VideoBackend.h | 3 + 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.h b/Source/Core/Common/Src/VideoBackendBase.h index d09288ebc7..311fa66104 100644 --- a/Source/Core/Common/Src/VideoBackendBase.h +++ b/Source/Core/Common/Src/VideoBackendBase.h @@ -137,6 +137,8 @@ public: // the implementation needs not do synchronization logic, because calls to it are surrounded by PauseAndLock now virtual void DoState(PointerWrap &p) = 0; + + virtual void CheckInvalidState() = 0; }; extern std::vector g_available_video_backends; @@ -176,9 +178,15 @@ class VideoBackendHardware : public VideoBackend void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void DoState(PointerWrap &p); + + bool m_invalid; + +public: + void CheckInvalidState(); protected: void InitializeShared(); + void InvalidState(); }; #endif diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 1e13a36f96..0bde9cc613 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -37,7 +37,6 @@ using namespace BPFunctions; static u32 mapTexAddress; static bool mapTexFound; static int numWrites; -static bool s_invalid; extern volatile bool g_bSkipCurrentFrame; @@ -57,7 +56,6 @@ void BPInit() mapTexAddress = 0; numWrites = 0; mapTexFound = false; - s_invalid = false; } void RenderToXFB(const BPCmd &bp, const EFBRectangle &rc, float yScale, float xfbLines, u32 xfbAddr, const u32 dstWidth, const u32 dstHeight, float gamma) @@ -85,7 +83,7 @@ void BPWritten(const BPCmd& bp) */ // check for invalid state, else unneeded configuration are built - BPReload(); + g_video_backend->CheckInvalidState(); // Debugging only, this lets you skip a bp update //static int times = 0; @@ -685,42 +683,32 @@ void BPWritten(const BPCmd& bp) // Called when loading a saved state. void BPReload() { - if(s_invalid) { - s_invalid = false; - - // restore anything that goes straight to the renderer. - // let's not risk actually replaying any writes. - // note that PixelShaderManager is already covered since it has its own DoState. - SetGenerationMode(); - SetScissor(); - SetLineWidth(); - SetDepthMode(); - SetLogicOpMode(); - SetDitherMode(); - SetBlendMode(); - SetColorMask(); - OnPixelFormatChange(); - { - BPCmd bp = {BPMEM_TX_SETMODE0, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0])}; - SetTextureMode(bp); - } - { - BPCmd bp = {BPMEM_TX_SETMODE0_4, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0_4])}; - SetTextureMode(bp); - } - { - BPCmd bp = {BPMEM_FIELDMASK, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMASK])}; - SetInterlacingMode(bp); - } - { - BPCmd bp = {BPMEM_FIELDMODE, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMODE])}; - SetInterlacingMode(bp); - } + // restore anything that goes straight to the renderer. + // let's not risk actually replaying any writes. + // note that PixelShaderManager is already covered since it has its own DoState. + SetGenerationMode(); + SetScissor(); + SetLineWidth(); + SetDepthMode(); + SetLogicOpMode(); + SetDitherMode(); + SetBlendMode(); + SetColorMask(); + OnPixelFormatChange(); + { + BPCmd bp = {BPMEM_TX_SETMODE0, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0])}; + SetTextureMode(bp); + } + { + BPCmd bp = {BPMEM_TX_SETMODE0_4, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_TX_SETMODE0_4])}; + SetTextureMode(bp); + } + { + BPCmd bp = {BPMEM_FIELDMASK, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMASK])}; + SetInterlacingMode(bp); + } + { + BPCmd bp = {BPMEM_FIELDMODE, 0xFFFFFF, static_cast(((u32*)&bpmem)[BPMEM_FIELDMODE])}; + SetInterlacingMode(bp); } } - -void BPInvalidate() -{ - s_invalid = true; -} - diff --git a/Source/Core/VideoCommon/Src/BPStructs.h b/Source/Core/VideoCommon/Src/BPStructs.h index 1c1bc23e06..38b3d3a3d4 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.h +++ b/Source/Core/VideoCommon/Src/BPStructs.h @@ -23,6 +23,5 @@ void BPInit(); void LoadBPReg(u32 value0); void BPReload(); -void BPInvalidate(); #endif // _BPSTRUCTS_H_ diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 6e0fb530db..726ef71b38 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -180,6 +180,7 @@ void VideoBackendHardware::InitializeShared() memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs)); memset(&s_accessEFBArgs, 0, sizeof(s_accessEFBArgs)); s_AccessEFBResult = 0; + m_invalid = false; } // Run from the CPU thread @@ -198,16 +199,25 @@ void VideoBackendHardware::DoState(PointerWrap& p) // Refresh state. if (p.GetMode() == PointerWrap::MODE_READ) { - BPInvalidate(); + m_invalid = true; RecomputeCachedArraybases(); // Clear all caches that touch RAM // (? these don't appear to touch any emulation state that gets saved. moved to on load only.) - TextureCache::InvalidateHashes(); VertexLoaderManager::MarkAllDirty(); } } +void VideoBackendHardware::CheckInvalidState() { + if (m_invalid) + { + m_invalid = false; + + BPReload(); + TextureCache::Invalidate(); + } +} + void VideoBackendHardware::PauseAndLock(bool doLock, bool unpauseOnUnlock) { Fifo_PauseAndLock(doLock, unpauseOnUnlock); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 2bcaead19c..7c47c35bb6 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -72,18 +72,6 @@ void TextureCache::Invalidate() textures.clear(); } -// this function is dirty hack to work around a OGL bug. -// it is only used on loading states. It will work for normal textures, -// but for efb2ram, it wouldn't be checked. So there may be glitches on loading -void TextureCache::InvalidateHashes() -{ - TexCache::iterator - iter = textures.begin(), - tcend = textures.end(); - for (; iter != tcend; ++iter) - iter->second->hash = TEXHASH_INVALID; -} - TextureCache::~TextureCache() { Invalidate(); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 4d7124f215..4ef3b8a985 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -106,7 +106,6 @@ public: static void Cleanup(); static void Invalidate(); - static void InvalidateHashes(); static void InvalidateRange(u32 start_address, u32 size); static void MakeRangeDynamic(u32 start_address, u32 size); static void ClearRenderTargets(); // currently only used by OGL diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 23f355fe3b..5be72e4fcf 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -161,7 +161,7 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { // loading a state will invalidate BP, so check for it - BPReload(); + g_video_backend->CheckInvalidState(); g_vertex_manager->vFlush(); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 3c6fdcca38..cbd7ccbceb 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -95,6 +95,11 @@ void VideoSoftware::DoState(PointerWrap&) // NYI } +void VideoSoftware::CheckInvalidState() +{ + // there is no state to invalidate +} + void VideoSoftware::PauseAndLock(bool doLock, bool unpauseOnUnlock) { if (doLock) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index c0309c95c1..3e1490031f 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -50,6 +50,9 @@ class VideoSoftware : public VideoBackend void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void DoState(PointerWrap &p); + +public: + void CheckInvalidState(); }; } From 59ec1fe180e327e3a1b194f2a762d697591272c9 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 07:37:50 +1300 Subject: [PATCH 240/627] Fix some random warnings. --- Source/Core/Common/Src/VideoBackendBase.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 339cb016c1..40bb0fc4ce 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -41,7 +41,7 @@ static bool IsGteVista() VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL); - return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask); + return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE; } #endif diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 4e5f3a3365..5eb1660d8e 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -97,7 +97,7 @@ void EnsureTmpInputSize(size_t bound) if (tmpInput != NULL) { if (g_totalBytes > 0) - memcpy(newTmpInput, tmpInput, g_totalBytes); + memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes); delete[] tmpInput; } tmpInput = newTmpInput; @@ -637,7 +637,7 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_bDiscChange = false; } - EnsureTmpInputSize(g_currentByte + 8); + EnsureTmpInputSize((size_t)(g_currentByte + 8)); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); g_currentByte += 8; g_totalBytes = g_currentByte; @@ -661,7 +661,7 @@ void RecordWiimote(int wiimote, u8 *data, u8 size) return; InputUpdate(); - EnsureTmpInputSize(g_currentByte + size + 1); + EnsureTmpInputSize((size_t)(g_currentByte + size + 1)); tmpInput[g_currentByte++] = size; memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size; From eedca572702c7416805375bd652c56af8665d167 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 08:01:44 +1300 Subject: [PATCH 241/627] Revert "support retina display" This reverts commit 3aa990161844. --- .../DolphinWX/Src/Debugger/DSPDebugWindow.h | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 37 +------- Source/Core/DolphinWX/Src/Frame.h | 4 - Source/Core/DolphinWX/Src/FrameTools.cpp | 94 +++++++------------ Source/Core/DolphinWX/Src/TASInputDlg.cpp | 4 +- Source/Core/DolphinWX/Src/TASInputDlg.h | 4 +- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 8 -- 7 files changed, 40 insertions(+), 113 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h index 8e7c869dc0..0e4feccef2 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Src/Debugger/DSPDebugWindow.h @@ -50,7 +50,7 @@ public: DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY); virtual ~DSPDebuggerLLE(); - virtual void Update(); + void Update(); private: DECLARE_EVENT_TABLE(); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index ac5bf7e4af..c9408203ea 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -450,26 +450,11 @@ CFrame::~CFrame() bool CFrame::RendererIsFullscreen() { - bool fullscreen = false; - if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE) { - fullscreen = m_RenderFrame->IsFullScreen(); + return m_RenderFrame->IsFullScreen(); } - -#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - if (m_RenderFrame != NULL) - { - NSView *view = (NSView *) m_RenderFrame->GetHandle(); - NSWindow *window = [view window]; - - if ([window respondsToSelector:@selector(toggleFullScreen:)]) { - fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); - } - } -#endif - - return fullscreen; + return false; } void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event)) @@ -1017,23 +1002,7 @@ void CFrame::DoFullscreen(bool bF) { ToggleDisplayMode(bF); -#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - NSView *view = (NSView *) m_RenderFrame->GetHandle(); - NSWindow *window = [view window]; - - if ([window respondsToSelector:@selector(toggleFullScreen:)]) - { - if (bF != RendererIsFullscreen()) - { - [window toggleFullScreen:nil]; - } - } - else -#endif - { - m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); - } - + m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) { if (bF) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index e974d9939d..8c8285f842 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -29,10 +29,6 @@ #include #include -#ifdef __APPLE__ -#include -#endif - #include "CDUtils.h" #include "Debugger/CodeWindow.h" #include "LogWindow.h" diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 5434901032..fa326adecc 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -876,46 +876,39 @@ void CFrame::ToggleDisplayMode(bool bFullscreen) #elif defined(HAVE_XRANDR) && HAVE_XRANDR m_XRRConfig->ToggleDisplayMode(bFullscreen); #elif defined __APPLE__ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - NSView *view = (NSView *) m_RenderFrame->GetHandle(); - NSWindow *window = [view window]; - - if (![window respondsToSelector:@selector(toggleFullScreen:)]) -#endif - { - if (!bFullscreen) { - CGRestorePermanentDisplayConfiguration(); - CGDisplayRelease(CGMainDisplayID()); - return; - } - - CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID()); - for (CFIndex i = 0; i < CFArrayGetCount(modes); i++) - { - CFDictionaryRef mode; - CFNumberRef ref; - int x, y, w, h, d; - - sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.\ - strFullscreenResolution.c_str(), "%dx%d", &x, &y); - - mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth); - CFNumberGetValue(ref, kCFNumberIntType, &w); - ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight); - CFNumberGetValue(ref, kCFNumberIntType, &h); - ref = (CFNumberRef)CFDictionaryGetValue(mode, - kCGDisplayBitsPerPixel); - CFNumberGetValue(ref, kCFNumberIntType, &d); - - if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched)) - continue; - if (w != x || h != y || d != 32) - continue;; - - CGDisplaySwitchToMode(CGMainDisplayID(), mode); - } + if (!bFullscreen) { + CGRestorePermanentDisplayConfiguration(); + CGDisplayRelease(CGMainDisplayID()); + return; } + + CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID()); + for (CFIndex i = 0; i < CFArrayGetCount(modes); i++) + { + CFDictionaryRef mode; + CFNumberRef ref; + int x, y, w, h, d; + + sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.\ + strFullscreenResolution.c_str(), "%dx%d", &x, &y); + + mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); + ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth); + CFNumberGetValue(ref, kCFNumberIntType, &w); + ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight); + CFNumberGetValue(ref, kCFNumberIntType, &h); + ref = (CFNumberRef)CFDictionaryGetValue(mode, + kCGDisplayBitsPerPixel); + CFNumberGetValue(ref, kCFNumberIntType, &d); + + if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched)) + continue; + if (w != x || h != y || d != 32) + continue;; + + CGDisplaySwitchToMode(CGMainDisplayID(), mode); + } + #endif } @@ -975,14 +968,6 @@ void CFrame::StartGame(const std::string& filename) m_RenderFrame->Show(); } -#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - NSView *view = (NSView *) m_RenderFrame->GetHandle(); - NSWindow *window = [view window]; - - if ([window respondsToSelector:@selector(setCollectionBehavior:)]) - [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; -#endif - wxBeginBusyCursor(); DoFullscreen(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen); @@ -1155,23 +1140,8 @@ void CFrame::DoStop() if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); - if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) - { m_RenderFrame->Destroy(); - } -#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - else - { - // Disable the full screen button when not in a game. - NSView *view = (NSView *) m_RenderFrame->GetHandle(); - NSWindow *window = [view window]; - - if ([window respondsToSelector:@selector(setCollectionBehavior:)]) - [window setCollectionBehavior:NSWindowCollectionBehaviorDefault]; - } -#endif - m_RenderParent = NULL; // Clean framerate indications from the status bar. diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index cea09f23c4..b4f4c77397 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -680,7 +680,7 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event) } } -bool TASInputDlg::HasFocus() const +bool TASInputDlg::HasFocus() { //allows numbers to be used as hotkeys if(TextBoxHasFocus()) @@ -695,7 +695,7 @@ bool TASInputDlg::HasFocus() const return false; } -bool TASInputDlg::TextBoxHasFocus() const +bool TASInputDlg::TextBoxHasFocus() { if(wxWindow::FindFocus() == wx_mainX_t) return true; diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h index bdd1b5befc..6e901edee5 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.h +++ b/Source/Core/DolphinWX/Src/TASInputDlg.h @@ -45,8 +45,8 @@ class TASInputDlg : public wxDialog void SetTurboFalse(wxMouseEvent& event); void ButtonTurbo(); void GetKeyBoardInput(SPADStatus *PadStatus); - virtual bool TextBoxHasFocus() const; - virtual bool HasFocus() const; + bool TextBoxHasFocus(); + bool HasFocus(); wxBitmap CreateStickBitmap(int x, int y); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 0750dbef78..20bd4dfb38 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -252,14 +252,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxFlexGridSizer* const szr_display = new wxFlexGridSizer(2, 5, 5); { - -#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - NSView *view = (NSView *) parent->GetHandle(); - NSWindow *window = [view window]; - - if (![window respondsToSelector:@selector(toggleFullScreen:)]) -#endif - // display resolution { wxArrayString res_list = GetListOfResolutions(); From 6d61a54ef16f2a5b9d3b0b0f05fcd08fa98d757c Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 24 Dec 2012 11:52:20 +0200 Subject: [PATCH 242/627] Update Greek language. --- Languages/po/el.po | 865 ++++++++++++++------------------------------- 1 file changed, 268 insertions(+), 597 deletions(-) diff --git a/Languages/po/el.po b/Languages/po/el.po index 45db45d2cb..1b25d933e3 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-04-03 21:13+0200\n" +"PO-Revision-Date: 2012-12-24 11:46+0200\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -44,13 +44,12 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "" -"Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format @@ -78,8 +77,7 @@ msgstr "%s υπάÏχει ήδη, θέλετε αντικατάσταση;" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "" -"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." +msgstr "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." #: Source/Core/Core/Src/HW/GCMemcard.cpp:95 #, c-format @@ -106,8 +104,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης \n" -"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας " -"μνήμης (0x%x bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -138,9 +135,7 @@ msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται ν #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "" -"Το %s είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ για όνομα αÏχείου, ο μέγιστος αÏιθμός χαÏακτήÏων " -"είναι 45" +msgstr "Το %s είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ για όνομα αÏχείου, ο μέγιστος αÏιθμός χαÏακτήÏων είναι 45" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format @@ -308,7 +303,7 @@ msgstr "&Wiki" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -328,7 +323,7 @@ msgstr "(ανενεÏγό)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" -msgstr "" +msgstr "0x44" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 msgid "16 bit" @@ -369,7 +364,7 @@ msgstr "<Συστήματος>" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" -msgstr "" +msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:187 #: Source/Core/DolphinWX/Src/NetWindow.cpp:221 @@ -393,13 +388,11 @@ msgstr "" msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -413,12 +406,10 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " -"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " -"Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" @@ -452,14 +443,12 @@ msgstr "ΑκÏιβής VBeam εξομοίωση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " -"του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." @@ -485,38 +474,23 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " -"ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:754 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " -"και Slide (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill και Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " -"Write και Fill (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram Write και Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " -"To Pointer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write To Pointer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:801 #, c-format @@ -525,11 +499,8 @@ msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memor #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format -msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "" -"Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν " -"έχουν υλοποιηθεί (%s)" +msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +msgstr "Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν έχουν υλοποιηθεί (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -591,8 +562,7 @@ msgstr "ΔιεÏθυνση :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -602,8 +572,7 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -611,9 +580,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " -"ενεÏγοποίηση των κουμπιών." +msgstr "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την ενεÏγοποίηση των κουμπιών." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 msgid "Advanced" @@ -624,14 +591,12 @@ msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" #: Source/Core/DolphinWX/Src/FrameTools.cpp:667 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, ciso, gcz)" +msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 msgid "All Gamecube GCM files (gcm)" @@ -655,15 +620,12 @@ msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 -#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " -"6 και 7 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, και 6 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -673,7 +635,7 @@ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 msgid "Analyze" -msgstr "" +msgstr "Ανάλυση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 msgid "Anisotropic Filtering:" @@ -728,9 +690,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " -"πάντα!" +msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 @@ -777,19 +737,17 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " -"ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" -msgstr "" +msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "&ΚαταχωÏητές" +msgstr "BP ΚαταχωÏητές" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -908,7 +866,7 @@ msgstr "Κουμπιά" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" -msgstr "" +msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" @@ -920,7 +878,7 @@ msgstr "Stick ΚάμεÏας" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" -msgstr "" +msgstr "CP reg" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "CPU Emulator Engine" @@ -933,16 +891,12 @@ msgstr "Cache Display Lists" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" +"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" "\n" "If unsure, leave this checked." msgstr "" "Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " -"υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση " -"ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -956,8 +910,7 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " -"φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -975,7 +928,7 @@ msgstr "Αποτυχία ανοίγματος %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "" +msgstr "Δεν μποÏεί να γίνει κατάÏγηση καταχώÏησης συμβάντων όταν οÏισμένα εκκÏεμοÏν." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 #, c-format @@ -1079,11 +1032,11 @@ msgstr "ΔιαχείÏιση Cheat" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 msgid "Check Partition Integrity" -msgstr "" +msgstr "Έλεγχος ΑκεÏαιότητας Κατάτμησης" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 msgid "Checking integrity..." -msgstr "" +msgstr "Έλεγχος ακεÏαιότητας..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Chinese (Simplified)" @@ -1118,12 +1071,8 @@ msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " -"απαÏτίζονται μόνο από φακέλους)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 @@ -1146,12 +1095,8 @@ msgid "Clear" msgstr "ΚαθάÏισ." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " -"απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 @@ -1305,15 +1250,10 @@ msgstr "Αποτυχία εκκίνησης backend %s" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format -msgid "" -"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." msgstr "" -"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν " -"είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" -" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν " -"από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." +"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" +" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1330,23 +1270,19 @@ msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " -"Ï„Ïέχει!\n" -"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " -"το παÏόν)" +"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι Ï„Ïέχει!\n" +"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος το παÏόν)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "Δεν μπόÏεσε να γίνει εγγÏαφή των αÏχείων της κάÏτας μνήμης %s.\n" "\n" -"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " -"Ï€Ïοστασία εγγÏαφής;" +"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει Ï€Ïοστασία εγγÏαφής;" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 msgid "Couldn't find open command for extension 'ini'!" @@ -1384,11 +1320,8 @@ msgid "Created by KDE-Look.org" msgstr "ΔημιουÏγήθηκε από KDE-Look.org" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." -"com]" +msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 msgid "Created by VistaIcons.com" @@ -1396,9 +1329,7 @@ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " -"Developments" +msgstr "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web Developments" #: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 msgid "Creator: " @@ -1449,7 +1380,7 @@ msgstr "Τσέχικα" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" @@ -1494,8 +1425,7 @@ msgstr "DVDLowRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία αν #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "" -"DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" +msgstr "DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 msgid "Data Size" @@ -1579,12 +1509,8 @@ msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα " -"χωÏάνε μέσα στο buffer. Clamp." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα χωÏάνε μέσα στο buffer. Clamp." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 @@ -1632,30 +1558,24 @@ msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "ΑπενεÏγοποιεί την XFB εξομοίωση.\n" -"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά " -"παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" +"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "ΑπενεÏγοποιεί την εξομοίωση των EFB αντιγÏαφών.\n" -"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν " -"και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα " -"Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" +"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1733,20 +1653,12 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " -"αÏχείων..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " -"εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -1792,8 +1704,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" -"Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1803,8 +1714,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" -"/\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -1833,17 +1743,9 @@ msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 -#, fuzzy, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι " -"τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του " -"Dolphin σας, μία επανεκκίνηση απαιτείται για να κάνει τα Windows να δοÏνε " -"τους νέους οδηγοÏÏ‚." +#, c-format +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δοÏνε τους νέους οδηγοÏÏ‚." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -1893,31 +1795,24 @@ msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής " -"ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï " -"παιχνιδιών.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Εξομοιώνει XFBs χÏησιμοποιώντας GPU αντικείμενα υφής.\n" -"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς " -"παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί " -"να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" +"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -1935,15 +1830,13 @@ msgstr "ΕνεÏγοποίηση" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D " -"Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" +"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" "Πιθανώς μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα.\n" "ΧÏειάζεται λειτουÏγία πλήÏης οθόνης για να λειτουÏγήσει.\n" "\n" @@ -2023,19 +1916,14 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " -"γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " -"(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. (ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Enable pages" @@ -2048,41 +1936,28 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " -"απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin " -"για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" +"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " -"Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " -"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Enables Custom Projection Hack" @@ -2095,18 +1970,13 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " -"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" @@ -2159,28 +2029,17 @@ msgstr "Σφάλμα" #: Source/Core/DolphinWX/Src/Main.cpp:345 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " -"συστήματος." +msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -"Σφάλμα: Μετά από \"%s\", βÏέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d " -"(0x%X). Ματαίωση φόÏτωσης σημείου αποθήκευσης..." +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Σφάλμα: Μετά από \"%s\", βÏέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d (0x%X). Ματαίωση φόÏτωσης σημείου αποθήκευσης..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι " -"φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή " -"να κÏασάÏουν." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή να κÏασάÏουν." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2193,8 +2052,7 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" +msgstr "ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" @@ -2342,12 +2200,10 @@ msgstr "" "Αποτυχία φόÏτωσης DSP ROM:\t%s\n" "\n" "Αυτό το αÏχείο χÏειάζεται για να χÏησιμοποιηθεί το DSP LLE.\n" -"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής " -"ιδιοκτησίας.\n" +"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής ιδιοκτησίας.\n" "ΧÏησιμοποιήστε το DSPSpy για να εξάγετε το αÏχείο από την κονσόλα σας.\n" "\n" -"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM " -"dumps.\n" +"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM dumps.\n" "(Επιλέξτε την από την καÏτέλα \"Ήχος\" του παÏαθÏÏου των γενικών Ïυθμίσεων.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2365,12 +2221,15 @@ msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" -msgstr "Αποτυχία ανάγνωσης " +msgstr "" +"Αποτυχία ανάγνωσης του μπλόκ %d από το αÏχείο αποθήκευσης\n" +"ΜποÏεί να έχουν πεÏικοπεί τα δεδομένα στην κάÏτα μνήμης\n" +"Θέση αÏχείου:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2453,11 +2312,8 @@ msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για ÏŒ #: Source/Core/Core/Src/Movie.cpp:1039 #, c-format -msgid "" -"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" -msgstr "" -"ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε " -"PlayWiimote: %u != %u, byte %u.)%s" +msgid "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε PlayWiimote: %u != %u, byte %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:213 msgid "Fifo Player" @@ -2515,11 +2371,11 @@ msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θ #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 msgid "Find next" -msgstr "" +msgstr "ΕÏÏεση επομένου" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 msgid "Find previous" -msgstr "" +msgstr "ΕÏÏεση Ï€ÏοηγοÏμενου" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" @@ -2553,8 +2409,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " -"σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -2573,13 +2428,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" -"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM " -"γÏαμματοσειÏά.\n" -"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " -"αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." +"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM γÏαμματοσειÏά.\n" +"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" @@ -2596,7 +2448,7 @@ msgstr "ΜπÏοστά" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "Î’Ïέθηκαν %d αποτελέσματα για '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 @@ -2617,9 +2469,8 @@ msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 -#, fuzzy msgid "Frame Info" -msgstr "ΚαÏέ" +msgstr "ΠληÏοφοÏίες ΚαÏέ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 msgid "Frame Range" @@ -2678,7 +2529,7 @@ msgstr "GCPad" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 msgid "GX_CMD_INVL_VC" -msgstr "" +msgstr "GX_CMD_INVL_VC" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 msgid "Game ID:" @@ -2706,7 +2557,7 @@ msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "GameCube αÏχεία αποθήκευσης(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 msgid "Gamecube" @@ -2734,14 +2585,10 @@ msgstr "Κωδικοί Gecko" #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported. Try using the " -"native code handler by placing the codehandler.bin file into the Sys " -"directory and restarting Dolphin.)" +"(either a bad code or the code type is not yet supported. Try using the native code handler by placing the codehandler.bin file into the Sys directory and restarting Dolphin.)" msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" -"(Ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται. " -"Δοκιμάστε να χÏησιμοποιήσετε τον εγγενή διαχειÏιστή κώδικα τοποθετώντας το " -"codehandler.bin αÏχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" +"(Ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται. Δοκιμάστε να χÏησιμοποιήσετε τον εγγενή διαχειÏιστή κώδικα τοποθετώντας το codehandler.bin αÏχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 @@ -2763,9 +2610,7 @@ msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" -"GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " -"κωδικών ar" +msgstr "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των κωδικών ar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:444 msgid "Graphics" @@ -2781,19 +2626,15 @@ msgstr "ΜεγαλÏτεÏο από" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" -"Greatly increases quality of textures generated using render to texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " -"to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " -"και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2871,8 +2712,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2906,20 +2746,16 @@ msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "" -"IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " -"%08x/%08x" +msgstr "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο " -"που δεν είναι διαθέσιμος στο nand dump\n" +"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο που δεν είναι διαθέσιμος στο nand dump\n" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2960,30 +2796,16 @@ msgid "Icon" msgstr "Εικονίδιο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 -msgid "" -"If checked, the bounding box registers will be updated. Used by the Paper " -"Mario games." -msgstr "" -"Εάν επιλεχθεί, οι καταχωÏητές bounding box θα ανανεώνονται. ΧÏησιμοποιοÏνται " -"από τα Paper Mario παιχνίδια." +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Εάν επιλεχθεί, οι καταχωÏητές bounding box θα ανανεώνονται. ΧÏησιμοποιοÏνται από τα Paper Mario παιχνίδια." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " -"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " -"Audio to throttle using the DSP (might fix audio clicks but can also cause " -"constant noise depending on the game)." -msgstr "" -"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " -"PAL:50), χÏησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μποÏεί να " -"διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές " -"θόÏυβο αναλόγα με το παιχνίδι)." +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)." +msgstr "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50), χÏησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μποÏεί να διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές θόÏυβο αναλόγα με το παιχνίδι)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 msgid "Ignore Format Changes" @@ -2992,29 +2814,24 @@ msgstr "Αγνόηση Αλλαγών Format" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n" -"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. " -"ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" +"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγÏαφή στο EFB.\n" -"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να " -"απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ " -"γÏαφικών.\n" +"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ γÏαφικών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3048,13 +2865,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται " -"στη σωστή εξομοίωση της ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3104,11 +2919,8 @@ msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " -"ακόμα." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει ακόμα." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 msgid "Installing WAD..." @@ -3116,22 +2928,20 @@ msgstr "Γίνεται εγκατάσταση WAD..." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 msgid "Integrity Check Error" -msgstr "" +msgstr "Σφάλμα Ελέγχου ΑκεÏαιότητας" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 msgid "Integrity check completed" -msgstr "" +msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε. Δε βÏέθηκαν σφάλματα." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 #, c-format -msgid "" -"Integrity check for partition %d failed. Your dump is most likely corrupted " -"or has been patched incorrectly." -msgstr "" +msgid "Integrity check for partition %d failed. Your dump is most likely corrupted or has been patched incorrectly." +msgstr "Ο έλεγχος ακεÏαιότητας για την κατάτμηση %d απέτυχε. Το αÏχείο έχει πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος Ï„Ïόπο." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 msgid "Interface" @@ -3209,15 +3019,15 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "Μη έγκυÏες παÏάμετÏοι αναζήτησης (δεν επιλέχθηκε αντικείμενο)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 msgid "Invalid search string (couldn't convert to number)" -msgstr "" +msgstr "Μη έγκυÏο string αναζήτησης (δεν μποÏεί να γίνει μετατÏοπή σε νοÏμεÏο)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 msgid "Invalid search string (only even string lengths supported)" -msgstr "" +msgstr "Μη έγκυÏο string αναζήτησης (μόνο ζυγά μήκη string υποστηÏίζονται)" #: Source/Core/Core/Src/Core.cpp:528 msgid "Invalid state" @@ -3251,20 +3061,18 @@ msgid "KOREA" msgstr "ΚΟΡΕΑ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 -#, fuzzy msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " -"εξομοίωσης.\n" +"ΔιατηÏεί το παÏάθυÏο του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Ï€Î¬Î½Ï‰ από όλα τα υπόλοιπα παÏάθυÏα.\n" "\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +"Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 msgid "Keep window on top" -msgstr "" +msgstr "ΔιατήÏηση παÏαθÏÏου στην κοÏυφή." #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 @@ -3440,22 +3248,19 @@ msgstr "Ρυθμίσεις ΚαταγÏαφής" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Log FPS to file" -msgstr "" +msgstr "ΚαταγÏαφή FPS σε αÏχείο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 -#, fuzzy msgid "" -"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " -"feature when you want to measure the performance of Dolphin.\n" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " -"μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"ΚαταγÏάφει τον αÏιθμό των καÏέ ανά δευτεÏόλεπτο στο αÏχείο User/Logs/fps.txt. ΧÏησιμοποιήστε αυτό το χαÏακτηÏιστικό όταν θέλετε να μετÏήσετε την ταχÏτητα του Dolphin.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3530,12 +3335,8 @@ msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " -"χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3556,9 +3357,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "" -"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " -"κεφαλίδας." +msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" @@ -3588,13 +3387,11 @@ msgstr "Modifier" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι " -"κωδικοποιημένες.\n" +"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι κωδικοποιημένες.\n" "ΧÏειάζεται επανεκκίνηση της εξομοίωσης στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3622,8 +3419,7 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " -"μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3634,20 +3430,16 @@ msgid "Multiply" msgstr "Multiply" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " -"Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" -msgstr "" +msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "ΣΗΜΕΙΩΣΗ: Το μέγεθος της Ïοής δεν ταιÏιάζει με το Ï€Ïαγματικό μήκος των δεδομένων.\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3784,7 +3576,7 @@ msgstr "Δε βÏέθηκε αÏχείο εικονιδίου για τον τί #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" -msgstr "" +msgstr "Μη διαθέσιμη πεÏιγÏαφή" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" @@ -3881,7 +3673,7 @@ msgstr "Offset:" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 msgid "On-Screen Display Messages" -msgstr "" +msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 #, c-format @@ -3943,8 +3735,7 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των " -"block.\n" +"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των block.\n" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" @@ -3954,12 +3745,8 @@ msgid "Other" msgstr "Άλλα" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " -"απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 msgid "Output" @@ -4022,7 +3809,7 @@ msgstr "ΠαÏση" #: Source/Core/DolphinWX/Src/FrameTools.cpp:142 msgid "Pause at end of movie" -msgstr "" +msgstr "ΠαÏση στο τέλος της ταινίας" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 msgid "Per-Pixel Lighting" @@ -4420,9 +4207,7 @@ msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" #: Source/Core/Core/Src/Movie.cpp:782 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " -"εγγÏαφής της ταινίας..." +msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 msgid "Scaled EFB Copy" @@ -4450,9 +4235,8 @@ msgid "Scroll Lock" msgstr "Scroll Lock" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 -#, fuzzy msgid "Search" -msgstr "Αναζήτηση Cheat" +msgstr "Αναζήτηση" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 msgid "Search Filter" @@ -4463,16 +4247,17 @@ msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 -#, fuzzy msgid "Search current Object" -msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" +msgstr "Αναζήτηση Ï„Ïέχων Αντικειμένου" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search for hex Value:" -msgstr "" +msgstr "Αναζήτηση δεκαεξαδικής Τιμής:" -#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 -#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 +#: Source/Core/Common/Src/SysConf.h:103 +#: Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 +#: Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" @@ -4539,8 +4324,7 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " -"παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." @@ -4551,32 +4335,26 @@ msgstr "Επιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους " -"οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική " -"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" +"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" "\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας " -"σας.\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Επιλέγει το API γÏαφικών που θα χÏησιμοποιηθεί εσωτεÏικά.\n" -"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο " -"ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" +"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε το Direct3D 9." @@ -4598,11 +4376,8 @@ msgid "Serbian" msgstr "ΣεÏβικά" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 -msgid "" -"Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "" -"ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " -"Ï€ÏοσαÏμογέας δικτÏου" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 msgid "Set" @@ -4620,9 +4395,7 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " -"κωδικών ar %lu" +msgstr "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των κωδικών ar %lu" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 msgid "Settings..." @@ -4743,12 +4516,10 @@ msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή #: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 msgid "" "Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη " -"κÏίσιμα σφάλματα, αλλά \n" +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 @@ -4756,16 +4527,16 @@ msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:144 -#, fuzzy msgid "Show lag counter" -msgstr "Εμφάνιση αποθηκευμένου σχολίου" +msgstr "Εμφάνιση μετÏητή καθυστέÏησης " #: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 msgid "" "Show messages on the emulation screen area.\n" -"These messages include memory card writes, video backend and CPU " -"information, and JIT cache clearing." +"These messages include memory card writes, video backend and CPU information, and JIT cache clearing." msgstr "" +"Εμφανίζει μηνÏματα στην πεÏιοχή της εξομοίωσης στην οθόνη.\n" +"Στα μηνÏματα αυτά πεÏιλαμβάνονται εγγÏαφές στην κάÏτα μνήμης, πληÏοφοÏίες σχετικά με την CPU και του βίντεο backend, καθώς και καθαÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î·Ï‚ JIT cache." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save blocks" @@ -4785,13 +4556,11 @@ msgstr "Εμφάνιση αποθηκευμένου τίτλου" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " -"μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο μέτÏησης της ταχÏτητας εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4835,13 +4604,11 @@ msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια " -"σε διάφοÏα γÏαφικά εφέ.\n" +"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια σε διάφοÏα γÏαφικά εφέ.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4849,16 +4616,13 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " -"εξομοίωσης.\n" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " -"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -4886,16 +4650,13 @@ msgstr "Απεικόνιση ΛογισμικοÏ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα " -"backends.\n" +"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " -"σίγουÏοι, επιλέξτε 'Όχι'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 msgid "Sound Settings" @@ -4927,22 +4688,13 @@ msgstr "Ένταση ηχείου:" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" -"Specifies the resolution used to render at. A high resolution will improve " -"visual quality a lot but is also quite heavy on performance and might cause " -"glitches in certain games.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή " -"ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ " -"αντίκτυπο στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα " -"παιχνίδια.\n" -"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου" -"\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η " -"εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" +"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ Î±Î½Ï„Î¯ÎºÏ„Ï…Ï€Î¿ στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα παιχνίδια.\n" +"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." @@ -5001,14 +4753,12 @@ msgstr "Διακοπή" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " -"παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -5123,12 +4873,8 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι " -"ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5150,33 +4896,25 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "" -"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" "\n" "If unsure, use the rightmost value." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " -"χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεξιότεÏη τιμή." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" #: Source/Core/DolphinWX/Src/Main.cpp:352 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " -"Ï€Ïοεπιλογή συστήματος." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5212,12 +4950,8 @@ msgid "Theme selection went wrong" msgstr "Η επιλογή θέματος απέτυχε" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " -"πιθανότατα ημιτελές." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι πιθανότατα ημιτελές." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 msgid "" @@ -5225,59 +4959,40 @@ msgid "" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " -"του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:355 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " -"ίδιο το Action Replay." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το ίδιο το Action Replay." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 msgid "This could cause slow down in Wii Menu and some games." -msgstr "" -"Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " -"παιχνίδια." +msgstr "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του " -"παιχνιδιοÏ.\n" -"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για " -"να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα " -"από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη " -"απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο " -"αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" +"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του παιχνιδιοÏ.\n" +"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" -"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ " -"πυÏήνες.\n" +"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ πυÏήνες.\n" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " #: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" +msgstr "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5325,7 +5040,8 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 +#: Source/Core/Common/Src/SysConf.h:91 +#: Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5363,9 +5079,9 @@ msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 -#, fuzzy, c-format +#, c-format msgid "UNKNOWN_%02X" -msgstr "ΑΓÎΩΣΤΟ" +msgstr "ΑΓÎΩΣΤΟ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5382,13 +5098,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως " -"ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι " -"τον πληκτÏολογήσατε σωστά.\n" +"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" #: Source/Core/DolphinWX/Src/FrameTools.cpp:405 @@ -5402,7 +5115,7 @@ msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 msgid "Unexpected 0x80 call? Aborting..." -msgstr "" +msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..." #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Unknown" @@ -5466,23 +5179,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " -"πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μÏνημα " -"σφάλματος.\n" -"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε " -"gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" +"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μήνυμα σφάλματος.\n" +"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5539,8 +5248,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " -"εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5570,8 +5278,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " -"στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5583,71 +5290,43 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " -"που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" #: Source/Core/Core/Src/Movie.cpp:825 #, c-format -msgid "" -"Warning: You loaded a save that's after the end of the current movie. (byte " -"%u > %u) (frame %u > %u). You should load another save before continuing, or " -"load this state with read-only mode off." -msgstr "" -"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης που βÏίσκεται μετά το τέλος " -"της Ï„Ïέχουσας ταινίας. (byte %u > %u) (frame %u > %u). Θα Ï€Ïέπει να " -"φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων " -"με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." +msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." +msgstr "ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης που βÏίσκεται μετά το τέλος της Ï„Ïέχουσας ταινίας. (byte %u > %u) (frame %u > %u). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." #: Source/Core/Core/Src/Movie.cpp:842 #, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -"should load another save before continuing, or load this state with read-" -"only mode off. Otherwise you'll probably get a desync." -msgstr "" -"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία " -"εμφανίζει ασυμφωνία στο byte %d (0x%X). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο " -"αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη " -"την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " -"ασυγχÏονισμός." +msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." +msgstr "ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία εμφανίζει ασυμφωνία στο byte %d (0x%X). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί ασυγχÏονισμός." #: Source/Core/Core/Src/Movie.cpp:851 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should " -"load another save before continuing, or load this state with read-only mode " -"off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's " -"movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "On frame %d, the savestate's movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία " -"εμφανίζει ασυμφωνία στο καÏέ %d. Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο " -"αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη " -"την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " -"ασυγχÏονισμός.\n" +"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία εμφανίζει ασυμφωνία στο καÏέ %d. Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί ασυγχÏονισμός.\n" "\n" -"ΠεÏισσότεÏες πληÏοφοÏίες: Η Ï„Ïέχουσα ταινία έχει μήκος %d καÏέ και η ταινία " -"του σημείου αποθήκευσης έχει μήκος %d καÏέ.\n" +"ΠεÏισσότεÏες πληÏοφοÏίες: Η Ï„Ïέχουσα ταινία έχει μήκος %d καÏέ και η ταινία του σημείου αποθήκευσης έχει μήκος %d καÏέ.\n" "\n" "Στο καÏέ %d, η Ï„Ïέχουσα ταινία εμφανίζει τους χειÏισμοÏÏ‚:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "Στο καÏέ %d, η ταινία του σημείου αποθήκευσης εμφανίζει τους χειÏισμοÏÏ‚:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:120 @@ -5785,7 +5464,7 @@ msgstr "Αποτυχία δημιουÏγίας κεντÏικής φωνής XA #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" @@ -5821,8 +5500,7 @@ msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïο #: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "" -"ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." +msgstr "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -5880,19 +5558,14 @@ msgstr "[ΠÏοσαÏμοζόμενο]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[ΠΕΙΡΑΜΑΤΙΚΟ]\n" -"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των " -"υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" -"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές " -"σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση " -"υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" +"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" +"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -5939,9 +5612,7 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " -"μεγέθους %x" +msgstr "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου μεγέθους %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" From 296b9b1c16695d4c97e41a3992b3a95125ffd738 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 24 Dec 2012 09:37:12 -0600 Subject: [PATCH 243/627] Small bit of clean up in GLES-software. --- CMakeLists.txt | 3 +++ Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 13 ++++++++++++ .../Plugin_VideoSoftware/Src/HwRasterizer.cpp | 20 +++---------------- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 16 ++------------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15cd489dd3..48788e835b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,11 +218,14 @@ if(FASTLOG) add_definitions(-DDEBUGFAST) endif() +# For now GLES and EGL are tied to each other. +# Enabling GLES also disables the OpenGL plugin. option(USE_GLES "Enables GLES, disables OGL" OFF) if(USE_GLES) message("GLES rendering enabled") add_definitions(-DUSE_GLES) add_definitions(-DUSE_EGL) + set(USE_EGL True) endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index ae83401f38..2c131fb937 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -29,6 +29,19 @@ #define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 #endif +#ifdef USE_GLES +#define TEX2D GL_TEXTURE_2D +#define PREC "highp" +#define TEXTYPE "sampler2D" +#define TEXFUNC "texture2D" +#else +#define TEX2D GL_TEXTURE_RECTANGLE_ARB +#define PREC +#define TEXTYPE "sampler2DRect" +#define TEXFUNC "texture2DRect" +#endif + + #ifndef _WIN32 #include diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index a31fdaedd8..83d9fa9b23 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -26,17 +26,6 @@ #include "DebugUtil.h" #define TEMP_SIZE (1024*1024*4) -#ifdef USE_GLES -#define PREC "highp" -#define TEX2D GL_TEXTURE_2D -#define TEXTYPE "sampler2D" -#define TEXFUNC "texture2D" -#else -#define PREC -#define TEX2D GL_TEXTURE_RECTANGLE_ARB -#define TEXTYPE "sampler2DRect" -#define TEXFUNC "texture2DRect" -#endif namespace HwRasterizer { @@ -176,7 +165,6 @@ namespace HwRasterizer #endif TexCacheEntry &cacheEntry = textures[imageAddr]; cacheEntry.Update(); - GL_REPORT_ERRORD(); glBindTexture(TEX2D, cacheEntry.texture); glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); @@ -187,7 +175,6 @@ namespace HwRasterizer void BeginTriangles() { // disabling depth test sometimes allows more things to be visible - GL_REPORT_ERRORD(); glEnable(GL_DEPTH_TEST); glEnable(GL_BLEND); @@ -195,7 +182,6 @@ namespace HwRasterizer if (hasTexture) LoadTexture(); - GL_REPORT_ERRORD(); } void EndTriangles() @@ -237,9 +223,9 @@ namespace HwRasterizer { x2, y2, z2 } }; static const GLfloat col[3][4] = { - { r0, g0, b0, 0.1f }, - { r1, g1, b1, 0.1f }, - { r2, g2, b2, 0.1f } + { r0, g0, b0, 1.0f }, + { r1, g1, b1, 1.0f }, + { r2, g2, b2, 1.0f } }; { glUseProgram(colProg); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 982a8f11da..c85a1029c9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -29,19 +29,7 @@ static GLint attr_pos = -1, attr_tex = -1; static GLint uni_tex = -1; static GLuint program; -#ifdef USE_GLES -#define PREC "highp" -#define TEX2D GL_TEXTURE_2D -#define TEXTYPE "sampler2D" -#define TEXFUNC "texture2D" -#else -#define PREC -#define TEX2D GL_TEXTURE_RECTANGLE_ARB -#define TEXTYPE "sampler2DRect" -#define TEXFUNC "texture2DRect" -#endif - - +// Rasterfont isn't compatible with GLES #ifndef USE_GLES RasterFont* s_pfont = NULL; #endif @@ -104,9 +92,9 @@ void SWRenderer::Prepare() void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { +#ifndef USE_GLES int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); -#ifndef USE_GLES glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); s_pfont->printMultilineText(pstr, From 09b05c0f6c0f29c69e211085542f762731f9a231 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 24 Dec 2012 09:46:37 -0600 Subject: [PATCH 244/627] Add header guards to InterfaceBase.h --- Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h index 8fa4cc1b12..0c1c438cd0 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h @@ -14,7 +14,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ - +#ifndef _GLINTERFACEBASE_H_ +#define _GLINTERFACEBASE_H_ class cInterfaceBase { protected: @@ -33,4 +34,4 @@ public: virtual void Update() { } virtual bool PeekMessages() { return false; } }; - +#endif From 14a31d9b3a0d98f4d836fd40d7b66c42bcb829c6 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 24 Dec 2012 12:48:14 -0500 Subject: [PATCH 245/627] Fix sorting bug. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 414138d41f..318e4dfb92 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -322,9 +322,10 @@ void CGameListCtrl::Update() } // Sort items by Title + sorted = false; wxListEvent event; event.m_col = SConfig::GetInstance().m_ListSort2; - last_column = 1; + last_column = 0; OnColumnClick(event); event.m_col = SConfig::GetInstance().m_ListSort; From da5e61b45b23268c203e4de13ab168aa8023ce06 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 24 Dec 2012 13:04:57 -0500 Subject: [PATCH 246/627] Fix another sorting bug. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 318e4dfb92..49f8512f8d 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -322,10 +322,11 @@ void CGameListCtrl::Update() } // Sort items by Title + if (!sorted) + last_column = 0; sorted = false; wxListEvent event; event.m_col = SConfig::GetInstance().m_ListSort2; - last_column = 0; OnColumnClick(event); event.m_col = SConfig::GetInstance().m_ListSort; From 2dd570c880662d9477be384f97a500f56b12ba67 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 24 Dec 2012 13:29:19 -0500 Subject: [PATCH 247/627] Should completely fix game list sorting. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 49f8512f8d..546f086167 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -713,20 +713,25 @@ void CGameListCtrl::OnColumnClick(wxListEvent& event) if(event.GetColumn() != COLUMN_BANNER) { int current_column = event.GetColumn(); - - if (last_column == current_column) + if (sorted) { - last_sort = -last_sort; + if (last_column == current_column) + { + last_sort = -last_sort; + } + else + { + SConfig::GetInstance().m_ListSort2 = last_sort; + last_column = current_column; + last_sort = current_column; + } + SConfig::GetInstance().m_ListSort = last_sort; } else { - if (sorted) - SConfig::GetInstance().m_ListSort2 = last_sort; - last_column = current_column; last_sort = current_column; + last_column = current_column; } - if (sorted) - SConfig::GetInstance().m_ListSort = last_sort; caller = this; SortItems(wxListCompare, last_sort); } From 2fedab3baddadb5ccd72d88f28406d3407633c7e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 22 Dec 2012 00:03:58 +0100 Subject: [PATCH 248/627] OGL: Make OSD messages fade out properly instead of having them disappear spontaneously. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 77bb91d48b..978972f4fb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -604,12 +604,17 @@ void Renderer::RenderText(const char *text, int left, int top, u32 color) glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + s_pfont->printMultilineText(text, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, 0, nBackbufferWidth, nBackbufferHeight); GL_REPORT_ERRORD(); + + glDisable(GL_BLEND); } TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) From 249afa5eac095ecb452a04ada460a4ed274ef029 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 24 Dec 2012 17:33:40 +0100 Subject: [PATCH 249/627] Change copyright year to 2013 in the about dialog. --- Source/Core/DolphinWX/Src/AboutDolphin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index d13c12ee7f..5e1825b6ae 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -31,7 +31,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxBitmap(iDolphinLogo)); std::string Text = "Dolphin " SCM_DESC_STR "\n" - "Copyright (c) 2003-2011+ Dolphin Team\n" + "Copyright (c) 2003-2013+ Dolphin Team\n" "\n" "Branch: " SCM_BRANCH_STR "\n" "Revision: " SCM_REV_STR "\n" From 5a7835103337d754248cda10f9d938765fd28535 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 19 Dec 2012 16:55:44 +0100 Subject: [PATCH 250/627] TextureCacheBase: Fix a potential bug when using custom textures. --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 7c47c35bb6..9fc18ef1bd 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -377,7 +377,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Don't we need to force texture decoding to RGBA8 for dynamic EFB copies? // TODO: Actually, it should be enough if the internal texture format matches... - if ((entry->type == TCET_NORMAL && width == entry->native_width && height == entry->native_height && full_format == entry->format && entry->num_mipmaps == maxlevel) + if ((entry->type == TCET_NORMAL && width == entry->virtual_width && height == entry->virtual_height && full_format == entry->format && entry->num_mipmaps == maxlevel) || (entry->type == TCET_EC_DYNAMIC && entry->native_width == width && entry->native_height == height)) { // reuse the texture @@ -396,14 +396,21 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, pcfmt = LoadCustomTexture(tex_hash, texformat, 0, width, height); if (pcfmt != PC_TEX_FMT_NONE) { - expandedWidth = width; - expandedHeight = height; + if (expandedWidth != width || expandedHeight != height) + { + expandedWidth = width; + expandedHeight = height; + + // If we thought we could reuse the texture before, make sure to delete it now! + delete entry; + entry = NULL; + } using_custom_texture = true; } } - // TODO: RGBA8 textures are stored non-continuously in tmem, that might cause problems when preloading is enabled - if (pcfmt == PC_TEX_FMT_NONE) + // TODO: RGBA8 textures are stored non-continuously in tmem, that might cause problems here when preloading is enabled + if (!using_custom_texture) pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); From 4d868705fd312adda1649aebe65c6f82adb21c04 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 24 Dec 2012 19:49:14 +0100 Subject: [PATCH 251/627] VertexShaderGen: Fix a shader compilation error. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 4c746e9b75..afa9174815 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6975 + LINEAR_DISKCACHE_VER = 6976 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 07ace04b97..2f46a0ee3c 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -357,7 +357,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) default: _assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW); if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) ) - WRITE(p, "coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW); + WRITE(p, "coord = float4(o.tex%d.x, o.tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW); break; } @@ -389,9 +389,9 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) default: if (components & (VB_HAS_TEXMTXIDX0< Date: Mon, 24 Dec 2012 21:23:28 +0100 Subject: [PATCH 252/627] Revert "Uninitialized usage.. or so it thought." This reverts commit 7839676c871415cba89de266b2db2879fb9233b1. Parlane, I hate you. --- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 170044b2e3..8a7b817212 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -144,7 +144,7 @@ void Init(int cpu_core) #ifdef _WIN32 _control87(_PC_53, MCW_PC); #else - unsigned short _mode = 0; + unsigned short _mode; asm ("fstcw %0" : : "m" (_mode)); _mode = (_mode & ~FPU_PREC_MASK) | FPU_PREC_53; asm ("fldcw %0" : : "m" (_mode)); From e3e14af0dd54f00ac762ef13f3a3a7737c2c867f Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 24 Dec 2012 21:27:53 +0100 Subject: [PATCH 253/627] Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p This reverts commit 4d868705fd312adda1649aebe65c6f82adb21c04. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index afa9174815..4c746e9b75 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6976 + LINEAR_DISKCACHE_VER = 6975 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 2f46a0ee3c..07ace04b97 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -357,7 +357,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) default: _assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW); if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) ) - WRITE(p, "coord = float4(o.tex%d.x, o.tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW); + WRITE(p, "coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW); break; } @@ -389,9 +389,9 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) default: if (components & (VB_HAS_TEXMTXIDX0< Date: Sat, 22 Dec 2012 12:51:01 +0100 Subject: [PATCH 254/627] Dolphin 3.5 release. --- CMakeLists.txt | 14 +++++++------- Data/cpack_package_description.txt | 1 + Readme.txt | 21 ++++++++++++--------- Source/Core/DolphinWX/CMakeLists.txt | 2 ++ 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 Data/cpack_package_description.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e4f14f5e..a4f8e21437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE FALSE) +set(DOLPHIN_IS_STABLE TRUE) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) @@ -86,7 +86,7 @@ endif() # version number set(DOLPHIN_VERSION_MAJOR "3") -set(DOLPHIN_VERSION_MINOR "0") +set(DOLPHIN_VERSION_MINOR "5") if(DOLPHIN_IS_STABLE) set(DOLPHIN_VERSION_PATCH "0") else() @@ -581,7 +581,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h ) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") - ######################################## # Optional Targets # TODO: Add DSPSpy and TestSuite. @@ -617,19 +616,20 @@ set(CPACK_PACKAGE_VENDOR "Dolphin Team") set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH}) +set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Gamecube, Wii and Triforce emulator") -# TODO: CPACK_PACKAGE_DESCRIPTION_FILE -# TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY +set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other) +set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0) # TODO: CPACK_RESOURCE_FILE_README # TODO: CPACK_RESOURCE_FILE_WELCOME -# TODO: CPACK_PACKAGE_EXECUTABLES # TODO: CPACK_PACKAGE_ICON # TODO: CPACK_NSIS_* # TODO: Use CPack components for DSPSpy, etc => cpack_add_component set(CPACK_SET_DESTDIR ON) set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP") -set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.svn") +set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.git") list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}") # CPack must be included after the CPACK_* variables are set in order for those diff --git a/Data/cpack_package_description.txt b/Data/cpack_package_description.txt new file mode 100644 index 0000000000..318774314d --- /dev/null +++ b/Data/cpack_package_description.txt @@ -0,0 +1 @@ +Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on the Gamecube) emulator which supports many extra features and abilities not present on the original consoles. Gamecube and Wii compatibility is good - one can expect "mainstream" titles to run; lesser known titles can be hit or miss. Triforce compatibility is currently limited to a couple of games - others require more of the Triforce-specific peripheral devices to be emulated. diff --git a/Readme.txt b/Readme.txt index a00bf2a4c2..e23d0e0ec1 100644 --- a/Readme.txt +++ b/Readme.txt @@ -14,13 +14,14 @@ Team members: http://code.google.com/p/dolphin-emu/people/ Please read the FAQ before use: -http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions +http://dolphin-emu.org/docs/faq/ System Requirements: -* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X. +* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X (10.6 or higher). + Windows XP x64 is NOT supported. * Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz). Dual Core for speed boost. -* Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1. +* Graphics: Any reasonably modern graphics card (Direct3D9/OpenGL 2.1, shader model 3.0). [Command line usage] Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] @@ -30,20 +31,22 @@ Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] -e, --exec= Loads the specified file (DOL,ELF,WAD,GCM,ISO) -b, --batch Exit Dolphin with emulator -V, --video_backend= Specify a video plugin - -A, --audio_emulation= Low level (LLE) or high level (HLE) audio + -A, --audio_emulation= Low level (LLE) or high level (HLE) audio [Libraries] Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html) *.pdb = Program Debug Database (use these symbols with a program debugger) -[DSP Plugins] -Plugin_DSP_HLE: High Level DSP Emulation -Plugin_DSP_LLE: Low Level DSP Emulation +[DSP Emulator Engines] +HLE: High Level DSP Emulation +LLE: Low Level DSP Emulation (requires DSP dumps) + Recompiler is faster than interpreter but may be buggy. [Video Backends] Direct3D9: Render with Direct3D 9 Direct3D11: Render with Direct3D 11 OpenGL: Render with OpenGL + Cg Shader Language +Software Renderer: Render using the CPU only (for devs only) [Sys Files] totaldb.dsy: Database of symbols (for devs only) @@ -54,9 +57,9 @@ setting-usa/jpn/usa.txt: config files for Wii Cache: used to cache the ISO list Config: emulator configuration files Dump: anything dumped from dolphin will go here -GC: Gamecube memory cards GameConfig: holds the INI game config files -Load: high resolution textures +GC: Gamecube memory cards +Load: custom textures Logs: logs go here Maps: symbol tables go here (dev only) OpenCL: OpenCL code diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index d03cf7c6b1..f72b200ed9 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -196,3 +196,5 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") else() install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) endif() + +set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) From 9a9f567f28df6d853ccbd7f639a96d17e121f365 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 22 Dec 2012 13:03:40 +0100 Subject: [PATCH 255/627] ... and back to unstable again --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4f8e21437..0358a82511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE TRUE) +set(DOLPHIN_IS_STABLE FAST) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) From 5ac1e908b1509cae583b9ec74a292e785aec4273 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 24 Dec 2012 22:12:33 +0100 Subject: [PATCH 256/627] Truly unstable. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0358a82511..c29740b3bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE FAST) +set(DOLPHIN_IS_STABLE FALSE) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) From 399a6af66de69ffaf54d779441b57b05aa2b24e0 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 25 Dec 2012 12:22:02 +0100 Subject: [PATCH 257/627] revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough --- .../Plugin_VideoOGL/Src/RasterFont.cpp | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 13e0cb6210..bf3681483b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -125,22 +125,19 @@ const u8 rasters[char_count][char_height] = { }; static const char *s_vertex_shader = - "#version 330 core\n" - "layout(location = 0) in vec2 vertexPosition;\n" - "layout(location = 1) in vec2 texturePosition;\n" - "out vec2 tpos;\n" + "attribute vec2 vertexPosition;\n" + "attribute vec2 texturePosition;\n" + "varying vec2 tpos;\n" "void main(void) {\n" " gl_Position = vec4(vertexPosition,0,1);\n" " tpos = texturePosition;\n" "}\n"; static const char *s_fragment_shader = - "#version 330 core\n" "#extension GL_ARB_texture_rectangle : enable\n" "uniform sampler2DRect textureSampler;\n" "uniform vec4 color;\n" - "in vec2 tpos;\n" - "out vec4 gl_FragColor;\n" + "varying vec2 tpos;\n" "void main(void) {\n" " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" "}\n"; @@ -162,16 +159,6 @@ RasterFont::RasterFont() glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA, char_width*char_count, char_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data); delete [] texture_data; - // generate VBO & VAO - glGenBuffers(1, &VBO); - glGenVertexArrays(1, &VAO); - glBindBuffer(GL_ARRAY_BUFFER, VBO); - glBindVertexArray(VAO); - glEnableVertexAttribArray(0); // vertexPosition - glVertexAttribPointer(0, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL); - glEnableVertexAttribArray(1); // texturePosition - glVertexAttribPointer(1, 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2); - // generate shader shader_program = OpenGL_CompileProgram(s_vertex_shader, s_fragment_shader); @@ -183,6 +170,16 @@ RasterFont::RasterFont() cached_color = -1; glUseProgram(0); + // generate VBO & VAO + glGenBuffers(1, &VBO); + glGenVertexArrays(1, &VAO); + glBindBuffer(GL_ARRAY_BUFFER, VBO); + glBindVertexArray(VAO); + glEnableVertexAttribArray(glGetAttribLocation(shader_program, "vertexPosition")); + glVertexAttribPointer(glGetAttribLocation(shader_program, "vertexPosition"), 2, GL_FLOAT, 0, sizeof(GLfloat)*4, NULL); + glEnableVertexAttribArray(glGetAttribLocation(shader_program, "texturePosition")); + glVertexAttribPointer(glGetAttribLocation(shader_program, "texturePosition"), 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2); + // TODO: this after merging with graphic_update glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); From b3714f4874681b463c48f5aa96e3f89274f94aac Mon Sep 17 00:00:00 2001 From: rog Date: Tue, 25 Dec 2012 06:30:13 -0500 Subject: [PATCH 258/627] Don't show compress iso option for wbfs and ciso files. Fixes issue 5809. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 546f086167..fbefb1c769 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -928,7 +928,8 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event) { if (selected_iso->IsCompressed()) popupMenu->Append(IDM_COMPRESSGCM, _("Decompress ISO...")); - else + else if (selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".ciso" + && selected_iso->GetFileName().substr(selected_iso->GetFileName().find_last_of(".")) != ".wbfs") popupMenu->Append(IDM_COMPRESSGCM, _("Compress ISO...")); } else popupMenu->Append(IDM_LIST_INSTALLWAD, _("Install to Wii Menu")); From 4a74da3e876b7ed9e96767da309280483995c6a8 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 25 Dec 2012 13:30:55 +0100 Subject: [PATCH 259/627] Readd the old AXWii (rename the new version to NewAXWii) and set it as default --- Source/Core/Core/CMakeLists.txt | 3 +- Source/Core/Core/Core.vcxproj | 6 +- Source/Core/Core/Core.vcxproj.filters | 14 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 4 + .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 2 +- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp | 522 +++++++----------- .../Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h | 75 +-- .../Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h | 92 +++ .../HW/DSPHLE/UCodes/UCode_AXWii_Structs.h | 365 ++++++++++++ .../Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h | 271 +++++++++ .../{UCode_AXStructs.h => UCode_AX_Structs.h} | 0 .../Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 2 +- .../Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp | 383 +++++++++++++ .../Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h | 80 +++ .../Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp | 11 +- 15 files changed, 1454 insertions(+), 376 deletions(-) create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h rename Source/Core/Core/Src/HW/DSPHLE/UCodes/{UCode_AXStructs.h => UCode_AX_Structs.h} (100%) create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp create mode 100644 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 734d966781..93def26ec2 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -71,7 +71,8 @@ set(SRCS Src/ActionReplay.cpp Src/HW/CPU.cpp Src/HW/DSP.cpp Src/HW/DSPHLE/UCodes/UCode_AX.cpp - Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp + Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp + Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp Src/HW/DSPHLE/UCodes/UCode_CARD.cpp Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp Src/HW/DSPHLE/UCodes/UCode_ROM.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index dca0d072fc..763308db73 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -262,6 +262,7 @@ + @@ -459,8 +460,11 @@ - + + + + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 68953aef07..ad6db227d5 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -197,6 +197,9 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes @@ -730,12 +733,21 @@ HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + + + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes + HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 57032a774e..81ef7c6482 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -200,7 +200,11 @@ void CUCode_AX::HandleCommandList() u16 idx = m_cmdlist[curr_idx++]; addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; + // TODO + (void)samp_val; + (void)idx; + break; } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 7158c197e8..8fd2a2af5f 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -27,7 +27,7 @@ #define _UCODE_AX_H #include "UCodes.h" -#include "UCode_AXStructs.h" +#include "UCode_AX_Structs.h" // We can't directly use the mixer_control field from the PB because it does // not mean the same in all AX versions. The AX UCode converts the diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index 8c74c7a1e7..f4effbba6d 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -21,363 +21,247 @@ #include "Mixer.h" #include "UCodes.h" -#include "UCode_AXStructs.h" +#include "UCode_AXWii_Structs.h" +#include "UCode_AX.h" // for some functions in CUCode_AX #include "UCode_AXWii.h" - -#define AX_WII -#include "UCode_AX_Voice.h" +#include "UCode_AXWii_Voice.h" CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC) - : CUCode_AX(dsp_hle, l_CRC) + : IUCode(dsp_hle, l_CRC) + , m_addressPBs(0xFFFFFFFF) { - WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii"); + // we got loaded + m_rMailHandler.PushMail(DSP_INIT); + + templbuffer = new int[1024 * 1024]; + temprbuffer = new int[1024 * 1024]; + + wiisportsHack = m_CRC == 0xfa450138; } CUCode_AXWii::~CUCode_AXWii() { + m_rMailHandler.Clear(); + delete [] templbuffer; + delete [] temprbuffer; } -void CUCode_AXWii::HandleCommandList() +void CUCode_AXWii::HandleMail(u32 _uMail) { - // Temp variables for addresses computation - u16 addr_hi, addr_lo; - u16 addr2_hi, addr2_lo; - u16 volume; - -// WARN_LOG(DSPHLE, "Command list:"); -// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) -// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); -// WARN_LOG(DSPHLE, "-------------"); - - u32 curr_idx = 0; - bool end = false; - while (!end) + if (m_UploadSetupInProgress) { - u16 cmd = m_cmdlist[curr_idx++]; - - switch (cmd) - { - // Some of these commands are unknown, or unused in this AX HLE. - // We still need to skip their arguments using "curr_idx += N". - - case CMD_SETUP: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - SetupProcessing(HILO_TO_32(addr)); - break; - - case CMD_UNK_01: curr_idx += 2; break; - case CMD_UNK_02: curr_idx += 2; break; - case CMD_UNK_03: curr_idx += 2; break; - - case CMD_PROCESS: - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - ProcessPBList(HILO_TO_32(addr)); - break; - - case CMD_MIX_AUXA: - case CMD_MIX_AUXB: - case CMD_MIX_AUXC: - volume = m_cmdlist[curr_idx++]; - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - addr2_hi = m_cmdlist[curr_idx++]; - addr2_lo = m_cmdlist[curr_idx++]; - MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume); - break; - - // These two go together and manipulate some AUX buffers. - case CMD_UNK_08: curr_idx += 13; break; - case CMD_UNK_09: curr_idx += 13; break; - - case CMD_UNK_0A: curr_idx += 4; break; - - case CMD_OUTPUT: - volume = m_cmdlist[curr_idx++]; - addr_hi = m_cmdlist[curr_idx++]; - addr_lo = m_cmdlist[curr_idx++]; - addr2_hi = m_cmdlist[curr_idx++]; - addr2_lo = m_cmdlist[curr_idx++]; - OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume); - break; - - case CMD_UNK_0C: curr_idx += 5; break; - - case CMD_WM_OUTPUT: - { - u32 addresses[4] = { - (u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1], - (u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3], - (u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5], - (u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7], - }; - curr_idx += 8; - OutputWMSamples(addresses); - break; - } - - case CMD_END: - end = true; - break; - } + PrepareBootUCode(_uMail); + return; } -} - -void CUCode_AXWii::SetupProcessing(u32 init_addr) -{ - // TODO: should be easily factorizable with AX - s16 init_data[60]; - - for (u32 i = 0; i < 60; ++i) - init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); - - // List of all buffers we have to initialize - struct { - int* ptr; - u32 samples; - } buffers[] = { - { m_samples_left, 32 }, - { m_samples_right, 32 }, - { m_samples_surround, 32 }, - { m_samples_auxA_left, 32 }, - { m_samples_auxA_right, 32 }, - { m_samples_auxA_surround, 32 }, - { m_samples_auxB_left, 32 }, - { m_samples_auxB_right, 32 }, - { m_samples_auxB_surround, 32 }, - { m_samples_auxC_left, 32 }, - { m_samples_auxC_right, 32 }, - { m_samples_auxC_surround, 32 }, - - { m_samples_wm0, 6 }, - { m_samples_aux0, 6 }, - { m_samples_wm1, 6 }, - { m_samples_aux1, 6 }, - { m_samples_wm2, 6 }, - { m_samples_aux2, 6 }, - { m_samples_wm3, 6 }, - { m_samples_aux3, 6 } - }; - - u32 init_idx = 0; - for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) + else if ((_uMail & 0xFFFF0000) == MAIL_AX_ALIST) { - s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); - s16 delta = (s16)init_data[init_idx + 2]; - - init_idx += 3; - - if (!init_val) - memset(buffers[i].ptr, 0, 3 * buffers[i].samples * sizeof (int)); - else - { - for (u32 j = 0; j < 3 * buffers[i].samples; ++j) - { - buffers[i].ptr[j] = init_val; - init_val += delta; - } - } + // We are expected to get a new CmdBlock + DEBUG_LOG(DSPHLE, "GetNextCmdBlock (%ibytes)", (u16)_uMail); } -} - -AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control) -{ - u32 ret = 0; - - if (mixer_control & 0x00000001) ret |= MIX_L; - if (mixer_control & 0x00000002) ret |= MIX_R; - if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP; - if (mixer_control & 0x00000008) ret |= MIX_S; - if (mixer_control & 0x00000010) ret |= MIX_S_RAMP; - if (mixer_control & 0x00010000) ret |= MIX_AUXA_L; - if (mixer_control & 0x00020000) ret |= MIX_AUXA_R; - if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; - if (mixer_control & 0x00080000) ret |= MIX_AUXA_S; - if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP; - if (mixer_control & 0x00200000) ret |= MIX_AUXB_L; - if (mixer_control & 0x00400000) ret |= MIX_AUXB_R; - if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; - if (mixer_control & 0x01000000) ret |= MIX_AUXB_S; - if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP; - if (mixer_control & 0x04000000) ret |= MIX_AUXC_L; - if (mixer_control & 0x08000000) ret |= MIX_AUXC_R; - if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP; - if (mixer_control & 0x20000000) ret |= MIX_AUXC_S; - if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP; - - return (AXMixControl)ret; -} - -void CUCode_AXWii::ProcessPBList(u32 pb_addr) -{ - const u32 spms = 32; - - AXPBWii pb; - - while (pb_addr) + else switch(_uMail) { - AXBuffers buffers = {{ - m_samples_left, - m_samples_right, - m_samples_surround, - m_samples_auxA_left, - m_samples_auxA_right, - m_samples_auxA_surround, - m_samples_auxB_left, - m_samples_auxB_right, - m_samples_auxB_surround, - m_samples_auxC_left, - m_samples_auxC_right, - m_samples_auxC_surround - }}; - - if (!ReadPB(pb_addr, pb)) + case 0xCDD10000: // Action 0 - AX_ResumeTask() + m_rMailHandler.PushMail(DSP_RESUME); break; - for (int curr_ms = 0; curr_ms < 3; ++curr_ms) - { - Process1ms(pb, buffers, ConvertMixerControl(HILO_TO_32(pb.mixer_control))); + case 0xCDD10001: // Action 1 - new ucode upload + DEBUG_LOG(DSPHLE,"DSP IROM - New Ucode!"); + // TODO find a better way to protect from HLEMixer? + soundStream->GetMixer()->SetHLEReady(false); + m_UploadSetupInProgress = true; + break; - // Forward the buffers - for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) - buffers.ptrs[i] += spms; - } + case 0xCDD10002: // Action 2 - IROM_Reset(); ( WII: De Blob, Cursed Mountain,...) + DEBUG_LOG(DSPHLE,"DSP IROM - Reset!"); + m_DSPHLE->SetUCode(UCODE_ROM); + return; - WritePB(pb_addr, pb); - pb_addr = HILO_TO_32(pb.next_pb); + case 0xCDD10003: // Action 3 - AX_GetNextCmdBlock() + break; + + default: + DEBUG_LOG(DSPHLE, " >>>> u32 MAIL : AXTask Mail (%08x)", _uMail); + AXTask(_uMail); + break; } } -void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume) +void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize) { - int* buffers[3] = { 0 }; - int* main_buffers[3] = { - m_samples_left, - m_samples_right, - m_samples_surround - }; + AXPBWii PB; - switch (aux_id) + if (_iSize > 1024 * 1024) + _iSize = 1024 * 1024; + + memset(templbuffer, 0, _iSize * sizeof(int)); + memset(temprbuffer, 0, _iSize * sizeof(int)); + + u32 blockAddr = m_addressPBs; + if (!blockAddr) + return; + + for (int i = 0; i < NUMBER_OF_PBS; i++) { - case 0: - buffers[0] = m_samples_auxA_left; - buffers[1] = m_samples_auxA_right; - buffers[2] = m_samples_auxA_surround; - break; + if (!ReadPB(blockAddr, PB)) + break; - case 1: - buffers[0] = m_samples_auxB_left; - buffers[1] = m_samples_auxB_right; - buffers[2] = m_samples_auxB_surround; - break; + if (wiisportsHack) + MixAddVoice(*(AXPBWiiSports*)&PB, templbuffer, temprbuffer, _iSize); + else + MixAddVoice(PB, templbuffer, temprbuffer, _iSize); - case 2: - buffers[0] = m_samples_auxC_left; - buffers[1] = m_samples_auxC_right; - buffers[2] = m_samples_auxC_surround; - break; - } + if (!WritePB(blockAddr, PB)) + break; + + // next PB, or done + blockAddr = (PB.next_pb_hi << 16) | PB.next_pb_lo; + if (!blockAddr) + break; + } - // Send the content of AUX buffers to the CPU - if (write_addr) + // We write the sound to _pBuffer + if (_pBuffer) { - int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); - for (u32 i = 0; i < 3; ++i) - for (u32 j = 0; j < 3 * 32; ++j) - *ptr++ = Common::swap32(buffers[i][j]); - } - - // Then read the buffers from the CPU and add to our main buffers. - int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); - for (u32 i = 0; i < 3; ++i) - for (u32 j = 0; j < 3 * 32; ++j) + for (int i = 0; i < _iSize; i++) { - s64 new_val = main_buffers[i][j] + Common::swap32(*ptr++); - main_buffers[i][j] = (new_val * volume) >> 15; - } -} - -void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) -{ - int surround_buffer[3 * 32] = { 0 }; - - for (u32 i = 0; i < 3 * 32; ++i) - surround_buffer[i] = Common::swap32(m_samples_surround[i]); - memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); - - short buffer[3 * 32 * 2]; - - // Clamp internal buffers to 16 bits. - for (u32 i = 0; i < 3 * 32; ++i) - { - int left = m_samples_left[i]; - int right = m_samples_right[i]; - - // Apply global volume. Cast to s64 to avoid overflow. - left = ((s64)left * volume) >> 15; - right = ((s64)right * volume) >> 15; - - if (left < -32767) left = -32767; - if (left > 32767) left = 32767; - if (right < -32767) right = -32767; - if (right > 32767) right = 32767; - - m_samples_left[i] = left; - m_samples_right[i] = right; - } - - for (u32 i = 0; i < 3 * 32; ++i) - { - buffer[2 * i] = Common::swap16(m_samples_left[i]); - buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); - } - - memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); -} - -void CUCode_AXWii::OutputWMSamples(u32* addresses) -{ - int* buffers[] = { - m_samples_wm0, - m_samples_wm1, - m_samples_wm2, - m_samples_wm3 - }; - - for (u32 i = 0; i < 4; ++i) - { - int* in = buffers[i]; - u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]); - for (u32 j = 0; j < 3 * 6; ++j) - { - int sample = in[j]; - if (sample < -32767) sample = -32767; - if (sample > 32767) sample = 32767; - out[j] = Common::swap16((u16)sample); + // Clamp into 16-bit. Maybe we should add a volume compressor here. + int left = templbuffer[i] + _pBuffer[0]; + int right = temprbuffer[i] + _pBuffer[1]; + if (left < -32767) left = -32767; + else if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + else if (right > 32767) right = 32767; + *_pBuffer++ = left; + *_pBuffer++ = right; } } } + +void CUCode_AXWii::Update(int cycles) +{ + if (NeedsResumeMail()) + { + m_rMailHandler.PushMail(DSP_RESUME); + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } + // check if we have to send something + else if (!m_rMailHandler.IsEmpty()) + { + DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); + } +} + +// AX seems to bootup one task only and waits for resume-callbacks +// everytime the DSP has "spare time" it sends a resume-mail to the CPU +// and the __DSPHandler calls a AX-Callback which generates a new AXFrame +bool CUCode_AXWii::AXTask(u32& _uMail) +{ + u32 uAddress = _uMail; + //u32 Addr__AXStudio; + //u32 Addr__AXOutSBuffer; + bool bExecuteList = true; + +/* + for (int i=0;i<64;i++) { + NOTICE_LOG(DSPHLE,"%x - %08x",uAddress+(i*4),HLEMemory_Read_U32(uAddress+(i*4))); + } +*/ + + while (bExecuteList) + { + u16 iCommand = HLEMemory_Read_U16(uAddress); + uAddress += 2; + //NOTICE_LOG(DSPHLE,"AXWII - AXLIST CMD %X",iCommand); + + switch (iCommand) + { + case 0x0000: + //Addr__AXStudio = HLEMemory_Read_U32(uAddress); + uAddress += 4; + break; + + case 0x0001: + uAddress += 4; + break; + + case 0x0003: + uAddress += 4; + break; + + case 0x0004: + // PBs are here now + m_addressPBs = HLEMemory_Read_U32(uAddress); + if (soundStream) + soundStream->GetMixer()->SetHLEReady(true); +// soundStream->Update(); + uAddress += 4; + break; + + case 0x0005: + if (!wiisportsHack) + uAddress += 10; + break; + + case 0x0006: + uAddress += 10; + break; + + case 0x0007: // AXLIST_SBUFFER + //Addr__AXOutSBuffer = HLEMemory_Read_U32(uAddress); + uAddress += 10; + break; + + case 0x0008: + uAddress += 26; + break; + + case 0x000a: + uAddress += wiisportsHack ? 4 : 8; // AXLIST_COMPRESSORTABLE + break; + + case 0x000b: + uAddress += wiisportsHack ? 2 : 10; + break; + + case 0x000c: + uAddress += wiisportsHack ? 8 : 10; + break; + + case 0x000d: + uAddress += 16; + break; + + case 0x000e: + if (wiisportsHack) + uAddress += 16; + else + bExecuteList = false; + break; + + case 0x000f: // only for Wii Sports uCode + bExecuteList = false; + break; + + default: + INFO_LOG(DSPHLE,"DSPHLE - AXwii - AXLIST - Unknown CMD: %x",iCommand); + // unknown command so stop the execution of this TaskList + bExecuteList = false; + break; + } + } + + m_rMailHandler.PushMail(DSP_YIELD); //its here in case there is a CMD fuckup + return true; +} + void CUCode_AXWii::DoState(PointerWrap &p) { - std::lock_guard lk(m_processing); + std::lock_guard lk(m_csMix); + + p.Do(m_addressPBs); + p.Do(wiisportsHack); DoStateShared(p); - DoAXState(p); - - p.Do(m_samples_auxC_left); - p.Do(m_samples_auxC_right); - p.Do(m_samples_auxC_surround); - - p.Do(m_samples_wm0); - p.Do(m_samples_wm1); - p.Do(m_samples_wm2); - p.Do(m_samples_wm3); - - p.Do(m_samples_aux0); - p.Do(m_samples_aux1); - p.Do(m_samples_aux2); - p.Do(m_samples_aux3); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h index 3a66c30868..dc07e71a63 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -12,69 +12,44 @@ // A copy of the GPL 2.0 should have been included with the program. // If not, see http://www.gnu.org/licenses/ -// Official Git repository and contact information can be found at +// Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _UCODE_AXWII_H -#define _UCODE_AXWII_H +#ifndef _UCODE_AXWII +#define _UCODE_AXWII -#include "UCode_AX.h" +#include "UCode_AXWii_Structs.h" -class CUCode_AXWii : public CUCode_AX +#define NUMBER_OF_PBS 128 + +class CUCode_AXWii : public IUCode { public: CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC); virtual ~CUCode_AXWii(); - virtual void DoState(PointerWrap &p); - -protected: - int m_samples_auxC_left[32 * 3]; - int m_samples_auxC_right[32 * 3]; - int m_samples_auxC_surround[32 * 3]; - - // Wiimote buffers - int m_samples_wm0[6 * 3]; - int m_samples_aux0[6 * 3]; - int m_samples_wm1[6 * 3]; - int m_samples_aux1[6 * 3]; - int m_samples_wm2[6 * 3]; - int m_samples_aux2[6 * 3]; - int m_samples_wm3[6 * 3]; - int m_samples_aux3[6 * 3]; - - // Convert a mixer_control bitfield to our internal representation for that - // value. Required because that bitfield has a different meaning in some - // versions of AX. - AXMixControl ConvertMixerControl(u32 mixer_control); - - virtual void HandleCommandList(); - - void SetupProcessing(u32 init_addr); - void ProcessPBList(u32 pb_addr); - void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume); - void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); - void OutputWMSamples(u32* addresses); // 4 addresses + void HandleMail(u32 _uMail); + void MixAdd(short* _pBuffer, int _iSize); + void Update(int cycles); + void DoState(PointerWrap &p); private: - enum CmdType + enum { - CMD_SETUP = 0x00, - CMD_UNK_01 = 0x01, - CMD_UNK_02 = 0x02, - CMD_UNK_03 = 0x03, - CMD_PROCESS = 0x04, - CMD_MIX_AUXA = 0x05, - CMD_MIX_AUXB = 0x06, - CMD_MIX_AUXC = 0x07, - CMD_UNK_08 = 0x08, - CMD_UNK_09 = 0x09, - CMD_UNK_0A = 0x0A, - CMD_OUTPUT = 0x0B, - CMD_UNK_0C = 0x0C, - CMD_WM_OUTPUT = 0x0D, - CMD_END = 0x0E + MAIL_AX_ALIST = 0xBABE0000, }; + + // PBs + u32 m_addressPBs; + + bool wiisportsHack; + + int *templbuffer; + int *temprbuffer; + + // ax task message handler + bool AXTask(u32& _uMail); + void SendMail(u32 _uMail); }; #endif // _UCODE_AXWII diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h new file mode 100644 index 0000000000..9130bb9da4 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_ADPCM.h @@ -0,0 +1,92 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_AX_ADPCM_H +#define _UCODE_AX_ADPCM_H + +#include "../../DSP.h" + +static inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac) +{ + while (samplePos < newSamplePos) + { + if ((samplePos & 15) == 0) + { + adpcm.pred_scale = DSP::ReadARAM((samplePos & ~15) >> 1); + samplePos += 2; + newSamplePos += 2; + } + + int scale = 1 << (adpcm.pred_scale & 0xF); + int coef_idx = (adpcm.pred_scale >> 4) & 7; + + s32 coef1 = adpcm.coefs[coef_idx * 2 + 0]; + s32 coef2 = adpcm.coefs[coef_idx * 2 + 1]; + + int temp = (samplePos & 1) ? + (DSP::ReadARAM(samplePos >> 1) & 0xF) : + (DSP::ReadARAM(samplePos >> 1) >> 4); + + if (temp >= 8) + temp -= 16; + + // 0x400 = 0.5 in 11-bit fixed point + int val = (scale * temp) + ((0x400 + coef1 * adpcm.yn1 + coef2 * adpcm.yn2) >> 11); + + if (val > 0x7FFF) + val = 0x7FFF; + else if (val < -0x7FFF) + val = -0x7FFF; + + adpcm.yn2 = adpcm.yn1; + adpcm.yn1 = val; + + samplePos++; + } + + return adpcm.yn1; +} + +// TODO: WTF is going on here?!? +// Volume control (ramping) +static inline u16 ADPCM_Vol(u16 vol, u16 delta) +{ + int x = vol; + if (delta && delta < 0x5000) + x += delta * 20 * 8; // unsure what the right step is + //x += 1 * 20 * 8; + else if (delta && delta > 0x5000) + //x -= (0x10000 - delta); // this is to small, it's often 1 + x -= (0x10000 - delta) * 20 * 16; // if this was 20 * 8 the sounds in Fire Emblem and Paper Mario + // did not have time to go to zero before the were closed + //x -= 1 * 20 * 16; + + // make lower limits + if (x < 0) x = 0; + //if (pb.mixer_control < 1000 && x < pb.mixer_control) x = pb.mixer_control; // does this make + // any sense? + + // make upper limits + //if (mixer_control > 1000 && x > mixer_control) x = mixer_control; // maybe mixer_control also + // has a volume target? + //if (x >= 0x7fff) x = 0x7fff; // this seems a little high + //if (x >= 0x4e20) x = 0x4e20; // add a definitive limit at 20 000 + if (x >= 0x8000) x = 0x8000; // clamp to 32768; + return x; // update volume +} + +#endif // _UCODE_AX_ADPCM_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h new file mode 100644 index 0000000000..7f082740de --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Structs.h @@ -0,0 +1,365 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_AX_STRUCTS_H +#define _UCODE_AX_STRUCTS_H + +struct PBMixer +{ + u16 left; + u16 left_delta; + u16 right; + u16 right_delta; + + u16 unknown3[8]; + u16 unknown4[6]; +}; + +struct PBMixerWii +{ + // volume mixing values in .15, 0x8000 = ca. 1.0 + u16 left; + u16 left_delta; + u16 right; + u16 right_delta; + + u16 auxA_left; + u16 auxA_left_delta; + u16 auxA_right; + u16 auxA_right_delta; + + u16 auxB_left; + u16 auxB_left_delta; + u16 auxB_right; + u16 auxB_right_delta; + + // Note: the following elements usage changes a little in DPL2 mode + // TODO: implement and comment it in the mixer + u16 auxC_left; + u16 auxC_left_delta; + u16 auxC_right; + u16 auxC_right_delta; + + u16 surround; + u16 surround_delta; + u16 auxA_surround; + u16 auxA_surround_delta; + u16 auxB_surround; + u16 auxB_surround_delta; + u16 auxC_surround; + u16 auxC_surround_delta; +}; + +struct PBMixerWM +{ + u16 main0; + u16 main0_delta; + u16 aux0; + u16 aux0_delta; + + u16 main1; + u16 main1_delta; + u16 aux1; + u16 aux1_delta; + + u16 main2; + u16 main2_delta; + u16 aux2; + u16 aux2_delta; + + u16 main3; + u16 main3_delta; + u16 aux3; + u16 aux3_delta; +}; + +struct PBInitialTimeDelay +{ + u16 on; + u16 addrMemHigh; + u16 addrMemLow; + u16 offsetLeft; + u16 offsetRight; + u16 targetLeft; + u16 targetRight; +}; + +// Update data - read these each 1ms subframe and use them! +// It seems that to provide higher time precisions for MIDI events, some games +// use this thing to update the parameter blocks per 1ms sub-block (a block is 5ms). +// Using this data should fix games that are missing MIDI notes. +struct PBUpdates +{ + u16 num_updates[5]; + u16 data_hi; // These point to main RAM. Not sure about the structure of the data. + u16 data_lo; +}; + +// The DSP stores the final sample values for each voice after every frame of processing. +// The values are then accumulated for all dropped voices, added to the next frame of audio, +// and ramped down on a per-sample basis to provide a gentle "roll off." +struct PBDpop +{ + s16 unknown[9]; +}; + +struct PBDpopWii +{ + s16 left; + s16 auxA_left; + s16 auxB_left; + s16 auxC_left; + + s16 right; + s16 auxA_right; + s16 auxB_right; + s16 auxC_right; + + s16 surround; + s16 auxA_surround; + s16 auxB_surround; + s16 auxC_surround; +}; + +struct PBDpopWM +{ + s16 aMain0; + s16 aMain1; + s16 aMain2; + s16 aMain3; + + s16 aAux0; + s16 aAux1; + s16 aAux2; + s16 aAux3; +}; + +struct PBVolumeEnvelope +{ + u16 cur_volume; // volume at start of frame + s16 cur_volume_delta; // signed per sample delta (96 samples per frame) +}; + +struct PBUnknown2 +{ + u16 unknown_reserved[3]; +}; + +struct PBAudioAddr +{ + u16 looping; + u16 sample_format; + u16 loop_addr_hi; // Start of loop (this will point to a shared "zero" buffer if one-shot mode is active) + u16 loop_addr_lo; + u16 end_addr_hi; // End of sample (and loop), inclusive + u16 end_addr_lo; + u16 cur_addr_hi; + u16 cur_addr_lo; +}; + +struct PBADPCMInfo +{ + s16 coefs[16]; + u16 gain; + u16 pred_scale; + s16 yn1; + s16 yn2; +}; + +struct PBSampleRateConverter +{ + // ratio = (f32)ratio * 0x10000; + // valid range is 1/512 to 4.0000 + u16 ratio_hi; // integer part of sampling ratio + u16 ratio_lo; // fraction part of sampling ratio + u16 cur_addr_frac; + u16 last_samples[4]; +}; + +struct PBSampleRateConverterWM +{ + u16 currentAddressFrac; + u16 last_samples[4]; +}; + +struct PBADPCMLoopInfo +{ + u16 pred_scale; + u16 yn1; + u16 yn2; +}; + +struct AXPB +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, ?, linear) + u16 coef_select; + u16 mixer_control; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixer mixer; + PBInitialTimeDelay initial_time_delay; + PBUpdates updates; + PBDpop dpop; + PBVolumeEnvelope vol_env; + PBUnknown2 unknown3; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + u16 unknown_maybe_padding[3]; +}; + +struct PBLowPassFilter +{ + u16 enabled; + u16 yn1; + u16 a0; + u16 b0; +}; + +struct PBBiquadFilter +{ + + u16 on; // on = 2, off = 0 + u16 xn1; // History data + u16 xn2; + u16 yn1; + u16 yn2; + u16 b0; // Filter coefficients + u16 b1; + u16 b2; + u16 a1; + u16 a2; + +}; + +union PBInfImpulseResponseWM +{ + PBLowPassFilter lpf; + PBBiquadFilter biquad; +}; + +struct AXPBWii +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, 4-tap, linear) + u16 coef_select; // coef for the 4-tap src + u32 mixer_control; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixerWii mixer; + PBInitialTimeDelay initial_time_delay; + PBDpopWii dpop; + PBVolumeEnvelope vol_env; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + PBLowPassFilter lpf; + PBBiquadFilter biquad; + + // WIIMOTE :D + u16 remote; + u16 remote_mixer_control; + + PBMixerWM remote_mixer; + PBDpopWM remote_dpop; + PBSampleRateConverterWM remote_src; + PBInfImpulseResponseWM remote_iir; + + u16 pad[12]; // align us, captain! (32B) +}; + +// Seems like nintendo used an early version of AXWii and forgot to remove the update functionality ;p +struct PBUpdatesWiiSports +{ + u16 num_updates[3]; + u16 data_hi; + u16 data_lo; +}; + +struct AXPBWiiSports +{ + u16 next_pb_hi; + u16 next_pb_lo; + u16 this_pb_hi; + u16 this_pb_lo; + + u16 src_type; // Type of sample rate converter (none, 4-tap, linear) + u16 coef_select; // coef for the 4-tap src + u32 mixer_control; + + u16 running; // 1=RUN 0=STOP + u16 is_stream; // 1 = stream, 0 = one shot + + PBMixerWii mixer; + PBInitialTimeDelay initial_time_delay; + PBUpdatesWiiSports updates; + PBDpopWii dpop; + PBVolumeEnvelope vol_env; + PBAudioAddr audio_addr; + PBADPCMInfo adpcm; + PBSampleRateConverter src; + PBADPCMLoopInfo adpcm_loop_info; + PBLowPassFilter lpf; + PBBiquadFilter biquad; + + // WIIMOTE :D + u16 remote; + u16 remote_mixer_control; + + PBMixerWM remote_mixer; + PBDpopWM remote_dpop; + PBSampleRateConverterWM remote_src; + PBInfImpulseResponseWM remote_iir; + + u16 pad[7]; // align us, captain! (32B) +}; + +// TODO: All these enums have changed a lot for wii +enum { + AUDIOFORMAT_ADPCM = 0, + AUDIOFORMAT_PCM8 = 0x19, + AUDIOFORMAT_PCM16 = 0xA, +}; + +enum { + SRCTYPE_LINEAR = 1, + SRCTYPE_NEAREST = 2, + MIXCONTROL_RAMPING = 8, +}; + +// Both may be used at once +enum { + FILTER_LOWPASS = 1, + FILTER_BIQUAD = 2, +}; + +#endif // _UCODE_AX_STRUCTS_H diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h new file mode 100644 index 0000000000..55f7face27 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii_Voice.h @@ -0,0 +1,271 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_AXWII_VOICE_H +#define _UCODE_AXWII_VOICE_H + +#include "UCodes.h" +#include "UCode_AXWii_ADPCM.h" +#include "UCode_AX.h" +#include "Mixer.h" +#include "../../AudioInterface.h" + +// MRAM -> ARAM for GC +inline bool ReadPB(u32 addr, AXPB &PB) +{ + const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + u16* PB_in_aram = (u16*)&PB; + + for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) + { + PB_in_aram[p] = Common::swap16(PB_in_mram[p]); + } + + return true; +} + +// MRAM -> ARAM for Wii +inline bool ReadPB(u32 addr, AXPBWii &PB) +{ + const u16* PB_in_mram = (const u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + u16* PB_in_aram = (u16*)&PB; + + // preswap the mixer_control + PB.mixer_control = ((u32)PB_in_mram[7] << 16) | ((u32)PB_in_mram[6] >> 16); + + for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) + { + PB_in_aram[p] = Common::swap16(PB_in_mram[p]); + } + + return true; +} + +// ARAM -> MRAM for GC +inline bool WritePB(u32 addr, AXPB &PB) +{ + const u16* PB_in_aram = (const u16*)&PB; + u16* PB_in_mram = (u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + + for (size_t p = 0; p < (sizeof(AXPB) >> 1); p++) + { + PB_in_mram[p] = Common::swap16(PB_in_aram[p]); + } + + return true; +} + +// ARAM -> MRAM for Wii +inline bool WritePB(u32 addr, AXPBWii &PB) +{ + const u16* PB_in_aram = (const u16*)&PB; + u16* PB_in_mram = (u16*)Memory::GetPointer(addr); + if (PB_in_mram == NULL) + return false; + + // preswap the mixer_control + *(u32*)&PB_in_mram[6] = (PB.mixer_control << 16) | (PB.mixer_control >> 16); + + for (size_t p = 0; p < (sizeof(AXPBWii) >> 1); p++) + { + PB_in_mram[p] = Common::swap16(PB_in_aram[p]); + } + + return true; +} + +////////////////////////////////////////////////////////////////////////// +// TODO: fix handling of gc/wii PB differences +// TODO: generally fix up the mess - looks crazy and kinda wrong +template +inline void MixAddVoice(ParamBlockType &pb, + int *templbuffer, int *temprbuffer, + int _iSize) +{ + if (pb.running) + { + const u32 ratio = (u32)(((pb.src.ratio_hi << 16) + pb.src.ratio_lo) + * /*ratioFactor:*/((float)AudioInterface::GetAIDSampleRate() / (float)soundStream->GetMixer()->GetSampleRate())); + u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo; + u32 loopPos = (pb.audio_addr.loop_addr_hi << 16) | pb.audio_addr.loop_addr_lo; + + u32 samplePos = (pb.audio_addr.cur_addr_hi << 16) | pb.audio_addr.cur_addr_lo; + u32 frac = pb.src.cur_addr_frac; + + // ======================================================================================= + // Handle No-SRC streams - No src streams have pb.src_type == 2 and have pb.src.ratio_hi = 0 + // and pb.src.ratio_lo = 0. We handle that by setting the sampling ratio integer to 1. This + // makes samplePos update in the correct way. I'm unsure how we are actually supposed to + // detect that this setting. Updates did not fix this automatically. + // --------------------------------------------------------------------------------------- + // Stream settings + // src_type = 2 (most other games have src_type = 0) + // Affected games: + // Baten Kaitos - Eternal Wings (2003) + // Baten Kaitos - Origins (2006)? + // Soul Calibur 2: The movie music use src_type 2 but it needs no adjustment, perhaps + // the sound format plays in to, Baten use ADPCM, SC2 use PCM16 + //if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) + if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0)) + { + pb.src.ratio_hi = 1; + } + + // ======================================================================================= + // Games that use looping to play non-looping music streams - SSBM has info in all + // pb.adpcm_loop_info parameters but has pb.audio_addr.looping = 0. If we treat these streams + // like any other looping streams the music works. I'm unsure how we are actually supposed to + // detect that these kinds of blocks should be looping. It seems like pb.mixer_control == 0 may + // identify these types of blocks. Updates did not write any looping values. + if ( + (pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2) + && pb.mixer_control == 0 && pb.adpcm_loop_info.pred_scale <= 0x7F + ) + { + pb.audio_addr.looping = 1; + } + + + + // Top Spin 3 Wii + if (pb.audio_addr.sample_format > 25) + pb.audio_addr.sample_format = 0; + + // ======================================================================================= + // Walk through _iSize. _iSize = numSamples. If the game goes slow _iSize will be higher to + // compensate for that. _iSize can be as low as 100 or as high as 2000 some cases. + for (int s = 0; s < _iSize; s++) + { + int sample = 0; + u32 oldFrac = frac; + frac += ratio; + u32 newSamplePos = samplePos + (frac >> 16); //whole number of frac + + // ======================================================================================= + // Process sample format + switch (pb.audio_addr.sample_format) + { + case AUDIOFORMAT_PCM8: + pb.adpcm.yn2 = ((s8)DSP::ReadARAM(samplePos)) << 8; //current sample + pb.adpcm.yn1 = ((s8)DSP::ReadARAM(samplePos + 1)) << 8; //next sample + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; + + samplePos = newSamplePos; + break; + + case AUDIOFORMAT_PCM16: + pb.adpcm.yn2 = (s16)(u16)((DSP::ReadARAM(samplePos * 2) << 8) | (DSP::ReadARAM((samplePos * 2 + 1)))); //current sample + pb.adpcm.yn1 = (s16)(u16)((DSP::ReadARAM((samplePos + 1) * 2) << 8) | (DSP::ReadARAM(((samplePos + 1) * 2 + 1)))); //next sample + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)oldFrac + pb.adpcm.yn2 * (u16)(0xFFFF - oldFrac) + pb.adpcm.yn2) >> 16; + + samplePos = newSamplePos; + break; + + case AUDIOFORMAT_ADPCM: + ADPCM_Step(pb.adpcm, samplePos, newSamplePos, frac); + + if (pb.src_type == SRCTYPE_NEAREST) + sample = pb.adpcm.yn2; + else // linear interpolation + sample = (pb.adpcm.yn1 * (u16)frac + pb.adpcm.yn2 * (u16)(0xFFFF - frac) + pb.adpcm.yn2) >> 16; //adpcm moves on frac + + break; + + default: + break; + } + + // =================================================================== + // Overall volume control. In addition to this there is also separate volume settings to + // different channels (left, right etc). + frac &= 0xffff; + + int vol = pb.vol_env.cur_volume >> 9; + sample = sample * vol >> 8; + + if (pb.mixer_control & MIXCONTROL_RAMPING) + { + int x = pb.vol_env.cur_volume; + x += pb.vol_env.cur_volume_delta; // I'm not sure about this, can anybody find a game + // that use this? Or how does it work? + if (x < 0) + x = 0; + if (x >= 0x7fff) + x = 0x7fff; + pb.vol_env.cur_volume = x; // maybe not per sample?? :P + } + + int leftmix = pb.mixer.left >> 5; + int rightmix = pb.mixer.right >> 5; + int left = sample * leftmix >> 8; + int right = sample * rightmix >> 8; + // adpcm has to walk from oldSamplePos to samplePos here + templbuffer[s] += left; + temprbuffer[s] += right; + + // Control the behavior when we reach the end of the sample + if (samplePos >= sampleEnd) + { + if (pb.audio_addr.looping == 1) + { + if ((samplePos & ~0x1f) == (sampleEnd & ~0x1f) || (pb.audio_addr.sample_format != AUDIOFORMAT_ADPCM)) + samplePos = loopPos; + if ((!pb.is_stream) && (pb.audio_addr.sample_format == AUDIOFORMAT_ADPCM)) + { + pb.adpcm.yn1 = pb.adpcm_loop_info.yn1; + pb.adpcm.yn2 = pb.adpcm_loop_info.yn2; + pb.adpcm.pred_scale = pb.adpcm_loop_info.pred_scale; + } + } + else + { + pb.running = 0; + samplePos = loopPos; + //samplePos = samplePos - sampleEnd + loopPos; + memset(&pb.dpop, 0, sizeof(pb.dpop)); + memset(pb.src.last_samples, 0, 8); + break; + } + } + } // end of the _iSize loop + + // Update volume + pb.mixer.left = ADPCM_Vol(pb.mixer.left, pb.mixer.left_delta); + pb.mixer.right = ADPCM_Vol(pb.mixer.right, pb.mixer.right_delta); + + pb.src.cur_addr_frac = (u16)frac; + pb.audio_addr.cur_addr_hi = samplePos >> 16; + pb.audio_addr.cur_addr_lo = (u16)samplePos; + + } // if (pb.running) +} + +#endif diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h similarity index 100% rename from Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXStructs.h rename to Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Structs.h diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 625b761b80..349dc7e03b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -27,7 +27,7 @@ #endif #include "Common.h" -#include "UCode_AXStructs.h" +#include "UCode_AX_Structs.h" #include "../../DSP.h" #ifdef AX_GC diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp new file mode 100644 index 0000000000..40ad6e1947 --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.cpp @@ -0,0 +1,383 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "StringUtil.h" + +#include "../MailHandler.h" +#include "Mixer.h" + +#include "UCodes.h" +#include "UCode_AX_Structs.h" +#include "UCode_NewAXWii.h" + +#define AX_WII +#include "UCode_AX_Voice.h" + + +CUCode_NewAXWii::CUCode_NewAXWii(DSPHLE *dsp_hle, u32 l_CRC) + : CUCode_AX(dsp_hle, l_CRC) +{ + WARN_LOG(DSPHLE, "Instantiating CUCode_NewAXWii"); +} + +CUCode_NewAXWii::~CUCode_NewAXWii() +{ +} + +void CUCode_NewAXWii::HandleCommandList() +{ + // Temp variables for addresses computation + u16 addr_hi, addr_lo; + u16 addr2_hi, addr2_lo; + u16 volume; + +// WARN_LOG(DSPHLE, "Command list:"); +// for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i) +// WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]); +// WARN_LOG(DSPHLE, "-------------"); + + u32 curr_idx = 0; + bool end = false; + while (!end) + { + u16 cmd = m_cmdlist[curr_idx++]; + + switch (cmd) + { + // Some of these commands are unknown, or unused in this AX HLE. + // We still need to skip their arguments using "curr_idx += N". + + case CMD_SETUP: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + SetupProcessing(HILO_TO_32(addr)); + break; + + case CMD_UNK_01: curr_idx += 2; break; + case CMD_UNK_02: curr_idx += 2; break; + case CMD_UNK_03: curr_idx += 2; break; + + case CMD_PROCESS: + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + ProcessPBList(HILO_TO_32(addr)); + break; + + case CMD_MIX_AUXA: + case CMD_MIX_AUXB: + case CMD_MIX_AUXC: + volume = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + MixAUXSamples(cmd - CMD_MIX_AUXA, HILO_TO_32(addr), HILO_TO_32(addr2), volume); + break; + + // These two go together and manipulate some AUX buffers. + case CMD_UNK_08: curr_idx += 13; break; + case CMD_UNK_09: curr_idx += 13; break; + + case CMD_UNK_0A: curr_idx += 4; break; + + case CMD_OUTPUT: + volume = m_cmdlist[curr_idx++]; + addr_hi = m_cmdlist[curr_idx++]; + addr_lo = m_cmdlist[curr_idx++]; + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr), volume); + break; + + case CMD_UNK_0C: curr_idx += 5; break; + + case CMD_WM_OUTPUT: + { + u32 addresses[4] = { + (u32)(m_cmdlist[curr_idx + 0] << 16) | m_cmdlist[curr_idx + 1], + (u32)(m_cmdlist[curr_idx + 2] << 16) | m_cmdlist[curr_idx + 3], + (u32)(m_cmdlist[curr_idx + 4] << 16) | m_cmdlist[curr_idx + 5], + (u32)(m_cmdlist[curr_idx + 6] << 16) | m_cmdlist[curr_idx + 7], + }; + curr_idx += 8; + OutputWMSamples(addresses); + break; + } + + case CMD_END: + end = true; + break; + } + } +} + +void CUCode_NewAXWii::SetupProcessing(u32 init_addr) +{ + // TODO: should be easily factorizable with AX + s16 init_data[60]; + + for (u32 i = 0; i < 60; ++i) + init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i); + + // List of all buffers we have to initialize + struct { + int* ptr; + u32 samples; + } buffers[] = { + { m_samples_left, 32 }, + { m_samples_right, 32 }, + { m_samples_surround, 32 }, + { m_samples_auxA_left, 32 }, + { m_samples_auxA_right, 32 }, + { m_samples_auxA_surround, 32 }, + { m_samples_auxB_left, 32 }, + { m_samples_auxB_right, 32 }, + { m_samples_auxB_surround, 32 }, + { m_samples_auxC_left, 32 }, + { m_samples_auxC_right, 32 }, + { m_samples_auxC_surround, 32 }, + + { m_samples_wm0, 6 }, + { m_samples_aux0, 6 }, + { m_samples_wm1, 6 }, + { m_samples_aux1, 6 }, + { m_samples_wm2, 6 }, + { m_samples_aux2, 6 }, + { m_samples_wm3, 6 }, + { m_samples_aux3, 6 } + }; + + u32 init_idx = 0; + for (u32 i = 0; i < sizeof (buffers) / sizeof (buffers[0]); ++i) + { + s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]); + s16 delta = (s16)init_data[init_idx + 2]; + + init_idx += 3; + + if (!init_val) + memset(buffers[i].ptr, 0, 3 * buffers[i].samples * sizeof (int)); + else + { + for (u32 j = 0; j < 3 * buffers[i].samples; ++j) + { + buffers[i].ptr[j] = init_val; + init_val += delta; + } + } + } +} + +AXMixControl CUCode_NewAXWii::ConvertMixerControl(u32 mixer_control) +{ + u32 ret = 0; + + if (mixer_control & 0x00000001) ret |= MIX_L; + if (mixer_control & 0x00000002) ret |= MIX_R; + if (mixer_control & 0x00000004) ret |= MIX_L_RAMP | MIX_R_RAMP; + if (mixer_control & 0x00000008) ret |= MIX_S; + if (mixer_control & 0x00000010) ret |= MIX_S_RAMP; + if (mixer_control & 0x00010000) ret |= MIX_AUXA_L; + if (mixer_control & 0x00020000) ret |= MIX_AUXA_R; + if (mixer_control & 0x00040000) ret |= MIX_AUXA_L_RAMP | MIX_AUXA_R_RAMP; + if (mixer_control & 0x00080000) ret |= MIX_AUXA_S; + if (mixer_control & 0x00100000) ret |= MIX_AUXA_S_RAMP; + if (mixer_control & 0x00200000) ret |= MIX_AUXB_L; + if (mixer_control & 0x00400000) ret |= MIX_AUXB_R; + if (mixer_control & 0x00800000) ret |= MIX_AUXB_L_RAMP | MIX_AUXB_R_RAMP; + if (mixer_control & 0x01000000) ret |= MIX_AUXB_S; + if (mixer_control & 0x02000000) ret |= MIX_AUXB_S_RAMP; + if (mixer_control & 0x04000000) ret |= MIX_AUXC_L; + if (mixer_control & 0x08000000) ret |= MIX_AUXC_R; + if (mixer_control & 0x10000000) ret |= MIX_AUXC_L_RAMP | MIX_AUXC_R_RAMP; + if (mixer_control & 0x20000000) ret |= MIX_AUXC_S; + if (mixer_control & 0x40000000) ret |= MIX_AUXC_S_RAMP; + + return (AXMixControl)ret; +} + +void CUCode_NewAXWii::ProcessPBList(u32 pb_addr) +{ + const u32 spms = 32; + + AXPBWii pb; + + while (pb_addr) + { + AXBuffers buffers = {{ + m_samples_left, + m_samples_right, + m_samples_surround, + m_samples_auxA_left, + m_samples_auxA_right, + m_samples_auxA_surround, + m_samples_auxB_left, + m_samples_auxB_right, + m_samples_auxB_surround, + m_samples_auxC_left, + m_samples_auxC_right, + m_samples_auxC_surround + }}; + + if (!ReadPB(pb_addr, pb)) + break; + + for (int curr_ms = 0; curr_ms < 3; ++curr_ms) + { + Process1ms(pb, buffers, ConvertMixerControl(HILO_TO_32(pb.mixer_control))); + + // Forward the buffers + for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i) + buffers.ptrs[i] += spms; + } + + WritePB(pb_addr, pb); + pb_addr = HILO_TO_32(pb.next_pb); + } +} + +void CUCode_NewAXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume) +{ + int* buffers[3] = { 0 }; + int* main_buffers[3] = { + m_samples_left, + m_samples_right, + m_samples_surround + }; + + switch (aux_id) + { + case 0: + buffers[0] = m_samples_auxA_left; + buffers[1] = m_samples_auxA_right; + buffers[2] = m_samples_auxA_surround; + break; + + case 1: + buffers[0] = m_samples_auxB_left; + buffers[1] = m_samples_auxB_right; + buffers[2] = m_samples_auxB_surround; + break; + + case 2: + buffers[0] = m_samples_auxC_left; + buffers[1] = m_samples_auxC_right; + buffers[2] = m_samples_auxC_surround; + break; + } + + // Send the content of AUX buffers to the CPU + if (write_addr) + { + int* ptr = (int*)HLEMemory_Get_Pointer(write_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) + *ptr++ = Common::swap32(buffers[i][j]); + } + + // Then read the buffers from the CPU and add to our main buffers. + int* ptr = (int*)HLEMemory_Get_Pointer(read_addr); + for (u32 i = 0; i < 3; ++i) + for (u32 j = 0; j < 3 * 32; ++j) + { + s64 new_val = main_buffers[i][j] + Common::swap32(*ptr++); + main_buffers[i][j] = (new_val * volume) >> 15; + } +} + +void CUCode_NewAXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume) +{ + int surround_buffer[3 * 32] = { 0 }; + + for (u32 i = 0; i < 3 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + + short buffer[3 * 32 * 2]; + + // Clamp internal buffers to 16 bits. + for (u32 i = 0; i < 3 * 32; ++i) + { + int left = m_samples_left[i]; + int right = m_samples_right[i]; + + // Apply global volume. Cast to s64 to avoid overflow. + left = ((s64)left * volume) >> 15; + right = ((s64)right * volume) >> 15; + + if (left < -32767) left = -32767; + if (left > 32767) left = 32767; + if (right < -32767) right = -32767; + if (right > 32767) right = 32767; + + m_samples_left[i] = left; + m_samples_right[i] = right; + } + + for (u32 i = 0; i < 3 * 32; ++i) + { + buffer[2 * i] = Common::swap16(m_samples_left[i]); + buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); + } + + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); +} + +void CUCode_NewAXWii::OutputWMSamples(u32* addresses) +{ + int* buffers[] = { + m_samples_wm0, + m_samples_wm1, + m_samples_wm2, + m_samples_wm3 + }; + + for (u32 i = 0; i < 4; ++i) + { + int* in = buffers[i]; + u16* out = (u16*)HLEMemory_Get_Pointer(addresses[i]); + for (u32 j = 0; j < 3 * 6; ++j) + { + int sample = in[j]; + if (sample < -32767) sample = -32767; + if (sample > 32767) sample = 32767; + out[j] = Common::swap16((u16)sample); + } + } +} + +void CUCode_NewAXWii::DoState(PointerWrap &p) +{ + std::lock_guard lk(m_processing); + + DoStateShared(p); + DoAXState(p); + + p.Do(m_samples_auxC_left); + p.Do(m_samples_auxC_right); + p.Do(m_samples_auxC_surround); + + p.Do(m_samples_wm0); + p.Do(m_samples_wm1); + p.Do(m_samples_wm2); + p.Do(m_samples_wm3); + + p.Do(m_samples_aux0); + p.Do(m_samples_aux1); + p.Do(m_samples_aux2); + p.Do(m_samples_aux3); +} diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h new file mode 100644 index 0000000000..4c9bc5757c --- /dev/null +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_NewAXWii.h @@ -0,0 +1,80 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official Git repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _UCODE_NEWAXWII_H +#define _UCODE_NEWAXWII_H + +#include "UCode_AX.h" + +class CUCode_NewAXWii : public CUCode_AX +{ +public: + CUCode_NewAXWii(DSPHLE *dsp_hle, u32 _CRC); + virtual ~CUCode_NewAXWii(); + + virtual void DoState(PointerWrap &p); + +protected: + int m_samples_auxC_left[32 * 3]; + int m_samples_auxC_right[32 * 3]; + int m_samples_auxC_surround[32 * 3]; + + // Wiimote buffers + int m_samples_wm0[6 * 3]; + int m_samples_aux0[6 * 3]; + int m_samples_wm1[6 * 3]; + int m_samples_aux1[6 * 3]; + int m_samples_wm2[6 * 3]; + int m_samples_aux2[6 * 3]; + int m_samples_wm3[6 * 3]; + int m_samples_aux3[6 * 3]; + + // Convert a mixer_control bitfield to our internal representation for that + // value. Required because that bitfield has a different meaning in some + // versions of AX. + AXMixControl ConvertMixerControl(u32 mixer_control); + + virtual void HandleCommandList(); + + void SetupProcessing(u32 init_addr); + void ProcessPBList(u32 pb_addr); + void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume); + void OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume); + void OutputWMSamples(u32* addresses); // 4 addresses + +private: + enum CmdType + { + CMD_SETUP = 0x00, + CMD_UNK_01 = 0x01, + CMD_UNK_02 = 0x02, + CMD_UNK_03 = 0x03, + CMD_PROCESS = 0x04, + CMD_MIX_AUXA = 0x05, + CMD_MIX_AUXB = 0x06, + CMD_MIX_AUXC = 0x07, + CMD_UNK_08 = 0x08, + CMD_UNK_09 = 0x09, + CMD_UNK_0A = 0x0A, + CMD_OUTPUT = 0x0B, + CMD_UNK_0C = 0x0C, + CMD_WM_OUTPUT = 0x0D, + CMD_END = 0x0E + }; +}; + +#endif // _UCODE_AXWII diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp index c04bf41403..86773ad020 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp @@ -19,6 +19,7 @@ #include "UCode_AX.h" #include "UCode_AXWii.h" +#include "UCode_NewAXWii.h" #include "UCode_Zelda.h" #include "UCode_ROM.h" #include "UCode_CARD.h" @@ -26,6 +27,12 @@ #include "UCode_GBA.h" #include "Hash.h" +#if 0 +# define AXWII CUCode_NewAXWii +#else +# define AXWII CUCode_AXWii +#endif + IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) { switch (_CRC) @@ -90,13 +97,13 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii) case 0x4cc52064: // Bleach: Versus Crusade case 0xd9c4bf34: // WiiMenu INFO_LOG(DSPHLE, "CRC %08x: Wii - AXWii chosen", _CRC); - return new CUCode_AXWii(dsp_hle, _CRC); + return new AXWII(dsp_hle, _CRC); default: if (bWii) { PanicAlert("DSPHLE: Unknown ucode (CRC = %08x) - forcing AXWii.\n\nTry LLE emulator if this is homebrew.", _CRC); - return new CUCode_AXWii(dsp_hle, _CRC); + return new AXWII(dsp_hle, _CRC); } else { From b3ed3bdb910fe77dc3b1e05478258f693b5d943d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 25 Dec 2012 13:51:13 +0100 Subject: [PATCH 260/627] Define NvOptimusEnablement to tell the Nvidia driver we need high performance --- Source/Core/DolphinWX/Src/Main.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index a5b19eca4c..fc3e2c41a7 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -45,6 +45,15 @@ #include +// Nvidia drivers >= v302 will check if the application exports a global +// variable named NvOptimusEnablement to know if it should run the app in high +// performance graphics mode or using the IGP. +#ifdef WIN32 +extern "C" { + __declspec(dllexport) DWORD NvOptimusEnablement = 1; +} +#endif + // ------------ // Main window From 01953ff64a1f6b8d4a6236d45400f5b208c4b079 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 25 Dec 2012 19:08:24 -0600 Subject: [PATCH 261/627] Rename the interface files and hopefully fix OSX building. --- CMakeLists.txt | 4 ++++ Source/Core/Common/Src/Common.h | 5 ----- Source/Core/DolphinWX/CMakeLists.txt | 18 ++++++++++++------ .../Src/{GLVideoInterface.h => GLInterface.h} | 14 +++++++------- .../{VideoInterface => GLInterface}/AGL.cpp | 2 +- .../Src/{VideoInterface => GLInterface}/AGL.h | 0 .../{VideoInterface => GLInterface}/EGL.cpp | 3 +-- .../Src/{VideoInterface => GLInterface}/EGL.h | 0 .../{VideoInterface => GLInterface}/GLX.cpp | 2 +- .../Src/{VideoInterface => GLInterface}/GLX.h | 0 .../InterfaceBase.h | 0 .../{VideoInterface => GLInterface}/WGL.cpp | 2 +- .../Src/{VideoInterface => GLInterface}/WGL.h | 0 .../Src/{VideoInterface => GLInterface}/WX.cpp | 2 +- .../Src/{VideoInterface => GLInterface}/WX.h | 0 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 2 +- 16 files changed, 29 insertions(+), 25 deletions(-) rename Source/Core/DolphinWX/Src/{GLVideoInterface.h => GLInterface.h} (89%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/AGL.cpp (99%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/AGL.h (100%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/EGL.cpp (99%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/EGL.h (100%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/GLX.cpp (99%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/GLX.h (100%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/InterfaceBase.h (100%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/WGL.cpp (99%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/WGL.h (100%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/WX.cpp (98%) rename Source/Core/DolphinWX/Src/{VideoInterface => GLInterface}/WX.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48788e835b..82f2b55d87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,6 +178,10 @@ if(APPLE) # page on x86_64 is 4GB in size. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000") + if(NOT DISABLE_WX) + add_definitions(-DUSE_WX -DHAVE_WX) + set(USE_WX TRUE) + endif() find_library(APPKIT_LIBRARY AppKit) find_library(APPSERV_LIBRARY ApplicationServices) find_library(ATB_LIBRARY AudioToolbox) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 960bf75559..884a1e6c16 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -60,11 +60,6 @@ private: #undef STACKALIGN #define STACKALIGN __attribute__((__force_align_arg_pointer__)) #endif -// We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support. -#ifdef __WXOSX_COCOA__ -#define HAVE_WX 1 -#define USE_WX 1 // Use wxGLCanvas -#endif #elif defined _WIN32 diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index fcc531029c..f54ff9f4e3 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -85,20 +85,26 @@ endif() if(USE_EGL) set(SRCS ${SRCS} - Src/VideoInterface/EGL.cpp + Src/GLInterface/EGL.cpp ) else() if(WIN32) set(SRCS ${SRCS} - Src/VideoInterface/GLW.cpp + Src/GLInterface/GLW.cpp ) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(SRCS ${SRCS} - Src/VideoInterface/AGL.cpp - ) + if(USE_WX) + set(SRCS ${SRCS} + Src/GLInterface/WX.cpp + ) + else() + set(SRCS ${SRCS} + Src/GLInterface/AGL.cpp + ) + endif() else() set(SRCS ${SRCS} - Src/VideoInterface/GLX.cpp + Src/GLInterface/GLX.cpp ) endif() endif() diff --git a/Source/Core/DolphinWX/Src/GLVideoInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h similarity index 89% rename from Source/Core/DolphinWX/Src/GLVideoInterface.h rename to Source/Core/DolphinWX/Src/GLInterface.h index d688335259..a7c069df4e 100644 --- a/Source/Core/DolphinWX/Src/GLVideoInterface.h +++ b/Source/Core/DolphinWX/Src/GLInterface.h @@ -14,21 +14,21 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _VIDEOINTERFACE_H_ -#define _VIDEOINTERFACE_H_ +#ifndef _GLINTERFACE_H_ +#define _GLINTERFACE_H_ #include "Thread.h" #if defined(USE_EGL) && USE_EGL -#include "VideoInterface/EGL.h" +#include "GLInterface/EGL.h" #elif defined(USE_WX) && USE_WX -#include "VideoInterface/WX.h" +#include "GLInterface/WX.h" #elif defined(__APPLE__) -#include "VideoInterface/AGL.h" +#include "GLInterface/AGL.h" #elif defined(_WIN32) -#include "VideoInterface/WGL.h" +#include "GLInterface/WGL.h" #elif defined(HAVE_X11) && HAVE_X11 -#include "VideoInterface/GLX.h" +#include "GLInterface/GLX.h" #endif typedef struct { diff --git a/Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp similarity index 99% rename from Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp rename to Source/Core/DolphinWX/Src/GLInterface/AGL.cpp index 465f77c972..65b4b269d6 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/AGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp @@ -20,7 +20,7 @@ #include "RenderBase.h" #include "VertexShaderManager.h" -#include "../GLVideoInterface.h" +#include "../GLInterface.h" #include "AGL.h" void cInterfaceAGL::SwapBuffers() diff --git a/Source/Core/DolphinWX/Src/VideoInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/AGL.h rename to Source/Core/DolphinWX/Src/GLInterface/AGL.h diff --git a/Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp similarity index 99% rename from Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp rename to Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index bcf7acaff5..00d16ba504 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -20,7 +20,7 @@ #include "RenderBase.h" #include "VertexShaderManager.h" -#include "../GLVideoInterface.h" +#include "../GLInterface.h" #include "EGL.h" void cInterfaceEGL::CreateXWindow(void) @@ -294,7 +294,6 @@ bool cInterfaceEGL::CreateWindow(void *&window_handle) if (GLWin.parent == 0) GLWin.parent = RootWindow(GLWin.x_dpy, GLWin.screen); - unsigned long mask; XVisualInfo visTemplate; int num_visuals; EGLConfig config; diff --git a/Source/Core/DolphinWX/Src/VideoInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/EGL.h rename to Source/Core/DolphinWX/Src/GLInterface/EGL.h diff --git a/Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp similarity index 99% rename from Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp rename to Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index 63458f7a4d..cbe749845e 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -20,7 +20,7 @@ #include "RenderBase.h" #include "VertexShaderManager.h" -#include "../GLVideoInterface.h" +#include "../GLInterface.h" #include "GLX.h" void cInterfaceGLX::CreateXWindow(void) diff --git a/Source/Core/DolphinWX/Src/VideoInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/GLX.h rename to Source/Core/DolphinWX/Src/GLInterface/GLX.h diff --git a/Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/InterfaceBase.h rename to Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp similarity index 99% rename from Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp rename to Source/Core/DolphinWX/Src/GLInterface/WGL.cpp index 9abcd52fc6..99f861e019 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/WGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -20,7 +20,7 @@ #include "RenderBase.h" #include "VertexShaderManager.h" -#include "../GLVideoInterface.h" +#include "../GLInterface.h" #include "WGL.h" #include "EmuWindow.h" diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/WGL.h rename to Source/Core/DolphinWX/Src/GLInterface/WGL.h diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp similarity index 98% rename from Source/Core/DolphinWX/Src/VideoInterface/WX.cpp rename to Source/Core/DolphinWX/Src/GLInterface/WX.cpp index 7126ccb8ba..bf6b2abf33 100644 --- a/Source/Core/DolphinWX/Src/VideoInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -20,7 +20,7 @@ #include "RenderBase.h" #include "VertexShaderManager.h" -#include "../GLVideoInterface.h" +#include "../GLInterface.h" #include "WX.h" void cInterfaceWX::SwapBuffers() diff --git a/Source/Core/DolphinWX/Src/VideoInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h similarity index 100% rename from Source/Core/DolphinWX/Src/VideoInterface/WX.h rename to Source/Core/DolphinWX/Src/GLInterface/WX.h diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 2c131fb937..09d38bb731 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -20,7 +20,7 @@ #include "VideoConfig.h" #include "MathUtil.h" -#include "GLVideoInterface.h" +#include "GLInterface.h" #ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils #define GL_DEPTH_STENCIL_EXT 0x84F9 From c884dbf65457c665229e84adebf223b34aeee3c2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 25 Dec 2012 19:18:03 -0600 Subject: [PATCH 262/627] Mistype in WX.cpp --- Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp index bf6b2abf33..460d9357cb 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -35,7 +35,7 @@ void cInterfaceWX::UpdateFPSDisplay(const char *text) // Create rendering window. // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool cInterfaceWX::CreateCreate(void *&window_handle) +bool cInterfaceWX::CreateWindow(void *&window_handle) { int _tx, _ty, _twidth, _theight; Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); From 0de073edead76770aaa3b05638d3ebaa5d5f64f8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 25 Dec 2012 21:12:51 -0600 Subject: [PATCH 263/627] When using the "Keep window on top option" make sure that the effect of that option ends when emulation ends when using render to main. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index fa326adecc..7b595c485e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1142,6 +1142,9 @@ void CFrame::DoStop() DoFullscreen(false); if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) m_RenderFrame->Destroy(); + else + // Make sure the window is not longer set to stay on top + m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP); m_RenderParent = NULL; // Clean framerate indications from the status bar. From e9099459bb6d2e66eefb6686c2fee2a03bf19fd5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 25 Dec 2012 22:52:30 -0600 Subject: [PATCH 264/627] Maybe fix Windows compiling. --- Source/Core/DolphinWX/Dolphin.vcxproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index d945e395f9..2c64ca4ee2 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -265,7 +265,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - + Create Create @@ -327,6 +327,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / + + + From f4e7a280a9cc968f9a20ef2f027ed3b3753d6940 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:07:43 -0600 Subject: [PATCH 265/627] Remove cg.lib from some files for Windows and renaming a function. --- Source/Core/DolphinWX/Src/GLInterface/AGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.h | 2 +- .../Core/DolphinWX/Src/GLInterface/InterfaceBase.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.h | 2 +- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 14 +++++++------- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 2 +- Source/VSProps/Dolphin.Win32.props | 4 ++-- Source/VSProps/Dolphin.x64.props | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h index 1e73f3c6b8..e6e4f9be27 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h @@ -29,7 +29,7 @@ class cInterfaceAGL : public cInterfaceBase public: void SwapBuffers(); void UpdateFPSDisplay(const char *Text); - bool CreateWindow(void *&window_handle); + bool Create(void *&window_handle); bool MakeCurrent(); void Shutdown(); }; diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index 00d16ba504..155f59b093 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -225,7 +225,7 @@ void cInterfaceEGL::SwapBuffers() // Create rendering window. // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool cInterfaceEGL::CreateWindow(void *&window_handle) +bool cInterfaceEGL::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index afb57b2ac2..e3b4ec40e8 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -35,7 +35,7 @@ private: public: void SwapBuffers(); void UpdateFPSDisplay(const char *Text); - bool CreateWindow(void *&window_handle); + bool Create(void *&window_handle); bool MakeCurrent(); void Shutdown(); }; diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index cbe749845e..235e393040 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -225,7 +225,7 @@ void cInterfaceGLX::SwapBuffers() // Create rendering window. // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool cInterfaceGLX::CreateWindow(void *&window_handle) +bool cInterfaceGLX::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h index bea58cb862..9b6a3cb87d 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h @@ -33,7 +33,7 @@ private: public: void SwapBuffers(); void UpdateFPSDisplay(const char *Text); - bool CreateWindow(void *&window_handle); + bool Create(void *&window_handle); bool MakeCurrent(); void Shutdown(); }; diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h index 0c1c438cd0..dfe534c41a 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -25,7 +25,7 @@ protected: public: virtual void SwapBuffers() = 0; virtual void UpdateFPSDisplay(const char *Text) = 0; - virtual bool CreateWindow(void *&window_handle) = 0; + virtual bool Create(void *&window_handle) = 0; virtual bool MakeCurrent() = 0; virtual void Shutdown() = 0; diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp index 99f861e019..70f86a3ddf 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -57,7 +57,7 @@ void cInterfaceWGL::UpdateFPSDisplay(const char *text) // Create rendering window. // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool cInterfaceWGL::CreateWindow(void *&window_handle) +bool cInterfaceWGL::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h index 4ef6943623..e45d538a78 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h @@ -30,7 +30,7 @@ class cInterfaceWGL : public cInterfaceBase public: void SwapBuffers(); void UpdateFPSDisplay(const char *Text); - bool CreateWindow(void *&window_handle); + bool Create(void *&window_handle); bool MakeCurrent(); void Shutdown(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp index 460d9357cb..36e3e60fa5 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -35,7 +35,7 @@ void cInterfaceWX::UpdateFPSDisplay(const char *text) // Create rendering window. // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool cInterfaceWX::CreateWindow(void *&window_handle) +bool cInterfaceWX::Create(void *&window_handle) { int _tx, _ty, _twidth, _theight; Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h index d15044e503..8f4af1c8d6 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h @@ -37,7 +37,7 @@ class cInterfaceWX : public cInterfaceBase public: void SwapBuffers(); void UpdateFPSDisplay(const char *Text); - bool CreateWindow(void *&window_handle); + bool Create(void *&window_handle); bool MakeCurrent(); void Shutdown(); diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 18b8ac4d84..aa7f697772 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -121,7 +121,7 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -133,7 +133,7 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -147,7 +147,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -161,7 +161,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -175,7 +175,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -189,7 +189,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -247,4 +247,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index f52ec917e2..e57e3e210a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -166,7 +166,7 @@ bool VideoBackend::Initialize(void *&window_handle) UpdateActiveConfig(); InitInterface(); - if (!GLInterface->CreateWindow(window_handle)) + if (!GLInterface->Create(window_handle)) return false; s_BackendInitialized = true; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 1c18b1c165..11f7f39b5c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -73,7 +73,7 @@ bool VideoSoftware::Initialize(void *&window_handle) g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); InitInterface(); - if (!GLInterface->CreateWindow(window_handle)) + if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); return false; diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 5adc4159e0..1cddeea4e5 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -8,8 +8,8 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) - \ No newline at end of file + diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props index 557e6350e7..c6f3410026 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -9,8 +9,8 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) - \ No newline at end of file + From a35c5a7f226be9dcc992beab914618d529b55232 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:20:09 -0600 Subject: [PATCH 266/627] Add a include directory --- Source/Core/DolphinWX/Dolphin.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 2c64ca4ee2..c375208256 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,7 +130,7 @@ - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) From fa9abfdc4208d36f34392aa4385aacf9d6c483bb Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:22:17 -0600 Subject: [PATCH 267/627] Add a include directory --- Source/Core/DolphinWX/Dolphin.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index c375208256..08d6dff3e2 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,7 +130,7 @@ - ..\..\..\Externals\GLew;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) From c43a0dac2ea570aa7bc6628493767ffb6cb63e06 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:25:49 -0600 Subject: [PATCH 268/627] Add to more than 32bit debug --- Source/Core/DolphinWX/Dolphin.vcxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 08d6dff3e2..789e6c21fe 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -144,7 +144,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -188,7 +188,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -204,7 +204,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) From 9a58f9a3bb5f7111277832fa2d951559a1c6a9c6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:34:09 -0600 Subject: [PATCH 269/627] Rename another function... --- Source/Core/DolphinWX/Src/GLInterface/AGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/AGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/EGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/GLX.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WGL.h | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface/WX.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp index 65b4b269d6..30ff4a31cf 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp @@ -23,7 +23,7 @@ #include "../GLInterface.h" #include "AGL.h" -void cInterfaceAGL::SwapBuffers() +void cInterfaceAGL::Swap() { [GLWin.cocoaCtx flushBuffer]; } diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h index e6e4f9be27..e03256ab4e 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h @@ -27,7 +27,7 @@ class cInterfaceAGL : public cInterfaceBase { public: - void SwapBuffers(); + void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); bool MakeCurrent(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index 155f59b093..49a77636f8 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -218,7 +218,7 @@ void cInterfaceEGL::UpdateFPSDisplay(const char *text) { XStoreName(GLWin.x_dpy, GLWin.win, text); } -void cInterfaceEGL::SwapBuffers() +void cInterfaceEGL::Swap() { eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf); } diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index e3b4ec40e8..0e0adcd6d7 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -33,7 +33,7 @@ private: void DestroyXWindow(); void XEventThread(); public: - void SwapBuffers(); + void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); bool MakeCurrent(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index 235e393040..cb6d814db3 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -218,7 +218,7 @@ void cInterfaceGLX::UpdateFPSDisplay(const char *text) { XStoreName(GLWin.dpy, GLWin.win, text); } -void cInterfaceGLX::SwapBuffers() +void cInterfaceGLX::Swap() { glXSwapBuffers(GLWin.dpy, GLWin.win); } diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h index 9b6a3cb87d..5a37695f4e 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h @@ -31,7 +31,7 @@ private: void DestroyXWindow(); void XEventThread(); public: - void SwapBuffers(); + void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); bool MakeCurrent(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h index dfe534c41a..40b17e8083 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -23,7 +23,7 @@ protected: u32 s_backbuffer_width; u32 s_backbuffer_height; public: - virtual void SwapBuffers() = 0; + virtual void Swap() = 0; virtual void UpdateFPSDisplay(const char *Text) = 0; virtual bool Create(void *&window_handle) = 0; virtual bool MakeCurrent() = 0; diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp index 70f86a3ddf..c97cb48bdf 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -27,7 +27,7 @@ static HDC hDC = NULL; // Private GDI Device Context static HGLRC hRC = NULL; // Permanent Rendering Context -void cInterfaceWGL::SwapBuffers() +void cInterfaceWGL::Swap() { SwapBuffers(hDC); } diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h index e45d538a78..184ddd475f 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h @@ -28,7 +28,7 @@ class cInterfaceWGL : public cInterfaceBase { public: - void SwapBuffers(); + void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); bool MakeCurrent(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp index 36e3e60fa5..0db1f8d632 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -23,7 +23,7 @@ #include "../GLInterface.h" #include "WX.h" -void cInterfaceWX::SwapBuffers() +void cInterfaceWX::Swap() { GLWin.glCanvas->SwapBuffers(); } diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h index 8f4af1c8d6..7772f864e5 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h @@ -35,7 +35,7 @@ class cInterfaceWX : public cInterfaceBase { public: - void SwapBuffers(); + void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); bool MakeCurrent(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 2c43100b4c..57347ad4ec 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1354,7 +1354,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons GL_REPORT_ERRORD(); // Copy the rendered frame to the real window - GLInterface->SwapBuffers(); + GLInterface->Swap(); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index c85a1029c9..fceb19e0a9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -192,7 +192,7 @@ void SWRenderer::SwapBuffer() glFlush(); - GLInterface->SwapBuffers(); + GLInterface->Swap(); swstats.ResetFrame(); From e2489196e4e93eacbe17af3c1d6eb53d9aabee59 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 00:41:25 -0600 Subject: [PATCH 270/627] Got overzealous. We aren't removing CG quite yet with this branch. --- .../Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 12 ++++++------ Source/VSProps/Dolphin.Win32.props | 2 +- Source/VSProps/Dolphin.x64.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index aa7f697772..d74bc2edb5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -121,7 +121,7 @@ true - opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -133,7 +133,7 @@ true - opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -147,7 +147,7 @@ true true true - opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -161,7 +161,7 @@ true true true - opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -175,7 +175,7 @@ true true true - opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -189,7 +189,7 @@ true true true - opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 1cddeea4e5..5850450a5a 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -8,7 +8,7 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props index c6f3410026..754b4af53e 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -9,7 +9,7 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) From fbdf9ba153d6f409bd27ea1c160f9814a0e05393 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 5 Oct 2011 00:22:51 +1100 Subject: [PATCH 271/627] Added preliminary support for ES_LAUNCH (Wii Multi-boot games) by using HLE to hijack the OSBootDol function. Metroid Prime Trilogy is working. Wii Sports+Wii Sports Resort is not working. Any games which can be played using the dol replacement trick should work here. Suspect that the DOL's are meant to receive an argument list which has not been catered for in this code. This probably also means that the Metroid Prime Trilogy games are locked in Veteran difficulty for the time-being. --- Data/Sys/totaldb.dsy | Bin 722980 -> 723252 bytes Source/Core/Core/Src/Boot/Boot.cpp | 13 ++++++++ Source/Core/Core/Src/HLE/HLE.cpp | 4 ++- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 44 ++++++++++++++++++++++++++ Source/Core/Core/Src/HLE/HLE_Misc.h | 1 + 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/Data/Sys/totaldb.dsy b/Data/Sys/totaldb.dsy index 790a942eaefc071dfcad998bcc985dc239e2582f..a1c9683c9f57ca74ba2693c818d474dcb4761b2e 100644 GIT binary patch delta 93 zcmZ27L1)V(9mZpgjIE47#MH{j+{(z(%E;Qv$kxip-pa_)%E;Nu$hDP`TbV=Xjp3Gq hUlGetFileSize(dol.substr(1).c_str()); + u8* dolFile = new u8[fileSize]; + if (dolFile) + { + pFileSystem->ReadFile(dol.substr(1).c_str(), dolFile, fileSize); + CDolLoader dolLoader(dolFile, fileSize); + dolLoader.Load(); + PowerPC::ppcState.iCache.Reset(); + + static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + for (unsigned int i = 0; i < 4; i++) + { + if (s_Usb->m_WiiMotes[i].IsConnected()) + { + s_Usb->m_WiiMotes[i].Activate(false); + s_Usb->m_WiiMotes[i].Activate(true); + } + else + { + s_Usb->m_WiiMotes[i].Activate(false); + } + } + + NPC = dolLoader.GetEntryPoint() | 0x80000000; + } +} + } diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index 6c932258a7..f831e5b600 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -39,6 +39,7 @@ namespace HLE_Misc void FZ_sqrt_internal(); void FZ_rsqrt_internal(); void HBReload(); + void OSBootDol(); } #endif From 651cedaac4526996bd5cc186736e66a0895798a3 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 10 Oct 2011 20:32:24 +1100 Subject: [PATCH 272/627] Added argument detection and passing to the loaded dol. This fixes the Wii Sports+Wii Sports Resort bundle pack. --- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index bc625c9d2d..f9bab42f3c 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -292,10 +292,14 @@ void HBReload() void OSBootDol() { std::string dol; + std::string args; u32 r28 = GPR(28); Memory::GetString(dol, r28); + u32 argsPtr = Memory::Read_U32(GPR(5)); + Memory::GetString(args, argsPtr); + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); @@ -322,6 +326,22 @@ void OSBootDol() } } + if (argsPtr) + { + u32 args_base = Memory::Read_U32(0x800000f4); + u32 ptr_to_num_args = 0xc; + u32 num_args = 1; + u32 hi_ptr = args_base + ptr_to_num_args + 4; + u32 new_args_ptr = args_base + ptr_to_num_args + 8; + + Memory::Write_U32(ptr_to_num_args, args_base + 8); + Memory::Write_U32(num_args, args_base + ptr_to_num_args); + Memory::Write_U32(0x14, hi_ptr); + + for (int i = 0; i < args.length(); i++) + Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); + } + NPC = dolLoader.GetEntryPoint() | 0x80000000; } } From 88e273fac13b6c3b95256fc083867c2b6553c9d6 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 1 Nov 2011 23:00:12 +1100 Subject: [PATCH 273/627] Added an IOS check as games which use IOS older than IOS30 do not need to be HLE'd. Added some stubs for Reset to Menu and SSBB's load from disc partition. Fixed loading Fate of Atlantis from the Indiana Jones and the Staff of Kings game. --- Source/Core/Core/Src/Boot/Boot.cpp | 1 - Source/Core/Core/Src/HLE/HLE.cpp | 29 +++++++-- Source/Core/Core/Src/HLE/HLE.h | 1 + Source/Core/Core/Src/HLE/HLE_Misc.cpp | 92 +++++++++++++++++++++++---- 4 files changed, 103 insertions(+), 20 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 228d10b8a8..7711990e65 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -267,7 +267,6 @@ bool CBoot::BootUp() db.Apply(&g_symbolDB); } HLE::PatchFunctions(); - g_symbolDB.Clear(); } /* Try to load the symbol map if there is one, and then scan it for diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 671a9e0a3a..0c42f7f4df 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -28,6 +28,7 @@ #include "HLE_OS.h" #include "HLE_Misc.h" #include "IPC_HLE/WII_IPC_HLE_Device_es.h" +#include "ConfigManager.h" namespace HLE { @@ -137,13 +138,16 @@ void PatchFunctions() } } - for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++) + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) { - Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); - if (symbol > 0) + for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++) { - PowerPC::breakpoints.Add(symbol->address, false); - INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address); + Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); + if (symbol > 0) + { + PowerPC::breakpoints.Add(symbol->address, false); + INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address); + } } } @@ -171,4 +175,19 @@ u32 GetOrigInstruction(u32 addr) return (iter != orig_instruction.end()) ? iter->second : 0; } +u32 UnPatch(std::string patchName) +{ + Symbol *symbol = g_symbolDB.GetSymbolFromName(patchName.c_str()); + if (symbol > 0) + { + for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) + { + Memory::WriteUnchecked_U32(orig_instruction[addr], addr); + PowerPC::ppcState.iCache.Invalidate(addr); + } + return symbol->address; + } + return 0; +} + } // end of namespace HLE diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h index 04c3d35198..b81f347b9f 100644 --- a/Source/Core/Core/Src/HLE/HLE.h +++ b/Source/Core/Core/Src/HLE/HLE.h @@ -24,6 +24,7 @@ namespace HLE { void PatchFunctions(); void Patch(u32 pc, const char *func_name); + u32 UnPatch(std::string patchName); void Execute(u32 _CurrentPC, u32 _Instruction); u32 GetOrigInstruction(u32 em_address); diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index f9bab42f3c..67b2e84963 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -28,10 +28,17 @@ #include "Filesystem.h" #include "../Boot/Boot_DOL.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "HLE.h" namespace HLE_Misc { +std::string dol; +std::string args; +u32 argsPtr; +u32 bootType; +u16 IOSv; + // Helper to quickly read the floating point value at a memory location. inline float F(u32 addr) { @@ -288,26 +295,19 @@ void HBReload() Host_Message(WM_USER_STOP); } - -void OSBootDol() +void BootDOLFromDisc() { - std::string dol; - std::string args; - - u32 r28 = GPR(28); - Memory::GetString(dol, r28); - - u32 argsPtr = Memory::Read_U32(GPR(5)); - Memory::GetString(args, argsPtr); - DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); - size_t fileSize = (size_t) pFileSystem->GetFileSize(dol.substr(1).c_str()); + if (dol.substr(1, 1).compare("//")) + dol = dol.substr(1); + + u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str()); u8* dolFile = new u8[fileSize]; - if (dolFile) + if (fileSize > 0) { - pFileSystem->ReadFile(dol.substr(1).c_str(), dolFile, fileSize); + pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize); CDolLoader dolLoader(dolFile, fileSize); dolLoader.Load(); PowerPC::ppcState.iCache.Reset(); @@ -346,4 +346,68 @@ void OSBootDol() } } +u32 GetDolFileSize() +{ + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); + DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); + + std::string dolFile; + + if (dol.substr(1, 1).compare("//")) + dolFile = dol.substr(1); + + return (u32)pFileSystem->GetFileSize(dolFile.c_str()); +} + +void OSBootDol() +{ + IOSv = Memory::Read_U16(0x00003140); + + if (IOSv >= 30) + { + bootType = GPR(4); + + if ((GPR(4) >> 28) == 0x8) + { + // Reset from menu + PanicAlert("Reset from menu"); + } + else if ((GPR(4) >> 28) == 0xA) + { + // Boot from disc partition + PanicAlert("Boot Partition: %08x", GPR(26)); + } + else if ((GPR(4) >> 28) == 0xC) + { + // Boot DOL from disc + u32 ptr = GPR(28); + Memory::GetString(dol, ptr); + + if (GetDolFileSize() == 0) + { + ptr = GPR(30); + Memory::GetString(dol, ptr); + if (GetDolFileSize() == 0) + { + // Cannot locate the dol file, exit. + HLE::UnPatch("__OSBootDol"); + NPC = PC; + return; + } + } + + argsPtr = Memory::Read_U32(GPR(5)); + Memory::GetString(args, argsPtr); + BootDOLFromDisc(); + return; + } + else + { + PanicAlert("Unknown boot type: %08x", GPR(4)); + } + } + HLE::UnPatch("__OSBootDol"); + NPC = PC; +} + } From 0c845728ccfc5f3a93c69aa09a924a0413e8d151 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 May 2012 18:38:00 +1000 Subject: [PATCH 274/627] Added support for Reset (from menu). Fixes Sam & Max. --- Source/Core/Core/Src/Boot/Boot.cpp | 6 +- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 122 ++++++++++++------ Source/Core/Core/Src/HLE/HLE_Misc.h | 1 + .../Core/Core/Src/HW/ProcessorInterface.cpp | 1 + Source/Core/DiscIO/Src/FileSystemGCWii.cpp | 17 ++- Source/Core/DiscIO/Src/FileSystemGCWii.h | 2 + Source/Core/DiscIO/Src/Filesystem.h | 2 + 7 files changed, 108 insertions(+), 43 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 7711990e65..ef3ae2a4fb 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -260,13 +260,15 @@ bool CBoot::BootUp() // Scan for common HLE functions if (!_StartupPara.bEnableDebugging) { - PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB); + PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); SignatureDB db; if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) { db.Apply(&g_symbolDB); + HLE::PatchFunctions(); + db.Clear(); + g_symbolDB.Clear(); } - HLE::PatchFunctions(); } /* Try to load the symbol map if there is one, and then scan it for diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 67b2e84963..40073d401e 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -29,6 +29,10 @@ #include "../Boot/Boot_DOL.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "HLE.h" +#include "PowerPC/PPCAnalyst.h" +#include "PowerPC/SignatureDB.h" +#include "PowerPC/PPCSymbolDB.h" +#include "CommonPaths.h" namespace HLE_Misc { @@ -295,7 +299,61 @@ void HBReload() Host_Message(WM_USER_STOP); } -void BootDOLFromDisc() +void ExecuteDOL(u8* dolFile, u32 fileSize) +{ + CDolLoader dolLoader(dolFile, fileSize); + dolLoader.Load(); + + // Scan for common HLE functions + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) + { + PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); + SignatureDB db; + if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) + { + db.Apply(&g_symbolDB); + HLE::PatchFunctions(); + db.Clear(); + g_symbolDB.Clear(); + } + } + + PowerPC::ppcState.iCache.Reset(); + + static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + for (unsigned int i = 0; i < 4; i++) + { + if (s_Usb->m_WiiMotes[i].IsConnected()) + { + s_Usb->m_WiiMotes[i].Activate(false); + s_Usb->m_WiiMotes[i].Activate(true); + } + else + { + s_Usb->m_WiiMotes[i].Activate(false); + } + } + + if (argsPtr) + { + u32 args_base = Memory::Read_U32(0x800000f4); + u32 ptr_to_num_args = 0xc; + u32 num_args = 1; + u32 hi_ptr = args_base + ptr_to_num_args + 4; + u32 new_args_ptr = args_base + ptr_to_num_args + 8; + + Memory::Write_U32(ptr_to_num_args, args_base + 8); + Memory::Write_U32(num_args, args_base + ptr_to_num_args); + Memory::Write_U32(0x14, hi_ptr); + + for (int i = 0; i < args.length(); i++) + Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); + } + + NPC = dolLoader.GetEntryPoint() | 0x80000000; +} + +void LoadDOLFromDisc() { DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); @@ -308,42 +366,23 @@ void BootDOLFromDisc() if (fileSize > 0) { pFileSystem->ReadFile(dol.c_str(), dolFile, fileSize); - CDolLoader dolLoader(dolFile, fileSize); - dolLoader.Load(); - PowerPC::ppcState.iCache.Reset(); - - static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); - for (unsigned int i = 0; i < 4; i++) - { - if (s_Usb->m_WiiMotes[i].IsConnected()) - { - s_Usb->m_WiiMotes[i].Activate(false); - s_Usb->m_WiiMotes[i].Activate(true); - } - else - { - s_Usb->m_WiiMotes[i].Activate(false); - } - } - - if (argsPtr) - { - u32 args_base = Memory::Read_U32(0x800000f4); - u32 ptr_to_num_args = 0xc; - u32 num_args = 1; - u32 hi_ptr = args_base + ptr_to_num_args + 4; - u32 new_args_ptr = args_base + ptr_to_num_args + 8; - - Memory::Write_U32(ptr_to_num_args, args_base + 8); - Memory::Write_U32(num_args, args_base + ptr_to_num_args); - Memory::Write_U32(0x14, hi_ptr); - - for (int i = 0; i < args.length(); i++) - Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); - } - - NPC = dolLoader.GetEntryPoint() | 0x80000000; + ExecuteDOL(dolFile, fileSize); } + delete[] dolFile; +} + +void LoadBootDOLFromDisc() +{ + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); + DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); + u32 fileSize = pFileSystem->GetBootDOLSize(); + u8* dolFile = new u8[fileSize]; + if (fileSize > 0) + { + pFileSystem->GetBootDOL(dolFile, fileSize); + ExecuteDOL(dolFile, fileSize); + } + delete[] dolFile; } u32 GetDolFileSize() @@ -369,8 +408,13 @@ void OSBootDol() if ((GPR(4) >> 28) == 0x8) { - // Reset from menu - PanicAlert("Reset from menu"); + u32 resetCode = GPR(30); + + // Reset game + Memory::Write_U32(resetCode << 3, 0xCC003024); + //Memory::Write_U32((resetCode << 3) | 0x80000000, 0x800030f0); // Warm reset + LoadBootDOLFromDisc(); + return; } else if ((GPR(4) >> 28) == 0xA) { @@ -398,7 +442,7 @@ void OSBootDol() argsPtr = Memory::Read_U32(GPR(5)); Memory::GetString(args, argsPtr); - BootDOLFromDisc(); + LoadDOLFromDisc(); return; } else diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index f831e5b600..d39280831c 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -40,6 +40,7 @@ namespace HLE_Misc void FZ_rsqrt_internal(); void HBReload(); void OSBootDol(); + void ExecuteDOL(u8* dolFile, u32 fileSize); } #endif diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp index 4a18ce63b5..0e989d3f50 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp @@ -199,6 +199,7 @@ void Write32(const u32 _uValue, const u32 _iAddress) case PI_RESET_CODE: DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to PI_RESET_CODE", _uValue); + m_ResetCode = _uValue; break; case PI_FLIPPER_UNK: diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 8f40ab2f18..f1d5f20b6e 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -159,7 +159,7 @@ bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const return false; } -bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const +u32 CFileSystemGCWii::GetBootDOLSize() const { u32 DolOffset = Read32(0x420) << m_OffsetShift; u32 DolSize = 0, offset = 0, size = 0; @@ -181,9 +181,22 @@ bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const if (offset + size > DolSize) DolSize = offset + size; } + return DolSize; +} +bool CFileSystemGCWii::GetBootDOL(u8* &buffer, u32 DolSize) const +{ + u32 DolOffset = Read32(0x420) << m_OffsetShift; + return m_rVolume->Read(DolOffset, DolSize, buffer); +} + +bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const +{ + u32 DolOffset = Read32(0x420) << m_OffsetShift; + u32 DolSize = GetBootDOLSize(); u8* buffer = new u8[DolSize]; - if (m_rVolume->Read(DolOffset, DolSize, buffer)) + + if (GetBootDOL(buffer, DolSize)) { char exportName[512]; sprintf(exportName, "%s/boot.dol", _rExportFolder); diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h index 38e5f181f9..0e7d836d75 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.h +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h @@ -38,6 +38,8 @@ public: virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename); virtual bool ExportApploader(const char* _rExportFolder) const; virtual bool ExportDOL(const char* _rExportFolder) const; + virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const; + virtual u32 GetBootDOLSize() const; private: bool m_Initialized; diff --git a/Source/Core/DiscIO/Src/Filesystem.h b/Source/Core/DiscIO/Src/Filesystem.h index 71be4293e3..8bc98e6a77 100644 --- a/Source/Core/DiscIO/Src/Filesystem.h +++ b/Source/Core/DiscIO/Src/Filesystem.h @@ -57,6 +57,8 @@ public: virtual bool ExportApploader(const char* _rExportFolder) const = 0; virtual bool ExportDOL(const char* _rExportFolder) const = 0; virtual const char* GetFileName(u64 _Address) = 0; + virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const = 0; + virtual u32 GetBootDOLSize() const = 0; virtual const IVolume *GetVolume() const { return m_rVolume; } protected: From 05730af7244fc3ce98f7475f4ebe906234ef1789 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 May 2012 22:55:24 +1000 Subject: [PATCH 275/627] Added some IOS version checks and code to clear memory before loading the dol. --- Source/Core/Core/Src/Boot/Boot.cpp | 2 +- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 6 ++++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index ef3ae2a4fb..0fa89a28cc 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -258,7 +258,7 @@ bool CBoot::BootUp() } // Scan for common HLE functions - if (!_StartupPara.bEnableDebugging) + if (!_StartupPara.bEnableDebugging && Memory::Read_U16(0x00003140) >= 30) { PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); SignatureDB db; diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 40073d401e..b04e8004fd 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -301,6 +301,12 @@ void HBReload() void ExecuteDOL(u8* dolFile, u32 fileSize) { + // Clear memory before loading the dol + for (int i = 0x80004000; i < Memory::Read_U32(0x00000034); i += 4) + { + // TODO: Should not write over the "save region" + Memory::Write_U32(0x00000000, i); + } CDolLoader dolLoader(dolFile, fileSize); dolLoader.Load(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index f409c88c83..f15dc81ce7 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -780,7 +780,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // someone with an affected game should test IOSv = TitleID & 0xffff; } - if (!bSuccess) + if (!bSuccess && IOSv >= 30 && IOSv != 0xffff) { PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n Dolphin will likely hang now", TitleID); From 2d4c3c7c918877c844babaa5ac4c23f8a441fb64 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 10:33:45 -0600 Subject: [PATCH 276/627] Beautify some tabs. --- .../Plugin_VideoSoftware/Src/HwRasterizer.cpp | 205 +++++++++--------- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 38 ++-- 2 files changed, 120 insertions(+), 123 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index 83d9fa9b23..dba6f7f12c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -29,15 +29,15 @@ namespace HwRasterizer { - float efbHalfWidth; - float efbHalfHeight; - bool hasTexture; + float efbHalfWidth; + float efbHalfHeight; + bool hasTexture; - u8 *temp; + u8 *temp; // Programs static GLuint colProg, texProg, clearProg; - + // Color static GLint col_apos = -1, col_atex = -1; // Tex @@ -58,9 +58,7 @@ namespace HwRasterizer "varying " PREC " vec4 TexCoordOut;\n" "uniform " TEXTYPE " Texture;\n" "void main() {\n" - " " PREC " vec4 tmpcolor;\n" - " tmpcolor = " TEXFUNC "(Texture, TexCoordOut.xy);\n" - " gl_FragColor = tmpcolor;\n" + " gl_FragColor = " TEXFUNC "(Texture, TexCoordOut.xy);\n" "}\n"; // Clear shader static const char *fragclearText = @@ -74,7 +72,7 @@ namespace HwRasterizer "attribute vec4 TexCoordIn;\n " "varying vec4 TexCoordOut;\n " "void main() {\n" - " gl_Position = pos;\n" + " gl_Position = pos;\n" " TexCoordOut = TexCoordIn;\n" "}\n"; static const char *vertclearText = @@ -104,13 +102,13 @@ namespace HwRasterizer clear_ucol = glGetUniformLocation(clearProg, "Color"); } - void Init() - { - efbHalfWidth = EFB_WIDTH / 2.0f; - efbHalfHeight = 480 / 2.0f; + void Init() + { + efbHalfWidth = EFB_WIDTH / 2.0f; + efbHalfHeight = 480 / 2.0f; - temp = (u8*)AllocateMemoryPages(TEMP_SIZE); - } + temp = (u8*)AllocateMemoryPages(TEMP_SIZE); + } void Shutdown() { glDeleteProgram(colProg); @@ -150,10 +148,10 @@ namespace HwRasterizer GL_REPORT_ERRORD(); } static float width, height; - void LoadTexture() - { - FourTexUnits &texUnit = bpmem.tex[0]; - u32 imageAddr = texUnit.texImage3[0].image_base; + void LoadTexture() + { + FourTexUnits &texUnit = bpmem.tex[0]; + u32 imageAddr = texUnit.texImage3[0].image_base; // Texture Rectangle uses pixel coordinates // While GLES uses texture coordinates #ifdef USE_GLES @@ -163,36 +161,36 @@ namespace HwRasterizer width = 1; height = 1; #endif - TexCacheEntry &cacheEntry = textures[imageAddr]; - cacheEntry.Update(); + TexCacheEntry &cacheEntry = textures[imageAddr]; + cacheEntry.Update(); glBindTexture(TEX2D, cacheEntry.texture); glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, texUnit.texMode0[0].mag_filter ? GL_LINEAR : GL_NEAREST); glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, (texUnit.texMode0[0].min_filter >= 4) ? GL_LINEAR : GL_NEAREST); GL_REPORT_ERRORD(); - } + } - void BeginTriangles() - { - // disabling depth test sometimes allows more things to be visible - glEnable(GL_DEPTH_TEST); - glEnable(GL_BLEND); + void BeginTriangles() + { + // disabling depth test sometimes allows more things to be visible + glEnable(GL_DEPTH_TEST); + glEnable(GL_BLEND); - hasTexture = bpmem.tevorders[0].enable0; + hasTexture = bpmem.tevorders[0].enable0; - if (hasTexture) - LoadTexture(); - } + if (hasTexture) + LoadTexture(); + } - void EndTriangles() - { - glBindTexture(TEX2D, 0); - glDisable(GL_DEPTH_TEST); - glDisable(GL_BLEND); - } + void EndTriangles() + { + glBindTexture(TEX2D, 0); + glDisable(GL_DEPTH_TEST); + glDisable(GL_BLEND); + } - void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) - { + void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); float z0 = v0->screenPosition.z / (float)0x00ffffff; @@ -200,11 +198,11 @@ namespace HwRasterizer float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); float z1 = v1->screenPosition.z / (float)0x00ffffff; - + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); float z2 = v2->screenPosition.z / (float)0x00ffffff; - + float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f; float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f; float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f; @@ -223,9 +221,9 @@ namespace HwRasterizer { x2, y2, z2 } }; static const GLfloat col[3][4] = { - { r0, g0, b0, 1.0f }, - { r1, g1, b1, 1.0f }, - { r2, g2, b2, 1.0f } + { r0, g0, b0, 1.0f }, + { r1, g1, b1, 1.0f }, + { r2, g2, b2, 1.0f } }; { glUseProgram(colProg); @@ -239,10 +237,10 @@ namespace HwRasterizer glDisableVertexAttribArray(col_apos); } GL_REPORT_ERRORD(); - } + } - void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) - { + void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f; float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight); float z0 = v0->screenPosition.z; @@ -250,7 +248,7 @@ namespace HwRasterizer float x1 = (v1->screenPosition.x / efbHalfWidth) - 1.0f; float y1 = 1.0f - (v1->screenPosition.y / efbHalfHeight); float z1 = v1->screenPosition.z; - + float x2 = (v2->screenPosition.x / efbHalfWidth) - 1.0f; float y2 = 1.0f - (v2->screenPosition.y / efbHalfHeight); float z2 = v2->screenPosition.z; @@ -262,7 +260,7 @@ namespace HwRasterizer float t1 = v1->texCoords[0].y / height; float s2 = v2->texCoords[0].x / width; - float t2 = v2->texCoords[0].y / width; + float t2 = v2->texCoords[0].y / height; static const GLfloat verts[3][3] = { { x0, y0, z0 }, @@ -287,28 +285,28 @@ namespace HwRasterizer glDisableVertexAttribArray(tex_apos); } GL_REPORT_ERRORD(); - } + } - void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) - { + void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2) + { if (hasTexture) DrawTextureVertex(v0, v1, v2); else DrawColorVertex(v0, v1, v2); } - void Clear() - { - u8 r = (bpmem.clearcolorAR & 0x00ff); - u8 g = (bpmem.clearcolorGB & 0xff00) >> 8; - u8 b = (bpmem.clearcolorGB & 0x00ff); - u8 a = (bpmem.clearcolorAR & 0xff00) >> 8; + void Clear() + { + u8 r = (bpmem.clearcolorAR & 0x00ff); + u8 g = (bpmem.clearcolorGB & 0xff00) >> 8; + u8 b = (bpmem.clearcolorGB & 0x00ff); + u8 a = (bpmem.clearcolorAR & 0xff00) >> 8; - GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f; - GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight; - GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f; - GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight; - GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff; + GLfloat left = (GLfloat)bpmem.copyTexSrcXY.x / efbHalfWidth - 1.0f; + GLfloat top = 1.0f - (GLfloat)bpmem.copyTexSrcXY.y / efbHalfHeight; + GLfloat right = (GLfloat)(left + bpmem.copyTexSrcWH.x + 1) / efbHalfWidth - 1.0f; + GLfloat bottom = 1.0f - (GLfloat)(top + bpmem.copyTexSrcWH.y + 1) / efbHalfHeight; + GLfloat depth = (GLfloat)bpmem.clearZValue / (GLfloat)0x00ffffff; static const GLfloat verts[4][3] = { { left, top, depth }, { right, top, depth }, @@ -324,62 +322,61 @@ namespace HwRasterizer glDisableVertexAttribArray(col_apos); } GL_REPORT_ERRORD(); - } + } - TexCacheEntry::TexCacheEntry() - { - Create(); - } + TexCacheEntry::TexCacheEntry() + { + Create(); + } - void TexCacheEntry::Create() - { - FourTexUnits &texUnit = bpmem.tex[0]; + void TexCacheEntry::Create() + { + FourTexUnits &texUnit = bpmem.tex[0]; - texImage0.hex = texUnit.texImage0[0].hex; - texImage1.hex = texUnit.texImage1[0].hex; - texImage2.hex = texUnit.texImage2[0].hex; - texImage3.hex = texUnit.texImage3[0].hex; - texTlut.hex = texUnit.texTlut[0].hex; + texImage0.hex = texUnit.texImage0[0].hex; + texImage1.hex = texUnit.texImage1[0].hex; + texImage2.hex = texUnit.texImage2[0].hex; + texImage3.hex = texUnit.texImage3[0].hex; + texTlut.hex = texUnit.texTlut[0].hex; - int width = texImage0.width; - int height = texImage0.height; + int width = texImage0.width; + int height = texImage0.height; - DebugUtil::GetTextureBGRA(temp, 0, 0, width, height); + DebugUtil::GetTextureBGRA(temp, 0, 0, width, height); - glGenTextures(1, (GLuint *)&texture); + glGenTextures(1, (GLuint *)&texture); glBindTexture(TEX2D, texture); #ifdef USE_GLES - glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); #else - glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); + glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); #endif GL_REPORT_ERRORD(); } - void TexCacheEntry::Destroy() - { - if (texture == 0) - return; + void TexCacheEntry::Destroy() + { + if (texture == 0) + return; - glDeleteTextures(1, &texture); - texture = 0; - } + glDeleteTextures(1, &texture); + texture = 0; + } - void TexCacheEntry::Update() - { - FourTexUnits &texUnit = bpmem.tex[0]; - - // extra checks cause textures to be reloaded much more - if (texUnit.texImage0[0].hex != texImage0.hex || - //texUnit.texImage1[0].hex != texImage1.hex || - //texUnit.texImage2[0].hex != texImage2.hex || - texUnit.texImage3[0].hex != texImage3.hex || - texUnit.texTlut[0].hex != texTlut.hex) - { - Destroy(); - Create(); - } - } + void TexCacheEntry::Update() + { + FourTexUnits &texUnit = bpmem.tex[0]; + // extra checks cause textures to be reloaded much more + if (texUnit.texImage0[0].hex != texImage0.hex || + //texUnit.texImage1[0].hex != texImage1.hex || + //texUnit.texImage2[0].hex != texImage2.hex || + texUnit.texImage3[0].hex != texImage3.hex || + texUnit.texTlut[0].hex != texTlut.hex) + { + Destroy(); + Create(); + } + } } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index fceb19e0a9..ba7dd73e6f 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -41,7 +41,7 @@ void SWRenderer::Init() void SWRenderer::Shutdown() { glDeleteProgram(program); - glDeleteTextures(1, &s_RenderTarget); + glDeleteTextures(1, &s_RenderTarget); #ifndef USE_GLES delete s_pfont; s_pfont = 0; @@ -79,12 +79,12 @@ void CreateShaders() void SWRenderer::Prepare() { glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment - glGenTextures(1, &s_RenderTarget); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); // 4-byte pixel alignment + glGenTextures(1, &s_RenderTarget); CreateShaders(); #ifndef USE_GLES - s_pfont = new RasterFont(); + s_pfont = new RasterFont(); glEnable(GL_TEXTURE_RECTANGLE_ARB); #endif GL_REPORT_ERRORD(); @@ -106,7 +106,7 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) void SWRenderer::DrawDebugText() { - char debugtext_buffer[8192]; + char debugtext_buffer[8192]; char *p = debugtext_buffer; p[0] = 0; @@ -134,21 +134,21 @@ void SWRenderer::DrawDebugText() void SWRenderer::DrawTexture(u8 *texture, int width, int height) { - GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); + GLsizei glWidth = (GLsizei)GLInterface->GetBackBufferWidth(); GLsizei glHeight = (GLsizei)GLInterface->GetBackBufferHeight(); // Update GLViewPort glViewport(0, 0, glWidth, glHeight); - glScissor(0, 0, glWidth, glHeight); + glScissor(0, 0, glWidth, glHeight); - glBindTexture(TEX2D, s_RenderTarget); + glBindTexture(TEX2D, s_RenderTarget); - glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); - glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); + glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)glHeight; + GLfloat u_max = (GLfloat)width; + GLfloat v_max = (GLfloat)glHeight; static const GLfloat verts[4][2] = { { -1, -1}, // Left top @@ -174,30 +174,30 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) #endif glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); - glEnableVertexAttribArray(attr_pos); + glEnableVertexAttribArray(attr_pos); glEnableVertexAttribArray(attr_tex); glActiveTexture(GL_TEXTURE0); glUniform1i(uni_tex, 0); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - glDisableVertexAttribArray(attr_pos); + glDisableVertexAttribArray(attr_pos); glDisableVertexAttribArray(attr_tex); - glBindTexture(TEX2D, 0); + glBindTexture(TEX2D, 0); GL_REPORT_ERRORD(); } void SWRenderer::SwapBuffer() { - DrawDebugText(); + DrawDebugText(); - glFlush(); + glFlush(); GLInterface->Swap(); - swstats.ResetFrame(); + swstats.ResetFrame(); #ifndef USE_GLES - glClearDepth(1.0f); + glClearDepth(1.0f); #endif glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); From 93f72d84638bc8eabd29a19c8128cdb5f142c727 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 11:07:33 -0600 Subject: [PATCH 277/627] Don't add superfluous whitespace to the CMake file --- Source/Core/DolphinWX/CMakeLists.txt | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index f54ff9f4e3..6e21b81153 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -84,28 +84,18 @@ else() endif() if(USE_EGL) - set(SRCS ${SRCS} - Src/GLInterface/EGL.cpp - ) + set(SRCS ${SRCS} Src/GLInterface/EGL.cpp) else() if(WIN32) - set(SRCS ${SRCS} - Src/GLInterface/GLW.cpp - ) + set(SRCS ${SRCS} Src/GLInterface/GLW.cpp) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(USE_WX) - set(SRCS ${SRCS} - Src/GLInterface/WX.cpp - ) + set(SRCS ${SRCS} Src/GLInterface/WX.cpp) else() - set(SRCS ${SRCS} - Src/GLInterface/AGL.cpp - ) + set(SRCS ${SRCS} Src/GLInterface/AGL.cpp) endif() else() - set(SRCS ${SRCS} - Src/GLInterface/GLX.cpp - ) + set(SRCS ${SRCS} Src/GLInterface/GLX.cpp) endif() endif() From 5169804a61841fdbce939538915f35d3df1acce1 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 12:12:26 -0600 Subject: [PATCH 278/627] Remove duplicated X11 code. --- Source/Core/DolphinWX/CMakeLists.txt | 7 +- Source/Core/DolphinWX/Src/GLInterface.h | 4 +- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 212 +---------------- Source/Core/DolphinWX/Src/GLInterface/EGL.h | 7 +- Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 197 +--------------- Source/Core/DolphinWX/Src/GLInterface/GLX.h | 6 +- .../DolphinWX/Src/GLInterface/InterfaceBase.h | 1 + .../DolphinWX/Src/GLInterface/X11_Util.cpp | 213 ++++++++++++++++++ .../Core/DolphinWX/Src/GLInterface/X11_Util.h | 31 +++ 9 files changed, 272 insertions(+), 406 deletions(-) create mode 100644 Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp create mode 100644 Source/Core/DolphinWX/Src/GLInterface/X11_Util.h diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 6e21b81153..3e573f3379 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -84,7 +84,8 @@ else() endif() if(USE_EGL) - set(SRCS ${SRCS} Src/GLInterface/EGL.cpp) + set(SRCS ${SRCS} Src/GLInterface/EGL.cpp + Src/GLInterface/X11_Util.cpp) else() if(WIN32) set(SRCS ${SRCS} Src/GLInterface/GLW.cpp) @@ -95,7 +96,9 @@ else() set(SRCS ${SRCS} Src/GLInterface/AGL.cpp) endif() else() - set(SRCS ${SRCS} Src/GLInterface/GLX.cpp) + set(SRCS ${SRCS} Src/GLInterface/GLX.cpp + Src/GLInterface/X11_Util.cpp) + endif() endif() diff --git a/Source/Core/DolphinWX/Src/GLInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h index a7c069df4e..a81f17104c 100644 --- a/Source/Core/DolphinWX/Src/GLInterface.h +++ b/Source/Core/DolphinWX/Src/GLInterface.h @@ -34,8 +34,8 @@ typedef struct { #if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop int screen; - Display *x_dpy; - Display *x_evdpy; + Display *dpy; + Display *evdpy; Window win; Window parent; EGLSurface egl_surf; diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index 49a77636f8..b8716ab467 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -15,208 +15,16 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "VideoConfig.h" #include "Host.h" #include "RenderBase.h" -#include "VertexShaderManager.h" #include "../GLInterface.h" #include "EGL.h" -void cInterfaceEGL::CreateXWindow(void) -{ - Atom wmProtocols[1]; - - // Setup window attributes - GLWin.attr.colormap = XCreateColormap(GLWin.x_evdpy, - GLWin.parent, GLWin.vi->visual, AllocNone); - GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; - GLWin.attr.background_pixel = BlackPixel(GLWin.x_evdpy, GLWin.screen); - GLWin.attr.border_pixel = 0; - - // Create the window - GLWin.win = XCreateWindow(GLWin.x_evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, - GLWin.vi->depth, InputOutput, GLWin.vi->visual, - CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); - wmProtocols[0] = XInternAtom(GLWin.x_evdpy, "WM_DELETE_WINDOW", True); - XSetWMProtocols(GLWin.x_evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.x_evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); - XMapRaised(GLWin.x_evdpy, GLWin.win); - XSync(GLWin.x_evdpy, True); - - GLWin.xEventThread = std::thread(&cInterfaceEGL::XEventThread, this); -} - -void cInterfaceEGL::DestroyXWindow(void) -{ - XUnmapWindow(GLWin.x_dpy, GLWin.win); - GLWin.win = 0; - if (GLWin.xEventThread.joinable()) - GLWin.xEventThread.join(); - XFreeColormap(GLWin.x_dpy, GLWin.attr.colormap); -} - -void cInterfaceEGL::XEventThread() -{ - // Free look variables - static bool mouseLookEnabled = false; - static bool mouseMoveEnabled = false; - static float lastMouse[2]; - while (GLWin.win) - { - XEvent event; - KeySym key; - for (int num_events = XPending(GLWin.x_evdpy); num_events > 0; num_events--) - { - XNextEvent(GLWin.x_evdpy, &event); - switch(event.type) { - case KeyPress: - key = XLookupKeysym((XKeyEvent*)&event, 0); - switch (key) - { - case XK_3: - OSDChoice = 1; - // Toggle native resolution - g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; - break; - case XK_4: - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - break; - case XK_5: - OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - break; - case XK_6: - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - break; - default: - break; - } - if (g_Config.bFreeLook) - { - static float debugSpeed = 1.0f; - switch (key) - { - case XK_parenleft: - debugSpeed /= 2.0f; - break; - case XK_parenright: - debugSpeed *= 2.0f; - break; - case XK_w: - VertexShaderManager::TranslateView(0.0f, debugSpeed); - break; - case XK_s: - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - break; - case XK_a: - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - break; - case XK_d: - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - break; - case XK_r: - VertexShaderManager::ResetView(); - break; - } - } - break; - case ButtonPress: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseMoveEnabled = true; - break; - case 3: // Right button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseLookEnabled = true; - break; - } - } - break; - case ButtonRelease: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - mouseMoveEnabled = false; - break; - case 3: // Right button - mouseLookEnabled = false; - break; - } - } - break; - case MotionNotify: - if (g_Config.bFreeLook) - { - if (mouseLookEnabled) - { - VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, - (event.xmotion.y - lastMouse[1]) / 200.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - - if (mouseMoveEnabled) - { - VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, - (event.xmotion.y - lastMouse[1]) / 50.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - } - break; - case ConfigureNotify: - Window winDummy; - unsigned int borderDummy, depthDummy; - XGetGeometry(GLWin.x_dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, - &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); - s_backbuffer_width = GLWin.width; - s_backbuffer_height = GLWin.height; - break; - case ClientMessage: - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.x_dpy, "WM_DELETE_WINDOW", False)) - Host_Message(WM_USER_STOP); - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.x_dpy, "RESIZE", False)) - XMoveResizeWindow(GLWin.x_dpy, GLWin.win, - event.xclient.data.l[1], event.xclient.data.l[2], - event.xclient.data.l[3], event.xclient.data.l[4]); - break; - default: - break; - } - } - Common::SleepCurrentThread(20); - } -} - // Show the current FPS void cInterfaceEGL::UpdateFPSDisplay(const char *text) { - XStoreName(GLWin.x_dpy, GLWin.win, text); + XStoreName(GLWin.dpy, GLWin.win, text); } void cInterfaceEGL::Swap() { @@ -237,14 +45,14 @@ bool cInterfaceEGL::Create(void *&window_handle) const char *s; EGLint egl_major, egl_minor; - GLWin.x_dpy = XOpenDisplay(NULL); + GLWin.dpy = XOpenDisplay(NULL); - if (!GLWin.x_dpy) { + if (!GLWin.dpy) { printf("Error: couldn't open display\n"); return false; } - GLWin.egl_dpy = eglGetDisplay(GLWin.x_dpy); + GLWin.egl_dpy = eglGetDisplay(GLWin.dpy); if (!GLWin.egl_dpy) { printf("Error: eglGetDisplay() failed\n"); return false; @@ -288,11 +96,11 @@ bool cInterfaceEGL::Create(void *&window_handle) EGL_NONE }; - GLWin.x_evdpy = XOpenDisplay(NULL); + GLWin.evdpy = XOpenDisplay(NULL); GLWin.parent = (Window)window_handle; - GLWin.screen = DefaultScreen(GLWin.x_dpy); + GLWin.screen = DefaultScreen(GLWin.dpy); if (GLWin.parent == 0) - GLWin.parent = RootWindow(GLWin.x_dpy, GLWin.screen); + GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); XVisualInfo visTemplate; int num_visuals; @@ -312,7 +120,7 @@ bool cInterfaceEGL::Create(void *&window_handle) /* The X window visual must match the EGL config */ visTemplate.visualid = vid; - GLWin.vi = XGetVisualInfo(GLWin.x_dpy, VisualIDMask, &visTemplate, &num_visuals); + GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals); if (!GLWin.vi) { printf("Error: couldn't get X visual\n"); exit(1); @@ -323,7 +131,7 @@ bool cInterfaceEGL::Create(void *&window_handle) GLWin.width = _twidth; GLWin.height = _theight; - CreateXWindow(); + XWindow.CreateXWindow(); #ifdef USE_GLES eglBindAPI(EGL_OPENGL_ES_API); #else @@ -368,7 +176,7 @@ bool cInterfaceEGL::MakeCurrent() // Close backend void cInterfaceEGL::Shutdown() { - DestroyXWindow(); + XWindow.DestroyXWindow(); if (GLWin.egl_ctx && !eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) NOTICE_LOG(VIDEO, "Could not release drawing context."); if (GLWin.egl_ctx) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index 0e0adcd6d7..c4b6a00b6c 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -24,15 +24,16 @@ #include #include #endif + +#include "X11_Util.h" #include "InterfaceBase.h" class cInterfaceEGL : public cInterfaceBase { private: - void CreateXWindow(); - void DestroyXWindow(); - void XEventThread(); + cX11Window XWindow; public: + friend class cX11Window; void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index cb6d814db3..ef60873531 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -15,204 +15,13 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "VideoConfig.h" #include "Host.h" #include "RenderBase.h" +#include "VideoConfig.h" -#include "VertexShaderManager.h" #include "../GLInterface.h" #include "GLX.h" -void cInterfaceGLX::CreateXWindow(void) -{ - Atom wmProtocols[1]; - - // Setup window attributes - GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, - GLWin.parent, GLWin.vi->visual, AllocNone); - GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; - GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); - GLWin.attr.border_pixel = 0; - - // Create the window - GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, - GLWin.vi->depth, InputOutput, GLWin.vi->visual, - CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); - wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); - XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); - XMapRaised(GLWin.evdpy, GLWin.win); - XSync(GLWin.evdpy, True); - - GLWin.xEventThread = std::thread(&cInterfaceGLX::XEventThread, this); -} - -void cInterfaceGLX::DestroyXWindow(void) -{ - XUnmapWindow(GLWin.dpy, GLWin.win); - GLWin.win = 0; - if (GLWin.xEventThread.joinable()) - GLWin.xEventThread.join(); - XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); -} - -void cInterfaceGLX::XEventThread() -{ - // Free look variables - static bool mouseLookEnabled = false; - static bool mouseMoveEnabled = false; - static float lastMouse[2]; - while (GLWin.win) - { - XEvent event; - KeySym key; - for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) - { - XNextEvent(GLWin.evdpy, &event); - switch(event.type) { - case KeyPress: - key = XLookupKeysym((XKeyEvent*)&event, 0); - switch (key) - { - case XK_3: - OSDChoice = 1; - // Toggle native resolution - g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; - break; - case XK_4: - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - break; - case XK_5: - OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - break; - case XK_6: - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - break; - default: - break; - } - if (g_Config.bFreeLook) - { - static float debugSpeed = 1.0f; - switch (key) - { - case XK_parenleft: - debugSpeed /= 2.0f; - break; - case XK_parenright: - debugSpeed *= 2.0f; - break; - case XK_w: - VertexShaderManager::TranslateView(0.0f, debugSpeed); - break; - case XK_s: - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - break; - case XK_a: - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - break; - case XK_d: - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - break; - case XK_r: - VertexShaderManager::ResetView(); - break; - } - } - break; - case ButtonPress: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseMoveEnabled = true; - break; - case 3: // Right button - lastMouse[0] = event.xbutton.x; - lastMouse[1] = event.xbutton.y; - mouseLookEnabled = true; - break; - } - } - break; - case ButtonRelease: - if (g_Config.bFreeLook) - { - switch (event.xbutton.button) - { - case 2: // Middle button - mouseMoveEnabled = false; - break; - case 3: // Right button - mouseLookEnabled = false; - break; - } - } - break; - case MotionNotify: - if (g_Config.bFreeLook) - { - if (mouseLookEnabled) - { - VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, - (event.xmotion.y - lastMouse[1]) / 200.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - - if (mouseMoveEnabled) - { - VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, - (event.xmotion.y - lastMouse[1]) / 50.0f); - lastMouse[0] = event.xmotion.x; - lastMouse[1] = event.xmotion.y; - } - } - break; - case ConfigureNotify: - Window winDummy; - unsigned int borderDummy, depthDummy; - XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, - &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); - s_backbuffer_width = GLWin.width; - s_backbuffer_height = GLWin.height; - break; - case ClientMessage: - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) - Host_Message(WM_USER_STOP); - if ((unsigned long) event.xclient.data.l[0] == - XInternAtom(GLWin.evdpy, "RESIZE", False)) - XMoveResizeWindow(GLWin.evdpy, GLWin.win, - event.xclient.data.l[1], event.xclient.data.l[2], - event.xclient.data.l[3], event.xclient.data.l[4]); - break; - default: - break; - } - } - Common::SleepCurrentThread(20); - } -} - // Show the current FPS void cInterfaceGLX::UpdateFPSDisplay(const char *text) { @@ -309,7 +118,7 @@ bool cInterfaceGLX::Create(void *&window_handle) GLWin.width = _twidth; GLWin.height = _theight; - CreateXWindow(); + XWindow.CreateXWindow(); window_handle = (void *)GLWin.win; return true; } @@ -328,7 +137,7 @@ bool cInterfaceGLX::MakeCurrent() // Close backend void cInterfaceGLX::Shutdown() { - DestroyXWindow(); + XWindow.DestroyXWindow(); if (GLWin.ctx && !glXMakeCurrent(GLWin.dpy, None, NULL)) NOTICE_LOG(VIDEO, "Could not release drawing context."); if (GLWin.ctx) diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h index 5a37695f4e..73a6690ec5 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h @@ -22,15 +22,15 @@ #include #include +#include "X11_Util.h" #include "InterfaceBase.h" class cInterfaceGLX : public cInterfaceBase { private: - void CreateXWindow(); - void DestroyXWindow(); - void XEventThread(); + cX11Window XWindow; public: + friend class cX11Window; void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h index 40b17e8083..3e4f10fcd4 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -31,6 +31,7 @@ public: virtual u32 GetBackBufferWidth() { return s_backbuffer_width; } virtual u32 GetBackBufferHeight() { return s_backbuffer_height; } + virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; } virtual void Update() { } virtual bool PeekMessages() { return false; } }; diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp new file mode 100644 index 0000000000..9372c4d644 --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp @@ -0,0 +1,213 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Host.h" +#include "RenderBase.h" +#include "VideoConfig.h" +#include "../GLInterface.h" +#include "VertexShaderManager.h" + +void cX11Window::CreateXWindow(void) +{ + Atom wmProtocols[1]; + + // Setup window attributes + GLWin.attr.colormap = XCreateColormap(GLWin.evdpy, + GLWin.parent, GLWin.vi->visual, AllocNone); + GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask; + GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen); + GLWin.attr.border_pixel = 0; + + // Create the window + GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, + GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + GLWin.vi->depth, InputOutput, GLWin.vi->visual, + CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); + wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); + XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); + XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XMapRaised(GLWin.evdpy, GLWin.win); + XSync(GLWin.evdpy, True); + + GLWin.xEventThread = std::thread(&cX11Window::XEventThread, this); +} + +void cX11Window::DestroyXWindow(void) +{ + XUnmapWindow(GLWin.dpy, GLWin.win); + GLWin.win = 0; + if (GLWin.xEventThread.joinable()) + GLWin.xEventThread.join(); + XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); +} + +void cX11Window::XEventThread() +{ + // Free look variables + static bool mouseLookEnabled = false; + static bool mouseMoveEnabled = false; + static float lastMouse[2]; + while (GLWin.win) + { + XEvent event; + KeySym key; + for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--) + { + XNextEvent(GLWin.evdpy, &event); + switch(event.type) { + case KeyPress: + key = XLookupKeysym((XKeyEvent*)&event, 0); + switch (key) + { + case XK_3: + OSDChoice = 1; + // Toggle native resolution + g_Config.iEFBScale = g_Config.iEFBScale + 1; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + break; + case XK_4: + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + break; + case XK_5: + OSDChoice = 3; + // Toggle EFB copy + if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + { + g_Config.bEFBCopyEnable ^= true; + g_Config.bCopyEFBToTexture = false; + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + break; + case XK_6: + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + break; + default: + break; + } + if (g_Config.bFreeLook) + { + static float debugSpeed = 1.0f; + switch (key) + { + case XK_parenleft: + debugSpeed /= 2.0f; + break; + case XK_parenright: + debugSpeed *= 2.0f; + break; + case XK_w: + VertexShaderManager::TranslateView(0.0f, debugSpeed); + break; + case XK_s: + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + break; + case XK_a: + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + break; + case XK_d: + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + break; + case XK_r: + VertexShaderManager::ResetView(); + break; + } + } + break; + case ButtonPress: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseMoveEnabled = true; + break; + case 3: // Right button + lastMouse[0] = event.xbutton.x; + lastMouse[1] = event.xbutton.y; + mouseLookEnabled = true; + break; + } + } + break; + case ButtonRelease: + if (g_Config.bFreeLook) + { + switch (event.xbutton.button) + { + case 2: // Middle button + mouseMoveEnabled = false; + break; + case 3: // Right button + mouseLookEnabled = false; + break; + } + } + break; + case MotionNotify: + if (g_Config.bFreeLook) + { + if (mouseLookEnabled) + { + VertexShaderManager::RotateView((event.xmotion.x - lastMouse[0]) / 200.0f, + (event.xmotion.y - lastMouse[1]) / 200.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + + if (mouseMoveEnabled) + { + VertexShaderManager::TranslateView((event.xmotion.x - lastMouse[0]) / 50.0f, + (event.xmotion.y - lastMouse[1]) / 50.0f); + lastMouse[0] = event.xmotion.x; + lastMouse[1] = event.xmotion.y; + } + } + break; + case ConfigureNotify: + Window winDummy; + unsigned int borderDummy, depthDummy; + XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, + &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); + GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height); + break; + case ClientMessage: + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False)) + Host_Message(WM_USER_STOP); + if ((unsigned long) event.xclient.data.l[0] == + XInternAtom(GLWin.evdpy, "RESIZE", False)) + XMoveResizeWindow(GLWin.evdpy, GLWin.win, + event.xclient.data.l[1], event.xclient.data.l[2], + event.xclient.data.l[3], event.xclient.data.l[4]); + break; + default: + break; + } + } + Common::SleepCurrentThread(20); + } +} + + diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h new file mode 100644 index 0000000000..9e6f6d5e3c --- /dev/null +++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.h @@ -0,0 +1,31 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef _X11_UTIL_H_ +#define _X11_UTIL_H_ + +#include +#include + +class cX11Window +{ +private: + void XEventThread(); +public: + void CreateXWindow(void); + void DestroyXWindow(void); +}; +#endif From 01cdcc83a3a6d65eeb435d549761fc63e68f2b32 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 26 Dec 2012 13:15:19 -0600 Subject: [PATCH 279/627] Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated. --- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 63 ------------------- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 3 - .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 4 +- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index a5c76bdd6a..29a1b6a662 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -127,69 +127,6 @@ GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentSha return programID; } -GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) -{ - // generate objects - GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); - GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); - GLuint programID = glCreateProgram(); - GLint Result = GL_FALSE; - char stringBuffer[1024]; - GLsizei stringBufferUsage = 0; - - // compile vertex shader - glShaderSource(vertexShaderID, 1, &vertexShader, NULL); - glCompileShader(vertexShaderID); -#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) - glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result); - glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer); - if(Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader); - } else if(!Result) { - ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader); - } else { - DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader); - } - bool shader_errors = !Result; -#endif - - // compile fragment shader - glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL); - glCompileShader(fragmentShaderID); -#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) - glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result); - glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer); - if(Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader); - } else if(!Result) { - ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader); - } else { - DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader); - } - shader_errors |= !Result; -#endif - - // link them - glAttachShader(programID, vertexShaderID); - glAttachShader(programID, fragmentShaderID); - glLinkProgram(programID); -#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL) - glGetProgramiv(programID, GL_LINK_STATUS, &Result); - glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer); - if(Result && stringBufferUsage) { - ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); - } else if(!Result && !shader_errors) { - ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader); - } -#endif - - // cleanup - glDeleteShader(vertexShaderID); - glDeleteShader(fragmentShaderID); - - return programID; -} - GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 1d179fdefa..09d38bb731 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -52,9 +52,6 @@ void InitInterface(); // Helpers GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); -// Helpers -GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); - // Error reporting - use the convenient macros. void OpenGL_ReportARBProgramError(); GLuint OpenGL_ReportGLError(const char *function, const char *file, int line); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 32a6f98dd0..e148906692 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -94,8 +94,8 @@ void SWRenderer::Prepare() void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) { #ifndef USE_GLES - int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth(); - int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight(); + int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); + int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); s_pfont->printMultilineText(pstr, left * 2.0f / (float)nBackbufferWidth - 1, From db5f4c8c20b36b2fdc6257104096e021b56d6145 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 26 Dec 2012 23:48:33 +0100 Subject: [PATCH 280/627] fix byte order in osd rasterfont --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 3fbe18f7fd..f1cd9fd674 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -270,7 +270,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta glUseProgram(shader_program); if(color != cached_color) { - glUniform4f(uniform_color_id, ((color>>0)&0xff)/255.f,((color>>8)&0xff)/255.f,((color>>16)&0xff)/255.f,((color>>24)&0xff)/255.f); + glUniform4f(uniform_color_id, ((color>>16)&0xff)/255.f,((color>>8)&0xff)/255.f,((color>>0)&0xff)/255.f,((color>>24)&0xff)/255.f); cached_color = color; } From 94116bf89c917309b7e7b2a2b46bf2f43f3219db Mon Sep 17 00:00:00 2001 From: rog Date: Wed, 26 Dec 2012 19:55:45 -0500 Subject: [PATCH 281/627] Always use the right user dir on windows. --- Source/Core/Common/Src/FileUtil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 77aac45418..77290528a6 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -649,8 +649,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) if (paths[D_USER_IDX].empty()) { #ifdef _WIN32 - // TODO: use GetExeDirectory() here instead of ROOT_DIR so that if the cwd is changed we still have the correct paths? - paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; + paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; #else if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; From 2fd1c9e7c29ed686165c711c98794b4ef11d8488 Mon Sep 17 00:00:00 2001 From: rog Date: Thu, 27 Dec 2012 09:42:20 -0500 Subject: [PATCH 282/627] Allow setting cpu engine and whatever bHLE_BS2 is from game ini. --- Source/Core/Core/Src/BootManager.cpp | 12 +++++++++--- Source/Core/Core/Src/Core.cpp | 2 +- Source/Core/Core/Src/HW/CPU.cpp | 4 ---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index e0fac1da87..59ab51f730 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -47,7 +47,6 @@ #include "VideoBackendBase.h" #include "Movie.h" - namespace BootManager { @@ -56,8 +55,8 @@ namespace BootManager struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT, - bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker; - int iTLBHack; + bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker, bHLE_BS2; + int iTLBHack, iCPUCore; std::string strBackend; }; static ConfigCache config_cache; @@ -90,6 +89,7 @@ bool BootCore(const std::string& _rFilename) config_cache.valid = true; config_cache.bCPUThread = StartUp.bCPUThread; config_cache.bSkipIdle = StartUp.bSkipIdle; + config_cache.iCPUCore = StartUp.iCPUCore; config_cache.bEnableFPRF = StartUp.bEnableFPRF; config_cache.bMMU = StartUp.bMMU; config_cache.bMMUBAT = StartUp.bMMUBAT; @@ -100,6 +100,7 @@ bool BootCore(const std::string& _rFilename) config_cache.bDSPHLE = StartUp.bDSPHLE; config_cache.bDisableWiimoteSpeaker = StartUp.bDisableWiimoteSpeaker; config_cache.strBackend = StartUp.m_strVideoBackend; + config_cache.bHLE_BS2 = StartUp.bHLE_BS2; // General settings game_ini.Get("Core", "CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread); @@ -114,6 +115,8 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); + game_ini.Get("Core", "CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); + game_ini.Get("Core", "HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) @@ -123,6 +126,7 @@ bool BootCore(const std::string& _rFilename) StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bProgressive = Movie::IsProgressive(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); + StartUp.iCPUCore = Movie::GetCPUMode(); if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii) { if (File::Exists("Movie.raw")) @@ -159,6 +163,7 @@ void Stop() config_cache.valid = false; StartUp.bCPUThread = config_cache.bCPUThread; StartUp.bSkipIdle = config_cache.bSkipIdle; + StartUp.iCPUCore = config_cache.iCPUCore; StartUp.bEnableFPRF = config_cache.bEnableFPRF; StartUp.bMMU = config_cache.bMMU; StartUp.bMMUBAT = config_cache.bMMUBAT; @@ -170,6 +175,7 @@ void Stop() StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); + StartUp.bHLE_BS2 = config_cache.bHLE_BS2; } } diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index e92b9088bc..ebb43c1abd 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -431,7 +431,7 @@ void EmuThread() CBoot::BootUp(); // Setup our core, but can't use dynarec if we are compare server - if (Movie::GetCPUMode() && (!_CoreParameter.bRunCompareServer || + if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient)) PowerPC::SetMode(PowerPC::MODE_JIT); else diff --git a/Source/Core/Core/Src/HW/CPU.cpp b/Source/Core/Core/Src/HW/CPU.cpp index a7a272e263..610042c66d 100644 --- a/Source/Core/Core/Src/HW/CPU.cpp +++ b/Source/Core/Core/Src/HW/CPU.cpp @@ -37,10 +37,6 @@ namespace void CCPU::Init(int cpu_core) { - if (Movie::IsPlayingInput() && Movie::IsConfigSaved()) - { - cpu_core = Movie::GetCPUMode(); - } PowerPC::Init(cpu_core); m_SyncEvent = 0; } From 95f66859008fe3dd16f0232e0da5623857abbe44 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 28 Dec 2012 14:26:46 +1100 Subject: [PATCH 283/627] Changed the HLE system to allow it to hook the beginning, the end or replace the entire function without changing the GC memory. Fixes Kirby's Return to Dreamland. Added a way to categorise the type of HLE function. Currently, there are debug, floating point, memory and generic functions. Added a HLE function for OSGetResetCode (Warm reset). Fixes the CSI games. Added a switch to disable all of the HLE functions if the idle skipping option is disabled. --- Data/Sys/totaldb.dsy | Bin 723252 -> 723388 bytes Source/Core/Core/Src/Boot/Boot.cpp | 3 +- Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp | 2 +- Source/Core/Core/Src/HLE/HLE.cpp | 115 +++++++++++------- Source/Core/Core/Src/HLE/HLE.h | 26 +++- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 96 +++++++++++++-- Source/Core/Core/Src/HLE/HLE_Misc.h | 7 ++ Source/Core/Core/Src/HW/Memmap.cpp | 5 +- .../Core/Core/Src/HW/ProcessorInterface.cpp | 3 +- .../Src/PowerPC/Interpreter/Interpreter.cpp | 98 +++++++++------ Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 37 +++++- .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 39 +++++- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 6 +- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 25 ++-- 14 files changed, 339 insertions(+), 123 deletions(-) diff --git a/Data/Sys/totaldb.dsy b/Data/Sys/totaldb.dsy index a1c9683c9f57ca74ba2693c818d474dcb4761b2e..8eb9c28bf769b1b762c83b503d2733400a02e697 100644 GIT binary patch delta 56 zcmdloNoUVw9meC0jIE47#MH{j+{(z(%E;Qv$kxip-pa_)%E;Nu$hDP`+nAH}*sruk LgXu57u{8q#y~7ZL delta 45 zcmdlpS!c^69mZpgjIE47#MH{j+{(z(%E;Qv$kxip-pa_)%E;Nu$hDP`+n5soCFBaH diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 0fa89a28cc..aaaa4dd39a 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -258,7 +258,7 @@ bool CBoot::BootUp() } // Scan for common HLE functions - if (!_StartupPara.bEnableDebugging && Memory::Read_U16(0x00003140) >= 30) + if (_StartupPara.bSkipIdle && !_StartupPara.bEnableDebugging) { PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); SignatureDB db; @@ -267,7 +267,6 @@ bool CBoot::BootUp() db.Apply(&g_symbolDB); HLE::PatchFunctions(); db.Clear(); - g_symbolDB.Clear(); } } diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp index bd789fa82b..5011543448 100644 --- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp @@ -375,7 +375,7 @@ bool CBoot::EmulatedBS2_Wii() u32 iLength = Memory::ReadUnchecked_U32(0x81300008); u32 iDVDOffset = Memory::ReadUnchecked_U32(0x8130000c) << 2; - INFO_LOG(BOOT, "DVDRead: offset: %08x memOffse: %08x length: %i", iDVDOffset, iRamAddress, iLength); + INFO_LOG(BOOT, "DVDRead: offset: %08x memOffset: %08x length: %i", iDVDOffset, iRamAddress, iLength); DVDInterface::DVDRead(iDVDOffset, iRamAddress, iLength); } while(PowerPC::ppcState.gpr[3] != 0x00); diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 0c42f7f4df..457870ba1d 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include #include "Common.h" #include "HLE.h" @@ -29,6 +28,7 @@ #include "HLE_Misc.h" #include "IPC_HLE/WII_IPC_HLE_Device_es.h" #include "ConfigManager.h" +#include "Core.h" namespace HLE { @@ -47,56 +47,72 @@ struct SPatch { char m_szPatchName[128]; TPatchFunction PatchFunction; + int type; + int flags; }; static const SPatch OSPatches[] = { - { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, + { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // speedup - //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse }, - //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState }, + //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "memcpy", HLE_Misc::memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memcmp", HLE_Misc::memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memset", HLE_Misc::memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memmove", HLE_Misc::memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? + //{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? + + //{ "DCFlushRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "DCInvalidateRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ "DCZeroRange", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // debug out is very nice ;) - { "OSReport", HLE_OS::HLE_GeneralDebugPrint }, - { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint }, - { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint }, - { "OSPanic", HLE_OS::HLE_OSPanic }, - { "vprintf", HLE_OS::HLE_GeneralDebugPrint }, - { "printf", HLE_OS::HLE_GeneralDebugPrint }, - { "puts", HLE_OS::HLE_GeneralDebugPrint }, // gcc-optimized printf? - { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint }, // used for early init things (normally) - { "___blank", HLE_OS::HLE_GeneralDebugPrint }, - { "__write_console", HLE_OS::HLE_write_console }, // used by sysmenu (+more?) + { "OSReport", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "WUD_DEBUGPrint", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "OSPanic", HLE_OS::HLE_OSPanic, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "vprintf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "printf", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "puts", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // gcc-optimized printf? + { "___blank(char *,...)", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used for early init things (normally) + { "___blank", HLE_OS::HLE_GeneralDebugPrint, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + { "__write_console", HLE_OS::HLE_write_console, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, // used by sysmenu (+more?) // wii only - //{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction }, + //{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Super Monkey Ball - no longer needed. - //{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine }, - //{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize }, - //{ ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength }, - //{ ".evil_vec_something", HLE_Misc::FZero_evil_vec_normalize }, - { "PanicAlert", HLE_Misc::HLEPanicAlert }, - //{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal }, - //{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal }, - //{ ".atan2", HLE_Misc::SMB_atan2}, - //{ ".sqrt_fz", HLE_Misc::FZ_sqrt}, + //{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".evil_vec_something", HLE_Misc::FZero_evil_vec_normalize, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + { "PanicAlert", HLE_Misc::HLEPanicAlert, HLE_HOOK_REPLACE, HLE_TYPE_DEBUG }, + //{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".atan2", HLE_Misc::SMB_atan2HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".sqrt_fz", HLE_Misc::FZ_sqrtHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // F-zero still isn't working correctly, but these aren't really helping. - //{ ".sqrt_internal_fz", HLE_Misc::FZ_sqrt_internal }, - //{ ".rsqrt_internal_fz", HLE_Misc::FZ_rsqrt_internal }, + //{ ".sqrt_internal_fz", HLE_Misc::FZ_sqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + //{ ".rsqrt_internal_fz", HLE_Misc::FZ_rsqrt_internal, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ ".kill_infinites", HLE_Misc::FZero_kill_infinites }, + //{ ".kill_infinites", HLE_Misc::FZero_kill_infinites, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // special - // { "GXPeekZ", HLE_Misc::GXPeekZ}, - // { "GXPeekARGB", HLE_Misc::GXPeekARGB}, + // { "GXPeekZ", HLE_Misc::GXPeekZHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + // { "GXPeekARGB", HLE_Misc::GXPeekARGBHLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Name doesn't matter, installed in CBoot::BootUp() - { "HBReload", HLE_Misc::HBReload }, - { "__OSBootDol", HLE_Misc::OSBootDol }, + { "HBReload", HLE_Misc::HBReload, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + + // ES_LAUNCH + { "__OSBootDol", HLE_Misc::OSBootDol, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + { "OSGetResetCode", HLE_Misc::OSGetResetCode, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, + }; static const SPatch OSBreakPoints[] = @@ -104,17 +120,13 @@ static const SPatch OSBreakPoints[] = { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, }; - -static std::map orig_instruction; - -void Patch(u32 address, const char *hle_func_name) +void Patch(u32 addr, const char *hle_func_name) { for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++) { if (!strcmp(OSPatches[i].m_szPatchName, hle_func_name)) { - u32 HLEPatchValue = (1 & 0x3f) << 26; - Memory::Write_U32(HLEPatchValue | i, address); + orig_instruction[addr] = i; return; } } @@ -128,11 +140,9 @@ void PatchFunctions() Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); if (symbol > 0) { - u32 HLEPatchValue = (1 & 0x3f) << 26; for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) { - orig_instruction[addr] = Memory::ReadUnchecked_U32(addr); - Memory::Write_U32(HLEPatchValue | i, addr); + orig_instruction[addr] = i; } INFO_LOG(OSHLE, "Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address); } @@ -169,12 +179,33 @@ void Execute(u32 _CurrentPC, u32 _Instruction) // _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName); } -u32 GetOrigInstruction(u32 addr) +u32 GetFunctionIndex(u32 addr) { std::map::const_iterator iter = orig_instruction.find(addr); return (iter != orig_instruction.end()) ? iter->second : 0; } +int GetFunctionTypeByIndex(u32 index) +{ + return OSPatches[index].type; +} + +int GetFunctionFlagsByIndex(u32 index) +{ + return OSPatches[index].flags; +} + +bool IsEnabled(int flags) +{ + if (flags == HLE::HLE_TYPE_MEMORY && Core::g_CoreStartupParameter.bMMU) + return false; + + if (flags == HLE::HLE_TYPE_DEBUG && !Core::g_CoreStartupParameter.bEnableDebugging && PowerPC::GetMode() != MODE_INTERPRETER) + return false; + + return true; +} + u32 UnPatch(std::string patchName) { Symbol *symbol = g_symbolDB.GetSymbolFromName(patchName.c_str()); @@ -182,7 +213,7 @@ u32 UnPatch(std::string patchName) { for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) { - Memory::WriteUnchecked_U32(orig_instruction[addr], addr); + orig_instruction[addr] = 0; PowerPC::ppcState.iCache.Invalidate(addr); } return symbol->address; diff --git a/Source/Core/Core/Src/HLE/HLE.h b/Source/Core/Core/Src/HLE/HLE.h index b81f347b9f..9318d34197 100644 --- a/Source/Core/Core/Src/HLE/HLE.h +++ b/Source/Core/Core/Src/HLE/HLE.h @@ -18,16 +18,40 @@ #ifndef _HLE_H #define _HLE_H +#include #include "Common.h" namespace HLE { + enum + { + HLE_HOOK_START = 0, // Hook the beginning of the function and execute the function afterwards + HLE_HOOK_END = 1, // Hook the end of the function, executing the function first before the hook + HLE_HOOK_REPLACE = 2, // Replace the function with the HLE version + HLE_HOOK_NONE = 3, // Do not hook the function + }; + + enum + { + HLE_TYPE_GENERIC = 0, // Miscellaneous function + HLE_TYPE_MEMORY = 1, // Memory operation + HLE_TYPE_FP = 2, // Floating Point operation + HLE_TYPE_DEBUG = 3, // Debug output function + }; + void PatchFunctions(); + void Patch(u32 pc, const char *func_name); u32 UnPatch(std::string patchName); void Execute(u32 _CurrentPC, u32 _Instruction); - u32 GetOrigInstruction(u32 em_address); + u32 GetFunctionIndex(u32 em_address); + int GetFunctionTypeByIndex(u32 index); + int GetFunctionFlagsByIndex(u32 index); + + bool IsEnabled(int flags); + + static std::map orig_instruction; } #endif diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index b04e8004fd..4a17ffd748 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -37,7 +37,6 @@ namespace HLE_Misc { -std::string dol; std::string args; u32 argsPtr; u32 bootType; @@ -302,7 +301,7 @@ void HBReload() void ExecuteDOL(u8* dolFile, u32 fileSize) { // Clear memory before loading the dol - for (int i = 0x80004000; i < Memory::Read_U32(0x00000034); i += 4) + for (u32 i = 0x80004000; i < Memory::Read_U32(0x00000034); i += 4) { // TODO: Should not write over the "save region" Memory::Write_U32(0x00000000, i); @@ -320,7 +319,6 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) db.Apply(&g_symbolDB); HLE::PatchFunctions(); db.Clear(); - g_symbolDB.Clear(); } } @@ -359,12 +357,12 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) NPC = dolLoader.GetEntryPoint() | 0x80000000; } -void LoadDOLFromDisc() +void LoadDOLFromDisc(std::string dol) { DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); - if (dol.substr(1, 1).compare("//")) + if (dol.length() > 1 && dol.compare(0, 1, "/") == 0) dol = dol.substr(1); u32 fileSize = (u32) pFileSystem->GetFileSize(dol.c_str()); @@ -391,19 +389,92 @@ void LoadBootDOLFromDisc() delete[] dolFile; } -u32 GetDolFileSize() +u32 GetDolFileSize(std::string dol) { DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(SConfig::GetInstance().m_LastFilename.c_str()); DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); std::string dolFile; - if (dol.substr(1, 1).compare("//")) + if (dol.length() > 1 && dol.compare(0, 1, "/") == 0) dolFile = dol.substr(1); + else + dolFile = dol; return (u32)pFileSystem->GetFileSize(dolFile.c_str()); } +void memmove() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + std::memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void memcpy() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + std::memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void memset() +{ + u32 dest = GPR(3); + u32 ch = GPR(4); + u32 count = GPR(5); + std::memset((u8*)(Memory::base + dest), ch, count); + NPC = LR; +} + +void memcmp() +{ + u32 dest = GPR(3); + u32 src = GPR(4); + u32 count = GPR(5); + GPR(3) = std::memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + NPC = LR; +} + +void div2i() +{ + s64 num = (s64)(GPR(3)) << 32 | GPR(4); + s64 den = (s64)(GPR(5)) << 32 | GPR(6); + s64 quo = num / den; + GPR(3) = quo >> 32; + GPR(4) = quo & 0xffffffff; + NPC = LR; +} + +void div2u() +{ + u64 num = (u64)(GPR(3)) << 32 | GPR(4); + u64 den = (u64)(GPR(5)) << 32 | GPR(6); + u64 quo = num / den; + GPR(3) = quo >> 32; + GPR(4) = quo & 0xffffffff; + NPC = LR; +} + +void OSGetResetCode() +{ + u32 resetCode = Memory::Read_U32(0xCC003024); + if (resetCode != 0) + { + GPR(3) = resetCode | 0x80000000; + } + else + { + GPR(3) = 0; + } + + NPC = LR; +} + void OSBootDol() { IOSv = Memory::Read_U16(0x00003140); @@ -417,8 +488,7 @@ void OSBootDol() u32 resetCode = GPR(30); // Reset game - Memory::Write_U32(resetCode << 3, 0xCC003024); - //Memory::Write_U32((resetCode << 3) | 0x80000000, 0x800030f0); // Warm reset + Memory::Write_U32(resetCode, 0xCC003024); LoadBootDOLFromDisc(); return; } @@ -429,15 +499,17 @@ void OSBootDol() } else if ((GPR(4) >> 28) == 0xC) { + std::string dol; + // Boot DOL from disc u32 ptr = GPR(28); Memory::GetString(dol, ptr); - if (GetDolFileSize() == 0) + if (GetDolFileSize(dol) == 0) { ptr = GPR(30); Memory::GetString(dol, ptr); - if (GetDolFileSize() == 0) + if (GetDolFileSize(dol) == 0) { // Cannot locate the dol file, exit. HLE::UnPatch("__OSBootDol"); @@ -448,7 +520,7 @@ void OSBootDol() argsPtr = Memory::Read_U32(GPR(5)); Memory::GetString(args, argsPtr); - LoadDOLFromDisc(); + LoadDOLFromDisc(dol); return; } else diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index d39280831c..d0d098835f 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -40,6 +40,13 @@ namespace HLE_Misc void FZ_rsqrt_internal(); void HBReload(); void OSBootDol(); + void OSGetResetCode(); + void memcpy(); + void memset(); + void memmove(); + void memcmp(); + void div2i(); + void div2u(); void ExecuteDOL(u8* dolFile, u32 fileSize); } diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 2da999eeac..88f6b2c358 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -416,10 +416,7 @@ bool AreMemoryBreakpointsActivated() u32 Read_Instruction(const u32 em_address) { UGeckoInstruction inst = ReadUnchecked_U32(em_address); - if (inst.OPCD == 1) - return HLE::GetOrigInstruction(em_address); - else - return inst.hex; + return inst.hex; } u32 Read_Opcode_JIT_Uncached(const u32 _Address) diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp index 0e989d3f50..9e72cc2169 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp @@ -96,8 +96,7 @@ void Init() m_FlipperRev = 0x246500B1; // revision C m_Unknown = 0; - // Bleh, why? - //m_ResetCode |= 0x80000000; + m_ResetCode = 0x80000000; // Cold reset m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI; toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", &ToggleResetButtonCallback); diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp index a8277d868a..be68d357a3 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp @@ -26,6 +26,7 @@ #include "PowerPCDisasm.h" #include "../../IPC_HLE/WII_IPC_HLE.h" #include "Atomic.h" +#include "HLE/HLE.h" namespace { @@ -79,57 +80,63 @@ int startTrace = 0; void Trace( UGeckoInstruction &instCode ) { - char regs[500]=""; + char reg[25]=""; + std::string regs = ""; for (int i=0; i<32; i++) { - sprintf(regs, "%sr%02d: %08x ", regs, i, PowerPC::ppcState.gpr[i]); + sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]); + regs.append(reg); } - char fregs[500]=""; + char freg[25]=""; + std::string fregs = ""; for (int i=0; i<32; i++) { - sprintf(fregs, "%sf%02d: %08llx %08llx ", fregs, i, - PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]); + sprintf(freg, "f%02d: %08llx %08llx ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]); + fregs.append(freg); } char ppcInst[256]; DisassembleGekko(instCode.hex, PC, ppcInst, 256); - DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s %08x %s", PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs, instCode.hex, ppcInst); + DEBUG_LOG(POWERPC, "INTER PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s %08x %s", PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str(), instCode.hex, ppcInst); } int Interpreter::SingleStepInner(void) { static UGeckoInstruction instCode; - NPC = PC + sizeof(UGeckoInstruction); - instCode.hex = Memory::Read_Opcode(PC); - - // Uncomment to trace the interpreter - //if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624) - // startTrace = 1; - //else - // startTrace = 0; - - if (startTrace) + u32 function = m_EndBlock ? HLE::GetFunctionIndex(PC) : 0; // Check for HLE functions after branches + if (function != 0) { - Trace(instCode); - } - - if (instCode.hex != 0) - { - UReg_MSR& msr = (UReg_MSR&)MSR; - if (msr.FP) //If FPU is enabled, just execute + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) { - m_opTable[instCode.OPCD](instCode); - if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) { - PowerPC::CheckExceptions(); - m_EndBlock = true; + HLEFunction(function); } } - else + } + else + { + NPC = PC + sizeof(UGeckoInstruction); + instCode.hex = Memory::Read_Opcode(PC); + + // Uncomment to trace the interpreter + //if ((PC & 0xffffff)>=0x0ab54c && (PC & 0xffffff)<=0x0ab624) + // startTrace = 1; + //else + // startTrace = 0; + + if (startTrace) { - // check if we have to generate a FPU unavailable exception - if (!PPCTables::UsesFPU(instCode)) + Trace(instCode); + } + + if (instCode.hex != 0) + { + UReg_MSR& msr = (UReg_MSR&)MSR; + if (msr.FP) //If FPU is enabled, just execute { m_opTable[instCode.OPCD](instCode); if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) @@ -140,17 +147,30 @@ int Interpreter::SingleStepInner(void) } else { - Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE); - PowerPC::CheckExceptions(); - m_EndBlock = true; + // check if we have to generate a FPU unavailable exception + if (!PPCTables::UsesFPU(instCode)) + { + m_opTable[instCode.OPCD](instCode); + if (PowerPC::ppcState.Exceptions & EXCEPTION_DSI) + { + PowerPC::CheckExceptions(); + m_EndBlock = true; + } + } + else + { + Common::AtomicOr(PowerPC::ppcState.Exceptions, EXCEPTION_FPU_UNAVAILABLE); + PowerPC::CheckExceptions(); + m_EndBlock = true; + } } } - } - else - { - // Memory exception on instruction fetch - PowerPC::CheckExceptions(); - m_EndBlock = true; + else + { + // Memory exception on instruction fetch + PowerPC::CheckExceptions(); + m_EndBlock = true; + } } last_pc = PC; PC = NPC; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 357eeb7809..31caca0a43 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -252,8 +252,6 @@ void Jit64::HLEFunction(UGeckoInstruction _inst) gpr.Flush(FLUSH_ALL); fpr.Flush(FLUSH_ALL); ABI_CallFunctionCC((void*)&HLE::Execute, js.compilerPC, _inst.hex); - MOV(32, R(EAX), M(&NPC)); - WriteExitDestInEAX(); } void Jit64::DoNothing(UGeckoInstruction _inst) @@ -566,6 +564,27 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc ABI_CallFunction(thunks.ProtectFunction((void *)&GPFifo::CheckGatherPipe, 0)); } + u32 function = HLE::GetFunctionIndex(ops[i].address); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + if (type == HLE::HLE_HOOK_REPLACE) + { + MOV(32, R(EAX), M(&NPC)); + js.downcountAmount += js.st.numCycles; + WriteExitDestInEAX(); + break; + } + } + } + } + if (!ops[i].skip) { if ((opinfo->flags & FL_USE_FPU) && !js.firstFPInstructionFound) @@ -668,6 +687,20 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc break; } + u32 function = HLE::GetFunctionIndex(js.blockStart); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_END) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + } + } + } + if (memory_exception) { // Address of instruction could not be translated diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index c9d4e44e71..d56c9ffee8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -199,7 +199,7 @@ namespace JitILProfiler static u64 beginTime; static Block& Add(u64 codeHash) { - const u32 _blockIndex = blocks.size(); + const u32 _blockIndex = (u32)blocks.size(); blocks.push_back(Block()); Block& block = blocks.back(); block.index = _blockIndex; @@ -649,6 +649,27 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc js.next_compilerPC = ops[i + 1].address; } + u32 function = HLE::GetFunctionIndex(ops[i].address); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_START || type == HLE::HLE_HOOK_REPLACE) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + if (type == HLE::HLE_HOOK_REPLACE) + { + MOV(32, R(EAX), M(&NPC)); + jit->js.downcountAmount += jit->js.st.numCycles; + WriteExitDestInOpArg(R(EAX)); + break; + } + } + } + } + if (!ops[i].skip) { if (js.memcheck && (opinfo->flags & FL_USE_FPU)) @@ -665,7 +686,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc { ibuild.EmitBreakPointCheck(ibuild.EmitIntConst(ops[i].address)); } - + JitILTables::CompileInstruction(ops[i]); if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) @@ -681,6 +702,20 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc } } + u32 function = HLE::GetFunctionIndex(jit->js.blockStart); + if (function != 0) + { + int type = HLE::GetFunctionTypeByIndex(function); + if (type == HLE::HLE_HOOK_END) + { + int flags = HLE::GetFunctionFlagsByIndex(function); + if (HLE::IsEnabled(flags)) + { + HLEFunction(function); + } + } + } + if (memory_exception) { ibuild.EmitISIException(ibuild.EmitIntConst(em_address)); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 496ddebf7a..57827ec662 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -135,7 +135,11 @@ bool JitBlock::ContainsAddress(u32 em_address) // is full and when saving and loading states. void JitBlockCache::Clear() { - Core::DisplayMessage("Clearing code cache.", 3000); + if (IsFull()) + Core::DisplayMessage("Clearing block cache.", 3000); + else + Core::DisplayMessage("Clearing code cache.", 3000); + for (int i = 0; i < num_blocks; i++) { DestroyBlock(i, false); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 333f0cdc05..7ec780b336 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -269,23 +269,18 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr) { - u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; - - if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack) - { - mem_mask |= Memory::ADDR_MASK_MEM1; - } - -#ifdef ENABLE_MEM_CHECK - if (Core::g_CoreStartupParameter.bEnableDebugging) - { - mem_mask |= Memory::EXRAM_MASK; - } -#endif - - TEST(32, R(reg_addr), Imm32(mem_mask)); if (false && cpu_info.bSSSE3) { // This path should be faster but for some reason it causes errors so I've disabled it. + u32 mem_mask = Memory::ADDR_MASK_HW_ACCESS; + + if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack) + mem_mask |= Memory::ADDR_MASK_MEM1; + +#ifdef ENABLE_MEM_CHECK + if (Core::g_CoreStartupParameter.bEnableDebugging) + mem_mask |= Memory::EXRAM_MASK; +#endif + TEST(32, R(reg_addr), Imm32(mem_mask)); FixupBranch argh = J_CC(CC_Z); MOVSS(M(&float_buffer), xmm_value); MOV(32, R(EAX), M(&float_buffer)); From 225d29f3f6c45fbdc0770d3bbcd69f7d938d2979 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 27 Dec 2012 23:43:59 -0600 Subject: [PATCH 284/627] Fix this annoying warning in ChunkFile.h --- Source/Core/Common/Src/ChunkFile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 5935b7f53a..be8b49a3a3 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -158,7 +158,7 @@ public: case MODE_READ: x = (wchar_t*)*ptr; break; case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; case MODE_MEASURE: break; - case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%s\" != \"%s\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; + case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; } (*ptr) += stringLen; } From af2820ac88a02cfa933d77c61c31bbb5a886e4c6 Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 28 Dec 2012 03:29:51 -0500 Subject: [PATCH 285/627] Don't show multiple exit confirmation dialogues. Pause emulation while waiting for confirmation to exit. Fixes issue 5822. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 7b595c485e..7f69631827 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -96,6 +96,8 @@ extern "C" { #include "../resources/KDE.h" }; +bool confirmStop = false; + // Create menu items // --------------------- void CFrame::CreateMenu() @@ -1070,6 +1072,9 @@ void CFrame::DoPause() // Stop the emulation void CFrame::DoStop() { + if (confirmStop) + return; + m_bGameLoading = false; if (Core::GetState() != Core::CORE_UNINITIALIZED || m_RenderParent != NULL) @@ -1082,6 +1087,9 @@ void CFrame::DoStop() // Ask for confirmation in case the user accidentally clicked Stop / Escape if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop) { + Core::EState state = Core::GetState(); + confirmStop = true; + Core::SetState(Core::CORE_PAUSE); wxMessageDialog *m_StopDlg = new wxMessageDialog( this, _("Do you want to stop the current emulation?"), @@ -1091,8 +1099,12 @@ void CFrame::DoStop() int Ret = m_StopDlg->ShowModal(); m_StopDlg->Destroy(); + confirmStop = false; if (Ret != wxID_YES) + { + Core::SetState(state); return; + } } // TODO: Show the author/description dialog here From c303669dd0a45893f32f3b92082606b34b288f9e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 28 Dec 2012 09:58:06 -0600 Subject: [PATCH 286/627] Clean up some messy code issues that have been annoying me. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 4 +- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 40 +++++++++---------- Source/Core/DolphinWX/Src/Frame.cpp | 2 - Source/Core/DolphinWX/Src/FrameTools.cpp | 5 +-- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index db45802e6f..47737326f4 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -387,7 +387,7 @@ void ExecuteCommand(u32 _Address) INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", pDevice->GetDeviceName().c_str(), DeviceID, Mode); - if (Memory::Read_U32(_Address + 4) == DeviceID) + if (Memory::Read_U32(_Address + 4) == (u32)DeviceID) { g_FdMap[DeviceID] = pDevice; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index f409c88c83..5e23819d7b 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -789,8 +789,8 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) { static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; - for(unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); - i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) + wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h index 1afb01cf8d..c98338e39d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -31,7 +31,7 @@ struct NANDStat }; enum { - FS_RESULT_OK = 0, + FS_RESULT_OK = 0, FS_INVALID = -4, FS_DIRFILE_NOT_FOUND = -6, FS_RESULT_FATAL = -101, diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index af10e98d60..29e3c64a7c 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -116,26 +116,26 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) p.Do(m_EventQueue); m_acl_pool.DoState(p); - for (unsigned int i = 0; i < 4; i++) - m_WiiMotes[i].DoState(p); - - // Reset the connection of real and hybrid wiimotes - if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) - { - for (unsigned int i = 0; i < 4; i++) - { - if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i]) - continue; - // TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad. - m_EventQueue.clear(); - if (!m_WiiMotes[i].IsInactive()) - { - m_WiiMotes[i].Activate(false); - m_WiiMotes[i].Activate(true); - } - else - m_WiiMotes[i].Activate(false); - } + for (unsigned int i = 0; i < 4; i++) + m_WiiMotes[i].DoState(p); + + // Reset the connection of real and hybrid wiimotes + if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) + { + for (unsigned int i = 0; i < 4; i++) + { + if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i]) + continue; + // TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad. + m_EventQueue.clear(); + if (!m_WiiMotes[i].IsInactive()) + { + m_WiiMotes[i].Activate(false); + m_WiiMotes[i].Activate(true); + } + else + m_WiiMotes[i].Activate(false); + } } } diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index c9408203ea..750696f6c7 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -365,8 +365,6 @@ CFrame::CFrame(wxFrame* parent, // --------------- // Manager - // wxAUI_MGR_LIVE_RESIZE does not exist in the wxWidgets 2.8.9 that comes with Ubuntu 9.04 - // Could just check for wxWidgets version if it becomes a problem. m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 7f69631827..1a7743e8e6 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1090,15 +1090,14 @@ void CFrame::DoStop() Core::EState state = Core::GetState(); confirmStop = true; Core::SetState(Core::CORE_PAUSE); - wxMessageDialog *m_StopDlg = new wxMessageDialog( + wxMessageDialog m_StopDlg( this, _("Do you want to stop the current emulation?"), _("Please confirm..."), wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxDefaultPosition); - int Ret = m_StopDlg->ShowModal(); - m_StopDlg->Destroy(); + int Ret = m_StopDlg.ShowModal(); confirmStop = false; if (Ret != wxID_YES) { From 3ec3b7683e83c88200fb239f2f89e85fe3b75634 Mon Sep 17 00:00:00 2001 From: rog Date: Fri, 28 Dec 2012 11:21:08 -0500 Subject: [PATCH 287/627] Fix (dis)connecting wiimotes via hotkey. Fixes issue 5594. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 1a7743e8e6..9207144554 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -50,6 +50,7 @@ Core::GetWindowHandle(). #include "LogConfigWindow.h" #include "FifoPlayerDlg.h" #include "WxUtils.h" +#include "Host.h" #include "ConfigManager.h" // Core #include "Core.h" @@ -1468,6 +1469,7 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1, connect ? wxT("Connected") : wxT("Disconnected"))); Core::DisplayMessage(msg.ToAscii(), 3000); + Host_UpdateMainFrame(); } } From e9d00bfeebb62d8b6c5627b959c9045914348775 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 29 Dec 2012 00:37:50 +0100 Subject: [PATCH 288/627] revert RasterFont optimization isn't needed and also not tested and buggy --- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index f1cd9fd674..5bebd76eb6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -263,9 +263,6 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta x += delta_x + border_x; } glUnmapBuffer(GL_ARRAY_BUFFER); - - // no printable char, so also nothing to do - if(!usage) return; glUseProgram(shader_program); From 670ca7e993277178d09d2c5b131b51210d20a607 Mon Sep 17 00:00:00 2001 From: rog Date: Sat, 29 Dec 2012 02:43:36 -0500 Subject: [PATCH 289/627] Toggle wiimote status based on the actual status, instead of some dumb checkbox that is almost never even right. The checkbox is still wrong when starting emulation, but it's now purely cosmetic. Actually fixes issue 5594. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 9207144554..b79e890f3b 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1469,13 +1469,17 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1, connect ? wxT("Connected") : wxT("Disconnected"))); Core::DisplayMessage(msg.ToAscii(), 3000); + + // Wait for the wiimote to connect + while (GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->IsConnected() != connect) + {} Host_UpdateMainFrame(); } } void CFrame::OnConnectWiimote(wxCommandEvent& event) { - ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, event.IsChecked()); + ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, !GetUsbPointer()->AccessWiiMote((event.GetId() - IDM_CONNECT_WIIMOTE1) | 0x100)->IsConnected()); } // Toogle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover From cd54d6efdd754afb5dadd763873fc9e635fc4ae5 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sat, 29 Dec 2012 22:26:09 +1300 Subject: [PATCH 290/627] Mismatched new/delete. --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 28ce6106c7..204a1fc698 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -173,7 +173,7 @@ bool Wiimote::Read() return true; } - delete rpt.first; + delete[] rpt.first; return false; } From 30dd9c2e17c4b7dc5bf623f51e627ca1c0d0b940 Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 29 Dec 2012 12:50:42 +0100 Subject: [PATCH 291/627] always calls glBindBuffer(0) after disabling vao --- .../Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp | 6 ++---- Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 +++----- Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 4 +--- .../Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp | 10 +++------- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 0220e54806..e7fb7ad7b7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -203,8 +203,8 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); // EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f glViewport(0, 0, m_targetWidth, m_targetHeight); @@ -360,9 +360,6 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, }; glBindBuffer(GL_ARRAY_BUFFER, s_VBO); glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); s_cached_sourcerc = sourcerc; s_cached_drawrc = drawrc; @@ -373,6 +370,7 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, // TODO: this after merging with graphic_update glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 5bebd76eb6..95c99ac78c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -181,8 +181,8 @@ RasterFont::RasterFont() glVertexAttribPointer(glGetAttribLocation(shader_program, "texturePosition"), 2, GL_FLOAT, 0, sizeof(GLfloat)*4, (GLfloat*)NULL+2); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); } RasterFont::~RasterFont() @@ -276,8 +276,8 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta glDrawArrays(GL_TRIANGLES, 0, usage/4); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); glUseProgram(0); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 15fa36046d..a2d0a94ee3 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -503,8 +503,8 @@ Renderer::Renderer() glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); @@ -704,8 +704,8 @@ void Renderer::DrawDebugInfo() glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); // Restore Line Size glLineWidth(lSize); @@ -1286,9 +1286,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); s_cached_targetRc = targetRc; } @@ -1299,6 +1296,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // TODO: this after merging with graphic_update glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); if(applyShader) PixelShaderCache::DisableShader(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 40dac17df6..d90f651a82 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -357,9 +357,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); - vbo_it->second.targetSource = targetSource; } @@ -368,6 +365,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo // TODO: this after merging with graphic_update glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index f45277f759..54a2e2464c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -176,8 +176,8 @@ void Init() glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL+2); // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); @@ -271,9 +271,6 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); - s_cached_sourceRc = sourceRc; } @@ -282,6 +279,7 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar // TODO: this after merging with graphic_update glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); @@ -454,9 +452,6 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat)*4*4, vertices, GL_STREAM_DRAW); - // TODO: this after merging with graphic_update - glBindBuffer(GL_ARRAY_BUFFER, 0); - s_cached_srcHeight = srcHeight; s_cached_srcWidth = srcWidth; } @@ -466,6 +461,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur // TODO: this after merging with graphic_update glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); GL_REPORT_ERRORD(); From 5ccbcf455e437031cb2542db0804a341cc9150cc Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 30 Dec 2012 13:41:48 +1100 Subject: [PATCH 292/627] Added preliminary GameCube Steering Wheel emulation via a PC Force Feedback Steering Wheel. --- Source/Core/Core/CMakeLists.txt | 1 + Source/Core/Core/Core.vcxproj | 2 + Source/Core/Core/Core.vcxproj.filters | 6 + Source/Core/Core/Src/HW/GCPad.cpp | 27 +- Source/Core/Core/Src/HW/GCPad.h | 1 + Source/Core/Core/Src/HW/GCPadEmu.cpp | 7 +- Source/Core/Core/Src/HW/GCPadEmu.h | 2 +- Source/Core/Core/Src/HW/SI_Device.cpp | 5 + .../Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 301 ++++++++++++++++++ .../Core/Src/HW/SI_DeviceGCSteeringWheel.h | 118 +++++++ Source/Core/Core/Src/NetPlay.cpp | 11 + Source/Core/DolphinWX/Src/ConfigMain.cpp | 13 +- .../DInput/DInputJoystick.cpp | 27 +- 13 files changed, 506 insertions(+), 15 deletions(-) create mode 100644 Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp create mode 100644 Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 124d7aa879..6ffeeaec3a 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -115,6 +115,7 @@ set(SRCS Src/ActionReplay.cpp Src/HW/SI_Device.cpp Src/HW/SI_DeviceGBA.cpp Src/HW/SI_DeviceGCController.cpp + Src/HW/SI_DeviceGCSteeringWheel.cpp Src/HW/Sram.cpp Src/HW/StreamADPCM.cpp Src/HW/SystemTimers.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index e626ccd033..bd3d97f11b 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -301,6 +301,7 @@ + @@ -503,6 +504,7 @@ + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index ad6db227d5..246dafd972 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -290,6 +290,9 @@ HW %28Flipper/Hollywood%29\SI - Serial Interface + + HW %28Flipper/Hollywood%29\SI - Serial Interface + HW %28Flipper/Hollywood%29\VI - Video Interface @@ -814,6 +817,9 @@ HW %28Flipper/Hollywood%29\SI - Serial Interface + + HW %28Flipper/Hollywood%29\SI - Serial Interface + HW %28Flipper/Hollywood%29\SI - Serial Interface diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 4c1b4dabdd..61b666af12 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -101,7 +101,32 @@ void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) { // TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time // set rumble - ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput( 1 == _uType && _uStrength > 2 ); + if (1 == _uType && _uStrength > 2) + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(255); + } + } +} + +// __________________________________________________________________________________________________ +// Function: Motor +// Purpose: For devices with constant Force feedback +// input: Type - 06 = Motor On, 04 = Motor Off +// Strength - 00 = Left Strong, 127 = Left Weak, 128 = Right Weak, 255 = Right Strong +// output: none +// +void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) +{ + std::unique_lock lk(g_plugin.controls_lock, std::try_to_lock); + + if (lk.owns_lock()) + { + // TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time + // set rumble + if (_uType == 06) + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(_uStrength); + } } } diff --git a/Source/Core/Core/Src/HW/GCPad.h b/Source/Core/Core/Src/HW/GCPad.h index f7f6af2f20..fb07e82ccc 100644 --- a/Source/Core/Core/Src/HW/GCPad.h +++ b/Source/Core/Core/Src/HW/GCPad.h @@ -32,6 +32,7 @@ InputPlugin *GetPlugin(); void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus); void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); +void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); bool GetMicButton(u8 pad); } diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index 837c9104cc..5233ed2877 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -130,10 +130,13 @@ void GCPad::GetInput(SPADStatus* const pad) } } -void GCPad::SetOutput(const bool on) +void GCPad::SetOutput(const u8 on) { // only rumble if window has focus or background input is enabled - m_rumble->controls[0]->control_ref->State(on && (Host_RendererHasFocus() || m_options[0].settings[0]->value)); + if (Host_RendererHasFocus() || m_options[0].settings[0]->value) + m_rumble->controls[0]->control_ref->State((float)on / 255); + else + m_rumble->controls[0]->control_ref->State(0); } void GCPad::LoadDefaults(const ControllerInterface& ciface) diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h index 5185ff221c..cf0940245e 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.h +++ b/Source/Core/Core/Src/HW/GCPadEmu.h @@ -28,7 +28,7 @@ public: GCPad(const unsigned int index); void GetInput(SPADStatus* const pad); - void SetOutput(const bool on); + void SetOutput(const u8 on); bool GetMicButton() const; diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp index 8abddbe472..062499f16f 100644 --- a/Source/Core/Core/Src/HW/SI_Device.cpp +++ b/Source/Core/Core/Src/HW/SI_Device.cpp @@ -17,6 +17,7 @@ #include "SI_Device.h" #include "SI_DeviceGCController.h" +#include "SI_DeviceGCSteeringWheel.h" #include "SI_DeviceGBA.h" #include "SI_DeviceAMBaseboard.h" @@ -76,6 +77,10 @@ ISIDevice* SIDevice_Create(const SIDevices device, const int port_number) return new CSIDevice_GCController(device, port_number); break; + case SIDEVICE_GC_STEERING: + return new CSIDevice_GCSteeringWheel(device, port_number); + break; + case SIDEVICE_GC_TARUKONGA: return new CSIDevice_TaruKonga(device, port_number); break; diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp new file mode 100644 index 0000000000..113fe186b1 --- /dev/null +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -0,0 +1,301 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include +#include + +#include "SI.h" +#include "SI_Device.h" +#include "SI_DeviceGCSteeringWheel.h" + +#include "EXI_Device.h" +#include "EXI_DeviceMic.h" + +#include "GCPad.h" + +#include "../Movie.h" + +#include "../CoreTiming.h" +#include "SystemTimers.h" +#include "ProcessorInterface.h" +#include "../Core.h" + +// --- standard gamecube controller --- +CSIDevice_GCSteeringWheel::CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber) + : ISIDevice(device, _iDeviceNumber) + , m_TButtonComboStart(0) + , m_TButtonCombo(0) + , m_LastButtonCombo(COMBO_NONE) +{ + memset(&m_Origin, 0, sizeof(SOrigin)); + m_Origin.uCommand = CMD_ORIGIN; + m_Origin.uOriginStickX = 0x80; // center + m_Origin.uOriginStickY = 0x80; + m_Origin.uSubStickStickX = 0x80; + m_Origin.uSubStickStickY = 0x80; + m_Origin.uTrigger_L = 0x1F; // 0-30 is the lower deadzone + m_Origin.uTrigger_R = 0x1F; + + // Dunno if we need to do this, game/lib should set it? + m_Mode = 0x03; +} + +int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength) +{ + // For debug logging only + ISIDevice::RunBuffer(_pBuffer, _iLength); + + // Read the command + EBufferCommands command = static_cast(_pBuffer[3]); + + // Handle it + switch (command) + { + case CMD_RESET: + *(u32*)&_pBuffer[0] = SI_GC_STEERING; + break; + + case CMD_ORIGIN: + { + INFO_LOG(SERIALINTERFACE, "PAD - Get Origin"); + u8* pCalibration = reinterpret_cast(&m_Origin); + for (int i = 0; i < (int)sizeof(SOrigin); i++) + { + _pBuffer[i ^ 3] = *pCalibration++; + } + } + break; + + // Recalibrate (FiRES: i am not 100 percent sure about this) + case CMD_RECALIBRATE: + { + INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate"); + u8* pCalibration = reinterpret_cast(&m_Origin); + for (int i = 0; i < (int)sizeof(SOrigin); i++) + { + _pBuffer[i ^ 3] = *pCalibration++; + } + } + break; + + // DEFAULT + default: + { + ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); + } + break; + } + + return _iLength; +} + + +// GetData + +// Return true on new data (max 7 Bytes and 6 bits ;) +// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r] +// |\_ ERR_LATCH (error latched - check SISR) +// |_ ERR_STATUS (error on last GetData or SendCmd?) +bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) +{ + SPADStatus PadStatus; + memset(&PadStatus, 0, sizeof(PadStatus)); + + Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus); + Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber); + + u32 netValues[2]; + if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues)) + { + _Hi = netValues[0]; // first 4 bytes + _Low = netValues[1]; // last 4 bytes + return true; + } + + Movie::SetPolledDevice(); + + if(Movie::IsPlayingInput()) + { + Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); + if(!Movie::IsUsingWiimote(0)) + Movie::InputUpdate(); + } + else if(Movie::IsRecordingInput()) + { + Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); + if(!Movie::IsUsingWiimote(0)) + Movie::InputUpdate(); + } + else + Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); + + // Thankfully changing mode does not change the high bits ;) + _Hi = (u32)((u8)PadStatus.stickY); + _Hi |= (u32)((u8)PadStatus.stickX << 8); + _Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16); + + // Low bits are packed differently per mode + if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7) + { + _Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.substickY) << 16); // All 8 bits + _Low |= (u32)((u8)(PadStatus.substickX) << 24); // All 8 bits + } + else if (m_Mode == 1) + { + _Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits + _Low |= (u32)((u8)PadStatus.triggerRight << 8); // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits + } + else if (m_Mode == 2) + { + _Low = (u8)(PadStatus.analogB); // All 8 bits + _Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits + _Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 16); // Top 4 bits + _Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 20); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickY << 24); // Top 4 bits + _Low |= (u32)((u8)PadStatus.substickX << 28); // Top 4 bits + } + else if (m_Mode == 3) + { + // Analog A/B are always 0 + _Low = (u8)PadStatus.triggerRight; // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 8); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits + } + else if (m_Mode == 4) + { + _Low = (u8)(PadStatus.analogB); // All 8 bits + _Low |= (u32)((u8)(PadStatus.analogA) << 8); // All 8 bits + // triggerLeft/Right are always 0 + _Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits + _Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits + } + + // Keep track of the special button combos (embedded in controller hardware... :( ) + EButtonCombo tempCombo; + if ((PadStatus.button & 0xff00) == (PAD_BUTTON_Y|PAD_BUTTON_X|PAD_BUTTON_START)) + tempCombo = COMBO_ORIGIN; + else if ((PadStatus.button & 0xff00) == (PAD_BUTTON_B|PAD_BUTTON_X|PAD_BUTTON_START)) + tempCombo = COMBO_RESET; + else + tempCombo = COMBO_NONE; + if (tempCombo != m_LastButtonCombo) + { + m_LastButtonCombo = tempCombo; + if (m_LastButtonCombo != COMBO_NONE) + m_TButtonComboStart = CoreTiming::GetTicks(); + } + if (m_LastButtonCombo != COMBO_NONE) + { + m_TButtonCombo = CoreTiming::GetTicks(); + if ((m_TButtonCombo - m_TButtonComboStart) > SystemTimers::GetTicksPerSecond() * 3) + { + if (m_LastButtonCombo == COMBO_RESET) + ProcessorInterface::ResetButton_Tap(); + else if (m_LastButtonCombo == COMBO_ORIGIN) + { + m_Origin.uOriginStickX = PadStatus.stickX; + m_Origin.uOriginStickY = PadStatus.stickY; + m_Origin.uSubStickStickX = PadStatus.substickX; + m_Origin.uSubStickStickY = PadStatus.substickY; + m_Origin.uTrigger_L = PadStatus.triggerLeft; + m_Origin.uTrigger_R = PadStatus.triggerRight; + } + m_LastButtonCombo = COMBO_NONE; + } + } + + return true; +} + + +// SendCommand +void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) +{ + UCommand command(_Cmd); + + switch (command.Command) + { + // Costis sent it in some demos :) + case 0x00: + break; + + case CMD_FORCE: + { + unsigned int uStrength = command.Parameter1; // 0 = left strong, 127 = left weak, 128 = right weak, 255 = right strong + unsigned int uType = command.Parameter2; // 06 = motor on, 04 = motor off + + // get the correct pad number that should rumble locally when using netplay + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + + NOTICE_LOG(COMMON, "Type: %d Strength: %d", uType, uStrength); + + if (numPAD < 4) + Pad::Motor(numPAD, uType, uStrength); + + if (!_Poll) + { + m_Mode = command.Parameter2; + INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); + } + } + break; + + case CMD_WRITE: + { + unsigned int uType = command.Parameter1; // 0 = stop, 1 = rumble, 2 = stop hard + unsigned int uStrength = command.Parameter2; + + // get the correct pad number that should rumble locally when using netplay + const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); + + if (numPAD < 4) + Pad::Rumble(numPAD, uType, uStrength); + + if (!_Poll) + { + m_Mode = command.Parameter2; + INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode); + } + } + break; + + default: + { + ERROR_LOG(SERIALINTERFACE, "unknown direct command (0x%x)", _Cmd); + } + break; + } +} + +// Savestate support +void CSIDevice_GCSteeringWheel::DoState(PointerWrap& p) +{ + p.Do(m_Origin); + p.Do(m_Mode); + p.Do(m_TButtonComboStart); + p.Do(m_TButtonCombo); + p.Do(m_LastButtonCombo); +} diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h new file mode 100644 index 0000000000..1814c8d6e4 --- /dev/null +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -0,0 +1,118 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _SI_DEVICEGCSTEERINGWHEEL_H +#define _SI_DEVICEGCSTEERINGWHEEL_H + +#include "SI_Device.h" +#include "GCPadStatus.h" + + +// standard gamecube controller +class CSIDevice_GCSteeringWheel : public ISIDevice +{ +private: + + // Commands + enum EBufferCommands + { + CMD_RESET = 0x00, + CMD_ORIGIN = 0x41, + CMD_RECALIBRATE = 0x42, + }; + + struct SOrigin + { + u8 uCommand;// Maybe should be button bits? + u8 unk_1; // ..and this would be the other half + u8 uOriginStickX; + u8 uOriginStickY; + u8 uSubStickStickX; + u8 uSubStickStickY; + u8 uTrigger_L; + u8 uTrigger_R; + u8 unk_4; + u8 unk_5; + u8 unk_6; + u8 unk_7; + }; + + enum EDirectCommands + { + CMD_FORCE = 0x30, + CMD_WRITE = 0x40 + }; + + union UCommand + { + u32 Hex; + struct + { + u32 Parameter1 : 8; + u32 Parameter2 : 8; + u32 Command : 8; + u32 : 8; + }; + UCommand() {Hex = 0;} + UCommand(u32 _iValue) {Hex = _iValue;} + }; + + enum EButtonCombo + { + COMBO_NONE = 0, + COMBO_ORIGIN, + COMBO_RESET + }; + + // struct to compare input against + // Set on connection and (standard pad only) on button combo + SOrigin m_Origin; + + // PADAnalogMode + u8 m_Mode; + + // Timer to track special button combos: + // y, X, start for 3 seconds updates origin with current status + // Technically, the above is only on standard pad, wavebird does not support it for example + // b, x, start for 3 seconds triggers reset (PI reset button interrupt) + u64 m_TButtonComboStart, m_TButtonCombo; + // Type of button combo from the last/current poll + EButtonCombo m_LastButtonCombo; + +public: + + // Constructor + CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber); + + // Run the SI Buffer + virtual int RunBuffer(u8* _pBuffer, int _iLength); + + // Send and Receive pad input from network + static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); + static u8 NetPlay_GetPadNum(u8 numPAD); + + // Return true on new data + virtual bool GetData(u32& _Hi, u32& _Low); + + // Send a command directly + virtual void SendCommand(u32 _Cmd, u8 _Poll); + + // Savestate support + virtual void DoState(PointerWrap& p); +}; + +#endif diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp index 1c19f763ec..05331bc6cc 100644 --- a/Source/Core/Core/Src/NetPlay.cpp +++ b/Source/Core/Core/Src/NetPlay.cpp @@ -22,6 +22,7 @@ #include "IPC_HLE/WII_IPC_HLE_WiiMote.h" // for gcpad #include "HW/SI_DeviceGCController.h" +#include "HW/SI_DeviceGCSteeringWheel.h" // for gctime #include "HW/EXI_DeviceIPL.h" // for wiimote/ OSD messages @@ -296,6 +297,11 @@ bool CSIDevice_GCController::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u return false; } +bool CSIDevice_GCSteeringWheel::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus) +{ + return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus); +} + // called from ---CPU--- thread // so all players' games get the same time u32 CEXIIPL::NetPlay_GetGCTime() @@ -320,6 +326,11 @@ u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) return numPAD; } +u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD) +{ + return CSIDevice_GCController::NetPlay_GetPadNum(numPAD); +} + // called from ---CPU--- thread // wiimote update / used for frame counting //void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 76508daf7c..6e9987b1f4 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -79,6 +79,7 @@ static const wxLanguage langIds[] = #define DEV_DUMMY_STR _trans("Dummy") #define SIDEV_STDCONT_STR _trans("Standard Controller") +#define SIDEV_STEERING_STR _trans("Steering Wheel") #define SIDEV_BONGO_STR _trans("TaruKonga (Bongos)") #define SIDEV_GBA_STR "GBA" #define SIDEV_AM_BB_STR _trans("AM-Baseboard") @@ -391,6 +392,7 @@ void CConfigMain::InitializeGUIValues() wxArrayString SIDevices; SIDevices.Add(_(DEV_NONE_STR)); SIDevices.Add(_(SIDEV_STDCONT_STR)); + SIDevices.Add(_(SIDEV_STEERING_STR)); SIDevices.Add(_(SIDEV_BONGO_STR)); SIDevices.Add(_(SIDEV_GBA_STR)); SIDevices.Add(_(SIDEV_AM_BB_STR)); @@ -443,15 +445,18 @@ void CConfigMain::InitializeGUIValues() case SIDEVICE_GC_CONTROLLER: GCSIDevice[i]->SetStringSelection(SIDevices[1]); break; - case SIDEVICE_GC_TARUKONGA: + case SIDEVICE_GC_STEERING: GCSIDevice[i]->SetStringSelection(SIDevices[2]); break; - case SIDEVICE_GC_GBA: + case SIDEVICE_GC_TARUKONGA: GCSIDevice[i]->SetStringSelection(SIDevices[3]); break; - case SIDEVICE_AM_BASEBOARD: + case SIDEVICE_GC_GBA: GCSIDevice[i]->SetStringSelection(SIDevices[4]); break; + case SIDEVICE_AM_BASEBOARD: + GCSIDevice[i]->SetStringSelection(SIDevices[5]); + break; default: GCSIDevice[i]->SetStringSelection(SIDevices[0]); break; @@ -1053,6 +1058,8 @@ void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum) SIDevices tempType; if (!deviceName.compare(WXSTR_TRANS(SIDEV_STDCONT_STR))) tempType = SIDEVICE_GC_CONTROLLER; + else if (!deviceName.compare(WXSTR_TRANS(SIDEV_STEERING_STR))) + tempType = SIDEVICE_GC_STEERING; else if (!deviceName.compare(WXSTR_TRANS(SIDEV_BONGO_STR))) tempType = SIDEVICE_GC_TARUKONGA; else if (!deviceName.compare(wxT(SIDEV_GBA_STR))) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index 08d62bcfc1..5f80b6f32b 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -145,7 +145,7 @@ LCleanup: void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd) { std::list joysticks; - idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_ATTACHEDONLY ); + idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_FORCEFEEDBACK | DIEDFL_ATTACHEDONLY ); // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 @@ -254,9 +254,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI for (unsigned int offset = 0; offset < DIJOFS_BUTTON(0) / sizeof(LONG); ++offset) { range.diph.dwObj = offset * sizeof(LONG); - // try to set some nice power of 2 values (8192) - range.lMin = -(1 << 13); - range.lMax = (1 << 13); + // try to set some nice power of 2 values (128) to match the GameCube controls + range.lMin = -(1 << 7); + range.lMax = (1 << 7); m_device->SetProperty(DIPROP_RANGE, &range.diph); // but i guess not all devices support setting range // so i getproperty right afterward incase it didn't set :P @@ -281,17 +281,19 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI if ( objects.size() ) { // temporary - DWORD rgdwAxes[] = {DIJOFS_X, DIJOFS_Y}; - LONG rglDirection[] = {0, 0}; + DWORD rgdwAxes[2] = {DIJOFS_X, DIJOFS_Y}; + LONG rglDirection[2] = {-200, 0}; DIEFFECT eff; ZeroMemory(&eff, sizeof(eff)); eff.dwSize = sizeof(DIEFFECT); eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.dwDuration = INFINITE; // (4 * DI_SECONDS) + eff.dwSamplePeriod = 0; eff.dwGain = DI_FFNOMINALMAX; eff.dwTriggerButton = DIEB_NOTRIGGER; - eff.cAxes = std::min((DWORD)2, (DWORD)objects.size()); + eff.dwTriggerRepeatInterval = 0; + eff.cAxes = std::min((DWORD)1, (DWORD)objects.size()); eff.rgdwAxes = rgdwAxes; eff.rglDirection = rglDirection; @@ -310,7 +312,12 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI { // ugly if ladder if (0 == f) + { + DICONSTANTFORCE diCF = {-10000}; + diCF.lMagnitude = DI_FFNOMINALMAX; eff.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + eff.lpvTypeSpecificParams = &diCF; + } else if (1 == f) eff.cbTypeSpecificParams = sizeof(DIRAMPFORCE); else @@ -528,7 +535,11 @@ ControlState Joystick::Hat::GetState() const void Joystick::ForceConstant::SetState(const ControlState state) { - const LONG new_val = LONG(10000 * state); + float force = abs(state - 0.5) * 2; + if (state < 0.5) + force = -force; + + const LONG new_val = LONG(10000 * force); LONG &val = params.lMagnitude; if (val != new_val) From 539bf405f2df07e84ac0d549c4553d0b1435d231 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Sun, 30 Dec 2012 16:31:38 +1300 Subject: [PATCH 293/627] In memory of calc84. http://dolphin-emu.org --- Source/Core/Common/Src/x64Emitter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 19e96478d1..5f8d0a66f1 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -1068,8 +1068,10 @@ void XEmitter::XOR (int bits, const OpArg &a1, const OpArg &a2) {WriteNormalOp(t void XEmitter::MOV (int bits, const OpArg &a1, const OpArg &a2) { #ifdef _DEBUG +#ifndef _M_X64 _assert_msg_(DYNA_REC, !a1.IsSimpleReg() || !a2.IsSimpleReg() || a1.GetSimpleReg() != a2.GetSimpleReg(), "Redundant MOV @ %p - bug in JIT?", - code); + code); +#endif #endif WriteNormalOp(this, bits, nrmMOV, a1, a2); } From b4f30e549e033f27fa38b45a2b1d152a301c0813 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 29 Dec 2012 21:50:07 -0600 Subject: [PATCH 294/627] Missed a precision qualifier in a HWRasterizer shader. --- Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index dba6f7f12c..a5609f51b2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -62,7 +62,7 @@ namespace HwRasterizer "}\n"; // Clear shader static const char *fragclearText = - "uniform vec4 Color;\n" + "uniform " PREC " vec4 Color;\n" "void main() {\n" " gl_FragColor = Color;\n" "}\n"; From b2911516de5ca632debc87bac2fc9a48f8d03f04 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 30 Dec 2012 01:42:33 -0600 Subject: [PATCH 295/627] Disable the warning about va_list being mangled differently now. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e5a866500..b025de11ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ if(NOT MSVC) endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag -add_definitions(-fno-strict-aliasing -fno-exceptions) +add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi) include(CheckCXXCompilerFlag) From 49ed752126a2656e208eb9ca9902ebe9b06ad6c9 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 30 Dec 2012 02:12:31 -0600 Subject: [PATCH 296/627] This line in SWRenderer has been wrong ever since the beginning. --- Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index e148906692..3a5e28f68f 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -148,7 +148,7 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)glHeight; + GLfloat v_max = (GLfloat)height; static const GLfloat verts[4][2] = { { -1, -1}, // Left top From e5d5365bacb0fb9b579a0f51902990547c15fec7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 30 Dec 2012 02:34:14 -0600 Subject: [PATCH 297/627] Fix the last few warnings in Dolphin on my system. --- .../VideoCommon/Src/PixelShaderManager.cpp | 18 ++++++++++++++++-- .../VideoCommon/Src/VertexShaderManager.cpp | 18 ++++++++++++++++-- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 6 +++--- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index f195cd805b..258ec04413 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -302,8 +302,7 @@ void PixelShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; - // TODO: This code is wrong. i goes out of range for xfregs.ambColor. - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 2; ++i) { if (nMaterialsChanged & (1 << i)) { @@ -317,6 +316,21 @@ void PixelShaderManager::SetConstants() SetPSConstant4fv(C_PMATERIALS + i, material); } } + + for (int i = 0; i < 2; ++i) + { + if (nMaterialsChanged & (1 << (i + 2))) + { + u32 data = *(xfregs.matColor + i); + + material[0] = ((data >> 24) & 0xFF) * NormalizationCoef; + material[1] = ((data >> 16) & 0xFF) * NormalizationCoef; + material[2] = ((data >> 8) & 0xFF) * NormalizationCoef; + material[3] = ( data & 0xFF) * NormalizationCoef; + + SetPSConstant4fv(C_PMATERIALS + i + 2, material); + } + } nMaterialsChanged = 0; } diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 12445f283a..d960710ada 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -251,8 +251,7 @@ void VertexShaderManager::SetConstants() float GC_ALIGNED16(material[4]); float NormalizationCoef = 1 / 255.0f; - // TODO: This code is wrong. i goes out of range for xfregs.ambColor. - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 2; ++i) { if (nMaterialsChanged & (1 << i)) { @@ -266,6 +265,21 @@ void VertexShaderManager::SetConstants() SetVSConstant4fv(C_MATERIALS + i, material); } } + + for (int i = 0; i < 2; ++i) + { + if (nMaterialsChanged & (1 << (i + 2))) + { + u32 data = *(xfregs.matColor + i); + + material[0] = ((data >> 24) & 0xFF) * NormalizationCoef; + material[1] = ((data >> 16) & 0xFF) * NormalizationCoef; + material[2] = ((data >> 8) & 0xFF) * NormalizationCoef; + material[3] = ( data & 0xFF) * NormalizationCoef; + + SetVSConstant4fv(C_MATERIALS + i + 2, material); + } + } nMaterialsChanged = 0; } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 3a5e28f68f..d2f77cd256 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -146,9 +146,6 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)height; static const GLfloat verts[4][2] = { { -1, -1}, // Left top @@ -158,6 +155,9 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) }; //Texture rectangle uses pixel coordinates #ifndef USE_GLES + GLfloat u_max = (GLfloat)width; + GLfloat v_max = (GLfloat)height; + static const GLfloat texverts[4][2] = { {0, v_max}, {0, 0}, From ff3b22e1ff8a29fb70c06b5037f3d31f93b7ff14 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 30 Dec 2012 03:28:50 -0600 Subject: [PATCH 298/627] Clear up some warnings that crop up from -Wextra --- Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp | 2 +- Source/Core/Core/Src/HW/EXI_DeviceEthernet.h | 2 +- Source/Core/Core/Src/HW/EXI_DeviceIPL.h | 2 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 6 +++--- Source/Core/VideoCommon/Src/VideoCommon.h | 17 +++++++---------- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp index 4197d01350..50c7de4cd2 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp @@ -290,7 +290,7 @@ bool CEXIETHERNET::IsWriteCommand(u32 const data) return IsMXCommand(data) ? !!(data & (1 << 30)) : !!(data & (1 << 14)); } -char const * const CEXIETHERNET::GetRegisterName() const +const char* CEXIETHERNET::GetRegisterName() const { #define STR_RETURN(x) case x: return #x; diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h index 6a3a552f38..0ee352eea5 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h @@ -297,7 +297,7 @@ public: bool IsMXCommand(u32 const data); bool IsWriteCommand(u32 const data); - char const * const GetRegisterName() const; + const char* GetRegisterName() const; void MXHardReset(); void MXCommandHandler(u32 data, u32 size); void DirectFIFOWrite(u8 *data, u32 size); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h index 4788f21adb..ed5cf0c922 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h @@ -78,7 +78,7 @@ private: virtual void TransferByte(u8 &_uByte); bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } - u32 const CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } + const u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } void LoadFileToIPL(std::string filename, u32 offset); }; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 6b490a1922..2061a106e0 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -196,7 +196,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) switch (Mode){ case 0: { - if (SeekPosition >=0 && SeekPosition <= fileSize) + if (SeekPosition <= fileSize) { m_SeekPos = SeekPosition; ReturnValue = m_SeekPos; @@ -206,7 +206,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 1: { u32 wantedPos = SeekPosition+m_SeekPos; - if (wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; @@ -216,7 +216,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) case 2: { u64 wantedPos = fileSize+m_SeekPos; - if (wantedPos >=0 && wantedPos <= fileSize) + if (wantedPos <= fileSize) { m_SeekPos = wantedPos; ReturnValue = m_SeekPos; diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index f067fb9d6b..1eeed20b82 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -44,17 +44,14 @@ enum EFB_HEIGHT = 528, }; -enum -{ - // XFB width is decided by EFB copy operation. The VI can do horizontal - // scaling (TODO: emulate). - MAX_XFB_WIDTH = EFB_WIDTH, +// XFB width is decided by EFB copy operation. The VI can do horizontal +// scaling (TODO: emulate). +const u32 MAX_XFB_WIDTH = EFB_WIDTH; - // Although EFB height is 528, 574-line XFB's can be created either with - // vertical scaling by the EFB copy operation or copying to multiple XFB's - // that are next to each other in memory (TODO: handle that situation). - MAX_XFB_HEIGHT = 574 -}; +// Although EFB height is 528, 574-line XFB's can be created either with +// vertical scaling by the EFB copy operation or copying to multiple XFB's +// that are next to each other in memory (TODO: handle that situation). +const u32 MAX_XFB_HEIGHT = 574; // Logging // ---------- From 64afbade33f0c048472a214ef3841c6687eadeeb Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 30 Dec 2012 04:32:37 -0600 Subject: [PATCH 299/627] Fix 4 warnings on OSX --- Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 1 + Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp index 0db1f8d632..d5415c8ed9 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -50,6 +50,7 @@ bool cInterfaceWX::Create(void *&window_handle) GLWin.glCanvas->Show(true); if (GLWin.glCtxt == NULL) // XXX dirty hack GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); + return true; } bool cInterfaceWX::MakeCurrent() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp index f2631c9238..6722ec7935 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp @@ -355,7 +355,7 @@ namespace EfbInterface dstClr = (~srcClr) & dstClr; break; case 5: // noop - dstClr = dstClr; + // Do nothing break; case 6: // xor dstClr = srcClr ^ dstClr; From 71bb297f2cecc94ca6d045a877f0731e1507471f Mon Sep 17 00:00:00 2001 From: rog Date: Sun, 30 Dec 2012 06:48:37 -0500 Subject: [PATCH 300/627] Always count gc controller inputs. --- Source/Core/Core/Src/HW/SI_DeviceGCController.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp index 74c020fd39..8c4c562b82 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp @@ -132,14 +132,12 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low) if(Movie::IsPlayingInput()) { Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Movie::IsUsingWiimote(0)) - Movie::InputUpdate(); + Movie::InputUpdate(); } else if(Movie::IsRecordingInput()) { Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Movie::IsUsingWiimote(0)) - Movie::InputUpdate(); + Movie::InputUpdate(); } else Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); From bcf1f54c65de6341e24d1d89d5a21da7527fe0cd Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 31 Dec 2012 02:29:36 +0100 Subject: [PATCH 301/627] Optimized the Dolphin SEO process a bit --- Source/Core/DolphinWX/Src/Main.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index fc3e2c41a7..75725337c8 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -45,6 +45,10 @@ #include +#ifdef _WIN32 +#include +#endif + // Nvidia drivers >= v302 will check if the application exports a global // variable named NvOptimusEnablement to know if it should run the app in high // performance graphics mode or using the IGP. @@ -264,6 +268,18 @@ bool DolphinApp::OnInit() int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth; int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight; +#ifdef _WIN32 + if (File::Exists("www.dolphin-emulator.com.txt")) + { + MessageBox(NULL, + L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please " + L"download Dolphin from the official website instead: http://dolphin-emu.org/", + L"Unofficial version detected", MB_OK | MB_ICONWARNING); + ShellExecute(NULL, L"open", L"http://dolphin-emu.org/?ref=badver", NULL, NULL, SW_SHOWDEFAULT); + exit(0); + } +#endif + // The following is not needed with X11, where window managers // do not allow windows to be created off the desktop. #ifdef _WIN32 From 4c374cd58a00aed9091c323045058e7667eb71fd Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 31 Dec 2012 15:27:36 +1300 Subject: [PATCH 302/627] Improve file search speeds by deleting an unused file. --- Source/Core/DolphinWX/Src/Main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 75725337c8..338ed59547 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -271,6 +271,7 @@ bool DolphinApp::OnInit() #ifdef _WIN32 if (File::Exists("www.dolphin-emulator.com.txt")) { + File::Delete("www.dolphin-emulator.com.txt"); MessageBox(NULL, L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please " L"download Dolphin from the official website instead: http://dolphin-emu.org/", From c728ef2cd30ef803210d5db0a1ecab6b198a2c65 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 1 Jan 2013 14:42:30 +1300 Subject: [PATCH 303/627] Last warning for me on Linux. --- Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp index ee5908889a..687982cfb9 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp @@ -218,13 +218,12 @@ void DSPJitRegCache::flushRegs(DSPJitRegCache &cache, bool emit) do { movcnt = 0; for(i = 0; i <= DSP_REG_MAX_MEM_BACKED; i++) { - if (cache.regs[i].loc.GetSimpleReg() != - regs[i].loc.GetSimpleReg() && - xregs[cache.regs[i].loc.GetSimpleReg()].guest_reg == DSP_REG_NONE) + X64Reg simple = regs[i].loc.GetSimpleReg(); + X64Reg simple_cache = cache.regs[i].loc.GetSimpleReg(); + if (simple_cache != simple + && xregs[simple_cache].guest_reg == DSP_REG_NONE) { - movToHostReg(i, - cache.regs[i].loc.GetSimpleReg(), - true); + movToHostReg(i, simple_cache, true); movcnt++; } } From 51603f052220b6240ac9c316ab791c3738e260ef Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 1 Jan 2013 13:49:22 +1100 Subject: [PATCH 304/627] * Implemented working pedal support. * Changed the mapping of the steering wheel to: Main Stick Left/Right = Steer Left/Right Main Stick Up = Accelerate Main Stick Down = Brake * Fixed non-force feedback controllers that were not detected --- .../Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 23 ++++++++++++++++--- .../Core/Src/HW/SI_DeviceGCSteeringWheel.h | 1 + .../DInput/DInputJoystick.cpp | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 113fe186b1..7783261da9 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -92,6 +92,10 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength) } break; + // Seen in F-Zero GX + case CMD_MOTOR_OFF: + break; + // DEFAULT default: { @@ -144,12 +148,12 @@ bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); // Thankfully changing mode does not change the high bits ;) - _Hi = (u32)((u8)PadStatus.stickY); - _Hi |= (u32)((u8)PadStatus.stickX << 8); + _Hi = (u32)((u8)PadStatus.stickX); // Steering + _Hi |= 0x800; // Pedal connected flag _Hi |= (u32)((u16)(PadStatus.button | PAD_USE_ORIGIN) << 16); // Low bits are packed differently per mode - if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7) + if (m_Mode == 0 || m_Mode == 5 || m_Mode == 7) { _Low = (u8)(PadStatus.analogB >> 4); // Top 4 bits _Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4); // Top 4 bits @@ -192,6 +196,19 @@ bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) _Low |= (u32)((u8)PadStatus.substickY << 16); // All 8 bits _Low |= (u32)((u8)PadStatus.substickX << 24); // All 8 bits } + else if (m_Mode == 6) + { + _Low = (u8)PadStatus.triggerRight; // All 8 bits + _Low |= (u32)((u8)PadStatus.triggerLeft << 8); // All 8 bits + + // The GC Steering Wheel appears to have combined pedals + // (both the Accelerate and Brake pedals are mapped to a single axis) + // We use the stickY axis for the pedals. + if (PadStatus.stickY < 128) + _Low |= (u32)((u8)(255 - ((PadStatus.stickY & 0x7f) * 2)) << 16); // All 8 bits (Brake) + if (PadStatus.stickY >= 128) + _Low |= (u32)((u8)((PadStatus.stickY & 0x7f) * 2) << 24); // All 8 bits (Accelerate) + } // Keep track of the special button combos (embedded in controller hardware... :( ) EButtonCombo tempCombo; diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h index 1814c8d6e4..2245765863 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.h @@ -33,6 +33,7 @@ private: CMD_RESET = 0x00, CMD_ORIGIN = 0x41, CMD_RECALIBRATE = 0x42, + CMD_MOTOR_OFF = 0xff, }; struct SOrigin diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index 5f80b6f32b..b7ac3bf82e 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -145,7 +145,7 @@ LCleanup: void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd) { std::list joysticks; - idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_FORCEFEEDBACK | DIEDFL_ATTACHEDONLY ); + idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_ATTACHEDONLY ); // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 From 9af711b12c8248f3f806725644e93fdf9024bd37 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 31 Dec 2012 21:57:39 -0500 Subject: [PATCH 305/627] Always count GC wheel inputs too. --- Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index 7783261da9..f69ccd2fc1 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -135,14 +135,12 @@ bool CSIDevice_GCSteeringWheel::GetData(u32& _Hi, u32& _Low) if(Movie::IsPlayingInput()) { Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Movie::IsUsingWiimote(0)) - Movie::InputUpdate(); + Movie::InputUpdate(); } else if(Movie::IsRecordingInput()) { Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber); - if(!Movie::IsUsingWiimote(0)) - Movie::InputUpdate(); + Movie::InputUpdate(); } else Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber); From 3fd1b4ee83e02de1d9ed8d145ec21b88c16b523c Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 1 Jan 2013 15:13:18 +1100 Subject: [PATCH 306/627] Removed some debug testing code. --- Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp index f69ccd2fc1..ade19b758e 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp @@ -265,8 +265,6 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll) // get the correct pad number that should rumble locally when using netplay const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber); - NOTICE_LOG(COMMON, "Type: %d Strength: %d", uType, uStrength); - if (numPAD < 4) Pad::Motor(numPAD, uType, uStrength); From 5fbce28bbce934bbe01cb8cd9acb853e6c8f1707 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 1 Jan 2013 16:18:52 -0500 Subject: [PATCH 307/627] Save git hash to .dtm header. --- Source/Core/Core/Src/Movie.cpp | 8 ++++++++ Source/Core/Core/Src/Movie.h | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 5eb1660d8e..316181d449 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -36,6 +36,7 @@ #include "HW/DVDInterface.h" #include "../../Common/Src/NandPaths.h" #include "Crypto/md5.h" +#include "scmrev.h" // The chunk to allocate movie data in multiples of. #define DTM_BASE_LENGTH (1024) @@ -72,6 +73,7 @@ std::string author = ""; u64 g_titleID = 0; unsigned char MD5[16]; u8 bongos; +u8 revision[20]; bool g_bRecordingFromSaveState = false; bool g_bPolled = false; @@ -687,6 +689,7 @@ void ReadHeader() g_bClearSave = tmpHeader.bClearSave; bMemcard = tmpHeader.bMemcard; bongos = tmpHeader.bongos; + memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision)); } else { @@ -1132,6 +1135,7 @@ void SaveRecording(const char *filename) strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); memcpy(header.md5,MD5,16); header.bongos = bongos; + memcpy(header.revision, revision, ARRAYSIZE(header.revision)); // TODO header.uniqueID = 0; @@ -1189,6 +1193,10 @@ void GetSettings() if (!Core::g_CoreStartupParameter.bWii) g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; + + std::stringstream ss; + ss << std::hex << SCM_REV_STR; + ss >> revision; } void CheckMD5() diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h index 2cb4c78e23..79b5e72f29 100644 --- a/Source/Core/Core/Src/Movie.h +++ b/Source/Core/Core/Src/Movie.h @@ -121,7 +121,8 @@ struct DTMHeader { u8 bongos; u8 reserved[15]; // Padding for any new config options u8 discChange[40]; // Name of iso file to switch to, for two disc games. - u8 reserved2[47]; // Make heading 256 bytes, just because we can + u8 revision[20]; // Git hash + u8 reserved2[27]; // Make heading 256 bytes, just because we can }; static_assert(sizeof(DTMHeader) == 256, "DTMHeader should be 256 bytes"); From 91023e133b4639f93fbcdb153f66179f7b9b5dff Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 2 Jan 2013 01:21:20 -0500 Subject: [PATCH 308/627] Move widescreen hack to enhancements tab. --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 20bd4dfb38..f59c7c34c9 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -405,6 +405,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con _3d_vision = CreateCheckBox(page_enh, _("3D Vision"), wxGetTranslation(_3d_vision_desc), vconfig.b3DVision); _3d_vision->Show(vconfig.backend_info.bSupports3DVision); szr_enh->Add(_3d_vision); + szr_enh->Add(CreateCheckBox(page_enh, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack)); // TODO: Add anaglyph 3d here wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_enh, _("Enhancements")); @@ -553,8 +554,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_misc->Add(CreateCheckBox(page_advanced, _("Crop"), wxGetTranslation(crop_desc), vconfig.bCrop)); szr_misc->Add(CreateCheckBox(page_advanced, _("Enable Hotkeys"), wxGetTranslation(hotkeys_desc), vconfig.bOSDHotKey)); - szr_misc->Add(CreateCheckBox(page_advanced, _("Widescreen Hack"), wxGetTranslation(ws_hack_desc), vconfig.bWidescreenHack)); - // Progressive Scan { wxCheckBox* const cb_prog_scan = new wxCheckBox(page_advanced, wxID_ANY, _("Enable Progressive Scan")); From 3da05af30ab82639b5898f6ef46326bdd2f1dc7e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 3 Jan 2013 10:35:07 -0600 Subject: [PATCH 309/627] Fix truncated names and descriptions in the game list on linux. --- Source/Core/Common/Src/ChunkFile.h | 9 ++++++++- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 15 ++++++++------- Source/Core/DolphinWX/Src/ISOFile.cpp | 6 +++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index be8b49a3a3..e26536735d 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -155,7 +155,14 @@ public: Do(stringLen); switch (mode) { - case MODE_READ: x = (wchar_t*)*ptr; break; + case MODE_READ: + { + wchar_t* tmp = new wchar_t[stringLen / sizeof(wchar_t)]; + memcpy(tmp, *ptr, stringLen); + x = tmp; + delete[] tmp; + } + break; case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; case MODE_MEASURE: break; case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index fbefb1c769..c67ee83ed3 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -464,14 +464,15 @@ void CGameListCtrl::InsertItemInReportView(long _Index) SelectedLanguage = 0; default: { - wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); - rISOFile.GetName(wstring_name, SelectedLanguage); + wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252)); + rISOFile.GetName(wstring_name, SelectedLanguage); - name = wxString(rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252); - m_gameList.append(StringFromFormat("%s (%c)\n", - rISOFile.GetName(SelectedLanguage).c_str(), (rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA)?'U':'E')); - description = wxString(company.size() ? company.c_str() : - rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252); + name = wxString(rISOFile.GetName(SelectedLanguage).c_str(), WindowsCP1252); + m_gameList.append(StringFromFormat("%s (%c)\n", + rISOFile.GetName(SelectedLanguage).c_str(), + (rISOFile.GetCountry() == DiscIO::IVolume::COUNTRY_USA) ? 'U' : 'E')); + description = wxString(company.size() ? company.c_str() : + rISOFile.GetDescription(SelectedLanguage).c_str(), WindowsCP1252); } break; } diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index a3d3761e62..a00ce2c496 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -140,8 +140,8 @@ GameListItem::GameListItem(const std::string& _rFileName) SplitPath(m_FileName, NULL, &FileName, NULL); int length = FileName.length(); wFileName.reserve(length+1); - for (int i = 0; i < length; ++i) - wFileName.push_back(FileName[i]); + for (int j = 0; j < length; ++j) + wFileName.push_back(FileName[j]); wFileName.push_back(0); } *i = wFileName; @@ -283,7 +283,7 @@ bool GameListItem::GetName(std::wstring& wName, int index) const // This function will only succeed for wii discs with banners or WADs // utilize the same array as for gc discs (-1= Japanese, 0 = English etc index++; - if ((index >=0) && (index < 10)) + if ((index >= 0) && (index < 10)) { if (m_wNames.size() > (size_t)index) { From 4f531fe1229b2f18b17feb82f12f0a75b0a781eb Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 3 Jan 2013 16:40:18 -0500 Subject: [PATCH 310/627] Remove unused progressive scan option from iso properties, and disable audio settings while a game is running. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 6 ++++++ Source/Core/DolphinWX/Src/ISOProperties.cpp | 20 -------------------- Source/Core/DolphinWX/Src/ISOProperties.h | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 76508daf7c..8fad769b29 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -618,6 +618,12 @@ void CConfigMain::CreateGUIControls() FrequencySelection->Append(wxString::Format(_("%d Hz"), 48000)); FrequencySelection->Append(wxString::Format(_("%d Hz"), 32000)); + if (Core::GetState() != Core::CORE_UNINITIALIZED) + { + FrequencySelection->Disable(); + BackendSelection->Disable(); + } + // Create sizer and add items to dialog wxStaticBoxSizer *sbAudioSettings = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Sound Settings")); sbAudioSettings->Add(DSPEngine, 0, wxALL | wxEXPAND, 5); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 61139d985f..0b75b03d59 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -328,7 +328,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Wii Console - EnableProgressiveScan = new wxCheckBox(m_GameConfig, ID_ENABLEPROGRESSIVESCAN, _("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); DisableWiimoteSpeaker = new wxCheckBox(m_GameConfig, ID_DISABLEWIIMOTESPEAKER, _("Alternate Wiimote Timing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); @@ -378,18 +377,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO)) { sbWiiOverrides->ShowItems(false); - EnableProgressiveScan->Hide(); EnableWideScreen->Hide(); DisableWiimoteSpeaker->Hide(); } - else - { - // Progressive Scan is not used by Dolphin itself, and changing it on a per-game - // basis would have the side-effect of changing the SysConf, making this setting - // rather useless. - EnableProgressiveScan->Disable(); - } - sbWiiOverrides->Add(EnableProgressiveScan, 0, wxLEFT, 5); sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); sbWiiOverrides->Add(DisableWiimoteSpeaker, 0, wxLEFT, 5); @@ -971,11 +961,6 @@ void CISOProperties::LoadGameConfig() else DSPHLE->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Display", "ProgressiveScan", &bTemp)) - EnableProgressiveScan->Set3StateValue((wxCheckBoxState)bTemp); - else - EnableProgressiveScan->Set3StateValue(wxCHK_UNDETERMINED); - // ?? if (GameIni.Get("Wii", "Widescreen", &bTemp)) EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp); @@ -1071,11 +1056,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Core", "DSPHLE", DSPHLE->Get3StateValue()); - if (EnableProgressiveScan->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Display", "ProgressiveScan"); - else - GameIni.Set("Display", "ProgressiveScan", EnableProgressiveScan->Get3StateValue()); - if (EnableWideScreen->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Wii", "Widescreen"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index da275136fe..9d71e675e2 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -72,7 +72,7 @@ private: wxCheckBox *CPUThread, *SkipIdle, *MMU, *MMUBAT, *TLBHack; wxCheckBox *VBeam, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii - wxCheckBox *EnableProgressiveScan, *EnableWideScreen, *DisableWiimoteSpeaker; + wxCheckBox *EnableWideScreen, *DisableWiimoteSpeaker; // Video wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox; wxButton *PHSettings; From 12a606501c108de1c513f4aacf4e345fe077bd8d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 3 Jan 2013 19:21:20 -0600 Subject: [PATCH 311/627] Fix the name and description truncation issue in a cleaner way. --- Source/Core/Common/Src/ChunkFile.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index e26536735d..5a6f26e7c3 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -155,14 +155,7 @@ public: Do(stringLen); switch (mode) { - case MODE_READ: - { - wchar_t* tmp = new wchar_t[stringLen / sizeof(wchar_t)]; - memcpy(tmp, *ptr, stringLen); - x = tmp; - delete[] tmp; - } - break; + case MODE_READ: x.assign((wchar_t*)*ptr, stringLen / sizeof(wchar_t)); break; case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; case MODE_MEASURE: break; case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; From 9b51c99c6ba5f1b5f256032f6750540d7d8b2b0e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 3 Jan 2013 19:49:19 -0600 Subject: [PATCH 312/627] Make sure the null character is not included in the string. --- Source/Core/Common/Src/ChunkFile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 5a6f26e7c3..38e1b2176c 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -155,7 +155,7 @@ public: Do(stringLen); switch (mode) { - case MODE_READ: x.assign((wchar_t*)*ptr, stringLen / sizeof(wchar_t)); break; + case MODE_READ: x.assign((wchar_t*)*ptr, (stringLen / sizeof(wchar_t)) - 1); break; case MODE_WRITE: memcpy(*ptr, x.c_str(), stringLen); break; case MODE_MEASURE: break; case MODE_VERIFY: _dbg_assert_msg_(COMMON, x == (wchar_t*)*ptr, "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), (wchar_t*)*ptr, ptr); break; From 1c9c6052d5fb3264a3a687b1d6fb87b89f229e7e Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 Jan 2013 12:32:47 +1100 Subject: [PATCH 313/627] Corrected a state bug where newly loaded dols did not have their patches applied. --- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index 4a17ffd748..da39a71372 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -40,7 +40,6 @@ namespace HLE_Misc std::string args; u32 argsPtr; u32 bootType; -u16 IOSv; // Helper to quickly read the floating point value at a memory location. inline float F(u32 addr) @@ -312,6 +311,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) // Scan for common HLE functions if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) { + g_symbolDB.Clear(); PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); SignatureDB db; if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) @@ -325,9 +325,15 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) PowerPC::ppcState.iCache.Reset(); static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); - for (unsigned int i = 0; i < 4; i++) + bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; + for(unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) + wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); + + WII_IPC_HLE_Interface::Reset(true); + WII_IPC_HLE_Interface::Init(); + for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) { - if (s_Usb->m_WiiMotes[i].IsConnected()) + if (wiiMoteConnected[i]) { s_Usb->m_WiiMotes[i].Activate(false); s_Usb->m_WiiMotes[i].Activate(true); @@ -338,6 +344,8 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) } } + delete[] wiiMoteConnected; + if (argsPtr) { u32 args_base = Memory::Read_U32(0x800000f4); @@ -475,11 +483,14 @@ void OSGetResetCode() NPC = LR; } +u16 GetIOSVersion() +{ + return Memory::Read_U16(0x00003140); +} + void OSBootDol() { - IOSv = Memory::Read_U16(0x00003140); - - if (IOSv >= 30) + if (GetIOSVersion() >= 30) { bootType = GPR(4); From c61b0c7fbaf2cb1f0ce80e825022f16d26a736c3 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 5 Jan 2013 12:56:35 +1100 Subject: [PATCH 314/627] Build fix --- Source/Core/Core/Src/HLE/HLE.cpp | 8 ++++---- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index 457870ba1d..ae25060c64 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -58,10 +58,10 @@ static const SPatch OSPatches[] = // speedup //{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, //{ "THPPlayerGetState", HLE_Misc:THPPlayerGetState, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, - //{ "memcpy", HLE_Misc::memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memcmp", HLE_Misc::memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memset", HLE_Misc::memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, - //{ "memmove", HLE_Misc::memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memcpy", HLE_Misc::gc_memcpy, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memcmp", HLE_Misc::gc_memcmp, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memset", HLE_Misc::gc_memset, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, + //{ "memmove", HLE_Misc::gc_memmove, HLE_HOOK_REPLACE, HLE_TYPE_MEMORY }, //{ "__div2i", HLE_Misc::div2i, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? //{ "__div2u", HLE_Misc::div2u, HLE_HOOK_REPLACE, HLE_TYPE_GENERIC }, // Slower? diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index da39a71372..e6d1fc5611 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -358,7 +358,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize) Memory::Write_U32(num_args, args_base + ptr_to_num_args); Memory::Write_U32(0x14, hi_ptr); - for (int i = 0; i < args.length(); i++) + for (unsigned int i = 0; i < args.length(); i++) Memory::WriteUnchecked_U8(args[i], new_args_ptr+i); } @@ -412,39 +412,39 @@ u32 GetDolFileSize(std::string dol) return (u32)pFileSystem->GetFileSize(dolFile.c_str()); } -void memmove() +void gc_memmove() { u32 dest = GPR(3); u32 src = GPR(4); u32 count = GPR(5); - std::memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + memmove((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); NPC = LR; } -void memcpy() +void gc_memcpy() { u32 dest = GPR(3); u32 src = GPR(4); u32 count = GPR(5); - std::memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + memcpy((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); NPC = LR; } -void memset() +void gc_memset() { u32 dest = GPR(3); u32 ch = GPR(4); u32 count = GPR(5); - std::memset((u8*)(Memory::base + dest), ch, count); + memset((u8*)(Memory::base + dest), ch, count); NPC = LR; } -void memcmp() +void gc_memcmp() { u32 dest = GPR(3); u32 src = GPR(4); u32 count = GPR(5); - GPR(3) = std::memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); + GPR(3) = memcmp((u8*)(Memory::base + dest), (u8*)(Memory::base + src), count); NPC = LR; } From 1d691d7de4d640c998daa060201740c63d11d22a Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 6 Jan 2013 14:36:38 +1100 Subject: [PATCH 315/627] Fixed SSBB from starting at the mini-games screen. --- Source/Core/Core/Src/HLE/HLE_Misc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index e6d1fc5611..162cc4698d 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -471,7 +471,8 @@ void div2u() void OSGetResetCode() { u32 resetCode = Memory::Read_U32(0xCC003024); - if (resetCode != 0) + + if ((resetCode & 0x1fffffff) != 0) { GPR(3) = resetCode | 0x80000000; } From 7a957134968963a1c53f635afbb91c53b15d9e2b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 5 Jan 2013 22:45:32 -0600 Subject: [PATCH 316/627] Fix some warnings. Changes suggested by nerzhultheking. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 47737326f4..c5ea6fcb06 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -253,15 +253,15 @@ void DoState(PointerWrap &p) u32 i; for (i=0; i Date: Mon, 7 Jan 2013 12:16:04 +1100 Subject: [PATCH 317/627] OpenAL for Windows initial commit --- Externals/OpenAL/Win32/EFX-Util.lib | Bin 0 -> 9934 bytes Externals/OpenAL/Win32/OpenAL32.dll | Bin 0 -> 110592 bytes Externals/OpenAL/Win32/OpenAL32.lib | Bin 0 -> 20552 bytes Externals/OpenAL/Win32/wrap_oal.dll | Bin 0 -> 413696 bytes Externals/OpenAL/Win64/EFX-Util.lib | Bin 0 -> 15984 bytes Externals/OpenAL/Win64/OpenAL32.dll | Bin 0 -> 133632 bytes Externals/OpenAL/Win64/OpenAL32.lib | Bin 0 -> 19858 bytes Externals/OpenAL/Win64/wrap_oal.dll | Bin 0 -> 419840 bytes Externals/OpenAL/include/EFX-Util.h | 422 +++++++++++ Externals/OpenAL/include/al.h | 732 +++++++++++++++++++ Externals/OpenAL/include/alc.h | 281 ++++++++ Externals/OpenAL/include/efx-creative.h | 151 ++++ Externals/OpenAL/include/efx.h | 737 ++++++++++++++++++++ Externals/OpenAL/include/xram.h | 94 +++ Source/Core/AudioCommon/AudioCommon.vcxproj | 48 +- Source/Core/Common/Src/Common.h | 3 +- 16 files changed, 2445 insertions(+), 23 deletions(-) create mode 100644 Externals/OpenAL/Win32/EFX-Util.lib create mode 100644 Externals/OpenAL/Win32/OpenAL32.dll create mode 100644 Externals/OpenAL/Win32/OpenAL32.lib create mode 100644 Externals/OpenAL/Win32/wrap_oal.dll create mode 100644 Externals/OpenAL/Win64/EFX-Util.lib create mode 100644 Externals/OpenAL/Win64/OpenAL32.dll create mode 100644 Externals/OpenAL/Win64/OpenAL32.lib create mode 100644 Externals/OpenAL/Win64/wrap_oal.dll create mode 100644 Externals/OpenAL/include/EFX-Util.h create mode 100644 Externals/OpenAL/include/al.h create mode 100644 Externals/OpenAL/include/alc.h create mode 100644 Externals/OpenAL/include/efx-creative.h create mode 100644 Externals/OpenAL/include/efx.h create mode 100644 Externals/OpenAL/include/xram.h diff --git a/Externals/OpenAL/Win32/EFX-Util.lib b/Externals/OpenAL/Win32/EFX-Util.lib new file mode 100644 index 0000000000000000000000000000000000000000..94ab9c817a4e0d1b9b4a3a02a1ff104226244756 GIT binary patch literal 9934 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 literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/Win32/OpenAL32.dll b/Externals/OpenAL/Win32/OpenAL32.dll new file mode 100644 index 0000000000000000000000000000000000000000..b63bb2f3012f9e355fbc444971994716b2dcbbb5 GIT binary patch literal 110592 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

T+&f$ixghDt873WzpILVUW$M7He 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 literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/Win64/OpenAL32.dll b/Externals/OpenAL/Win64/OpenAL32.dll new file mode 100644 index 0000000000000000000000000000000000000000..f36943df401562cf63d08eda15a02a7244ebe27c GIT binary patch literal 133632 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 literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/Win64/OpenAL32.lib b/Externals/OpenAL/Win64/OpenAL32.lib new file mode 100644 index 0000000000000000000000000000000000000000..17663e0a388887093e8cff00a892b0c8c4851360 GIT binary patch literal 19858 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 literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/Win64/wrap_oal.dll b/Externals/OpenAL/Win64/wrap_oal.dll new file mode 100644 index 0000000000000000000000000000000000000000..1ab0365711f7e19ca409b5353f69e3556ad08bf6 GIT binary patch literal 419840 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

Q~J3$t#;CHi=*xB$_d4dW7 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 MLnl@7Vt>}+|Js^=IRF3v literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/Win64/soft_oal.dll b/Externals/OpenAL/Win64/soft_oal.dll new file mode 100644 index 0000000000000000000000000000000000000000..b47ff952b78bf43db6b7d507b4d7a9b9f1d2d810 GIT binary patch literal 417320 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 literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/include/al.h b/Externals/OpenAL/include/al.h index 1c2f95b318..413b38331e 100644 --- a/Externals/OpenAL/include/al.h +++ b/Externals/OpenAL/include/al.h @@ -1,21 +1,18 @@ #ifndef AL_AL_H #define AL_AL_H - - #if defined(__cplusplus) extern "C" { #endif -#if defined(_WIN32) && !defined(_XBOX) - /* _OPENAL32LIB is deprecated */ - #if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB) - #define AL_API __declspec(dllexport) - #else +#ifndef AL_API + #if defined(AL_LIBTYPE_STATIC) + #define AL_API + #elif defined(_WIN32) #define AL_API __declspec(dllimport) + #else + #define AL_API extern #endif -#else - #define AL_API extern #endif #if defined(_WIN32) @@ -24,20 +21,19 @@ extern "C" { #define AL_APIENTRY #endif -#if TARGET_OS_MAC - #pragma export on -#endif -/* The OPENAL, ALAPI, and ALAPIENTRY macros are deprecated, but are included for applications porting code - from AL 1.0 */ +/** Deprecated macro. */ #define OPENAL -#define ALAPI AL_API -#define ALAPIENTRY AL_APIENTRY +#define ALAPI AL_API +#define ALAPIENTRY AL_APIENTRY +#define AL_INVALID (-1) +#define AL_ILLEGAL_ENUM AL_INVALID_ENUM +#define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION +/** Supported AL version. */ #define AL_VERSION_1_0 #define AL_VERSION_1_1 - /** 8-bit boolean */ typedef char ALboolean; @@ -45,7 +41,7 @@ typedef char ALboolean; typedef char ALchar; /** signed 8-bit 2's complement integer */ -typedef char ALbyte; +typedef signed char ALbyte; /** unsigned 8-bit integer */ typedef unsigned char ALubyte; @@ -80,650 +76,578 @@ typedef void ALvoid; /* Enumerant values begin at column 50. No tabs. */ -/* bad value */ -#define AL_INVALID -1 +/** "no distance model" or "no buffer" */ +#define AL_NONE 0 -#define AL_NONE 0 - -/* Boolean False. */ -#define AL_FALSE 0 +/** Boolean False. */ +#define AL_FALSE 0 /** Boolean True. */ -#define AL_TRUE 1 - -/** Indicate Source has relative coordinates. */ -#define AL_SOURCE_RELATIVE 0x202 - +#define AL_TRUE 1 /** - * Directional source, inner cone angle, in degrees. - * Range: [0-360] - * Default: 360 - */ -#define AL_CONE_INNER_ANGLE 0x1001 - -/** - * Directional source, outer cone angle, in degrees. - * Range: [0-360] - * Default: 360 - */ -#define AL_CONE_OUTER_ANGLE 0x1002 - -/** - * Specify the pitch to be applied, either at source, - * or on mixer results, at listener. - * Range: [0.5-2.0] - * Default: 1.0 - */ -#define AL_PITCH 0x1003 - -/** - * Specify the current location in three dimensional space. - * OpenAL, like OpenGL, uses a right handed coordinate system, - * where in a frontal default view X (thumb) points right, - * Y points up (index finger), and Z points towards the - * viewer/camera (middle finger). - * To switch from a left handed coordinate system, flip the - * sign on the Z coordinate. - * Listener position is always in the world coordinate system. - */ -#define AL_POSITION 0x1004 - -/** Specify the current direction. */ -#define AL_DIRECTION 0x1005 - -/** Specify the current velocity in three dimensional space. */ -#define AL_VELOCITY 0x1006 - -/** - * Indicate whether source is looping. - * Type: ALboolean? + * Relative source. + * Type: ALboolean * Range: [AL_TRUE, AL_FALSE] - * Default: FALSE. - */ -#define AL_LOOPING 0x1007 - -/** - * Indicate the buffer to provide sound samples. - * Type: ALuint. - * Range: any valid Buffer id. - */ -#define AL_BUFFER 0x1009 - -/** - * Indicate the gain (volume amplification) applied. - * Type: ALfloat. - * Range: ]0.0- ] - * A value of 1.0 means un-attenuated/unchanged. - * Each division by 2 equals an attenuation of -6dB. - * Each multiplicaton with 2 equals an amplification of +6dB. - * A value of 0.0 is meaningless with respect to a logarithmic - * scale; it is interpreted as zero volume - the channel - * is effectively disabled. - */ -#define AL_GAIN 0x100A - -/* - * Indicate minimum source attenuation - * Type: ALfloat - * Range: [0.0 - 1.0] + * Default: AL_FALSE * - * Logarthmic + * Specifies if the Source has relative coordinates. */ -#define AL_MIN_GAIN 0x100D +#define AL_SOURCE_RELATIVE 0x202 + /** - * Indicate maximum source attenuation - * Type: ALfloat - * Range: [0.0 - 1.0] + * Inner cone angle, in degrees. + * Type: ALint, ALfloat + * Range: [0 - 360] + * Default: 360 * - * Logarthmic + * The angle covered by the inner cone, where the source will not attenuate. */ -#define AL_MAX_GAIN 0x100E +#define AL_CONE_INNER_ANGLE 0x1001 /** - * Indicate listener orientation. + * Outer cone angle, in degrees. + * Range: [0 - 360] + * Default: 360 * - * at/up + * The angle covered by the outer cone, where the source will be fully + * attenuated. */ -#define AL_ORIENTATION 0x100F +#define AL_CONE_OUTER_ANGLE 0x1002 /** - * Specify the channel mask. (Creative) - * Type: ALuint - * Range: [0 - 255] - */ -#define AL_CHANNEL_MASK 0x3000 - - -/** - * Source state information. - */ -#define AL_SOURCE_STATE 0x1010 -#define AL_INITIAL 0x1011 -#define AL_PLAYING 0x1012 -#define AL_PAUSED 0x1013 -#define AL_STOPPED 0x1014 - -/** - * Buffer Queue params - */ -#define AL_BUFFERS_QUEUED 0x1015 -#define AL_BUFFERS_PROCESSED 0x1016 - -/** - * Source buffer position information - */ -#define AL_SEC_OFFSET 0x1024 -#define AL_SAMPLE_OFFSET 0x1025 -#define AL_BYTE_OFFSET 0x1026 - -/* - * Source type (Static, Streaming or undetermined) - * Source is Static if a Buffer has been attached using AL_BUFFER - * Source is Streaming if one or more Buffers have been attached using alSourceQueueBuffers - * Source is undetermined when it has the NULL buffer attached - */ -#define AL_SOURCE_TYPE 0x1027 -#define AL_STATIC 0x1028 -#define AL_STREAMING 0x1029 -#define AL_UNDETERMINED 0x1030 - -/** Sound samples: format specifier. */ -#define AL_FORMAT_MONO8 0x1100 -#define AL_FORMAT_MONO16 0x1101 -#define AL_FORMAT_STEREO8 0x1102 -#define AL_FORMAT_STEREO16 0x1103 - -/** - * source specific reference distance - * Type: ALfloat - * Range: 0.0 - +inf + * Source pitch. + * Type: ALfloat + * Range: [0.5 - 2.0] + * Default: 1.0 * - * At 0.0, no distance attenuation occurs. Default is - * 1.0. + * A multiplier for the frequency (sample rate) of the source's buffer. */ -#define AL_REFERENCE_DISTANCE 0x1020 +#define AL_PITCH 0x1003 /** - * source specific rolloff factor - * Type: ALfloat - * Range: 0.0 - +inf + * Source or listener position. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} * + * The source or listener location in three dimensional space. + * + * OpenAL, like OpenGL, uses a right handed coordinate system, where in a + * frontal default view X (thumb) points right, Y points up (index finger), and + * Z points towards the viewer/camera (middle finger). + * + * To switch from a left handed coordinate system, flip the sign on the Z + * coordinate. */ -#define AL_ROLLOFF_FACTOR 0x1021 +#define AL_POSITION 0x1004 /** - * Directional source, outer cone gain. + * Source direction. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} * - * Default: 0.0 - * Range: [0.0 - 1.0] - * Logarithmic + * Specifies the current direction in local space. + * A zero-length vector specifies an omni-directional source (cone is ignored). */ -#define AL_CONE_OUTER_GAIN 0x1022 +#define AL_DIRECTION 0x1005 /** - * Indicate distance above which sources are not - * attenuated using the inverse clamped distance model. + * Source or listener velocity. + * Type: ALfloat[3], ALint[3] + * Default: {0, 0, 0} * + * Specifies the current velocity in local space. + */ +#define AL_VELOCITY 0x1006 + +/** + * Source looping. + * Type: ALboolean + * Range: [AL_TRUE, AL_FALSE] + * Default: AL_FALSE + * + * Specifies whether source is looping. + */ +#define AL_LOOPING 0x1007 + +/** + * Source buffer. + * Type: ALuint + * Range: any valid Buffer. + * + * Specifies the buffer to provide sound samples. + */ +#define AL_BUFFER 0x1009 + +/** + * Source or listener gain. + * Type: ALfloat + * Range: [0.0 - ] + * + * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation + * of about -6dB. Each multiplicaton by 2 equals an amplification of about + * +6dB. + * + * A value of 0.0 is meaningless with respect to a logarithmic scale; it is + * silent. + */ +#define AL_GAIN 0x100A + +/** + * Minimum source gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * The minimum gain allowed for a source, after distance and cone attenation is + * applied (if applicable). + */ +#define AL_MIN_GAIN 0x100D + +/** + * Maximum source gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * The maximum gain allowed for a source, after distance and cone attenation is + * applied (if applicable). + */ +#define AL_MAX_GAIN 0x100E + +/** + * Listener orientation. + * Type: ALfloat[6] + * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0} + * + * Effectively two three dimensional vectors. The first vector is the front (or + * "at") and the second is the top (or "up"). + * + * Both vectors are in local space. + */ +#define AL_ORIENTATION 0x100F + +/** + * Source state (query only). + * Type: ALint + * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED] + */ +#define AL_SOURCE_STATE 0x1010 + +/** Source state value. */ +#define AL_INITIAL 0x1011 +#define AL_PLAYING 0x1012 +#define AL_PAUSED 0x1013 +#define AL_STOPPED 0x1014 + +/** + * Source Buffer Queue size (query only). + * Type: ALint + * + * The number of buffers queued using alSourceQueueBuffers, minus the buffers + * removed with alSourceUnqueueBuffers. + */ +#define AL_BUFFERS_QUEUED 0x1015 + +/** + * Source Buffer Queue processed count (query only). + * Type: ALint + * + * The number of queued buffers that have been fully processed, and can be + * removed with alSourceUnqueueBuffers. + * + * Looping sources will never fully process buffers because they will be set to + * play again for when the source loops. + */ +#define AL_BUFFERS_PROCESSED 0x1016 + +/** + * Source reference distance. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + * + * The distance in units that no attenuation occurs. + * + * At 0.0, no distance attenuation ever occurs on non-linear attenuation models. + */ +#define AL_REFERENCE_DISTANCE 0x1020 + +/** + * Source rolloff factor. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + * + * Multiplier to exaggerate or diminish distance attenuation. + * + * At 0.0, no distance attenuation ever occurs. + */ +#define AL_ROLLOFF_FACTOR 0x1021 + +/** + * Outer cone gain. + * Type: ALfloat + * Range: [0.0 - 1.0] + * Default: 0.0 + * + * The gain attenuation applied when the listener is outside of the source's + * outer cone. + */ +#define AL_CONE_OUTER_GAIN 0x1022 + +/** + * Source maximum distance. + * Type: ALfloat + * Range: [0.0 - ] * Default: +inf - * Type: ALfloat - * Range: 0.0 - +inf + * + * The distance above which the source is not attenuated any further with a + * clamped distance model, or where attenuation reaches 0.0 gain for linear + * distance models with a default rolloff factor. */ -#define AL_MAX_DISTANCE 0x1023 +#define AL_MAX_DISTANCE 0x1023 -/** - * Sound samples: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. +/** Source buffer position, in seconds */ +#define AL_SEC_OFFSET 0x1024 +/** Source buffer position, in sample frames */ +#define AL_SAMPLE_OFFSET 0x1025 +/** Source buffer position, in bytes */ +#define AL_BYTE_OFFSET 0x1026 + +/** + * Source type (query only). + * Type: ALint + * Range: [AL_STATIC, AL_STREAMING, AL_UNDETERMINED] + * + * A Source is Static if a Buffer has been attached using AL_BUFFER. + * + * A Source is Streaming if one or more Buffers have been attached using + * alSourceQueueBuffers. + * + * A Source is Undetermined when it has the NULL buffer attached using + * AL_BUFFER. */ -#define AL_FREQUENCY 0x2001 -#define AL_BITS 0x2002 -#define AL_CHANNELS 0x2003 -#define AL_SIZE 0x2004 +#define AL_SOURCE_TYPE 0x1027 + +/** Source type value. */ +#define AL_STATIC 0x1028 +#define AL_STREAMING 0x1029 +#define AL_UNDETERMINED 0x1030 + +/** Buffer format specifier. */ +#define AL_FORMAT_MONO8 0x1100 +#define AL_FORMAT_MONO16 0x1101 +#define AL_FORMAT_STEREO8 0x1102 +#define AL_FORMAT_STEREO16 0x1103 + +/** Buffer frequency (query only). */ +#define AL_FREQUENCY 0x2001 +/** Buffer bits per sample (query only). */ +#define AL_BITS 0x2002 +/** Buffer channel count (query only). */ +#define AL_CHANNELS 0x2003 +/** Buffer data size (query only). */ +#define AL_SIZE 0x2004 /** * Buffer state. * - * Not supported for public use (yet). + * Not for public use. */ -#define AL_UNUSED 0x2010 -#define AL_PENDING 0x2011 -#define AL_PROCESSED 0x2012 +#define AL_UNUSED 0x2010 +#define AL_PENDING 0x2011 +#define AL_PROCESSED 0x2012 -/** Errors: No Error. */ -#define AL_NO_ERROR AL_FALSE +/** No error. */ +#define AL_NO_ERROR 0 -/** - * Invalid Name paramater passed to AL call. - */ -#define AL_INVALID_NAME 0xA001 +/** Invalid name paramater passed to AL call. */ +#define AL_INVALID_NAME 0xA001 -/** - * Invalid parameter passed to AL call. - */ -#define AL_ILLEGAL_ENUM 0xA002 -#define AL_INVALID_ENUM 0xA002 +/** Invalid enum parameter passed to AL call. */ +#define AL_INVALID_ENUM 0xA002 -/** - * Invalid enum parameter value. - */ -#define AL_INVALID_VALUE 0xA003 +/** Invalid value parameter passed to AL call. */ +#define AL_INVALID_VALUE 0xA003 -/** - * Illegal call. - */ -#define AL_ILLEGAL_COMMAND 0xA004 -#define AL_INVALID_OPERATION 0xA004 +/** Illegal AL call. */ +#define AL_INVALID_OPERATION 0xA004 - -/** - * No mojo. - */ -#define AL_OUT_OF_MEMORY 0xA005 +/** Not enough memory. */ +#define AL_OUT_OF_MEMORY 0xA005 -/** Context strings: Vendor Name. */ -#define AL_VENDOR 0xB001 -#define AL_VERSION 0xB002 -#define AL_RENDERER 0xB003 -#define AL_EXTENSIONS 0xB004 +/** Context string: Vendor ID. */ +#define AL_VENDOR 0xB001 +/** Context string: Version. */ +#define AL_VERSION 0xB002 +/** Context string: Renderer ID. */ +#define AL_RENDERER 0xB003 +/** Context string: Space-separated extension list. */ +#define AL_EXTENSIONS 0xB004 -/** Global tweakage. */ /** - * Doppler scale. Default 1.0 - */ -#define AL_DOPPLER_FACTOR 0xC000 - -/** - * Tweaks speed of propagation. - */ -#define AL_DOPPLER_VELOCITY 0xC001 - -/** - * Speed of Sound in units per second - */ -#define AL_SPEED_OF_SOUND 0xC003 - -/** - * Distance models + * Doppler scale. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 * - * used in conjunction with DistanceModel + * Scale for source and listener velocities. + */ +#define AL_DOPPLER_FACTOR 0xC000 +AL_API void AL_APIENTRY alDopplerFactor(ALfloat value); + +/** + * Doppler velocity (deprecated). * - * implicit: NONE, which disances distance attenuation. + * A multiplier applied to the Speed of Sound. */ -#define AL_DISTANCE_MODEL 0xD000 -#define AL_INVERSE_DISTANCE 0xD001 -#define AL_INVERSE_DISTANCE_CLAMPED 0xD002 -#define AL_LINEAR_DISTANCE 0xD003 -#define AL_LINEAR_DISTANCE_CLAMPED 0xD004 -#define AL_EXPONENT_DISTANCE 0xD005 -#define AL_EXPONENT_DISTANCE_CLAMPED 0xD006 +#define AL_DOPPLER_VELOCITY 0xC001 +AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value); - -#if !defined(AL_NO_PROTOTYPES) - -/* - * Renderer State management +/** + * Speed of Sound, in units per second. + * Type: ALfloat + * Range: [0.0001 - ] + * Default: 343.3 + * + * The speed at which sound waves are assumed to travel, when calculating the + * doppler effect. */ -AL_API void AL_APIENTRY alEnable( ALenum capability ); +#define AL_SPEED_OF_SOUND 0xC003 +AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value); -AL_API void AL_APIENTRY alDisable( ALenum capability ); - -AL_API ALboolean AL_APIENTRY alIsEnabled( ALenum capability ); - - -/* - * State retrieval +/** + * Distance attenuation model. + * Type: ALint + * Range: [AL_NONE, AL_INVERSE_DISTANCE, AL_INVERSE_DISTANCE_CLAMPED, + * AL_LINEAR_DISTANCE, AL_LINEAR_DISTANCE_CLAMPED, + * AL_EXPONENT_DISTANCE, AL_EXPONENT_DISTANCE_CLAMPED] + * Default: AL_INVERSE_DISTANCE_CLAMPED + * + * The model by which sources attenuate with distance. + * + * None - No distance attenuation. + * Inverse - Doubling the distance halves the source gain. + * Linear - Linear gain scaling between the reference and max distances. + * Exponent - Exponential gain dropoff. + * + * Clamped variations work like the non-clamped counterparts, except the + * distance calculated is clamped between the reference and max distances. */ -AL_API const ALchar* AL_APIENTRY alGetString( ALenum param ); +#define AL_DISTANCE_MODEL 0xD000 +AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel); -AL_API void AL_APIENTRY alGetBooleanv( ALenum param, ALboolean* data ); +/** Distance model value. */ +#define AL_INVERSE_DISTANCE 0xD001 +#define AL_INVERSE_DISTANCE_CLAMPED 0xD002 +#define AL_LINEAR_DISTANCE 0xD003 +#define AL_LINEAR_DISTANCE_CLAMPED 0xD004 +#define AL_EXPONENT_DISTANCE 0xD005 +#define AL_EXPONENT_DISTANCE_CLAMPED 0xD006 -AL_API void AL_APIENTRY alGetIntegerv( ALenum param, ALint* data ); +/** Renderer State management. */ +AL_API void AL_APIENTRY alEnable(ALenum capability); +AL_API void AL_APIENTRY alDisable(ALenum capability); +AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability); -AL_API void AL_APIENTRY alGetFloatv( ALenum param, ALfloat* data ); +/** State retrieval. */ +AL_API const ALchar* AL_APIENTRY alGetString(ALenum param); +AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values); +AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values); +AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values); +AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param); +AL_API ALint AL_APIENTRY alGetInteger(ALenum param); +AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param); +AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param); -AL_API void AL_APIENTRY alGetDoublev( ALenum param, ALdouble* data ); - -AL_API ALboolean AL_APIENTRY alGetBoolean( ALenum param ); - -AL_API ALint AL_APIENTRY alGetInteger( ALenum param ); - -AL_API ALfloat AL_APIENTRY alGetFloat( ALenum param ); - -AL_API ALdouble AL_APIENTRY alGetDouble( ALenum param ); - - -/* - * Error support. - * Obtain the most recent error generated in the AL state machine. +/** + * Error retrieval. + * + * Obtain the first error generated in the AL context since the last check. */ -AL_API ALenum AL_APIENTRY alGetError( void ); +AL_API ALenum AL_APIENTRY alGetError(void); - -/* +/** * Extension support. - * Query for the presence of an extension, and obtain any appropriate - * function pointers and enum values. - */ -AL_API ALboolean AL_APIENTRY alIsExtensionPresent( const ALchar* extname ); - -AL_API void* AL_APIENTRY alGetProcAddress( const ALchar* fname ); - -AL_API ALenum AL_APIENTRY alGetEnumValue( const ALchar* ename ); - - -/* - * LISTENER - * Listener represents the location and orientation of the - * 'user' in 3D-space. * - * Properties include: - - * - * Gain AL_GAIN ALfloat - * Position AL_POSITION ALfloat[3] - * Velocity AL_VELOCITY ALfloat[3] - * Orientation AL_ORIENTATION ALfloat[6] (Forward then Up vectors) -*/ - -/* - * Set Listener parameters + * Query for the presence of an extension, and obtain any appropriate function + * pointers and enum values. */ -AL_API void AL_APIENTRY alListenerf( ALenum param, ALfloat value ); - -AL_API void AL_APIENTRY alListener3f( ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); - -AL_API void AL_APIENTRY alListenerfv( ALenum param, const ALfloat* values ); - -AL_API void AL_APIENTRY alListeneri( ALenum param, ALint value ); - -AL_API void AL_APIENTRY alListener3i( ALenum param, ALint value1, ALint value2, ALint value3 ); - -AL_API void AL_APIENTRY alListeneriv( ALenum param, const ALint* values ); - -/* - * Get Listener parameters - */ -AL_API void AL_APIENTRY alGetListenerf( ALenum param, ALfloat* value ); - -AL_API void AL_APIENTRY alGetListener3f( ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3 ); - -AL_API void AL_APIENTRY alGetListenerfv( ALenum param, ALfloat* values ); - -AL_API void AL_APIENTRY alGetListeneri( ALenum param, ALint* value ); - -AL_API void AL_APIENTRY alGetListener3i( ALenum param, ALint *value1, ALint *value2, ALint *value3 ); - -AL_API void AL_APIENTRY alGetListeneriv( ALenum param, ALint* values ); - - -/** - * SOURCE - * Sources represent individual sound objects in 3D-space. - * Sources take the PCM data provided in the specified Buffer, - * apply Source-specific modifications, and then - * submit them to be mixed according to spatial arrangement etc. - * - * Properties include: - - * - * Gain AL_GAIN ALfloat - * Min Gain AL_MIN_GAIN ALfloat - * Max Gain AL_MAX_GAIN ALfloat - * Position AL_POSITION ALfloat[3] - * Velocity AL_VELOCITY ALfloat[3] - * Direction AL_DIRECTION ALfloat[3] - * Head Relative Mode AL_SOURCE_RELATIVE ALint (AL_TRUE or AL_FALSE) - * Reference Distance AL_REFERENCE_DISTANCE ALfloat - * Max Distance AL_MAX_DISTANCE ALfloat - * RollOff Factor AL_ROLLOFF_FACTOR ALfloat - * Inner Angle AL_CONE_INNER_ANGLE ALint or ALfloat - * Outer Angle AL_CONE_OUTER_ANGLE ALint or ALfloat - * Cone Outer Gain AL_CONE_OUTER_GAIN ALint or ALfloat - * Pitch AL_PITCH ALfloat - * Looping AL_LOOPING ALint (AL_TRUE or AL_FALSE) - * MS Offset AL_MSEC_OFFSET ALint or ALfloat - * Byte Offset AL_BYTE_OFFSET ALint or ALfloat - * Sample Offset AL_SAMPLE_OFFSET ALint or ALfloat - * Attached Buffer AL_BUFFER ALint - * State (Query only) AL_SOURCE_STATE ALint - * Buffers Queued (Query only) AL_BUFFERS_QUEUED ALint - * Buffers Processed (Query only) AL_BUFFERS_PROCESSED ALint - */ - -/* Create Source objects */ -AL_API void AL_APIENTRY alGenSources( ALsizei n, ALuint* sources ); - -/* Delete Source objects */ -AL_API void AL_APIENTRY alDeleteSources( ALsizei n, const ALuint* sources ); - -/* Verify a handle is a valid Source */ -AL_API ALboolean AL_APIENTRY alIsSource( ALuint sid ); - -/* - * Set Source parameters - */ -AL_API void AL_APIENTRY alSourcef( ALuint sid, ALenum param, ALfloat value ); - -AL_API void AL_APIENTRY alSource3f( ALuint sid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); - -AL_API void AL_APIENTRY alSourcefv( ALuint sid, ALenum param, const ALfloat* values ); - -AL_API void AL_APIENTRY alSourcei( ALuint sid, ALenum param, ALint value ); - -AL_API void AL_APIENTRY alSource3i( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); - -AL_API void AL_APIENTRY alSourceiv( ALuint sid, ALenum param, const ALint* values ); - -/* - * Get Source parameters - */ -AL_API void AL_APIENTRY alGetSourcef( ALuint sid, ALenum param, ALfloat* value ); - -AL_API void AL_APIENTRY alGetSource3f( ALuint sid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); - -AL_API void AL_APIENTRY alGetSourcefv( ALuint sid, ALenum param, ALfloat* values ); - -AL_API void AL_APIENTRY alGetSourcei( ALuint sid, ALenum param, ALint* value ); - -AL_API void AL_APIENTRY alGetSource3i( ALuint sid, ALenum param, ALint* value1, ALint* value2, ALint* value3); - -AL_API void AL_APIENTRY alGetSourceiv( ALuint sid, ALenum param, ALint* values ); - - -/* - * Source vector based playback calls - */ - -/* Play, replay, or resume (if paused) a list of Sources */ -AL_API void AL_APIENTRY alSourcePlayv( ALsizei ns, const ALuint *sids ); - -/* Stop a list of Sources */ -AL_API void AL_APIENTRY alSourceStopv( ALsizei ns, const ALuint *sids ); - -/* Rewind a list of Sources */ -AL_API void AL_APIENTRY alSourceRewindv( ALsizei ns, const ALuint *sids ); - -/* Pause a list of Sources */ -AL_API void AL_APIENTRY alSourcePausev( ALsizei ns, const ALuint *sids ); - -/* - * Source based playback calls - */ - -/* Play, replay, or resume a Source */ -AL_API void AL_APIENTRY alSourcePlay( ALuint sid ); - -/* Stop a Source */ -AL_API void AL_APIENTRY alSourceStop( ALuint sid ); - -/* Rewind a Source (set playback postiton to beginning) */ -AL_API void AL_APIENTRY alSourceRewind( ALuint sid ); - -/* Pause a Source */ -AL_API void AL_APIENTRY alSourcePause( ALuint sid ); - -/* - * Source Queuing - */ -AL_API void AL_APIENTRY alSourceQueueBuffers( ALuint sid, ALsizei numEntries, const ALuint *bids ); - -AL_API void AL_APIENTRY alSourceUnqueueBuffers( ALuint sid, ALsizei numEntries, ALuint *bids ); - - -/** - * BUFFER - * Buffer objects are storage space for sample data. - * Buffers are referred to by Sources. One Buffer can be used - * by multiple Sources. - * - * Properties include: - - * - * Frequency (Query only) AL_FREQUENCY ALint - * Size (Query only) AL_SIZE ALint - * Bits (Query only) AL_BITS ALint - * Channels (Query only) AL_CHANNELS ALint - */ - -/* Create Buffer objects */ -AL_API void AL_APIENTRY alGenBuffers( ALsizei n, ALuint* buffers ); - -/* Delete Buffer objects */ -AL_API void AL_APIENTRY alDeleteBuffers( ALsizei n, const ALuint* buffers ); - -/* Verify a handle is a valid Buffer */ -AL_API ALboolean AL_APIENTRY alIsBuffer( ALuint bid ); - -/* Specify the data to be copied into a buffer */ -AL_API void AL_APIENTRY alBufferData( ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq ); - -/* - * Set Buffer parameters - */ -AL_API void AL_APIENTRY alBufferf( ALuint bid, ALenum param, ALfloat value ); - -AL_API void AL_APIENTRY alBuffer3f( ALuint bid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); - -AL_API void AL_APIENTRY alBufferfv( ALuint bid, ALenum param, const ALfloat* values ); - -AL_API void AL_APIENTRY alBufferi( ALuint bid, ALenum param, ALint value ); - -AL_API void AL_APIENTRY alBuffer3i( ALuint bid, ALenum param, ALint value1, ALint value2, ALint value3 ); - -AL_API void AL_APIENTRY alBufferiv( ALuint bid, ALenum param, const ALint* values ); - -/* - * Get Buffer parameters - */ -AL_API void AL_APIENTRY alGetBufferf( ALuint bid, ALenum param, ALfloat* value ); - -AL_API void AL_APIENTRY alGetBuffer3f( ALuint bid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); - -AL_API void AL_APIENTRY alGetBufferfv( ALuint bid, ALenum param, ALfloat* values ); - -AL_API void AL_APIENTRY alGetBufferi( ALuint bid, ALenum param, ALint* value ); - -AL_API void AL_APIENTRY alGetBuffer3i( ALuint bid, ALenum param, ALint* value1, ALint* value2, ALint* value3); - -AL_API void AL_APIENTRY alGetBufferiv( ALuint bid, ALenum param, ALint* values ); - - -/* - * Global Parameters - */ -AL_API void AL_APIENTRY alDopplerFactor( ALfloat value ); - -AL_API void AL_APIENTRY alDopplerVelocity( ALfloat value ); - -AL_API void AL_APIENTRY alSpeedOfSound( ALfloat value ); - -AL_API void AL_APIENTRY alDistanceModel( ALenum distanceModel ); - -#else /* AL_NO_PROTOTYPES */ - -typedef void (AL_APIENTRY *LPALENABLE)( ALenum capability ); -typedef void (AL_APIENTRY *LPALDISABLE)( ALenum capability ); -typedef ALboolean (AL_APIENTRY *LPALISENABLED)( ALenum capability ); -typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)( ALenum param ); -typedef void (AL_APIENTRY *LPALGETBOOLEANV)( ALenum param, ALboolean* data ); -typedef void (AL_APIENTRY *LPALGETINTEGERV)( ALenum param, ALint* data ); -typedef void (AL_APIENTRY *LPALGETFLOATV)( ALenum param, ALfloat* data ); -typedef void (AL_APIENTRY *LPALGETDOUBLEV)( ALenum param, ALdouble* data ); -typedef ALboolean (AL_APIENTRY *LPALGETBOOLEAN)( ALenum param ); -typedef ALint (AL_APIENTRY *LPALGETINTEGER)( ALenum param ); -typedef ALfloat (AL_APIENTRY *LPALGETFLOAT)( ALenum param ); -typedef ALdouble (AL_APIENTRY *LPALGETDOUBLE)( ALenum param ); -typedef ALenum (AL_APIENTRY *LPALGETERROR)( void ); -typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar* extname ); -typedef void* (AL_APIENTRY *LPALGETPROCADDRESS)( const ALchar* fname ); -typedef ALenum (AL_APIENTRY *LPALGETENUMVALUE)( const ALchar* ename ); -typedef void (AL_APIENTRY *LPALLISTENERF)( ALenum param, ALfloat value ); -typedef void (AL_APIENTRY *LPALLISTENER3F)( ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); -typedef void (AL_APIENTRY *LPALLISTENERFV)( ALenum param, const ALfloat* values ); -typedef void (AL_APIENTRY *LPALLISTENERI)( ALenum param, ALint value ); -typedef void (AL_APIENTRY *LPALLISTENER3I)( ALenum param, ALint value1, ALint value2, ALint value3 ); -typedef void (AL_APIENTRY *LPALLISTENERIV)( ALenum param, const ALint* values ); -typedef void (AL_APIENTRY *LPALGETLISTENERF)( ALenum param, ALfloat* value ); -typedef void (AL_APIENTRY *LPALGETLISTENER3F)( ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3 ); -typedef void (AL_APIENTRY *LPALGETLISTENERFV)( ALenum param, ALfloat* values ); -typedef void (AL_APIENTRY *LPALGETLISTENERI)( ALenum param, ALint* value ); -typedef void (AL_APIENTRY *LPALGETLISTENER3I)( ALenum param, ALint *value1, ALint *value2, ALint *value3 ); -typedef void (AL_APIENTRY *LPALGETLISTENERIV)( ALenum param, ALint* values ); -typedef void (AL_APIENTRY *LPALGENSOURCES)( ALsizei n, ALuint* sources ); -typedef void (AL_APIENTRY *LPALDELETESOURCES)( ALsizei n, const ALuint* sources ); -typedef ALboolean (AL_APIENTRY *LPALISSOURCE)( ALuint sid ); -typedef void (AL_APIENTRY *LPALSOURCEF)( ALuint sid, ALenum param, ALfloat value); -typedef void (AL_APIENTRY *LPALSOURCE3F)( ALuint sid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); -typedef void (AL_APIENTRY *LPALSOURCEFV)( ALuint sid, ALenum param, const ALfloat* values ); -typedef void (AL_APIENTRY *LPALSOURCEI)( ALuint sid, ALenum param, ALint value); -typedef void (AL_APIENTRY *LPALSOURCE3I)( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); -typedef void (AL_APIENTRY *LPALSOURCEIV)( ALuint sid, ALenum param, const ALint* values ); -typedef void (AL_APIENTRY *LPALGETSOURCEF)( ALuint sid, ALenum param, ALfloat* value ); -typedef void (AL_APIENTRY *LPALGETSOURCE3F)( ALuint sid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); -typedef void (AL_APIENTRY *LPALGETSOURCEFV)( ALuint sid, ALenum param, ALfloat* values ); -typedef void (AL_APIENTRY *LPALGETSOURCEI)( ALuint sid, ALenum param, ALint* value ); -typedef void (AL_APIENTRY *LPALGETSOURCE3I)( ALuint sid, ALenum param, ALint* value1, ALint* value2, ALint* value3); -typedef void (AL_APIENTRY *LPALGETSOURCEIV)( ALuint sid, ALenum param, ALint* values ); -typedef void (AL_APIENTRY *LPALSOURCEPLAYV)( ALsizei ns, const ALuint *sids ); -typedef void (AL_APIENTRY *LPALSOURCESTOPV)( ALsizei ns, const ALuint *sids ); -typedef void (AL_APIENTRY *LPALSOURCEREWINDV)( ALsizei ns, const ALuint *sids ); -typedef void (AL_APIENTRY *LPALSOURCEPAUSEV)( ALsizei ns, const ALuint *sids ); -typedef void (AL_APIENTRY *LPALSOURCEPLAY)( ALuint sid ); -typedef void (AL_APIENTRY *LPALSOURCESTOP)( ALuint sid ); -typedef void (AL_APIENTRY *LPALSOURCEREWIND)( ALuint sid ); -typedef void (AL_APIENTRY *LPALSOURCEPAUSE)( ALuint sid ); -typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint sid, ALsizei numEntries, const ALuint *bids ); -typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint sid, ALsizei numEntries, ALuint *bids ); -typedef void (AL_APIENTRY *LPALGENBUFFERS)( ALsizei n, ALuint* buffers ); -typedef void (AL_APIENTRY *LPALDELETEBUFFERS)( ALsizei n, const ALuint* buffers ); -typedef ALboolean (AL_APIENTRY *LPALISBUFFER)( ALuint bid ); -typedef void (AL_APIENTRY *LPALBUFFERDATA)( ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq ); -typedef void (AL_APIENTRY *LPALBUFFERF)( ALuint bid, ALenum param, ALfloat value); -typedef void (AL_APIENTRY *LPALBUFFER3F)( ALuint bid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); -typedef void (AL_APIENTRY *LPALBUFFERFV)( ALuint bid, ALenum param, const ALfloat* values ); -typedef void (AL_APIENTRY *LPALBUFFERI)( ALuint bid, ALenum param, ALint value); -typedef void (AL_APIENTRY *LPALBUFFER3I)( ALuint bid, ALenum param, ALint value1, ALint value2, ALint value3 ); -typedef void (AL_APIENTRY *LPALBUFFERIV)( ALuint bid, ALenum param, const ALint* values ); -typedef void (AL_APIENTRY *LPALGETBUFFERF)( ALuint bid, ALenum param, ALfloat* value ); -typedef void (AL_APIENTRY *LPALGETBUFFER3F)( ALuint bid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); -typedef void (AL_APIENTRY *LPALGETBUFFERFV)( ALuint bid, ALenum param, ALfloat* values ); -typedef void (AL_APIENTRY *LPALGETBUFFERI)( ALuint bid, ALenum param, ALint* value ); -typedef void (AL_APIENTRY *LPALGETBUFFER3I)( ALuint bid, ALenum param, ALint* value1, ALint* value2, ALint* value3); -typedef void (AL_APIENTRY *LPALGETBUFFERIV)( ALuint bid, ALenum param, ALint* values ); -typedef void (AL_APIENTRY *LPALDOPPLERFACTOR)( ALfloat value ); -typedef void (AL_APIENTRY *LPALDOPPLERVELOCITY)( ALfloat value ); -typedef void (AL_APIENTRY *LPALSPEEDOFSOUND)( ALfloat value ); -typedef void (AL_APIENTRY *LPALDISTANCEMODEL)( ALenum distanceModel ); - -#endif /* AL_NO_PROTOTYPES */ - -#if TARGET_OS_MAC - #pragma export off -#endif +AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname); +AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname); +AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename); + + +/** Set Listener parameters */ +AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value); +AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value); +AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values); + +/** Get Listener parameters */ +AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values); + + +/** Create Source objects. */ +AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources); +/** Delete Source objects. */ +AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources); +/** Verify a handle is a valid Source. */ +AL_API ALboolean AL_APIENTRY alIsSource(ALuint source); + +/** Set Source parameters. */ +AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value); +AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value); +AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values); + +/** Get Source parameters. */ +AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetSourcei(ALuint source, ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetSourceiv(ALuint source, ALenum param, ALint *values); + + +/** Play, replay, or resume (if paused) a list of Sources */ +AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources); +/** Stop a list of Sources */ +AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources); +/** Rewind a list of Sources */ +AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources); +/** Pause a list of Sources */ +AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources); + +/** Play, replay, or resume a Source */ +AL_API void AL_APIENTRY alSourcePlay(ALuint source); +/** Stop a Source */ +AL_API void AL_APIENTRY alSourceStop(ALuint source); +/** Rewind a Source (set playback postiton to beginning) */ +AL_API void AL_APIENTRY alSourceRewind(ALuint source); +/** Pause a Source */ +AL_API void AL_APIENTRY alSourcePause(ALuint source); + +/** Queue buffers onto a source */ +AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers); +/** Unqueue processed buffers from a source */ +AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers); + + +/** Create Buffer objects */ +AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers); +/** Delete Buffer objects */ +AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers); +/** Verify a handle is a valid Buffer */ +AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer); + +/** Specifies the data to be copied into a buffer */ +AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); + +/** Set Buffer parameters, */ +AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value); +AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values); +AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value); +AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3); +AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values); + +/** Get Buffer parameters. */ +AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value); +AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values); +AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value); +AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3); +AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values); + +/** Pointer-to-function type, useful for dynamically getting AL entry points. */ +typedef void (AL_APIENTRY *LPALENABLE)(ALenum capability); +typedef void (AL_APIENTRY *LPALDISABLE)(ALenum capability); +typedef ALboolean (AL_APIENTRY *LPALISENABLED)(ALenum capability); +typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param); +typedef void (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values); +typedef void (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values); +typedef ALboolean (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param); +typedef ALint (AL_APIENTRY *LPALGETINTEGER)(ALenum param); +typedef ALfloat (AL_APIENTRY *LPALGETFLOAT)(ALenum param); +typedef ALdouble (AL_APIENTRY *LPALGETDOUBLE)(ALenum param); +typedef ALenum (AL_APIENTRY *LPALGETERROR)(void); +typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname); +typedef void* (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname); +typedef ALenum (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename); +typedef void (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources); +typedef void (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources); +typedef ALboolean (AL_APIENTRY *LPALISSOURCE)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources); +typedef void (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCESTOP)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source); +typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers); +typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers); +typedef void (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers); +typedef void (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers); +typedef ALboolean (AL_APIENTRY *LPALISBUFFER)(ALuint buffer); +typedef void (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); +typedef void (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +typedef void (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values); +typedef void (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3); +typedef void (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values); +typedef void (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value); +typedef void (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3); +typedef void (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values); +typedef void (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value); +typedef void (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3); +typedef void (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values); +typedef void (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value); +typedef void (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value); +typedef void (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value); +typedef void (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel); #if defined(__cplusplus) } /* extern "C" */ diff --git a/Externals/OpenAL/include/alc.h b/Externals/OpenAL/include/alc.h index b0bbfbe7de..294e8b33c6 100644 --- a/Externals/OpenAL/include/alc.h +++ b/Externals/OpenAL/include/alc.h @@ -5,16 +5,11 @@ extern "C" { #endif -#if defined(_WIN32) && !defined(_XBOX) - /* _OPENAL32LIB is deprecated */ - #if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB) - #define ALC_API __declspec(dllexport) - #else +#ifndef ALC_API + #if defined(AL_LIBTYPE_STATIC) + #define ALC_API + #elif defined(_WIN32) #define ALC_API __declspec(dllimport) - #endif -#else - #if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY) - #define ALC_API __attribute__((visibility("default"))) #else #define ALC_API extern #endif @@ -26,25 +21,20 @@ extern "C" { #define ALC_APIENTRY #endif -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC - #pragma export on -#endif -/* - * The ALCAPI, ALCAPIENTRY, and ALC_INVALID macros are deprecated, but are - * included for applications porting code from AL 1.0 - */ -#define ALCAPI ALC_API -#define ALCAPIENTRY ALC_APIENTRY -#define ALC_INVALID 0 +/** Deprecated macro. */ +#define ALCAPI ALC_API +#define ALCAPIENTRY ALC_APIENTRY +#define ALC_INVALID 0 +/** Supported ALC version? */ +#define ALC_VERSION_0_1 1 -#define ALC_VERSION_0_1 1 - +/** Opaque device handle */ typedef struct ALCdevice_struct ALCdevice; +/** Opaque context handle */ typedef struct ALCcontext_struct ALCcontext; - /** 8-bit boolean */ typedef char ALCboolean; @@ -52,7 +42,7 @@ typedef char ALCboolean; typedef char ALCchar; /** signed 8-bit 2's complement integer */ -typedef char ALCbyte; +typedef signed char ALCbyte; /** unsigned 8-bit integer */ typedef unsigned char ALCubyte; @@ -87,192 +77,158 @@ typedef void ALCvoid; /* Enumerant values begin at column 50. No tabs. */ -/* Boolean False. */ +/** Boolean False. */ #define ALC_FALSE 0 -/* Boolean True. */ +/** Boolean True. */ #define ALC_TRUE 1 -/** - * followed by Hz - */ +/** Context attribute: Hz. */ #define ALC_FREQUENCY 0x1007 -/** - * followed by Hz - */ +/** Context attribute: Hz. */ #define ALC_REFRESH 0x1008 -/** - * followed by AL_TRUE, AL_FALSE - */ +/** Context attribute: AL_TRUE or AL_FALSE. */ #define ALC_SYNC 0x1009 -/** - * followed by Num of requested Mono (3D) Sources - */ +/** Context attribute: requested Mono (3D) Sources. */ #define ALC_MONO_SOURCES 0x1010 -/** - * followed by Num of requested Stereo Sources - */ +/** Context attribute: requested Stereo Sources. */ #define ALC_STEREO_SOURCES 0x1011 -/** - * errors - */ +/** No error. */ +#define ALC_NO_ERROR 0 -/** - * No error - */ -#define ALC_NO_ERROR ALC_FALSE - -/** - * No device - */ +/** Invalid device handle. */ #define ALC_INVALID_DEVICE 0xA001 -/** - * invalid context ID - */ +/** Invalid context handle. */ #define ALC_INVALID_CONTEXT 0xA002 -/** - * bad enum - */ +/** Invalid enum parameter passed to an ALC call. */ #define ALC_INVALID_ENUM 0xA003 -/** - * bad value - */ +/** Invalid value parameter passed to an ALC call. */ #define ALC_INVALID_VALUE 0xA004 -/** - * Out of memory. - */ +/** Out of memory. */ #define ALC_OUT_OF_MEMORY 0xA005 -/** - * The Specifier string for default device - */ -#define ALC_DEFAULT_DEVICE_SPECIFIER 0x1004 -#define ALC_DEVICE_SPECIFIER 0x1005 -#define ALC_EXTENSIONS 0x1006 - +/** Runtime ALC version. */ #define ALC_MAJOR_VERSION 0x1000 #define ALC_MINOR_VERSION 0x1001 +/** Context attribute list properties. */ #define ALC_ATTRIBUTES_SIZE 0x1002 #define ALC_ALL_ATTRIBUTES 0x1003 +/** String for the default device specifier. */ +#define ALC_DEFAULT_DEVICE_SPECIFIER 0x1004 /** - * ALC_ENUMERATE_ALL_EXT enums + * String for the given device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known device specifiers (list ends with an empty string). */ -#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 -#define ALC_ALL_DEVICES_SPECIFIER 0x1013 +#define ALC_DEVICE_SPECIFIER 0x1005 +/** String for space-separated list of ALC extensions. */ +#define ALC_EXTENSIONS 0x1006 + +/** Capture extension */ +#define ALC_EXT_CAPTURE 1 /** - * Capture extension + * String for the given capture device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known capture device specifiers (list ends with an empty string). */ #define ALC_CAPTURE_DEVICE_SPECIFIER 0x310 +/** String for the default capture device specifier. */ #define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER 0x311 +/** Number of sample frames available for capture. */ #define ALC_CAPTURE_SAMPLES 0x312 -/* - * Context Management +/** Enumerate All extension */ +#define ALC_ENUMERATE_ALL_EXT 1 +/** String for the default extended device specifier. */ +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +/** + * String for the given extended device's specifier. + * + * If device handle is NULL, it is instead a null-char separated list of + * strings of known extended device specifiers (list ends with an empty string). */ -ALC_API ALCcontext * ALC_APIENTRY alcCreateContext( ALCdevice *device, const ALCint* attrlist ); - -ALC_API ALCboolean ALC_APIENTRY alcMakeContextCurrent( ALCcontext *context ); - -ALC_API void ALC_APIENTRY alcProcessContext( ALCcontext *context ); - -ALC_API void ALC_APIENTRY alcSuspendContext( ALCcontext *context ); - -ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context ); - -ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void ); - -ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext *context ); +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 -/* - * Device Management - */ -ALC_API ALCdevice * ALC_APIENTRY alcOpenDevice( const ALCchar *devicename ); +/** Context management. */ +ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint* attrlist); +ALC_API ALCboolean ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context); +ALC_API void ALC_APIENTRY alcProcessContext(ALCcontext *context); +ALC_API void ALC_APIENTRY alcSuspendContext(ALCcontext *context); +ALC_API void ALC_APIENTRY alcDestroyContext(ALCcontext *context); +ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void); +ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice(ALCcontext *context); -ALC_API ALCboolean ALC_APIENTRY alcCloseDevice( ALCdevice *device ); +/** Device management. */ +ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename); +ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device); -/* +/** * Error support. - * Obtain the most recent Context error + * + * Obtain the most recent Device error. */ -ALC_API ALCenum ALC_APIENTRY alcGetError( ALCdevice *device ); +ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device); - -/* +/** * Extension support. + * * Query for the presence of an extension, and obtain any appropriate * function pointers and enum values. */ -ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent( ALCdevice *device, const ALCchar *extname ); +ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname); +ALC_API void* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname); +ALC_API ALCenum ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname); -ALC_API void * ALC_APIENTRY alcGetProcAddress( ALCdevice *device, const ALCchar *funcname ); +/** Query function. */ +ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param); +ALC_API void ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values); -ALC_API ALCenum ALC_APIENTRY alcGetEnumValue( ALCdevice *device, const ALCchar *enumname ); +/** Capture function. */ +ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize); +ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureStart(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureStop(ALCdevice *device); +ALC_API void ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); - -/* - * Query functions - */ -ALC_API const ALCchar * ALC_APIENTRY alcGetString( ALCdevice *device, ALCenum param ); - -ALC_API void ALC_APIENTRY alcGetIntegerv( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *data ); - - -/* - * Capture functions - */ -ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize ); - -ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice( ALCdevice *device ); - -ALC_API void ALC_APIENTRY alcCaptureStart( ALCdevice *device ); - -ALC_API void ALC_APIENTRY alcCaptureStop( ALCdevice *device ); - -ALC_API void ALC_APIENTRY alcCaptureSamples( ALCdevice *device, ALCvoid *buffer, ALCsizei samples ); - -/* - * Pointer-to-function types, useful for dynamically getting ALC entry points. - */ -typedef ALCcontext * (ALC_APIENTRY *LPALCCREATECONTEXT) (ALCdevice *device, const ALCint *attrlist); -typedef ALCboolean (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)( ALCcontext *context ); -typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context ); -typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context ); -typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context ); -typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void ); -typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context ); -typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename ); -typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device ); -typedef ALCenum (ALC_APIENTRY *LPALCGETERROR)( ALCdevice *device ); -typedef ALCboolean (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)( ALCdevice *device, const ALCchar *extname ); -typedef void * (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname ); -typedef ALCenum (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname ); -typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)( ALCdevice *device, ALCenum param ); -typedef void (ALC_APIENTRY *LPALCGETINTEGERV)( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *dest ); -typedef ALCdevice * (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize ); -typedef ALCboolean (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)( ALCdevice *device ); -typedef void (ALC_APIENTRY *LPALCCAPTURESTART)( ALCdevice *device ); -typedef void (ALC_APIENTRY *LPALCCAPTURESTOP)( ALCdevice *device ); -typedef void (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, ALCvoid *buffer, ALCsizei samples ); - -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC - #pragma export off -#endif +/** Pointer-to-function type, useful for dynamically getting ALC entry points. */ +typedef ALCcontext* (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist); +typedef ALCboolean (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context); +typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void); +typedef ALCdevice* (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context); +typedef ALCdevice* (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename); +typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device); +typedef ALCenum (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device); +typedef ALCboolean (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname); +typedef void* (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname); +typedef ALCenum (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname); +typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param); +typedef void (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values); +typedef ALCdevice* (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize); +typedef ALCboolean (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device); +typedef void (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); #if defined(__cplusplus) } diff --git a/Externals/OpenAL/include/alext.h b/Externals/OpenAL/include/alext.h new file mode 100644 index 0000000000..0447f2bb45 --- /dev/null +++ b/Externals/OpenAL/include/alext.h @@ -0,0 +1,355 @@ +/** + * OpenAL cross platform audio library + * Copyright (C) 2008 by authors. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * Or go to http://www.gnu.org/copyleft/lgpl.html + */ + +#ifndef AL_ALEXT_H +#define AL_ALEXT_H + +#include +/* Define int64_t and uint64_t types */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#include +#elif defined(_WIN32) && defined(__GNUC__) +#include +#elif defined(_WIN32) +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +/* Fallback if nothing above works */ +#include +#endif + +#include "alc.h" +#include "al.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef AL_LOKI_IMA_ADPCM_format +#define AL_LOKI_IMA_ADPCM_format 1 +#define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 +#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 +#endif + +#ifndef AL_LOKI_WAVE_format +#define AL_LOKI_WAVE_format 1 +#define AL_FORMAT_WAVE_EXT 0x10002 +#endif + +#ifndef AL_EXT_vorbis +#define AL_EXT_vorbis 1 +#define AL_FORMAT_VORBIS_EXT 0x10003 +#endif + +#ifndef AL_LOKI_quadriphonic +#define AL_LOKI_quadriphonic 1 +#define AL_FORMAT_QUAD8_LOKI 0x10004 +#define AL_FORMAT_QUAD16_LOKI 0x10005 +#endif + +#ifndef AL_EXT_float32 +#define AL_EXT_float32 1 +#define AL_FORMAT_MONO_FLOAT32 0x10010 +#define AL_FORMAT_STEREO_FLOAT32 0x10011 +#endif + +#ifndef AL_EXT_double +#define AL_EXT_double 1 +#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012 +#define AL_FORMAT_STEREO_DOUBLE_EXT 0x10013 +#endif + +#ifndef AL_EXT_MULAW +#define AL_EXT_MULAW 1 +#define AL_FORMAT_MONO_MULAW_EXT 0x10014 +#define AL_FORMAT_STEREO_MULAW_EXT 0x10015 +#endif + +#ifndef AL_EXT_ALAW +#define AL_EXT_ALAW 1 +#define AL_FORMAT_MONO_ALAW_EXT 0x10016 +#define AL_FORMAT_STEREO_ALAW_EXT 0x10017 +#endif + +#ifndef ALC_LOKI_audio_channel +#define ALC_LOKI_audio_channel 1 +#define ALC_CHAN_MAIN_LOKI 0x500001 +#define ALC_CHAN_PCM_LOKI 0x500002 +#define ALC_CHAN_CD_LOKI 0x500003 +#endif + +#ifndef AL_EXT_MCFORMATS +#define AL_EXT_MCFORMATS 1 +#define AL_FORMAT_QUAD8 0x1204 +#define AL_FORMAT_QUAD16 0x1205 +#define AL_FORMAT_QUAD32 0x1206 +#define AL_FORMAT_REAR8 0x1207 +#define AL_FORMAT_REAR16 0x1208 +#define AL_FORMAT_REAR32 0x1209 +#define AL_FORMAT_51CHN8 0x120A +#define AL_FORMAT_51CHN16 0x120B +#define AL_FORMAT_51CHN32 0x120C +#define AL_FORMAT_61CHN8 0x120D +#define AL_FORMAT_61CHN16 0x120E +#define AL_FORMAT_61CHN32 0x120F +#define AL_FORMAT_71CHN8 0x1210 +#define AL_FORMAT_71CHN16 0x1211 +#define AL_FORMAT_71CHN32 0x1212 +#endif + +#ifndef AL_EXT_MULAW_MCFORMATS +#define AL_EXT_MULAW_MCFORMATS 1 +#define AL_FORMAT_MONO_MULAW 0x10014 +#define AL_FORMAT_STEREO_MULAW 0x10015 +#define AL_FORMAT_QUAD_MULAW 0x10021 +#define AL_FORMAT_REAR_MULAW 0x10022 +#define AL_FORMAT_51CHN_MULAW 0x10023 +#define AL_FORMAT_61CHN_MULAW 0x10024 +#define AL_FORMAT_71CHN_MULAW 0x10025 +#endif + +#ifndef AL_EXT_IMA4 +#define AL_EXT_IMA4 1 +#define AL_FORMAT_MONO_IMA4 0x1300 +#define AL_FORMAT_STEREO_IMA4 0x1301 +#endif + +#ifndef AL_EXT_STATIC_BUFFER +#define AL_EXT_STATIC_BUFFER 1 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq); +#endif +#endif + +#ifndef ALC_EXT_EFX +#define ALC_EXT_EFX 1 +#include "efx.h" +#endif + +#ifndef ALC_EXT_disconnect +#define ALC_EXT_disconnect 1 +#define ALC_CONNECTED 0x313 +#endif + +#ifndef ALC_EXT_thread_local_context +#define ALC_EXT_thread_local_context 1 +typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API ALCboolean ALC_APIENTRY alcSetThreadContext(ALCcontext *context); +ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void); +#endif +#endif + +#ifndef AL_EXT_source_distance_model +#define AL_EXT_source_distance_model 1 +#define AL_SOURCE_DISTANCE_MODEL 0x200 +#endif + +#ifndef AL_SOFT_buffer_sub_data +#define AL_SOFT_buffer_sub_data 1 +#define AL_BYTE_RW_OFFSETS_SOFT 0x1031 +#define AL_SAMPLE_RW_OFFSETS_SOFT 0x1032 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length); +#endif +#endif + +#ifndef AL_SOFT_loop_points +#define AL_SOFT_loop_points 1 +#define AL_LOOP_POINTS_SOFT 0x2015 +#endif + +#ifndef AL_EXT_FOLDBACK +#define AL_EXT_FOLDBACK 1 +#define AL_EXT_FOLDBACK_NAME "AL_EXT_FOLDBACK" +#define AL_FOLDBACK_EVENT_BLOCK 0x4112 +#define AL_FOLDBACK_EVENT_START 0x4111 +#define AL_FOLDBACK_EVENT_STOP 0x4113 +#define AL_FOLDBACK_MODE_MONO 0x4101 +#define AL_FOLDBACK_MODE_STEREO 0x4102 +typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei); +typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK); +typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback); +AL_API void AL_APIENTRY alRequestFoldbackStop(void); +#endif +#endif + +#ifndef ALC_EXT_DEDICATED +#define ALC_EXT_DEDICATED 1 +#define AL_DEDICATED_GAIN 0x0001 +#define AL_EFFECT_DEDICATED_DIALOGUE 0x9001 +#define AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT 0x9000 +#endif + +#ifndef AL_SOFT_buffer_samples +#define AL_SOFT_buffer_samples 1 +/* Channel configurations */ +#define AL_MONO_SOFT 0x1500 +#define AL_STEREO_SOFT 0x1501 +#define AL_REAR_SOFT 0x1502 +#define AL_QUAD_SOFT 0x1503 +#define AL_5POINT1_SOFT 0x1504 +#define AL_6POINT1_SOFT 0x1505 +#define AL_7POINT1_SOFT 0x1506 + +/* Sample types */ +#define AL_BYTE_SOFT 0x1400 +#define AL_UNSIGNED_BYTE_SOFT 0x1401 +#define AL_SHORT_SOFT 0x1402 +#define AL_UNSIGNED_SHORT_SOFT 0x1403 +#define AL_INT_SOFT 0x1404 +#define AL_UNSIGNED_INT_SOFT 0x1405 +#define AL_FLOAT_SOFT 0x1406 +#define AL_DOUBLE_SOFT 0x1407 +#define AL_BYTE3_SOFT 0x1408 +#define AL_UNSIGNED_BYTE3_SOFT 0x1409 + +/* Storage formats */ +#define AL_MONO8_SOFT 0x1100 +#define AL_MONO16_SOFT 0x1101 +#define AL_MONO32F_SOFT 0x10010 +#define AL_STEREO8_SOFT 0x1102 +#define AL_STEREO16_SOFT 0x1103 +#define AL_STEREO32F_SOFT 0x10011 +#define AL_QUAD8_SOFT 0x1204 +#define AL_QUAD16_SOFT 0x1205 +#define AL_QUAD32F_SOFT 0x1206 +#define AL_REAR8_SOFT 0x1207 +#define AL_REAR16_SOFT 0x1208 +#define AL_REAR32F_SOFT 0x1209 +#define AL_5POINT1_8_SOFT 0x120A +#define AL_5POINT1_16_SOFT 0x120B +#define AL_5POINT1_32F_SOFT 0x120C +#define AL_6POINT1_8_SOFT 0x120D +#define AL_6POINT1_16_SOFT 0x120E +#define AL_6POINT1_32F_SOFT 0x120F +#define AL_7POINT1_8_SOFT 0x1210 +#define AL_7POINT1_16_SOFT 0x1211 +#define AL_7POINT1_32F_SOFT 0x1212 + +/* Buffer attributes */ +#define AL_INTERNAL_FORMAT_SOFT 0x2008 +#define AL_BYTE_LENGTH_SOFT 0x2009 +#define AL_SAMPLE_LENGTH_SOFT 0x200A +#define AL_SEC_LENGTH_SOFT 0x200B + +typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*); +typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*); +typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*); +typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data); +AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data); +AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data); +AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format); +#endif +#endif + +#ifndef AL_SOFT_direct_channels +#define AL_SOFT_direct_channels 1 +#define AL_DIRECT_CHANNELS_SOFT 0x1033 +#endif + +#ifndef ALC_SOFT_loopback +#define ALC_SOFT_loopback 1 +#define ALC_FORMAT_CHANNELS_SOFT 0x1990 +#define ALC_FORMAT_TYPE_SOFT 0x1991 + +/* Sample types */ +#define ALC_BYTE_SOFT 0x1400 +#define ALC_UNSIGNED_BYTE_SOFT 0x1401 +#define ALC_SHORT_SOFT 0x1402 +#define ALC_UNSIGNED_SHORT_SOFT 0x1403 +#define ALC_INT_SOFT 0x1404 +#define ALC_UNSIGNED_INT_SOFT 0x1405 +#define ALC_FLOAT_SOFT 0x1406 + +/* Channel configurations */ +#define ALC_MONO_SOFT 0x1500 +#define ALC_STEREO_SOFT 0x1501 +#define ALC_QUAD_SOFT 0x1503 +#define ALC_5POINT1_SOFT 0x1504 +#define ALC_6POINT1_SOFT 0x1505 +#define ALC_7POINT1_SOFT 0x1506 + +typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*); +typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum); +typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName); +ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type); +ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples); +#endif +#endif + +#ifndef AL_EXT_STEREO_ANGLES +#define AL_EXT_STEREO_ANGLES 1 +#define AL_STEREO_ANGLES 0x1030 +#endif + +#ifndef AL_EXT_SOURCE_RADIUS +#define AL_EXT_SOURCE_RADIUS 1 +#define AL_SOURCE_RADIUS 0x1031 +#endif + +#ifndef AL_SOFT_source_latency +#define AL_SOFT_source_latency 1 +#define AL_SAMPLE_OFFSET_LATENCY_SOFT 0x1200 +#define AL_SEC_OFFSET_LATENCY_SOFT 0x1201 +typedef int64_t ALint64SOFT; +typedef uint64_t ALuint64SOFT; +typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble); +typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble); +typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*); +typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*); +typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT); +typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT); +typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*); +typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*); +#ifdef AL_ALEXT_PROTOTYPES +AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value); +AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3); +AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values); +AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value); +AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3); +AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values); +AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value); +AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3); +AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values); +AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value); +AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3); +AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values); +#endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/Externals/OpenAL/include/efx-creative.h b/Externals/OpenAL/include/efx-creative.h index 4ea9da6b72..0a04c982e1 100644 --- a/Externals/OpenAL/include/efx-creative.h +++ b/Externals/OpenAL/include/efx-creative.h @@ -1,151 +1,3 @@ -#ifndef __efxcreative_h_ -#define __efxcreative_h_ - -/** - * efx-creative.h - Environmental Audio Extensions - * for OpenAL Effects Extension. - * - */ -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * Effect object definitions to be used with alEffect functions. - * - * Effect parameter value definitions, ranges, and defaults - * appear farther down in this file. - */ - -/* AL EAXReverb effect parameters. */ -#define AL_EAXREVERB_DENSITY 0x0001 -#define AL_EAXREVERB_DIFFUSION 0x0002 -#define AL_EAXREVERB_GAIN 0x0003 -#define AL_EAXREVERB_GAINHF 0x0004 -#define AL_EAXREVERB_GAINLF 0x0005 -#define AL_EAXREVERB_DECAY_TIME 0x0006 -#define AL_EAXREVERB_DECAY_HFRATIO 0x0007 -#define AL_EAXREVERB_DECAY_LFRATIO 0x0008 -#define AL_EAXREVERB_REFLECTIONS_GAIN 0x0009 -#define AL_EAXREVERB_REFLECTIONS_DELAY 0x000A -#define AL_EAXREVERB_REFLECTIONS_PAN 0x000B -#define AL_EAXREVERB_LATE_REVERB_GAIN 0x000C -#define AL_EAXREVERB_LATE_REVERB_DELAY 0x000D -#define AL_EAXREVERB_LATE_REVERB_PAN 0x000E -#define AL_EAXREVERB_ECHO_TIME 0x000F -#define AL_EAXREVERB_ECHO_DEPTH 0x0010 -#define AL_EAXREVERB_MODULATION_TIME 0x0011 -#define AL_EAXREVERB_MODULATION_DEPTH 0x0012 -#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF 0x0013 -#define AL_EAXREVERB_HFREFERENCE 0x0014 -#define AL_EAXREVERB_LFREFERENCE 0x0015 -#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR 0x0016 -#define AL_EAXREVERB_DECAY_HFLIMIT 0x0017 - -/* Effect type definitions to be used with AL_EFFECT_TYPE. */ -#define AL_EFFECT_EAXREVERB 0x8000 - - - - /********************************************************** - * Effect parameter structures, value definitions, ranges and defaults. - */ - -/** - * AL reverb effect parameter ranges and defaults - */ -#define AL_EAXREVERB_MIN_DENSITY 0.0f -#define AL_EAXREVERB_MAX_DENSITY 1.0f -#define AL_EAXREVERB_DEFAULT_DENSITY 1.0f - -#define AL_EAXREVERB_MIN_DIFFUSION 0.0f -#define AL_EAXREVERB_MAX_DIFFUSION 1.0f -#define AL_EAXREVERB_DEFAULT_DIFFUSION 1.0f - -#define AL_EAXREVERB_MIN_GAIN 0.0f -#define AL_EAXREVERB_MAX_GAIN 1.0f -#define AL_EAXREVERB_DEFAULT_GAIN 0.32f - -#define AL_EAXREVERB_MIN_GAINHF 0.0f -#define AL_EAXREVERB_MAX_GAINHF 1.0f -#define AL_EAXREVERB_DEFAULT_GAINHF 0.89f - -#define AL_EAXREVERB_MIN_GAINLF 0.0f -#define AL_EAXREVERB_MAX_GAINLF 1.0f -#define AL_EAXREVERB_DEFAULT_GAINLF 1.0f - -#define AL_EAXREVERB_MIN_DECAY_TIME 0.1f -#define AL_EAXREVERB_MAX_DECAY_TIME 20.0f -#define AL_EAXREVERB_DEFAULT_DECAY_TIME 1.49f - -#define AL_EAXREVERB_MIN_DECAY_HFRATIO 0.1f -#define AL_EAXREVERB_MAX_DECAY_HFRATIO 2.0f -#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO 0.83f - -#define AL_EAXREVERB_MIN_DECAY_LFRATIO 0.1f -#define AL_EAXREVERB_MAX_DECAY_LFRATIO 2.0f -#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO 1.0f - -#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN 0.0f -#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN 3.16f -#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN 0.05f - -#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY 0.0f -#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY 0.3f -#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY 0.007f - -#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN {0.0f, 0.0f, 0.0f} - -#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN 0.0f -#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN 10.0f -#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN 1.26f - -#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY 0.0f -#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY 0.1f -#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY 0.011f - -#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN {0.0f, 0.0f, 0.0f} - -#define AL_EAXREVERB_MIN_ECHO_TIME 0.075f -#define AL_EAXREVERB_MAX_ECHO_TIME 0.25f -#define AL_EAXREVERB_DEFAULT_ECHO_TIME 0.25f - -#define AL_EAXREVERB_MIN_ECHO_DEPTH 0.0f -#define AL_EAXREVERB_MAX_ECHO_DEPTH 1.0f -#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH 0.0f - -#define AL_EAXREVERB_MIN_MODULATION_TIME 0.04f -#define AL_EAXREVERB_MAX_MODULATION_TIME 4.0f -#define AL_EAXREVERB_DEFAULT_MODULATION_TIME 0.25f - -#define AL_EAXREVERB_MIN_MODULATION_DEPTH 0.0f -#define AL_EAXREVERB_MAX_MODULATION_DEPTH 1.0f -#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH 0.0f - -#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF 0.892f -#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF 1.0f -#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF 0.994f - -#define AL_EAXREVERB_MIN_HFREFERENCE 1000.0f -#define AL_EAXREVERB_MAX_HFREFERENCE 20000.0f -#define AL_EAXREVERB_DEFAULT_HFREFERENCE 5000.0f - -#define AL_EAXREVERB_MIN_LFREFERENCE 20.0f -#define AL_EAXREVERB_MAX_LFREFERENCE 1000.0f -#define AL_EAXREVERB_DEFAULT_LFREFERENCE 250.0f - -#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR 0.0f -#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR 10.0f -#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f - -#define AL_EAXREVERB_MIN_DECAY_HFLIMIT AL_FALSE -#define AL_EAXREVERB_MAX_DECAY_HFLIMIT AL_TRUE -#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE - - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __efxcreative_h_ */ +/* The tokens that would be defined here are already defined in efx.h. This + * empty file is here to provide compatibility with Windows-based projects + * that would include it. */ diff --git a/Externals/OpenAL/include/efx-presets.h b/Externals/OpenAL/include/efx-presets.h new file mode 100644 index 0000000000..86dcbda2f3 --- /dev/null +++ b/Externals/OpenAL/include/efx-presets.h @@ -0,0 +1,402 @@ +/* Reverb presets for EFX */ + +#ifndef EFX_PRESETS_H +#define EFX_PRESETS_H + +#ifndef EFXEAXREVERBPROPERTIES_DEFINED +#define EFXEAXREVERBPROPERTIES_DEFINED +typedef struct { + float flDensity; + float flDiffusion; + float flGain; + float flGainHF; + float flGainLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + float flReflectionsGain; + float flReflectionsDelay; + float flReflectionsPan[3]; + float flLateReverbGain; + float flLateReverbDelay; + float flLateReverbPan[3]; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionGainHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + int iDecayHFLimit; +} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES; +#endif + +/* Default Presets */ + +#define EFX_REVERB_PRESET_GENERIC \ + { 1.0000f, 1.0000f, 0.3162f, 0.8913f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PADDEDCELL \ + { 0.1715f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.1700f, 0.1000f, 1.0000f, 0.2500f, 0.0010f, { 0.0000f, 0.0000f, 0.0000f }, 1.2691f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ROOM \ + { 0.4287f, 1.0000f, 0.3162f, 0.5929f, 1.0000f, 0.4000f, 0.8300f, 1.0000f, 0.1503f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.0629f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_BATHROOM \ + { 0.1715f, 1.0000f, 0.3162f, 0.2512f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.6531f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 3.2734f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_LIVINGROOM \ + { 0.9766f, 1.0000f, 0.3162f, 0.0010f, 1.0000f, 0.5000f, 0.1000f, 1.0000f, 0.2051f, 0.0030f, { 0.0000f, 0.0000f, 0.0000f }, 0.2805f, 0.0040f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_STONEROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 2.3100f, 0.6400f, 1.0000f, 0.4411f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1003f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_AUDITORIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.5781f, 1.0000f, 4.3200f, 0.5900f, 1.0000f, 0.4032f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7170f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CONCERTHALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.5623f, 1.0000f, 3.9200f, 0.7000f, 1.0000f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.9977f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CAVE \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 2.9100f, 1.3000f, 1.0000f, 0.5000f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.7063f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_ARENA \ + { 1.0000f, 1.0000f, 0.3162f, 0.4477f, 1.0000f, 7.2400f, 0.3300f, 1.0000f, 0.2612f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.0186f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_HANGAR \ + { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 10.0500f, 0.2300f, 1.0000f, 0.5000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2560f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CARPETEDHALLWAY \ + { 0.4287f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 0.3000f, 0.1000f, 1.0000f, 0.1215f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 0.1531f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_HALLWAY \ + { 0.3645f, 1.0000f, 0.3162f, 0.7079f, 1.0000f, 1.4900f, 0.5900f, 1.0000f, 0.2458f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.6615f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_STONECORRIDOR \ + { 1.0000f, 1.0000f, 0.3162f, 0.7612f, 1.0000f, 2.7000f, 0.7900f, 1.0000f, 0.2472f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 1.5758f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ALLEY \ + { 1.0000f, 0.3000f, 0.3162f, 0.7328f, 1.0000f, 1.4900f, 0.8600f, 1.0000f, 0.2500f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.9954f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.9500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FOREST \ + { 1.0000f, 0.3000f, 0.3162f, 0.0224f, 1.0000f, 1.4900f, 0.5400f, 1.0000f, 0.0525f, 0.1620f, { 0.0000f, 0.0000f, 0.0000f }, 0.7682f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY \ + { 1.0000f, 0.5000f, 0.3162f, 0.3981f, 1.0000f, 1.4900f, 0.6700f, 1.0000f, 0.0730f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1427f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_MOUNTAINS \ + { 1.0000f, 0.2700f, 0.3162f, 0.0562f, 1.0000f, 1.4900f, 0.2100f, 1.0000f, 0.0407f, 0.3000f, { 0.0000f, 0.0000f, 0.0000f }, 0.1919f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_QUARRY \ + { 1.0000f, 1.0000f, 0.3162f, 0.3162f, 1.0000f, 1.4900f, 0.8300f, 1.0000f, 0.0000f, 0.0610f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.7000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PLAIN \ + { 1.0000f, 0.2100f, 0.3162f, 0.1000f, 1.0000f, 1.4900f, 0.5000f, 1.0000f, 0.0585f, 0.1790f, { 0.0000f, 0.0000f, 0.0000f }, 0.1089f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PARKINGLOT \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 1.0000f, 1.6500f, 1.5000f, 1.0000f, 0.2082f, 0.0080f, { 0.0000f, 0.0000f, 0.0000f }, 0.2652f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SEWERPIPE \ + { 0.3071f, 0.8000f, 0.3162f, 0.3162f, 1.0000f, 2.8100f, 0.1400f, 1.0000f, 1.6387f, 0.0140f, { 0.0000f, 0.0000f, 0.0000f }, 3.2471f, 0.0210f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_UNDERWATER \ + { 0.3645f, 1.0000f, 0.3162f, 0.0100f, 1.0000f, 1.4900f, 0.1000f, 1.0000f, 0.5963f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 7.0795f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 1.1800f, 0.3480f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRUGGED \ + { 0.4287f, 0.5000f, 0.3162f, 1.0000f, 1.0000f, 8.3900f, 1.3900f, 1.0000f, 0.8760f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 3.1081f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DIZZY \ + { 0.3645f, 0.6000f, 0.3162f, 0.6310f, 1.0000f, 17.2300f, 0.5600f, 1.0000f, 0.1392f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4937f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.8100f, 0.3100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PSYCHOTIC \ + { 0.0625f, 0.5000f, 0.3162f, 0.8404f, 1.0000f, 7.5600f, 0.9100f, 1.0000f, 0.4864f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 2.4378f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 4.0000f, 1.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Castle Presets */ + +#define EFX_REVERB_PRESET_CASTLE_SMALLROOM \ + { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 1.2200f, 0.8300f, 0.3100f, 0.8913f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_SHORTPASSAGE \ + { 1.0000f, 0.8900f, 0.3162f, 0.3162f, 0.1000f, 2.3200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_MEDIUMROOM \ + { 1.0000f, 0.9300f, 0.3162f, 0.2818f, 0.1000f, 2.0400f, 0.8300f, 0.4600f, 0.6310f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1550f, 0.0300f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_LARGEROOM \ + { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.1259f, 2.5300f, 0.8300f, 0.5000f, 0.4467f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1850f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_LONGPASSAGE \ + { 1.0000f, 0.8900f, 0.3162f, 0.3981f, 0.1000f, 3.4200f, 0.8300f, 0.3100f, 0.8913f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_HALL \ + { 1.0000f, 0.8100f, 0.3162f, 0.2818f, 0.1778f, 3.1400f, 0.7900f, 0.6200f, 0.1778f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_CUPBOARD \ + { 1.0000f, 0.8900f, 0.3162f, 0.2818f, 0.1000f, 0.6700f, 0.8700f, 0.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 3.5481f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CASTLE_COURTYARD \ + { 1.0000f, 0.4200f, 0.3162f, 0.4467f, 0.1995f, 2.1300f, 0.6100f, 0.2300f, 0.2239f, 0.1600f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3700f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CASTLE_ALCOVE \ + { 1.0000f, 0.8900f, 0.3162f, 0.5012f, 0.1000f, 1.6400f, 0.8700f, 0.3100f, 1.0000f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1380f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 5168.6001f, 139.5000f, 0.0000f, 0x1 } + +/* Factory Presets */ + +#define EFX_REVERB_PRESET_FACTORY_SMALLROOM \ + { 0.3645f, 0.8200f, 0.3162f, 0.7943f, 0.5012f, 1.7200f, 0.6500f, 1.3100f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.1190f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_SHORTPASSAGE \ + { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 2.5300f, 0.6500f, 1.3100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_MEDIUMROOM \ + { 0.4287f, 0.8200f, 0.2512f, 0.7943f, 0.5012f, 2.7600f, 0.6500f, 1.3100f, 0.2818f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1740f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_LARGEROOM \ + { 0.4287f, 0.7500f, 0.2512f, 0.7079f, 0.6310f, 4.2400f, 0.5100f, 1.3100f, 0.1778f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2310f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_LONGPASSAGE \ + { 0.3645f, 0.6400f, 0.2512f, 0.7943f, 0.5012f, 4.0600f, 0.6500f, 1.3100f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.1350f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_HALL \ + { 0.4287f, 0.7500f, 0.3162f, 0.7079f, 0.6310f, 7.4300f, 0.5100f, 1.3100f, 0.0631f, 0.0730f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_CUPBOARD \ + { 0.3071f, 0.6300f, 0.2512f, 0.7943f, 0.5012f, 0.4900f, 0.6500f, 1.3100f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.1070f, 0.0700f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_COURTYARD \ + { 0.3071f, 0.5700f, 0.3162f, 0.3162f, 0.6310f, 2.3200f, 0.2900f, 0.5600f, 0.2239f, 0.1400f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2900f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_FACTORY_ALCOVE \ + { 0.3645f, 0.5900f, 0.2512f, 0.7943f, 0.5012f, 3.1400f, 0.6500f, 1.3100f, 1.4125f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.1140f, 0.1000f, 0.2500f, 0.0000f, 0.9943f, 3762.6001f, 362.5000f, 0.0000f, 0x1 } + +/* Ice Palace Presets */ + +#define EFX_REVERB_PRESET_ICEPALACE_SMALLROOM \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 1.5100f, 1.5300f, 0.2700f, 0.8913f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1640f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_SHORTPASSAGE \ + { 1.0000f, 0.7500f, 0.3162f, 0.5623f, 0.2818f, 1.7900f, 1.4600f, 0.2800f, 0.5012f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_MEDIUMROOM \ + { 1.0000f, 0.8700f, 0.3162f, 0.5623f, 0.4467f, 2.2200f, 1.5300f, 0.3200f, 0.3981f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_LARGEROOM \ + { 1.0000f, 0.8100f, 0.3162f, 0.5623f, 0.4467f, 3.1400f, 1.5300f, 0.3200f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0270f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_LONGPASSAGE \ + { 1.0000f, 0.7700f, 0.3162f, 0.5623f, 0.3981f, 3.0100f, 1.4600f, 0.2800f, 0.7943f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0250f, { 0.0000f, 0.0000f, 0.0000f }, 0.1860f, 0.0400f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_HALL \ + { 1.0000f, 0.7600f, 0.3162f, 0.4467f, 0.5623f, 5.4900f, 1.5300f, 0.3800f, 0.1122f, 0.0540f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0520f, { 0.0000f, 0.0000f, 0.0000f }, 0.2260f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_CUPBOARD \ + { 1.0000f, 0.8300f, 0.3162f, 0.5012f, 0.2239f, 0.7600f, 1.5300f, 0.2600f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1430f, 0.0800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_COURTYARD \ + { 1.0000f, 0.5900f, 0.3162f, 0.2818f, 0.3162f, 2.0400f, 1.2000f, 0.3800f, 0.3162f, 0.1730f, { 0.0000f, 0.0000f, 0.0000f }, 0.3162f, 0.0430f, { 0.0000f, 0.0000f, 0.0000f }, 0.2350f, 0.4800f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_ICEPALACE_ALCOVE \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 0.2818f, 2.7600f, 1.4600f, 0.2800f, 1.1220f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1610f, 0.0900f, 0.2500f, 0.0000f, 0.9943f, 12428.5000f, 99.6000f, 0.0000f, 0x1 } + +/* Space Station Presets */ + +#define EFX_REVERB_PRESET_SPACESTATION_SMALLROOM \ + { 0.2109f, 0.7000f, 0.3162f, 0.7079f, 0.8913f, 1.7200f, 0.8200f, 0.5500f, 0.7943f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0130f, { 0.0000f, 0.0000f, 0.0000f }, 0.1880f, 0.2600f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_SHORTPASSAGE \ + { 0.2109f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 3.5700f, 0.5000f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.1720f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_MEDIUMROOM \ + { 0.2109f, 0.7500f, 0.3162f, 0.6310f, 0.8913f, 3.0100f, 0.5000f, 0.5500f, 0.3981f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2090f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_LARGEROOM \ + { 0.3645f, 0.8100f, 0.3162f, 0.6310f, 0.8913f, 3.8900f, 0.3800f, 0.6100f, 0.3162f, 0.0560f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0350f, { 0.0000f, 0.0000f, 0.0000f }, 0.2330f, 0.2800f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_LONGPASSAGE \ + { 0.4287f, 0.8200f, 0.3162f, 0.6310f, 0.8913f, 4.6200f, 0.6200f, 0.5500f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2300f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_HALL \ + { 0.4287f, 0.8700f, 0.3162f, 0.6310f, 0.8913f, 7.1100f, 0.3800f, 0.6100f, 0.1778f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2500f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_CUPBOARD \ + { 0.1715f, 0.5600f, 0.3162f, 0.7079f, 0.8913f, 0.7900f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.7783f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1810f, 0.3100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPACESTATION_ALCOVE \ + { 0.2109f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.1600f, 0.8100f, 0.5500f, 1.4125f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0180f, { 0.0000f, 0.0000f, 0.0000f }, 0.1920f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 3316.1001f, 458.2000f, 0.0000f, 0x1 } + +/* Wooden Galleon Presets */ + +#define EFX_REVERB_PRESET_WOODEN_SMALLROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.1122f, 0.3162f, 0.7900f, 0.3200f, 0.8700f, 1.0000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_SHORTPASSAGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.7500f, 0.5000f, 0.8700f, 0.8913f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.6310f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_MEDIUMROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.2818f, 1.4700f, 0.4200f, 0.8200f, 0.8913f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_LARGEROOM \ + { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.2818f, 2.6500f, 0.3300f, 0.8200f, 0.8913f, 0.0660f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_LONGPASSAGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1000f, 0.3162f, 1.9900f, 0.4000f, 0.7900f, 1.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.4467f, 0.0360f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_HALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.0794f, 0.2818f, 3.4500f, 0.3000f, 0.8200f, 0.8913f, 0.0880f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_CUPBOARD \ + { 1.0000f, 1.0000f, 0.3162f, 0.1413f, 0.3162f, 0.5600f, 0.4600f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_COURTYARD \ + { 1.0000f, 0.6500f, 0.3162f, 0.0794f, 0.3162f, 1.7900f, 0.3500f, 0.7900f, 0.5623f, 0.1230f, { 0.0000f, 0.0000f, 0.0000f }, 0.1000f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_WOODEN_ALCOVE \ + { 1.0000f, 1.0000f, 0.3162f, 0.1259f, 0.3162f, 1.2200f, 0.6200f, 0.9100f, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 4705.0000f, 99.6000f, 0.0000f, 0x1 } + +/* Sports Presets */ + +#define EFX_REVERB_PRESET_SPORT_EMPTYSTADIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.4467f, 0.7943f, 6.2600f, 0.5100f, 1.1000f, 0.0631f, 0.1830f, { 0.0000f, 0.0000f, 0.0000f }, 0.3981f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_SQUASHCOURT \ + { 1.0000f, 0.7500f, 0.3162f, 0.3162f, 0.7943f, 2.2200f, 0.9100f, 1.1600f, 0.4467f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.1260f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \ + { 1.0000f, 0.7000f, 0.3162f, 0.7943f, 0.8913f, 2.7600f, 1.2500f, 1.1400f, 0.6310f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SPORT_LARGESWIMMINGPOOL \ + { 1.0000f, 0.8200f, 0.3162f, 0.7943f, 1.0000f, 5.4900f, 1.3100f, 1.1400f, 0.4467f, 0.0390f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2220f, 0.5500f, 1.1590f, 0.2100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_SPORT_GYMNASIUM \ + { 1.0000f, 0.8100f, 0.3162f, 0.4467f, 0.8913f, 3.1400f, 1.0600f, 1.3500f, 0.3981f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0450f, { 0.0000f, 0.0000f, 0.0000f }, 0.1460f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_FULLSTADIUM \ + { 1.0000f, 1.0000f, 0.3162f, 0.0708f, 0.7943f, 5.2500f, 0.1700f, 0.8000f, 0.1000f, 0.1880f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0380f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SPORT_STADIUMTANNOY \ + { 1.0000f, 0.7800f, 0.3162f, 0.5623f, 0.5012f, 2.5300f, 0.8800f, 0.6800f, 0.2818f, 0.2300f, { 0.0000f, 0.0000f, 0.0000f }, 0.5012f, 0.0630f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +/* Prefab Presets */ + +#define EFX_REVERB_PRESET_PREFAB_WORKSHOP \ + { 0.4287f, 1.0000f, 0.3162f, 0.1413f, 0.3981f, 0.7600f, 1.0000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PREFAB_SCHOOLROOM \ + { 0.4022f, 0.6900f, 0.3162f, 0.6310f, 0.5012f, 0.9800f, 0.4500f, 0.1800f, 1.4125f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PREFAB_PRACTISEROOM \ + { 0.4022f, 0.8700f, 0.3162f, 0.3981f, 0.5012f, 1.1200f, 0.5600f, 0.1800f, 1.2589f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0110f, { 0.0000f, 0.0000f, 0.0000f }, 0.0950f, 0.1400f, 0.2500f, 0.0000f, 0.9943f, 7176.8999f, 211.2000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PREFAB_OUTHOUSE \ + { 1.0000f, 0.8200f, 0.3162f, 0.1122f, 0.1585f, 1.3800f, 0.3800f, 0.3500f, 0.8913f, 0.0240f, { 0.0000f, 0.0000f, -0.0000f }, 0.6310f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.1210f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PREFAB_CARAVAN \ + { 1.0000f, 1.0000f, 0.3162f, 0.0891f, 0.1259f, 0.4300f, 1.5000f, 1.0000f, 1.0000f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 1.9953f, 0.0120f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Dome and Pipe Presets */ + +#define EFX_REVERB_PRESET_DOME_TOMB \ + { 1.0000f, 0.7900f, 0.3162f, 0.3548f, 0.2239f, 4.1800f, 0.2100f, 0.1000f, 0.3868f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 1.6788f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.1770f, 0.1900f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PIPE_SMALL \ + { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 5.0400f, 0.1000f, 0.1000f, 0.5012f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 2.5119f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DOME_SAINTPAULS \ + { 1.0000f, 0.8700f, 0.3162f, 0.3548f, 0.2239f, 10.4800f, 0.1900f, 0.1000f, 0.1778f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0420f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1200f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PIPE_LONGTHIN \ + { 0.2560f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 9.2100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_PIPE_LARGE \ + { 1.0000f, 1.0000f, 0.3162f, 0.3548f, 0.2239f, 8.4500f, 0.1000f, 0.1000f, 0.3981f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_PIPE_RESONANT \ + { 0.1373f, 0.9100f, 0.3162f, 0.4467f, 0.2818f, 6.8100f, 0.1800f, 0.1000f, 0.7079f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.0000f, 0.0220f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 20.0000f, 0.0000f, 0x0 } + +/* Outdoors Presets */ + +#define EFX_REVERB_PRESET_OUTDOORS_BACKYARD \ + { 1.0000f, 0.4500f, 0.3162f, 0.2512f, 0.5012f, 1.1200f, 0.3400f, 0.4600f, 0.4467f, 0.0690f, { 0.0000f, 0.0000f, -0.0000f }, 0.7079f, 0.0230f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \ + { 1.0000f, 0.0000f, 0.3162f, 0.0112f, 0.6310f, 2.1300f, 0.2100f, 0.4600f, 0.1778f, 0.3000f, { 0.0000f, 0.0000f, -0.0000f }, 0.4467f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_DEEPCANYON \ + { 1.0000f, 0.7400f, 0.3162f, 0.1778f, 0.6310f, 3.8900f, 0.2100f, 0.4600f, 0.3162f, 0.2230f, { 0.0000f, 0.0000f, -0.0000f }, 0.3548f, 0.0190f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_CREEK \ + { 1.0000f, 0.3500f, 0.3162f, 0.1778f, 0.5012f, 2.1300f, 0.2100f, 0.4600f, 0.3981f, 0.1150f, { 0.0000f, 0.0000f, -0.0000f }, 0.1995f, 0.0310f, { 0.0000f, 0.0000f, 0.0000f }, 0.2180f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 4399.1001f, 242.9000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_OUTDOORS_VALLEY \ + { 1.0000f, 0.2800f, 0.3162f, 0.0282f, 0.1585f, 2.8800f, 0.2600f, 0.3500f, 0.1413f, 0.2630f, { 0.0000f, 0.0000f, -0.0000f }, 0.3981f, 0.1000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.3400f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +/* Mood Presets */ + +#define EFX_REVERB_PRESET_MOOD_HEAVEN \ + { 1.0000f, 0.9400f, 0.3162f, 0.7943f, 0.4467f, 5.0400f, 1.1200f, 0.5600f, 0.2427f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0290f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0800f, 2.7420f, 0.0500f, 0.9977f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_MOOD_HELL \ + { 1.0000f, 0.5700f, 0.3162f, 0.3548f, 0.4467f, 3.5700f, 0.4900f, 2.0000f, 0.0000f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1100f, 0.0400f, 2.1090f, 0.5200f, 0.9943f, 5000.0000f, 139.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_MOOD_MEMORY \ + { 1.0000f, 0.8500f, 0.3162f, 0.6310f, 0.3548f, 4.0600f, 0.8200f, 0.5600f, 0.0398f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.1220f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.4740f, 0.4500f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +/* Driving Presets */ + +#define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \ + { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_PITGARAGE \ + { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_RACER \ + { 0.0832f, 0.8000f, 0.3162f, 1.0000f, 0.7943f, 0.1700f, 2.0000f, 0.4100f, 1.7783f, 0.0070f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0150f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_SPORTS \ + { 0.0832f, 0.8000f, 0.3162f, 0.6310f, 1.0000f, 0.1700f, 0.7500f, 0.4100f, 1.0000f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_INCAR_LUXURY \ + { 0.2560f, 1.0000f, 0.3162f, 0.1000f, 0.5012f, 0.1300f, 0.4100f, 0.4600f, 0.7943f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 1.5849f, 0.0100f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10268.2002f, 251.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_DRIVING_FULLGRANDSTAND \ + { 1.0000f, 1.0000f, 0.3162f, 0.2818f, 0.6310f, 3.0100f, 1.3700f, 1.2800f, 0.3548f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.1778f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \ + { 1.0000f, 1.0000f, 0.3162f, 1.0000f, 0.7943f, 4.6200f, 1.7500f, 1.4000f, 0.2082f, 0.0900f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.0000f, 0.9943f, 10420.2002f, 250.0000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_DRIVING_TUNNEL \ + { 1.0000f, 0.8100f, 0.3162f, 0.3981f, 0.8913f, 3.4200f, 0.9400f, 1.3100f, 0.7079f, 0.0510f, { 0.0000f, 0.0000f, 0.0000f }, 0.7079f, 0.0470f, { 0.0000f, 0.0000f, 0.0000f }, 0.2140f, 0.0500f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 155.3000f, 0.0000f, 0x1 } + +/* City Presets */ + +#define EFX_REVERB_PRESET_CITY_STREETS \ + { 1.0000f, 0.7800f, 0.3162f, 0.7079f, 0.8913f, 1.7900f, 1.1200f, 0.9100f, 0.2818f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 0.1995f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_SUBWAY \ + { 1.0000f, 0.7400f, 0.3162f, 0.7079f, 0.8913f, 3.0100f, 1.2300f, 0.9100f, 0.7079f, 0.0460f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0280f, { 0.0000f, 0.0000f, 0.0000f }, 0.1250f, 0.2100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_MUSEUM \ + { 1.0000f, 0.8200f, 0.3162f, 0.1778f, 0.1778f, 3.2800f, 1.4000f, 0.5700f, 0.2512f, 0.0390f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0340f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CITY_LIBRARY \ + { 1.0000f, 0.8200f, 0.3162f, 0.2818f, 0.0891f, 2.7600f, 0.8900f, 0.4100f, 0.3548f, 0.0290f, { 0.0000f, 0.0000f, -0.0000f }, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 0.1300f, 0.1700f, 0.2500f, 0.0000f, 0.9943f, 2854.3999f, 107.5000f, 0.0000f, 0x0 } + +#define EFX_REVERB_PRESET_CITY_UNDERPASS \ + { 1.0000f, 0.8200f, 0.3162f, 0.4467f, 0.8913f, 3.5700f, 1.1200f, 0.9100f, 0.3981f, 0.0590f, { 0.0000f, 0.0000f, 0.0000f }, 0.8913f, 0.0370f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1400f, 0.2500f, 0.0000f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CITY_ABANDONED \ + { 1.0000f, 0.6900f, 0.3162f, 0.7943f, 0.8913f, 3.2800f, 1.1700f, 0.9100f, 0.4467f, 0.0440f, { 0.0000f, 0.0000f, 0.0000f }, 0.2818f, 0.0240f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.2000f, 0.2500f, 0.0000f, 0.9966f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +/* Misc. Presets */ + +#define EFX_REVERB_PRESET_DUSTYROOM \ + { 0.3645f, 0.5600f, 0.3162f, 0.7943f, 0.7079f, 1.7900f, 0.3800f, 0.2100f, 0.5012f, 0.0020f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0060f, { 0.0000f, 0.0000f, 0.0000f }, 0.2020f, 0.0500f, 0.2500f, 0.0000f, 0.9886f, 13046.0000f, 163.3000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_CHAPEL \ + { 1.0000f, 0.8400f, 0.3162f, 0.5623f, 1.0000f, 4.6200f, 0.6400f, 1.2300f, 0.4467f, 0.0320f, { 0.0000f, 0.0000f, 0.0000f }, 0.7943f, 0.0490f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.0000f, 0.2500f, 0.1100f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + +#define EFX_REVERB_PRESET_SMALLWATERROOM \ + { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } + +#endif /* EFX_PRESETS_H */ diff --git a/Externals/OpenAL/include/efx.h b/Externals/OpenAL/include/efx.h index fece1608de..57766983f6 100644 --- a/Externals/OpenAL/include/efx.h +++ b/Externals/OpenAL/include/efx.h @@ -1,737 +1,761 @@ -#ifndef __efx_h_ -#define __efx_h_ +#ifndef AL_EFX_H +#define AL_EFX_H +#include "alc.h" +#include "al.h" + #ifdef __cplusplus extern "C" { #endif -#define ALC_EXT_EFX_NAME "ALC_EXT_EFX" +#define ALC_EXT_EFX_NAME "ALC_EXT_EFX" -/** - * Context definitions to be used with alcCreateContext. - * These values must be unique and not conflict with other - * al context values. - */ -#define ALC_EFX_MAJOR_VERSION 0x20001 -#define ALC_EFX_MINOR_VERSION 0x20002 -#define ALC_MAX_AUXILIARY_SENDS 0x20003 +#define ALC_EFX_MAJOR_VERSION 0x20001 +#define ALC_EFX_MINOR_VERSION 0x20002 +#define ALC_MAX_AUXILIARY_SENDS 0x20003 +/* Listener properties. */ +#define AL_METERS_PER_UNIT 0x20004 + +/* Source properties. */ +#define AL_DIRECT_FILTER 0x20005 +#define AL_AUXILIARY_SEND_FILTER 0x20006 +#define AL_AIR_ABSORPTION_FACTOR 0x20007 +#define AL_ROOM_ROLLOFF_FACTOR 0x20008 +#define AL_CONE_OUTER_GAINHF 0x20009 +#define AL_DIRECT_FILTER_GAINHF_AUTO 0x2000A +#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO 0x2000B +#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO 0x2000C -/** - * Listener definitions to be used with alListener functions. - * These values must be unique and not conflict with other - * al listener values. - */ -#define AL_METERS_PER_UNIT 0x20004 +/* Effect properties. */ +/* Reverb effect parameters */ +#define AL_REVERB_DENSITY 0x0001 +#define AL_REVERB_DIFFUSION 0x0002 +#define AL_REVERB_GAIN 0x0003 +#define AL_REVERB_GAINHF 0x0004 +#define AL_REVERB_DECAY_TIME 0x0005 +#define AL_REVERB_DECAY_HFRATIO 0x0006 +#define AL_REVERB_REFLECTIONS_GAIN 0x0007 +#define AL_REVERB_REFLECTIONS_DELAY 0x0008 +#define AL_REVERB_LATE_REVERB_GAIN 0x0009 +#define AL_REVERB_LATE_REVERB_DELAY 0x000A +#define AL_REVERB_AIR_ABSORPTION_GAINHF 0x000B +#define AL_REVERB_ROOM_ROLLOFF_FACTOR 0x000C +#define AL_REVERB_DECAY_HFLIMIT 0x000D +/* EAX Reverb effect parameters */ +#define AL_EAXREVERB_DENSITY 0x0001 +#define AL_EAXREVERB_DIFFUSION 0x0002 +#define AL_EAXREVERB_GAIN 0x0003 +#define AL_EAXREVERB_GAINHF 0x0004 +#define AL_EAXREVERB_GAINLF 0x0005 +#define AL_EAXREVERB_DECAY_TIME 0x0006 +#define AL_EAXREVERB_DECAY_HFRATIO 0x0007 +#define AL_EAXREVERB_DECAY_LFRATIO 0x0008 +#define AL_EAXREVERB_REFLECTIONS_GAIN 0x0009 +#define AL_EAXREVERB_REFLECTIONS_DELAY 0x000A +#define AL_EAXREVERB_REFLECTIONS_PAN 0x000B +#define AL_EAXREVERB_LATE_REVERB_GAIN 0x000C +#define AL_EAXREVERB_LATE_REVERB_DELAY 0x000D +#define AL_EAXREVERB_LATE_REVERB_PAN 0x000E +#define AL_EAXREVERB_ECHO_TIME 0x000F +#define AL_EAXREVERB_ECHO_DEPTH 0x0010 +#define AL_EAXREVERB_MODULATION_TIME 0x0011 +#define AL_EAXREVERB_MODULATION_DEPTH 0x0012 +#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF 0x0013 +#define AL_EAXREVERB_HFREFERENCE 0x0014 +#define AL_EAXREVERB_LFREFERENCE 0x0015 +#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR 0x0016 +#define AL_EAXREVERB_DECAY_HFLIMIT 0x0017 +/* Chorus effect parameters */ +#define AL_CHORUS_WAVEFORM 0x0001 +#define AL_CHORUS_PHASE 0x0002 +#define AL_CHORUS_RATE 0x0003 +#define AL_CHORUS_DEPTH 0x0004 +#define AL_CHORUS_FEEDBACK 0x0005 +#define AL_CHORUS_DELAY 0x0006 -/** - * Source definitions to be used with alSource functions. - * These values must be unique and not conflict with other - * al source values. - */ -#define AL_DIRECT_FILTER 0x20005 -#define AL_AUXILIARY_SEND_FILTER 0x20006 -#define AL_AIR_ABSORPTION_FACTOR 0x20007 -#define AL_ROOM_ROLLOFF_FACTOR 0x20008 -#define AL_CONE_OUTER_GAINHF 0x20009 -#define AL_DIRECT_FILTER_GAINHF_AUTO 0x2000A -#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO 0x2000B -#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO 0x2000C +/* Distortion effect parameters */ +#define AL_DISTORTION_EDGE 0x0001 +#define AL_DISTORTION_GAIN 0x0002 +#define AL_DISTORTION_LOWPASS_CUTOFF 0x0003 +#define AL_DISTORTION_EQCENTER 0x0004 +#define AL_DISTORTION_EQBANDWIDTH 0x0005 +/* Echo effect parameters */ +#define AL_ECHO_DELAY 0x0001 +#define AL_ECHO_LRDELAY 0x0002 +#define AL_ECHO_DAMPING 0x0003 +#define AL_ECHO_FEEDBACK 0x0004 +#define AL_ECHO_SPREAD 0x0005 +/* Flanger effect parameters */ +#define AL_FLANGER_WAVEFORM 0x0001 +#define AL_FLANGER_PHASE 0x0002 +#define AL_FLANGER_RATE 0x0003 +#define AL_FLANGER_DEPTH 0x0004 +#define AL_FLANGER_FEEDBACK 0x0005 +#define AL_FLANGER_DELAY 0x0006 +/* Frequency shifter effect parameters */ +#define AL_FREQUENCY_SHIFTER_FREQUENCY 0x0001 +#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION 0x0002 +#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION 0x0003 -/** - * Effect object definitions to be used with alEffect functions. - * - * Effect parameter value definitions, ranges, and defaults - * appear farther down in this file. - */ +/* Vocal morpher effect parameters */ +#define AL_VOCAL_MORPHER_PHONEMEA 0x0001 +#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING 0x0002 +#define AL_VOCAL_MORPHER_PHONEMEB 0x0003 +#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING 0x0004 +#define AL_VOCAL_MORPHER_WAVEFORM 0x0005 +#define AL_VOCAL_MORPHER_RATE 0x0006 -/* Reverb Parameters */ -#define AL_REVERB_DENSITY 0x0001 -#define AL_REVERB_DIFFUSION 0x0002 -#define AL_REVERB_GAIN 0x0003 -#define AL_REVERB_GAINHF 0x0004 -#define AL_REVERB_DECAY_TIME 0x0005 -#define AL_REVERB_DECAY_HFRATIO 0x0006 -#define AL_REVERB_REFLECTIONS_GAIN 0x0007 -#define AL_REVERB_REFLECTIONS_DELAY 0x0008 -#define AL_REVERB_LATE_REVERB_GAIN 0x0009 -#define AL_REVERB_LATE_REVERB_DELAY 0x000A -#define AL_REVERB_AIR_ABSORPTION_GAINHF 0x000B -#define AL_REVERB_ROOM_ROLLOFF_FACTOR 0x000C -#define AL_REVERB_DECAY_HFLIMIT 0x000D +/* Pitchshifter effect parameters */ +#define AL_PITCH_SHIFTER_COARSE_TUNE 0x0001 +#define AL_PITCH_SHIFTER_FINE_TUNE 0x0002 -/* Chorus Parameters */ -#define AL_CHORUS_WAVEFORM 0x0001 -#define AL_CHORUS_PHASE 0x0002 -#define AL_CHORUS_RATE 0x0003 -#define AL_CHORUS_DEPTH 0x0004 -#define AL_CHORUS_FEEDBACK 0x0005 -#define AL_CHORUS_DELAY 0x0006 +/* Ringmodulator effect parameters */ +#define AL_RING_MODULATOR_FREQUENCY 0x0001 +#define AL_RING_MODULATOR_HIGHPASS_CUTOFF 0x0002 +#define AL_RING_MODULATOR_WAVEFORM 0x0003 -/* Distortion Parameters */ -#define AL_DISTORTION_EDGE 0x0001 -#define AL_DISTORTION_GAIN 0x0002 -#define AL_DISTORTION_LOWPASS_CUTOFF 0x0003 -#define AL_DISTORTION_EQCENTER 0x0004 -#define AL_DISTORTION_EQBANDWIDTH 0x0005 +/* Autowah effect parameters */ +#define AL_AUTOWAH_ATTACK_TIME 0x0001 +#define AL_AUTOWAH_RELEASE_TIME 0x0002 +#define AL_AUTOWAH_RESONANCE 0x0003 +#define AL_AUTOWAH_PEAK_GAIN 0x0004 -/* Echo Parameters */ -#define AL_ECHO_DELAY 0x0001 -#define AL_ECHO_LRDELAY 0x0002 -#define AL_ECHO_DAMPING 0x0003 -#define AL_ECHO_FEEDBACK 0x0004 -#define AL_ECHO_SPREAD 0x0005 +/* Compressor effect parameters */ +#define AL_COMPRESSOR_ONOFF 0x0001 -/* Flanger Parameters */ -#define AL_FLANGER_WAVEFORM 0x0001 -#define AL_FLANGER_PHASE 0x0002 -#define AL_FLANGER_RATE 0x0003 -#define AL_FLANGER_DEPTH 0x0004 -#define AL_FLANGER_FEEDBACK 0x0005 -#define AL_FLANGER_DELAY 0x0006 - -/* Frequencyshifter Parameters */ -#define AL_FREQUENCY_SHIFTER_FREQUENCY 0x0001 -#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION 0x0002 -#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION 0x0003 - -/* Vocalmorpher Parameters */ -#define AL_VOCAL_MORPHER_PHONEMEA 0x0001 -#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING 0x0002 -#define AL_VOCAL_MORPHER_PHONEMEB 0x0003 -#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING 0x0004 -#define AL_VOCAL_MORPHER_WAVEFORM 0x0005 -#define AL_VOCAL_MORPHER_RATE 0x0006 - -/* Pitchshifter Parameters */ -#define AL_PITCH_SHIFTER_COARSE_TUNE 0x0001 -#define AL_PITCH_SHIFTER_FINE_TUNE 0x0002 - -/* Ringmodulator Parameters */ -#define AL_RING_MODULATOR_FREQUENCY 0x0001 -#define AL_RING_MODULATOR_HIGHPASS_CUTOFF 0x0002 -#define AL_RING_MODULATOR_WAVEFORM 0x0003 - -/* Autowah Parameters */ -#define AL_AUTOWAH_ATTACK_TIME 0x0001 -#define AL_AUTOWAH_RELEASE_TIME 0x0002 -#define AL_AUTOWAH_RESONANCE 0x0003 -#define AL_AUTOWAH_PEAK_GAIN 0x0004 - -/* Compressor Parameters */ -#define AL_COMPRESSOR_ONOFF 0x0001 - -/* Equalizer Parameters */ -#define AL_EQUALIZER_LOW_GAIN 0x0001 -#define AL_EQUALIZER_LOW_CUTOFF 0x0002 -#define AL_EQUALIZER_MID1_GAIN 0x0003 -#define AL_EQUALIZER_MID1_CENTER 0x0004 -#define AL_EQUALIZER_MID1_WIDTH 0x0005 -#define AL_EQUALIZER_MID2_GAIN 0x0006 -#define AL_EQUALIZER_MID2_CENTER 0x0007 -#define AL_EQUALIZER_MID2_WIDTH 0x0008 -#define AL_EQUALIZER_HIGH_GAIN 0x0009 -#define AL_EQUALIZER_HIGH_CUTOFF 0x000A +/* Equalizer effect parameters */ +#define AL_EQUALIZER_LOW_GAIN 0x0001 +#define AL_EQUALIZER_LOW_CUTOFF 0x0002 +#define AL_EQUALIZER_MID1_GAIN 0x0003 +#define AL_EQUALIZER_MID1_CENTER 0x0004 +#define AL_EQUALIZER_MID1_WIDTH 0x0005 +#define AL_EQUALIZER_MID2_GAIN 0x0006 +#define AL_EQUALIZER_MID2_CENTER 0x0007 +#define AL_EQUALIZER_MID2_WIDTH 0x0008 +#define AL_EQUALIZER_HIGH_GAIN 0x0009 +#define AL_EQUALIZER_HIGH_CUTOFF 0x000A /* Effect type */ -#define AL_EFFECT_FIRST_PARAMETER 0x0000 -#define AL_EFFECT_LAST_PARAMETER 0x8000 -#define AL_EFFECT_TYPE 0x8001 +#define AL_EFFECT_FIRST_PARAMETER 0x0000 +#define AL_EFFECT_LAST_PARAMETER 0x8000 +#define AL_EFFECT_TYPE 0x8001 -/* Effect type definitions to be used with AL_EFFECT_TYPE. */ -#define AL_EFFECT_NULL 0x0000 /* Can also be used as an Effect Object ID */ -#define AL_EFFECT_REVERB 0x0001 -#define AL_EFFECT_CHORUS 0x0002 -#define AL_EFFECT_DISTORTION 0x0003 -#define AL_EFFECT_ECHO 0x0004 -#define AL_EFFECT_FLANGER 0x0005 -#define AL_EFFECT_FREQUENCY_SHIFTER 0x0006 -#define AL_EFFECT_VOCAL_MORPHER 0x0007 -#define AL_EFFECT_PITCH_SHIFTER 0x0008 -#define AL_EFFECT_RING_MODULATOR 0x0009 -#define AL_EFFECT_AUTOWAH 0x000A -#define AL_EFFECT_COMPRESSOR 0x000B -#define AL_EFFECT_EQUALIZER 0x000C +/* Effect types, used with the AL_EFFECT_TYPE property */ +#define AL_EFFECT_NULL 0x0000 +#define AL_EFFECT_REVERB 0x0001 +#define AL_EFFECT_CHORUS 0x0002 +#define AL_EFFECT_DISTORTION 0x0003 +#define AL_EFFECT_ECHO 0x0004 +#define AL_EFFECT_FLANGER 0x0005 +#define AL_EFFECT_FREQUENCY_SHIFTER 0x0006 +#define AL_EFFECT_VOCAL_MORPHER 0x0007 +#define AL_EFFECT_PITCH_SHIFTER 0x0008 +#define AL_EFFECT_RING_MODULATOR 0x0009 +#define AL_EFFECT_AUTOWAH 0x000A +#define AL_EFFECT_COMPRESSOR 0x000B +#define AL_EFFECT_EQUALIZER 0x000C +#define AL_EFFECT_EAXREVERB 0x8000 -/** - * Auxiliary Slot object definitions to be used with alAuxiliaryEffectSlot functions. - */ -#define AL_EFFECTSLOT_EFFECT 0x0001 -#define AL_EFFECTSLOT_GAIN 0x0002 -#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO 0x0003 +/* Auxiliary Effect Slot properties. */ +#define AL_EFFECTSLOT_EFFECT 0x0001 +#define AL_EFFECTSLOT_GAIN 0x0002 +#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO 0x0003 -/** - * Value to be used as an Auxiliary Slot ID to disable a source send.. - */ -#define AL_EFFECTSLOT_NULL 0x0000 +/* NULL Auxiliary Slot ID to disable a source send. */ +#define AL_EFFECTSLOT_NULL 0x0000 +/* Filter properties. */ -/** - * Filter object definitions to be used with alFilter functions. - */ +/* Lowpass filter parameters */ +#define AL_LOWPASS_GAIN 0x0001 +#define AL_LOWPASS_GAINHF 0x0002 -/* Lowpass parameters. */ -#define AL_LOWPASS_GAIN 0x0001 -#define AL_LOWPASS_GAINHF 0x0002 +/* Highpass filter parameters */ +#define AL_HIGHPASS_GAIN 0x0001 +#define AL_HIGHPASS_GAINLF 0x0002 -/* Highpass Parameters */ -#define AL_HIGHPASS_GAIN 0x0001 -#define AL_HIGHPASS_GAINLF 0x0002 - -/* Bandpass Parameters */ -#define AL_BANDPASS_GAIN 0x0001 -#define AL_BANDPASS_GAINLF 0x0002 -#define AL_BANDPASS_GAINHF 0x0003 +/* Bandpass filter parameters */ +#define AL_BANDPASS_GAIN 0x0001 +#define AL_BANDPASS_GAINLF 0x0002 +#define AL_BANDPASS_GAINHF 0x0003 /* Filter type */ -#define AL_FILTER_FIRST_PARAMETER 0x0000 -#define AL_FILTER_LAST_PARAMETER 0x8000 -#define AL_FILTER_TYPE 0x8001 +#define AL_FILTER_FIRST_PARAMETER 0x0000 +#define AL_FILTER_LAST_PARAMETER 0x8000 +#define AL_FILTER_TYPE 0x8001 + +/* Filter types, used with the AL_FILTER_TYPE property */ +#define AL_FILTER_NULL 0x0000 +#define AL_FILTER_LOWPASS 0x0001 +#define AL_FILTER_HIGHPASS 0x0002 +#define AL_FILTER_BANDPASS 0x0003 + + +/* Effect object function types. */ +typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint); +typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*); + +/* Filter object function types. */ +typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint); +typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*); + +/* Auxiliary Effect Slot object function types. */ +typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*); +typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*); +typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat); +typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*); +typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*); + +#ifdef AL_ALEXT_PROTOTYPES +AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects); +AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects); +AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect); +AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues); + +AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters); +AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters); +AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter); +AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues); + +AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots); +AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots); +AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue); +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue); +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues); +#endif + +/* Filter ranges and defaults. */ + +/* Lowpass filter */ +#define AL_LOWPASS_MIN_GAIN (0.0f) +#define AL_LOWPASS_MAX_GAIN (1.0f) +#define AL_LOWPASS_DEFAULT_GAIN (1.0f) + +#define AL_LOWPASS_MIN_GAINHF (0.0f) +#define AL_LOWPASS_MAX_GAINHF (1.0f) +#define AL_LOWPASS_DEFAULT_GAINHF (1.0f) + +/* Highpass filter */ +#define AL_HIGHPASS_MIN_GAIN (0.0f) +#define AL_HIGHPASS_MAX_GAIN (1.0f) +#define AL_HIGHPASS_DEFAULT_GAIN (1.0f) + +#define AL_HIGHPASS_MIN_GAINLF (0.0f) +#define AL_HIGHPASS_MAX_GAINLF (1.0f) +#define AL_HIGHPASS_DEFAULT_GAINLF (1.0f) + +/* Bandpass filter */ +#define AL_BANDPASS_MIN_GAIN (0.0f) +#define AL_BANDPASS_MAX_GAIN (1.0f) +#define AL_BANDPASS_DEFAULT_GAIN (1.0f) + +#define AL_BANDPASS_MIN_GAINHF (0.0f) +#define AL_BANDPASS_MAX_GAINHF (1.0f) +#define AL_BANDPASS_DEFAULT_GAINHF (1.0f) + +#define AL_BANDPASS_MIN_GAINLF (0.0f) +#define AL_BANDPASS_MAX_GAINLF (1.0f) +#define AL_BANDPASS_DEFAULT_GAINLF (1.0f) + + +/* Effect parameter ranges and defaults. */ + +/* Standard reverb effect */ +#define AL_REVERB_MIN_DENSITY (0.0f) +#define AL_REVERB_MAX_DENSITY (1.0f) +#define AL_REVERB_DEFAULT_DENSITY (1.0f) + +#define AL_REVERB_MIN_DIFFUSION (0.0f) +#define AL_REVERB_MAX_DIFFUSION (1.0f) +#define AL_REVERB_DEFAULT_DIFFUSION (1.0f) + +#define AL_REVERB_MIN_GAIN (0.0f) +#define AL_REVERB_MAX_GAIN (1.0f) +#define AL_REVERB_DEFAULT_GAIN (0.32f) + +#define AL_REVERB_MIN_GAINHF (0.0f) +#define AL_REVERB_MAX_GAINHF (1.0f) +#define AL_REVERB_DEFAULT_GAINHF (0.89f) + +#define AL_REVERB_MIN_DECAY_TIME (0.1f) +#define AL_REVERB_MAX_DECAY_TIME (20.0f) +#define AL_REVERB_DEFAULT_DECAY_TIME (1.49f) + +#define AL_REVERB_MIN_DECAY_HFRATIO (0.1f) +#define AL_REVERB_MAX_DECAY_HFRATIO (2.0f) +#define AL_REVERB_DEFAULT_DECAY_HFRATIO (0.83f) + +#define AL_REVERB_MIN_REFLECTIONS_GAIN (0.0f) +#define AL_REVERB_MAX_REFLECTIONS_GAIN (3.16f) +#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN (0.05f) + +#define AL_REVERB_MIN_REFLECTIONS_DELAY (0.0f) +#define AL_REVERB_MAX_REFLECTIONS_DELAY (0.3f) +#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY (0.007f) + +#define AL_REVERB_MIN_LATE_REVERB_GAIN (0.0f) +#define AL_REVERB_MAX_LATE_REVERB_GAIN (10.0f) +#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN (1.26f) + +#define AL_REVERB_MIN_LATE_REVERB_DELAY (0.0f) +#define AL_REVERB_MAX_LATE_REVERB_DELAY (0.1f) +#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY (0.011f) + +#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f) +#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f) +#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f) + +#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) + +#define AL_REVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_REVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_REVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE + +/* EAX reverb effect */ +#define AL_EAXREVERB_MIN_DENSITY (0.0f) +#define AL_EAXREVERB_MAX_DENSITY (1.0f) +#define AL_EAXREVERB_DEFAULT_DENSITY (1.0f) -/* Filter type definitions to be used with AL_FILTER_TYPE. */ -#define AL_FILTER_NULL 0x0000 /* Can also be used as a Filter Object ID */ -#define AL_FILTER_LOWPASS 0x0001 -#define AL_FILTER_HIGHPASS 0x0002 -#define AL_FILTER_BANDPASS 0x0003 +#define AL_EAXREVERB_MIN_DIFFUSION (0.0f) +#define AL_EAXREVERB_MAX_DIFFUSION (1.0f) +#define AL_EAXREVERB_DEFAULT_DIFFUSION (1.0f) +#define AL_EAXREVERB_MIN_GAIN (0.0f) +#define AL_EAXREVERB_MAX_GAIN (1.0f) +#define AL_EAXREVERB_DEFAULT_GAIN (0.32f) -/** - * Effect object functions. - */ +#define AL_EAXREVERB_MIN_GAINHF (0.0f) +#define AL_EAXREVERB_MAX_GAINHF (1.0f) +#define AL_EAXREVERB_DEFAULT_GAINHF (0.89f) -/* Create Effect objects. */ -typedef void (__cdecl *LPALGENEFFECTS)( ALsizei n, ALuint* effects ); +#define AL_EAXREVERB_MIN_GAINLF (0.0f) +#define AL_EAXREVERB_MAX_GAINLF (1.0f) +#define AL_EAXREVERB_DEFAULT_GAINLF (1.0f) -/* Delete Effect objects. */ -typedef void (__cdecl *LPALDELETEEFFECTS)( ALsizei n, ALuint* effects ); +#define AL_EAXREVERB_MIN_DECAY_TIME (0.1f) +#define AL_EAXREVERB_MAX_DECAY_TIME (20.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_TIME (1.49f) -/* Verify a handle is a valid Effect. */ -typedef ALboolean (__cdecl *LPALISEFFECT)( ALuint eid ); +#define AL_EAXREVERB_MIN_DECAY_HFRATIO (0.1f) +#define AL_EAXREVERB_MAX_DECAY_HFRATIO (2.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO (0.83f) -/* Set an integer parameter for an Effect object. */ -typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); -typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); +#define AL_EAXREVERB_MIN_DECAY_LFRATIO (0.1f) +#define AL_EAXREVERB_MAX_DECAY_LFRATIO (2.0f) +#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO (1.0f) -/* Set a floating point parameter for an Effect object. */ -typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value); -typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); +#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN (0.0f) +#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN (3.16f) +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN (0.05f) -/* Get an integer parameter for an Effect object. */ -typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value ); -typedef void (__cdecl *LPALGETEFFECTIV)( ALuint eid, ALenum pname, ALint* values ); +#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY (0.0f) +#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY (0.3f) +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY (0.007f) -/* Get a floating point parameter for an Effect object. */ -typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value ); -typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values ); +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN_XYZ (0.0f) +#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN (0.0f) +#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN (10.0f) +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN (1.26f) -/** - * Filter object functions - */ +#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY (0.0f) +#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY (0.1f) +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY (0.011f) -/* Create Filter objects. */ -typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN_XYZ (0.0f) -/* Delete Filter objects. */ -typedef void (__cdecl *LPALDELETEFILTERS)( ALsizei n, ALuint* filters ); +#define AL_EAXREVERB_MIN_ECHO_TIME (0.075f) +#define AL_EAXREVERB_MAX_ECHO_TIME (0.25f) +#define AL_EAXREVERB_DEFAULT_ECHO_TIME (0.25f) -/* Verify a handle is a valid Filter. */ -typedef ALboolean (__cdecl *LPALISFILTER)( ALuint fid ); +#define AL_EAXREVERB_MIN_ECHO_DEPTH (0.0f) +#define AL_EAXREVERB_MAX_ECHO_DEPTH (1.0f) +#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH (0.0f) -/* Set an integer parameter for a Filter object. */ -typedef void (__cdecl *LPALFILTERI)( ALuint fid, ALenum param, ALint value ); -typedef void (__cdecl *LPALFILTERIV)( ALuint fid, ALenum param, ALint* values ); +#define AL_EAXREVERB_MIN_MODULATION_TIME (0.04f) +#define AL_EAXREVERB_MAX_MODULATION_TIME (4.0f) +#define AL_EAXREVERB_DEFAULT_MODULATION_TIME (0.25f) -/* Set a floating point parameter for an Filter object. */ -typedef void (__cdecl *LPALFILTERF)( ALuint fid, ALenum param, ALfloat value); -typedef void (__cdecl *LPALFILTERFV)( ALuint fid, ALenum param, ALfloat* values ); +#define AL_EAXREVERB_MIN_MODULATION_DEPTH (0.0f) +#define AL_EAXREVERB_MAX_MODULATION_DEPTH (1.0f) +#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH (0.0f) -/* Get an integer parameter for a Filter object. */ -typedef void (__cdecl *LPALGETFILTERI)( ALuint fid, ALenum pname, ALint* value ); -typedef void (__cdecl *LPALGETFILTERIV)( ALuint fid, ALenum pname, ALint* values ); +#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF (0.892f) +#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF (1.0f) +#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF (0.994f) -/* Get a floating point parameter for a Filter object. */ -typedef void (__cdecl *LPALGETFILTERF)( ALuint fid, ALenum pname, ALfloat* value ); -typedef void (__cdecl *LPALGETFILTERFV)( ALuint fid, ALenum pname, ALfloat* values ); +#define AL_EAXREVERB_MIN_HFREFERENCE (1000.0f) +#define AL_EAXREVERB_MAX_HFREFERENCE (20000.0f) +#define AL_EAXREVERB_DEFAULT_HFREFERENCE (5000.0f) +#define AL_EAXREVERB_MIN_LFREFERENCE (20.0f) +#define AL_EAXREVERB_MAX_LFREFERENCE (1000.0f) +#define AL_EAXREVERB_DEFAULT_LFREFERENCE (250.0f) -/** - * Auxiliary Slot object functions - */ +#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) -/* Create Auxiliary Slot objects. */ -typedef void (__cdecl *LPALGENAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); +#define AL_EAXREVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_EAXREVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE -/* Delete Auxiliary Slot objects. */ -typedef void (__cdecl *LPALDELETEAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); +/* Chorus effect */ +#define AL_CHORUS_WAVEFORM_SINUSOID (0) +#define AL_CHORUS_WAVEFORM_TRIANGLE (1) -/* Verify a handle is a valid Auxiliary Slot. */ -typedef ALboolean (__cdecl *LPALISAUXILIARYEFFECTSLOT)( ALuint slot ); +#define AL_CHORUS_MIN_WAVEFORM (0) +#define AL_CHORUS_MAX_WAVEFORM (1) +#define AL_CHORUS_DEFAULT_WAVEFORM (1) -/* Set an integer parameter for a Auxiliary Slot object. */ -typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value ); -typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum param, ALint* values ); +#define AL_CHORUS_MIN_PHASE (-180) +#define AL_CHORUS_MAX_PHASE (180) +#define AL_CHORUS_DEFAULT_PHASE (90) -/* Set a floating point parameter for an Auxiliary Slot object. */ -typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum param, ALfloat value ); -typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum param, ALfloat* values ); +#define AL_CHORUS_MIN_RATE (0.0f) +#define AL_CHORUS_MAX_RATE (10.0f) +#define AL_CHORUS_DEFAULT_RATE (1.1f) -/* Get an integer parameter for a Auxiliary Slot object. */ -typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum pname, ALint* value ); -typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum pname, ALint* values ); +#define AL_CHORUS_MIN_DEPTH (0.0f) +#define AL_CHORUS_MAX_DEPTH (1.0f) +#define AL_CHORUS_DEFAULT_DEPTH (0.1f) -/* Get a floating point parameter for a Auxiliary Slot object. */ -typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum pname, ALfloat* value ); -typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum pname, ALfloat* values ); +#define AL_CHORUS_MIN_FEEDBACK (-1.0f) +#define AL_CHORUS_MAX_FEEDBACK (1.0f) +#define AL_CHORUS_DEFAULT_FEEDBACK (0.25f) +#define AL_CHORUS_MIN_DELAY (0.0f) +#define AL_CHORUS_MAX_DELAY (0.016f) +#define AL_CHORUS_DEFAULT_DELAY (0.016f) +/* Distortion effect */ +#define AL_DISTORTION_MIN_EDGE (0.0f) +#define AL_DISTORTION_MAX_EDGE (1.0f) +#define AL_DISTORTION_DEFAULT_EDGE (0.2f) + +#define AL_DISTORTION_MIN_GAIN (0.01f) +#define AL_DISTORTION_MAX_GAIN (1.0f) +#define AL_DISTORTION_DEFAULT_GAIN (0.05f) + +#define AL_DISTORTION_MIN_LOWPASS_CUTOFF (80.0f) +#define AL_DISTORTION_MAX_LOWPASS_CUTOFF (24000.0f) +#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF (8000.0f) + +#define AL_DISTORTION_MIN_EQCENTER (80.0f) +#define AL_DISTORTION_MAX_EQCENTER (24000.0f) +#define AL_DISTORTION_DEFAULT_EQCENTER (3600.0f) + +#define AL_DISTORTION_MIN_EQBANDWIDTH (80.0f) +#define AL_DISTORTION_MAX_EQBANDWIDTH (24000.0f) +#define AL_DISTORTION_DEFAULT_EQBANDWIDTH (3600.0f) + +/* Echo effect */ +#define AL_ECHO_MIN_DELAY (0.0f) +#define AL_ECHO_MAX_DELAY (0.207f) +#define AL_ECHO_DEFAULT_DELAY (0.1f) + +#define AL_ECHO_MIN_LRDELAY (0.0f) +#define AL_ECHO_MAX_LRDELAY (0.404f) +#define AL_ECHO_DEFAULT_LRDELAY (0.1f) + +#define AL_ECHO_MIN_DAMPING (0.0f) +#define AL_ECHO_MAX_DAMPING (0.99f) +#define AL_ECHO_DEFAULT_DAMPING (0.5f) + +#define AL_ECHO_MIN_FEEDBACK (0.0f) +#define AL_ECHO_MAX_FEEDBACK (1.0f) +#define AL_ECHO_DEFAULT_FEEDBACK (0.5f) + +#define AL_ECHO_MIN_SPREAD (-1.0f) +#define AL_ECHO_MAX_SPREAD (1.0f) +#define AL_ECHO_DEFAULT_SPREAD (-1.0f) + +/* Flanger effect */ +#define AL_FLANGER_WAVEFORM_SINUSOID (0) +#define AL_FLANGER_WAVEFORM_TRIANGLE (1) + +#define AL_FLANGER_MIN_WAVEFORM (0) +#define AL_FLANGER_MAX_WAVEFORM (1) +#define AL_FLANGER_DEFAULT_WAVEFORM (1) + +#define AL_FLANGER_MIN_PHASE (-180) +#define AL_FLANGER_MAX_PHASE (180) +#define AL_FLANGER_DEFAULT_PHASE (0) + +#define AL_FLANGER_MIN_RATE (0.0f) +#define AL_FLANGER_MAX_RATE (10.0f) +#define AL_FLANGER_DEFAULT_RATE (0.27f) + +#define AL_FLANGER_MIN_DEPTH (0.0f) +#define AL_FLANGER_MAX_DEPTH (1.0f) +#define AL_FLANGER_DEFAULT_DEPTH (1.0f) + +#define AL_FLANGER_MIN_FEEDBACK (-1.0f) +#define AL_FLANGER_MAX_FEEDBACK (1.0f) +#define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f) + +#define AL_FLANGER_MIN_DELAY (0.0f) +#define AL_FLANGER_MAX_DELAY (0.004f) +#define AL_FLANGER_DEFAULT_DELAY (0.002f) + +/* Frequency shifter effect */ +#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY (0.0f) +#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY (24000.0f) +#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY (0.0f) + +#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION (0) +#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION (2) +#define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION (0) + +#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN (0) +#define AL_FREQUENCY_SHIFTER_DIRECTION_UP (1) +#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF (2) + +#define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION (0) +#define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION (2) +#define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION (0) + +/* Vocal morpher effect */ +#define AL_VOCAL_MORPHER_MIN_PHONEMEA (0) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA (29) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA (0) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING (24) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING (0) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB (0) +#define AL_VOCAL_MORPHER_MAX_PHONEMEB (29) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB (10) + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING (24) +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING (0) + +#define AL_VOCAL_MORPHER_PHONEME_A (0) +#define AL_VOCAL_MORPHER_PHONEME_E (1) +#define AL_VOCAL_MORPHER_PHONEME_I (2) +#define AL_VOCAL_MORPHER_PHONEME_O (3) +#define AL_VOCAL_MORPHER_PHONEME_U (4) +#define AL_VOCAL_MORPHER_PHONEME_AA (5) +#define AL_VOCAL_MORPHER_PHONEME_AE (6) +#define AL_VOCAL_MORPHER_PHONEME_AH (7) +#define AL_VOCAL_MORPHER_PHONEME_AO (8) +#define AL_VOCAL_MORPHER_PHONEME_EH (9) +#define AL_VOCAL_MORPHER_PHONEME_ER (10) +#define AL_VOCAL_MORPHER_PHONEME_IH (11) +#define AL_VOCAL_MORPHER_PHONEME_IY (12) +#define AL_VOCAL_MORPHER_PHONEME_UH (13) +#define AL_VOCAL_MORPHER_PHONEME_UW (14) +#define AL_VOCAL_MORPHER_PHONEME_B (15) +#define AL_VOCAL_MORPHER_PHONEME_D (16) +#define AL_VOCAL_MORPHER_PHONEME_F (17) +#define AL_VOCAL_MORPHER_PHONEME_G (18) +#define AL_VOCAL_MORPHER_PHONEME_J (19) +#define AL_VOCAL_MORPHER_PHONEME_K (20) +#define AL_VOCAL_MORPHER_PHONEME_L (21) +#define AL_VOCAL_MORPHER_PHONEME_M (22) +#define AL_VOCAL_MORPHER_PHONEME_N (23) +#define AL_VOCAL_MORPHER_PHONEME_P (24) +#define AL_VOCAL_MORPHER_PHONEME_R (25) +#define AL_VOCAL_MORPHER_PHONEME_S (26) +#define AL_VOCAL_MORPHER_PHONEME_T (27) +#define AL_VOCAL_MORPHER_PHONEME_V (28) +#define AL_VOCAL_MORPHER_PHONEME_Z (29) + +#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID (0) +#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE (1) +#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH (2) + +#define AL_VOCAL_MORPHER_MIN_WAVEFORM (0) +#define AL_VOCAL_MORPHER_MAX_WAVEFORM (2) +#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM (0) + +#define AL_VOCAL_MORPHER_MIN_RATE (0.0f) +#define AL_VOCAL_MORPHER_MAX_RATE (10.0f) +#define AL_VOCAL_MORPHER_DEFAULT_RATE (1.41f) + +/* Pitch shifter effect */ +#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE (-12) +#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE (12) +#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE (12) + +#define AL_PITCH_SHIFTER_MIN_FINE_TUNE (-50) +#define AL_PITCH_SHIFTER_MAX_FINE_TUNE (50) +#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE (0) + +/* Ring modulator effect */ +#define AL_RING_MODULATOR_MIN_FREQUENCY (0.0f) +#define AL_RING_MODULATOR_MAX_FREQUENCY (8000.0f) +#define AL_RING_MODULATOR_DEFAULT_FREQUENCY (440.0f) + +#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF (0.0f) +#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF (24000.0f) +#define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF (800.0f) + +#define AL_RING_MODULATOR_SINUSOID (0) +#define AL_RING_MODULATOR_SAWTOOTH (1) +#define AL_RING_MODULATOR_SQUARE (2) + +#define AL_RING_MODULATOR_MIN_WAVEFORM (0) +#define AL_RING_MODULATOR_MAX_WAVEFORM (2) +#define AL_RING_MODULATOR_DEFAULT_WAVEFORM (0) + +/* Autowah effect */ +#define AL_AUTOWAH_MIN_ATTACK_TIME (0.0001f) +#define AL_AUTOWAH_MAX_ATTACK_TIME (1.0f) +#define AL_AUTOWAH_DEFAULT_ATTACK_TIME (0.06f) + +#define AL_AUTOWAH_MIN_RELEASE_TIME (0.0001f) +#define AL_AUTOWAH_MAX_RELEASE_TIME (1.0f) +#define AL_AUTOWAH_DEFAULT_RELEASE_TIME (0.06f) + +#define AL_AUTOWAH_MIN_RESONANCE (2.0f) +#define AL_AUTOWAH_MAX_RESONANCE (1000.0f) +#define AL_AUTOWAH_DEFAULT_RESONANCE (1000.0f) + +#define AL_AUTOWAH_MIN_PEAK_GAIN (0.00003f) +#define AL_AUTOWAH_MAX_PEAK_GAIN (31621.0f) +#define AL_AUTOWAH_DEFAULT_PEAK_GAIN (11.22f) + +/* Compressor effect */ +#define AL_COMPRESSOR_MIN_ONOFF (0) +#define AL_COMPRESSOR_MAX_ONOFF (1) +#define AL_COMPRESSOR_DEFAULT_ONOFF (1) + +/* Equalizer effect */ +#define AL_EQUALIZER_MIN_LOW_GAIN (0.126f) +#define AL_EQUALIZER_MAX_LOW_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_LOW_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_LOW_CUTOFF (50.0f) +#define AL_EQUALIZER_MAX_LOW_CUTOFF (800.0f) +#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF (200.0f) + +#define AL_EQUALIZER_MIN_MID1_GAIN (0.126f) +#define AL_EQUALIZER_MAX_MID1_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_MID1_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_MID1_CENTER (200.0f) +#define AL_EQUALIZER_MAX_MID1_CENTER (3000.0f) +#define AL_EQUALIZER_DEFAULT_MID1_CENTER (500.0f) + +#define AL_EQUALIZER_MIN_MID1_WIDTH (0.01f) +#define AL_EQUALIZER_MAX_MID1_WIDTH (1.0f) +#define AL_EQUALIZER_DEFAULT_MID1_WIDTH (1.0f) + +#define AL_EQUALIZER_MIN_MID2_GAIN (0.126f) +#define AL_EQUALIZER_MAX_MID2_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_MID2_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_MID2_CENTER (1000.0f) +#define AL_EQUALIZER_MAX_MID2_CENTER (8000.0f) +#define AL_EQUALIZER_DEFAULT_MID2_CENTER (3000.0f) + +#define AL_EQUALIZER_MIN_MID2_WIDTH (0.01f) +#define AL_EQUALIZER_MAX_MID2_WIDTH (1.0f) +#define AL_EQUALIZER_DEFAULT_MID2_WIDTH (1.0f) + +#define AL_EQUALIZER_MIN_HIGH_GAIN (0.126f) +#define AL_EQUALIZER_MAX_HIGH_GAIN (7.943f) +#define AL_EQUALIZER_DEFAULT_HIGH_GAIN (1.0f) + +#define AL_EQUALIZER_MIN_HIGH_CUTOFF (4000.0f) +#define AL_EQUALIZER_MAX_HIGH_CUTOFF (16000.0f) +#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF (6000.0f) -/********************************************************** - * Filter ranges and defaults. - */ +/* Source parameter value ranges and defaults. */ +#define AL_MIN_AIR_ABSORPTION_FACTOR (0.0f) +#define AL_MAX_AIR_ABSORPTION_FACTOR (10.0f) +#define AL_DEFAULT_AIR_ABSORPTION_FACTOR (0.0f) -/** - * Lowpass filter - */ +#define AL_MIN_ROOM_ROLLOFF_FACTOR (0.0f) +#define AL_MAX_ROOM_ROLLOFF_FACTOR (10.0f) +#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR (0.0f) -#define LOWPASS_MIN_GAIN 0.0f -#define LOWPASS_MAX_GAIN 1.0f -#define LOWPASS_DEFAULT_GAIN 1.0f +#define AL_MIN_CONE_OUTER_GAINHF (0.0f) +#define AL_MAX_CONE_OUTER_GAINHF (1.0f) +#define AL_DEFAULT_CONE_OUTER_GAINHF (1.0f) -#define LOWPASS_MIN_GAINHF 0.0f -#define LOWPASS_MAX_GAINHF 1.0f -#define LOWPASS_DEFAULT_GAINHF 1.0f +#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO AL_TRUE -/** - * Highpass filter - */ +#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE -#define HIGHPASS_MIN_GAIN 0.0f -#define HIGHPASS_MAX_GAIN 1.0f -#define HIGHPASS_DEFAULT_GAIN 1.0f +#define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE -#define HIGHPASS_MIN_GAINLF 0.0f -#define HIGHPASS_MAX_GAINLF 1.0f -#define HIGHPASS_DEFAULT_GAINLF 1.0f -/** - * Bandpass filter - */ - -#define BANDPASS_MIN_GAIN 0.0f -#define BANDPASS_MAX_GAIN 1.0f -#define BANDPASS_DEFAULT_GAIN 1.0f - -#define BANDPASS_MIN_GAINHF 0.0f -#define BANDPASS_MAX_GAINHF 1.0f -#define BANDPASS_DEFAULT_GAINHF 1.0f - -#define BANDPASS_MIN_GAINLF 0.0f -#define BANDPASS_MAX_GAINLF 1.0f -#define BANDPASS_DEFAULT_GAINLF 1.0f - - - - - /********************************************************** - * Effect parameter structures, value definitions, ranges and defaults. - */ - -/** - * AL reverb effect parameter ranges and defaults - */ -#define AL_REVERB_MIN_DENSITY 0.0f -#define AL_REVERB_MAX_DENSITY 1.0f -#define AL_REVERB_DEFAULT_DENSITY 1.0f - -#define AL_REVERB_MIN_DIFFUSION 0.0f -#define AL_REVERB_MAX_DIFFUSION 1.0f -#define AL_REVERB_DEFAULT_DIFFUSION 1.0f - -#define AL_REVERB_MIN_GAIN 0.0f -#define AL_REVERB_MAX_GAIN 1.0f -#define AL_REVERB_DEFAULT_GAIN 0.32f - -#define AL_REVERB_MIN_GAINHF 0.0f -#define AL_REVERB_MAX_GAINHF 1.0f -#define AL_REVERB_DEFAULT_GAINHF 0.89f - -#define AL_REVERB_MIN_DECAY_TIME 0.1f -#define AL_REVERB_MAX_DECAY_TIME 20.0f -#define AL_REVERB_DEFAULT_DECAY_TIME 1.49f - -#define AL_REVERB_MIN_DECAY_HFRATIO 0.1f -#define AL_REVERB_MAX_DECAY_HFRATIO 2.0f -#define AL_REVERB_DEFAULT_DECAY_HFRATIO 0.83f - -#define AL_REVERB_MIN_REFLECTIONS_GAIN 0.0f -#define AL_REVERB_MAX_REFLECTIONS_GAIN 3.16f -#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN 0.05f - -#define AL_REVERB_MIN_REFLECTIONS_DELAY 0.0f -#define AL_REVERB_MAX_REFLECTIONS_DELAY 0.3f -#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY 0.007f - -#define AL_REVERB_MIN_LATE_REVERB_GAIN 0.0f -#define AL_REVERB_MAX_LATE_REVERB_GAIN 10.0f -#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN 1.26f - -#define AL_REVERB_MIN_LATE_REVERB_DELAY 0.0f -#define AL_REVERB_MAX_LATE_REVERB_DELAY 0.1f -#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY 0.011f - -#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF 0.892f -#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF 1.0f -#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF 0.994f - -#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR 0.0f -#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR 10.0f -#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f - -#define AL_REVERB_MIN_DECAY_HFLIMIT AL_FALSE -#define AL_REVERB_MAX_DECAY_HFLIMIT AL_TRUE -#define AL_REVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE - -/** - * AL chorus effect parameter ranges and defaults - */ -#define AL_CHORUS_MIN_WAVEFORM 0 -#define AL_CHORUS_MAX_WAVEFORM 1 -#define AL_CHORUS_DEFAULT_WAVEFORM 1 - -#define AL_CHORUS_WAVEFORM_SINUSOID 0 -#define AL_CHORUS_WAVEFORM_TRIANGLE 1 - -#define AL_CHORUS_MIN_PHASE (-180) -#define AL_CHORUS_MAX_PHASE 180 -#define AL_CHORUS_DEFAULT_PHASE 90 - -#define AL_CHORUS_MIN_RATE 0.0f -#define AL_CHORUS_MAX_RATE 10.0f -#define AL_CHORUS_DEFAULT_RATE 1.1f - -#define AL_CHORUS_MIN_DEPTH 0.0f -#define AL_CHORUS_MAX_DEPTH 1.0f -#define AL_CHORUS_DEFAULT_DEPTH 0.1f - -#define AL_CHORUS_MIN_FEEDBACK (-1.0f) -#define AL_CHORUS_MAX_FEEDBACK 1.0f -#define AL_CHORUS_DEFAULT_FEEDBACK 0.25f - -#define AL_CHORUS_MIN_DELAY 0.0f -#define AL_CHORUS_MAX_DELAY 0.016f -#define AL_CHORUS_DEFAULT_DELAY 0.016f - -/** - * AL distortion effect parameter ranges and defaults - */ -#define AL_DISTORTION_MIN_EDGE 0.0f -#define AL_DISTORTION_MAX_EDGE 1.0f -#define AL_DISTORTION_DEFAULT_EDGE 0.2f - -#define AL_DISTORTION_MIN_GAIN 0.01f -#define AL_DISTORTION_MAX_GAIN 1.0f -#define AL_DISTORTION_DEFAULT_GAIN 0.05f - -#define AL_DISTORTION_MIN_LOWPASS_CUTOFF 80.0f -#define AL_DISTORTION_MAX_LOWPASS_CUTOFF 24000.0f -#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF 8000.0f - -#define AL_DISTORTION_MIN_EQCENTER 80.0f -#define AL_DISTORTION_MAX_EQCENTER 24000.0f -#define AL_DISTORTION_DEFAULT_EQCENTER 3600.0f - -#define AL_DISTORTION_MIN_EQBANDWIDTH 80.0f -#define AL_DISTORTION_MAX_EQBANDWIDTH 24000.0f -#define AL_DISTORTION_DEFAULT_EQBANDWIDTH 3600.0f - -/** - * AL echo effect parameter ranges and defaults - */ -#define AL_ECHO_MIN_DELAY 0.0f -#define AL_ECHO_MAX_DELAY 0.207f -#define AL_ECHO_DEFAULT_DELAY 0.1f - -#define AL_ECHO_MIN_LRDELAY 0.0f -#define AL_ECHO_MAX_LRDELAY 0.404f -#define AL_ECHO_DEFAULT_LRDELAY 0.1f - -#define AL_ECHO_MIN_DAMPING 0.0f -#define AL_ECHO_MAX_DAMPING 0.99f -#define AL_ECHO_DEFAULT_DAMPING 0.5f - -#define AL_ECHO_MIN_FEEDBACK 0.0f -#define AL_ECHO_MAX_FEEDBACK 1.0f -#define AL_ECHO_DEFAULT_FEEDBACK 0.5f - -#define AL_ECHO_MIN_SPREAD (-1.0f) -#define AL_ECHO_MAX_SPREAD 1.0f -#define AL_ECHO_DEFAULT_SPREAD (-1.0f) - -/** - * AL flanger effect parameter ranges and defaults - */ -#define AL_FLANGER_MIN_WAVEFORM 0 -#define AL_FLANGER_MAX_WAVEFORM 1 -#define AL_FLANGER_DEFAULT_WAVEFORM 1 - -#define AL_FLANGER_WAVEFORM_SINUSOID 0 -#define AL_FLANGER_WAVEFORM_TRIANGLE 1 - -#define AL_FLANGER_MIN_PHASE (-180) -#define AL_FLANGER_MAX_PHASE 180 -#define AL_FLANGER_DEFAULT_PHASE 0 - -#define AL_FLANGER_MIN_RATE 0.0f -#define AL_FLANGER_MAX_RATE 10.0f -#define AL_FLANGER_DEFAULT_RATE 0.27f - -#define AL_FLANGER_MIN_DEPTH 0.0f -#define AL_FLANGER_MAX_DEPTH 1.0f -#define AL_FLANGER_DEFAULT_DEPTH 1.0f - -#define AL_FLANGER_MIN_FEEDBACK (-1.0f) -#define AL_FLANGER_MAX_FEEDBACK 1.0f -#define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f) - -#define AL_FLANGER_MIN_DELAY 0.0f -#define AL_FLANGER_MAX_DELAY 0.004f -#define AL_FLANGER_DEFAULT_DELAY 0.002f - -/** - * AL frequency shifter effect parameter ranges and defaults - */ -#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY 0.0f -#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY 24000.0f -#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY 0.0f - -#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION 0 -#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION 2 -#define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION 0 - -#define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION 0 -#define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION 2 -#define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION 0 - -#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN 0 -#define AL_FREQUENCY_SHIFTER_DIRECTION_UP 1 -#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF 2 - -/** - * AL vocal morpher effect parameter ranges and defaults - */ -#define AL_VOCAL_MORPHER_MIN_PHONEMEA 0 -#define AL_VOCAL_MORPHER_MAX_PHONEMEA 29 -#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA 0 - -#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) -#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING 24 -#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING 0 - -#define AL_VOCAL_MORPHER_MIN_PHONEMEB 0 -#define AL_VOCAL_MORPHER_MAX_PHONEMEB 29 -#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB 10 - -#define AL_VOCAL_MORPHER_PHONEME_A 0 -#define AL_VOCAL_MORPHER_PHONEME_E 1 -#define AL_VOCAL_MORPHER_PHONEME_I 2 -#define AL_VOCAL_MORPHER_PHONEME_O 3 -#define AL_VOCAL_MORPHER_PHONEME_U 4 -#define AL_VOCAL_MORPHER_PHONEME_AA 5 -#define AL_VOCAL_MORPHER_PHONEME_AE 6 -#define AL_VOCAL_MORPHER_PHONEME_AH 7 -#define AL_VOCAL_MORPHER_PHONEME_AO 8 -#define AL_VOCAL_MORPHER_PHONEME_EH 9 -#define AL_VOCAL_MORPHER_PHONEME_ER 10 -#define AL_VOCAL_MORPHER_PHONEME_IH 11 -#define AL_VOCAL_MORPHER_PHONEME_IY 12 -#define AL_VOCAL_MORPHER_PHONEME_UH 13 -#define AL_VOCAL_MORPHER_PHONEME_UW 14 -#define AL_VOCAL_MORPHER_PHONEME_B 15 -#define AL_VOCAL_MORPHER_PHONEME_D 16 -#define AL_VOCAL_MORPHER_PHONEME_F 17 -#define AL_VOCAL_MORPHER_PHONEME_G 18 -#define AL_VOCAL_MORPHER_PHONEME_J 19 -#define AL_VOCAL_MORPHER_PHONEME_K 20 -#define AL_VOCAL_MORPHER_PHONEME_L 21 -#define AL_VOCAL_MORPHER_PHONEME_M 22 -#define AL_VOCAL_MORPHER_PHONEME_N 23 -#define AL_VOCAL_MORPHER_PHONEME_P 24 -#define AL_VOCAL_MORPHER_PHONEME_R 25 -#define AL_VOCAL_MORPHER_PHONEME_S 26 -#define AL_VOCAL_MORPHER_PHONEME_T 27 -#define AL_VOCAL_MORPHER_PHONEME_V 28 -#define AL_VOCAL_MORPHER_PHONEME_Z 29 - -#define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24) -#define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING 24 -#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING 0 - -#define AL_VOCAL_MORPHER_MIN_WAVEFORM 0 -#define AL_VOCAL_MORPHER_MAX_WAVEFORM 2 -#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM 0 - -#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID 0 -#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE 1 -#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH 2 - -#define AL_VOCAL_MORPHER_MIN_RATE 0.0f -#define AL_VOCAL_MORPHER_MAX_RATE 10.0f -#define AL_VOCAL_MORPHER_DEFAULT_RATE 1.41f - -/** - * AL pitch shifter effect parameter ranges and defaults - */ -#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE (-12) -#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE 12 -#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE 12 - -#define AL_PITCH_SHIFTER_MIN_FINE_TUNE (-50) -#define AL_PITCH_SHIFTER_MAX_FINE_TUNE 50 -#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE 0 - -/** - * AL ring modulator effect parameter ranges and defaults - */ -#define AL_RING_MODULATOR_MIN_FREQUENCY 0.0f -#define AL_RING_MODULATOR_MAX_FREQUENCY 8000.0f -#define AL_RING_MODULATOR_DEFAULT_FREQUENCY 440.0f - -#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF 0.0f -#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF 24000.0f -#define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF 800.0f - -#define AL_RING_MODULATOR_MIN_WAVEFORM 0 -#define AL_RING_MODULATOR_MAX_WAVEFORM 2 -#define AL_RING_MODULATOR_DEFAULT_WAVEFORM 0 - -#define AL_RING_MODULATOR_SINUSOID 0 -#define AL_RING_MODULATOR_SAWTOOTH 1 -#define AL_RING_MODULATOR_SQUARE 2 - -/** - * AL autowah effect parameter ranges and defaults - */ -#define AL_AUTOWAH_MIN_ATTACK_TIME 0.0001f -#define AL_AUTOWAH_MAX_ATTACK_TIME 1.0f -#define AL_AUTOWAH_DEFAULT_ATTACK_TIME 0.06f - -#define AL_AUTOWAH_MIN_RELEASE_TIME 0.0001f -#define AL_AUTOWAH_MAX_RELEASE_TIME 1.0f -#define AL_AUTOWAH_DEFAULT_RELEASE_TIME 0.06f - -#define AL_AUTOWAH_MIN_RESONANCE 2.0f -#define AL_AUTOWAH_MAX_RESONANCE 1000.0f -#define AL_AUTOWAH_DEFAULT_RESONANCE 1000.0f - -#define AL_AUTOWAH_MIN_PEAK_GAIN 0.00003f -#define AL_AUTOWAH_MAX_PEAK_GAIN 31621.0f -#define AL_AUTOWAH_DEFAULT_PEAK_GAIN 11.22f - -/** - * AL compressor effect parameter ranges and defaults - */ -#define AL_COMPRESSOR_MIN_ONOFF 0 -#define AL_COMPRESSOR_MAX_ONOFF 1 -#define AL_COMPRESSOR_DEFAULT_ONOFF 1 - -/** - * AL equalizer effect parameter ranges and defaults - */ -#define AL_EQUALIZER_MIN_LOW_GAIN 0.126f -#define AL_EQUALIZER_MAX_LOW_GAIN 7.943f -#define AL_EQUALIZER_DEFAULT_LOW_GAIN 1.0f - -#define AL_EQUALIZER_MIN_LOW_CUTOFF 50.0f -#define AL_EQUALIZER_MAX_LOW_CUTOFF 800.0f -#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF 200.0f - -#define AL_EQUALIZER_MIN_MID1_GAIN 0.126f -#define AL_EQUALIZER_MAX_MID1_GAIN 7.943f -#define AL_EQUALIZER_DEFAULT_MID1_GAIN 1.0f - -#define AL_EQUALIZER_MIN_MID1_CENTER 200.0f -#define AL_EQUALIZER_MAX_MID1_CENTER 3000.0f -#define AL_EQUALIZER_DEFAULT_MID1_CENTER 500.0f - -#define AL_EQUALIZER_MIN_MID1_WIDTH 0.01f -#define AL_EQUALIZER_MAX_MID1_WIDTH 1.0f -#define AL_EQUALIZER_DEFAULT_MID1_WIDTH 1.0f - -#define AL_EQUALIZER_MIN_MID2_GAIN 0.126f -#define AL_EQUALIZER_MAX_MID2_GAIN 7.943f -#define AL_EQUALIZER_DEFAULT_MID2_GAIN 1.0f - -#define AL_EQUALIZER_MIN_MID2_CENTER 1000.0f -#define AL_EQUALIZER_MAX_MID2_CENTER 8000.0f -#define AL_EQUALIZER_DEFAULT_MID2_CENTER 3000.0f - -#define AL_EQUALIZER_MIN_MID2_WIDTH 0.01f -#define AL_EQUALIZER_MAX_MID2_WIDTH 1.0f -#define AL_EQUALIZER_DEFAULT_MID2_WIDTH 1.0f - -#define AL_EQUALIZER_MIN_HIGH_GAIN 0.126f -#define AL_EQUALIZER_MAX_HIGH_GAIN 7.943f -#define AL_EQUALIZER_DEFAULT_HIGH_GAIN 1.0f - -#define AL_EQUALIZER_MIN_HIGH_CUTOFF 4000.0f -#define AL_EQUALIZER_MAX_HIGH_CUTOFF 16000.0f -#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF 6000.0f - - - - -/********************************************************** - * Source parameter value definitions, ranges and defaults. - */ -#define AL_MIN_AIR_ABSORPTION_FACTOR 0.0f -#define AL_MAX_AIR_ABSORPTION_FACTOR 10.0f -#define AL_DEFAULT_AIR_ABSORPTION_FACTOR 0.0f - -#define AL_MIN_ROOM_ROLLOFF_FACTOR 0.0f -#define AL_MAX_ROOM_ROLLOFF_FACTOR 10.0f -#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f - -#define AL_MIN_CONE_OUTER_GAINHF 0.0f -#define AL_MAX_CONE_OUTER_GAINHF 1.0f -#define AL_DEFAULT_CONE_OUTER_GAINHF 1.0f - -#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO AL_FALSE -#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO AL_TRUE -#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO AL_TRUE - -#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_FALSE -#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE -#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE - -#define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE -#define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE -#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE - - - - -/********************************************************** - * Listener parameter value definitions, ranges and defaults. - */ -#define AL_MIN_METERS_PER_UNIT FLT_MIN -#define AL_MAX_METERS_PER_UNIT FLT_MAX -#define AL_DEFAULT_METERS_PER_UNIT 1.0f +/* Listener parameter value ranges and defaults. */ +#define AL_MIN_METERS_PER_UNIT FLT_MIN +#define AL_MAX_METERS_PER_UNIT FLT_MAX +#define AL_DEFAULT_METERS_PER_UNIT (1.0f) #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __efx_h_ */ +#endif /* AL_EFX_H */ diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 2e13aedb46..a983005318 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -109,7 +109,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -121,7 +121,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -147,7 +147,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -175,7 +175,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -192,6 +192,7 @@ + @@ -204,6 +205,7 @@ + diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index 7e098ecb85..af5fe12220 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -21,6 +21,7 @@ SoundStreams + @@ -44,6 +45,7 @@ SoundStreams + diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index 93547681b0..0e610bd847 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -1,5 +1,6 @@ set(SRCS Src/AudioCommon.cpp Src/AudioCommonConfig.cpp + Src/DPL2Decoder.cpp Src/Mixer.cpp Src/WaveFile.cpp Src/NullSoundStream.cpp) diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp new file mode 100644 index 0000000000..4efedc4b44 --- /dev/null +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -0,0 +1,397 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// Dolby Pro Logic 2 decoder from ffdshow-tryout +// * Copyright 2001 Anders Johansson ajh@atri.curtin.edu.au +// * Copyright (c) 2004-2006 Milan Cutka +// * based on mplayer HRTF plugin by ylai + +#include +#include +#include "DPL2Decoder.h" + +#define M_PI 3.14159265358979323846 +#define M_SQRT1_2 0.70710678118654752440 + +int olddelay = -1; +unsigned int oldfreq = 0; +unsigned int dlbuflen; +int cyc_pos; +float l_fwr, r_fwr, lpr_fwr, lmr_fwr; +std::vector fwrbuf_l, fwrbuf_r; +float adapt_l_gain, adapt_r_gain, adapt_lpr_gain, adapt_lmr_gain; +std::vector lf, rf, lr, rr, cf, cr; +float LFE_buf[256]; +unsigned int lfe_pos; +float *filter_coefs_lfe; +unsigned int len125; + +template static _ftype_t dotproduct(int count,const T *buf,const _ftype_t *coefficients) +{ + float sum0=0,sum1=0,sum2=0,sum3=0; + for (;count>=4;buf+=4,coefficients+=4,count-=4) + { + sum0+=buf[0]*coefficients[0]; + sum1+=buf[1]*coefficients[1]; + sum2+=buf[2]*coefficients[2]; + sum3+=buf[3]*coefficients[3]; + } + while (count--) sum0+= *buf++ * *coefficients++; + return sum0+sum1+sum2+sum3; +} + +template static T firfilter(const T *buf, int pos, int len, int count, const float *coefficients) +{ + int count1, count2; + + if (pos >= count) + { + pos -= count; + count1 = count; count2 = 0; + } + else + { + count2 = pos; + count1 = count - pos; + pos = len - count1; + } + + // high part of window + const T *ptr = &buf[pos]; + + float r1=dotproduct(count1,ptr,coefficients);coefficients+=count1; + float r2=dotproduct(count2,buf,coefficients); + return T(r1+r2); +} + +template inline const T& limit(const T& val, const T& min, const T& max) +{ + if (val < min) { + return min; + } else if (val > max) { + return max; + } else { + return val; + } +} + +/* +// Hamming +// 2*pi*k +// w(k) = 0.54 - 0.46*cos(------), where 0 <= k < N +// N-1 +// +// n window length +// w buffer for the window parameters +*/ +void hamming(int n, float* w) +{ + int i; + float k = float(2*M_PI/((float)(n-1))); // 2*pi/(N-1) + + // Calculate window coefficients + for (i=0; i Fs/2 +flags window and filter type as defined in filter.h +variables are ored together: i.e. LP|HAMMING will give a +low pass filter designed using a hamming window +opt beta constant used only when designing using kaiser windows + +returns 0 if OK, -1 if fail +*/ +float* design_fir(unsigned int *n, float* fc, float opt) +{ + unsigned int o = *n & 1; // Indicator for odd filter length + unsigned int end = ((*n + 1) >> 1) - o; // Loop end + unsigned int i; // Loop index + + float k1 = 2 * float(M_PI); // 2*pi*fc1 + float k2 = 0.5f * (float)(1 - o);// Constant used if the filter has even length + float g = 0.0f; // Gain + float t1; // Temporary variables + float fc1; // Cutoff frequencies + + // Sanity check + if(*n==0) return NULL; + fc[0]=limit(fc[0],float(0.001),float(1)); + + float *w=(float*)calloc(sizeof(float),*n); + + // Get window coefficients + hamming(*n,w); + + fc1=*fc; + // Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2 + fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1/2 : 0.25f; + k1 *= fc1; + + // Low pass filter + + // If the filter length is odd, there is one point which is exactly + // in the middle. The value at this point is 2*fCutoff*sin(x)/x, + // where x is zero. To make sure nothing strange happens, we set this + // value separately. + if (o) + { + w[end] = fc1 * w[end] * 2.0f; + g=w[end]; + } + + // Create filter + for (i=0 ; i M9_03DB * lpr_fwr ? lmr_fwr : M9_03DB * lpr_fwr; + float lpr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lpr_fwr + lpr_fwr); + float lmr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); + float lmr_unlim_gain = (lpr_fwr + lmr_fwr) / (1 + lmr_fwr + lmr_fwr); + float lpr, lmr; + float l_agc, r_agc, lpr_agc, lmr_agc; + float f, d_gain, c_gain, c_agc_cfk; + + /*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/ + /* AGC adaption */ + d_gain = (fabs(l_gain - *adapt_l_gain) + fabs(r_gain - *adapt_r_gain)) * 0.5f; + f = d_gain * (1.0f / MATAGCTRIG); + f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); + *adapt_l_gain = (1 - f) * *adapt_l_gain + f * l_gain; + *adapt_r_gain = (1 - f) * *adapt_r_gain + f * r_gain; + /* Matrix */ + l_agc = in[il] * passive_lock(*adapt_l_gain); + r_agc = in[ir] * passive_lock(*adapt_r_gain); + cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; + if (decode_rear) + { + lr[kr] = rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; + /* Stereo rear channel is steered with the same AGC steering as + the decoding matrix. Note this requires a fast updating AGC + at the order of 20 ms (which is the case here). */ + lr[kr] *= (l_fwr + l_fwr) / (1 + l_fwr + r_fwr); + rr[kr] *= (r_fwr + r_fwr) / (1 + l_fwr + r_fwr); + } + + /*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/ + lpr = (in[il] + in[ir]) * (float)M_SQRT1_2; + lmr = (in[il] - in[ir]) * (float)M_SQRT1_2; + /* AGC adaption */ + d_gain = fabs(lmr_unlim_gain - *adapt_lmr_gain); + f = d_gain * (1.0f / MATAGCTRIG); + f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); + *adapt_lpr_gain = (1 - f) * *adapt_lpr_gain + f * lpr_gain; + *adapt_lmr_gain = (1 - f) * *adapt_lmr_gain + f * lmr_gain; + /* Matrix */ + lpr_agc = lpr * passive_lock(*adapt_lpr_gain); + lmr_agc = lmr * passive_lock(*adapt_lmr_gain); + lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; + rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; + + /*** CENTER FRONT CANCELLATION ***/ + /* A heuristic approach exploits that Lt + Rt gain contains the + information about Lt, Rt correlation. This effectively reshapes + the front and rear "cones" to concentrate Lt + Rt to C and + introduce Lt - Rt in L, R. */ + /* 0.67677 is the empirical lower bound for lpr_gain. */ + c_gain = 8 * (*adapt_lpr_gain - 0.67677f); + c_gain = c_gain > 0 ? c_gain : 0; + /* c_gain should not be too high, not even reaching full + cancellation (~ 0.50 - 0.55 at current AGC implementation), or + the center will sound too narrow. */ + c_gain = MATCOMPGAIN / (1 + c_gain * c_gain); + c_agc_cfk = c_gain * cf[k]; + lf[k] -= c_agc_cfk; + rf[k] -= c_agc_cfk; + cf[k] += c_agc_cfk + c_agc_cfk; +} + +void dpl2decode(float *samples, int numsamples, float *out) +{ + static const unsigned int FWRDURATION = 240; /* FWR average duration (samples) */ + static const unsigned int cfg_delay = 0; + static const unsigned int fmt_freq = 48000; + static const unsigned int fmt_nchannels = 2; // input channels + + int cur = 0; + + if (olddelay != cfg_delay || oldfreq != fmt_freq) + { + done(); + olddelay = cfg_delay; + oldfreq = fmt_freq; + dlbuflen = std::max(FWRDURATION, (fmt_freq * cfg_delay / 1000)); //+(len7000-1); + cyc_pos = dlbuflen - 1; + fwrbuf_l.resize(dlbuflen); + fwrbuf_r.resize(dlbuflen); + lf.resize(dlbuflen); + rf.resize(dlbuflen); + lr.resize(dlbuflen); + rr.resize(dlbuflen); + cf.resize(dlbuflen); + cr.resize(dlbuflen); + filter_coefs_lfe = calc_coefficients_125Hz_lowpass(fmt_freq); + lfe_pos = 0; + memset(LFE_buf, 0, sizeof(LFE_buf)); + } + + float *in = samples; // Input audio data + float *end = in + numsamples * fmt_nchannels; // Loop end + + while (in < end) + { + const int k = cyc_pos; + + const int fwr_pos = (k + FWRDURATION) % dlbuflen; + /* Update the full wave rectified total amplitude */ + /* Input matrix decoder */ + l_fwr += fabs(in[0]) - fabs(fwrbuf_l[fwr_pos]); + r_fwr += fabs(in[1]) - fabs(fwrbuf_r[fwr_pos]); + lpr_fwr += fabs(in[0] + in[1]) - fabs(fwrbuf_l[fwr_pos] + fwrbuf_r[fwr_pos]); + lmr_fwr += fabs(in[0] - in[1]) - fabs(fwrbuf_l[fwr_pos] - fwrbuf_r[fwr_pos]); + + /* Matrix encoded 2 channel sources */ + fwrbuf_l[k] = in[0]; + fwrbuf_r[k] = in[1]; + matrix_decode(in, k, 0, 1, true, dlbuflen, + l_fwr, r_fwr, + lpr_fwr, lmr_fwr, + &adapt_l_gain, &adapt_r_gain, + &adapt_lpr_gain, &adapt_lmr_gain, + &lf[0], &rf[0], &lr[0], &rr[0], &cf[0]); + + out[cur + 0] = lf[k]; + out[cur + 1] = rf[k]; + out[cur + 2] = cf[k]; + LFE_buf[lfe_pos] = (out[0] + out[1]) / 2; + out[cur + 3] = firfilter(LFE_buf, lfe_pos, len125, len125, filter_coefs_lfe); + lfe_pos++; + if (lfe_pos == len125) + { + lfe_pos = 0; + } + out[cur + 4] = lr[k]; + out[cur + 5] = rr[k]; + // Next sample... + in += 2; + cur += 6; + cyc_pos--; + if (cyc_pos < 0) + { + cyc_pos += dlbuflen; + } + } +} + +void dpl2reset() +{ + olddelay = -1; + oldfreq = 0; + filter_coefs_lfe = NULL; +} diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.h b/Source/Core/AudioCommon/Src/DPL2Decoder.h new file mode 100644 index 0000000000..eee8fbf15e --- /dev/null +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.h @@ -0,0 +1,24 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _DPL2DECODER_H_ +#define _DPL2DECODER_H_ + +void dpl2decode(float *samples, int numsamples, float *out); +void dpl2reset(); + +#endif // _DPL2DECODER_H_ diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index b0c856dcad..8fb1f1b2c5 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -15,10 +15,9 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include - #include "aldlist.h" #include "OpenALStream.h" +#include "DPL2Decoder.h" #if defined HAVE_OPENAL && HAVE_OPENAL @@ -37,8 +36,10 @@ bool OpenALStream::Start() pDeviceList = new ALDeviceList(); if ((pDeviceList) && (pDeviceList->GetNumDevices())) { - char *defDevName = pDeviceList-> \ - GetDeviceName(pDeviceList->GetDefaultDevice()); + char *defDevName = pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()); + + WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName); + pDevice = alcOpenDevice(defDevName); if (pDevice) { @@ -52,8 +53,7 @@ bool OpenALStream::Start() else { alcCloseDevice(pDevice); - PanicAlertT("OpenAL: can't create context " - "for device %s", defDevName); + PanicAlertT("OpenAL: can't create context for device %s", defDevName); } } else @@ -67,6 +67,9 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } + // Initialise DPL2 parameters + dpl2reset(); + soundTouch.clear(); return bReturn; } @@ -76,6 +79,7 @@ void OpenALStream::Stop() threadData = 1; // kick the thread if it's waiting soundSyncEvent.Set(); + mainSyncEvent.Set(); soundTouch.clear(); @@ -141,10 +145,15 @@ void OpenALStream::SoundLoop() alGenSources(1, &uiSource); // Short Silence - memset(sampleBuffer, 0, OAL_MAX_SAMPLES * 4 * OAL_NUM_BUFFERS); + memset(sampleBuffer, 0, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS); memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4); for (int i = 0; i < OAL_NUM_BUFFERS; i++) - alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES * 4, ulFrequency); + { + if (Core::g_CoreStartupParameter.bDPL2Decoder) + alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS, ulFrequency); + else + alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES * 4, ulFrequency); + } alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers); alSourcePlay(uiSource); @@ -166,6 +175,8 @@ void OpenALStream::SoundLoop() soundTouch.setSetting(SETTING_SEEKWINDOW_MS, 28); soundTouch.setSetting(SETTING_OVERLAP_MS, 12); + bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder; + while (!threadData) { // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. @@ -201,18 +212,72 @@ void OpenALStream::SoundLoop() soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); soundTouch.setTempo(rate); } - unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS); + unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS); if (nSamples > 0) { // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) if (iBuffersFilled == 0) + { alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp); - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, sampleBuffer, nSamples * 4, ulFrequency); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error unqueuing buffers: %08x", err); + } + } +#if defined(__APPLE__) + // OSX does not have the alext AL_FORMAT_51CHN32 yet. + surround_capable = false; +#else + if (surround_capable) + { + // Convert the samples from short to float for the dpl2 decoder + float dest[OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS]; + for (u32 i = 0; i < nSamples; ++i) + { + dest[i * 2 + 0] = (float)sampleBuffer[i * 2 + 0] / (1<<16); + dest[i * 2 + 1] = (float)sampleBuffer[i * 2 + 1] / (1<<16); + } + + float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS]; + dpl2decode(dest, nSamples, dpl2); + + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); + ALenum err = alGetError(); + if (err == AL_INVALID_ENUM) + { + // 5.1 is not supported by the host, fallback to stereo + WARN_LOG(AUDIO, "Unable set 5.1 surround mode. Updating OpenAL Soft might fix this issue."); + surround_capable = false; + } + else if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred while buffering data: %08x", err); + } + } +#endif + if (!surround_capable) + { + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, sampleBuffer, nSamples * 2 * 2, ulFrequency); + } + alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error queuing buffers: %08x", err); + } iBuffersFilled++; if (iBuffersFilled == OAL_NUM_BUFFERS) + { alSourcePlay(uiSource); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err); + } + } } } else diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index c775d31cf2..b342e0a49e 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -26,12 +26,14 @@ #ifdef _WIN32 #include #include +#include #elif defined __APPLE__ #include #include #else #include #include +#include #endif #include "Core.h" @@ -44,6 +46,8 @@ #define SFX_MAX_SOURCE 1 #define OAL_NUM_BUFFERS 16 #define OAL_MAX_SAMPLES 512 +#define SURROUND_CHANNELS 6 // number of channels in surround mode +#define SIZE_FLOAT 4 // size of a float in bytes #endif class OpenALStream: public SoundStream @@ -72,7 +76,7 @@ private: Common::Event mainSyncEvent; short realtimeBuffer[OAL_MAX_SAMPLES * 2]; - soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS]; + soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS]; ALuint uiBuffers[OAL_NUM_BUFFERS]; ALuint uiSource; ALfloat fVolume; diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 180e6c981d..d4b79774ef 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -227,6 +227,7 @@ void SConfig::SaveSettings() ini.Set("Core", "Apploader", m_LocalCoreStartupParameter.m_strApploader); ini.Set("Core", "EnableCheats", m_LocalCoreStartupParameter.bEnableCheats); ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); + ini.Set("Core", "DPL2Decoder", m_LocalCoreStartupParameter.bDPL2Decoder); ini.Set("Core", "MemcardA", m_strMemoryCardA); ini.Set("Core", "MemcardB", m_strMemoryCardB); ini.Set("Core", "SlotA", m_EXIDevice[0]); @@ -367,6 +368,7 @@ void SConfig::LoadSettings() ini.Get("Core", "Apploader", &m_LocalCoreStartupParameter.m_strApploader); ini.Get("Core", "EnableCheats", &m_LocalCoreStartupParameter.bEnableCheats, false); ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); + ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, true); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index dee2452cb3..64a3fc54d8 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -49,6 +49,7 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableCheats(false), bMergeBlocks(false), bRunCompareServer(false), bRunCompareClient(false), + bDPL2Decoder(true), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), @@ -84,6 +85,7 @@ void SCoreStartupParameter::LoadDefaults() bMergeBlocks = false; SelectedLanguage = 0; bWii = false; + bDPL2Decoder = true; iPosX = 100; iPosY = 100; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index e67935906b..b67bf24b20 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -107,6 +107,8 @@ struct SCoreStartupParameter bool bEnableCheats; bool bMergeBlocks; + bool bDPL2Decoder; + bool bRunCompareServer; bool bRunCompareClient; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ce4cd9cb22..9f38c5db69 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -120,6 +120,7 @@ EVT_RADIOBOX(ID_DSPENGINE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DUMP_AUDIO, CConfigMain::AudioSettingsChanged) +EVT_CHECKBOX(ID_DPL2DECODER, CConfigMain::AudioSettingsChanged) EVT_CHOICE(ID_FREQUENCY, CConfigMain::AudioSettingsChanged) EVT_CHOICE(ID_BACKEND, CConfigMain::AudioSettingsChanged) EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) @@ -363,6 +364,7 @@ void CConfigMain::InitializeGUIValues() VolumeText->SetLabel(wxString::Format(wxT("%d %%"), ac_Config.m_Volume)); DSPThread->SetValue(startup_params.bDSPThread); DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); + DPL2Decoder->SetValue(startup_params.bDPL2Decoder); FrequencySelection->SetSelection( FrequencySelection->FindString(wxString::Format(_("%d Hz"), ac_Config.iFrequency))); // add backends to the list @@ -517,6 +519,14 @@ void CConfigMain::InitializeGUITooltips() // Wii - Devices WiiKeyboard->SetToolTip(_("This could cause slow down in Wii Menu and some games.")); + +#if defined(__APPLE__) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX.")); +#elif defined(__linux__) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only.")); +#elif defined(_WIN32) + DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work.")); +#endif } void CConfigMain::CreateGUIControls() @@ -613,6 +623,7 @@ void CConfigMain::CreateGUIControls() DSPThread = new wxCheckBox(AudioPage, ID_DSPTHREAD, _("DSP LLE on Thread")); DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder")); VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT(""), @@ -634,6 +645,7 @@ void CConfigMain::CreateGUIControls() sbAudioSettings->Add(DSPEngine, 0, wxALL | wxEXPAND, 5); sbAudioSettings->Add(DSPThread, 0, wxALL, 5); sbAudioSettings->Add(DumpAudio, 0, wxALL, 5); + sbAudioSettings->Add(DPL2Decoder, 0, wxALL, 5); wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume")); sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13); @@ -927,6 +939,10 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread = DSPThread->IsChecked(); break; + case ID_DPL2DECODER: + SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder = DPL2Decoder->IsChecked(); + break; + case ID_BACKEND: VolumeSlider->Enable(SupportsVolumeChanges(std::string(BackendSelection->GetStringSelection().mb_str()))); ac_Config.sBackend = BackendSelection->GetStringSelection().mb_str(); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 9b5dbf4243..01a85fabeb 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -79,6 +79,7 @@ private: ID_ENABLE_HLE_AUDIO, ID_ENABLE_THROTTLE, ID_DUMP_AUDIO, + ID_DPL2DECODER, ID_FREQUENCY, ID_BACKEND, ID_VOLUME, @@ -157,6 +158,7 @@ private: wxSlider* VolumeSlider; wxStaticText* VolumeText; wxCheckBox* DumpAudio; + wxCheckBox* DPL2Decoder; wxArrayString wxArrayBackends; wxChoice* BackendSelection; wxChoice* FrequencySelection; From ed5a68a5040416fe744119069960d1e29b3518eb Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 11 Jan 2013 14:20:22 +1100 Subject: [PATCH 384/627] Build fix --- Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp index 4efedc4b44..a5d2720878 100644 --- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -22,6 +22,9 @@ #include #include +#include +#include +#include #include "DPL2Decoder.h" #define M_PI 3.14159265358979323846 @@ -315,7 +318,7 @@ void matrix_decode(const float *in, const int k, const int il, void dpl2decode(float *samples, int numsamples, float *out) { static const unsigned int FWRDURATION = 240; /* FWR average duration (samples) */ - static const unsigned int cfg_delay = 0; + static const int cfg_delay = 0; static const unsigned int fmt_freq = 48000; static const unsigned int fmt_nchannels = 2; // input channels From 3632ce6df5d3c948f5e4c603c48f2d3c4e190eca Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 11 Jan 2013 19:42:03 +1100 Subject: [PATCH 385/627] Removed the synchronisation between the CPU thread and the audio thread. Added code to detect and resume from buffer underruns. Disabled the ability to change the DPL2 option after the game has started. Fixed a memory leak that occurred in the DPL2 decoder. Fixed the OSX build. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 26 ++++++++++++++------ Source/Core/DolphinWX/Src/ConfigMain.cpp | 1 + 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 8fb1f1b2c5..1895cd2199 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -79,7 +79,6 @@ void OpenALStream::Stop() threadData = 1; // kick the thread if it's waiting soundSyncEvent.Set(); - mainSyncEvent.Set(); soundTouch.clear(); @@ -112,7 +111,6 @@ void OpenALStream::SetVolume(int volume) void OpenALStream::Update() { soundSyncEvent.Set(); - mainSyncEvent.Wait(); } void OpenALStream::Clear(bool mute) @@ -149,10 +147,12 @@ void OpenALStream::SoundLoop() memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4); for (int i = 0; i < OAL_NUM_BUFFERS; i++) { +#if !defined(__APPLE__) if (Core::g_CoreStartupParameter.bDPL2Decoder) - alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS, ulFrequency); + alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, 4 * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); else - alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES * 4, ulFrequency); +#endif + alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, 4 * 2 * 2, ulFrequency); } alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers); alSourcePlay(uiSource); @@ -165,6 +165,7 @@ void OpenALStream::SoundLoop() ALint iBuffersFilled = 0; ALint iBuffersProcessed = 0; + ALint iState = 0; ALuint uiBufferTemp[OAL_NUM_BUFFERS] = {0}; soundTouch.setChannels(2); @@ -232,7 +233,7 @@ void OpenALStream::SoundLoop() if (surround_capable) { // Convert the samples from short to float for the dpl2 decoder - float dest[OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS]; + float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_NUM_BUFFERS]; for (u32 i = 0; i < nSamples; ++i) { dest[i * 2 + 0] = (float)sampleBuffer[i * 2 + 0] / (1<<16); @@ -247,7 +248,7 @@ void OpenALStream::SoundLoop() if (err == AL_INVALID_ENUM) { // 5.1 is not supported by the host, fallback to stereo - WARN_LOG(AUDIO, "Unable set 5.1 surround mode. Updating OpenAL Soft might fix this issue."); + WARN_LOG(AUDIO, "Unable to set 5.1 surround mode. Updating OpenAL Soft might fix this issue."); surround_capable = false; } else if (err != 0) @@ -278,13 +279,24 @@ void OpenALStream::SoundLoop() ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err); } } + + alGetSourcei(uiSource, AL_SOURCE_STATE, &iState); + if (iState != AL_PLAYING) + { + // Buffer underrun occurred, resume playback + alSourcePlay(uiSource); + ALenum err = alGetError(); + if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err); + } + } } } else { soundSyncEvent.Wait(); } - mainSyncEvent.Set(); } } diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 9f38c5db69..78fc886c10 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -638,6 +638,7 @@ void CConfigMain::CreateGUIControls() { FrequencySelection->Disable(); BackendSelection->Disable(); + DPL2Decoder->Disable(); } // Create sizer and add items to dialog From 73140c7da75eae814c470c82a49c1a57d207032e Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 11 Jan 2013 23:06:20 +1100 Subject: [PATCH 386/627] Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 5 ++++- Source/Core/AudioCommon/Src/OpenALStream.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 1895cd2199..eefc62e346 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -207,7 +207,10 @@ void OpenALStream::SoundLoop() Core::RequestRefreshInfo(); rate = m_mixer->GetCurrentSpeed(); } - if (rate > 0) + + // Place a lower limit of 10% speed. When a game boots up, there will be + // many silence samples. These do not need to be timestretched. + if (rate > 0.10) { // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index b342e0a49e..f325d6b63a 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -73,7 +73,6 @@ public: private: std::thread thread; Common::Event soundSyncEvent; - Common::Event mainSyncEvent; short realtimeBuffer[OAL_MAX_SAMPLES * 2]; soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS]; From ad05d568b9fce5f983dd06cfedb0904ada8ce9ab Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 11 Jan 2013 15:47:38 +0100 Subject: [PATCH 387/627] PixelShaderGen: Change error strings to be unique so that we can identify unexpected behavior more easily. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index fdb5f21a51..f10fd437a8 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -287,10 +287,10 @@ static const char *tevKSelTableC[] = // KCSEL "0.375f,0.375f,0.375f", // 3_8 = 0x05 "0.25f,0.25f,0.25f", // 1_4 = 0x06 "0.125f,0.125f,0.125f", // 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b + "ERROR1", // 0x08 + "ERROR2", // 0x09 + "ERROR3", // 0x0a + "ERROR4", // 0x0b I_KCOLORS"[0].rgb", // K0 = 0x0C I_KCOLORS"[1].rgb", // K1 = 0x0D I_KCOLORS"[2].rgb", // K2 = 0x0E @@ -323,14 +323,14 @@ static const char *tevKSelTableA[] = // KASEL "0.375f",// 3_8 = 0x05 "0.25f", // 1_4 = 0x06 "0.125f",// 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b - "ERROR", // 0x0c - "ERROR", // 0x0d - "ERROR", // 0x0e - "ERROR", // 0x0f + "ERROR5", // 0x08 + "ERROR6", // 0x09 + "ERROR7", // 0x0a + "ERROR8", // 0x0b + "ERROR9", // 0x0c + "ERROR10", // 0x0d + "ERROR11", // 0x0e + "ERROR12", // 0x0f I_KCOLORS"[0].r", // K0_R = 0x10 I_KCOLORS"[1].r", // K1_R = 0x11 I_KCOLORS"[2].r", // K2_R = 0x12 @@ -405,7 +405,7 @@ static const char *tevCInputTable[] = // CC "float3(0.5f, 0.5f, 0.5f)", // HALF "(ckonsttemp.rgb)", //"konsttemp.rgb", // KONST "float3(0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR" + "PADERROR1", "PADERROR2", "PADERROR3", "PADERROR4" }; static const char *tevAInputTable[] = // CA @@ -427,17 +427,17 @@ static const char *tevAInputTable[] = // CA "crastemp", // RASA, "ckonsttemp", // KONST, (hw1 had quarter) "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR", - "PADERROR", "PADERROR", "PADERROR", "PADERROR", + "PADERROR5", "PADERROR6", "PADERROR7", "PADERROR8", + "PADERROR9", "PADERROR10", "PADERROR11", "PADERROR12", }; static const char *tevRasTable[] = { "colors_0", "colors_1", - "ERROR", //2 - "ERROR", //3 - "ERROR", //4 + "ERROR13", //2 + "ERROR14", //3 + "ERROR15", //4 "alphabump", // use bump alpha "(alphabump*(255.0f/248.0f))", //normalized "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero From 482360906badd215231fd2b4ce9e62009dd0c467 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 11 Jan 2013 11:24:52 -0500 Subject: [PATCH 388/627] Convert relative paths to absolute when opening containing folder of an iso. Fixes issue 5879. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 2e31843ef9..6f75674c29 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -982,9 +983,11 @@ void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event)) const GameListItem *iso = GetSelectedISO(); if (!iso) return; - std::string path; - SplitPath(iso->GetFileName(), &path, 0, 0); - WxUtils::Explore(path.c_str()); + + wxString strPath(iso->GetFileName().c_str(), wxConvUTF8); + wxFileName path = wxFileName::FileName(strPath); + path.MakeAbsolute(); + WxUtils::Explore(path.GetPath().char_str()); } void CGameListCtrl::OnOpenSaveFolder(wxCommandEvent& WXUNUSED (event)) From cb71158df45f4c72c325c9c905ab10d43c31a52a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 13:47:19 -0600 Subject: [PATCH 389/627] Be consistent with uppercase letters. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 ++-- .../Core/DolphinWX/resources/{Flag_Sdk.xpm => Flag_SDK.xpm} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Source/Core/DolphinWX/resources/{Flag_Sdk.xpm => Flag_SDK.xpm} (99%) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 1b35e06c29..366f8c95c3 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -44,7 +44,7 @@ #include "../resources/Flag_Taiwan.xpm" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" -#include "../resources/Flag_Sdk.xpm" +#include "../resources/Flag_SDK.xpm" #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" @@ -209,7 +209,7 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = - m_imageListSmall->Add(wxBitmap(Flag_Sdk_xpm), wxNullBitmap); + m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm similarity index 99% rename from Source/Core/DolphinWX/resources/Flag_Sdk.xpm rename to Source/Core/DolphinWX/resources/Flag_SDK.xpm index f4a5504044..169caacdcc 100644 --- a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm +++ b/Source/Core/DolphinWX/resources/Flag_SDK.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * Flag_Sdk_xpm[] = { +static const char * Flag_SDK_xpm[] = { "96 32 79 1", " c None", ". c #000000", From 35dce209ae7b3edfbecd8c6aea5cc64c436e2402 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 14:10:36 -0600 Subject: [PATCH 390/627] Gave the "platform" icons a complete white background rather than a slightly-uglier white box. (apparently XPM only supports a 1-bit alpha channel) Centered the icons a bit better too. --- .../DolphinWX/resources/Platform_Gamecube.xpm | 476 ++++++----- .../Core/DolphinWX/resources/Platform_Wad.xpm | 762 +++++++++--------- .../Core/DolphinWX/resources/Platform_Wii.xpm | 410 +++++----- 3 files changed, 820 insertions(+), 828 deletions(-) diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm index 8fbe5c3d1f..8ec3f4bddb 100644 --- a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm @@ -1,241 +1,239 @@ /* XPM */ -static const char *Platform_Gamecube_xpm[] = { +static const char * Platform_Gamecube_xpm[] = { "96 32 204 2", -"E. c #B1B0B0", -"] c #8E8B8C", -"`. c #E8E8E8", -"O c #CFCECF", -"q. c #F7F7F7", -" . c #231F20", -"N. c #191415", -"x. c #191416", -"~ c #322E2F", -"G. c #4B4849", -"S. c #646263", -"@. c #5A5758", -"^. c #504C4D", -"4 c #828080", -"p. c #C3C3C3", -":. c #B9B8B8", -"H c #C8C7C7", -"c. c #BEBCBC", -"L c #E1E1E1", -"G c #F0F0EF", -"n c #F0F0F0", -"L. c #E6E5E6", -". c #FFFFFF", -"! c #1C1819", -"d. c #2B2728", -"z c #535051", -"H. c #9E9E9E", -"a c #716E6F", -"9 c #8A8888", -"1X c #B2B1B1", -"V. c #8F8C8D", -"XX c #A8A6A7", -"X. c #DFDEDF", -"o. c #EEEDED", -";X c #151112", -", c #242021", -"$ c #3D3A3A", -"j. c #1A1517", -"]. c #292426", -"f. c #656364", -"[. c #6A6768", -"y. c #929091", -"& c #BAB9B9", -"I. c #D3D3D3", -"# c #B0AEAF", -"o c #C9C8C8", -"%X c #C9C8C9", -",X c #F1F1F1", -"7 c #2C2829", -"5. c #221D1E", -"!. c #3B3738", -"x c #221D1F", -"[ c #312C2D", -"u c #7C7A7A", -"-X c #8B8989", -"A c #B3B2B2", -"F. c #C2C1C1", -"a. c #B8B6B6", -"P c #C2C1C2", -">X c #D1D0D1", -"K c #EAEAEA", -"#. c #C7C5C6", -"0 c #E0DFDF", -"$X c #F9F9F9", -"}. c #EFEEEE", -"v. c #252121", -"8 c #252122", -"{ c #1B1617", -"&. c #3E3B3D", -"d c #343031", -"+X c #2A2526", -"y c #2A2527", -"< c #5C5959", -"OX c #848282", -"I c #615D5E", -"#X c #898686", -"6. c #939192", -" c #2A2627", -"v c #393535", -":X c #615E5F", -"&X c #575354", -"J c #706D6E", -"2. c #A2A1A1", -">. c #7F7C7D", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . X o O + . . . . . . . . ", -" . . . . . . . @ # $ % & * . . . . . . . ", -" . . . . . = - ; : > > , < 1 2 . . . . . ", -" . . . . 3 4 , > 5 6 7 > 5 8 9 0 . . . . ", -" . X q w e r t y u i p a 5 t s d f * . . ", -" . g h j t s k 1 . . . + l z x c v & . . ", -" b n m M N B b . V C Z b . b A S D . F G ", -" H J @ K L . . P I x r U Y T . . . R E W ", -" Q ! ~ R . T ^ / ( ) ~ j _ ` . ' ] [ { } ", -" | . .... X.o.O.+.r s @.#.$.%.&.*.=., -. ", -" | .;.:.T >.E ,.<.1.2.<.3.4.5.> M ~ , -. ", -" | .;.:.. 6.7.8.9.0.q.w.e.5 5 r.t.e , -. ", -" | .;.:.. y.u.e i.p.a.s.=.d.f.g.| h 8 -. ", -" | .;.& . h.j.~ k.l.z._ =.x.:.. c.;.8 -. ", -" | .v.b.. n.m.M.N.B.V.N.t C.Z.. O.: 8 -. ", -" O.x A.S.D.. . F.G.H.J.z K.. . L.P.7 _ I. ", -" U.Y.e M.e T.n . D R.K g.. i E.=.t M 7.3 ", -" W.Q.!. .M.~.^./.+ . . 0.(.).5.t ._.H 2 ", -" . . `.'.~ s ].5 [.{.}.|. Xt 5..XXXi . . ", -" . . . . oXOX, +X@X6.#X! 5 8 h.L . . . . ", -" . . . . . $X%X&X*X=X-X;X:X>X2 . . . . . ", -" . . . . . . . ,XC XX c #F9F8F8", +", c #C7C7C7", +"' c #534F50", +") c #252021", +"! c #2A2627", +"~ c #242021", +"{ c #5C5959", +"] c #CECDCD", +"^ c #FBFBFB", +"/ c #D8D8D8", +"( c #828080", +"_ c #292526", +": c #2D282A", +"< c #2C2829", +"[ c #252122", +"} c #8A8888", +"| c #E0DFDF", +"1 c #E5E4E4", +"2 c #9B9999", +"3 c #302C2D", +"4 c #221E1E", +"5 c #282425", +"6 c #2A2527", +"7 c #7C7A7A", +"8 c #EDEDED", +"9 c #E8E7E7", +"0 c #716E6F", +"a c #221E1F", +"b c #343031", +"c c #868383", +"d c #D6D5D6", +"e c #262122", +"f c #1F1A1B", +"g c #595656", +"h c #C4C3C4", +"i c #535051", +"j c #221D1F", +"k c #1D181A", +"l c #393535", +"m c #F5F5F5", +"n c #F0F0F0", +"o c #ADACAC", +"p c #2E2A2B", +"q c #302C2C", +"r c #B1AFAF", +"s c #F2F1F1", +"t c #A6A4A5", +"u c #AEACAC", +"v c #B3B2B2", +"w c #A6A5A5", +"x c #EBEBEB", +"y c #F3F2F2", +"z c #F0F0EF", +"A c #C8C7C7", +"B c #706D6E", +"C c #EAEAEA", +"D c #E1E1E1", +"E c #C2C1C2", +"F c #615D5E", +"G c #676465", +"H c #CBCACA", +"I c #FEFEFE", +"J c #D5D5D5", +"K c #575455", +"L c #D1D1D1", +"M c #C5C4C4", +"N c #1C1819", +"O c #322E2F", +"P c #9D9B9C", +"Q c #211D1F", +"R c #201C1D", +"S c #332E2F", +"T c #241F20", +"U c #B0AFAF", +"V c #E9E8E8", +"W c #8E8B8C", +"X c #312C2D", +"Y c #1B1617", +"Z c #D5D4D5", +"` c #C7C6C6", +" . c #231F20", +".. c #B5B3B3", +"+. c #DFDEDF", +"@. c #EEEDED", +"#. c #C3C2C2", +"$. c #545050", +"%. c #5A5758", +"&. c #C7C5C6", +"*. c #F4F4F4", +"=. c #B4B2B2", +"-. c #3E3B3D", +";. c #262123", +">. c #312D2E", +",. c #D6D5D5", +"'. c #262223", +"). c #B9B8B8", +"!. c #7F7C7D", +"~. c #DCDBDB", +"{. c #ECECEC", +"]. c #9B999A", +"^. c #A2A1A1", +"/. c #D4D3D4", +"(. c #636161", +"_. c #221D1E", +":. c #939192", +"<. c #191516", +"[. c #322F2F", +"}. c #817F7F", +"|. c #FAFAFA", +"1. c #F7F7F7", +"2. c #777475", +"3. c #2F2B2C", +"4. c #3F3C3D", +"5. c #4D494A", +"6. c #929091", +"7. c #241F21", +"8. c #1A1617", +"9. c #C3C3C3", +"0. c #B8B6B6", +"a. c #1C1719", +"b. c #2B2728", +"c. c #656364", +"d. c #EFEFEF", +"e. c #8C898A", +"f. c #1A1517", +"g. c #231E1F", +"h. c #999898", +"i. c #8F8E8E", +"j. c #191416", +"k. c #BEBCBC", +"l. c #252121", +"m. c #BCBBBB", +"n. c #E3E3E3", +"o. c #635F60", +"p. c #272324", +"q. c #191415", +"r. c #999899", +"s. c #8F8C8D", +"t. c #6E6C6C", +"u. c #F3F3F3", +"v. c #2D292A", +"w. c #646263", +"x. c #E4E3E3", +"y. c #C2C1C1", +"z. c #4B4849", +"A. c #9E9E9E", +"B. c #979596", +"C. c #CDCCCD", +"D. c #E6E5E6", +"E. c #787676", +"F. c #D3D3D3", +"G. c #CAC9CA", +"H. c #171214", +"I. c #ADACAD", +"J. c #F1F0F0", +"K. c #B1B0B0", +"L. c #FAF9FA", +"M. c #BEBDBE", +"N. c #3B3738", +"O. c #211D1E", +"P. c #504C4D", +"Q. c #C4C2C3", +"R. c #BAB8B9", +"S. c #4C4849", +"T. c #423F40", +"U. c #E8E8E8", +"V. c #9C9A9B", +"W. c #292426", +"X. c #6A6768", +"Y. c #F2F1F2", +"Z. c #EFEEEE", +"`. c #605D5E", +" + c #2A2626", +".+ c #373435", +"++ c #A8A6A7", +"@+ c #DBDADB", +"#+ c #848282", +"$+ c #2A2526", +"%+ c #1B1718", +"&+ c #898686", +"*+ c #F9F9F9", +"=+ c #C9C8C9", +"-+ c #575354", +";+ c #151012", +">+ c #979595", +",+ c #8B8989", +"'+ c #151112", +")+ c #615E5F", +"!+ c #D1D0D1", +"~+ c #F1F1F1", +"{+ c #A2A0A1", +"]+ c #B2B1B1", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . + @ # $ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . % & * = - ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . > , ' ) ! ! ~ { ] ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . / ( ~ ! _ : < ! _ [ } | . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . + 1 2 3 4 5 6 7 8 9 0 _ 5 a b c ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . d e f 5 a g ] . . . $ h i j k l - . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . m n o p q r m . s t u m . m v w x . y z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . A B % C D . . E F j 4 G H I . . . J K L . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . M N O J . I P Q R S O f T U . V W X Y Z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` . .... +.@.#.$.4 a %.&.*.=.-.;.>.~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).I !.K ~.{.].^.{./.(._.! p O ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. :.<.[.}.|.1.2.3._ _ 4.5.3 ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. 6.7.3 8.9.0.a.>.b.c.d.` e [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.- . e.f.O g.h.i.T >.j.).. k.'.[ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .l.m.. n.o.p.q.r.s.q.5 t.u.. #.) [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . #.j v.w.x.. . y.z.A.B.i C.. . D.E.< T F.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . G.H.3 p.3 I.n . x J.C d.. 8 K.>.5 p <./ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . L.M.N. .p.O.P.Q.$ . . |.R.S._.5 .T.A ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . U.V.O a W._ X.Y.Z.`. +5 _..+++8 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . @+#+~ $+%+:.&+N _ [ e.D . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . *+=+-+;+>+,+'+)+!+^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . ~+t ++{+]+*.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.xpm b/Source/Core/DolphinWX/resources/Platform_Wad.xpm index fcb309cedc..a89c3a0c9c 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wad.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wad.xpm @@ -1,384 +1,382 @@ /* XPM */ -static const char *Platform_Wad_xpm[] = { +static const char * Platform_Wad_xpm[] = { "96 32 347 2", -"hX c #71CBE2", -"v. c #DADCDC", -"a c #DDDDDE", -"!. c #DDDDDF", -"} c #E0E1E1", -"i c #76777B", -")X c #62D8F4", -"go c #5CD6F5", -"a. c #ECEBEC", -">. c #EFEFEF", -"FX c #6EDCF7", -"x. c #7C7F82", -"qo c #8CE3F7", -"sX c #9EE6F8", -"Z c #F2F3F3", -"oo c #A7E9F9", -"yX c #F2F3F4", -"Bo c #AAEAFA", -"c c #828488", -"3. c #85888A", -"X c #F8F8F8", -"*X c #85888B", -"do c #D1F4FC", -"po c #CEF3FC", -"H c #88898C", -"K. c #85888C", -"gX c #D7FCFF", -"6. c #8B8D8F", -"*o c #F8FEFE", -"`X c #F2FCFF", -" o c #EFFBFF", -";X c #F5FDFF", -"M. c #9A9B9E", -"] c #B8BABB", -"z. c #BEBFC1", -", c #D6D6D8", -"N c #E8E8E9", -"BX c #58D6F4", -"vo c #6AD9F5", -"ao c #79DEF7", -"zX c #4FD9FA", -"V c #7B7D81", -" . c #F1F1F0", -"r c #7E8184", -"!X c #94E4F8", -"m. c #F1F1F2", -"IX c #9DE7FA", -"Fo c #BEEFFB", -"Do c #B5ECFB", -"` c #84868A", -".. c #FAFAF9", -"PX c #B8F0FE", -"8 c #FAFAFA", -"Ho c #DCF6FD", -"yo c #E5F9FD", -"wo c #E2F8FD", -"rX c #DFF7FD", -"3X c #E2F8FE", -"# c #FDFEFD", -"QX c #FDFEFE", -"qX c #848C92", -"6X c #8A8E92", -"r. c #8D8F93", -"_ c #909396", -"u c #96989A", -">X c #84959C", -",. c #9C9DA0", -"A c #9FA1A3", -"'. c #9FA1A4", -"2 c #ABABAD", -"D. c #AEAFB2", -"l. c #B1B3B4", -"iX c #BDBDC0", -"D c #C3C5C5", -"( c #C6C6C8", -"v c #C9CACB", -"<. c #CCCECF", -" c None", -"| c #DBDCDD", -"w. c #E1E1E2", -"> c #E4E5E5", -"EX c #60D7F5", -" X c #EDEBEC", -"RX c #72DDF6", -"8o c #69DAF6", -"+X c #F0ECED", -"Y. c #EDEEEF", -"eo c #8AE2F8", -"g. c #F3F3F4", -"0o c #ABEAFA", -"]. c #F9F8F7", -"'X c #CCF2FC", -"no c #D8F6FD", -"J c #86888C", -"HX c #E7F8FC", -"$ c #FCFCFC", -"Jo c #F0FBFE", -"_X c #DEF8FF", -"to c #F3FCFE", -"/. c #8F9194", -"k c #8F9195", -"n c #95969A", -"`. c #989A9C", -"h c #9E9FA2", -"5X c #899EA7", -"0X c #8FA6AD", -"[. c #AAACAE", -"&. c #B9BABC", -"M c #C2C3C4", -"H. c #C5C7C8", -"f. c #CBCCCD", -"c. c #D1D1D2", -"1 c #DDDEDF", -"6o c #38CEF3", -"/X c #44CFF2", -"#o c #56D5F4", -"VX c #53D4F4", -"9X c #D4E7ED", -"jo c #59D6F5", -"bX c #56D5F5", -"Y c #ECECED", -".X c #F2EEEF", -"-. c #EFF0F0", -"LX c #74DCF7", -"aX c #80E0F8", -"7o c #7DDFF8", -"#X c #7F8184", -"xo c #95E4F8", -"o c #88E1F7", -"5o c #91E4F8", -"TX c #8BE2F8", -"pX c #F1F2F3", -".o c #9AE7F9", -"+. c #818387", -"YX c #B5EDFA", -"S. c #818388", -"R c #F7F7F7", -"Q c #F7F7F8", -"o c #FAFBFA", -"* c #FAFBFB", -"[ c #8A8C8E", -"WX c #EEFAFD", -"R. c #8A8C8F", -"W. c #909194", -"^. c #9C9EA1", -"V. c #A2A3A6", -";. c #A5A7A9", -"/ c #AEB0B1", -"U. c #B4B5B7", -"' c #BDBEC0", -"t c #C0C2C4", -"OX c #CCCCCD", -"C c #CCCCCE", -"j. c #CFD0D1", -"jX c #A5CBD6", -"P c #D5D5D6", -"f c #DBDDDC", -"t. c #E1E2E3", -"y c #E7E7E9", -"1o c #57D5F4", -"%o c #54D4F4", -":o c #66DAF6", -"4X c #CFE8EF", -"B. c #EDECED", -"nX c #45D5F9", -"4 c #F0F0F0", -"^X c #72DEF9", -"&o c #9FE7F8", -"s c #808184", -"(X c #99E5F8", -"d. c #7D8084", -"i. c #838588", -"2X c #F0F6F7", -"^ c #838589", -"Mo c #C0EFFB", -"Lo c #C3F0FC", -". c #F9F9FA", -"tX c #E7F9FD", -"L c #FFFEFE", -"d c #8C8E91", -"Q. c #929397", -"(. c #959799", -"XX c #9B999C", -"B c #989B9E", -"s. c #9EA0A3", -"$. c #A7A9AB", -"0 c #ADAEB1", -"A. c #C8C9CA", -"$X c #CECECF", -"q c #D1D2D4", -"wX c #CBD3D7", -"J. c #D7D7D8", -"o. c #DADBDB", -"fo c #50D4F4", -"j c #76797C", -"UX c #5FD6F4", -"Xo c #56D6F5", -"ZX c #7ADCF4", -"lX c #56D9FA", -"|X c #98E6F8", -"=o c #92E4F8", -"AX c #D4EEF5", -"CX c #86E3FA", -"Oo c #AAE9F9", -"Go c #B3ECFA", -"#. c #F5F6F6", -"m c #828688", -"]X c #B0EBFB", -"oX c #85878A", -"Po c #CEF2FC", -") c #85878B", -"! c #FBFBFB", -"co c #D1F3FD", -"JX c #D1F6FE", -"KX c #F8FDFE", -"}. c #8B8C8F", -"Ao c #F8FDFF", -"%. c #8B8C90", -"I c #8E9092", -"b. c #8E9094", -"U c #97999B", -"9. c #97999C", -"e. c #97999D", -"6 c #A3A6A9", -"3 c #BBBDBE", -"9 c #C1C2C4", -"p. c #CACBCC", -"- c #D9D9DA", -"8. c #DFDEE0", -"9o c #31CBF2", -"SX c #46D2F5", -"mo c #5ED7F4", -"~. c #EBEBEB", -"$o c #64D9F5", -"5. c #EBEBEC", -"2o c #88E2F7", -"1X c #DFEDF1", -"k. c #818486", -"< c #F4F4F5", -"Ko c #C7F1FB", -"@ c #F7F8F8", -"Vo c #CDF3FC", -"4o c #C7F1FC", -":. c #87898C", -"{. c #8A8A8D", -"-X c #EEFBFE", -"ro c #E8F9FE", -"x c #909295", -"7. c #909296", -"*. c #939698", -",X c #8A9398", -"u. c #96979B", -"n. c #999B9E", -"@. c #9FA0A3", -"h. c #A2A4A6", -"L. c #B1B2B5", -"~ c #B4B6B8", -"%X c #BDBFC1", -"N. c #CCCDCE", -"7X c #CCD0D2", -"T. c #DBDBDD", -"X. c #E4E4E4", -"l c #E4E4E6", -"so c #33CDF3", -"E c #E7E8E8", -"w c #E7E8E9", -"xX c #C0E1EB", -"No c #48D1F4", -"T c #EAE9EA", -"zo c #45D0F4", -"kX c #4ED6F6", -"g c #EDEDED", -"1. c #EDEDEE", -"b c #EDEDEF", -";o c #78DEF7", -"}X c #8DE2F7", -"3o c #93E4F8", -"&X c #808286", -"{X c #B1EBF9", -"G. c #838688", -"io c #B7EDFA", -",o c #B7EDFB", -"DX c #C9F3FC", -"& c #F9FAFA", -"fX c #C6F8FF", -"Zo c #D8F5FD", -"S c #898B8E", -": c #FFFFFE", -"bo c #F9FDFF", -"O c #FFFFFF", -"G c #8C8F92", -"E. c #929498", -"{ c #A1A2A5", -"q. c #AAABAE", -" , < ", -"1 2 3 4 O O + 5 6 7 8 O O . 9 0 q w e r t O y u i p ", -"a s d f O O g h j k l O O z x c v b n m M O N B V C ", -"Z A S D O O F G H J K L O P I U Y O T a R O O E W Q ", -"! ~ ^ / O O ( ) _ ` ' & O ] [ { + 8 } | .O ..X.o.4 ", -"O O.+.@.#.X $.%.&.*.=.-.: ;.:.M O >.,.[ <.O 1.2.3.4. ", -"O 5.6.7.8.z e 9.0.q.` w.N e.r.t.O y.u.i.p.O a.s.d.f. ", -"O g.h.:.j.a k.l.+ z.x.c.v.b.n.m.O z M.:.N.O B.V.C.Z. ", -"O $ A.S.D.F.G.H.O J.K.L.P.I.U.$ O Y.M.:.N.O B.V.C.Z. ", -"O O T.R.E.W.Q.!.O ~.^./.(.)._.+ O z M.:.N.O B.V.C.Z. ", -"O O z `.I.:.'.Y.O ].[.{.}.|. XO O .XXXoXOXO +X@X#X$X ", -"O O 8 %X&X*X=XO -X;X:X>X,Xo,oO QX c #E5E5E5", +", c #D9D9DA", +"' c #F5F5F5", +") c #FFFFFE", +"! c #E4E5E5", +"~ c #D6D6D8", +"{ c #F4F4F5", +"] c #DDDEDF", +"^ c #ABABAD", +"/ c #BBBDBE", +"( c #F0F0F0", +"_ c #D3D3D5", +": c #A3A6A9", +"< c #C7C9CA", +"[ c #FAFAFA", +"} c #C1C2C4", +"| c #ADAEB1", +"1 c #D1D2D4", +"2 c #E7E8E9", +"3 c #919396", +"4 c #7E8184", +"5 c #C0C2C4", +"6 c #E7E7E9", +"7 c #96989A", +"8 c #76777B", +"9 c #CACACC", +"0 c #DDDDDE", +"a c #808184", +"b c #8C8E91", +"c c #DBDDDC", +"d c #EDEDED", +"e c #9E9FA2", +"f c #76797C", +"g c #8F9195", +"h c #E4E4E6", +"i c #EEEEEF", +"j c #909295", +"k c #828488", +"l c #C9CACB", +"m c #EDEDEF", +"n c #95969A", +"o c #828688", +"p c #C2C3C4", +"q c #E8E8E9", +"r c #989B9E", +"s c #7B7D81", +"t c #CCCCCE", +"u c #F2F3F3", +"v c #9FA1A3", +"w c #898B8E", +"x c #C3C5C5", +"y c #D6D7D9", +"z c #8C8F92", +"A c #88898C", +"B c #86888C", +"C c #CECFD1", +"D c #FFFEFE", +"E c #D5D5D6", +"F c #8E9092", +"G c #97999B", +"H c #ECECED", +"I c #EAE9EA", +"J c #F7F7F7", +"K c #E7E8E8", +"L c #DCDCDD", +"M c #F7F7F8", +"N c #FBFBFB", +"O c #B4B6B8", +"P c #838589", +"Q c #AEB0B1", +"R c #C6C6C8", +"S c #85878B", +"T c #909396", +"U c #84868A", +"V c #BDBEC0", +"W c #B8BABB", +"X c #8A8C8E", +"Y c #A1A2A5", +"Z c #E0E1E1", +"` c #DBDCDD", +" . c #F1F1F0", +".. c #FAFAF9", +"+. c #E4E4E4", +"@. c #DADBDB", +"#. c #D4D4D5", +"$. c #818387", +"%. c #9FA0A3", +"&. c #F5F6F6", +"*. c #A7A9AB", +"=. c #8B8C90", +"-. c #B9BABC", +";. c #939698", +">. c #9A9C9F", +",. c #EFF0F0", +"'. c #A5A7A9", +"). c #87898C", +"!. c #EFEFEF", +"~. c #9C9DA0", +"{. c #CCCECF", +"]. c #EDEDEE", +"^. c #A3A5A7", +"/. c #85888A", +"(. c #CECFCF", +"_. c #EBEBEC", +":. c #8B8D8F", +"<. c #909296", +"[. c #DFDEE0", +"}. c #97999C", +"|. c #E5E5E6", +"1. c #AAABAE", +"2. c #E1E1E2", +"3. c #97999D", +"4. c #8D8F93", +"5. c #E1E2E3", +"6. c #EEEEEE", +"7. c #96979B", +"8. c #838588", +"9. c #CACBCC", +"0. c #ECEBEC", +"a. c #9EA0A3", +"b. c #7D8084", +"c. c #CBCCCD", +"d. c #F3F3F4", +"e. c #A2A4A6", +"f. c #CFD0D1", +"g. c #818486", +"h. c #B1B3B4", +"i. c #BEBFC1", +"j. c #7C7F82", +"k. c #D1D1D2", +"l. c #DADCDC", +"m. c #8E9094", +"n. c #999B9E", +"o. c #F1F1F2", +"p. c #9A9B9E", +"q. c #CCCDCE", +"r. c #EDECED", +"s. c #A2A3A6", +"t. c #828588", +"u. c #CDCECF", +"v. c #C8C9CA", +"w. c #818388", +"x. c #AEAFB2", +"y. c #B8B8BA", +"z. c #838688", +"A. c #C5C7C8", +"B. c #D7D7D8", +"C. c #85888C", +"D. c #B1B2B5", +"E. c #B5B7B9", +"F. c #888A8D", +"G. c #B4B5B7", +"H. c #EDEEEF", +"I. c #DBDBDD", +"J. c #8A8C8F", +"K. c #929498", +"L. c #909194", +"M. c #929397", +"N. c #DDDDDF", +"O. c #EBEBEB", +"P. c #9C9EA1", +"Q. c #8F9194", +"R. c #959799", +"S. c #888A8E", +"T. c #CECFD2", +"U. c #989A9C", +"V. c #9FA1A4", +"W. c #F9F8F7", +"X. c #AAACAE", +"Y. c #8A8A8D", +"Z. c #8B8C8F", +"`. c #8E8F93", +" + c #EDEBEC", +".+ c #F2EEEF", +"++ c #9B999C", +"@+ c #85878A", +"#+ c #CCCCCD", +"$+ c #F0ECED", +"%+ c #A3A2A4", +"&+ c #7F8184", +"*+ c #CECECF", +"=+ c #BDBFC1", +"-+ c #808286", +";+ c #85888B", +">+ c #BEC0C1", +",+ c #EEFBFE", +"'+ c #F5FDFF", +")+ c #CBCBCD", +"!+ c #84959C", +"~+ c #8A9398", +"{+ c #B3B4B6", +"]+ c #DFEDF1", +"^+ c #F0F6F7", +"/+ c #E2F8FE", +"(+ c #CFE8EF", +"_+ c #899EA7", +":+ c #8A8E92", +"<+ c #CCD0D2", +"[+ c #E9FAFF", +"}+ c #D4E7ED", +"|+ c #8FA6AD", +"1+ c #848C92", +"2+ c #CBD3D7", +"3+ c #E3F8FD", +"4+ c #DFF7FD", +"5+ c #E7F9FD", +"6+ c #F2F3F4", +"7+ c #B9B9BD", +"8+ c #BDBDC0", +"9+ c #F1F2F3", +"0+ c #80E0F8", +"a+ c #9EE6F8", +"b+ c #5FDEFD", +"c+ c #C6F8FF", +"d+ c #D7FCFF", +"e+ c #71CBE2", +"f+ c #A5CBD6", +"g+ c #4ED6F6", +"h+ c #56D9FA", +"i+ c #4FD9FA", +"j+ c #C0E1EB", +"k+ c #CBF6FF", +"l+ c #52D8F9", +"m+ c #56D5F5", +"n+ c #45D5F9", +"o+ c #A7F0FF", +"p+ c #98E8FC", +"q+ c #67D9F6", +"r+ c #58D6F4", +"s+ c #53D4F4", +"t+ c #86E3FA", +"u+ c #7ADCF4", +"v+ c #D4EEF5", +"w+ c #46D2F5", +"x+ c #C9F3FC", +"y+ c #6EDCF7", +"z+ c #AFE5F4", +"A+ c #E7F8FC", +"B+ c #D1F6FE", +"C+ c #F8FDFE", +"D+ c #74DCF7", +"E+ c #B8F0FE", +"F+ c #9DE7FA", +"G+ c #5FD6F4", +"H+ c #B5EDFA", +"I+ c #8BE2F8", +"J+ c #72DDF6", +"K+ c #60D7F5", +"L+ c #EEFAFD", +"M+ c #FDFEFE", +"N+ c #94E4F8", +"O+ c #70DCF8", +"P+ c #72DEF9", +"Q+ c #44CFF2", +"R+ c #99E5F8", +"S+ c #62D8F4", +"T+ c #DEF8FF", +"U+ c #F2FCFF", +"V+ c #CCF2FC", +"W+ c #B0EBFB", +"X+ c #61D7F5", +"Y+ c #B1EBF9", +"Z+ c #8DE2F7", +"`+ c #98E6F8", +" @ c #EFFBFF", +".@ c #9AE7F9", +"+@ c #56D6F5", +"@@ c #A7E9F9", +"#@ c #AAE9F9", +"$@ c #6ADAF6", +"%@ c #98E5F9", +"&@ c #56D5F4", +"*@ c #64D9F5", +"=@ c #54D4F4", +"-@ c #9FE7F8", +";@ c #F8FEFE", +">@ c #92E4F8", +",@ c #70DCF6", +"'@ c #78DEF7", +")@ c #66DAF6", +"!@ c #88E1F7", +"~@ c #B7EDFB", +"{@ c #92E3F8", +"]@ c #57D5F4", +"^@ c #88E2F7", +"/@ c #93E4F8", +"(@ c #C7F1FC", +"_@ c #91E4F8", +":@ c #38CEF3", +"<@ c #7DDFF8", +"[@ c #69DAF6", +"}@ c #31CBF2", +"|@ c #ABEAFA", +"1@ c #8CE3F7", +"2@ c #E2F8FD", +"3@ c #8AE2F8", +"4@ c #E8F9FE", +"5@ c #F3FCFE", +"6@ c #E5F9FD", +"7@ c #6DDBF5", +"8@ c #B7EDFA", +"9@ c #CEF3FC", +"0@ c #79DEF7", +"a@ c #33CDF3", +"b@ c #D1F4FC", +"c@ c #50D4F4", +"d@ c #5CD6F5", +"e@ c #E3F8FE", +"f@ c #59D6F5", +"g@ c #6DDBF6", +"h@ c #9BE6FA", +"i@ c #45D0F4", +"j@ c #95E4F8", +"k@ c #D1F3FD", +"l@ c #6AD9F5", +"m@ c #F9FDFF", +"n@ c #D8F6FD", +"o@ c #5ED7F4", +"p@ c #C0EFFB", +"q@ c #48D1F4", +"r@ c #AAEAFA", +"s@ c #CDF3FC", +"t@ c #BFEFFB", +"u@ c #D8F5FD", +"v@ c #F8FDFF", +"w@ c #C5F1FB", +"x@ c #B5ECFB", +"y@ c #BEEFFB", +"z@ c #B3ECFA", +"A@ c #DCF6FD", +"B@ c #F0FBFE", +"C@ c #C7F1FB", +"D@ c #C3F0FC", +"E@ c #CEF2FC", +"F@ c #ECFBFE", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . + @ # . . . . $ % & . . . . * = - ; > , ' . ) ! ~ { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . ] ^ / ( . . $ _ : < [ . . + } | 1 2 3 4 5 . 6 7 8 9 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . 0 a b c . . d e f g h . . i j k l m n o p . q r s t . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . u v w x . . y z A B C D . E F G H . I 0 J . . K L M . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . N O P Q . . R S T U V - . W X Y $ [ Z ` .. ..+.@.( . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . #.$.%.&.@ *.=.-.;.>.,.) '.).p . !.~.X {.. ].^./.(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . _.:.<.[.i 3 }.|.1.U 2.q 3.4.5.. 6.7.8.9.. 0.a.b.c.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . d.e.).f.0 g.h.$ i.j.k.l.m.n.o.. i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . * v.w.x.y.z.A.. B.C.D.E.F.G.* . H.p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . I.J.K.L.M.N.. O.P.Q.R.S.T.$ . i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . i U.F.).V.H.. W.X.Y.Z.`. +. . .+++@+#+. $+%+&+*+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . [ =+-+;+>+. ,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . 6+7+8+9+. 0+a+. b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+q+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+. @.@+@@@#@$@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . %@s+&@*@=@-@;@>@,@'@)@V+!@~@. M+{@]@^@/@(@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . _@:@<@[@}@3+|@1@2@W+3@4@3@5@. 6@7@8@. 9@4+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . 0@a@b@c@d@e@f@g@h@i@j@k@l@m@. n@o@/@p@q@r@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . s@t@. (@u@v@w@x@y@z@A@B@C@v@. B@(@D@E@p@F@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.xpm b/Source/Core/DolphinWX/resources/Platform_Wii.xpm index eb163b80f0..c9781b427f 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wii.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wii.xpm @@ -1,195 +1,192 @@ /* XPM */ -static const char *Platform_Wii_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 187 2", -":. c #C5C6C8", -"V c #D4D5D6", -"k c #E3E4E4", -"w. c #CACACC", -"5. c #E8E8E9", -"5 c #F7F7F8", -"8 c #8C8E91", -".X c #AAACAF", -"+. c #AFB0B2", -"= c #DCDDDE", -"L. c #EBECED", -"H c #FAFBFB", -"%. c #F0F0F0", -"J. c #F0F0F1", -"+ c #FFFFFF", -"O. c #808386", -"U. c #8F9294", -"0. c #85878A", -"S. c #949698", -"K. c #949699", -"2. c #B2B4B6", -"!. c #A8A9AC", -"z. c #B7B8BA", -"S c #C6C7C8", -"7. c #D5D6D7", -"P c #F3F4F4", -") c #E9E9E9", -"m. c #E9E9EB", -"% c #F8F8F8", -"n. c #F8F8F9", -"p. c #888B8D", -"h c #7E8084", -"n c #8D8F92", -"k. c #9C9EA0", -"8. c #8D8F93", -"u c #BABCBE", -"} c #E2E2E2", -"N c #E2E2E3", -"( c #F1F1F1", -">. c #818487", -"x. c #818488", -"K c #86888B", -"A. c #959799", -"<. c #86888C", -"r. c #95979A", -"j. c #8B8C8F", -"v c #B3B5B7", -"9. c #A9AAAD", -", c #C7C8C9", -"* c #E5E6E7", -"*. c #F9F9F9", -"Q. c #7F8184", -",. c #8E9092", -"B c #8E9093", -"U c #9D9FA3", -"R. c #A2A3A6", -"[ c #CFD0D0", -"e c #C0C1C3", -"d c #EDEEEE", -"(. c #FCFDFD", -"b c #87898C", -"/ c #96989A", -"^ c #87898D", -"t c #96989B", -"L c #A5A7A9", -"- c #E6E7E8", -"X c #DCDCDD", -"]. c #FAFAFA", -"e. c #8A8D90", -"N. c #8F9194", -"d. c #9EA0A3", -"{. c #9EA0A4", -"=. c #A3A4A7", -" X c #A3A4A8", -"s. c #CBCDCE", -"| c #C1C2C3", -"o c #DFE0E0", -"Z c #C6C6C8", -" c None", -"|. c #D5D5D7", -"R c #E4E4E5", -"XX c #F3F3F3", -"! c #F3F3F4", -"O c #F8F7F7", -"#. c #838689", -"' c #888A8D", -"x c #888A8E", -"Q c #97999C", -";. c #A6A8AA", -"c c #C4C6C6", -"@. c #C4C6C7", -"b. c #BABBBD", -"4. c #C9CACB", -"P. c #C9CACC", -"1. c #BFBFC2", -"; c #F6F7F7", -"r c #ECECED", -"f c #FBFBFB", -"T. c #FBFBFC", -"p c #909296", -"7 c #86878A", -"{ c #BDBFC0", -"] c #A4A5A8", -"_ c #D1D2D4", -"D c #E0E1E1", -"~. c #C7C7C9", -"Y. c #EFF0F0", -"I c #F4F4F4", -"f. c #F4F4F5", -"w c #84878A", -"s c #939699", -"W c #898B8E", -"6. c #898B8F", -"B. c #989A9D", -"g. c #989A9E", -"` c #A7A9AB", -"^. c #8E8F93", -" . c #C5C7C7", -"E. c #ACADAF", -"[. c #BBBCBF", -"c. c #C0C0C2", -"6 c #D9DADB", -"0 c #DEDEDF", -". c #EDEDEE", -"@ c #FCFCFC", -"a c #7D8083", -"j c #828487", -"F c #9B9EA1", -"z c #96979A", -"`. c #A5A6A8", -"W. c #A5A6A9", -"y. c #B4B5B7", -"Z. c #D2D3D4", -"2 c #E1E2E2", -"h. c #C8C8CA", -"# c #E1E2E3", -"l. c #F0F1F2", -"). c #E6E6E7", -"M c #F5F5F6", -"Y c #8A8C8F", -"X. c #8A8C90", -"3 c #999B9D", -"A c #999B9E", -"q. c #ADAEB0", -"&. c #CBCCCD", -"G. c #CBCCCE", -"$ c #DADBDC", -"/. c #F8F9F9", -"l c #EEEEEE", -"'. c #EEEEEF", -"< c #FDFDFD", -"C c #FDFDFE", -"3. c #7E8184", -"u. c #838588", -"M. c #929496", -"y c #838589", -"H. c #929497", -"V. c #88898C", -"i. c #B0B2B3", -"J c #B0B2B4", -"> c #97989B", -"C. c #B5B6B9", -"~ c #C4C5C6", -"9 c #D3D4D4", -"4 c #ABABAF", -"D. c #D3D4D6", -".. c #E7E7E7", -"G c #F6F6F7", -"-. c #7C7E81", -"o. c #8B8D90", -"a. c #9A9C9E", -"q c #8B8D91", -"m c #9A9C9F", -"$. c #A9ABAD", -"v. c #A9ABAE", -"E c #BDBEBF", -"g c #AEAFB2", -"}. c #BDBEC1", -"t. c #EAEBEB", -"i c #EFEFF0", -"& c #FEFEFE", -"1 c #FEFEFF", -"I. c #848689", -"T c #8E9195", -"F. c #A2A4A6", -"_. c #A2A4A7", -": c #C5C6C7", -/* pixels */ +static const char * Platform_Wii_xpm[] = { +"96 32 186 2", +" c #FFFFFF", +". c #EDEDEE", +"+ c #DCDCDD", +"@ c #DFE0E0", +"# c #F8F7F7", +"$ c #FCFCFC", +"% c #E1E2E3", +"& c #DADBDC", +"* c #F8F8F8", +"= c #FEFEFE", +"- c #E5E6E7", +"; c #DCDDDE", +"> c #E6E7E8", +", c #F6F7F7", +"' c #C5C6C7", +") c #97989B", +"! c #C7C8C9", +"~ c #FDFDFD", +"{ c #FEFEFF", +"] c #E1E2E2", +"^ c #999B9D", +"/ c #ABABAF", +"( c #F7F7F8", +"_ c #D9DADB", +": c #86878A", +"< c #8C8E91", +"[ c #D3D4D4", +"} c #DEDEDF", +"| c #8B8D91", +"1 c #84878A", +"2 c #C0C1C3", +"3 c #ECECED", +"4 c #96989B", +"5 c #838589", +"6 c #BABCBE", +"7 c #EFEFF0", +"8 c #909296", +"9 c #7D8083", +"0 c #939699", +"a c #EDEEEE", +"b c #FBFBFB", +"c c #AEAFB2", +"d c #7E8084", +"e c #828487", +"f c #E3E4E4", +"g c #EEEEEE", +"h c #96979A", +"i c #888A8E", +"j c #C4C6C6", +"k c #B3B5B7", +"l c #87898C", +"m c #8D8F92", +"n c #9A9C9F", +"o c #F5F5F6", +"p c #E2E2E3", +"q c #8E9093", +"r c #D4D5D6", +"s c #FDFDFE", +"t c #C6C6C8", +"u c #999B9E", +"v c #C6C7C8", +"w c #E0E1E1", +"x c #9B9EA1", +"y c #F6F6F7", +"z c #FAFBFB", +"A c #B0B2B4", +"B c #86888B", +"C c #A5A7A9", +"D c #F3F4F4", +"E c #F4F4F4", +"F c #9D9FA3", +"G c #8A8C8F", +"H c #8E9195", +"I c #E4E4E5", +"J c #BDBEBF", +"K c #898B8E", +"L c #97999C", +"M c #F3F3F4", +"N c #C4C5C6", +"O c #87898D", +"P c #96989A", +"Q c #F1F1F1", +"R c #E9E9E9", +"S c #D1D2D4", +"T c #A7A9AB", +"U c #888A8D", +"V c #A4A5A8", +"W c #CFD0D0", +"X c #BDBFC0", +"Y c #E2E2E2", +"Z c #C1C2C3", +"` c #C5C7C7", +" . c #E7E7E7", +".. c #8A8C90", +"+. c #8B8D90", +"@. c #808386", +"#. c #AFB0B2", +"$. c #C4C6C7", +"%. c #838689", +"&. c #A9ABAD", +"*. c #F0F0F0", +"=. c #CBCCCD", +"-. c #F9F9F9", +";. c #A3A4A7", +">. c #7C7E81", +",. c #A6A8AA", +"'. c #C5C6C8", +"). c #818487", +"!. c #8E9092", +"~. c #86888C", +"{. c #BFBFC2", +"]. c #B2B4B6", +"^. c #7E8184", +"/. c #C9CACB", +"(. c #E8E8E9", +"_. c #898B8F", +":. c #D5D6D7", +"<. c #8D8F93", +"[. c #A9AAAD", +"}. c #85878A", +"|. c #ADAEB0", +"1. c #CACACC", +"2. c #8A8D90", +"3. c #95979A", +"4. c #EAEBEB", +"5. c #B4B5B7", +"6. c #838588", +"7. c #B0B2B3", +"8. c #888B8D", +"9. c #9A9C9E", +"0. c #CBCDCE", +"a. c #9EA0A3", +"b. c #F4F4F5", +"c. c #989A9E", +"d. c #C8C8CA", +"e. c #8B8C8F", +"f. c #9C9EA0", +"g. c #F0F1F2", +"h. c #B7B8BA", +"i. c #818488", +"j. c #C0C0C2", +"k. c #A9ABAE", +"l. c #BABBBD", +"m. c #F8F8F9", +"n. c #E9E9EB", +"o. c #929496", +"p. c #8F9194", +"q. c #989A9D", +"r. c #88898C", +"s. c #B5B6B9", +"t. c #D2D3D4", +"u. c #959799", +"v. c #949698", +"w. c #D3D4D6", +"x. c #A2A4A6", +"y. c #CBCCCE", +"z. c #929497", +"A. c #F0F0F1", +"B. c #949699", +"C. c #EBECED", +"D. c #C9CACC", +"E. c #848689", +"F. c #8F9294", +"G. c #EFF0F0", +"H. c #FBFBFC", +"I. c #A2A3A6", +"J. c #ACADAF", +"K. c #A5A6A9", +"L. c #7F8184", +"M. c #A8A9AC", +"N. c #C7C7C9", +"O. c #8E8F93", +"P. c #F8F9F9", +"Q. c #FCFDFD", +"R. c #E6E6E7", +"S. c #A2A4A7", +"T. c #A5A6A8", +"U. c #EEEEEF", +"V. c #FAFAFA", +"W. c #BBBCBF", +"X. c #9EA0A4", +"Y. c #BDBEC1", +"Z. c #D5D5D7", +"`. c #A3A4A8", +" + c #AAACAF", +".+ c #F3F3F3", " ", " ", " ", @@ -199,19 +196,20 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -". X o O + + + @ # $ % + + + & * = - ; : > , < 1 2 3 4 5 ", -"6 7 8 9 + + + 0 q w e + + + r t y u i p a s d f g h j k ", -"l z x c < + f v b n m M + + N 8 B V C Z A S @ & D F g G ", -"H J K L P + I U Y B T R + < E W Q ! + f I f + + & I % + ", -"+ ~ ^ / ( + ) q s A b _ < & ` ' ] & @ [ { 9 + + } | .P ", -"+ ..X.o.$ + , O.+.@.#.$.< %.z ' &.& *.=.-.;.+ + :.>.,.) ", -"+ 5 3 <.1.f 2.3.4.5.6.t ( 7.8.p - + *.9.0.q.+ + w.e.r.t. ", -"+ f y.u.i.( 3 p.5.G a.<.R s.<.d.f.+ *.9.0.q.+ + w.e.r.t. ", -"+ & $ <.g.h.j.k.l.@ z.x.c.v.K b.& + n.9.0.q.+ + w.e.r.t. ", -"+ + m.M.N.B.V.C.< + Z.o.A.S.6.D.+ + *.9.0.q.+ + w.e.r.t. ", -"+ + f F.Y N.' G.+ + k H.n B p J.+ + *.9.0.q.+ + w.e.K.L. ", -"+ + + P.I.x U.Y.+ + T.R.<.K E.n.+ + n.W.Q.!.+ + ~.w ^.i ", -"+ + + /.C.m Z.(.+ + + )._.`.'.+ + + ].[.{.}.+ + |. X.XXX ", +" ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( ", +" _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f ", +" g h i j ~ b k l m n o p < q r s t u v $ = w x c y ", +" z A B C D E F G q H I ~ J K L M b E b = E * ", +" N O P Q R | 0 u l S ~ = T U V = $ W X [ Y Z ` D ", +" ...+.& ! @.#.$.%.&.~ *.h U =.= -.;.>.,. '.).!.R ", +" ( ^ ~.{.b ].^./.(._.4 Q :.<.8 > -.[.}.|. 1.2.3.4. ", +" b 5.6.7.Q ^ 8.(.y 9.~.I 0.~.a.b. -.[.}.|. 1.2.3.4. ", +" = & ~.c.d.e.f.g.$ h.i.j.k.B l.= m.[.}.|. 1.2.3.4. ", +" n.o.p.q.r.s.~ t.+.u.v._.w. -.[.}.|. 1.2.3.4. ", +" b x.G p.U y. f z.m q 8 A. -.[.}.|. 1.2.B.C. ", +" D.E.i F.G. H.I.~.B J.m. m.K.L.M. N.1 O.7 ", +" P.s.n t.Q. R.S.T.U. V.W.X.Y. Z.`. +.+ ", " ", " ", " ", @@ -220,6 +218,4 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -" ", -" " -}; +" "}; From 346922e39ea6d2e06c0dca0cbfa6180113604afe Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 15:13:20 -0600 Subject: [PATCH 391/627] Update game cache revision, for "germany" games that were once "europe". --- Source/Core/DolphinWX/Src/ISOFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index a00ce2c496..2d4b202272 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -36,7 +36,7 @@ #include "ChunkFile.h" #include "../resources/no_banner.cpp" -#define CACHE_REVISION 0x10D +#define CACHE_REVISION 0x10E #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 From 104f5a46997a18d90f6adafd5ad2a0d2116d5b32 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 11 Jan 2013 17:53:34 -0500 Subject: [PATCH 392/627] Set focus on game list after stopping emulation. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index b79e890f3b..d4cf35b121 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1177,6 +1177,7 @@ void CFrame::DoStop() m_GameListCtrl->Enable(); m_GameListCtrl->Show(); + m_GameListCtrl->SetFocus(); UpdateGUI(); } } From dfc0c4b08d339502989fdfaf21e89f8ed77366a3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 11 Jan 2013 19:38:04 -0500 Subject: [PATCH 393/627] Fix two signed/unsigned mismatch warnings. Also tidied up SDCardUtil - made the variables make more sense (typewise) --- Source/Core/Common/Src/SDCardUtil.cpp | 98 +++++++++---------- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 6 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Source/Core/Common/Src/SDCardUtil.cpp b/Source/Core/Common/Src/SDCardUtil.cpp index 4002a51b99..0f2ad08607 100644 --- a/Source/Core/Common/Src/SDCardUtil.cpp +++ b/Source/Core/Common/Src/SDCardUtil.cpp @@ -40,7 +40,7 @@ #include // for unlink() #endif -/* believe me, you *don't* want to change these constants !! */ +/* Believe me, you *don't* want to change these constants !! */ #define BYTES_PER_SECTOR 512 #define RESERVED_SECTORS 32 #define BACKUP_BOOT_SECTOR 6 @@ -52,15 +52,15 @@ #define POKES(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8) ) #define POKEW(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8), BYTE_(p,2) = (u8)((v) >> 16), BYTE_(p,3) = (u8)((v) >> 24) ) -static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* boot sector */ +static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* Boot sector */ static u8 s_fsinfo_sector [ BYTES_PER_SECTOR ]; /* FS Info sector */ -static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* first FAT sector */ +static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* First FAT sector */ -/* this is the date and time when creating the disk */ -static int get_serial_id() +/* This is the date and time when creating the disk */ +static unsigned int get_serial_id() { u16 lo, hi; - time_t now = time(NULL); + time_t now = time(nullptr); struct tm tm = gmtime( &now )[0]; lo = (u16)(tm.tm_mday + ((tm.tm_mon+1) << 8) + (tm.tm_sec << 8)); @@ -69,7 +69,7 @@ static int get_serial_id() return lo + (hi << 16); } -static int get_sectors_per_cluster(u64 disk_size) +static unsigned int get_sectors_per_cluster(u64 disk_size) { u64 disk_MB = disk_size/(1024*1024); @@ -88,60 +88,60 @@ static int get_sectors_per_cluster(u64 disk_size) return 32; } -static int get_sectors_per_fat(u64 disk_size, int sectors_per_cluster) +static unsigned int get_sectors_per_fat(u64 disk_size, u32 sectors_per_cluster) { u64 divider; - /* weird computation from MS - see fatgen103.doc for details */ - disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* don't count 32 reserved sectors */ - disk_size /= BYTES_PER_SECTOR; /* disk size in sectors */ + /* Weird computation from MS - see fatgen103.doc for details */ + disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* Don't count 32 reserved sectors */ + disk_size /= BYTES_PER_SECTOR; /* Disk size in sectors */ divider = ((256 * sectors_per_cluster) + NUM_FATS) / 2; - return (int)( (disk_size + (divider-1)) / divider ); + return (u32)( (disk_size + (divider-1)) / divider ); } static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* label) { - int sectors_per_cluster = get_sectors_per_cluster(disk_size); - int sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); - int sectors_per_disk = (int)(disk_size / BYTES_PER_SECTOR); - int serial_id = get_serial_id(); - int free_count; + u32 sectors_per_cluster = get_sectors_per_cluster(disk_size); + u32 sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); + u32 sectors_per_disk = (u32)(disk_size / BYTES_PER_SECTOR); + u32 serial_id = get_serial_id(); + u32 free_count; - if (label == NULL) + if (label == nullptr) label = "DOLPHINSD"; POKEB(boot, 0xeb); POKEB(boot+1, 0x5a); POKEB(boot+2, 0x90); strcpy( (char*)boot + 3, "MSWIN4.1" ); - POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* sector size */ - POKEB( boot + 0xd, sectors_per_cluster ); /* sectors per cluster */ - POKES( boot + 0xe, RESERVED_SECTORS ); /* reserved sectors before first FAT */ - POKEB( boot + 0x10, NUM_FATS ); /* number of FATs */ - POKES( boot + 0x11, 0 ); /* max root directory entries for FAT12/FAT16, 0 for FAT32 */ - POKES( boot + 0x13, 0 ); /* total sectors, 0 to use 32-bit value at offset 0x20 */ - POKEB( boot + 0x15, 0xF8 ); /* media descriptor, 0xF8 == hard disk */ + POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* Sector size */ + POKEB( boot + 0xd, sectors_per_cluster ); /* Sectors per cluster */ + POKES( boot + 0xe, RESERVED_SECTORS ); /* Reserved sectors before first FAT */ + POKEB( boot + 0x10, NUM_FATS ); /* Number of FATs */ + POKES( boot + 0x11, 0 ); /* Max root directory entries for FAT12/FAT16, 0 for FAT32 */ + POKES( boot + 0x13, 0 ); /* Total sectors, 0 to use 32-bit value at offset 0x20 */ + POKEB( boot + 0x15, 0xF8 ); /* Media descriptor, 0xF8 == hard disk */ POKES( boot + 0x16, 0 ); /* Sectors per FAT for FAT12/16, 0 for FAT32 */ POKES( boot + 0x18, 9 ); /* Sectors per track (whatever) */ POKES( boot + 0x1a, 2 ); /* Number of heads (whatever) */ POKEW( boot + 0x1c, 0 ); /* Hidden sectors */ POKEW( boot + 0x20, sectors_per_disk ); /* Total sectors */ - /* extension */ + /* Extension */ POKEW( boot + 0x24, sectors_per_fat ); /* Sectors per FAT */ POKES( boot + 0x28, 0 ); /* FAT flags */ - POKES( boot + 0x2a, 0 ); /* version */ - POKEW( boot + 0x2c, 2 ); /* cluster number of root directory start */ - POKES( boot + 0x30, 1 ); /* sector number of FS information sector */ - POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* sector number of a copy of this boot sector */ - POKEB( boot + 0x40, 0x80 ); /* physical drive number */ - POKEB( boot + 0x42, 0x29 ); /* extended boot signature ?? */ - POKEW( boot + 0x43, serial_id ); /* serial ID */ + POKES( boot + 0x2a, 0 ); /* Version */ + POKEW( boot + 0x2c, 2 ); /* Cluster number of root directory start */ + POKES( boot + 0x30, 1 ); /* Sector number of FS information sector */ + POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* Sector number of a copy of this boot sector */ + POKEB( boot + 0x40, 0x80 ); /* Physical drive number */ + POKEB( boot + 0x42, 0x29 ); /* Extended boot signature ?? */ + POKEW( boot + 0x43, serial_id ); /* Serial ID */ strncpy( (char*)boot + 0x47, label, 11 ); /* Volume Label */ memcpy( boot + 0x52, "FAT32 ", 8 ); /* FAT system type, padded with 0x20 */ - POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* boot sector signature */ + POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* Boot sector signature */ POKEB( boot + BYTES_PER_SECTOR-1, 0xAA ); /* FSInfo sector */ @@ -149,25 +149,25 @@ static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* labe POKEW( info + 0, 0x41615252 ); POKEW( info + 484, 0x61417272 ); - POKEW( info + 488, free_count ); /* number of free clusters */ - POKEW( info + 492, 3 ); /* next free clusters, 0-1 reserved, 2 is used for the root dir */ + POKEW( info + 488, free_count ); /* Number of free clusters */ + POKEW( info + 492, 3 ); /* Next free clusters, 0-1 reserved, 2 is used for the root dir */ POKEW( info + 508, 0xAA550000 ); } static void fat_init(u8* fat) { - POKEW( fat, 0x0ffffff8 ); /* reserve cluster 1, media id in low byte */ - POKEW( fat + 4, 0x0fffffff ); /* reserve cluster 2 */ - POKEW( fat + 8, 0x0fffffff ); /* end of clust chain for root dir */ + POKEW( fat, 0x0ffffff8 ); /* Reserve cluster 1, media id in low byte */ + POKEW( fat + 4, 0x0fffffff ); /* Reserve cluster 2 */ + POKEW( fat + 8, 0x0fffffff ); /* End of cluster chain for root dir */ } -static int write_sector(FILE* file, u8* sector) +static unsigned int write_sector(FILE* file, u8* sector) { return fwrite(sector, 1, 512, file) != 512; } -static int write_empty(FILE* file, u64 count) +static unsigned int write_empty(FILE* file, u64 count) { static u8 empty[64*1024]; @@ -188,8 +188,8 @@ static int write_empty(FILE* file, u64 count) bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) { - int sectors_per_fat; - int sectors_per_disk; + u32 sectors_per_fat; + u32 sectors_per_disk; FILE* f; // Convert MB to bytes @@ -200,21 +200,21 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return false; } - // pretty unlikely to overflow. - sectors_per_disk = (int)(disk_size / 512); + // Pretty unlikely to overflow. + sectors_per_disk = (u32)(disk_size / 512); sectors_per_fat = get_sectors_per_fat(disk_size, get_sectors_per_cluster(disk_size)); - boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, NULL ); + boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, nullptr); fat_init(s_fat_head); f = fopen(filename, "wb"); if (!f) { - ERROR_LOG(COMMON, "could not create file '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not create file '%s', aborting...\n", filename); return false; } - /* here's the layout: + /* Here's the layout: * * boot_sector * fsinfo_sector @@ -251,7 +251,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return true; FailWrite: - ERROR_LOG(COMMON, "could not write to '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not write to '%s', aborting...\n", filename); if (unlink(filename) < 0) ERROR_LOG(COMMON, "unlink(%s) failed\n%s", filename, GetLastErrorMsg()); fclose(f); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index f10fd437a8..e21efa5ce1 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -28,7 +28,7 @@ #include "NativeVertexFormat.h" -static void StageHash(int stage, u32* out) +static void StageHash(u32 stage, u32* out) { out[0] |= bpmem.combiners[stage].colorC.hex & 0xFFFFFF; // 24 u32 alphaC = bpmem.combiners[stage].alphaC.hex & 0xFFFFF0; // 24, strip out tswap and rswap for now @@ -141,7 +141,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] @@ -204,7 +204,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.tevindref.hex; // 31 - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times { *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i From dcc216a02728fc258a0b9fb1a8d6f779c8680aba Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 11 Jan 2013 22:22:55 -0500 Subject: [PATCH 394/627] 'count' parameter for AddStereoSamples and AddStereoSamplesBE in WaveFile should be unsigned. Doesn't make sense to have them signed. --- Source/Core/AudioCommon/Src/WaveFile.cpp | 31 +++++++++++++++++------- Source/Core/AudioCommon/Src/WaveFile.h | 4 +-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp index 802f3f7417..d98348b8bf 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.cpp +++ b/Source/Core/AudioCommon/Src/WaveFile.cpp @@ -100,39 +100,52 @@ void WaveFileWriter::Write4(const char *ptr) file.WriteBytes(ptr, 4); } -void WaveFileWriter::AddStereoSamples(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamples(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); - if (skip_silence) { + + if (skip_silence) + { bool all_zero = true; - for (int i = 0; i < count * 2; i++) - if (sample_data[i]) all_zero = false; - if (all_zero) return; + + for (u32 i = 0; i < count * 2; i++) + { + if (sample_data[i]) + all_zero = false; + } + + if (all_zero) + return; } + file.WriteBytes(sample_data, count * 4); audio_size += count * 4; } -void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); if (count > BUF_SIZE * 2) - PanicAlert("WaveFileWriter - buffer too small (count = %i).", count); + PanicAlert("WaveFileWriter - buffer too small (count = %u).", count); if (skip_silence) { bool all_zero = true; - for (int i = 0; i < count * 2; i++) + + for (u32 i = 0; i < count * 2; i++) + { if (sample_data[i]) all_zero = false; + } + if (all_zero) return; } - for (int i = 0; i < count * 2; i++) + for (u32 i = 0; i < count * 2; i++) conv_buffer[i] = Common::swap16((u16)sample_data[i]); file.WriteBytes(conv_buffer, count * 4); diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h index 72a090814b..11fbb4ced5 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.h +++ b/Source/Core/AudioCommon/Src/WaveFile.h @@ -50,8 +50,8 @@ public: void SetSkipSilence(bool skip) { skip_silence = skip; } - void AddStereoSamples(const short *sample_data, int count); - void AddStereoSamplesBE(const short *sample_data, int count); // big endian + void AddStereoSamples(const short *sample_data, u32 count); + void AddStereoSamplesBE(const short *sample_data, u32 count); // big endian u32 GetAudioSize() { return audio_size; } }; From 2cd415dd837d24e384524a7f0b39d547f890535f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 11 Jan 2013 22:00:36 -0600 Subject: [PATCH 395/627] Fix the signed/unsigned comparison warnings created by a recent commit. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index e21efa5ce1..c1ebdbcc89 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -141,7 +141,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] @@ -204,7 +204,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.tevindref.hex; // 31 - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) // up to 16 times { *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i From 1c462a1ecaa514912338735537284456f7cd835b Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 13 Jan 2013 00:05:30 +1100 Subject: [PATCH 396/627] Added a latency setting to the audio settings. Removed the Sample Rate setting. It is now hardcoded to 48000hz (accurate audio timing). Fixes issue 5672. --- .../AudioCommon/Src/AudioCommonConfig.cpp | 2 - .../Core/AudioCommon/Src/AudioCommonConfig.h | 1 - Source/Core/AudioCommon/Src/OpenALStream.cpp | 28 ++++++++------ Source/Core/AudioCommon/Src/OpenALStream.h | 10 +++-- Source/Core/Core/Src/ConfigManager.cpp | 2 + Source/Core/Core/Src/CoreParameter.cpp | 3 +- Source/Core/Core/Src/CoreParameter.h | 1 + Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 2 +- Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 2 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 38 +++++++++++-------- Source/Core/DolphinWX/Src/ConfigMain.h | 7 ++-- 11 files changed, 57 insertions(+), 39 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 08902e1c3f..49f50b6880 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -42,7 +42,6 @@ void AudioCommonConfig::Load() #else file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); #endif - file.Get("Config", "Frequency", &iFrequency, 48000); file.Get("Config", "Volume", &m_Volume, 100); } @@ -55,7 +54,6 @@ void AudioCommonConfig::SaveSettings() file.Set("Config", "EnableJIT", m_EnableJIT); file.Set("Config", "DumpAudio", m_DumpAudio); file.Set("Config", "Backend", sBackend); - file.Set("Config", "Frequency", iFrequency); file.Set("Config", "Volume", m_Volume); file.Save(File::GetUserPath(F_DSPCONFIG_IDX)); diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h index 76c50c6408..48807b3ffd 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.h @@ -37,7 +37,6 @@ struct AudioCommonConfig bool m_DumpAudio; int m_Volume; std::string sBackend; - int iFrequency; // Load from given file void Load(); diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index eefc62e346..94112c130d 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -46,6 +46,11 @@ bool OpenALStream::Start() pContext = alcCreateContext(pDevice, NULL); if (pContext) { + // Used to determine an appropriate period size (2x period = total buffer size) + //ALCint refresh; + //alcGetIntegerv(pDevice, ALC_REFRESH, 1, &refresh); + //period_size_in_millisec = 1000 / refresh; + alcMakeContextCurrent(pContext); thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this); bReturn = true; @@ -90,7 +95,7 @@ void OpenALStream::Stop() // Clean up buffers and sources alDeleteSources(1, &uiSource); uiSource = 0; - alDeleteBuffers(OAL_NUM_BUFFERS, uiBuffers); + alDeleteBuffers(numBuffers, uiBuffers); ALCcontext *pContext = alcGetCurrentContext(); ALCdevice *pDevice = alcGetContextsDevice(pContext); @@ -133,19 +138,20 @@ void OpenALStream::SoundLoop() Common::SetCurrentThreadName("Audio thread - openal"); u32 ulFrequency = m_mixer->GetSampleRate(); + numBuffers = Core::g_CoreStartupParameter.iLatency + 2; // OpenAL requires a minimum of two buffers - memset(uiBuffers, 0, OAL_NUM_BUFFERS * sizeof(ALuint)); + memset(uiBuffers, 0, numBuffers * sizeof(ALuint)); uiSource = 0; // Generate some AL Buffers for streaming - alGenBuffers(OAL_NUM_BUFFERS, (ALuint *)uiBuffers); + alGenBuffers(numBuffers, (ALuint *)uiBuffers); // Generate a Source to playback the Buffers alGenSources(1, &uiSource); // Short Silence - memset(sampleBuffer, 0, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS); + memset(sampleBuffer, 0, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * numBuffers); memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4); - for (int i = 0; i < OAL_NUM_BUFFERS; i++) + for (int i = 0; i < numBuffers; i++) { #if !defined(__APPLE__) if (Core::g_CoreStartupParameter.bDPL2Decoder) @@ -154,7 +160,7 @@ void OpenALStream::SoundLoop() #endif alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, 4 * 2 * 2, ulFrequency); } - alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers); + alSourceQueueBuffers(uiSource, numBuffers, uiBuffers); alSourcePlay(uiSource); // Set the default sound volume as saved in the config file. @@ -166,7 +172,7 @@ void OpenALStream::SoundLoop() ALint iBuffersFilled = 0; ALint iBuffersProcessed = 0; ALint iState = 0; - ALuint uiBufferTemp[OAL_NUM_BUFFERS] = {0}; + ALuint uiBufferTemp[OAL_MAX_BUFFERS] = {0}; soundTouch.setChannels(2); soundTouch.setSampleRate(ulFrequency); @@ -216,7 +222,7 @@ void OpenALStream::SoundLoop() soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); soundTouch.setTempo(rate); } - unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS); + unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS); if (nSamples > 0) { // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) @@ -236,14 +242,14 @@ void OpenALStream::SoundLoop() if (surround_capable) { // Convert the samples from short to float for the dpl2 decoder - float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_NUM_BUFFERS]; + float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; for (u32 i = 0; i < nSamples; ++i) { dest[i * 2 + 0] = (float)sampleBuffer[i * 2 + 0] / (1<<16); dest[i * 2 + 1] = (float)sampleBuffer[i * 2 + 1] / (1<<16); } - float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS]; + float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS]; dpl2decode(dest, nSamples, dpl2); alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); @@ -273,7 +279,7 @@ void OpenALStream::SoundLoop() } iBuffersFilled++; - if (iBuffersFilled == OAL_NUM_BUFFERS) + if (iBuffersFilled == numBuffers) { alSourcePlay(uiSource); ALenum err = alGetError(); diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index f325d6b63a..a808fcefc9 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -44,8 +44,8 @@ // 16 bit Stereo #define SFX_MAX_SOURCE 1 -#define OAL_NUM_BUFFERS 16 -#define OAL_MAX_SAMPLES 512 +#define OAL_MAX_BUFFERS 32 +#define OAL_MAX_SAMPLES 256 #define SURROUND_CHANNELS 6 // number of channels in surround mode #define SIZE_FLOAT 4 // size of a float in bytes #endif @@ -75,10 +75,12 @@ private: Common::Event soundSyncEvent; short realtimeBuffer[OAL_MAX_SAMPLES * 2]; - soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_NUM_BUFFERS]; - ALuint uiBuffers[OAL_NUM_BUFFERS]; + soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS]; + ALuint uiBuffers[OAL_MAX_BUFFERS]; ALuint uiSource; ALfloat fVolume; + + u8 numBuffers; #else public: OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {} diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index d4b79774ef..210769c8a5 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -228,6 +228,7 @@ void SConfig::SaveSettings() ini.Set("Core", "EnableCheats", m_LocalCoreStartupParameter.bEnableCheats); ini.Set("Core", "SelectedLanguage", m_LocalCoreStartupParameter.SelectedLanguage); ini.Set("Core", "DPL2Decoder", m_LocalCoreStartupParameter.bDPL2Decoder); + ini.Set("Core", "Latency", m_LocalCoreStartupParameter.iLatency); ini.Set("Core", "MemcardA", m_strMemoryCardA); ini.Set("Core", "MemcardB", m_strMemoryCardB); ini.Set("Core", "SlotA", m_EXIDevice[0]); @@ -369,6 +370,7 @@ void SConfig::LoadSettings() ini.Get("Core", "EnableCheats", &m_LocalCoreStartupParameter.bEnableCheats, false); ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, true); + ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 14); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 64a3fc54d8..b8294ce815 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -49,7 +49,7 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableCheats(false), bMergeBlocks(false), bRunCompareServer(false), bRunCompareClient(false), - bDPL2Decoder(true), + bDPL2Decoder(true), iLatency(14), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), @@ -86,6 +86,7 @@ void SCoreStartupParameter::LoadDefaults() SelectedLanguage = 0; bWii = false; bDPL2Decoder = true; + iLatency = 14; iPosX = 100; iPosY = 100; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index b67bf24b20..0dd8b68f22 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -108,6 +108,7 @@ struct SCoreStartupParameter bool bMergeBlocks; bool bDPL2Decoder; + int iLatency; bool bRunCompareServer; bool bRunCompareClient; diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index 817610ea0f..7981c677a8 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -251,7 +251,7 @@ void DSPHLE::InitMixer() unsigned int AISampleRate, DACSampleRate; AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate); delete soundStream; - soundStream = AudioCommon::InitSoundStream(new HLEMixer(this, AISampleRate, DACSampleRate, ac_Config.iFrequency), m_hWnd); + soundStream = AudioCommon::InitSoundStream(new HLEMixer(this, AISampleRate, DACSampleRate, 48000), m_hWnd); if(!soundStream) PanicAlert("Error starting up sound stream"); // Mixer is initialized m_InitMixer = true; diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index a44ff65f21..b5ca788e72 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -204,7 +204,7 @@ void DSPLLE::InitMixer() unsigned int AISampleRate, DACSampleRate; AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate); delete soundStream; - soundStream = AudioCommon::InitSoundStream(new CMixer(AISampleRate, DACSampleRate, ac_Config.iFrequency), m_hWnd); + soundStream = AudioCommon::InitSoundStream(new CMixer(AISampleRate, DACSampleRate, 48000), m_hWnd); if(!soundStream) PanicAlert("Error starting up sound stream"); // Mixer is initialized m_InitMixer = true; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 78fc886c10..ddc8025d88 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -121,7 +121,7 @@ EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DUMP_AUDIO, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DPL2DECODER, CConfigMain::AudioSettingsChanged) -EVT_CHOICE(ID_FREQUENCY, CConfigMain::AudioSettingsChanged) +EVT_SLIDER(ID_LATENCY, CConfigMain::AudioSettingsChanged) EVT_CHOICE(ID_BACKEND, CConfigMain::AudioSettingsChanged) EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) @@ -218,6 +218,8 @@ void CConfigMain::UpdateGUI() // Disable stuff on AudioPage DSPEngine->Disable(); DSPThread->Disable(); + DPL2Decoder->Disable(); + LatencySlider->Disable(); // Disable stuff on GamecubePage GCSystemLang->Disable(); @@ -365,8 +367,9 @@ void CConfigMain::InitializeGUIValues() DSPThread->SetValue(startup_params.bDSPThread); DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); DPL2Decoder->SetValue(startup_params.bDPL2Decoder); - FrequencySelection->SetSelection( - FrequencySelection->FindString(wxString::Format(_("%d Hz"), ac_Config.iFrequency))); + LatencySlider->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); + LatencySlider->SetValue(startup_params.iLatency); + LatencyText->SetLabel(wxString::Format(wxT("%d"), startup_params.iLatency)); // add backends to the list AddAudioBackends(); @@ -511,7 +514,6 @@ void CConfigMain::InitializeGUITooltips() // Audio tooltips DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended).")); - FrequencySelection->SetToolTip(_("Changing this will have no effect while the emulator is running!")); BackendSelection->SetToolTip(_("Changing this will have no effect while the emulator is running!")); // Gamecube - Devices @@ -527,6 +529,8 @@ void CConfigMain::InitializeGUITooltips() #elif defined(_WIN32) DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work.")); #endif + + LatencySlider->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only.")); } void CConfigMain::CreateGUIControls() @@ -630,13 +634,14 @@ void CConfigMain::CreateGUIControls() wxDefaultPosition, wxDefaultSize, 0); BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); - FrequencySelection = new wxChoice(AudioPage, ID_FREQUENCY); - FrequencySelection->Append(wxString::Format(_("%d Hz"), 48000)); - FrequencySelection->Append(wxString::Format(_("%d Hz"), 32000)); + LatencySlider = new wxSlider(AudioPage, ID_LATENCY, 0, 0, 30, + wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); + LatencyText = new wxStaticText(AudioPage, wxID_ANY, wxT(""), + wxDefaultPosition, wxDefaultSize, 0); if (Core::GetState() != Core::CORE_UNINITIALIZED) { - FrequencySelection->Disable(); + LatencySlider->Disable(); BackendSelection->Disable(); DPL2Decoder->Disable(); } @@ -655,8 +660,9 @@ void CConfigMain::CreateGUIControls() wxGridBagSizer *sBackend = new wxGridBagSizer(); sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); - sBackend->Add(TEXT_BOX(AudioPage, _("Sample Rate:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); - sBackend->Add(FrequencySelection, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sBackend->Add(LatencySlider, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + sBackend->Add(LatencyText, wxGBPosition(1, 2), wxDefaultSpan, wxALL, 5); wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings")); sbBackend->Add(sBackend, 0, wxEXPAND); @@ -946,17 +952,19 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) case ID_BACKEND: VolumeSlider->Enable(SupportsVolumeChanges(std::string(BackendSelection->GetStringSelection().mb_str()))); + LatencySlider->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); + DPL2Decoder->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); ac_Config.sBackend = BackendSelection->GetStringSelection().mb_str(); ac_Config.Update(); break; + case ID_LATENCY: + SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = LatencySlider->GetValue(); + LatencyText->SetLabel(wxString::Format(wxT("%d"), LatencySlider->GetValue())); + break; + default: ac_Config.m_DumpAudio = DumpAudio->GetValue(); - - long int frequency; - FrequencySelection->GetStringSelection().ToLong(&frequency); - ac_Config.iFrequency = frequency; - ac_Config.Update(); break; } } diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 01a85fabeb..c0cdd632e4 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -80,7 +80,7 @@ private: ID_ENABLE_THROTTLE, ID_DUMP_AUDIO, ID_DPL2DECODER, - ID_FREQUENCY, + ID_LATENCY, ID_BACKEND, ID_VOLUME, @@ -156,12 +156,13 @@ private: wxBoxSizer* sAudioPage; // GC settings wxRadioBox* DSPEngine; wxSlider* VolumeSlider; - wxStaticText* VolumeText; + wxStaticText* VolumeText; wxCheckBox* DumpAudio; wxCheckBox* DPL2Decoder; wxArrayString wxArrayBackends; wxChoice* BackendSelection; - wxChoice* FrequencySelection; + wxSlider* LatencySlider; + wxStaticText* LatencyText; // Interface wxCheckBox* ConfirmStop; From f7b0c8684bc56efe256232d618de3376ed965232 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 12 Jan 2013 15:06:06 +0100 Subject: [PATCH 397/627] BPMemory: Expose more register descriptions for FifoPlayer --- Source/Core/VideoCommon/Src/BPMemory.cpp | 135 ++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index ca0e748cb0..38489bcf7a 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -55,6 +55,11 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size snprintf(name, name_size, #reg); \ (void)(reg); + case BPMEM_GENMODE: // 0x00 + SetRegName(BPMEM_GENMODE); + // TODO: Description + break; + case BPMEM_DISPLAYCOPYFILER: // 0x01 // TODO: This is actually the sample pattern used for copies from an antialiased EFB SetRegName(BPMEM_DISPLAYCOPYFILER); @@ -75,6 +80,28 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size } break; + case BPMEM_BLENDMODE: // 0x41 + { + SetRegName(BPMEM_BLENDMODE); + BlendMode mode; mode.hex = cmddata; + const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" }; + snprintf(desc, desc_size, "Enable: %s\n" + "Logic ops: %s\n" + "Dither: %s\n" + "Color write: %s\n" + "Alpha write: %s\n" + "Dest factor: %s\n" + "Source factor: %s\n" + "Subtract: %s\n" + "Logic mode: %s\n", + no_yes[mode.blendenable], no_yes[mode.logicopenable], no_yes[mode.dither], + no_yes[mode.colorupdate], no_yes[mode.alphaupdate], dstfactors[mode.dstfactor], + srcfactors[mode.srcfactor], no_yes[mode.subtract], logicmodes[mode.logicmode]); + } + break; + case BPMEM_EFB_BR: // 0x4A { // TODO: Misleading name, should be BPMEM_EFB_WH instead @@ -148,7 +175,113 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size // TODO: Description break; -#undef SET_REG_NAME + case BPMEM_TEV_COLOR_ENV: // 0xC0 + case BPMEM_TEV_COLOR_ENV+2: + case BPMEM_TEV_COLOR_ENV+4: + case BPMEM_TEV_COLOR_ENV+8: + case BPMEM_TEV_COLOR_ENV+10: + case BPMEM_TEV_COLOR_ENV+12: + case BPMEM_TEV_COLOR_ENV+14: + case BPMEM_TEV_COLOR_ENV+16: + case BPMEM_TEV_COLOR_ENV+18: + case BPMEM_TEV_COLOR_ENV+20: + case BPMEM_TEV_COLOR_ENV+22: + case BPMEM_TEV_COLOR_ENV+24: + case BPMEM_TEV_COLOR_ENV+26: + case BPMEM_TEV_COLOR_ENV+28: + case BPMEM_TEV_COLOR_ENV+30: + { + SetRegName(BPMEM_TEV_COLOR_ENV); + TevStageCombiner::ColorCombiner cc; cc.hex = cmddata; + const char* tevin[] = + { + "prev.rgb", "prev.aaa", + "c0.rgb", "c0.aaa", + "c1.rgb", "c1.aaa", + "c2.rgb", "c2.aaa", + "tex.rgb", "tex.aaa", + "ras.rgb", "ras.aaa", + "ONE", "HALF", "konst.rgb", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n", + (data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d], + tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]); + break; + } + + case BPMEM_TEV_ALPHA_ENV: // 0xC1 + case BPMEM_TEV_ALPHA_ENV+2: + case BPMEM_TEV_ALPHA_ENV+4: + case BPMEM_TEV_ALPHA_ENV+6: + case BPMEM_TEV_ALPHA_ENV+8: + case BPMEM_TEV_ALPHA_ENV+10: + case BPMEM_TEV_ALPHA_ENV+12: + case BPMEM_TEV_ALPHA_ENV+14: + case BPMEM_TEV_ALPHA_ENV+16: + case BPMEM_TEV_ALPHA_ENV+18: + case BPMEM_TEV_ALPHA_ENV+20: + case BPMEM_TEV_ALPHA_ENV+22: + case BPMEM_TEV_ALPHA_ENV+24: + case BPMEM_TEV_ALPHA_ENV+26: + case BPMEM_TEV_ALPHA_ENV+28: + case BPMEM_TEV_ALPHA_ENV+30: + { + SetRegName(BPMEM_TEV_ALPHA_ENV); + TevStageCombiner::AlphaCombiner ac; ac.hex = cmddata; + const char* tevin[] = + { + "prev", "c0", "c1", "c2", + "tex", "ras", "konst", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev", "c0", "c1", "c2" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n" + "ras sel: %d\n" + "tex sel: %d\n", + (data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d], + tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest], + ac.rswap, ac.tswap); + break; + } + + case BPMEM_ALPHACOMPARE: // 0xF3 + { + SetRegName(BPMEM_ALPHACOMPARE); + AlphaTest test; test.hex = cmddata; + const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" }; + const char* logic[] = { "AND", "OR", "XOR", "XNOR" }; + snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n" + "test 2: %s (ref: %#02x)\n" + "logic: %s\n", + functions[test.comp0], test.ref0, functions[test.comp1], test.ref1, logic[test.logic]); + break; + } + +#undef SetRegName } } From 6f391a2df0c7903b8da046971a2de2797f6fe66f Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 12 Jan 2013 20:46:49 -0500 Subject: [PATCH 398/627] Set focus on memcard manager after losing it. --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 76c77a0543..d11a8575ff 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -471,6 +471,7 @@ bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot) PanicAlert(E_UNK); break; } + SetFocus(); return true; } From 429324a773fad3a840ac87f42f7d697305585d55 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 12 Jan 2013 21:18:42 -0500 Subject: [PATCH 399/627] Real fix for memcard manager. --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index d11a8575ff..3f8f0de7a7 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -252,7 +252,6 @@ void CMemcardManager::CreateGUIControls() SetSizerAndFit(sMain); Center(); - SetFocus(); for (int i = SLOT_A; i <= SLOT_B; i++) { @@ -525,13 +524,13 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), - wxFD_OPEN | wxFD_FILE_MUST_EXIST); + wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); if (!fileName.empty() && !fileName2.empty()) { wxString temp2 = wxFileSelector(_("Save GCI as..."), wxEmptyString, wxEmptyString, wxT(".gci"), _("GCI File(*.gci)") + wxString(_T("|*.gci")), - wxFD_OVERWRITE_PROMPT|wxFD_SAVE); + wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this); if (temp2.empty()) break; fileName2 = temp2.mb_str(); } @@ -561,7 +560,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), - wxFD_OVERWRITE_PROMPT|wxFD_SAVE); + wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this); if (fileName.length() > 0) { From eb5e7d44bd0b7acb43b6837572fa3eb31ef4c1ad Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 13 Jan 2013 07:00:56 +0100 Subject: [PATCH 400/627] Enable fastmem (aka. backpatch) support on Linux amd64 and OSX x64. Not tested on OSX, 8% performance increase on Linux amd64 --- Source/Core/Core/Src/Core.cpp | 2 +- Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index e92b9088bc..9170862025 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -313,7 +313,7 @@ void CpuThread() if (_CoreParameter.bLockThreads) Common::SetCurrentThreadAffinity(1); // Force to first core - #if defined(_WIN32) && defined(_M_X64) + #if defined(_M_X64) EMM::InstallExceptionHandler(); // Let's run under memory watch #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 333f0cdc05..7f1c9b590c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -118,7 +118,7 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s32 offset, bool signExtend) { -#if defined(_WIN32) && defined(_M_X64) +#if defined(_M_X64) #ifdef ENABLE_MEM_CHECK if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) #else From eca93c4c195963f4bd235692d2f0b584f6495d12 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 02:28:12 -0600 Subject: [PATCH 401/627] Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions. Unlike Connect, Bind is quite type-safe. I also seem to have fixed some errors in the input config dialog. --- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 24 ++--- Source/Core/DolphinWX/Src/CheatsWindow.h | 2 +- Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 8 +- Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 101 +++++++++--------- Source/Core/DolphinWX/Src/InputConfigDiag.h | 10 +- Source/Core/DolphinWX/Src/LogConfigWindow.cpp | 17 ++- Source/Core/DolphinWX/Src/NetWindow.cpp | 35 +++--- Source/Core/DolphinWX/Src/UDPConfigDiag.cpp | 16 ++- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 20 ++-- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 20 ++-- .../Src/VideoConfigDialog.cpp | 6 +- 11 files changed, 120 insertions(+), 139 deletions(-) diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index dec6648461..b07d9d9571 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -25,8 +25,6 @@ #include "HW/Memmap.h" #include "Frame.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY 256 extern std::vector arCodes; @@ -80,8 +78,8 @@ void wxCheatsWindow::Init_ChildControls() m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_CheckListBox_CheatsList = new wxCheckListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_CheatStringList, wxLB_HSCROLL, wxDefaultValidator); - _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemSelected, wxEVT_COMMAND_LISTBOX_SELECTED, this); - _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemToggled, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this); + m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this); m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize); m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize); @@ -107,10 +105,10 @@ void wxCheatsWindow::Init_ChildControls() m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update")); - _connect_macro_(button_updatelog, wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_updatelog->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this); m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging")); - _connect_macro_(m_CheckBox_LogAR, wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_CheckBox_LogAR->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this); m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging()); m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP); @@ -134,9 +132,9 @@ void wxCheatsWindow::Init_ChildControls() // Button Strip wxButton* const button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize); - _connect_macro_(button_apply, wxCheatsWindow::OnEvent_ApplyChanges_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this); wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize); - _connect_macro_(button_cancel, wxCheatsWindow::OnEvent_ButtonClose_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this); Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxCheatsWindow::OnEvent_Close), (wxObject*)0, this); @@ -160,11 +158,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) { // first scan button btnInitScan = new wxButton(this, -1, _("New Scan")); - _connect_macro_(btnInitScan, CheatSearchTab::StartNewSearch, wxEVT_COMMAND_BUTTON_CLICKED, this); + btnInitScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::StartNewSearch, this); // next scan button btnNextScan = new wxButton(this, -1, _("Next Scan")); - _connect_macro_(btnNextScan, CheatSearchTab::FilterCheatSearchResults, wxEVT_COMMAND_BUTTON_CLICKED, this); + btnNextScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::FilterCheatSearchResults, this); btnNextScan->Disable(); // data size radio buttons @@ -185,7 +183,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) // create AR code button wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code")); - _connect_macro_(button_cheat_search_copy_address, CheatSearchTab::CreateARCode, wxEVT_COMMAND_BUTTON_CLICKED, this); + button_cheat_search_copy_address->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::CreateARCode, this); // results groupbox wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results")); @@ -200,7 +198,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) // search value textbox textctrl_value_x = new wxTextCtrl(this, -1, wxT("0x0"), wxDefaultPosition, wxSize(96,-1)); - _connect_macro_(textctrl_value_x, CheatSearchTab::ApplyFocus, wxEVT_SET_FOCUS, this); + textctrl_value_x->Bind(wxEVT_SET_FOCUS, &CheatSearchTab::ApplyFocus, this); wxBoxSizer* const sizer_cheat_filter_text = new wxBoxSizer(wxHORIZONTAL); sizer_cheat_filter_text->Add(value_x_radiobtn.rad_uservalue, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); @@ -495,7 +493,7 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&) UpdateCheatSearchResultsList(); } -void CheatSearchTab::ApplyFocus(wxCommandEvent& ev) +void CheatSearchTab::ApplyFocus(wxEvent& ev) { ev.Skip(true); value_x_radiobtn.rad_uservalue->SetValue(true); diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h index 9d44e878f3..f1acc1c118 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.h +++ b/Source/Core/DolphinWX/Src/CheatsWindow.h @@ -99,7 +99,7 @@ protected: void StartNewSearch(wxCommandEvent& event); void FilterCheatSearchResults(wxCommandEvent& event); void CreateARCode(wxCommandEvent&); - void ApplyFocus(wxCommandEvent&); + void ApplyFocus(wxEvent&); }; class wxCheatsWindow : public wxDialog diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp index cffeb25e7f..e015c55ae8 100644 --- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp @@ -18,8 +18,6 @@ #include -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - namespace Gecko { @@ -31,8 +29,8 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) { m_listbox_gcodes = new wxCheckListBox(this, -1, wxDefaultPosition, wxDefaultSize); - _connect_macro_(m_listbox_gcodes, CodeConfigPanel::UpdateInfoBox, wxEVT_COMMAND_LISTBOX_SELECTED, this); - _connect_macro_(m_listbox_gcodes, CodeConfigPanel::ToggleCode, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_listbox_gcodes->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &CodeConfigPanel::UpdateInfoBox, this); + m_listbox_gcodes->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &CodeConfigPanel::ToggleCode, this); m_infobox.label_name = new wxStaticText(this, -1, wxGetTranslation(wxstr_name)); m_infobox.label_creator = new wxStaticText(this, -1, wxGetTranslation(wxstr_creator)); @@ -53,7 +51,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) // button sizer wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL); wxButton* const btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1)); - _connect_macro_(btn_download, CodeConfigPanel::DownloadCodes, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_download->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CodeConfigPanel::DownloadCodes, this); sizer_buttons->AddStretchSpacer(1); sizer_buttons->Add(btn_download, 1, wxEXPAND); diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp index b3d57ae89c..3994660686 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp @@ -18,7 +18,6 @@ #include "InputConfigDiag.h" #include "UDPConfigDiag.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) #define WXSTR_FROM_STR(s) (wxString::FromUTF8((s).c_str())) #define WXTSTR_FROM_CSTR(s) (wxGetTranslation(wxString::FromUTF8(s))) #define STR_FROM_WXSTR(w) (std::string((w).ToUTF8())) @@ -123,10 +122,10 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, Con //device_cbox = new wxComboBox(this, -1, WXSTR_FROM_STR(ref->device_qualifier.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); device_cbox = new wxComboBox(this, -1, WXSTR_FROM_STR(m_devq.ToString()), wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); - _connect_macro_(device_cbox, ControlDialog::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this); - _connect_macro_(device_cbox, ControlDialog::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this); + device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &ControlDialog::SetDevice, this); + device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &ControlDialog::SetDevice, this); - wxStaticBoxSizer* const control_chooser = CreateControlChooser(this, parent); + wxStaticBoxSizer* const control_chooser = CreateControlChooser(parent); wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer(wxVERTICAL, this, _("Device")); d_szr->Add(device_cbox, 0, wxEXPAND|wxALL, 5); @@ -406,7 +405,7 @@ void GamepadPage::AdjustControlOption(wxCommandEvent&) m_control_dialog->control_reference->range = (ControlState)(m_control_dialog->range_slider->GetValue()) / SLIDER_TICK_COUNT; } -void GamepadPage::ConfigControl(wxCommandEvent& event) +void GamepadPage::ConfigControl(wxEvent& event) { m_control_dialog = new ControlDialog(this, m_plugin, ((ControlButton*)event.GetEventObject())->control_reference); m_control_dialog->ShowModal(); @@ -416,7 +415,7 @@ void GamepadPage::ConfigControl(wxCommandEvent& event) UpdateGUI(); } -void GamepadPage::ClearControl(wxCommandEvent& event) +void GamepadPage::ClearControl(wxEvent& event) { ControlButton* const btn = (ControlButton*)event.GetEventObject(); btn->control_reference->expression.clear(); @@ -480,24 +479,24 @@ void GamepadPage::DetectControl(wxCommandEvent& event) } } -wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wxWindow* const eventsink) +wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) { - wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? _("Input") : _("Output")); + wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output")); - textctrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE); + textctrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE); - wxButton* const detect_button = new wxButton(parent, -1, control_reference->is_input ? _("Detect") : _("Test")); + wxButton* const detect_button = new wxButton(this, -1, control_reference->is_input ? _("Detect") : _("Test")); - wxButton* const clear_button = new wxButton(parent, -1, _("Clear")); - wxButton* const set_button = new wxButton(parent, -1, _("Set")); + wxButton* const clear_button = new wxButton(this, -1, _("Clear")); + wxButton* const set_button = new wxButton(this, -1, _("Set")); - wxButton* const select_button = new wxButton(parent, -1, _("Select")); - _connect_macro_(select_button, ControlDialog::SetSelectedControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + wxButton* const select_button = new wxButton(this, -1, _("Select")); + select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this); - wxButton* const or_button = new wxButton(parent, -1, _("| OR"), wxDefaultPosition); - _connect_macro_(or_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + wxButton* const or_button = new wxButton(this, -1, _("| OR"), wxDefaultPosition); + or_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); - control_lbox = new wxListBox(parent, -1, wxDefaultPosition, wxSize(-1, 64)); + control_lbox = new wxListBox(this, -1, wxDefaultPosition, wxSize(-1, 64)); wxBoxSizer* const button_sizer = new wxBoxSizer(wxVERTICAL); button_sizer->Add(detect_button, 1, 0, 5); @@ -507,30 +506,30 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wx if (control_reference->is_input) { // TODO: check if && is good on other OS - wxButton* const and_button = new wxButton(parent, -1, _("&& AND"), wxDefaultPosition); - wxButton* const not_button = new wxButton(parent, -1, _("! NOT"), wxDefaultPosition); - wxButton* const add_button = new wxButton(parent, -1, _("^ ADD"), wxDefaultPosition); + wxButton* const and_button = new wxButton(this, -1, _("&& AND"), wxDefaultPosition); + wxButton* const not_button = new wxButton(this, -1, _("! NOT"), wxDefaultPosition); + wxButton* const add_button = new wxButton(this, -1, _("^ ADD"), wxDefaultPosition); - _connect_macro_(and_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(not_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(add_button, ControlDialog::AppendControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + and_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); + not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); + add_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this); button_sizer->Add(and_button, 1, 0, 5); button_sizer->Add(not_button, 1, 0, 5); button_sizer->Add(add_button, 1, 0, 5); } - range_slider = new wxSlider(parent, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); + range_slider = new wxSlider(this, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT)); - _connect_macro_(detect_button, ControlDialog::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(clear_button, ControlDialog::ClearControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); - _connect_macro_(set_button, ControlDialog::SetControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); + detect_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::DetectControl, this); + clear_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::ClearControl, this); + set_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetControl, this); - _connect_macro_(range_slider, GamepadPage::AdjustControlOption, wxEVT_SCROLL_CHANGED, eventsink); - wxStaticText* const range_label = new wxStaticText(parent, -1, _("Range")); - m_bound_label = new wxStaticText(parent, -1, wxT("")); + range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent); + wxStaticText* const range_label = new wxStaticText(this, -1, _("Range")); + m_bound_label = new wxStaticText(this, -1, wxT("")); wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL); range_sizer->Add(range_label, 0, wxCENTER|wxLEFT, 5); @@ -668,7 +667,7 @@ ControlGroupBox::~ControlGroupBox() delete *i; } -ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, wxWindow* const eventsink) +ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink) : wxBoxSizer(wxVERTICAL) , control_group(group) { @@ -691,16 +690,16 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin if ((*ci)->control_ref->is_input) { control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); - _connect_macro_(control_button, GamepadPage::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DetectControl, eventsink); } else { control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear.")); - _connect_macro_(control_button, GamepadPage::ConfigControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + control_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigControl, eventsink); } - _connect_macro_(control_button, GamepadPage::ClearControl, wxEVT_MIDDLE_DOWN, eventsink); - _connect_macro_(control_button, GamepadPage::ConfigControl, wxEVT_RIGHT_UP, eventsink); + control_button->Bind(wxEVT_MIDDLE_DOWN, &GamepadPage::ClearControl, eventsink); + control_button->Bind(wxEVT_RIGHT_UP, &GamepadPage::ConfigControl, eventsink); wxBoxSizer* const control_sizer = new wxBoxSizer(wxHORIZONTAL); control_sizer->AddStretchSpacer(1); @@ -733,7 +732,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingSpin* setting = new PadSettingSpin(parent, *i); - _connect_macro_(setting->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting); szr->Add(new wxStaticText(parent, -1, WXTSTR_FROM_CSTR((*i)->name))); szr->Add(setting->wxcontrol, 0, wxLEFT, 0); @@ -754,7 +753,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin static_bitmap = new wxStaticBitmap(parent, -1, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP); PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]); - _connect_macro_(threshold_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + threshold_cbox->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons.")); @@ -793,7 +792,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingSpin* setting = new PadSettingSpin(parent, *i); - _connect_macro_(setting->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); + setting->wxcontrol->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting); wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); szr->Add(new wxStaticText(parent, -1, WXTSTR_FROM_CSTR((*i)->name)), 0, wxCENTER|wxRIGHT, 3); @@ -811,8 +810,8 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin options.push_back(attachments); - _connect_macro_(attachments->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_CHOICE_SELECTED, eventsink); - _connect_macro_(configure_btn, GamepadPage::ConfigExtension, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + attachments->wxcontrol->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &GamepadPage::AdjustSetting, eventsink); + configure_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigExtension, eventsink); Add(attachments->wxcontrol, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 3); Add(configure_btn, 0, wxALL|wxEXPAND, 3); @@ -821,7 +820,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin case GROUP_TYPE_UDPWII: { wxButton* const btn = new UDPConfigButton(parent, (UDPWrapper*)group); - _connect_macro_(btn, GamepadPage::ConfigUDPWii, wxEVT_COMMAND_BUTTON_CLICKED, eventsink); + btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ConfigUDPWii, eventsink); Add(btn, 0, wxALL|wxEXPAND, 3); } break; @@ -835,7 +834,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin for (; i!=e; ++i) { PadSettingCheckBox* setting_cbox = new PadSettingCheckBox(parent, (*i)->value, (*i)->name); - _connect_macro_(setting_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_CHECKBOX_CLICKED, eventsink); + setting_cbox->wxcontrol->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &GamepadPage::AdjustSetting, eventsink); options.push_back(setting_cbox); Add(setting_cbox->wxcontrol, 0, wxALL|wxLEFT, 5); @@ -850,7 +849,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin //AddStretchSpacer(0); } -ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, wxWindow* const eventsink, std::vector* groups) +ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector* groups) : wxBoxSizer(wxHORIZONTAL) { size_t col_size = 0; @@ -906,9 +905,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i wxButton* refresh_button = new wxButton(this, -1, _("Refresh"), wxDefaultPosition, wxSize(60,-1)); - _connect_macro_(device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this); - _connect_macro_(device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this); - _connect_macro_(refresh_button, GamepadPage::RefreshDevices, wxEVT_COMMAND_BUTTON_CLICKED, this); + device_cbox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &GamepadPage::SetDevice, this); + device_cbox->Bind(wxEVT_COMMAND_TEXT_ENTER, &GamepadPage::SetDevice, this); + refresh_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::RefreshDevices, this); device_sbox->Add(device_cbox, 1, wxLEFT|wxRIGHT, 3); device_sbox->Add(refresh_button, 0, wxRIGHT|wxBOTTOM, 3); @@ -920,8 +919,8 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i clear_sbox->Add(default_button, 1, wxLEFT, 3); clear_sbox->Add(clearall_button, 1, wxRIGHT, 3); - _connect_macro_(clearall_button, GamepadPage::ClearAll, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(default_button, GamepadPage::LoadDefaults, wxEVT_COMMAND_BUTTON_CLICKED, this); + clearall_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::ClearAll, this); + default_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadDefaults, this); profile_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1)); @@ -929,9 +928,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputPlugin& plugin, const unsigned i wxButton* const psave_btn = new wxButton(this, -1, _("Save"), wxDefaultPosition, wxSize(48,-1)); wxButton* const pdelete_btn = new wxButton(this, -1, _("Delete"), wxDefaultPosition, wxSize(60,-1)); - _connect_macro_(pload_btn, GamepadPage::LoadProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(psave_btn, GamepadPage::SaveProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); - _connect_macro_(pdelete_btn, GamepadPage::DeleteProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); + pload_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::LoadProfile, this); + psave_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::SaveProfile, this); + pdelete_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &GamepadPage::DeleteProfile, this); profile_sbox->Add(profile_cbox, 1, wxLEFT, 3); profile_sbox->Add(pload_btn, 0, wxLEFT, 3); diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h index 53f06a1144..1be97bff14 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.h +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h @@ -100,7 +100,7 @@ class ControlDialog : public wxDialog public: ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref); - wxStaticBoxSizer* CreateControlChooser(wxWindow* const parent, wxWindow* const eventsink); + wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent); void DetectControl(wxCommandEvent& event); void ClearControl(wxCommandEvent& event); @@ -159,7 +159,7 @@ public: class ControlGroupBox : public wxBoxSizer { public: - ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, wxWindow* const eventsink); + ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink); ~ControlGroupBox(); std::vector options; @@ -172,7 +172,7 @@ public: class ControlGroupsSizer : public wxBoxSizer { public: - ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, wxWindow* const eventsink, std::vector* const groups = NULL); + ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector* const groups = NULL); }; class InputConfigDialog; @@ -193,8 +193,8 @@ public: void SaveProfile(wxCommandEvent& event); void DeleteProfile(wxCommandEvent& event); - void ConfigControl(wxCommandEvent& event); - void ClearControl(wxCommandEvent& event); + void ConfigControl(wxEvent& event); + void ClearControl(wxEvent& event); void DetectControl(wxCommandEvent& event); void ConfigExtension(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp index d771a75c30..162647c64d 100644 --- a/Source/Core/DolphinWX/Src/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogConfigWindow.cpp @@ -21,9 +21,6 @@ #include "LogWindow.h" #include "FileUtil.h" -#define _connect_macro_(b, f, c, s) \ - (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id) : wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration")) , m_LogWindow(log_window), enableAll(true) @@ -53,29 +50,29 @@ void LogConfigWindow::CreateGUIControls() m_verbosity = new wxRadioBox(this, wxID_ANY, _("Verbosity"), wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxRA_SPECIFY_ROWS, wxDefaultValidator); - _connect_macro_(m_verbosity, LogConfigWindow::OnVerbosityChange, wxEVT_COMMAND_RADIOBOX_SELECTED, this); + m_verbosity->Bind(wxEVT_COMMAND_RADIOBOX_SELECTED, &LogConfigWindow::OnVerbosityChange, this); // Options m_writeFileCB = new wxCheckBox(this, wxID_ANY, _("Write to File")); - _connect_macro_(m_writeFileCB, LogConfigWindow::OnWriteFileChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeFileCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteFileChecked, this); m_writeConsoleCB = new wxCheckBox(this, wxID_ANY, _("Write to Console")); - _connect_macro_(m_writeConsoleCB, LogConfigWindow::OnWriteConsoleChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeConsoleCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteConsoleChecked, this); m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window")); - _connect_macro_(m_writeWindowCB, LogConfigWindow::OnWriteWindowChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeWindowCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteWindowChecked, this); m_writeDebuggerCB = NULL; #ifdef _MSC_VER if (IsDebuggerPresent()) { m_writeDebuggerCB = new wxCheckBox(this, wxID_ANY, _("Write to Debugger")); - _connect_macro_(m_writeDebuggerCB, LogConfigWindow::OnWriteDebuggerChecked, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + m_writeDebuggerCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteDebuggerChecked, this); } #endif wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); - _connect_macro_(btn_toggle_all, LogConfigWindow::OnToggleAll, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_toggle_all->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &LogConfigWindow::OnToggleAll, this); m_checks = new wxCheckListBox(this, wxID_ANY); - _connect_macro_(m_checks, LogConfigWindow::OnLogCheck, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); + m_checks->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &LogConfigWindow::OnLogCheck, this); for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) m_checks->Append(wxString::FromAscii(m_LogManager->GetFullName((LogTypes::LOG_TYPE)i))); diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 0347385e73..142a7ea00c 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -24,9 +24,6 @@ #include -#define _connect_macro_(b, f, c, s) \ - (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - #define NETPLAY_TITLEBAR "Dolphin NetPlay" BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame) @@ -86,7 +83,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, wxString::FromAscii(port.c_str())); wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect")); - _connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this); + connect_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnJoin, this); wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY, _("ALERT:\n\nNetPlay will currently only work properly when using the following settings:\n - Dual Core [OFF]\n - Audio Throttle [OFF]\n - DSP-HLE with \"Null Audio\" or DSP-LLE\n - Manually set the exact number of controllers that will be used to [Standard Controller]\n\nAll players should try to use the same Dolphin version and settings.\nDisable all memory cards or send them to all players before starting.\nWiimote support has not been implemented.\n\nYou must forward TCP port to host!!"), @@ -119,10 +116,10 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* m_host_port_text = new wxTextCtrl(host_tab, wxID_ANY, wxString::FromAscii(port.c_str())); wxButton* const host_btn = new wxButton(host_tab, wxID_ANY, _("Host")); - _connect_macro_(host_btn, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_BUTTON_CLICKED, this); + host_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnHost, this); m_game_lbox = new wxListBox(host_tab, wxID_ANY); - _connect_macro_(m_game_lbox, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, this); + m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &NetPlaySetupDiag::OnHost, this); std::istringstream ss(game_list->GetGameNames()); std::string game; @@ -143,7 +140,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl* // bottom row wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit")); - _connect_macro_(quit_btn, NetPlaySetupDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); + quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlaySetupDiag::OnQuit, this); // main sizer wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); @@ -257,7 +254,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game wxDefaultPosition, wxDefaultSize, wxBU_LEFT); if (is_hosting) - _connect_macro_(m_game_btn, NetPlayDiag::OnChangeGame, wxEVT_COMMAND_BUTTON_CLICKED, this); + m_game_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChangeGame, this); else m_game_btn->Disable(); @@ -269,10 +266,10 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game m_chat_msg_text = new wxTextCtrl(panel, wxID_ANY, wxEmptyString , wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - _connect_macro_(m_chat_msg_text, NetPlayDiag::OnChat, wxEVT_COMMAND_TEXT_ENTER, this); + m_chat_msg_text->Bind(wxEVT_COMMAND_TEXT_ENTER, &NetPlayDiag::OnChat, this); wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send")); - _connect_macro_(chat_msg_btn, NetPlayDiag::OnChat, wxEVT_COMMAND_BUTTON_CLICKED, this); + chat_msg_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnChat, this); wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL); chat_msg_szr->Add(m_chat_msg_text, 1); @@ -290,7 +287,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game if (is_hosting) { wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads")); - _connect_macro_(player_config_btn, NetPlayDiag::OnConfigPads, wxEVT_COMMAND_BUTTON_CLICKED, this); + player_config_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnConfigPads, this); player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5); } @@ -300,23 +297,23 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game // bottom crap wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit")); - _connect_macro_(quit_btn, NetPlayDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); + quit_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnQuit, this); wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL); if (is_hosting) { wxButton* const start_btn = new wxButton(panel, wxID_ANY, _("Start")); - _connect_macro_(start_btn, NetPlayDiag::OnStart, wxEVT_COMMAND_BUTTON_CLICKED, this); + start_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnStart, this); bottom_szr->Add(start_btn); wxButton* const stop_btn = new wxButton(panel, wxID_ANY, _("Stop")); - _connect_macro_(stop_btn, NetPlayDiag::OnStop, wxEVT_COMMAND_BUTTON_CLICKED, this); + stop_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnStop, this); bottom_szr->Add(stop_btn); bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 ); wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20") , wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20); - _connect_macro_(padbuf_spin, NetPlayDiag::OnAdjustBuffer, wxEVT_COMMAND_SPINCTRL_UPDATED, this); + padbuf_spin->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &NetPlayDiag::OnAdjustBuffer, this); wxButton* const padbuf_btn = new wxButton(panel, wxID_ANY, wxT("?"), wxDefaultPosition, wxSize(22, -1)); - _connect_macro_(padbuf_btn, NetPlayDiag::OnPadBuffHelp, wxEVT_COMMAND_BUTTON_CLICKED, this); + padbuf_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &NetPlayDiag::OnPadBuffHelp, this); bottom_szr->Add(padbuf_spin, 0, wxCENTER); bottom_szr->Add(padbuf_btn); } @@ -550,7 +547,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons , m_game_name(game_name) { m_game_lbox = new wxListBox(this, wxID_ANY); - _connect_macro_(m_game_lbox, ChangeGameDiag::OnPick, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, this); + m_game_lbox->Bind(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, &ChangeGameDiag::OnPick, this); // fill list with games std::istringstream ss(game_list->GetGameNames()); @@ -559,7 +556,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons m_game_lbox->Append(wxString(game.c_str(), *wxConvCurrent)); wxButton* const ok_btn = new wxButton(this, wxID_OK, _("Change")); - _connect_macro_(ok_btn, ChangeGameDiag::OnPick, wxEVT_COMMAND_BUTTON_CLICKED, this); + ok_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ChangeGameDiag::OnPick, this); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); szr->Add(m_game_lbox, 1, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 5); @@ -604,7 +601,7 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, pad_names); pad_cbox->Select(m_mapping[i] + 1); - _connect_macro_(pad_cbox, PadMapDiag::OnAdjust, wxEVT_COMMAND_CHOICE_SELECTED, this); + pad_cbox->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &PadMapDiag::OnAdjust, this); wxBoxSizer* const v_szr = new wxBoxSizer(wxVERTICAL); v_szr->Add(new wxStaticText(this,wxID_ANY, pad_names[i + 1]), 1, wxALIGN_CENTER_HORIZONTAL); diff --git a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp b/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp index d66e6c1fc5..2f31311495 100644 --- a/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/UDPConfigDiag.cpp @@ -6,8 +6,6 @@ #include "IniFile.h" #include -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), wrp(_wrp) @@ -31,13 +29,13 @@ UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : port_tbox = new wxTextCtrl(this, wxID_ANY, wxString::FromUTF8(wrp->port.c_str())); port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND, 5); - _connect_macro_(enable, UDPConfigDiag::ChangeState, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(butt, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(accel, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(point, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(nun, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(nunaccel, UDPConfigDiag::ChangeUpdateFlags, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(port_tbox, UDPConfigDiag::ChangeState, wxEVT_COMMAND_TEXT_UPDATED, this); + enable->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeState, this); + butt->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + accel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + point->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + nun->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + nunaccel->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &UDPConfigDiag::ChangeUpdateFlags, this); + port_tbox->Bind(wxEVT_COMMAND_TEXT_UPDATED, &UDPConfigDiag::ChangeState, this); enable->SetValue(wrp->udpEn); butt->SetValue(wrp->updButt); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index d99bd97e8d..83b1d64c4c 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -11,8 +11,6 @@ #include #endif -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - extern CFrame* main_frame; // template instantiation @@ -27,7 +25,7 @@ SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, const wxSt { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - _connect_macro_(this, SettingCheckBox::UpdateValue, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + this->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &SettingCheckBox::UpdateValue, this); } template <> @@ -38,7 +36,7 @@ SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, const w { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - _connect_macro_(this, SettingRadioButton::UpdateValue, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); + this->Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &SettingRadioButton::UpdateValue, this); } SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num, const wxString choices[], long style) @@ -47,7 +45,7 @@ SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& too { SetToolTip(tooltip); Select(m_setting); - _connect_macro_(this, SettingChoice::UpdateValue, wxEVT_COMMAND_CHOICE_SELECTED, this); + this->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &SettingChoice::UpdateValue, this); } void SettingChoice::UpdateValue(wxCommandEvent& ev) @@ -217,7 +215,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con choice_backend->AppendString(wxGetTranslation(wxString::FromAscii((*it)->GetName().c_str()))); choice_backend->SetStringSelection(wxGetTranslation(wxString::FromAscii(g_video_backend->GetName().c_str()))); - _connect_macro_(choice_backend, VideoConfigDiag::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_basic->Add(choice_backend, 1, 0, 0); @@ -259,7 +257,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxStaticText* const label_display_resolution = new wxStaticText(page_general, wxID_ANY, _("Fullscreen resolution:")); choice_display_resolution = new wxChoice(page_general, wxID_ANY, wxDefaultPosition, wxDefaultSize, res_list); RegisterControl(choice_display_resolution, wxGetTranslation(display_res_desc)); - _connect_macro_(choice_display_resolution, VideoConfigDiag::Event_DisplayResolution, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_display_resolution->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_DisplayResolution, this); choice_display_resolution->SetStringSelection(wxString::FromAscii(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str())); @@ -389,7 +387,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con else choice_ppshader->SetStringSelection(wxString::FromAscii(vconfig.sPostProcessingShader.c_str())); - _connect_macro_(choice_ppshader, VideoConfigDiag::Event_PPShader, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_ppshader->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_PPShader, this); szr_enh->Add(new wxStaticText(page_enh, -1, _("Post-Processing Effect:")), 1, wxALIGN_CENTER_VERTICAL, 0); szr_enh->Add(choice_ppshader); @@ -455,7 +453,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // TODO: Use wxSL_MIN_MAX_LABELS or wxSL_VALUE_LABEL with wx 2.9.1 wxSlider* const stc_slider = new wxSlider(page_hacks, wxID_ANY, 0, 0, 2, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_BOTTOM); - _connect_macro_(stc_slider, VideoConfigDiag::Event_Stc, wxEVT_COMMAND_SLIDER_UPDATED, this); + stc_slider->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &VideoConfigDiag::Event_Stc, this); RegisterControl(stc_slider, wxGetTranslation(stc_desc)); if (vconfig.iSafeTextureCache_ColorSamples == 0) stc_slider->SetValue(0); @@ -556,7 +554,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con { wxCheckBox* const cb_prog_scan = new wxCheckBox(page_advanced, wxID_ANY, _("Enable Progressive Scan")); RegisterControl(cb_prog_scan, wxGetTranslation(prog_scan_desc)); - _connect_macro_(cb_prog_scan, VideoConfigDiag::Event_ProgressiveScan, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + cb_prog_scan->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &VideoConfigDiag::Event_ProgressiveScan, this); if (Core::GetState() != Core::CORE_UNINITIALIZED) cb_prog_scan->Disable(); @@ -579,7 +577,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con } wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition); - _connect_macro_(btn_close, VideoConfigDiag::Event_ClickClose, wxEVT_COMMAND_BUTTON_CLICKED, this); + btn_close->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &VideoConfigDiag::Event_ClickClose, this); Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VideoConfigDiag::Event_Close), (wxObject*)0, this); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index b232bf6461..d94c099531 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -4,8 +4,6 @@ #include "HW/WiimoteReal/WiimoteReal.h" #include "Frame.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler(f), (wxObject*)0, (wxEvtHandler*)s) - const wxString& ConnectedWiimotesString() { static wxString str; @@ -42,9 +40,9 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin wiimote_label[i] = new wxStaticText(this, wxID_ANY, str); wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices); - _connect_macro_(wiimote_source_ch[i], WiimoteConfigDiag::SelectSource, wxEVT_COMMAND_CHOICE_SELECTED, this); + wiimote_source_ch[i]->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::SelectSource, this); wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure")); - _connect_macro_(wiimote_configure_bt[i], WiimoteConfigDiag::ConfigEmulatedWiimote, wxEVT_COMMAND_BUTTON_CLICKED, this); + wiimote_configure_bt[i]->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::ConfigEmulatedWiimote, this); m_orig_wiimote_sources[i] = g_wiimote_sources[i]; wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]); @@ -69,11 +67,11 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString()); wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition); - _connect_macro_(refresh_btn, WiimoteConfigDiag::RefreshRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, this); + refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); #ifdef _WIN32 wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition); - _connect_macro_(pairup_btn, WiimoteConfigDiag::PairUpRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, this); + pairup_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::PairUpRealWiimotes, this); #endif @@ -133,11 +131,11 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData("BT.MOT")); WiimoteReconnectOnLoad->SetValue(SConfig::GetInstance().m_WiimoteReconnectOnLoad); - _connect_macro_(WiiSensBarPos, WiimoteConfigDiag::OnSensorBarPos, wxEVT_COMMAND_CHOICE_SELECTED, this); - _connect_macro_(WiiSensBarSens, WiimoteConfigDiag::OnSensorBarSensitivity, wxEVT_COMMAND_SLIDER_UPDATED, this); - _connect_macro_(WiimoteSpkVolume, WiimoteConfigDiag::OnSpeakerVolume, wxEVT_COMMAND_SLIDER_UPDATED, this); - _connect_macro_(WiimoteMotor, WiimoteConfigDiag::OnMotor, wxEVT_COMMAND_CHECKBOX_CLICKED, this); - _connect_macro_(WiimoteReconnectOnLoad, WiimoteConfigDiag::OnReconnectOnLoad, wxEVT_COMMAND_CHECKBOX_CLICKED, this); + WiiSensBarPos->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::OnSensorBarPos, this); + WiiSensBarSens->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSensorBarSensitivity, this); + WiimoteSpkVolume->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSpeakerVolume, this); + WiimoteMotor->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnMotor, this); + WiimoteReconnectOnLoad->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnReconnectOnLoad, this); // "General Settings" layout diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp index 792d90e61c..c18ac28d33 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp @@ -21,8 +21,6 @@ #include "FileUtil.h" #include "Core.h" -#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) - template IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) : wxSpinCtrl(parent, -1, label, wxDefaultPosition, wxDefaultSize, style), @@ -30,7 +28,7 @@ IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& se { SetRange(minVal, maxVal); SetValue(m_setting); - _connect_macro_(this, IntegerSetting::UpdateValue, wxEVT_COMMAND_SPINCTRL_UPDATED, this); + this->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &IntegerSetting::UpdateValue, this); } @@ -70,7 +68,7 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, // TODO: How to get the translated plugin name? choice_backend->SetStringSelection(wxString::FromAscii(g_video_backend->GetName().c_str())); - _connect_macro_(choice_backend, VideoConfigDialog::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this); + choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDialog::Event_Backend, this); szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_rendering->Add(choice_backend, 1, 0, 0); From 6e5c26a3d4e07a1a748195ba7385472cd6746c36 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 03:12:29 -0600 Subject: [PATCH 402/627] kill _connect_macro_ ugliness in BreakpointWindow. --- .../DolphinWX/Src/Debugger/BreakpointWindow.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp index 7d40e820f2..35f957d71a 100644 --- a/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/BreakpointWindow.cpp @@ -31,13 +31,10 @@ extern "C" { #include "../../resources/toolbar_debugger_delete.c" } -#define _connect_macro_(id, handler) \ - Connect(id, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(handler), (wxObject*)0, (wxEvtHandler*)parent) - class CBreakPointBar : public wxAuiToolBar { public: - CBreakPointBar(wxWindow* parent, const wxWindowID id) + CBreakPointBar(CBreakPointWindow* parent, const wxWindowID id) : wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT) { @@ -51,26 +48,26 @@ public: wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24)); AddTool(ID_DELETE, wxT("Delete"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_DELETE, CBreakPointWindow::OnDelete); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnDelete, parent, ID_DELETE); AddTool(ID_CLEAR, wxT("Clear"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_CLEAR, CBreakPointWindow::OnClear); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnClear, parent, ID_CLEAR); AddTool(ID_ADDBP, wxT("+BP"), m_Bitmaps[Toolbar_Add_BP]); - _connect_macro_(ID_ADDBP, CBreakPointWindow::OnAddBreakPoint); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP); // Add memory breakpoints if you can use them if (Memory::AreMemoryBreakpointsActivated()) { AddTool(ID_ADDMC, wxT("+MC"), m_Bitmaps[Toolbar_Add_MC]); - _connect_macro_(ID_ADDMC, CBreakPointWindow::OnAddMemoryCheck); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC); } AddTool(ID_LOAD, wxT("Load"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_LOAD, CBreakPointWindow::LoadAll); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::LoadAll, parent, ID_LOAD); AddTool(ID_SAVE, wxT("Save"), m_Bitmaps[Toolbar_Delete]); - _connect_macro_(ID_SAVE, CBreakPointWindow::Event_SaveAll); + Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE); } private: From 5dbc3b32197bdac2037f7ba261adbf15303c98a0 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 03:33:11 -0600 Subject: [PATCH 403/627] replace this->Bind with Bind --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 6 +++--- .../Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 83b1d64c4c..f099272686 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -25,7 +25,7 @@ SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, const wxSt { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - this->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &SettingCheckBox::UpdateValue, this); + Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &SettingCheckBox::UpdateValue, this); } template <> @@ -36,7 +36,7 @@ SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, const w { SetToolTip(tooltip); SetValue(m_setting ^ m_reverse); - this->Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &SettingRadioButton::UpdateValue, this); + Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &SettingRadioButton::UpdateValue, this); } SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num, const wxString choices[], long style) @@ -45,7 +45,7 @@ SettingChoice::SettingChoice(wxWindow* parent, int &setting, const wxString& too { SetToolTip(tooltip); Select(m_setting); - this->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &SettingChoice::UpdateValue, this); + Bind(wxEVT_COMMAND_CHOICE_SELECTED, &SettingChoice::UpdateValue, this); } void SettingChoice::UpdateValue(wxCommandEvent& ev) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp index c18ac28d33..bd085a3edf 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp @@ -28,7 +28,7 @@ IntegerSetting::IntegerSetting(wxWindow* parent, const wxString& label, T& se { SetRange(minVal, maxVal); SetValue(m_setting); - this->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &IntegerSetting::UpdateValue, this); + Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &IntegerSetting::UpdateValue, this); } From 60a73bcd77a5207a54ff0b1ad4d2d03eee297510 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 11:46:30 -0600 Subject: [PATCH 404/627] Replace a bunch of Connect calls with Bind. --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 34 ++++++------- Source/Core/DolphinWX/Src/TASInputDlg.cpp | 56 ++++++++++----------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 160aaf211a..b1ed09c139 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -307,26 +307,26 @@ void FifoPlayerDlg::CreateGUIControls() // Connect Events Connect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint)); - m_FrameFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this); - m_FrameToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this); - m_ObjectFromCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this); - m_ObjectToCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectTo), NULL, this); - m_EarlyMemoryUpdates->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCheckEarlyMemoryUpdates), NULL, this); - m_RecordStop->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnRecordStop), NULL, this); - m_Save->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnSaveFile), NULL, this); - m_FramesToRecordCtrl->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); - Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + m_FrameFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this); + m_FrameToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this); + m_ObjectFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this); + m_ObjectToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this); + m_EarlyMemoryUpdates->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this); + m_RecordStop->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this); + m_Save->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this); + m_FramesToRecordCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this); - m_framesList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); - m_objectsList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); - m_objectCmdList->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + m_framesList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this); + m_objectsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this); + m_objectCmdList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this); - m_beginSearch->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); - m_findNext->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindNextClick), NULL, this); - m_findPrevious->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnFindPreviousClick), NULL, this); + m_beginSearch->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnBeginSearch, this); + m_findNext->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindNextClick, this); + m_findPrevious->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindPreviousClick, this); - m_searchField->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(FifoPlayerDlg::OnBeginSearch), NULL, this); - m_searchField->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(FifoPlayerDlg::OnSearchFieldTextChanged), NULL, this); + m_searchField->Bind(wxEVT_COMMAND_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this); + m_searchField->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FifoPlayerDlg::OnSearchFieldTextChanged, this); // Setup command copying wxAcceleratorEntry entry; diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index b4f4c77397..51b340c55a 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -54,8 +54,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const main_stick_box = new wxBoxSizer(wxVERTICAL); static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); - static_bitmap_main->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpL), NULL, this); - static_bitmap_main->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpR), NULL, this); + static_bitmap_main->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this); + static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); wx_mainX_s->SetMinSize(wxSize(120,-1)); wx_mainX_t = new wxTextCtrl(this, ID_MAIN_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); @@ -80,8 +80,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxBoxSizer* const c_stick_box = new wxBoxSizer(wxVERTICAL); static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize); - static_bitmap_c->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpL), NULL, this); - static_bitmap_c->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(TASInputDlg::OnMouseUpR), NULL, this); + static_bitmap_c->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this); + static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this); wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); wx_cX_s->SetMinSize(wxSize(120,-1)); wx_cX_t = new wxTextCtrl(this, ID_C_X_TEXT, wxT("128"), wxDefaultPosition, wxSize(40, 20)); @@ -120,29 +120,29 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxGridSizer* const buttons_grid = new wxGridSizer(4); wx_a_button = new wxCheckBox(this,ID_A,_T("A"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_a_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_a_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_a_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_a_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_b_button = new wxCheckBox(this,ID_B,_T("B"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_b_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_b_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_b_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_b_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_x_button = new wxCheckBox(this,ID_X,_T("X"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_x_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_x_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_x_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_x_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_y_button = new wxCheckBox(this,ID_Y,_T("Y"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_y_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_y_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_y_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_y_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_l_button = new wxCheckBox(this,ID_L,_T("L"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_l_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_l_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_l_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_l_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_r_button = new wxCheckBox(this,ID_R,_T("R"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_r_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_r_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_r_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_r_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_z_button = new wxCheckBox(this,ID_Z,_T("Z"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_z_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_z_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_z_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_z_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_start_button = new wxCheckBox(this,ID_START,_T("Start"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_start_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_start_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_start_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_start_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); buttons_grid->Add(wx_a_button,false); buttons_grid->Add(wx_b_button,false); @@ -157,17 +157,17 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title, wxGridSizer* const buttons_dpad = new wxGridSizer(3); wx_up_button = new wxCheckBox(this,ID_UP,_T("Up"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_up_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_up_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_up_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_up_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_right_button = new wxCheckBox(this,ID_RIGHT,_T("Right"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_right_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_right_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_right_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_right_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_down_button = new wxCheckBox(this,ID_DOWN,_T("Down"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_down_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_down_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_down_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_down_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); wx_left_button = new wxCheckBox(this,ID_LEFT,_T("Left"),wxDefaultPosition,wxDefaultSize,0,wxDefaultValidator,wxCheckBoxNameStr); - wx_left_button->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurbo), NULL, this); - wx_left_button->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(TASInputDlg::SetTurboFalse), NULL, this); + wx_left_button->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); + wx_left_button->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurboFalse, this); buttons_dpad->AddSpacer(20); buttons_dpad->Add(wx_up_button,false); From 70427b3f3583ee2588a007a3ac62b929bdb89325 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 12:07:45 -0600 Subject: [PATCH 405/627] Replace all of Connect/Disconnect with Bind/Unbind. --- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 8 +- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 42 +++++----- Source/Core/DolphinWX/Src/FifoPlayerDlg.h | 4 +- Source/Core/DolphinWX/Src/Frame.cpp | 4 +- Source/Core/DolphinWX/Src/FrameAui.cpp | 8 +- Source/Core/DolphinWX/Src/FrameTools.cpp | 80 ++++++------------- Source/Core/DolphinWX/Src/GCMicDlg.cpp | 8 +- Source/Core/DolphinWX/Src/HotkeyDlg.cpp | 8 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 3 +- Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 4 +- Source/Core/DolphinWX/Src/MemcardManager.h | 6 +- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 8 +- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 4 +- 13 files changed, 68 insertions(+), 119 deletions(-) diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index b07d9d9571..63ddced86b 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -136,7 +136,7 @@ void wxCheatsWindow::Init_ChildControls() wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize); button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxCheatsWindow::OnEvent_Close), (wxObject*)0, this); + Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this); wxStdDialogButtonSizer* const sButtons = new wxStdDialogButtonSizer(); sButtons->AddButton(button_apply); @@ -588,9 +588,9 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address) sizer_main->Add(textctrl_value, 0, wxALL, 5); sizer_main->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxALL, 5); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CreateCodeDialog::PressOK)); - Connect(wxID_CANCEL, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CreateCodeDialog::PressCancel)); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CreateCodeDialog::OnEvent_Close), (wxObject*)0, this); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressOK, this, wxID_OK); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressCancel, this, wxID_CANCEL); + Bind(wxEVT_CLOSE_WINDOW, &CreateCodeDialog::OnEvent_Close, this); SetSizerAndFit(sizer_main); SetFocus(); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index b1ed09c139..d33f507282 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -56,24 +56,24 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) : FifoPlayerDlg::~FifoPlayerDlg() { - Disconnect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); - Disconnect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); + Unbind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this); + Unbind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this); // Disconnect Events - Disconnect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint), NULL, this); - m_FrameFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameFrom), NULL, this); - m_FrameToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnFrameTo), NULL, this); - m_ObjectFromCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectFrom), NULL, this); - m_ObjectToCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnObjectTo), NULL, this); - m_EarlyMemoryUpdates->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCheckEarlyMemoryUpdates), NULL, this); - m_RecordStop->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnRecordStop), NULL, this); - m_Save->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnSaveFile), NULL, this); - m_FramesToRecordCtrl->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(FifoPlayerDlg::OnNumFramesToRecord), NULL, this); - m_Close->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FifoPlayerDlg::OnCloseClick), NULL, this); + Unbind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this); + m_FrameFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this); + m_FrameToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this); + m_ObjectFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this); + m_ObjectToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this); + m_EarlyMemoryUpdates->Unbind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this); + m_RecordStop->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this); + m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this); + m_FramesToRecordCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this); + m_Close->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this); - m_framesList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnFrameListSelectionChanged), NULL, this); - m_objectsList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectListSelectionChanged), NULL, this); - m_objectCmdList->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionChanged), NULL, this); + m_framesList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this); + m_objectsList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this); + m_objectCmdList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this); FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL); @@ -306,7 +306,7 @@ void FifoPlayerDlg::CreateGUIControls() Center(wxBOTH); // Connect Events - Connect(wxEVT_PAINT, wxPaintEventHandler(FifoPlayerDlg::OnPaint)); + Bind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this); m_FrameFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this); m_FrameToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this); m_ObjectFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this); @@ -333,10 +333,10 @@ void FifoPlayerDlg::CreateGUIControls() entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY); wxAcceleratorTable accel(1, &entry); m_objectCmdList->SetAcceleratorTable(accel); - m_objectCmdList->Connect(wxID_COPY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(FifoPlayerDlg::OnObjectCmdListSelectionCopy), NULL, this); + m_objectCmdList->Bind(wxEVT_COMMAND_MENU_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY); - Connect(RECORDING_FINISHED_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnRecordingFinished), NULL, this); - Connect(FRAME_WRITTEN_EVENT, wxCommandEventHandler(FifoPlayerDlg::OnFrameWritten), NULL, this); + Bind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this); + Bind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this); Show(); } @@ -784,7 +784,7 @@ void FifoPlayerDlg::OnCloseClick(wxCommandEvent& WXUNUSED(event)) Hide(); } -void FifoPlayerDlg::OnRecordingFinished(wxCommandEvent& WXUNUSED(event)) +void FifoPlayerDlg::OnRecordingFinished(wxEvent&) { m_RecordStop->SetLabel(_("Record")); m_RecordStop->Enable(); @@ -792,7 +792,7 @@ void FifoPlayerDlg::OnRecordingFinished(wxCommandEvent& WXUNUSED(event)) UpdateRecorderGui(); } -void FifoPlayerDlg::OnFrameWritten(wxCommandEvent& WXUNUSED(event)) +void FifoPlayerDlg::OnFrameWritten(wxEvent&) { m_CurrentFrameLabel->SetLabel(CreateCurrentFrameLabel()); m_NumObjectsLabel->SetLabel(CreateFileObjectCountLabel()); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h index eb5f9a33e9..f00af6119b 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h @@ -51,8 +51,8 @@ private: void OnSearchFieldTextChanged(wxCommandEvent& event); void ChangeSearchResult(unsigned int result_idx); - void OnRecordingFinished(wxCommandEvent& event); - void OnFrameWritten(wxCommandEvent& event); + void OnRecordingFinished(wxEvent& event); + void OnFrameWritten(wxEvent& event); void OnFrameListSelectionChanged(wxCommandEvent& event); void OnObjectListSelectionChanged(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 750696f6c7..e45544c5eb 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -424,9 +424,7 @@ CFrame::CFrame(wxFrame* parent, // ------------------------- // Connect event handlers - m_Mgr->Connect(wxID_ANY, wxEVT_AUI_RENDER, // Resize - wxAuiManagerEventHandler(CFrame::OnManagerResize), - (wxObject*)0, this); + m_Mgr->Bind(wxEVT_AUI_RENDER, &CFrame::OnManagerResize, this); // ---------- // Update controls diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index 503d6994af..0550c5cd39 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -1004,15 +1004,11 @@ wxFrame * CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, m_MainSizer->Add(Child, 1, wxEXPAND); - Frame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(CFrame::OnFloatingPageClosed), - (wxObject*)0, this); + Frame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnFloatingPageClosed, this); if (Id == IDM_CONSOLEWINDOW_PARENT) { - Frame->Connect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnFloatingPageSize), - (wxObject*)0, this); + Frame->Bind(wxEVT_SIZE, &CFrame::OnFloatingPageSize, this); } // Main sizer diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d4cf35b121..6846150359 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -958,15 +958,9 @@ void CFrame::StartGame(const std::string& filename) wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight()); - m_RenderFrame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, - wxCloseEventHandler(CFrame::OnRenderParentClose), - (wxObject*)0, this); - m_RenderFrame->Connect(wxID_ANY, wxEVT_ACTIVATE, - wxActivateEventHandler(CFrame::OnActive), - (wxObject*)0, this); - m_RenderFrame->Connect(wxID_ANY, wxEVT_MOVE, - wxMoveEventHandler(CFrame::OnRenderParentMove), - (wxObject*)0, this); + m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this); + m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this); + m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this); m_RenderParent = new CPanel(m_RenderFrame, wxID_ANY); m_RenderFrame->Show(); } @@ -999,30 +993,14 @@ void CFrame::StartGame(const std::string& filename) m_RenderParent->SetFocus(); #endif - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(CFrame::OnKeyDown), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_UP, - wxKeyEventHandler(CFrame::OnKeyUp), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_RIGHT_DOWN, // Mouse - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_RIGHT_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MIDDLE_DOWN, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MIDDLE_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Connect(wxID_ANY, wxEVT_MOTION, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - m_RenderParent->Connect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnRenderParentResize), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); + m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); } wxEndBusyCursor(); @@ -1125,30 +1103,18 @@ void CFrame::DoStop() m_RenderFrame->SetTitle(wxString::FromAscii(scm_rev_str)); // Destroy the renderer frame when not rendering to main - m_RenderParent->Disconnect(wxID_ANY, wxEVT_SIZE, - wxSizeEventHandler(CFrame::OnRenderParentResize), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(CFrame::OnKeyDown), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_UP, - wxKeyEventHandler(CFrame::OnKeyUp), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_RIGHT_DOWN, // Mouse - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_RIGHT_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MIDDLE_DOWN, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MIDDLE_UP, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); - wxTheApp->Disconnect(wxID_ANY, wxEVT_MOTION, - wxMouseEventHandler(CFrame::OnMouse), - (wxObject*)0, this); + m_RenderParent->Unbind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); + + // Keyboard + wxTheApp->Unbind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); + wxTheApp->Unbind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); + + // Mouse + wxTheApp->Unbind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + wxTheApp->Unbind(wxEVT_MOTION, &CFrame::OnMouse, this); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxNullCursor); DoFullscreen(false); diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.cpp b/Source/Core/DolphinWX/Src/GCMicDlg.cpp index 1cdd166cf5..ddf804b57b 100644 --- a/Source/Core/DolphinWX/Src/GCMicDlg.cpp +++ b/Source/Core/DolphinWX/Src/GCMicDlg.cpp @@ -56,9 +56,7 @@ void GCMicDialog::SaveButtonMapping(int Id, int Key, int Modkey) void GCMicDialog::EndGetButtons(void) { - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(GCMicDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Unbind(wxEVT_KEY_DOWN, &GCMicDialog::OnKeyDown, this); m_ButtonMappingTimer->Stop(); GetButtonWaitingTimer = 0; GetButtonWaitingID = 0; @@ -153,9 +151,7 @@ void GCMicDialog::OnButtonClick(wxCommandEvent& event) if (m_ButtonMappingTimer->IsRunning()) return; - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(GCMicDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &GCMicDialog::OnKeyDown, this); // Get the button ClickedButton = (wxButton *)event.GetEventObject(); diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp index ecd4f49ace..c214fac466 100644 --- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp @@ -56,9 +56,7 @@ void HotkeyConfigDialog::SaveButtonMapping(int Id, int Key, int Modkey) void HotkeyConfigDialog::EndGetButtons(void) { - wxTheApp->Disconnect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(HotkeyConfigDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Unbind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this); m_ButtonMappingTimer->Stop(); GetButtonWaitingTimer = 0; GetButtonWaitingID = 0; @@ -153,9 +151,7 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event) if (m_ButtonMappingTimer->IsRunning()) return; - wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard - wxKeyEventHandler(HotkeyConfigDialog::OnKeyDown), - (wxObject*)0, this); + wxTheApp->Bind(wxEVT_KEY_DOWN, &HotkeyConfigDialog::OnKeyDown, this); // Get the button ClickedButton = (wxButton *)event.GetEventObject(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 0b75b03d59..f06b3daa8a 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -212,8 +212,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW // Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title ChangeBannerDetails((int)SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); m_Banner->SetBitmap(OpenGameListItem->GetImage()); - m_Banner->Connect(wxID_ANY, wxEVT_RIGHT_DOWN, - wxMouseEventHandler(CISOProperties::RightClickOnBanner), (wxObject*)NULL, this); + m_Banner->Bind(wxEVT_RIGHT_DOWN, &CISOProperties::RightClickOnBanner, this); // Filesystem browser/dumper // TODO : Should we add a way to browse the wad file ? diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp index 3994660686..8cdd2e16cb 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp @@ -971,7 +971,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin UpdateDeviceComboBox(); UpdateProfileComboBox(); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InputConfigDialog::ClickSave)); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputConfigDialog::ClickSave, this, wxID_OK); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); szr->Add(m_pad_notebook, 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, 5); @@ -982,7 +982,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin // live preview update timer m_update_timer = new wxTimer(this, -1); - Connect(wxID_ANY, wxEVT_TIMER, wxTimerEventHandler(InputConfigDialog::UpdateBitmaps), (wxObject*)0, this); + Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this); m_update_timer->Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS); } diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h index beff71b671..537b0eb111 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.h +++ b/Source/Core/DolphinWX/Src/MemcardManager.h @@ -149,13 +149,11 @@ class CMemcardManager : public wxDialog : wxListCtrl(parent, id, pos, size, style) , __mcmSettings(_mcmSetngs) { - Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler( - CMemcardListCtrl::OnRightClick)); + Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } ~CMemcardListCtrl() { - Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler( - CMemcardListCtrl::OnRightClick)); + Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); } _mcmSettings & __mcmSettings; bool prevPage, diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index f099272686..71c4c1ac93 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -188,7 +188,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con { vconfig.Load((File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini").c_str()); - Connect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(VideoConfigDiag::OnUpdateUI), NULL, this); + Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this); wxNotebook* const notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize); @@ -579,7 +579,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con wxButton* const btn_close = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition); btn_close->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &VideoConfigDiag::Event_ClickClose, this); - Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VideoConfigDiag::Event_Close), (wxObject*)0, this); + Bind(wxEVT_CLOSE_WINDOW, &VideoConfigDiag::Event_Close, this); wxBoxSizer* const szr_main = new wxBoxSizer(wxVERTICAL); szr_main->Add(notebook, 1, wxEXPAND | wxALL, 5); @@ -627,8 +627,8 @@ SettingRadioButton* VideoConfigDiag::CreateRadioButton(wxWindow* parent, const w wxControl* VideoConfigDiag::RegisterControl(wxControl* const control, const wxString& description) { ctrl_descs.insert(std::pair(control, description)); - control->Connect(wxID_ANY, wxEVT_ENTER_WINDOW, wxMouseEventHandler(VideoConfigDiag::Evt_EnterControl), NULL, this); - control->Connect(wxID_ANY, wxEVT_LEAVE_WINDOW, wxMouseEventHandler(VideoConfigDiag::Evt_LeaveControl), NULL, this); + control->Bind(wxEVT_ENTER_WINDOW, &VideoConfigDiag::Evt_EnterControl, this); + control->Bind(wxEVT_LEAVE_WINDOW, &VideoConfigDiag::Evt_LeaveControl, this); return control; } diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index d94c099531..22914366b0 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -173,8 +173,8 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin main_sizer->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(WiimoteConfigDiag::Save)); - Connect(wxID_CANCEL, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(WiimoteConfigDiag::Cancel)); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Save, this, wxID_OK); + Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::Cancel, this, wxID_CANCEL); SetSizerAndFit(main_sizer); Center(); From 6b8dc6802ba2303f039919be48ba59caeb411dd7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 12:57:17 -0600 Subject: [PATCH 406/627] Fix two warnings. --- Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp | 2 +- Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp index a6467f0366..dd94295859 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp @@ -151,7 +151,7 @@ void FifoRecordAnalyzer::ProcessLoadTlut1() void FifoRecordAnalyzer::ProcessPreloadTexture() { BPS_TmemConfig& tmem_cfg = m_BpMem->tmem_config; - u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; + //u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; // TODO: Should this be half size for RGBA8 preloads? FifoRecorder::GetInstance().WriteMemory(tmem_cfg.preload_addr << 5, size, MemoryUpdate::TMEM); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index fa30ba5c62..dad0c6bbf8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -115,7 +115,6 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key ControlState KeyboardMouse::Key::GetState() const { - const KeyCode shift = XKeysymToKeycode(m_display, XK_Shift_L); return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } From 6b3a3ff0540b9a4df4f75b35842da70faa6d35b4 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 23:42:16 -0600 Subject: [PATCH 407/627] Kill theme selection from GUI. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 25 ------------------------ Source/Core/DolphinWX/Src/ConfigMain.h | 3 --- 2 files changed, 28 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 12deddb572..0277a117ea 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -127,7 +127,6 @@ EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_ONSCREENDISPLAYMESSAGES, CConfigMain::DisplaySettingsChanged) -EVT_CHOICE(ID_INTERFACE_THEME, CConfigMain::DisplaySettingsChanged) EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::DisplaySettingsChanged) EVT_BUTTON(ID_HOTKEY_CONFIG, CConfigMain::DisplaySettingsChanged) @@ -253,14 +252,6 @@ void CConfigMain::InitializeGUILists() arrayStringFor_DSPEngine.Add(_("DSP LLE recompiler")); arrayStringFor_DSPEngine.Add(_("DSP LLE interpreter (slow)")); - - // Display page - // Themes - arrayStringFor_Themes.Add(wxT("Boomy")); - arrayStringFor_Themes.Add(wxT("Vista")); - arrayStringFor_Themes.Add(wxT("X-Plastik")); - arrayStringFor_Themes.Add(wxT("KDE")); - // Gamecube page // GC Language arrayStrings arrayStringFor_GCSystemLang.Add(_("English")); @@ -340,7 +331,6 @@ void CConfigMain::InitializeGUIValues() ConfirmStop->SetValue(startup_params.bConfirmStop); UsePanicHandlers->SetValue(startup_params.bUsePanicHandlers); OnScreenDisplayMessages->SetValue(startup_params.bOnScreenDisplayMessages); - Theme->SetSelection(startup_params.iTheme); // need redesign for (unsigned int i = 0; i < sizeof(langIds) / sizeof(wxLanguage); i++) { @@ -499,9 +489,6 @@ void CConfigMain::InitializeGUITooltips() UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); - // Display - Themes: Copyright notice - Theme->SetToolTip(_("Boomy: Milosz Wlazlo [miloszwl@miloszwl.com]\nVista: VistaIcons.com\nX-Plastik: black_rider [ForumW.org]\nKDE: KDE-Look.org")); - InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); // Audio tooltips @@ -576,9 +563,6 @@ void CConfigMain::CreateGUIControls() // Hotkey configuration HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); - // Themes - Theme = new wxChoice(DisplayPage, ID_INTERFACE_THEME, wxDefaultPosition, - wxDefaultSize, arrayStringFor_Themes, 0, wxDefaultValidator); // Interface settings ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); @@ -592,15 +576,10 @@ void CConfigMain::CreateGUIControls() sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->AddStretchSpacer(); sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5); - wxBoxSizer* scInterface = new wxBoxSizer(wxHORIZONTAL); - scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - scInterface->Add(Theme, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - scInterface->AddStretchSpacer(); sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5); - sbInterface->Add(scInterface, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5); sDisplayPage = new wxBoxSizer(wxVERTICAL); sDisplayPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5); @@ -886,10 +865,6 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.bOnScreenDisplayMessages = OnScreenDisplayMessages->IsChecked(); SetEnableAlert(OnScreenDisplayMessages->IsChecked()); break; - case ID_INTERFACE_THEME: - SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme = Theme->GetSelection(); - main_frame->InitBitmaps(); - break; case ID_INTERFACE_LANG: if (SConfig::GetInstance().m_InterfaceLanguage != langIds[InterfaceLang->GetSelection()]) SuccessAlertT("You must restart Dolphin in order for the change to take effect."); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 0e594101df..1c4a87b754 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -87,7 +87,6 @@ private: ID_INTERFACE_CONFIRMSTOP, ID_INTERFACE_USEPANICHANDLERS, ID_INTERFACE_ONSCREENDISPLAYMESSAGES, - ID_INTERFACE_THEME, ID_INTERFACE_LANG, ID_HOTKEY_CONFIG, @@ -165,7 +164,6 @@ private: wxCheckBox* ConfirmStop; wxCheckBox* UsePanicHandlers; wxCheckBox* OnScreenDisplayMessages; - wxChoice* Theme; wxChoice* InterfaceLang; wxButton* HotkeyConfig; @@ -227,7 +225,6 @@ private: wxArrayString arrayStringFor_CPUEngine; wxArrayString arrayStringFor_DSPEngine; wxArrayString arrayStringFor_FullscreenResolution; - wxArrayString arrayStringFor_Themes; wxArrayString arrayStringFor_InterfaceLang; wxArrayString arrayStringFor_GCSystemLang; wxArrayString arrayStringFor_WiiSensBarPos; From 0c95673478881d7280109f5ad49483816c86b48d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 23:52:42 -0600 Subject: [PATCH 408/627] Kill themes in the config and load pngs from "theme" directory for now. --- Source/Core/Core/Src/ConfigManager.cpp | 2 - Source/Core/Core/Src/CoreParameter.cpp | 1 - Source/Core/Core/Src/CoreParameter.h | 1 - Source/Core/DolphinWX/Src/Frame.h | 9 -- Source/Core/DolphinWX/Src/FrameTools.cpp | 127 +++-------------------- 5 files changed, 17 insertions(+), 123 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 180e6c981d..1c353a3a85 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -164,7 +164,6 @@ void SConfig::SaveSettings() ini.Set("Interface", "OnScreenDisplayMessages", m_LocalCoreStartupParameter.bOnScreenDisplayMessages); ini.Set("Interface", "HideCursor", m_LocalCoreStartupParameter.bHideCursor); ini.Set("Interface", "AutoHideCursor", m_LocalCoreStartupParameter.bAutoHideCursor); - ini.Set("Interface", "Theme", m_LocalCoreStartupParameter.iTheme); ini.Set("Interface", "MainWindowPosX", (m_LocalCoreStartupParameter.iPosX == -32000) ? 0 : m_LocalCoreStartupParameter.iPosX); // TODO - HAX ini.Set("Interface", "MainWindowPosY", (m_LocalCoreStartupParameter.iPosY == -32000) ? 0 : m_LocalCoreStartupParameter.iPosY); // TODO - HAX ini.Set("Interface", "MainWindowWidth", m_LocalCoreStartupParameter.iWidth); @@ -302,7 +301,6 @@ void SConfig::LoadSettings() ini.Get("Interface", "OnScreenDisplayMessages", &m_LocalCoreStartupParameter.bOnScreenDisplayMessages, true); ini.Get("Interface", "HideCursor", &m_LocalCoreStartupParameter.bHideCursor, false); ini.Get("Interface", "AutoHideCursor", &m_LocalCoreStartupParameter.bAutoHideCursor, false); - ini.Get("Interface", "Theme", &m_LocalCoreStartupParameter.iTheme, 0); ini.Get("Interface", "MainWindowPosX", &m_LocalCoreStartupParameter.iPosX, 100); ini.Get("Interface", "MainWindowPosY", &m_LocalCoreStartupParameter.iPosY, 100); ini.Get("Interface", "MainWindowWidth", &m_LocalCoreStartupParameter.iWidth, 800); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index dee2452cb3..a1298ae846 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -59,7 +59,6 @@ SCoreStartupParameter::SCoreStartupParameter() bRenderWindowAutoSize(false), bKeepWindowOnTop(false), bFullscreen(false), bRenderToMain(false), bProgressive(false), bDisableScreenSaver(false), - iTheme(0), iPosX(100), iPosY(100), iWidth(800), iHeight(600) { LoadDefaults(); diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 8aa6be83e5..516b7d1117 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -136,7 +136,6 @@ struct SCoreStartupParameter bool bFullscreen, bRenderToMain; bool bProgressive, bDisableScreenSaver; - int iTheme; int iPosX, iPosY, iWidth, iHeight; enum EBootBS2 diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 8c8285f842..45a0eb1ad4 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -210,15 +210,6 @@ private: EToolbar_Max }; - enum EBitmapsThemes - { - BOOMY, - VISTA, - XPLASTIK, - KDE, - THEMES_MAX - }; - wxBitmap m_Bitmaps[EToolbar_Max]; wxBitmap m_BitmapsMenu[EToolbar_Max]; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 6846150359..3f5c77641e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -78,23 +78,6 @@ Core::GetWindowHandle(). // Resources extern "C" { #include "../resources/Dolphin.c" // Dolphin icon -#include "../resources/toolbar_browse.c" -#include "../resources/toolbar_file_open.c" -#include "../resources/toolbar_fullscreen.c" -#include "../resources/toolbar_help.c" -#include "../resources/toolbar_pause.c" -#include "../resources/toolbar_play.c" -#include "../resources/toolbar_plugin_dsp.c" -#include "../resources/toolbar_plugin_gfx.c" -#include "../resources/toolbar_plugin_options.c" -#include "../resources/toolbar_plugin_pad.c" -#include "../resources/toolbar_plugin_wiimote.c" -#include "../resources/toolbar_refresh.c" -#include "../resources/toolbar_stop.c" -#include "../resources/Boomy.h" // Theme packages -#include "../resources/Vista.h" -#include "../resources/X-Plastik.h" -#include "../resources/KDE.h" }; bool confirmStop = false; @@ -512,102 +495,26 @@ void CFrame::RecreateToolbar() void CFrame::InitBitmaps() { - // Get selected theme - int Theme = SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme; + wxString dir("theme/"); - // Save memory by only having one set of bitmaps loaded at any time. I mean, they are still - // in the exe, which is in memory, but at least we wont make another copy of all of them. - switch (Theme) - { - case BOOMY: - { - // These are stored as 48x48 - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(toolbar_file_open_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(toolbar_refresh_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(toolbar_browse_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(toolbar_play_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(toolbar_stop_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(toolbar_pause_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(toolbar_plugin_options_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(toolbar_plugin_gfx_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(toolbar_plugin_dsp_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(toolbar_plugin_pad_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(toolbar_plugin_wiimote_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(toolbar_fullscreen_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(toolbar_fullscreen_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(toolbar_help_png); - - // Scale the 48x48 bitmaps to 24x24 - for (size_t n = Toolbar_FileOpen; n < EToolbar_Max; n++) - { - m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); - } - } - break; - - case VISTA: - { - // These are stored as 24x24 and need no scaling - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open1_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh1_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse1_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play1_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop1_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause1_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options1_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx1_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP1_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad1_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote1_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen1_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen1_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help1_png); - } - break; - - case XPLASTIK: - { - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open2_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh2_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse2_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play2_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop2_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause2_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options2_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx2_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP2_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad2_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote2_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen2_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen2_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help2_png); - } - break; - - case KDE: - { - m_Bitmaps[Toolbar_FileOpen] = wxGetBitmapFromMemory(Toolbar_Open3_png); - m_Bitmaps[Toolbar_Refresh] = wxGetBitmapFromMemory(Toolbar_Refresh3_png); - m_Bitmaps[Toolbar_Browse] = wxGetBitmapFromMemory(Toolbar_Browse3_png); - m_Bitmaps[Toolbar_Play] = wxGetBitmapFromMemory(Toolbar_Play3_png); - m_Bitmaps[Toolbar_Stop] = wxGetBitmapFromMemory(Toolbar_Stop3_png); - m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(Toolbar_Pause3_png); - m_Bitmaps[Toolbar_ConfigMain] = wxGetBitmapFromMemory(Toolbar_Options3_png); - m_Bitmaps[Toolbar_ConfigGFX] = wxGetBitmapFromMemory(Toolbar_Gfx3_png); - m_Bitmaps[Toolbar_ConfigDSP] = wxGetBitmapFromMemory(Toolbar_DSP3_png); - m_Bitmaps[Toolbar_ConfigPAD] = wxGetBitmapFromMemory(Toolbar_Pad3_png); - m_Bitmaps[Toolbar_Wiimote] = wxGetBitmapFromMemory(Toolbar_Wiimote3_png); - m_Bitmaps[Toolbar_Screenshot] = wxGetBitmapFromMemory(Toolbar_Fullscreen3_png); - m_Bitmaps[Toolbar_FullScreen] = wxGetBitmapFromMemory(Toolbar_Fullscreen3_png); - m_Bitmaps[Toolbar_Help] = wxGetBitmapFromMemory(Toolbar_Help3_png); - } - break; - - default: PanicAlertT("Theme selection went wrong"); - } + m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Browse].LoadFile(dir + "browse.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Play].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Stop].LoadFile(dir + "stop.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Pause].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigMain].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigGFX].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigDSP].LoadFile(dir + "dsp.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_ConfigPAD].LoadFile(dir + "gcpad.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Wiimote].LoadFile(dir + "wiimote.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Screenshot].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); + m_Bitmaps[Toolbar_Help].LoadFile(dir + "help.png", wxBITMAP_TYPE_PNG); // Update in case the bitmap has been updated - if (m_ToolBar != NULL) RecreateToolbar(); + if (m_ToolBar != NULL) + RecreateToolbar(); } // Menu items From 6f7b11b9bebf4a80a6d09d344c312241a9abe16e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 14:06:15 -0600 Subject: [PATCH 409/627] themes directory stuffs --- Source/Core/Common/Src/CommonPaths.h | 1 + Source/Core/Common/Src/FileUtil.cpp | 1 + Source/Core/Common/Src/FileUtil.h | 1 + Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/CoreParameter.h | 1 + Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 430a0c0cd8..c39056a946 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -89,6 +89,7 @@ #define MAIL_LOGS_DIR LOGS_DIR DIR_SEP "Mail" #define SHADERS_DIR "Shaders" #define WII_SYSCONF_DIR "shared2" DIR_SEP "sys" +#define THEMES_DIR "Themes" // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 77290528a6..acd4588126 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -678,6 +678,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) paths[D_DUMPDSP_IDX] = paths[D_USER_IDX] + DUMP_DSP_DIR DIR_SEP; paths[D_LOGS_IDX] = paths[D_USER_IDX] + LOGS_DIR DIR_SEP; paths[D_MAILLOGS_IDX] = paths[D_USER_IDX] + MAIL_LOGS_DIR DIR_SEP; + paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; paths[F_DSPCONFIG_IDX] = paths[D_CONFIG_IDX] + DSP_CONFIG; diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 9134bcf44e..0947db4f5c 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -50,6 +50,7 @@ enum { D_LOGS_IDX, D_MAILLOGS_IDX, D_WIISYSCONF_IDX, + D_THEMES_IDX, F_DOLPHINCONFIG_IDX, F_DSPCONFIG_IDX, F_DEBUGGERCONFIG_IDX, diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 1c353a3a85..959a2bba0a 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -174,6 +174,7 @@ void SConfig::SaveSettings() ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow); ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow); ini.Set("Interface", "ShowConsole", m_InterfaceConsole); + ini.Set("Interface", "ThemeName", m_LocalCoreStartupParameter.theme_name); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) @@ -311,6 +312,7 @@ void SConfig::LoadSettings() ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false); ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false); ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false); + ini.Get("Interface", "ThemeName", &m_LocalCoreStartupParameter.theme_name, "Boomy"); // Hotkeys for (int i = 0; i < NUM_HOTKEYS; i++) diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 516b7d1117..6ee8fb8b54 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -123,6 +123,7 @@ struct SCoreStartupParameter // Interface settings bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; + std::string theme_name; // Hotkeys int iHotkey[NUM_HOTKEYS]; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 3f5c77641e..f07fcd10f3 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -495,7 +495,7 @@ void CFrame::RecreateToolbar() void CFrame::InitBitmaps() { - wxString dir("theme/"); + wxString dir(File::GetUserPath(D_THEMES_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"); m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); From a9ff3709e485a4f38189c694c540652468cc1d19 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 15:32:26 -0600 Subject: [PATCH 410/627] Attempt to make file searching stuff less crappy on Linux. Supports a * search now. --- Source/Core/Common/Src/FileSearch.cpp | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp index c60ce9beda..595dfe7000 100644 --- a/Source/Core/Common/Src/FileSearch.cpp +++ b/Source/Core/Common/Src/FileSearch.cpp @@ -25,6 +25,7 @@ #endif #include +#include #include "FileSearch.h" @@ -72,36 +73,36 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& #else - size_t dot_pos = _searchString.rfind("."); + // TODO: super lame/broken - if (dot_pos == std::string::npos) - return; + auto end_match(_searchString); + + // assuming we have a "*.blah"-like pattern + if (!end_match.empty() && end_match[0] == '*') + end_match.erase(0, 1); + + // ugly + if (end_match == ".*") + end_match.clear(); - std::string ext = _searchString.substr(dot_pos); DIR* dir = opendir(_strPath.c_str()); if (!dir) return; - dirent* dp; - - while (true) + while (auto const dp = readdir(dir)) { - dp = readdir(dir); + std::string found(dp->d_name); - if (!dp) - break; - - std::string s(dp->d_name); - - if ( (!ext.compare(".*") && s.compare(".") && s.compare("..")) || - ((s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) )) + if ((found != ".") && (found != "..") + && (found.size() >= end_match.size()) + && std::equal(end_match.rbegin(), end_match.rend(), found.rbegin())) { std::string full_name; if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR) - full_name = _strPath + s; + full_name = _strPath + found; else - full_name = _strPath + DIR_SEP + s; + full_name = _strPath + DIR_SEP + found; m_FileNames.push_back(full_name); } From c6e8239fd93e1670daa538eced2dcbbfbfd84e47 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 15:39:53 -0600 Subject: [PATCH 411/627] theme selection working now --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 0277a117ea..1f1d8a3619 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -17,10 +17,12 @@ #include // System #include +#include #include #include "Common.h" #include "CommonPaths.h" +#include "FileSearch.h" #include "Core.h" // Core #include "HW/EXI.h" @@ -576,10 +578,40 @@ void CConfigMain::CreateGUIControls() sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->AddStretchSpacer(); sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5); + + // theme selection + auto const theme_selection = new wxChoice(DisplayPage, wxID_ANY); + + CFileSearch cfs(CFileSearch::XStringVector(1, "*"), CFileSearch::XStringVector(1, File::GetUserPath(D_THEMES_IDX))); + auto const& sv = cfs.GetFileNames(); + std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename) + { + std::string name, ext; + SplitPath(filename, NULL, &name, &ext); + + name += ext; + theme_selection->Append(name); + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name == name) + theme_selection->SetSelection(theme_selection->GetCount() - 1); + }); + + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, [this,theme_selection](wxEvent&) + { + SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); + main_frame->InitBitmaps(); + }); + + auto const scInterface = new wxBoxSizer(wxHORIZONTAL); + scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->Add(theme_selection, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->AddStretchSpacer(); + sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5); + sbInterface->Add(scInterface, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5); sDisplayPage = new wxBoxSizer(wxVERTICAL); sDisplayPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5); From 727851c89638bfeb3dddd8278a2b7418040e20f5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 15:41:44 -0600 Subject: [PATCH 412/627] Add Boomy theme to Data dir. (not actually boomy right now, just test images) --- Data/User/Themes/Boomy/browse.png | 1 + Data/User/Themes/Boomy/config.png | 1 + Data/User/Themes/Boomy/dsp.png | 1 + Data/User/Themes/Boomy/fullscreen.png | 1 + Data/User/Themes/Boomy/gcpad.png | 1 + Data/User/Themes/Boomy/graphics.png | 1 + Data/User/Themes/Boomy/help.png | 1 + Data/User/Themes/Boomy/open.png | 1 + Data/User/Themes/Boomy/pause.png | 1 + Data/User/Themes/Boomy/play.png | Bin 0 -> 544 bytes Data/User/Themes/Boomy/refresh.png | 1 + Data/User/Themes/Boomy/screenshot.png | 1 + Data/User/Themes/Boomy/stop.png | 1 + Data/User/Themes/Boomy/wiimote.png | 1 + 14 files changed, 13 insertions(+) create mode 120000 Data/User/Themes/Boomy/browse.png create mode 120000 Data/User/Themes/Boomy/config.png create mode 120000 Data/User/Themes/Boomy/dsp.png create mode 120000 Data/User/Themes/Boomy/fullscreen.png create mode 120000 Data/User/Themes/Boomy/gcpad.png create mode 120000 Data/User/Themes/Boomy/graphics.png create mode 120000 Data/User/Themes/Boomy/help.png create mode 120000 Data/User/Themes/Boomy/open.png create mode 120000 Data/User/Themes/Boomy/pause.png create mode 100644 Data/User/Themes/Boomy/play.png create mode 120000 Data/User/Themes/Boomy/refresh.png create mode 120000 Data/User/Themes/Boomy/screenshot.png create mode 120000 Data/User/Themes/Boomy/stop.png create mode 120000 Data/User/Themes/Boomy/wiimote.png diff --git a/Data/User/Themes/Boomy/browse.png b/Data/User/Themes/Boomy/browse.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/browse.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/config.png b/Data/User/Themes/Boomy/config.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/config.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/User/Themes/Boomy/dsp.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/dsp.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/User/Themes/Boomy/fullscreen.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/fullscreen.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/User/Themes/Boomy/gcpad.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/gcpad.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/User/Themes/Boomy/graphics.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/graphics.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/help.png b/Data/User/Themes/Boomy/help.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/help.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/open.png b/Data/User/Themes/Boomy/open.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/open.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/pause.png b/Data/User/Themes/Boomy/pause.png new file mode 120000 index 0000000000..ee6976f609 --- /dev/null +++ b/Data/User/Themes/Boomy/pause.png @@ -0,0 +1 @@ +play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/play.png b/Data/User/Themes/Boomy/play.png new file mode 100644 index 0000000000000000000000000000000000000000..678dc345b70d5891518b6ce42edec8b6228e6fb8 GIT binary patch literal 544 zcmV+*0^j|KP)WFU8GbZ8()Nlj2>E@cM*00D$aL_t(Y$L*4_Y7|iv zhCgg9fRP>jT&;XqLQ$h2TqwR*HlzHYvic8h6~C%-s2o z%>?2&vze8MP5$oQd(QdJ{rTZvD>~Hm29Q#^t$t9C)F0~mMRR@wwZWT9sl$kfq9|@= zS+=IWIIU+{z&IizrF5&$oKpcU7Tr@v5fSQcN@?p%e{ign(pC+bboE^Ln_#Ge*=%-I z-L0>F_D)kDi_~}OSS{2~DW$u8e|@h1pnwR7=2_VJBR#OwtOq!RRpGhtSvV3hVJN&= z1SoUZJigE2hEO)^GguS82w4RWrf_8fmlE6&-Yx=+gzXdC4}?*(UU(T06+BtWq6!`h zMGhM|Yzk!sk6HkG0g=PTQh) Date: Sun, 13 Jan 2013 15:46:21 -0600 Subject: [PATCH 413/627] remove some now-unused resource files --- Source/Core/DolphinWX/Src/Frame.cpp | 16 - Source/Core/DolphinWX/resources/Boomy.h | 312 -- Source/Core/DolphinWX/resources/KDE.h | 3651 ----------------- Source/Core/DolphinWX/resources/Vista.h | 2751 ------------- Source/Core/DolphinWX/resources/X-Plastik.h | 3040 -------------- .../Core/DolphinWX/resources/toolbar_browse.c | 303 -- .../DolphinWX/resources/toolbar_file_open.c | 214 - .../DolphinWX/resources/toolbar_fullscreen.c | 209 - .../Core/DolphinWX/resources/toolbar_help.c | 306 -- .../DolphinWX/resources/toolbar_plugin_dsp.c | 316 -- .../DolphinWX/resources/toolbar_plugin_gfx.c | 291 -- .../DolphinWX/resources/toolbar_plugin_pad.c | 239 -- .../resources/toolbar_plugin_wiimote.c | 174 - .../DolphinWX/resources/toolbar_refresh.c | 306 -- .../Core/DolphinWX/resources/toolbar_stop.c | 260 -- 15 files changed, 12388 deletions(-) delete mode 100644 Source/Core/DolphinWX/resources/Boomy.h delete mode 100644 Source/Core/DolphinWX/resources/KDE.h delete mode 100644 Source/Core/DolphinWX/resources/Vista.h delete mode 100644 Source/Core/DolphinWX/resources/X-Plastik.h delete mode 100644 Source/Core/DolphinWX/resources/toolbar_browse.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_file_open.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_fullscreen.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_help.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_pad.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_refresh.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_stop.c diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index e45544c5eb..b2a60b606c 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -52,22 +52,6 @@ extern "C" { #include "../resources/Dolphin.c" // Dolphin icon -#include "../resources/toolbar_browse.c" -#include "../resources/toolbar_file_open.c" -#include "../resources/toolbar_fullscreen.c" -#include "../resources/toolbar_help.c" -#include "../resources/toolbar_pause.c" -#include "../resources/toolbar_play.c" -#include "../resources/toolbar_plugin_dsp.c" -#include "../resources/toolbar_plugin_gfx.c" -#include "../resources/toolbar_plugin_options.c" -#include "../resources/toolbar_plugin_pad.c" -#include "../resources/toolbar_refresh.c" -#include "../resources/toolbar_stop.c" -#include "../resources/Boomy.h" // Theme packages -#include "../resources/Vista.h" -#include "../resources/X-Plastik.h" -#include "../resources/KDE.h" }; diff --git a/Source/Core/DolphinWX/resources/Boomy.h b/Source/Core/DolphinWX/resources/Boomy.h deleted file mode 100644 index f2060ebba7..0000000000 --- a/Source/Core/DolphinWX/resources/Boomy.h +++ /dev/null @@ -1,312 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_0_H_ -#define _WXINCLUDE_MYHEADER_0_H_ - -static const unsigned char Toolbar_Log_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0xC0, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x56, 0x79, 0x6C, 0x14, 0x75, 0x14, -0xFE, 0x66, 0xF6, 0xE8, 0x5E, 0xED, 0x1E, 0x6D, 0x77, 0xDB, -0xED, 0x1E, 0x3D, 0x96, 0x5E, 0x58, 0x5A, 0xDA, 0xD2, 0x42, -0xA5, 0x35, 0x6D, 0x38, 0x24, 0xB6, 0x85, 0x42, 0x29, 0x06, -0xAD, 0x78, 0x80, 0x5A, 0xA2, 0x26, 0x42, 0x62, 0x48, 0x10, -0x83, 0x09, 0x68, 0x8C, 0x4D, 0x4A, 0x0C, 0x12, 0x45, 0x12, -0x30, 0x2A, 0x04, 0xFF, 0x30, 0x8A, 0x04, 0x08, 0x06, 0x91, -0x48, 0xC2, 0x65, 0x15, 0xA5, 0x45, 0x10, 0x28, 0x45, 0xE9, -0x96, 0x76, 0xDB, 0xED, 0x76, 0x69, 0xF7, 0x9A, 0x99, 0x1D, -0xDF, 0x0C, 0x52, 0xA9, 0x85, 0xF8, 0x8F, 0xFE, 0x92, 0x97, -0xDF, 0xCC, 0xFC, 0x66, 0xBE, 0xF7, 0xDE, 0xF7, 0xBE, 0xF7, -0x76, 0x81, 0xFF, 0x79, 0x29, 0x1E, 0x74, 0xF0, 0x7D, 0x3B, -0xD8, 0xD6, 0x1A, 0x68, 0x1F, 0xAF, 0x41, 0xC6, 0x8A, 0xB9, -0x28, 0x6D, 0xAE, 0xC2, 0xFC, 0xE6, 0xB9, 0x58, 0xD5, 0x34, -0x1B, 0xF5, 0x8D, 0x15, 0xA8, 0xAF, 0x2F, 0xC7, 0x63, 0x0D, -0x95, 0xC8, 0x6F, 0xAC, 0x82, 0x50, 0x3F, 0x0B, 0x03, 0x07, -0xCF, 0x22, 0x7E, 0x3F, 0x1C, 0xF6, 0x9F, 0x0F, 0x7E, 0xDC, -0x05, 0xC5, 0xD9, 0x1D, 0xC8, 0x65, 0x95, 0x78, 0x95, 0x51, -0x33, 0xFB, 0x35, 0x49, 0xAA, 0xD3, 0x46, 0x9B, 0xF6, 0x98, -0x35, 0x2B, 0xF9, 0x43, 0x6B, 0x66, 0xF2, 0xCB, 0x36, 0x97, -0x69, 0xAD, 0xCD, 0x95, 0xD4, 0x96, 0xEE, 0x32, 0xB4, 0xE9, -0x0D, 0xCA, 0xF6, 0x38, 0x8F, 0x13, 0xA2, 0x88, 0x77, 0xB6, -0xBF, 0x08, 0xFD, 0xBF, 0x66, 0x70, 0x66, 0x27, 0x98, 0x78, -0x0C, 0xAB, 0xE8, 0x72, 0x4F, 0x82, 0xD1, 0xD4, 0x9C, 0x9A, -0x5F, 0x99, 0x9B, 0x51, 0xD2, 0x68, 0x70, 0x96, 0xAC, 0x80, -0xBB, 0x74, 0x99, 0x6C, 0xAE, 0xE2, 0x7A, 0x64, 0xCE, 0x5C, -0x00, 0x77, 0x51, 0x05, 0x12, 0x8D, 0x2C, 0xFA, 0x7B, 0xAE, -0x29, 0xA3, 0x51, 0x71, 0x8E, 0x08, 0xE4, 0x2E, 0x2C, 0xC5, -0xA1, 0x23, 0x9D, 0xE0, 0x1E, 0x98, 0x01, 0x17, 0x85, 0x9B, -0xE3, 0xD0, 0x9E, 0xE8, 0x9C, 0xE6, 0xC8, 0x6B, 0x78, 0x0F, -0x9E, 0xBA, 0x03, 0xB0, 0x15, 0x6E, 0x81, 0xDE, 0x3A, 0x1F, -0x50, 0xA7, 0x22, 0x16, 0x19, 0x05, 0x17, 0x19, 0x02, 0x37, -0xDE, 0x8B, 0x38, 0x1F, 0x40, 0xB2, 0x23, 0x1B, 0x6A, 0x8D, -0x06, 0xE2, 0x1D, 0x72, 0x9A, 0x29, 0x93, 0x8E, 0xF6, 0xA7, -0xA1, 0xBA, 0x17, 0x53, 0x79, 0xEF, 0x8D, 0xC0, 0xE1, 0x51, -0x85, 0x4A, 0x61, 0x71, 0xCE, 0x5E, 0x07, 0x9D, 0xB9, 0x15, -0xC1, 0xC1, 0x93, 0xB8, 0xDE, 0xF9, 0x11, 0x46, 0xFB, 0x4F, -0x93, 0x73, 0x3F, 0x44, 0x21, 0x0E, 0x96, 0xB8, 0xD3, 0xEA, -0x75, 0x30, 0x5B, 0x53, 0xA0, 0xD2, 0x6A, 0x11, 0x8B, 0xF1, -0x88, 0x93, 0x03, 0x81, 0x52, 0xA0, 0x7D, 0x8D, 0x08, 0xE6, -0xCC, 0xD6, 0x95, 0xE2, 0x9E, 0x8D, 0x7B, 0x21, 0x4C, 0xCA, -0xE0, 0xC8, 0x5B, 0x60, 0x29, 0x83, 0x6A, 0xBD, 0xD5, 0x01, -0x7D, 0x6A, 0x3D, 0xC6, 0x03, 0x9D, 0x38, 0xB5, 0xBF, 0x01, -0x17, 0x8E, 0xEE, 0x85, 0xAF, 0x77, 0x18, 0xB1, 0x28, 0x8B, -0xB8, 0xA0, 0x42, 0x34, 0x22, 0xC0, 0xD7, 0x37, 0x8C, 0xEB, -0x17, 0x7B, 0x10, 0x1A, 0x8F, 0x41, 0xA3, 0xD3, 0x41, 0xA9, -0x52, 0x41, 0xA5, 0x56, 0x42, 0xA1, 0x60, 0x40, 0x7E, 0xB6, -0x12, 0x5C, 0xDA, 0x14, 0x8A, 0x14, 0x2A, 0x18, 0x63, 0x31, -0x94, 0x19, 0x6C, 0xB9, 0x60, 0x60, 0x06, 0x17, 0x3E, 0x8D, -0x9C, 0xB2, 0x2A, 0x34, 0xBC, 0xB6, 0x1E, 0x8B, 0x37, 0xAC, -0xC3, 0xBC, 0x67, 0xDB, 0x50, 0xBD, 0xB2, 0x15, 0xD5, 0x2D, -0x2D, 0x64, 0x4B, 0x51, 0x5C, 0x57, 0x8B, 0x14, 0x67, 0x16, -0x8A, 0xAA, 0x2B, 0x51, 0x51, 0x37, 0x13, 0xE5, 0x55, 0x39, -0x30, 0x99, 0xB5, 0x10, 0x04, 0x91, 0x23, 0xAA, 0xC4, 0x29, -0x45, 0x7E, 0xA2, 0x0E, 0x56, 0xA2, 0x68, 0x63, 0xC6, 0x8C, -0x79, 0x2A, 0x63, 0xFA, 0x2C, 0xA8, 0x54, 0x97, 0xA0, 0x37, -0x25, 0xC1, 0xEF, 0xED, 0x43, 0xDF, 0xAF, 0x5D, 0x18, 0xB8, -0x72, 0x89, 0x32, 0xE9, 0xC1, 0x60, 0x6F, 0x2F, 0x3D, 0xF3, -0x82, 0xE7, 0x62, 0x14, 0xB9, 0x06, 0xA9, 0x0E, 0x3B, 0x2C, -0xE9, 0x16, 0xE8, 0x35, 0x3C, 0x2E, 0x77, 0x7B, 0x31, 0x16, -0xE4, 0xBE, 0x7D, 0x7D, 0x1F, 0x76, 0xDD, 0xC5, 0x65, 0xEE, -0x5E, 0x7C, 0xB9, 0x09, 0x0F, 0xAB, 0x13, 0x70, 0xB2, 0xA4, -0x69, 0x03, 0xD2, 0xF2, 0x9F, 0xC4, 0x85, 0x23, 0x2F, 0xE0, -0xF2, 0xA9, 0x73, 0x08, 0x07, 0x63, 0x60, 0x29, 0x0C, 0x25, -0x55, 0x8B, 0xE8, 0x87, 0x42, 0xA9, 0x90, 0x3F, 0x63, 0x88, -0x0E, 0xA9, 0x1E, 0x46, 0x5B, 0x1A, 0xB2, 0x4B, 0x1E, 0x42, -0x68, 0xB8, 0x1F, 0xDF, 0x7C, 0xFD, 0x93, 0x18, 0x0C, 0x08, -0x9B, 0x36, 0xED, 0x93, 0x69, 0x9A, 0x9C, 0x41, 0x4B, 0x35, -0x6A, 0x59, 0x15, 0x9A, 0xEC, 0x05, 0x73, 0xA0, 0xD1, 0x9B, -0x70, 0xE9, 0xC4, 0x6E, 0xA8, 0xB5, 0x66, 0x38, 0x0B, 0x33, -0xE1, 0x29, 0x2B, 0x86, 0x7B, 0x7A, 0x1E, 0x9C, 0x05, 0xB9, -0xC8, 0x2A, 0x2A, 0xA0, 0x3D, 0x1F, 0x69, 0x59, 0xD3, 0xA0, -0x33, 0x9A, 0x21, 0xB1, 0x91, 0x98, 0xA4, 0xC5, 0xF0, 0xAD, -0x21, 0xF4, 0x5E, 0xF5, 0x89, 0x3C, 0x87, 0x9D, 0xC7, 0xBB, -0xD0, 0x3D, 0xC5, 0xC1, 0xF2, 0x1A, 0xCC, 0x20, 0xE2, 0x9A, -0xEC, 0x79, 0x95, 0xD0, 0x9B, 0x2D, 0xA4, 0xF1, 0x30, 0x3C, -0x14, 0x99, 0x39, 0x3D, 0x8D, 0x0A, 0xA8, 0xA2, 0x02, 0x82, -0xE4, 0xC8, 0x43, 0x14, 0x49, 0x1C, 0xF4, 0xA2, 0x96, 0xC0, -0xD3, 0x3C, 0x79, 0x70, 0x14, 0x4C, 0x87, 0x42, 0x8C, 0xE2, -0x5A, 0xD7, 0x55, 0xDC, 0xBC, 0x31, 0x1A, 0x27, 0xFE, 0x3F, -0x25, 0x07, 0xBF, 0x4D, 0x91, 0x69, 0x5C, 0xB8, 0x23, 0x2B, -0x46, 0xA9, 0x25, 0x2A, 0x18, 0x84, 0x03, 0xC3, 0xE8, 0xE9, -0xFC, 0x19, 0xC3, 0xDE, 0x01, 0x84, 0xC7, 0x23, 0x04, 0x1E, -0x27, 0x13, 0x26, 0x48, 0x4D, 0xD0, 0x69, 0x60, 0xB2, 0xDA, -0x60, 0xCD, 0xCA, 0x41, 0xAA, 0x4D, 0x8F, 0x70, 0x58, 0xA0, -0xBA, 0x40, 0x64, 0xD8, 0xC9, 0xBD, 0x35, 0x91, 0x41, 0x53, -0x15, 0x8A, 0xE8, 0x70, 0x99, 0x3D, 0xB7, 0x00, 0x1A, 0x83, -0x11, 0xE7, 0xBE, 0xDA, 0x83, 0xBE, 0x6B, 0x03, 0x60, 0x18, -0x1E, 0xBA, 0x44, 0x03, 0x0C, 0xA6, 0x44, 0x24, 0x59, 0x92, -0x64, 0xFD, 0x27, 0xA6, 0x58, 0xA0, 0x35, 0x18, 0xC8, 0xF1, -0x18, 0xC9, 0xD9, 0x4F, 0xD9, 0xEA, 0xE0, 0xBB, 0x35, 0x02, -0x6F, 0xDF, 0x6D, 0x49, 0x3D, 0x9F, 0x7D, 0xD7, 0x85, 0x2B, -0x53, 0x1C, 0x2C, 0xAE, 0x42, 0x09, 0x05, 0xD7, 0x94, 0xEE, -0xC9, 0x96, 0xB9, 0x8D, 0xF8, 0xAF, 0xC0, 0x55, 0x98, 0x8D, -0x9C, 0xE2, 0x42, 0x38, 0x72, 0xB3, 0x90, 0x96, 0x99, 0x81, -0x14, 0x07, 0x45, 0xEC, 0x76, 0xC2, 0xEE, 0xC9, 0x81, 0xA3, -0x70, 0x06, 0x5C, 0x25, 0x15, 0xF4, 0x2C, 0x13, 0x52, 0xDD, -0x47, 0x7D, 0x3E, 0x78, 0x6F, 0x8E, 0x30, 0x1C, 0x8F, 0x63, -0x27, 0xBA, 0x71, 0x7E, 0x0A, 0x45, 0xC4, 0x2B, 0x1F, 0x8D, -0x00, 0xD1, 0x31, 0x3F, 0xF1, 0xCD, 0x13, 0xA0, 0x83, 0x64, -0x93, 0x00, 0xFF, 0xA0, 0x1F, 0x63, 0x23, 0x41, 0x70, 0xD4, -0x24, 0x02, 0x59, 0x9C, 0x62, 0x54, 0x25, 0x68, 0xA0, 0xD4, -0xE8, 0x69, 0x54, 0xB8, 0x61, 0xC9, 0xC8, 0x84, 0x36, 0xD9, -0x0E, 0x9B, 0xFD, 0x06, 0xD5, 0xEA, 0x0F, 0x26, 0x1C, 0xE2, -0x2A, 0x09, 0x6D, 0xF7, 0x14, 0x99, 0x7E, 0xBC, 0x1E, 0x65, -0x34, 0x87, 0x7E, 0x98, 0x5E, 0xEE, 0x41, 0x45, 0xF3, 0x1A, -0x5C, 0x3C, 0xFA, 0x09, 0x7A, 0xBA, 0x7B, 0x30, 0x16, 0x08, -0xC9, 0x45, 0x65, 0x64, 0xA9, 0xB2, 0x44, 0x5F, 0xA2, 0xFC, -0xBE, 0x20, 0x08, 0x34, 0x97, 0x42, 0xD4, 0xC9, 0x66, 0xD8, -0x49, 0x5D, 0x0E, 0x97, 0x19, 0x07, 0xF6, 0x9E, 0xC4, 0xEF, -0xBD, 0xC1, 0xAB, 0x24, 0x88, 0xCA, 0x37, 0x3F, 0x87, 0x5F, -0x7A, 0x6F, 0xA2, 0x20, 0x14, 0x9C, 0x8F, 0xB6, 0xC8, 0x50, -0x1F, 0x35, 0x51, 0x6C, 0x0C, 0x42, 0x9C, 0x81, 0x92, 0x1A, -0x23, 0xBB, 0x38, 0x1F, 0x45, 0x35, 0x95, 0x98, 0xD3, 0x30, -0x9F, 0x6C, 0x21, 0xCA, 0x17, 0xD4, 0x62, 0xD6, 0x22, 0xBA, -0x5E, 0xB2, 0x04, 0x55, 0x2D, 0xAD, 0xC8, 0x9B, 0xFB, 0x08, -0xF5, 0x42, 0x3A, 0x05, 0xA0, 0x86, 0xCB, 0x65, 0xA0, 0xDE, -0x60, 0xB2, 0x09, 0xA7, 0xEE, 0x2E, 0xEE, 0x84, 0x03, 0x12, -0xC9, 0x30, 0x05, 0x7A, 0xDE, 0x37, 0x18, 0x42, 0x7F, 0xF7, -0x59, 0x64, 0x78, 0x3C, 0x28, 0x9C, 0x99, 0x05, 0xB7, 0x27, -0x05, 0x46, 0x93, 0x02, 0x91, 0xE0, 0x08, 0x82, 0x43, 0x03, -0x08, 0xDC, 0xBA, 0x29, 0x5B, 0xC8, 0xEF, 0x85, 0x96, 0x1D, -0x43, 0xBA, 0x83, 0xA8, 0x4A, 0x4E, 0x80, 0xC8, 0x85, 0x60, -0xB3, 0x4A, 0x72, 0x66, 0x58, 0xA2, 0xA5, 0x6D, 0xF3, 0x8A, -0x3B, 0x53, 0x75, 0x82, 0x22, 0x69, 0x7D, 0xF0, 0x12, 0xDE, -0x27, 0x47, 0x6B, 0x1D, 0x6E, 0x13, 0xF2, 0x8B, 0x5C, 0x08, -0x0C, 0x0C, 0x60, 0xD0, 0xC7, 0xE1, 0xF6, 0xED, 0x18, 0x22, -0x61, 0x0E, 0x3C, 0x8D, 0x4C, 0x51, 0x9A, 0x9A, 0x22, 0x75, -0x31, 0xF1, 0xA0, 0x54, 0xAB, 0x61, 0xB6, 0xE8, 0x61, 0x49, -0xD6, 0xC0, 0x9C, 0x24, 0x22, 0xE0, 0x1B, 0xA1, 0x0A, 0x07, -0x08, 0x54, 0xE4, 0x09, 0xAE, 0x71, 0xF3, 0x7E, 0x1C, 0x9E, -0xE4, 0x60, 0x47, 0x1B, 0x16, 0xD1, 0xF7, 0x87, 0x24, 0xB7, -0x4A, 0x92, 0x46, 0x9C, 0x2A, 0xCA, 0xF3, 0x71, 0xA9, 0x47, -0x64, 0x60, 0x9A, 0xD6, 0xF2, 0xEC, 0xE7, 0xFF, 0xDA, 0xA5, -0x7B, 0xD9, 0x19, 0x2B, 0x39, 0x64, 0xA4, 0x41, 0x07, 0x81, -0x17, 0x65, 0xC5, 0xD0, 0x6A, 0x20, 0x07, 0x07, 0x27, 0xFD, -0x1E, 0xF0, 0x02, 0x8E, 0x33, 0x0C, 0xBE, 0x20, 0xB0, 0xA5, -0x3C, 0x27, 0x48, 0xAF, 0xF5, 0x92, 0xB3, 0xC3, 0x74, 0xF4, -0x0B, 0xF9, 0xF2, 0xD2, 0x1E, 0x26, 0x3C, 0x29, 0x28, 0x03, -0x9D, 0x25, 0xD3, 0x5E, 0x40, 0xA0, 0xA5, 0x04, 0x5A, 0x44, -0xD7, 0x16, 0xE9, 0x84, 0x91, 0x27, 0xB6, 0x3C, 0x8B, 0x8E, -0xE2, 0x7E, 0xAB, 0x63, 0x35, 0x52, 0xC9, 0xB6, 0x6D, 0x5B, -0x8D, 0x57, 0x3A, 0x9E, 0x83, 0xB3, 0xE3, 0x79, 0x28, 0x3B, -0xD6, 0x80, 0x7D, 0xF7, 0x99, 0xBF, 0xE9, 0x7C, 0xBB, 0x15, -0xCC, 0xD6, 0xA7, 0xC0, 0x6E, 0x59, 0x09, 0xE5, 0x1B, 0xCB, -0x61, 0x22, 0xBE, 0xB3, 0xC9, 0x6A, 0xC9, 0x5A, 0xC9, 0x4A, -0xC8, 0x1E, 0xF8, 0x67, 0xE2, 0x3F, 0x5F, 0x7F, 0x02, 0x1C, -0xAC, 0x2A, 0x6C, 0xAB, 0x0A, 0x12, 0x89, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Zoom_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x1C, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x95, 0x6B, 0x6C, 0x14, 0x55, 0x18, -0x86, 0x9F, 0x99, 0x9D, 0x9D, 0xBD, 0x74, 0x77, 0xBB, 0xDB, -0x42, 0x8B, 0xF4, 0x4A, 0x57, 0x28, 0x2D, 0xA4, 0x14, 0xB0, -0x96, 0x0A, 0x04, 0xA1, 0x5C, 0x02, 0x96, 0x4B, 0x81, 0x6A, -0x55, 0xAE, 0x82, 0xA0, 0x09, 0xC4, 0x00, 0x11, 0x03, 0x14, -0x02, 0x05, 0x6F, 0x44, 0x40, 0x91, 0x10, 0xF1, 0x8F, 0x11, -0x83, 0x31, 0x11, 0x0D, 0x04, 0x7E, 0x48, 0x10, 0x2C, 0x06, -0x68, 0x2B, 0x77, 0xCB, 0x45, 0x2A, 0x45, 0xB1, 0xD4, 0x2D, -0xDB, 0xB2, 0xD0, 0x6E, 0x69, 0x77, 0xBB, 0x97, 0xF1, 0x2C, -0x0A, 0x88, 0x52, 0x08, 0x18, 0xDF, 0xE4, 0xCC, 0xEC, 0x9C, -0xB3, 0xF9, 0x9E, 0xF3, 0x7D, 0xDF, 0x7B, 0x66, 0xE0, 0x7F, -0x96, 0xAE, 0xC3, 0x95, 0xA5, 0x7B, 0x65, 0x06, 0x3C, 0x97, -0x44, 0xCE, 0xE4, 0x71, 0xE4, 0x14, 0x2E, 0xA2, 0xFF, 0xB8, -0xC5, 0xF4, 0x1B, 0x5B, 0x48, 0xDF, 0x31, 0x09, 0xF4, 0x1D, -0xDD, 0x42, 0xF6, 0x48, 0x0F, 0x27, 0xBF, 0x09, 0x3F, 0x08, -0x20, 0xDF, 0x73, 0xB6, 0xF4, 0x60, 0x8C, 0x58, 0x5A, 0x20, -0x85, 0xE5, 0xC3, 0x06, 0x83, 0x69, 0x6B, 0x54, 0xB4, 0x63, -0x9A, 0x2D, 0x36, 0x2E, 0xCF, 0x6C, 0xB5, 0x3F, 0xA3, 0xC8, -0xCA, 0x5A, 0x42, 0xDA, 0x31, 0x34, 0x79, 0x0B, 0xD3, 0xD6, -0xA7, 0x32, 0x73, 0xB3, 0xF4, 0x70, 0x80, 0xD2, 0xF2, 0x24, -0x82, 0xDA, 0x97, 0x66, 0xA3, 0xF1, 0xBD, 0xFC, 0xAC, 0xB4, -0x84, 0x35, 0xE3, 0x9F, 0x64, 0x4B, 0xF1, 0x20, 0xD6, 0x4D, -0x1A, 0xC2, 0xA2, 0x82, 0x7C, 0x46, 0x3D, 0x3D, 0x8C, 0xCE, -0x89, 0x69, 0x8A, 0x4E, 0x92, 0x66, 0x12, 0x0E, 0x95, 0xE1, -0xF7, 0x0E, 0x66, 0xFA, 0x86, 0x0E, 0x21, 0x77, 0x03, 0x56, -0x57, 0xD8, 0x09, 0x6B, 0x5B, 0x1C, 0x16, 0xCB, 0xB0, 0x95, -0xC3, 0x33, 0xD9, 0x33, 0x35, 0x9D, 0x57, 0x72, 0x62, 0x68, -0xBE, 0xD1, 0xC6, 0x96, 0x7D, 0x95, 0x54, 0xD4, 0x5C, 0xA2, -0x57, 0x42, 0x02, 0xE3, 0x87, 0xE6, 0x93, 0xDC, 0x3B, 0x17, -0xD9, 0x10, 0x95, 0x82, 0x16, 0xFE, 0x9C, 0xB6, 0x1B, 0xD9, -0x0F, 0x06, 0xAC, 0xA9, 0x90, 0x68, 0xF7, 0x4F, 0x32, 0xC8, -0xD2, 0xE8, 0x79, 0xB9, 0x29, 0xBC, 0x9E, 0x67, 0xA7, 0xB1, -0x0D, 0x36, 0x1E, 0xF1, 0xB3, 0x6A, 0xCF, 0x39, 0x8E, 0x1E, -0x3B, 0xC7, 0x81, 0xD3, 0xE7, 0xD9, 0x75, 0xB6, 0x86, 0x93, -0xEE, 0x6B, 0x58, 0x92, 0xD3, 0xE8, 0x94, 0xD9, 0x0F, 0xBD, -0xC9, 0x94, 0x20, 0x32, 0x59, 0xCE, 0xB8, 0x92, 0xE8, 0xFB, -0x03, 0x9A, 0xAF, 0x5B, 0xA5, 0x80, 0x7F, 0x4E, 0x66, 0xBC, -0x8D, 0x59, 0xD9, 0x0E, 0x7E, 0x69, 0x82, 0x4D, 0xC7, 0x42, -0xE2, 0x1E, 0xC4, 0x6A, 0x10, 0xEB, 0x26, 0x15, 0x55, 0xD5, -0xA3, 0x97, 0x25, 0x7C, 0xC1, 0x20, 0x61, 0x25, 0x84, 0xA3, -0xBB, 0x13, 0x5B, 0x62, 0x0A, 0x92, 0x2C, 0x15, 0xA2, 0x85, -0xEE, 0x99, 0xC5, 0x9D, 0xDA, 0x2D, 0xDC, 0x99, 0xA7, 0xE8, -0xD5, 0xC3, 0xAF, 0x0E, 0xC9, 0x66, 0xE1, 0xC0, 0x78, 0x36, -0x1C, 0x6A, 0xE4, 0xD0, 0xC5, 0x06, 0x11, 0x34, 0x4C, 0x75, -0x6D, 0x1D, 0x57, 0xAF, 0xB8, 0x50, 0x4D, 0x26, 0xEC, 0xB1, -0x9D, 0xD1, 0x24, 0x0D, 0x4B, 0xAC, 0x8D, 0x4E, 0xE9, 0x3D, -0x68, 0xAC, 0xA9, 0xA1, 0xB6, 0x6C, 0x0F, 0x41, 0x6F, 0xF3, -0x2A, 0x11, 0xEE, 0x2D, 0x76, 0xBD, 0xDD, 0xFE, 0x77, 0x80, -0x72, 0xFB, 0x57, 0x28, 0x90, 0xA9, 0xE8, 0x14, 0x3A, 0x99, -0x55, 0x4E, 0xB8, 0xFC, 0x6C, 0xDC, 0x7F, 0x04, 0x3C, 0x0D, -0xA0, 0x0A, 0x27, 0x2B, 0x62, 0x18, 0x55, 0xDA, 0x7D, 0xAD, -0xB8, 0x6B, 0xCE, 0x40, 0x4B, 0x33, 0x0D, 0xED, 0xED, 0x58, -0xE3, 0x67, 0x10, 0xE5, 0x70, 0xA0, 0xD3, 0xE9, 0x08, 0x42, -0x26, 0xB2, 0x2E, 0x92, 0xEB, 0x5D, 0x80, 0x3B, 0x25, 0x0A, -0xF9, 0xD1, 0x82, 0x7E, 0x9A, 0xFC, 0x41, 0x5C, 0x2D, 0x22, -0x9E, 0x4E, 0x42, 0x31, 0x1B, 0xD0, 0xEB, 0x15, 0x24, 0x4D, -0x83, 0x40, 0x00, 0xD1, 0x50, 0x51, 0x0E, 0x3D, 0x18, 0xCC, -0x98, 0x6C, 0x16, 0x8C, 0x46, 0x3D, 0x9A, 0x16, 0x12, 0xD3, -0x62, 0x5D, 0x92, 0xA2, 0xC4, 0xF8, 0x97, 0x2B, 0xEF, 0x4C, -0x84, 0x83, 0xEE, 0xA0, 0xBF, 0x95, 0x73, 0xEE, 0x66, 0x51, -0x5F, 0x23, 0xBD, 0x7B, 0x74, 0x27, 0x3D, 0xBD, 0x27, 0xCE, -0xB4, 0xEE, 0x58, 0xCC, 0xA6, 0x9B, 0xBB, 0x56, 0xC4, 0x4E, -0xE3, 0xD2, 0x33, 0x48, 0x1F, 0x36, 0x84, 0x01, 0x33, 0x8B, -0x70, 0x24, 0x74, 0xA1, 0xB5, 0xD1, 0x4D, 0x28, 0x18, 0x88, -0x00, 0xAA, 0xFF, 0xB9, 0xFB, 0x88, 0xEE, 0x9C, 0xE4, 0xAC, -0xD1, 0xCD, 0x9A, 0x14, 0x9E, 0xD1, 0x26, 0xF6, 0x9D, 0x9A, -0x94, 0x48, 0xAB, 0xA2, 0x60, 0x16, 0xE9, 0x47, 0xEA, 0x7E, -0xB5, 0xFE, 0x77, 0x7C, 0xF5, 0x97, 0x51, 0xAC, 0x56, 0x32, -0x9E, 0xEA, 0x4F, 0xD6, 0xA0, 0x9E, 0xD8, 0xE2, 0xED, 0xB8, -0x5C, 0xAD, 0xD4, 0x55, 0x1E, 0xA4, 0xD5, 0xED, 0x85, 0xB6, -0x2E, 0xCB, 0x38, 0x5E, 0x78, 0x81, 0x96, 0x0F, 0x3B, 0x68, -0xF2, 0xF3, 0xEB, 0x74, 0x44, 0x45, 0x6D, 0x96, 0x8D, 0xC6, -0x39, 0x39, 0x39, 0xB9, 0x24, 0x39, 0xBB, 0xE1, 0x11, 0x25, -0x93, 0x45, 0x09, 0x7E, 0xDC, 0x5F, 0x86, 0xFB, 0xDB, 0xEF, -0x30, 0x67, 0x65, 0x30, 0x62, 0xD6, 0xB3, 0x38, 0x12, 0x63, -0xB9, 0x54, 0x17, 0xE4, 0x42, 0x65, 0x39, 0x75, 0x07, 0x2A, -0xB1, 0xF8, 0x7F, 0x63, 0xAC, 0xE3, 0x68, 0xBF, 0x6D, 0x9F, -0x96, 0x9F, 0xE8, 0xD8, 0x45, 0x11, 0x4D, 0xDF, 0xD8, 0x07, -0x59, 0x2A, 0x37, 0xD8, 0x1D, 0xA6, 0x9E, 0xFD, 0xFB, 0x13, -0x9D, 0x9A, 0x8C, 0xCD, 0x66, 0xC2, 0x73, 0xB9, 0x96, 0xFA, -0x53, 0x55, 0xD8, 0x53, 0x13, 0x49, 0xCA, 0xCE, 0xE2, 0xDA, -0x75, 0x1F, 0xBF, 0x1E, 0x3F, 0x8E, 0xEB, 0xF0, 0x0F, 0x04, -0x3C, 0x7A, 0x66, 0x24, 0x7F, 0xC4, 0x84, 0xE8, 0x33, 0x15, -0xAA, 0x89, 0x97, 0xC6, 0xAC, 0xE2, 0x5C, 0xC7, 0x80, 0x88, -0xA6, 0xAC, 0x9F, 0x2F, 0x1A, 0xB2, 0x51, 0x1F, 0x6D, 0x25, -0x3E, 0xAD, 0x07, 0xD1, 0x09, 0x89, 0x44, 0x75, 0x72, 0xA0, -0x18, 0x0D, 0x04, 0xDB, 0x7C, 0x34, 0xB9, 0xEA, 0xB9, 0x7A, -0xF1, 0x3C, 0xD7, 0xCE, 0xFE, 0x4C, 0xA8, 0xDA, 0x4B, 0xFE, -0x58, 0x2B, 0x1F, 0xBF, 0x70, 0x84, 0x86, 0xEF, 0xBF, 0xC6, -0x5D, 0xC7, 0x01, 0xA2, 0x18, 0x33, 0xEE, 0x0D, 0x5A, 0x3B, -0x06, 0x30, 0x50, 0xA2, 0x78, 0xEC, 0x42, 0x71, 0x70, 0xDE, -0x95, 0x84, 0xFF, 0x54, 0x8B, 0x45, 0x98, 0xC6, 0x84, 0x22, -0xAC, 0x1A, 0xF0, 0xF9, 0xF1, 0x79, 0x5B, 0x08, 0xD4, 0xDF, -0x80, 0x1B, 0x32, 0xA3, 0x72, 0x3D, 0x7C, 0x30, 0x75, 0x27, -0xE9, 0x7D, 0x26, 0xE2, 0xBD, 0xE2, 0xE1, 0xC8, 0xB6, 0x4F, -0xF0, 0x36, 0x85, 0x97, 0x4C, 0x28, 0xE5, 0x9D, 0xFB, 0x00, -0xFE, 0xD2, 0xE4, 0xD5, 0x05, 0xC2, 0x59, 0xF3, 0xC5, 0x6B, -0x60, 0x24, 0x11, 0x9B, 0x12, 0x12, 0x36, 0x15, 0x9E, 0x68, -0x57, 0x48, 0x89, 0xF1, 0x33, 0x77, 0xB8, 0x9D, 0x19, 0x43, -0x9B, 0xE8, 0xA2, 0x6C, 0xA5, 0x45, 0x0E, 0x61, 0xED, 0xFA, -0x26, 0xD5, 0x7B, 0x37, 0x71, 0xBA, 0xEC, 0x64, 0x53, 0x5B, -0x50, 0x1B, 0x3C, 0x65, 0x2D, 0x55, 0x91, 0x30, 0x4A, 0x87, -0x80, 0xED, 0xCB, 0x77, 0x33, 0xA1, 0x44, 0xBC, 0x96, 0x49, -0x17, 0x16, 0xEC, 0x01, 0x71, 0xBA, 0xC7, 0xB4, 0xD3, 0xDD, -0x9E, 0x50, 0x0E, 0xCD, 0x1D, 0x9C, 0x6C, 0xB3, 0xBD, 0x9C, -0x37, 0x42, 0x9C, 0xEA, 0x38, 0x3C, 0xAE, 0x01, 0x22, 0xAB, -0xAF, 0xC4, 0xDF, 0x3E, 0xA3, 0xB3, 0xB3, 0x1F, 0x4A, 0xC5, -0xD9, 0x68, 0x9F, 0xDB, 0x3F, 0x4F, 0x44, 0x98, 0x7B, 0x7F, -0x40, 0x44, 0x3B, 0xD6, 0xB8, 0xC4, 0x35, 0x32, 0xCA, 0x22, -0x8F, 0xAF, 0x0D, 0xC7, 0x18, 0xB4, 0x10, 0xA3, 0xB8, 0xAD, -0xB3, 0xCE, 0x57, 0x25, 0xD1, 0xCB, 0x6C, 0x17, 0x87, 0x37, -0x4D, 0xF4, 0x26, 0x03, 0x4F, 0xF5, 0x29, 0xEC, 0x09, 0x71, -0xE8, 0x2D, 0x66, 0x7C, 0xB5, 0xFE, 0x89, 0xB7, 0x00, 0xF7, -0xFD, 0x58, 0xDC, 0x4B, 0x25, 0x05, 0xF4, 0x96, 0x54, 0x69, -0x47, 0x97, 0xD4, 0x14, 0x67, 0x7E, 0xC1, 0x30, 0xBA, 0x26, -0x77, 0xE5, 0xBA, 0xEB, 0x0C, 0x5E, 0xF7, 0x31, 0xE2, 0xBA, -0xA5, 0x51, 0xBE, 0xEF, 0x0C, 0x3F, 0x55, 0x35, 0xB0, 0x78, -0xEB, 0x9F, 0xB1, 0x1F, 0x1A, 0x70, 0x13, 0x52, 0xC8, 0x6C, -0x9D, 0x41, 0xDD, 0x94, 0xF2, 0xB8, 0xD3, 0x90, 0x93, 0x97, -0x81, 0xC3, 0xDA, 0x26, 0xAA, 0xD8, 0x4C, 0x93, 0xD7, 0x4F, -0xD9, 0xEE, 0x2A, 0x1A, 0x3D, 0xFE, 0xC0, 0x8A, 0x2F, 0x50, -0x1F, 0x19, 0xB0, 0x6C, 0x22, 0xAA, 0x2C, 0x53, 0xA2, 0xA8, -0xA6, 0x92, 0x98, 0xCE, 0x31, 0x52, 0x9A, 0xD3, 0x8E, 0x6A, -0x94, 0x38, 0x7F, 0xEA, 0x22, 0x0D, 0x57, 0x5A, 0x45, 0x3F, -0x58, 0x50, 0xBA, 0x9D, 0xF7, 0x1F, 0x25, 0xF6, 0x6D, 0xAD, -0x28, 0x42, 0x5D, 0x59, 0x24, 0xBD, 0x58, 0x5A, 0xAC, 0xBF, -0xB8, 0xAA, 0xD8, 0xA8, 0xAD, 0x28, 0x52, 0xB4, 0xE5, 0x93, -0xA8, 0x5B, 0x31, 0x89, 0xD9, 0xE2, 0xAE, 0xFE, 0xA7, 0xE0, -0xB7, 0x54, 0x3A, 0x19, 0x69, 0x49, 0x01, 0xCE, 0xA5, 0xE3, -0x99, 0xB2, 0xAC, 0x90, 0xA9, 0x25, 0x13, 0x71, 0xAE, 0x2C, -0xBA, 0xFB, 0x33, 0xFC, 0x07, 0x07, 0x66, 0xCF, 0x92, 0x85, -0x17, 0xB4, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/KDE.h b/Source/Core/DolphinWX/resources/KDE.h deleted file mode 100644 index 23fcd4272b..0000000000 --- a/Source/Core/DolphinWX/resources/KDE.h +++ /dev/null @@ -1,3651 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_3_H_ -#define _WXINCLUDE_MYHEADER_3_H_ - -static const unsigned char Toolbar_Browse3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE5, 0xDB, -0xC0, 0x00, 0xAF, 0x92, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x06, -0x24, 0x26, 0x16, 0x57, 0xF6, 0xF6, 0xF9, 0xEB, 0xE7, 0xE5, -0xF1, 0xBC, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x6E, 0xBF, 0x00, -0x1C, 0x25, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x03, 0x23, 0x40, -0x57, 0x90, 0x94, 0xF5, 0xEE, 0xE1, 0xEA, 0xA9, 0x97, 0x79, -0x3D, 0x19, 0x22, 0x3D, 0xE9, 0x4E, 0x6B, 0xB9, 0xFF, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xE2, 0xE7, 0xE2, 0x00, 0xFE, 0x05, 0x08, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x09, 0x2D, 0x32, 0x36, 0x6B, 0x08, 0x0B, -0x14, 0x0E, 0x13, 0x1C, 0x35, 0x23, 0x22, 0x23, 0x1F, 0x58, -0xEF, 0xE9, 0xD8, 0x05, 0xFE, 0xFD, 0xFB, 0x00, 0x04, 0x05, -0x09, 0x00, 0x04, 0x05, 0x09, 0x00, 0x04, 0x05, 0x09, 0x00, -0x02, 0x04, 0x06, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, -0x06, 0x03, 0x20, 0x2E, 0x3C, 0x59, 0x5B, 0x01, 0xFA, 0xE7, -0x00, 0x01, 0xFB, 0xEA, 0x01, 0x33, 0x3F, 0x5D, 0x6B, 0xF8, -0xF5, 0xEB, 0x14, 0xD6, 0xC7, 0x9E, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, -0x03, 0x03, 0x00, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x09, 0x2C, 0x2E, -0x32, 0x66, 0x0A, 0x0C, 0x0E, 0x10, 0x00, 0xFC, 0xF7, 0x00, -0x00, 0xFC, 0xF5, 0x00, 0x15, 0x1B, 0x2C, 0x23, 0x20, 0x1E, -0x1D, 0x53, 0xC8, 0xB4, 0x7C, 0x06, 0xF8, 0xF5, 0xEE, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x17, -0x1E, 0x00, 0x1C, 0x16, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x02, 0x06, 0x05, 0x02, 0x1E, 0x30, 0x38, 0x47, -0x5D, 0x01, 0xF8, 0xE8, 0x00, 0x00, 0xFB, 0xF4, 0x00, 0x00, -0xFB, 0xF4, 0x00, 0x01, 0xFA, 0xEB, 0x01, 0x34, 0x3B, 0x4F, -0x6C, 0xFD, 0xFA, 0xF5, 0x12, 0xCB, 0xB9, 0x83, 0x01, 0xF4, -0xF0, 0xE5, 0x00, 0xFC, 0xFB, 0xF8, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0xDD, 0xD0, 0xAE, 0x00, 0xE4, 0xDB, -0xBF, 0x01, 0xF0, 0xE9, 0xD8, 0x02, 0xFF, 0xFF, 0x00, 0x02, -0x00, 0x00, 0x00, 0x01, 0x04, 0x03, 0x01, 0x0E, 0x0B, 0x09, -0x05, 0x22, 0x29, 0x2A, 0x2C, 0x6B, 0x0A, 0x09, 0x03, 0x11, -0x00, 0xFB, 0xF4, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xFF, -0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x16, 0x19, 0x22, 0x25, -0x29, 0x23, 0x1F, 0x6E, 0xDD, 0xC7, 0x95, 0xA9, 0xD4, 0xC1, -0x93, 0xE1, 0x0D, 0x14, 0x23, 0xF5, 0x0C, 0x10, 0x1D, 0xFE, -0x0A, 0x0E, 0x18, 0xFE, 0x0B, 0x0E, 0x18, 0xFF, 0x1E, 0x2A, -0x49, 0xFF, 0x01, 0xA4, 0x7A, 0x0E, 0x31, 0x1A, 0x17, 0x14, -0x45, 0x0F, 0x10, 0x13, 0x24, 0x10, 0x12, 0x14, 0x23, 0x10, -0x12, 0x14, 0x23, 0x0C, 0x0E, 0x10, 0x17, 0x04, 0x08, 0x0D, -0x07, 0x01, 0x01, 0xFF, 0x01, 0x01, 0xFC, 0xF1, 0x00, 0x00, -0x01, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, 0x04, -0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0xFF, -0x04, 0x11, 0x00, 0xFF, 0xFB, 0xFA, 0xFF, 0xFA, 0xF5, 0xEF, -0xF7, 0xF3, 0xF0, 0xEB, 0xE6, 0xF0, 0xED, 0xE8, 0xDD, 0xF0, -0xEE, 0xE7, 0xDC, 0xF3, 0xF4, 0xF2, 0xDC, 0xDF, 0xE6, 0xE1, -0xB3, 0x01, 0xC7, 0x95, 0x24, 0xA0, 0x35, 0x39, 0x41, 0x5E, -0x03, 0x03, 0xFC, 0x01, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00, -0xFC, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0x01, 0xFF, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x01, -0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, -0x02, 0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFE, 0x01, 0x00, 0x00, 0xFE, 0x00, 0x00, 0xFF, 0xFE, -0x00, 0x00, 0xFD, 0xF6, 0xF4, 0xFF, 0xBD, 0xC3, 0xAC, 0x82, -0x04, 0xCE, 0xD8, 0xDC, 0xA5, 0x08, 0x00, 0xFF, 0x2F, 0x28, -0x2C, 0x30, 0x2F, 0x07, 0x09, 0xFE, 0x01, 0x01, 0xFF, 0xFB, -0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFD, -0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, -0xFF, 0x01, 0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x04, -0x00, 0x00, 0xFE, 0x01, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, -0xFD, 0x00, 0x00, 0xFF, 0x01, 0x08, 0x00, 0xF8, 0xF5, 0xFF, -0xFF, 0xCC, 0xD5, 0xC7, 0xBE, 0xDB, 0xEB, 0xEC, 0xBC, 0x03, -0x49, 0x36, 0x00, 0xF5, 0xE3, 0xEC, 0xEF, 0xDE, 0x08, 0xFB, -0xF5, 0x26, 0x12, 0x0F, 0x18, 0x19, 0x03, 0x02, 0xFC, 0x00, -0x01, 0xF9, 0xEC, 0x00, 0x00, 0xF8, 0xEE, 0x00, 0x00, 0xF9, -0xED, 0x00, 0x00, 0xF9, 0xF2, 0x00, 0x00, 0xFA, 0xF2, 0x00, -0x00, 0xFA, 0xF4, 0x00, 0x00, 0xF9, 0xF3, 0x00, 0x00, 0xFA, -0xF2, 0x00, 0x00, 0xF8, 0xF1, 0x00, 0xD8, 0xEB, 0xF7, 0x00, -0x98, 0xD4, 0xFB, 0x00, 0xBB, 0xDC, 0xF6, 0x00, 0xE1, 0xF5, -0x14, 0x00, 0x24, 0x06, 0xF7, 0xFF, 0xCC, 0xD6, 0xC9, 0xBB, -0xD2, 0xE9, 0xEA, 0x8D, 0x00, 0x00, 0x00, 0xD3, 0x03, 0x76, -0x73, 0x69, 0xF7, 0xEA, 0xE2, 0xCC, 0xEE, 0xE4, 0xEE, 0xF1, -0xDE, 0x07, 0xF9, 0xF0, 0x23, 0x14, 0x0B, 0x06, 0x1B, 0x02, -0xFE, 0xF7, 0x00, 0x01, 0xFD, 0xFB, 0x00, 0x00, 0xFE, 0xFF, -0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, -0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, 0xFF, -0x00, 0x00, 0xFD, 0x00, 0x00, 0xC2, 0xE9, 0xF4, 0x00, 0xEB, -0x38, 0x54, 0x00, 0x02, 0x16, 0x21, 0x00, 0xDD, 0xEF, 0xF7, -0xFF, 0x0A, 0xDF, 0xBB, 0xB7, 0xD6, 0xEC, 0xEF, 0x8D, 0x01, -0x01, 0x01, 0xCC, 0x2E, 0x3F, 0x6E, 0xF0, 0x03, 0x9C, 0xA6, -0xC3, 0xFF, 0xF5, 0xF1, 0xE7, 0xF7, 0xEB, 0xE4, 0xCF, 0xEE, -0xE4, 0xF0, 0xF5, 0xE0, 0x04, 0xFB, 0xF9, 0x20, 0x18, 0x0F, -0x0B, 0x1C, 0x02, 0xFF, 0xFD, 0x00, 0x00, 0xFD, 0xFF, 0x00, -0x00, 0xFE, 0xFE, 0x00, 0x00, 0xFD, 0xFF, 0x00, 0x00, 0xFD, -0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFD, 0xFF, 0x00, -0x00, 0xFD, 0xFF, 0x00, 0xD6, 0xFB, 0xFE, 0x00, 0xF0, 0x2B, -0x33, 0x00, 0xF3, 0xF9, 0xF1, 0x00, 0xEA, 0xE6, 0xEE, 0xF8, -0x04, 0xE5, 0xCF, 0x72, 0x03, 0x02, 0x01, 0xCC, 0x35, 0x48, -0x7C, 0xF0, 0x3B, 0x50, 0x8A, 0xFF, 0x02, 0x04, 0x05, 0x08, -0x00, 0x42, 0x59, 0x9B, 0xFE, 0x22, 0x2E, 0x51, 0xEC, 0x00, -0x00, 0x00, 0xC8, 0xC9, 0xE2, 0xEC, 0x8C, 0xE9, 0xEA, 0xF1, -0xE8, 0x00, 0xFA, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, -0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, -0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, 0xFB, 0xFE, 0x00, 0x00, -0xFB, 0xFE, 0x00, 0x00, 0x08, 0x03, 0x00, 0x08, 0x0F, 0x06, -0x00, 0xFB, 0x0B, 0xF9, 0x00, 0xF8, 0x03, 0xFA, 0xFC, 0xFE, -0xFF, 0x00, 0xD0, 0x2F, 0x44, 0x76, 0xF0, 0x37, 0x4B, 0x82, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x01, 0x02, 0x02, 0x00, 0x2F, 0x40, 0x6E, 0xFD, 0xDE, 0xD2, -0xAF, 0xEC, 0x00, 0x00, 0x00, 0xDB, 0x0C, 0x03, 0x01, 0x0B, -0x00, 0xFB, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xD1, 0xF5, 0x11, 0x00, -0xBE, 0xF6, 0xF6, 0x00, 0x03, 0x0D, 0x03, 0x00, 0x08, 0x0B, -0x07, 0x00, 0xE9, 0x10, 0x0C, 0x00, 0x09, 0x02, 0xFB, 0x00, -0xF4, 0xFD, 0xF4, 0x00, 0x19, 0x1C, 0x19, 0x06, 0xB6, 0xD6, -0x26, 0x7F, 0xCB, 0xCD, 0xDD, 0xFA, 0xA5, 0xCC, 0x67, 0x00, -0x18, 0x0C, 0x18, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x07, 0x02, 0x02, 0x12, 0x0A, 0x02, 0x02, 0x0C, 0x00, -0xFB, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0xBC, 0xDB, 0xEC, 0x00, 0x97, -0x2B, 0xF8, 0x00, 0x28, 0x2E, 0x27, 0x00, 0x29, 0x1C, 0x2A, -0x00, 0x0A, 0x03, 0x0B, 0x00, 0xDE, 0xE9, 0xDC, 0x00, 0xEA, -0xEC, 0xEA, 0x00, 0x09, 0xF2, 0x0C, 0x07, 0x21, 0x43, 0x36, -0x69, 0x09, 0x06, 0x08, 0x00, 0x07, 0x01, 0x07, 0x00, 0xD4, -0xCD, 0xD1, 0xFC, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, -0x10, 0x04, 0x04, 0x28, 0x03, 0xFE, 0xFF, 0x01, 0x00, 0xFE, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFD, 0xF6, 0xFE, 0x00, 0xEE, 0xD8, -0xEF, 0x00, 0xC9, 0xFC, 0xC8, 0x00, 0xD9, 0xE7, 0xD7, 0x00, -0x07, 0x02, 0x08, 0x00, 0x03, 0xEF, 0x05, 0x00, 0x0E, 0xF2, -0x10, 0x00, 0x0F, 0x19, 0xFB, 0x00, 0x03, 0x12, 0xFF, 0x00, -0x02, 0x05, 0xFF, 0x00, 0xFC, 0xFB, 0xFA, 0x00, 0xF4, 0x0B, -0xF1, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x12, -0x06, 0x04, 0x27, 0x01, 0xFB, 0xFE, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x00, 0xFF, 0x02, 0x04, 0x00, 0xF9, -0xF7, 0xFB, 0xFF, 0x12, 0x0A, 0x13, 0xEF, 0x26, 0x04, 0x04, -0x05, 0x01, 0xE5, 0xFB, 0x0C, 0x04, 0xF0, 0x03, 0x01, 0x02, -0x0E, 0x09, 0x00, 0xE8, 0x04, 0xFB, 0x00, 0xE9, 0x08, 0xD7, -0x00, 0x3D, 0x13, 0x40, 0x00, 0x0D, 0xE6, 0xEF, 0xBA, 0x1F, -0x25, 0x34, 0xFA, 0xFF, 0x00, 0xFF, 0x00, 0x1F, 0x2D, 0x25, -0xFE, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xF7, 0xF5, 0xED, 0x00, 0xFF, 0x00, 0x00, 0x06, 0x12, 0x05, -0x03, 0x25, 0x00, 0xFB, 0xFF, 0x00, 0xFF, 0x07, 0x0F, 0x00, -0xF8, 0xFA, 0x01, 0xFF, 0xDE, 0xE9, 0xEA, 0xDF, 0xD0, 0xF2, -0xEF, 0xB2, 0xF7, 0xFD, 0xE3, 0xCA, 0x5C, 0xF7, 0x00, 0x05, -0x17, 0x03, 0x05, 0x3E, 0x30, 0xFB, 0x12, 0x4A, 0xC5, 0xED, -0x05, 0x18, 0x8E, 0x35, 0x07, 0x01, 0x11, 0x0A, 0x10, 0x00, -0xEF, 0xF9, 0xEF, 0x00, 0x3F, 0xC9, 0xD4, 0x5D, 0x5D, 0x40, -0x9C, 0xEA, 0x0F, 0x15, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, -0xEC, 0xDD, 0x01, 0x00, 0x00, 0x00, 0x09, 0x12, 0x02, 0x04, -0x22, 0xFD, 0x01, 0x0E, 0xFF, 0xE0, 0xE7, 0xEF, 0xE5, 0xCD, -0xEF, 0xEC, 0xB4, 0xEA, 0xFD, 0xFB, 0xBC, 0x00, 0x00, 0x00, -0xD7, 0x01, 0x01, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x02, 0xE9, -0xFD, 0xFB, 0xD2, 0xB9, 0xF0, 0xE9, 0xBE, 0xDA, 0xF2, 0xF4, -0x63, 0x02, 0x3B, 0x1F, 0x42, 0x0A, 0x0A, 0x0A, 0x00, 0x06, -0xFE, 0x06, 0x00, 0xFC, 0xFB, 0xF7, 0x05, 0xEA, 0xE3, 0xCD, -0x00, 0x0F, 0x15, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xEC, -0xDE, 0x00, 0x00, 0x00, 0x00, 0x02, 0xDC, 0xF4, 0xF8, 0xCA, -0xCE, 0xF0, 0xDD, 0xC6, 0xE5, 0xFD, 0xFA, 0xBB, 0x00, 0x00, -0x00, 0xD7, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0xF3, -0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, -0x00, 0xF1, 0x00, 0x00, 0x00, 0xE4, 0xF5, 0xF9, 0xFE, 0x24, -0xFF, 0xFB, 0xFF, 0x42, 0xFB, 0xFB, 0xFB, 0x00, 0xFD, 0xFA, -0xFD, 0x00, 0x00, 0xFF, 0x00, 0x02, 0xF7, 0xF3, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x27, 0x44, -0xFF, 0xD5, 0xC5, 0x99, 0xF0, 0xD7, 0xF9, 0xF7, 0x8A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, -0xF2, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0xFB, 0x09, 0x0C, 0x15, 0xED, 0x22, 0x08, 0x1A, 0xD7, 0xDD, -0xC2, 0xF5, 0xD5, 0xF5, 0x08, 0xF7, 0x02, 0x12, 0x17, 0xFE, -0x00, 0x05, 0x05, 0x08, 0xF5, 0x1F, 0x2B, 0x4A, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xBB, 0x68, -0x3E, 0x68, 0xFE, 0x55, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x02, 0x3E, 0x3E, -0x3E, 0x47, 0x2F, 0x2F, 0x2F, 0x4A, 0x2A, 0x2A, 0x2A, 0x23, -0x07, 0x07, 0x07, 0xFF, 0xCB, 0xCB, 0xCB, 0xDE, 0xC4, 0xC4, -0xC4, 0xB5, 0xD0, 0xD0, 0xD0, 0xBA, 0xFC, 0xFC, 0xFC, 0xFE, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, -0x1A, 0x1A, 0x12, 0x83, 0x83, 0x83, 0xB0, 0x0E, 0x0E, 0x0E, -0x3C, 0xFA, 0xFA, 0xFA, 0x01, 0x11, 0x11, 0x11, 0x00, 0x0C, -0x0C, 0x0C, 0x00, 0xF8, 0xF8, 0xF8, 0x00, 0xFB, 0xFB, 0xFB, -0xFF, 0xD3, 0xD3, 0xD3, 0xC1, 0x86, 0x86, 0x86, 0x54, 0xF2, -0xF2, 0xF2, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x09, 0x73, 0x73, -0x73, 0x9C, 0x20, 0x20, 0x20, 0x4A, 0x06, 0x06, 0x06, 0x01, -0x1B, 0x1B, 0x1B, 0x00, 0x2B, 0x2B, 0x2B, 0x00, 0x1F, 0x1F, -0x1F, 0x00, 0x10, 0x10, 0x10, 0x00, 0x07, 0x07, 0x07, 0x01, -0x15, 0x15, 0x15, 0x20, 0x12, 0x12, 0x12, 0x1F, 0xD1, 0xD1, -0xD1, 0xB7, 0xF9, 0xF9, 0xF9, 0xFB, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, -0x3B, 0x3B, 0x43, 0xA7, 0xA7, 0xA7, 0xDC, 0xCA, 0xCA, 0xCA, -0xFF, 0xE6, 0xE6, 0xE6, 0xFF, 0xEF, 0xEF, 0xEF, 0xFF, 0xEB, -0xEB, 0xEB, 0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xE8, 0xE8, 0xE8, -0xFF, 0xEB, 0xEB, 0xEB, 0xFF, 0xF1, 0xF1, 0xF1, 0xFF, 0xED, -0xED, 0xED, 0xFF, 0xD5, 0xD5, 0xD5, 0xFF, 0xAD, 0xAD, 0xAD, -0xE0, 0x3F, 0x3F, 0x3F, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x4A, 0x4A, 0x4A, 0x56, 0x72, 0x72, -0x72, 0xA3, 0x2B, 0x2B, 0x2B, 0x06, 0x00, 0x00, 0x00, 0x00, -0xDC, 0xDC, 0xDC, 0x00, 0xD2, 0xD2, 0xD2, 0x00, 0xE1, 0xE1, -0xE1, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, -0x10, 0x10, 0x10, 0x00, 0x20, 0x20, 0x20, 0x00, 0x2E, 0x2E, -0x2E, 0x00, 0x23, 0x23, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, -0xD6, 0xD6, 0xD6, 0xFB, 0x8C, 0x8C, 0x8C, 0x61, 0xB5, 0xB5, -0xB5, 0xA5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x21, -0x21, 0x21, 0x21, 0x9A, 0x9A, 0x9A, 0xD1, 0x28, 0x28, 0x28, -0x0D, 0xE0, 0xE0, 0xE0, 0x00, 0xBE, 0xBE, 0xBE, 0x00, 0xC9, -0xC9, 0xC9, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x1E, 0x1E, 0x1E, -0x00, 0x1C, 0x1C, 0x1C, 0x00, 0x01, 0x01, 0x01, 0x00, 0xE4, -0xE4, 0xE4, 0x00, 0xE1, 0xE1, 0xE1, 0x00, 0x06, 0x06, 0x06, -0x00, 0x38, 0x38, 0x38, 0x00, 0x41, 0x41, 0x41, 0x00, 0x20, -0x20, 0x20, 0x00, 0xD1, 0xD1, 0xD1, 0xF5, 0x65, 0x65, 0x65, -0x33, 0xE4, 0xE4, 0xE4, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x5D, -0x5D, 0x7B, 0x43, 0x43, 0x43, 0x41, 0xD6, 0xD6, 0xD6, 0x00, -0xBA, 0xBA, 0xBA, 0x00, 0xCC, 0xCC, 0xCC, 0x00, 0x13, 0x13, -0x13, 0x00, 0x48, 0x48, 0x48, 0x00, 0x48, 0x48, 0x48, 0x00, -0x30, 0x30, 0x30, 0x00, 0x29, 0x29, 0x29, 0x00, 0x29, 0x29, -0x29, 0x00, 0x13, 0x13, 0x13, 0x00, 0xE9, 0xE9, 0xE9, 0x00, -0xD8, 0xD8, 0xD8, 0x00, 0xF4, 0xF4, 0xF4, 0x00, 0x05, 0x05, -0x05, 0x00, 0x23, 0x23, 0x23, 0x06, 0xEC, 0xEC, 0xEC, 0x02, -0xCD, 0xCD, 0xCD, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x2B, 0x2B, -0x34, 0xDE, 0xDE, 0xDE, 0x00, 0xE7, 0xE7, 0xE7, 0x00, 0xD8, -0xD8, 0xD8, 0x00, 0x17, 0x17, 0x17, 0x00, 0x18, 0x18, 0x18, -0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0x0B, -0x0B, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF4, 0xF4, -0x00, 0xF9, 0xF9, 0xF9, 0x00, 0x23, 0x23, 0x23, 0x00, 0x03, -0x03, 0x03, 0x00, 0xD5, 0xD5, 0xD5, 0x00, 0x24, 0x24, 0x24, -0x00, 0x05, 0x05, 0x05, 0x00, 0x2D, 0x2D, 0x2D, 0x34, 0x00, -0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, -0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x05, -0xDC, 0xDC, 0xDC, 0x00, 0x01, 0x01, 0x01, 0x00, 0x12, 0x12, -0x12, 0x00, 0x15, 0x15, 0x15, 0x00, 0xF5, 0xF5, 0xF5, 0x00, -0xF8, 0xF8, 0xF8, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFC, 0xFC, -0xFC, 0x00, 0x01, 0x01, 0x01, 0x00, 0x04, 0x04, 0x04, 0x00, -0x04, 0x04, 0x04, 0x00, 0x17, 0x17, 0x17, 0x00, 0xF7, 0xF7, -0xF7, 0x00, 0x02, 0x02, 0x02, 0x00, 0xF8, 0xF8, 0xF8, 0x00, -0xDA, 0xDB, 0xDA, 0x00, 0x07, 0x0E, 0x07, 0x0F, 0x01, 0x1A, -0x00, 0x2C, 0x00, 0xF7, 0x00, 0xE8, 0xFF, 0xEF, 0x00, 0xE6, -0x04, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF4, 0xF4, 0xF6, 0xF6, -0xF6, 0xF6, 0x00, 0x1D, 0x1D, 0x1D, 0x00, 0x13, 0x13, 0x13, -0x00, 0x15, 0x15, 0x15, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0x0C, -0x0C, 0x0C, 0x00, 0x26, 0x26, 0x26, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0x02, 0x02, 0x02, 0x00, 0x05, 0x05, 0x05, 0x00, 0x03, -0x11, 0x02, 0x00, 0xC6, 0xDA, 0xC6, 0x00, 0xE8, 0x18, 0xE7, -0x00, 0xFD, 0x1B, 0xFD, 0x00, 0xD9, 0x16, 0xD7, 0x00, 0xFD, -0x06, 0xFD, 0x00, 0x0B, 0x0F, 0x0C, 0x27, 0x86, 0xB2, 0x86, -0xCD, 0xC9, 0xDB, 0xC8, 0xED, 0xB0, 0x60, 0xB2, 0x25, 0x04, -0x00, 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xBE, 0x38, 0x38, -0x38, 0x45, 0xF8, 0xF8, 0xF8, 0x00, 0x24, 0x24, 0x24, 0x00, -0x06, 0x06, 0x06, 0x00, 0x18, 0x18, 0x18, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xE8, 0xE8, 0xE8, 0x00, 0x12, 0x12, 0x12, 0x00, -0x02, 0x02, 0x02, 0x00, 0xAD, 0xEA, 0xAB, 0x00, 0x28, 0x1E, -0x29, 0x00, 0x4C, 0x28, 0x4D, 0x00, 0x0A, 0x04, 0x0A, 0x00, -0xF0, 0xFA, 0xF0, 0x00, 0xF0, 0xF9, 0xF0, 0x00, 0xEE, 0xF9, -0xEE, 0x00, 0xEC, 0xF7, 0xEC, 0x00, 0xE8, 0xF7, 0xE9, 0x00, -0xD4, 0xF1, 0xD4, 0x0F, 0x00, 0x02, 0x00, 0x15, 0x04, 0x00, -0x00, 0x00, 0x00, 0xB5, 0xB5, 0xB5, 0x9F, 0x35, 0x35, 0x35, -0x64, 0xDA, 0xDA, 0xDA, 0x23, 0x34, 0x34, 0x34, 0x00, 0x16, -0x16, 0x16, 0x00, 0x07, 0x07, 0x07, 0x00, 0x0C, 0x0C, 0x0C, -0x00, 0x07, 0x07, 0x07, 0x00, 0x05, 0x05, 0x05, 0x00, 0xFB, -0xFD, 0xFB, 0x00, 0x0D, 0xFE, 0x0E, 0x00, 0xFE, 0x01, 0xFF, -0x00, 0xC7, 0xE9, 0xC7, 0x00, 0xEA, 0xF7, 0xEA, 0x00, 0xF1, -0xFA, 0xF0, 0x00, 0xF1, 0xF9, 0xF1, 0x00, 0xF0, 0xFA, 0xF1, -0x00, 0xF0, 0xF9, 0xF0, 0x00, 0xE6, 0xF6, 0xE6, 0x00, 0xE7, -0xE9, 0xE5, 0xF7, 0x00, 0xF7, 0x00, 0xF1, 0x03, 0x00, 0x00, -0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF5, 0xD2, 0xD2, 0xD2, 0xCC, -0x39, 0x39, 0x39, 0x45, 0xDC, 0xDC, 0xDC, 0x0F, 0xFB, 0xFB, -0xFB, 0x00, 0x18, 0x18, 0x18, 0x00, 0x17, 0x17, 0x17, 0x00, -0x09, 0x09, 0x09, 0x00, 0x08, 0x08, 0x08, 0x00, 0x09, 0x08, -0x09, 0x00, 0xBA, 0xE6, 0xB9, 0x00, 0xC9, 0xEE, 0xC9, 0x00, -0xD8, 0xF1, 0xD2, 0x00, 0xE0, 0xF5, 0xD8, 0x00, 0xE0, 0xF3, -0xD7, 0x00, 0xE1, 0xF1, 0xDA, 0x00, 0xE1, 0xEC, 0xDE, 0xFF, -0xE3, 0xE1, 0xE4, 0xF4, 0x3D, 0x1A, 0x3D, 0x02, 0xDE, 0xDE, -0xDE, 0xE9, 0xFD, 0xC6, 0xFE, 0x95, 0x04, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xEA, 0xEA, 0xEA, 0xC7, 0x8E, -0x8E, 0x8E, 0x4C, 0x4B, 0x4B, 0x4B, 0x7E, 0x05, 0x05, 0x05, -0x4C, 0xDA, 0xDA, 0xDA, 0x08, 0x05, 0x05, 0x05, 0x00, 0x20, -0x20, 0x20, 0x00, 0x0D, 0x0D, 0x0D, 0x00, 0x00, 0x00, 0x00, -0x00, 0xDD, 0x0D, 0xD9, 0x00, 0xD6, 0xF5, 0xCF, 0x00, 0x0F, -0xF4, 0x0D, 0x00, 0x10, 0xFA, 0x11, 0xF7, 0xE3, 0xC6, 0xF5, -0xC0, 0xE6, 0xD2, 0xEC, 0xC7, 0xFC, 0xEA, 0x00, 0xD9, 0xFF, -0xF4, 0x00, 0xE4, 0x07, 0x9E, 0x05, 0xA7, 0xFE, 0xF0, 0xFC, -0xEB, 0x00, 0x00, 0x00, 0xFA, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF5, 0xF5, -0xF5, 0xD3, 0xAA, 0xAA, 0xAA, 0x63, 0x0F, 0x0F, 0x0F, 0x32, -0x2E, 0x2E, 0x2E, 0x4F, 0x1A, 0x1A, 0x1A, 0x33, 0xF1, 0xF1, -0xF1, 0x1C, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x01, 0x01, 0x00, -0xF1, 0x2C, 0xE7, 0x0E, 0x0A, 0xF5, 0x02, 0xF9, 0x08, 0xAC, -0x17, 0xA3, 0xC9, 0xD1, 0xD1, 0xB7, 0xF2, 0xF2, 0xF2, 0xCE, -0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, -0x00, 0x01, 0xE8, 0xFC, 0xE8, 0x05, 0x01, 0xEF, 0x01, 0xE9, -0x00, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, -0x22, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x2D, 0x24, -0x80, 0x09, 0xC5, 0x27, 0x8C, 0x05, 0xDE, 0x00, 0x00, 0x00, -0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, -0x05, 0x27, 0x98, 0x22, 0xEE, 0x07, 0x46, 0x01, 0x9A, 0x00, -0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFA, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0xEC, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xEF, -0xF9, 0xE3, 0x0C, 0x16, 0x00, 0x1E, 0x00, 0x00, 0x00, 0xFA, -0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x08, 0x19, -0x02, 0x1B, 0x0F, 0x1B, 0x0C, 0x30, 0x01, 0x05, 0xFF, 0x02, -0xEA, 0xFD, 0xE9, 0x07, 0x02, 0xF1, 0x01, 0xE6, 0x00, 0x00, -0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x00, 0x00, 0x23, 0x43, 0x19, 0x51, 0x4E, -0x55, 0x4F, 0x61, 0x0E, 0x0F, 0x10, 0x1B, 0xDA, 0x05, 0xCA, -0x17, 0xDC, 0xF0, 0xC1, 0x06, 0x00, 0x00, 0x00, 0x01, 0x04, -0x0C, 0x01, 0x0A, 0x52, 0x7B, 0x46, 0x97, 0x5C, 0x55, 0x66, -0x5B, 0x09, 0x08, 0x0B, 0x03, 0xDC, 0xF1, 0xD9, 0x00, 0x90, -0xD2, 0x88, 0x00, 0xE7, 0xF4, 0xF8, 0xE5, 0xF7, 0x00, 0x00, -0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x19, 0x46, 0x0C, 0x5E, 0x7D, 0x90, 0x85, 0x9F, 0xF6, 0xFE, -0xF5, 0x02, 0xE4, 0xF6, 0xDC, 0x00, 0xF8, 0xF0, 0x00, 0x00, -0xEA, 0xE5, 0x04, 0xF1, 0x01, 0x04, 0xFD, 0x05, 0x13, 0x4E, -0x05, 0x71, 0x19, 0x3F, 0x20, 0x5E, 0xBF, 0xF0, 0xAA, 0x00, -0xF7, 0x00, 0xE6, 0x00, 0xE9, 0xF9, 0xE0, 0x00, 0x14, 0x0B, -0xF9, 0xFF, 0xE6, 0xF4, 0x00, 0xE7, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, -0x17, 0xF9, 0x3A, 0x96, 0xDB, 0x84, 0x02, 0x1E, 0x13, 0x04, -0x00, 0x15, 0x0C, 0x05, 0x00, 0x11, 0x13, 0xF9, 0x00, 0x2C, -0x0F, 0x16, 0xF1, 0xE2, 0xFE, 0xE3, 0x02, 0x07, 0x02, 0xFF, -0x09, 0xD3, 0xF7, 0xAF, 0x00, 0x2C, 0x0F, 0x13, 0x00, 0x2B, -0x12, 0x18, 0x00, 0x2D, 0xFD, 0x2D, 0xFF, 0xA9, 0xAD, 0xCB, -0xB8, 0xF3, 0xE1, 0xFD, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xED, -0x01, 0xED, 0x2C, 0x3E, 0x0A, 0x47, 0x38, 0x2A, 0x1D, 0x0B, -0x2E, 0x15, 0x1B, 0xFF, 0xF5, 0xD8, 0x01, 0xE4, 0xAF, 0x77, -0xD8, 0x81, 0xF7, 0xEE, 0xFF, 0xCA, 0xF4, 0xD8, 0xFE, 0xD2, -0x0D, 0xF9, 0x03, 0x0F, 0x11, 0xFB, 0x13, 0xFC, 0xE2, 0xC7, -0xF1, 0xD7, 0xA6, 0x80, 0xCE, 0x9E, 0xD2, 0xAE, 0xF2, 0x8B, -0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x02, 0x00, 0x23, 0x09, 0x0F, 0x02, 0x24, 0xFF, -0xFF, 0x00, 0x01, 0xF7, 0xF0, 0xFE, 0xE4, 0x00, 0x00, 0x00, -0xDA, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, -0xFE, 0x00, 0x00, 0x00, 0xF2, 0x00, 0x00, 0x00, 0xF9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x08, 0x4A, -0xE1, 0x2D, 0xE8, 0x27, 0x03, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Fullscreen3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xB3, 0xC9, 0xD3, 0x00, 0xF3, 0xF9, 0xFF, 0x00, 0x10, 0x0D, -0x0B, 0x00, 0x0D, 0x09, 0x07, 0x00, 0x08, 0x04, 0x03, 0x00, -0x00, 0xFE, 0xFD, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x01, 0xFE, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFE, 0xFD, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0xFD, 0xFE, 0xFF, 0x00, 0xF4, 0xF6, 0xF8, 0x00, -0xEE, 0xF0, 0xF5, 0x00, 0xF0, 0xF1, 0xF2, 0x00, 0xB6, 0xB6, -0xB6, 0x00, 0xE0, 0xDA, 0xD4, 0x00, 0x04, 0x0F, 0x17, 0x00, -0x06, 0x24, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xF0, -0xF4, 0xF7, 0x00, 0xF0, 0xF8, 0xFE, 0x00, 0x02, 0x04, 0x04, -0x00, 0x02, 0x01, 0x02, 0x00, 0xFF, 0x06, 0xFE, 0x00, 0x00, -0xFE, 0xFD, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x01, 0xFD, 0x01, -0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0xFE, 0xFE, 0xFD, 0x00, 0xFE, 0xFD, 0xFE, -0x00, 0xFC, 0xFD, 0xFE, 0x00, 0xF3, 0xF5, 0xF9, 0x00, 0xEF, -0xF1, 0xF6, 0x00, 0xEB, 0xED, 0xF3, 0x00, 0xDA, 0xDE, 0xE1, -0x00, 0xD9, 0xD4, 0xD6, 0x00, 0x0A, 0x0D, 0xE3, 0x00, 0x8A, -0x7C, 0x79, 0x00, 0x0A, 0x0D, 0x0D, 0x00, 0x04, 0x0A, 0x05, -0x04, 0x39, 0xF0, 0xF9, 0xFB, 0x89, 0xF4, 0xF8, 0xFB, 0x01, -0xFB, 0xFE, 0xFF, 0x00, 0x04, 0x01, 0x01, 0x00, 0xFF, 0xFD, -0xFB, 0x00, 0xFC, 0xFB, 0xFD, 0x00, 0xFC, 0xFA, 0xFD, 0x00, -0xFE, 0xFD, 0xFE, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFD, 0xFD, 0xFD, 0x00, -0xFE, 0xFD, 0xFF, 0x00, 0xFB, 0xFB, 0xFC, 0x00, 0xF7, 0xF7, -0xFA, 0x00, 0xFE, 0x01, 0x00, 0x00, 0x0D, 0x0C, 0x0C, 0xA2, -0x05, 0x06, 0x06, 0x9B, 0xFB, 0xF9, 0xF9, 0x00, 0xB3, 0xB1, -0xB1, 0x00, 0x2D, 0x44, 0x46, 0x00, 0x04, 0x0A, 0x06, 0x04, -0x28, 0xFF, 0x03, 0xFE, 0x3D, 0xF5, 0xF9, 0xFA, 0x00, 0xF4, -0xF8, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFB, 0xFB, -0x00, 0xF7, 0xF6, 0xF9, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFC, -0xFA, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFD, 0xFE, -0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xFF, -0xFD, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xF8, 0xF7, 0xF8, -0x00, 0xDA, 0xDC, 0xDE, 0x00, 0xED, 0xF2, 0xF4, 0xD9, 0x0B, -0x0C, 0x0F, 0x9B, 0x05, 0x0B, 0x0F, 0x00, 0xDA, 0xE0, 0xFA, -0x00, 0x02, 0xC5, 0xCD, 0x00, 0x04, 0xF9, 0xFB, 0xFC, 0x00, -0xE9, 0xEF, 0xF3, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, -0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFD, 0xFB, 0xFD, 0x00, -0xFA, 0xF8, 0xF9, 0x00, 0xFE, 0xFC, 0xFD, 0x00, 0xFD, 0xFB, -0xFB, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFE, 0xFD, 0x00, -0xFF, 0xFD, 0xFE, 0x00, 0xFE, 0xFC, 0xFE, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xEB, 0xED, 0xF0, 0x00, 0xEA, 0xEA, 0xEB, 0x00, -0xFB, 0xF8, 0xF7, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x06, 0x0B, -0x0F, 0x00, 0x1E, 0x38, 0x51, 0x00, 0xDC, 0xE6, 0xEC, 0x00, -0xE3, 0xDB, 0xE2, 0x00, 0x04, 0xFC, 0xFE, 0xFF, 0x00, 0xF3, -0xF9, 0xFA, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x00, -0x00, 0xFA, 0xFC, 0xFD, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x00, 0xFA, 0xFB, 0xFC, 0x00, 0xFB, 0xF9, 0xFB, -0x00, 0xFB, 0xF7, 0xF7, 0x00, 0xFC, 0xF9, 0xFB, 0x00, 0xFF, -0xFC, 0xFD, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0xF0, 0xF2, 0xF2, -0x00, 0xFD, 0xFB, 0xFB, 0x00, 0xFC, 0xF9, 0xF9, 0x00, 0xFC, -0xF7, 0xF8, 0x00, 0x09, 0x09, 0x0D, 0x06, 0x28, 0x39, 0x4C, -0x13, 0xF1, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xF4, 0xE9, -0xEF, 0xF8, 0xF9, 0x04, 0xFC, 0xFE, 0xFD, 0x00, 0xF4, 0xFA, -0xFA, 0x00, 0x01, 0x02, 0x02, 0x00, 0xF6, 0xFC, 0xFE, 0x00, -0x22, 0x37, 0x32, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x01, -0x01, 0x00, 0x03, 0xFE, 0xFF, 0x00, 0x02, 0xFD, 0xFA, 0x00, -0xFB, 0xF8, 0xFB, 0x00, 0xF8, 0xF6, 0xFB, 0x00, 0xFC, 0xFA, -0xFC, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x00, -0xFF, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, 0xFF, 0xFB, -0xFD, 0x00, 0x00, 0xFF, 0x00, 0x5C, 0x00, 0xFF, 0x01, 0x5A, -0x02, 0xFD, 0xFB, 0x00, 0xF6, 0xFC, 0xF4, 0xC2, 0xD1, 0xDE, -0xE5, 0x42, 0x04, 0xFE, 0xFF, 0x00, 0xFF, 0xF6, 0xFA, 0xFC, -0x00, 0x00, 0x00, 0xFF, 0x00, 0xF5, 0xFE, 0xFE, 0x00, 0xF8, -0x02, 0x05, 0x00, 0xF9, 0xFA, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, -0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFB, 0xF9, 0xFF, 0x00, 0xF7, -0xF4, 0xFC, 0x00, 0xF9, 0xF5, 0xFA, 0x00, 0xFD, 0xF9, 0xFA, -0x00, 0xFE, 0xFD, 0xFE, 0x00, 0xFF, 0xFC, 0xFC, 0x00, 0xFE, -0xFC, 0xFC, 0x00, 0xFF, 0xFB, 0xFE, 0x00, 0xFF, 0xFC, 0xFE, -0x00, 0x01, 0x00, 0x00, 0x01, 0xEF, 0xE9, 0xEF, 0x03, 0xD3, -0xD7, 0xDF, 0x00, 0xF2, 0xF8, 0xF3, 0x0D, 0x00, 0x07, 0x08, -0x00, 0x04, 0xF8, 0xF4, 0xF6, 0x00, 0xEE, 0xE3, 0xE7, 0x00, -0x00, 0x00, 0x00, 0x00, 0xF8, 0x05, 0x05, 0x00, 0xDE, 0xEB, -0xF5, 0x00, 0xF5, 0xF7, 0xFB, 0x00, 0xFF, 0xFE, 0xFF, 0x00, -0xFE, 0xFC, 0xFE, 0x00, 0xFE, 0xFB, 0xFE, 0x00, 0xFD, 0xFC, -0xFE, 0x00, 0xFE, 0xFA, 0xFD, 0x00, 0xFF, 0xFA, 0xFD, 0x00, -0x00, 0xFB, 0xFB, 0x00, 0xFF, 0xFB, 0xF9, 0x00, 0xFF, 0xFE, -0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0xFB, 0xF8, 0xFC, 0x00, -0xE2, 0xE4, 0xEC, 0x00, 0xEB, 0xEE, 0xF1, 0x00, 0xFF, 0xFB, -0xFC, 0x00, 0x00, 0xFC, 0xFC, 0x00, 0x00, 0x01, 0x03, 0x00, -0x04, 0xFE, 0xFC, 0xFC, 0xFF, 0xF8, 0xF0, 0xF2, 0x00, 0x00, -0x01, 0x00, 0x00, 0xF7, 0x08, 0x09, 0x00, 0xE9, 0xFE, 0x00, -0x00, 0xFC, 0x02, 0x03, 0x00, 0x02, 0x05, 0x04, 0x00, 0x00, -0x08, 0x01, 0x00, 0xFF, 0x02, 0x02, 0x00, 0xFE, 0xF8, 0xFB, -0x00, 0xFB, 0xF2, 0xF6, 0x00, 0xFB, 0xF8, 0xFA, 0x00, 0xFC, -0xF8, 0xFA, 0x00, 0xFE, 0xF8, 0xFA, 0x00, 0xFD, 0xF5, 0xF8, -0x00, 0xF3, 0xEE, 0xF5, 0x00, 0xEE, 0xEF, 0xF3, 0x00, 0xFE, -0xFB, 0xFA, 0x00, 0xFF, 0xF7, 0xF4, 0x00, 0x00, 0xF6, 0xF3, -0x00, 0x00, 0xFB, 0xF8, 0x00, 0x00, 0x01, 0x02, 0x00, 0x04, -0xFF, 0xFD, 0xFE, 0xFF, 0xFB, 0xF7, 0xF8, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xF9, 0xFF, 0x01, 0x00, 0xEE, 0xFA, 0xFD, 0x00, -0xFF, 0xFB, 0xFE, 0x00, 0x00, 0x01, 0xFD, 0x00, 0x01, 0x00, -0x02, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFE, 0xF9, 0xFD, 0x00, -0xFE, 0xF8, 0xFB, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xFC, 0xF8, -0xF9, 0x00, 0xF8, 0xEF, 0xF1, 0x00, 0xF5, 0xF4, 0xF8, 0x00, -0xFD, 0xF9, 0xFE, 0x00, 0xFF, 0x03, 0x01, 0x00, 0xFF, 0xF9, -0xFD, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, -0x00, 0xFF, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x04, 0xFF, -0xFE, 0xFF, 0xFF, 0xFC, 0xF9, 0xFA, 0x00, 0x01, 0x01, 0x01, -0x00, 0xFD, 0xF9, 0xFC, 0x00, 0xEE, 0xEF, 0xFA, 0x00, 0xFF, -0xFC, 0xFB, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0xFE, 0x00, -0x00, 0xFF, 0xFB, 0xFC, 0x00, 0xFD, 0xF2, 0xF7, 0x00, 0xFD, -0xF2, 0xF4, 0x00, 0xFE, 0xF7, 0xF4, 0x00, 0xFC, 0xF3, 0xF3, -0x00, 0xFD, 0xF6, 0xF8, 0x00, 0x00, 0xFA, 0xFE, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0xF4, 0xF6, 0x00, 0x00, 0xF9, 0xF5, -0x00, 0x00, 0xF8, 0xF4, 0x00, 0x00, 0xFC, 0xF8, 0x00, 0x00, -0xFE, 0xFB, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x04, 0x02, 0x03, -0x04, 0xFF, 0x03, 0x05, 0x05, 0x00, 0x01, 0x01, 0x01, 0x00, -0x01, 0xFB, 0xFC, 0x00, 0xF2, 0xD1, 0xDA, 0x00, 0x00, 0xFE, -0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, -0x01, 0xFF, 0x00, 0x00, 0xFF, 0xFC, 0xFE, 0x00, 0x00, 0xFA, -0xFA, 0x00, 0xFF, 0xFB, 0xF8, 0x00, 0xFF, 0xFB, 0xF9, 0x00, -0x00, 0x00, 0x02, 0x00, 0x01, 0x07, 0x07, 0x00, 0xFF, 0xFC, -0xFF, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xFC, 0xFC, 0x00, -0x00, 0xFE, 0xF3, 0x00, 0x00, 0xF8, 0xF4, 0x00, 0x00, 0xFA, -0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x02, -0x00, 0x06, 0x02, 0x03, 0x00, 0x02, 0x03, 0x03, 0x00, 0xFA, -0xFC, 0xFF, 0x00, 0xFF, 0xF0, 0xEF, 0x00, 0x00, 0xFF, 0xFD, -0x00, 0x00, 0xFF, 0x02, 0x00, 0x00, 0x01, 0xFF, 0x00, 0xFF, -0xFF, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFC, 0xFC, -0x00, 0x00, 0xFC, 0xFB, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, -0x02, 0x04, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x01, 0xFE, 0xFF, -0x00, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0xFE, 0xFD, 0x00, 0x00, -0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFD, -0x00, 0x00, 0x00, 0xFE, 0x00, 0x04, 0x25, 0x21, 0x20, 0xEA, -0x4A, 0x41, 0x01, 0xF3, 0x01, 0x03, 0x03, 0x01, 0xE3, 0xEB, -0xEE, 0x02, 0xCE, 0xC8, 0xE0, 0x0A, 0xFF, 0x00, 0xFF, 0x00, -0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x02, -0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x00, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFC, 0xFD, 0x00, -0x00, 0xFE, 0xFC, 0x00, 0x00, 0xFE, 0xFD, 0x00, 0x00, 0xFF, -0xFD, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0xFE, 0xFD, 0xFF, -0x00, 0xFE, 0xFD, 0x00, 0x04, 0xFA, 0xF8, 0xF8, 0xBA, 0xFA, -0xF4, 0xF6, 0x0E, 0x00, 0x03, 0x02, 0x00, 0xC2, 0xD2, 0xDE, -0x34, 0xFF, 0xFE, 0x00, 0xCB, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0xFF, 0x00, -0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x01, 0x01, 0xFE, -0x00, 0xFF, 0xFD, 0xFB, 0x00, 0x00, 0xFA, 0xFA, 0x00, 0x00, -0xFA, 0xFA, 0x00, 0x00, 0xFB, 0xF8, 0x00, 0x00, 0xFC, 0xFB, -0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0xFD, 0xFC, 0x00, 0x00, -0xFD, 0xFE, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, -0xFF, 0x00, 0xAC, 0xD1, 0xE1, 0x00, 0xD4, 0xEA, 0xF9, 0x00, -0x01, 0x0F, 0x11, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x01, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x02, -0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x03, 0x03, 0x00, -0xFF, 0xFD, 0xFC, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x01, -0xFD, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x00, 0x03, 0x01, 0x00, -0x00, 0x04, 0x03, 0x00, 0x00, 0xFE, 0x07, 0x00, 0x00, 0x05, -0xFD, 0x00, 0x04, 0xFF, 0x01, 0x02, 0x00, 0xD7, 0xF0, 0x00, -0x00, 0x03, 0x05, 0x0D, 0x00, 0x30, 0x20, 0x0D, 0x00, 0x07, -0x07, 0x08, 0x00, 0x02, 0x05, 0x05, 0x00, 0x03, 0x04, 0x04, -0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, -0x05, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x03, -0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, -0xFC, 0xFA, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0xFE, 0xFA, 0xFA, -0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xFD, 0xF9, 0xF6, 0x00, 0xFE, -0xF7, 0xF1, 0x00, 0xFB, 0xF2, 0xED, 0x00, 0xF5, 0xEB, 0xEC, -0x00, 0x04, 0xF2, 0xE9, 0xDB, 0x00, 0xF9, 0xD1, 0xA2, 0x00, -0x21, 0x00, 0x00, 0x00, 0xFE, 0x08, 0x14, 0xE0, 0x32, 0x48, -0x60, 0xA1, 0xF8, 0xF9, 0xF7, 0x0C, 0xED, 0xF0, 0xEC, 0x0A, -0xFE, 0x03, 0x01, 0x08, 0x00, 0x02, 0xFF, 0x03, 0xFF, 0x01, -0xFF, 0x01, 0x00, 0xFD, 0xFF, 0x00, 0x01, 0xFE, 0xFF, 0x01, -0x00, 0xFD, 0xFE, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, -0xFF, 0x00, 0x01, 0x02, 0xFF, 0x00, 0x00, 0x05, 0xFE, 0xFE, -0x01, 0x02, 0xFE, 0xFB, 0x02, 0x07, 0x02, 0xF7, 0x1B, 0x27, -0x26, 0xF7, 0xF3, 0xF0, 0xEB, 0xC6, 0xC0, 0xAC, 0xB6, 0x00, -0x01, 0xFA, 0xFA, 0xFA, 0x00, 0x05, 0x05, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x01, 0x01, 0x01, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, -0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, -0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFB, 0x00, -0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0xF9, 0x00, 0x00, 0x00, -0xFA, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0xFF, 0x04, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFE, -0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, -0x00, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x78, 0x37, -0xB5, 0x40, 0x48, 0xBA, 0x99, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x0A, -0x0C, 0x0A, 0x11, 0x1B, 0x21, 0x34, 0xF9, 0xFA, 0xFC, 0x01, -0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x01, 0x00, 0x01, 0x01, -0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, -0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFE, 0xFE, -0xFF, 0x00, 0xFF, 0xFF, 0xFE, 0x00, 0xFE, 0xFE, 0xFE, 0x00, -0xFF, 0xFE, 0xFF, 0x00, 0x0C, 0x09, 0x05, 0xF5, 0xE2, 0xDC, -0xD6, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0C, 0x1B, 0x26, -0x41, 0x33, 0x67, 0x84, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFE, -0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFF, -0xFD, 0xFD, 0x00, 0xFF, 0xFD, 0xFD, 0x00, 0xFF, 0xFD, 0xFD, -0x00, 0xFE, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, 0xFA, -0xF7, 0xF6, 0x00, 0xEA, 0xD9, 0xDB, 0xF0, 0x02, 0xE0, 0xDE, -0x12, 0xFE, 0xFC, 0xF8, 0xFF, 0x04, 0xFD, 0xFD, 0xFD, 0x02, -0x10, 0x03, 0xFD, 0x00, 0x15, 0xF7, 0xE1, 0x00, 0xDD, 0x01, -0x1C, 0x00, 0xFD, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFE, 0xFF, 0x00, -0x00, 0xFE, 0xFE, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFE, 0xFD, -0xFD, 0x00, 0xFF, 0xFD, 0xFD, 0x00, 0xFE, 0xFD, 0xFC, 0x00, -0xFF, 0xFD, 0xFC, 0x00, 0xF1, 0xEB, 0xED, 0x00, 0xDC, 0xCF, -0xD4, 0x00, 0x00, 0xFB, 0xF9, 0x01, 0xFF, 0xFF, 0xFF, 0x01, -0x00, 0x00, 0x00, 0xFF, 0x02, 0x00, 0xFF, 0x00, 0x00, 0x0D, -0x05, 0x00, 0x00, 0x5B, 0x48, 0x3B, 0x00, 0x07, 0x02, 0x00, -0x00, 0xFE, 0xFC, 0xFB, 0x00, 0xFE, 0xFC, 0xFC, 0x00, 0xFE, -0xFC, 0xFC, 0x00, 0xFE, 0xFC, 0xFC, 0x00, 0xFF, 0xFD, 0xFD, -0x00, 0xFE, 0xFC, 0xFE, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x01, 0x03, 0x00, 0x01, 0x03, 0x06, 0x00, 0x02, 0x05, 0x09, -0x00, 0x03, 0x06, 0x08, 0x00, 0x03, 0x03, 0x04, 0x00, 0xED, -0xE4, 0xE6, 0x00, 0xE2, 0xD9, 0xDE, 0x00, 0x06, 0x07, 0x06, -0x00, 0x08, 0x0C, 0x0B, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xFF, 0x00, 0xE1, 0xEE, -0xF7, 0x00, 0x88, 0xB6, 0xD9, 0x00, 0xF7, 0x01, 0x08, 0x00, -0x03, 0x03, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x04, 0x02, 0x01, 0x00, 0x00, 0xFE, 0xFC, 0x00, 0xF8, 0xF7, -0xF8, 0x00, 0xFE, 0xFB, 0xFA, 0x00, 0xFC, 0xFB, 0xF9, 0x00, -0xF9, 0xF4, 0xF7, 0x00, 0xE1, 0xD8, 0xDE, 0x00, 0xF3, 0xF0, -0xF2, 0x00, 0x10, 0x0C, 0x08, 0x00, 0x13, 0x11, 0x0A, 0x00, -0xF5, 0xF6, 0xF8, 0x00, 0xE9, 0xFF, 0xFF, 0x01, 0x00, 0x00, -0x00, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x07, 0x01, 0xFF, -0x00, 0x46, 0x34, 0x04, 0x00, 0xBC, 0xCC, 0xF1, 0x00, 0xEE, -0xF2, 0xFE, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, -0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x11, -0x0A, 0x04, 0x00, 0x00, 0x03, 0x05, 0x00, 0xF7, 0xFE, 0x01, -0x00, 0xFB, 0xFD, 0x02, 0x00, 0xF0, 0xEA, 0xF4, 0x00, 0xE4, -0xDF, 0xE5, 0x00, 0xFD, 0xFF, 0x06, 0x00, 0x0C, 0x11, 0x16, -0x00, 0x6A, 0x56, 0x30, 0x00, 0x5B, 0x51, 0x40, 0x00, 0xE7, -0xE7, 0xE9, 0x0C, 0x68, 0x67, 0xCE, 0x4B, 0xCC, 0xCC, 0xCC, -0xB2, 0x02, 0xFE, 0xFC, 0xF9, 0x00, 0xF7, 0xF4, 0xF3, 0x00, -0xF7, 0xF2, 0xDA, 0x00, 0xF9, 0xFC, 0x02, 0x00, 0x03, 0x06, -0x0B, 0x00, 0x03, 0x06, 0x0D, 0x00, 0x03, 0x06, 0x0C, 0x00, -0x03, 0x06, 0x0B, 0x00, 0x1B, 0x0F, 0x07, 0x00, 0x8E, 0x63, -0x3E, 0x00, 0x14, 0x05, 0xFA, 0x00, 0x12, 0x0F, 0x0C, 0x00, -0xF5, 0xED, 0xF1, 0x00, 0xEA, 0xE9, 0xEE, 0x00, 0x03, 0x04, -0x01, 0x00, 0x02, 0xFC, 0xF3, 0x00, 0x0B, 0xFE, 0xEA, 0x00, -0x50, 0x45, 0x35, 0x00, 0x01, 0x01, 0x03, 0x00, 0x5A, 0x6A, -0x86, 0xF6, 0xCC, 0xCE, 0xD0, 0xBE, 0x00, 0x00, 0x00, 0x00, -0x04, 0xFF, 0xFF, 0x00, 0x00, 0xF7, 0xF7, 0xFC, 0x00, 0xAE, -0xC5, 0x13, 0x00, 0x00, 0x00, 0xF6, 0x00, 0x00, 0xFF, 0xF5, -0x00, 0x01, 0x00, 0xFF, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, -0x01, 0x01, 0x00, 0xE0, 0xED, 0xF9, 0x00, 0x98, 0xA6, 0xB4, -0x00, 0x4F, 0x32, 0x24, 0x00, 0x86, 0x9D, 0xBD, 0x00, 0x02, -0xFE, 0x06, 0x00, 0x05, 0xFF, 0xFC, 0x00, 0xF8, 0xFC, 0x00, -0x00, 0x08, 0x0C, 0x13, 0x00, 0x2F, 0x28, 0x0D, 0x00, 0xF8, -0xF8, 0xF7, 0x00, 0x05, 0x06, 0x05, 0x00, 0x31, 0x2F, 0x2A, -0xFF, 0x09, 0xFA, 0xDF, 0x32, 0xF3, 0xF1, 0xEF, 0xF5, 0x03, -0x07, 0x0C, 0x14, 0x28, 0x16, 0x24, 0x32, 0x59, 0xFF, 0xFE, -0xFF, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0xFF, 0xFE, 0x01, 0x00, -0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFF, 0xFF, -0x02, 0x00, 0xFD, 0x00, 0x05, 0x00, 0xCC, 0xD8, 0xEC, 0x00, -0xD4, 0xD6, 0xDB, 0x00, 0x83, 0x6C, 0x50, 0x00, 0xC8, 0xD3, -0xE1, 0x00, 0x11, 0x0E, 0x07, 0x00, 0x03, 0xFE, 0xF7, 0x00, -0x0C, 0xFF, 0xEF, 0x00, 0x35, 0x26, 0x11, 0x00, 0x05, 0x03, -0xFF, 0x00, 0xDC, 0xDD, 0xDC, 0x00, 0x32, 0x2A, 0x1D, 0x06, -0x3A, 0x39, 0x39, 0x5B, 0xAB, 0xAB, 0xAB, 0xA4, 0x04, 0x01, -0x02, 0x03, 0x00, 0x01, 0x04, 0x09, 0x00, 0xFF, 0x00, 0x01, -0x00, 0x00, 0x01, 0x02, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, -0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF8, 0xF5, 0xF3, -0x00, 0xEB, 0xE7, 0xEB, 0x00, 0xFC, 0xFB, 0xFB, 0x00, 0xD9, -0xEF, 0xF9, 0x00, 0x7A, 0x8E, 0xA7, 0x00, 0x83, 0x6E, 0x54, -0x00, 0x8D, 0xA0, 0xBB, 0x00, 0x1A, 0x1A, 0x1B, 0x00, 0x12, -0x07, 0x13, 0x00, 0x53, 0x4D, 0x46, 0x00, 0xB0, 0xB2, 0xAF, -0x00, 0x06, 0x05, 0x06, 0x00, 0xE8, 0xEA, 0xEF, 0xFE, 0xC3, -0xC0, 0xBC, 0x8A, 0xF0, 0xF0, 0xF0, 0xCB, 0x01, 0x0D, 0x17, -0x23, 0x4E, 0x29, 0x45, 0x5E, 0xB1, 0x02, 0x02, 0x03, 0x00, -0x01, 0x02, 0x03, 0x00, 0xFF, 0x01, 0x02, 0x00, 0x00, 0x02, -0x05, 0x00, 0xF4, 0xF2, 0xF8, 0x00, 0xF2, 0xF3, 0xF8, 0x00, -0x02, 0x05, 0x06, 0x00, 0x02, 0x03, 0x05, 0x00, 0xFF, 0xFF, -0xFE, 0x00, 0xFE, 0xFA, 0xF8, 0x00, 0x23, 0x0F, 0xF6, 0x00, -0x80, 0x6D, 0x53, 0x00, 0xB0, 0xB7, 0xC2, 0x00, 0x07, 0xFF, -0xF0, 0x00, 0xF7, 0xF6, 0xF5, 0x00, 0xCF, 0xD7, 0xE6, 0x00, -0xD4, 0xE0, 0xF7, 0x00, 0xFF, 0x03, 0x0A, 0xF2, 0xEF, 0xD7, -0xAF, 0x16, 0xFF, 0xFE, 0xFB, 0xF9, 0x02, 0x00, 0x01, 0x03, -0x01, 0xFF, 0x00, 0x07, 0x00, 0xFD, 0xFE, 0x04, 0x00, 0xFC, -0xFC, 0x01, 0x00, 0xF7, 0xF4, 0xF9, 0x00, 0xE2, 0xD9, 0xDE, -0x00, 0xE7, 0xE1, 0xE3, 0x00, 0xF5, 0xF0, 0xEF, 0x00, 0xF5, -0xEF, 0xEE, 0x00, 0xF3, 0xEE, 0xEC, 0x00, 0xF5, 0xEF, 0xEF, -0x00, 0x04, 0xFE, 0xFB, 0x00, 0xEA, 0xF0, 0xFA, 0x00, 0x9E, -0xA4, 0xAF, 0x00, 0x4E, 0x44, 0x36, 0x00, 0xFF, 0xFD, 0xFE, -0x00, 0xF1, 0xEE, 0xDA, 0x00, 0x11, 0x10, 0xEB, 0x00, 0x0D, -0x0D, 0x06, 0x00, 0xFC, 0xFC, 0x00, 0xFF, 0xFF, 0x00, 0x01, -0xFB, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFE, 0xFC, 0xFC, 0x00, -0xFA, 0xF5, 0xF4, 0x00, 0x00, 0x01, 0x02, 0x00, 0xF3, 0xF2, -0xF5, 0x00, 0xF1, 0xEF, 0xF3, 0x00, 0x00, 0x02, 0x03, 0x00, -0x02, 0x03, 0x03, 0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0x00, -0x00, 0x00, 0x01, 0x00, 0xFF, 0x00, 0x0C, 0x0A, 0x05, 0x00, -0x06, 0x00, 0xF7, 0x00, 0x38, 0x2A, 0x16, 0x00, 0x02, 0xF5, -0xE1, 0x00, 0x95, 0x96, 0x95, 0x00, 0x5F, 0x60, 0x61, 0x00, -0x03, 0xF1, 0xF1, 0x00, 0xCE, 0xCF, 0xC5, 0x00, 0x0C, 0x0C, -0x0F, 0x00, 0xCC, 0xD6, 0x00, 0x00, 0xF2, 0xDB, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x04, 0xFF, 0x01, 0x02, 0x00, 0x20, -0x1E, 0x1F, 0x00, 0x0C, 0x03, 0xFA, 0x00, 0xB9, 0xA8, 0x8F, -0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, -0x00, 0x01, 0x00, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x01, -0x00, 0x01, 0x01, 0x00, 0x00, 0xF7, 0x04, 0x03, 0x00, 0x53, -0x5A, 0x58, 0x00, 0xEA, 0xE7, 0xDB, 0x00, 0xE2, 0xE4, 0xE5, -0x00, 0x05, 0x06, 0x08, 0x00, 0xBC, 0xA2, 0x61, 0x00, 0x85, -0x69, 0xEC, 0x00, 0x20, 0x08, 0x09, 0x00, 0x8C, 0xAE, 0x03, -0x00, 0x22, 0x16, 0x15, 0x00, 0xD8, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x04, 0xFF, 0xFD, 0xFB, 0xE9, 0xDB, 0xCF, -0xC0, 0xBD, 0xFC, 0xF7, 0xF5, 0x01, 0xEF, 0xE9, 0xE0, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x00, -0x03, 0x03, 0x02, 0x05, 0x6C, 0x6B, 0x6A, 0x38, 0xE4, 0xE1, -0xD8, 0x05, 0xDF, 0xDF, 0xE0, 0x00, 0x24, 0x23, 0x24, 0xDE, -0xA5, 0xA6, 0xA8, 0xE1, 0xC2, 0x06, 0xFF, 0x00, 0xF5, 0xF2, -0xFF, 0x14, 0x8B, 0x84, 0xF5, 0x2C, 0x8B, 0x70, 0xF9, 0x01, -0x8C, 0x94, 0xD2, 0xF2, 0xB6, 0xFE, 0xFA, 0x05, 0x00, 0x00, -0x00, 0xF9, 0x01, 0x0F, 0x1D, 0x33, 0x08, 0x26, 0x39, 0x4B, -0x0C, 0xFF, 0xFF, 0x00, 0x00, 0xF2, 0xEF, 0xF3, 0x00, 0xF6, -0xF6, 0xF8, 0x00, 0x01, 0x02, 0x03, 0x00, 0x02, 0x03, 0x04, -0x00, 0x01, 0x02, 0x03, 0x00, 0x01, 0xFE, 0xF8, 0x05, 0x5D, -0x44, 0x21, 0x8D, 0x05, 0x01, 0xF8, 0x49, 0xB0, 0xB0, 0xAF, -0x10, 0x3E, 0x3E, 0x41, 0xD0, 0xA3, 0xB8, 0xD6, 0x5E, 0x0A, -0x14, 0x25, 0xE7, 0xFF, 0xFF, 0xFF, 0x00, 0xF6, 0xEE, 0xE3, -0x0C, 0x7E, 0x40, 0xB3, 0xAB, 0x5C, 0x5D, 0x0F, 0x34, 0x02, -0x06, 0x08, 0xFF, 0x8A, 0x8A, 0xE5, 0x8C, 0x89, 0xA9, 0x00, -0x79, 0x01, 0x06, 0x0B, 0x13, 0x00, 0x0C, 0x14, 0x1C, 0x01, -0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0xF8, 0xF8, -0xFA, 0x00, 0xFC, 0xFB, 0xFD, 0x00, 0x00, 0x01, 0x01, 0x00, -0x01, 0x02, 0x02, 0x00, 0x17, 0x0F, 0x05, 0x29, 0x39, 0x33, -0x28, 0x5D, 0xDF, 0xDE, 0xDF, 0xE1, 0x55, 0x55, 0x54, 0x73, -0x7F, 0x81, 0x83, 0x4F, 0xFC, 0x07, 0x19, 0xD8, 0x00, 0x01, -0x02, 0xFF, 0x00, 0xFF, 0xFE, 0x00, 0xFF, 0xFD, 0xFC, 0x01, -0x02, 0xF6, 0xE1, 0x23, 0x8B, 0x66, 0xFC, 0xA6, 0x58, 0x54, -0x09, 0x34, 0x06, 0x0E, 0x04, 0xFF, 0x80, 0x82, 0xF3, 0x81, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x0F, 0x67, 0x67, 0x67, -0xAA, 0x67, 0x67, 0x67, 0xB1, 0x0D, 0x0D, 0x0D, 0x32, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x05, 0x03, 0x00, 0x1F, 0x88, 0x65, 0x00, -0xC2, 0xE5, 0xB5, 0x02, 0xFC, 0x51, 0x3C, 0x00, 0x71, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, -0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x17, -0x1A, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x82, 0x49, -0x5F, 0x6E, 0x58, 0xCF, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB3, 0xB3, 0xB3, 0x00, 0x9C, 0x9C, -0x9C, 0x05, 0xB8, 0xB8, 0xB8, 0x10, 0x22, 0x22, 0x22, 0x28, -0x21, 0x21, 0x21, 0x21, 0x04, 0x04, 0x04, 0x08, 0xF6, 0xF6, -0xF6, 0xF0, 0xD6, 0xD6, 0xD6, 0xD9, 0xF8, 0xF8, 0xF8, 0xE0, -0x59, 0x59, 0x59, 0xF4, 0x6E, 0x6E, 0x6E, 0xFD, 0x27, 0x27, -0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xE7, 0xE7, 0xE7, 0x00, 0x49, -0x49, 0x49, 0x05, 0x1E, 0x1E, 0x1E, 0x34, 0x8D, 0x8D, 0x8D, -0x9F, 0xE1, 0xE1, 0xE1, 0xE9, 0xF3, 0xF3, 0xF3, 0xFE, 0xF1, -0xF1, 0xF1, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 0xF1, 0xF1, 0xF1, -0xFF, 0xF2, 0xF2, 0xF2, 0xFC, 0xCC, 0xCC, 0xCC, 0xD7, 0x6A, -0x6A, 0x6A, 0x7F, 0x13, 0x13, 0x13, 0x1C, 0x7E, 0x7E, 0x7E, -0x02, 0xF8, 0xF8, 0xF8, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0xD7, 0xD7, 0xD7, 0x00, 0x1C, 0x1C, 0x1C, 0x0E, 0x6E, 0x6E, -0x6E, 0x82, 0xEB, 0xEB, 0xEB, 0xF4, 0xEE, 0xEE, 0xEE, 0xFF, -0xE7, 0xE7, 0xE7, 0xFF, 0xE2, 0xE2, 0xE2, 0xFF, 0xE0, 0xE0, -0xE0, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, -0xE2, 0xE2, 0xE2, 0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xEF, 0xEF, -0xEF, 0xFE, 0xD4, 0xD4, 0xD4, 0xDF, 0x3A, 0x3A, 0x3A, 0x51, -0x4A, 0x4A, 0x4A, 0x06, 0xF6, 0xF6, 0xF6, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xDA, 0xDA, 0x00, 0x44, -0x44, 0x44, 0x11, 0x7A, 0x7A, 0x7A, 0x95, 0x5B, 0x5B, 0x5B, -0x58, 0xF5, 0xF5, 0xF5, 0x01, 0xF9, 0xF9, 0xF9, 0x00, 0xF7, -0xFA, 0xFD, 0x00, 0xCC, 0xE1, 0xF6, 0x00, 0xE3, 0xEE, 0xF8, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x08, 0x06, 0x03, 0x00, 0x2B, -0x1A, 0x0B, 0x00, 0x29, 0x1A, 0x0A, 0x00, 0x03, 0x02, 0x01, -0x00, 0x08, 0x08, 0x08, 0x00, 0x04, 0x04, 0x04, 0xF8, 0x67, -0x67, 0x67, 0x72, 0xF7, 0xF7, 0xF7, 0x9D, 0xAE, 0xAE, 0xAE, -0xFA, 0x07, 0x07, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0x3B, 0x3B, 0x3B, 0x08, 0x4D, 0x4D, -0x4D, 0x8B, 0x71, 0x71, 0x71, 0x6B, 0xF2, 0xF2, 0xF2, 0x01, -0xF9, 0xFA, 0xFB, 0x00, 0xB7, 0xD6, 0xF3, 0x00, 0xD4, 0xEA, -0xFF, 0x00, 0x1C, 0x16, 0x0E, 0x00, 0x0D, 0x07, 0x03, 0x00, -0xFE, 0xFD, 0xFE, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0xE7, 0xED, -0xF5, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0x4A, 0x2C, 0x0F, 0x00, -0x30, 0x1E, 0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x06, 0x06, -0x06, 0xF8, 0x4E, 0x4E, 0x4E, 0x5A, 0x44, 0x44, 0x44, 0xB1, -0x81, 0x81, 0x81, 0xFE, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x93, -0x93, 0x93, 0x01, 0xA6, 0xA6, 0xA6, 0x4D, 0xB9, 0xB9, 0xB9, -0xAD, 0xF5, 0xF5, 0xF5, 0x04, 0xF6, 0xF7, 0xF9, 0x00, 0x99, -0xC8, 0xF1, 0x00, 0x01, 0x09, 0x11, 0x00, 0x0B, 0x08, 0x05, -0x00, 0x1B, 0x09, 0xF9, 0x00, 0x2A, 0x18, 0x0A, 0x00, 0x0D, -0x08, 0x03, 0x00, 0xF2, 0xF7, 0xFC, 0x00, 0xC8, 0xDC, 0xEF, -0x00, 0xEA, 0xF6, 0x01, 0x00, 0xE5, 0xEA, 0xEF, 0x00, 0x3B, -0x1F, 0x05, 0x00, 0x48, 0x2E, 0x13, 0x00, 0x09, 0x09, 0x09, -0x00, 0xEB, 0xEB, 0xEB, 0xE0, 0x40, 0x40, 0x40, 0x3D, 0xC5, -0xC5, 0xC5, 0xE4, 0x01, 0xFA, 0xFA, 0xFA, 0x00, 0x2C, 0x2C, -0x2C, 0x0C, 0x92, 0x92, 0x92, 0xB9, 0x33, 0x33, 0x33, 0x3A, -0xF4, 0xF4, 0xF4, 0x00, 0xA6, 0xCE, 0xF4, 0x00, 0xE1, 0xFB, -0x0F, 0x00, 0x07, 0x07, 0x06, 0x00, 0xF8, 0xF6, 0xF7, 0x00, -0x74, 0x40, 0x12, 0x00, 0x26, 0x1A, 0x0E, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFC, 0xFE, 0x00, -0x7A, 0xA7, 0xD3, 0x00, 0xE9, 0xF6, 0x01, 0x00, 0xEC, 0xEC, -0xEE, 0x00, 0x66, 0x3C, 0x13, 0x00, 0x31, 0x20, 0x0E, 0x00, -0x0E, 0x0E, 0x0E, 0xFF, 0x7C, 0x7C, 0x7C, 0x81, 0x07, 0x07, -0x07, 0x84, 0x02, 0xCE, 0xCE, 0xCE, 0x00, 0xFF, 0xFF, 0xFF, -0x2E, 0x3A, 0x3A, 0x3A, 0x36, 0xF9, 0xF9, 0xF9, 0x00, 0xE4, -0xF1, 0xFC, 0x00, 0xC5, 0xE9, 0x05, 0x00, 0xF0, 0xFD, 0x06, -0x00, 0xE7, 0xF3, 0xFD, 0x00, 0xEC, 0xF8, 0x01, 0x00, 0x98, -0xC2, 0xE7, 0x00, 0x61, 0x9A, 0xD0, 0x00, 0x63, 0x98, 0xCB, -0x00, 0xF5, 0xF8, 0xFB, 0x00, 0x05, 0x04, 0x02, 0x00, 0x21, -0x15, 0x09, 0x00, 0xE5, 0xEF, 0xF9, 0x00, 0xF7, 0x00, 0x07, -0x00, 0x9A, 0xC0, 0xE6, 0x00, 0xFD, 0xFE, 0xFF, 0x00, 0xF8, -0xF8, 0xF8, 0x01, 0x60, 0x60, 0x60, 0x58, 0xA7, 0xA7, 0xA7, -0x0C, 0x04, 0xC6, 0xC6, 0xC6, 0x01, 0x40, 0x40, 0x40, 0x40, -0xFE, 0xFE, 0xFE, 0x04, 0xFC, 0xFC, 0xFC, 0x00, 0xBE, 0xDC, -0xF8, 0x00, 0xF4, 0x02, 0x11, 0x00, 0xF4, 0xF3, 0xFD, 0x00, -0xFD, 0xFC, 0xFC, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0xE2, 0xED, -0x00, 0x00, 0xFA, 0xFB, 0x05, 0x00, 0x05, 0xF9, 0xF8, 0x00, -0xFE, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD4, 0xE4, -0xF3, 0x00, 0xE5, 0xEF, 0xF8, 0x00, 0xFD, 0xFD, 0xFD, 0x00, -0xF9, 0xF4, 0xFA, 0x00, 0xD6, 0xE5, 0xF4, 0x00, 0x2E, 0x1E, -0x02, 0x00, 0x25, 0x25, 0x25, 0x25, 0x01, 0x01, 0x01, 0x20, -0x04, 0xCE, 0xCE, 0xCE, 0x03, 0x35, 0x35, 0x35, 0x28, 0xFC, -0xFC, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xCC, 0xE7, 0xFE, -0x00, 0xEC, 0xFC, 0x01, 0x00, 0xFD, 0xFD, 0xFC, 0x00, 0xFC, -0xFB, 0xFC, 0x00, 0xFB, 0xFA, 0xFB, 0x00, 0xFB, 0xFB, 0xFC, -0x00, 0xFD, 0xFA, 0xF8, 0x00, 0x90, 0x4F, 0x1C, 0x00, 0x0D, -0x0A, 0x06, 0x00, 0xC9, 0xDA, 0xEB, 0x00, 0xA9, 0xCC, 0xED, -0x00, 0xFB, 0xFF, 0x03, 0x00, 0xFE, 0xFC, 0xFB, 0x00, 0xFD, -0xFA, 0xFE, 0x00, 0xC8, 0xDB, 0xEE, 0x00, 0x2C, 0x1C, 0x0C, -0x00, 0xFF, 0xFF, 0xFF, 0x03, 0x29, 0x29, 0x29, 0x27, 0x04, -0xFB, 0xFB, 0xFB, 0x01, 0x09, 0x09, 0x09, 0x0F, 0xFE, 0xFE, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0xF4, 0xFC, 0x00, -0xFB, 0x06, 0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0xFD, 0xFE, -0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x3F, 0x20, 0x06, 0x00, 0x58, 0x39, 0x1B, 0x00, 0xE9, 0xF0, -0xF7, 0x00, 0x5D, 0x98, 0xD1, 0x00, 0xF9, 0x00, 0x05, 0x00, -0xFD, 0xFD, 0xFC, 0x00, 0xFD, 0xFD, 0xFF, 0x00, 0xFD, 0xFE, -0x00, 0x00, 0xEC, 0xF1, 0xF9, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x0A, 0x0A, 0x10, 0x02, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF8, 0x01, 0x01, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x07, 0x03, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x49, -0x2B, 0x10, 0x00, 0x01, 0x01, 0x01, 0x00, 0x9F, 0xC0, 0xDF, -0x00, 0xE8, 0xF9, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0x00, 0x0B, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, 0xF8, 0x04, 0x23, 0x23, -0x23, 0xFD, 0xE0, 0xE0, 0xE0, 0xE0, 0x02, 0x02, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x25, 0x12, 0x02, 0x00, 0xE0, 0xEB, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0xB9, 0xD3, -0xEB, 0x00, 0xDF, 0xE6, 0xEE, 0x00, 0xBF, 0xDB, 0xF5, 0x00, -0x01, 0x02, 0x02, 0x00, 0x00, 0xFD, 0xFD, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFD, 0x00, -0x2B, 0x1D, 0x0E, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, -0x02, 0xFF, 0xE0, 0xE0, 0xE0, 0xDF, 0x02, 0x3D, 0x3D, 0x3D, -0xFE, 0xC4, 0xC4, 0xC4, 0xC7, 0x05, 0x05, 0x05, 0xFF, 0x02, -0x02, 0x02, 0x00, 0x42, 0x22, 0x06, 0x00, 0xFD, 0xF9, 0xF7, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x08, -0x05, 0x01, 0x00, 0x0E, 0x0A, 0x02, 0x00, 0xF8, 0x02, 0x06, -0x00, 0x19, 0x16, 0x10, 0x00, 0x07, 0x09, 0x06, 0x00, 0x10, -0x0B, 0x02, 0x00, 0x09, 0x07, 0x02, 0x00, 0x03, 0x02, 0x01, -0x00, 0x00, 0x00, 0xFF, 0x00, 0x13, 0x08, 0xFE, 0x00, 0x3A, -0x26, 0x12, 0x00, 0x03, 0x03, 0x03, 0x00, 0xEE, 0xEE, 0xEE, -0xEB, 0xE5, 0xE5, 0xE5, 0xD8, 0x02, 0x38, 0x38, 0x38, 0x00, -0xD8, 0xD8, 0xD8, 0xC5, 0xE2, 0xE2, 0xE2, 0xE1, 0x06, 0x06, -0x06, 0x00, 0x33, 0x1D, 0x07, 0x00, 0x2F, 0x0F, 0xF6, 0x00, -0x00, 0xFE, 0xFC, 0x00, 0x0D, 0x09, 0x00, 0x00, 0x18, 0x10, -0x01, 0x00, 0x15, 0x0C, 0xFD, 0x00, 0x8C, 0x52, 0x1F, 0x00, -0x69, 0x42, 0x1F, 0x00, 0x86, 0x51, 0x21, 0x00, 0x17, 0x10, -0x02, 0x00, 0x1B, 0x14, 0x06, 0x00, 0x0F, 0x0C, 0x03, 0x00, -0x02, 0xFD, 0xFB, 0x00, 0x6D, 0x44, 0x1B, 0x00, 0x08, 0x05, -0x01, 0x00, 0x07, 0x07, 0x07, 0x00, 0xAE, 0xAE, 0xAE, 0xB6, -0x40, 0x40, 0x40, 0xF0, 0x02, 0x10, 0x10, 0x10, 0x00, 0x58, -0x58, 0x58, 0xEE, 0x8E, 0x8E, 0x8E, 0x97, 0x09, 0x09, 0x09, -0xFF, 0x03, 0x02, 0x02, 0x00, 0x7C, 0x42, 0x0E, 0x00, 0x13, -0xFE, 0xEF, 0x00, 0x02, 0xFF, 0xFD, 0x00, 0x04, 0x02, 0x00, -0x00, 0x02, 0x01, 0x00, 0x00, 0xD5, 0xE2, 0xEF, 0x00, 0xFE, -0xFF, 0xFF, 0x00, 0xD5, 0xE1, 0xED, 0x00, 0x03, 0x02, 0x01, -0x00, 0x04, 0x03, 0x01, 0x00, 0x03, 0xFF, 0xFC, 0x00, 0x4B, -0x2A, 0x0A, 0x00, 0x5C, 0x3C, 0x1B, 0x00, 0x04, 0x04, 0x04, -0x00, 0xFD, 0xFD, 0xFD, 0xF5, 0x93, 0x93, 0x93, 0x95, 0x6C, -0x6C, 0x6C, 0xFB, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xEB, 0xEB, -0xEB, 0x00, 0x28, 0x28, 0x28, 0x12, 0xA5, 0xA5, 0xA5, 0xB3, -0x35, 0x35, 0x35, 0x3A, 0xF4, 0xF4, 0xF4, 0x00, 0xEC, 0xF5, -0xFD, 0x00, 0x84, 0xBB, 0xED, 0x00, 0xD6, 0xF1, 0x04, 0x00, -0x08, 0x08, 0x05, 0x00, 0xFD, 0xF5, 0xF1, 0x00, 0x0D, 0xFF, -0xF7, 0x00, 0xEE, 0xFC, 0x04, 0x00, 0xFE, 0x01, 0x05, 0x00, -0xF8, 0xF2, 0xF3, 0x00, 0x54, 0x2E, 0x0C, 0x00, 0x6D, 0x44, -0x1C, 0x00, 0x04, 0x03, 0x02, 0x00, 0x0D, 0x0D, 0x0D, 0xFF, -0x7F, 0x7F, 0x7F, 0x85, 0xDC, 0xDC, 0xDC, 0x82, 0xB6, 0xB6, -0xB6, 0xFB, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x00, 0xAF, 0xAF, 0xAF, 0x00, 0x6B, 0x6B, 0x6B, 0x2A, 0xB5, -0xB5, 0xB5, 0xB0, 0x1D, 0x1D, 0x1D, 0x25, 0xF6, 0xF6, 0xF6, -0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xCA, 0xE1, 0xF6, 0x00, 0xBB, -0xD8, 0xF4, 0x00, 0xD8, 0xE8, 0xF8, 0x00, 0xF4, 0xF7, 0xF9, -0x00, 0x11, 0x0A, 0x03, 0x00, 0x32, 0x1C, 0x09, 0x00, 0x4F, -0x30, 0x13, 0x00, 0x1D, 0x12, 0x06, 0x00, 0x03, 0x03, 0x03, -0x00, 0x0B, 0x0B, 0x0B, 0xFF, 0xA8, 0xA8, 0xA8, 0xA9, 0x86, -0x86, 0x86, 0x68, 0xCC, 0xCC, 0xCC, 0xF1, 0x18, 0x18, 0x18, -0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0xFD, 0xFD, 0xFD, 0x00, 0x70, 0x70, 0x70, 0x03, 0x16, 0x16, -0x16, 0x2F, 0xB6, 0xB6, 0xB6, 0xCA, 0xEF, 0xEF, 0xEF, 0xFE, -0xE6, 0xE6, 0xE6, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, 0xDF, 0xDF, -0xDF, 0xFF, 0xDF, 0xDF, 0xDF, 0xFF, 0xE0, 0xE0, 0xE0, 0xFF, -0xDF, 0xDF, 0xDF, 0xFF, 0xDF, 0xDF, 0xDF, 0xFF, 0xE1, 0xE1, -0xE1, 0xFF, 0xE7, 0xE7, 0xE7, 0xFF, 0xED, 0xED, 0xED, 0xFB, -0x7F, 0x7F, 0x7F, 0x98, 0x12, 0x12, 0x12, 0x13, 0xD0, 0xD0, -0xD0, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF5, 0xF5, 0xF5, 0x00, 0x32, -0x32, 0x32, 0x06, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, -0x26, 0x03, 0x03, 0x03, 0x44, 0x5E, 0x5E, 0x5E, 0x9D, 0xD0, -0xD0, 0xD0, 0xEA, 0xF0, 0xF0, 0xF0, 0xFE, 0xEB, 0xEB, 0xEB, -0xFF, 0xE8, 0xE8, 0xE8, 0xFF, 0xE7, 0xE7, 0xE7, 0xFF, 0xE8, -0xE8, 0xE8, 0xFF, 0xEB, 0xEB, 0xEB, 0xFF, 0xED, 0xED, 0xED, -0xFC, 0xB2, 0xB2, 0xB2, 0xD6, 0x35, 0x35, 0x35, 0x76, 0x00, -0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0x1C, 0x1C, 0x1C, -0x08, 0xF0, 0xF0, 0xF0, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, -0xC0, 0x01, 0x9B, 0x9B, 0x9B, 0x08, 0xC9, 0xC9, 0xC9, 0x0B, -0xE3, 0xE3, 0xE3, 0x0D, 0xFA, 0xFA, 0xFA, 0x10, 0x03, 0x03, -0x03, 0x17, 0x33, 0x33, 0x33, 0x30, 0x3B, 0x3B, 0x3B, 0x2B, -0x21, 0x21, 0x21, 0x18, 0x06, 0x06, 0x06, 0x06, 0xF3, 0xF3, -0xF3, 0xF4, 0xD6, 0xD6, 0xD6, 0xE1, 0xC1, 0xC1, 0xC1, 0xCE, -0xDE, 0xDE, 0xDE, 0xD5, 0x06, 0x06, 0x06, 0xEB, 0x16, 0x16, -0x16, 0xF2, 0x3E, 0x3E, 0x3E, 0xF4, 0x56, 0x56, 0x56, 0xF8, -0x4F, 0x4F, 0x4F, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0xE2, 0xE2, 0xE2, 0x00, 0xE5, 0xE5, 0xE5, -0x02, 0xE4, 0xE4, 0xE4, 0x02, 0xCE, 0xCE, 0xCE, 0x04, 0xE5, -0xE5, 0xE5, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -0xFD, 0x2C, 0x2C, 0x2C, 0xFD, 0x35, 0x35, 0x35, 0xFD, 0x23, -0x23, 0x23, 0xFD, 0x1E, 0x1E, 0x1E, 0x00, 0x06, 0x06, 0x06, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xEA, 0x4C, -0xEA, 0x00, 0x54, 0x70, 0x66, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Log3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x0B, 0x0B, 0x0C, 0x01, 0x2A, 0x2B, -0x2B, 0x1B, 0x47, 0x47, 0x49, 0x3D, 0x61, 0x61, 0x63, 0x58, -0x15, 0x15, 0x16, 0x04, 0xD2, 0xD2, 0xD1, 0xDF, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x03, 0x24, 0x24, 0x26, -0x1B, 0x30, 0x30, 0x30, 0x2E, 0x32, 0x33, 0x34, 0x33, 0x31, -0x30, 0x31, 0x32, 0x25, 0x25, 0x25, 0x32, 0x0C, 0x0C, 0x0B, -0x18, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x01, 0x25, -0x26, 0x26, 0xAC, 0xA3, 0xA3, 0xA1, 0xBE, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, -0x00, 0x00, 0x0C, 0x0C, 0x0C, 0x04, 0x2B, 0x2C, 0x2D, 0x1B, -0x2B, 0x2B, 0x2C, 0x2F, 0x30, 0x2F, 0x30, 0x32, 0x31, 0x31, -0x31, 0x33, 0x24, 0x24, 0x25, 0x30, 0x0C, 0x0C, 0x0C, 0x18, -0x02, 0x02, 0x01, 0x03, 0x00, 0x00, 0x00, 0x01, 0xFE, 0xFE, -0xFE, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF7, 0xF8, -0xF8, 0xEE, 0x2D, 0x2C, 0x29, 0x1C, 0xEE, 0xEE, 0xEE, 0xF7, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xA0, 0xA0, 0xA4, 0x8C, 0xF2, 0xF3, 0xF6, 0xFC, 0xF3, -0xF4, 0xF7, 0xFE, 0xF3, 0xF4, 0xF7, 0xFF, 0xF1, 0xF2, 0xF5, -0xFF, 0xEF, 0xEF, 0xF2, 0xFF, 0xEE, 0xEF, 0xF2, 0xFF, 0xEE, -0xEF, 0xF2, 0xFF, 0xED, 0xEE, 0xF1, 0xFF, 0xED, 0xED, 0xF0, -0xFF, 0xEE, 0xEE, 0xF1, 0xFF, 0xEE, 0xEF, 0xF2, 0xFF, 0xEE, -0xEE, 0xF1, 0xFF, 0xEC, 0xED, 0xF0, 0xFF, 0xED, 0xEE, 0xF1, -0xFE, 0x50, 0x51, 0x53, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0xD0, 0xD1, 0xCF, 0xDE, 0xFC, 0xFC, 0xFC, 0x03, 0xFB, 0xFB, -0xFB, 0x01, 0xFA, 0xFA, 0xFA, 0x00, 0xFA, 0xFA, 0xFA, 0x00, -0xFE, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x01, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, -0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xF7, 0xF7, 0x01, -0x42, 0x42, 0x43, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xCF, -0xCF, 0xCE, 0xCD, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xDA, 0xD9, -0x00, 0xD7, 0xD7, 0xD7, 0x00, 0xF4, 0xF4, 0xF4, 0x00, 0x01, -0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF7, 0xF7, 0xF7, 0x00, 0xE3, -0xE3, 0xE2, 0x00, 0xDC, 0xDC, 0xDB, 0x00, 0xD2, 0xD1, 0xD1, -0x00, 0xD5, 0xD5, 0xD4, 0x00, 0xD6, 0xD6, 0xD5, 0x00, 0x40, -0x3F, 0x40, 0x49, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, -0x00, 0x0E, 0x0E, 0x0E, 0x11, 0x99, 0x99, 0x99, 0xB0, 0x1F, -0x1F, 0x1F, 0x33, 0x04, 0x00, 0x00, 0x00, 0x00, 0xD6, 0xD5, -0xD4, 0xD9, 0xF8, 0xF8, 0xF9, 0xF4, 0x23, 0x22, 0x23, 0x0D, -0x01, 0x01, 0x01, 0x00, 0xF9, 0xF9, 0xF9, 0x00, 0xE5, 0xE4, -0xE4, 0x00, 0xF1, 0xF1, 0xF1, 0x00, 0x09, 0x09, 0x09, 0x00, -0xE3, 0xE4, 0xE3, 0x00, 0x0D, 0x0C, 0x0D, 0x00, 0x05, 0x05, -0x05, 0x00, 0xFB, 0xFC, 0xFB, 0x00, 0x05, 0x05, 0x05, 0x00, -0xF5, 0xF4, 0xF5, 0x00, 0x07, 0x07, 0x07, 0x00, 0x19, 0x19, -0x18, 0x24, 0x3A, 0x3A, 0x3C, 0x2A, 0x69, 0x69, 0x67, 0x66, -0xEA, 0xEA, 0xEA, 0x32, 0x1C, 0x1C, 0x1C, 0x37, 0xEA, 0xEA, -0xEA, 0xA0, 0x04, 0x0E, 0x0E, 0x09, 0x07, 0x6F, 0x68, 0x34, -0x5F, 0xFE, 0xFA, 0xE6, 0x05, 0xE1, 0xE7, 0x00, 0x00, 0xEB, -0xEA, 0xEA, 0x00, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x02, 0x02, 0x02, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0x01, -0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFB, -0x00, 0x05, 0x05, 0x05, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFA, 0x00, 0xFF, 0xFF, 0x00, -0x02, 0x7C, 0x7C, 0x7C, 0x80, 0xB6, 0xB6, 0xB4, 0x19, 0x57, -0x58, 0x58, 0x39, 0xA4, 0xA3, 0xA3, 0xF7, 0xFB, 0xFB, 0xFB, -0xDA, 0x03, 0xAE, 0xA4, 0x5C, 0x9B, 0x61, 0x59, 0x1F, 0x78, -0xF8, 0xFC, 0x13, 0x05, 0x03, 0x07, 0x20, 0x00, 0xF5, 0xF6, -0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, -0x0C, 0x0D, 0x0D, 0x00, 0xF2, 0xF3, 0xF3, 0x00, 0x0A, 0x0A, -0x0B, 0x00, 0x01, 0x02, 0x02, 0x00, 0xFB, 0xFB, 0xFA, 0x00, -0x03, 0x04, 0x04, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0x00, 0x01, -0x01, 0x00, 0x05, 0x05, 0x06, 0x00, 0xF5, 0xF4, 0xF5, 0x00, -0xEA, 0xEA, 0xE9, 0xFF, 0x2C, 0x2C, 0x2B, 0xEE, 0xD3, 0xD5, -0xD5, 0x1A, 0xA3, 0xA2, 0xA2, 0xB0, 0xED, 0xED, 0xED, 0xA5, -0x02, 0x8E, 0x95, 0xC7, 0xA0, 0xFF, 0xFF, 0x02, 0xFD, 0x02, -0xFF, 0xE6, 0x00, 0x04, 0x04, 0x03, 0x00, 0xF0, 0xEF, 0xEF, -0x00, 0x04, 0x04, 0x04, 0x00, 0x02, 0x01, 0x01, 0x00, 0x01, -0x01, 0x02, 0x00, 0x02, 0x01, 0x01, 0x00, 0xFE, 0xFF, 0xFE, -0x00, 0xFA, 0xFA, 0xFA, 0x00, 0x0F, 0x0F, 0x10, 0x00, 0xFC, -0xFC, 0xFC, 0x00, 0xFC, 0xFD, 0xFC, 0x00, 0xFD, 0xFD, 0xFD, -0x00, 0x0A, 0x0A, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x00, 0x08, -0x09, 0x08, 0x27, 0x1F, 0x20, 0x20, 0x39, 0xCE, 0xCC, 0xCC, -0xD3, 0xEF, 0xEF, 0xEF, 0x84, 0x00, 0x00, 0x00, 0xF3, 0x03, -0xDF, 0xE0, 0xED, 0xE6, 0x2C, 0x2A, 0x1E, 0x25, 0x23, 0x21, -0x08, 0x2D, 0x03, 0x09, 0x3A, 0x00, 0xED, 0xEE, 0xED, 0x00, -0x08, 0x08, 0x08, 0x00, 0xF4, 0xF5, 0xF4, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0x01, 0x01, 0x01, 0x00, -0x06, 0x06, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFB, -0xFB, 0x00, 0x26, 0x26, 0x26, 0x00, 0x1C, 0x1C, 0x1C, 0x00, -0x14, 0x14, 0x14, 0x00, 0xFA, 0xF9, 0xF8, 0x00, 0x0D, 0x0D, -0x0C, 0x02, 0xC0, 0xC2, 0xC2, 0xF8, 0xC1, 0xC0, 0xC0, 0x9C, -0xDA, 0xDA, 0xDA, 0xB5, 0x00, 0x00, 0x00, 0xFD, 0x02, 0x00, -0x00, 0x00, 0xFB, 0x76, 0x7F, 0xBB, 0x81, 0xFB, 0xF9, 0xF1, -0xF1, 0xFD, 0xFD, 0xF6, 0x00, 0x0A, 0x0A, 0x0B, 0x00, 0x01, -0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x00, 0xF7, 0xF6, 0xF6, -0x00, 0x10, 0x0F, 0x10, 0x00, 0x0C, 0x0B, 0x0C, 0x00, 0x06, -0x05, 0x06, 0x00, 0x03, 0x02, 0x02, 0x00, 0x18, 0x18, 0x18, -0x00, 0x0A, 0x0A, 0x0B, 0x00, 0x06, 0x05, 0x06, 0x00, 0x01, -0x00, 0x01, 0x00, 0xF3, 0xF3, 0xF5, 0x00, 0x05, 0x07, 0x07, -0x00, 0xD3, 0xD2, 0xD3, 0xF0, 0xD7, 0xD7, 0xD7, 0xB0, 0x00, -0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0xF0, 0xF1, 0xF7, 0xF1, 0x06, 0x07, 0x08, 0x08, -0x33, 0x33, 0x38, 0x3E, 0xFD, 0xFF, 0x0D, 0x01, 0xF9, 0xF8, -0xF9, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x20, 0x20, 0x20, 0x00, -0x17, 0x17, 0x18, 0x00, 0x15, 0x16, 0x16, 0x00, 0x14, 0x15, -0x15, 0x00, 0x13, 0x14, 0x14, 0x00, 0x0B, 0x0B, 0x0B, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0xFD, 0xFD, -0xFD, 0x00, 0x06, 0x05, 0x03, 0x00, 0xBC, 0xBE, 0xBD, 0x00, -0x11, 0x0F, 0x11, 0xFC, 0xB9, 0xB9, 0xB8, 0x89, 0xFC, 0xFC, -0xFC, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFE, 0xCF, 0xD1, 0xE8, 0xD7, 0x4B, -0x4A, 0x3C, 0x55, 0x1F, 0x20, 0x30, 0x10, 0x11, 0x11, 0x11, -0x00, 0x19, 0x19, 0x19, 0x00, 0x0A, 0x09, 0x0A, 0x00, 0x02, -0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, -0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, -0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0xE5, 0xE5, 0xE3, -0x00, 0xBB, 0xBF, 0xBD, 0x00, 0xE9, 0xE7, 0xE8, 0x00, 0x49, -0x48, 0x4A, 0x09, 0xD4, 0xD5, 0xD5, 0xBC, 0xE1, 0xE0, 0xDF, -0xDE, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFA, 0xFB, 0xFC, 0xF7, 0xFB, 0xFD, -0x09, 0x0E, 0x3F, 0x3F, 0x41, 0x40, 0xCD, 0xCE, 0xCC, 0x00, -0xF7, 0xF7, 0xF7, 0x00, 0xE6, 0xE6, 0xE6, 0x00, 0x09, 0x09, -0x09, 0x00, 0x07, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x01, 0x02, -0x01, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xD2, 0xD3, 0xD1, 0x00, -0xCD, 0xCD, 0xCC, 0x00, 0x31, 0x2F, 0x30, 0x00, 0x2B, 0x2C, -0x2D, 0x01, 0xF2, 0xF2, 0xF2, 0xEE, 0xBF, 0xBE, 0xBD, 0xBA, -0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xCD, 0xCD, 0xCF, -0xBF, 0x07, 0x08, 0x08, 0xFF, 0x1D, 0x1D, 0x1E, 0x00, 0x1F, -0x1F, 0x20, 0x00, 0x2B, 0x2C, 0x2C, 0x00, 0x0E, 0x0F, 0x0F, -0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, -0xFF, 0xFE, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xE6, 0xE4, 0x00, 0xD7, 0xD8, 0xD7, 0x00, 0x0D, -0x0A, 0x0B, 0x00, 0x2A, 0x2B, 0x2C, 0x00, 0x06, 0x06, 0x06, -0x00, 0x43, 0x42, 0x44, 0x46, 0x02, 0x02, 0x02, 0x05, 0x00, -0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xDF, 0xDE, 0xD7, -0xF2, 0xF2, 0xF3, 0xF1, 0x1C, 0x1B, 0x1C, 0x00, 0x04, 0x03, -0x04, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0x01, 0x01, -0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xF1, 0xF0, 0xF0, 0x00, -0xE3, 0xE2, 0xE1, 0x00, 0xED, 0xEC, 0xEC, 0x00, 0x2D, 0x2D, -0x2E, 0x00, 0x15, 0x14, 0x16, 0x00, 0xF8, 0xF8, 0xF9, 0xFE, -0xF6, 0xF7, 0xF7, 0x0F, 0x12, 0x12, 0x13, 0x15, 0x00, 0x00, -0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xB1, -0xB1, 0xB6, 0xC1, 0x36, 0x37, 0x37, 0x37, 0x01, 0x01, 0x01, -0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFE, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, -0x00, 0x00, 0x00, 0x01, 0x00, 0xBE, 0xBD, 0xBB, 0x00, 0xD6, -0xD6, 0xD3, 0x00, 0x0F, 0x0F, 0x0F, 0xF7, 0xD2, 0xD3, 0xD5, -0xBC, 0xDE, 0xDD, 0xDE, 0xC8, 0xD4, 0xD4, 0xD2, 0xCC, 0xF0, -0xF0, 0xF0, 0xD9, 0x00, 0x00, 0xFF, 0xE5, 0x00, 0x00, 0x00, -0xFC, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xCF, 0xD0, -0xCE, 0xD1, 0x36, 0x37, 0x36, 0x37, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, -0xF5, 0x00, 0xF1, 0xF0, 0xE4, 0x00, 0xDC, 0xDB, 0xD4, 0xF1, -0xA8, 0xAA, 0xBB, 0xBD, 0xED, 0xED, 0xEE, 0x19, 0x62, 0x62, -0x61, 0x2E, 0x8D, 0x8D, 0x8D, 0x7E, 0xCF, 0xCF, 0xCF, 0x9F, -0x00, 0x00, 0x00, 0xF3, 0x00, 0x00, 0x00, 0xFD, 0x00, 0x00, -0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xCF, 0xCE, 0xCE, -0xCE, 0xE5, 0xE5, 0xE6, 0xF4, 0xDD, 0xDC, 0xD6, 0xF2, 0x16, -0x11, 0xE8, 0x19, 0xFE, 0xFB, 0xE2, 0x01, 0x02, 0xFF, 0xED, -0xFA, 0xAB, 0xB0, 0xD5, 0xB4, 0xA0, 0xA5, 0xD1, 0x93, 0xF6, -0xF7, 0xFB, 0xD2, 0x61, 0x61, 0x61, 0x8F, 0x81, 0x81, 0x81, -0x98, 0xDB, 0xDB, 0xDB, 0xAA, 0x00, 0x00, 0x00, 0xF8, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x04, 0x12, -0x04, 0x04, 0x04, 0x2C, 0x05, 0x05, 0x03, 0x2F, 0xC9, 0xBD, -0x62, 0xDB, 0xB3, 0xA8, 0x55, 0xCE, 0x29, 0x27, 0x15, 0x57, -0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x04, 0x04, -0x04, 0x13, 0x1E, 0x1E, 0x1E, 0x78, 0x00, 0x00, 0x00, 0x08, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x15, 0x14, 0x0C, -0x30, 0x01, 0x01, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x05, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xBC, 0x5F, -0xCE, 0x94, 0x2C, 0x90, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Open3_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, -0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x06, -0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x0a, 0x39, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, 0x49, -0x43, 0x43, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x48, -0xc7, 0x9d, 0x96, 0x77, 0x54, 0x54, 0xd7, 0x16, 0x87, 0xcf, 0xbd, 0x77, 0x7a, -0xa1, 0xcd, 0x30, 0xd2, 0x19, 0x7a, 0x93, 0x2e, 0x30, 0x80, 0xf4, 0x2e, 0x20, -0x1d, 0x04, 0x51, 0x18, 0x66, 0x06, 0x18, 0xca, 0x00, 0xc3, 0x0c, 0x4d, 0x6c, -0x88, 0xa8, 0x40, 0x44, 0x11, 0x11, 0x01, 0x45, 0x90, 0xa0, 0x80, 0x01, 0xa3, -0xa1, 0x48, 0xac, 0x88, 0x62, 0x21, 0x28, 0xa8, 0x60, 0x0f, 0x48, 0x10, 0x50, -0x62, 0x30, 0x8a, 0xa8, 0xa8, 0x64, 0x46, 0xd6, 0x4a, 0x7c, 0x79, 0x79, 0xef, -0xe5, 0xe5, 0xf7, 0xc7, 0xbd, 0xdf, 0xda, 0x67, 0xef, 0x73, 0xf7, 0xd9, 0x7b, -0x9f, 0xb5, 0x2e, 0x00, 0x24, 0x4f, 0x1f, 0x2e, 0x2f, 0x05, 0x96, 0x02, 0x20, -0x99, 0x27, 0xe0, 0x07, 0x7a, 0x38, 0xd3, 0x57, 0x85, 0x47, 0xd0, 0xb1, 0xfd, -0x00, 0x06, 0x78, 0x80, 0x01, 0xa6, 0x00, 0x30, 0x59, 0xe9, 0xa9, 0xbe, 0x41, -0xee, 0xc1, 0x40, 0x24, 0x2f, 0x37, 0x17, 0x7a, 0xba, 0xc8, 0x09, 0xfc, 0x8b, -0xde, 0x0c, 0x01, 0x48, 0xfc, 0xbe, 0x65, 0xe8, 0xe9, 0x4f, 0xa7, 0x83, 0xff, -0x4f, 0xd2, 0xac, 0x54, 0xbe, 0x00, 0x00, 0xc8, 0x5f, 0xc4, 0xe6, 0x6c, 0x4e, -0x3a, 0x4b, 0xc4, 0xf9, 0x22, 0x4e, 0xca, 0x14, 0xa4, 0x8a, 0xed, 0x33, 0x22, -0xa6, 0xc6, 0x24, 0x8a, 0x19, 0x46, 0x89, 0x99, 0x2f, 0x4a, 0x50, 0xc4, 0x72, -0x62, 0x8e, 0x5b, 0xe4, 0xa5, 0x9f, 0x7d, 0x16, 0xd9, 0x51, 0xcc, 0xec, 0x64, -0x1e, 0x5b, 0xc4, 0xe2, 0x9c, 0x53, 0xd9, 0xc9, 0x6c, 0x31, 0xf7, 0x88, 0x78, -0x7b, 0x86, 0x90, 0x23, 0x62, 0xc4, 0x47, 0xc4, 0x05, 0x19, 0x5c, 0x4e, 0xa6, -0x88, 0x6f, 0x8b, 0x58, 0x33, 0x49, 0x98, 0xcc, 0x15, 0xf1, 0x5b, 0x71, 0x6c, -0x32, 0x87, 0x99, 0x0e, 0x00, 0x8a, 0x24, 0xb6, 0x0b, 0x38, 0xac, 0x78, 0x11, -0x9b, 0x88, 0x98, 0xc4, 0x0f, 0x0e, 0x74, 0x11, 0xf1, 0x72, 0x00, 0x70, 0xa4, -0xb8, 0x2f, 0x38, 0xe6, 0x0b, 0x16, 0x70, 0xb2, 0x04, 0xe2, 0x43, 0xb9, 0xa4, -0xa4, 0x66, 0xf3, 0xb9, 0x71, 0xf1, 0x02, 0xba, 0x2e, 0x4b, 0x8f, 0x6e, 0x6a, -0x6d, 0xcd, 0xa0, 0x7b, 0x72, 0x32, 0x93, 0x38, 0x02, 0x81, 0xa1, 0x3f, 0x93, -0x95, 0xc8, 0xe4, 0xb3, 0xe9, 0x2e, 0x29, 0xc9, 0xa9, 0x4c, 0x5e, 0x36, 0x00, -0x8b, 0x67, 0xfe, 0x2c, 0x19, 0x71, 0x6d, 0xe9, 0xa2, 0x22, 0x5b, 0x9a, 0x5a, -0x5b, 0x5a, 0x1a, 0x9a, 0x19, 0x99, 0x7e, 0x51, 0xa8, 0xff, 0xba, 0xf8, 0x37, -0x25, 0xee, 0xed, 0x22, 0xbd, 0x0a, 0xf8, 0xdc, 0x33, 0x88, 0xd6, 0xf7, 0x87, -0xed, 0xaf, 0xfc, 0x52, 0xea, 0x00, 0x60, 0xcc, 0x8a, 0x6a, 0xb3, 0xeb, 0x0f, -0x5b, 0xcc, 0x7e, 0x00, 0x3a, 0xb6, 0x02, 0x20, 0x77, 0xff, 0x0f, 0x9b, 0xe6, -0x21, 0x00, 0x24, 0x45, 0x7d, 0x6b, 0xbf, 0xf1, 0xc5, 0x79, 0x68, 0xe2, 0x79, -0x89, 0x17, 0x08, 0x52, 0x6d, 0x8c, 0x8d, 0x33, 0x33, 0x33, 0x8d, 0xb8, 0x1c, -0x96, 0x91, 0xb8, 0xa0, 0xbf, 0xeb, 0x7f, 0x3a, 0xfc, 0x0d, 0x7d, 0xf1, 0x3d, -0x23, 0xf1, 0x76, 0xbf, 0x97, 0x87, 0xee, 0xca, 0x89, 0x65, 0x0a, 0x93, 0x04, -0x74, 0x71, 0xdd, 0x58, 0x29, 0x49, 0x29, 0x42, 0x3e, 0x3d, 0x3d, 0x95, 0xc9, -0xe2, 0xd0, 0x0d, 0xff, 0x3c, 0xc4, 0xff, 0x38, 0xf0, 0xaf, 0xf3, 0x58, 0x1a, -0xc8, 0x89, 0xe5, 0xf0, 0x39, 0x3c, 0x51, 0x44, 0xa8, 0x68, 0xca, 0xb8, 0xbc, -0x38, 0x51, 0xbb, 0x79, 0x6c, 0xae, 0x80, 0x9b, 0xc2, 0xa3, 0x73, 0x79, 0xff, -0xa9, 0x89, 0xff, 0x30, 0xec, 0x4f, 0x5a, 0x9c, 0x6b, 0x91, 0x28, 0xf5, 0x9f, -0x00, 0x35, 0xca, 0x08, 0x48, 0xdd, 0xa0, 0x02, 0xe4, 0xe7, 0x3e, 0x80, 0xa2, -0x10, 0x01, 0x12, 0x79, 0x50, 0xdc, 0xf5, 0xdf, 0xfb, 0xe6, 0x83, 0x0f, 0x05, -0xe2, 0x9b, 0x17, 0xa6, 0x3a, 0xb1, 0x38, 0xf7, 0x9f, 0x05, 0xfd, 0xfb, 0xae, -0x70, 0x89, 0xf8, 0x91, 0xce, 0x8d, 0xfb, 0x1c, 0xe7, 0x12, 0x18, 0x4c, 0x67, -0x09, 0xf9, 0x19, 0x8b, 0x6b, 0xe2, 0x6b, 0x09, 0xd0, 0x80, 0x00, 0x24, 0x01, -0x15, 0xc8, 0x03, 0x15, 0xa0, 0x01, 0x74, 0x81, 0x21, 0x30, 0x03, 0x56, 0xc0, -0x16, 0x38, 0x02, 0x37, 0xb0, 0x02, 0xf8, 0x81, 0x60, 0x10, 0x0e, 0xd6, 0x02, -0x16, 0x88, 0x07, 0xc9, 0x80, 0x0f, 0x32, 0x41, 0x2e, 0xd8, 0x0c, 0x0a, 0x40, -0x11, 0xd8, 0x05, 0xf6, 0x82, 0x4a, 0x50, 0x03, 0xea, 0x41, 0x23, 0x68, 0x01, -0x27, 0x40, 0x07, 0x38, 0x0d, 0x2e, 0x80, 0xcb, 0xe0, 0x3a, 0xb8, 0x09, 0xee, -0x80, 0x07, 0x60, 0x04, 0x8c, 0x83, 0xe7, 0x60, 0x06, 0xbc, 0x01, 0xf3, 0x10, -0x04, 0x61, 0x21, 0x32, 0x44, 0x81, 0xe4, 0x21, 0x55, 0x48, 0x0b, 0x32, 0x80, -0xcc, 0x20, 0x06, 0x64, 0x0f, 0xb9, 0x41, 0x3e, 0x50, 0x20, 0x14, 0x0e, 0x45, -0x43, 0x71, 0x10, 0x0f, 0x12, 0x42, 0xb9, 0xd0, 0x16, 0xa8, 0x08, 0x2a, 0x85, -0x2a, 0xa1, 0x5a, 0xa8, 0x11, 0xfa, 0x16, 0x3a, 0x05, 0x5d, 0x80, 0xae, 0x42, -0x03, 0xd0, 0x3d, 0x68, 0x14, 0x9a, 0x82, 0x7e, 0x85, 0xde, 0xc3, 0x08, 0x4c, -0x82, 0xa9, 0xb0, 0x32, 0xac, 0x0d, 0x1b, 0xc3, 0x0c, 0xd8, 0x09, 0xf6, 0x86, -0x83, 0xe1, 0x35, 0x70, 0x1c, 0x9c, 0x06, 0xe7, 0xc0, 0xf9, 0xf0, 0x4e, 0xb8, -0x02, 0xae, 0x83, 0x8f, 0xc1, 0xed, 0xf0, 0x05, 0xf8, 0x3a, 0x7c, 0x07, 0x1e, -0x81, 0x9f, 0xc3, 0xb3, 0x08, 0x40, 0x88, 0x08, 0x0d, 0x51, 0x43, 0x0c, 0x11, -0x06, 0xe2, 0x82, 0xf8, 0x21, 0x11, 0x48, 0x2c, 0xc2, 0x47, 0x36, 0x20, 0x85, -0x48, 0x39, 0x52, 0x87, 0xb4, 0x20, 0x5d, 0x48, 0x2f, 0x72, 0x0b, 0x19, 0x41, -0xa6, 0x91, 0x77, 0x28, 0x0c, 0x8a, 0x82, 0xa2, 0xa3, 0x0c, 0x51, 0xb6, 0x28, -0x4f, 0x54, 0x08, 0x8a, 0x85, 0x4a, 0x43, 0x6d, 0x40, 0x15, 0xa3, 0x2a, 0x51, -0x47, 0x51, 0xed, 0xa8, 0x1e, 0xd4, 0x2d, 0xd4, 0x28, 0x6a, 0x06, 0xf5, 0x09, -0x4d, 0x46, 0x2b, 0xa1, 0x0d, 0xd0, 0x36, 0x68, 0x2f, 0xf4, 0x2a, 0x74, 0x1c, -0x3a, 0x13, 0x5d, 0x80, 0x2e, 0x47, 0x37, 0xa0, 0xdb, 0xd0, 0x97, 0xd0, 0x77, -0xd0, 0xe3, 0xe8, 0x37, 0x18, 0x0c, 0x86, 0x86, 0xd1, 0xc1, 0x58, 0x61, 0x3c, -0x31, 0xe1, 0x98, 0x04, 0xcc, 0x3a, 0x4c, 0x31, 0xe6, 0x00, 0xa6, 0x15, 0x73, -0x1e, 0x33, 0x80, 0x19, 0xc3, 0xcc, 0x62, 0xb1, 0x58, 0x79, 0xac, 0x01, 0xd6, -0x0e, 0xeb, 0x87, 0x65, 0x62, 0x05, 0xd8, 0x02, 0xec, 0x7e, 0xec, 0x31, 0xec, -0x39, 0xec, 0x20, 0x76, 0x1c, 0xfb, 0x16, 0x47, 0xc4, 0xa9, 0xe2, 0xcc, 0x70, -0xee, 0xb8, 0x08, 0x1c, 0x0f, 0x97, 0x87, 0x2b, 0xc7, 0x35, 0xe1, 0xce, 0xe2, -0x06, 0x71, 0x13, 0xb8, 0x79, 0xbc, 0x14, 0x5e, 0x0b, 0x6f, 0x83, 0xf7, 0xc3, -0xb3, 0xf1, 0xd9, 0xf8, 0x12, 0x7c, 0x3d, 0xbe, 0x0b, 0x7f, 0x03, 0x3f, 0x8e, -0x9f, 0x27, 0x48, 0x13, 0x74, 0x08, 0x76, 0x84, 0x60, 0x42, 0x02, 0x61, 0x33, -0xa1, 0x82, 0xd0, 0x42, 0xb8, 0x44, 0x78, 0x48, 0x78, 0x45, 0x24, 0x12, 0xd5, -0x89, 0xd6, 0xc4, 0x00, 0x22, 0x97, 0xb8, 0x89, 0x58, 0x41, 0x3c, 0x4e, 0xbc, -0x42, 0x1c, 0x25, 0xbe, 0x23, 0xc9, 0x90, 0xf4, 0x49, 0x2e, 0xa4, 0x48, 0x92, -0x90, 0xb4, 0x93, 0x74, 0x84, 0x74, 0x9e, 0x74, 0x8f, 0xf4, 0x8a, 0x4c, 0x26, -0x6b, 0x93, 0x1d, 0xc9, 0x11, 0x64, 0x01, 0x79, 0x27, 0xb9, 0x91, 0x7c, 0x91, -0xfc, 0x98, 0xfc, 0x56, 0x82, 0x22, 0x61, 0x24, 0xe1, 0x25, 0xc1, 0x96, 0xd8, -0x28, 0x51, 0x25, 0xd1, 0x2e, 0x31, 0x28, 0xf1, 0x42, 0x12, 0x2f, 0xa9, 0x25, -0xe9, 0x24, 0xb9, 0x56, 0x32, 0x47, 0xb2, 0x5c, 0xf2, 0xa4, 0xe4, 0x0d, 0xc9, -0x69, 0x29, 0xbc, 0x94, 0xb6, 0x94, 0x8b, 0x14, 0x53, 0x6a, 0x83, 0x54, 0x95, -0xd4, 0x29, 0xa9, 0x61, 0xa9, 0x59, 0x69, 0x8a, 0xb4, 0xa9, 0xb4, 0x9f, 0x74, -0xb2, 0x74, 0xb1, 0x74, 0x93, 0xf4, 0x55, 0xe9, 0x49, 0x19, 0xac, 0x8c, 0xb6, -0x8c, 0x9b, 0x0c, 0x5b, 0x26, 0x5f, 0xe6, 0xb0, 0xcc, 0x45, 0x99, 0x31, 0x0a, -0x42, 0xd1, 0xa0, 0xb8, 0x50, 0x58, 0x94, 0x2d, 0x94, 0x7a, 0xca, 0x25, 0xca, -0x38, 0x15, 0x43, 0xd5, 0xa1, 0x7a, 0x51, 0x13, 0xa8, 0x45, 0xd4, 0x6f, 0xa8, -0xfd, 0xd4, 0x19, 0x59, 0x19, 0xd9, 0x65, 0xb2, 0xa1, 0xb2, 0x59, 0xb2, 0x55, -0xb2, 0x67, 0x64, 0x47, 0x68, 0x08, 0x4d, 0x9b, 0xe6, 0x45, 0x4b, 0xa2, 0x95, -0xd0, 0x4e, 0xd0, 0x86, 0x68, 0xef, 0x97, 0x28, 0x2f, 0x71, 0x5a, 0xc2, 0x59, -0xb2, 0x63, 0x49, 0xcb, 0x92, 0xc1, 0x25, 0x73, 0x72, 0x8a, 0x72, 0x8e, 0x72, -0x1c, 0xb9, 0x42, 0xb9, 0x56, 0xb9, 0x3b, 0x72, 0xef, 0xe5, 0xe9, 0xf2, 0x6e, -0xf2, 0x89, 0xf2, 0xbb, 0xe5, 0x3b, 0xe4, 0x1f, 0x29, 0xa0, 0x14, 0xf4, 0x15, -0x02, 0x14, 0x32, 0x15, 0x0e, 0x2a, 0x5c, 0x52, 0x98, 0x56, 0xa4, 0x2a, 0xda, -0x2a, 0xb2, 0x14, 0x0b, 0x15, 0x4f, 0x28, 0xde, 0x57, 0x82, 0x95, 0xf4, 0x95, -0x02, 0x95, 0xd6, 0x29, 0x1d, 0x56, 0xea, 0x53, 0x9a, 0x55, 0x56, 0x51, 0xf6, -0x50, 0x4e, 0x55, 0xde, 0xaf, 0x7c, 0x51, 0x79, 0x5a, 0x85, 0xa6, 0xe2, 0xa8, -0x92, 0xa0, 0x52, 0xa6, 0x72, 0x56, 0x65, 0x4a, 0x95, 0xa2, 0x6a, 0xaf, 0xca, -0x55, 0x2d, 0x53, 0x3d, 0xa7, 0xfa, 0x8c, 0x2e, 0x4b, 0x77, 0xa2, 0x27, 0xd1, -0x2b, 0xe8, 0x3d, 0xf4, 0x19, 0x35, 0x25, 0x35, 0x4f, 0x35, 0xa1, 0x5a, 0xad, -0x5a, 0xbf, 0xda, 0xbc, 0xba, 0x8e, 0x7a, 0x88, 0x7a, 0x9e, 0x7a, 0xab, 0xfa, -0x23, 0x0d, 0x82, 0x06, 0x43, 0x23, 0x56, 0xa3, 0x4c, 0xa3, 0x5b, 0x63, 0x46, -0x53, 0x55, 0xd3, 0x57, 0x33, 0x57, 0xb3, 0x59, 0xf3, 0xbe, 0x16, 0x5e, 0x8b, -0xa1, 0x15, 0xaf, 0xb5, 0x4f, 0xab, 0x57, 0x6b, 0x4e, 0x5b, 0x47, 0x3b, 0x4c, -0x7b, 0x9b, 0x76, 0x87, 0xf6, 0xa4, 0x8e, 0x9c, 0x8e, 0x97, 0x4e, 0x8e, 0x4e, -0xb3, 0xce, 0x43, 0x5d, 0xb2, 0xae, 0x83, 0x6e, 0x9a, 0x6e, 0x9d, 0xee, 0x6d, -0x3d, 0x8c, 0x1e, 0x43, 0x2f, 0x51, 0xef, 0x80, 0xde, 0x4d, 0x7d, 0x58, 0xdf, -0x42, 0x3f, 0x5e, 0xbf, 0x4a, 0xff, 0x86, 0x01, 0x6c, 0x60, 0x69, 0xc0, 0x35, -0x38, 0x60, 0x30, 0xb0, 0x14, 0xbd, 0xd4, 0x7a, 0x29, 0x6f, 0x69, 0xdd, 0xd2, -0x61, 0x43, 0x92, 0xa1, 0x93, 0x61, 0x86, 0x61, 0xb3, 0xe1, 0xa8, 0x11, 0xcd, -0xc8, 0xc7, 0x28, 0xcf, 0xa8, 0xc3, 0xe8, 0x85, 0xb1, 0xa6, 0x71, 0x84, 0xf1, -0x6e, 0xe3, 0x5e, 0xe3, 0x4f, 0x26, 0x16, 0x26, 0x49, 0x26, 0xf5, 0x26, 0x0f, -0x4c, 0x65, 0x4c, 0x57, 0x98, 0xe6, 0x99, 0x76, 0x99, 0xfe, 0x6a, 0xa6, 0x6f, -0xc6, 0x32, 0xab, 0x32, 0xbb, 0x6d, 0x4e, 0x36, 0x77, 0x37, 0xdf, 0x68, 0xde, -0x69, 0xfe, 0x72, 0x99, 0xc1, 0x32, 0xce, 0xb2, 0x83, 0xcb, 0xee, 0x5a, 0x50, -0x2c, 0x7c, 0x2d, 0xb6, 0x59, 0x74, 0x5b, 0x7c, 0xb4, 0xb4, 0xb2, 0xe4, 0x5b, -0xb6, 0x58, 0x4e, 0x59, 0x69, 0x5a, 0x45, 0x5b, 0x55, 0x5b, 0x0d, 0x33, 0xa8, -0x0c, 0x7f, 0x46, 0x31, 0xe3, 0x8a, 0x35, 0xda, 0xda, 0xd9, 0x7a, 0xa3, 0xf5, -0x69, 0xeb, 0x77, 0x36, 0x96, 0x36, 0x02, 0x9b, 0x13, 0x36, 0xbf, 0xd8, 0x1a, -0xda, 0x26, 0xda, 0x36, 0xd9, 0x4e, 0x2e, 0xd7, 0x59, 0xce, 0x59, 0x5e, 0xbf, -0x7c, 0xcc, 0x4e, 0xdd, 0x8e, 0x69, 0x57, 0x6b, 0x37, 0x62, 0x4f, 0xb7, 0x8f, -0xb6, 0x3f, 0x64, 0x3f, 0xe2, 0xa0, 0xe6, 0xc0, 0x74, 0xa8, 0x73, 0x78, 0xe2, -0xa8, 0xe1, 0xc8, 0x76, 0x6c, 0x70, 0x9c, 0x70, 0xd2, 0x73, 0x4a, 0x70, 0x3a, -0xe6, 0xf4, 0xc2, 0xd9, 0xc4, 0x99, 0xef, 0xdc, 0xe6, 0x3c, 0xe7, 0x62, 0xe3, -0xb2, 0xde, 0xe5, 0xbc, 0x2b, 0xe2, 0xea, 0xe1, 0x5a, 0xe8, 0xda, 0xef, 0x26, -0xe3, 0x16, 0xe2, 0x56, 0xe9, 0xf6, 0xd8, 0x5d, 0xdd, 0x3d, 0xce, 0xbd, 0xd9, -0x7d, 0xc6, 0xc3, 0xc2, 0x63, 0x9d, 0xc7, 0x79, 0x4f, 0xb4, 0xa7, 0xb7, 0xe7, -0x6e, 0xcf, 0x61, 0x2f, 0x65, 0x2f, 0x96, 0x57, 0xa3, 0xd7, 0xcc, 0x0a, 0xab, -0x15, 0xeb, 0x57, 0xf4, 0x78, 0x93, 0xbc, 0x83, 0xbc, 0x2b, 0xbd, 0x9f, 0xf8, -0xe8, 0xfb, 0xf0, 0x7d, 0xba, 0x7c, 0x61, 0xdf, 0x15, 0xbe, 0x7b, 0x7c, 0x1f, -0xae, 0xd4, 0x5a, 0xc9, 0x5b, 0xd9, 0xe1, 0x07, 0xfc, 0xbc, 0xfc, 0xf6, 0xf8, -0x3d, 0xf2, 0xd7, 0xf1, 0x4f, 0xf3, 0xff, 0x3e, 0x00, 0x13, 0xe0, 0x1f, 0x50, -0x15, 0xf0, 0x34, 0xd0, 0x34, 0x30, 0x37, 0xb0, 0x37, 0x88, 0x12, 0x14, 0x15, -0xd4, 0x14, 0xf4, 0x26, 0xd8, 0x39, 0xb8, 0x24, 0xf8, 0x41, 0x88, 0x6e, 0x88, -0x30, 0xa4, 0x3b, 0x54, 0x32, 0x34, 0x32, 0xb4, 0x31, 0x74, 0x2e, 0xcc, 0x35, -0xac, 0x34, 0x6c, 0x64, 0x95, 0xf1, 0xaa, 0xf5, 0xab, 0xae, 0x87, 0x2b, 0x84, -0x73, 0xc3, 0x3b, 0x23, 0xb0, 0x11, 0xa1, 0x11, 0x0d, 0x11, 0xb3, 0xab, 0xdd, -0x56, 0xef, 0x5d, 0x3d, 0x1e, 0x69, 0x11, 0x59, 0x10, 0x39, 0xb4, 0x46, 0x67, -0x4d, 0xd6, 0x9a, 0xab, 0x6b, 0x15, 0xd6, 0x26, 0xad, 0x3d, 0x13, 0x25, 0x19, -0xc5, 0x8c, 0x3a, 0x19, 0x8d, 0x8e, 0x0e, 0x8b, 0x6e, 0x8a, 0xfe, 0xc0, 0xf4, -0x63, 0xd6, 0x31, 0x67, 0x63, 0xbc, 0x62, 0xaa, 0x63, 0x66, 0x58, 0x2e, 0xac, -0x7d, 0xac, 0xe7, 0x6c, 0x47, 0x76, 0x19, 0x7b, 0x8a, 0x63, 0xc7, 0x29, 0xe5, -0x4c, 0xc4, 0xda, 0xc5, 0x96, 0xc6, 0x4e, 0xc6, 0xd9, 0xc5, 0xed, 0x89, 0x9b, -0x8a, 0x77, 0x88, 0x2f, 0x8f, 0x9f, 0xe6, 0xba, 0x70, 0x2b, 0xb9, 0x2f, 0x13, -0x3c, 0x13, 0x6a, 0x12, 0xe6, 0x12, 0xfd, 0x12, 0x8f, 0x24, 0x2e, 0x24, 0x85, -0x25, 0xb5, 0x26, 0xe3, 0x92, 0xa3, 0x93, 0x4f, 0xf1, 0x64, 0x78, 0x89, 0xbc, -0x9e, 0x14, 0x95, 0x94, 0xac, 0x94, 0x81, 0x54, 0x83, 0xd4, 0x82, 0xd4, 0x91, -0x34, 0x9b, 0xb4, 0xbd, 0x69, 0x33, 0x7c, 0x6f, 0x7e, 0x43, 0x3a, 0x94, 0xbe, -0x26, 0xbd, 0x53, 0x40, 0x15, 0xfd, 0x4c, 0xf5, 0x09, 0x75, 0x85, 0x5b, 0x85, -0xa3, 0x19, 0xf6, 0x19, 0x55, 0x19, 0x6f, 0x33, 0x43, 0x33, 0x4f, 0x66, 0x49, -0x67, 0xf1, 0xb2, 0xfa, 0xb2, 0xf5, 0xb3, 0x77, 0x64, 0x4f, 0xe4, 0xb8, 0xe7, -0x7c, 0xbd, 0x0e, 0xb5, 0x8e, 0xb5, 0xae, 0x3b, 0x57, 0x2d, 0x77, 0x73, 0xee, -0xe8, 0x7a, 0xa7, 0xf5, 0xb5, 0x1b, 0xa0, 0x0d, 0x31, 0x1b, 0xba, 0x37, 0x6a, -0x6c, 0xcc, 0xdf, 0x38, 0xbe, 0xc9, 0x63, 0xd3, 0xd1, 0xcd, 0x84, 0xcd, 0x89, -0x9b, 0x7f, 0xc8, 0x33, 0xc9, 0x2b, 0xcd, 0x7b, 0xbd, 0x25, 0x6c, 0x4b, 0x57, -0xbe, 0x72, 0xfe, 0xa6, 0xfc, 0xb1, 0xad, 0x1e, 0x5b, 0x9b, 0x0b, 0x24, 0x0a, -0xf8, 0x05, 0xc3, 0xdb, 0x6c, 0xb7, 0xd5, 0x6c, 0x47, 0x6d, 0xe7, 0x6e, 0xef, -0xdf, 0x61, 0xbe, 0x63, 0xff, 0x8e, 0x4f, 0x85, 0xec, 0xc2, 0x6b, 0x45, 0x26, -0x45, 0xe5, 0x45, 0x1f, 0x8a, 0x59, 0xc5, 0xd7, 0xbe, 0x32, 0xfd, 0xaa, 0xe2, -0xab, 0x85, 0x9d, 0xb1, 0x3b, 0xfb, 0x4b, 0x2c, 0x4b, 0x0e, 0xee, 0xc2, 0xec, -0xe2, 0xed, 0x1a, 0xda, 0xed, 0xb0, 0xfb, 0x68, 0xa9, 0x74, 0x69, 0x4e, 0xe9, -0xd8, 0x1e, 0xdf, 0x3d, 0xed, 0x65, 0xf4, 0xb2, 0xc2, 0xb2, 0xd7, 0x7b, 0xa3, -0xf6, 0x5e, 0x2d, 0x5f, 0x56, 0x5e, 0xb3, 0x8f, 0xb0, 0x4f, 0xb8, 0x6f, 0xa4, -0xc2, 0xa7, 0xa2, 0x73, 0xbf, 0xe6, 0xfe, 0x5d, 0xfb, 0x3f, 0x54, 0xc6, 0x57, -0xde, 0xa9, 0x72, 0xae, 0x6a, 0xad, 0x56, 0xaa, 0xde, 0x51, 0x3d, 0x77, 0x80, -0x7d, 0x60, 0xf0, 0xa0, 0xe3, 0xc1, 0x96, 0x1a, 0xe5, 0x9a, 0xa2, 0x9a, 0xf7, -0x87, 0xb8, 0x87, 0xee, 0xd6, 0x7a, 0xd4, 0xb6, 0xd7, 0x69, 0xd7, 0x95, 0x1f, -0xc6, 0x1c, 0xce, 0x38, 0xfc, 0xb4, 0x3e, 0xb4, 0xbe, 0xf7, 0x6b, 0xc6, 0xd7, -0x8d, 0x0d, 0x0a, 0x0d, 0x45, 0x0d, 0x1f, 0x8f, 0xf0, 0x8e, 0x8c, 0x1c, 0x0d, -0x3c, 0xda, 0xd3, 0x68, 0xd5, 0xd8, 0xd8, 0xa4, 0xd4, 0x54, 0xd2, 0x0c, 0x37, -0x0b, 0x9b, 0xa7, 0x8e, 0x45, 0x1e, 0xbb, 0xf9, 0x8d, 0xeb, 0x37, 0x9d, 0x2d, -0x86, 0x2d, 0xb5, 0xad, 0xb4, 0xd6, 0xa2, 0xe3, 0xe0, 0xb8, 0xf0, 0xf8, 0xb3, -0x6f, 0xa3, 0xbf, 0x1d, 0x3a, 0xe1, 0x7d, 0xa2, 0xfb, 0x24, 0xe3, 0x64, 0xcb, -0x77, 0x5a, 0xdf, 0x55, 0xb7, 0x51, 0xda, 0x0a, 0xdb, 0xa1, 0xf6, 0xec, 0xf6, -0x99, 0x8e, 0xf8, 0x8e, 0x91, 0xce, 0xf0, 0xce, 0x81, 0x53, 0x2b, 0x4e, 0x75, -0x77, 0xd9, 0x76, 0xb5, 0x7d, 0x6f, 0xf4, 0xfd, 0x91, 0xd3, 0x6a, 0xa7, 0xab, -0xce, 0xc8, 0x9e, 0x29, 0x39, 0x4b, 0x38, 0x9b, 0x7f, 0x76, 0xe1, 0x5c, 0xce, -0xb9, 0xd9, 0xf3, 0xa9, 0xe7, 0xa7, 0x2f, 0xc4, 0x5d, 0x18, 0xeb, 0x8e, 0xea, -0x7e, 0x70, 0x71, 0xd5, 0xc5, 0xdb, 0x3d, 0x01, 0x3d, 0xfd, 0x97, 0xbc, 0x2f, -0x5d, 0xb9, 0xec, 0x7e, 0xf9, 0x62, 0xaf, 0x53, 0xef, 0xb9, 0x2b, 0x76, 0x57, -0x4e, 0x5f, 0xb5, 0xb9, 0x7a, 0xea, 0x1a, 0xe3, 0x5a, 0xc7, 0x75, 0xcb, 0xeb, -0xed, 0x7d, 0x16, 0x7d, 0x6d, 0x3f, 0x58, 0xfc, 0xd0, 0xd6, 0x6f, 0xd9, 0xdf, -0x7e, 0xc3, 0xea, 0x46, 0xe7, 0x4d, 0xeb, 0x9b, 0x5d, 0x03, 0xcb, 0x07, 0xce, -0x0e, 0x3a, 0x0c, 0x5e, 0xb8, 0xe5, 0x7a, 0xeb, 0xf2, 0x6d, 0xaf, 0xdb, 0xd7, -0xef, 0xac, 0xbc, 0x33, 0x30, 0x14, 0x32, 0x74, 0x77, 0x38, 0x72, 0x78, 0xe4, -0x2e, 0xfb, 0xee, 0xe4, 0xbd, 0xa4, 0x7b, 0x2f, 0xef, 0x67, 0xdc, 0x9f, 0x7f, -0xb0, 0xe9, 0x21, 0xfa, 0x61, 0xe1, 0x23, 0xa9, 0x47, 0xe5, 0x8f, 0x95, 0x1e, -0xd7, 0xfd, 0xa8, 0xf7, 0x63, 0xeb, 0x88, 0xe5, 0xc8, 0x99, 0x51, 0xd7, 0xd1, -0xbe, 0x27, 0x41, 0x4f, 0x1e, 0x8c, 0xb1, 0xc6, 0x9e, 0xff, 0x94, 0xfe, 0xd3, -0x87, 0xf1, 0xfc, 0xa7, 0xe4, 0xa7, 0xe5, 0x13, 0xaa, 0x13, 0x8d, 0x93, 0x66, -0x93, 0xa7, 0xa7, 0xdc, 0xa7, 0x6e, 0x3e, 0x5b, 0xfd, 0x6c, 0xfc, 0x79, 0xea, -0xf3, 0xf9, 0xe9, 0x82, 0x9f, 0xa5, 0x7f, 0xae, 0x7e, 0xa1, 0xfb, 0xe2, 0xbb, -0x5f, 0x1c, 0x7f, 0xe9, 0x9b, 0x59, 0x35, 0x33, 0xfe, 0x92, 0xff, 0x72, 0xe1, -0xd7, 0xe2, 0x57, 0xf2, 0xaf, 0x8e, 0xbc, 0x5e, 0xf6, 0xba, 0x7b, 0xd6, 0x7f, -0xf6, 0xf1, 0x9b, 0xe4, 0x37, 0xf3, 0x73, 0x85, 0x6f, 0xe5, 0xdf, 0x1e, 0x7d, -0xc7, 0x78, 0xd7, 0xfb, 0x3e, 0xec, 0xfd, 0xc4, 0x7c, 0xe6, 0x07, 0xec, 0x87, -0x8a, 0x8f, 0x7a, 0x1f, 0xbb, 0x3e, 0x79, 0x7f, 0x7a, 0xb8, 0x90, 0xbc, 0xb0, -0xf0, 0x1b, 0xf7, 0x84, 0xf3, 0xfb, 0xe2, 0xe6, 0x1d, 0xc2, 0x00, 0x00, 0x00, -0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, -0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, -0x07, 0xdd, 0x01, 0x0a, 0x02, 0x35, 0x0f, 0x01, 0xa3, 0x67, 0xcc, 0x00, 0x00, -0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, -0xbd, 0xa7, 0x93, 0x00, 0x00, 0x05, 0x50, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, -0x6d, 0xc1, 0x5b, 0x88, 0x5c, 0x67, 0x01, 0xc0, 0xf1, 0xff, 0x77, 0x39, 0xe7, -0xcc, 0x7d, 0x76, 0xb2, 0xd9, 0xfb, 0x36, 0xdb, 0x24, 0x9b, 0xa4, 0x4d, 0x2f, -0xd1, 0x98, 0x62, 0x09, 0xb6, 0x25, 0x12, 0xd4, 0x3e, 0x28, 0x42, 0xd1, 0x80, -0x16, 0x5f, 0x4a, 0xa5, 0x0f, 0x56, 0x51, 0x1f, 0x6a, 0x11, 0x45, 0xa8, 0x45, -0x04, 0xb5, 0x68, 0xf1, 0x45, 0x9f, 0x0a, 0xb1, 0x52, 0x41, 0x6c, 0x20, 0x50, -0x7c, 0xb0, 0x68, 0x2c, 0x69, 0x5a, 0x6a, 0xb5, 0xe2, 0x62, 0x53, 0x4c, 0x8d, -0xb9, 0x6c, 0x92, 0x4e, 0x76, 0x27, 0x3b, 0xb3, 0x3b, 0x67, 0xce, 0x77, 0x75, -0x26, 0x2c, 0x18, 0x64, 0x7f, 0x3f, 0xc1, 0xff, 0x39, 0xfe, 0xd3, 0xc7, 0x79, -0xf4, 0x6b, 0xbf, 0x64, 0xe4, 0x17, 0x3f, 0xfa, 0x8a, 0xb8, 0xff, 0xbe, 0x03, -0xa2, 0xb3, 0x72, 0x59, 0x38, 0x6b, 0xc5, 0xee, 0x5d, 0x3b, 0xc5, 0xf2, 0xf2, -0x55, 0xdd, 0x5e, 0xed, 0x4e, 0xb4, 0xc6, 0xc7, 0x67, 0xc7, 0x5b, 0x63, 0xf3, -0x52, 0x30, 0xf5, 0xfe, 0xf9, 0x0b, 0x63, 0x4a, 0xca, 0xfd, 0xf3, 0x3b, 0x76, -0x9f, 0x98, 0x9c, 0x9c, 0xff, 0xdd, 0xe4, 0xde, 0xa3, 0x56, 0xb0, 0x85, 0x1f, -0x7e, 0xeb, 0xd3, 0xfa, 0xd0, 0x81, 0x7b, 0xa6, 0xd3, 0x72, 0xf5, 0xae, 0xe9, -0xa9, 0x89, 0xbd, 0xbd, 0x6e, 0x67, 0x97, 0x75, 0x76, 0x71, 0x7e, 0x66, 0x7a, -0xb7, 0x92, 0xcc, 0xa4, 0x89, 0x1a, 0xd3, 0x5a, 0x90, 0x17, 0x16, 0x81, 0xa2, -0x35, 0xbe, 0x8d, 0x68, 0xd6, 0xb0, 0x62, 0xf2, 0xf9, 0x98, 0x4e, 0x3d, 0x55, -0x9b, 0x3d, 0x98, 0x6b, 0xb6, 0x30, 0xd6, 0x68, 0x1e, 0x59, 0x58, 0x98, 0x39, -0x3e, 0x3d, 0xd1, 0x98, 0xf4, 0x76, 0xc0, 0x6d, 0x33, 0xf3, 0xa4, 0x59, 0x42, -0xc8, 0x7b, 0xa8, 0x34, 0xc3, 0x78, 0x4f, 0xbb, 0xdd, 0x8f, 0xa5, 0x52, 0x49, -0x54, 0x4a, 0x8a, 0x58, 0x74, 0x58, 0x5b, 0xbd, 0x4e, 0xac, 0x54, 0x72, 0xad, -0x27, 0x22, 0x43, 0x9a, 0x2d, 0xcc, 0xcd, 0x4e, 0x4f, 0xd5, 0xeb, 0x49, 0x96, -0x48, 0x87, 0x8f, 0x91, 0x41, 0xaf, 0x4b, 0x7f, 0x2d, 0x22, 0xb5, 0xc2, 0xf5, -0x06, 0x9c, 0x3d, 0xb7, 0x4c, 0x56, 0x69, 0x8a, 0x83, 0xfb, 0x9b, 0x58, 0x5b, -0xe0, 0x7c, 0xc4, 0xb9, 0x40, 0xb4, 0x45, 0x2a, 0x4c, 0x4f, 0x30, 0x24, 0xd9, -0xc2, 0x7a, 0x3f, 0x1f, 0x0c, 0xd6, 0x07, 0xc6, 0xe4, 0x39, 0xc2, 0xae, 0xa3, -0xc2, 0x06, 0x99, 0xc8, 0xa9, 0x48, 0xc3, 0xa9, 0x33, 0x4b, 0xbc, 0xfc, 0xfb, -0xb7, 0x30, 0xc6, 0x22, 0x12, 0x45, 0x8c, 0x82, 0x10, 0x22, 0xce, 0x3b, 0x8c, -0x19, 0x54, 0xf3, 0x7e, 0x57, 0x30, 0xa4, 0xd9, 0x42, 0xb1, 0xd1, 0xb1, 0x29, -0x7d, 0x17, 0x5d, 0x89, 0xce, 0x40, 0x53, 0x84, 0x04, 0xa5, 0x04, 0x35, 0x17, -0x58, 0x5d, 0xb9, 0x81, 0x70, 0x39, 0x49, 0x22, 0x41, 0x08, 0x46, 0x82, 0xf7, -0x58, 0x6b, 0x40, 0xf9, 0x92, 0xf0, 0x5e, 0x30, 0xa4, 0xb9, 0xc5, 0x0f, 0x5e, -0x3a, 0xc5, 0xd3, 0xc7, 0x1e, 0x84, 0x7c, 0x75, 0xe3, 0x72, 0xbf, 0x36, 0x68, -0x9b, 0xdd, 0x5c, 0xc8, 0xc7, 0x30, 0x21, 0x41, 0x29, 0x49, 0x3d, 0xf5, 0x5c, -0x88, 0xd7, 0xb0, 0x72, 0x15, 0x11, 0x03, 0x23, 0x11, 0xf0, 0xce, 0x61, 0x8b, -0x02, 0x9d, 0x85, 0x54, 0x4a, 0xc1, 0x88, 0x66, 0xd3, 0x93, 0xcf, 0x3c, 0xc7, -0xd3, 0xc7, 0x1e, 0x64, 0xa4, 0x73, 0xd7, 0xd7, 0xef, 0x3d, 0x6d, 0xc7, 0xe7, -0x6c, 0xa8, 0x83, 0x02, 0xa9, 0x05, 0x51, 0x6b, 0x7a, 0x3a, 0x61, 0x99, 0x05, -0xae, 0xc7, 0x35, 0x0a, 0x51, 0x01, 0xe1, 0x20, 0x82, 0x75, 0x16, 0x6b, 0x0a, -0x54, 0x08, 0x52, 0x10, 0x05, 0x43, 0x9a, 0x4d, 0xd3, 0xfb, 0x0e, 0x31, 0xf2, -0xb3, 0x93, 0x67, 0x1e, 0xd2, 0xb5, 0xd6, 0x37, 0xd0, 0xa5, 0x34, 0x8d, 0x16, -0x25, 0x04, 0x5a, 0x29, 0x92, 0x44, 0x23, 0x55, 0x42, 0x39, 0x53, 0x90, 0xd4, -0x08, 0x32, 0x01, 0x02, 0x21, 0x06, 0x9c, 0xb3, 0x18, 0x6b, 0x48, 0x7d, 0x10, -0x31, 0x70, 0x93, 0x66, 0xd3, 0xb7, 0x3f, 0xff, 0x00, 0x5f, 0xfa, 0xe6, 0xf7, -0xa6, 0x62, 0x14, 0x4f, 0xd4, 0x6b, 0xb5, 0x39, 0x67, 0x0b, 0x84, 0xd0, 0x31, -0x49, 0x52, 0x21, 0x75, 0x06, 0x52, 0x51, 0x4a, 0x34, 0xa9, 0x56, 0x24, 0x0a, -0x84, 0xe0, 0xa6, 0xe0, 0x3d, 0xd6, 0x58, 0x9c, 0x29, 0xf0, 0xd1, 0x83, 0xe4, -0x26, 0xc9, 0xd0, 0x23, 0x4f, 0x7e, 0x87, 0x91, 0x03, 0x87, 0x8f, 0xdc, 0x56, -0x6d, 0x36, 0x8e, 0xa4, 0x5a, 0x91, 0x4a, 0x19, 0xab, 0x59, 0x26, 0x84, 0x80, -0x4e, 0xfb, 0x22, 0x2b, 0xd7, 0x2e, 0x71, 0x63, 0xa3, 0x87, 0x4a, 0x4a, 0x94, -0x4a, 0x25, 0xa4, 0x94, 0x10, 0x23, 0xce, 0x59, 0xac, 0x35, 0x18, 0x53, 0x40, -0x8c, 0x48, 0xa9, 0x18, 0xd1, 0x0c, 0xfd, 0xf6, 0xf9, 0x67, 0x18, 0xf1, 0xde, -0xef, 0xa9, 0x64, 0xe5, 0xa9, 0x44, 0x69, 0x54, 0xb9, 0x2c, 0x92, 0xac, 0xc2, -0xda, 0xf2, 0xfb, 0x94, 0xdb, 0xa7, 0xd9, 0xa1, 0x2f, 0xd1, 0xde, 0xb8, 0x93, -0xde, 0xba, 0x21, 0x1f, 0x58, 0x42, 0x08, 0x20, 0x24, 0xce, 0x3a, 0x9c, 0x31, -0x58, 0x63, 0x71, 0xce, 0x2b, 0xef, 0x3c, 0x23, 0x9a, 0xff, 0x11, 0x69, 0x9a, -0xaa, 0x4a, 0xad, 0x4a, 0x92, 0xa5, 0x08, 0x40, 0x66, 0x55, 0xca, 0x49, 0xa4, -0x92, 0x59, 0xa6, 0xfc, 0x65, 0x52, 0xdd, 0xc4, 0xac, 0x47, 0x6e, 0xac, 0xf5, -0x48, 0xf4, 0x14, 0x48, 0xb0, 0x45, 0x81, 0x75, 0x86, 0xe0, 0x3d, 0x45, 0xde, -0xaf, 0x6c, 0xf4, 0x56, 0x05, 0x43, 0x72, 0xef, 0xde, 0xbd, 0x42, 0x29, 0x95, -0x00, 0xc9, 0xf9, 0xb3, 0x4b, 0xb9, 0x54, 0xbe, 0xa8, 0x37, 0xca, 0x0c, 0xf2, -0x01, 0xd7, 0x96, 0x2f, 0xd1, 0xcd, 0x23, 0x79, 0x79, 0x81, 0x0b, 0xad, 0x4f, -0xb2, 0x5e, 0xbf, 0x93, 0x72, 0x9a, 0x50, 0xae, 0x56, 0xf9, 0xdb, 0xb9, 0x82, -0xfe, 0xca, 0x00, 0x29, 0x03, 0xd6, 0x58, 0x9c, 0xb7, 0x38, 0x9b, 0xd7, 0xcc, -0xa0, 0x27, 0x19, 0xd2, 0x49, 0x92, 0x64, 0x43, 0xf3, 0xfd, 0x7e, 0xbf, 0xfc, -0xea, 0xcb, 0xbf, 0xee, 0xcd, 0xec, 0xdc, 0x75, 0x6e, 0xe7, 0xfe, 0x0f, 0xed, -0xbf, 0x72, 0xe9, 0x62, 0x8c, 0x21, 0x08, 0x9d, 0x55, 0x18, 0xd4, 0xee, 0x60, -0x23, 0x15, 0xa8, 0xac, 0x46, 0x56, 0xeb, 0x50, 0xcd, 0x7a, 0x9c, 0x39, 0x37, -0xe0, 0xf0, 0x9e, 0x0d, 0xe6, 0x6b, 0x01, 0x6b, 0x0c, 0xd6, 0x58, 0x82, 0xf7, -0x69, 0x0c, 0x81, 0x11, 0xbd, 0xb8, 0xb8, 0x58, 0x5c, 0xbd, 0x7a, 0xb5, 0x3f, -0x34, 0xf7, 0xf7, 0xd7, 0xff, 0xd8, 0xbf, 0xfd, 0xee, 0x8f, 0x9c, 0xaa, 0x8e, -0xcf, 0xde, 0xd1, 0xda, 0x3e, 0x29, 0xb1, 0x06, 0x95, 0x68, 0xa4, 0xca, 0x08, -0x2a, 0x25, 0x2d, 0x67, 0xdc, 0x7b, 0xe8, 0x7e, 0xba, 0x9d, 0x15, 0xa4, 0x5f, -0x47, 0x10, 0x31, 0xc6, 0x60, 0x9d, 0xc1, 0x59, 0x43, 0x8c, 0x51, 0x0b, 0x10, -0x0c, 0xc9, 0x13, 0x27, 0x4e, 0xc4, 0x95, 0x95, 0x95, 0x2b, 0x4a, 0x29, 0x07, -0x4c, 0xbe, 0xfd, 0xca, 0xaf, 0xde, 0x5e, 0x3d, 0xfb, 0xc6, 0xf9, 0x46, 0x73, -0x9c, 0xe6, 0xd4, 0x1c, 0xb5, 0x7a, 0x83, 0x4a, 0x39, 0xa1, 0x94, 0x06, 0x94, -0x70, 0x6c, 0x9b, 0x9e, 0xa6, 0xdc, 0x68, 0xe1, 0xd1, 0xf8, 0x10, 0xb0, 0xb6, -0xc0, 0x59, 0x8b, 0xb3, 0x86, 0xe8, 0x5d, 0x1a, 0xbc, 0x15, 0x0c, 0x49, 0x86, -0x4a, 0x43, 0xc0, 0x0e, 0xa0, 0x25, 0xdd, 0x7a, 0xb2, 0xa8, 0x2f, 0x9a, 0xf2, -0xd5, 0xd7, 0x58, 0xbb, 0x7e, 0x99, 0x90, 0x8d, 0xa1, 0x1a, 0xdb, 0x48, 0xeb, -0xe3, 0xe8, 0x7a, 0x03, 0xab, 0xaa, 0xb1, 0x30, 0x0e, 0xf3, 0xc1, 0x7b, 0xb8, -0xbc, 0x8b, 0xf3, 0x22, 0x3a, 0x63, 0xa2, 0x19, 0x6c, 0x20, 0x94, 0xd2, 0x49, -0x56, 0x66, 0x44, 0x33, 0xe4, 0xbd, 0x77, 0xde, 0xfb, 0x15, 0x60, 0x31, 0x88, -0x54, 0x4e, 0x4c, 0x2f, 0x24, 0xb3, 0xee, 0x5d, 0x2e, 0xbe, 0xfe, 0x02, 0xed, -0xd9, 0x07, 0x48, 0x26, 0xf6, 0x80, 0xae, 0x44, 0x7c, 0x5f, 0x0c, 0xae, 0x9f, -0x13, 0xd9, 0x7f, 0x4e, 0x52, 0xc9, 0xaf, 0x10, 0xfd, 0x3c, 0x85, 0x0d, 0xf4, -0x3a, 0xd7, 0x44, 0x73, 0x62, 0x81, 0x52, 0x75, 0xec, 0xd9, 0x6d, 0xb3, 0xfb, -0xba, 0x0c, 0x69, 0x86, 0xec, 0x50, 0xab, 0xd5, 0x7a, 0xb3, 0xd7, 0x5b, 0x9f, -0x4d, 0x12, 0xfd, 0x99, 0x3c, 0x96, 0xb6, 0x17, 0xb6, 0x4b, 0x63, 0xe3, 0x1d, -0xcc, 0x3f, 0xdf, 0x81, 0x7f, 0x4f, 0xa2, 0x2a, 0x2d, 0x51, 0xa9, 0x34, 0xd6, -0xe6, 0xe6, 0xe7, 0x5e, 0xfb, 0x6b, 0xa7, 0x7d, 0x69, 0xe9, 0x5f, 0xed, 0xf1, -0xcf, 0xe6, 0xf6, 0x21, 0x5d, 0xb4, 0x27, 0x2a, 0x63, 0x33, 0x45, 0x6b, 0x7a, -0xf1, 0xcb, 0xf7, 0x7c, 0xec, 0xd8, 0x8b, 0x69, 0x73, 0x8f, 0xff, 0xea, 0x87, -0x41, 0x0c, 0x11, 0x63, 0x64, 0x53, 0x5d, 0xa7, 0xd9, 0x27, 0x1e, 0x3b, 0x76, -0xe4, 0x89, 0x47, 0x8e, 0xec, 0x38, 0x5a, 0x4e, 0xc2, 0x8d, 0x52, 0x6d, 0xfb, -0x9f, 0x83, 0xb7, 0xa7, 0xab, 0xcd, 0xc9, 0xd3, 0x97, 0x97, 0xfe, 0xb4, 0x74, -0xdf, 0x47, 0x0f, 0x9b, 0xa3, 0x8f, 0xbf, 0x60, 0x17, 0xe6, 0x9b, 0x1f, 0xff, -0xc2, 0xa7, 0xf6, 0xfd, 0xe6, 0xd0, 0xdd, 0x0b, 0x74, 0x6c, 0xf3, 0xb1, 0x83, -0x0f, 0x3f, 0xf5, 0x12, 0x9b, 0xba, 0x1f, 0x2c, 0x71, 0xd3, 0xdc, 0xdc, 0x1c, -0xb7, 0x10, 0x07, 0x16, 0xb7, 0xa5, 0xef, 0xbe, 0x79, 0x7c, 0xea, 0xca, 0x3f, -0x5e, 0xac, 0xfd, 0xe5, 0xe4, 0xf7, 0xd5, 0xd2, 0x1f, 0x7e, 0x2c, 0x63, 0xff, -0x3d, 0x6e, 0xf5, 0x93, 0xef, 0x7e, 0x71, 0xc7, 0x1b, 0xaf, 0x3c, 0xf7, 0x73, -0x77, 0xed, 0xd5, 0x47, 0xd9, 0xf4, 0xec, 0xe7, 0xa0, 0x7b, 0xe5, 0x2d, 0x46, -0xfe, 0x0b, 0x23, 0x6d, 0x86, 0x4b, 0xa3, 0xa1, 0xde, 0x64, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xEC, 0xEC, 0xEC, 0x33, 0xE5, 0xE4, 0xE4, 0x7D, 0x04, 0x04, -0x04, 0x73, 0x51, 0x4E, 0x4F, 0xDD, 0xFE, 0xFE, 0xFE, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x2D, 0x2E, 0x2E, 0x00, 0x21, 0x22, 0x22, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x14, 0x14, 0x13, 0x33, -0x2C, 0x2D, 0x2D, 0x6D, 0x17, 0x17, 0x17, 0x38, 0x04, 0x05, -0x05, 0xF7, 0xF5, 0xF4, 0xF5, 0xAA, 0x1B, 0x1C, 0x1B, 0x87, -0x18, 0x18, 0x18, 0x00, 0xFC, 0xFC, 0xFC, 0x00, 0x04, 0xF4, -0xF3, 0xF3, 0x03, 0x1D, 0x1D, 0x1D, 0x47, 0xD0, 0xD0, 0xD1, -0x42, 0x17, 0x18, 0x17, 0x42, 0xEC, 0xEB, 0xEC, 0xCC, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x01, 0x01, 0x00, 0x00, 0xFA, 0xFA, 0xF9, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x1A, 0x1A, 0x1A, 0x54, 0x38, 0x39, 0x39, 0xA5, 0x06, -0x06, 0x07, 0x06, 0xF1, 0xF1, 0xF1, 0xFA, 0xD7, 0xD6, 0xD6, -0xA4, 0x0F, 0x0F, 0x0F, 0xA6, 0xD3, 0xD2, 0xD1, 0x00, 0x09, -0x09, 0x09, 0x00, 0x02, 0x02, 0x02, 0x00, 0x01, 0xFF, 0xFF, -0xFF, 0x00, 0xD4, 0xD3, 0xD4, 0x6B, 0x0A, 0x0A, 0x09, 0x8F, -0xD6, 0xD4, 0xD5, 0xBB, 0xDC, 0xDC, 0xDB, 0x50, 0x00, 0x00, -0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xEC, 0xEC, 0xEC, 0x00, 0xEC, 0xEC, 0xED, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, -0x70, 0x71, 0x71, 0xDA, 0xF0, 0xEF, 0xF0, 0x21, 0xF3, 0xF3, -0xF3, 0x00, 0xD1, 0xD1, 0xD1, 0xA6, 0xF8, 0xF7, 0xF7, 0x5B, -0xFE, 0xFD, 0xFD, 0x22, 0x10, 0x11, 0x11, 0x52, 0x0B, 0x0C, -0x0B, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, -0x00, 0x29, 0x2A, 0x29, 0x95, 0xD0, 0xCE, 0xCF, 0xC7, 0xFB, -0xFA, 0xFA, 0xB0, 0x21, 0x21, 0x21, 0xA1, 0xF8, 0xF8, 0xF8, -0x5E, 0x01, 0x01, 0x01, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x0C, -0x0C, 0x0D, 0x00, 0xF3, 0xF4, 0xF4, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x0A, 0x0B, 0x24, 0x24, -0x25, 0x25, 0x20, 0xF3, 0xF2, 0xF3, 0x00, 0xD2, 0xD2, 0xD1, -0x00, 0x14, 0x14, 0x14, 0x4A, 0x0A, 0x0B, 0x0A, 0xA0, 0x06, -0x06, 0x06, 0x54, 0xEF, 0xEE, 0xEF, 0xAF, 0xF6, 0xF6, 0xF5, -0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x03, 0x03, 0x03, 0x00, 0x24, 0x25, 0x25, 0xCE, 0x99, 0x96, -0x97, 0x45, 0xFE, 0xFE, 0xFE, 0x3D, 0x08, 0x07, 0x08, 0xA2, -0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x0D, 0x0C, 0x0D, 0x00, 0x01, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x22, 0x03, 0x03, -0x03, 0x01, 0x0C, 0x0D, 0x0C, 0x00, 0x0B, 0x0B, 0x0B, 0x00, -0x25, 0x26, 0x25, 0x10, 0x0D, 0x0D, 0x0D, 0x5F, 0x00, 0xFF, -0x00, 0x03, 0xFB, 0xFB, 0xFB, 0x8F, 0xFF, 0xFF, 0x00, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFC, 0xFC, -0xD9, 0x98, 0x94, 0x96, 0x43, 0xFE, 0xFF, 0xFE, 0x3D, 0x08, -0x08, 0x08, 0xA3, 0xFF, 0xFF, 0xFF, 0x04, 0x01, 0x01, 0x00, -0x00, 0x15, 0x15, 0x14, 0x00, 0xF2, 0xF3, 0xF3, 0x00, 0xF2, -0xF3, 0xF3, 0x00, 0x0A, 0x0A, 0x0A, 0x2C, 0xD8, 0xD7, 0xD7, -0x00, 0x8B, 0x89, 0x8A, 0x00, 0xB0, 0xB0, 0xB1, 0x00, 0x12, -0x12, 0x12, 0x00, 0x09, 0x09, 0x0A, 0xF6, 0xFA, 0xFA, 0xF9, -0x5A, 0xFA, 0xFA, 0xFA, 0xCE, 0xFF, 0xFF, 0x00, 0x00, 0xC4, -0xE8, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFD, 0xFD, 0xFD, 0xDA, 0x98, 0x94, 0x96, 0x43, 0xFD, 0xFD, -0xFE, 0x3C, 0x09, 0x08, 0x09, 0xA2, 0x00, 0x00, 0x00, 0x05, -0x0C, 0x0F, 0x11, 0x00, 0xD5, 0xFE, 0x21, 0x00, 0xD8, 0xF7, -0x16, 0x0D, 0x12, 0x13, 0x14, 0x6A, 0xE5, 0xE5, 0xE6, 0x00, -0x17, 0x18, 0x18, 0x00, 0xFF, 0xFE, 0xFE, 0x00, 0xFA, 0xFA, -0xFA, 0x00, 0x17, 0x17, 0x16, 0x05, 0x0F, 0x10, 0x11, 0xD7, -0x24, 0x25, 0x25, 0x00, 0x10, 0x1A, 0x21, 0x00, 0xD1, 0xEF, -0x0B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFD, 0xFD, 0xFD, 0xDA, 0x99, 0x95, 0x96, -0x44, 0xFC, 0xFC, 0xFC, 0x3C, 0x08, 0x08, 0x09, 0xA1, 0x02, -0x04, 0x06, 0x05, 0xEE, 0x03, 0x1B, 0x0D, 0xDB, 0xF7, 0x33, -0xB4, 0x92, 0xC3, 0x12, 0x1F, 0xDC, 0xE3, 0xF3, 0x00, 0x10, -0x10, 0x0F, 0xFE, 0x25, 0x26, 0x25, 0xB6, 0xD1, 0xD0, 0xD0, -0x69, 0xE0, 0xE0, 0xE0, 0x58, 0x01, 0x02, 0x01, 0xF5, 0x02, -0x03, 0x02, 0x00, 0xE8, 0xE5, 0xE2, 0x00, 0xEB, 0xC6, 0xAA, -0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFD, 0xFD, 0xD9, -0x99, 0x97, 0x98, 0x45, 0x66, 0x69, 0x68, 0xBB, 0x09, 0x07, -0x09, 0xA3, 0x35, 0xFF, 0xF4, 0x19, 0x35, 0xF7, 0xB8, 0x3E, -0x9F, 0x05, 0x65, 0x00, 0x8B, 0xB8, 0xF9, 0xEF, 0x34, 0x01, -0xAB, 0x59, 0xEE, 0xEC, 0xE9, 0xB9, 0x3D, 0x3D, 0x3D, 0x00, -0x0B, 0x0C, 0x0C, 0x00, 0x09, 0x09, 0x09, 0x00, 0x02, 0x03, -0x03, 0x00, 0xEB, 0xE3, 0xDD, 0x00, 0xF6, 0xD3, 0xB4, 0x00, -0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x02, 0x00, 0xFB, 0x13, 0x23, 0x00, 0xFB, 0x13, 0x23, -0x00, 0xFB, 0x13, 0x23, 0x00, 0xFB, 0x13, 0x24, 0x00, 0xF7, -0x0F, 0x20, 0xD9, 0x8F, 0xA9, 0xC5, 0x50, 0x15, 0xF6, 0xF9, -0x53, 0x8C, 0x23, 0xEA, 0x3E, 0x19, 0xDB, 0xBF, 0x00, 0x73, -0xD9, 0x8D, 0xFE, 0xF4, 0xF8, 0xF2, 0x6E, 0xD5, 0xFA, 0x22, -0xB9, 0x04, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x07, 0x08, 0x07, 0x00, 0x18, 0x19, 0x19, 0x00, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xF4, -0xF8, 0x00, 0x48, 0x7D, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, -0xFF, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFA, 0xFA, -0x00, 0x0F, 0x23, 0xF1, 0xF7, 0xB6, 0x7A, 0x03, 0xCC, 0x3A, -0x10, 0xFF, 0xFC, 0x00, 0xFD, 0x01, 0x01, 0x00, 0xE9, 0xEB, -0xEA, 0xFB, 0xFE, 0xDD, 0xDD, 0x44, 0x13, 0xF3, 0xF3, 0xC2, -0xF5, 0xF0, 0xF1, 0x00, 0xF2, 0x1A, 0x1A, 0x00, 0x04, 0x37, -0x35, 0x00, 0xF7, 0x4E, 0x4F, 0x00, 0xF4, 0x01, 0x02, 0x00, -0xD9, 0xD8, 0xD9, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFC, 0xFB, 0x00, 0x10, 0x02, 0x02, 0x19, -0xB6, 0xDF, 0xD9, 0xC3, 0x39, 0xC6, 0xE3, 0xB8, 0x00, 0x29, -0x1B, 0x19, 0x00, 0x22, 0x44, 0x44, 0x00, 0x09, 0xE3, 0xE3, -0x05, 0xDC, 0xF5, 0xF6, 0xAF, 0xF9, 0xF5, 0xF6, 0x59, 0x12, -0xFF, 0xFF, 0xBA, 0x0E, 0xE2, 0xE2, 0x00, 0x07, 0xF0, 0xEB, -0x00, 0x14, 0xBB, 0xB8, 0x00, 0xCE, 0x3D, 0x3C, 0x00, 0xEE, -0x1D, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFC, -0x00, 0x0E, 0x18, 0x13, 0x20, 0xB3, 0xDF, 0xD3, 0xE6, 0x39, -0xD6, 0x11, 0x39, 0x00, 0xC6, 0x43, 0x81, 0x00, 0xDE, 0x08, -0x19, 0xF5, 0xC7, 0xA3, 0xA3, 0xFF, 0x06, 0x13, 0x13, 0x00, -0x2B, 0x33, 0x33, 0x12, 0xF2, 0x11, 0x11, 0xB6, 0xDE, 0x0B, -0x0B, 0x98, 0xFC, 0x02, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x33, 0xDE, 0xD6, 0x00, 0xFE, 0xD8, -0xD5, 0x00, 0xE0, 0xDF, 0xDF, 0x00, 0x02, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x0A, 0x18, 0x12, 0x20, -0xB1, 0xD1, 0xCA, 0xE4, 0x3C, 0xF4, 0xFF, 0x0F, 0x00, 0x23, -0x2B, 0x1D, 0x00, 0xD1, 0x11, 0x2D, 0xF7, 0xB3, 0xFD, 0x20, -0x42, 0x01, 0xF4, 0xF4, 0x8D, 0xD9, 0xCA, 0xCA, 0xFF, 0x08, -0x1C, 0x1C, 0x00, 0x29, 0x35, 0x35, 0x03, 0xFE, 0x09, 0x09, -0x67, 0xD9, 0x0E, 0x0E, 0xCF, 0xEE, 0x02, 0x04, 0x39, 0x00, -0x00, 0x00, 0x00, 0x09, 0xFE, 0xFD, 0x00, 0x62, 0xED, 0xE2, -0x00, 0xE3, 0x20, 0x57, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xFD, -0x00, 0x07, 0x01, 0x02, 0x19, 0xAA, 0xD4, 0xD1, 0xEB, 0x40, -0xE8, 0xF0, 0x05, 0x00, 0x1A, 0x26, 0x1E, 0x00, 0x07, 0x04, -0xFE, 0xFF, 0xEC, 0xE7, 0xDB, 0x70, 0xEC, 0x17, 0x16, 0xCA, -0x11, 0xF3, 0xF3, 0x78, 0xF3, 0xF4, 0xF4, 0xC0, 0xCE, 0xB4, -0xB4, 0x00, 0x09, 0x20, 0x20, 0x00, 0x2E, 0x3D, 0x3D, 0x00, -0x0A, 0x07, 0x07, 0x20, 0xDD, 0x02, 0x04, 0xBB, 0xEC, 0x01, -0x03, 0x43, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFE, 0xFE, 0x00, -0xF4, 0xFF, 0x0A, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x02, 0xF5, 0xF7, 0x12, -0x9D, 0xE4, 0xE1, 0xF8, 0x4B, 0xE3, 0xE4, 0xFA, 0x00, 0x13, -0x22, 0x1D, 0x00, 0x18, 0x16, 0x08, 0x00, 0xE1, 0xDB, 0xD6, -0x9B, 0x08, 0x0A, 0xF5, 0x9A, 0x09, 0xF6, 0xEE, 0x00, 0xF3, -0xFF, 0xFF, 0xFD, 0x02, 0xF1, 0xF1, 0x67, 0xF5, 0xFB, 0xFB, -0xF5, 0xCC, 0xAB, 0xAB, 0x00, 0x0A, 0x24, 0x24, 0x00, 0x2E, -0x3F, 0x3F, 0x00, 0x0C, 0x05, 0x06, 0x0B, 0xDE, 0x01, 0x04, -0xAE, 0xEE, 0xF9, 0xFE, 0x32, 0x05, 0xFC, 0xFB, 0x00, 0x64, -0xC9, 0x91, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFC, -0xFE, 0x00, 0x7F, 0xA1, 0xD5, 0x87, 0xF7, 0xFA, 0x0B, 0x5B, -0xE7, 0xDF, 0xF0, 0x00, 0x0D, 0x1F, 0x1E, 0x00, 0x23, 0x21, -0x10, 0x00, 0xDB, 0xD3, 0xD7, 0xC3, 0x09, 0x08, 0xF0, 0x6E, -0xFF, 0xFD, 0xFD, 0x00, 0x07, 0xF6, 0xF2, 0x00, 0xF3, 0x00, -0x00, 0x00, 0xFD, 0xFC, 0xFC, 0xDB, 0xF5, 0xF3, 0xF3, 0x78, -0xFC, 0xFD, 0xFD, 0x00, 0xC9, 0xA2, 0xA2, 0x00, 0x0B, 0x25, -0x25, 0x00, 0x2F, 0x3E, 0x3E, 0x00, 0x0B, 0x05, 0x05, 0x0E, -0xD9, 0xF2, 0xFB, 0xAF, 0xF8, 0xF7, 0xFE, 0x17, 0x51, 0xF1, -0xDE, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x89, 0xA9, 0xD7, -0x66, 0xC3, 0xE1, 0x04, 0x74, 0x02, 0xFA, 0xFF, 0x00, 0x0B, -0x1C, 0x1D, 0x00, 0x27, 0x26, 0x13, 0x00, 0xDB, 0xD5, 0xDA, -0xE3, 0x04, 0x03, 0xE6, 0x57, 0xFE, 0xFD, 0xF8, 0xF9, 0xFA, -0xE2, 0xC9, 0x00, 0xCB, 0xDF, 0xBD, 0x00, 0xA7, 0x0C, 0x0C, -0x00, 0xDE, 0x02, 0x02, 0x00, 0xF0, 0xF4, 0xF3, 0x95, 0xDA, -0xF2, 0xF1, 0x9A, 0x00, 0xFF, 0xFF, 0x00, 0xC8, 0x9F, 0x9F, -0x00, 0x09, 0x1E, 0x1E, 0x00, 0x2E, 0x3B, 0x3B, 0x00, 0x03, -0x03, 0x04, 0x1E, 0xDD, 0xF8, 0x00, 0xA3, 0xFF, 0xFA, 0xFF, -0x02, 0x01, 0xD2, 0xDC, 0xEC, 0x15, 0x4F, 0x84, 0xD4, 0xDF, -0x21, 0x0F, 0x05, 0xAD, 0xDE, 0xF5, 0x03, 0x32, 0x16, 0x13, -0x0A, 0x2C, 0xE3, 0xDE, 0xE4, 0xF5, 0xFA, 0xF4, 0xD6, 0x41, -0xFD, 0xEF, 0xD3, 0xCB, 0xFE, 0xDF, 0xC0, 0x00, 0x06, 0xFD, -0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x03, 0xFF, 0xFF, 0x00, 0x24, 0xF9, 0xF8, 0x00, 0x29, 0xF7, -0xF6, 0x03, 0x27, 0x0B, 0x0D, 0x8C, 0x1C, 0x10, 0x10, 0x6F, -0x03, 0x01, 0x01, 0x01, 0x33, 0x50, 0x50, 0x00, 0xF9, 0xE5, -0xE5, 0x00, 0xDB, 0xD1, 0xD1, 0xFF, 0x21, 0xFF, 0xFF, 0x46, -0x02, 0xF1, 0xF1, 0xF5, 0x0A, 0xF3, 0xEA, 0xED, 0x08, 0x2C, -0x34, 0x1F, 0xE5, 0x32, 0x3B, 0x1F, 0xEF, 0xE0, 0xDC, 0xE7, -0xFB, 0xF0, 0xD8, 0xB2, 0x60, 0xF1, 0xC8, 0x92, 0xCB, 0xF0, -0xC8, 0xA1, 0x00, 0xFD, 0xF4, 0xEC, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, -0x01, 0x01, 0x00, 0xD9, 0x08, 0x09, 0x00, 0xA3, 0x01, 0x03, -0xFD, 0xAA, 0xF3, 0xF3, 0x71, 0xC8, 0xED, 0xED, 0x6B, 0xF4, -0xF9, 0xF9, 0xF8, 0xCA, 0xAF, 0xAF, 0x00, 0x08, 0x18, 0x18, -0x00, 0x31, 0x51, 0x51, 0xE9, 0xDA, 0xEE, 0xEE, 0xCA, 0x03, -0x1D, 0x18, 0x10, 0xF5, 0xCE, 0xC9, 0xC6, 0x0A, 0xD7, 0xE5, -0x04, 0x6D, 0xE5, 0xD4, 0xD9, 0x11, 0xF8, 0xD2, 0x99, 0x8B, -0x05, 0xEB, 0xBB, 0xCA, 0x07, 0x00, 0xFA, 0x1E, 0x09, 0x09, -0x09, 0x1F, 0x07, 0x07, 0x07, 0x1F, 0x02, 0x02, 0x02, 0x1E, -0x01, 0x01, 0x01, 0x1E, 0x01, 0x01, 0x01, 0x1E, 0x01, 0x01, -0x01, 0x1E, 0x02, 0x02, 0x02, 0x1E, 0x03, 0x05, 0x05, 0x1D, -0xEE, 0x08, 0x08, 0x1A, 0xD2, 0x04, 0x04, 0xE4, 0xE3, 0xFF, -0xFF, 0xCE, 0x1D, 0xFD, 0xFD, 0x35, 0xFB, 0xF9, 0xF9, 0xE9, -0x81, 0xD4, 0xD4, 0x69, 0x89, 0xE5, 0xE5, 0xD9, 0x01, 0x95, -0x95, 0x95, 0x03, 0xCF, 0xCE, 0xCE, 0x10, 0xE5, 0xE7, 0xEB, -0x0B, 0xF0, 0xF0, 0xED, 0x05, 0x04, 0x03, 0x02, 0x03, 0x00, -0x00, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0x04, 0xFF, 0xFF, 0xFF, -0x03, 0xE7, 0xE7, 0xE7, 0x01, 0xEE, 0xEE, 0xEE, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x00, 0x00, 0xFD, 0x01, 0x01, 0x01, 0xFC, 0x01, 0x01, 0x01, -0xFD, 0x02, 0xFD, 0xFD, 0xFE, 0xFD, 0xFF, 0xFF, 0xF8, 0xFF, -0x02, 0x02, 0xF7, 0xF3, 0xF3, 0xF3, 0xF1, 0x06, 0x4A, 0xD6, -0xAB, 0xAA, 0xF4, 0xEA, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF8, 0xF8, 0x00, -0xA5, 0xA6, 0xA6, 0x02, 0x12, 0x12, 0x12, 0x49, 0x0B, 0x0B, -0x0C, 0x3F, 0xFB, 0xFB, 0xFA, 0xEC, 0x0A, 0x09, 0x0A, 0xA4, -0x22, 0x23, 0x23, 0xE6, 0x01, 0x01, 0x01, 0x00, 0x08, 0x08, -0xFE, 0x00, 0xFE, 0xFE, 0x03, 0x00, 0xFC, 0xFD, 0x01, 0x00, -0x02, 0x00, 0x01, 0x00, 0xF5, 0xF6, 0xF6, 0x01, 0xDD, 0xDD, -0xDC, 0x59, 0x09, 0x09, 0x09, 0x2F, 0x00, 0x00, 0x00, 0xE6, -0xED, 0xED, 0xEE, 0xA4, 0x2C, 0x2B, 0x2B, 0xED, 0x26, 0x26, -0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0xEB, 0xEB, 0xEB, 0x08, 0x8D, -0x8E, 0x8F, 0xA9, 0x5F, 0x5E, 0x5E, 0x4D, 0x1F, 0x1F, 0x1F, -0x01, 0xF8, 0xF8, 0xF8, 0x00, 0xEC, 0xED, 0xED, 0xE5, 0xF9, -0xF9, 0xF9, 0xC2, 0xFF, 0xFF, 0x00, 0xE0, 0x09, 0x09, 0xFE, -0xF2, 0xFF, 0xFF, 0x04, 0xFE, 0xFE, 0xFE, 0x03, 0x09, 0x03, -0x02, 0x02, 0x1A, 0x05, 0x06, 0x05, 0x31, 0x09, 0x09, 0x0A, -0x34, 0x02, 0x01, 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xBF, -0xBF, 0xBF, 0xE7, 0x12, 0x12, 0x12, 0x4E, 0x45, 0x45, 0x44, -0xCC, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0x00, -0x00, 0x00, 0x00, 0x00, 0xD0, 0xD0, 0xD0, 0x41, 0x0E, 0x0E, -0x0F, 0xBE, 0xDD, 0xDD, 0xDD, 0x00, 0xEE, 0xEE, 0xEE, 0x00, -0x0B, 0x0B, 0x0B, 0x00, 0x34, 0x34, 0x34, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0x03, 0x03, 0x03, 0x00, 0x0C, 0x0C, 0x0C, 0x00, -0x02, 0x03, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0xF9, -0xF9, 0x00, 0xFC, 0xFD, 0xFD, 0x00, 0xED, 0xEC, 0xED, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0x03, 0x03, 0x03, 0x00, 0x15, 0x16, -0x16, 0x00, 0xD0, 0xD0, 0xD0, 0xA0, 0x44, 0x43, 0x42, 0x61, -0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0xFF, -0xFF, 0xFF, 0x00, 0x10, 0x10, 0x11, 0x76, 0xD1, 0xD2, 0xD2, -0x00, 0xD4, 0xD4, 0xD4, 0x00, 0xF6, 0xF5, 0xF5, 0x00, 0x10, -0x10, 0x11, 0x00, 0xEF, 0xEF, 0xF0, 0x00, 0x45, 0x46, 0x44, -0x00, 0x0F, 0x0F, 0x0E, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, -0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x00, 0xFB, 0xF4, 0xF5, 0x00, 0x02, 0x02, 0x02, 0x00, 0xF8, -0xF8, 0xF8, 0x00, 0xFC, 0xFD, 0xFD, 0x00, 0xFB, 0xFB, 0xFC, -0x00, 0x27, 0x26, 0x26, 0x52, 0xF5, 0xF5, 0xF5, 0x7A, 0x0B, -0x0B, 0x0B, 0xE7, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xF6, -0xF6, 0x33, 0xFD, 0xFE, 0xFE, 0x46, 0xE5, 0xE4, 0xE4, 0x00, -0xFA, 0xFA, 0xFA, 0x00, 0xF9, 0xFA, 0xFB, 0x00, 0xE8, 0xE8, -0xE8, 0x00, 0xC9, 0xC9, 0xC8, 0x00, 0xCC, 0xCC, 0xCE, 0x00, -0xFD, 0xFE, 0xFE, 0x00, 0xED, 0xED, 0xEE, 0x00, 0xFE, 0xFE, -0xFE, 0x00, 0xE7, 0xE8, 0xE8, 0x00, 0x06, 0x06, 0x06, 0x00, -0xB6, 0xB7, 0xB7, 0x00, 0xC2, 0xC3, 0xC3, 0x00, 0x26, 0x27, -0x27, 0x00, 0xE1, 0xE1, 0xE1, 0x00, 0xDE, 0xDF, 0xDE, 0x00, -0xF9, 0xF9, 0xF9, 0x0E, 0xFA, 0xFA, 0xFB, 0x6B, 0x00, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, -0x5B, 0xFE, 0xFE, 0xFE, 0x02, 0x06, 0x07, 0x08, 0x00, 0xE6, -0xE5, 0xE7, 0x00, 0x01, 0x01, 0x01, 0x00, 0xED, 0xED, 0xED, -0x00, 0xFA, 0xFA, 0xFB, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xE9, -0xE9, 0xEA, 0x00, 0xEA, 0xEB, 0xEA, 0x00, 0xFE, 0xFE, 0xFE, -0x00, 0xE8, 0xE7, 0xE8, 0x00, 0xF2, 0xF3, 0xF4, 0x00, 0x39, -0x39, 0x39, 0x00, 0x28, 0x28, 0x28, 0x00, 0xC3, 0xC3, 0xC3, -0x00, 0x1E, 0x1E, 0x1E, 0x00, 0x24, 0x23, 0x23, 0x00, 0xF6, -0xF6, 0xF6, 0x00, 0xFB, 0xFC, 0xFC, 0x5B, 0xFE, 0xFE, 0xFE, -0x02, 0x02, 0xFF, 0xFF, 0xFF, 0x00, 0xFB, 0xFB, 0xFB, 0x4A, -0xF6, 0xF5, 0xF6, 0x00, 0x21, 0x21, 0x21, 0x00, 0x2F, 0x30, -0x2F, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1D, 0x1E, 0x1E, 0x00, -0x30, 0x32, 0x32, 0x00, 0xFB, 0xFB, 0xFB, 0x00, 0xDE, 0xDF, -0xDF, 0x00, 0xE9, 0xE9, 0xEA, 0x00, 0xA0, 0xA0, 0xA2, 0x00, -0x04, 0x05, 0x05, 0x00, 0xD1, 0xD2, 0xD2, 0x00, 0xE0, 0xE0, -0xE0, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0xBF, 0xBF, 0xBE, 0x00, -0x04, 0x03, 0x03, 0x00, 0x16, 0x17, 0x17, 0x00, 0x07, 0x08, -0x08, 0x00, 0xF8, 0xF8, 0xF8, 0x1F, 0xFC, 0xFC, 0xFC, 0x2C, -0x04, 0xFC, 0xFC, 0xFC, 0x16, 0xF6, 0xF6, 0xF7, 0x23, 0x03, -0x04, 0x03, 0x00, 0x29, 0x29, 0x27, 0x00, 0x14, 0x14, 0x14, -0x00, 0xDD, 0x1B, 0x1B, 0x00, 0xEC, 0xEC, 0xEC, 0x00, 0xF8, -0xF7, 0xF7, 0x00, 0xF2, 0xF2, 0xF2, 0x00, 0xE6, 0xE6, 0xE6, -0x00, 0xFD, 0xF5, 0xF5, 0x00, 0xEC, 0xC8, 0xC8, 0x00, 0x02, -0x03, 0x03, 0x00, 0x06, 0x06, 0x06, 0x00, 0xF4, 0xF5, 0xF4, -0x00, 0xEF, 0xEF, 0xF0, 0x00, 0x3B, 0x3C, 0x3D, 0x00, 0x11, -0x13, 0x13, 0x00, 0x04, 0x04, 0x04, 0x00, 0x09, 0x09, 0x09, -0x00, 0xFD, 0xFC, 0xFC, 0x01, 0xFA, 0xFB, 0xFB, 0x38, 0x04, -0xFA, 0xFA, 0xFB, 0x27, 0xF4, 0xF5, 0xF4, 0x03, 0x07, 0x07, -0x07, 0x00, 0x08, 0x08, 0x09, 0x00, 0x17, 0x17, 0x16, 0x00, -0xE2, 0xE2, 0xE2, 0x00, 0xE3, 0xE3, 0xE3, 0x00, 0xE4, 0xE3, -0xE3, 0x00, 0xEE, 0xEE, 0xEE, 0x00, 0xFD, 0xFD, 0xFC, 0x00, -0x16, 0x17, 0x17, 0x00, 0x07, 0x18, 0x18, 0x00, 0xD7, 0xB7, -0xB6, 0x00, 0xF8, 0xF8, 0xF8, 0x00, 0x07, 0x06, 0x07, 0x00, -0x10, 0x10, 0x10, 0x00, 0xF6, 0xF6, 0xF6, 0x00, 0x00, 0xFF, -0x00, 0x00, 0x30, 0x30, 0x2F, 0x00, 0x05, 0x05, 0x05, 0x00, -0xFE, 0x01, 0x01, 0x00, 0xF8, 0xF8, 0xF8, 0x2D, 0x04, 0xF7, -0xF8, 0xF7, 0x1D, 0xF8, 0xF7, 0xF8, 0x01, 0x0D, 0x0D, 0x0C, -0x00, 0xFE, 0xFE, 0xFE, 0x00, 0xDF, 0xDF, 0xE0, 0x00, 0xD6, -0xD7, 0xD7, 0x00, 0xD9, 0xD9, 0xD9, 0x00, 0xD4, 0xD3, 0xD2, -0x00, 0xF4, 0xF4, 0xF4, 0x00, 0xF6, 0xF6, 0xF6, 0x00, 0x1B, -0x1B, 0x1C, 0x00, 0x06, 0x07, 0x06, 0x00, 0xE8, 0xE7, 0xE8, -0x00, 0xFB, 0xFB, 0xFA, 0x00, 0x01, 0x01, 0x01, 0x00, 0x27, -0x27, 0x28, 0x00, 0xF0, 0xF2, 0xF1, 0x00, 0x05, 0x05, 0x05, -0x00, 0x0F, 0x0F, 0x0E, 0x00, 0x21, 0x21, 0x21, 0x00, 0xFE, -0xFE, 0xFE, 0x00, 0xFA, 0xFA, 0xFB, 0x24, 0x04, 0xF9, 0xF8, -0xF9, 0x0B, 0xF9, 0xFA, 0xF9, 0x00, 0x0B, 0xFF, 0x0B, 0x00, -0xF2, 0xF2, 0xF3, 0x00, 0xDE, 0xDF, 0xDE, 0x00, 0xDA, 0xDA, -0xDA, 0x00, 0xEA, 0xEA, 0xEA, 0xF0, 0x0C, 0x0C, 0x0D, 0x04, -0xFB, 0xFB, 0xFD, 0x0C, 0x03, 0x03, 0x05, 0xF2, 0xEE, 0xEE, -0xEE, 0xCA, 0x00, 0x01, 0x00, 0xFA, 0x02, 0x03, 0x03, 0x2E, -0x08, 0x03, 0x0A, 0x1A, 0x09, 0x09, 0x08, 0xFE, 0xF0, 0xF1, -0xF1, 0xEC, 0xF7, 0xF7, 0xF7, 0x17, 0x06, 0x05, 0x06, 0x01, -0x15, 0x14, 0x14, 0x00, 0x11, 0x11, 0x11, 0x00, 0x07, 0x06, -0x06, 0x00, 0x03, 0x03, 0x03, 0x0F, 0x04, 0xF9, 0xF9, 0xF9, -0xFE, 0xF9, 0xF8, 0xF9, 0x00, 0xF7, 0xF7, 0xF7, 0x00, 0xF7, -0xF7, 0xF7, 0x00, 0xE0, 0xE0, 0xE1, 0x00, 0xE7, 0xE7, 0xE6, -0xD7, 0xF8, 0xF9, 0xF9, 0x3B, 0x03, 0x04, 0x05, 0xFD, 0xFF, -0x00, 0xFF, 0x1A, 0x0E, 0x10, 0x0E, 0xE4, 0xEB, 0xE9, 0xEB, -0xF4, 0x02, 0x02, 0x01, 0x00, 0x07, 0x0A, 0x07, 0x03, 0xF7, -0xF6, 0xF6, 0x19, 0xF6, 0xF8, 0xF7, 0xFD, 0xFF, 0x01, 0x00, -0xEB, 0xFB, 0xFA, 0xFA, 0x8E, 0xE2, 0xE2, 0xE1, 0x6D, 0xDD, -0xDD, 0x1A, 0x00, 0x20, 0x20, 0x20, 0x00, 0x11, 0x10, 0x10, -0x00, 0x00, 0x01, 0x01, 0xFB, 0x04, 0xFE, 0xFE, 0xFE, 0xE7, -0xF0, 0xF1, 0xF0, 0x00, 0xFD, 0xFE, 0xFD, 0x00, 0xED, 0xED, -0xEE, 0x00, 0xE0, 0xE0, 0xDF, 0xFF, 0xF2, 0xF2, 0xF3, 0x78, -0x27, 0x26, 0x24, 0xEF, 0x0C, 0x0B, 0x0B, 0x00, 0xF1, 0xF1, -0xF1, 0xF2, 0x16, 0x16, 0x16, 0x00, 0xFA, 0xF9, 0xF9, 0x00, -0x02, 0x02, 0x03, 0x00, 0x0E, 0x0F, 0x0E, 0xFD, 0xE3, 0xE2, -0xE2, 0xE4, 0x01, 0x01, 0x02, 0x00, 0x03, 0x04, 0x03, 0x00, -0xD2, 0xD2, 0xD2, 0x7D, 0xF0, 0xF0, 0xF0, 0x57, 0xE4, 0xE4, -0xE4, 0x16, 0xE3, 0xE4, 0xE3, 0x00, 0xF9, 0xF9, 0xF8, 0x00, -0xFF, 0x00, 0xFF, 0xE2, 0x04, 0x09, 0x0A, 0x09, 0xCE, 0xDF, -0xDF, 0xE0, 0xFB, 0x07, 0x07, 0x06, 0x05, 0xEA, 0xEA, 0xEB, -0x00, 0xE9, 0xE9, 0xE9, 0xC3, 0x3C, 0x3A, 0x39, 0xB6, 0x0D, -0x0D, 0x0C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x1A, 0x1A, -0x00, 0x0B, 0x0B, 0x0B, 0x00, 0xF9, 0xF9, 0xF9, 0xFF, 0x01, -0x01, 0x01, 0x00, 0x11, 0x11, 0x11, 0x01, 0x08, 0x07, 0x07, -0x00, 0x02, 0x02, 0x02, 0x00, 0xFE, 0xFE, 0xFE, 0x00, 0x1F, -0x1E, 0x1E, 0xF4, 0xC8, 0xC9, 0xCA, 0x87, 0xE8, 0xE8, 0xE7, -0x8E, 0xDA, 0xD9, 0xDA, 0x01, 0xEC, 0xEB, 0xEC, 0x00, 0x0F, -0x0F, 0x0E, 0xC4, 0x01, 0x54, 0x54, 0x54, 0x02, 0x0B, 0x0C, -0x0D, 0xA0, 0x02, 0x02, 0x03, 0x5D, 0xF5, 0xF5, 0xF5, 0xFB, -0x10, 0x10, 0x0E, 0x8A, 0x11, 0x10, 0x10, 0xF6, 0xFE, 0xFE, -0xFE, 0x12, 0xFE, 0xFE, 0xFE, 0x0B, 0x00, 0x00, 0x00, 0x03, -0x02, 0x02, 0x02, 0xFE, 0x02, 0x02, 0x02, 0xFF, 0x01, 0x01, -0x01, 0x00, 0xFE, 0xFE, 0xFE, 0x02, 0xFE, 0xFE, 0xFE, 0x02, -0x00, 0x00, 0x00, 0xFF, 0x02, 0x02, 0x02, 0xF8, 0x02, 0x02, -0x02, 0xEF, 0xFD, 0xFD, 0xFD, 0xED, 0xC4, 0xC5, 0xC5, 0x72, -0x0E, 0x0E, 0x0F, 0x1F, 0x04, 0x04, 0x05, 0xE3, 0x37, 0x36, -0x34, 0x2E, 0x01, 0x2B, 0x2B, 0x2B, 0x07, 0x05, 0x05, 0x05, -0x29, 0x29, 0x2A, 0x2B, 0x73, 0x0D, 0x0D, 0x0D, 0xFC, 0xED, -0xEC, 0xEC, 0xF1, 0xCA, 0xCA, 0xC9, 0xEB, 0xFB, 0xFB, 0xFB, -0x05, 0xFB, 0xFB, 0xFB, 0xFA, 0xFC, 0xFC, 0xFC, 0xF7, 0xFD, -0xFD, 0xFD, 0xF8, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, -0x00, 0x01, 0x01, 0x01, 0x02, 0x03, 0x03, 0x03, 0x07, 0x06, -0x06, 0x06, 0x0A, 0x05, 0x05, 0x05, 0x09, 0x04, 0x04, 0x04, -0xFD, 0x10, 0x10, 0x11, 0x09, 0x20, 0x20, 0x20, 0x0E, 0x00, -0x01, 0x01, 0x11, 0xF8, 0xF8, 0xF8, 0xA5, 0x02, 0x01, 0x00, -0xB7, 0x04, 0x57, 0x57, 0x57, 0xFA, 0xF0, 0xF1, 0xF2, 0xEA, -0x22, 0x22, 0x22, 0x8A, 0x07, 0x07, 0x07, 0x03, 0xD7, 0xD8, -0xD8, 0x01, 0xDC, 0xDD, 0xDE, 0xF5, 0xD3, 0xD2, 0xD0, 0xEC, -0xFE, 0xFE, 0xFE, 0xFB, 0x01, 0x02, 0x02, 0xF9, 0x02, 0x02, -0x02, 0xFC, 0xFD, 0xFC, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, -0x02, 0x02, 0x02, 0x01, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFE, -0xFE, 0x06, 0x00, 0x00, 0x00, 0x06, 0x0A, 0x0B, 0x0B, 0x0C, -0x0C, 0x0E, 0x0F, 0x15, 0x14, 0x15, 0x15, 0xFE, 0x2E, 0x2E, -0x2E, 0xFD, 0x11, 0x11, 0x11, 0xF7, 0xF9, 0xF9, 0xF8, 0xFD, -0x01, 0xFF, 0xFF, 0xFF, 0x00, 0xE6, 0xE6, 0xE6, 0x02, 0x00, -0x00, 0x01, 0x00, 0x08, 0x09, 0x08, 0x01, 0xED, 0xED, 0xED, -0x00, 0xE0, 0xE0, 0xE0, 0x00, 0xED, 0xED, 0xED, 0xFD, 0xFA, -0xF9, 0xFA, 0x00, 0xFE, 0xFF, 0xFF, 0x00, 0x03, 0x03, 0x03, -0x00, 0xF9, 0xF8, 0xF8, 0x00, 0xFC, 0xFD, 0xFC, 0x00, 0x09, -0x09, 0x09, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0xFF, 0xFF, 0xFF, -0x00, 0x01, 0x01, 0x01, 0x00, 0x05, 0x05, 0x05, 0x02, 0x11, -0x11, 0x12, 0x01, 0x21, 0x20, 0x20, 0x00, 0x12, 0x12, 0x12, -0x00, 0x04, 0x04, 0x03, 0xFF, 0x12, 0x12, 0x12, 0xFE, 0x01, -0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xF8, 0xB8, -0x51, 0x77, 0x52, 0xB9, 0x73, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xE9, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x84, 0x95, 0x5B, 0x6C, 0x14, 0x55, 0x1C, -0xC6, 0x7F, 0x73, 0xEB, 0x5E, 0x60, 0x7B, 0x59, 0xD1, 0x96, -0x76, 0xEB, 0x52, 0x6D, 0x4B, 0x01, 0x2F, 0xD0, 0x1A, 0x90, -0x20, 0x88, 0x88, 0x85, 0x80, 0x12, 0x34, 0x51, 0xAB, 0x68, -0x4C, 0xBC, 0x80, 0x1A, 0x4B, 0xA2, 0x89, 0xF1, 0x85, 0x48, -0xF4, 0x45, 0x13, 0x43, 0x34, 0x0A, 0xC1, 0x40, 0x20, 0x10, -0x13, 0xC1, 0x5B, 0x22, 0x89, 0x52, 0x6B, 0x78, 0x40, 0x11, -0x6F, 0x11, 0x1A, 0xA9, 0x88, 0x4A, 0xD1, 0x81, 0xD2, 0xCB, -0xB6, 0xDD, 0x69, 0xBB, 0xDB, 0xED, 0x4C, 0x77, 0x66, 0xE7, -0xEF, 0xC3, 0x62, 0x61, 0x63, 0xA3, 0x27, 0x99, 0x87, 0x73, -0xF9, 0x7E, 0xF3, 0x9D, 0xEF, 0xE4, 0xFC, 0x8F, 0x22, 0x22, -0x4C, 0xD5, 0x4C, 0xD3, 0x54, 0x93, 0xA3, 0xE9, 0xF2, 0x47, -0x36, 0xB5, 0xC6, 0x7F, 0xEB, 0x3A, 0x3F, 0x5B, 0x8F, 0x94, -0x5E, 0xA3, 0xA0, 0xAA, 0xAE, 0x9D, 0x1A, 0x99, 0x73, 0x7D, -0xFC, 0xEC, 0x7B, 0x3B, 0xDF, 0x36, 0xAF, 0x2A, 0x0E, 0x77, -0xCF, 0x9A, 0x35, 0xCB, 0x9D, 0x4A, 0xAF, 0x4C, 0x05, 0x3E, -0x71, 0xB2, 0x23, 0xBA, 0xEC, 0xE1, 0x4D, 0x2D, 0x57, 0x37, -0xAD, 0xBA, 0xB7, 0x71, 0xF9, 0xDD, 0x75, 0x0D, 0x73, 0x6F, -0x2C, 0x2F, 0x89, 0x84, 0x03, 0x9A, 0x02, 0x63, 0x99, 0xAC, -0xD7, 0xD5, 0xF5, 0xBB, 0xD5, 0xF1, 0xED, 0x11, 0xB3, 0xF7, -0xC7, 0xC3, 0xED, 0xF7, 0x2F, 0x9A, 0xB3, 0x6F, 0xD7, 0x8E, -0xB7, 0xFF, 0xFA, 0x3F, 0xB0, 0x56, 0xBB, 0xF0, 0xF6, 0x3B, -0xFC, 0xC6, 0xF5, 0xAF, 0x2E, 0xDD, 0xF0, 0x7C, 0xE3, 0xEC, -0x59, 0x14, 0x05, 0x14, 0x94, 0xCB, 0xAB, 0x99, 0xEC, 0x88, -0x0F, 0x66, 0x02, 0xAF, 0xED, 0xC0, 0x3E, 0xD3, 0xFF, 0xEE, -0xE0, 0xEB, 0x7F, 0x7E, 0xFB, 0xC5, 0x01, 0x60, 0x7C, 0x2A, -0xB0, 0xB6, 0x60, 0xC5, 0xDA, 0x35, 0xE9, 0x25, 0x9B, 0xB6, -0x2D, 0x5A, 0xBF, 0xAE, 0x2E, 0xE8, 0x81, 0xE2, 0x81, 0xAA, -0x41, 0x4E, 0x01, 0xAD, 0x08, 0x34, 0xC0, 0xCD, 0x81, 0x9A, -0xBD, 0x34, 0x0E, 0xB8, 0x3A, 0xFC, 0xFC, 0x75, 0x87, 0xA5, -0x1E, 0x7D, 0xEB, 0xB5, 0x13, 0x87, 0xF6, 0xEF, 0x04, 0x32, -0xF9, 0x3F, 0x8B, 0x20, 0x22, 0xD4, 0x34, 0x2D, 0x59, 0x5A, -0xF9, 0xE2, 0xC1, 0x33, 0xAB, 0xBF, 0x14, 0x7F, 0xD5, 0x21, -0x91, 0xBD, 0x3F, 0x8B, 0xB8, 0x22, 0xE2, 0x8B, 0xC8, 0x89, -0x11, 0x91, 0x87, 0xDA, 0x44, 0xEE, 0x39, 0x2C, 0xF2, 0xEA, -0x71, 0x91, 0x71, 0x11, 0xC9, 0x89, 0xC8, 0x45, 0x5F, 0xE4, -0x89, 0x76, 0x91, 0x35, 0xED, 0xE2, 0xD7, 0xBE, 0xFE, 0xBD, -0x15, 0x5F, 0xB2, 0xFA, 0x19, 0x11, 0x51, 0x44, 0x04, 0xF5, -0x52, 0xA6, 0x91, 0xD1, 0xFA, 0x95, 0x5B, 0x67, 0x34, 0x3E, -0xD8, 0x30, 0xD8, 0x83, 0x32, 0xD0, 0x6B, 0xB3, 0xB0, 0x1A, -0xF4, 0xFC, 0xEE, 0x69, 0x2C, 0x81, 0xDC, 0xB8, 0x4B, 0x62, -0x00, 0xE6, 0x46, 0x21, 0x04, 0xA8, 0x40, 0x95, 0x02, 0x11, -0xCF, 0x26, 0xD1, 0x8B, 0x52, 0x52, 0xBD, 0xA8, 0xCC, 0x9A, -0x7B, 0xDF, 0x4B, 0x1B, 0x5B, 0x37, 0xCF, 0xE1, 0xD2, 0xBC, -0xF2, 0xCE, 0x07, 0x9F, 0xAD, 0x53, 0x9A, 0x5A, 0x16, 0x27, -0xCE, 0x27, 0xE8, 0xB9, 0xD8, 0x43, 0x5F, 0x22, 0x81, 0x93, -0x2D, 0x3C, 0x8C, 0xE1, 0xA4, 0xC5, 0x40, 0x62, 0x88, 0x71, -0xBB, 0x70, 0x62, 0x68, 0x78, 0x84, 0xBE, 0xDE, 0x7E, 0xFA, -0xBB, 0x13, 0x84, 0xEA, 0x9B, 0x63, 0x07, 0x7E, 0xFC, 0xEB, -0x29, 0xD3, 0x34, 0x43, 0xFA, 0xC9, 0x8E, 0x53, 0xD1, 0xFD, -0x27, 0xFB, 0xEF, 0xA7, 0xC9, 0x0F, 0x91, 0x3C, 0x07, 0xBA, -0x0E, 0x78, 0x4C, 0x64, 0x63, 0xE4, 0x3D, 0x83, 0x00, 0x43, -0xC9, 0x24, 0x89, 0x21, 0xC1, 0xB6, 0x0D, 0xA0, 0x68, 0x12, -0x3C, 0x62, 0x59, 0xF4, 0x76, 0x3B, 0x40, 0x0E, 0x0C, 0x5D, -0x23, 0xB6, 0xB8, 0x79, 0xDB, 0xF6, 0x5D, 0x7B, 0xF5, 0x71, -0x8C, 0x18, 0x55, 0x37, 0x34, 0x70, 0xF6, 0x94, 0x82, 0xE3, -0x42, 0x51, 0x08, 0x14, 0x05, 0xD7, 0xCD, 0x4E, 0x82, 0x3D, -0x20, 0x3D, 0x98, 0xC4, 0x1E, 0xF2, 0xB0, 0x9D, 0x28, 0x50, -0x32, 0x09, 0xCE, 0x24, 0x2D, 0x18, 0x18, 0x06, 0x71, 0x21, -0xE7, 0x42, 0x64, 0x66, 0x7C, 0xFB, 0x8E, 0x17, 0x6F, 0xD4, -0x97, 0x2E, 0x6F, 0x8E, 0x73, 0xDF, 0xD6, 0x0A, 0xFA, 0x3A, -0xF3, 0xC9, 0x68, 0xD3, 0x40, 0x35, 0x90, 0xAC, 0x0D, 0x84, -0x21, 0xEF, 0x05, 0xCF, 0x1A, 0x84, 0xC1, 0x71, 0x3C, 0xA7, -0xBA, 0x20, 0x0A, 0x49, 0x25, 0x60, 0xA8, 0x1B, 0xC8, 0x82, -0x6B, 0x83, 0x5A, 0x36, 0x8D, 0x68, 0xF5, 0x4D, 0x3A, 0x81, -0x48, 0x29, 0x13, 0x99, 0x20, 0x19, 0x0B, 0xF4, 0x30, 0x18, -0x92, 0x77, 0xEA, 0xE7, 0x2E, 0x8B, 0x01, 0xDC, 0x71, 0xF0, -0x6D, 0x44, 0xBC, 0x42, 0xB0, 0x6B, 0xC3, 0x44, 0x06, 0x70, -0x20, 0x6B, 0xC3, 0x44, 0x10, 0x42, 0xC5, 0x51, 0x1D, 0x45, -0x57, 0x18, 0xBD, 0x00, 0xE6, 0x57, 0x10, 0x8C, 0x42, 0xA4, -0x0A, 0x02, 0x25, 0xF9, 0x6D, 0x5D, 0x01, 0x16, 0xD7, 0x06, -0x67, 0xAC, 0x60, 0x1C, 0x20, 0x37, 0x31, 0x06, 0xF6, 0x20, -0x78, 0x19, 0xB0, 0x2D, 0x08, 0x66, 0x00, 0x14, 0x9D, 0x9C, -0x9B, 0x22, 0x54, 0x9C, 0x45, 0x33, 0x02, 0x38, 0x29, 0xC8, -0x09, 0x04, 0xAC, 0xBC, 0xC3, 0x7F, 0xC0, 0x02, 0x92, 0xEE, -0x87, 0xD4, 0x30, 0x64, 0x33, 0x85, 0x8E, 0xC7, 0x7A, 0x20, -0xF9, 0x07, 0xB8, 0x69, 0x70, 0x52, 0x30, 0x23, 0x0C, 0x8E, -0x9D, 0x56, 0x8F, 0x7D, 0xD5, 0x76, 0x81, 0x40, 0x68, 0x80, -0x68, 0x0C, 0x82, 0xC5, 0xF9, 0xCF, 0x08, 0x83, 0xA2, 0x4D, -0x8A, 0xFD, 0x1C, 0xF8, 0xFE, 0x04, 0xB8, 0x4E, 0x41, 0x44, -0xF9, 0xAB, 0xED, 0x83, 0x28, 0xA0, 0x18, 0x10, 0x2A, 0x86, -0xD2, 0x0A, 0x87, 0x54, 0xE2, 0x57, 0x35, 0x8C, 0x7B, 0x91, -0x94, 0xD5, 0x45, 0x75, 0x83, 0x50, 0x14, 0xC9, 0x43, 0x8D, -0xE9, 0x88, 0xA6, 0x15, 0x46, 0xA1, 0x85, 0xA0, 0x28, 0x02, -0xAA, 0x51, 0x08, 0xD6, 0x02, 0x50, 0x34, 0x1D, 0x02, 0xD3, -0xA1, 0xAC, 0x02, 0x02, 0x81, 0xDE, 0xE7, 0x5A, 0x9F, 0xEA, -0x54, 0x1B, 0xE7, 0xD5, 0x0D, 0x3C, 0xBE, 0xB8, 0xEE, 0x53, -0x1A, 0x1A, 0xB3, 0xCC, 0xA8, 0xCA, 0x2F, 0x28, 0x9A, 0x86, -0x88, 0x5A, 0x78, 0x78, 0x7A, 0x18, 0x82, 0x11, 0x7C, 0x55, -0x2F, 0x00, 0xFB, 0x6A, 0x10, 0x02, 0xD3, 0x20, 0x54, 0x02, -0x75, 0x0B, 0xFC, 0x88, 0x93, 0x38, 0xF6, 0xC2, 0xC6, 0xC7, -0x7E, 0x53, 0x01, 0x79, 0xF6, 0xEE, 0x25, 0x9F, 0x84, 0xB3, -0xD6, 0x69, 0xE6, 0xDD, 0x0A, 0xE1, 0x62, 0xD0, 0x43, 0xE4, -0xFC, 0xCB, 0x62, 0xCF, 0x15, 0x3C, 0x35, 0x08, 0x46, 0x04, -0xD7, 0x57, 0x0A, 0xC0, 0x59, 0x5F, 0xCB, 0x3B, 0xAE, 0xAE, -0x83, 0x92, 0xD2, 0xE1, 0x0D, 0x37, 0xCF, 0xDC, 0x53, 0x13, -0xAF, 0x1E, 0x9D, 0xAC, 0x6E, 0x75, 0x2B, 0x37, 0xAC, 0x3F, -0x37, 0xFB, 0x9E, 0xED, 0x32, 0x98, 0xAE, 0xC4, 0xBC, 0xA0, -0x2C, 0xBB, 0xAD, 0x9E, 0x96, 0x3B, 0xE7, 0x21, 0x8A, 0xC1, -0xF1, 0xDF, 0x2D, 0xDE, 0xFF, 0x61, 0x04, 0x7C, 0x95, 0xDA, -0x58, 0x90, 0xD6, 0x95, 0x55, 0x18, 0xE2, 0x71, 0xF6, 0x7C, -0x0F, 0x6F, 0x7E, 0xFC, 0x53, 0xFE, 0x52, 0x5D, 0x5B, 0xE9, -0xC4, 0x7B, 0x8E, 0xBE, 0x69, 0x7E, 0xBE, 0xEB, 0x65, 0xC0, -0xBB, 0xB2, 0x6C, 0x06, 0x6E, 0x79, 0x60, 0xF3, 0xC3, 0x27, -0x63, 0x77, 0xBD, 0x26, 0xB6, 0x56, 0xCE, 0x39, 0x13, 0x6C, -0x05, 0xCA, 0x2A, 0xA1, 0x62, 0x26, 0xE1, 0xB2, 0x62, 0x74, -0x4D, 0x63, 0xDC, 0x76, 0xF0, 0xFA, 0x12, 0x90, 0xEC, 0x07, -0x77, 0x14, 0x2A, 0xCA, 0xA0, 0x3C, 0xE2, 0xD0, 0xBE, 0x63, -0x97, 0x79, 0x64, 0xDF, 0x2B, 0xF1, 0x58, 0x85, 0x35, 0x55, -0xA1, 0x0F, 0xD4, 0xAC, 0x7C, 0xB4, 0xE5, 0x7C, 0xFD, 0xDA, -0x2D, 0x72, 0x4D, 0x7D, 0x0D, 0xA3, 0xBE, 0xA6, 0x85, 0xA6, -0x53, 0x51, 0x1A, 0xA5, 0x38, 0x12, 0x41, 0xD7, 0x74, 0x6C, -0xC7, 0x66, 0x68, 0x78, 0x98, 0x91, 0xF4, 0x18, 0xE8, 0xB6, -0x8F, 0xDD, 0x3B, 0x62, 0x1C, 0xDB, 0xB7, 0xFB, 0xD1, 0xA6, -0xF2, 0x37, 0xF6, 0xEC, 0xDE, 0x99, 0xFC, 0xAF, 0xA7, 0x49, -0x79, 0xFA, 0x85, 0x2D, 0x75, 0x1F, 0x9E, 0x49, 0x6F, 0x4C, -0xD7, 0xAF, 0x68, 0x2E, 0xA9, 0x9D, 0x1F, 0xAF, 0x8C, 0xC5, -0x23, 0xD1, 0x32, 0x14, 0x43, 0x87, 0x54, 0x1A, 0x7A, 0xBB, -0x07, 0x9C, 0x21, 0xF3, 0x97, 0x3E, 0xE7, 0xD8, 0x47, 0xDF, -0xCF, 0x15, 0x73, 0xF7, 0xE9, 0x6F, 0xDA, 0xBE, 0x01, 0xDC, -0xFF, 0x7D, 0xF3, 0x00, 0xCC, 0xEE, 0x9E, 0xD0, 0xB6, 0x77, -0xF7, 0x5F, 0xB7, 0x7D, 0xF7, 0x81, 0x79, 0xC4, 0x6E, 0x5A, -0xA0, 0x45, 0xAB, 0xCA, 0x31, 0x74, 0x23, 0x67, 0xF5, 0x25, -0xB9, 0xD8, 0x79, 0xBA, 0xF5, 0xC9, 0x96, 0xCE, 0xC7, 0xD6, -0xAF, 0xFA, 0xA3, 0x71, 0xFE, 0x0D, 0x96, 0xA2, 0x28, 0xFF, -0xD2, 0xFF, 0x3D, 0x00, 0xEA, 0xE2, 0x4F, 0x77, 0xBB, 0xE4, -0x24, 0x44, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x05, 0x53, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x8C, 0x55, 0x6B, 0x6C, 0x54, 0x45, 0x14, -0xFE, 0x66, 0xEE, 0xBD, 0x7B, 0xF7, 0x3E, 0xB6, 0xED, 0x76, -0xB7, 0x6C, 0x5B, 0xE8, 0xF6, 0x15, 0xA4, 0x48, 0x01, 0x51, -0x14, 0x10, 0x1F, 0x80, 0xBC, 0x54, 0xF8, 0xA1, 0x12, 0xFE, -0x80, 0x89, 0x31, 0x12, 0xF1, 0xD5, 0x84, 0x04, 0xC1, 0x00, -0x46, 0x81, 0x98, 0x40, 0x8C, 0x04, 0xC5, 0x18, 0x13, 0x9E, -0x01, 0x7F, 0x18, 0xB0, 0x50, 0xE4, 0x25, 0x12, 0xC0, 0x02, -0x01, 0xDB, 0x5A, 0x01, 0x49, 0x29, 0x50, 0x5A, 0x5A, 0x68, -0xB7, 0xB5, 0xBB, 0x65, 0xB7, 0xFB, 0xE8, 0x6E, 0x77, 0xEF, -0xCC, 0xF8, 0x63, 0x2B, 0x94, 0x58, 0x88, 0x27, 0x99, 0x73, -0x32, 0x99, 0x73, 0xBE, 0x73, 0xE6, 0xE4, 0x3C, 0x88, 0x10, -0x02, 0x0F, 0xA3, 0xE6, 0xAE, 0x16, 0xAD, 0xB1, 0xBB, 0xA1, -0xE4, 0x72, 0x47, 0xFD, 0x63, 0x3B, 0xAB, 0x77, 0x7A, 0x55, -0xBB, 0xEA, 0x66, 0x16, 0x4B, 0x14, 0x3A, 0x0B, 0x6F, 0x2F, -0x9F, 0xF7, 0x71, 0x8B, 0x6C, 0x69, 0x37, 0xA6, 0x8F, 0x99, -0xE6, 0x1F, 0xCA, 0x96, 0x3C, 0x0C, 0x78, 0xED, 0x81, 0x75, -0x13, 0xBB, 0x69, 0xD3, 0xBB, 0x99, 0x59, 0xDA, 0x94, 0x29, -0x05, 0x93, 0x4A, 0x87, 0x39, 0xF2, 0xEC, 0x9A, 0xA2, 0x83, -0x71, 0x0B, 0x81, 0x98, 0x9F, 0x5D, 0x0B, 0x34, 0x76, 0xD7, -0xDD, 0xBC, 0x58, 0x9F, 0xC1, 0x46, 0xEC, 0x5D, 0x31, 0x73, -0xD5, 0x4F, 0x5E, 0x77, 0x41, 0xFC, 0x91, 0xC0, 0x7B, 0x2F, -0xEC, 0x73, 0x7F, 0x59, 0xBD, 0xEE, 0xFD, 0x45, 0xAF, 0xCC, -0xFE, 0x70, 0x6E, 0xD9, 0x3C, 0x97, 0xAE, 0x64, 0x51, 0x4E, -0x38, 0x18, 0x04, 0x08, 0x48, 0xDA, 0x08, 0x04, 0x54, 0x50, -0x30, 0xD6, 0x2F, 0x2E, 0x75, 0xD7, 0x26, 0x77, 0x9F, 0x3C, -0x70, 0x32, 0x3B, 0x5E, 0xBC, 0x72, 0xD3, 0xA2, 0xAF, 0xAE, -0x66, 0x19, 0x59, 0xFC, 0x3F, 0xC0, 0x07, 0x6A, 0x7E, 0x36, -0xB7, 0xD4, 0xAD, 0xFF, 0x7A, 0xE9, 0x82, 0x05, 0x8B, 0x47, -0x79, 0xC6, 0xDB, 0x2C, 0x22, 0xC0, 0x31, 0xD8, 0x31, 0x79, -0x80, 0x13, 0x00, 0x0A, 0x64, 0xF4, 0xC4, 0x3B, 0xF9, 0xF7, -0x47, 0x76, 0x5E, 0x36, 0x83, 0x25, 0x1F, 0x6C, 0x5F, 0xB2, -0xED, 0xC2, 0x03, 0xC0, 0xB5, 0x37, 0xEB, 0xF4, 0x8A, 0xAA, -0xB7, 0x3F, 0xAD, 0x78, 0xEB, 0x8D, 0x65, 0xC3, 0xDC, 0x5E, -0x35, 0x09, 0x0B, 0x42, 0x00, 0x48, 0x51, 0x50, 0x21, 0x83, -0x29, 0x29, 0x10, 0x7A, 0xDF, 0x01, 0xB9, 0xC7, 0x05, 0x28, -0x28, 0x52, 0xC9, 0x98, 0xD8, 0x73, 0xAC, 0xF2, 0x6A, 0x51, -0x64, 0xEA, 0x9C, 0x8D, 0x8B, 0xBF, 0xE8, 0x90, 0xEF, 0x45, -0xDB, 0x50, 0xF9, 0xD2, 0xAB, 0xF3, 0x27, 0x2C, 0xA1, 0xD9, -0x8A, 0x7A, 0x87, 0xB7, 0x01, 0x20, 0xB0, 0xC2, 0x02, 0x79, -0x77, 0xCB, 0x90, 0x6F, 0x2F, 0x45, 0x93, 0xED, 0x0F, 0x44, -0x9D, 0xFE, 0x7F, 0xC3, 0xBD, 0x0F, 0x3E, 0x70, 0x97, 0x14, -0x4A, 0xE6, 0xCE, 0x9E, 0x52, 0xF6, 0xCB, 0xFE, 0xCB, 0xAB, -0xAE, 0x75, 0x5C, 0x5F, 0x21, 0x03, 0x40, 0x20, 0x12, 0x90, -0x5B, 0x78, 0xED, 0xB2, 0xE9, 0x79, 0xE5, 0xAE, 0x5B, 0x3D, -0x77, 0xD2, 0x66, 0x84, 0x40, 0x04, 0x65, 0x94, 0x24, 0x33, -0x90, 0xAB, 0x17, 0x21, 0x07, 0xF9, 0x38, 0xDB, 0x75, 0x10, -0xED, 0x6A, 0x13, 0x18, 0xB5, 0x06, 0xC0, 0x07, 0xA7, 0x49, -0x40, 0xA1, 0xB2, 0xE4, 0x2C, 0x65, 0xAF, 0xD5, 0x77, 0xD6, -0xEE, 0x23, 0x42, 0x08, 0xBC, 0xB7, 0xAB, 0xE2, 0x59, 0xE7, -0xE4, 0xD6, 0x5F, 0x2D, 0xC8, 0x46, 0x2C, 0x9E, 0x04, 0xA5, -0x14, 0x94, 0x4A, 0x50, 0xFA, 0x34, 0xCC, 0xB4, 0x2F, 0xC4, -0xF8, 0x9C, 0xC9, 0x90, 0x15, 0x09, 0x8A, 0x2A, 0xE3, 0x62, -0xE4, 0x1C, 0x4E, 0xF6, 0x56, 0x22, 0x41, 0xFB, 0x20, 0x84, -0x18, 0x38, 0xFC, 0x9E, 0xD4, 0x6C, 0x14, 0xFB, 0x2B, 0xEB, -0xB7, 0xC8, 0x29, 0x2B, 0x05, 0x77, 0xBE, 0x32, 0x23, 0x8E, -0xB8, 0xDA, 0xDA, 0x16, 0x84, 0xE0, 0x80, 0x24, 0x49, 0xA0, -0x54, 0x82, 0x9E, 0xCA, 0x80, 0x35, 0x2C, 0x1D, 0x9D, 0x10, -0x02, 0x54, 0x48, 0x98, 0xEC, 0x9A, 0x09, 0x3B, 0x31, 0x51, -0xD9, 0xBA, 0x15, 0xFE, 0x94, 0x0F, 0x9C, 0x33, 0x70, 0x21, -0xD2, 0x92, 0x73, 0x18, 0x86, 0x82, 0x11, 0xC5, 0xE6, 0x5C, -0xF9, 0xC8, 0xA5, 0xE3, 0xEA, 0xA9, 0xB6, 0xC3, 0xA3, 0x8B, -0x4C, 0x55, 0xEA, 0xF4, 0x05, 0x40, 0xA9, 0x0C, 0x49, 0x96, -0x21, 0x51, 0x09, 0x0E, 0xC1, 0x61, 0x65, 0xB3, 0x41, 0x9F, -0x15, 0x80, 0x00, 0x26, 0xE5, 0xBE, 0x88, 0x7C, 0xCD, 0x8B, -0x1D, 0x57, 0x36, 0xA1, 0x26, 0xF0, 0x1B, 0x18, 0x4F, 0x81, -0x31, 0x0E, 0xCE, 0x19, 0x6C, 0x2A, 0x45, 0x96, 0x53, 0x2F, -0x95, 0x25, 0x89, 0xDA, 0xED, 0xAA, 0x64, 0xFA, 0xAE, 0x06, -0x49, 0xC8, 0x1F, 0x85, 0x3D, 0x5B, 0x85, 0xA2, 0xC8, 0xA0, -0x84, 0xC2, 0x4E, 0x4C, 0x0C, 0xD5, 0x40, 0x42, 0x08, 0x14, -0x3A, 0x4B, 0xF1, 0xCE, 0xD8, 0xE5, 0xE8, 0xEB, 0x8B, 0xA1, -0xA6, 0xAB, 0x1A, 0x29, 0x9E, 0x04, 0x17, 0x0C, 0x49, 0x0E, -0x64, 0x3A, 0x55, 0x2A, 0x83, 0x70, 0x41, 0x89, 0x10, 0x9D, -0xE7, 0x13, 0xB8, 0x79, 0x3A, 0x02, 0xBB, 0x37, 0x02, 0xDD, -0x2B, 0x43, 0xF3, 0xC8, 0x20, 0x39, 0x3A, 0xD8, 0x48, 0x3E, -0x64, 0x67, 0x32, 0xC6, 0xD1, 0xEE, 0x6B, 0x47, 0xF3, 0xAD, -0x16, 0xF4, 0xDC, 0x0D, 0xA2, 0x3F, 0x92, 0x42, 0x7F, 0x8F, -0x05, 0x11, 0x21, 0x70, 0xCC, 0x32, 0x20, 0x0B, 0xC1, 0xE3, -0x96, 0xC5, 0xC2, 0x19, 0x5E, 0x55, 0x48, 0x3A, 0x88, 0x15, -0x01, 0xA2, 0xAD, 0x16, 0xFA, 0xFC, 0x16, 0xD4, 0xE1, 0x31, -0xA4, 0x9E, 0xB4, 0x06, 0x95, 0x58, 0x9A, 0x2C, 0x8B, 0xE1, -0x44, 0xED, 0x51, 0x6C, 0x3C, 0xF2, 0x19, 0xAE, 0xF9, 0xAE, -0xC0, 0x0A, 0x0B, 0xB0, 0x5E, 0xC0, 0x0A, 0x03, 0x86, 0xA9, -0x02, 0x9C, 0x30, 0xF9, 0xE5, 0xB1, 0x73, 0x53, 0x8D, 0x91, -0xEA, 0x2B, 0x35, 0xC6, 0x31, 0xAB, 0x29, 0xBF, 0x4B, 0x49, -0x31, 0x06, 0xAA, 0x01, 0x44, 0x03, 0x88, 0x0C, 0x0C, 0xCE, -0x04, 0x25, 0x14, 0xB1, 0x44, 0x0C, 0xDB, 0x8E, 0x7F, 0x8B, -0x6D, 0xE7, 0xBE, 0x41, 0x28, 0x1A, 0x04, 0x4F, 0x0D, 0x3C, -0xDA, 0x00, 0xAA, 0x03, 0xAE, 0x32, 0x3B, 0xB8, 0x22, 0xAE, -0x53, 0x45, 0xB6, 0xA1, 0xC7, 0x1F, 0x3F, 0xE9, 0xCC, 0xD5, -0xFB, 0x5D, 0x65, 0x3A, 0xA8, 0x0E, 0x50, 0x13, 0x90, 0x4C, -0x40, 0x32, 0x08, 0xA8, 0x9C, 0x2E, 0x57, 0x49, 0x92, 0xD0, -0x19, 0xF0, 0x61, 0xC3, 0xA1, 0x35, 0xF8, 0xEE, 0xE2, 0x06, -0x84, 0x95, 0x20, 0xA8, 0x31, 0xA0, 0xEB, 0x00, 0x24, 0x03, -0x50, 0x32, 0x08, 0xF2, 0xC6, 0x3A, 0xD0, 0x1B, 0x49, 0x1C, -0xA5, 0x00, 0xB0, 0x72, 0xCE, 0xBA, 0xCB, 0x56, 0x98, 0x56, -0x3F, 0x3E, 0xCD, 0x03, 0xD5, 0x2D, 0x81, 0xE8, 0x00, 0x35, -0x06, 0x80, 0xA5, 0x74, 0x1F, 0xDF, 0x68, 0xBF, 0x86, 0x8A, -0x83, 0x8B, 0x50, 0x79, 0x6B, 0x07, 0xB8, 0xBD, 0x1F, 0xCA, -0x00, 0x20, 0x35, 0x01, 0x62, 0xA4, 0xF5, 0x5D, 0xA3, 0x34, -0xE4, 0x14, 0x99, 0xB7, 0x57, 0xCF, 0xD8, 0x58, 0x25, 0x03, -0x80, 0xCB, 0x74, 0xB3, 0x72, 0x7D, 0xDA, 0xE6, 0x66, 0xCF, -0xA9, 0xA7, 0x8A, 0x9E, 0x71, 0xE6, 0xB6, 0x36, 0x04, 0x00, -0x0D, 0xE8, 0x57, 0x62, 0xA8, 0xF3, 0x9D, 0x41, 0x67, 0xA8, -0x1D, 0x55, 0x2D, 0x7B, 0xD0, 0x16, 0x6F, 0x02, 0x14, 0x01, -0x89, 0x51, 0x70, 0xCE, 0xD3, 0xB3, 0x83, 0x02, 0x0C, 0x80, -0x91, 0x21, 0xA3, 0xFC, 0xF9, 0x3C, 0xCB, 0x43, 0x8A, 0x7F, -0x2C, 0xCF, 0x79, 0xBA, 0xFE, 0xDE, 0xAC, 0x98, 0x35, 0x72, -0xC1, 0xD9, 0xDF, 0x4F, 0x1F, 0xDA, 0x3C, 0x71, 0xAA, 0x77, -0x8D, 0xB0, 0x31, 0xD3, 0x77, 0x27, 0x84, 0x28, 0x0F, 0xA1, -0xAA, 0xE5, 0x07, 0x64, 0x3A, 0x32, 0x21, 0x3B, 0x24, 0x8C, -0x70, 0x17, 0x40, 0x08, 0x81, 0xBE, 0xBE, 0x3E, 0x84, 0xC3, -0x61, 0x24, 0x12, 0x09, 0x50, 0x22, 0xA0, 0x39, 0x14, 0x8C, -0x19, 0x97, 0xCF, 0x75, 0x22, 0xD5, 0x15, 0xD0, 0x71, 0x1B, -0x4B, 0x87, 0x8D, 0x4A, 0x3C, 0x30, 0x36, 0x4F, 0x34, 0x54, -0x29, 0xBB, 0x1B, 0x57, 0x7F, 0xEE, 0x2E, 0xD7, 0x2A, 0x1A, -0x5B, 0xBB, 0xCC, 0xD6, 0xC6, 0x1E, 0xD8, 0x64, 0x1D, 0xC3, -0xF3, 0x87, 0xC3, 0x99, 0x9D, 0x0D, 0xC3, 0x30, 0x20, 0x04, -0x47, 0x6F, 0x38, 0x0C, 0x7F, 0x77, 0x37, 0xFC, 0x81, 0xBF, -0xA1, 0x9A, 0x04, 0x65, 0xA3, 0x3D, 0x4C, 0x8E, 0x8A, 0x33, -0x45, 0xFD, 0x2F, 0x7C, 0xB4, 0x6E, 0xFE, 0xF6, 0x86, 0x21, -0x07, 0xFD, 0x95, 0x8E, 0x1A, 0xF3, 0x62, 0xCF, 0xE1, 0x37, -0x1B, 0xE8, 0xF1, 0xD5, 0x51, 0x09, 0xB9, 0xFD, 0x11, 0x55, -0xD2, 0x55, 0x37, 0xB2, 0x32, 0xB3, 0xE1, 0x70, 0x98, 0x60, -0x8C, 0xA3, 0x37, 0x1C, 0x42, 0x38, 0x7C, 0x17, 0x49, 0x04, -0x85, 0x6E, 0x4B, 0x24, 0xEC, 0xC1, 0xCC, 0xFD, 0x8B, 0x4A, -0xD7, 0xAF, 0x2E, 0x74, 0x8E, 0xB9, 0x9D, 0xA9, 0x39, 0xC5, -0x23, 0x57, 0xD3, 0xAE, 0xF3, 0x6B, 0x8B, 0x7B, 0xA4, 0xBF, -0x96, 0xC6, 0x8C, 0xAE, 0xE7, 0xF2, 0x3C, 0x25, 0x65, 0x59, -0x5A, 0x6E, 0xA6, 0x43, 0x71, 0x49, 0x16, 0x4F, 0xE2, 0x6E, -0xDC, 0x17, 0xED, 0x0E, 0xB5, 0xB5, 0x87, 0xBA, 0x42, 0x7F, -0x7A, 0xAC, 0x09, 0xBB, 0x17, 0x3E, 0xF1, 0xC9, 0x29, 0x4F, -0x86, 0x37, 0xF5, 0xBF, 0x76, 0x1E, 0x00, 0xF8, 0x42, 0xCD, -0x72, 0x47, 0xEF, 0xD5, 0x11, 0x2D, 0xBD, 0x35, 0x25, 0xA7, -0x9A, 0xB6, 0x7A, 0x34, 0xD5, 0xE6, 0xE2, 0x8C, 0x27, 0xB2, -0xD4, 0xE2, 0x8E, 0xD7, 0xC7, 0xAD, 0xF2, 0x11, 0xA6, 0x35, -0x8F, 0x2F, 0x98, 0x1E, 0x1D, 0xCA, 0xF6, 0x9F, 0x01, 0x00, -0xB7, 0x74, 0x73, 0x9F, 0x7C, 0x6F, 0x3C, 0xA6, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Refresh3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x01, -0xD8, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0xF7, -0xFA, 0x03, 0xE6, 0xE8, 0xF4, 0x0F, 0xD1, 0xD4, 0xEC, 0x1F, -0x10, 0x0E, 0x0F, 0x25, 0x04, 0x04, 0x03, 0x02, 0xEF, 0xF2, -0xF1, 0xDF, 0x2D, 0x29, 0x12, 0xDE, 0x19, 0x17, 0x0C, 0xEF, -0x0B, 0x09, 0x05, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, -0xF2, 0xF8, 0x07, 0xBA, 0xC3, 0xE0, 0x42, 0xC1, 0xC9, 0xE1, -0x62, 0x0F, 0x0A, 0x12, 0x3F, 0x2D, 0x26, 0x22, 0x14, 0x04, -0x05, 0x0F, 0x01, 0x08, 0x07, 0x03, 0x00, 0x03, 0xF3, 0x0A, -0x00, 0xAC, 0xB2, 0xE0, 0xEF, 0xE6, 0xED, 0xE4, 0xC1, 0x22, -0x1F, 0x0F, 0x9E, 0x5D, 0x51, 0x2D, 0xBB, 0x13, 0x11, 0x0A, -0xF8, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF9, 0xFC, 0x04, 0xD8, -0xDB, 0xFD, 0x33, 0x09, 0x08, 0xFB, 0xD2, 0x01, 0xD8, 0xFE, -0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB9, 0xC1, 0xDD, 0x1E, 0xB9, 0xC1, -0xE1, 0x8E, 0x16, 0x12, 0x19, 0x4D, 0x2B, 0x25, 0x22, 0x06, -0x09, 0x08, 0x06, 0x00, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x02, 0x03, 0x01, 0x00, 0xF7, 0xF8, 0xFA, 0x00, 0xD6, 0xDC, -0xDF, 0xFB, 0xE6, 0xEC, 0xE5, 0xB8, 0x48, 0x3F, 0x20, 0x70, -0x3F, 0x37, 0x1F, 0xE4, 0xA3, 0xAB, 0xD8, 0x78, 0x07, 0x06, -0x18, 0x79, 0x17, 0x15, 0xF9, 0x38, 0x01, 0xD8, 0xFE, 0xFE, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, -0xBB, 0xD7, 0x34, 0xB0, 0xB7, 0xDF, 0xA0, 0x3E, 0x35, 0x39, -0x2A, 0x0F, 0x0D, 0x0C, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, -0x00, 0xF2, 0xF4, 0xF5, 0xFF, 0xCC, 0xD3, 0xD0, 0xD9, 0x0B, -0x09, 0x00, 0xC6, 0x17, 0x13, 0x20, 0x5B, 0x0D, 0x0B, 0x07, -0x07, 0x17, 0x16, 0xF9, 0x34, 0x01, 0xD8, 0xFE, 0xFE, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB1, 0xBA, 0xD6, 0x21, 0xA5, 0xAE, -0xD5, 0xB4, 0x43, 0x38, 0x40, 0x29, 0x07, 0x06, 0x07, 0x01, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0xFA, 0xFB, 0xFB, 0x00, 0xF0, 0xF2, 0xF0, 0x00, -0xFF, 0xFF, 0x00, 0x00, 0x0A, 0x09, 0x09, 0x00, 0x0D, 0x0B, -0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFE, 0xFF, 0xF8, 0xFA, -0xFA, 0x00, 0x09, 0x06, 0x07, 0x01, 0xF1, 0xF4, 0xF3, 0x00, -0x22, 0x1F, 0xFD, 0x34, 0x04, 0x00, 0x00, 0x00, 0x00, 0xF0, -0xF1, 0xF7, 0x07, 0xB0, 0xB4, 0xD2, 0x8F, 0x2F, 0x26, 0x2F, -0x29, 0xFA, 0xFB, 0xFA, 0x01, 0xFA, 0xFB, 0xFA, 0x00, 0x00, -0x00, 0x01, 0x00, 0xFA, 0xFB, 0xFA, 0x00, 0xD0, 0xD3, 0xCE, -0x00, 0xE1, 0xE1, 0xDD, 0x00, 0xFC, 0xFA, 0xFA, 0x00, 0x00, -0x00, 0x00, 0x00, 0x02, 0x03, 0x03, 0x00, 0x10, 0x14, 0x17, -0x00, 0x2B, 0x28, 0x2D, 0x00, 0x1F, 0x1B, 0x1D, 0x00, 0x02, -0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, -0x00, 0xF5, 0xF6, 0xF6, 0x00, 0xF9, 0xF9, 0xF9, 0x00, 0x01, -0x01, 0x04, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0xBC, 0xC3, -0xDA, 0x43, 0xFC, 0xFC, 0x08, 0x4A, 0x01, 0x01, 0x02, 0x01, -0xF2, 0xF4, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xEF, -0xED, 0x00, 0xCF, 0xCE, 0xC8, 0x00, 0xF6, 0xF5, 0xF3, 0xFF, -0xFF, 0xFD, 0xFD, 0xF4, 0x0A, 0x08, 0x04, 0xEC, 0x00, 0x00, -0x00, 0xFF, 0xF6, 0xF8, 0xFA, 0x15, 0xF0, 0xF1, 0xF0, 0x0C, -0xCB, 0xD6, 0xD0, 0x01, 0xEE, 0xF2, 0xF0, 0x00, 0x2C, 0x25, -0x28, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFE, 0xFD, 0x00, -0xFD, 0xFD, 0xFD, 0x00, 0xF9, 0xFA, 0xF9, 0x00, 0x02, 0x01, -0x06, 0x01, 0x04, 0xF5, 0xF6, 0xFA, 0x03, 0xAC, 0xB3, 0xD0, -0x60, 0x16, 0x14, 0x22, 0x05, 0xF3, 0xF5, 0xF3, 0x00, 0x00, -0x00, 0x00, 0x00, 0xF5, 0xF6, 0xF5, 0x00, 0xD0, 0xCE, 0xC8, -0x00, 0xFB, 0xFC, 0xFB, 0xFC, 0x0D, 0x10, 0x0D, 0xB4, 0x6A, -0x65, 0x43, 0x88, 0x2E, 0x2B, 0x1D, 0xCF, 0xFF, 0xFF, 0xFE, -0xFF, 0xD3, 0xD5, 0xE4, 0x31, 0xA9, 0xAD, 0xC9, 0x7A, 0xF3, -0xF9, 0x03, 0x4D, 0xFA, 0xFA, 0xFA, 0x02, 0xEB, 0xEC, 0xEB, -0x00, 0x15, 0x13, 0x14, 0x00, 0xFB, 0xFC, 0xFC, 0x00, 0xFB, -0xFB, 0xFC, 0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x01, 0x02, 0x01, -0x00, 0x04, 0xE5, 0xE7, 0xF2, 0x0E, 0xEB, 0xEC, 0xF4, 0x41, -0x13, 0x10, 0xFC, 0x00, 0xF2, 0xF4, 0xF3, 0x00, 0x00, 0x00, -0x00, 0x00, 0xDA, 0xDA, 0xD6, 0x00, 0xFB, 0xFB, 0xFA, 0xFF, -0x0F, 0x13, 0x11, 0xB3, 0x7E, 0x75, 0x4A, 0x5C, 0x3A, 0x35, -0x22, 0xF6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x1A, 0x17, 0x0E, 0xD2, 0xCB, 0xCE, 0xDF, 0xE1, 0xE8, 0xEC, -0x06, 0x00, 0x1D, 0x1A, 0x1C, 0x00, 0x02, 0x03, 0x03, 0x00, -0x00, 0x00, 0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0xFB, 0xFC, -0xFA, 0x00, 0xF8, 0xF9, 0xF7, 0x00, 0xFD, 0xFD, 0xFE, 0x02, -0x04, 0xC0, 0xC8, 0xDE, 0x1A, 0xFF, 0xFF, 0x00, 0x13, 0xF2, -0xF6, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFA, 0xF9, -0x00, 0xF4, 0xF2, 0xF0, 0x00, 0x00, 0x01, 0x02, 0xF5, 0x68, -0x62, 0x40, 0x8B, 0x3A, 0x35, 0x22, 0xF6, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0xFB, 0xFD, 0x02, 0x84, -0x8A, 0xB4, 0x77, 0xF9, 0xFC, 0x10, 0x69, 0x49, 0x43, 0x38, -0x02, 0xFF, 0xFE, 0x01, 0x00, 0xF6, 0xF7, 0xFB, 0x00, 0xEF, -0xF0, 0xF0, 0x00, 0xEF, 0xF2, 0xF0, 0x00, 0xE6, 0xEB, 0xE9, -0x00, 0xF5, 0xF6, 0xF5, 0x00, 0x36, 0x32, 0x11, 0x01, 0x04, -0xFC, 0xFC, 0xFB, 0x21, 0xFD, 0xFD, 0xFD, 0x01, 0xF1, 0xF6, -0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xF7, 0xF6, 0x00, -0x03, 0x08, 0x09, 0x00, 0x09, 0x04, 0xFF, 0xED, 0x2D, 0x29, -0x19, 0xCF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFF, 0x0B, 0xEE, 0xF3, -0x0D, 0x59, 0xF7, 0xF1, 0xE9, 0x05, 0xB7, 0xB5, 0xB4, 0xFD, -0xFA, 0xFB, 0xFC, 0xFB, 0xF8, 0xFC, 0xFC, 0x04, 0xF3, 0xF8, -0xF7, 0x03, 0xF9, 0xFC, 0xFC, 0x01, 0xFE, 0x01, 0x01, 0x00, -0x08, 0x09, 0x0A, 0xD3, 0x1D, 0x1B, 0x0B, 0xDB, 0x04, 0x00, -0xFF, 0xFE, 0xFF, 0xF8, 0xF1, 0xEE, 0x00, 0xFD, 0xFC, 0xFB, -0x00, 0x02, 0x06, 0x07, 0x00, 0x04, 0x06, 0x07, 0x00, 0x07, -0x0F, 0x11, 0x00, 0x02, 0xFA, 0xF4, 0x00, 0x00, 0x00, 0x00, -0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x0A, 0x09, 0x03, 0xF3, 0x97, 0x8B, 0x44, -0x28, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFB, 0xFD, 0x00, 0xA4, -0xA7, 0xC4, 0x02, 0xF6, 0xF8, 0xFC, 0xFF, 0x35, 0x33, 0x22, -0xFF, 0x26, 0x24, 0x17, 0x00, 0x05, 0x05, 0x04, 0x00, 0x0B, -0x0A, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, -0x02, 0xDF, 0xFF, 0xFC, 0xFB, 0xFF, 0xFE, 0xFB, 0xFA, 0x01, -0x02, 0x06, 0x07, 0x00, 0x04, 0x06, 0x07, 0x00, 0x11, 0x0D, -0x0D, 0x00, 0xF4, 0xF0, 0xFF, 0x13, 0xD4, 0xD8, 0xE8, 0x32, -0x23, 0x1F, 0x13, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xB4, 0xB9, 0xD1, 0x04, 0xA4, 0xA7, -0xC9, 0x10, 0x07, 0x0C, 0x0E, 0xFB, 0xAC, 0xB1, 0xCF, 0xFB, -0xFE, 0xFE, 0xFE, 0xFB, 0x13, 0x16, 0x10, 0xFD, 0x56, 0x51, -0x34, 0xFE, 0x56, 0x4E, 0x31, 0x00, 0x02, 0x3F, 0x38, 0x22, -0xE7, 0x01, 0x03, 0x05, 0xEC, 0x03, 0x09, 0x0B, 0x00, 0x08, -0x0C, 0x0D, 0x00, 0x12, 0x0D, 0x0E, 0x00, 0x10, 0x0B, 0x0D, -0x00, 0x1A, 0x1A, 0x1D, 0x0B, 0xA2, 0xAF, 0xD3, 0x78, 0xCE, -0xD4, 0xE8, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, -0xE1, 0xED, 0x03, 0x98, 0x9C, 0xBF, 0x2E, 0x21, 0x28, 0x2C, -0x2B, 0x26, 0x27, 0x2B, 0x21, 0x2B, 0x2E, 0x34, 0x19, 0x24, -0x29, 0x2F, 0x12, 0x00, 0x07, 0x11, 0x0C, 0x9A, 0xA7, 0xCC, -0x06, 0xF2, 0xF4, 0xF9, 0x00, 0x03, 0x77, 0x89, 0x85, 0xFB, -0xBB, 0xC0, 0xD6, 0x32, 0xFB, 0x03, 0x09, 0x2C, 0x10, 0x0E, -0x0F, 0x00, 0x10, 0x0B, 0x0D, 0x00, 0x07, 0x05, 0x06, 0x00, -0x09, 0x08, 0x07, 0x01, 0x0A, 0x07, 0x0B, 0x22, 0xC5, 0xCC, -0xE1, 0x2C, 0x0A, 0x09, 0x04, 0xD4, 0x06, 0x04, 0x03, 0xED, -0xF1, 0xF3, 0xF9, 0x00, 0xC2, 0xC9, 0xDE, 0x1D, 0x97, 0x9C, -0xC0, 0x5F, 0x0F, 0x10, 0x1B, 0x42, 0x15, 0x14, 0x17, 0x12, -0x01, 0x01, 0x01, 0x0B, 0x00, 0x00, 0x00, 0x08, 0x03, 0x02, -0x02, 0x05, 0x01, 0x00, 0x01, 0x04, 0x09, 0x0A, 0x00, 0xFA, -0x51, 0x48, 0x2B, 0xF9, 0x01, 0xD8, 0xFE, 0xFE, 0x00, 0xA9, -0xAE, 0xCA, 0x47, 0x9B, 0xA6, 0xCC, 0xB3, 0x1E, 0x1D, 0x22, -0x05, 0x0A, 0x07, 0x08, 0x00, 0x05, 0x05, 0x04, 0x00, 0x06, -0x04, 0x06, 0x00, 0x05, 0x05, 0x05, 0x00, 0x01, 0x02, 0x02, -0xFF, 0xF1, 0xF4, 0xF3, 0xF0, 0xF3, 0xF7, 0xF1, 0xED, 0xFA, -0xF9, 0xF8, 0xFD, 0x00, 0xFF, 0x04, 0x0E, 0x1A, 0x16, 0x19, -0x00, 0x0D, 0x0A, 0x0B, 0xE9, 0xFC, 0xFD, 0xFC, 0xE0, 0xFB, -0xFB, 0xFB, 0xE0, 0xFB, 0xFC, 0xFB, 0xE3, 0xFC, 0xFC, 0xFC, -0xE7, 0xE8, 0xEE, 0xEB, 0xE8, 0x34, 0x30, 0x16, 0xCB, 0x74, -0x67, 0x3C, 0xF4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x46, 0x42, -0x2C, 0xBF, 0xB0, 0xB5, 0xD1, 0xB3, 0x01, 0x00, 0xFF, 0x51, -0x03, 0x03, 0x03, 0x01, 0x04, 0x03, 0x04, 0x00, 0x04, 0x04, -0x04, 0x00, 0x05, 0x05, 0x05, 0x00, 0x05, 0x04, 0x06, 0x01, -0x0F, 0x0C, 0x0D, 0x11, 0x05, 0x04, 0x1F, 0x11, 0x02, 0x03, -0x02, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFB, 0xFC, 0xFC, 0xFE, -0xFA, 0xFB, 0xFA, 0x06, 0x02, 0xFB, 0x03, 0x00, 0x00, 0x01, -0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFC, 0xFD, 0xFD, 0x00, -0x09, 0x0A, 0xFF, 0xE3, 0x60, 0x56, 0x32, 0xF5, 0x00, 0x00, -0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x11, 0x10, 0x0A, -0xFA, 0x55, 0x50, 0x33, 0x70, 0xE9, 0xE9, 0xE5, 0xD4, 0x01, -0x01, 0x00, 0xFF, 0x03, 0x03, 0x03, 0x00, 0x04, 0x04, 0x04, -0x00, 0x05, 0x03, 0x05, 0x00, 0x08, 0x07, 0x06, 0x00, 0x0D, -0x0C, 0x0E, 0x00, 0x12, 0x12, 0x11, 0x00, 0x15, 0x13, 0x13, -0x00, 0x12, 0x12, 0x11, 0x01, 0x10, 0x0F, 0x0F, 0x03, 0x0A, -0x09, 0x0A, 0x11, 0x05, 0x05, 0x04, 0x1F, 0x05, 0x03, 0x05, -0x1E, 0x03, 0x03, 0x04, 0x1C, 0xE2, 0xE9, 0xE4, 0x04, 0x4F, -0x47, 0x28, 0xD2, 0x14, 0x11, 0x0A, 0xFF, 0x00, 0x00, 0x00, -0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x52, 0x4D, 0x32, 0xE3, 0x61, 0x58, 0x32, 0x5F, 0xE4, 0xE5, -0xE1, 0xD2, 0xFF, 0x00, 0x01, 0xFF, 0x04, 0x03, 0x04, 0x00, -0x04, 0x04, 0x04, 0x00, 0x09, 0x08, 0x09, 0x00, 0x0D, 0x0D, -0x0B, 0x00, 0x10, 0x0F, 0x09, 0x00, 0x13, 0x12, 0x06, 0x00, -0x12, 0x10, 0x07, 0x00, 0x0F, 0x0E, 0x09, 0x00, 0x0C, 0x0B, -0x0B, 0x02, 0x08, 0x07, 0x07, 0x0F, 0xFE, 0xFF, 0xFF, 0x1C, -0xDA, 0xDF, 0xD9, 0xFE, 0x5D, 0x52, 0x2B, 0xAA, 0x50, 0x46, -0x2B, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x53, 0x4E, 0x32, 0xCF, 0x02, 0x03, 0x02, -0x4B, 0xB6, 0xBE, 0xDE, 0x89, 0xF8, 0xF9, 0x15, 0x52, 0x17, -0x14, 0x16, 0x09, 0x07, 0x07, 0x07, 0x00, 0x0A, 0x09, 0x04, -0x00, 0x0D, 0x0D, 0x02, 0x00, 0x0C, 0x0B, 0x01, 0x00, 0xFB, -0xFC, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0xEE, 0xF0, 0xFB, -0x00, 0xDD, 0xE1, 0xDE, 0xFC, 0xF5, 0xF6, 0xE9, 0xBF, 0x5B, -0x52, 0x2B, 0x75, 0x50, 0x49, 0x2D, 0xE4, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -0xD8, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0xEF, 0xF1, 0xF7, 0x04, 0xBD, 0xC2, 0xD9, 0x3A, 0xB1, 0xB7, -0xD4, 0x62, 0x01, 0x00, 0x0C, 0x41, 0x11, 0x0F, 0x0F, 0x1D, -0x1F, 0x1F, 0x16, 0x01, 0x09, 0x08, 0x01, 0x00, 0xE8, 0xE8, -0xF4, 0xFF, 0xE6, 0xE9, 0xE9, 0xE6, 0xFA, 0xFA, 0xF3, 0xC4, -0x23, 0x16, 0xF8, 0x9C, 0x69, 0x6A, 0x53, 0xC4, 0x15, 0x15, -0x0F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xD8, -0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xF5, 0xF9, -0x02, 0xE1, 0xE2, 0xED, 0x0D, 0xBF, 0xC3, 0xD7, 0x14, 0x00, -0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, -0xE8, 0x41, 0x3C, 0x27, 0xE8, 0x20, 0x20, 0x16, 0xF3, 0x0C, -0x0B, 0x07, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xB4, 0x89, -0xF5, 0x1D, 0x8B, 0x7B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xF2, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x84, 0x94, 0x5D, 0x6C, 0x5C, 0x47, 0x19, -0x86, 0x9F, 0x6F, 0xCE, 0xD9, 0xB3, 0x67, 0xD7, 0xBB, 0xD9, -0x6C, 0xBC, 0x6B, 0x36, 0x26, 0x69, 0x12, 0x3B, 0x89, 0x13, -0x29, 0xA5, 0x6E, 0xD5, 0x82, 0x5A, 0x1C, 0x85, 0x82, 0xAA, -0x48, 0xA4, 0x95, 0x90, 0x40, 0xA8, 0x02, 0x89, 0x0A, 0x95, -0x04, 0xB8, 0x01, 0xC1, 0x05, 0x70, 0x81, 0xB8, 0x69, 0x91, -0x0A, 0x17, 0x5C, 0x70, 0x47, 0xA3, 0x14, 0xC2, 0x5F, 0x24, -0x24, 0x4A, 0x69, 0x2B, 0x2E, 0x12, 0xD4, 0x16, 0x9A, 0xA6, -0xA2, 0x8D, 0x42, 0x12, 0x7E, 0x92, 0xD4, 0xD9, 0xD8, 0x69, -0x36, 0xF6, 0xAE, 0xBD, 0x6B, 0xEF, 0x8F, 0x7D, 0xCE, 0xEE, -0xD9, 0x33, 0x33, 0x5C, 0xB8, 0x6E, 0x9D, 0x10, 0xD5, 0xAF, -0x34, 0xD2, 0x5C, 0xCC, 0x3C, 0xF3, 0x7E, 0xDF, 0x7C, 0x7A, -0xE5, 0x8B, 0x3B, 0x00, 0x0B, 0xC6, 0x80, 0x00, 0xAE, 0x78, -0xE4, 0x71, 0xA8, 0xF6, 0x43, 0x95, 0x57, 0x89, 0x6D, 0x9E, -0xE3, 0xEF, 0x18, 0xC8, 0x6C, 0xD8, 0x93, 0x4A, 0xA5, 0x0A, -0x08, 0x12, 0x04, 0xE1, 0x7C, 0x10, 0xB4, 0xAF, 0xF4, 0xA2, -0x70, 0xAA, 0x69, 0xE3, 0xE9, 0x8F, 0xB8, 0x49, 0xD3, 0xC4, -0xD0, 0xB7, 0x7D, 0x10, 0x10, 0x07, 0x10, 0x70, 0x59, 0xE1, -0x62, 0xED, 0x7B, 0x4B, 0x59, 0x2C, 0x76, 0xF3, 0xAE, 0x81, -0xE2, 0x93, 0x13, 0xF7, 0x1D, 0x38, 0x34, 0xF2, 0xC0, 0xC4, -0xD8, 0xE0, 0xCE, 0x3D, 0x79, 0x2F, 0x9B, 0x01, 0xA0, 0xD7, -0xE9, 0xB0, 0x30, 0x79, 0x69, 0xB1, 0xFC, 0x8F, 0xD7, 0xDF, -0x79, 0xFD, 0x9F, 0x7F, 0x7F, 0xB9, 0x13, 0x75, 0x9E, 0xB3, -0xD6, 0xCE, 0x18, 0x56, 0xA4, 0xEC, 0x8A, 0x41, 0x59, 0x6A, -0x2D, 0x80, 0x5D, 0x81, 0x57, 0xA7, 0xCB, 0xDE, 0xB1, 0xAF, -0x7F, 0xF9, 0xB1, 0x4F, 0x6D, 0xD9, 0xF7, 0xD4, 0x43, 0x8F, -0x7F, 0x6D, 0xD7, 0xC0, 0xC8, 0x36, 0x57, 0xB0, 0x88, 0x89, -0x41, 0x84, 0x55, 0x59, 0xE5, 0x62, 0x05, 0x96, 0xDE, 0xB9, -0x1A, 0x9F, 0x3E, 0x71, 0x6C, 0xF2, 0xA5, 0x0B, 0xAF, 0xFD, -0xA8, 0xD6, 0x6B, 0xBF, 0x88, 0x22, 0x52, 0xCE, 0xCA, 0x51, -0xB1, 0xD6, 0x02, 0x30, 0x3B, 0x75, 0x35, 0x71, 0xE2, 0xDB, -0x87, 0xBF, 0xF2, 0x99, 0xAD, 0xE3, 0xCF, 0x7C, 0xEC, 0xE0, -0xA3, 0x05, 0x49, 0x02, 0x5A, 0xBF, 0x0F, 0x43, 0xFE, 0x6F, -0x03, 0x4E, 0x02, 0xD3, 0xED, 0x73, 0xE1, 0xE5, 0xE7, 0xEB, -0xCF, 0x9E, 0xFC, 0xDD, 0x0F, 0xAA, 0x71, 0xE7, 0x37, 0xCA, -0x25, 0x12, 0xD6, 0x80, 0x7F, 0x7C, 0xF0, 0x13, 0x9F, 0x7B, -0x74, 0xF8, 0xDE, 0x67, 0xEF, 0xFE, 0xE4, 0xFE, 0x82, 0xE8, -0xAE, 0x60, 0x2D, 0x82, 0xB9, 0xC5, 0xE9, 0x07, 0x5C, 0x01, -0x11, 0xAC, 0x15, 0x50, 0x0A, 0x8B, 0x6B, 0xCF, 0xBF, 0x7A, -0xB2, 0x71, 0xF4, 0xAD, 0x17, 0xBF, 0x51, 0x8B, 0x5A, 0x7F, -0x94, 0xD5, 0x1E, 0x9F, 0x3D, 0xF9, 0xC2, 0xD0, 0x83, 0x6E, -0xF1, 0xE9, 0xBB, 0x47, 0xC7, 0x8A, 0xF6, 0x46, 0x99, 0xA8, -0xDF, 0xA5, 0xE5, 0xBA, 0xC4, 0x8E, 0xB3, 0x06, 0x78, 0xDB, -0x03, 0x40, 0x22, 0x8E, 0xC9, 0xA3, 0x70, 0x13, 0x09, 0xB9, -0x67, 0x6C, 0x5F, 0xE1, 0xB3, 0x37, 0xA7, 0x9E, 0x3E, 0x3E, -0x75, 0xFA, 0xB4, 0x31, 0xD4, 0xDC, 0x5E, 0x18, 0xA8, 0x99, -0x93, 0xA7, 0x9E, 0x98, 0xD8, 0xBA, 0x77, 0xF7, 0xE2, 0xEC, -0x35, 0x74, 0xBF, 0x47, 0xE4, 0x38, 0x24, 0x8F, 0x1C, 0x26, -0x5D, 0x1A, 0xBE, 0xA5, 0xF2, 0xDB, 0x15, 0x57, 0x6E, 0xB0, -0xF0, 0xAB, 0xE3, 0x24, 0x2C, 0x88, 0x38, 0x3C, 0x30, 0xB2, -0x6F, 0xE7, 0xDF, 0xAA, 0x97, 0xBE, 0x7A, 0x2D, 0x68, 0xFC, -0xD4, 0xBD, 0x74, 0xE6, 0x95, 0x8F, 0xDA, 0xD3, 0x67, 0x1F, -0x6B, 0xDD, 0xB5, 0x3B, 0xD1, 0x0C, 0x9A, 0x2B, 0xAD, 0xCB, -0x0E, 0xB0, 0xBB, 0x50, 0xC4, 0xDF, 0x5C, 0xE2, 0xC3, 0x14, -0x86, 0x21, 0xD7, 0x1A, 0x0D, 0xE8, 0x45, 0x68, 0x6D, 0xF0, -0x3D, 0xDF, 0xBD, 0x3F, 0xBB, 0xE5, 0xD0, 0x4C, 0xBF, 0xF9, -0x7B, 0xD7, 0xEF, 0x99, 0x1D, 0xA5, 0xE4, 0xC6, 0xB1, 0xE9, -0xEB, 0x65, 0xC2, 0x38, 0x42, 0x09, 0x24, 0xC2, 0x1C, 0x23, -0x71, 0xCC, 0x7A, 0x8A, 0xE3, 0x98, 0xF9, 0xF9, 0x79, 0x74, -0x10, 0xA2, 0xB5, 0x41, 0x09, 0x14, 0xC5, 0x1F, 0xCB, 0xA8, -0xF4, 0x88, 0xFB, 0xEB, 0xEF, 0x1D, 0xD9, 0xFE, 0xF9, 0xF4, -0xDE, 0xC2, 0xCD, 0x99, 0x0A, 0x31, 0x16, 0x27, 0xE1, 0x90, -0x8C, 0x63, 0xF4, 0xDA, 0x89, 0xF8, 0x10, 0x70, 0xBD, 0x5E, -0xA7, 0xBF, 0xB4, 0x8C, 0x36, 0x1A, 0xAB, 0x0D, 0xA5, 0xEC, -0x60, 0x21, 0xEF, 0x7A, 0xE3, 0x6E, 0xCA, 0x3A, 0x83, 0x95, -0xE5, 0x8E, 0x9A, 0x6E, 0xB7, 0xC9, 0x27, 0x1C, 0xFC, 0xD8, -0x85, 0xA4, 0x8F, 0xB5, 0x66, 0x5D, 0xB0, 0xB5, 0x86, 0x6E, -0xB7, 0x4B, 0xD4, 0x0D, 0xB1, 0x5A, 0x63, 0x62, 0x8D, 0xF6, -0x32, 0x92, 0x52, 0x6A, 0x9B, 0xAB, 0xFA, 0x56, 0x5F, 0xA7, -0xCB, 0x2F, 0x83, 0x36, 0x79, 0x6B, 0x19, 0x71, 0x1D, 0xC6, -0x12, 0x0E, 0x91, 0x5E, 0x1F, 0x1C, 0x6B, 0xC3, 0x5C, 0xBB, -0xCD, 0x62, 0xA7, 0xCD, 0x42, 0x3F, 0x66, 0xCE, 0x68, 0xC6, -0xBD, 0x34, 0xF8, 0xD6, 0xB8, 0x5A, 0xEB, 0x7A, 0xD1, 0xF7, -0x75, 0x1E, 0x71, 0x22, 0x65, 0xA9, 0x18, 0x8D, 0xF4, 0xBA, -0x44, 0x66, 0x7D, 0x70, 0x57, 0x6B, 0x2E, 0x74, 0xDA, 0xCC, -0x06, 0xCB, 0xB4, 0x04, 0x02, 0x11, 0xC6, 0x95, 0x63, 0x8C, -0xB5, 0x65, 0xF5, 0xA5, 0x9F, 0x1D, 0xBD, 0x3E, 0xE8, 0xF9, -0xB5, 0x51, 0xCF, 0x27, 0x67, 0x21, 0x07, 0xA4, 0xE4, 0x8E, -0x63, 0x7B, 0x87, 0x56, 0x58, 0x0C, 0x16, 0x57, 0x20, 0x05, -0x0C, 0xE3, 0xB0, 0xC5, 0xF7, 0xE7, 0x7B, 0x51, 0xFF, 0xDF, -0x2A, 0xF2, 0x9C, 0x6B, 0x91, 0xEE, 0x5F, 0xBE, 0x2F, 0x37, -0x48, 0xD6, 0x40, 0x1A, 0x18, 0x00, 0xD4, 0xFA, 0x5C, 0x14, -0x30, 0x60, 0x21, 0xF3, 0xDE, 0x9D, 0x3D, 0xE9, 0x2C, 0x3E, -0x5C, 0x8E, 0xE2, 0xB8, 0xEC, 0xEE, 0x3C, 0xF0, 0x70, 0xB5, -0xBA, 0xFF, 0xAF, 0x7F, 0x7A, 0xF0, 0x8D, 0x73, 0x13, 0x37, -0x5B, 0x75, 0xAF, 0xD9, 0x0F, 0x49, 0xC6, 0x9A, 0x4E, 0xE5, -0x26, 0xE9, 0x4C, 0x66, 0x25, 0x9D, 0xEE, 0x24, 0x81, 0xA0, -0x56, 0x23, 0x65, 0x0D, 0x03, 0x02, 0x39, 0x27, 0xC1, 0xC4, -0xD0, 0xD6, 0xFE, 0xBB, 0xCD, 0xEA, 0x0B, 0xBA, 0x17, 0xCD, -0xB8, 0x5E, 0x3A, 0x6D, 0x87, 0x0E, 0x3E, 0xFC, 0xDB, 0xFA, -0xDB, 0xFF, 0x79, 0xE2, 0x91, 0xE1, 0x9D, 0xF7, 0xBF, 0xF2, -0xEE, 0x7F, 0x91, 0x66, 0x9B, 0x97, 0xBE, 0xF5, 0x4D, 0xD2, -0x99, 0x2C, 0x62, 0x41, 0x94, 0x42, 0x44, 0x90, 0xD5, 0xF2, -0x8D, 0xC1, 0x0A, 0x04, 0xCD, 0x16, 0x4E, 0xD4, 0x65, 0x03, -0xC2, 0xBD, 0x9B, 0x86, 0xF1, 0x95, 0xF7, 0xAF, 0xD9, 0x6E, -0xEB, 0x38, 0x0A, 0xFB, 0x7E, 0x08, 0x1D, 0xFB, 0xF8, 0xFE, -0x4F, 0xDF, 0xA3, 0x33, 0xCF, 0x55, 0x6A, 0x93, 0x77, 0x5D, -0x9C, 0x9B, 0x16, 0x6D, 0x35, 0x0A, 0xC1, 0xF7, 0x92, 0xE4, -0xF2, 0x1B, 0xF1, 0xBD, 0x24, 0xE2, 0x28, 0xFA, 0x51, 0x44, -0xAB, 0xD9, 0x22, 0x08, 0x03, 0xB4, 0x35, 0x28, 0x51, 0x6C, -0xCF, 0x0D, 0xD9, 0x6D, 0xC5, 0xD1, 0xCA, 0x9B, 0x95, 0xC9, -0x27, 0x1B, 0xC1, 0xE2, 0x29, 0x8B, 0xFD, 0x20, 0xDD, 0x1A, -0x57, 0xCB, 0xEA, 0xD4, 0xE1, 0xEF, 0x1C, 0xDA, 0xDB, 0xD6, -0x3F, 0x0F, 0x3A, 0x33, 0xDB, 0x2F, 0xCE, 0x96, 0x09, 0x1C, -0x28, 0x0E, 0x0D, 0x51, 0x2A, 0x95, 0xC8, 0x64, 0x32, 0x28, -0xA5, 0x08, 0xC3, 0x90, 0xB9, 0xFA, 0x3C, 0x73, 0xB3, 0x55, -0x08, 0xBB, 0xEC, 0xDE, 0xB4, 0x95, 0x6C, 0x66, 0xF3, 0xF5, -0x33, 0x95, 0xC9, 0xEF, 0x56, 0x97, 0xE7, 0xFF, 0x0C, 0x68, -0xD6, 0xC6, 0x26, 0x40, 0x63, 0xB2, 0xAC, 0x96, 0xCE, 0x5F, -0x39, 0x50, 0xFD, 0xC9, 0xD1, 0x67, 0x36, 0x39, 0xD1, 0x78, -0x53, 0x2D, 0x7B, 0xB2, 0x71, 0x80, 0x7C, 0xA9, 0x40, 0x36, -0xB7, 0x01, 0x85, 0x10, 0x04, 0x01, 0x8B, 0x73, 0x75, 0xA2, -0xC5, 0x25, 0x52, 0x4B, 0x12, 0x2D, 0x2C, 0xDB, 0x8B, 0xE7, -0x2A, 0xE5, 0xEF, 0xCF, 0x85, 0xF5, 0xD7, 0x62, 0xE9, 0x1B, -0x8B, 0x45, 0x90, 0x95, 0xD8, 0x5C, 0xD5, 0xE0, 0xAE, 0x51, -0x33, 0xB8, 0x6B, 0xF4, 0xD5, 0x9E, 0xE7, 0x3E, 0xD2, 0xF8, -0xCB, 0x99, 0xC7, 0x9D, 0xB3, 0x97, 0xBE, 0x50, 0xF2, 0x4B, -0x63, 0x1B, 0x72, 0xC3, 0x9B, 0xBD, 0x42, 0x3E, 0x81, 0x12, -0xBC, 0x46, 0xB3, 0xAF, 0xEA, 0x99, 0xD9, 0x99, 0xCE, 0xCC, -0x95, 0xCB, 0xB5, 0xEA, 0xF3, 0xB3, 0xAD, 0xDA, 0x89, 0x4E, -0x2F, 0x68, 0xDD, 0xFE, 0xCB, 0xB7, 0x38, 0x5E, 0xAB, 0x7E, -0x10, 0xCA, 0x8D, 0x53, 0x67, 0x8A, 0x49, 0xA3, 0x76, 0xBC, -0x71, 0xE4, 0xA9, 0x2D, 0xBE, 0xE7, 0x17, 0x45, 0xC4, 0x86, -0xBD, 0x6E, 0xFD, 0xA1, 0x5F, 0xFC, 0xB0, 0x72, 0xEE, 0xF8, -0x1F, 0xA6, 0x3A, 0x6F, 0x9E, 0x9F, 0x5F, 0x08, 0x16, 0x6C, -0xB3, 0xD7, 0x24, 0x34, 0xCB, 0xC4, 0x12, 0xB3, 0xEA, 0xF8, -0x7F, 0x03, 0x00, 0xD2, 0xFB, 0x71, 0x29, 0x72, 0x54, 0xF0, -0x6D, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, -0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x0D, 0x06, -0x68, 0x67, 0x6A, 0x57, 0x5F, 0x63, 0x5F, 0x61, 0x05, 0x04, -0x05, 0xE5, 0xD9, 0xD9, 0xD9, 0xEA, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, -0x03, 0x69, 0x69, 0x6C, 0x57, 0xCD, 0xCE, 0xD0, 0xD9, 0xD4, -0xE8, 0xC6, 0xFE, 0xCE, 0xDA, 0xC2, 0xFE, 0x77, 0x76, 0x84, -0xFB, 0x9B, 0x9B, 0x9F, 0xA0, 0x2F, 0x2F, 0x30, 0x1A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, -0x02, 0x00, 0x4C, 0x4C, 0x4F, 0x3F, 0x8B, 0x8A, 0x8E, 0xA7, -0x03, 0x02, 0x0A, 0x6F, 0x1B, 0x1E, 0x10, 0x13, 0xE1, 0xDD, -0xEC, 0x00, 0x81, 0x76, 0x97, 0x00, 0xDA, 0xDA, 0xDE, 0x02, -0xD1, 0xD1, 0xD9, 0x2F, 0x5E, 0x5E, 0x5E, 0x5F, 0x0A, 0x0B, -0x07, 0xCC, 0xD7, 0xD7, 0xD6, 0xE0, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2F, 0x21, 0x70, 0x6F, 0x74, -0x89, 0x30, 0x31, 0x31, 0x53, 0xA2, 0xA1, 0xA9, 0x01, 0x11, -0x12, 0x0F, 0x00, 0xFA, 0xF9, 0xFB, 0x00, 0x0F, 0x0F, 0x0D, -0x00, 0xDD, 0xDD, 0xE0, 0x00, 0xD1, 0xD0, 0xD5, 0x00, 0x02, -0x03, 0x03, 0x00, 0x11, 0x11, 0x0F, 0x00, 0x59, 0x59, 0x51, -0xE9, 0x6B, 0x6B, 0x67, 0x46, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, 0x0B, 0x77, 0x76, -0x7C, 0x7A, 0x6F, 0x6F, 0x73, 0xA3, 0xEE, 0xEE, 0xF1, 0x30, -0xA4, 0xA4, 0xAB, 0x01, 0x58, 0x58, 0x4F, 0x00, 0xD8, 0xD8, -0xDC, 0x00, 0xC7, 0xC6, 0xCB, 0x00, 0x20, 0x21, 0x1D, 0x00, -0x6D, 0x6E, 0x64, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x04, 0x04, -0x03, 0x01, 0x43, 0x43, 0x3E, 0x00, 0x9F, 0x9E, 0xA9, 0x0C, -0x0C, 0x0C, 0x11, 0x30, 0x01, 0x04, 0x04, 0x06, 0x05, 0x30, -0x2F, 0x37, 0x5B, 0xCD, 0xCE, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, -0x57, 0x59, 0x40, 0x62, 0x61, 0x66, 0x9B, 0x13, 0x13, 0x14, -0x23, 0xB9, 0xB9, 0xBE, 0x00, 0xEB, 0xEB, 0xED, 0x00, 0x1C, -0x1C, 0x19, 0x00, 0xBD, 0xBD, 0xC3, 0x00, 0x1A, 0x1A, 0x18, -0x00, 0x49, 0x49, 0x42, 0x00, 0x1F, 0x20, 0x1C, 0x00, 0x87, -0x86, 0x92, 0x00, 0x15, 0x15, 0x14, 0x00, 0x1D, 0x1D, 0x1A, -0x00, 0xB1, 0xB1, 0xB9, 0x00, 0x06, 0x05, 0x06, 0x00, 0x04, -0x05, 0x03, 0xFB, 0x03, 0xFF, 0xFF, 0xFF, 0xFE, 0x17, 0x16, -0x1E, 0x4F, 0x33, 0x33, 0x3A, 0x59, 0xEC, 0xED, 0xE8, 0xC8, -0x07, 0x07, 0x06, 0xFB, 0x82, 0x81, 0x86, 0x87, 0x56, 0x56, -0x5B, 0x98, 0xF2, 0xF1, 0xF4, 0x13, 0xB4, 0xB4, 0xBA, 0x00, -0x53, 0x54, 0x4B, 0x00, 0xD3, 0xD3, 0xD7, 0x00, 0xBA, 0xBA, -0xC0, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFA, 0xFB, 0xFB, 0x00, -0xD4, 0xD4, 0xD8, 0x00, 0x08, 0x07, 0x07, 0x00, 0x0E, 0x0E, -0x0D, 0x00, 0xF1, 0xF1, 0xF4, 0x00, 0xC3, 0xC2, 0xC8, 0x00, -0x09, 0x09, 0x09, 0x00, 0x07, 0x07, 0x07, 0x00, 0xF7, 0xF6, -0xF3, 0xA7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x22, 0x22, 0x29, 0x33, 0x50, 0x4F, 0x57, 0x8C, 0x3E, -0x3F, 0x36, 0x01, 0x17, 0x16, 0x18, 0x3E, 0xC5, 0xC5, 0xCA, -0x00, 0xD0, 0xD0, 0xD3, 0x00, 0x46, 0x47, 0x40, 0x00, 0xAC, -0xAA, 0xB3, 0x00, 0xED, 0xEE, 0xEF, 0x00, 0x02, 0x02, 0x02, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0x0C, -0x0D, 0x0B, 0x00, 0x3B, 0x3B, 0x35, 0x00, 0xEB, 0xEA, 0xEE, -0x00, 0xD3, 0xD3, 0xD8, 0x00, 0x0A, 0x0A, 0x08, 0x00, 0x05, -0x06, 0x05, 0x00, 0xFB, 0xFA, 0xFA, 0xCA, 0xC3, 0xC4, 0xB3, -0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x17, 0x17, 0x12, 0xF0, 0x48, 0x49, 0x41, 0x1A, 0xFE, 0xFE, -0x00, 0x25, 0xBD, 0xBD, 0xC3, 0x00, 0x2F, 0x2F, 0x2A, 0x00, -0x05, 0x05, 0x04, 0x00, 0x9C, 0x9A, 0xA5, 0x00, 0x01, 0x01, -0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x03, 0x02, 0x03, 0x00, -0x05, 0x07, 0x05, 0x00, 0x02, 0x02, 0x03, 0x00, 0x3B, 0x3B, -0x35, 0x00, 0xEE, 0xED, 0xF0, 0x00, 0xD7, 0xD7, 0xDC, 0x00, -0x0E, 0x0F, 0x0D, 0x00, 0x07, 0x06, 0x06, 0x00, 0xFB, 0xFB, -0xF9, 0xD1, 0xCA, 0xCC, 0xBD, 0x4C, 0xF9, 0xFA, 0xF8, 0xF3, -0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x3A, 0x24, 0x88, -0x87, 0x8D, 0xBD, 0xDB, 0xDB, 0xDF, 0x1D, 0xB9, 0xB9, 0xBE, -0x00, 0x4F, 0x4F, 0x48, 0x00, 0xC9, 0xC9, 0xCD, 0x00, 0xD0, -0xD0, 0xD5, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x01, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0x54, 0x55, 0x4D, 0x00, 0xE7, 0xE6, 0xEA, -0x00, 0xD9, 0xD9, 0xDD, 0x00, 0x0B, 0x0B, 0x0A, 0x00, 0x07, -0x08, 0x07, 0x00, 0xFB, 0xFB, 0xF9, 0xD7, 0xBF, 0xC0, 0xB2, -0x43, 0xF1, 0xF1, 0xEE, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x01, -0x1F, 0x1F, 0x20, 0x13, 0x93, 0x92, 0x99, 0xC7, 0x18, 0x18, -0x18, 0x24, 0xD0, 0xD1, 0xD4, 0x00, 0x0E, 0x0D, 0x0C, 0x00, -0xA7, 0xA7, 0xAF, 0x00, 0xF0, 0xF0, 0xF1, 0x00, 0xFC, 0xFB, -0xFC, 0x00, 0x03, 0x04, 0x03, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x15, 0x15, 0x13, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0x43, 0x44, -0x3D, 0x00, 0xCF, 0xCF, 0xD5, 0x00, 0xEC, 0xEB, 0xED, 0x00, -0x0C, 0x0C, 0x0C, 0x00, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xBA, 0xBC, 0xAD, 0x3B, 0xEA, 0xEA, 0xE6, 0xE1, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7E, -0x7D, 0x83, 0x9C, 0xD2, 0xD2, 0xD7, 0x24, 0xFF, 0xFF, 0x00, -0x00, 0xFA, 0xF9, 0xF9, 0x00, 0x98, 0xA4, 0xAC, 0x00, 0xFA, -0xFB, 0xFB, 0x00, 0x04, 0x03, 0x04, 0x00, 0xFE, 0xFF, 0xFF, -0x01, 0x06, 0x02, 0x02, 0xFF, 0x20, 0x21, 0x1E, 0x00, 0xF8, -0xF8, 0xF9, 0x00, 0x3B, 0x3B, 0x37, 0x00, 0xC1, 0xC0, 0xC6, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0x12, 0x13, 0x12, 0x00, 0x09, -0x09, 0x08, 0x00, 0x01, 0x01, 0x01, 0xF3, 0xBB, 0xBB, 0xAF, -0x4F, 0xEA, 0xEA, 0xE6, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x34, 0x34, -0x34, 0x3D, 0x12, 0x12, 0x0F, 0x00, 0x9E, 0x9E, 0xA7, 0x00, -0xC3, 0xC3, 0xC8, 0x00, 0xF2, 0xF2, 0xF4, 0x00, 0x07, 0x08, -0x06, 0x00, 0x01, 0x02, 0x01, 0x00, 0xFE, 0xFE, 0xFE, 0xFF, -0x01, 0x02, 0x02, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0x2F, 0x2E, -0x2A, 0x00, 0xB9, 0xB8, 0xBF, 0x00, 0x09, 0x0A, 0x0A, 0x00, -0x13, 0x12, 0x0E, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xFE, 0xFE, -0xFE, 0xFB, 0xC1, 0xC1, 0xB8, 0x57, 0xE1, 0xE2, 0xDC, 0xCD, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x2B, 0x2A, 0x2D, -0x20, 0x36, 0x37, 0x34, 0x34, 0x20, 0x21, 0x1C, 0x00, 0xC1, -0xC0, 0xC7, 0x00, 0x08, 0x08, 0x07, 0x00, 0xFC, 0xFB, 0xFC, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x0D, 0x0C, 0x0B, 0x00, 0x2E, -0x2F, 0x2A, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xC7, 0xC6, 0xCD, -0x00, 0x0E, 0x0E, 0x0E, 0x00, 0x11, 0x12, 0x11, 0x00, 0x11, -0x11, 0x10, 0x00, 0xFF, 0xFE, 0xFE, 0xFE, 0xCE, 0xCF, 0xC8, -0x6A, 0xD6, 0xD7, 0xCD, 0xB0, 0x8D, 0x8D, 0x8D, 0x99, 0x63, -0x63, 0x63, 0x6B, 0x3A, 0x3A, 0x3A, 0x3A, 0x03, 0x03, 0x03, -0xFC, 0xDB, 0xDB, 0xDB, 0xDD, 0x01, 0x23, 0x23, 0x24, 0x18, -0xB0, 0xAF, 0xB5, 0xD1, 0x22, 0x23, 0x1D, 0x15, 0xCE, 0xCE, -0xD3, 0x00, 0x7C, 0x7B, 0x88, 0x00, 0x05, 0x04, 0x04, 0x00, -0x0B, 0x0C, 0x0A, 0x00, 0x3E, 0x3E, 0x39, 0x00, 0xC9, 0xC8, -0xCF, 0x00, 0xEE, 0xEE, 0xF0, 0x00, 0x0E, 0x0F, 0x0D, 0x00, -0x0E, 0x0E, 0x0E, 0x00, 0x0D, 0x0D, 0x0C, 0x00, 0xFB, 0xFB, -0xFB, 0xFD, 0xCF, 0xCF, 0xC9, 0x72, 0xCA, 0xCA, 0xBF, 0x93, -0x57, 0x58, 0x57, 0x5C, 0x91, 0x91, 0x91, 0xA2, 0xD5, 0xD5, -0xD5, 0x00, 0xED, 0xED, 0xED, 0x00, 0x2B, 0x2B, 0x2B, 0xF8, -0x43, 0x43, 0x43, 0x24, 0x03, 0xEF, 0xEF, 0xEE, 0xF4, 0xEE, -0xEE, 0xEF, 0xD5, 0x33, 0x33, 0x37, 0x56, 0x1D, 0x1D, 0x19, -0x03, 0x2F, 0x30, 0x2B, 0x00, 0x05, 0x05, 0x05, 0x00, 0x14, -0x14, 0x13, 0x00, 0xB7, 0xB6, 0xBE, 0x01, 0xFA, 0xFA, 0xFB, -0x00, 0x0B, 0x0C, 0x0A, 0x00, 0x09, 0x09, 0x09, 0x00, 0x06, -0x06, 0x06, 0x00, 0xF6, 0xF5, 0xF5, 0xF1, 0xC8, 0xC9, 0xC0, -0x5E, 0xD0, 0xD0, 0xC7, 0xA0, 0x00, 0x00, 0xFF, 0x00, 0x54, -0x54, 0x54, 0x60, 0x33, 0x33, 0x33, 0x39, 0xF6, 0xEE, 0xEE, -0x00, 0x01, 0xFB, 0xFB, 0x00, 0x16, 0x1B, 0x1B, 0x04, 0xC0, -0xC0, 0xC0, 0xB7, 0x03, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xD5, -0xD3, 0xDC, 0xFD, 0xFD, 0xFE, 0xE0, 0x2D, 0x2C, 0x30, 0x4B, -0xE5, 0xE4, 0xE7, 0x03, 0xB0, 0xAF, 0xB7, 0x00, 0xD2, 0xD1, -0xD6, 0x00, 0x06, 0x07, 0x06, 0x00, 0x08, 0x07, 0x07, 0x00, -0x06, 0x06, 0x06, 0x00, 0x02, 0x02, 0x01, 0x00, 0xEB, 0xEB, -0xE7, 0xB7, 0xC1, 0xC3, 0xB7, 0x4F, 0xE2, 0xE2, 0xDB, 0xC6, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, -0x20, 0x2B, 0x1F, 0x1F, 0x1F, 0x47, 0xEF, 0xEF, 0xEF, 0x00, -0x17, 0x19, 0x19, 0x00, 0x05, 0x08, 0x08, 0x01, 0xCB, 0xCB, -0xCB, 0xB6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x97, 0x97, 0x93, 0xA4, 0xD9, 0xD8, 0xD8, 0xDD, 0xEB, -0xEA, 0xF9, 0x85, 0x0A, 0x0A, 0x0C, 0x3C, 0x06, 0x06, 0x06, -0x04, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFC, 0xF0, -0xEF, 0xEC, 0xC3, 0xE0, 0xE2, 0xDA, 0x86, 0xE1, 0xE1, 0xDA, -0xBD, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xE7, 0xE7, -0xDD, 0x08, 0x08, 0x08, 0xFF, 0xEF, 0x01, 0x01, 0x01, 0x02, -0x07, 0x07, 0x00, 0x01, 0x01, 0x01, 0x00, 0x19, 0x19, 0x19, -0x1D, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xBE, 0xBF, 0xBB, 0xC7, 0x00, 0x00, -0x01, 0x42, 0x0A, 0x0A, 0x0D, 0x16, 0x0D, 0x0C, 0x10, 0x25, -0xFF, 0xFF, 0xFE, 0xFC, 0xF6, 0xF7, 0xF3, 0xDC, 0xF4, 0xF4, -0xF2, 0xED, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x06, -0x0B, 0x0B, 0x0B, 0x00, 0x1A, 0x1A, 0x1A, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x1D, 0x1D, 0x1D, 0x2F, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0x00, 0xF6, 0xF6, 0xF2, 0xEA, 0xF6, 0xF6, 0xF2, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC9, 0xC9, 0xC9, 0xF0, -0xF0, 0xF0, 0xF3, 0x0F, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, -0x00, 0xF9, 0xF9, 0xF9, 0xFE, 0xC8, 0xC8, 0xC8, 0xC9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x31, -0x31, 0x4D, 0xA0, 0xA0, 0xA0, 0xCF, 0xAC, 0xAC, 0xAC, 0xD0, -0x51, 0x51, 0x51, 0x6F, 0x01, 0x01, 0x01, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x46, 0x33, -0xDB, 0xDA, 0xDB, 0xE3, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/Vista.h b/Source/Core/DolphinWX/resources/Vista.h deleted file mode 100644 index af66498caf..0000000000 --- a/Source/Core/DolphinWX/resources/Vista.h +++ /dev/null @@ -1,2751 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_1_H_ -#define _WXINCLUDE_MYHEADER_1_H_ - -static const unsigned char Toolbar_Browse1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0xE7, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x6D, 0x68, 0x5B, 0x55, 0x18, -0x7E, 0xCF, 0x39, 0xF7, 0x2B, 0x1F, 0xB7, 0x89, 0x69, 0x12, -0x93, 0xB2, 0x76, 0x6D, 0xA2, 0xC6, 0xD6, 0xA4, 0x5D, 0xD3, -0xD0, 0x3A, 0x59, 0x41, 0xD0, 0x49, 0xD7, 0x6D, 0xB0, 0xA9, -0x9B, 0x53, 0x51, 0xFC, 0xA1, 0xA2, 0x7F, 0x64, 0x3A, 0x29, -0x22, 0x4C, 0x87, 0xB0, 0xE1, 0x10, 0x3A, 0xFD, 0xE1, 0xC7, -0xE8, 0x0F, 0xB1, 0x6C, 0x0A, 0x9D, 0x1F, 0xC8, 0x56, 0x70, -0x2A, 0x3A, 0x36, 0x3F, 0x26, 0xFE, 0xD0, 0x29, 0xEA, 0x7E, -0xA8, 0xC8, 0x1C, 0x43, 0x9D, 0x73, 0x49, 0x9B, 0x5C, 0xD3, -0xDC, 0xDC, 0x73, 0x7C, 0xCF, 0x8D, 0x83, 0x75, 0x36, 0xEB, -0x1D, 0xEE, 0xC0, 0xC3, 0x79, 0x73, 0x73, 0xDE, 0xE7, 0x79, -0xBF, 0xCE, 0xBD, 0x00, 0x97, 0xB0, 0xFE, 0x7C, 0xA1, 0xE7, -0xBE, 0xD3, 0xE3, 0xCB, 0xD6, 0xFC, 0xF1, 0xC1, 0x43, 0xCC, -0xAB, 0x0F, 0xF1, 0x7A, 0xF0, 0xC8, 0x13, 0xDD, 0xB4, 0x53, -0x58, 0x27, 0x59, 0xAC, 0x23, 0x11, 0x7F, 0xE0, 0xC1, 0x4D, -0x4A, 0xE8, 0x9E, 0x29, 0x2F, 0x7E, 0xD4, 0xAB, 0xC0, 0x35, -0xA6, 0x92, 0xAB, 0x9E, 0xB4, 0x92, 0x46, 0xE6, 0x6A, 0xA0, -0x1A, 0x19, 0xF5, 0xEA, 0xE7, 0x39, 0xD5, 0xCD, 0xFD, 0x2D, -0xF7, 0xD6, 0x2B, 0x73, 0x37, 0xC7, 0xEE, 0x58, 0x09, 0x2C, -0xA8, 0xC7, 0xEF, 0xDF, 0x58, 0xD8, 0xB5, 0xEB, 0x95, 0x43, -0x8B, 0xFA, 0x79, 0xCE, 0x80, 0xF3, 0xFA, 0x4A, 0x23, 0x15, -0x24, 0x6A, 0x3C, 0x88, 0x3F, 0xCA, 0xC9, 0x64, 0x1C, 0xFA, -0xBC, 0xF8, 0x29, 0x5E, 0x0E, 0xFD, 0xF8, 0x5C, 0x9F, 0x9F, -0xCD, 0x9E, 0x5D, 0x11, 0x18, 0x58, 0x0A, 0x50, 0x9F, 0x91, -0x8F, 0x08, 0x11, 0x7F, 0x8F, 0xE0, 0xFE, 0xF5, 0x65, 0x11, -0x88, 0x46, 0x60, 0xD8, 0x0E, 0x11, 0xC3, 0x97, 0x6A, 0x15, -0x60, 0x97, 0x24, 0xBF, 0x00, 0xA7, 0xB6, 0x0A, 0x8D, 0x67, -0x2F, 0x8B, 0x00, 0x6D, 0xA9, 0xDF, 0xE2, 0x0B, 0x6B, 0x84, -0x99, 0x3E, 0x10, 0xB5, 0x19, 0x41, 0xE4, 0xF4, 0x09, 0xB1, -0xBC, 0xF4, 0xFA, 0xF0, 0x70, 0xF9, 0x9B, 0xDF, 0x52, 0x40, -0x9D, 0x5E, 0x35, 0xCE, 0x72, 0x46, 0x87, 0x91, 0xD5, 0xDB, -0xA2, 0xDF, 0x12, 0x1A, 0x19, 0xD3, 0x06, 0xDF, 0x3A, 0xE6, -0x49, 0xE0, 0xCC, 0xDE, 0x6C, 0x48, 0x6D, 0x75, 0x46, 0x58, -0xD4, 0x87, 0x71, 0xDB, 0x00, 0x35, 0xFB, 0x9C, 0xAC, 0x02, -0x06, 0x3F, 0x1C, 0x1C, 0x6A, 0x03, 0x3D, 0x61, 0x0A, 0x25, -0x6C, 0x12, 0xC2, 0x34, 0x00, 0x9B, 0x9B, 0x4E, 0xA9, 0xE2, -0x9C, 0xF3, 0x9F, 0x77, 0x0F, 0x4E, 0xED, 0xE8, 0x8B, 0x28, -0x50, 0xEF, 0x17, 0xCC, 0xCE, 0x2B, 0x61, 0x18, 0x50, 0x23, -0x34, 0x4F, 0x45, 0x25, 0xAD, 0x46, 0x14, 0xA2, 0xB4, 0xB5, -0xE3, 0xCC, 0x05, 0x1A, 0x1E, 0x32, 0x07, 0x69, 0xC8, 0x9D, -0xE3, 0x9C, 0x88, 0x7F, 0x51, 0x27, 0x8E, 0x53, 0xAE, 0xDE, -0xAA, 0xAD, 0x98, 0xDE, 0x3F, 0x4F, 0xE0, 0xD7, 0x6D, 0xBD, -0x99, 0xCA, 0xF7, 0xA7, 0xA7, 0xFD, 0x49, 0xB5, 0xCB, 0xDF, -0xE9, 0xA7, 0x7A, 0xC2, 0x10, 0x5A, 0x44, 0x27, 0x2C, 0xEC, -0x07, 0xA2, 0x33, 0x41, 0x28, 0x27, 0xB2, 0xEC, 0x2E, 0x90, -0x4A, 0xFA, 0x09, 0x41, 0x04, 0xE1, 0x14, 0x77, 0x0A, 0x82, -0x53, 0x01, 0x78, 0x84, 0x97, 0xEB, 0x8F, 0x6B, 0x37, 0x7E, -0x38, 0x7E, 0x7E, 0xD0, 0xAE, 0xC0, 0x77, 0x5B, 0x7B, 0xB5, -0x50, 0xD5, 0x7A, 0x4A, 0x4F, 0xB0, 0xB1, 0x50, 0x3A, 0xAC, -0x50, 0xC6, 0xB1, 0x02, 0x1C, 0x90, 0x18, 0x40, 0xC7, 0xC8, -0x0C, 0x06, 0x44, 0x16, 0x53, 0x0E, 0x35, 0x95, 0x1D, 0x40, -0x83, 0xCB, 0x36, 0x50, 0x37, 0x03, 0xE1, 0x50, 0xE0, 0x16, -0xDF, 0xAD, 0xDD, 0x74, 0xF8, 0xE1, 0x0B, 0x4B, 0x3C, 0xAF, -0x44, 0xA5, 0xC9, 0xBE, 0x82, 0x12, 0xA9, 0xBF, 0xAA, 0x31, -0xF5, 0x3A, 0xCA, 0x19, 0x91, 0x22, 0xC0, 0x30, 0x56, 0x4C, -0x02, 0x34, 0x4C, 0x42, 0x45, 0x32, 0x37, 0x76, 0x8C, 0x1C, -0x64, 0xD4, 0xB8, 0xA3, 0x90, 0x63, 0x91, 0xF7, 0x8B, 0x25, -0xB2, 0x3A, 0xBE, 0xE1, 0xB3, 0xFA, 0x45, 0x05, 0xDC, 0x3E, -0xBC, 0x5D, 0x30, 0x62, 0x4B, 0xF8, 0x36, 0xA7, 0x58, 0xDB, -0xC2, 0x6C, 0x45, 0xC1, 0x56, 0x36, 0x04, 0x90, 0xCF, 0x85, -0xE2, 0x1A, 0x44, 0x2A, 0x61, 0x16, 0xC4, 0x99, 0xA3, 0x3F, -0xD7, 0x2C, 0x65, 0x20, 0xB0, 0xEE, 0xF3, 0xE2, 0x42, 0x43, -0xD2, 0xF4, 0x65, 0x37, 0xFB, 0x46, 0xFF, 0xF2, 0x99, 0x63, -0x7F, 0x4D, 0x06, 0x3B, 0x8D, 0xB4, 0x99, 0x36, 0x1A, 0x3D, -0x68, 0xDC, 0x7B, 0xE1, 0xDE, 0x33, 0x42, 0x65, 0x17, 0x88, -0x53, 0x65, 0xC7, 0xD5, 0xD1, 0x2F, 0xBB, 0x9B, 0xF1, 0x5C, -0xF4, 0x6D, 0x7A, 0xE2, 0x91, 0xA5, 0xEF, 0x72, 0x31, 0xB7, -0xB6, 0x7D, 0x34, 0x21, 0x4B, 0xD5, 0x38, 0x4D, 0x1A, 0x12, -0xEE, 0x04, 0x21, 0xB8, 0x4D, 0xB9, 0x35, 0xA3, 0xB6, 0x86, -0xEE, 0x3A, 0x5A, 0x5A, 0x88, 0xA3, 0xE9, 0xBB, 0xE8, 0xC9, -0xD5, 0x09, 0xC6, 0x42, 0x70, 0x83, 0x99, 0x0D, 0x80, 0x5B, -0x12, 0x2E, 0x41, 0xB0, 0xE0, 0x72, 0x34, 0x89, 0xB4, 0x01, -0x6D, 0x34, 0x80, 0x69, 0x84, 0xF7, 0x37, 0xE3, 0x39, 0xFF, -0xA2, 0x49, 0x31, 0x03, 0xA1, 0x23, 0x7C, 0x07, 0x7F, 0x98, -0xCD, 0x6D, 0xD9, 0x60, 0xB4, 0xFA, 0xA3, 0x06, 0xB8, 0xA4, -0xB4, 0x91, 0x30, 0x77, 0x38, 0x8E, 0xA5, 0xBC, 0x66, 0xB2, -0x6A, 0xAE, 0x98, 0x1C, 0xAA, 0x02, 0xFE, 0x79, 0x68, 0x31, -0x01, 0x49, 0x9E, 0x44, 0xC4, 0x11, 0xD1, 0x42, 0x8F, 0xB1, -0x2E, 0x70, 0xAD, 0x0E, 0xF4, 0xAC, 0x06, 0xC2, 0xC6, 0x06, -0x20, 0x99, 0xE3, 0x08, 0x31, 0x36, 0x71, 0xEA, 0xE0, 0x50, -0x98, 0x76, 0xAD, 0x2A, 0x84, 0x33, 0x66, 0x2A, 0x28, 0x70, -0xA6, 0x50, 0x80, 0x14, 0x9A, 0x65, 0x40, 0x2E, 0xB0, 0x55, -0x84, 0x16, 0xF4, 0x51, 0x7D, 0xCF, 0x8E, 0x8E, 0x89, 0x35, -0x23, 0xBE, 0xF5, 0xE2, 0x78, 0x10, 0x5B, 0x49, 0x08, 0x47, -0xAA, 0x47, 0x77, 0x9F, 0xD8, 0xF3, 0xE2, 0x7B, 0xBF, 0x7F, -0x24, 0xCF, 0xDC, 0xD6, 0x63, 0xE6, 0xB7, 0xAF, 0x8F, 0x6E, -0xEA, 0xCC, 0x5D, 0x11, 0x22, 0x54, 0xFD, 0x49, 0xDF, 0xF8, -0xC5, 0x55, 0xCD, 0x44, 0x16, 0x5C, 0xD5, 0xAF, 0x72, 0xBF, -0xCC, 0x7D, 0xDA, 0x23, 0xEC, 0x37, 0x87, 0xB8, 0xC4, 0x63, -0x6B, 0x93, 0x2F, 0xE3, 0xE3, 0x34, 0x22, 0x82, 0xC0, 0xAE, -0x43, 0x57, 0xAC, 0x45, 0x19, 0x7C, 0xE6, 0xEE, 0x2B, 0xC7, -0x8F, 0xEC, 0xEC, 0xFE, 0x64, 0xEF, 0xE6, 0x8C, 0xEE, 0x99, -0xBC, 0x78, 0x60, 0xB0, 0xBD, 0x7A, 0x34, 0xC3, 0xAD, 0x77, -0xB2, 0xBC, 0x36, 0x75, 0x3D, 0xDF, 0x7A, 0xFB, 0x92, 0xE7, -0xF1, 0x71, 0x0C, 0xFE, 0x3B, 0x14, 0x44, 0x65, 0x84, 0x76, -0xC4, 0x34, 0xCF, 0x1F, 0x2E, 0x77, 0x59, 0xD3, 0xF9, 0x3B, -0x8B, 0xFB, 0x52, 0xA2, 0x32, 0xB9, 0x8C, 0x7F, 0xFC, 0x74, -0x76, 0x67, 0xD4, 0x54, 0x8C, 0x4B, 0x22, 0x58, 0x6C, 0x95, -0xA7, 0xF2, 0x03, 0x67, 0x5E, 0xCA, 0xBC, 0x36, 0x3B, 0x91, -0xDF, 0xFE, 0x7F, 0xB9, 0xFE, 0x01, 0x8C, 0x37, 0x4F, 0xD9, -0x44, 0x8F, 0x9A, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x38, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xCD, 0x54, 0x6B, 0x6C, 0x54, 0x45, 0x14, -0x3E, 0x33, 0x77, 0xEF, 0xDD, 0x47, 0xB7, 0xA5, 0x2D, 0x74, -0xEF, 0x76, 0xDB, 0x66, 0x97, 0x2D, 0x15, 0x4A, 0x5B, 0x11, -0x69, 0xC0, 0x48, 0x1A, 0x05, 0x8D, 0x40, 0x85, 0x60, 0x6C, -0x1B, 0x30, 0xFE, 0x32, 0x6A, 0x7C, 0x01, 0x6D, 0x28, 0x85, -0xA0, 0x3F, 0x40, 0xA3, 0xE1, 0x25, 0x31, 0x46, 0x0D, 0xA9, -0x31, 0x08, 0x34, 0x50, 0x82, 0xA0, 0x06, 0x45, 0x14, 0xE8, -0x83, 0xA0, 0xF2, 0x2A, 0x06, 0x52, 0xA8, 0x31, 0xC4, 0x06, -0x69, 0x83, 0xB4, 0xB4, 0xDB, 0xBD, 0xDD, 0x3E, 0x76, 0xEF, -0x63, 0xC6, 0x33, 0x2D, 0x5B, 0x29, 0xD4, 0x6A, 0xF8, 0xE5, -0x24, 0xBB, 0x73, 0xEE, 0x3C, 0xCE, 0x77, 0xBE, 0xEF, 0x9C, -0x33, 0x04, 0xC6, 0x18, 0x07, 0x6A, 0xF7, 0x2F, 0xE4, 0x9C, -0xAF, 0xD5, 0x0D, 0xDD, 0x66, 0xB7, 0xDB, 0x3B, 0x82, 0x39, -0x39, 0xD5, 0x85, 0xB3, 0x66, 0x9D, 0x18, 0xEB, 0xEC, 0xBF, -0x0D, 0x7A, 0xF7, 0xC2, 0x8F, 0x27, 0x4F, 0x15, 0xA6, 0xA6, -0xA6, 0x1E, 0x55, 0x14, 0x65, 0xDE, 0xB5, 0xD6, 0x6B, 0x45, -0x47, 0x0E, 0x7F, 0x53, 0x7A, 0xB0, 0x76, 0xFF, 0xF1, 0xF6, -0xB6, 0xB6, 0x6D, 0xF1, 0x33, 0x8D, 0xF5, 0x0D, 0xF2, 0xE9, -0x9F, 0x7E, 0xAE, 0x38, 0xD5, 0x78, 0xF2, 0x60, 0xCD, 0xE7, -0xBB, 0x0E, 0xBF, 0xBF, 0x79, 0xCB, 0xF6, 0x37, 0xAB, 0xAA, -0x66, 0xFF, 0x27, 0x00, 0xC3, 0x30, 0x6A, 0x92, 0x92, 0x93, -0xA1, 0xE5, 0xCA, 0x65, 0x08, 0xF7, 0xF4, 0x80, 0xD3, 0xE9, -0x64, 0x97, 0x2F, 0x37, 0x43, 0x6B, 0x6B, 0xEB, 0x42, 0xB1, -0x5F, 0x7F, 0xAC, 0x6E, 0xB2, 0x47, 0x55, 0xFB, 0x3B, 0xFE, -0xBC, 0xF9, 0xC1, 0xD7, 0x87, 0xBE, 0x2C, 0x39, 0x73, 0xFA, -0xCC, 0x92, 0x96, 0x2B, 0x57, 0x56, 0xFF, 0xDE, 0xDA, 0x7A, -0xF6, 0xB9, 0xD2, 0x92, 0x8F, 0xC6, 0x05, 0xA8, 0x3F, 0x76, -0x62, 0xB9, 0x69, 0x18, 0xD3, 0x2E, 0x36, 0x5D, 0xE0, 0x7A, -0xCC, 0x60, 0x8C, 0x59, 0xF8, 0x63, 0x84, 0x52, 0xCA, 0xED, -0x0E, 0x7B, 0xBE, 0x38, 0xE3, 0x70, 0x38, 0xCA, 0x63, 0xB1, -0x98, 0xDC, 0x74, 0xFE, 0x3C, 0x77, 0x20, 0x38, 0x32, 0x65, -0xB2, 0x22, 0x73, 0xC5, 0xA6, 0xF0, 0x68, 0x4C, 0x7F, 0x69, -0x5C, 0x00, 0x59, 0x51, 0xB6, 0x35, 0x5F, 0x6A, 0x86, 0xAE, -0xAE, 0x10, 0x47, 0x26, 0x94, 0x59, 0x16, 0xB5, 0x98, 0xC5, -0x2D, 0xC3, 0x20, 0x2E, 0x97, 0x0B, 0xBE, 0x3B, 0xF2, 0xED, -0x63, 0xCE, 0x04, 0xD7, 0xF3, 0xBF, 0xB5, 0xFC, 0x0A, 0x8A, -0xAC, 0x70, 0x71, 0x9F, 0x73, 0xA0, 0x04, 0x08, 0x27, 0x94, -0x88, 0xC9, 0x81, 0x2C, 0xE6, 0x8E, 0x09, 0x70, 0xB2, 0xBE, -0x71, 0xC1, 0xAD, 0x8E, 0xCE, 0x4C, 0xD3, 0x34, 0xC0, 0xB4, -0x74, 0x60, 0xCC, 0x04, 0x13, 0x6F, 0x33, 0x93, 0x81, 0x85, -0x73, 0x82, 0xD3, 0x09, 0x86, 0xAE, 0xBF, 0xE6, 0x76, 0x27, -0x4C, 0x6A, 0x6F, 0x6B, 0x07, 0x64, 0x35, 0x3A, 0x54, 0x82, -0xCE, 0x08, 0x85, 0x98, 0x6E, 0x2C, 0xBE, 0x73, 0xD9, 0x16, -0x37, 0x90, 0xEA, 0x8A, 0xF6, 0xF6, 0x76, 0x71, 0x0E, 0x03, -0xB7, 0x88, 0x65, 0x72, 0xC6, 0x4D, 0x0B, 0x4C, 0x66, 0x12, -0x2A, 0x51, 0x86, 0x1B, 0x04, 0xF3, 0x51, 0x12, 0xEA, 0x0E, -0x71, 0xD3, 0x34, 0x39, 0xC1, 0x81, 0xD7, 0x58, 0xDC, 0x3D, -0xD2, 0x61, 0xB8, 0x44, 0x0D, 0xD3, 0x78, 0x12, 0xBF, 0xD7, -0xDF, 0xC3, 0xA0, 0x57, 0xEB, 0x5D, 0x6C, 0x1A, 0x26, 0x30, -0xCE, 0x29, 0xBA, 0xE6, 0x26, 0xB7, 0xA8, 0xC9, 0x4D, 0xCA, -0xD0, 0x99, 0x43, 0x51, 0x70, 0x8D, 0x21, 0x80, 0xCB, 0xD6, -0xDD, 0xD5, 0xC5, 0xA5, 0xE1, 0xF0, 0xF9, 0xED, 0xFB, 0xB7, -0x6D, 0x4E, 0x85, 0x89, 0xD1, 0x15, 0xDE, 0x23, 0x11, 0xCA, -0x33, 0xAF, 0x57, 0xD3, 0x86, 0xCE, 0xA1, 0xE6, 0x28, 0x91, -0x05, 0xDC, 0x32, 0x01, 0x51, 0x90, 0x01, 0x03, 0x4C, 0x26, -0xE8, 0xBA, 0x0E, 0x98, 0x48, 0xE8, 0xED, 0x8D, 0xC0, 0x70, -0xF0, 0x77, 0x0D, 0x84, 0x10, 0xB0, 0x58, 0x14, 0xB0, 0xBC, -0xF4, 0xD9, 0xE0, 0x28, 0x89, 0x64, 0x59, 0x7E, 0x24, 0x1C, -0x0E, 0x03, 0x36, 0x97, 0x28, 0x1C, 0x74, 0x6C, 0x11, 0xD3, -0xB4, 0x18, 0x32, 0x00, 0x21, 0x97, 0x3B, 0xD1, 0xCD, 0xA2, -0xD1, 0x41, 0xB0, 0x29, 0x0A, 0x0C, 0xF6, 0x0D, 0x08, 0x75, -0xD8, 0xB0, 0xEA, 0x7F, 0x4B, 0x14, 0xB7, 0x91, 0x1C, 0x8D, -0xC5, 0xF4, 0x3C, 0x34, 0x5B, 0xEF, 0x94, 0x68, 0xDA, 0xC0, -0xC0, 0x80, 0x00, 0xA0, 0x26, 0xC3, 0xCA, 0xC1, 0xD0, 0x85, -0x8D, 0x13, 0xB5, 0x30, 0x19, 0x89, 0x89, 0x89, 0xD4, 0x88, -0xE9, 0x78, 0x96, 0xD0, 0xC1, 0xD8, 0x60, 0x5C, 0x9A, 0xBB, -0x24, 0x1A, 0xB1, 0x45, 0x50, 0xFE, 0x51, 0x0C, 0x62, 0xBA, -0x9E, 0x86, 0x89, 0x03, 0x51, 0xF5, 0x1C, 0xAB, 0xC6, 0xB4, -0x38, 0x26, 0x19, 0xD3, 0xCB, 0x51, 0x2E, 0xDD, 0x20, 0x1E, -0x8F, 0x87, 0xE9, 0xB8, 0x6F, 0x97, 0xF0, 0xDB, 0x30, 0xC7, -0x61, 0xC0, 0x87, 0x82, 0x96, 0x24, 0xC9, 0x33, 0x0A, 0x20, -0xDA, 0xDF, 0x6F, 0xD7, 0x63, 0x3A, 0x18, 0xA6, 0x8E, 0x0C, -0x4C, 0x91, 0x28, 0xD1, 0x62, 0x14, 0x9B, 0x0E, 0x24, 0x59, -0x66, 0xAA, 0xEA, 0xA1, 0x62, 0x9F, 0x12, 0x79, 0x48, 0xC6, -0xDB, 0x91, 0xC6, 0x67, 0x88, 0xDB, 0x48, 0x1A, 0x44, 0x7A, -0xDC, 0xEE, 0xC4, 0x84, 0x51, 0x49, 0x9E, 0x9A, 0x37, 0x5D, -0x53, 0x7D, 0x5E, 0x28, 0x9C, 0x33, 0x5B, 0x34, 0x1B, 0x68, -0xBD, 0x1A, 0x84, 0xB5, 0x30, 0x08, 0xA7, 0x8B, 0x8A, 0x17, -0x41, 0x66, 0x86, 0x0F, 0xA2, 0xD1, 0x81, 0xA1, 0xEF, 0xB1, -0xF2, 0x7B, 0xA7, 0x33, 0x42, 0x24, 0xF0, 0xE1, 0xF9, 0x51, -0x00, 0x4E, 0x97, 0xF3, 0x8F, 0xA7, 0x97, 0x2E, 0x81, 0xAC, -0x80, 0x1F, 0x16, 0x14, 0x2F, 0x84, 0xB2, 0x65, 0x65, 0xB0, -0x66, 0x5D, 0x15, 0x7C, 0xBC, 0xE3, 0x13, 0xC8, 0xCB, 0xCF, -0x45, 0x16, 0x12, 0x50, 0x9B, 0x04, 0x22, 0xD1, 0xD1, 0x68, -0x4C, 0x68, 0x8C, 0x62, 0x60, 0x85, 0x89, 0xA6, 0xC4, 0x9F, -0xF8, 0x8E, 0x7B, 0x2B, 0x29, 0x2B, 0x03, 0xD5, 0xEB, 0x0D, -0xC7, 0x01, 0x24, 0xF1, 0x57, 0x59, 0x59, 0xE9, 0xC5, 0xC0, -0x9E, 0x99, 0x90, 0xE4, 0x66, 0xC9, 0x29, 0x29, 0xDC, 0xAB, -0xAA, 0xA2, 0x12, 0x79, 0xC7, 0xCD, 0x1B, 0x7C, 0xA0, 0xBF, -0x9F, 0xA0, 0x03, 0x21, 0x2E, 0x99, 0xFD, 0xE8, 0x5C, 0x8E, -0xE5, 0x4A, 0x6E, 0xB4, 0xDF, 0xE0, 0x7D, 0xB8, 0x3E, 0x73, -0xD6, 0xC3, 0x3C, 0x10, 0x0C, 0xF0, 0xB6, 0xEB, 0xD7, 0x49, -0x4F, 0xA8, 0x87, 0x3F, 0x38, 0x63, 0x06, 0xCF, 0xCA, 0xF2, -0x91, 0x60, 0x76, 0x70, 0xCF, 0xAE, 0xDD, 0x7B, 0x2E, 0x8E, -0x30, 0xA8, 0xAE, 0xAE, 0xAE, 0x97, 0x24, 0x02, 0x7D, 0x7D, -0xFD, 0x34, 0x1C, 0x0A, 0xD1, 0xCE, 0xCE, 0x9B, 0xBC, 0x2F, -0x12, 0xA1, 0xD8, 0xFA, 0x54, 0x92, 0x6D, 0xA2, 0x6B, 0x69, -0x5F, 0x5F, 0xE4, 0xAA, 0xA8, 0x81, 0xA2, 0xC7, 0x8B, 0x60, -0xE5, 0x9A, 0x55, 0xF4, 0x95, 0x37, 0x5E, 0xE5, 0x53, 0xA6, -0xE6, 0xD0, 0x60, 0xCE, 0x14, 0xFA, 0xC2, 0xCB, 0x2F, 0xF2, -0x77, 0xDE, 0x7B, 0x9B, 0x16, 0x17, 0x3F, 0x45, 0x5D, 0x2E, -0x07, 0x68, 0xA1, 0xEE, 0x0B, 0x23, 0x49, 0xCE, 0xCD, 0xCD, -0x25, 0x35, 0x35, 0x35, 0xD1, 0x27, 0xE6, 0xCF, 0xEF, 0x48, -0xF3, 0xA4, 0xA9, 0xD8, 0x09, 0x88, 0x4A, 0x86, 0x0B, 0x03, -0x69, 0x78, 0xD4, 0x74, 0x12, 0xEA, 0xBA, 0x05, 0x75, 0x0D, -0x8D, 0xF5, 0x99, 0xFE, 0x29, 0xC6, 0xD4, 0x07, 0x72, 0xA6, -0x23, 0x0E, 0xD8, 0x64, 0x1B, 0xB8, 0x1C, 0x76, 0x88, 0x45, -0xA3, 0x20, 0x04, 0xEB, 0xEC, 0xEC, 0xC0, 0xF7, 0x82, 0x03, -0xF6, 0x00, 0x5B, 0x5A, 0xB2, 0xAC, 0x79, 0x04, 0x40, 0x68, -0x91, 0x94, 0x94, 0x24, 0x6D, 0xD8, 0xB8, 0x71, 0x43, 0x65, -0xE5, 0xEA, 0x77, 0xFD, 0x59, 0x59, 0x93, 0x0C, 0xF1, 0x8A, -0xA2, 0xB6, 0xF8, 0x62, 0x00, 0x3E, 0x0D, 0xD6, 0xDE, 0xBD, -0xB5, 0x07, 0x8F, 0xD7, 0x35, 0x7C, 0x38, 0x39, 0x98, 0xD3, -0x9D, 0x36, 0x31, 0x65, 0xFA, 0xA5, 0x8B, 0x97, 0x58, 0x5E, -0x7E, 0x1E, 0x19, 0x8C, 0xEA, 0x2C, 0x12, 0x89, 0x80, 0x5D, -0x91, 0x49, 0xEA, 0x44, 0x95, 0x69, 0x5A, 0x88, 0xE2, 0x9B, -0xF6, 0xD5, 0xA8, 0xC4, 0xB7, 0xB4, 0xB4, 0x70, 0x5C, 0xEC, -0xD4, 0x34, 0xAD, 0xA6, 0xAA, 0x6A, 0xED, 0xCC, 0x95, 0xE5, -0x15, 0x4B, 0x36, 0x6D, 0xDE, 0x52, 0xBE, 0x69, 0xEB, 0xF6, -0xF2, 0x75, 0xEB, 0xDF, 0x2A, 0x5D, 0xB1, 0xB2, 0xE2, 0xA1, -0xB3, 0xE7, 0x9A, 0x5E, 0x77, 0x3A, 0x1C, 0x57, 0xF7, 0xED, -0xAB, 0xDD, 0xC1, 0x91, 0x59, 0x41, 0x41, 0x01, 0x3E, 0xE3, -0xD8, 0xF1, 0xF8, 0x5E, 0x29, 0xB2, 0x24, 0xEA, 0x1E, 0xB4, -0x70, 0x17, 0x4D, 0x49, 0x9E, 0x00, 0x07, 0xBE, 0x38, 0xB4, -0xE3, 0x9F, 0xEB, 0x6C, 0x9C, 0x11, 0x08, 0x04, 0x68, 0x46, -0x46, 0x86, 0xB7, 0xA8, 0xA8, 0x68, 0xD5, 0x96, 0xAD, 0x9B, -0x7F, 0xF9, 0xE1, 0xFB, 0xA3, 0x83, 0x17, 0x9A, 0xCE, 0xF1, -0xF3, 0x67, 0x4F, 0xF3, 0x86, 0xBA, 0xE3, 0x7C, 0xF7, 0xCE, -0xCF, 0xDA, 0x2A, 0x2A, 0x56, 0x7D, 0xAA, 0xAA, 0xDE, 0xF4, -0x60, 0x30, 0x28, 0xDD, 0x17, 0x48, 0x76, 0x76, 0xB6, 0xCD, -0xEF, 0xF7, 0x27, 0xA6, 0xA7, 0xFB, 0x32, 0x55, 0x55, 0xCD, -0xF7, 0xF9, 0x7C, 0x73, 0x02, 0x01, 0xFF, 0x5C, 0xEC, 0xF4, -0x02, 0xAF, 0xD7, 0x9B, 0x89, 0x23, 0xF1, 0xBE, 0x9D, 0xFF, -0x6F, 0xC7, 0x5F, 0x02, 0xE8, 0xB0, 0xF1, 0x7A, 0x17, 0xEF, -0x2F, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, -0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Fullscreen1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x44, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xD5, 0x55, 0x59, 0x6F, 0x1B, 0x55, 0x14, -0x3E, 0x77, 0x3C, 0xFB, 0x6A, 0x8F, 0x67, 0xF3, 0x32, 0xB6, -0xE3, 0x38, 0x69, 0x12, 0x48, 0x4A, 0xD3, 0x84, 0x38, 0x64, -0x48, 0x2B, 0xCA, 0x03, 0xAA, 0x90, 0x28, 0x48, 0x50, 0x56, -0xA1, 0x56, 0xA8, 0x50, 0xAA, 0x4A, 0x80, 0x04, 0x0F, 0x88, -0x4D, 0xC0, 0xAF, 0x42, 0x55, 0x9F, 0x78, 0xE1, 0x89, 0x7F, -0x80, 0x84, 0x2A, 0x20, 0xDD, 0xD2, 0xA6, 0x49, 0x6C, 0x27, -0x1E, 0xDF, 0xC3, 0xB9, 0xC6, 0x69, 0xC3, 0x4F, 0xE8, 0x48, -0xDF, 0xF5, 0x78, 0xE6, 0x9E, 0xEF, 0x3B, 0xEB, 0x1D, 0x80, -0xA7, 0xFD, 0x2A, 0x88, 0x65, 0x6D, 0x6D, 0x7D, 0xA1, 0x5E, -0x4F, 0x2F, 0x37, 0x9A, 0xCD, 0x6C, 0x7A, 0x7A, 0x26, 0x9B, -0x9F, 0x9F, 0xCF, 0x16, 0x97, 0x96, 0xB2, 0x53, 0xA7, 0x96, -0xB3, 0xD5, 0x95, 0xD5, 0x6C, 0x6D, 0x6D, 0x2D, 0xEB, 0xAE, -0x77, 0xB3, 0xF5, 0xEE, 0x3A, 0xDD, 0x77, 0xB3, 0x95, 0xD5, -0xD5, 0xF1, 0x3B, 0xB1, 0x67, 0x7E, 0x61, 0x21, 0x9B, 0xE9, -0xCC, 0x64, 0xCD, 0x56, 0x2B, 0x8B, 0xA2, 0x84, 0x10, 0x65, -0x49, 0x92, 0x64, 0x71, 0x9C, 0xDC, 0xBA, 0x7D, 0x7B, 0x6B, -0x67, 0xAC, 0xD2, 0x6A, 0x4D, 0x7D, 0x9B, 0x24, 0x55, 0x5E, -0xF2, 0x03, 0x5E, 0x0E, 0x63, 0x9E, 0xD4, 0x52, 0x9E, 0xB6, -0xDA, 0xBC, 0x3D, 0x3B, 0xC7, 0x4F, 0x3C, 0x7B, 0x92, 0x2F, -0x2E, 0x3F, 0xCF, 0x57, 0x5F, 0x7C, 0x89, 0x6F, 0xBE, 0xF2, -0x06, 0x3F, 0xFB, 0xEA, 0x45, 0xBE, 0x71, 0xEE, 0x3C, 0x5F, -0x79, 0xE1, 0x0C, 0x3F, 0xB9, 0xDA, 0xE5, 0xCF, 0x3C, 0xB7, -0xCC, 0x67, 0x17, 0x16, 0x79, 0x63, 0x6A, 0x9A, 0x27, 0xD5, -0x94, 0xFB, 0x61, 0xC4, 0xCB, 0x41, 0xC8, 0x93, 0xA4, 0xF2, -0xD1, 0xE3, 0x08, 0x3C, 0xAF, 0x78, 0xBE, 0x7F, 0x30, 0xD8, -0xD8, 0xDB, 0xEF, 0x33, 0x0E, 0xC0, 0x38, 0x63, 0x80, 0x92, -0xCC, 0x0A, 0x8A, 0xCE, 0x64, 0xCD, 0x04, 0xCD, 0x2E, 0xB2, -0x62, 0x32, 0xC5, 0x4A, 0x8D, 0x0E, 0xB3, 0x83, 0x18, 0x14, -0x59, 0x67, 0x28, 0xD1, 0x46, 0x59, 0x61, 0x92, 0xAC, 0xB2, -0xD1, 0x48, 0x58, 0x49, 0x0C, 0x09, 0x83, 0xFE, 0x00, 0x00, -0x05, 0x03, 0xDC, 0xEC, 0xF5, 0xF6, 0x7F, 0x93, 0x84, 0x80, -0x24, 0x49, 0xA6, 0x24, 0x15, 0x40, 0x56, 0x35, 0xD0, 0x0C, -0x0B, 0x0C, 0xDB, 0x05, 0xDB, 0x2B, 0x82, 0x57, 0x0E, 0xA1, -0x14, 0x25, 0x90, 0xA4, 0x6D, 0x68, 0xCC, 0xCD, 0x41, 0x6B, -0xBA, 0x09, 0x69, 0xAB, 0x06, 0x95, 0x34, 0x85, 0x6A, 0x2D, -0x85, 0x5A, 0xBD, 0x01, 0x3E, 0xED, 0xF1, 0x69, 0x4F, 0x39, -0xAE, 0x81, 0xA6, 0x1B, 0xC4, 0xA1, 0x82, 0x54, 0x18, 0xFB, -0x6D, 0x8D, 0xB9, 0xC5, 0xA2, 0xA8, 0x8A, 0x55, 0x90, 0x15, -0xD0, 0x0D, 0x0B, 0x0D, 0xC7, 0x47, 0xDB, 0x0D, 0xC0, 0xF3, -0x2B, 0xE8, 0x47, 0x29, 0xC6, 0xB5, 0x29, 0x68, 0xCC, 0xCE, -0xE2, 0x6C, 0xA7, 0x81, 0x9D, 0x46, 0x82, 0x8D, 0x24, 0x84, -0x4A, 0x2D, 0xC6, 0x7A, 0x73, 0x0A, 0x82, 0xB8, 0x86, 0x41, -0x52, 0xC7, 0x4A, 0xA3, 0x03, 0x4E, 0x29, 0x44, 0x49, 0xD5, -0x50, 0x38, 0x48, 0x5C, 0x48, 0xB4, 0xE6, 0x63, 0x01, 0xF2, -0xDE, 0x96, 0x55, 0x13, 0x74, 0x27, 0x60, 0x76, 0x39, 0x61, -0x6E, 0x58, 0x85, 0x52, 0xB5, 0xCE, 0xE2, 0xA9, 0x16, 0x6B, -0xCE, 0xCD, 0xC0, 0xDC, 0x4C, 0x8B, 0xB5, 0xAB, 0x31, 0x4B, -0xFC, 0x22, 0x2B, 0x7B, 0x0E, 0x24, 0x71, 0xC0, 0xCA, 0x51, -0x44, 0x9E, 0xD3, 0xB3, 0x34, 0x65, 0x7E, 0x92, 0x80, 0x44, -0xE9, 0x32, 0x2C, 0x97, 0x89, 0xE8, 0x29, 0x13, 0x8C, 0xB2, -0x75, 0x2C, 0x02, 0x45, 0x36, 0x65, 0xDD, 0x04, 0x93, 0x8C, -0x9C, 0x98, 0xD2, 0x92, 0x56, 0x20, 0x4A, 0xAB, 0xD0, 0x6E, -0x37, 0xE0, 0x44, 0xAB, 0x0E, 0x9D, 0x5A, 0x02, 0x15, 0xBF, -0x08, 0xB6, 0xA9, 0x83, 0x67, 0x5B, 0xE0, 0xB9, 0x36, 0x78, -0x25, 0x17, 0xE2, 0x2A, 0x89, 0x84, 0x65, 0xCA, 0x80, 0x0A, -0xBA, 0x69, 0x83, 0xE5, 0xFA, 0x94, 0xDE, 0x12, 0xFD, 0x37, -0x80, 0xC1, 0x31, 0x01, 0x92, 0xB3, 0x15, 0xC7, 0x01, 0x3F, -0x0E, 0x31, 0x22, 0x84, 0xBE, 0x0F, 0x8D, 0x0A, 0xA5, 0x23, -0x0A, 0xB1, 0x5A, 0xF6, 0x21, 0x2A, 0x79, 0x68, 0x69, 0x2A, -0xEA, 0x0A, 0x81, 0xC8, 0x1C, 0xD3, 0xC0, 0x98, 0x04, 0x49, -0x0C, 0x35, 0x8D, 0xD2, 0x42, 0xC2, 0xA6, 0xEB, 0xA1, 0xE9, -0xFA, 0xA8, 0xDB, 0x3E, 0xC8, 0xBA, 0x85, 0xA4, 0xF0, 0x44, -0x80, 0x2E, 0xC3, 0xF1, 0x3C, 0xA8, 0x46, 0x11, 0xAB, 0x04, -0x14, 0x7E, 0xD1, 0x03, 0x22, 0x60, 0x45, 0xD7, 0xA1, 0x94, -0xB8, 0x40, 0xA4, 0x6C, 0x84, 0xC8, 0x38, 0x81, 0xBA, 0x03, -0x6C, 0xC3, 0x60, 0x86, 0xA6, 0x82, 0x5C, 0x28, 0x30, 0x5D, -0x53, 0x99, 0xA1, 0xEB, 0xA0, 0x59, 0x3A, 0x53, 0x1D, 0x4B, -0x00, 0x64, 0xC3, 0x64, 0x47, 0x45, 0x96, 0xC5, 0xC2, 0x39, -0xB7, 0x03, 0x22, 0xAA, 0x84, 0x01, 0xAA, 0x9A, 0x06, 0x86, -0x61, 0x80, 0xA6, 0xAA, 0x68, 0xEA, 0x74, 0xAF, 0xAB, 0x70, -0x98, 0x8F, 0xB0, 0x77, 0x90, 0x43, 0x7F, 0x98, 0x83, 0xAA, -0x8C, 0x4D, 0x90, 0xA3, 0x88, 0x9C, 0xA1, 0xA6, 0x28, 0xE2, -0x06, 0x0A, 0xB4, 0x5F, 0x16, 0xA2, 0xB4, 0xBF, 0xA0, 0x6B, -0x08, 0x78, 0xAC, 0xC8, 0x79, 0x9E, 0x9B, 0x45, 0xD7, 0x03, -0x22, 0x64, 0xC2, 0x2B, 0x4A, 0x19, 0xBD, 0xA7, 0x55, 0x92, -0x58, 0xFF, 0x70, 0x08, 0x3B, 0xBD, 0x01, 0xDB, 0xD9, 0x1F, -0xB0, 0x11, 0x17, 0x51, 0x00, 0x1C, 0x0C, 0x73, 0x76, 0x30, -0x1C, 0x81, 0x44, 0x95, 0x24, 0x6D, 0xF2, 0x96, 0x89, 0x46, -0x61, 0x05, 0xB2, 0xA5, 0x8E, 0x24, 0x07, 0x69, 0x4E, 0x10, -0x9F, 0x44, 0x30, 0x1A, 0x8D, 0x2C, 0xD3, 0x32, 0x05, 0xA9, -0x30, 0x06, 0x59, 0xA3, 0xA8, 0x88, 0xA8, 0x77, 0x70, 0x08, -0x43, 0x9A, 0xA1, 0xA1, 0x18, 0x24, 0x9A, 0x13, 0x95, 0x3C, -0xE5, 0x87, 0xF9, 0xD8, 0x7D, 0x8A, 0x8A, 0xDE, 0xF1, 0xF1, -0x3B, 0x61, 0x27, 0x7A, 0xBF, 0x20, 0x49, 0xA0, 0x51, 0x84, -0x22, 0x3F, 0xFF, 0x13, 0x18, 0x0E, 0x87, 0xA6, 0x98, 0x83, -0xBD, 0xDE, 0x00, 0x72, 0x72, 0x48, 0xD5, 0x47, 0x63, 0xF2, -0x3B, 0x0F, 0x76, 0xA9, 0xA7, 0x65, 0x50, 0xA9, 0xB0, 0xA2, -0x53, 0x68, 0x5A, 0xA1, 0x40, 0x5A, 0x23, 0xE4, 0x63, 0x47, -0x06, 0x14, 0x45, 0xCE, 0x71, 0x2C, 0xC0, 0xFE, 0x4B, 0x35, -0x8C, 0xE8, 0xB9, 0xF0, 0xE7, 0xA8, 0x06, 0xAC, 0x52, 0xA9, -0x2A, 0x74, 0xED, 0x6D, 0x5E, 0x78, 0x57, 0xC9, 0x59, 0x41, -0x4C, 0x1D, 0x58, 0x96, 0x43, 0xB0, 0xC0, 0x34, 0x0D, 0x70, -0x1C, 0x1B, 0x34, 0x4D, 0x07, 0x8B, 0x3A, 0xC5, 0xA0, 0xFA, -0xC8, 0x05, 0x09, 0x72, 0x62, 0x38, 0x1C, 0x0E, 0x09, 0x87, -0xB0, 0xBB, 0xDF, 0x87, 0x87, 0x0F, 0x1F, 0xC1, 0x5F, 0x5B, -0xB7, 0xE1, 0xE1, 0xFD, 0x7B, 0xF0, 0xE0, 0xFE, 0x7D, 0xE8, -0x3D, 0xB8, 0x0B, 0xB7, 0x7E, 0xFF, 0x75, 0xEB, 0xDE, 0xBD, -0xBB, 0x55, 0x39, 0x08, 0x02, 0x6D, 0x7B, 0x7B, 0x5B, 0xFE, -0xE7, 0xCF, 0x3F, 0x00, 0x69, 0x58, 0x98, 0xAC, 0xC2, 0x36, -0x15, 0x4C, 0xA2, 0xB3, 0xC8, 0x25, 0x72, 0xCB, 0x32, 0x51, -0xA5, 0xC1, 0x31, 0x0D, 0x3A, 0x46, 0x28, 0xBF, 0x94, 0x06, -0x24, 0x4F, 0x59, 0x4E, 0xC9, 0x1F, 0xE6, 0x43, 0xD6, 0x1F, -0x1C, 0xC0, 0xCE, 0xA3, 0x5D, 0xFC, 0x7B, 0xEB, 0x0E, 0xEB, -0xED, 0xEE, 0xC2, 0xA0, 0xB7, 0x87, 0xC3, 0xFD, 0x47, 0x54, -0x47, 0x36, 0x2E, 0x32, 0x9C, 0x3B, 0xF7, 0xB2, 0x55, 0xAB, -0xD5, 0xFB, 0x74, 0x5C, 0x73, 0x3A, 0xAE, 0xB1, 0xDD, 0x9E, -0xC6, 0x4E, 0x67, 0x86, 0xCF, 0xCD, 0xCD, 0xE3, 0xD2, 0xD2, -0x49, 0x3C, 0x7D, 0x7A, 0x85, 0x77, 0xBB, 0xEB, 0xB8, 0x91, -0x65, 0xB8, 0xB9, 0x79, 0x46, 0x80, 0x6F, 0x6C, 0x64, 0xB8, -0xD6, 0xED, 0xF2, 0xE5, 0xD3, 0x2B, 0x48, 0x47, 0x36, 0xD2, -0x5E, 0x3E, 0x3D, 0xDD, 0xC1, 0x66, 0xB3, 0x85, 0xC4, 0xC5, -0x29, 0x2B, 0x48, 0x7C, 0x77, 0x1E, 0x7F, 0x14, 0x2C, 0xCB, -0x2E, 0x52, 0x4A, 0x12, 0xDB, 0xB6, 0x13, 0xC7, 0x71, 0x12, -0xD7, 0x75, 0x13, 0xCF, 0xF3, 0x12, 0xDF, 0xF7, 0x2B, 0xEF, -0xBD, 0xFF, 0xC1, 0xA5, 0x2F, 0xBE, 0xFC, 0x8A, 0x5F, 0xBD, -0x76, 0x9D, 0x5F, 0xF9, 0xE4, 0x2A, 0xFF, 0xF8, 0xD3, 0x6B, -0xFC, 0xFA, 0x67, 0x9F, 0xF3, 0x6F, 0xBE, 0xFB, 0x9E, 0xBF, -0xF9, 0xD6, 0xC5, 0xCD, 0x52, 0xC9, 0xAF, 0x88, 0xBD, 0x8E, -0xE3, 0x8E, 0x6D, 0x05, 0x87, 0xE0, 0x22, 0x4E, 0x77, 0x5C, -0x83, 0x09, 0xE4, 0xC9, 0xD1, 0x7D, 0x04, 0xF9, 0x08, 0x1F, -0x5E, 0xBA, 0x7C, 0xED, 0xE2, 0xDB, 0xEF, 0x7C, 0x9D, 0x8F, -0x72, 0xD1, 0xF7, 0xE3, 0x19, 0x10, 0xED, 0x4B, 0xC3, 0x85, -0x3F, 0xFF, 0xF4, 0xE3, 0xE5, 0x9B, 0x37, 0x6E, 0xFC, 0x22, -0x3A, 0xFD, 0x18, 0x46, 0x13, 0x0C, 0xC5, 0xAF, 0x34, 0x21, -0x14, 0xF9, 0x2A, 0x11, 0x62, 0x42, 0x83, 0x30, 0x43, 0x58, -0xA4, 0x8F, 0xC6, 0xF9, 0xD7, 0x2E, 0xBC, 0x7E, 0x45, 0x37, -0xF4, 0x5E, 0xA9, 0x58, 0xEA, 0x87, 0x41, 0xD0, 0x8F, 0xC2, -0x70, 0xE0, 0x3A, 0x4E, 0x1F, 0x11, 0xFA, 0x24, 0xFE, 0x83, -0xAE, 0x1B, 0x99, 0xD8, 0x3B, 0xB1, 0x69, 0x4C, 0x38, 0x3C, -0x82, 0x3E, 0x71, 0x7E, 0xBC, 0x08, 0x11, 0x1A, 0x49, 0xD0, -0xC4, 0xB1, 0x31, 0x69, 0x31, 0x77, 0x22, 0x5A, 0x25, 0xA4, -0x13, 0xE3, 0xA6, 0xF8, 0x00, 0x4E, 0xEE, 0xC5, 0xB3, 0xCA, -0x64, 0x8F, 0x3B, 0xB1, 0x31, 0x26, 0x1C, 0xCA, 0xB1, 0x63, -0xE8, 0x29, 0xBF, 0xFE, 0x05, 0xBF, 0xC0, 0xA7, 0xEC, 0x02, -0xFF, 0xAC, 0x09, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0xCE, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xD5, 0x94, 0x6B, 0x6C, 0x14, 0x55, 0x14, -0xC7, 0xFF, 0xF3, 0x9E, 0xD9, 0xC7, 0x74, 0x1F, 0x5D, 0xD8, -0x6E, 0x5B, 0x28, 0xDB, 0xD2, 0x94, 0x16, 0x04, 0xAC, 0xDA, -0x07, 0xB4, 0x54, 0x49, 0x0B, 0x94, 0xF4, 0x43, 0x6D, 0x04, -0xC5, 0xA6, 0x01, 0xA1, 0x1A, 0x89, 0x90, 0x18, 0x3F, 0x91, -0x26, 0xA4, 0xBE, 0x48, 0x3F, 0xA8, 0x11, 0x79, 0x24, 0x10, -0x21, 0x21, 0xFA, 0x41, 0xA2, 0xD1, 0x08, 0x06, 0xD1, 0xD4, -0x14, 0x14, 0x4A, 0xC5, 0x44, 0x41, 0x85, 0x86, 0xA6, 0xD0, -0x74, 0x41, 0x96, 0xB2, 0xDD, 0xED, 0x76, 0x77, 0x67, 0x76, -0x67, 0x67, 0x67, 0xC7, 0x5B, 0x62, 0xD0, 0x18, 0x6C, 0xA8, -0x21, 0x31, 0x9E, 0xE4, 0xE6, 0xDE, 0xDC, 0x73, 0xEE, 0xF9, -0xDD, 0x7B, 0xCE, 0x3D, 0x07, 0xF8, 0xBF, 0x0B, 0x35, 0x9D, -0x52, 0xD7, 0x75, 0x81, 0x4C, 0x0E, 0x8E, 0xE3, 0xC6, 0x1E, -0x38, 0x20, 0x95, 0x4A, 0x49, 0x44, 0x7D, 0x36, 0x14, 0x8D, -0x3D, 0xE4, 0x75, 0x3B, 0x4E, 0x98, 0xA6, 0xB9, 0x97, 0x6C, -0xF7, 0xF2, 0x3C, 0x9F, 0x7D, 0x20, 0x80, 0x74, 0x3A, 0xFD, -0xD6, 0xB1, 0xB3, 0x3F, 0xBF, 0x72, 0x59, 0xD1, 0x51, 0xBB, -0xD8, 0x0F, 0xBF, 0x4D, 0x84, 0xCF, 0x22, 0x5E, 0xA1, 0x29, -0x6A, 0x3F, 0x51, 0x1F, 0x21, 0xA0, 0xC9, 0x7F, 0x0D, 0xD0, -0x34, 0xAD, 0x7E, 0x28, 0x30, 0xD6, 0xD7, 0xF3, 0x59, 0x3F, -0xFD, 0x6C, 0xD0, 0x84, 0xA7, 0x79, 0x11, 0xE2, 0xD5, 0xF3, -0x21, 0xEA, 0x69, 0xB8, 0x90, 0x45, 0x9E, 0xC0, 0xC5, 0x45, -0x96, 0xF9, 0x90, 0x98, 0xEE, 0x15, 0x04, 0xE1, 0xF2, 0x8C, -0x00, 0x24, 0x34, 0xF6, 0xB4, 0x9E, 0xB9, 0xB0, 0x75, 0xF7, -0xA7, 0xFE, 0x9C, 0xA2, 0x02, 0x3C, 0xAE, 0xC4, 0xE1, 0x98, -0xA3, 0x81, 0x5B, 0x54, 0x09, 0x5D, 0xCE, 0x07, 0x4D, 0x6C, -0x26, 0x14, 0x15, 0xA2, 0xAA, 0x61, 0x81, 0x5D, 0x30, 0x7D, -0xB2, 0xA5, 0x8F, 0x6C, 0xED, 0x23, 0xE3, 0x98, 0x28, 0x8A, -0x99, 0xFB, 0x01, 0x1C, 0xDC, 0xFB, 0xC9, 0xB7, 0x9D, 0xA7, -0x87, 0x82, 0x78, 0xB8, 0x6E, 0x09, 0x68, 0x33, 0x86, 0xE7, -0xAC, 0x03, 0x48, 0xF1, 0x39, 0x18, 0xF2, 0x3F, 0x03, 0x92, -0x0B, 0x4C, 0xC4, 0x35, 0x24, 0x93, 0x69, 0xE8, 0x86, 0x01, -0x3B, 0x32, 0xA8, 0x70, 0x58, 0x50, 0xEA, 0x92, 0x47, 0x39, -0x86, 0x3E, 0x40, 0xF4, 0xEF, 0x4B, 0x92, 0x14, 0xBA, 0x27, -0x40, 0x51, 0x94, 0xB5, 0x3F, 0x5D, 0xB9, 0x7E, 0xFC, 0xE5, -0x7D, 0xC7, 0xA9, 0xD2, 0xF2, 0x12, 0xF8, 0xCA, 0x4A, 0xC0, -0xCA, 0x22, 0x16, 0x86, 0xBE, 0x40, 0x6B, 0xA9, 0x84, 0x7E, -0xB3, 0x14, 0x61, 0x7B, 0x05, 0x52, 0xC4, 0x39, 0x28, 0x13, -0x7A, 0xD6, 0x04, 0x58, 0x86, 0xCC, 0x06, 0x32, 0x8A, 0x02, -0xBF, 0xC8, 0x61, 0xE9, 0x6C, 0x77, 0xCA, 0x69, 0x95, 0x8E, -0x12, 0xD0, 0x3E, 0x8B, 0xC5, 0xF2, 0x03, 0xF3, 0x17, 0xE7, -0xEE, 0x84, 0x9A, 0xFA, 0xF2, 0xC5, 0x9E, 0x8F, 0xED, 0x06, -0x74, 0x58, 0x1D, 0xB9, 0x30, 0x58, 0x0B, 0x24, 0xD9, 0x8E, -0x28, 0x3B, 0x1B, 0xF9, 0xE1, 0xEF, 0x90, 0x87, 0x71, 0x0C, -0xD1, 0x25, 0x10, 0xC8, 0x29, 0x9A, 0x36, 0xC1, 0x30, 0x14, -0x68, 0x32, 0x28, 0x62, 0x9F, 0x26, 0x2F, 0x19, 0x89, 0xAA, -0x38, 0x3D, 0x7C, 0x9B, 0x1D, 0xB9, 0x15, 0x59, 0x92, 0x2F, -0x4B, 0x9D, 0xBB, 0x5E, 0x7F, 0x75, 0xF8, 0x2E, 0xA0, 0xAB, -0xAB, 0xEB, 0xF0, 0xAE, 0x43, 0x7D, 0x35, 0xE7, 0x06, 0x83, -0xE0, 0x05, 0x1A, 0x26, 0x2B, 0x81, 0x11, 0xED, 0xE0, 0x79, -0x06, 0x16, 0x81, 0xC3, 0x44, 0x74, 0x02, 0x55, 0x1E, 0x05, -0xB1, 0x68, 0x08, 0xAA, 0x5C, 0x08, 0x8E, 0x38, 0x66, 0xD8, -0xA9, 0x8C, 0xA4, 0x61, 0x82, 0x84, 0x4C, 0xD3, 0xA0, 0x2A, -0x06, 0x34, 0xDD, 0x40, 0x28, 0x9E, 0x40, 0x6D, 0x51, 0x1E, -0x7A, 0xDE, 0x78, 0xAD, 0xFF, 0x0E, 0x20, 0x91, 0x48, 0xAC, -0x0F, 0x84, 0x13, 0xDD, 0x83, 0x0A, 0x03, 0x51, 0xB4, 0x90, -0x24, 0x9A, 0xA0, 0x58, 0x1E, 0xA2, 0x45, 0x82, 0xC4, 0x9B, -0xB0, 0x5B, 0x48, 0x44, 0x72, 0xBC, 0x60, 0x46, 0x4E, 0x61, -0xB1, 0x43, 0xC5, 0xA8, 0x38, 0x07, 0xB4, 0xC0, 0x83, 0xA5, -0x49, 0x49, 0xD0, 0x29, 0xE2, 0x54, 0x43, 0x2C, 0x91, 0x41, -0x8A, 0x40, 0x60, 0xC4, 0xB1, 0xCC, 0x27, 0x63, 0x5E, 0x8E, -0xAC, 0xEF, 0xD8, 0xB1, 0xE3, 0x4D, 0x2A, 0x16, 0x8B, 0xE5, -0xC5, 0x55, 0xED, 0x97, 0x8E, 0xDD, 0xFD, 0x6E, 0x4F, 0xA1, -0x07, 0xFE, 0x7C, 0x07, 0x72, 0x45, 0x1A, 0xB7, 0xC7, 0xA3, -0xB8, 0xA5, 0xA4, 0x60, 0xB1, 0x51, 0x98, 0xED, 0xE6, 0xE1, -0x76, 0xB0, 0x60, 0x6E, 0xFE, 0x88, 0xA7, 0xC4, 0x7E, 0x5C, -0x17, 0x8A, 0x30, 0x5C, 0xDC, 0x4C, 0x42, 0x04, 0x64, 0x8C, -0x2C, 0x42, 0xB1, 0x0C, 0xA2, 0x64, 0x64, 0xF5, 0x49, 0xC8, -0xDA, 0x6D, 0xB4, 0x3F, 0xD6, 0x86, 0x3D, 0xBB, 0xF7, 0x1C, -0xE9, 0xEE, 0xEE, 0xDE, 0x42, 0x8D, 0x8C, 0x8C, 0x6C, 0x4B, -0x19, 0xFC, 0x7B, 0x5D, 0x87, 0xCE, 0xE1, 0xD2, 0x78, 0x1A, -0x6E, 0xAF, 0x0B, 0xC5, 0x05, 0x76, 0xCC, 0x2D, 0x74, 0xA0, -0xD0, 0x23, 0x81, 0x35, 0x53, 0x50, 0xD3, 0x31, 0x72, 0x63, -0x9D, 0x84, 0x2A, 0x0B, 0xD7, 0xC0, 0x01, 0xAC, 0x9C, 0x0B, -0x9C, 0x2A, 0x58, 0x8D, 0x49, 0xD9, 0x05, 0x33, 0x4B, 0x21, -0x46, 0x5E, 0x6C, 0xA4, 0xA2, 0x10, 0x13, 0xD7, 0x50, 0xE9, -0x6D, 0x80, 0xA0, 0xBB, 0x23, 0x75, 0x75, 0x75, 0x8F, 0x46, -0x22, 0x91, 0x6B, 0x4C, 0x32, 0x99, 0x5C, 0xB2, 0xA6, 0xE9, -0x89, 0x96, 0xB6, 0x15, 0xA5, 0x58, 0x5E, 0xE6, 0x41, 0x22, -0x3A, 0x89, 0xE1, 0x60, 0x14, 0x71, 0x9A, 0x41, 0x86, 0x31, -0x21, 0x58, 0x59, 0xE4, 0x7B, 0x1C, 0xF0, 0xCA, 0x12, 0x38, -0x56, 0x47, 0xD8, 0x26, 0xC3, 0x13, 0x18, 0x80, 0x33, 0x13, -0xC6, 0x8D, 0xBC, 0x3C, 0x24, 0xCD, 0x08, 0xAC, 0x54, 0x18, -0x8E, 0xCC, 0x30, 0x24, 0xC6, 0x81, 0xA5, 0xF9, 0xAB, 0x30, -0x15, 0x9A, 0xF3, 0xE7, 0xCF, 0x1F, 0xBF, 0xF3, 0x4D, 0x69, -0x9A, 0x16, 0x6A, 0x6A, 0x6A, 0x9E, 0xDC, 0xB4, 0x69, 0xD3, -0xF6, 0xC6, 0xC6, 0xC6, 0x2A, 0x9B, 0xCD, 0x46, 0x45, 0xD4, -0x0C, 0x4E, 0x5C, 0x1A, 0xC3, 0x85, 0x70, 0x0C, 0x2E, 0x17, -0x0B, 0x6F, 0xAE, 0x00, 0x4F, 0x0E, 0x0B, 0x17, 0x81, 0xD9, -0xB9, 0x0C, 0x32, 0xFD, 0x1F, 0xA0, 0x96, 0xFA, 0x15, 0xA7, -0x0A, 0x2B, 0x10, 0x9C, 0xE5, 0x44, 0x56, 0x8D, 0x42, 0x57, -0x05, 0xAC, 0x9C, 0xB5, 0x01, 0xBF, 0x0D, 0xDE, 0x1C, 0x6A, -0x6A, 0x6A, 0xAA, 0x32, 0x0C, 0x23, 0xFA, 0xF7, 0x3A, 0xE0, -0xCB, 0xCB, 0xCB, 0xEB, 0xDA, 0xDB, 0xDB, 0xB7, 0xB7, 0xB5, -0xB5, 0xAD, 0x76, 0x3A, 0x9D, 0xBC, 0x41, 0x31, 0x18, 0xB8, -0x31, 0x8E, 0x8B, 0x13, 0xE3, 0xE0, 0xAC, 0x59, 0x92, 0x07, -0x86, 0x24, 0x9C, 0x82, 0xC8, 0xA4, 0x51, 0xD4, 0xBB, 0x1F, -0xD6, 0x05, 0xD5, 0xF8, 0xC6, 0xAB, 0x62, 0x2C, 0x1E, 0x87, -0x9F, 0x5A, 0x88, 0xB5, 0xB9, 0xAB, 0xCC, 0xD6, 0xD6, 0xD6, -0x0D, 0x67, 0xCE, 0x9C, 0xF9, 0xE8, 0x1F, 0x2B, 0x99, 0x08, -0xE3, 0xF3, 0xF9, 0x2A, 0xD6, 0xAD, 0x5B, 0xF7, 0x52, 0x47, -0x47, 0xC7, 0xD3, 0x64, 0x6D, 0x67, 0x79, 0x1E, 0x83, 0x91, -0x08, 0x2E, 0x4E, 0x06, 0xA1, 0x70, 0x2A, 0x9C, 0x76, 0x13, -0x39, 0x66, 0x12, 0xF3, 0xAF, 0x5E, 0xC5, 0xF8, 0xD2, 0x65, -0x08, 0xC4, 0x46, 0xD1, 0x68, 0xAB, 0xC5, 0xD7, 0x9F, 0x7F, -0xD5, 0xDB, 0xD9, 0xD9, 0xD9, 0x32, 0xD5, 0x10, 0xA6, 0x03, -0xDC, 0xD5, 0xC9, 0xB2, 0x5C, 0xD0, 0xD2, 0xD2, 0xB2, 0x65, -0xF3, 0xE6, 0xCD, 0x5B, 0xCA, 0xCA, 0xCA, 0x7C, 0xA4, 0xB1, -0xE1, 0x86, 0x3A, 0x89, 0x4B, 0x91, 0x41, 0x8C, 0xEA, 0x21, -0x98, 0x14, 0x4D, 0xBA, 0x2E, 0x85, 0x35, 0xF3, 0xAA, 0xE0, -0xD5, 0x04, 0xAD, 0xA1, 0xA1, 0x61, 0x05, 0xF9, 0x34, 0xDF, -0x4F, 0xDB, 0x8B, 0xEE, 0x05, 0x22, 0x8E, 0x9D, 0xE4, 0xF0, -0x7A, 0x02, 0xDA, 0x5A, 0x5D, 0x5D, 0xBD, 0x90, 0xF4, 0x1A, -0x4C, 0xA4, 0x15, 0xF4, 0x05, 0x87, 0x31, 0xA6, 0xC5, 0xF0, -0x7C, 0xE9, 0x72, 0xBC, 0xFB, 0xF6, 0x3B, 0x07, 0x7B, 0x7A, -0x7A, 0xB6, 0x12, 0x7B, 0x63, 0xA6, 0x80, 0x3F, 0x8D, 0x29, -0xCA, 0x52, 0x59, 0x59, 0xB9, 0x7A, 0xE3, 0xC6, 0x8D, 0xDB, -0x9A, 0x9B, 0x9B, 0xEB, 0xAD, 0x56, 0x2B, 0xCD, 0x90, 0x62, -0x08, 0x04, 0x02, 0x21, 0x72, 0x81, 0x47, 0x48, 0x4D, 0x05, -0x66, 0xE2, 0x6F, 0x3A, 0xE1, 0x8A, 0x8B, 0x8B, 0x6B, 0x77, -0xEE, 0xDC, 0x79, 0xF4, 0xE4, 0xC9, 0x93, 0x37, 0xEB, 0xEB, -0xEB, 0x5F, 0x98, 0xE9, 0x65, 0xEF, 0x57, 0xA6, 0x9A, 0x91, -0xFD, 0x8F, 0xF9, 0xBF, 0x91, 0xDF, 0x01, 0x72, 0xD8, 0xEB, -0xCC, 0xAF, 0xB0, 0x2D, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0xC5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x85, 0x55, 0x0B, 0x6C, 0x53, 0xE7, 0x15, -0xFE, 0xCE, 0x7D, 0xF8, 0x6D, 0xC7, 0xCE, 0x9B, 0xC4, 0x76, -0x12, 0x88, 0x12, 0xDA, 0x3C, 0x58, 0x43, 0x50, 0x18, 0x6B, -0xB7, 0x69, 0x19, 0xB4, 0x2A, 0x08, 0xA8, 0xA8, 0x52, 0x34, -0x06, 0x22, 0x24, 0x0D, 0x84, 0x01, 0x12, 0x4A, 0xB4, 0x57, -0xA7, 0x02, 0x6B, 0x47, 0x25, 0x36, 0x54, 0x3A, 0x75, 0x12, -0xA0, 0x11, 0x69, 0xB0, 0x89, 0x0C, 0x69, 0x5D, 0xBA, 0x08, -0x18, 0x45, 0x6B, 0x12, 0x22, 0xB2, 0x41, 0xCA, 0xD8, 0xD2, -0x50, 0x48, 0x42, 0xC8, 0x52, 0x12, 0xC7, 0x71, 0x9A, 0x97, -0xED, 0xF8, 0x11, 0xDB, 0xF7, 0xEE, 0xDC, 0x64, 0x93, 0x06, -0xA5, 0xEB, 0x91, 0x8E, 0xFF, 0xEB, 0xFF, 0xDE, 0xFF, 0xFB, -0xCF, 0x39, 0xFF, 0xF9, 0xBE, 0x9F, 0xF0, 0x7F, 0xAC, 0xAB, -0xAB, 0xCB, 0xE2, 0x70, 0x38, 0x36, 0x58, 0xAD, 0xD6, 0x6F, -0xEB, 0xF5, 0xFA, 0x62, 0x51, 0x14, 0x33, 0x89, 0x4D, 0x51, -0x94, 0xA9, 0x70, 0x38, 0xDC, 0x37, 0x3A, 0x3A, 0xDA, 0x19, -0x0C, 0x06, 0x5B, 0x2A, 0x2B, 0x2B, 0x47, 0xBF, 0x08, 0x43, -0x7C, 0xD2, 0x64, 0x73, 0x73, 0xB3, 0xA5, 0xB1, 0xB1, 0xF1, -0xF5, 0xBC, 0xBC, 0xBC, 0xF3, 0x4E, 0xA7, 0x73, 0x9B, 0x4E, -0x6F, 0x2C, 0x8B, 0x26, 0xE0, 0x8C, 0xC4, 0x54, 0x7B, 0x24, -0xAE, 0xDA, 0x12, 0x2A, 0x2D, 0x31, 0x99, 0x4D, 0x45, 0x2E, -0x67, 0xF6, 0x7A, 0x8B, 0xD9, 0x7C, 0x60, 0xDB, 0xB6, 0x6D, -0x45, 0xDB, 0xB7, 0x6F, 0xFF, 0x47, 0x53, 0x53, 0xD3, 0xD4, -0xE3, 0x58, 0xC2, 0xE3, 0x13, 0xE7, 0xCF, 0x9F, 0x2F, 0xCF, -0xCF, 0xCF, 0xEF, 0x29, 0x2E, 0x2E, 0x7E, 0x2D, 0x41, 0x3A, -0x7B, 0xEF, 0x90, 0x0F, 0xB7, 0x07, 0x7D, 0xB8, 0x37, 0xEA, -0xC7, 0x80, 0x37, 0x88, 0xFE, 0xB1, 0x20, 0x7A, 0x1F, 0xFA, -0xF1, 0xD7, 0x7B, 0xE3, 0x68, 0xBB, 0x3D, 0x0C, 0xAF, 0x3F, -0x2E, 0xE5, 0xE4, 0x2D, 0xAD, 0xE2, 0x40, 0xFE, 0xD9, 0xDD, -0xDD, 0x5D, 0xF7, 0x38, 0x1E, 0xFD, 0xEF, 0x9F, 0x33, 0x67, -0xCE, 0x54, 0x96, 0x95, 0x95, 0xBD, 0x9F, 0xED, 0x74, 0x9B, -0x86, 0x3F, 0x9B, 0x43, 0x30, 0x0A, 0x24, 0x54, 0x76, 0x45, -0x45, 0x5C, 0x51, 0x90, 0x48, 0x2C, 0x8E, 0x71, 0x6D, 0x4C, -0xFC, 0x77, 0x4C, 0x40, 0x50, 0xE6, 0xB1, 0x72, 0x69, 0x32, -0x52, 0x2C, 0x32, 0x3C, 0x1E, 0xCF, 0x9B, 0xE5, 0xE5, 0xE5, -0xAF, 0x7F, 0x2E, 0x83, 0xB3, 0x67, 0xCF, 0x16, 0x94, 0x96, -0x96, 0xBE, 0x97, 0x9A, 0x9E, 0x69, 0xEE, 0x7D, 0x38, 0x83, -0x89, 0x60, 0x82, 0x82, 0xD1, 0x38, 0x05, 0xC2, 0x31, 0x44, -0xE6, 0xE3, 0x94, 0x91, 0x64, 0xA4, 0xA2, 0x9C, 0x64, 0xFA, -0x4A, 0x5E, 0x2A, 0x9E, 0x72, 0xDA, 0x29, 0xD9, 0xA2, 0x87, -0x3F, 0x34, 0x4F, 0xD3, 0x73, 0x31, 0xF2, 0x06, 0x55, 0xFC, -0xE9, 0x96, 0x87, 0x06, 0x3C, 0xB3, 0x94, 0x9E, 0x9E, 0xFE, -0x93, 0x9B, 0x37, 0x6F, 0xEE, 0x7A, 0x64, 0x83, 0xA3, 0x47, -0x8F, 0x92, 0xCB, 0xE5, 0x6A, 0x72, 0xB9, 0x73, 0x6C, 0x77, -0x46, 0xFC, 0x98, 0x0A, 0x2B, 0xF0, 0x33, 0xF0, 0x2C, 0x7B, -0x92, 0x49, 0xC6, 0xF3, 0x65, 0x6E, 0x64, 0x58, 0x05, 0x7C, -0x3A, 0xEA, 0x85, 0xC7, 0xEB, 0xC3, 0x12, 0x9B, 0x88, 0x75, -0x3C, 0xF7, 0xCA, 0x73, 0xF9, 0xE8, 0x1B, 0x0F, 0xE0, 0xD2, -0x1D, 0x1F, 0x3E, 0xE8, 0x9B, 0xC1, 0x5B, 0x17, 0xFB, 0x31, -0x30, 0x36, 0x0B, 0x9B, 0xCD, 0xF6, 0x76, 0x5B, 0x5B, 0x9B, -0x4B, 0xC3, 0x96, 0xB4, 0x1F, 0x3E, 0xCC, 0x0D, 0x05, 0x05, -0x05, 0x6B, 0x1E, 0x78, 0x67, 0x55, 0xDF, 0x9C, 0x82, 0x98, -0x92, 0xD0, 0xD2, 0x57, 0x45, 0x52, 0xF1, 0xB5, 0xA7, 0xF3, -0x20, 0x4B, 0xA2, 0xFA, 0xE1, 0x27, 0x13, 0x38, 0xD5, 0x35, -0x8E, 0x81, 0x89, 0x10, 0x4A, 0x1D, 0xBD, 0xEA, 0xE5, 0xD7, -0x36, 0x20, 0xC5, 0x66, 0x50, 0xB7, 0x54, 0x38, 0xF1, 0xE2, -0xBB, 0x1F, 0x31, 0x8A, 0xAA, 0x82, 0xD7, 0x8D, 0x9E, 0xBB, -0x81, 0xF7, 0x1B, 0x2A, 0xAD, 0x3A, 0x9D, 0xEE, 0xC7, 0x3C, -0x59, 0xBF, 0xD0, 0x45, 0x7B, 0xF7, 0xEE, 0x3D, 0xB6, 0x64, -0x49, 0x56, 0x61, 0x67, 0xFF, 0x04, 0x05, 0x62, 0xA0, 0x50, -0x2C, 0x81, 0xB9, 0x79, 0x85, 0x48, 0x4D, 0xD0, 0x33, 0xB9, -0x29, 0x90, 0x65, 0x99, 0x62, 0xB1, 0x28, 0xBD, 0xD9, 0x36, -0x46, 0x51, 0xC9, 0x80, 0xE9, 0xB8, 0x4C, 0xAF, 0x96, 0x3B, -0xC0, 0x6D, 0x4B, 0x26, 0x21, 0x4E, 0xEF, 0x5E, 0xF7, 0x80, -0x74, 0x06, 0x22, 0x51, 0xA0, 0xC9, 0xA8, 0x8A, 0x8A, 0x2C, -0x03, 0xE5, 0xA4, 0x27, 0x15, 0xE4, 0xE4, 0xE4, 0xBC, 0x23, -0x70, 0x8B, 0x49, 0xFC, 0xF0, 0x4D, 0xEF, 0x74, 0x10, 0xBE, -0x90, 0x82, 0x69, 0x2E, 0xCB, 0x54, 0x38, 0x8E, 0xDB, 0xDE, -0x00, 0xDE, 0xB8, 0x36, 0x82, 0xC3, 0xCD, 0x1D, 0x78, 0xAF, -0xFD, 0x23, 0xBC, 0x75, 0xA9, 0x07, 0x92, 0xDD, 0x0E, 0x29, -0x29, 0x09, 0x76, 0x87, 0x79, 0xA1, 0xBE, 0xA1, 0x50, 0x08, -0x43, 0x9E, 0x09, 0x88, 0x36, 0x1B, 0x44, 0x8B, 0x19, 0x82, -0xD9, 0x04, 0x58, 0x6D, 0xE8, 0x18, 0xF8, 0x0C, 0xA9, 0xA9, -0xA9, 0xB6, 0x8C, 0x8C, 0x8C, 0x35, 0xE2, 0xEA, 0xD5, 0xAB, -0xDD, 0x9B, 0x36, 0x6D, 0xFA, 0x7E, 0xBF, 0x67, 0x1A, 0xBD, -0xBE, 0x30, 0x82, 0x31, 0x05, 0xED, 0xC3, 0x33, 0xE8, 0xF4, -0x04, 0x31, 0x2F, 0xEB, 0xD1, 0x1D, 0xD0, 0xA3, 0xE5, 0x21, -0xF0, 0x40, 0x4C, 0x65, 0x10, 0x0B, 0x44, 0x93, 0x11, 0xDF, -0x2B, 0xD1, 0xA1, 0x2C, 0xD3, 0x88, 0x48, 0x24, 0x82, 0x37, -0xDA, 0x87, 0x31, 0x24, 0x67, 0x70, 0x06, 0x12, 0x04, 0x51, -0x00, 0x89, 0x04, 0xAB, 0x12, 0xC6, 0x77, 0x9F, 0x5D, 0x8E, -0x91, 0x91, 0x91, 0xFB, 0x82, 0xC1, 0x60, 0xC8, 0x90, 0x24, -0x89, 0x02, 0xD1, 0x38, 0x26, 0xC3, 0x31, 0xFA, 0xF3, 0xD0, -0x24, 0xDD, 0x99, 0x8D, 0x42, 0x34, 0xEA, 0x49, 0xB4, 0x98, -0x48, 0xB4, 0xDB, 0x20, 0xA5, 0xA5, 0x92, 0x94, 0x62, 0x27, -0x29, 0xD9, 0x46, 0xCF, 0xE7, 0x8A, 0xD8, 0xB5, 0xC2, 0x41, -0x1A, 0xF8, 0xCF, 0x3B, 0x07, 0xE9, 0x2F, 0xBA, 0x7C, 0xED, -0x1D, 0x64, 0x87, 0x8D, 0x24, 0xBB, 0x85, 0x24, 0xAB, 0x19, -0x61, 0x10, 0x69, 0x98, 0xF1, 0x78, 0xDC, 0x21, 0xF2, 0xE1, -0x66, 0x72, 0x06, 0xAF, 0x0E, 0xFB, 0x66, 0xF0, 0x9B, 0x8F, -0xC7, 0xF1, 0x69, 0x88, 0xFB, 0x5A, 0xAF, 0x83, 0xC0, 0x91, -0x8A, 0x9C, 0xB2, 0x64, 0xE5, 0xA8, 0x79, 0x91, 0x56, 0x02, -0xB7, 0x29, 0x81, 0x5F, 0x97, 0x49, 0x08, 0x06, 0xE7, 0xF0, -0xA3, 0xBF, 0x79, 0x71, 0xD1, 0xB8, 0x1C, 0x02, 0xBF, 0x27, -0xBD, 0x04, 0x92, 0x45, 0x8E, 0x9E, 0x89, 0xC5, 0x8D, 0x51, -0x6C, 0x88, 0x60, 0x4B, 0x59, 0x2E, 0x7A, 0x7B, 0x7B, 0x3B, -0x44, 0xD6, 0x99, 0xA4, 0xAD, 0x5B, 0xB7, 0xEE, 0x8B, 0x31, -0x71, 0xDE, 0xB9, 0x3E, 0x48, 0xA4, 0x37, 0x90, 0x60, 0xE0, -0x0D, 0x8C, 0x46, 0x12, 0xCD, 0x66, 0x5A, 0x00, 0x37, 0x73, -0x26, 0x26, 0x3D, 0x35, 0x66, 0x04, 0xC8, 0x29, 0xC7, 0x50, -0xFB, 0xF7, 0x00, 0xF5, 0xA4, 0x15, 0x73, 0x96, 0x46, 0x12, -0x74, 0x22, 0x09, 0x0C, 0x2E, 0x88, 0x44, 0xDC, 0xF4, 0x2C, -0x54, 0x71, 0xBC, 0x94, 0xAE, 0xD0, 0xB3, 0x05, 0xD9, 0xC4, -0x7C, 0xB8, 0xC4, 0x18, 0x66, 0x61, 0xDD, 0xBA, 0x75, 0x0D, -0x85, 0x79, 0x2E, 0xFA, 0x63, 0x77, 0x3F, 0x4D, 0x8B, 0x86, -0x85, 0x0C, 0x44, 0xA3, 0x81, 0xB4, 0x7A, 0xFF, 0xC7, 0x49, -0x92, 0x05, 0x34, 0xDA, 0xA7, 0xD1, 0x3C, 0x1C, 0x44, 0x47, -0x72, 0x11, 0x03, 0x73, 0xD4, 0x92, 0xC0, 0xB5, 0x10, 0x34, -0x70, 0x4D, 0x13, 0x38, 0x78, 0x05, 0xE2, 0xCC, 0x38, 0x7E, -0xBA, 0x3A, 0x8B, 0x89, 0x68, 0x44, 0x4B, 0x4B, 0x4B, 0xB3, -0xC8, 0xFD, 0x1A, 0x71, 0xBB, 0xDD, 0x35, 0x2B, 0x57, 0xAE, -0xB4, 0xD9, 0x65, 0xD0, 0xA5, 0xC1, 0x49, 0x90, 0xC1, 0xC8, -0x9B, 0xE8, 0x49, 0xD0, 0x1B, 0x20, 0x1A, 0xF4, 0x8B, 0xCF, -0x92, 0x88, 0x87, 0x0F, 0xEE, 0xE3, 0x16, 0x25, 0x63, 0xCE, -0x9A, 0x4A, 0x24, 0x30, 0x22, 0xE3, 0x93, 0xB0, 0xA8, 0x38, -0xA4, 0x24, 0x08, 0xF3, 0x51, 0xBC, 0x00, 0x2F, 0xAA, 0xBF, -0xFA, 0x14, 0x79, 0xBD, 0x5E, 0xF5, 0xC2, 0x85, 0x0B, 0xC7, -0x16, 0xB4, 0x68, 0xF3, 0xE6, 0xCD, 0x27, 0x4F, 0x9C, 0x38, -0x51, 0x97, 0x91, 0x99, 0x89, 0xDA, 0xA6, 0x0F, 0x71, 0x71, -0x8A, 0x3B, 0x82, 0xDB, 0x4D, 0xB2, 0x58, 0xB9, 0xFE, 0xDC, -0x82, 0x66, 0x33, 0x96, 0x1B, 0x62, 0xD8, 0xE7, 0x54, 0x70, -0x2D, 0x20, 0xE1, 0x0F, 0x73, 0x76, 0xAD, 0xD8, 0x8B, 0x5A, -0xC0, 0xFC, 0x52, 0x59, 0x8F, 0x54, 0x3E, 0xF4, 0xF4, 0x91, -0x8F, 0xF1, 0xFB, 0x17, 0x96, 0x22, 0x2B, 0xD5, 0x81, 0x2B, -0x57, 0xAE, 0x4C, 0x1C, 0x3E, 0x7C, 0x38, 0x77, 0xE1, 0xAB, -0xC2, 0xC2, 0xC2, 0x67, 0x0E, 0x1C, 0x38, 0x70, 0x63, 0xE7, -0xCE, 0x9D, 0x72, 0x34, 0xAE, 0xA0, 0xA6, 0xA9, 0x5D, 0xBD, -0xE6, 0xE7, 0xFA, 0x5A, 0x92, 0x20, 0x99, 0x2C, 0xAA, 0x68, -0x32, 0xD3, 0xD7, 0x75, 0x13, 0xF8, 0x61, 0xB1, 0x0E, 0x37, -0x3C, 0x21, 0xF5, 0x67, 0xFE, 0x02, 0x82, 0x24, 0x33, 0xB2, -0x4A, 0x2A, 0x97, 0x05, 0xB1, 0x79, 0x35, 0x65, 0xFC, 0x13, -0x3A, 0x56, 0x61, 0xC5, 0x8A, 0x65, 0x2E, 0x75, 0x6A, 0x6A, -0x8A, 0x4E, 0x9F, 0x3E, 0x7D, 0xEC, 0xF8, 0xF1, 0xE3, 0x3F, -0x58, 0x90, 0x8A, 0xBE, 0xBE, 0xBE, 0xDB, 0x57, 0xAF, 0x5E, -0xFD, 0x2D, 0x13, 0xA3, 0x7A, 0xFD, 0xFA, 0xF5, 0x38, 0x57, -0xF7, 0x2D, 0xBC, 0xDD, 0x7A, 0x0B, 0x27, 0x6F, 0x8D, 0x22, -0x6E, 0xC9, 0x04, 0x0C, 0x71, 0x5C, 0x13, 0xCD, 0xE8, 0xFE, -0x97, 0x1F, 0x51, 0xD9, 0x0A, 0x32, 0x85, 0x16, 0x85, 0x98, -0xA5, 0x41, 0x08, 0x4D, 0xA3, 0x34, 0x71, 0x1F, 0x7B, 0x2B, -0xD2, 0xE0, 0x62, 0x02, 0x32, 0x38, 0xEE, 0xDE, 0xBD, 0x3B, -0xD2, 0xD1, 0xD1, 0xF1, 0x8B, 0x47, 0xE4, 0x3A, 0x2B, 0x2B, -0x2B, 0xB9, 0xAA, 0xAA, 0xAA, 0x9D, 0x89, 0x57, 0xBC, 0x76, -0xED, 0x5A, 0xF0, 0xE1, 0x63, 0xD8, 0x3B, 0x89, 0x73, 0xED, -0x7D, 0xB8, 0x7A, 0xCF, 0x0F, 0x4F, 0x44, 0x0F, 0xE8, 0x18, -0x5C, 0xE0, 0x8E, 0x51, 0x62, 0xB0, 0x28, 0x01, 0xAC, 0x48, -0x8E, 0x62, 0x4D, 0xB6, 0x8A, 0x82, 0x2C, 0x1B, 0xB8, 0x1B, -0xC1, 0xB7, 0x9E, 0x46, 0xBE, 0xF0, 0xA1, 0x43, 0x87, 0x5E, -0xFA, 0x80, 0xED, 0x91, 0x1B, 0x2D, 0x10, 0x08, 0x84, 0xC7, -0xC6, 0xC6, 0x2E, 0x33, 0xF1, 0xBE, 0xD1, 0xD3, 0xD3, 0x93, -0xC9, 0x1B, 0x50, 0xC1, 0xD2, 0x5C, 0x7A, 0xAE, 0xC8, 0x89, -0xEF, 0xAC, 0x71, 0xD3, 0x96, 0x62, 0x0B, 0x55, 0xBA, 0x12, -0xF4, 0x62, 0xAE, 0x82, 0x97, 0x9F, 0x96, 0x68, 0x6B, 0x99, -0x1D, 0x15, 0x79, 0x56, 0xCA, 0x4E, 0x4B, 0xD2, 0x6E, 0x51, -0x0D, 0x58, 0x23, 0x96, 0xFF, 0xC8, 0x91, 0x23, 0xBB, 0xB8, -0x1A, 0xAD, 0x4F, 0xBC, 0x70, 0x34, 0x5B, 0xB6, 0x6C, 0x59, -0x72, 0x49, 0x49, 0xC9, 0x2F, 0x57, 0xAD, 0x5A, 0x55, 0x95, -0x96, 0x96, 0x26, 0x33, 0x11, 0xD5, 0xEC, 0xEC, 0x6C, 0xD2, -0x22, 0x64, 0x76, 0x82, 0x41, 0x54, 0x0D, 0x8C, 0xEF, 0x62, -0x75, 0x68, 0x68, 0x88, 0xB4, 0x92, 0x58, 0x2C, 0x16, 0x95, -0x83, 0xEB, 0x6B, 0x6D, 0x6D, 0xAD, 0xE5, 0xC3, 0xBD, 0xFE, -0x85, 0x37, 0x9A, 0x66, 0x1B, 0x37, 0x6E, 0x24, 0x2E, 0xD7, -0x72, 0xBF, 0xDF, 0xBF, 0x8F, 0xCF, 0xE4, 0x65, 0x6E, 0xE1, -0x34, 0x96, 0x73, 0x98, 0x4C, 0x26, 0x4D, 0x55, 0x17, 0x36, -0xD1, 0x3C, 0x16, 0x8B, 0xA1, 0xB3, 0xB3, 0x53, 0xCB, 0x3C, -0xE2, 0xF3, 0xF9, 0x6E, 0xB0, 0xB2, 0xFE, 0x4A, 0x10, 0x84, -0xCB, 0xA7, 0x4E, 0x9D, 0x9A, 0x7B, 0x1C, 0xF3, 0x73, 0xB6, -0x7B, 0xF7, 0x6E, 0xB1, 0xBE, 0xBE, 0xDE, 0xBD, 0x67, 0xCF, -0x9E, 0x57, 0x6A, 0x6B, 0x6B, 0x4F, 0xB2, 0xE2, 0x76, 0xD5, -0xD5, 0xD5, 0xDD, 0x3F, 0x78, 0xF0, 0xE0, 0x48, 0x43, 0x43, -0xC3, 0xC8, 0xFE, 0xFD, 0xFB, 0x07, 0x77, 0xEC, 0xD8, 0xD1, -0x5D, 0x5D, 0x5D, 0xFD, 0x3B, 0xFE, 0xA6, 0x9E, 0xBD, 0x84, -0xBF, 0x37, 0x7E, 0x29, 0xF0, 0x93, 0x8C, 0x41, 0x24, 0x5E, -0x6C, 0x61, 0x4F, 0x63, 0x77, 0x32, 0x98, 0x93, 0xC7, 0x74, -0x1E, 0xAD, 0x35, 0x35, 0x35, 0xF2, 0x97, 0xAD, 0xFF, 0x37, -0x84, 0x15, 0xB6, 0xDE, 0xA9, 0xD0, 0x66, 0x37, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Log1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0xE9, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x54, 0x5D, 0x6C, 0x93, 0x55, 0x18, -0x7E, 0xCE, 0xF9, 0xDA, 0x0E, 0x3B, 0xD6, 0xE2, 0x58, 0xB7, -0x76, 0x23, 0xD4, 0x64, 0xC6, 0x4D, 0x26, 0x65, 0x75, 0x84, -0xC4, 0x6B, 0x13, 0x13, 0x3B, 0xF1, 0xC2, 0x3F, 0x6C, 0x4C, -0xB8, 0x50, 0x82, 0xEE, 0xA7, 0xDB, 0x57, 0xC4, 0x71, 0xA3, -0xC3, 0x18, 0x35, 0xEE, 0xC2, 0xE8, 0x22, 0xF1, 0x82, 0x84, -0x09, 0x4A, 0x82, 0x89, 0x9A, 0x25, 0x18, 0xC0, 0x78, 0x01, -0x89, 0x3F, 0x41, 0x2E, 0x70, 0xDD, 0x20, 0x04, 0x31, 0x73, -0xE9, 0x12, 0x60, 0xA2, 0x41, 0x18, 0x0E, 0xDA, 0x2E, 0xED, -0xE7, 0x7B, 0xCE, 0x77, 0xBE, 0xBF, 0xD1, 0x7A, 0xA5, 0xA7, -0x79, 0x7B, 0xDE, 0x73, 0xBE, 0x73, 0xDE, 0xE7, 0x9C, 0xE7, -0x39, 0xEF, 0x0B, 0xFC, 0xCF, 0x4D, 0xB3, 0x9C, 0xB1, 0xB1, -0xB1, 0x47, 0x27, 0x0E, 0x1E, 0x3A, 0x95, 0xCD, 0xEE, 0xD2, -0xF5, 0x6C, 0x56, 0xD7, 0x77, 0xBE, 0xAC, 0x0F, 0x8F, 0x8C, -0xE8, 0xC3, 0x7A, 0x56, 0x1F, 0x1A, 0xD6, 0xA5, 0x65, 0x84, -0x91, 0x33, 0x28, 0x8C, 0x06, 0x03, 0x99, 0x21, 0x7D, 0x60, -0x70, 0x48, 0xEF, 0xCF, 0x64, 0xF4, 0x7E, 0xEA, 0xFB, 0x06, -0x32, 0x64, 0x83, 0x7A, 0x2C, 0x16, 0x3B, 0x77, 0xEA, 0xE4, -0xC9, 0x39, 0x11, 0x97, 0x5B, 0x00, 0xA1, 0x70, 0x38, 0x18, -0x8B, 0x46, 0xE3, 0xD1, 0x68, 0x2C, 0x1E, 0x8D, 0x91, 0x59, -0xBE, 0xEC, 0xA3, 0xF1, 0x16, 0x61, 0x2D, 0x2D, 0xD2, 0x9A, -0xDD, 0xD6, 0xDC, 0x1C, 0x8F, 0x44, 0x5A, 0xC8, 0x9A, 0xA5, -0x35, 0x91, 0x85, 0x42, 0xA1, 0xA0, 0x15, 0xD7, 0x67, 0x39, -0x8C, 0xAC, 0xB4, 0xBC, 0x8C, 0x0B, 0x17, 0x2F, 0x61, 0xD3, -0x43, 0x5D, 0x28, 0x57, 0x0C, 0x54, 0x2A, 0x15, 0xC0, 0xA0, -0xDE, 0xA0, 0x4E, 0xFC, 0xC8, 0x37, 0x2A, 0xD2, 0xA3, 0x6F, -0x62, 0x2C, 0xE6, 0x61, 0xCE, 0x8B, 0x75, 0x6A, 0x8D, 0xBB, -0xF9, 0xDC, 0x83, 0xBA, 0x40, 0x00, 0x1B, 0x3A, 0x1F, 0x00, -0x23, 0xB4, 0x8A, 0x02, 0x70, 0x02, 0x38, 0x81, 0xDC, 0xF6, -0xD7, 0xF5, 0xEB, 0x08, 0xAD, 0xB9, 0xD7, 0x99, 0x5B, 0xA1, -0x01, 0x5F, 0x31, 0x96, 0x20, 0x02, 0x81, 0x73, 0x06, 0x8D, -0x73, 0x68, 0x8C, 0x9B, 0xBD, 0x35, 0x56, 0xC6, 0xC9, 0xA6, -0x73, 0x53, 0x18, 0xD9, 0x9D, 0xC5, 0xD1, 0xC9, 0xAF, 0xA0, -0x69, 0x6A, 0x9E, 0xF6, 0xB2, 0x6A, 0x00, 0x02, 0xB9, 0x50, -0x2A, 0xE2, 0xCC, 0xD9, 0x29, 0xB9, 0x80, 0xA9, 0x3F, 0xD1, -0x8B, 0x2D, 0xCC, 0xF2, 0x99, 0xF2, 0xE9, 0xF3, 0xF8, 0x07, -0xEF, 0x13, 0x65, 0x15, 0x14, 0x4B, 0x25, 0x73, 0x0D, 0x1D, -0x82, 0x9B, 0x8B, 0xAA, 0xDF, 0xA0, 0xCE, 0x1F, 0xC0, 0x96, -0x9E, 0x6E, 0x5B, 0x95, 0x7F, 0x03, 0xF9, 0xE3, 0xFB, 0xEF, -0xF0, 0x5A, 0x2A, 0x85, 0xA6, 0xB5, 0x4D, 0x78, 0x6E, 0xDB, -0xF3, 0xCE, 0x1A, 0x5E, 0xE3, 0x06, 0x90, 0x1C, 0x9B, 0xDC, -0x1B, 0x4A, 0x74, 0x56, 0x03, 0xA4, 0x5C, 0xB8, 0x83, 0xA5, -0x43, 0x07, 0x11, 0x9D, 0x9C, 0xC4, 0xAE, 0x17, 0x5F, 0x82, -0xDF, 0xEF, 0x37, 0x03, 0xAB, 0x35, 0x55, 0x35, 0x90, 0x14, -0x15, 0x8B, 0x38, 0x3B, 0x35, 0x23, 0x91, 0x2C, 0xB9, 0xAA, -0x81, 0xE4, 0x27, 0x0E, 0xA0, 0x95, 0xBE, 0xCF, 0xB7, 0xB6, -0xA1, 0x6D, 0x53, 0xB7, 0xE2, 0x9D, 0xD9, 0x20, 0x35, 0x28, -0x32, 0x10, 0x08, 0xF8, 0xD1, 0x93, 0x4C, 0xA8, 0x17, 0x83, -0xAA, 0x20, 0x4B, 0xF3, 0x79, 0xF0, 0x6F, 0x4E, 0x20, 0x9F, -0xCF, 0xA3, 0xFD, 0xD5, 0xDD, 0x52, 0x6C, 0x71, 0x2B, 0x0F, -0x48, 0x2D, 0x8A, 0x04, 0x3D, 0x37, 0x17, 0x17, 0xED, 0xC0, -0xD5, 0x40, 0xE6, 0xC6, 0x3F, 0x44, 0x98, 0x44, 0x2D, 0x3C, -0xB1, 0x15, 0x91, 0xF6, 0x76, 0x8F, 0xF0, 0x16, 0x88, 0xBB, -0xF9, 0x5C, 0xF1, 0x65, 0xA2, 0x5D, 0x5D, 0xB8, 0x86, 0x50, -0x43, 0x83, 0x99, 0x30, 0x92, 0x2A, 0x11, 0xC1, 0x90, 0x1B, -0xAF, 0x9D, 0x3E, 0x8D, 0xE0, 0x99, 0x9F, 0x30, 0xEB, 0xF3, -0x21, 0xD1, 0xD7, 0x6F, 0x06, 0x63, 0xD6, 0x6E, 0x66, 0x9F, -0x98, 0xB9, 0x28, 0xB2, 0x6B, 0x51, 0x6F, 0x6F, 0x6F, 0x47, -0x4F, 0xCF, 0xE6, 0xF4, 0xDA, 0xC6, 0x46, 0xB9, 0xB8, 0x42, -0x4F, 0x16, 0xF4, 0xAA, 0x98, 0x3A, 0xBF, 0x78, 0x8E, 0x17, -0x86, 0x32, 0xA8, 0xBB, 0x7C, 0x19, 0xFE, 0x3D, 0x7B, 0xD0, -0x9A, 0x7C, 0xD8, 0xFE, 0xE6, 0x1C, 0xDA, 0x74, 0x66, 0xA6, -0x73, 0x47, 0x8E, 0x1F, 0x3F, 0x76, 0xC9, 0x0B, 0x90, 0xEA, -0xED, 0xE8, 0xDA, 0x98, 0x48, 0x5F, 0x59, 0xF8, 0x5D, 0xDE, -0xA0, 0x42, 0x82, 0x43, 0x24, 0x9D, 0xBA, 0xF4, 0xEC, 0xE7, -0x47, 0xC0, 0xBF, 0xFC, 0x02, 0x57, 0x89, 0x96, 0xCD, 0x6F, -0xBD, 0x0D, 0xAE, 0x71, 0x8B, 0x38, 0x77, 0x6C, 0xE9, 0xB8, -0x01, 0x3C, 0xAF, 0x48, 0xB0, 0xA2, 0x69, 0x9A, 0xB7, 0x34, -0xD0, 0xAF, 0x70, 0xE3, 0x06, 0x16, 0xC6, 0xDE, 0xC3, 0xE2, -0xED, 0xDB, 0xB8, 0x7F, 0xEF, 0x9B, 0xF0, 0x11, 0x45, 0x8E, -0xF0, 0x4A, 0x03, 0x4F, 0x9E, 0x38, 0x1A, 0xD8, 0x37, 0x48, -0x11, 0x45, 0xDD, 0xC9, 0x64, 0x7A, 0x75, 0x7D, 0xBD, 0x09, -0x58, 0x34, 0x29, 0x12, 0xED, 0xFC, 0xBB, 0xEF, 0xA0, 0xFE, -0xC7, 0x1F, 0xB0, 0xF4, 0xF4, 0x33, 0xD8, 0xB8, 0x63, 0x87, -0x62, 0x85, 0xB9, 0x34, 0x80, 0xE7, 0x26, 0xD3, 0x39, 0xBA, -0xC1, 0xB1, 0x15, 0x14, 0x3D, 0x9E, 0x4A, 0x75, 0x74, 0x6E, -0xE8, 0x4A, 0xFF, 0x3A, 0x3B, 0x47, 0xD9, 0xD9, 0x68, 0x03, -0x94, 0xEE, 0xFC, 0x0D, 0xFF, 0x9F, 0x39, 0xCC, 0xFF, 0xF2, -0x1B, 0x12, 0xFB, 0xF6, 0xE3, 0x9E, 0xD5, 0x0D, 0x36, 0xEF, -0xB5, 0x40, 0xA6, 0x73, 0x3F, 0xDB, 0x00, 0x9E, 0x6A, 0xEA, -0xD3, 0x7C, 0x58, 0xBF, 0xAE, 0x4D, 0x52, 0x53, 0x2E, 0x53, -0x25, 0x2D, 0x97, 0x51, 0xB8, 0x79, 0x05, 0xC6, 0x7D, 0x61, -0xC4, 0xF7, 0x7F, 0x8C, 0xFA, 0x48, 0x04, 0xCB, 0x34, 0xE7, -0xA1, 0x47, 0x05, 0x95, 0xCF, 0x59, 0xE5, 0x8F, 0xBB, 0x79, -0x35, 0x20, 0xAB, 0x5B, 0xB5, 0x8A, 0xEA, 0xBF, 0x61, 0x9F, -0x6A, 0x9E, 0x12, 0x6B, 0x29, 0x9C, 0xC4, 0xBA, 0x07, 0x1F, -0x71, 0x0A, 0x9D, 0x6D, 0x2A, 0xC9, 0x54, 0xA5, 0x15, 0x49, -0x67, 0x89, 0x7F, 0x17, 0x80, 0x80, 0x2E, 0x12, 0x2D, 0xB9, -0x99, 0x73, 0xE6, 0x29, 0x0C, 0x53, 0xBC, 0xA6, 0xF5, 0x09, -0xC4, 0x3B, 0xB7, 0x38, 0x42, 0x02, 0x76, 0xC9, 0xE0, 0x60, -0xAE, 0x24, 0x73, 0xCA, 0xBA, 0x5B, 0x64, 0xDB, 0x1D, 0xFF, -0x68, 0xDF, 0xD6, 0xF4, 0x0B, 0xDB, 0x8F, 0x72, 0x6E, 0x6E, -0x30, 0x6E, 0xDD, 0x82, 0x41, 0x82, 0x8B, 0x53, 0xC9, 0x93, -0x78, 0x4E, 0xEE, 0x7D, 0x39, 0x60, 0x0E, 0xA8, 0x68, 0x9F, -0x4C, 0x1C, 0x78, 0xB2, 0xBF, 0xEF, 0x95, 0xAF, 0x3D, 0x00, -0xAF, 0xBF, 0x31, 0xFA, 0xD8, 0x53, 0xCF, 0x6E, 0xFB, 0x94, -0x33, 0x73, 0x9A, 0x53, 0xC5, 0x44, 0x30, 0x68, 0x97, 0x00, -0x39, 0x7B, 0x17, 0x80, 0x95, 0xB5, 0x5E, 0x4D, 0x0E, 0x1F, -0xFE, 0x6C, 0xFB, 0xDE, 0xD1, 0xD1, 0x6F, 0xB1, 0xA2, 0x31, -0x25, 0xFA, 0x7F, 0x61, 0xF6, 0xC1, 0xFF, 0x01, 0x59, 0x9D, -0x93, 0x96, 0xAE, 0x48, 0x48, 0x15, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Open1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x03, 0x81, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x9D, 0x55, 0x5B, 0x6B, 0x13, 0x41, 0x14, -0x3E, 0xB3, 0xB3, 0xDD, 0xCD, 0x65, 0x37, 0x4D, 0xC4, 0x60, -0x55, 0x8A, 0x36, 0x50, 0xEF, 0x5A, 0xB5, 0x5E, 0xA3, 0x48, -0x45, 0x11, 0x41, 0xA4, 0x2A, 0xE8, 0x93, 0xE0, 0x83, 0xE8, -0x43, 0x2B, 0x3E, 0x48, 0x8B, 0xFA, 0xE0, 0x1F, 0x10, 0x04, -0x41, 0xC1, 0x27, 0x45, 0x14, 0x11, 0x7D, 0x16, 0x7C, 0x13, -0xA1, 0xFA, 0x28, 0x3E, 0xA8, 0x78, 0x41, 0xA8, 0x25, 0x6A, -0xB5, 0xDA, 0xDA, 0x34, 0x4D, 0xD3, 0x24, 0xBB, 0x73, 0x3C, -0xB3, 0x49, 0xB6, 0x49, 0x76, 0x13, 0x2F, 0x27, 0x0C, 0x93, -0xDD, 0xCC, 0x7C, 0xE7, 0x3B, 0xDF, 0x77, 0x66, 0xC2, 0xC0, -0x27, 0x5E, 0x3C, 0x3A, 0xDF, 0x19, 0x0C, 0x68, 0x2A, 0x63, -0x0C, 0xE4, 0x00, 0x45, 0xCE, 0x4A, 0xCD, 0xF7, 0xBC, 0xAD, -0xC3, 0x68, 0xA6, 0x2D, 0x32, 0x93, 0xF9, 0x61, 0x8F, 0xA6, -0x5E, 0xCD, 0x08, 0x6B, 0x96, 0xA9, 0xCC, 0x4A, 0x9F, 0xBE, -0xF0, 0xE0, 0x73, 0x35, 0x16, 0xAF, 0x07, 0x3F, 0xB2, 0x7F, -0x3D, 0x3B, 0xB8, 0x77, 0xDD, 0xBB, 0x68, 0xD4, 0x1C, 0x0C, -0x85, 0x43, 0xFD, 0x61, 0x23, 0xD4, 0x17, 0x36, 0x8D, 0x33, -0x46, 0x24, 0xDC, 0x1F, 0x8E, 0x18, 0xFD, 0x41, 0x23, 0xDA, -0xC7, 0xC2, 0x4B, 0xCF, 0xA8, 0x46, 0xA2, 0x8F, 0xD6, 0x9C, -0x6A, 0x8B, 0xEB, 0xA7, 0xD7, 0x2E, 0x9B, 0xD7, 0xB7, 0x3A, -0x11, 0xEB, 0xFF, 0x96, 0xFA, 0xD0, 0xF5, 0x76, 0x38, 0x7D, -0x77, 0x6C, 0x3C, 0xEB, 0xE2, 0x29, 0xF5, 0x09, 0x34, 0x3D, -0xCC, 0x50, 0x20, 0x9B, 0x35, 0xF7, 0x40, 0x36, 0xD2, 0x0B, -0x59, 0xB3, 0x17, 0x32, 0xA1, 0x03, 0x90, 0xCA, 0x27, 0xC1, -0x0A, 0xAD, 0x04, 0x6E, 0xB4, 0x43, 0x2C, 0xC2, 0x20, 0x6E, -0x4C, 0x40, 0x3C, 0x34, 0x06, 0x51, 0x7D, 0x1A, 0x54, 0x40, -0x10, 0x85, 0x3C, 0x08, 0x5B, 0x70, 0xCB, 0xB2, 0x6B, 0xF0, -0x3C, 0x09, 0xBA, 0x93, 0xFB, 0x97, 0xF0, 0xF9, 0x3B, 0x82, -0xC8, 0x4D, 0x54, 0x14, 0x8E, 0x48, 0xEF, 0x84, 0x40, 0x1C, -0xF9, 0x34, 0x8C, 0xB1, 0x88, 0x8D, 0xE1, 0x90, 0x06, 0x5C, -0x0D, 0x20, 0x28, 0x2D, 0x24, 0x15, 0x47, 0xA0, 0x81, 0x76, -0x01, 0x80, 0x58, 0xC9, 0xFD, 0x58, 0x87, 0xE7, 0x49, 0xD0, -0xA2, 0x9B, 0x8B, 0xD4, 0xC8, 0xF2, 0xA0, 0xC2, 0x35, 0x12, -0x5C, 0xCA, 0x2E, 0x27, 0x60, 0x42, 0x88, 0xB2, 0x01, 0xB4, -0x85, 0x71, 0x7A, 0xCB, 0x9D, 0x19, 0xD0, 0x66, 0xC2, 0xCE, -0x3B, 0x6B, 0x6C, 0x62, 0x22, 0x04, 0x36, 0x4F, 0xD0, 0xD1, -0xD1, 0x71, 0xAE, 0x62, 0xAE, 0xA2, 0x28, 0xEE, 0x60, 0x0A, -0x2B, 0x2F, 0xE7, 0xA5, 0x99, 0x95, 0x66, 0x51, 0x9C, 0x9E, -0xDB, 0x5C, 0x4F, 0x9F, 0x42, 0xAD, 0x7F, 0x31, 0x34, 0x34, -0x74, 0xBF, 0xBB, 0xBB, 0xFB, 0x70, 0xF5, 0x72, 0x4A, 0x86, -0xB2, 0x73, 0x5C, 0xE0, 0x92, 0x34, 0x44, 0x7E, 0x06, 0x11, -0x2D, 0x17, 0xDE, 0x07, 0xDF, 0x5B, 0xC1, 0xF3, 0x67, 0x4F, -0x1F, 0xE7, 0x67, 0xB3, 0x39, 0x62, 0xCD, 0xCA, 0x03, 0x9C, -0xD9, 0x29, 0x4B, 0x96, 0x51, 0x96, 0x46, 0x1A, 0x5B, 0x9C, -0x72, 0x64, 0xAC, 0xF0, 0xF0, 0x2B, 0xC1, 0x93, 0xC0, 0xD0, -0x0B, 0xB9, 0xDC, 0xC4, 0xFB, 0x5C, 0xB5, 0x3C, 0x8E, 0x44, -0xAC, 0x2C, 0x91, 0x3C, 0x0F, 0x94, 0x04, 0x8B, 0x93, 0xF4, -0x2C, 0x7C, 0x38, 0xD7, 0x26, 0xF1, 0x48, 0xA4, 0xAB, 0xC4, -0x2C, 0xFB, 0x91, 0x40, 0xB7, 0xB9, 0x2B, 0x49, 0x07, 0xEA, -0xA8, 0x39, 0x0F, 0x10, 0x67, 0x51, 0x58, 0x53, 0xF5, 0x68, -0xE8, 0x83, 0xEF, 0xAD, 0x80, 0xA8, 0x42, 0x0B, 0xA6, 0x21, -0x97, 0xFD, 0x55, 0x23, 0x11, 0x73, 0xE4, 0x91, 0x33, 0x25, -0xB0, 0x7E, 0x56, 0xE4, 0xA8, 0x95, 0xC8, 0x7D, 0xD5, 0xA4, -0x02, 0xF9, 0xBB, 0xAA, 0x72, 0xC8, 0xE7, 0xA6, 0xD0, 0x6C, -0x8D, 0xBB, 0x15, 0x48, 0x89, 0x50, 0xF2, 0x21, 0x53, 0xD1, -0x4A, 0x57, 0x78, 0x7A, 0x2B, 0x80, 0x3F, 0xB4, 0x29, 0x93, -0x9F, 0x32, 0x57, 0x19, 0xAE, 0xC9, 0x8A, 0x52, 0xEA, 0x5D, -0xEB, 0x87, 0x04, 0xA9, 0x32, 0xB6, 0xDA, 0xE4, 0xBF, 0x38, -0x68, 0x95, 0x08, 0x04, 0x02, 0x50, 0x2C, 0x16, 0x6B, 0x4D, -0x46, 0x41, 0xAD, 0x39, 0xDE, 0x68, 0x8B, 0x6F, 0x78, 0x12, -0xAC, 0xE8, 0x5C, 0xE8, 0x90, 0xE1, 0xAA, 0x2A, 0xA5, 0xA9, -0xEA, 0x24, 0x4A, 0x60, 0x8D, 0x51, 0x12, 0xDB, 0x07, 0xA6, -0x71, 0x78, 0x3C, 0x38, 0xB4, 0xAF, 0xEB, 0x6A, 0x50, 0x57, -0x4D, 0x5D, 0xD3, 0xB0, 0x08, 0xF2, 0x1E, 0x12, 0x32, 0x41, -0xE9, 0xA0, 0x09, 0x97, 0x7D, 0x13, 0x0F, 0x9A, 0x54, 0xB0, -0x3B, 0xB9, 0x9C, 0x45, 0xDB, 0x56, 0xF7, 0xC6, 0x96, 0xF4, -0xB4, 0x70, 0xCE, 0x99, 0xAE, 0xEB, 0xCC, 0xB2, 0x2C, 0xC7, -0x03, 0xF9, 0x0C, 0x75, 0x7A, 0x83, 0x8F, 0x07, 0x4D, 0x13, -0x48, 0x0A, 0x4C, 0xA1, 0xA2, 0x14, 0xCD, 0xBD, 0x8B, 0xE4, -0x4C, 0xE0, 0x30, 0x3F, 0xBE, 0x00, 0x3E, 0xA5, 0x9A, 0xCB, -0xE3, 0x57, 0x82, 0xB7, 0x4D, 0x2B, 0x74, 0xE8, 0xFE, 0x91, -0xED, 0x14, 0x0C, 0x06, 0xA5, 0xD9, 0xD8, 0xDA, 0x1A, 0x85, -0x89, 0xAF, 0x72, 0xB9, 0x5D, 0x8D, 0x55, 0x2B, 0x91, 0x4F, -0x06, 0x9F, 0x2E, 0x2A, 0x55, 0x9A, 0x1E, 0x4F, 0xB1, 0xF1, -0xEF, 0xC3, 0xF4, 0xE7, 0x63, 0x4B, 0x1F, 0x4A, 0x6D, 0xFA, -0x1F, 0x12, 0xD5, 0x54, 0x50, 0x28, 0x58, 0x50, 0x9C, 0xFE, -0x02, 0xF9, 0x49, 0x22, 0x3F, 0x39, 0x02, 0x74, 0x67, 0xC2, -0x94, 0x7E, 0x00, 0xD2, 0x99, 0x3C, 0x98, 0xB1, 0xC5, 0x8D, -0x8A, 0xAD, 0xE6, 0x86, 0x96, 0xED, 0xEB, 0xF5, 0x5C, 0x6C, -0xDA, 0x90, 0x58, 0xBF, 0x79, 0x63, 0x62, 0x57, 0x65, 0xAC, -0x5D, 0xD5, 0xBE, 0xBB, 0x6B, 0x4D, 0x47, 0xCF, 0xE0, 0xE0, -0xC0, 0xAD, 0xDB, 0x37, 0x06, 0xDE, 0x14, 0x7E, 0xDE, 0x13, -0xB9, 0xD1, 0x3B, 0x22, 0x33, 0x72, 0x53, 0x7C, 0x7F, 0x7D, -0x6D, 0xE6, 0xC9, 0xC3, 0xC1, 0x97, 0x57, 0x2E, 0x1D, 0xBD, -0x73, 0xF2, 0xD8, 0xF6, 0x81, 0xE4, 0x86, 0xF6, 0x2D, 0x7F, -0x66, 0xD1, 0x20, 0x48, 0xA2, 0xD6, 0xE3, 0x47, 0x93, 0x17, -0xAF, 0x5F, 0x3E, 0x71, 0xEB, 0xD4, 0xF1, 0x9E, 0xB3, 0x5B, -0x37, 0x26, 0x76, 0x46, 0xCC, 0x40, 0x2C, 0xA0, 0xAB, 0x1A, -0x8D, 0x86, 0x07, 0xF6, 0x5F, 0x42, 0xDE, 0x1C, 0xAA, 0xAE, -0xFD, 0x1B, 0xD8, 0x6F, 0xB7, 0x0F, 0x3D, 0x51, 0x8F, 0x05, -0x15, 0x71, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x6B, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x63, 0x60, 0x20, 0x03, 0x6C, 0xDB, 0xBE, -0x43, 0x73, 0xE7, 0xAE, 0x5D, 0xE2, 0xC4, 0xA8, 0x65, 0x22, -0xD5, 0xF0, 0xB2, 0xDA, 0xB6, 0x60, 0x45, 0x65, 0xB5, 0x73, -0x7A, 0x7A, 0x7A, 0x7B, 0xF6, 0xED, 0x3F, 0x40, 0xD0, 0x12, -0x16, 0x18, 0x63, 0xFA, 0xF4, 0xE9, 0x2E, 0x5C, 0x5C, 0x5C, -0x32, 0xF1, 0xF1, 0xF1, 0x0B, 0x70, 0x29, 0xCE, 0xCA, 0x2B, -0x56, 0x96, 0x90, 0x96, 0x59, 0x78, 0xE3, 0xCE, 0x43, 0x0E, -0x03, 0x1D, 0x75, 0x6D, 0x36, 0x36, 0xB6, 0xF8, 0xF9, 0x0B, -0x16, 0xCC, 0x4A, 0x4C, 0x48, 0xF8, 0x80, 0x4B, 0x0F, 0x33, -0x8C, 0xE1, 0xE1, 0xE1, 0xC1, 0xE9, 0xEA, 0xEA, 0xBA, 0xCE, -0xC8, 0xC8, 0x88, 0x7B, 0xC3, 0x86, 0x0D, 0xFB, 0xB0, 0x29, -0xB6, 0xB4, 0xB0, 0xE0, 0x77, 0x76, 0xB0, 0x0D, 0x79, 0xFD, -0xFE, 0xB3, 0xC0, 0xBB, 0x0F, 0x9F, 0x18, 0xA4, 0xA4, 0x24, -0xCC, 0x8D, 0x0C, 0xF4, 0xB3, 0xDC, 0x3D, 0xDC, 0x77, 0x2E, -0x5A, 0xB4, 0xE8, 0x25, 0x36, 0x3D, 0x8C, 0xC8, 0x9C, 0x49, -0x93, 0x26, 0x79, 0xF1, 0xF1, 0xF1, 0xF5, 0x7D, 0xF8, 0xF0, -0xA1, 0x00, 0x08, 0x76, 0x60, 0xD3, 0x50, 0x5C, 0x52, 0xAA, -0xA8, 0xAA, 0xAE, 0x99, 0xA7, 0xAE, 0xAE, 0x11, 0xFE, 0xE1, -0xCB, 0x4F, 0x49, 0x23, 0x3D, 0x0D, 0x06, 0x0E, 0x36, 0x96, -0xD7, 0x97, 0x2E, 0x5E, 0x74, 0x71, 0x75, 0x75, 0xB9, 0x84, -0xD7, 0x02, 0x10, 0xA8, 0xAD, 0xAD, 0x95, 0x02, 0x86, 0xEF, -0xD6, 0xD7, 0xAF, 0x5F, 0x57, 0x64, 0x65, 0x65, 0xED, 0xC4, -0xE5, 0xF5, 0x69, 0xB3, 0xE6, 0x35, 0x70, 0xF0, 0x0A, 0xD7, -0x0B, 0xF2, 0xF3, 0x31, 0x00, 0x2D, 0xF9, 0xCF, 0xC1, 0xC6, -0xFC, 0xE6, 0xDC, 0xB9, 0x73, 0x2E, 0x9E, 0x1E, 0x1E, 0x28, -0x96, 0x60, 0x58, 0x00, 0x02, 0xCD, 0xCD, 0xCD, 0x92, 0x1A, -0x1A, 0x1A, 0xDB, 0x80, 0x96, 0x54, 0x02, 0x2D, 0xC1, 0xEA, -0x93, 0xF6, 0xDE, 0xA9, 0x5B, 0x84, 0xC5, 0x24, 0xBD, 0x18, -0x19, 0x19, 0x19, 0x44, 0x84, 0x04, 0x18, 0xC0, 0x3E, 0x61, -0x65, 0x7E, 0x73, 0xF6, 0xDC, 0x59, 0x17, 0x2F, 0x4F, 0x4F, -0xB8, 0x25, 0x58, 0x2D, 0x80, 0x5A, 0x22, 0xA5, 0xAE, 0xAE, -0xBE, 0xF5, 0xCD, 0x9B, 0x37, 0x18, 0x96, 0x24, 0x67, 0x15, -0x19, 0x19, 0x9B, 0x5A, 0x9C, 0x64, 0x01, 0x02, 0xB0, 0x21, -0x8C, 0x8C, 0xFF, 0x81, 0x96, 0x30, 0x42, 0x82, 0x8B, 0xF9, -0xF5, 0xE5, 0xCB, 0x57, 0xCC, 0x5C, 0x9C, 0x9D, 0x1E, 0x80, -0xE4, 0x70, 0x26, 0x53, 0x60, 0x50, 0x3D, 0xBB, 0x79, 0xF3, -0xA6, 0xB7, 0x88, 0x88, 0x48, 0xFB, 0xB4, 0x69, 0xD3, 0xDC, -0x61, 0xE2, 0x6C, 0x96, 0xB9, 0xAC, 0x6C, 0x4A, 0x66, 0x33, -0xA4, 0x24, 0x44, 0x99, 0x41, 0xAE, 0x63, 0x67, 0x63, 0x65, -0x10, 0x17, 0x15, 0x02, 0xB2, 0xFE, 0x33, 0x9C, 0xBB, 0x74, -0x9D, 0xE1, 0xC7, 0xAF, 0xBF, 0x22, 0x52, 0x52, 0x52, 0x65, -0x04, 0x7D, 0x80, 0x1C, 0x5C, 0x40, 0x9F, 0x6C, 0x83, 0xFB, -0xC4, 0xAD, 0x63, 0x3A, 0x83, 0xB8, 0x7C, 0x7A, 0x63, 0xBC, -0x05, 0x03, 0xCB, 0xC5, 0xED, 0x47, 0x1F, 0x3F, 0xBC, 0xD7, -0xF0, 0xE5, 0xE3, 0xDB, 0x6B, 0x66, 0x26, 0xC6, 0x9E, 0xFA, -0x46, 0xE6, 0x13, 0xDF, 0x7E, 0xFC, 0xCC, 0xCD, 0xC3, 0xC1, -0x7A, 0xD8, 0xCD, 0xC9, 0xD6, 0x9E, 0x90, 0xD9, 0x28, 0xC1, -0xB5, 0x62, 0xE5, 0xAA, 0x73, 0x1E, 0x39, 0xFD, 0x0B, 0x6C, -0xC2, 0xDA, 0xFE, 0x65, 0x38, 0x84, 0xFE, 0x97, 0x2E, 0x59, -0x31, 0xD5, 0x31, 0xAE, 0x88, 0x15, 0x59, 0xDD, 0x8C, 0x59, -0xB3, 0xF3, 0x56, 0x6C, 0xD8, 0xF9, 0xAF, 0xB4, 0xA1, 0x67, -0x11, 0xD1, 0x86, 0xC3, 0x80, 0x6A, 0x58, 0x4B, 0xCD, 0xFC, -0xC5, 0x6B, 0xFE, 0x3D, 0x69, 0xCD, 0xF9, 0xB7, 0x51, 0x55, -0xE4, 0xDF, 0x64, 0x75, 0xE5, 0xEA, 0x64, 0x4E, 0x4E, 0xD6, -0x20, 0x46, 0x44, 0x28, 0x64, 0x64, 0xE5, 0xA8, 0xCC, 0x5F, -0xB1, 0xE9, 0x5F, 0x78, 0x72, 0x91, 0x0F, 0x4C, 0x8C, 0x60, -0x51, 0x01, 0x8C, 0x47, 0x5F, 0x3E, 0x71, 0xF9, 0x8D, 0x92, -0xDF, 0x3E, 0x35, 0x59, 0x1D, 0x59, 0xC1, 0x28, 0xF0, 0xEF, -0x3E, 0x83, 0x4D, 0x59, 0x11, 0xA3, 0x9E, 0x2C, 0xBF, 0x8F, -0x19, 0x3B, 0xD3, 0x4B, 0xCE, 0xFF, 0x0C, 0xF3, 0xC3, 0xA1, -0x25, 0x02, 0x23, 0x23, 0x13, 0xCB, 0xBD, 0xFB, 0x0F, 0x8E, -0x7E, 0x7C, 0xF7, 0x72, 0x2B, 0xB1, 0x16, 0x84, 0xB3, 0xB2, -0xB2, 0xAE, 0x91, 0x16, 0xE2, 0xF2, 0x53, 0x7B, 0xB2, 0x83, -0xE1, 0xC8, 0xE6, 0x3D, 0xFF, 0x3F, 0xFC, 0x94, 0xFD, 0xCF, -0xA5, 0xAE, 0xC2, 0xA0, 0x6D, 0xAD, 0x6F, 0xAE, 0x2C, 0x21, -0x28, 0x68, 0x22, 0xCC, 0x1F, 0xC7, 0xC3, 0xC8, 0x30, 0x37, -0x8C, 0x93, 0x83, 0x59, 0x44, 0x80, 0x4F, 0xF5, 0xC3, 0x9B, -0x97, 0x09, 0x3B, 0xD6, 0x2F, 0xFD, 0x0F, 0x77, 0x20, 0x3E, -0xC3, 0x81, 0x29, 0x68, 0x91, 0xA0, 0xA0, 0x20, 0x2B, 0x30, -0x55, 0x30, 0x5C, 0xFB, 0xFE, 0xFD, 0x1D, 0x1B, 0x03, 0x7B, -0x81, 0xC0, 0xBA, 0xED, 0xEE, 0x16, 0xCF, 0x1F, 0xC4, 0xFC, -0x66, 0x61, 0x67, 0xE0, 0x15, 0xE2, 0x65, 0xD0, 0x60, 0x64, -0x02, 0x42, 0xC6, 0xD8, 0x8B, 0xEF, 0x3F, 0x31, 0x3C, 0x58, -0xB3, 0x3A, 0x6B, 0xF1, 0xCD, 0x9B, 0x5F, 0x09, 0x85, 0x0A, -0x28, 0x5D, 0x87, 0xB3, 0xB3, 0xB3, 0xFF, 0x54, 0x55, 0x55, -0xFD, 0xE7, 0xE8, 0xE8, 0xF8, 0xCF, 0xDC, 0xDC, 0xFC, 0xBD, -0xA4, 0x84, 0x84, 0x15, 0x48, 0xAE, 0x99, 0x93, 0xED, 0xDA, -0x62, 0x11, 0x9E, 0x7F, 0xA7, 0x2C, 0x35, 0xFF, 0x5D, 0xF6, -0xB2, 0xFA, 0x77, 0xC2, 0x52, 0xE3, 0xDF, 0x0E, 0x2D, 0xB9, -0x7F, 0x13, 0x45, 0x04, 0xFE, 0x25, 0x33, 0x32, 0x2C, 0x8C, -0xC0, 0xEF, 0x68, 0x88, 0xCB, 0x85, 0x84, 0x84, 0x40, 0x86, -0xFF, 0x77, 0x72, 0x72, 0xFA, 0x6F, 0x65, 0x65, 0xF5, 0x5E, -0x52, 0x52, 0xD2, 0x0A, 0x2E, 0xC9, 0xC8, 0x18, 0xDF, 0x27, -0x2B, 0xF1, 0x7B, 0x06, 0x1F, 0xC7, 0xBF, 0x93, 0x16, 0x1A, -0xFF, 0x81, 0x96, 0xFC, 0x07, 0x5B, 0xA2, 0x29, 0xF7, 0x7F, -0xA2, 0x08, 0x3F, 0xCC, 0x12, 0x66, 0xAC, 0x26, 0x33, 0x31, -0x31, 0x85, 0x03, 0x0B, 0xBB, 0x9F, 0x6A, 0x6A, 0x6A, 0x20, -0x97, 0xFF, 0xB7, 0xB4, 0xB4, 0x7C, 0x2F, 0x01, 0x75, 0x39, -0x32, 0x48, 0x60, 0x67, 0x8D, 0x9F, 0x20, 0x2F, 0x05, 0xB2, -0xE4, 0x3F, 0xD4, 0x12, 0x90, 0x4F, 0xFE, 0x23, 0x5B, 0x12, -0x89, 0xC5, 0x92, 0x70, 0x0E, 0x0E, 0x8E, 0x9F, 0xC0, 0x32, -0x08, 0x1C, 0x2C, 0x16, 0x16, 0x16, 0x28, 0x2E, 0xC7, 0x63, -0x09, 0xC8, 0x27, 0xF0, 0xE0, 0xDA, 0xA9, 0x2D, 0xFF, 0x6F, -0x32, 0x30, 0xB8, 0xB2, 0x99, 0x18, 0x17, 0xC4, 0x33, 0x33, -0x82, 0x93, 0x30, 0x37, 0x10, 0xA7, 0x8A, 0x8A, 0x8A, 0xFE, -0x54, 0x51, 0x51, 0xF9, 0xEF, 0xEC, 0xEC, 0x8C, 0x11, 0x2C, -0x78, 0x2D, 0x91, 0x93, 0x42, 0x04, 0x97, 0xB7, 0xF5, 0xFF, -0xD3, 0xCE, 0x46, 0xFF, 0xF6, 0x1B, 0xAB, 0xFE, 0x5F, 0x2A, -0x21, 0xF0, 0x2F, 0x9F, 0x93, 0x4D, 0x0D, 0xA4, 0x4E, 0x0E, -0x18, 0xA1, 0x77, 0x41, 0xC1, 0x02, 0x0A, 0x73, 0x90, 0xCB, -0xB1, 0x05, 0x0B, 0x21, 0x9F, 0xCC, 0xE4, 0xE3, 0xFC, 0x7F, -0xCE, 0xD9, 0xF0, 0xFF, 0xDD, 0xE4, 0xA0, 0x7F, 0xAF, 0x1A, -0x73, 0xFE, 0x5F, 0x8B, 0xF0, 0xF8, 0x52, 0x2D, 0x2A, 0x20, -0x00, 0x56, 0x24, 0x20, 0x20, 0xA0, 0x00, 0x34, 0xF8, 0x2E, -0x30, 0xCC, 0x3F, 0x02, 0x93, 0x26, 0xD1, 0x86, 0xC3, 0x80, -0x1F, 0x2B, 0x4B, 0xFC, 0x64, 0x79, 0xC9, 0xDF, 0xCB, 0xA4, -0x04, 0xFF, 0x3D, 0xCC, 0x0A, 0xFB, 0xF7, 0xF3, 0xF4, 0x96, -0x7F, 0x9B, 0x33, 0x63, 0x0B, 0x50, 0x14, 0x01, 0x5D, 0xAD, -0xC0, 0xCB, 0xCB, 0xDB, 0x0C, 0x64, 0xEA, 0x90, 0x8A, 0x81, -0xB1, 0xA9, 0x63, 0xC8, 0xC4, 0xD4, 0x34, 0x91, 0x9F, 0xEB, -0xEB, 0x21, 0x7B, 0xA3, 0x17, 0x1B, 0x22, 0x7C, 0x33, 0x70, -0x39, 0x86, 0x03, 0x88, 0x79, 0xC8, 0xC5, 0x92, 0x8C, 0x0C, -0x82, 0xC1, 0x5C, 0xEC, 0x28, 0xF9, 0x00, 0x00, 0x44, 0x5A, -0xA4, 0x22, 0x92, 0xC8, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x71, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x6D, 0x4C, 0x5B, 0x65, 0x14, -0x7E, 0x6E, 0x3F, 0xE0, 0xDE, 0xB6, 0xD0, 0x96, 0xAF, 0x31, -0x10, 0x18, 0x83, 0x31, 0xC5, 0xCA, 0xA7, 0x63, 0xA0, 0x82, -0x5B, 0x54, 0xE6, 0x0C, 0x0C, 0x31, 0x4E, 0x60, 0x6C, 0x03, -0xB6, 0x80, 0x31, 0x46, 0xA7, 0x2E, 0x3A, 0x25, 0x9B, 0x6E, -0x9A, 0x18, 0xF7, 0xC3, 0x25, 0xB0, 0xA8, 0x13, 0x37, 0xED, -0xA6, 0xC8, 0x40, 0xB3, 0x4F, 0xC4, 0x31, 0x8D, 0x51, 0x97, -0x08, 0x66, 0x06, 0x37, 0xD4, 0xCC, 0xF5, 0x43, 0xA0, 0x95, -0xB5, 0x40, 0x47, 0x81, 0x01, 0xBD, 0xFD, 0xA2, 0x9E, 0xB7, -0x4A, 0xB2, 0x44, 0x13, 0x71, 0x7F, 0xFC, 0xA1, 0xA7, 0x39, -0xCD, 0xBD, 0xEF, 0x39, 0xCF, 0x73, 0xEE, 0x79, 0xDE, 0xF7, -0xBC, 0xC0, 0xFF, 0xF6, 0x6F, 0x1B, 0x37, 0xFF, 0x30, 0xE6, -0x9C, 0xE2, 0x03, 0x81, 0x40, 0xAD, 0xCF, 0xE7, 0x5B, 0x22, -0x93, 0xC9, 0x26, 0x38, 0x8E, 0x6B, 0x8D, 0xD6, 0x86, 0x5B, -0x17, 0x42, 0x42, 0xD8, 0x04, 0xC2, 0x56, 0x13, 0x56, 0x43, -0xD8, 0x41, 0xC2, 0xEA, 0x09, 0x2B, 0xB2, 0x98, 0x6C, 0x3E, -0xC9, 0x25, 0xBA, 0xEB, 0xBD, 0x5E, 0x6F, 0xB3, 0xD7, 0xE7, -0x03, 0x25, 0x31, 0xCF, 0xA3, 0xE5, 0x87, 0x16, 0x52, 0x60, -0xC6, 0x25, 0x36, 0x11, 0x79, 0x39, 0x39, 0xE4, 0x84, 0x95, -0x93, 0xD1, 0xF2, 0x7E, 0x16, 0x93, 0xB0, 0xBF, 0x8B, 0x3F, -0x9B, 0xE5, 0x32, 0xA9, 0xA4, 0x41, 0xA5, 0x10, 0xA0, 0x0E, -0x53, 0x42, 0x08, 0x0D, 0x41, 0x20, 0x30, 0x57, 0x7C, 0xE1, -0x92, 0x29, 0xEA, 0xEF, 0xC8, 0x59, 0x0E, 0xCB, 0x65, 0x18, -0x86, 0x55, 0x29, 0x05, 0x30, 0x2E, 0xC6, 0x19, 0xEC, 0xE0, -0x07, 0xC3, 0x00, 0x17, 0x13, 0xA9, 0x6D, 0xA1, 0x0A, 0xBA, -0x59, 0x97, 0x0B, 0x4E, 0xA7, 0x13, 0x0A, 0xA5, 0x0A, 0x52, -0xA9, 0x54, 0xA9, 0x54, 0xF0, 0x97, 0x2D, 0xB6, 0xD1, 0x29, -0x6A, 0xF9, 0x2F, 0xC9, 0x49, 0x16, 0xB8, 0x3D, 0x9E, 0x70, -0x8A, 0x2A, 0x07, 0x07, 0x07, 0x70, 0xEA, 0x74, 0x2B, 0x36, -0x55, 0x3F, 0x86, 0xB8, 0xB8, 0x38, 0x5D, 0x6C, 0x74, 0x64, -0x0B, 0x71, 0x6F, 0x91, 0xEE, 0xDE, 0xBD, 0xA7, 0x80, 0xF0, -0xCD, 0x2E, 0x97, 0xC8, 0xF5, 0xF7, 0xF7, 0x63, 0xD7, 0xCE, -0x9D, 0x48, 0x4C, 0x5A, 0x02, 0x55, 0x58, 0x18, 0x23, 0x10, -0x42, 0xE4, 0x72, 0x8D, 0x52, 0xE0, 0x35, 0xD4, 0xFA, 0x9F, -0xDC, 0xE3, 0xF5, 0x6A, 0x66, 0x5D, 0xA2, 0x20, 0xBA, 0x45, -0x8C, 0xD8, 0x6D, 0xE8, 0x3C, 0x7D, 0x02, 0x05, 0xF9, 0x85, -0x10, 0x04, 0x05, 0x93, 0x29, 0x53, 0x21, 0xF0, 0x67, 0x39, -0xDA, 0xA0, 0x17, 0x3D, 0x6E, 0xF7, 0x9E, 0x8E, 0x8F, 0x3A, -0x30, 0x34, 0x34, 0x84, 0x65, 0x69, 0x69, 0xB8, 0xD0, 0xD7, -0x07, 0x5D, 0x46, 0x26, 0xEE, 0x2A, 0xBA, 0x1B, 0x02, 0xCF, -0x23, 0xE0, 0xF7, 0xC1, 0x60, 0x34, 0xA1, 0x60, 0x65, 0x1E, -0x38, 0x09, 0x87, 0x9E, 0xDE, 0x6F, 0x71, 0x6B, 0x7A, 0x3A, -0xBC, 0xFE, 0x39, 0x98, 0x8C, 0x06, 0x7C, 0xD1, 0x7E, 0x0A, -0xA5, 0x5B, 0x2A, 0x91, 0x98, 0x98, 0x84, 0x5F, 0x4C, 0x46, -0x7C, 0xF2, 0xE1, 0x11, 0x6C, 0x7D, 0xE6, 0x39, 0xC4, 0xC5, -0xDF, 0xF4, 0x12, 0x67, 0x77, 0x38, 0x5F, 0xF6, 0xFB, 0xFD, -0xBB, 0x3A, 0x3A, 0x3A, 0x60, 0x36, 0x9B, 0xA1, 0xD6, 0xA8, -0x61, 0xB5, 0x58, 0x91, 0x93, 0x7B, 0x3B, 0xEE, 0x2C, 0x2C, -0x22, 0xA9, 0x24, 0xB8, 0x36, 0x35, 0x89, 0xF3, 0xE7, 0xBF, -0x43, 0xD9, 0xBA, 0x75, 0xC1, 0x02, 0xC7, 0x8E, 0x9D, 0x40, -0x5E, 0xDE, 0x0A, 0x84, 0xAB, 0xD5, 0x18, 0xB6, 0x5A, 0x71, -0xF2, 0xFD, 0x36, 0x54, 0x34, 0xD4, 0x31, 0x69, 0xF0, 0xAB, -0xC5, 0x82, 0xE3, 0x1F, 0xE8, 0xF1, 0xF8, 0xB3, 0x2F, 0x20, -0x3A, 0x26, 0xE6, 0x15, 0xE9, 0xA6, 0xBA, 0xFA, 0xE5, 0x72, -0xB9, 0xAC, 0x64, 0x69, 0x4A, 0x0A, 0x78, 0x41, 0x40, 0x7B, -0x5B, 0x1B, 0xD6, 0x57, 0x56, 0xE1, 0xB6, 0xCC, 0x2C, 0x04, -0xE8, 0x27, 0x97, 0x4A, 0xA1, 0xD5, 0x46, 0x04, 0x65, 0x23, -0x49, 0xE0, 0xF1, 0x78, 0x91, 0x9A, 0x9A, 0x4A, 0x6B, 0x1A, -0xF8, 0xE8, 0x3D, 0x94, 0x30, 0x99, 0xF9, 0x2B, 0x31, 0x62, -0xBB, 0x82, 0x83, 0x6F, 0xEB, 0x91, 0x9D, 0x9B, 0x85, 0xFB, -0xCB, 0xCA, 0x21, 0x28, 0x14, 0x18, 0x77, 0x4E, 0x1E, 0x95, -0x96, 0x57, 0x6C, 0xC8, 0x50, 0x2A, 0x84, 0x32, 0x9F, 0xCF, -0x4F, 0xA0, 0x48, 0xAC, 0x59, 0xBB, 0x96, 0xBA, 0xD0, 0xC2, -0xE1, 0x9C, 0x84, 0xBE, 0xB3, 0x07, 0x6D, 0x9F, 0x7E, 0x83, -0x61, 0xFB, 0x08, 0xEE, 0xC8, 0xBA, 0x19, 0x5D, 0x67, 0xCE, -0xC2, 0x60, 0x30, 0x22, 0x43, 0x97, 0x8E, 0x37, 0x8F, 0x76, -0xE1, 0xD0, 0xC9, 0x73, 0x30, 0x58, 0xC7, 0x90, 0xBC, 0x58, -0x0B, 0xCC, 0xCD, 0xC1, 0x48, 0xB1, 0xEC, 0xDC, 0x1C, 0xDA, -0x03, 0x81, 0x5E, 0x03, 0x84, 0x1B, 0x3D, 0xCE, 0x75, 0x7F, -0xDD, 0x5B, 0x93, 0x9A, 0x9C, 0xA8, 0x97, 0x4A, 0x24, 0x70, -0x8C, 0x4F, 0x80, 0xCD, 0x01, 0xCD, 0x03, 0x3E, 0xFE, 0xAC, -0x17, 0x17, 0xCD, 0xA3, 0x10, 0x45, 0x17, 0x1C, 0x8E, 0x31, -0xBC, 0xBA, 0xAD, 0x1A, 0x2A, 0x81, 0x0F, 0x9E, 0x9E, 0x69, -0x97, 0x88, 0xC6, 0xA6, 0x56, 0x44, 0x45, 0x45, 0x83, 0xE7, -0xA9, 0x83, 0x94, 0x18, 0x3C, 0x5C, 0x9C, 0x4F, 0x33, 0x20, -0x0F, 0xCE, 0x41, 0x54, 0x84, 0x06, 0x7E, 0x2A, 0x68, 0x1A, -0xB0, 0xD4, 0x72, 0xDD, 0x5F, 0xF5, 0x6E, 0x4E, 0x49, 0x4E, -0x3C, 0x4C, 0xC7, 0x0A, 0xFD, 0x97, 0x4C, 0x18, 0x19, 0x73, -0x20, 0x31, 0x3E, 0x16, 0x2D, 0xED, 0x5D, 0x38, 0xF7, 0xBD, -0x91, 0x0A, 0x7A, 0x83, 0x7B, 0xB0, 0x77, 0x7B, 0xAD, 0xA8, -0x0E, 0x53, 0x35, 0xB1, 0x02, 0x93, 0xD7, 0xA6, 0xB7, 0xED, -0x78, 0x5D, 0xCF, 0x87, 0x85, 0xAB, 0x83, 0xA4, 0x85, 0xD9, -0xCB, 0xD0, 0x50, 0xF1, 0x00, 0x2C, 0xC3, 0x76, 0x2C, 0x8A, -0x8E, 0x42, 0xC6, 0x2D, 0xA9, 0xB0, 0x8F, 0x5D, 0x85, 0x79, -0xC0, 0x52, 0xC3, 0x06, 0xCD, 0x37, 0x47, 0xD5, 0x98, 0xB3, -0xAF, 0x67, 0x43, 0x18, 0x19, 0xA1, 0xC5, 0x86, 0xD2, 0x55, -0xFE, 0x70, 0xFA, 0xE0, 0x49, 0xA7, 0x03, 0xAB, 0x57, 0xA4, -0x23, 0x47, 0x97, 0x76, 0xE0, 0xC1, 0xE2, 0xA2, 0xE7, 0x99, -0xB3, 0x67, 0xB6, 0xC6, 0x62, 0x2C, 0x87, 0xE5, 0x32, 0x0C, -0xC3, 0x32, 0x8E, 0x79, 0x3E, 0xC6, 0x2D, 0xDD, 0x58, 0xB7, -0x35, 0x59, 0x1D, 0x1E, 0x56, 0xA5, 0xA0, 0x29, 0xB6, 0x8D, -0x3A, 0xA0, 0x20, 0xFD, 0x22, 0x34, 0x6A, 0x1F, 0x9D, 0xE1, -0xA2, 0xEA, 0xD2, 0x7B, 0x1C, 0x95, 0x25, 0xAB, 0x6D, 0xC5, -0x85, 0x79, 0xFB, 0x69, 0x26, 0x5E, 0x7B, 0xA3, 0xB9, 0x29, -0xC0, 0x50, 0x4F, 0x3E, 0xF5, 0xF4, 0xE7, 0xF7, 0x15, 0xE6, -0x5D, 0xD9, 0x58, 0x76, 0xAF, 0xAB, 0xA6, 0x7C, 0x4D, 0x27, -0x69, 0xBE, 0x83, 0xC8, 0x6B, 0x44, 0xB7, 0x47, 0x42, 0x27, -0x92, 0xBA, 0x88, 0xC0, 0xF4, 0xCC, 0x2C, 0x26, 0xA6, 0xA6, -0x8E, 0x70, 0x67, 0xBE, 0xEC, 0xC9, 0x4E, 0x88, 0x5F, 0xDC, -0xB7, 0x88, 0x24, 0xFA, 0xF1, 0xB2, 0x39, 0xA8, 0x1F, 0xCF, -0xF3, 0xEF, 0xA4, 0x26, 0xC4, 0x36, 0x2C, 0xE4, 0x1E, 0x9A, -0x37, 0x93, 0xD5, 0xDE, 0x22, 0x8A, 0x62, 0x3D, 0xDB, 0x47, -0xDD, 0xF2, 0x14, 0x92, 0xFA, 0x2A, 0xAC, 0xC3, 0xB6, 0x1C, -0xD9, 0xF6, 0x27, 0x1E, 0xFD, 0xE9, 0xC0, 0x21, 0xBD, 0x35, -0x32, 0x42, 0x93, 0x10, 0x12, 0x22, 0xC7, 0xCC, 0xCC, 0xF4, -0xD0, 0xE6, 0xAA, 0xF5, 0x8D, 0xB8, 0xEE, 0xA6, 0x5D, 0x88, -0x3D, 0x52, 0x5E, 0xDA, 0xF8, 0xD6, 0xC1, 0xF7, 0x8A, 0x89, -0x23, 0xC9, 0x47, 0x5D, 0x8C, 0x3B, 0xC7, 0xAD, 0x8C, 0x9B, -0xC5, 0xB8, 0xAC, 0xEC, 0x9C, 0x92, 0x96, 0x77, 0x0F, 0x77, -0xEF, 0xDD, 0xD7, 0xDC, 0x95, 0xBC, 0x34, 0x65, 0x15, 0xAD, -0xA9, 0x6E, 0xC4, 0x19, 0x96, 0x71, 0x30, 0x2E, 0xC6, 0x79, -0xFD, 0x47, 0xB2, 0xF3, 0xA7, 0xF9, 0xC3, 0x43, 0xF1, 0xFB, -0x2D, 0x7B, 0x23, 0x1E, 0x7A, 0x1D, 0x0F, 0xFF, 0x4F, 0x14, -0xF8, 0x0F, 0xDB, 0x6F, 0x02, 0xB1, 0xDD, 0xD5, 0xD4, 0x39, -0x26, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xD9, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x8C, 0x56, 0x4D, 0x88, 0x1C, 0x55, 0x10, -0xFE, 0xDE, 0x7F, 0xFF, 0x4C, 0xCF, 0xEC, 0x8E, 0xEC, 0x92, -0x8D, 0x0A, 0xD1, 0x43, 0x50, 0x82, 0xE4, 0x26, 0x11, 0x0F, -0x6E, 0x16, 0x3C, 0x28, 0x39, 0x05, 0xF7, 0xAA, 0x07, 0x31, -0x37, 0x2F, 0x7A, 0xF1, 0x27, 0x28, 0x11, 0xC5, 0x8B, 0x2B, -0x01, 0x3D, 0x48, 0x8E, 0x7A, 0xF0, 0xEA, 0x25, 0x28, 0xE8, -0x1E, 0x22, 0x04, 0x72, 0x59, 0x16, 0x3C, 0x24, 0x41, 0x61, -0xC3, 0x22, 0xBB, 0x1B, 0xF6, 0x6F, 0x66, 0x77, 0x66, 0xBA, -0xA7, 0x5F, 0xBF, 0xF7, 0xCA, 0x83, 0xD3, 0x4D, 0xB2, 0xAE, -0xD1, 0x82, 0xC7, 0x34, 0xDD, 0xD3, 0x55, 0x5F, 0xD5, 0x57, -0x5F, 0x55, 0xB3, 0xDB, 0xB7, 0x6F, 0xA3, 0x36, 0x22, 0x82, -0x94, 0x12, 0x5A, 0x6B, 0x30, 0xC6, 0x90, 0xE7, 0x39, 0xCA, -0xB2, 0x44, 0x9A, 0xA6, 0x4F, 0x5A, 0x6B, 0x1F, 0xB7, 0xD6, -0x9E, 0x24, 0x22, 0x8A, 0xA2, 0x68, 0x63, 0x6A, 0x6A, 0x6A, -0x43, 0x08, 0xB1, 0x21, 0x84, 0x80, 0x94, 0x12, 0x21, 0x84, -0xC6, 0x0F, 0x63, 0xAC, 0xB9, 0x96, 0x78, 0x84, 0x31, 0xC6, -0xC0, 0x18, 0x7B, 0x8E, 0x73, 0x7E, 0x3E, 0x8E, 0xE3, 0xA7, -0xB4, 0xD6, 0xB3, 0x44, 0x04, 0xA5, 0xD4, 0x7D, 0xC6, 0xD8, -0x1A, 0x80, 0x9F, 0x01, 0xFC, 0xFE, 0x28, 0x1F, 0xC7, 0x06, -0x20, 0x22, 0x10, 0xD1, 0xB9, 0x34, 0x4D, 0x3F, 0xCC, 0xB2, -0xEC, 0x45, 0xAD, 0xF5, 0xB4, 0x31, 0x06, 0x44, 0x04, 0x00, -0xE0, 0x9C, 0xD7, 0x7F, 0xDD, 0x26, 0xA2, 0x1B, 0xDE, 0xFB, -0x4F, 0x89, 0xE8, 0xB7, 0x07, 0x91, 0xD7, 0xC6, 0x8F, 0xDE, -0xF0, 0xDE, 0x43, 0x4A, 0x79, 0xA5, 0xDD, 0x6E, 0xFF, 0x9A, -0xA6, 0xE9, 0x05, 0xA5, 0xD4, 0x34, 0x11, 0xC1, 0x39, 0x87, -0xA2, 0x28, 0x50, 0x14, 0x05, 0xBC, 0xF7, 0xE0, 0x9C, 0x43, -0x29, 0x35, 0xAB, 0xB5, 0x5E, 0x34, 0xC6, 0xDC, 0x14, 0x42, -0xBC, 0x53, 0x03, 0x78, 0x28, 0x00, 0xE7, 0x1C, 0xF5, 0x09, -0x21, 0x40, 0x29, 0x75, 0xAD, 0xD5, 0x6A, 0x7D, 0xC4, 0x39, -0x57, 0xDE, 0x7B, 0x84, 0x10, 0xE0, 0xBD, 0x87, 0xF7, 0x1E, -0xD6, 0x5A, 0x58, 0x6B, 0xC1, 0x18, 0x83, 0x10, 0x02, 0x44, -0x84, 0x10, 0x02, 0x84, 0x10, 0x2D, 0x63, 0xCC, 0x12, 0xE7, -0xFC, 0xF3, 0xA3, 0x41, 0xE4, 0x11, 0x82, 0x2F, 0xA7, 0x69, -0xFA, 0x96, 0x73, 0xAE, 0x2E, 0x13, 0xF2, 0x3C, 0x47, 0xBF, -0xDF, 0x47, 0xAB, 0xD5, 0x6A, 0x40, 0x00, 0x80, 0x52, 0x0A, -0x71, 0x1C, 0x43, 0x29, 0x05, 0xEF, 0x3D, 0x18, 0x63, 0x30, -0xC6, 0xBC, 0x57, 0x96, 0xE5, 0x3A, 0x11, 0x7D, 0x53, 0x97, -0x8B, 0x0B, 0x21, 0x30, 0x39, 0xCF, 0x67, 0x59, 0xF6, 0x09, -0x11, 0xA1, 0x2C, 0x4B, 0x78, 0xEF, 0x61, 0x8C, 0xC1, 0xD2, -0xD2, 0x12, 0x16, 0x17, 0x17, 0x71, 0xF5, 0xEA, 0x55, 0x68, -0xAD, 0xB1, 0xB5, 0xB5, 0x85, 0x4B, 0x97, 0x2E, 0xE1, 0xE2, -0xC5, 0x8B, 0xB8, 0x7E, 0xFD, 0x3A, 0xE2, 0x38, 0x6E, 0xB2, -0x04, 0x00, 0xAD, 0xF5, 0x17, 0x9C, 0xF3, 0xD3, 0x93, 0x06, -0x01, 0x8F, 0xA2, 0x08, 0xC6, 0x18, 0xB4, 0x5A, 0xAD, 0x8F, -0x8D, 0x31, 0x8C, 0x31, 0x06, 0xEF, 0x3D, 0xAA, 0xAA, 0x02, -0x11, 0x61, 0x65, 0x65, 0x05, 0x6B, 0x6B, 0x6B, 0x58, 0x5D, -0x5D, 0x85, 0xF7, 0x1E, 0x83, 0xC1, 0x00, 0xCB, 0xCB, 0xCB, -0xB8, 0x75, 0xEB, 0x16, 0xD6, 0xD6, 0xD6, 0x9A, 0xAC, 0xEA, -0xC3, 0x18, 0x4B, 0x95, 0x52, 0x97, 0x6B, 0xE0, 0x9C, 0x88, -0x18, 0x63, 0xEC, 0x59, 0xA5, 0xD4, 0x79, 0x21, 0x04, 0x94, -0x52, 0x30, 0xC6, 0x80, 0x73, 0x0E, 0x6B, 0x2D, 0xA2, 0x28, -0x02, 0x00, 0x08, 0x21, 0x30, 0x1A, 0x8D, 0x10, 0x42, 0x40, -0xA7, 0xD3, 0x69, 0xCA, 0x54, 0x97, 0xB3, 0x46, 0x3C, 0xB1, -0x57, 0x19, 0x63, 0x4F, 0x30, 0xC6, 0xC0, 0xCB, 0xB2, 0x3C, -0xE1, 0xBD, 0x7F, 0x19, 0x40, 0x5C, 0xD7, 0xB2, 0xAE, 0x6F, -0x1C, 0xC7, 0x10, 0x42, 0x34, 0x01, 0xC6, 0xE3, 0x71, 0x4D, -0xEA, 0x43, 0x5A, 0x11, 0x42, 0x80, 0x31, 0xD6, 0x90, 0x4E, -0x44, 0x8F, 0x39, 0xE7, 0x5E, 0xAA, 0xAA, 0x6A, 0x5A, 0x56, -0x55, 0xF5, 0x74, 0x08, 0xE1, 0x34, 0x63, 0x0C, 0x9C, 0xF3, -0xBF, 0xD3, 0x9A, 0xFC, 0x46, 0x51, 0x04, 0xAD, 0x35, 0x00, -0x20, 0x4D, 0xD3, 0xC6, 0xB9, 0x52, 0xAA, 0xC9, 0x80, 0x73, -0x8E, 0xBA, 0xDB, 0x26, 0xCE, 0x01, 0x00, 0xD6, 0xDA, 0x67, -0xBC, 0xF7, 0xAB, 0x72, 0x38, 0x1C, 0x9E, 0xE0, 0x9C, 0x77, -0x47, 0xA3, 0xD1, 0x43, 0xA8, 0xA4, 0x94, 0x0D, 0xD9, 0x00, -0x10, 0xC7, 0x31, 0xDA, 0xED, 0x36, 0x7A, 0xBD, 0x5E, 0x23, -0xB4, 0xF1, 0x78, 0x8C, 0x9D, 0x9D, 0x1D, 0x0C, 0x06, 0x83, -0xA3, 0xBD, 0x0F, 0x00, 0xD3, 0x00, 0xBA, 0x32, 0xCF, 0xF3, -0x40, 0x44, 0x54, 0xA3, 0xE0, 0x9C, 0x37, 0x69, 0x3B, 0xE7, -0xE0, 0x9C, 0x03, 0x00, 0x1C, 0x1E, 0x1E, 0x62, 0x7F, 0x7F, -0x1F, 0x5B, 0x5B, 0x5B, 0x70, 0xCE, 0x41, 0x08, 0x81, 0xA2, -0x28, 0xB0, 0xB7, 0xB7, 0x87, 0xA2, 0x28, 0x1A, 0x2D, 0xD5, -0x01, 0x38, 0xE7, 0x04, 0x80, 0xA4, 0x73, 0x6E, 0x13, 0xC0, -0x6E, 0xED, 0xA8, 0x26, 0x2B, 0x84, 0x80, 0xE1, 0x70, 0xD8, -0x04, 0x28, 0xCB, 0x12, 0x52, 0x4A, 0xC4, 0x71, 0xDC, 0x0C, -0x45, 0x6B, 0x6D, 0xC3, 0x4B, 0xAD, 0xA5, 0x07, 0xB4, 0xB2, -0x07, 0x60, 0x4F, 0x0A, 0x21, 0xEE, 0x01, 0xB8, 0xEB, 0xBD, -0x6F, 0x10, 0x3B, 0xE7, 0x30, 0x1C, 0x0E, 0x91, 0xE7, 0x39, -0xEA, 0xD2, 0x49, 0x29, 0xD1, 0xED, 0x76, 0xD1, 0xEF, 0xF7, -0x51, 0x4F, 0xD0, 0x5E, 0xAF, 0x87, 0xF5, 0xF5, 0x75, 0xB4, -0x5A, 0x2D, 0x24, 0x49, 0x02, 0xAD, 0x75, 0x13, 0x9C, 0x88, -0xEE, 0x00, 0xD8, 0x92, 0xD6, 0xDA, 0x6D, 0x22, 0xFA, 0xC5, -0x5A, 0x3B, 0x1A, 0x8D, 0x46, 0x69, 0x51, 0x14, 0x38, 0x38, -0x38, 0x40, 0xAF, 0xD7, 0x6B, 0xDA, 0xB5, 0xE6, 0x20, 0x4D, -0x53, 0x24, 0x49, 0x02, 0x29, 0x65, 0x43, 0xF0, 0xEE, 0xEE, -0x2E, 0xFA, 0xFD, 0x3E, 0xA6, 0xA6, 0xA6, 0x90, 0x65, 0x59, -0xAD, 0xEE, 0x6D, 0xCE, 0xF9, 0x0D, 0x22, 0x3A, 0x90, 0x55, -0x55, 0x01, 0xC0, 0x1F, 0x79, 0x9E, 0xFF, 0xB8, 0xB9, 0xB9, -0xF9, 0x5A, 0xBF, 0xDF, 0xC7, 0x68, 0x34, 0x02, 0xE7, 0x1C, -0x33, 0x33, 0x33, 0x4D, 0xC7, 0x48, 0x29, 0x61, 0x8C, 0x69, -0x66, 0x90, 0x73, 0x0E, 0x71, 0x1C, 0x23, 0x49, 0x12, 0xF4, -0x7A, 0x3D, 0x94, 0x65, 0x89, 0x3C, 0xCF, 0x91, 0x65, 0x19, -0xB2, 0x2C, 0xFB, 0x21, 0x4D, 0xD3, 0xFB, 0x00, 0x20, 0x37, -0x36, 0x36, 0xEA, 0x29, 0x7A, 0x65, 0x30, 0x18, 0x5C, 0xD8, -0xDE, 0xDE, 0x8E, 0x92, 0x24, 0x41, 0xBB, 0xDD, 0x6E, 0x50, -0xC7, 0x71, 0x8C, 0x4E, 0xA7, 0x03, 0xCE, 0x79, 0x53, 0x2A, -0xEF, 0x3D, 0xB4, 0xD6, 0x30, 0xC6, 0x20, 0x49, 0x12, 0x8C, -0xC7, 0x63, 0x1C, 0x1C, 0x1C, 0xC0, 0x39, 0xD7, 0x73, 0xCE, -0x7D, 0x56, 0x77, 0x96, 0x98, 0x9F, 0x9F, 0x87, 0xB5, 0x16, -0xDE, 0xFB, 0xED, 0x10, 0xC2, 0x21, 0x63, 0xEC, 0x15, 0xAD, -0x35, 0xB2, 0x2C, 0x83, 0x73, 0x0E, 0xA7, 0x4E, 0x9D, 0xC2, -0xC2, 0xC2, 0x02, 0xE6, 0xE7, 0xE7, 0xD1, 0xED, 0x76, 0x11, -0xC7, 0x31, 0xCE, 0x9C, 0x39, 0x83, 0xB3, 0x67, 0xCF, 0x62, -0x76, 0x76, 0xB6, 0x69, 0x69, 0x00, 0xF5, 0xA8, 0x78, 0x53, -0x4A, 0x79, 0xB3, 0xAA, 0x2A, 0x54, 0x55, 0x05, 0x59, 0x3F, -0x9C, 0xC8, 0xFD, 0xAB, 0xB9, 0xB9, 0xB9, 0xB9, 0x10, 0xC2, -0xFB, 0x55, 0x55, 0xA1, 0x2C, 0x4B, 0x10, 0x11, 0x3A, 0x9D, -0x0E, 0xA6, 0xA7, 0xA7, 0x1B, 0x71, 0xCD, 0xCC, 0xCC, 0xA0, -0xDF, 0xEF, 0xA3, 0x28, 0x0A, 0x54, 0x55, 0xD5, 0x8C, 0x17, -0x29, 0xE5, 0xBB, 0x21, 0x84, 0xEF, 0x6B, 0xD1, 0xFE, 0x63, -0xE1, 0x10, 0x11, 0x84, 0x10, 0x1F, 0x74, 0xBB, 0xDD, 0xB7, -0xD3, 0x34, 0xED, 0xD7, 0x9D, 0x55, 0xAB, 0xFB, 0x01, 0x20, -0x60, 0x8C, 0xA1, 0xAA, 0x2A, 0x58, 0x6B, 0x41, 0x44, 0xF7, -0x95, 0x52, 0x6F, 0x70, 0xCE, 0xBF, 0x3C, 0xBA, 0x0F, 0xF8, -0x71, 0xEB, 0x32, 0x84, 0xF0, 0xB5, 0x31, 0xE6, 0x85, 0x76, -0xBB, 0xFD, 0x5D, 0xBB, 0xDD, 0xFE, 0xB3, 0xD5, 0x6A, 0xC1, -0x18, 0xD3, 0xCC, 0x1B, 0xAD, 0x35, 0xE2, 0x38, 0x86, 0x94, -0xF2, 0x1E, 0x11, 0x5D, 0x03, 0x70, 0x0E, 0xC0, 0xB7, 0xC7, -0x6D, 0xB4, 0x7F, 0xDD, 0xC9, 0x21, 0x84, 0xBB, 0x42, 0x88, -0xD7, 0x93, 0x24, 0x39, 0xD9, 0xE9, 0x74, 0x16, 0xA4, 0x94, -0xA7, 0x89, 0x68, 0x8A, 0x31, 0x46, 0x52, 0xCA, 0x5E, 0x14, -0x45, 0x77, 0xA2, 0x28, 0x5A, 0xAE, 0xAA, 0x6A, 0xF7, 0x38, -0xC7, 0xFF, 0xEB, 0xAB, 0x62, 0xF2, 0xE2, 0x26, 0x63, 0xEC, -0x27, 0x00, 0x2B, 0x44, 0xD4, 0x05, 0x40, 0x13, 0x95, 0xEE, -0x00, 0xD8, 0xC7, 0x7F, 0xD8, 0x5F, 0x03, 0x00, 0xF2, 0xB8, -0xA7, 0xA8, 0x90, 0xD3, 0xAF, 0x66, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0xF0, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x4F, 0x88, 0x15, 0xD9, 0x15, -0xC6, 0x7F, 0xF7, 0x6F, 0xDD, 0x57, 0xEF, 0x5F, 0xBF, 0x8E, -0xAD, 0x89, 0xE0, 0x22, 0x93, 0x81, 0x0E, 0x34, 0x59, 0x64, -0xA3, 0xA3, 0x9D, 0x5D, 0x76, 0x81, 0xEC, 0xEC, 0x75, 0xB2, -0x1C, 0x8C, 0x20, 0x01, 0x37, 0x32, 0xAD, 0xAB, 0x21, 0x0C, -0x12, 0x48, 0x56, 0x19, 0xB2, 0x0D, 0xB3, 0x75, 0x9D, 0x6D, -0xFE, 0x4C, 0x8B, 0x2B, 0xC1, 0x21, 0x4A, 0xCC, 0xD8, 0xA4, -0x83, 0xA3, 0x12, 0xEC, 0xF6, 0xBD, 0xD7, 0xBE, 0xAA, 0x57, -0x55, 0xB7, 0x6E, 0xDD, 0x2C, 0xE6, 0x55, 0x45, 0x8D, 0x38, -0xE4, 0x42, 0xC1, 0x85, 0xBA, 0xF7, 0x3B, 0xF7, 0x7C, 0xE7, -0xFB, 0xCE, 0x11, 0x0F, 0x1E, 0x3C, 0xA0, 0x5D, 0x31, 0x46, -0xB4, 0xD6, 0x58, 0x6B, 0x01, 0x28, 0x8A, 0x02, 0xEF, 0xBD, -0xE9, 0xF5, 0x7A, 0x1B, 0x65, 0x59, 0x9E, 0xAE, 0xAA, 0xEA, -0x3B, 0x31, 0xC6, 0xE8, 0x9C, 0x7B, 0x32, 0x99, 0x4C, 0x9E, -0x49, 0x29, 0x9F, 0x6B, 0xAD, 0x83, 0x94, 0xB2, 0xBB, 0x0F, -0x20, 0x84, 0xE8, 0x30, 0x35, 0xDF, 0xBC, 0x7E, 0x20, 0xA5, -0xDC, 0xEE, 0xF5, 0x7A, 0xEF, 0x59, 0x6B, 0xD7, 0x63, 0x8C, -0x18, 0x63, 0x9E, 0x0B, 0x21, 0xF6, 0x81, 0xBF, 0x02, 0x7F, -0x7B, 0xD7, 0xE5, 0xB7, 0x06, 0x58, 0xBD, 0xE4, 0x5C, 0xBF, -0xDF, 0xFF, 0x48, 0x4A, 0x79, 0xD6, 0x5A, 0x7B, 0xCA, 0x5A, -0x4B, 0x08, 0x01, 0x21, 0x04, 0x52, 0x4A, 0xA4, 0x94, 0x08, -0x21, 0x9E, 0x36, 0x4D, 0xB3, 0x57, 0xD7, 0xF5, 0xC7, 0x42, -0x88, 0x2F, 0xDE, 0x86, 0x25, 0xDF, 0x02, 0x9E, 0x28, 0xA5, -0xAE, 0x0F, 0x87, 0xC3, 0x3F, 0xA7, 0x69, 0xFA, 0x53, 0xAD, -0xF5, 0xA9, 0xA6, 0x69, 0xA8, 0xEB, 0x1A, 0xEF, 0x3D, 0x55, -0x55, 0xD1, 0x34, 0x0D, 0x42, 0x08, 0x94, 0x52, 0xA7, 0xAD, -0xB5, 0x3B, 0xBD, 0x5E, 0xEF, 0x73, 0x21, 0xC4, 0x95, 0x18, -0xA3, 0xFA, 0x9F, 0x0C, 0x5A, 0xFE, 0x00, 0xEA, 0xBA, 0x76, -0x5A, 0xEB, 0xDF, 0xF4, 0xFB, 0xFD, 0x0F, 0x85, 0x10, 0x84, -0x10, 0xA8, 0xEB, 0x9A, 0xBA, 0xAE, 0xB1, 0xD6, 0x52, 0xD7, -0x35, 0x00, 0x4A, 0x29, 0x94, 0x52, 0xDD, 0x5E, 0x08, 0x31, -0x74, 0xCE, 0xFD, 0xB6, 0x28, 0x8A, 0x53, 0x21, 0x84, 0x1B, -0x42, 0x88, 0xBA, 0x0B, 0xD0, 0x16, 0x64, 0x55, 0xE0, 0xAB, -0x69, 0x9A, 0x7E, 0x18, 0x42, 0x00, 0xA0, 0x69, 0x1A, 0x9A, -0xA6, 0xA1, 0x2C, 0x4B, 0x9A, 0xA6, 0x01, 0x20, 0x84, 0x80, -0xD6, 0xBA, 0x0B, 0x20, 0x84, 0xE8, 0x3E, 0x6B, 0xED, 0xB5, -0xB2, 0x2C, 0x1F, 0xC7, 0x18, 0x3F, 0x6D, 0x71, 0x65, 0xCB, -0xA7, 0x52, 0xEA, 0x83, 0xC1, 0x60, 0x70, 0x3D, 0xC6, 0x48, -0x55, 0x55, 0x78, 0xEF, 0x3B, 0x50, 0x80, 0x5B, 0xB7, 0x6E, -0x71, 0xFB, 0xF6, 0x6D, 0x84, 0x10, 0xC4, 0x18, 0xBB, 0x7F, -0xED, 0x3E, 0x84, 0xC0, 0x4A, 0x00, 0x9F, 0x48, 0x29, 0xBF, -0xDF, 0x06, 0x95, 0x49, 0x92, 0x90, 0x24, 0x09, 0x69, 0x9A, -0x7E, 0x64, 0xAD, 0xB5, 0x42, 0x08, 0x5E, 0xE5, 0x1C, 0x20, -0x49, 0x12, 0xF6, 0xF6, 0xF6, 0xD8, 0xDD, 0xDD, 0xE5, 0xFE, -0xFD, 0xFB, 0xB4, 0xB4, 0xB6, 0xC0, 0x21, 0x04, 0x9A, 0xA6, -0x21, 0xC6, 0x88, 0x94, 0x72, 0xA4, 0xB5, 0xBE, 0xD6, 0xD2, -0x28, 0xA5, 0x94, 0x89, 0x94, 0xF2, 0x87, 0xC6, 0x98, 0x0B, -0x52, 0x4A, 0x8C, 0x31, 0x58, 0x6B, 0x11, 0x42, 0x74, 0x41, -0xA4, 0x94, 0x0C, 0x06, 0x03, 0x0E, 0x0E, 0x0E, 0xB8, 0x71, -0xE3, 0x06, 0xFB, 0xFB, 0xFB, 0x24, 0x49, 0xD2, 0x05, 0x78, -0x95, 0xAA, 0x18, 0x23, 0x42, 0x88, 0x1F, 0x03, 0xEF, 0x09, -0x21, 0xA4, 0xCC, 0xF3, 0x7C, 0xDD, 0x7B, 0xFF, 0xA3, 0x18, -0xE3, 0x7A, 0x6B, 0x14, 0xAD, 0x35, 0xCE, 0x39, 0x9C, 0x73, -0x1D, 0x0D, 0xC6, 0x18, 0x00, 0xEE, 0xDD, 0xBB, 0xC7, 0xD5, -0xAB, 0x57, 0x79, 0xF8, 0xF0, 0x21, 0xD6, 0xDA, 0x56, 0xAE, -0xAF, 0xD1, 0x15, 0x63, 0x3C, 0x1D, 0x42, 0xD8, 0xF6, 0xDE, -0x4F, 0xA4, 0xF7, 0xFE, 0x4C, 0x55, 0x55, 0xEF, 0x2F, 0x97, -0x4B, 0x96, 0xCB, 0xE5, 0x6B, 0xFC, 0x1B, 0x63, 0x48, 0xD3, -0x14, 0xE7, 0x5C, 0x57, 0xD4, 0x7E, 0xBF, 0xCF, 0x9D, 0x3B, -0x77, 0xB8, 0x72, 0xE5, 0x0A, 0x8F, 0x1E, 0x3D, 0x42, 0x29, -0x45, 0x08, 0x01, 0xEF, 0x3D, 0x65, 0x59, 0x52, 0x14, 0x05, -0x45, 0x51, 0x88, 0x3C, 0xCF, 0xBF, 0x97, 0x65, 0xD9, 0xBA, -0xCE, 0xB2, 0xEC, 0xDB, 0x52, 0xCA, 0x49, 0x96, 0x65, 0xAF, -0xD9, 0x5C, 0x29, 0x85, 0xD6, 0x1A, 0x63, 0x0C, 0xE3, 0xF1, -0xB8, 0xCB, 0x40, 0x29, 0xC5, 0x68, 0x34, 0x62, 0x6F, 0x6F, -0x8F, 0x4B, 0x97, 0x2E, 0x71, 0xF3, 0xE6, 0x4D, 0xCE, 0x9C, -0x39, 0xD3, 0x49, 0xB8, 0xA5, 0x0A, 0x98, 0x00, 0xEB, 0x3A, -0xCB, 0xB2, 0xD8, 0x6A, 0xBE, 0x69, 0x9A, 0x2E, 0xE5, 0x95, -0x91, 0x50, 0x4A, 0x31, 0x9D, 0x4E, 0x99, 0xCF, 0xE7, 0xAD, -0xDA, 0x00, 0x70, 0xCE, 0xE1, 0xBD, 0x67, 0x3A, 0x9D, 0x32, -0x1E, 0x8F, 0x09, 0x21, 0x74, 0xC5, 0x5F, 0x9D, 0x8B, 0x31, -0xC6, 0xA8, 0x43, 0x08, 0x4F, 0x80, 0xC3, 0xB6, 0x58, 0x2B, -0x25, 0x10, 0x63, 0xA4, 0x28, 0x0A, 0x16, 0x8B, 0x05, 0x79, -0x9E, 0x33, 0x9B, 0xCD, 0x30, 0xC6, 0xA0, 0xB5, 0xA6, 0x2C, -0x4B, 0xB6, 0xB6, 0xB6, 0xB8, 0x7C, 0xF9, 0x32, 0x1B, 0x1B, -0x1B, 0x14, 0x45, 0xD1, 0xDD, 0x91, 0x52, 0xB6, 0x4E, 0x9F, -0xC6, 0x18, 0x8F, 0xB4, 0x10, 0xE2, 0x89, 0x10, 0xE2, 0xCB, -0xBA, 0xAE, 0xBB, 0x2C, 0xBC, 0xF7, 0x64, 0x59, 0xC6, 0x74, -0x3A, 0xE5, 0xE5, 0xCB, 0x97, 0x9C, 0x38, 0x71, 0x82, 0x24, -0x49, 0x90, 0x52, 0x52, 0x55, 0x15, 0x5B, 0x5B, 0x5B, 0xEC, -0xEC, 0xEC, 0x10, 0x63, 0xE4, 0xF1, 0xE3, 0xC7, 0xAC, 0xAD, -0xAD, 0xD1, 0xEB, 0xF5, 0xB0, 0xD6, 0xB6, 0x26, 0x6C, 0x9A, -0xA6, 0xF9, 0x07, 0xF0, 0x42, 0x7B, 0xEF, 0x5F, 0x08, 0x21, -0xFE, 0x52, 0x96, 0xE5, 0xF3, 0x2C, 0xCB, 0x36, 0x96, 0xCB, -0x25, 0xC7, 0xC7, 0xC7, 0xCC, 0xE7, 0x73, 0xEA, 0xBA, 0x66, -0x3C, 0x1E, 0x93, 0xA6, 0x29, 0x00, 0x65, 0x59, 0x72, 0xEE, -0xDC, 0x39, 0x2E, 0x5E, 0xBC, 0xC8, 0xC6, 0xC6, 0x06, 0x59, -0x96, 0x71, 0x74, 0x74, 0x44, 0x9E, 0xE7, 0x8C, 0xC7, 0x63, -0x06, 0x83, 0x01, 0xCE, 0x39, 0x92, 0x24, 0xF9, 0x4A, 0x08, -0x71, 0x1B, 0x98, 0xE9, 0xAA, 0xAA, 0x3C, 0x70, 0x7F, 0xB9, -0x5C, 0xFE, 0xE9, 0xD9, 0xB3, 0x67, 0x3B, 0xC7, 0xC7, 0xC7, -0xE4, 0x79, 0x8E, 0x94, 0xB2, 0x7B, 0x59, 0x08, 0x81, 0xB2, -0x2C, 0xB9, 0x70, 0xE1, 0x02, 0xBB, 0xBB, 0xBB, 0xCC, 0x66, -0x33, 0x16, 0x8B, 0x05, 0x49, 0x92, 0x10, 0x63, 0xEC, 0xD4, -0x57, 0x14, 0x05, 0xFD, 0x7E, 0x9F, 0xC1, 0x60, 0xF0, 0xC7, -0x34, 0x4D, 0xFF, 0x05, 0xA0, 0x9F, 0x3E, 0x7D, 0xDA, 0xF6, -0x98, 0x8F, 0x17, 0x8B, 0xC5, 0x4F, 0x0E, 0x0F, 0x0F, 0xFB, -0x49, 0x92, 0x30, 0x1C, 0x0E, 0x71, 0xCE, 0x11, 0x42, 0x20, -0xCB, 0x32, 0xCE, 0x9E, 0x3D, 0xCB, 0xF6, 0xF6, 0x36, 0x9B, -0x9B, 0x9B, 0xDC, 0xBD, 0x7B, 0x17, 0xEF, 0x3D, 0x4A, 0x29, -0x9C, 0x73, 0x08, 0x21, 0x28, 0xCB, 0x92, 0xF9, 0x7C, 0x8E, -0xF7, 0xFE, 0xB0, 0xAE, 0xEB, 0x4F, 0x16, 0x8B, 0xC5, 0xD7, -0x05, 0xCF, 0xF3, 0x9C, 0x3C, 0xCF, 0xA9, 0xAA, 0xEA, 0x0B, -0xA5, 0xD4, 0xB5, 0xD1, 0x68, 0xD4, 0x69, 0x3F, 0xC6, 0x48, -0x59, 0x96, 0x78, 0xEF, 0x39, 0x7F, 0xFE, 0x3C, 0x9B, 0x9B, -0x9B, 0xD4, 0x75, 0x4D, 0xAF, 0xD7, 0x03, 0xA0, 0xAA, 0xAA, -0xCE, 0x84, 0x2B, 0xF7, 0xD7, 0xDE, 0xFB, 0x5F, 0xD6, 0x75, -0x7D, 0xB0, 0xF2, 0xC3, 0x7F, 0x9B, 0xDD, 0x4A, 0x5E, 0x9F, -0x9E, 0x3C, 0x79, 0xF2, 0x57, 0x93, 0xC9, 0x84, 0x18, 0x23, -0xDE, 0xFB, 0xAE, 0x55, 0x3B, 0xE7, 0xBA, 0x06, 0xE7, 0x9C, -0xC3, 0x18, 0xD3, 0xB5, 0xF2, 0x55, 0x27, 0x0D, 0xCE, 0xB9, -0x6B, 0x52, 0xCA, 0xCF, 0x5E, 0xF5, 0x83, 0x7C, 0x63, 0xD8, -0xD4, 0x5A, 0xEB, 0xEB, 0x6B, 0x6B, 0x6B, 0xBF, 0xE8, 0xF7, -0xFB, 0xB3, 0x16, 0x30, 0x49, 0x12, 0x8C, 0x31, 0xDD, 0x34, -0x33, 0xC6, 0x60, 0x8C, 0x21, 0x84, 0xD0, 0x0E, 0xA0, 0x7F, -0x1B, 0x63, 0x7E, 0x2E, 0xA5, 0xFC, 0x75, 0xDB, 0x6E, 0xDE, -0x35, 0xD1, 0x9A, 0x18, 0xE3, 0xEF, 0xAC, 0xB5, 0xE7, 0x47, -0xA3, 0xD1, 0x1F, 0x86, 0xC3, 0xE1, 0xC1, 0x60, 0x30, 0x20, -0x49, 0x92, 0xEE, 0x8C, 0x31, 0x06, 0xE7, 0x5C, 0x54, 0x4A, -0xED, 0x03, 0xBF, 0x07, 0x3E, 0x00, 0x3E, 0x7B, 0x13, 0xFC, -0x9D, 0x43, 0x3F, 0xC6, 0xF8, 0x77, 0x21, 0xC4, 0xCF, 0xD2, -0x34, 0xFD, 0xEE, 0x70, 0x38, 0xDC, 0xD6, 0x5A, 0xBF, 0x0F, -0xAC, 0x01, 0x51, 0x6B, 0xFD, 0x22, 0x49, 0x92, 0x2F, 0x9D, -0x73, 0x9F, 0x7B, 0xEF, 0xBF, 0xFA, 0xBF, 0x87, 0xFE, 0x1B, -0xEB, 0x9F, 0xC0, 0x4B, 0x60, 0x2D, 0xC6, 0xF8, 0x2D, 0xA0, -0x01, 0x8E, 0x80, 0x19, 0xF0, 0xE2, 0x9B, 0x2E, 0xFF, 0x67, -0x00, 0xD2, 0x61, 0xAF, 0x5D, 0xF2, 0x84, 0xFD, 0x03, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, -0x82 -}; - -static const unsigned char Toolbar_Refresh1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x82, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x79, 0x4C, 0xD4, 0x47, 0x14, -0x9E, 0xD9, 0xF3, 0x77, 0xEC, 0x2E, 0xEB, 0x72, 0xB3, 0x2C, -0x28, 0x82, 0x28, 0x8A, 0x02, 0x22, 0xE1, 0x14, 0x11, 0x4B, -0x41, 0xA1, 0xA5, 0xB2, 0xB6, 0x14, 0xDB, 0x82, 0x46, 0xA1, -0x1E, 0x50, 0x2F, 0xD4, 0x9A, 0xD0, 0xB4, 0x8D, 0x69, 0xDA, -0x44, 0x63, 0x68, 0x43, 0x6A, 0x5B, 0x89, 0xB6, 0xC4, 0x3F, -0x80, 0xDA, 0xD6, 0x5A, 0x54, 0x4E, 0xB5, 0xF1, 0x68, 0x05, -0x39, 0x9A, 0x20, 0x64, 0xC5, 0x03, 0x2F, 0x0A, 0x42, 0x51, -0x77, 0xD9, 0x65, 0xAF, 0x99, 0xBE, 0x55, 0xB4, 0x42, 0x97, -0x46, 0x93, 0xBE, 0xE4, 0xCB, 0x7B, 0x73, 0xBD, 0x6F, 0xE6, -0xBD, 0x37, 0x33, 0x08, 0x39, 0x11, 0x6D, 0x85, 0x1F, 0xB7, -0xE6, 0xAC, 0x22, 0xD8, 0xD9, 0xD8, 0x8B, 0x8A, 0xC0, 0x59, -0x67, 0xEA, 0x4C, 0xED, 0x0E, 0x37, 0x37, 0xAE, 0xFD, 0xA3, -0xBB, 0x0A, 0xEF, 0xFF, 0x9D, 0x60, 0xE7, 0x4F, 0x29, 0xA2, -0x48, 0xBF, 0xF4, 0x55, 0xFE, 0x8A, 0x18, 0xE6, 0xCF, 0x3E, -0x5A, 0x98, 0x5C, 0xE5, 0xA5, 0x8E, 0xA9, 0x54, 0x16, 0xC6, -0xD7, 0xB0, 0xD5, 0x89, 0xF5, 0x4C, 0xC7, 0xA2, 0x46, 0x56, -0x97, 0x7C, 0x96, 0x6F, 0x5B, 0x72, 0xCE, 0xAD, 0x6A, 0x79, -0x6B, 0xC8, 0xBA, 0x82, 0xAB, 0x8B, 0x5D, 0x5F, 0x88, 0xC0, -0xC7, 0xDF, 0x37, 0x8D, 0xE7, 0x55, 0xBE, 0xEE, 0x34, 0x81, -0x8E, 0x1A, 0xA7, 0x6D, 0x0E, 0xF2, 0x8A, 0xB8, 0x21, 0x73, -0x61, 0x4A, 0xA5, 0x2E, 0x28, 0x8B, 0x73, 0x47, 0xA1, 0x9E, -0x1A, 0x12, 0xA8, 0x51, 0xDB, 0xE6, 0xB9, 0xB9, 0xEB, 0xB5, -0xF7, 0x2D, 0x57, 0xCB, 0x7A, 0x7A, 0xBB, 0xAE, 0xAC, 0xE9, -0x8A, 0xDF, 0xB6, 0xE9, 0x5A, 0x8A, 0xE8, 0xB9, 0x08, 0xDC, -0x78, 0xBF, 0xD5, 0x77, 0xCD, 0x3D, 0x88, 0x60, 0x21, 0xF6, -0x53, 0x86, 0x33, 0x97, 0x0D, 0x17, 0x84, 0x7A, 0xAB, 0x1E, -0x13, 0x8A, 0x31, 0xC2, 0x18, 0x53, 0x8A, 0x10, 0x25, 0x08, -0x0B, 0x30, 0x2C, 0x96, 0x20, 0xFC, 0xC0, 0x32, 0x38, 0xE5, -0x62, 0x4B, 0xCB, 0xA7, 0x7A, 0x7D, 0x5F, 0x45, 0xD1, 0x95, -0x04, 0x76, 0xA2, 0xBF, 0x71, 0xAC, 0xC5, 0xF5, 0xE1, 0xDE, -0x22, 0x86, 0x4B, 0xBD, 0x69, 0xE9, 0x44, 0xD7, 0xCC, 0x7F, -0xA0, 0x66, 0x63, 0x03, 0xC2, 0x12, 0x3B, 0x12, 0x5A, 0xC0, -0x9B, 0x9D, 0x22, 0x3A, 0x4A, 0x91, 0xDE, 0x82, 0x90, 0x01, -0x53, 0x68, 0x52, 0x64, 0x31, 0x83, 0x03, 0x60, 0x22, 0x2C, -0x15, 0xB4, 0xB4, 0xEB, 0x56, 0xCC, 0x09, 0xF4, 0x1D, 0x06, -0x37, 0xEB, 0x27, 0x8D, 0xD7, 0x07, 0x17, 0x92, 0x8A, 0xF7, -0xDF, 0xDC, 0x44, 0x3E, 0xB9, 0xB5, 0x8C, 0xE4, 0xF6, 0x28, -0x49, 0x66, 0xBB, 0x8C, 0x24, 0x9F, 0x91, 0x93, 0xB8, 0xE3, -0x3C, 0x49, 0x38, 0xC1, 0x92, 0x45, 0x75, 0x0C, 0x49, 0x6D, -0x50, 0xDA, 0x93, 0x6A, 0x59, 0x5B, 0x62, 0xBD, 0xC4, 0x9E, -0x50, 0x2B, 0x26, 0xD1, 0xC7, 0xC4, 0x24, 0xA2, 0x52, 0x42, -0x42, 0x0E, 0x48, 0xC8, 0x82, 0x0A, 0xA9, 0x31, 0xE7, 0x94, -0x3A, 0xDA, 0xA9, 0xF3, 0xB7, 0xCA, 0x3D, 0x70, 0x49, 0x6B, -0x72, 0xE7, 0xFB, 0xBA, 0x45, 0x64, 0xB5, 0x4E, 0x45, 0xB2, -0xBB, 0x78, 0xBA, 0xAC, 0x99, 0xA7, 0x0B, 0xEB, 0x78, 0x12, -0x75, 0x84, 0x23, 0xAB, 0x4E, 0x47, 0x1F, 0xDF, 0xDB, 0xBD, -0x26, 0xB1, 0xF4, 0x62, 0xA1, 0xF2, 0x1B, 0xDD, 0xD6, 0xA0, -0x92, 0xB6, 0xCC, 0x2D, 0xD9, 0x4D, 0xC1, 0xBD, 0x0B, 0xAA, -0xC4, 0x24, 0xF4, 0xA0, 0x88, 0x04, 0x97, 0x89, 0x69, 0xF2, -0x11, 0xFE, 0xDC, 0xCB, 0x87, 0x19, 0xA7, 0xB9, 0x40, 0x79, -0x3F, 0x7B, 0x47, 0x6D, 0xE8, 0x08, 0xB7, 0xE6, 0x76, 0x78, -0xDA, 0xB3, 0x3B, 0x38, 0xA2, 0x6D, 0x63, 0x69, 0xFA, 0xEF, -0x1C, 0x4D, 0x3E, 0xCD, 0x93, 0xEC, 0xBA, 0xE9, 0xA4, 0xE8, -0x92, 0x7F, 0xE4, 0xC4, 0x35, 0xE5, 0x97, 0x77, 0xCA, 0x8A, -0x7F, 0xCB, 0x28, 0x9D, 0x7F, 0x88, 0xB7, 0x27, 0x56, 0xB3, -0xF7, 0x32, 0x6B, 0x79, 0xFF, 0x49, 0xC3, 0x93, 0x53, 0x13, -0xE9, 0xFE, 0xFA, 0xC9, 0xF9, 0xBB, 0xB2, 0x1A, 0x03, 0xCF, -0x6A, 0xCF, 0x7B, 0x8E, 0x64, 0x5D, 0x54, 0xD8, 0x32, 0xCE, -0xCB, 0xEC, 0x8B, 0x1B, 0x38, 0xB2, 0xB6, 0x79, 0x1A, 0x59, -0xDF, 0xCA, 0x1F, 0x9A, 0x6C, 0x6D, 0xD1, 0x99, 0x94, 0xA5, -0xCB, 0x7E, 0x94, 0x47, 0x4D, 0xEA, 0x7C, 0xA2, 0x68, 0x8F, -0x46, 0x7A, 0x67, 0xD5, 0xCE, 0xCE, 0x4D, 0xAF, 0xD7, 0x54, -0x2E, 0xA9, 0x75, 0x1D, 0xCC, 0x68, 0xD4, 0xD8, 0x36, 0x36, -0xBB, 0x0E, 0x69, 0xBF, 0x67, 0xC5, 0x8E, 0x71, 0xF5, 0x2A, -0x11, 0xCE, 0xAA, 0x0C, 0xAD, 0xF8, 0xBC, 0xE3, 0xC3, 0xEF, -0x4A, 0x2E, 0x14, 0xAC, 0xCD, 0x6F, 0x5C, 0x1A, 0x92, 0x57, -0x97, 0x28, 0x7C, 0x6E, 0x82, 0x67, 0x25, 0xBD, 0x72, 0xB6, -0x34, 0xAD, 0x66, 0xFA, 0x92, 0x1D, 0xAD, 0xF1, 0x69, 0x4F, -0xFA, 0xA6, 0x6E, 0x10, 0x32, 0x6F, 0x37, 0xF1, 0x7D, 0x5F, -0x74, 0x6F, 0x22, 0xE7, 0xFA, 0xEB, 0xC8, 0xB1, 0x3B, 0xDF, -0xDA, 0x4B, 0xBB, 0x77, 0xF4, 0x15, 0x37, 0xAF, 0xF8, 0x61, -0x65, 0x43, 0xEC, 0x96, 0x9C, 0x13, 0x71, 0x31, 0xD9, 0xC7, -0xA2, 0xA5, 0x8E, 0xB9, 0x78, 0x32, 0xC7, 0x19, 0x47, 0xE5, -0x01, 0x33, 0xDC, 0x62, 0x35, 0x7B, 0xE3, 0x6A, 0xCF, 0x38, -0x1B, 0x2F, 0x68, 0x96, 0x6D, 0x65, 0x84, 0xDE, 0x7B, 0x66, -0x71, 0x79, 0x48, 0xC6, 0x42, 0x9D, 0x4A, 0xAC, 0x48, 0x04, -0x40, 0xD8, 0x48, 0x6F, 0x3E, 0xEC, 0xB5, 0x75, 0xEA, 0xDA, -0x5F, 0x3D, 0x98, 0xD2, 0x79, 0xD2, 0x69, 0xC6, 0xDF, 0x6C, -0x92, 0x4B, 0x47, 0x4C, 0xD2, 0xA3, 0x9A, 0x29, 0x61, 0x21, -0xFB, 0xAE, 0x4C, 0x3F, 0xE4, 0xCA, 0xAA, 0x76, 0xBD, 0xE3, -0xBB, 0xBB, 0xFF, 0xD9, 0x39, 0x4A, 0x14, 0x55, 0x7D, 0x65, -0xF0, 0xF6, 0x67, 0xF7, 0xC5, 0x4D, 0x42, 0x8E, 0x93, 0x20, -0x95, 0x42, 0x8E, 0x65, 0xBC, 0x10, 0x31, 0x8C, 0x15, 0x09, -0xC4, 0x23, 0x56, 0x56, 0x38, 0xDA, 0xEC, 0x98, 0xE7, 0x34, -0x6E, 0xA1, 0xF9, 0x1E, 0xBB, 0x35, 0x6C, 0xFC, 0x6B, 0xEE, -0x2A, 0x37, 0x01, 0x27, 0xC7, 0x61, 0x7D, 0xA6, 0xDB, 0x05, -0x71, 0xEF, 0xCE, 0x08, 0x88, 0x5B, 0x17, 0xC4, 0xC6, 0x14, -0x04, 0xA9, 0xC3, 0x56, 0xFB, 0xBE, 0xD1, 0x35, 0x78, 0xFD, -0x2B, 0xDD, 0xBD, 0x1B, 0x2E, 0x77, 0x0C, 0x37, 0x50, 0xBF, -0xED, 0x3A, 0xEA, 0xB7, 0xEB, 0xB0, 0x01, 0x0F, 0x20, 0x8B, -0xC0, 0x80, 0x86, 0x87, 0x07, 0x1A, 0xCA, 0x62, 0xAE, 0x1E, -0xF8, 0x57, 0x88, 0xBC, 0xB7, 0x21, 0xA1, 0x87, 0x5A, 0xE9, -0x11, 0x18, 0xA1, 0xE9, 0xD6, 0x48, 0x66, 0xCA, 0x11, 0x63, -0x41, 0x8C, 0xC2, 0x84, 0x6C, 0xCC, 0x75, 0x74, 0xCF, 0x7A, -0x0B, 0xDD, 0x37, 0x12, 0x6A, 0x1C, 0x85, 0x9B, 0x6B, 0xA5, -0xD8, 0x62, 0x82, 0x1B, 0xAD, 0x87, 0xDB, 0x6C, 0xA5, 0x48, -0x08, 0xA9, 0x67, 0xA5, 0x02, 0xC4, 0xCB, 0x30, 0x72, 0x91, -0x49, 0xA8, 0x68, 0x48, 0x92, 0x5F, 0x9D, 0x34, 0x54, 0x3E, -0x8E, 0xC0, 0xE1, 0x1C, 0x5E, 0x1B, 0x0F, 0x30, 0xDD, 0x67, -0x85, 0x31, 0xF9, 0x52, 0x17, 0xCF, 0x7C, 0x21, 0x2B, 0x14, -0x1B, 0xC4, 0x7D, 0x54, 0xEE, 0x62, 0xC3, 0x4A, 0x05, 0x7E, -0x34, 0xDB, 0x60, 0x41, 0x74, 0xC4, 0x84, 0xB0, 0x79, 0x04, -0xF4, 0x30, 0xC5, 0x23, 0x0F, 0x28, 0xB2, 0xD9, 0x28, 0x95, -0x48, 0x31, 0xE6, 0x1C, 0x04, 0x72, 0xA9, 0x59, 0xFC, 0x97, -0xC0, 0xEF, 0x78, 0xE6, 0xC3, 0x81, 0xA7, 0x04, 0x5E, 0x1B, -0xE1, 0x19, 0x63, 0x90, 0x2B, 0x10, 0x04, 0x42, 0x73, 0x0A, -0x68, 0xC1, 0xCC, 0x79, 0xD2, 0xDC, 0x11, 0xA9, 0x30, 0xD3, -0x26, 0x35, 0x8B, 0x58, 0x05, 0xC6, 0x32, 0x58, 0xCC, 0x32, -0xB0, 0x7B, 0x78, 0xEE, 0x8C, 0x16, 0xE4, 0x38, 0x01, 0xB5, -0x19, 0x21, 0xA5, 0x7A, 0x84, 0x4C, 0x66, 0x42, 0x59, 0x06, -0x18, 0x44, 0x56, 0xCA, 0x0B, 0x98, 0x53, 0xBF, 0xA6, 0xE9, -0x93, 0x9F, 0x6C, 0xFC, 0x11, 0x81, 0xF7, 0x66, 0x24, 0x86, -0x6C, 0xF8, 0x82, 0xA9, 0x06, 0x30, 0x00, 0x11, 0x90, 0x88, -0xFD, 0x03, 0xB9, 0x68, 0xD6, 0x87, 0x5B, 0x69, 0x91, 0x1A, -0xFC, 0x24, 0xAC, 0xFD, 0x69, 0xC6, 0xE0, 0x35, 0x45, 0x14, -0x0A, 0xC6, 0x6A, 0xC6, 0xE8, 0xE1, 0x00, 0xED, 0xB1, 0x0E, -0xD1, 0xCB, 0xA9, 0x8B, 0xFD, 0x5F, 0x69, 0xE8, 0xBE, 0x4D, -0xC5, 0x26, 0x61, 0x51, 0x5B, 0x9E, 0xB1, 0x6C, 0x5C, 0x52, -0x3D, 0x37, 0x20, 0x0C, 0x21, 0xE2, 0x7C, 0x8A, 0x91, 0x0A, -0xE0, 0x05, 0x76, 0x00, 0xE8, 0x30, 0x40, 0x94, 0x7A, 0x3B, -0x8A, 0x9E, 0xB3, 0x57, 0x9E, 0x13, 0x71, 0x50, 0xF9, 0x71, -0x54, 0x95, 0xA2, 0x3C, 0xBC, 0x82, 0xA9, 0x0C, 0xFD, 0x5A, -0x7C, 0x38, 0x78, 0x9F, 0xA8, 0xCC, 0xAF, 0x44, 0xB0, 0x0E, -0xE6, 0xA4, 0xFB, 0x6C, 0x47, 0x2F, 0x6D, 0xEC, 0x90, 0xF7, -0x66, 0xFD, 0x12, 0x60, 0xF0, 0xDF, 0x25, 0x88, 0x85, 0x3E, -0x99, 0xB3, 0xE2, 0x79, 0x24, 0x30, 0x28, 0x1E, 0x23, 0x48, -0x02, 0xA4, 0x80, 0x9D, 0xE8, 0x20, 0x02, 0xCC, 0x01, 0xCC, -0x80, 0xF6, 0x2C, 0xD0, 0x0B, 0x41, 0xE7, 0x82, 0x2E, 0x04, -0x14, 0x81, 0x5D, 0x14, 0xB6, 0x4F, 0xB8, 0x3F, 0xE1, 0x4B, -0x45, 0x0D, 0xD8, 0xCB, 0x1D, 0x9B, 0x1C, 0x17, 0xA2, 0x71, -0x95, 0xB4, 0x15, 0xFE, 0x88, 0xC7, 0xC9, 0xF6, 0x01, 0xA8, -0x00, 0x3C, 0x40, 0x82, 0x1E, 0x7F, 0x4E, 0x78, 0xAC, 0xB4, -0x45, 0xE8, 0x9F, 0xBF, 0xC4, 0x36, 0xD6, 0xA7, 0x00, 0x40, -0xF0, 0xD0, 0x25, 0x40, 0x4B, 0xDF, 0x1E, 0x64, 0x9A, 0xF4, -0x14, 0x1E, 0xF9, 0x08, 0xC3, 0x2E, 0x24, 0x00, 0x05, 0xEC, -0xC8, 0x0B, 0xF4, 0x54, 0x40, 0xB0, 0xE3, 0x14, 0xD0, 0x9E, -0x0B, 0x7A, 0x2E, 0xE8, 0xD9, 0xA0, 0x83, 0x00, 0x7E, 0x60, -0x3B, 0xC6, 0x63, 0xC7, 0x4E, 0xE6, 0x31, 0xA9, 0xE3, 0xFF, -0x12, 0x95, 0x16, 0xE1, 0x89, 0x98, 0x10, 0x5A, 0x11, 0x40, -0xEA, 0xF5, 0xDE, 0xF8, 0xFE, 0xBF, 0x01, 0xF7, 0x76, 0x0D, -0xC5, 0xC1, 0x73, 0x36, 0xCA, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x04, 0x89, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x7C, 0x55, 0x4D, 0x88, 0x1C, 0x45, 0x14, -0xFE, 0xAA, 0xEA, 0x55, 0x55, 0x77, 0xCF, 0xF4, 0xEC, 0x6E, -0xC2, 0x46, 0xE2, 0xC5, 0x8B, 0xB7, 0x5C, 0x02, 0x62, 0x7E, -0xBC, 0x45, 0x16, 0x4C, 0x50, 0x44, 0x05, 0x2F, 0x26, 0x7A, -0xF1, 0xE0, 0xC1, 0x9F, 0x8B, 0x47, 0xAF, 0xC1, 0x83, 0x10, -0xC8, 0x41, 0x04, 0xC1, 0x1F, 0x44, 0xF0, 0xA0, 0xE4, 0x22, -0xB8, 0x88, 0x90, 0x10, 0x10, 0x44, 0x11, 0x44, 0x88, 0x04, -0xBC, 0x04, 0x12, 0x02, 0xEB, 0x1E, 0x66, 0x66, 0x67, 0x76, -0x67, 0xA6, 0xBB, 0xAA, 0x5E, 0x95, 0x07, 0xA7, 0xCB, 0xDD, -0xB0, 0xC9, 0x83, 0xA2, 0xBB, 0x69, 0xEA, 0xFD, 0x7C, 0xEF, -0x7D, 0xDF, 0x13, 0xB7, 0x6F, 0xDF, 0xC6, 0x7E, 0xB3, 0xD6, -0x42, 0x08, 0x01, 0x29, 0x25, 0x26, 0x93, 0x89, 0x94, 0x52, -0x9E, 0x2C, 0x8A, 0x42, 0x3B, 0xE7, 0xCE, 0x7B, 0xEF, 0xCF, -0xA6, 0x94, 0xA2, 0x31, 0xE6, 0xE6, 0x60, 0x30, 0xB8, 0xA1, -0xB5, 0x0E, 0x42, 0x88, 0x3F, 0x8D, 0x31, 0x88, 0x31, 0x1E, -0xF0, 0x23, 0x84, 0x00, 0x00, 0x10, 0x0E, 0xB1, 0x94, 0x12, -0x98, 0xF9, 0xE5, 0xAA, 0xAA, 0xDE, 0x50, 0x4A, 0xBD, 0x54, -0x96, 0x25, 0xAC, 0xB5, 0xF9, 0x9F, 0x10, 0xE2, 0xC2, 0xBE, -0xF7, 0xAF, 0x63, 0x8C, 0xDF, 0xA4, 0x94, 0x7E, 0xEC, 0x9C, -0x1E, 0x08, 0xF4, 0x60, 0x05, 0x5A, 0xEB, 0xBE, 0x31, 0xE6, -0x0B, 0x6B, 0xED, 0xAB, 0x44, 0x84, 0x94, 0x12, 0xA4, 0x94, -0x10, 0x42, 0xC0, 0x7B, 0x9F, 0xAB, 0xD4, 0x5A, 0x43, 0x29, -0x85, 0x94, 0x12, 0x42, 0x08, 0x08, 0x21, 0x7C, 0xCE, 0xCC, -0xEF, 0x08, 0x21, 0x9A, 0x87, 0x56, 0x10, 0x63, 0x7C, 0x9C, -0x88, 0x7E, 0xA8, 0xEB, 0xFA, 0x64, 0xE7, 0xB0, 0x6D, 0x5B, -0x00, 0x80, 0x31, 0x26, 0x07, 0x50, 0x4A, 0x41, 0x08, 0x81, -0x94, 0x12, 0x94, 0x52, 0xD0, 0x5A, 0x83, 0x88, 0xDE, 0x6C, -0x9A, 0xE6, 0x04, 0x33, 0x9F, 0x17, 0x42, 0x4C, 0x3A, 0x9F, -0x52, 0x29, 0x05, 0x22, 0x42, 0x8C, 0x71, 0x8D, 0x88, 0xBE, -0xAF, 0xAA, 0xEA, 0x64, 0x97, 0x55, 0x8C, 0x11, 0x31, 0x46, -0xB4, 0x6D, 0x8B, 0xB6, 0x6D, 0xE1, 0xBD, 0x87, 0x73, 0x0E, -0xCE, 0x39, 0x78, 0xEF, 0xC1, 0xCC, 0x60, 0xE6, 0x8C, 0xBF, -0x31, 0xE6, 0x8C, 0x94, 0x72, 0x33, 0xA5, 0xB4, 0x92, 0x03, -0xA4, 0x94, 0x10, 0x63, 0x24, 0x22, 0xFA, 0xAA, 0xD7, 0xEB, -0x3D, 0x15, 0x63, 0x84, 0x73, 0x2E, 0x5F, 0xEC, 0xBE, 0x9B, -0xA6, 0xC9, 0xC7, 0x7B, 0x8F, 0x10, 0x02, 0x98, 0x19, 0xCB, -0xFB, 0x60, 0x66, 0x08, 0x21, 0x60, 0xAD, 0x7D, 0x46, 0x4A, -0xF9, 0x51, 0x4A, 0xE9, 0x3F, 0x78, 0x8D, 0x31, 0xD0, 0x5A, -0x3F, 0x5B, 0xD7, 0xF5, 0x0B, 0x5A, 0xEB, 0x9C, 0xA5, 0xF7, -0x1E, 0x29, 0x25, 0x10, 0xFD, 0x87, 0x62, 0x08, 0x21, 0xFF, -0xB3, 0xD6, 0xA2, 0x2C, 0x4B, 0x10, 0xD1, 0x81, 0x4A, 0x99, -0xB9, 0xEB, 0xE3, 0x6B, 0x4A, 0xA9, 0xD3, 0x4A, 0x29, 0x90, -0x31, 0xA6, 0x94, 0x52, 0xBE, 0x6F, 0x8C, 0x11, 0x31, 0x46, -0x28, 0xA5, 0xB2, 0x33, 0x21, 0x04, 0x84, 0x10, 0x60, 0x66, -0xCC, 0x66, 0xB3, 0xEC, 0x60, 0x3E, 0x9F, 0x43, 0x29, 0x05, -0xA5, 0x54, 0x86, 0x47, 0x4A, 0x99, 0xA7, 0x4C, 0x29, 0xD5, -0x17, 0x42, 0xBC, 0x95, 0x52, 0xFA, 0x5D, 0xDC, 0xBB, 0x77, -0xEF, 0x84, 0xB5, 0xF6, 0x2F, 0xAD, 0x35, 0x62, 0x8C, 0xD8, -0x8F, 0xFF, 0xDD, 0xBB, 0x77, 0x71, 0xE5, 0xCA, 0x95, 0x0C, -0x8B, 0xF7, 0x1E, 0x4A, 0x29, 0x94, 0x65, 0x09, 0x00, 0xD8, -0xD8, 0xD8, 0xC0, 0xC5, 0x8B, 0x17, 0xA1, 0xB5, 0xCE, 0x41, -0x3A, 0x0E, 0x31, 0x73, 0x12, 0x42, 0x9C, 0xA0, 0xA6, 0x69, -0x6A, 0xAD, 0x35, 0x42, 0x08, 0x39, 0x63, 0xAD, 0x35, 0x3A, -0xB8, 0xAE, 0x5D, 0xBB, 0x86, 0x87, 0x59, 0x55, 0x55, 0xB8, -0x74, 0xE9, 0x12, 0x88, 0x28, 0xF7, 0xA3, 0xEB, 0x49, 0x4A, -0x49, 0x78, 0xEF, 0x0D, 0x85, 0x10, 0x2E, 0x2C, 0x16, 0x0B, -0x48, 0x29, 0xA1, 0x94, 0xCA, 0x59, 0x10, 0x51, 0xC6, 0x7A, -0xB1, 0x58, 0x1C, 0x1A, 0xA0, 0x63, 0x3D, 0x33, 0xC3, 0x39, -0x87, 0x94, 0x52, 0x86, 0x29, 0xA5, 0x84, 0xB6, 0x6D, 0x9F, -0xA0, 0xBD, 0xBD, 0xBD, 0x33, 0x8B, 0xC5, 0x22, 0x13, 0xAA, -0x7B, 0x56, 0x55, 0x85, 0xF1, 0x78, 0x9C, 0x2F, 0x1D, 0x66, -0xCE, 0x39, 0x8C, 0x46, 0xA3, 0x0E, 0x92, 0x03, 0x32, 0xB1, -0xEC, 0xC9, 0xD3, 0x34, 0x9F, 0xCF, 0xE3, 0xFE, 0x31, 0xEB, -0x4E, 0xD3, 0x34, 0x98, 0x4C, 0x26, 0x78, 0x94, 0xB5, 0x6D, -0x8B, 0xF1, 0x78, 0x0C, 0xAD, 0x75, 0x27, 0x1B, 0xFF, 0x33, -0x98, 0x08, 0x42, 0x88, 0x20, 0x43, 0x08, 0x37, 0x97, 0x54, -0xCF, 0x4D, 0xEE, 0xC6, 0xB2, 0xAB, 0xEC, 0x51, 0x01, 0x9A, -0xA6, 0x39, 0x40, 0xB8, 0xCE, 0xC7, 0xF2, 0xFB, 0x37, 0x92, -0x52, 0x5E, 0x07, 0x90, 0x65, 0xA0, 0x23, 0x51, 0xD3, 0x34, -0xB8, 0x73, 0xE7, 0x4E, 0x96, 0x8A, 0xC3, 0x6C, 0x3C, 0x1E, -0xE3, 0xFE, 0xFD, 0xFB, 0x58, 0x5F, 0x5F, 0x47, 0x51, 0x14, -0x30, 0xC6, 0xE4, 0x5E, 0x2E, 0xA5, 0xE7, 0x1F, 0x62, 0xE6, -0x39, 0x33, 0xA3, 0x69, 0x1A, 0x38, 0xE7, 0xB0, 0x58, 0x2C, -0x30, 0x9D, 0x4E, 0xB1, 0xBB, 0xBB, 0x8B, 0xE1, 0x70, 0x88, -0xBA, 0xAE, 0x33, 0x27, 0xBA, 0x8B, 0x21, 0x84, 0xDC, 0xA7, -0xE1, 0x70, 0x88, 0xB6, 0x6D, 0x31, 0x18, 0x0C, 0x50, 0xD7, -0x75, 0x0E, 0xA4, 0xB5, 0x6E, 0x53, 0x4A, 0x8D, 0xD8, 0xDC, -0xDC, 0x94, 0xCC, 0xFC, 0xDD, 0xF6, 0xF6, 0xF6, 0x2B, 0x3B, -0x3B, 0x3B, 0xD8, 0xDB, 0xDB, 0xC3, 0x6C, 0x36, 0x83, 0x94, -0x12, 0xAB, 0xAB, 0xAB, 0xB0, 0xD6, 0xC2, 0x39, 0x87, 0x23, -0x47, 0x8E, 0xE0, 0xD4, 0xA9, 0x53, 0x68, 0x9A, 0x06, 0xB7, -0x6E, 0xDD, 0x82, 0xF7, 0x1E, 0x55, 0x55, 0x65, 0x76, 0x13, -0x11, 0xEA, 0xBA, 0x46, 0xBF, 0xDF, 0x47, 0x55, 0x55, 0xE8, -0xF5, 0x7A, 0x1F, 0x13, 0xD1, 0x7B, 0x34, 0x1A, 0x8D, 0x22, -0x33, 0x5F, 0x9D, 0x4E, 0xA7, 0xCF, 0x6F, 0x6D, 0x6D, 0xD9, -0xB6, 0x6D, 0x61, 0xAD, 0xC5, 0x60, 0x30, 0x40, 0xBF, 0xDF, -0xCF, 0x25, 0x1F, 0x3F, 0x7E, 0x1C, 0xC7, 0x8E, 0x1D, 0x83, -0xF7, 0x1E, 0xC3, 0xE1, 0x10, 0xDB, 0xDB, 0xDB, 0x9D, 0x8A, -0x42, 0x4A, 0x89, 0xB6, 0x6D, 0xB1, 0xB3, 0xB3, 0xD3, 0xE9, -0xD6, 0x38, 0x84, 0xF0, 0x25, 0x11, 0x25, 0xDA, 0xDA, 0xDA, -0x82, 0x52, 0xEA, 0x67, 0x66, 0xFE, 0x56, 0x08, 0xF1, 0xBA, -0x94, 0x32, 0x67, 0xC1, 0xCC, 0x08, 0x21, 0x64, 0x4E, 0x84, -0x10, 0x90, 0x52, 0x82, 0xB5, 0x16, 0x29, 0x25, 0x38, 0xE7, -0xA0, 0xB5, 0x46, 0x51, 0x14, 0x10, 0x42, 0xA0, 0x6D, 0x5B, -0xCC, 0xE7, 0x73, 0x10, 0xD1, 0xA7, 0xD3, 0xE9, 0xF4, 0x0F, -0x66, 0x06, 0x69, 0xAD, 0x21, 0xA5, 0x84, 0x73, 0xEE, 0xDD, -0xA3, 0x47, 0x8F, 0x3E, 0x19, 0x63, 0x3C, 0xDB, 0x69, 0xBD, -0x73, 0x0E, 0x31, 0x46, 0x94, 0x65, 0x89, 0xB2, 0x2C, 0xF3, -0x7C, 0x17, 0x45, 0x01, 0x22, 0x42, 0xD3, 0x34, 0x07, 0x98, -0xBF, 0x6C, 0xEC, 0x8D, 0x94, 0xD2, 0xE5, 0x6E, 0x67, 0xC8, -0x7D, 0x43, 0x31, 0x51, 0x4A, 0x5D, 0x58, 0x5F, 0x5F, 0xFF, -0x65, 0x30, 0x18, 0x80, 0x99, 0xF3, 0x0E, 0x30, 0xC6, 0xC0, -0x18, 0x93, 0x49, 0xD4, 0x41, 0xD3, 0x89, 0x62, 0xD7, 0xF4, -0xA2, 0x28, 0x7E, 0x92, 0x52, 0xBE, 0x08, 0x60, 0x96, 0xF7, -0xC1, 0x03, 0x1B, 0x6D, 0x02, 0xE0, 0x5C, 0x55, 0x55, 0x9F, -0xF4, 0x7A, 0x3D, 0x10, 0x51, 0x76, 0xDE, 0xC9, 0xF6, 0x52, -0x8E, 0xF3, 0x8E, 0xF6, 0xDE, 0x23, 0xC6, 0xE8, 0xA4, 0x94, -0x1F, 0x0A, 0x21, 0x9E, 0x4B, 0x29, 0xCD, 0xF6, 0xFB, 0x94, -0x87, 0x2C, 0x7C, 0xC7, 0xCC, 0x6F, 0x6B, 0xAD, 0x37, 0x56, -0x56, 0x56, 0xAE, 0xAE, 0xAD, 0xAD, 0x61, 0x75, 0x75, 0x15, -0xC6, 0x98, 0x03, 0x2C, 0x5D, 0xC2, 0xE6, 0xA4, 0x94, 0x97, -0x01, 0x9C, 0x03, 0xF0, 0xC1, 0x61, 0x5C, 0xA1, 0x87, 0x91, -0x28, 0xC6, 0x78, 0x3D, 0xA5, 0x74, 0xDD, 0x5A, 0xFB, 0x59, -0x51, 0x14, 0xA5, 0x10, 0xE2, 0xB1, 0x18, 0xE3, 0x69, 0x00, -0x41, 0x4A, 0xF9, 0xAB, 0x52, 0x6A, 0x44, 0x44, 0xBB, 0xCC, -0xFC, 0xF7, 0xA3, 0xE4, 0xE4, 0xDF, 0x01, 0x00, 0xA3, 0xE7, -0xE8, 0xEB, 0x29, 0x7A, 0xCB, 0x6D, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote1_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, -0x00, 0x00, 0x00, 0x16, 0x08, 0x06, 0x00, 0x00, 0x00, 0xC4, -0xB4, 0x6C, 0x3B, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0F, 0xD7, 0x00, 0x00, 0x0F, 0xD7, 0x01, -0xD6, 0x33, 0x5E, 0x3F, 0x00, 0x00, 0x07, 0xB1, 0x49, 0x44, -0x41, 0x54, 0x38, 0x11, 0x01, 0xA6, 0x07, 0x59, 0xF8, 0x03, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x0D, 0x0D, 0x06, -0x68, 0x67, 0x6A, 0x57, 0x5F, 0x63, 0x5F, 0x61, 0x05, 0x04, -0x05, 0xE5, 0xD9, 0xD9, 0xD9, 0xEA, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, -0x03, 0x69, 0x69, 0x6C, 0x57, 0xCD, 0xCE, 0xD0, 0xD9, 0xD4, -0xE8, 0xC6, 0xFE, 0xCE, 0xDA, 0xC2, 0xFE, 0x77, 0x76, 0x84, -0xFB, 0x9B, 0x9B, 0x9F, 0xA0, 0x2F, 0x2F, 0x30, 0x1A, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, -0x02, 0x00, 0x4C, 0x4C, 0x4F, 0x3F, 0x8B, 0x8A, 0x8E, 0xA7, -0x03, 0x02, 0x0A, 0x6F, 0x1B, 0x1E, 0x10, 0x13, 0xE1, 0xDD, -0xEC, 0x00, 0x81, 0x76, 0x97, 0x00, 0xDA, 0xDA, 0xDE, 0x02, -0xD1, 0xD1, 0xD9, 0x2F, 0x5E, 0x5E, 0x5E, 0x5F, 0x0A, 0x0B, -0x07, 0xCC, 0xD7, 0xD7, 0xD6, 0xE0, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2F, 0x21, 0x70, 0x6F, 0x74, -0x89, 0x30, 0x31, 0x31, 0x53, 0xA2, 0xA1, 0xA9, 0x01, 0x11, -0x12, 0x0F, 0x00, 0xFA, 0xF9, 0xFB, 0x00, 0x0F, 0x0F, 0x0D, -0x00, 0xDD, 0xDD, 0xE0, 0x00, 0xD1, 0xD0, 0xD5, 0x00, 0x02, -0x03, 0x03, 0x00, 0x11, 0x11, 0x0F, 0x00, 0x59, 0x59, 0x51, -0xE9, 0x6B, 0x6B, 0x67, 0x46, 0x03, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, 0x0B, 0x77, 0x76, -0x7C, 0x7A, 0x6F, 0x6F, 0x73, 0xA3, 0xEE, 0xEE, 0xF1, 0x30, -0xA4, 0xA4, 0xAB, 0x01, 0x58, 0x58, 0x4F, 0x00, 0xD8, 0xD8, -0xDC, 0x00, 0xC7, 0xC6, 0xCB, 0x00, 0x20, 0x21, 0x1D, 0x00, -0x6D, 0x6E, 0x64, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x04, 0x04, -0x03, 0x01, 0x43, 0x43, 0x3E, 0x00, 0x9F, 0x9E, 0xA9, 0x0C, -0x0C, 0x0C, 0x11, 0x30, 0x01, 0x04, 0x04, 0x06, 0x05, 0x30, -0x2F, 0x37, 0x5B, 0xCD, 0xCE, 0xC4, 0xA0, 0xFF, 0xFF, 0xFF, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, -0x57, 0x59, 0x40, 0x62, 0x61, 0x66, 0x9B, 0x13, 0x13, 0x14, -0x23, 0xB9, 0xB9, 0xBE, 0x00, 0xEB, 0xEB, 0xED, 0x00, 0x1C, -0x1C, 0x19, 0x00, 0xBD, 0xBD, 0xC3, 0x00, 0x1A, 0x1A, 0x18, -0x00, 0x49, 0x49, 0x42, 0x00, 0x1F, 0x20, 0x1C, 0x00, 0x87, -0x86, 0x92, 0x00, 0x15, 0x15, 0x14, 0x00, 0x1D, 0x1D, 0x1A, -0x00, 0xB1, 0xB1, 0xB9, 0x00, 0x06, 0x05, 0x06, 0x00, 0x04, -0x05, 0x03, 0xFB, 0x03, 0xFF, 0xFF, 0xFF, 0xFE, 0x17, 0x16, -0x1E, 0x4F, 0x33, 0x33, 0x3A, 0x59, 0xEC, 0xED, 0xE8, 0xC8, -0x07, 0x07, 0x06, 0xFB, 0x82, 0x81, 0x86, 0x87, 0x56, 0x56, -0x5B, 0x98, 0xF2, 0xF1, 0xF4, 0x13, 0xB4, 0xB4, 0xBA, 0x00, -0x53, 0x54, 0x4B, 0x00, 0xD3, 0xD3, 0xD7, 0x00, 0xBA, 0xBA, -0xC0, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0xFA, 0xFB, 0xFB, 0x00, -0xD4, 0xD4, 0xD8, 0x00, 0x08, 0x07, 0x07, 0x00, 0x0E, 0x0E, -0x0D, 0x00, 0xF1, 0xF1, 0xF4, 0x00, 0xC3, 0xC2, 0xC8, 0x00, -0x09, 0x09, 0x09, 0x00, 0x07, 0x07, 0x07, 0x00, 0xF7, 0xF6, -0xF3, 0xA7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x22, 0x22, 0x29, 0x33, 0x50, 0x4F, 0x57, 0x8C, 0x3E, -0x3F, 0x36, 0x01, 0x17, 0x16, 0x18, 0x3E, 0xC5, 0xC5, 0xCA, -0x00, 0xD0, 0xD0, 0xD3, 0x00, 0x46, 0x47, 0x40, 0x00, 0xAC, -0xAA, 0xB3, 0x00, 0xED, 0xEE, 0xEF, 0x00, 0x02, 0x02, 0x02, -0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF8, 0xF8, 0xFA, 0x00, 0x0C, -0x0D, 0x0B, 0x00, 0x3B, 0x3B, 0x35, 0x00, 0xEB, 0xEA, 0xEE, -0x00, 0xD3, 0xD3, 0xD8, 0x00, 0x0A, 0x0A, 0x08, 0x00, 0x05, -0x06, 0x05, 0x00, 0xFB, 0xFA, 0xFA, 0xCA, 0xC3, 0xC4, 0xB3, -0x45, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x17, 0x17, 0x12, 0xF0, 0x48, 0x49, 0x41, 0x1A, 0xFE, 0xFE, -0x00, 0x25, 0xBD, 0xBD, 0xC3, 0x00, 0x2F, 0x2F, 0x2A, 0x00, -0x05, 0x05, 0x04, 0x00, 0x9C, 0x9A, 0xA5, 0x00, 0x01, 0x01, -0x01, 0x00, 0xFD, 0xFD, 0xFD, 0x00, 0x03, 0x02, 0x03, 0x00, -0x05, 0x07, 0x05, 0x00, 0x02, 0x02, 0x03, 0x00, 0x3B, 0x3B, -0x35, 0x00, 0xEE, 0xED, 0xF0, 0x00, 0xD7, 0xD7, 0xDC, 0x00, -0x0E, 0x0F, 0x0D, 0x00, 0x07, 0x06, 0x06, 0x00, 0xFB, 0xFB, -0xF9, 0xD1, 0xCA, 0xCC, 0xBD, 0x4C, 0xF9, 0xFA, 0xF8, 0xF3, -0x01, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x3A, 0x24, 0x88, -0x87, 0x8D, 0xBD, 0xDB, 0xDB, 0xDF, 0x1D, 0xB9, 0xB9, 0xBE, -0x00, 0x4F, 0x4F, 0x48, 0x00, 0xC9, 0xC9, 0xCD, 0x00, 0xD0, -0xD0, 0xD5, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x01, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0xF8, 0xF8, 0xF9, 0x00, 0xFA, -0xFA, 0xFA, 0x00, 0x54, 0x55, 0x4D, 0x00, 0xE7, 0xE6, 0xEA, -0x00, 0xD9, 0xD9, 0xDD, 0x00, 0x0B, 0x0B, 0x0A, 0x00, 0x07, -0x08, 0x07, 0x00, 0xFB, 0xFB, 0xF9, 0xD7, 0xBF, 0xC0, 0xB2, -0x43, 0xF1, 0xF1, 0xEE, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x01, -0x1F, 0x1F, 0x20, 0x13, 0x93, 0x92, 0x99, 0xC7, 0x18, 0x18, -0x18, 0x24, 0xD0, 0xD1, 0xD4, 0x00, 0x0E, 0x0D, 0x0C, 0x00, -0xA7, 0xA7, 0xAF, 0x00, 0xF0, 0xF0, 0xF1, 0x00, 0xFC, 0xFB, -0xFC, 0x00, 0x03, 0x04, 0x03, 0x00, 0xFF, 0xFF, 0xFF, 0x00, -0x15, 0x15, 0x13, 0x00, 0xF8, 0xF7, 0xF9, 0x00, 0x43, 0x44, -0x3D, 0x00, 0xCF, 0xCF, 0xD5, 0x00, 0xEC, 0xEB, 0xED, 0x00, -0x0C, 0x0C, 0x0C, 0x00, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, -0x00, 0xE6, 0xBA, 0xBC, 0xAD, 0x3B, 0xEA, 0xEA, 0xE6, 0xE1, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7E, -0x7D, 0x83, 0x9C, 0xD2, 0xD2, 0xD7, 0x24, 0xFF, 0xFF, 0x00, -0x00, 0xFA, 0xF9, 0xF9, 0x00, 0x98, 0xA4, 0xAC, 0x00, 0xFA, -0xFB, 0xFB, 0x00, 0x04, 0x03, 0x04, 0x00, 0xFE, 0xFF, 0xFF, -0x01, 0x06, 0x02, 0x02, 0xFF, 0x20, 0x21, 0x1E, 0x00, 0xF8, -0xF8, 0xF9, 0x00, 0x3B, 0x3B, 0x37, 0x00, 0xC1, 0xC0, 0xC6, -0x00, 0xFE, 0xFE, 0xFF, 0x00, 0x12, 0x13, 0x12, 0x00, 0x09, -0x09, 0x08, 0x00, 0x01, 0x01, 0x01, 0xF3, 0xBB, 0xBB, 0xAF, -0x4F, 0xEA, 0xEA, 0xE6, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x34, 0x34, -0x34, 0x3D, 0x12, 0x12, 0x0F, 0x00, 0x9E, 0x9E, 0xA7, 0x00, -0xC3, 0xC3, 0xC8, 0x00, 0xF2, 0xF2, 0xF4, 0x00, 0x07, 0x08, -0x06, 0x00, 0x01, 0x02, 0x01, 0x00, 0xFE, 0xFE, 0xFE, 0xFF, -0x01, 0x02, 0x02, 0x00, 0xFD, 0xFC, 0xFD, 0x00, 0x2F, 0x2E, -0x2A, 0x00, 0xB9, 0xB8, 0xBF, 0x00, 0x09, 0x0A, 0x0A, 0x00, -0x13, 0x12, 0x0E, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xFE, 0xFE, -0xFE, 0xFB, 0xC1, 0xC1, 0xB8, 0x57, 0xE1, 0xE2, 0xDC, 0xCD, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x2B, 0x2A, 0x2D, -0x20, 0x36, 0x37, 0x34, 0x34, 0x20, 0x21, 0x1C, 0x00, 0xC1, -0xC0, 0xC7, 0x00, 0x08, 0x08, 0x07, 0x00, 0xFC, 0xFB, 0xFC, -0x00, 0xFB, 0xFB, 0xFC, 0x00, 0x0D, 0x0C, 0x0B, 0x00, 0x2E, -0x2F, 0x2A, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0xC7, 0xC6, 0xCD, -0x00, 0x0E, 0x0E, 0x0E, 0x00, 0x11, 0x12, 0x11, 0x00, 0x11, -0x11, 0x10, 0x00, 0xFF, 0xFE, 0xFE, 0xFE, 0xCE, 0xCF, 0xC8, -0x6A, 0xD6, 0xD7, 0xCD, 0xB0, 0x8D, 0x8D, 0x8D, 0x99, 0x63, -0x63, 0x63, 0x6B, 0x3A, 0x3A, 0x3A, 0x3A, 0x03, 0x03, 0x03, -0xFC, 0xDB, 0xDB, 0xDB, 0xDD, 0x01, 0x23, 0x23, 0x24, 0x18, -0xB0, 0xAF, 0xB5, 0xD1, 0x22, 0x23, 0x1D, 0x15, 0xCE, 0xCE, -0xD3, 0x00, 0x7C, 0x7B, 0x88, 0x00, 0x05, 0x04, 0x04, 0x00, -0x0B, 0x0C, 0x0A, 0x00, 0x3E, 0x3E, 0x39, 0x00, 0xC9, 0xC8, -0xCF, 0x00, 0xEE, 0xEE, 0xF0, 0x00, 0x0E, 0x0F, 0x0D, 0x00, -0x0E, 0x0E, 0x0E, 0x00, 0x0D, 0x0D, 0x0C, 0x00, 0xFB, 0xFB, -0xFB, 0xFD, 0xCF, 0xCF, 0xC9, 0x72, 0xCA, 0xCA, 0xBF, 0x93, -0x57, 0x58, 0x57, 0x5C, 0x91, 0x91, 0x91, 0xA2, 0xD5, 0xD5, -0xD5, 0x00, 0xED, 0xED, 0xED, 0x00, 0x2B, 0x2B, 0x2B, 0xF8, -0x43, 0x43, 0x43, 0x24, 0x03, 0xEF, 0xEF, 0xEE, 0xF4, 0xEE, -0xEE, 0xEF, 0xD5, 0x33, 0x33, 0x37, 0x56, 0x1D, 0x1D, 0x19, -0x03, 0x2F, 0x30, 0x2B, 0x00, 0x05, 0x05, 0x05, 0x00, 0x14, -0x14, 0x13, 0x00, 0xB7, 0xB6, 0xBE, 0x01, 0xFA, 0xFA, 0xFB, -0x00, 0x0B, 0x0C, 0x0A, 0x00, 0x09, 0x09, 0x09, 0x00, 0x06, -0x06, 0x06, 0x00, 0xF6, 0xF5, 0xF5, 0xF1, 0xC8, 0xC9, 0xC0, -0x5E, 0xD0, 0xD0, 0xC7, 0xA0, 0x00, 0x00, 0xFF, 0x00, 0x54, -0x54, 0x54, 0x60, 0x33, 0x33, 0x33, 0x39, 0xF6, 0xEE, 0xEE, -0x00, 0x01, 0xFB, 0xFB, 0x00, 0x16, 0x1B, 0x1B, 0x04, 0xC0, -0xC0, 0xC0, 0xB7, 0x03, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xD5, -0xD3, 0xDC, 0xFD, 0xFD, 0xFE, 0xE0, 0x2D, 0x2C, 0x30, 0x4B, -0xE5, 0xE4, 0xE7, 0x03, 0xB0, 0xAF, 0xB7, 0x00, 0xD2, 0xD1, -0xD6, 0x00, 0x06, 0x07, 0x06, 0x00, 0x08, 0x07, 0x07, 0x00, -0x06, 0x06, 0x06, 0x00, 0x02, 0x02, 0x01, 0x00, 0xEB, 0xEB, -0xE7, 0xB7, 0xC1, 0xC3, 0xB7, 0x4F, 0xE2, 0xE2, 0xDB, 0xC6, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, -0x20, 0x2B, 0x1F, 0x1F, 0x1F, 0x47, 0xEF, 0xEF, 0xEF, 0x00, -0x17, 0x19, 0x19, 0x00, 0x05, 0x08, 0x08, 0x01, 0xCB, 0xCB, -0xCB, 0xB6, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x97, 0x97, 0x93, 0xA4, 0xD9, 0xD8, 0xD8, 0xDD, 0xEB, -0xEA, 0xF9, 0x85, 0x0A, 0x0A, 0x0C, 0x3C, 0x06, 0x06, 0x06, -0x04, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFC, 0xF0, -0xEF, 0xEC, 0xC3, 0xE0, 0xE2, 0xDA, 0x86, 0xE1, 0xE1, 0xDA, -0xBD, 0xFE, 0xFE, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0xE7, 0xE7, -0xDD, 0x08, 0x08, 0x08, 0xFF, 0xEF, 0x01, 0x01, 0x01, 0x02, -0x07, 0x07, 0x00, 0x01, 0x01, 0x01, 0x00, 0x19, 0x19, 0x19, -0x1D, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0xBE, 0xBF, 0xBB, 0xC7, 0x00, 0x00, -0x01, 0x42, 0x0A, 0x0A, 0x0D, 0x16, 0x0D, 0x0C, 0x10, 0x25, -0xFF, 0xFF, 0xFE, 0xFC, 0xF6, 0xF7, 0xF3, 0xDC, 0xF4, 0xF4, -0xF2, 0xED, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x06, -0x0B, 0x0B, 0x0B, 0x00, 0x1A, 0x1A, 0x1A, 0x00, 0x0C, 0x0C, -0x0C, 0x00, 0x07, 0x07, 0x07, 0x00, 0x1D, 0x1D, 0x1D, 0x2F, -0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -0x00, 0xF6, 0xF6, 0xF2, 0xEA, 0xF6, 0xF6, 0xF2, 0xEA, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xC9, 0xC9, 0xC9, 0xF0, -0xF0, 0xF0, 0xF3, 0x0F, 0x0F, 0x0F, 0x0E, 0x0B, 0x0B, 0x0B, -0x00, 0xF9, 0xF9, 0xF9, 0xFE, 0xC8, 0xC8, 0xC8, 0xC9, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x31, -0x31, 0x4D, 0xA0, 0xA0, 0xA0, 0xCF, 0xAC, 0xAC, 0xAC, 0xD0, -0x51, 0x51, 0x51, 0x6F, 0x01, 0x01, 0x01, 0x05, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x46, 0x33, -0xDB, 0xDA, 0xDB, 0xE3, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/X-Plastik.h b/Source/Core/DolphinWX/resources/X-Plastik.h deleted file mode 100644 index 904ee376de..0000000000 --- a/Source/Core/DolphinWX/resources/X-Plastik.h +++ /dev/null @@ -1,3040 +0,0 @@ -/* - Automatic generated header by: - - wxInclude by Kim De Deyn, use --help for more information. - Version 1.0, compiled at Sep 12 2007 17:26:17 - - Header: myheader - Macros: no - Const: yes -*/ - -#ifndef _WXINCLUDE_MYHEADER_2_H_ -#define _WXINCLUDE_MYHEADER_2_H_ - -static const unsigned char Toolbar_Browse2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x4B, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x95, 0x7F, 0x4C, 0x94, 0x75, 0x1C, -0xC7, 0xDF, 0xCF, 0x3D, 0x77, 0xCF, 0x73, 0xC7, 0xDD, 0x89, -0xDE, 0x1D, 0x1C, 0xC7, 0x1D, 0xBF, 0x39, 0x48, 0x4F, 0x1B, -0x01, 0x51, 0x21, 0xBA, 0x35, 0x32, 0x37, 0x18, 0x21, 0x67, -0x6A, 0x9A, 0x9B, 0x99, 0x26, 0xC1, 0x04, 0x6D, 0x18, 0x5B, -0x6C, 0x2E, 0xCB, 0x74, 0x1A, 0x96, 0x03, 0x5B, 0x83, 0xDC, -0x50, 0xFF, 0xA8, 0xB4, 0x31, 0x53, 0x1A, 0xE5, 0x1A, 0x5B, -0x7F, 0xE4, 0xA4, 0x16, 0x16, 0xFD, 0x93, 0xB5, 0x74, 0xB4, -0x45, 0x81, 0xFC, 0x88, 0xDF, 0xCA, 0xDD, 0x71, 0xF7, 0xF4, -0x3E, 0x4E, 0x1D, 0x22, 0x2A, 0x2C, 0xFA, 0xEE, 0x3E, 0xCF, -0xF7, 0xFB, 0x7C, 0x9F, 0xCF, 0xF7, 0xFD, 0xFA, 0x7C, 0x3F, -0xDF, 0x1F, 0x07, 0xCC, 0xA1, 0x94, 0x6F, 0x45, 0xD5, 0x5C, -0xFC, 0x83, 0x45, 0x35, 0x5B, 0xC7, 0xD7, 0x9E, 0xD3, 0xE5, -0xD5, 0x34, 0x28, 0x07, 0xF6, 0x14, 0x44, 0x16, 0xFD, 0x2F, -0x80, 0x57, 0xF7, 0x1E, 0x6B, 0x0E, 0xD6, 0x3B, 0x0F, 0x7E, -0x70, 0x76, 0xDE, 0x01, 0xEF, 0x95, 0x3A, 0xDE, 0x4D, 0xC9, -0xDC, 0xC6, 0x56, 0x3F, 0xE2, 0x96, 0xAE, 0x43, 0x5D, 0x65, -0x6C, 0xED, 0x7C, 0x02, 0x54, 0x3B, 0xAB, 0x2F, 0xBE, 0x3E, -0xD9, 0xF2, 0x76, 0xF1, 0xA1, 0x60, 0xFB, 0x3B, 0x97, 0xCB, -0xD6, 0xC4, 0x43, 0x3F, 0x2F, 0x80, 0xD3, 0x47, 0x5F, 0x3A, -0x27, 0x85, 0xC5, 0x51, 0xF7, 0x0A, 0xCD, 0x4F, 0x48, 0x2B, -0x44, 0x8D, 0x05, 0x9B, 0x2B, 0x2B, 0xCE, 0xFD, 0x27, 0x40, -0x59, 0x2E, 0xF4, 0x8D, 0x87, 0xB5, 0xFB, 0x37, 0xEC, 0xAE, -0x2F, 0x00, 0x3A, 0x01, 0x4F, 0x0F, 0x7B, 0x87, 0x08, 0x18, -0x64, 0xDD, 0x82, 0xB5, 0x25, 0xBB, 0x9F, 0x39, 0x5F, 0xE7, -0x38, 0x50, 0xE9, 0xC6, 0x82, 0x07, 0x01, 0xC4, 0x8A, 0xE2, -0x94, 0x9C, 0x32, 0xB7, 0xC5, 0x55, 0x55, 0x95, 0x57, 0xB4, -0x2E, 0x3F, 0xBF, 0x6A, 0x57, 0x71, 0x7E, 0xFD, 0xA1, 0xEA, -0x43, 0x07, 0xDD, 0xA5, 0xEF, 0x57, 0x2D, 0x59, 0xFE, 0xD6, -0x4A, 0xE0, 0x37, 0x60, 0xEC, 0x57, 0xBA, 0x06, 0xF8, 0xEB, -0x07, 0x84, 0x61, 0xBE, 0xFF, 0x05, 0xA8, 0x7F, 0x41, 0x6A, -0xD6, 0xCB, 0x2B, 0x56, 0x15, 0x3D, 0xFB, 0x46, 0xC9, 0xF6, -0x9C, 0x7D, 0x1B, 0xD7, 0x24, 0x56, 0xB8, 0x57, 0x25, 0xE6, -0xBC, 0xB2, 0x25, 0x35, 0xA6, 0xF0, 0x69, 0xBF, 0xC1, 0x1E, -0x31, 0xF2, 0x48, 0x6B, 0xBB, 0xFF, 0x77, 0xF5, 0x60, 0xE7, -0xD0, 0xFA, 0x8D, 0x75, 0xDD, 0x65, 0x77, 0x73, 0xAF, 0xD1, -0xAE, 0x02, 0xBE, 0xEB, 0x8C, 0x9C, 0x82, 0x8A, 0x97, 0x36, -0x14, 0x4A, 0x91, 0x42, 0x90, 0x4A, 0x01, 0x46, 0x27, 0x08, -0xF9, 0x19, 0x90, 0x87, 0x61, 0xB5, 0xFE, 0x0D, 0xAB, 0x7D, -0xC0, 0x08, 0xBF, 0x2F, 0x0F, 0xE8, 0xCB, 0x43, 0x97, 0x84, -0x96, 0x6F, 0x85, 0x9F, 0x28, 0xD2, 0x2C, 0x04, 0xE5, 0x8E, -0x6C, 0xCD, 0x3C, 0x53, 0xD1, 0xF0, 0xC3, 0x7A, 0xA0, 0x1D, -0x18, 0x64, 0xC4, 0x6A, 0x2D, 0x7B, 0xC7, 0x19, 0xF1, 0x4D, -0xDA, 0x00, 0xDB, 0x3E, 0x8A, 0x1A, 0x19, 0x3D, 0x85, 0x7D, -0x7D, 0x84, 0x72, 0x3D, 0x3C, 0x9C, 0x95, 0xA7, 0x7D, 0xD2, -0x0D, 0xEA, 0xD0, 0x04, 0xE1, 0xA0, 0xD1, 0xFD, 0xEC, 0x97, -0x68, 0x5A, 0x5B, 0x86, 0xC2, 0x3B, 0x6B, 0xB0, 0xE7, 0x44, -0xDB, 0x86, 0xA3, 0xC5, 0xF6, 0x6A, 0x20, 0x0D, 0x58, 0x28, -0x71, 0x10, 0x53, 0xE0, 0x67, 0xF4, 0x01, 0xE6, 0x5E, 0x63, -0x60, 0x22, 0x69, 0x63, 0x97, 0x80, 0xEE, 0xC3, 0x40, 0xEF, -0x9B, 0xDC, 0xAD, 0xA7, 0x81, 0x1B, 0xED, 0xA1, 0xD1, 0x86, -0x5B, 0x00, 0xEE, 0x03, 0x70, 0x79, 0x8E, 0x35, 0xE0, 0xC8, -0x6D, 0xF1, 0x60, 0x11, 0xA6, 0x26, 0xA6, 0x7E, 0x6F, 0x72, -0xCD, 0x8E, 0xB7, 0x9B, 0xCA, 0xA1, 0x34, 0xD1, 0x99, 0x9F, -0xD4, 0x5C, 0xBF, 0xC1, 0xAF, 0x99, 0x8E, 0xF3, 0x04, 0x06, -0x42, 0x42, 0x41, 0x51, 0xF1, 0xD6, 0x00, 0x45, 0x15, 0x0A, -0xDD, 0x1C, 0x5A, 0xFF, 0xE3, 0xA7, 0xD0, 0xB0, 0x63, 0x1F, -0xB6, 0xDD, 0x77, 0x17, 0x15, 0xEF, 0xBF, 0xBA, 0xEB, 0xB3, -0x9A, 0xD5, 0xB5, 0x10, 0x92, 0x89, 0xE6, 0x1A, 0x74, 0x94, -0x00, 0x23, 0x9F, 0xD3, 0x8B, 0x22, 0x06, 0x02, 0x65, 0x2A, -0x8B, 0x9A, 0x50, 0x5C, 0xC1, 0x94, 0x04, 0xF8, 0x08, 0x13, -0x30, 0xC1, 0xAC, 0x9D, 0xF8, 0x04, 0xB5, 0xD3, 0xC5, 0x31, -0x25, 0x96, 0x3B, 0xA5, 0xF1, 0xC2, 0xF0, 0x85, 0xDC, 0xC4, -0xE6, 0x82, 0x38, 0xFB, 0x77, 0xD1, 0x93, 0x5F, 0x25, 0x9E, -0x27, 0xD1, 0xC4, 0xC6, 0x22, 0x82, 0x82, 0x3B, 0x32, 0x8C, -0xFA, 0x86, 0x10, 0x48, 0x24, 0x40, 0x9A, 0xC0, 0xC5, 0x4B, -0x68, 0x2B, 0x2A, 0x85, 0x7B, 0xA6, 0x6D, 0x3A, 0xE3, 0x39, -0x18, 0xBA, 0x31, 0xE6, 0x85, 0x4E, 0xE6, 0x60, 0x26, 0x56, -0x8C, 0x65, 0x6A, 0x62, 0x18, 0x3D, 0xDB, 0x6A, 0x27, 0xEB, -0x25, 0xB4, 0x24, 0xF6, 0x27, 0xF2, 0x3D, 0x81, 0x6D, 0x33, -0xBC, 0x5E, 0x39, 0x30, 0x93, 0xCE, 0x7D, 0x01, 0x76, 0x7B, -0xB8, 0x0D, 0x5A, 0x0A, 0x0A, 0x36, 0x8A, 0x50, 0x2C, 0x2C, -0x03, 0xD0, 0xAE, 0x00, 0xF4, 0x39, 0xAC, 0x97, 0x53, 0xF4, -0x29, 0xD6, 0x8F, 0xF2, 0x5B, 0x0A, 0x83, 0x70, 0x22, 0x3A, -0xCA, 0x6A, 0x9F, 0x0B, 0x40, 0x5E, 0x64, 0x8A, 0xB2, 0x41, -0xC5, 0xA8, 0xC5, 0xA5, 0x14, 0x78, 0x92, 0x3D, 0x14, 0xD5, -0x67, 0x13, 0x94, 0x0B, 0xE8, 0x08, 0xD1, 0xF3, 0xFC, 0xE9, -0x68, 0xDA, 0x27, 0xE8, 0xB3, 0x0C, 0xA6, 0x08, 0xA7, 0xFD, -0xCC, 0x87, 0xE9, 0x0B, 0x67, 0x05, 0xF8, 0xE2, 0x54, 0x46, -0xB6, 0xD1, 0xE8, 0x90, 0xA1, 0xE2, 0x42, 0x1B, 0x5C, 0x80, -0x31, 0x9D, 0x90, 0x34, 0x78, 0x95, 0xC7, 0x30, 0x32, 0x9E, -0xF8, 0x91, 0x5F, 0xE4, 0xBB, 0x8A, 0xD1, 0x6B, 0xB9, 0xA5, -0xA5, 0x4C, 0x02, 0x32, 0xA1, 0x37, 0xBB, 0x90, 0xE0, 0x5C, -0x96, 0x31, 0x2B, 0x80, 0xA4, 0x8B, 0x57, 0x9B, 0x63, 0x79, -0x62, 0xE4, 0x64, 0xDE, 0x9B, 0x8B, 0x31, 0x3E, 0xEE, 0xC4, -0x88, 0xC7, 0x71, 0x5C, 0xD6, 0x39, 0x84, 0x05, 0xE1, 0x8E, -0x62, 0xB5, 0x6C, 0x12, 0x3C, 0x8A, 0xB5, 0xCE, 0x37, 0xC1, -0x14, 0x6A, 0x16, 0x33, 0x4D, 0x2E, 0x18, 0x4D, 0x2E, 0x98, -0xAD, 0x39, 0xD2, 0x4C, 0x00, 0xF5, 0xF4, 0x8E, 0x08, 0xA3, -0x77, 0xA5, 0xC7, 0x93, 0x8A, 0xC1, 0x6B, 0x29, 0xFF, 0x0C, -0x79, 0x4C, 0xE5, 0xA9, 0x2E, 0xE7, 0xC7, 0xD3, 0x7D, 0xB4, -0x5A, 0x99, 0xFB, 0x17, 0x25, 0x3D, 0xDD, 0x7F, 0x3E, 0x6F, -0x34, 0x26, 0xD5, 0xCA, 0x62, 0x98, 0x4D, 0x51, 0xBE, 0x5F, -0xCD, 0xBE, 0xAF, 0x1E, 0x3A, 0x83, 0x1F, 0xBB, 0xB3, 0xCC, -0xDD, 0xD7, 0x23, 0x37, 0x45, 0x25, 0x17, 0x9A, 0x53, 0x5D, -0x59, 0xF7, 0x88, 0x4F, 0x2D, 0x91, 0x51, 0x31, 0x8D, 0x3A, -0xBD, 0x2D, 0xDA, 0x8B, 0xF8, 0x17, 0xA1, 0x49, 0xB0, 0xCC, -0xE4, 0x23, 0x4C, 0xEF, 0x38, 0xD9, 0xB0, 0xF9, 0xF1, 0x2D, -0x2F, 0xD8, 0x3E, 0x85, 0x98, 0xD6, 0x3E, 0x3A, 0x9A, 0xDE, -0xAB, 0x92, 0x6C, 0x57, 0x24, 0x6D, 0x78, 0x8F, 0x37, 0x80, -0x3F, 0x78, 0xD5, 0x75, 0x88, 0x0A, 0x62, 0xB4, 0x32, 0x62, -0x79, 0xEF, 0x45, 0x4E, 0xF8, 0x91, 0x24, 0x4B, 0x5D, 0x26, -0xFE, 0x47, 0x24, 0xF7, 0xF7, 0x65, 0x56, 0x58, 0xEC, 0x71, -0x6D, 0x0F, 0x05, 0x04, 0x4B, 0xCB, 0x49, 0x6C, 0xCA, 0x75, -0x47, 0x59, 0xE0, 0x49, 0xE0, 0x95, 0x19, 0xA7, 0x83, 0x18, -0xA3, 0x81, 0xCA, 0xE2, 0x51, 0x54, 0xD2, 0x4D, 0x01, 0x82, -0x1A, 0xFE, 0x31, 0x05, 0x81, 0x5E, 0x1F, 0x94, 0xCE, 0x61, -0x48, 0x1D, 0xDE, 0xD6, 0x96, 0xCB, 0x03, 0xD9, 0x6E, 0x7C, -0xF3, 0xA0, 0xD9, 0xDE, 0x86, 0xDD, 0x73, 0xB2, 0xE7, 0x58, -0x82, 0x1A, 0x77, 0xA5, 0xFD, 0x5F, 0xE9, 0xBE, 0x48, 0xE3, -0x83, 0x00, 0x9D, 0x5B, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_DSP2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0xD5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x95, 0x56, 0x69, 0x50, 0x53, 0x57, 0x14, -0xFE, 0x80, 0x84, 0x24, 0x8F, 0x97, 0x7D, 0x23, 0xDB, 0x4B, -0x62, 0x12, 0xB6, 0x40, 0x12, 0x90, 0x35, 0x89, 0x22, 0x8B, -0x02, 0x5A, 0x5A, 0x15, 0xC5, 0x5A, 0x15, 0x97, 0x71, 0xCA, -0xE8, 0x0F, 0xDB, 0x4E, 0x99, 0xDA, 0xAA, 0xD3, 0xDA, 0xE9, -0x54, 0xDB, 0x99, 0x5A, 0xAD, 0x9D, 0xB1, 0xFE, 0xE9, 0xA8, -0x6D, 0xA7, 0x56, 0xEB, 0xC2, 0xD4, 0xD6, 0xA2, 0x08, 0xDA, -0x8A, 0x88, 0x80, 0x46, 0xAD, 0x20, 0x08, 0x56, 0x65, 0x51, -0x20, 0xB2, 0xEF, 0x88, 0xA4, 0x0F, 0x97, 0x0E, 0xA0, 0x54, -0x7B, 0x66, 0xEE, 0xDC, 0x39, 0xE7, 0x9D, 0xF3, 0x7D, 0xE7, -0x9E, 0x73, 0xCF, 0x9B, 0x0B, 0x3C, 0x5F, 0x7C, 0x6D, 0x96, -0x88, 0x75, 0x06, 0x3D, 0xF5, 0xB5, 0xD3, 0x11, 0x7B, 0xD3, -0x66, 0xB3, 0xED, 0x52, 0x69, 0xF4, 0x19, 0xB1, 0x91, 0xD1, -0xA2, 0x49, 0xFC, 0x27, 0x15, 0x9F, 0x89, 0x86, 0x94, 0xA4, -0xE4, 0x28, 0x2E, 0x9F, 0x5D, 0x37, 0x32, 0xDC, 0x97, 0x26, -0x14, 0x2B, 0xA3, 0x79, 0x5C, 0x99, 0x50, 0x4A, 0x70, 0xA3, -0x94, 0x0A, 0xFF, 0xCC, 0xD6, 0xEE, 0xFB, 0xEB, 0x45, 0x5C, -0x62, 0x95, 0xBB, 0xB5, 0x63, 0xC7, 0xCB, 0x12, 0x78, 0x8F, -0x55, 0x9C, 0x0E, 0xBB, 0x9A, 0xDE, 0x4A, 0x9B, 0x9A, 0x5A, -0xE1, 0x70, 0x64, 0xC0, 0x1C, 0xE2, 0x40, 0x75, 0xF5, 0x0D, -0x94, 0x5C, 0xAB, 0x40, 0x65, 0xCD, 0x1D, 0x88, 0x45, 0x46, -0x38, 0xE3, 0x17, 0x52, 0x76, 0xBB, 0xCD, 0xA3, 0x90, 0x8B, -0xDB, 0xFF, 0xF7, 0x09, 0x84, 0x3C, 0x72, 0xA7, 0x97, 0xF7, -0xA0, 0x4D, 0x2C, 0x09, 0x06, 0x57, 0xC0, 0xC2, 0x89, 0xBC, -0xC3, 0x08, 0x31, 0x87, 0x41, 0x24, 0x91, 0x43, 0x28, 0x12, -0xA1, 0xA1, 0xBE, 0x16, 0x25, 0xA5, 0x7F, 0xC2, 0x19, 0xBB, -0x10, 0x5A, 0x9D, 0x81, 0x5D, 0x5F, 0x73, 0x71, 0xB3, 0x75, -0x6A, 0xAC, 0xAB, 0xB1, 0xB1, 0xA1, 0x7A, 0x32, 0x02, 0xAF, -0xB1, 0xCA, 0x9B, 0xAB, 0x56, 0xE4, 0xFD, 0x7C, 0xE4, 0x68, -0x4A, 0x5C, 0xDC, 0x6C, 0x30, 0x18, 0x0F, 0x21, 0xE0, 0x8A, -0x50, 0x54, 0x5A, 0x88, 0xCE, 0x8E, 0x26, 0xB0, 0x18, 0x1C, -0x50, 0x53, 0xC2, 0xA0, 0x55, 0xEB, 0x71, 0xB1, 0xFC, 0x0C, -0xE2, 0xA7, 0x27, 0x83, 0x14, 0x68, 0xF0, 0xE3, 0x9E, 0x4F, -0x30, 0xC2, 0x22, 0x8E, 0xB4, 0xB6, 0xB4, 0x66, 0xBC, 0x90, -0x60, 0xCD, 0xCA, 0x65, 0x15, 0x65, 0x2E, 0x57, 0x08, 0xC1, -0x37, 0xE2, 0xE1, 0x48, 0x07, 0xF8, 0x3C, 0x01, 0x04, 0x02, -0x19, 0x8A, 0xCF, 0xE7, 0xC3, 0xF3, 0x60, 0x04, 0x62, 0xA9, -0x0C, 0x2A, 0x8D, 0x01, 0x72, 0xA5, 0x0E, 0x8D, 0x75, 0x55, -0x90, 0x08, 0x04, 0x30, 0x1A, 0xED, 0x38, 0xF6, 0xCB, 0x1E, -0xDC, 0x6A, 0xAC, 0x3D, 0xDD, 0xDA, 0xE2, 0x4E, 0x9C, 0x48, -0x30, 0xAE, 0x07, 0x57, 0x5C, 0xAE, 0xBD, 0x94, 0x52, 0x8E, -0xDE, 0xDE, 0x1E, 0x74, 0xB5, 0x77, 0xA2, 0xA2, 0xAA, 0x02, -0x67, 0x0A, 0x4F, 0x42, 0x26, 0xD2, 0xC1, 0x60, 0x0C, 0x41, -0x7B, 0x5B, 0x37, 0x86, 0xFA, 0xFB, 0x20, 0x93, 0x8B, 0x61, -0x32, 0x98, 0xE1, 0xF1, 0x26, 0x70, 0xB5, 0xA2, 0x10, 0x49, -0xC9, 0x0B, 0x60, 0xA0, 0x14, 0x09, 0xFA, 0x29, 0x92, 0xD8, -0xFF, 0x24, 0x28, 0xAB, 0x6A, 0x38, 0x1D, 0xAA, 0x53, 0xA1, -0xBD, 0xA7, 0xF9, 0x51, 0xA6, 0xF0, 0xD0, 0x65, 0xCB, 0x5E, -0x83, 0xD4, 0xD4, 0x19, 0x48, 0x4E, 0x4C, 0xC0, 0xA6, 0x0D, -0xEF, 0x41, 0x28, 0xE0, 0xE0, 0xE4, 0xAF, 0xB9, 0xF0, 0x21, -0x78, 0x10, 0x4A, 0xC4, 0x20, 0x49, 0x09, 0x8A, 0x4B, 0x7E, -0x83, 0xD9, 0x92, 0x0E, 0xBE, 0x9F, 0xF4, 0xBC, 0xC9, 0x18, -0x34, 0x73, 0xD2, 0x12, 0x8D, 0x4A, 0x72, 0xA0, 0xA6, 0x50, -0x19, 0x6C, 0x4A, 0xA8, 0x68, 0x15, 0x81, 0x39, 0xDC, 0x8C, -0xDA, 0x9B, 0x55, 0xF0, 0x57, 0x1A, 0xD1, 0xDB, 0xD1, 0x09, -0x95, 0x5A, 0x89, 0x69, 0xD3, 0xE2, 0x21, 0x24, 0xBD, 0x90, -0x7B, 0x3C, 0x0F, 0x61, 0xE1, 0xF1, 0xE8, 0xEF, 0xEE, 0x40, -0x9B, 0xBB, 0x05, 0xD7, 0xAB, 0xAE, 0xC1, 0xE9, 0x4C, 0xC5, -0xBE, 0xEF, 0xB6, 0x8F, 0xC3, 0xF5, 0x9E, 0x48, 0x70, 0xAA, -0xBA, 0x3E, 0x51, 0xCA, 0x60, 0x82, 0x18, 0xBA, 0x01, 0x83, -0xCE, 0x0A, 0xB9, 0x44, 0x09, 0x83, 0x5E, 0x8F, 0x28, 0xA7, -0x03, 0x0C, 0x26, 0x1B, 0x47, 0x8E, 0xE6, 0xE2, 0x4A, 0x55, -0x3D, 0xB2, 0x96, 0x66, 0xA1, 0xE0, 0x78, 0x2E, 0x2A, 0x2B, -0x2F, 0xA3, 0xA5, 0xAD, 0x05, 0xFE, 0xFE, 0x0A, 0x5C, 0xBD, -0x76, 0x09, 0x71, 0x31, 0x89, 0xB0, 0x85, 0x06, 0x5C, 0x79, -0x8A, 0xF7, 0xCC, 0xA0, 0x2D, 0xCF, 0xCE, 0xCE, 0xAB, 0xBE, -0x79, 0xD7, 0x28, 0x97, 0xF2, 0x50, 0x7C, 0xBD, 0x0A, 0xF1, -0x31, 0x33, 0xA1, 0x37, 0x51, 0x60, 0xFA, 0x72, 0x40, 0xF2, -0x48, 0x88, 0x25, 0x42, 0x94, 0x95, 0x94, 0x82, 0xCB, 0x25, -0xA1, 0x33, 0x19, 0x70, 0xF1, 0x42, 0x39, 0xFE, 0xBE, 0x53, -0x43, 0x13, 0x68, 0xD0, 0xD3, 0xE9, 0x86, 0xBF, 0x4A, 0x8F, -0x16, 0xF7, 0x6D, 0x79, 0x42, 0x5C, 0x62, 0x41, 0x65, 0x4D, -0x55, 0xDD, 0xB8, 0x13, 0x84, 0x06, 0x47, 0x1C, 0x74, 0x9D, -0x2B, 0x4B, 0xE9, 0xF2, 0x66, 0x43, 0x29, 0xD5, 0x61, 0xA5, -0xD9, 0x17, 0xFB, 0xF2, 0x7E, 0x42, 0xFB, 0xFD, 0x21, 0x58, -0x2D, 0x16, 0xB0, 0x98, 0x1C, 0xFA, 0x56, 0x89, 0x10, 0x19, -0x13, 0x8E, 0x6B, 0x7F, 0xB9, 0xC0, 0xE7, 0x10, 0xE0, 0x09, -0x84, 0xF4, 0x25, 0x90, 0xA0, 0xEE, 0x4E, 0x2D, 0x7C, 0xD8, -0x1C, 0x74, 0x75, 0x75, 0x82, 0xD2, 0x9B, 0xF0, 0xC7, 0xB9, -0x82, 0x69, 0xCF, 0x94, 0x88, 0xD2, 0xFA, 0x2F, 0x54, 0xA9, -0x55, 0x28, 0x2F, 0xCA, 0xC7, 0xD9, 0x5B, 0x8D, 0xE8, 0xE6, -0x59, 0xF1, 0xF9, 0x0C, 0x1D, 0xBE, 0xF9, 0x76, 0x2B, 0x8A, -0x8A, 0x2E, 0xC0, 0x66, 0x0D, 0xC5, 0xC3, 0xA1, 0x61, 0x9A, -0x88, 0x05, 0x1E, 0x5F, 0x88, 0x86, 0x7B, 0xCD, 0xE8, 0x6A, -0xEB, 0x44, 0xB4, 0xC3, 0x09, 0x4A, 0xA3, 0xA5, 0xCB, 0xE1, -0x83, 0xE1, 0xFE, 0x6E, 0xF8, 0x7A, 0xB8, 0x90, 0xC8, 0x24, -0x82, 0x67, 0x9A, 0xAC, 0xD7, 0x1B, 0x1A, 0x94, 0x4A, 0xB5, -0x6A, 0x64, 0x78, 0x18, 0x65, 0xA5, 0xE7, 0x20, 0x31, 0x04, -0x61, 0xC9, 0xCC, 0x64, 0x98, 0x89, 0x0E, 0xAC, 0xDA, 0xF6, -0x03, 0xA2, 0x9D, 0x73, 0x61, 0x52, 0x49, 0xE8, 0x69, 0xFE, -0x1D, 0x84, 0x1F, 0x07, 0x0F, 0x1E, 0x12, 0x08, 0x0C, 0x08, -0x04, 0x93, 0xEE, 0x59, 0xEF, 0x40, 0x1F, 0xAE, 0x5C, 0xBA, -0x04, 0x47, 0x4C, 0x12, 0x5C, 0xD7, 0xCB, 0xA1, 0x53, 0xCB, -0x70, 0xAA, 0xA0, 0xC0, 0x6B, 0x1C, 0x81, 0x4A, 0xA3, 0xFE, -0x80, 0x24, 0xC8, 0x2D, 0x1C, 0x1E, 0x0F, 0xEC, 0x61, 0x06, -0x6E, 0xD5, 0xDF, 0x82, 0xBB, 0x7F, 0x10, 0x49, 0xF6, 0x28, -0x6C, 0x4C, 0xB5, 0xE1, 0xD3, 0x43, 0x87, 0x51, 0x7D, 0x9F, -0x87, 0x80, 0xE0, 0x70, 0x0C, 0xBA, 0x6F, 0xD3, 0x73, 0xD1, -0x8A, 0x06, 0x77, 0x03, 0x64, 0x32, 0x09, 0x34, 0x0A, 0x13, -0x08, 0x82, 0x0D, 0x8A, 0x32, 0xE3, 0xE0, 0x81, 0x1D, 0xD0, -0x53, 0xFA, 0xCB, 0xA5, 0x97, 0x5D, 0xE1, 0xE3, 0x4A, 0xD4, -0x58, 0xDF, 0xB0, 0x95, 0x01, 0xDF, 0x91, 0xFE, 0x9E, 0x3E, -0x0C, 0x78, 0x0F, 0x20, 0xCE, 0x1E, 0x8D, 0x20, 0xA5, 0x3F, -0xF2, 0xF3, 0x4F, 0x60, 0xFE, 0xEE, 0x42, 0x4C, 0x35, 0x39, -0xF1, 0x51, 0x9A, 0x16, 0x7E, 0x1D, 0x65, 0xF0, 0xE6, 0x0A, -0xD0, 0x49, 0x0F, 0x9A, 0xC5, 0x32, 0x0D, 0x21, 0xC6, 0x58, -0x90, 0x7E, 0x3C, 0xF4, 0xF6, 0x78, 0x63, 0xDF, 0xFE, 0xED, -0xB0, 0xC6, 0x38, 0x40, 0x83, 0xBF, 0xF1, 0xDC, 0x39, 0xA0, -0xB4, 0x94, 0xE6, 0xC1, 0xA0, 0x57, 0x9D, 0xDC, 0x5F, 0x84, -0x81, 0xFE, 0x21, 0xF8, 0x92, 0x7E, 0x38, 0xB6, 0xE7, 0x0B, -0x84, 0x59, 0xA6, 0x83, 0x4D, 0x67, 0x2A, 0x93, 0xEB, 0x10, -0xA8, 0x11, 0xDF, 0x63, 0x0E, 0xBA, 0x15, 0x96, 0x90, 0x50, -0x1C, 0xBD, 0x50, 0x8D, 0x26, 0xBA, 0x0F, 0xCD, 0x74, 0x3F, -0x7C, 0x98, 0x0F, 0x30, 0x27, 0xC2, 0x0A, 0x30, 0x38, 0x8E, -0x43, 0x27, 0x4F, 0x15, 0x4F, 0xC4, 0xFE, 0x57, 0x48, 0x16, -0x5F, 0xE8, 0x70, 0x38, 0x3C, 0x72, 0xB5, 0xD6, 0x33, 0x27, -0x75, 0x96, 0x67, 0xF3, 0xFB, 0x6B, 0x3C, 0x07, 0xF6, 0x7F, -0xEF, 0xD9, 0xB2, 0x6D, 0xBB, 0x27, 0x28, 0x28, 0xE4, 0xD0, -0x53, 0xBF, 0xA5, 0x69, 0x09, 0x9B, 0xDF, 0xCD, 0x4C, 0xEF, -0xCB, 0x4E, 0x8D, 0xE9, 0xD9, 0xBE, 0xE1, 0x1D, 0xCF, 0xC7, -0x6F, 0xAD, 0x3D, 0x4B, 0x9B, 0x99, 0x93, 0x02, 0x4F, 0x14, -0xAB, 0x39, 0x34, 0x54, 0xA3, 0x52, 0xE7, 0x31, 0x19, 0x64, -0xBD, 0x5A, 0xAB, 0x6D, 0x8A, 0x32, 0x50, 0xAB, 0x5F, 0x3A, -0xF8, 0x45, 0xC2, 0xE5, 0x4A, 0x43, 0xA4, 0x12, 0xC5, 0xDA, -0xD8, 0x08, 0xEB, 0x26, 0x2E, 0x97, 0xF7, 0xE1, 0x9C, 0xD7, -0x57, 0x7C, 0xB9, 0x2C, 0x73, 0xD1, 0xD6, 0x9C, 0x15, 0x99, -0xD2, 0xB1, 0x7E, 0xEB, 0xB3, 0xE6, 0x53, 0x9F, 0xAD, 0xCE, -0xD4, 0xED, 0xDA, 0x98, 0x13, 0x70, 0x7C, 0xEF, 0x6E, 0xBF, -0x97, 0x02, 0x17, 0x8B, 0x94, 0x59, 0xB6, 0x88, 0x88, 0x2D, -0x94, 0xCE, 0xB4, 0x24, 0x29, 0x65, 0xCE, 0xF4, 0xBB, 0x37, -0x4A, 0x1C, 0xEB, 0x32, 0x53, 0x22, 0xE7, 0x2D, 0x98, 0xBB, -0x98, 0xFE, 0x9C, 0x63, 0xB5, 0xCF, 0x0C, 0x4D, 0x8C, 0x34, -0x67, 0x7C, 0xF5, 0xF6, 0xF2, 0x35, 0xCB, 0x5F, 0x49, 0xCA, -0x99, 0x1E, 0x6D, 0xC9, 0xB1, 0xC7, 0x85, 0xAF, 0x4F, 0x8A, -0x8B, 0xDC, 0x94, 0xBD, 0x60, 0xF6, 0x52, 0xDA, 0x87, 0x31, -0x29, 0xB8, 0xD1, 0x60, 0x8A, 0xB6, 0xD8, 0xC2, 0xD5, 0x4F, -0x54, 0xA6, 0x54, 0x2A, 0x25, 0xC0, 0xF6, 0x23, 0x19, 0x84, -0x90, 0x78, 0x12, 0xC8, 0x5C, 0x9D, 0x6E, 0x0F, 0x48, 0x49, -0x4B, 0x1F, 0x7D, 0x00, 0xB0, 0xF0, 0xF8, 0xA2, 0x3C, 0xB2, -0xD3, 0xCB, 0x57, 0xA1, 0x56, 0xC9, 0xF9, 0x22, 0xF1, 0x54, -0x3C, 0xAF, 0x17, 0xE6, 0x30, 0xB3, 0x5C, 0xA1, 0xA0, 0xF8, -0xA3, 0x41, 0x81, 0x46, 0x33, 0x49, 0xEF, 0x1C, 0xF0, 0x95, -0xA3, 0xC0, 0xAC, 0x9D, 0xEB, 0x16, 0x13, 0x49, 0x11, 0x81, -0xC4, 0x23, 0xDB, 0xE3, 0x3F, 0x00, 0x5B, 0xA7, 0x0F, 0xF6, -0xB3, 0xD9, 0x22, 0xB8, 0xF6, 0x68, 0x3B, 0x99, 0x31, 0x2F, -0x8B, 0x9C, 0xF7, 0xDA, 0x22, 0xDE, 0x28, 0xC9, 0xA8, 0xFF, -0xAB, 0x69, 0xB3, 0x9E, 0xFB, 0x02, 0x61, 0x3D, 0x09, 0xF6, -0x79, 0x92, 0x15, 0x63, 0x8C, 0xEE, 0x35, 0x26, 0xDB, 0xB1, -0xCB, 0x67, 0x8C, 0xDF, 0xD8, 0xFD, 0xD1, 0x09, 0xFE, 0x01, -0x77, 0x7C, 0xD0, 0x0A, 0x90, 0xC2, 0xD1, 0xF9, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 - -}; - -static const unsigned char Toolbar_Fullscreen2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x04, 0x43, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x6B, 0x4C, 0x9B, 0x65, 0x18, -0x3D, 0xBD, 0xAD, 0x95, 0xD2, 0x0B, 0x97, 0x16, 0x3A, 0x0A, -0xB4, 0xFD, 0xBE, 0x52, 0x06, 0x28, 0x88, 0x98, 0x28, 0xDD, -0xAA, 0x0C, 0x5C, 0xB6, 0x61, 0x18, 0xDB, 0x0F, 0x0D, 0xB7, -0x0D, 0x30, 0x12, 0x13, 0xA7, 0xC6, 0xC5, 0xC5, 0x6C, 0x8E, -0x28, 0x82, 0x66, 0x19, 0x46, 0x1D, 0x9B, 0x8A, 0xE2, 0x8C, -0x19, 0x6E, 0x51, 0x13, 0x67, 0x1A, 0x49, 0xB6, 0x78, 0x09, -0x31, 0x23, 0x73, 0x4B, 0x5C, 0x50, 0x33, 0x21, 0x9B, 0xB8, -0x79, 0xCB, 0xC6, 0x60, 0x8C, 0x8B, 0x04, 0x3A, 0x2E, 0xAD, -0xE7, 0x6D, 0x3F, 0x12, 0x7E, 0xF8, 0x43, 0xE2, 0xDF, 0x7D, -0xC9, 0xF9, 0x9E, 0xF7, 0xF6, 0x9C, 0xE7, 0x79, 0xCE, 0x7B, -0x01, 0x6E, 0x7F, 0xB7, 0xBF, 0xFF, 0xFB, 0x69, 0x96, 0x1A, -0xF5, 0xF5, 0x0D, 0xEE, 0xFE, 0xFE, 0xFE, 0xF1, 0xA7, 0x77, -0x3E, 0xB9, 0xA7, 0xAE, 0xBA, 0xBA, 0xD5, 0x68, 0x30, 0xFA, -0xC3, 0x91, 0x79, 0x7B, 0x41, 0x5E, 0xDE, 0x36, 0xD9, 0xEB, -0x29, 0xF5, 0x49, 0x52, 0x59, 0x96, 0x2C, 0x95, 0xF9, 0x14, -0x64, 0x0B, 0xF8, 0xE4, 0x0D, 0xAB, 0xED, 0xB6, 0xDC, 0xCD, -0x1B, 0x37, 0xB4, 0x1C, 0x79, 0xFB, 0xAD, 0xEE, 0xC3, 0x87, -0x0E, 0x36, 0xEF, 0x7A, 0x7E, 0x6F, 0x4B, 0x69, 0x59, 0xE9, -0x7B, 0xDD, 0x47, 0x8F, 0x4E, 0x0B, 0x5E, 0x95, 0xC2, 0xAF, -0xAA, 0xA8, 0x2C, 0x6F, 0x08, 0x9E, 0x08, 0x1E, 0x69, 0x6D, -0x7E, 0x11, 0x15, 0x75, 0x55, 0xC8, 0xF7, 0xE5, 0xAE, 0x28, -0xD3, 0x6F, 0x7E, 0xBC, 0x80, 0xD3, 0x1F, 0x75, 0xE1, 0xA5, -0x7D, 0x7B, 0x50, 0x59, 0xDB, 0x58, 0x17, 0xEC, 0x39, 0x79, -0x8C, 0xC3, 0x11, 0xB5, 0x12, 0x44, 0x13, 0x28, 0x2C, 0x78, -0xFC, 0xDD, 0xCE, 0x0F, 0xF0, 0x58, 0xF3, 0x5E, 0xB8, 0x48, -0x7E, 0x7E, 0x18, 0x38, 0x77, 0x1D, 0x38, 0x43, 0x7B, 0xFA, -0x2A, 0xD0, 0xFB, 0x3B, 0xF0, 0xE5, 0x9F, 0xC0, 0xC9, 0x3F, -0x80, 0x2F, 0x7E, 0x05, 0x4E, 0x5C, 0x04, 0x3E, 0xB9, 0x04, -0x1C, 0x1F, 0x00, 0x3E, 0xBE, 0x00, 0xC4, 0xE7, 0xE4, 0xE1, -0xAE, 0xDD, 0x07, 0xF0, 0xE1, 0x99, 0x41, 0x4C, 0x8C, 0xDE, -0x2C, 0x51, 0xD4, 0x51, 0x69, 0xF9, 0x13, 0x41, 0xB4, 0xA7, -0xBE, 0x1F, 0x5F, 0xF8, 0x2A, 0xD8, 0x86, 0xDE, 0x09, 0x60, -0x9A, 0x44, 0x1A, 0xCE, 0x2C, 0x44, 0x88, 0x30, 0x10, 0x5A, -0x88, 0x61, 0x6E, 0x11, 0x08, 0x8B, 0xC5, 0xF4, 0xD0, 0xAD, -0x8A, 0x39, 0xEA, 0xEE, 0x10, 0x79, 0x02, 0x83, 0x43, 0x80, -0xD1, 0xA4, 0x47, 0x60, 0x53, 0x09, 0xBA, 0xBB, 0x12, 0xC6, -0xC4, 0x32, 0x31, 0xA3, 0x55, 0x22, 0xE9, 0xAB, 0x5F, 0xD9, -0xBF, 0xB6, 0x8F, 0xDE, 0x67, 0x99, 0x91, 0xD9, 0x04, 0xDC, -0x62, 0x3B, 0x22, 0x08, 0x59, 0x9F, 0x5E, 0xC7, 0x45, 0xB4, -0x1A, 0xAE, 0x9C, 0x67, 0xA0, 0x6B, 0x53, 0xC0, 0xF5, 0x99, -0x58, 0xC0, 0x29, 0xDA, 0x49, 0x22, 0x34, 0x0F, 0xCC, 0xFE, -0x0D, 0xA4, 0x50, 0xD9, 0xE1, 0x7B, 0x9A, 0x77, 0xE3, 0xF3, -0x53, 0x6D, 0xE4, 0x0D, 0x2B, 0x01, 0xB4, 0x77, 0x9A, 0xB3, -0x4C, 0xF8, 0xF6, 0x67, 0xD6, 0x64, 0x00, 0xC6, 0x43, 0xC0, -0xCC, 0x1C, 0x30, 0x41, 0x8C, 0x4C, 0x02, 0x97, 0x47, 0x81, -0xBF, 0xB8, 0x65, 0xA3, 0x24, 0x00, 0xE7, 0xB0, 0xA8, 0x08, -0xAF, 0x56, 0xD2, 0x5B, 0x82, 0x10, 0xFB, 0x07, 0x91, 0x7B, -0xB1, 0x98, 0x15, 0xB5, 0xCD, 0x47, 0x97, 0x48, 0xF7, 0x3E, -0xB0, 0x69, 0x8C, 0x19, 0xFF, 0x44, 0x69, 0x7A, 0x58, 0x41, -0xC7, 0x39, 0x60, 0x7F, 0x2F, 0xF0, 0xCE, 0xD7, 0xC0, 0x67, -0xE7, 0x81, 0x7E, 0x06, 0x18, 0xA5, 0x0C, 0x9A, 0x64, 0xC0, -0xE0, 0xA2, 0x14, 0x59, 0x80, 0xC9, 0x47, 0xCB, 0xB6, 0xC6, -0x09, 0xAC, 0x72, 0x10, 0x36, 0x56, 0xCA, 0x79, 0x9D, 0x85, -0x36, 0x9D, 0xB1, 0xDC, 0x81, 0x2A, 0x91, 0x42, 0x34, 0xC0, -0x94, 0xE7, 0x7E, 0x7F, 0x4B, 0x10, 0xF8, 0x94, 0xD1, 0xBF, -0xFB, 0x8D, 0x64, 0xB3, 0x1C, 0xA4, 0x83, 0x43, 0x02, 0x7C, -0x39, 0xC0, 0xDD, 0x32, 0x50, 0x48, 0xA2, 0x82, 0x04, 0x20, -0x87, 0x04, 0xDE, 0x38, 0x20, 0x53, 0x0F, 0x64, 0xB0, 0xDA, -0x4C, 0xEE, 0x85, 0x8D, 0xD6, 0xCA, 0x0A, 0x8C, 0x64, 0x33, -0x33, 0x11, 0xB3, 0x99, 0xF2, 0x3A, 0xB2, 0x8A, 0x04, 0x77, -0x34, 0x40, 0xA8, 0xE2, 0xE5, 0xFB, 0xAE, 0x8E, 0x00, 0xAB, -0x99, 0x89, 0x87, 0x59, 0xE5, 0x91, 0xAC, 0x88, 0xD9, 0x64, -0x73, 0xA1, 0xCB, 0x48, 0x22, 0x12, 0x4A, 0xB4, 0x6B, 0x38, -0x96, 0xC3, 0x20, 0xD9, 0x89, 0x6C, 0x5B, 0x01, 0xD9, 0xCE, -0xF1, 0x44, 0x65, 0x0D, 0xF7, 0xCD, 0x41, 0x6B, 0x65, 0xC0, -0x78, 0xB2, 0x5A, 0xD6, 0x37, 0x96, 0x0B, 0x6E, 0xCD, 0x1B, -0x35, 0xFE, 0x16, 0x9D, 0xE5, 0xC1, 0xC0, 0x90, 0x27, 0x11, -0xB9, 0xD4, 0x36, 0x9E, 0x99, 0x39, 0x49, 0x98, 0x4A, 0x05, -0x53, 0x69, 0xDD, 0x0C, 0x92, 0x21, 0xC0, 0xCC, 0xD3, 0xD8, -0x77, 0x10, 0x76, 0xC2, 0xC6, 0xF9, 0x24, 0x6E, 0xBE, 0x85, -0xD9, 0x9B, 0x04, 0x29, 0x6D, 0x1C, 0x77, 0x34, 0x81, 0x63, -0xBF, 0x50, 0xEE, 0x1D, 0xCE, 0x64, 0x43, 0xFA, 0xE5, 0x63, -0xC3, 0x6A, 0x5B, 0x79, 0xD3, 0x43, 0xFB, 0xC2, 0xAD, 0xB0, -0x5D, 0x1C, 0x80, 0xBD, 0x80, 0xD9, 0x89, 0xF2, 0xE3, 0x01, -0xEE, 0x79, 0x34, 0x4B, 0x89, 0x36, 0xCB, 0x1C, 0xAB, 0x40, -0xA6, 0xF5, 0x28, 0x7D, 0x99, 0xD6, 0x43, 0xEB, 0xE5, 0x5A, -0x2F, 0xDB, 0x2E, 0x06, 0xF4, 0x99, 0x62, 0xFB, 0x52, 0x74, -0x6D, 0x00, 0x07, 0x3D, 0x3D, 0xB0, 0xE4, 0x97, 0x6D, 0xD6, -0x34, 0x3E, 0xB1, 0xAB, 0x73, 0xE8, 0xC6, 0x2C, 0xD6, 0x0D, -0x75, 0xE1, 0xAC, 0x69, 0x3D, 0x36, 0x96, 0x9A, 0xE0, 0xA6, -0x93, 0x9C, 0xC1, 0x60, 0x84, 0x97, 0xB2, 0xC9, 0x94, 0x46, -0x22, 0x32, 0x29, 0x47, 0x66, 0x12, 0x90, 0x4E, 0x38, 0xC5, -0x1E, 0xA5, 0xF0, 0x58, 0x52, 0x26, 0x2B, 0xFB, 0xC9, 0x94, -0x4E, 0x9F, 0xC6, 0x53, 0x77, 0x69, 0x06, 0x4D, 0x57, 0x5E, -0x45, 0xDF, 0x88, 0x16, 0xA9, 0xAE, 0x1C, 0xB7, 0x56, 0xBB, -0x30, 0x8D, 0x39, 0x4B, 0x3A, 0xA4, 0xE2, 0x2D, 0x78, 0x64, -0xB0, 0x13, 0x49, 0x45, 0xCF, 0xA0, 0xC4, 0x69, 0xC5, 0xE2, -0xDC, 0x1C, 0xF4, 0x94, 0xCC, 0x10, 0x89, 0x40, 0x1D, 0xA6, -0xA8, 0xEA, 0x08, 0xEF, 0x93, 0x2A, 0x7A, 0x32, 0x45, 0x57, -0xDC, 0xC0, 0x64, 0xB5, 0x0A, 0x21, 0xCA, 0xE1, 0xE4, 0xB8, -0x8A, 0xD9, 0xF7, 0x5D, 0x59, 0xC4, 0xA3, 0x37, 0x8E, 0x63, -0xCC, 0x92, 0x09, 0x7D, 0x8A, 0x8C, 0x42, 0x77, 0x9A, 0x1A, -0x1D, 0x1D, 0x87, 0xDB, 0x6B, 0x6A, 0x6A, 0xDA, 0xAA, 0xB6, -0xD7, 0xBF, 0xF9, 0xC2, 0xB3, 0x4F, 0x75, 0x19, 0x0D, 0xBA, -0x9D, 0x74, 0xAF, 0xE5, 0x91, 0x6E, 0x10, 0x40, 0x0C, 0xF5, -0xFF, 0x82, 0xE8, 0xF8, 0xB2, 0x75, 0xB5, 0x69, 0xF6, 0x84, -0xE7, 0x9A, 0x76, 0x6C, 0x7F, 0xFF, 0xE1, 0x2D, 0x95, 0xAF, -0x6F, 0xDB, 0xBA, 0xB5, 0xF5, 0x40, 0x7B, 0xFB, 0x6B, 0xE2, -0x6A, 0x50, 0x79, 0xB0, 0x78, 0x98, 0xC4, 0x8D, 0x5E, 0xF6, -0x00, 0x46, 0x56, 0xF0, 0xD6, 0xA9, 0x96, 0xB5, 0xC5, 0x6B, -0x72, 0x8B, 0x10, 0xD7, 0xF2, 0xA6, 0x98, 0xC8, 0x27, 0x78, -0x46, 0x10, 0xA7, 0xBC, 0x1F, 0x4B, 0xDF, 0x4A, 0x02, 0x2C, -0x05, 0x51, 0x29, 0x7E, 0x7C, 0x38, 0xC0, 0x07, 0x04, 0x93, -0x62, 0x62, 0x0D, 0x21, 0x2E, 0x85, 0x9F, 0x08, 0x10, 0x6B, -0x95, 0x76, 0xF1, 0x0A, 0x21, 0x7C, 0xD6, 0x29, 0x1C, 0x7E, -0x85, 0x33, 0x5B, 0x04, 0xE0, 0xC5, 0x86, 0xAC, 0x74, 0x04, -0xF8, 0x10, 0xC0, 0xAB, 0x8C, 0x49, 0xFF, 0x11, 0xB2, 0xE2, -0xE3, 0x5B, 0xC6, 0x23, 0xC6, 0x9D, 0xFF, 0x00, 0xED, 0x92, -0x2E, 0x92, 0xE2, 0xA4, 0xC8, 0x12, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Gfx2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x74, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xAD, 0x55, 0x0B, 0x50, 0x94, 0xD7, 0x15, -0xFE, 0xFE, 0xC7, 0xFE, 0xFB, 0xDE, 0x65, 0xDF, 0x4B, 0x78, -0xBA, 0xB0, 0x20, 0xEC, 0x2E, 0x0B, 0x12, 0xC4, 0x85, 0x29, -0x68, 0x8C, 0x44, 0xB1, 0x55, 0x62, 0x30, 0xA9, 0x8D, 0x31, -0x46, 0xA5, 0x31, 0x68, 0x71, 0xA2, 0x4D, 0x8D, 0x35, 0x6D, -0x41, 0x4D, 0xAA, 0xCD, 0xA3, 0x35, 0xA3, 0x13, 0xFA, 0x70, -0x9A, 0x4A, 0x02, 0x36, 0x35, 0x48, 0x0A, 0x22, 0x04, 0xAD, -0x94, 0x50, 0xC5, 0xBA, 0xD8, 0x8E, 0x3C, 0x56, 0x1B, 0x11, -0x05, 0x74, 0x01, 0x95, 0x7D, 0xF0, 0xDA, 0xA7, 0xDB, 0x7F, -0xB1, 0x3A, 0xCE, 0x38, 0x93, 0x4E, 0x93, 0x9E, 0x99, 0x7B, -0xFE, 0xF9, 0xE7, 0xDE, 0xF3, 0x7D, 0x73, 0xCF, 0x77, 0xCE, -0xB9, 0x84, 0xD1, 0x68, 0x3A, 0x60, 0x48, 0x8B, 0x7A, 0xAE, -0xE0, 0x09, 0xF3, 0x4B, 0xEB, 0x37, 0xEC, 0x6B, 0xC0, 0xFF, -0xD9, 0x08, 0x8B, 0x45, 0x77, 0x8C, 0x27, 0x2E, 0x28, 0x8A, -0x8D, 0xFE, 0x16, 0xAE, 0xF7, 0x1F, 0x40, 0xA4, 0x56, 0xD3, -0x9E, 0x30, 0x4B, 0xFB, 0xCB, 0x3D, 0x6F, 0x55, 0xD6, 0x7E, -0x55, 0xE0, 0x46, 0xA0, 0xE2, 0x03, 0x48, 0xC7, 0x08, 0xB8, -0xF6, 0x7F, 0x25, 0x41, 0xF6, 0xBC, 0xE8, 0x9F, 0xDC, 0xBA, -0x65, 0xD8, 0xD5, 0x77, 0xA5, 0x09, 0x53, 0x93, 0x7E, 0xD4, -0x1C, 0x69, 0x43, 0x43, 0x53, 0x3D, 0xBA, 0x2E, 0xB6, 0x63, -0x77, 0xC5, 0xF2, 0xA6, 0x55, 0xDF, 0xDD, 0xF8, 0x2A, 0x41, -0xA8, 0x2F, 0x3D, 0x1C, 0xB4, 0x3D, 0x0D, 0xF3, 0x4E, 0x5F, -0x44, 0xCB, 0x5A, 0x2C, 0x3B, 0xFD, 0x8A, 0xAC, 0xAC, 0x1D, -0x79, 0x0B, 0x3B, 0x42, 0xAB, 0x61, 0x25, 0x57, 0x12, 0x53, -0x8F, 0x10, 0xE4, 0xE7, 0x99, 0x9E, 0x1A, 0x1E, 0xE6, 0x37, -0xB5, 0xB5, 0x9D, 0x83, 0x52, 0x03, 0x90, 0xFF, 0xD9, 0x08, -0xB1, 0xEB, 0x67, 0x15, 0x2D, 0xA8, 0xAE, 0xFE, 0x05, 0x5E, -0xDE, 0x90, 0x8B, 0xCC, 0x5C, 0xDD, 0xB6, 0x85, 0xB9, 0x2F, -0xBE, 0x17, 0xDE, 0x7B, 0x66, 0x07, 0x1A, 0x8C, 0x2D, 0xFA, -0xF1, 0x8F, 0xAC, 0x7B, 0x1C, 0xBF, 0xC3, 0xB3, 0x19, 0xF3, -0x19, 0x0C, 0x78, 0x0A, 0x71, 0x86, 0x57, 0x8E, 0xB1, 0x50, -0xEC, 0xD1, 0xBF, 0x91, 0xF2, 0x95, 0x57, 0x1F, 0x10, 0x7C, -0xE7, 0xE9, 0x27, 0x8A, 0xBA, 0x6D, 0x8E, 0x63, 0x87, 0x2A, -0x2F, 0x20, 0x61, 0x16, 0x30, 0x31, 0x1D, 0x04, 0x9F, 0x4B, -0x41, 0x1E, 0x01, 0x48, 0x23, 0xEE, 0x1D, 0xAA, 0x6B, 0xEC, -0x41, 0xF3, 0x9F, 0xDB, 0x20, 0x77, 0xE8, 0xA0, 0xDF, 0x59, -0xE3, 0x1C, 0x11, 0xFE, 0xE1, 0x8D, 0x91, 0xD7, 0xB6, 0x25, -0x91, 0x1D, 0x9B, 0xE9, 0x16, 0x7B, 0xBC, 0xCE, 0x0A, 0x78, -0x39, 0x62, 0x98, 0x83, 0x09, 0x17, 0x0F, 0x53, 0xFB, 0x1A, -0x82, 0xC1, 0x8C, 0xDA, 0x06, 0x5A, 0xDD, 0x79, 0x61, 0x86, -0xE0, 0xFB, 0xA5, 0xC5, 0xCF, 0xB4, 0x9D, 0xEA, 0x3E, 0xBA, -0xE3, 0xA7, 0x36, 0xA8, 0x55, 0x00, 0xC3, 0x99, 0x80, 0x54, -0x0A, 0xF0, 0x79, 0x04, 0x28, 0x3A, 0x84, 0x48, 0xB1, 0x08, -0x12, 0xED, 0x3D, 0x22, 0x3B, 0x9A, 0x51, 0x5D, 0x75, 0x14, -0xB6, 0x60, 0xDF, 0xA9, 0x38, 0x72, 0x49, 0xA5, 0xAB, 0xF5, -0xB5, 0x6F, 0xDB, 0x8E, 0x01, 0x5B, 0x9C, 0x50, 0x16, 0x00, -0x72, 0x48, 0x8F, 0x70, 0x82, 0x4B, 0x6B, 0x4E, 0x52, 0xD9, -0xCD, 0x34, 0x5E, 0xF1, 0x3A, 0x09, 0x06, 0x6F, 0x12, 0xAF, -0xEF, 0xDC, 0xBC, 0xB8, 0xA1, 0xF6, 0x93, 0x13, 0xEB, 0x36, -0x0E, 0x61, 0x76, 0x1A, 0x07, 0x23, 0x37, 0x03, 0xF0, 0x85, -0x5C, 0xA0, 0x38, 0x23, 0x88, 0x90, 0x4D, 0x43, 0x12, 0xC5, -0xE0, 0xAE, 0x64, 0x1A, 0x53, 0x8C, 0x03, 0x59, 0x6A, 0x0A, -0x34, 0x04, 0xD8, 0x74, 0xB0, 0xF2, 0x37, 0x86, 0x75, 0x6F, -0x75, 0xDE, 0xDC, 0x1F, 0xCD, 0xCF, 0xF9, 0x14, 0x8F, 0x67, -0xDD, 0x46, 0xE4, 0x3F, 0xAE, 0x8D, 0xD4, 0xAF, 0xC1, 0x87, -0xB9, 0xD0, 0x1E, 0x6D, 0xC5, 0x6C, 0xEB, 0xF6, 0xE0, 0x3C, -0x6C, 0xA1, 0xF7, 0xA2, 0x8E, 0xCA, 0xC8, 0xCC, 0xD2, 0x71, -0x99, 0x0B, 0x2F, 0x74, 0x5A, 0x5F, 0x45, 0xEB, 0x49, 0x0E, -0xE2, 0x13, 0xC6, 0xA1, 0x51, 0xCB, 0x20, 0x92, 0xAA, 0x40, -0x73, 0x14, 0xAC, 0x16, 0x34, 0xA6, 0x3C, 0x34, 0x48, 0xAF, -0x0C, 0xC3, 0x18, 0x87, 0x8A, 0x11, 0xA3, 0x7E, 0x52, 0xDE, -0x25, 0xF6, 0xE4, 0x58, 0x87, 0xAE, 0x23, 0xB7, 0xCC, 0x84, -0x4B, 0xC3, 0x8D, 0xC8, 0x22, 0x88, 0x2B, 0xCE, 0xBE, 0xE0, -0x17, 0x42, 0xFD, 0xC4, 0xC9, 0x7E, 0xDC, 0x08, 0x70, 0xA9, -0xB6, 0xD0, 0xDB, 0xEC, 0xA5, 0x03, 0xE4, 0xB4, 0xCB, 0xE7, -0xE6, 0x89, 0xD8, 0x5C, 0xD1, 0xD3, 0x38, 0x7B, 0x26, 0x84, -0x1F, 0x96, 0xDD, 0xC6, 0x73, 0xCB, 0x6F, 0xE2, 0xC7, 0x2F, -0x3B, 0x71, 0xFC, 0x30, 0x01, 0xF7, 0xB0, 0x0A, 0x31, 0x29, -0x71, 0xF0, 0xA9, 0x64, 0x38, 0x3B, 0x60, 0x86, 0xD3, 0x91, -0x8A, 0xFC, 0x11, 0xE5, 0xB2, 0x2F, 0xC4, 0x10, 0x96, 0x94, -0xE0, 0x16, 0x29, 0x42, 0x34, 0x56, 0xFB, 0x2A, 0x63, 0xE2, -0xC7, 0x4D, 0x43, 0xE2, 0x31, 0xF7, 0x67, 0x20, 0x0A, 0x11, -0xA4, 0x12, 0x59, 0x70, 0xCF, 0x8C, 0x06, 0x07, 0x0E, 0xFE, -0x56, 0x5C, 0x57, 0x57, 0xE2, 0x8E, 0xD4, 0xF4, 0xA2, 0xEA, -0xA3, 0x14, 0x10, 0x11, 0x23, 0x08, 0xF9, 0xFD, 0xC0, 0x64, -0x90, 0xDD, 0x16, 0xCD, 0xE4, 0x5E, 0xFA, 0x58, 0x08, 0x65, -0xEF, 0x2B, 0xA0, 0x5F, 0x41, 0x20, 0x65, 0x0C, 0x78, 0xB7, -0xAE, 0xD6, 0x21, 0x5C, 0x12, 0x5D, 0xBC, 0x7F, 0x7C, 0xAE, -0xA8, 0xD3, 0x85, 0xEC, 0x60, 0xE3, 0x95, 0x74, 0xA2, 0xBB, -0x71, 0x50, 0x74, 0xE1, 0x54, 0x7A, 0xD7, 0x9D, 0x8E, 0x41, -0xB3, 0x7B, 0xB4, 0x37, 0x93, 0x2D, 0xC2, 0x70, 0x2C, 0xD9, -0xDB, 0xD3, 0xCB, 0x93, 0x08, 0x29, 0x36, 0x15, 0x2C, 0x28, -0x03, 0x08, 0x69, 0x3F, 0x22, 0x04, 0x02, 0xC8, 0x23, 0x19, -0x48, 0xE3, 0xDC, 0xE0, 0xCE, 0x0A, 0xC1, 0xA5, 0x93, 0x62, -0x77, 0xA9, 0x0B, 0x6B, 0x12, 0x46, 0x51, 0xC1, 0x96, 0xCC, -0xF6, 0x64, 0x7D, 0x68, 0xAF, 0x44, 0x73, 0xBD, 0x23, 0x19, -0x77, 0x47, 0xFD, 0x83, 0x63, 0x4C, 0xD4, 0xE8, 0xF1, 0x40, -0x9E, 0xA6, 0xCB, 0x21, 0xB2, 0x75, 0xA4, 0x2B, 0x02, 0x85, -0x03, 0x32, 0x74, 0xDF, 0x2F, 0x53, 0xF2, 0xD6, 0xC8, 0xF0, -0x34, 0x48, 0x39, 0xA6, 0xBD, 0x4E, 0x48, 0x24, 0x80, 0x4C, -0x4A, 0x42, 0xAE, 0x26, 0xA0, 0x54, 0x0A, 0xA0, 0x10, 0x33, -0x50, 0x8B, 0xED, 0x88, 0xF5, 0xDE, 0x40, 0xCC, 0x7C, 0x02, -0xD2, 0x27, 0x65, 0x68, 0xF8, 0x14, 0xC8, 0x2D, 0xF1, 0xCB, -0x39, 0xBE, 0xE0, 0x5C, 0x02, 0x88, 0x8D, 0xD6, 0x90, 0x19, -0x5E, 0x8B, 0xAD, 0x4C, 0x90, 0x79, 0xC2, 0x45, 0x2F, 0xE2, -0xDE, 0xB0, 0x13, 0x1E, 0x97, 0xDA, 0x81, 0x45, 0xF7, 0x09, -0xA8, 0x5E, 0x5B, 0xB7, 0x2F, 0x25, 0x55, 0xBC, 0x93, 0xC0, -0x7C, 0x6A, 0xCA, 0x97, 0x0A, 0x95, 0xC6, 0x0B, 0xB9, 0x9C, -0x82, 0x8C, 0xED, 0x01, 0xB5, 0x8C, 0x86, 0x52, 0x4C, 0x83, -0xD1, 0x8E, 0x81, 0x2F, 0x70, 0x40, 0x1D, 0x08, 0xC1, 0x13, -0xC3, 0xEA, 0xB2, 0x68, 0xD4, 0xB7, 0xE5, 0x7C, 0x0F, 0x9F, -0x6B, 0xA1, 0x8E, 0xDB, 0xE5, 0xAF, 0x6B, 0x85, 0x97, 0x48, -0xAB, 0x5B, 0x37, 0x3A, 0xCC, 0x3D, 0xDF, 0x9D, 0x22, 0x48, -0x73, 0x15, 0x04, 0xE6, 0xE0, 0xC9, 0x0F, 0xCF, 0xDD, 0xD3, -0x60, 0xA6, 0x71, 0xB9, 0xB4, 0x38, 0x20, 0x12, 0x5D, 0xC5, -0x2C, 0x56, 0x9A, 0x84, 0x78, 0x1A, 0x26, 0x3D, 0x81, 0x54, -0x23, 0x07, 0xA9, 0x06, 0x01, 0x92, 0x13, 0x23, 0x60, 0xD6, -0x88, 0x10, 0xA7, 0x76, 0x43, 0x90, 0xD7, 0x83, 0x2C, 0xF1, -0x97, 0x80, 0x4D, 0xC9, 0x3C, 0x3F, 0xB7, 0xB5, 0x3B, 0x09, -0x1F, 0xEF, 0x98, 0x00, 0x33, 0x45, 0xE7, 0xB9, 0x6C, 0xE2, -0xCE, 0x33, 0xA5, 0xCE, 0x55, 0x42, 0x8D, 0xC7, 0x8A, 0x13, -0xF9, 0xFB, 0xE1, 0x7C, 0x90, 0xA2, 0xB0, 0x73, 0xB8, 0x02, -0x7C, 0x12, 0x03, 0x48, 0x37, 0x02, 0x89, 0x3A, 0x1A, 0x51, -0xF1, 0x14, 0x62, 0xA3, 0x42, 0x2C, 0x59, 0x10, 0x86, 0x34, -0x3E, 0x32, 0x62, 0x12, 0x91, 0xCA, 0x95, 0x40, 0x3B, 0x74, -0x1B, 0xAE, 0x95, 0x9F, 0x20, 0x67, 0xF1, 0x39, 0xFC, 0x05, -0xF5, 0xC6, 0x37, 0xF0, 0xF1, 0xDA, 0x02, 0xFC, 0xFD, 0xAF, -0x4E, 0xFC, 0xF1, 0x05, 0x7A, 0xB1, 0x6B, 0x93, 0xBF, 0xF3, -0xDA, 0x0A, 0x65, 0xFD, 0xBE, 0xBA, 0x87, 0x67, 0x11, 0x15, -0x76, 0x0A, 0x25, 0xB7, 0x84, 0x23, 0x7A, 0x4C, 0x52, 0x5C, -0xBC, 0x02, 0x2A, 0x05, 0x83, 0xD9, 0x49, 0x0C, 0x8C, 0x29, -0x0C, 0xF4, 0x7A, 0x86, 0x25, 0x24, 0x91, 0x34, 0x17, 0xC8, -0x48, 0x89, 0x84, 0xAE, 0x4F, 0x07, 0x62, 0x80, 0x0F, 0xBE, -0x86, 0x8F, 0x41, 0x85, 0x30, 0xB9, 0x49, 0x7D, 0xFC, 0xF2, -0xCF, 0xE1, 0x29, 0xB6, 0xC3, 0xD5, 0x4C, 0x52, 0xBE, 0x26, -0x3B, 0x07, 0x9B, 0xD2, 0xC7, 0x7F, 0x10, 0xBD, 0xF7, 0xFD, -0x9A, 0xCC, 0x5D, 0x15, 0x15, 0x67, 0x67, 0xCA, 0x34, 0xEC, -0xB2, 0xB2, 0x53, 0xAD, 0x5A, 0xAD, 0x3E, 0xB3, 0xA2, 0xFC, -0xD7, 0xB8, 0x73, 0xBB, 0x17, 0x0C, 0x8F, 0x06, 0x07, 0x41, -0x04, 0x43, 0x01, 0x04, 0xEE, 0xFA, 0xC3, 0xED, 0xC2, 0xF6, -0x49, 0xB8, 0xCA, 0xB8, 0x08, 0x5C, 0xA6, 0xD0, 0x77, 0xC6, -0x0A, 0x43, 0x94, 0x65, 0x60, 0xD5, 0x82, 0x83, 0x7F, 0x7A, -0xC9, 0x5C, 0x7B, 0x71, 0xBD, 0xC0, 0xFF, 0xA3, 0x41, 0xF7, -0xA2, 0xEF, 0x25, 0x8E, 0x7F, 0x9E, 0x34, 0xE9, 0xB1, 0x27, -0xC7, 0x24, 0xA8, 0x27, 0x19, 0x86, 0xFE, 0x55, 0x18, 0x9B, -0x0E, 0x3B, 0x3E, 0x47, 0x4A, 0x7F, 0xD9, 0x7F, 0x15, 0x55, -0xB5, 0xDB, 0x30, 0xE1, 0x0C, 0xC0, 0x3F, 0x1E, 0x06, 0x0E, -0x81, 0xC7, 0x13, 0xB0, 0x23, 0x83, 0x1D, 0x0F, 0x34, 0x07, -0x1C, 0x0E, 0x8F, 0x9D, 0x55, 0x62, 0xC8, 0xE4, 0x4A, 0xB4, -0x33, 0x5D, 0x78, 0xF7, 0xC8, 0x07, 0xAA, 0xF6, 0x60, 0x33, -0xAF, 0xB5, 0x66, 0x67, 0xCE, 0xE7, 0x29, 0xBA, 0x4B, 0xE7, -0x4F, 0x9F, 0xAC, 0xDB, 0xF6, 0x4E, 0x9F, 0x44, 0xA2, 0x90, -0xEC, 0xBB, 0x0F, 0xFE, 0x40, 0x03, 0x85, 0x46, 0xE5, 0xF6, -0x4E, 0x4D, 0xA3, 0xAE, 0xEA, 0x3C, 0xAA, 0x0E, 0x35, 0xA2, -0xE7, 0x5F, 0x37, 0xA1, 0x4B, 0x36, 0x62, 0xD5, 0x9A, 0xF5, -0x28, 0x59, 0x57, 0x86, 0xA2, 0xA2, 0xE7, 0x91, 0x93, 0xBD, -0xC0, 0xCB, 0xE1, 0x2A, 0x6D, 0xD7, 0xFB, 0xEF, 0x34, 0x8B, -0x7C, 0xFC, 0xC3, 0x86, 0xEC, 0xAC, 0x9A, 0xB8, 0xDD, 0xC9, -0x9B, 0x5F, 0xAC, 0x4C, 0xDB, 0x58, 0xB2, 0x45, 0x54, 0x9C, -0xF3, 0x6C, 0x7F, 0x71, 0x72, 0x62, 0xA2, 0x32, 0x52, 0xAD, -0x7E, 0xFB, 0x91, 0x57, 0xA7, 0x60, 0x49, 0xDE, 0xD6, 0x78, -0x5D, 0x42, 0x68, 0x43, 0x69, 0xE9, 0xE8, 0xA6, 0xAD, 0xDB, -0x9F, 0x2E, 0x5A, 0xBE, 0xB4, 0xB5, 0xB0, 0xF0, 0xA9, 0x90, -0x50, 0x2C, 0x0A, 0x51, 0x14, 0x11, 0x7E, 0x1A, 0x0E, 0x3D, -0x12, 0xF4, 0x4D, 0x2C, 0x3F, 0xD7, 0x12, 0x06, 0xBD, 0xB7, -0xC8, 0x99, 0xEF, 0xD7, 0x36, 0xEA, 0xE1, 0x9F, 0xB4, 0xAC, -0x39, 0x79, 0x12, 0xA1, 0xF0, 0xDA, 0x90, 0x7D, 0x84, 0x4D, -0x1E, 0x01, 0x95, 0x5A, 0x0B, 0x92, 0x2B, 0x40, 0x4E, 0xBE, -0xA5, 0x7C, 0x61, 0xC1, 0x82, 0x72, 0xE3, 0x1C, 0x73, 0xF9, -0x9B, 0xBB, 0xF6, 0xFC, 0xB3, 0xA6, 0xBA, 0xFA, 0xF2, 0xD7, -0x25, 0xD4, 0x98, 0xD3, 0xCC, 0x5B, 0x97, 0x2E, 0x5B, 0xB2, -0xCB, 0xF0, 0xB8, 0xA9, 0x41, 0x2C, 0x12, 0xB6, 0x98, 0x4C, -0xA6, 0x13, 0xA9, 0x06, 0x53, 0x9B, 0x25, 0xC7, 0xF2, 0xD9, -0xDA, 0xF5, 0xAB, 0x7F, 0xAF, 0xD0, 0x68, 0x8A, 0xBF, 0xC9, -0x8D, 0xC8, 0xFF, 0x7E, 0xE4, 0x7F, 0xB3, 0x7F, 0x03, 0x76, -0x32, 0x53, 0x09, 0x06, 0x83, 0x1F, 0x67, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Help2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x72, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x8D, 0x55, 0x07, 0x50, 0x93, 0x67, 0x18, -0x7E, 0xFE, 0x90, 0x9D, 0x90, 0xC1, 0x94, 0x00, 0x86, 0x0D, -0x91, 0x21, 0x88, 0x13, 0xB4, 0x87, 0x08, 0xB2, 0x04, 0x57, -0xD1, 0xB6, 0x6A, 0xAB, 0xC5, 0x7A, 0x36, 0xEE, 0xC3, 0xBA, -0x50, 0x1B, 0xAD, 0x4A, 0x4F, 0x3D, 0xAD, 0xD7, 0xF6, 0xB4, -0xA8, 0xD8, 0x82, 0x56, 0xAB, 0x52, 0x3D, 0xED, 0xE9, 0xA9, -0x75, 0x4F, 0xAA, 0xA2, 0xE2, 0x42, 0x2A, 0xE2, 0x88, 0x83, -0x3D, 0x84, 0x90, 0x49, 0xFA, 0x26, 0x51, 0x8F, 0xD3, 0xAB, -0xED, 0x77, 0xF7, 0xDE, 0x37, 0xFE, 0xEF, 0x7D, 0xDE, 0xF7, -0x7B, 0xDE, 0xF1, 0x33, 0x78, 0xCF, 0xB0, 0x5A, 0xAD, 0x62, -0x9A, 0x32, 0x49, 0xA2, 0x48, 0xDC, 0x48, 0x06, 0xD9, 0x8E, -0x49, 0x4E, 0x93, 0x34, 0x90, 0xDC, 0x62, 0x18, 0xE6, 0x77, -0x9A, 0x0D, 0xFF, 0x86, 0xC1, 0xBC, 0x07, 0xFC, 0x12, 0x4D, -0xFD, 0xDE, 0xE7, 0x40, 0x97, 0x71, 0x84, 0x0C, 0xA5, 0xFE, -0x2F, 0x03, 0x04, 0x3C, 0x9A, 0xA6, 0xBD, 0xAF, 0xF7, 0xCF, -0x5F, 0xD4, 0x63, 0x71, 0x9E, 0x06, 0x4A, 0x6F, 0x31, 0xAE, -0xDE, 0x06, 0xD8, 0x3C, 0x0E, 0x62, 0x55, 0x1C, 0x3C, 0x7D, -0x66, 0x82, 0x66, 0x45, 0x2E, 0xDC, 0x5D, 0x65, 0x5D, 0xD5, -0xD3, 0xC9, 0xD0, 0xE1, 0xAE, 0x07, 0x4E, 0x6F, 0x81, 0xE7, -0xD1, 0xB4, 0xC9, 0xB6, 0xAE, 0xA9, 0xA9, 0xC1, 0xA4, 0xCF, -0xBF, 0x44, 0xC1, 0xE6, 0x02, 0x2C, 0x98, 0xAB, 0x46, 0x5C, -0x62, 0x1A, 0xB2, 0x86, 0x0D, 0x46, 0xDA, 0x90, 0xFE, 0x08, -0x8B, 0x8C, 0x40, 0x40, 0xA0, 0x0F, 0x66, 0x4E, 0x5F, 0x88, -0x93, 0x27, 0xCE, 0x20, 0x31, 0x69, 0x20, 0x78, 0x5C, 0x9E, -0x4D, 0x6D, 0x9C, 0x46, 0xA3, 0x79, 0xB6, 0x6C, 0xD9, 0xB2, -0xB2, 0x77, 0x0C, 0x10, 0xF8, 0x0C, 0x9A, 0xD6, 0xD8, 0xD6, -0x5B, 0xB7, 0x15, 0x63, 0xE4, 0xA8, 0x6C, 0x14, 0x6C, 0xDC, -0x80, 0x25, 0x4B, 0xF2, 0xD0, 0x5D, 0xE9, 0x0F, 0x89, 0x54, -0x02, 0x89, 0xB3, 0x00, 0x02, 0xA9, 0x00, 0x42, 0x99, 0x04, -0x81, 0xBE, 0x0A, 0x4C, 0x98, 0x90, 0x0D, 0xD7, 0x6E, 0x1E, -0xC8, 0x1E, 0x9D, 0x03, 0x31, 0xDB, 0x05, 0x51, 0xBD, 0x42, -0x6D, 0xEA, 0x99, 0xB9, 0xB9, 0xB9, 0x15, 0xF9, 0xF9, 0xF9, -0xB7, 0xBB, 0x52, 0xC4, 0x33, 0x18, 0x0C, 0x7A, 0x2E, 0x97, -0x4B, 0xE0, 0x45, 0x98, 0x9C, 0x33, 0x07, 0xD6, 0xCE, 0x06, -0xFB, 0x87, 0x07, 0x8D, 0x80, 0xC5, 0x62, 0x73, 0xC0, 0x21, -0xFA, 0x4E, 0x87, 0x82, 0x81, 0xC2, 0xAA, 0x37, 0x03, 0xD1, -0x41, 0x80, 0x89, 0xF6, 0x51, 0xDC, 0x18, 0xFC, 0x72, 0x60, -0x1D, 0x92, 0x52, 0x07, 0x3B, 0xB8, 0xA7, 0xF1, 0xC6, 0x80, -0x5E, 0xAF, 0xBF, 0xC1, 0xE3, 0xF1, 0x6C, 0x99, 0x02, 0x3E, -0xCB, 0x89, 0x40, 0x2C, 0x68, 0xA6, 0x75, 0xFD, 0x33, 0x0B, -0xF4, 0x56, 0x3D, 0xCC, 0x66, 0x27, 0xE8, 0x4C, 0x9D, 0xB0, -0x80, 0xC4, 0x60, 0x05, 0xE1, 0xC2, 0x48, 0x7B, 0x27, 0x27, -0x16, 0x6A, 0x9B, 0x2D, 0x30, 0x4B, 0x65, 0x88, 0x0C, 0x00, -0xBE, 0xE8, 0x95, 0x8E, 0x6B, 0x95, 0x87, 0xEC, 0x06, 0x2A, -0x2A, 0x2A, 0xCE, 0xAA, 0x54, 0xAA, 0x0F, 0x58, 0xB4, 0xE6, -0x98, 0x4C, 0x06, 0x3B, 0xF8, 0x88, 0xCC, 0x4C, 0x94, 0x1C, -0xBB, 0x68, 0xBF, 0x70, 0xBC, 0xCC, 0x04, 0x4F, 0x61, 0x2B, -0x22, 0xBC, 0x45, 0x88, 0x56, 0xF2, 0x11, 0x17, 0x24, 0xC4, -0xA0, 0x20, 0x31, 0x12, 0xC2, 0x9D, 0x91, 0x44, 0x92, 0x1E, -0x2D, 0x45, 0x4A, 0xA4, 0x33, 0x26, 0x0C, 0x92, 0x20, 0xC9, -0xA5, 0x06, 0xE7, 0xAA, 0x81, 0xB0, 0x79, 0x6B, 0xB0, 0x62, -0xFA, 0x2A, 0xBB, 0xBE, 0x42, 0xA1, 0xB0, 0xA5, 0x34, 0xD8, -0x1D, 0x3A, 0xDD, 0x30, 0x8E, 0x40, 0x60, 0x3F, 0xBC, 0x70, -0xE5, 0x06, 0xF6, 0x0F, 0xE9, 0x8B, 0xE2, 0x53, 0x80, 0xAF, -0x0F, 0x07, 0xBB, 0x6E, 0x72, 0x10, 0xA7, 0xA8, 0x87, 0x8B, -0x33, 0x87, 0x68, 0x60, 0x11, 0x2D, 0x0C, 0x58, 0x5C, 0x06, -0x65, 0x4F, 0xAC, 0xF0, 0x65, 0xB5, 0xA0, 0x7F, 0x2F, 0x6F, -0xD2, 0x62, 0xD1, 0x5D, 0x4F, 0x4C, 0xE2, 0xD5, 0xE1, 0x4E, -0x78, 0x38, 0xD6, 0xAD, 0x2D, 0xC4, 0x62, 0x3A, 0x95, 0x48, -0x24, 0x28, 0x2E, 0xDE, 0x3E, 0x84, 0x69, 0x69, 0x69, 0xD9, -0x48, 0x9B, 0xA9, 0xDF, 0x6B, 0x34, 0xB8, 0x29, 0x8C, 0xC3, -0xD8, 0x89, 0x43, 0xF1, 0xE8, 0xBE, 0x83, 0x3C, 0x2E, 0x87, -0xB8, 0x26, 0xD1, 0xBE, 0x04, 0xEE, 0x69, 0x0D, 0xA8, 0xA6, -0x45, 0x5D, 0x0B, 0x7D, 0x6B, 0x6B, 0xC2, 0x96, 0x51, 0x0C, -0x12, 0x06, 0x05, 0xBD, 0xC9, 0x40, 0xC3, 0xE3, 0x0A, 0xC4, -0xED, 0x0F, 0x86, 0xB6, 0xEC, 0x3A, 0x4E, 0x8D, 0x6D, 0x86, -0x2A, 0x6D, 0x08, 0x0A, 0x0B, 0x0B, 0x35, 0x4C, 0x63, 0x63, -0xE3, 0x25, 0xB9, 0x5C, 0xDE, 0x6F, 0xD9, 0x82, 0x45, 0xE8, -0xE8, 0x97, 0x03, 0x77, 0x97, 0x40, 0xF0, 0xF8, 0x80, 0x52, -0x4E, 0x5A, 0x42, 0x60, 0xF7, 0x59, 0xE0, 0xE6, 0xB1, 0x4A, -0x78, 0x08, 0xF5, 0x18, 0x31, 0x54, 0x88, 0x9C, 0x44, 0x39, -0x78, 0x62, 0xD7, 0x57, 0xB0, 0x9D, 0x76, 0x4F, 0x5E, 0x96, -0x5D, 0x83, 0x4F, 0x76, 0x03, 0x5A, 0x33, 0x92, 0x81, 0xBF, -0xEE, 0x60, 0xFB, 0xE4, 0x87, 0x18, 0x37, 0x39, 0x1D, 0x25, -0x25, 0x25, 0x47, 0x59, 0x26, 0x93, 0xB9, 0x8F, 0xED, 0xAA, -0x88, 0xC3, 0x41, 0x83, 0xD1, 0x09, 0xFE, 0xDD, 0x01, 0x4F, -0xF2, 0xBE, 0xF8, 0x0C, 0x90, 0x35, 0xDC, 0x8C, 0x93, 0x2B, -0x0E, 0xE2, 0xFC, 0x62, 0x36, 0x8E, 0xFE, 0xE0, 0x0F, 0x75, -0x56, 0xD0, 0x2B, 0xF0, 0x1A, 0xE8, 0x9E, 0x57, 0xE3, 0xEF, -0x73, 0xF7, 0xF0, 0xE9, 0xC4, 0x4B, 0x90, 0x7C, 0xC4, 0x47, -0x6B, 0x66, 0x32, 0x38, 0x1E, 0xF4, 0xA9, 0xA9, 0x93, 0x82, -0xEA, 0x48, 0xB5, 0xD0, 0xD0, 0x30, 0x23, 0xCB, 0x68, 0x34, -0xDA, 0xA3, 0xAA, 0xB3, 0x72, 0x21, 0x15, 0x59, 0xB1, 0x8F, -0x3A, 0xCB, 0x98, 0x7C, 0x60, 0xCF, 0x0E, 0x20, 0x5E, 0x78, -0x02, 0xDA, 0xDB, 0x09, 0x10, 0x05, 0xF8, 0xD9, 0xC2, 0x05, -0xB4, 0x54, 0x41, 0x3D, 0xE3, 0x38, 0x42, 0x53, 0xEA, 0x20, -0xCA, 0xB6, 0x20, 0x64, 0x89, 0x1B, 0x8A, 0x5B, 0xFB, 0x82, -0x3D, 0xBE, 0x07, 0x5C, 0xA9, 0x6B, 0x29, 0x88, 0x4E, 0x5B, -0xC7, 0xE2, 0xB8, 0xF2, 0xED, 0x06, 0x4E, 0x9E, 0x3C, 0xC5, -0x65, 0xAA, 0xAA, 0xAA, 0xD6, 0x05, 0x04, 0x04, 0xCC, 0xD1, -0x5E, 0xDC, 0x0D, 0xDF, 0x38, 0x4A, 0xCE, 0x29, 0x53, 0x00, -0x29, 0x7D, 0xFD, 0xB3, 0x06, 0xD6, 0x73, 0xE5, 0x44, 0x53, -0x4F, 0x98, 0x9B, 0x9F, 0x83, 0xA9, 0xEF, 0x00, 0x3B, 0x92, -0x02, 0xF0, 0x41, 0x0A, 0x10, 0x68, 0xCB, 0x67, 0x40, 0x20, -0xA2, 0xD7, 0x92, 0xB0, 0x8D, 0x44, 0x16, 0xD5, 0x88, 0x3B, -0xC5, 0xBC, 0x74, 0xFD, 0x61, 0xB4, 0x1E, 0xF3, 0x81, 0xB3, -0x22, 0x12, 0xE3, 0xC7, 0x4F, 0xF8, 0x8A, 0x45, 0x55, 0x74, -0xAA, 0xF2, 0xE1, 0x53, 0xF8, 0x0C, 0x18, 0x43, 0x5A, 0x45, -0x40, 0x30, 0x95, 0x37, 0x15, 0x96, 0x20, 0xD9, 0x13, 0xF2, -0x9C, 0x1E, 0x60, 0x02, 0xDA, 0xC0, 0x99, 0xE8, 0x01, 0xF6, -0x4C, 0x4F, 0x60, 0x56, 0x0A, 0x3C, 0xA8, 0x8E, 0x7C, 0x5D, -0xE8, 0xF9, 0x24, 0xC1, 0xE4, 0xB5, 0x17, 0xF5, 0x02, 0x2F, -0x72, 0x28, 0x82, 0xC0, 0x79, 0x54, 0x20, 0xBE, 0x41, 0x0D, -0x04, 0xAE, 0xB2, 0xBF, 0x40, 0xA7, 0x6B, 0xBF, 0xCC, 0x0A, -0x0C, 0x09, 0x39, 0x60, 0x6E, 0x6B, 0xB1, 0x1F, 0x1C, 0xF9, -0x71, 0x04, 0xB0, 0xF2, 0x0F, 0xF8, 0x45, 0x02, 0x1D, 0xED, -0xA4, 0xE8, 0xDE, 0x81, 0x8D, 0x0B, 0x5F, 0xA2, 0x77, 0x00, -0xA1, 0xF4, 0xF6, 0x47, 0x2C, 0xD1, 0x6F, 0x4B, 0x4C, 0x7F, -0x77, 0xC0, 0x8F, 0xD6, 0xC1, 0x34, 0x07, 0x76, 0x23, 0x63, -0x64, 0xBB, 0x27, 0xB1, 0x58, 0x7D, 0xAB, 0x0A, 0x7B, 0xBF, -0x09, 0xB1, 0xD3, 0x59, 0x53, 0x5B, 0x87, 0x7D, 0xFB, 0xF6, -0x9D, 0xB6, 0x57, 0xF2, 0xF5, 0xEB, 0x65, 0x47, 0x24, 0x32, -0xCF, 0xA1, 0xFE, 0x4A, 0x05, 0xA2, 0x83, 0x3F, 0xC6, 0x8D, -0xAC, 0x9D, 0x40, 0x2B, 0xB5, 0x86, 0x7C, 0x7A, 0x91, 0x5B, -0x2C, 0xB6, 0x1D, 0x7A, 0x82, 0xF9, 0x97, 0x52, 0x91, 0xEC, -0x67, 0xEB, 0xA6, 0x94, 0xE3, 0x44, 0x8F, 0x88, 0x6C, 0xCA, -0x84, 0x8E, 0x54, 0xA6, 0x16, 0x85, 0xFB, 0xB5, 0x40, 0x77, -0xCB, 0x45, 0x4C, 0xCB, 0xF2, 0x22, 0x0A, 0xFC, 0x90, 0x97, -0xB7, 0xA8, 0x70, 0xD5, 0xAA, 0xFC, 0x9C, 0x37, 0xED, 0x5A, -0xAB, 0xD5, 0x5A, 0x25, 0x72, 0x09, 0x9C, 0x75, 0x8F, 0xC1, -0x1B, 0xBC, 0x87, 0x82, 0xA8, 0xC1, 0x8E, 0xD4, 0x47, 0x08, -0x17, 0x6B, 0xB1, 0xFC, 0x72, 0x18, 0x44, 0x52, 0x57, 0x74, -0x23, 0xBE, 0xC5, 0x5C, 0x0A, 0x0B, 0x81, 0x8A, 0x08, 0x9C, -0x47, 0x7D, 0x80, 0xCF, 0x75, 0xC4, 0xBF, 0xF5, 0x61, 0x25, -0x46, 0x44, 0xB5, 0xC3, 0x22, 0x0E, 0x83, 0xC9, 0x64, 0x84, -0x4C, 0x26, 0xB3, 0x63, 0xB3, 0x5E, 0x1B, 0x58, 0xB3, 0x7A, -0x75, 0x0A, 0x9B, 0x4D, 0xAE, 0xB9, 0xA9, 0x50, 0x7B, 0x70, -0x38, 0xD2, 0x8D, 0x3F, 0x63, 0xF9, 0x79, 0x25, 0x56, 0x55, -0xC5, 0xA3, 0xB7, 0xCA, 0x15, 0x89, 0x14, 0x9B, 0x70, 0x85, -0x43, 0x54, 0x24, 0x21, 0x44, 0x8F, 0xCA, 0xC7, 0x41, 0x91, -0xBC, 0xFD, 0x21, 0xE2, 0xBB, 0xBD, 0x40, 0x93, 0xD9, 0x1D, -0x42, 0xA1, 0x00, 0x11, 0x11, 0x11, 0x21, 0xEF, 0xB4, 0xEB, -0xD2, 0xD2, 0xD2, 0xAA, 0xAB, 0x57, 0x2E, 0x37, 0x25, 0x0F, -0x4D, 0x4F, 0x73, 0xF5, 0xF6, 0xC3, 0xA8, 0x18, 0x0E, 0x62, -0x70, 0x11, 0x72, 0xF2, 0x2E, 0x52, 0x49, 0xDE, 0xCB, 0x19, -0x28, 0x28, 0xB0, 0x5E, 0x12, 0xCA, 0x16, 0xFA, 0xC7, 0xC8, -0x89, 0x16, 0x73, 0x5B, 0x1D, 0x9A, 0x2A, 0xAF, 0x40, 0xCE, -0xD7, 0xC1, 0x3B, 0xB4, 0x2F, 0xA4, 0x32, 0x39, 0xA8, 0x68, -0x63, 0x6B, 0x6B, 0x6B, 0x6F, 0xBF, 0xC6, 0x7D, 0xE7, 0x8F, -0x16, 0x15, 0x15, 0xA5, 0xFA, 0x75, 0xD7, 0x6F, 0x77, 0x7C, -0x7D, 0x94, 0xD4, 0xFF, 0x39, 0xA8, 0x7B, 0x50, 0x8E, 0xEA, -0x17, 0xCD, 0xE0, 0xF2, 0xC5, 0xE0, 0xF0, 0x85, 0xF4, 0x64, -0x86, 0x3A, 0xA9, 0x11, 0xE6, 0x0E, 0x3D, 0xF8, 0x14, 0x8F, -0x10, 0x55, 0x0C, 0xCC, 0x2C, 0x06, 0xD7, 0xAE, 0x94, 0xE1, -0xF8, 0xF1, 0xA3, 0xB2, 0xA5, 0x4B, 0x35, 0x2D, 0x5D, 0xF1, -0x58, 0x6F, 0x1B, 0x28, 0x2F, 0x2F, 0xBF, 0x1B, 0xD1, 0x43, -0xC5, 0xA8, 0xA7, 0x4D, 0xFF, 0x6E, 0xD3, 0x96, 0x22, 0x54, -0x37, 0x71, 0xA1, 0x50, 0x86, 0xC2, 0xC5, 0xDD, 0x0D, 0x22, -0x2E, 0x1F, 0x22, 0x11, 0x89, 0x40, 0x08, 0x99, 0x87, 0x27, -0xDA, 0xC1, 0xC3, 0xCE, 0xDD, 0x25, 0xA6, 0xB8, 0x01, 0x03, -0xD7, 0xC6, 0xC7, 0xC7, 0x31, 0x6F, 0x83, 0xFF, 0xE7, 0x18, -0x95, 0x91, 0x20, 0xDD, 0xBB, 0x6D, 0x43, 0xD2, 0x3C, 0xF5, -0xC4, 0xF5, 0x79, 0xB3, 0xD5, 0x0D, 0x8B, 0xE7, 0xCF, 0xED, -0x9C, 0xA5, 0x56, 0x5B, 0xE6, 0xE5, 0xCE, 0xAE, 0x9B, 0x31, -0x55, 0xBD, 0xB2, 0x70, 0xCB, 0xC6, 0x78, 0xBA, 0x26, 0x78, -0x1F, 0xC6, 0x9B, 0x18, 0x14, 0x6C, 0x2D, 0x74, 0xFE, 0x69, -0xF3, 0x4A, 0xDF, 0x94, 0x81, 0x41, 0x7D, 0x8B, 0x76, 0x7E, -0x9B, 0x3A, 0x7D, 0x4A, 0x76, 0x82, 0x57, 0xC4, 0x67, 0xFD, -0xA4, 0xDD, 0x63, 0xF9, 0xBD, 0x53, 0x53, 0xEE, 0x0E, 0xEC, -0x13, 0x5D, 0x34, 0xF2, 0xC3, 0xB0, 0x3D, 0xF1, 0x03, 0x7A, -0xEC, 0xC8, 0x18, 0x9E, 0xB1, 0x27, 0x6D, 0x58, 0xFF, 0xFA, -0x98, 0x5E, 0xE1, 0xFE, 0x0B, 0x26, 0x8F, 0x4D, 0x5C, 0xF1, -0xF5, 0x9C, 0x3E, 0x9A, 0x99, 0x9F, 0xF4, 0x6C, 0x6C, 0x6C, -0x73, 0x29, 0xBD, 0x76, 0xD4, 0xDA, 0xAE, 0x13, 0x98, 0x2E, -0x5C, 0x38, 0x6B, 0xFB, 0xD1, 0xE1, 0x1F, 0xB3, 0xE8, 0x2A, -0xAD, 0x3A, 0xE2, 0xBD, 0xDD, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Log2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x27, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x8D, 0x56, 0x6B, 0x4C, 0x93, 0x67, 0x14, -0x7E, 0xBF, 0x7B, 0x5B, 0xDA, 0x3A, 0xA0, 0x08, 0x58, 0x0A, -0x72, 0x91, 0xD2, 0x5A, 0xB9, 0x0D, 0x36, 0x8D, 0xD1, 0x2C, -0x31, 0x51, 0xB6, 0x29, 0x2C, 0x46, 0x48, 0xE6, 0x74, 0x6E, -0x33, 0x0E, 0x75, 0x19, 0x6C, 0xC6, 0x0B, 0xCA, 0xD8, 0x0C, -0x33, 0xA2, 0x9B, 0xE8, 0x74, 0x93, 0xC9, 0x0F, 0x25, 0xA2, -0x6E, 0xEA, 0x44, 0x32, 0x17, 0x59, 0x14, 0xE7, 0x96, 0x99, -0xF8, 0x63, 0xEE, 0x07, 0x64, 0x13, 0x91, 0x4C, 0x28, 0x8C, -0x22, 0x17, 0xDB, 0x52, 0x5A, 0x7A, 0xFD, 0xDA, 0xEE, 0x9C, -0x52, 0x18, 0x9D, 0x5B, 0xB2, 0x93, 0x9C, 0x9C, 0xB7, 0xEF, -0xD7, 0xEF, 0x79, 0xCE, 0x7B, 0xCE, 0x79, 0xCF, 0xF9, 0x28, -0x32, 0x4B, 0xEA, 0xEB, 0xEB, 0xD5, 0x0F, 0x1E, 0x3C, 0x28, -0x77, 0x38, 0x1C, 0x8F, 0x39, 0x8E, 0x9B, 0xFD, 0x88, 0x04, -0x83, 0x41, 0x42, 0xD3, 0x34, 0xF9, 0xA7, 0xE0, 0x1E, 0x68, -0x30, 0x3A, 0x3A, 0x3A, 0xA6, 0xA5, 0xA5, 0xE5, 0xBE, 0xD1, -0x68, 0xFC, 0x76, 0xF6, 0x73, 0x76, 0xF6, 0x8F, 0x5B, 0xB7, -0x6E, 0xAD, 0x6B, 0x6B, 0x6B, 0xAB, 0x79, 0x0A, 0xE5, 0x7F, -0x8A, 0x5A, 0xAD, 0x26, 0x3B, 0x76, 0xEC, 0xA0, 0xFE, 0x93, -0x60, 0xDE, 0xBC, 0x79, 0x3A, 0xB4, 0x76, 0xBB, 0x3D, 0x40, -0x51, 0x54, 0x00, 0xBC, 0xA6, 0x02, 0x53, 0x42, 0xF9, 0x7C, -0x3E, 0xB4, 0x41, 0x5C, 0xFB, 0x41, 0xC0, 0x32, 0xA0, 0x22, -0xFE, 0x9E, 0x9C, 0x9C, 0x14, 0xB3, 0xB3, 0xB3, 0x15, 0x06, -0xC3, 0xC2, 0xA7, 0x48, 0x23, 0x08, 0x0A, 0x0B, 0x0B, 0x57, -0xA3, 0x05, 0x30, 0x3F, 0x9E, 0x1E, 0x49, 0x60, 0x1D, 0x44, -0x3C, 0x24, 0x13, 0x45, 0x31, 0xB4, 0x86, 0x67, 0x21, 0x62, -0x58, 0x13, 0xF8, 0x4F, 0x10, 0xF7, 0xED, 0xF6, 0x09, 0x7F, -0x92, 0x66, 0x3E, 0x33, 0x8D, 0x95, 0xAB, 0x8D, 0xDF, 0xDE, -0xF1, 0x70, 0xA4, 0x21, 0x82, 0xA0, 0xB8, 0xB8, 0x58, 0x8D, -0xD6, 0xED, 0x76, 0x8B, 0xF0, 0x22, 0xED, 0xF5, 0x7A, 0xC1, -0x50, 0x7E, 0x20, 0x41, 0x70, 0x3F, 0x82, 0x21, 0x21, 0x02, -0x86, 0x5F, 0xC1, 0xD3, 0x78, 0x6D, 0x36, 0x1B, 0xEF, 0xF2, -0x78, 0x5D, 0x84, 0xE6, 0xE5, 0x79, 0x99, 0x71, 0x45, 0x9B, -0xCA, 0xDF, 0x2D, 0x5F, 0xB6, 0xE2, 0xC5, 0x57, 0x34, 0x89, -0x71, 0x45, 0x11, 0x04, 0x71, 0x71, 0x71, 0x08, 0x4E, 0x20, -0xC9, 0x7E, 0x96, 0x65, 0x09, 0xBC, 0x2C, 0x22, 0x09, 0x86, -0x06, 0x41, 0xC3, 0xDE, 0x52, 0x53, 0x11, 0x0A, 0x10, 0xA7, -0x73, 0x32, 0x28, 0x93, 0x44, 0xD1, 0xE0, 0xB9, 0xE3, 0xFE, -0xEF, 0x5D, 0xE2, 0xD9, 0xC6, 0x63, 0xBE, 0xA6, 0x4B, 0xDF, -0x7D, 0x9F, 0x93, 0xFB, 0x3C, 0xA0, 0x4D, 0x92, 0xD2, 0xB5, -0x65, 0x97, 0x67, 0x08, 0x96, 0x2F, 0x5F, 0x9E, 0x8F, 0xA0, -0x83, 0x83, 0x83, 0x2E, 0xF4, 0x12, 0x88, 0x7C, 0x10, 0x16, -0xF4, 0x9E, 0x01, 0x40, 0x0C, 0x0D, 0x0A, 0xE6, 0x20, 0x20, -0xFA, 0x44, 0xE2, 0x0B, 0x78, 0x59, 0x8D, 0x26, 0xCD, 0x4B, -0x53, 0x8C, 0xE7, 0x7C, 0x73, 0x23, 0xE3, 0xB4, 0x5B, 0x12, -0x4E, 0x9F, 0xBB, 0xC8, 0xF6, 0x3C, 0xEC, 0x20, 0x27, 0x8E, -0xD5, 0x91, 0x8C, 0xCC, 0xCC, 0x7B, 0x57, 0x5A, 0xDB, 0xCE, -0xCF, 0x64, 0xFC, 0xE0, 0xC1, 0x83, 0x15, 0x5B, 0xB7, 0x6E, -0x3D, 0xDE, 0xDB, 0xDB, 0x6B, 0x81, 0xB2, 0x43, 0x2F, 0xD1, -0xDB, 0xC0, 0x54, 0x52, 0x45, 0xBF, 0xC7, 0x23, 0x12, 0x41, -0xE0, 0x28, 0x9E, 0x63, 0x18, 0x5E, 0x22, 0x63, 0x78, 0x4E, -0x66, 0xBD, 0x7B, 0xF7, 0x0E, 0xDD, 0x7A, 0xE5, 0x9C, 0xAA, -0xEE, 0xD0, 0x61, 0x59, 0x4E, 0x5E, 0x36, 0x69, 0x3C, 0xF9, -0x29, 0x19, 0x36, 0x07, 0xC8, 0xE3, 0x91, 0xD1, 0x4F, 0x1A, -0x1B, 0xBE, 0xDC, 0x83, 0xB8, 0x33, 0x85, 0x0D, 0x80, 0x2A, -0x08, 0x01, 0xC1, 0x58, 0x7B, 0x3C, 0x1E, 0x3F, 0xE6, 0x01, -0xC3, 0x81, 0x61, 0x91, 0x48, 0x64, 0x74, 0x74, 0xF4, 0x1C, -0x9E, 0x61, 0x68, 0x66, 0xCC, 0x62, 0xB7, 0xFE, 0x70, 0xFB, -0xA7, 0xEE, 0xA6, 0x33, 0x27, 0x18, 0x63, 0x77, 0x47, 0x72, -0xDB, 0x8D, 0x9B, 0x32, 0x99, 0x84, 0x26, 0x77, 0x7E, 0x6C, -0x23, 0x0F, 0xFF, 0xF8, 0x93, 0xDC, 0xBC, 0x71, 0xDB, 0x37, -0x0D, 0x1E, 0x4A, 0xD2, 0xF4, 0xA2, 0xA6, 0xA6, 0xE6, 0x72, -0x65, 0x65, 0x65, 0x69, 0x57, 0x57, 0xD7, 0x10, 0x03, 0x48, -0x82, 0x20, 0xB0, 0x70, 0x12, 0x1A, 0x4A, 0xD0, 0x3B, 0x3C, -0x3C, 0xE4, 0x75, 0x38, 0x9C, 0x1E, 0xB3, 0xD9, 0x36, 0xDA, -0xD5, 0xD5, 0x29, 0xA4, 0xA5, 0x6A, 0xB4, 0xD5, 0x1F, 0xEC, -0x57, 0x90, 0x80, 0x95, 0x7C, 0xF3, 0xF5, 0x05, 0x7F, 0xD9, -0x86, 0x0A, 0x7B, 0xD1, 0xAA, 0x15, 0x62, 0x72, 0x8A, 0xDE, -0x99, 0x97, 0xA7, 0x53, 0x6F, 0xDB, 0xB6, 0x7D, 0x26, 0xF4, -0x33, 0x65, 0x55, 0x5D, 0x5D, 0x5D, 0x0F, 0xC0, 0x73, 0x00, -0xD3, 0x21, 0x95, 0x4A, 0x05, 0x8B, 0xC5, 0xE2, 0x7A, 0xF4, -0xE8, 0xD1, 0x44, 0x5F, 0x5F, 0x9F, 0x8B, 0xE1, 0xA4, 0x16, -0xF3, 0x13, 0x8B, 0xE3, 0xC9, 0x58, 0x7F, 0xEA, 0xE6, 0x2D, -0x9B, 0xB4, 0xA5, 0xA5, 0x1B, 0x84, 0x6B, 0x97, 0x4E, 0x91, -0x92, 0x92, 0xB2, 0xC9, 0xEE, 0xFE, 0x09, 0xD3, 0xCE, 0x3D, -0x55, 0xD6, 0xB4, 0xF4, 0x4C, 0x6F, 0xF1, 0xEA, 0x95, 0x2E, -0x85, 0x32, 0x3A, 0xBE, 0xB9, 0xF9, 0xEC, 0x45, 0x80, 0x34, -0x47, 0x84, 0x48, 0xA5, 0x52, 0x69, 0x94, 0x4A, 0x25, 0x5E, -0x32, 0x4F, 0x67, 0x67, 0xE7, 0x48, 0x4F, 0x4F, 0x8F, 0x5D, -0xE0, 0x04, 0x9F, 0x4E, 0x9F, 0x3D, 0x3E, 0xD0, 0xDB, 0x2D, -0x7F, 0x26, 0x46, 0xB2, 0xA4, 0xEE, 0xD0, 0xD1, 0xC4, 0x05, -0xEA, 0x58, 0x52, 0xB6, 0x66, 0xA9, 0x6B, 0xDF, 0x81, 0x53, -0xC6, 0xD7, 0xCB, 0xF7, 0xF5, 0xEF, 0xFF, 0xB0, 0xDA, 0x95, -0xAD, 0xD7, 0xB2, 0x99, 0x19, 0xC9, 0x81, 0xE1, 0x91, 0xD1, -0x20, 0xC3, 0x50, 0x44, 0xA3, 0xD1, 0x3C, 0x3B, 0x8D, 0x3B, -0x4D, 0x20, 0x40, 0xDC, 0xA1, 0x82, 0x4C, 0xA3, 0x03, 0xFD, -0x7D, 0x56, 0x89, 0x4C, 0xCA, 0xE5, 0xE5, 0x15, 0xF8, 0x25, -0x32, 0xD9, 0xE4, 0x2F, 0x77, 0xDB, 0x33, 0xCA, 0x5E, 0x5D, -0xA7, 0x7B, 0xEB, 0x8D, 0x72, 0xF2, 0xF9, 0xE1, 0x9D, 0xA4, -0x60, 0xE9, 0xAA, 0x51, 0xA5, 0x7A, 0xF1, 0x40, 0xD3, 0x99, -0xD3, 0xCE, 0x35, 0x2F, 0xBD, 0x40, 0x79, 0xDC, 0x6E, 0xCE, -0x6A, 0xB5, 0x12, 0xAC, 0x62, 0x9E, 0xE7, 0xC9, 0xDC, 0xB9, -0x73, 0x49, 0x4C, 0x4C, 0x4C, 0x5A, 0xC4, 0x4D, 0x86, 0x26, -0x55, 0x68, 0x32, 0x99, 0x48, 0x6C, 0x6C, 0xAC, 0x45, 0xA3, -0x49, 0x99, 0x13, 0x97, 0x90, 0x34, 0xFE, 0x5B, 0xC7, 0x3D, -0x36, 0x2A, 0x4A, 0x92, 0xBF, 0x73, 0xD7, 0x7B, 0x4C, 0xE7, -0xAF, 0x3F, 0x93, 0x95, 0x9B, 0x37, 0x39, 0xF8, 0x18, 0xED, -0xC8, 0x67, 0x0D, 0x67, 0x3C, 0x39, 0xFA, 0x4C, 0xA6, 0x7F, -0xC0, 0xC8, 0x8D, 0x8D, 0x4D, 0x10, 0xCC, 0x97, 0x42, 0xA1, -0x10, 0xB1, 0xE9, 0xC1, 0x9D, 0x61, 0xE3, 0xE3, 0xE3, 0x49, -0x62, 0x62, 0xA2, 0x06, 0xA2, 0xF0, 0xF7, 0x09, 0xA0, 0xD6, -0xF5, 0x50, 0x25, 0x44, 0x15, 0xA3, 0x0A, 0xEA, 0x17, 0xE6, -0x5B, 0x6C, 0xE3, 0xA6, 0xD8, 0x82, 0x02, 0x43, 0x76, 0x4A, -0x42, 0x14, 0x53, 0xB1, 0x7D, 0x9B, 0xE7, 0xFD, 0xAA, 0xE3, -0xA6, 0xD7, 0xB6, 0xEC, 0x35, 0x9D, 0x6D, 0x3A, 0xE9, 0xCB, -0xCA, 0x48, 0x16, 0xFA, 0x8C, 0xFD, 0x6C, 0x30, 0x18, 0x02, -0x26, 0xA0, 0x94, 0x4C, 0x26, 0x63, 0x24, 0x12, 0x09, 0x38, -0x14, 0x05, 0x21, 0x62, 0x02, 0x06, 0x83, 0xA1, 0x30, 0x22, -0x44, 0x90, 0x54, 0x55, 0x56, 0x96, 0x81, 0x2C, 0xCA, 0x59, -0x64, 0xBE, 0x7E, 0xAD, 0x29, 0xF3, 0xF8, 0x91, 0xBA, 0x94, -0xDB, 0xD7, 0x5B, 0x49, 0xC5, 0xAE, 0xDA, 0xD1, 0xF9, 0xBA, -0x65, 0x83, 0x57, 0xAF, 0xB6, 0x38, 0xD7, 0xAD, 0x5D, 0xC5, -0x58, 0xC6, 0xCC, 0x52, 0x9B, 0xCD, 0x41, 0x41, 0xAE, 0x58, -0xA5, 0x52, 0x41, 0x03, 0x30, 0x2A, 0x41, 0x02, 0xC0, 0x80, -0x7B, 0x22, 0x50, 0x40, 0xE4, 0xD1, 0x83, 0x44, 0x10, 0x38, -0x9D, 0x6E, 0x83, 0x5A, 0x9D, 0xE8, 0xAD, 0xDE, 0xFD, 0x66, -0xDE, 0x85, 0xF3, 0x17, 0x94, 0xD1, 0xAA, 0x34, 0xEB, 0x80, -0x99, 0x18, 0x9B, 0xBF, 0x6A, 0x75, 0xEC, 0xDD, 0x5D, 0x49, -0x73, 0x0C, 0x25, 0x8C, 0x8C, 0x9A, 0x25, 0x2C, 0xC7, 0x12, -0x04, 0x07, 0x4F, 0x31, 0xDE, 0x14, 0x80, 0xF2, 0xA0, 0x34, -0xFC, 0x26, 0xB8, 0x87, 0x24, 0xD0, 0x0D, 0x3C, 0x3A, 0x9D, -0x4E, 0x88, 0x20, 0xC8, 0xCD, 0xCD, 0x5F, 0x7C, 0xAE, 0xE9, -0x04, 0xDF, 0xD5, 0x33, 0xE6, 0x7F, 0xFB, 0x9D, 0xBD, 0xC6, -0x3D, 0x55, 0x55, 0x96, 0x03, 0x1F, 0x7F, 0x14, 0x8C, 0x57, -0xC9, 0xF9, 0xA1, 0xA1, 0x21, 0xDE, 0xED, 0xF5, 0x72, 0xB2, -0x29, 0x20, 0x1E, 0xBC, 0xC4, 0x3B, 0xC2, 0xC9, 0xE5, 0x72, -0x06, 0x4F, 0x00, 0x1E, 0x23, 0x19, 0x0D, 0xCA, 0xE2, 0x3E, -0xE4, 0xC2, 0x89, 0x73, 0x01, 0x92, 0x9D, 0x36, 0x43, 0x20, -0x57, 0xF0, 0xA9, 0xCF, 0x2D, 0x79, 0xD9, 0x75, 0xE4, 0x68, -0xC3, 0x48, 0x59, 0xE9, 0x5A, 0x2A, 0x35, 0x35, 0x45, 0x32, -0x3E, 0x3E, 0x2E, 0x75, 0x38, 0x5C, 0x2C, 0x80, 0xB0, 0x18, -0x67, 0x00, 0xE2, 0x10, 0x0C, 0x54, 0x00, 0x22, 0x04, 0xE6, -0x41, 0x09, 0x5A, 0x0C, 0x11, 0x28, 0x9E, 0x80, 0xC3, 0xEE, -0x0A, 0xD3, 0x8D, 0x68, 0xB5, 0xDA, 0x45, 0x33, 0x04, 0x32, -0xA9, 0x9C, 0x68, 0xB3, 0xD2, 0xDD, 0xE9, 0x69, 0xC9, 0x02, -0x74, 0x52, 0xC9, 0xC4, 0xC4, 0x04, 0x0B, 0xC9, 0x0A, 0x81, -0x83, 0x67, 0xD0, 0x22, 0x18, 0x01, 0x80, 0xD0, 0x4B, 0x0E, -0x3D, 0x0D, 0x0B, 0x05, 0x8A, 0xFB, 0x04, 0xC6, 0x2B, 0x03, -0x8A, 0xC9, 0x66, 0xB1, 0xD5, 0xC0, 0xE9, 0x08, 0xDC, 0x23, -0x4D, 0x88, 0xA0, 0xB9, 0xB9, 0x39, 0x1D, 0xEB, 0x17, 0x9A, -0x9A, 0x1B, 0x80, 0xA5, 0x08, 0x80, 0xDE, 0x86, 0x8F, 0x1D, -0xB2, 0x00, 0x44, 0x87, 0x41, 0xF9, 0xF0, 0x9A, 0x43, 0x70, -0x7C, 0x06, 0xC0, 0x02, 0x37, 0x25, 0xE8, 0x0B, 0x8D, 0xFD, -0x0B, 0x81, 0x4B, 0x4A, 0x4A, 0x42, 0xB3, 0x85, 0x2E, 0x2A, -0x2A, 0xD2, 0xE3, 0x80, 0x87, 0xA6, 0xE6, 0x00, 0x0F, 0x44, -0x78, 0x11, 0xC7, 0xA5, 0x1F, 0xF7, 0xB0, 0xE7, 0xE3, 0x24, -0x83, 0x13, 0x84, 0x14, 0x05, 0x2D, 0xC4, 0x39, 0x80, 0xCF, -0xD1, 0x82, 0xE2, 0x3B, 0x21, 0x85, 0x3D, 0x11, 0x48, 0x70, -0xE2, 0x91, 0x84, 0x84, 0x84, 0xFC, 0xD0, 0x45, 0x83, 0x21, -0x53, 0x10, 0x4E, 0xF8, 0x02, 0x9C, 0x07, 0x21, 0xD6, 0xF0, -0xD7, 0xC3, 0x3F, 0xBF, 0x22, 0x00, 0x3C, 0xE2, 0xF7, 0xBF, -0x7D, 0x65, 0x4C, 0xCB, 0xFA, 0xF5, 0xEB, 0x57, 0xD6, 0xD6, -0xD6, 0x12, 0x76, 0xE3, 0xC6, 0x8D, 0x5F, 0x24, 0x25, 0x25, -0xE5, 0xC2, 0x9E, 0x0D, 0xAA, 0xC0, 0x8B, 0x71, 0x00, 0x8B, -0x17, 0x26, 0x54, 0x8A, 0xD8, 0x51, 0xB1, 0x8D, 0x23, 0x18, -0x9E, 0x08, 0xD7, 0x38, 0xD1, 0xC2, 0xF3, 0x39, 0x88, 0x2D, -0x06, 0x3F, 0x08, 0xE0, 0x16, 0xE3, 0x90, 0x0A, 0xBA, 0x5C, -0xAE, 0x00, 0x74, 0x84, 0xB8, 0xF6, 0xF6, 0xF6, 0x0E, 0x24, -0xFA, 0x0B, 0x4D, 0x2F, 0xE3, 0x89, 0x13, 0x31, 0x9B, 0x23, -0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, -0x60, 0x82 -}; - -static const unsigned char Toolbar_Open2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x89, 0x00, 0x00, 0x0B, 0x89, 0x01, -0x37, 0xC9, 0xCB, 0xAD, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, -0x4D, 0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, -0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, -0x7A, 0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, -0x00, 0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, -0xEA, 0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, -0x92, 0x5F, 0xC5, 0x46, 0x00, 0x00, 0x05, 0xD8, 0x49, 0x44, -0x41, 0x54, 0x78, 0xDA, 0xA4, 0x95, 0x6D, 0x6C, 0x95, 0x67, -0x1D, 0xC6, 0x7F, 0xCF, 0x73, 0x9E, 0x97, 0xF3, 0x7E, 0x38, -0x85, 0xC3, 0x69, 0x39, 0xD0, 0x02, 0x2D, 0x6B, 0x09, 0xD0, -0xC2, 0x4A, 0xB7, 0x8E, 0x95, 0x41, 0xC4, 0xD9, 0x68, 0x40, -0x09, 0x6C, 0x1A, 0x74, 0xCA, 0x22, 0xCA, 0x07, 0x43, 0x16, -0xCC, 0xB2, 0x8C, 0x44, 0xBF, 0x2C, 0xD1, 0xCD, 0x4D, 0x71, -0x68, 0x18, 0x3A, 0xD8, 0x8C, 0x26, 0xFB, 0xB0, 0x45, 0x40, -0x3A, 0xAC, 0x6E, 0xE0, 0x42, 0xC5, 0x8E, 0x0A, 0xA3, 0x6E, -0x65, 0x20, 0x6D, 0xE1, 0x70, 0xDA, 0x02, 0x7D, 0x39, 0x2F, -0x3D, 0x4F, 0xCF, 0x69, 0x9F, 0xF3, 0xF2, 0x9C, 0xE7, 0xDC, -0x7E, 0x9A, 0x09, 0x93, 0x81, 0xE8, 0xF5, 0xE9, 0x9F, 0x3B, -0xFF, 0x5C, 0xD7, 0x7D, 0xFD, 0x73, 0xFF, 0xEF, 0x0B, 0xEE, -0x0E, 0xFD, 0x93, 0xC2, 0x30, 0xDE, 0xDF, 0x64, 0x9A, 0x5D, -0x7F, 0x7E, 0xE1, 0x85, 0xB6, 0x47, 0xF9, 0x7F, 0xD1, 0xDF, -0xFF, 0xBB, 0x86, 0x97, 0x5F, 0xFE, 0xDE, 0x5B, 0x42, 0x08, -0x61, 0x18, 0xEF, 0x5E, 0x7F, 0xFD, 0xF5, 0x3A, 0x71, 0xF2, -0xE4, 0x0F, 0xC5, 0x99, 0x33, 0xFB, 0x44, 0x3A, 0x7D, 0x5A, -0x1C, 0x3B, 0xD6, 0xF7, 0xCD, 0xFF, 0x89, 0x78, 0xCF, 0x9E, -0xC7, 0x3F, 0x3F, 0x36, 0x36, 0x3A, 0x24, 0x3E, 0x85, 0xC3, -0x87, 0xF7, 0x8B, 0xE7, 0x9E, 0x0B, 0x88, 0xEE, 0xEE, 0x67, -0xC5, 0xA5, 0x4B, 0xAF, 0x09, 0x21, 0x3E, 0x16, 0x9D, 0x9D, -0x9D, 0x3F, 0xBA, 0x1B, 0x9F, 0xF4, 0x49, 0xB1, 0x77, 0xEF, -0x13, 0x9B, 0x36, 0x6C, 0xD8, 0xF1, 0xFB, 0xA6, 0xA6, 0xF5, -0x3A, 0x58, 0x64, 0x32, 0x49, 0x6C, 0x3B, 0x43, 0xA1, 0x90, -0xC5, 0xB2, 0x4C, 0x16, 0x2C, 0x78, 0x84, 0xF3, 0xE7, 0xDF, -0xE6, 0xEA, 0xD5, 0x5F, 0x21, 0x44, 0x90, 0xFA, 0xFA, 0x06, -0xAA, 0xAB, 0xBF, 0x44, 0x28, 0xD4, 0xA2, 0x02, 0xA5, 0x3B, -0x0A, 0x9C, 0x3B, 0x77, 0xE4, 0x4C, 0x4B, 0xCB, 0x96, 0x87, -0x84, 0xB8, 0x49, 0x2C, 0xD6, 0x47, 0xB1, 0x58, 0x00, 0x6C, -0xCA, 0xE5, 0x19, 0x2C, 0xAB, 0x4C, 0xA9, 0x54, 0x24, 0x9F, -0x4F, 0x32, 0x77, 0x6E, 0x0D, 0x92, 0xE4, 0xC1, 0x30, 0x62, -0x9C, 0x3D, 0xFB, 0x17, 0xFA, 0xFB, 0x0D, 0xFF, 0xFE, 0xFD, -0x3D, 0xD9, 0x3B, 0x39, 0x50, 0x76, 0xED, 0xDA, 0x7C, 0xA8, -0xA5, 0x65, 0xCB, 0x43, 0x5D, 0x5D, 0x2F, 0xA2, 0xEB, 0x12, -0xBA, 0xEE, 0x26, 0x9F, 0x9F, 0xC1, 0xB6, 0x4B, 0x08, 0x21, -0x50, 0x14, 0x0B, 0x87, 0xC3, 0x8D, 0x2C, 0xDB, 0x24, 0x12, -0x83, 0x08, 0x21, 0x21, 0x49, 0x25, 0xDA, 0xDA, 0x5A, 0xB1, -0xED, 0x53, 0x83, 0x40, 0xD5, 0xDD, 0x46, 0xB4, 0x7D, 0x6C, -0xEC, 0xF9, 0xDF, 0x0E, 0x0F, 0x4F, 0x62, 0x18, 0x05, 0x6C, -0xDB, 0xC6, 0xED, 0x76, 0xE3, 0xF1, 0x38, 0x51, 0x55, 0x17, -0xF9, 0x7C, 0x11, 0xDB, 0xB6, 0x91, 0x65, 0x17, 0xA6, 0x99, -0x41, 0x92, 0x14, 0x6C, 0xBB, 0x40, 0xA1, 0x30, 0x8D, 0xA6, -0xD9, 0x2C, 0x5F, 0x5E, 0x27, 0x22, 0x91, 0x67, 0xE5, 0x3B, -0x8E, 0xE8, 0xE9, 0xA7, 0x57, 0x88, 0xDD, 0xBB, 0xD7, 0xD0, -0xD5, 0x35, 0xC1, 0xB2, 0x65, 0x21, 0x8A, 0x45, 0x95, 0x1B, -0x37, 0x4C, 0xE2, 0xF1, 0x49, 0x6C, 0xBB, 0x80, 0x6D, 0x9B, -0x78, 0xBD, 0x12, 0x42, 0x48, 0x98, 0x66, 0x01, 0xAF, 0x57, -0xC3, 0x30, 0x8A, 0xE4, 0x72, 0x12, 0x4E, 0xA7, 0x8A, 0xA6, -0xA9, 0x27, 0x9E, 0x7A, 0xEA, 0xBD, 0xF6, 0xDB, 0x09, 0x38, -0x00, 0x7A, 0x7A, 0xE2, 0xE9, 0x6D, 0xDB, 0x56, 0x7C, 0x31, -0x12, 0xD1, 0x79, 0xE6, 0x99, 0xEB, 0x3C, 0xFF, 0x93, 0x3F, -0x71, 0x25, 0x2A, 0xA1, 0xA9, 0x0D, 0x64, 0xB3, 0x95, 0xF4, -0x7D, 0x6C, 0x71, 0xAA, 0x6B, 0x92, 0x92, 0xB5, 0x94, 0xD6, -0x56, 0x1F, 0xBA, 0xAE, 0xB0, 0x78, 0x71, 0x0D, 0xBA, 0x2E, -0x70, 0xBB, 0x05, 0x95, 0x95, 0xBE, 0x5A, 0xBF, 0x5F, 0x09, -0xF6, 0xF6, 0xC6, 0xDF, 0xF9, 0xCC, 0x57, 0xD4, 0xDC, 0x5C, -0x25, 0x1C, 0xDA, 0x02, 0x9A, 0x57, 0x35, 0xB1, 0xF7, 0xE7, -0xFB, 0x70, 0xE9, 0xEE, 0x5B, 0x1A, 0xB3, 0xE6, 0x14, 0x2F, -0xBD, 0xF4, 0x22, 0xFF, 0xF8, 0xA0, 0x8F, 0x5D, 0xBB, 0x16, -0xA2, 0x28, 0x0A, 0x3E, 0xDF, 0x6C, 0xD2, 0xE9, 0x61, 0x64, -0xD9, 0xC9, 0x03, 0x0F, 0xF8, 0x38, 0x7E, 0xFC, 0xFD, 0x43, -0xDB, 0xB7, 0x77, 0xEF, 0xFC, 0x0F, 0x07, 0x00, 0x63, 0xE3, -0xD3, 0xF7, 0x5F, 0xB8, 0x70, 0xB1, 0xFE, 0xB1, 0xAD, 0x8F, -0xA3, 0x2A, 0x2A, 0xA5, 0x72, 0x89, 0x82, 0x65, 0x83, 0x54, -0x06, 0x51, 0xC6, 0xA9, 0xB9, 0xF9, 0xDC, 0xFA, 0x0D, 0xAC, -0x58, 0xD9, 0xC8, 0xDE, 0x9F, 0x1D, 0x61, 0xCD, 0x9A, 0xC5, -0xA8, 0xAA, 0x1B, 0x9F, 0x6F, 0x01, 0xB9, 0x5C, 0x86, 0x64, -0x32, 0xC0, 0xBA, 0x75, 0x8D, 0xCD, 0x86, 0x71, 0x2E, 0xDC, -0xDB, 0x9B, 0xEF, 0xFC, 0xB4, 0x83, 0xB5, 0x42, 0x88, 0xD3, -0x00, 0xA3, 0x93, 0x49, 0x34, 0x40, 0x12, 0xA0, 0x6A, 0x1A, -0x0E, 0x49, 0xC2, 0x2C, 0x15, 0x70, 0x08, 0x05, 0x1C, 0x82, -0x0A, 0x7F, 0x90, 0xAB, 0xD7, 0x06, 0x79, 0xF5, 0xC0, 0xAF, -0xF9, 0xD6, 0x37, 0x9E, 0x44, 0xF7, 0xC4, 0x10, 0x22, 0x4F, -0x2A, 0x75, 0x83, 0x8A, 0x8A, 0x5A, 0x1A, 0x1A, 0x54, 0x56, -0xAF, 0xDE, 0xF8, 0x5A, 0x6F, 0x2F, 0xDF, 0xFD, 0xB7, 0xC0, -0x40, 0x6C, 0x50, 0xDC, 0xB7, 0x70, 0x09, 0x97, 0x07, 0x2F, -0x12, 0x98, 0x15, 0xC0, 0x04, 0xE6, 0xF8, 0x2A, 0x50, 0x8B, -0x65, 0x32, 0xC2, 0x44, 0x77, 0x7A, 0x31, 0xD3, 0x49, 0x24, -0x21, 0x28, 0x0A, 0x89, 0x45, 0x91, 0x1A, 0x8E, 0x76, 0x1E, -0x46, 0x2B, 0x3B, 0xB9, 0x7F, 0xD5, 0x2A, 0x64, 0x65, 0x1C, -0xCB, 0x32, 0x49, 0xA5, 0x46, 0x08, 0x85, 0xFC, 0x44, 0x22, -0x09, 0x54, 0x75, 0xC7, 0xF7, 0x4B, 0x25, 0xF6, 0x49, 0xCD, -0x9B, 0x1E, 0xFC, 0xF2, 0xF9, 0xB7, 0xFF, 0xDE, 0x31, 0x9A, -0xEA, 0x97, 0x72, 0xD3, 0x92, 0x98, 0x9C, 0x36, 0x59, 0x58, -0x5B, 0x43, 0x5F, 0xDF, 0x05, 0xDE, 0xEB, 0xE8, 0x40, 0x72, -0xBA, 0x68, 0x6E, 0x6A, 0xE4, 0xC1, 0x47, 0xD6, 0x62, 0xCE, -0x08, 0xF4, 0x7C, 0x11, 0xCF, 0x94, 0x85, 0xC7, 0x1B, 0xE4, -0xE4, 0xF9, 0x6E, 0x36, 0x7E, 0x7D, 0x33, 0xE3, 0xA3, 0x63, -0xA8, 0x9A, 0x81, 0x65, 0x19, 0x18, 0x46, 0x86, 0x40, 0xC0, -0x60, 0x72, 0xB2, 0x9B, 0xC6, 0xC6, 0x03, 0x92, 0xB2, 0xAD, -0xFD, 0xAB, 0x8F, 0x02, 0xCC, 0xF3, 0x22, 0x90, 0x9D, 0xD4, -0x86, 0x2A, 0x39, 0xD5, 0x7D, 0x9A, 0x5F, 0x1E, 0x38, 0xC4, -0xAA, 0x86, 0x26, 0x42, 0xEE, 0x20, 0xD7, 0x2E, 0x46, 0x49, -0xA5, 0xE2, 0xD4, 0x04, 0xBD, 0x4C, 0xAB, 0x82, 0x99, 0x25, -0x73, 0xC9, 0xD5, 0xBB, 0x71, 0xDB, 0x02, 0x39, 0x2B, 0x33, -0x7B, 0xCE, 0x2C, 0x64, 0xD9, 0x8F, 0xAA, 0x2E, 0xA5, 0x5C, -0xEE, 0x26, 0x16, 0xEB, 0xA3, 0xAD, 0xED, 0x15, 0x84, 0x78, -0x65, 0x9F, 0x12, 0x9E, 0x3B, 0x7B, 0x19, 0xE4, 0x18, 0x4B, -0x96, 0x91, 0x67, 0xF2, 0x84, 0x85, 0x6D, 0xFF, 0xF3, 0x7C, -0xCC, 0x11, 0x8E, 0x44, 0x68, 0x5D, 0xFB, 0x30, 0xFE, 0x80, -0x97, 0xA9, 0x91, 0x38, 0x46, 0x2E, 0xCD, 0x9B, 0x2D, 0xF3, -0x19, 0x77, 0xC8, 0x84, 0xF2, 0xD3, 0x44, 0xCE, 0x44, 0xA9, -0x1E, 0xCF, 0x41, 0x03, 0xE8, 0xB2, 0x07, 0x80, 0x81, 0x81, -0x0E, 0x42, 0xA1, 0x20, 0x6D, 0x6D, 0x7B, 0x48, 0xA7, 0x13, -0x57, 0x96, 0x2F, 0x5F, 0xF8, 0x53, 0xA5, 0x58, 0xB4, 0x64, -0x32, 0x2E, 0x3C, 0x1F, 0xD6, 0x11, 0x93, 0x6E, 0x32, 0x12, -0x4E, 0x3A, 0x46, 0xCC, 0x58, 0xFA, 0xE1, 0x95, 0xAB, 0x83, -0xD7, 0x86, 0xA2, 0x04, 0xFC, 0x41, 0xBC, 0x1E, 0x8D, 0x1A, -0x6F, 0x2D, 0x3B, 0x63, 0xAB, 0x19, 0xD2, 0xE2, 0x4C, 0x59, -0x37, 0x88, 0x67, 0x24, 0x92, 0x6A, 0x12, 0x64, 0x48, 0x4C, -0x24, 0x48, 0x4F, 0x4D, 0x52, 0x5F, 0xFF, 0x15, 0x32, 0x99, -0x2C, 0x5B, 0xB7, 0xAE, 0xDD, 0x74, 0xF4, 0x68, 0xF7, 0x1F, -0x01, 0x94, 0xDA, 0xAC, 0x3F, 0xCA, 0x65, 0xB1, 0xEE, 0x43, -0xF3, 0x14, 0x09, 0xE7, 0x0C, 0x05, 0x4B, 0xA1, 0x6A, 0x51, -0xE5, 0xF4, 0x68, 0x6C, 0x30, 0xB8, 0xB4, 0xB1, 0x15, 0x49, -0x92, 0x91, 0x72, 0x39, 0x3E, 0xC8, 0x7F, 0x44, 0xB5, 0xE4, -0xC6, 0xE3, 0x5F, 0x42, 0x61, 0x4E, 0x18, 0xB3, 0x6E, 0x1C, -0xCF, 0xF8, 0x25, 0xAC, 0x91, 0x09, 0xF4, 0x59, 0x83, 0xDC, -0x17, 0x5E, 0x4B, 0x7B, 0xFB, 0xFA, 0x8E, 0x13, 0x27, 0xFE, -0xBA, 0xF9, 0x96, 0x3D, 0x28, 0x85, 0x45, 0xD0, 0x5E, 0xEF, -0xDB, 0x3C, 0x98, 0xB8, 0x86, 0xC3, 0xAB, 0x51, 0x1A, 0x9B, -0x20, 0x30, 0xB7, 0x3A, 0x60, 0xAB, 0xA5, 0xF2, 0xF5, 0xE8, -0x88, 0x94, 0x9D, 0x4A, 0x60, 0x3B, 0x66, 0x98, 0x55, 0x3D, -0x8F, 0x81, 0xE9, 0x18, 0xCE, 0xC9, 0x21, 0xB4, 0xE9, 0x9B, -0xE4, 0xCC, 0x69, 0xBE, 0x30, 0x7B, 0x31, 0xD5, 0x8B, 0x16, -0x92, 0x48, 0x70, 0xE5, 0xC0, 0x81, 0x1F, 0x34, 0x1C, 0x3C, -0x78, 0xF8, 0x37, 0xB7, 0xDD, 0xE4, 0xA1, 0xE8, 0x80, 0xB8, -0x74, 0x73, 0x98, 0x7C, 0xEA, 0x3A, 0x66, 0xD9, 0x8B, 0xE4, -0x2A, 0x21, 0x5B, 0x1A, 0xA3, 0x89, 0x14, 0x25, 0x61, 0x11, -0xF6, 0x39, 0xA8, 0x9B, 0x57, 0x49, 0x4A, 0x73, 0x63, 0x67, -0x4A, 0x78, 0x8A, 0x05, 0xEA, 0xEA, 0x22, 0x0C, 0x5C, 0x1C, -0xE5, 0xE0, 0x1B, 0xAF, 0xEE, 0xEE, 0x38, 0xF6, 0xEE, 0x2F, -0x3E, 0xEB, 0xB3, 0x73, 0x00, 0xD4, 0x2E, 0x5B, 0x3C, 0xD1, -0xB8, 0x74, 0xC1, 0xC6, 0xB4, 0x01, 0x15, 0x73, 0xFC, 0x38, -0x1D, 0x4E, 0x3C, 0x65, 0x85, 0x80, 0xDB, 0xC5, 0x9C, 0x9A, -0xF9, 0x54, 0x05, 0xE6, 0x13, 0xF0, 0xB8, 0xA9, 0x0E, 0x55, -0xE1, 0x73, 0x57, 0xB0, 0x72, 0xD9, 0x52, 0x0E, 0x77, 0x74, -0x46, 0x9F, 0x78, 0xF2, 0xDB, 0xB3, 0x07, 0xFA, 0xA3, 0x67, -0xFF, 0xAB, 0x44, 0xBB, 0x3C, 0x70, 0xF1, 0x4D, 0x29, 0xE0, -0xFA, 0x5A, 0x32, 0x9E, 0x46, 0x96, 0x64, 0x3C, 0xB2, 0x82, -0x43, 0x72, 0xE0, 0xF2, 0xBA, 0x90, 0x9D, 0x3A, 0x2E, 0xA1, -0xE3, 0xD6, 0x15, 0x54, 0x45, 0x45, 0xD1, 0xB5, 0x3F, 0xA8, -0xAA, 0xBA, 0xE5, 0x9E, 0xF3, 0xF8, 0x9D, 0x93, 0x27, 0x1E, -0x8B, 0xC6, 0xC7, 0xC4, 0x70, 0x26, 0x29, 0x6E, 0x4C, 0xC4, -0x45, 0x36, 0x6B, 0xDC, 0x92, 0xCB, 0xB9, 0x5C, 0x4E, 0x7C, -0x74, 0xE1, 0xC2, 0x8E, 0x7B, 0xE1, 0x94, 0x6E, 0x77, 0x18, -0x8D, 0x46, 0xDB, 0x23, 0xF3, 0xE7, 0xAD, 0x73, 0x48, 0xF2, -0xCC, 0xDF, 0xBA, 0x7B, 0x7C, 0x3D, 0x3D, 0x47, 0xD6, 0x87, -0x43, 0x2B, 0x7E, 0xFC, 0x9D, 0x9D, 0x3B, 0x8F, 0xDF, 0xEB, -0xA5, 0xFF, 0x35, 0x00, 0xB6, 0xF9, 0xAF, 0x08, 0x54, 0xAA, -0xDA, 0xA9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Options2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x37, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xB5, 0x96, 0x6B, 0x50, 0x54, 0xE7, 0x19, -0xC7, 0x7F, 0x7B, 0x85, 0x5D, 0x60, 0x77, 0xC9, 0x02, 0x2B, -0xC2, 0x2E, 0xB8, 0xE8, 0x82, 0x5C, 0x14, 0x54, 0x94, 0xE2, -0xA5, 0xD1, 0x41, 0x11, 0x4D, 0x26, 0xE4, 0xF2, 0x21, 0x63, -0x6A, 0xA4, 0x19, 0xAB, 0x69, 0x27, 0x5E, 0xA2, 0x69, 0x4C, -0x13, 0x1D, 0x41, 0x63, 0x9B, 0x38, 0x63, 0xB5, 0x49, 0x3E, -0x34, 0x3A, 0x0D, 0x5E, 0x12, 0x23, 0x51, 0x4C, 0x68, 0x52, -0x27, 0x11, 0xE3, 0x05, 0x50, 0x58, 0x56, 0x41, 0x44, 0x05, -0x04, 0x56, 0x90, 0x3B, 0x59, 0xEE, 0x84, 0xAB, 0xB8, 0x7D, -0x77, 0xB1, 0xAD, 0x92, 0x2F, 0x6D, 0xA7, 0x7D, 0xCE, 0xFE, -0xE7, 0x79, 0xDF, 0xF3, 0x9E, 0x7D, 0xAE, 0xFF, 0xF3, 0xCC, -0x81, 0xFF, 0xB3, 0x48, 0x72, 0xBF, 0xCB, 0x8E, 0x68, 0x6A, -0x0B, 0xAE, 0xE8, 0x1D, 0xF6, 0x43, 0x29, 0x1B, 0xE1, 0x81, -0xB8, 0xFE, 0x21, 0xD2, 0x87, 0xFA, 0x81, 0x53, 0xAC, 0xC5, -0x46, 0xE2, 0xBA, 0x9C, 0xE2, 0x09, 0x09, 0xC8, 0x65, 0xAE, -0x03, 0x90, 0x29, 0x60, 0x78, 0x40, 0x46, 0x6C, 0x8C, 0x3F, -0x27, 0xB3, 0x5E, 0x5F, 0xB8, 0x6F, 0xFF, 0xB1, 0x82, 0x47, -0x1D, 0xC8, 0xF6, 0xFD, 0xF1, 0xC4, 0xAB, 0xA7, 0x4F, 0x57, -0x2D, 0x59, 0xB3, 0x26, 0x0E, 0x83, 0xBF, 0x9A, 0x50, 0xA3, -0x2F, 0x21, 0x46, 0x1D, 0x53, 0x04, 0x8C, 0xA1, 0x3A, 0x42, -0x82, 0x75, 0x84, 0x86, 0x3E, 0x5C, 0x9B, 0x74, 0x04, 0x05, -0x6B, 0x31, 0x85, 0xE8, 0x08, 0x34, 0x08, 0x04, 0xE9, 0x30, -0x04, 0xFA, 0xA2, 0x9F, 0xAC, 0xA5, 0xDB, 0xA1, 0xA6, 0xAA, -0xA2, 0x20, 0xC0, 0x5A, 0x6C, 0xFD, 0xFC, 0x31, 0x07, 0xBF, -0x58, 0xBD, 0xC1, 0xEC, 0xEB, 0xAF, 0x4F, 0x8D, 0x8F, 0xF5, -0x21, 0xC0, 0x4F, 0x29, 0xA0, 0x70, 0xC3, 0xDF, 0xA5, 0xF5, -0xE3, 0xDA, 0x5F, 0xE8, 0x80, 0x27, 0x14, 0xF8, 0x09, 0xE8, -0xC4, 0x33, 0x3E, 0x5A, 0x25, 0x6A, 0xBD, 0x12, 0x4F, 0x6F, -0x25, 0x0A, 0x0F, 0x25, 0x1E, 0x62, 0x3D, 0xD9, 0x28, 0xE3, -0xEC, 0xA9, 0x53, 0x17, 0x4A, 0xCB, 0x4B, 0xBF, 0x79, 0xD4, -0x81, 0x54, 0x21, 0x93, 0xD0, 0xD6, 0xDA, 0xEB, 0xDE, 0xB4, -0xF5, 0x83, 0xA3, 0x07, 0x9A, 0x3A, 0xA1, 0xB1, 0x03, 0xEA, -0xDA, 0xE1, 0x4E, 0x33, 0xDC, 0x6C, 0x84, 0xD2, 0x1A, 0xB8, -0x72, 0x0B, 0x2E, 0x97, 0x43, 0xB1, 0x5D, 0xE0, 0x0E, 0x14, -0xB8, 0xEE, 0x35, 0xC0, 0xB9, 0x0A, 0xB0, 0x09, 0xAD, 0xF2, -0x74, 0x3A, 0x27, 0xF6, 0x40, 0x8E, 0xB8, 0xE5, 0x21, 0x9C, -0xB8, 0x4E, 0x06, 0x87, 0x45, 0x59, 0xEF, 0x8B, 0x9A, 0x0A, -0x0C, 0x8C, 0xC2, 0x88, 0xD8, 0xFF, 0x38, 0x24, 0x30, 0x22, -0xCE, 0x04, 0x86, 0x44, 0x1F, 0x46, 0xD5, 0x70, 0xB7, 0x34, -0x1F, 0x7A, 0x7F, 0xA0, 0xA3, 0xA5, 0x0D, 0x0F, 0xA3, 0x91, -0xEE, 0x86, 0x8B, 0xA8, 0x82, 0x32, 0x88, 0xB4, 0x58, 0xEC, -0x13, 0x1D, 0x48, 0x65, 0x32, 0x27, 0x72, 0xF9, 0x03, 0x3A, -0x84, 0xD1, 0x16, 0x11, 0x75, 0xAD, 0x88, 0xBA, 0x5A, 0x44, -0x5D, 0x51, 0x0F, 0x37, 0x9A, 0xE0, 0xBA, 0x88, 0xBE, 0xAC, -0x16, 0x4A, 0x44, 0x56, 0x17, 0xAA, 0xEB, 0x38, 0xF9, 0xFE, -0xF3, 0x94, 0x7E, 0xFA, 0x0E, 0x97, 0x8E, 0x7F, 0xC8, 0xF9, -0x4F, 0x32, 0x38, 0xB3, 0x6B, 0x2D, 0x77, 0x72, 0xCE, 0x60, -0xCF, 0x79, 0x9E, 0xEB, 0x77, 0xED, 0x6F, 0x2D, 0x5A, 0xBA, -0x22, 0xE6, 0x31, 0x16, 0x35, 0xD4, 0x76, 0xA6, 0x7D, 0x53, -0xD8, 0x91, 0x39, 0x65, 0xEE, 0x54, 0x5A, 0x85, 0xB1, 0x31, -0xA5, 0x88, 0x5E, 0x44, 0x3D, 0x28, 0x1C, 0xF6, 0xF7, 0x89, -0x2C, 0xC4, 0xBA, 0x59, 0x44, 0x5E, 0x5D, 0x53, 0x89, 0x9F, -0x75, 0x27, 0x6A, 0xC5, 0x8F, 0x0C, 0xC8, 0x7D, 0xB8, 0x61, -0x2B, 0xC6, 0x5B, 0xEB, 0xCD, 0x7D, 0x91, 0xB6, 0x42, 0xE5, -0x83, 0x61, 0x92, 0x2F, 0x2F, 0xAF, 0xDB, 0xC4, 0x97, 0xD9, -0x59, 0x68, 0x34, 0xFA, 0x9C, 0xA3, 0x07, 0x0F, 0xA4, 0xBA, -0x33, 0xF0, 0x52, 0x8C, 0x51, 0xD3, 0x3F, 0x9E, 0x41, 0xD7, -0xA0, 0xA8, 0x79, 0x1D, 0x58, 0x8B, 0xE0, 0xC4, 0xD7, 0xF0, -0xE9, 0x69, 0xF8, 0x20, 0x0B, 0x8E, 0xBE, 0x6B, 0xE7, 0xC9, -0xEA, 0x1D, 0xCC, 0x48, 0x30, 0xB1, 0xE4, 0xC5, 0x5F, 0x12, -0x24, 0x18, 0x64, 0x08, 0xD0, 0x11, 0x13, 0x15, 0xCE, 0xC6, -0x2D, 0x1B, 0x09, 0x09, 0xD2, 0xD3, 0xD5, 0xD1, 0x49, 0x6E, -0xF6, 0x31, 0x3E, 0xDA, 0x9B, 0xC1, 0xDD, 0x7A, 0xFB, 0x33, -0xC7, 0x73, 0xCE, 0x6C, 0x77, 0x67, 0x30, 0xDC, 0xD9, 0x95, -0xB6, 0xEA, 0x40, 0x7B, 0xA6, 0x5C, 0x6D, 0xE1, 0xCA, 0x25, -0x68, 0xE8, 0x19, 0xE7, 0x37, 0x2E, 0x9E, 0x7B, 0x0A, 0x88, -0xDA, 0xA7, 0x4C, 0x3D, 0xC6, 0xAE, 0xD5, 0x76, 0x7E, 0xFF, -0x59, 0x23, 0xFA, 0x11, 0x03, 0xF7, 0xEC, 0x5E, 0x18, 0xC3, -0xF3, 0xD9, 0xBC, 0x65, 0x3F, 0xB6, 0xAB, 0x45, 0x4C, 0x0B, -0x9B, 0xC2, 0xC7, 0x1F, 0x1F, 0xA2, 0xFC, 0xE6, 0xCD, 0xFB, -0xD1, 0xD3, 0x2D, 0xF2, 0x05, 0x2B, 0x5F, 0xA0, 0xC4, 0x6A, -0xE5, 0xD0, 0x87, 0xFB, 0x64, 0x72, 0xA5, 0x06, 0xB2, 0x0F, -0x89, 0xF0, 0x0D, 0x8C, 0x23, 0x50, 0x40, 0x94, 0xC9, 0xDD, -0x75, 0x97, 0x13, 0xD1, 0x8B, 0xB5, 0x89, 0x7D, 0xE4, 0xD5, -0x6B, 0xE8, 0xB6, 0x37, 0xE2, 0x13, 0xDC, 0x4F, 0x5C, 0x82, -0x3F, 0x2D, 0x0E, 0x3D, 0x97, 0xAF, 0x14, 0xF0, 0xEA, 0xBA, -0xB5, 0xE4, 0xE7, 0x5F, 0x46, 0xAB, 0xD5, 0x22, 0x95, 0x38, -0x5F, 0x4F, 0x48, 0x9C, 0x5F, 0xD9, 0x5A, 0x5B, 0x9D, 0x3B, -0x26, 0xD3, 0xB0, 0xE5, 0x9D, 0x1D, 0xEB, 0xA5, 0xB8, 0x98, -0xE5, 0x31, 0x06, 0x53, 0x85, 0x31, 0x3F, 0x57, 0x4E, 0x02, -0x82, 0x41, 0x0C, 0x3F, 0x74, 0xE2, 0x62, 0x92, 0xA8, 0x73, -0xEB, 0xBD, 0x76, 0xC2, 0xCC, 0x26, 0x51, 0x54, 0x25, 0x09, -0x8B, 0x93, 0x88, 0x8E, 0x9C, 0x49, 0x79, 0x59, 0x09, 0xDB, -0xB7, 0x6F, 0x67, 0xCF, 0x9E, 0xDD, 0x44, 0x45, 0x47, 0x63, -0x32, 0x86, 0xA4, 0x6D, 0xD8, 0xB0, 0xE9, 0x5C, 0x7D, 0xED, -0xED, 0x7C, 0x5F, 0x7F, 0x1D, 0xED, 0xCD, 0x2D, 0xE1, 0x52, -0xB7, 0x11, 0xF5, 0x78, 0xC7, 0x95, 0x22, 0x11, 0xB9, 0x5C, -0xF8, 0x13, 0x90, 0x09, 0x28, 0x5C, 0xA5, 0x0A, 0x11, 0xEC, -0xEA, 0x95, 0xD0, 0xFD, 0x43, 0x2D, 0xE6, 0xA8, 0x78, 0x41, -0xE9, 0x61, 0xAA, 0x4B, 0xF2, 0xF8, 0xED, 0x9B, 0x6F, 0x50, -0x55, 0x55, 0x47, 0x6F, 0x77, 0x07, 0x16, 0x8B, 0x85, 0xD5, -0xAB, 0x5E, 0x22, 0xD0, 0x14, 0xEA, 0x9E, 0x2E, 0x46, 0xA3, -0xA9, 0x44, 0xAE, 0x50, 0x62, 0x2B, 0x2A, 0x2C, 0x11, 0x0E, -0x24, 0xEE, 0xD7, 0xC1, 0xF5, 0x53, 0xAB, 0x40, 0xEB, 0x01, -0x3A, 0x1F, 0x30, 0x1B, 0x21, 0x7A, 0x06, 0x44, 0xCE, 0x81, -0xAB, 0x03, 0x2A, 0x5A, 0x6E, 0x55, 0xA2, 0x0D, 0xD0, 0x63, -0x9E, 0x96, 0x40, 0x5E, 0x89, 0x9C, 0xBF, 0x9E, 0xCA, 0xE4, -0xB9, 0x67, 0x9F, 0xA6, 0xB4, 0xEC, 0x36, 0x29, 0x2B, 0x9F, -0xE2, 0xF0, 0x91, 0x23, 0x8C, 0x0C, 0xF4, 0xC6, 0x65, 0x67, -0x9D, 0x68, 0x93, 0xEA, 0x4C, 0x9B, 0x2A, 0x4B, 0x0A, 0x59, -0xB0, 0x24, 0x79, 0x50, 0xE2, 0x1C, 0xEA, 0x49, 0x93, 0x24, -0x36, 0x66, 0x2A, 0x67, 0x47, 0x12, 0x26, 0x8C, 0x6B, 0x45, -0x4F, 0xBC, 0x05, 0x4C, 0x01, 0xA5, 0xF4, 0x14, 0xEF, 0x22, -0x44, 0xA3, 0xE0, 0x5E, 0x47, 0x20, 0x6A, 0x4F, 0x6F, 0x54, -0xF2, 0x21, 0x96, 0x2D, 0x4D, 0xE6, 0x42, 0x6F, 0x2C, 0x29, -0x81, 0xED, 0xEC, 0xD9, 0x9C, 0xCA, 0xB6, 0x8C, 0x7D, 0xB4, -0xB6, 0x34, 0xD1, 0xD6, 0xDC, 0x4E, 0xB0, 0x39, 0x84, 0xD6, -0x11, 0x25, 0x57, 0x05, 0x5B, 0x7C, 0x94, 0x2A, 0x8E, 0x1C, -0xFA, 0x40, 0x22, 0x71, 0x76, 0x75, 0xFD, 0x4A, 0x32, 0xBF, -0xFD, 0xE0, 0xE4, 0xA7, 0x2C, 0xC4, 0x78, 0x8B, 0xD2, 0x68, -0x61, 0x59, 0x64, 0x31, 0xD6, 0xFD, 0x2B, 0x58, 0x90, 0xB4, -0x8D, 0x58, 0x73, 0x10, 0x0A, 0x9D, 0x2F, 0x59, 0x5F, 0x5F, -0x64, 0x4C, 0x33, 0x89, 0x27, 0x44, 0x39, 0xA5, 0x43, 0x2D, -0x34, 0x0D, 0xFA, 0x73, 0xA3, 0xE8, 0x7B, 0xE6, 0xC4, 0xCF, -0x21, 0x36, 0x76, 0x16, 0xB6, 0x6B, 0xD7, 0xC5, 0x7B, 0xA1, -0xA7, 0xB9, 0xBE, 0xC6, 0x35, 0x7F, 0x28, 0xBB, 0x6A, 0x3D, -0x5B, 0x66, 0x2B, 0x4A, 0x96, 0x38, 0x9D, 0xCE, 0x6D, 0xAA, -0xB9, 0xB6, 0xF7, 0x86, 0x4C, 0x11, 0xA4, 0x2E, 0xF4, 0x61, -0x55, 0xE2, 0x08, 0xA7, 0xF7, 0x26, 0x11, 0x3E, 0x65, 0x1E, -0xE9, 0x7F, 0xD8, 0xCB, 0xDC, 0x45, 0x4F, 0xB2, 0xE3, 0xED, -0xDF, 0x11, 0xE0, 0x2D, 0x23, 0xE7, 0xA2, 0x8D, 0x76, 0x31, -0x43, 0x86, 0x1C, 0x0E, 0x3C, 0x15, 0xF7, 0x09, 0x0C, 0x36, -0xD3, 0xD0, 0xD4, 0x44, 0x57, 0x67, 0x97, 0x9B, 0x00, 0xA3, -0xA3, 0x23, 0x48, 0xE4, 0x6A, 0x91, 0x41, 0x5E, 0x5F, 0x61, -0xFE, 0x79, 0x0D, 0x0F, 0x39, 0x23, 0x88, 0xE4, 0x2C, 0x86, -0x3E, 0xBD, 0xE8, 0x42, 0xEB, 0x77, 0xDF, 0x66, 0xCF, 0xFB, -0xE2, 0xCB, 0x4B, 0xB2, 0x67, 0x52, 0x96, 0x62, 0x89, 0x8A, -0x62, 0xBA, 0x68, 0xA0, 0xC1, 0x30, 0x89, 0xD6, 0xD6, 0x66, -0xFE, 0x7C, 0xF0, 0x2F, 0x94, 0xD9, 0x5B, 0x70, 0x34, 0xD9, -0x1D, 0xBE, 0x5E, 0x1A, 0x8D, 0x54, 0xE5, 0xA1, 0x0C, 0x9A, -0x6C, 0x40, 0xED, 0x1C, 0xC5, 0x1C, 0x3D, 0x9B, 0xB3, 0xE7, -0xF3, 0x28, 0xBD, 0x56, 0xB4, 0xDF, 0x7A, 0xF1, 0xDC, 0x96, -0x7F, 0x8E, 0x8A, 0x89, 0xC3, 0x29, 0x30, 0x2C, 0x22, 0xFD, -0x95, 0xDF, 0x6C, 0xDD, 0x39, 0x23, 0xD0, 0x93, 0xB8, 0xB8, -0x58, 0x32, 0x8F, 0x7E, 0xC6, 0x8C, 0xE8, 0x08, 0x16, 0x2F, -0x5C, 0xC4, 0xD1, 0x9C, 0x5C, 0xAC, 0xB6, 0x12, 0x2A, 0xCB, -0x8A, 0x5E, 0x4E, 0x7A, 0xFA, 0x85, 0xAF, 0x7A, 0x1C, 0x8E, -0xCD, 0x26, 0xA3, 0xD1, 0xD2, 0x58, 0x53, 0xDE, 0x54, 0x75, -0xA7, 0xA6, 0x48, 0x17, 0x14, 0x52, 0xF0, 0xB7, 0x2F, 0x8E, -0x3B, 0x1E, 0x9F, 0xA6, 0x13, 0xE4, 0x95, 0x75, 0xAF, 0xC9, -0x0A, 0x2F, 0x7C, 0x4B, 0xD4, 0xFA, 0x75, 0xDC, 0xBE, 0x5D, -0xC1, 0xB4, 0xF0, 0x68, 0xDA, 0xBA, 0xFA, 0x28, 0xBA, 0x69, -0x17, 0x14, 0x56, 0x71, 0xB7, 0xE2, 0x06, 0xA6, 0xD0, 0xA9, -0x75, 0x7F, 0x7A, 0x77, 0x87, 0x98, 0x54, 0xEC, 0x7E, 0xFC, -0xDF, 0x97, 0x27, 0x9A, 0xFB, 0x69, 0x06, 0x61, 0xD3, 0x23, -0xE7, 0xCC, 0x4B, 0x98, 0x6F, 0x8B, 0x88, 0x9A, 0x25, 0x9A, -0x17, 0x43, 0xC6, 0xDB, 0x6F, 0xA0, 0xF2, 0xF0, 0x26, 0x62, -0xF6, 0x2C, 0x96, 0x2F, 0x5F, 0xC9, 0xD6, 0xD7, 0xD6, 0x8F, -0x79, 0x7B, 0x79, 0x19, 0x6E, 0x95, 0x5D, 0xEB, 0xF8, 0x89, -0xB5, 0x7F, 0x57, 0xD6, 0xA4, 0xAD, 0xCD, 0x8D, 0x4F, 0x5C, -0xE4, 0x3C, 0x7C, 0x32, 0xC7, 0x99, 0xB4, 0x7C, 0x85, 0x73, -0xF1, 0xCF, 0x17, 0x3A, 0x3F, 0xFA, 0xE4, 0xB0, 0xF3, 0xA5, -0xF5, 0x5B, 0x9D, 0x46, 0x53, 0x70, 0xEA, 0x7F, 0x6D, 0xF8, -0x11, 0x91, 0x2E, 0x4B, 0x49, 0x7D, 0xF3, 0xD7, 0xDB, 0xD2, -0x87, 0x37, 0xBE, 0xB5, 0xA7, 0x3F, 0xFD, 0xFD, 0x03, 0x03, -0xBB, 0x77, 0xA5, 0xE7, 0xEF, 0x3C, 0x70, 0x70, 0x59, 0x44, -0xD4, 0x4C, 0xCB, 0xFF, 0xC2, 0x81, 0x5B, 0x66, 0xC6, 0xFF, -0x2C, 0x60, 0x71, 0x72, 0x8A, 0x79, 0x69, 0xF2, 0xCA, 0x30, -0xFE, 0xF5, 0x91, 0xF1, 0x1F, 0xC9, 0xDF, 0x01, 0x3F, 0x79, -0x56, 0x4A, 0xCF, 0x4C, 0xD6, 0xCC, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pad2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0x7C, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xBD, 0x55, 0x7B, 0x50, 0x93, 0x57, 0x16, -0xFF, 0x7D, 0x79, 0x92, 0x90, 0x90, 0x87, 0x10, 0x49, 0x80, -0x00, 0xF2, 0x08, 0xE1, 0x51, 0x90, 0xD0, 0x20, 0x28, 0x09, -0xAF, 0x42, 0x11, 0x10, 0x21, 0x0A, 0x15, 0x10, 0x30, 0x0A, -0x2A, 0x10, 0x02, 0xE8, 0x22, 0xA6, 0x01, 0x4C, 0x5D, 0x94, -0x5A, 0xCA, 0x2A, 0xDB, 0x55, 0xB7, 0xB3, 0x6B, 0xAB, 0x4E, -0x15, 0x6D, 0x67, 0x5A, 0xBA, 0x75, 0x14, 0x57, 0x3B, 0xDD, -0x2D, 0x3A, 0xE2, 0x0A, 0x0A, 0x5B, 0x51, 0xB4, 0x05, 0x7C, -0x31, 0x5D, 0x05, 0x94, 0xC5, 0x1A, 0xB0, 0x9A, 0x6F, 0xBF, -0x64, 0xD7, 0x8E, 0xDB, 0xDD, 0xF6, 0x8F, 0x76, 0x67, 0x7F, -0x33, 0xF7, 0x3B, 0xE7, 0x9E, 0x7B, 0xCF, 0xEF, 0x9E, 0x73, -0xEF, 0xFD, 0xCE, 0x05, 0xFE, 0xDF, 0x50, 0x2A, 0x83, 0xD2, -0x9D, 0x38, 0x9C, 0x46, 0x4A, 0x65, 0x3C, 0xB3, 0x55, 0x55, -0x19, 0x94, 0x9F, 0x0E, 0xF4, 0x4E, 0x1B, 0x2D, 0x16, 0xB2, -0xA9, 0x6D, 0x17, 0x79, 0xE4, 0xC4, 0x31, 0xDB, 0xBB, 0x1F, -0x74, 0x54, 0x3E, 0xEF, 0x47, 0xA3, 0x11, 0xAB, 0x65, 0x73, -0x5D, 0xD7, 0x7D, 0x9F, 0x8F, 0xF6, 0x7C, 0xC7, 0xC9, 0x55, -0x42, 0xDE, 0xB9, 0x37, 0xFD, 0xC9, 0x8C, 0x75, 0xD6, 0x42, -0x10, 0xEC, 0x6F, 0x17, 0xC5, 0xC5, 0x6C, 0x75, 0x62, 0xF3, -0xEA, 0xB2, 0x74, 0x19, 0x83, 0x09, 0x61, 0x91, 0xBC, 0xA9, -0x5B, 0x8F, 0x31, 0xFC, 0xE7, 0x8B, 0x90, 0xBB, 0xBA, 0x13, -0xC5, 0xBA, 0xBC, 0x5F, 0xB3, 0x05, 0x92, 0x8F, 0x04, 0x72, -0x1F, 0x13, 0x9B, 0xCE, 0x26, 0x15, 0x8A, 0xA8, 0xDF, 0x8D, -0xCD, 0xF0, 0xF7, 0x80, 0x21, 0x24, 0xB3, 0x17, 0x27, 0xA4, -0xFF, 0xC7, 0x02, 0xA1, 0xE1, 0xE1, 0xA4, 0xA1, 0xA0, 0x00, -0xBA, 0xC5, 0x49, 0x30, 0x18, 0x0C, 0xD8, 0x62, 0xAE, 0xC7, -0xED, 0xD1, 0x09, 0xF3, 0xCC, 0xEC, 0xC3, 0xD7, 0x69, 0x4C, -0x26, 0xBE, 0xB9, 0x3F, 0x89, 0x8C, 0x44, 0x3F, 0x78, 0x85, -0x48, 0xB0, 0x40, 0x15, 0x89, 0x81, 0xFE, 0x5E, 0x70, 0x65, -0xB2, 0x2C, 0xCE, 0xFD, 0xA7, 0xCD, 0xA3, 0xED, 0x3B, 0x70, -0x6B, 0x64, 0x10, 0xAF, 0x9A, 0x8C, 0x30, 0x6D, 0x31, 0xE1, -0xF3, 0xA1, 0x07, 0x9F, 0x78, 0x0A, 0x9D, 0xE7, 0x7E, 0xB7, -0x80, 0x9B, 0xAB, 0x5B, 0x6D, 0x64, 0xEC, 0x22, 0x5C, 0xBD, -0x37, 0x86, 0x7D, 0xFB, 0xF7, 0xA3, 0xBD, 0x7D, 0x27, 0x42, -0xB4, 0x2A, 0xC8, 0x95, 0x5E, 0xD4, 0x28, 0x0B, 0x5D, 0xC7, -0x4F, 0xE2, 0x6C, 0xCF, 0x39, 0x2A, 0x45, 0x21, 0x92, 0x53, -0xD3, 0x71, 0xB4, 0xE3, 0x08, 0x95, 0xED, 0x1C, 0xDC, 0xBF, -0x7D, 0x0B, 0x98, 0xBE, 0x85, 0x86, 0xEE, 0x4B, 0x98, 0xB6, -0x3E, 0x44, 0x18, 0x1F, 0xF8, 0x72, 0xB0, 0x17, 0xE3, 0x1C, -0x16, 0x02, 0x62, 0x93, 0x0E, 0xDA, 0xB9, 0xE9, 0xF6, 0x8F, -0xD4, 0x7B, 0x5E, 0xD1, 0xE0, 0xCD, 0xB1, 0xA8, 0xDE, 0xD3, -0x7F, 0xC4, 0xD8, 0xFD, 0x47, 0x18, 0x1A, 0xEE, 0x47, 0x72, -0x74, 0x02, 0x76, 0xEF, 0xDA, 0x05, 0xA9, 0xAF, 0x02, 0x2C, -0x2E, 0x0D, 0x1B, 0x8D, 0x46, 0x48, 0x5C, 0x84, 0xE0, 0x70, -0xB9, 0x58, 0xA4, 0x89, 0xC3, 0x66, 0xB3, 0x19, 0xF3, 0xA4, -0xEE, 0x78, 0xE2, 0x15, 0x88, 0x07, 0x53, 0x5F, 0x23, 0x5E, -0xAD, 0x86, 0x66, 0x71, 0x26, 0x26, 0x1F, 0xCD, 0x60, 0xFA, -0xEA, 0x00, 0x9A, 0x5B, 0xDB, 0x7C, 0x26, 0xBF, 0x1E, 0x7B, -0xCD, 0x71, 0x90, 0xF5, 0xE6, 0xF5, 0xF3, 0x1A, 0xEA, 0x5A, -0x71, 0xAD, 0xF7, 0x22, 0xDC, 0x55, 0xF3, 0x71, 0xF7, 0xFA, -0xAC, 0x63, 0xDB, 0xDC, 0xBD, 0x7D, 0xD0, 0x7F, 0x79, 0x18, -0x77, 0xBA, 0x6E, 0xA2, 0xE3, 0x68, 0x07, 0x92, 0x13, 0x53, -0x30, 0x3E, 0x35, 0x81, 0xC9, 0xBE, 0xB3, 0xE8, 0xF8, 0xF8, -0x73, 0xB8, 0x10, 0x13, 0xB8, 0x3D, 0x72, 0x1B, 0x9B, 0x36, -0xD5, 0xC1, 0x2F, 0x38, 0x18, 0x24, 0x49, 0x3A, 0xFC, 0x08, -0x82, 0x40, 0xFD, 0xB6, 0x16, 0x6B, 0xCB, 0xA5, 0x0B, 0xFF, -0xBC, 0x29, 0xA5, 0x05, 0x15, 0xC9, 0xE5, 0x1B, 0xEB, 0xB0, -0xF7, 0xD0, 0x7B, 0x28, 0x7C, 0xFC, 0x10, 0xE9, 0x31, 0x71, -0x58, 0x5F, 0xBE, 0x1A, 0xB6, 0x59, 0x1B, 0xE4, 0x9E, 0xBE, -0x18, 0xE8, 0xEB, 0x43, 0xFE, 0x8A, 0x55, 0xE8, 0xFD, 0xCB, -0x19, 0xA8, 0xA3, 0x16, 0x20, 0x2C, 0x26, 0x01, 0xB6, 0x99, -0x07, 0x48, 0x7C, 0x39, 0x0B, 0x8A, 0xE0, 0x40, 0xF0, 0x78, -0x02, 0x7C, 0x39, 0x7C, 0x03, 0x5C, 0x27, 0x11, 0xDC, 0x02, -0x82, 0x10, 0xB4, 0x30, 0x05, 0x47, 0xF6, 0xED, 0xE5, 0x95, -0x6D, 0x2C, 0x53, 0xD0, 0xE2, 0xB4, 0x9A, 0xE8, 0xDF, 0x1F, -0x3C, 0x40, 0x0B, 0x90, 0x88, 0xD1, 0xF5, 0x59, 0x37, 0x56, -0x55, 0xD4, 0x52, 0x11, 0xD0, 0x70, 0xE3, 0xE6, 0x24, 0x18, -0x0C, 0x12, 0xDF, 0xFC, 0xED, 0x3A, 0x88, 0xD9, 0xC7, 0xF0, -0xF4, 0x54, 0x42, 0xB5, 0x20, 0x9E, 0x1A, 0x63, 0x61, 0x7C, -0x74, 0x94, 0xB2, 0x4F, 0xA0, 0xB3, 0xF3, 0x28, 0x78, 0x14, -0xA9, 0xA5, 0xC9, 0x02, 0x3F, 0x5F, 0x77, 0x44, 0xA4, 0xBE, -0x8C, 0xA7, 0x34, 0x02, 0xBB, 0x36, 0xEA, 0xB1, 0xC9, 0xBC, -0x15, 0x13, 0x13, 0xAC, 0x30, 0x86, 0x4C, 0xE9, 0x2D, 0x3F, -0x7F, 0xED, 0x32, 0x22, 0x43, 0x43, 0x70, 0xA5, 0xAF, 0xC7, -0x91, 0x62, 0xD4, 0x82, 0x85, 0xE0, 0xD3, 0xD9, 0x50, 0xA8, -0x14, 0x88, 0xC9, 0x59, 0x0E, 0x2E, 0x8F, 0x83, 0xB7, 0x36, -0x37, 0x22, 0x2F, 0x57, 0x07, 0x3A, 0xFD, 0x29, 0x06, 0x7A, -0xCE, 0x63, 0x4D, 0xAD, 0x19, 0x74, 0x5F, 0x35, 0x86, 0x7A, -0x3E, 0xC5, 0xEE, 0xB7, 0xDF, 0x46, 0x55, 0x9D, 0x09, 0x23, -0x83, 0xFD, 0xD4, 0xA1, 0x72, 0x60, 0xF5, 0xF6, 0xC7, 0xB9, -0xE3, 0x5D, 0x78, 0x62, 0xB3, 0x6A, 0x69, 0x7C, 0x26, 0xE7, -0x45, 0x67, 0x96, 0x13, 0x2E, 0x7E, 0x31, 0x02, 0xF3, 0x9B, -0xDB, 0xA1, 0x54, 0xC4, 0xE0, 0xC2, 0xB9, 0x33, 0x18, 0xA5, -0x22, 0x5F, 0x9E, 0x99, 0x06, 0x7F, 0x65, 0x04, 0x42, 0x22, -0x22, 0xC1, 0x67, 0x91, 0x90, 0xF9, 0x29, 0x41, 0x63, 0xF2, -0x21, 0x90, 0x0B, 0x91, 0xBA, 0x64, 0x29, 0x9C, 0x85, 0x7C, -0xAC, 0x5A, 0xB9, 0x14, 0xB3, 0xD6, 0x59, 0x58, 0xA7, 0xC6, -0x1D, 0xC1, 0xE5, 0x97, 0xAF, 0xC5, 0x07, 0x87, 0x0F, 0xC3, -0x8D, 0xC6, 0x04, 0x57, 0x24, 0xC8, 0xA3, 0xC9, 0x3D, 0xFD, -0x7C, 0x46, 0x86, 0xEF, 0x50, 0x7B, 0x3A, 0x05, 0x2B, 0xC9, -0x85, 0x58, 0x26, 0x06, 0x93, 0x4E, 0x3F, 0x7D, 0xBE, 0xA7, -0x8F, 0x48, 0x48, 0x5B, 0x81, 0x13, 0xEF, 0x1F, 0x40, 0xD9, -0xE2, 0xA5, 0xB8, 0xF7, 0x77, 0xFA, 0xD8, 0xC9, 0x93, 0xA7, -0x7E, 0x73, 0xEC, 0xC3, 0x13, 0xAD, 0x57, 0x2F, 0x8D, 0x7F, -0xA5, 0x4B, 0x48, 0xC2, 0x17, 0xDD, 0x9D, 0x28, 0xD5, 0x6F, -0x40, 0x7E, 0x99, 0x71, 0xAD, 0x0B, 0x93, 0x61, 0xE0, 0x0B, -0xC5, 0xF0, 0x0B, 0x0B, 0x02, 0x83, 0x4E, 0x07, 0x49, 0x3C, -0x01, 0xF1, 0x2D, 0x69, 0xC3, 0xB2, 0x92, 0xA2, 0xDF, 0x1A, -0x2C, 0x5B, 0xC8, 0xB4, 0x12, 0x3D, 0xB9, 0xC6, 0x6C, 0x26, -0x6B, 0x4D, 0x9B, 0xC9, 0xEC, 0xDC, 0x22, 0x9D, 0xE3, 0x0E, -0x33, 0x18, 0x02, 0x31, 0x4F, 0x61, 0xA3, 0xD4, 0xBF, 0x7E, -0xBF, 0x04, 0xD0, 0x21, 0xAA, 0xA0, 0x04, 0xA9, 0xC9, 0xD3, -0x6F, 0xF9, 0xEE, 0xAF, 0xE5, 0x30, 0xC8, 0x92, 0xFA, 0x26, -0x32, 0xA7, 0xB4, 0x82, 0xAC, 0x68, 0x6A, 0x24, 0x5F, 0xA9, -0xAD, 0xBB, 0x4B, 0x14, 0x54, 0x55, 0x97, 0xB8, 0x88, 0x45, -0xEF, 0x5C, 0xBF, 0x7A, 0x0D, 0x49, 0xDA, 0x38, 0x9C, 0xFE, -0xE8, 0x43, 0x9C, 0xEA, 0xEA, 0x22, 0x7E, 0xA4, 0x5C, 0xFD, -0x20, 0x22, 0xE6, 0xAB, 0xDB, 0x3C, 0xC2, 0x42, 0x6B, 0xB8, -0x42, 0x01, 0x44, 0x02, 0x17, 0x3C, 0x98, 0xB6, 0x5E, 0x40, -0x74, 0x6A, 0x56, 0xC1, 0xAA, 0xDA, 0x6A, 0x72, 0x99, 0xB1, -0x8A, 0x34, 0x98, 0x4D, 0x24, 0x4F, 0xE4, 0xE6, 0xF3, 0x53, -0xC8, 0x9F, 0x41, 0x2C, 0x97, 0x93, 0x79, 0x55, 0x35, 0xE4, -0x3A, 0xCB, 0x76, 0x32, 0x3A, 0x3B, 0xB7, 0xC1, 0x61, 0x7C, -0xA9, 0x70, 0x2D, 0xD9, 0xFC, 0xD6, 0x5E, 0xD2, 0xC3, 0x3B, -0x30, 0xF9, 0xE7, 0x90, 0x3B, 0x40, 0x40, 0xA4, 0xCD, 0xC8, -0x26, 0x4B, 0x5B, 0x76, 0x92, 0x74, 0x1A, 0x57, 0xE5, 0xB0, -0x09, 0xFD, 0x42, 0x37, 0x2D, 0xCC, 0x4C, 0xDF, 0xF3, 0xB3, -0xC9, 0xFF, 0x05, 0x06, 0x9D, 0x19, 0x1F, 0xAC, 0xD6, 0x7E, -0xEC, 0xD0, 0x5F, 0xD0, 0x24, 0x26, 0x2E, 0x4C, 0x48, 0x08, -0xE7, 0x8A, 0x9C, 0xCF, 0xA8, 0x14, 0x21, 0xBD, 0xED, 0xAD, -0x3B, 0x4A, 0x29, 0x7B, 0xDF, 0x4F, 0x25, 0x97, 0x07, 0x05, -0xFE, 0x41, 0x57, 0x6A, 0xF8, 0x8A, 0xE1, 0xCC, 0xEB, 0x67, -0xB9, 0x70, 0x2A, 0xB1, 0x6E, 0xF3, 0x2F, 0x96, 0x57, 0xBE, -0x66, 0xB1, 0x68, 0x74, 0xB9, 0x7A, 0xD3, 0x1B, 0x6D, 0x95, -0x6B, 0xD6, 0xEB, 0x3B, 0x0F, 0x1D, 0xFF, 0x93, 0xEC, 0x39, -0x1F, 0x0D, 0xD5, 0x22, 0xFE, 0x0B, 0x97, 0x48, 0x00, 0x4E, -0x1C, 0x78, 0xC2, 0x39, 0xCF, 0x0C, 0x3C, 0x01, 0x7F, 0x77, -0xED, 0x8E, 0x76, 0x73, 0xCE, 0xFA, 0xEA, 0xFC, 0x72, 0xB3, -0xB9, 0xAC, 0xB8, 0x69, 0x5B, 0x0D, 0x5A, 0xDE, 0x6C, 0x8D, -0x4F, 0x2F, 0x5A, 0x99, 0xB3, 0xD2, 0x58, 0x9D, 0xD4, 0xBC, -0x7F, 0x5F, 0x62, 0x76, 0x7E, 0x59, 0x1A, 0x35, 0x37, 0x2F, -0x25, 0x27, 0x43, 0x96, 0xBA, 0xE4, 0x95, 0x86, 0xC2, 0x2A, -0x63, 0x45, 0x4E, 0x41, 0xF1, 0x06, 0xB9, 0x3C, 0x54, 0x1F, -0x1D, 0xA7, 0x8D, 0x4A, 0x4A, 0x4C, 0x7A, 0x21, 0x50, 0x19, -0x9C, 0x99, 0x94, 0x99, 0xB6, 0x61, 0xA5, 0xF9, 0xD5, 0xD5, -0xCB, 0xD6, 0xAC, 0xAB, 0x5F, 0x51, 0xA0, 0x8F, 0x99, 0x1F, -0x11, 0x92, 0xC8, 0x60, 0x72, 0x72, 0x5A, 0x0E, 0x1E, 0x50, -0x65, 0x57, 0x94, 0x6B, 0x0D, 0x4D, 0x0D, 0x31, 0x05, 0x86, -0xAA, 0x78, 0x94, 0x54, 0xE8, 0xA5, 0x3B, 0xF6, 0xED, 0x51, -0xEF, 0x3E, 0x72, 0x28, 0x50, 0xEE, 0x1F, 0x18, 0x44, 0x91, -0xCF, 0xA3, 0x5A, 0x70, 0x46, 0x4A, 0x7A, 0x6A, 0xF7, 0x67, -0xC7, 0x3C, 0x8E, 0x0F, 0xDD, 0xF0, 0xEE, 0x1E, 0xBA, 0x22, -0xD5, 0xA8, 0x55, 0x01, 0x79, 0xAB, 0x2B, 0xB5, 0xEA, 0x58, -0x8D, 0x46, 0x1D, 0xEA, 0x13, 0xD1, 0x75, 0xF1, 0xBC, 0x6C, -0xEF, 0xE5, 0x3B, 0x5E, 0x3B, 0x0F, 0x1E, 0x90, 0xE8, 0x0A, -0x8B, 0x5F, 0xE4, 0x08, 0xE7, 0x86, 0x53, 0x7E, 0x32, 0x91, -0xC8, 0xDD, 0xBF, 0xE3, 0x54, 0x97, 0x77, 0xF3, 0x7B, 0x87, -0x83, 0x8A, 0x36, 0x98, 0xE4, 0xF6, 0xCC, 0x08, 0x9D, 0x2E, -0x57, 0xF1, 0xAB, 0xB6, 0xD7, 0x65, 0x1C, 0x17, 0x89, 0xC7, -0xD2, 0xAC, 0x74, 0xCF, 0xC2, 0xA2, 0x62, 0xA9, 0xAF, 0x3C, -0x60, 0x4E, 0x6A, 0x46, 0xA6, 0x74, 0x7E, 0x78, 0x94, 0x07, -0x35, 0xC7, 0xDE, 0xDC, 0x03, 0xFC, 0xFC, 0xC5, 0xCB, 0x73, -0x0B, 0x5D, 0x29, 0x5D, 0x62, 0x27, 0x53, 0x28, 0xC2, 0xA4, -0x76, 0xB9, 0x7D, 0xEB, 0xD6, 0x39, 0x54, 0xA9, 0x96, 0x80, -0x2B, 0xF5, 0xA4, 0xFA, 0x73, 0x9B, 0xDF, 0x68, 0x77, 0xAB, -0x31, 0x1A, 0x7D, 0x95, 0xD1, 0xB1, 0x5C, 0x7B, 0xB9, 0x26, -0x55, 0x8B, 0x42, 0xA6, 0x1A, 0x7F, 0xD9, 0xCE, 0x7E, 0x74, -0x77, 0xE4, 0x09, 0xD8, 0x5C, 0x7B, 0x51, 0xB7, 0xBF, 0x74, -0xCE, 0xEA, 0xE8, 0x38, 0xDB, 0x0C, 0x83, 0x67, 0x03, 0x47, -0x44, 0xB3, 0x98, 0xAB, 0x59, 0x8D, 0xA6, 0x46, 0x96, 0x3D, -0xA2, 0xEB, 0xDB, 0x2C, 0xB6, 0x40, 0xFF, 0x20, 0x1A, 0x5F, -0xE8, 0x44, 0xDA, 0x51, 0x53, 0x59, 0xEE, 0x4C, 0xBD, 0x01, -0xB6, 0x93, 0x9D, 0xEF, 0x13, 0x2F, 0x65, 0x2E, 0x61, 0xBB, -0x7A, 0x29, 0x6D, 0xDA, 0x94, 0xD8, 0xC7, 0x57, 0x7A, 0xCE, -0x3E, 0x7A, 0x76, 0x3E, 0xFF, 0xF6, 0xF8, 0xFF, 0x2F, 0xE0, -0x26, 0xF3, 0x11, 0xDB, 0xE5, 0x3F, 0x00, 0x43, 0xAA, 0x34, -0xCA, 0xD3, 0x4A, 0x6B, 0x34, 0x00, 0x00, 0x00, 0x00, 0x49, -0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Pause2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x2B, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x59, 0x6C, 0x5C, 0x67, 0x19, -0x86, 0x9F, 0xB3, 0xCC, 0xD9, 0x66, 0xF3, 0x8C, 0xC7, 0xF1, -0x1A, 0x3B, 0x5E, 0x43, 0xB3, 0x48, 0x4D, 0xE2, 0xB4, 0xD0, -0x26, 0x45, 0x50, 0x1C, 0x91, 0x46, 0x21, 0x95, 0x10, 0x55, -0x03, 0xC1, 0xA5, 0x51, 0x83, 0xD4, 0x8B, 0x80, 0xA0, 0x50, -0x16, 0x95, 0x0B, 0x90, 0x10, 0x12, 0x5C, 0x56, 0xC0, 0x05, -0x6D, 0x5A, 0x7A, 0x51, 0xC2, 0xA2, 0x10, 0xE2, 0xA8, 0x45, -0x89, 0x0A, 0x4D, 0xC8, 0x0D, 0x89, 0x83, 0xB3, 0x91, 0xC5, -0x4E, 0xEC, 0x38, 0xCE, 0x78, 0x3C, 0xF6, 0x78, 0xD6, 0x73, -0xCE, 0x6C, 0xE7, 0xCC, 0xCF, 0x45, 0x16, 0xB5, 0x02, 0x4A, -0x78, 0xAF, 0xFE, 0x9B, 0xEF, 0x79, 0x2F, 0xBE, 0xEF, 0x7F, -0x5F, 0x89, 0x8F, 0x56, 0xA0, 0x7F, 0xED, 0xAA, 0x9D, 0xA3, -0xA3, 0x7B, 0xD7, 0x77, 0xB7, 0x77, 0x3D, 0x19, 0x09, 0x47, -0x1E, 0x16, 0x12, 0xBE, 0x5D, 0x2C, 0x9E, 0x3D, 0x7F, 0xE9, -0xEC, 0xFB, 0x6F, 0x1C, 0x78, 0xEB, 0x5C, 0x3E, 0x53, 0x3A, -0xCA, 0xFF, 0xAB, 0xA6, 0xAE, 0x96, 0xF8, 0xB7, 0xBF, 0xF7, -0xF5, 0xB1, 0x54, 0xEA, 0xB6, 0xF8, 0x5F, 0x9A, 0xBE, 0x79, -0x5D, 0x3C, 0xB7, 0x6F, 0xF7, 0x41, 0x40, 0x7B, 0x30, 0x7A, -0x80, 0xD1, 0x9C, 0x5D, 0xB8, 0x0F, 0x68, 0x08, 0x4F, 0x94, -0x5D, 0x47, 0xD8, 0x65, 0x57, 0x94, 0x1D, 0x57, 0xD8, 0x65, -0x57, 0x54, 0xAA, 0x8E, 0x28, 0x57, 0xAA, 0x1F, 0x32, 0x9A, -0x9C, 0x9D, 0x12, 0xC0, 0xE7, 0x3E, 0x92, 0xDD, 0x3B, 0xD4, -0xF7, 0xF3, 0x7B, 0x03, 0x79, 0xA7, 0x24, 0xB2, 0x85, 0x65, -0x51, 0x2A, 0x14, 0x85, 0x6D, 0xDB, 0xA2, 0x58, 0x2E, 0x09, -0xDB, 0x71, 0x84, 0xED, 0x3A, 0xC2, 0x71, 0x1D, 0x51, 0x72, -0x4A, 0xC2, 0xB6, 0x8B, 0xA2, 0x58, 0xCA, 0x8B, 0x72, 0xAD, -0x7C, 0xDF, 0x48, 0x0F, 0x6B, 0x2F, 0x7F, 0x90, 0x29, 0xDD, -0x7B, 0xF4, 0xAD, 0xEB, 0xFD, 0xFE, 0x8D, 0x8B, 0xD3, 0x3F, -0x06, 0x98, 0x4B, 0xCF, 0x61, 0x98, 0x61, 0x2A, 0x55, 0x13, -0x8A, 0x3A, 0x9E, 0x0F, 0x7E, 0x15, 0xF4, 0x60, 0x15, 0x2B, -0xE6, 0x50, 0xB3, 0x83, 0x38, 0x35, 0x9D, 0x40, 0x00, 0x54, -0x1F, 0x84, 0x5E, 0x43, 0x0D, 0xE4, 0x68, 0x6B, 0x69, 0x05, -0x40, 0x0B, 0x4A, 0x5F, 0xAC, 0xBB, 0xFC, 0x06, 0x40, 0xBE, -0xCB, 0xEF, 0xBF, 0x07, 0x9F, 0x9A, 0x9A, 0x42, 0x57, 0x55, -0x84, 0x5F, 0x26, 0xBD, 0xA0, 0x53, 0xE8, 0x07, 0x7F, 0x08, -0x66, 0xD6, 0x83, 0xB3, 0xA0, 0xE3, 0xFB, 0x75, 0x66, 0xA6, -0x75, 0xFE, 0xA8, 0x42, 0xA6, 0x1B, 0x8E, 0xE4, 0xAB, 0xB8, -0x8B, 0x1A, 0x8A, 0x0A, 0x73, 0xC9, 0x9B, 0x00, 0xA4, 0xE7, -0x53, 0x6F, 0x03, 0xA1, 0xFB, 0x06, 0xBF, 0x3E, 0x72, 0xE0, -0x38, 0xC0, 0xD5, 0xE4, 0x3F, 0x89, 0x44, 0x34, 0x5C, 0xA7, -0x8A, 0x63, 0x57, 0xF1, 0x0A, 0x10, 0x01, 0x06, 0x80, 0x11, -0x20, 0x9B, 0x83, 0x6C, 0xC5, 0xA5, 0xA9, 0x1B, 0x96, 0xE6, -0x3C, 0x36, 0x01, 0x2F, 0x6E, 0xD0, 0x59, 0x4A, 0x41, 0xD9, -0x76, 0x69, 0xC8, 0x30, 0x73, 0x6B, 0x92, 0x58, 0xB4, 0x8D, -0x1F, 0xFD, 0xEC, 0x95, 0x77, 0xEE, 0x18, 0x0C, 0x05, 0xDA, -0x47, 0x77, 0x3E, 0xDF, 0x5B, 0x6B, 0x64, 0x31, 0x7C, 0x1D, -0xA7, 0x56, 0x03, 0xA9, 0x4C, 0xAD, 0x56, 0xE3, 0xD6, 0x19, -0x98, 0xF2, 0x60, 0xDA, 0x85, 0x53, 0x75, 0x78, 0x7A, 0xF7, -0x6F, 0x79, 0xEB, 0xF5, 0x5F, 0xFE, 0x65, 0xE7, 0xDA, 0xA3, -0x54, 0x0A, 0x0E, 0x29, 0xE0, 0x4A, 0x0E, 0x92, 0x2E, 0x14, -0x24, 0x1F, 0x47, 0x80, 0x5D, 0xF1, 0x28, 0x65, 0x8A, 0xEC, -0xDF, 0xF3, 0xF2, 0xD6, 0x50, 0x34, 0x10, 0x53, 0xBF, 0xFC, -0xAD, 0xD1, 0x51, 0x00, 0x47, 0x5E, 0x64, 0x65, 0xA7, 0x41, -0xCD, 0xF5, 0xC9, 0xE6, 0xC1, 0xAD, 0x16, 0x31, 0x87, 0xE0, -0xEC, 0x0D, 0x68, 0x24, 0xE0, 0x72, 0x1A, 0xCC, 0x40, 0x90, -0x9E, 0x78, 0xF7, 0x7C, 0x2C, 0x64, 0x51, 0x2D, 0x39, 0x9C, -0xCE, 0x46, 0x59, 0xB6, 0xA1, 0x7A, 0x08, 0x64, 0xEB, 0x3A, -0x46, 0xA5, 0x01, 0x01, 0x8B, 0xDB, 0xD1, 0x1C, 0x0F, 0x6D, -0x7D, 0x9C, 0xE7, 0xF7, 0xEC, 0xF9, 0x92, 0x3A, 0xD2, 0xFA, -0xE8, 0x00, 0x40, 0x2C, 0xEB, 0x83, 0x24, 0x30, 0x3D, 0x85, -0x4E, 0x23, 0x4E, 0xA7, 0xD1, 0xCA, 0x1A, 0x07, 0xFE, 0xBC, -0x08, 0xA6, 0x01, 0xD7, 0x96, 0x60, 0xD7, 0x86, 0x0D, 0x24, -0xDA, 0xDD, 0xC8, 0xC7, 0x37, 0xAD, 0x26, 0x6B, 0x7B, 0x1C, -0x9F, 0x87, 0x5C, 0x01, 0x92, 0x67, 0xC6, 0xB1, 0x5F, 0x9C, -0x27, 0xB3, 0x31, 0x86, 0xD3, 0x2A, 0x50, 0xF0, 0xE9, 0xE4, -0x14, 0x03, 0xCF, 0x3E, 0xDA, 0xA3, 0xB6, 0x87, 0x57, 0x8C, -0x80, 0x83, 0xE3, 0x68, 0x48, 0xB2, 0x8E, 0x25, 0x2B, 0x64, -0x8B, 0x79, 0x82, 0x05, 0x8D, 0xF4, 0x4B, 0x51, 0xC2, 0xBF, -0x50, 0x58, 0xAE, 0x41, 0x5A, 0x82, 0x42, 0xFE, 0x14, 0xAF, -0x7E, 0xE1, 0xD9, 0x5D, 0x8F, 0xB5, 0x9C, 0x14, 0x9D, 0xBB, -0x57, 0x73, 0x71, 0x11, 0x5C, 0x17, 0xC6, 0x27, 0x87, 0x49, -0x94, 0x1B, 0x98, 0x76, 0x89, 0xC4, 0x0D, 0x9B, 0xB6, 0x85, -0x2A, 0xAB, 0xCC, 0x02, 0xE9, 0xCB, 0x85, 0xCF, 0xA8, 0xF5, -0xAA, 0x12, 0x9A, 0x2A, 0x14, 0x59, 0x12, 0x65, 0xF4, 0xBC, -0x47, 0x66, 0x21, 0x4F, 0xD6, 0x4E, 0xD3, 0x11, 0x59, 0xC5, -0x9B, 0x7E, 0x83, 0xD4, 0x65, 0x98, 0x35, 0x15, 0xAE, 0x4E, -0xC1, 0x93, 0x77, 0x4F, 0x2E, 0x1F, 0x4C, 0xB2, 0x32, 0xD5, -0xC9, 0xC9, 0x85, 0x15, 0xE0, 0x78, 0xBC, 0xF0, 0xBE, 0xCA, -0xE6, 0xCF, 0x2E, 0xD3, 0x10, 0x75, 0x34, 0xBB, 0x4E, 0xA3, -0xE2, 0xE3, 0x87, 0x3D, 0x9C, 0xA2, 0x58, 0xAD, 0xC6, 0x2C, -0xA5, 0x38, 0xE8, 0xB7, 0x37, 0x0F, 0x8E, 0x47, 0xA1, 0x6E, -0x41, 0x08, 0xCA, 0x31, 0x98, 0x32, 0xF2, 0x44, 0xD7, 0x06, -0x78, 0xF3, 0x4F, 0x97, 0x61, 0xCB, 0x1A, 0xA8, 0x81, 0x21, -0x37, 0xF3, 0xC3, 0x57, 0xBE, 0xF3, 0xC8, 0xF8, 0xEB, 0xEB, -0x31, 0x4C, 0x19, 0x04, 0xE0, 0x29, 0xAC, 0x11, 0x10, 0x8E, -0x6F, 0x21, 0xAB, 0x97, 0x58, 0x08, 0xB9, 0x94, 0x4C, 0x07, -0x6D, 0x85, 0x45, 0x3D, 0x5A, 0xB8, 0xAC, 0xAA, 0xE3, 0x99, -0xF7, 0x10, 0xBC, 0x90, 0x56, 0xA7, 0x99, 0x89, 0x15, 0xB9, -0x59, 0x4F, 0xB2, 0xBC, 0x9C, 0xC2, 0xF5, 0xEA, 0x5C, 0x95, -0xBF, 0x42, 0x68, 0xA0, 0x1D, 0x3B, 0x0C, 0x28, 0xD0, 0x17, -0xDE, 0xC0, 0xB6, 0xA7, 0xC2, 0xAF, 0x56, 0x92, 0x61, 0xE6, -0x0D, 0x0D, 0x2A, 0x40, 0xA7, 0xC4, 0xB9, 0x03, 0xF0, 0xCC, -0x13, 0x79, 0xCC, 0x48, 0x94, 0x98, 0xD3, 0x20, 0xEF, 0xE5, -0x31, 0xE5, 0x06, 0x37, 0xAE, 0x2D, 0x1E, 0x57, 0x0F, 0xCD, -0x9D, 0xBC, 0x9A, 0xD9, 0xD1, 0xC9, 0x78, 0x61, 0x82, 0x60, -0x5E, 0x27, 0x84, 0x46, 0x58, 0xED, 0xA6, 0x25, 0x0A, 0xDA, -0x7B, 0x36, 0x91, 0x6F, 0x74, 0x60, 0xDF, 0xFD, 0x8E, 0x33, -0x17, 0xA7, 0x99, 0xBC, 0x78, 0xE1, 0xFC, 0xB1, 0x23, 0xB9, -0xCD, 0xBD, 0x9B, 0xD6, 0xDE, 0x49, 0x01, 0x1B, 0x2E, 0xE4, -0x32, 0x7C, 0x2A, 0x7F, 0x1A, 0xA9, 0xA2, 0xE2, 0x35, 0xB7, -0x53, 0x4B, 0x24, 0x08, 0xC7, 0x5B, 0x29, 0x5D, 0x99, 0x9D, -0x95, 0xFF, 0x76, 0x2D, 0xF9, 0x36, 0x85, 0x2A, 0x6B, 0xF5, -0x01, 0x56, 0x4A, 0x6D, 0xB4, 0x18, 0xDD, 0x84, 0xCC, 0x32, -0x52, 0x7A, 0x9E, 0x39, 0xE2, 0x34, 0x85, 0x7C, 0x06, 0x43, -0xD0, 0x64, 0xC2, 0xA9, 0x7C, 0x86, 0x64, 0x29, 0xB9, 0xDD, -0xB5, 0x0D, 0xA9, 0x6C, 0xA9, 0x60, 0x41, 0x40, 0x13, 0x78, -0xDD, 0x3A, 0x4A, 0xA0, 0x81, 0x25, 0x14, 0x9A, 0x92, 0x93, -0xF4, 0xCC, 0xFE, 0x03, 0xF9, 0xD2, 0x04, 0xF3, 0x37, 0x6F, -0x1F, 0x94, 0x4F, 0xBD, 0xFB, 0x6E, 0x6A, 0xF6, 0xEC, 0x95, -0xF3, 0xFD, 0x5D, 0x3D, 0xA0, 0x68, 0xF8, 0x46, 0x09, 0x3D, -0x5B, 0xA2, 0xA8, 0xB7, 0xF1, 0xF0, 0x1A, 0x8D, 0x4F, 0x76, -0x08, 0xB6, 0xF7, 0xC0, 0x70, 0xB8, 0x42, 0x8C, 0xD5, 0xA8, -0xAD, 0x2B, 0xBB, 0x3E, 0xD1, 0x36, 0x44, 0x47, 0xC4, 0x67, -0x7B, 0x1F, 0xEC, 0xEC, 0x97, 0x18, 0xEE, 0x0F, 0xD3, 0x14, -0x89, 0x10, 0xD4, 0x1B, 0x68, 0xCD, 0x2B, 0xE8, 0x6C, 0xED, -0xC6, 0xFF, 0xFB, 0xB9, 0x77, 0xFE, 0x70, 0xE8, 0x70, 0x5E, -0x05, 0x38, 0x7A, 0x78, 0xEC, 0xE9, 0xC7, 0x46, 0xB6, 0xCD, -0xC4, 0xBA, 0x4D, 0xEA, 0xD7, 0x97, 0xC9, 0x98, 0x9D, 0xB4, -0x44, 0x24, 0x5A, 0xA2, 0x3A, 0x9B, 0x7B, 0xA1, 0xEC, 0xFB, -0x74, 0x74, 0x80, 0x39, 0xDC, 0x46, 0xA2, 0x39, 0x41, 0xF3, -0x23, 0x1D, 0x3C, 0xD4, 0x31, 0x4F, 0x36, 0x0C, 0x8A, 0x27, -0x30, 0x3E, 0x26, 0x91, 0x88, 0xB7, 0xA0, 0x54, 0xAA, 0x68, -0xAA, 0x4F, 0x20, 0x20, 0xF3, 0xDC, 0x57, 0xF7, 0x7F, 0x9E, -0x3B, 0xAB, 0x83, 0xC9, 0x1B, 0x37, 0xF3, 0xA6, 0x65, 0xE4, -0x76, 0x3C, 0xBE, 0x69, 0xFB, 0x82, 0x6D, 0x60, 0x86, 0x54, -0x12, 0xA6, 0x86, 0x17, 0x30, 0x98, 0x3E, 0x1C, 0x86, 0x49, -0x19, 0xFB, 0x77, 0x2A, 0x9B, 0x76, 0x2F, 0xD1, 0xDF, 0xEF, -0x11, 0x1E, 0x30, 0x30, 0xA7, 0xDB, 0x30, 0x2E, 0xC0, 0x46, -0x4B, 0x62, 0xD5, 0x40, 0x91, 0x78, 0xCC, 0xC3, 0x0A, 0x04, -0x69, 0xEF, 0xE8, 0x62, 0x62, 0x62, 0x62, 0xC7, 0xC1, 0x83, -0xBF, 0xBF, 0xF2, 0xA1, 0xB8, 0x06, 0x78, 0xED, 0x57, 0xAF, -0xFD, 0x64, 0xE4, 0x99, 0x1D, 0xDF, 0x2D, 0xCC, 0x25, 0x99, -0x2F, 0x57, 0xB1, 0x64, 0x99, 0xA0, 0x65, 0xA2, 0x4A, 0x0A, -0x7E, 0xD5, 0x23, 0x60, 0x1A, 0x58, 0x8A, 0x86, 0x6F, 0x04, -0xD0, 0x34, 0x1D, 0xB5, 0xE6, 0x23, 0x49, 0x02, 0x45, 0x01, -0x45, 0xD5, 0x49, 0xC4, 0x9B, 0x39, 0x37, 0x31, 0xB1, 0x77, -0xC3, 0xC6, 0x8D, 0x6F, 0xFC, 0x5B, 0x1F, 0xDC, 0xD3, 0xB1, -0x63, 0x63, 0xBB, 0x36, 0x8F, 0x3C, 0x75, 0xB8, 0x98, 0xCF, -0x52, 0xA9, 0xB9, 0x54, 0xEB, 0x0D, 0x02, 0x5E, 0x83, 0x88, -0xA4, 0xA2, 0x04, 0x4D, 0x02, 0xB2, 0x7C, 0x27, 0x84, 0x55, -0x19, 0x5D, 0x0E, 0x10, 0x0C, 0x5A, 0x1F, 0x1C, 0xFF, 0xB4, -0x24, 0x49, 0x7F, 0x7D, 0xA0, 0xE6, 0x14, 0x42, 0xFC, 0x34, -0x53, 0x58, 0x2E, 0x17, 0x1B, 0x35, 0x91, 0x5A, 0xCA, 0x88, -0x5C, 0x2E, 0x2B, 0x0A, 0x85, 0x82, 0x28, 0x3A, 0x45, 0xE1, -0x94, 0x6D, 0xE1, 0x37, 0xEE, 0x34, 0x58, 0xA9, 0x54, 0xCA, -0x0A, 0x21, 0x7E, 0xF0, 0x20, 0x4C, 0xA9, 0xAB, 0xAB, 0x2B, -0xD2, 0xD4, 0xD4, 0xD4, 0x16, 0x8B, 0xC5, 0x9B, 0x77, 0x6C, -0xDF, 0xD6, 0xF6, 0xD2, 0xD7, 0xBE, 0xB9, 0x37, 0xB3, 0x98, -0xF9, 0xAF, 0xCD, 0x7F, 0xFA, 0xCC, 0x99, 0xF1, 0x7D, 0xFB, -0xF6, 0xED, 0x5F, 0xB7, 0x6E, 0x5D, 0x1F, 0xD0, 0x03, 0x0C, -0x01, 0xC6, 0x7F, 0xAC, 0x4C, 0x80, 0xE1, 0xE1, 0xE1, 0x50, -0x24, 0x12, 0x51, 0x06, 0x07, 0x07, 0x57, 0x5C, 0xB8, 0x70, -0x29, 0x1E, 0x0A, 0x5B, 0xEE, 0xD6, 0x2D, 0x4F, 0x44, 0xFA, -0xFA, 0xBA, 0x9B, 0x15, 0x59, 0x8B, 0x68, 0x86, 0xA1, 0xEB, -0x86, 0x6E, 0xCA, 0xC0, 0x42, 0x3A, 0x9D, 0x9A, 0xBB, 0x75, -0x2B, 0xE3, 0xBA, 0x6E, 0x68, 0x6C, 0x6C, 0xAC, 0x14, 0x0C, -0x06, 0xE7, 0x2D, 0xCB, 0xCA, 0x9E, 0x38, 0x71, 0xA2, 0x08, -0x78, 0xF7, 0x98, 0xFF, 0x1A, 0x00, 0x12, 0x76, 0x28, 0x70, -0x52, 0x4A, 0xD5, 0x77, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Play2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x06, 0xF5, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0x7D, 0x56, 0x0B, 0x50, 0x54, 0xD7, 0x19, -0xFE, 0xEE, 0xDD, 0xBB, 0x7B, 0xF7, 0x7D, 0xF7, 0xFD, 0x80, -0x65, 0x97, 0x5D, 0xC0, 0xC0, 0x2A, 0x22, 0xC2, 0x0A, 0x0A, -0x11, 0xAB, 0x06, 0x1A, 0xA1, 0xC4, 0x36, 0x36, 0xA1, 0x9A, -0x60, 0x02, 0xD6, 0x88, 0x01, 0x27, 0xA3, 0x53, 0xDB, 0x4C, -0x4C, 0x22, 0xD4, 0xA6, 0x1D, 0x6C, 0x62, 0x99, 0xA8, 0x10, -0x51, 0x62, 0x90, 0xC6, 0x19, 0xEC, 0x80, 0xC1, 0x98, 0x10, -0xC4, 0xA6, 0x38, 0xD8, 0x14, 0x2C, 0x19, 0x2A, 0x02, 0x26, -0x8C, 0x88, 0xA0, 0xBC, 0xC1, 0x05, 0x16, 0xDC, 0x17, 0xBB, -0xBD, 0x8B, 0xD3, 0xCC, 0x84, 0x32, 0xFE, 0x33, 0xE7, 0xDC, -0xF3, 0xF8, 0xFF, 0xEF, 0x3F, 0xFF, 0xF9, 0x1F, 0xE7, 0x02, -0x4F, 0xA0, 0xAD, 0xBF, 0x4C, 0x33, 0xBF, 0xBC, 0x6B, 0xFB, -0xCE, 0xBD, 0xF9, 0x7B, 0xCF, 0x7E, 0x54, 0x5E, 0x76, 0xBF, -0xF2, 0xD3, 0x4F, 0xA6, 0xCB, 0xCA, 0x4F, 0x3E, 0xD8, 0x5B, -0xF0, 0xFA, 0xC9, 0x9C, 0xD7, 0x76, 0x66, 0x8B, 0x15, 0xA2, -0xD0, 0x27, 0xC9, 0x07, 0x88, 0x5A, 0x72, 0x95, 0x43, 0xC6, -0xD4, 0xD4, 0x56, 0xD7, 0x24, 0x27, 0x26, 0x5B, 0xD4, 0x6A, -0xED, 0xE2, 0x5D, 0x09, 0xDB, 0xF2, 0x02, 0xAD, 0xFC, 0xC4, -0x19, 0x7C, 0x50, 0xFA, 0x41, 0xF7, 0x6F, 0x0A, 0x0E, 0xA6, -0xB3, 0xF3, 0xBB, 0x4B, 0x41, 0x11, 0x8B, 0x17, 0xDE, 0xF8, -0xD3, 0x9B, 0x1F, 0x1F, 0xF8, 0x55, 0xDE, 0x2B, 0x06, 0x63, -0xC8, 0xC2, 0xDC, 0xE9, 0x9C, 0x83, 0xC7, 0x0F, 0x70, 0x39, -0x04, 0x08, 0x1F, 0x09, 0x2F, 0xE9, 0x07, 0x67, 0xDE, 0x07, -0x5A, 0x20, 0x60, 0x85, 0x1F, 0x8B, 0xCF, 0xCE, 0xCD, 0xC1, -0xB6, 0x21, 0xF6, 0xF7, 0xDD, 0x37, 0xBE, 0x7F, 0xE7, 0x89, -0x0A, 0x72, 0xF6, 0xEE, 0xBA, 0x74, 0xE6, 0x44, 0x79, 0x46, -0x60, 0x3C, 0x3C, 0x35, 0x0A, 0x1D, 0xA3, 0x79, 0xBC, 0xE1, -0xF6, 0x63, 0xDC, 0x33, 0x05, 0x21, 0xC1, 0x85, 0x8F, 0xC3, -0x01, 0xC9, 0x2A, 0xF0, 0xFB, 0xE7, 0x01, 0x3F, 0x2B, 0x4E, -0x11, 0x10, 0xF1, 0x45, 0x0B, 0x6C, 0xB1, 0x6B, 0x56, 0x56, -0xB4, 0xDF, 0xE8, 0xC8, 0x5D, 0x52, 0xC1, 0xB3, 0x3F, 0xDB, -0x78, 0xEE, 0x8B, 0xBA, 0xAB, 0x2F, 0x39, 0x5C, 0x76, 0xD8, -0xA7, 0x9C, 0x30, 0xA8, 0x74, 0xA8, 0xF8, 0xA6, 0x02, 0x0E, -0x8F, 0x1D, 0xAF, 0x25, 0x14, 0x80, 0xE6, 0x71, 0xE1, 0x71, -0x7A, 0x30, 0xE5, 0x79, 0x08, 0x0E, 0x45, 0xC1, 0xC7, 0x82, -0x73, 0x59, 0xF1, 0x79, 0x82, 0x80, 0xFB, 0xD1, 0x1C, 0xB4, -0x6A, 0xFD, 0x02, 0x4E, 0x74, 0x7C, 0xD8, 0xB1, 0x5B, 0x6D, -0xBD, 0xFB, 0x7F, 0xA4, 0xC0, 0xBA, 0x26, 0x2A, 0xA6, 0xB3, -0xA5, 0xAB, 0xDD, 0xEF, 0x76, 0xE1, 0xEE, 0xF0, 0x20, 0x84, -0x12, 0x1A, 0x52, 0x97, 0x02, 0x95, 0xCD, 0x95, 0x68, 0x10, -0x7D, 0x0E, 0x86, 0x51, 0xC0, 0x3F, 0xEB, 0x47, 0x91, 0xA9, -0x08, 0x46, 0x85, 0x09, 0x6E, 0xCA, 0x8F, 0x19, 0xFF, 0x43, -0x4C, 0xB9, 0x58, 0xAB, 0x28, 0x3E, 0xB8, 0x24, 0x17, 0x8E, -0xD9, 0x39, 0x98, 0x42, 0x8C, 0x8F, 0x41, 0x09, 0xC2, 0xC4, -0x7E, 0xFA, 0x17, 0xDC, 0x19, 0xE8, 0x2E, 0x5D, 0xBE, 0xD8, -0x61, 0xD0, 0x19, 0x45, 0x3D, 0x63, 0xB7, 0x21, 0x21, 0x05, -0x98, 0xF7, 0x10, 0x18, 0x71, 0xDF, 0x07, 0xF9, 0x1D, 0x8D, -0x5B, 0xFC, 0xDB, 0x38, 0xB7, 0xB9, 0x12, 0x12, 0xA5, 0x14, -0x45, 0x3D, 0x87, 0x71, 0xBE, 0xF7, 0x02, 0x98, 0x29, 0x2E, -0x22, 0x85, 0x2B, 0xA0, 0x66, 0x54, 0x98, 0x70, 0x4F, 0xC0, -0x31, 0x33, 0x05, 0x8A, 0x24, 0x31, 0x3A, 0x39, 0x02, 0xA5, -0x5C, 0x05, 0x8A, 0xCF, 0xF9, 0xC5, 0xD7, 0x57, 0xBF, 0xFE, -0x4B, 0x00, 0x9B, 0xC4, 0x7A, 0x51, 0x78, 0x42, 0x4C, 0x92, -0xDA, 0x31, 0x37, 0x02, 0xEE, 0x2C, 0x0F, 0x33, 0x5E, 0x17, -0xFC, 0x98, 0x03, 0xC5, 0x11, 0x40, 0x23, 0x97, 0x63, 0xA2, -0xD3, 0x8E, 0x06, 0x7C, 0x85, 0x4D, 0xB2, 0x4D, 0xA8, 0xDD, -0xF0, 0x19, 0x0A, 0xD3, 0x0E, 0xA1, 0x91, 0x6E, 0x42, 0xDE, -0x37, 0xBB, 0xF1, 0xE7, 0xC6, 0xF7, 0xC1, 0x1F, 0xA6, 0x11, -0x26, 0x8C, 0x82, 0x8B, 0x4F, 0xC2, 0x31, 0xEF, 0xC1, 0xD8, -0xE0, 0x28, 0x0E, 0x1D, 0x7C, 0xDB, 0x64, 0x08, 0x0E, 0x8A, -0x5D, 0x50, 0xB0, 0x2D, 0x2D, 0x6B, 0x4B, 0x60, 0xE0, 0x15, -0x0E, 0xC3, 0x68, 0xA1, 0xA1, 0x93, 0x90, 0x70, 0x7B, 0xBD, -0xF0, 0xCE, 0xDA, 0x21, 0x5B, 0x2F, 0x47, 0x50, 0xB5, 0xB0, -0x3D, 0xBF, 0xAE, 0x60, 0xC6, 0x85, 0x59, 0xD4, 0xFA, 0x6A, -0x61, 0xE1, 0x86, 0xA3, 0x64, 0x4D, 0x09, 0xDE, 0x7C, 0xE1, -0x6D, 0x50, 0x56, 0x02, 0x3B, 0xBA, 0xB2, 0x71, 0xB0, 0xE1, -0x77, 0xF0, 0xB5, 0xDA, 0x11, 0x3E, 0xCC, 0x60, 0xBA, 0x7F, -0x20, 0x70, 0x6C, 0x6C, 0x49, 0x4D, 0x29, 0x08, 0xE0, 0x52, -0xA9, 0xD6, 0x95, 0x4F, 0x07, 0x06, 0x32, 0x3B, 0x9B, 0x12, -0x7E, 0x1F, 0xC4, 0x6C, 0x70, 0x88, 0xF9, 0x32, 0x40, 0xB3, -0x0C, 0xF7, 0xFA, 0xDB, 0xDD, 0x6E, 0x8A, 0xFE, 0x87, 0xEB, -0x53, 0xAF, 0xFF, 0xFD, 0xCC, 0xE2, 0x58, 0x15, 0xA1, 0xC3, -0x71, 0x94, 0x40, 0x09, 0x15, 0x74, 0xD0, 0x20, 0x79, 0xD9, -0x3A, 0x64, 0x2E, 0xCB, 0x44, 0xF7, 0xC8, 0x6D, 0xFC, 0xF1, -0xCB, 0x77, 0x61, 0x9F, 0xD6, 0x40, 0xB3, 0x3E, 0x03, 0xEB, -0x58, 0x8E, 0xD4, 0xBC, 0xEC, 0xC4, 0x53, 0x1F, 0x9F, 0x07, -0xD1, 0x70, 0xA5, 0x76, 0xE0, 0x99, 0xCD, 0xCF, 0x18, 0xA6, -0xFB, 0x06, 0xC1, 0xE3, 0x31, 0xE0, 0x83, 0x86, 0xDD, 0x3E, -0x0A, 0x66, 0x46, 0x82, 0xFE, 0xC9, 0x3B, 0x1D, 0xA7, 0x6F, -0xB6, 0xB4, 0xD6, 0xBF, 0x53, 0xC5, 0x65, 0xEE, 0x29, 0xB6, -0xC7, 0xEB, 0xA2, 0xA9, 0x3E, 0xD6, 0x77, 0x6E, 0x78, 0xE0, -0x5B, 0xB8, 0x5F, 0x92, 0xE5, 0xE7, 0xC2, 0x8C, 0x70, 0xD8, -0x10, 0x8F, 0xBE, 0xF1, 0xEF, 0xD1, 0xD2, 0xD1, 0x01, 0x27, -0xDF, 0x84, 0x97, 0x34, 0x36, 0x6C, 0x0B, 0x7F, 0x9E, 0x20, -0x2E, 0x7E, 0x55, 0x3F, 0x13, 0xB1, 0x7E, 0x95, 0xF8, 0xC1, -0xD8, 0x03, 0x08, 0xA6, 0x78, 0xB8, 0xDB, 0x7F, 0x07, 0xF3, -0xB3, 0x2E, 0x44, 0x69, 0x43, 0xD1, 0x3F, 0x35, 0xD6, 0xC1, -0xF5, 0x7B, 0x5B, 0x47, 0x4E, 0xDC, 0x9F, 0x7E, 0xEB, 0xC5, -0xA2, 0xB5, 0x13, 0x39, 0xA3, 0x89, 0x8B, 0x13, 0x89, 0xFC, -0x5F, 0x38, 0x7A, 0x81, 0x04, 0x6A, 0x0D, 0xA2, 0x59, 0xDB, -0x46, 0x2E, 0x77, 0x22, 0x2A, 0x7A, 0x1B, 0xAE, 0x1D, 0x69, -0x5E, 0xC1, 0xD9, 0x93, 0xFB, 0xF3, 0x7C, 0x9B, 0xDA, 0x26, -0x09, 0x6B, 0x50, 0xC2, 0x38, 0xAA, 0x47, 0x8C, 0x38, 0x12, -0x06, 0x65, 0x04, 0x5C, 0x2A, 0x01, 0xEE, 0xF4, 0x5F, 0x9F, -0x76, 0xDD, 0x75, 0x76, 0x0C, 0x10, 0xE3, 0x21, 0xDD, 0xFB, -0xDA, 0x52, 0x97, 0xD3, 0x56, 0x04, 0x43, 0x8F, 0x30, 0x84, -0x22, 0x8A, 0xED, 0x23, 0xFD, 0x91, 0x88, 0x7E, 0x14, 0x8D, -0x8D, 0xDC, 0x4D, 0x78, 0x96, 0xB4, 0xC1, 0x3C, 0x24, 0x87, -0xBF, 0xD9, 0x00, 0xFE, 0xA3, 0x6C, 0x6C, 0x59, 0x9B, 0xF7, -0xE8, 0xBD, 0xCC, 0xDD, 0x6F, 0x90, 0xFA, 0x5E, 0x5C, 0x47, -0x0B, 0x30, 0x20, 0xED, 0x41, 0x63, 0x50, 0x23, 0x2A, 0x7C, -0x9F, 0xA0, 0x6A, 0xA8, 0x04, 0x97, 0x3A, 0xCF, 0x21, 0x28, -0xC6, 0x18, 0xF1, 0x6D, 0xF5, 0x35, 0xAA, 0x7B, 0x75, 0xD7, -0xF2, 0x97, 0xA5, 0xD9, 0x48, 0x72, 0x27, 0x63, 0x3D, 0x52, -0x90, 0x84, 0xA7, 0x91, 0x34, 0xBF, 0x01, 0x99, 0xC4, 0x56, -0xE4, 0x08, 0xB3, 0xB0, 0xFA, 0xDE, 0x32, 0xC8, 0x3F, 0xFB, -0x29, 0xA4, 0x35, 0x07, 0xA0, 0x1A, 0xCF, 0xC5, 0xF2, 0xE4, -0x44, 0xFC, 0xA7, 0xBE, 0xFA, 0xDE, 0x82, 0x65, 0xB9, 0xB9, -0x2F, 0xEE, 0x79, 0xBE, 0x28, 0xBF, 0xF4, 0x7A, 0x4B, 0x13, -0xEB, 0x3A, 0x09, 0x24, 0xF3, 0x22, 0xD0, 0xD2, 0x60, 0x88, -0xE9, 0x39, 0x38, 0x86, 0x1C, 0xB8, 0x72, 0xF9, 0xBA, 0x77, -0xD3, 0xA9, 0x78, 0x8A, 0x27, 0x10, 0xC2, 0x09, 0x17, 0x44, -0x2C, 0x8F, 0x9E, 0xBD, 0x06, 0x2E, 0x84, 0x18, 0xBE, 0xDD, -0x87, 0x1B, 0x97, 0x7B, 0x21, 0xE8, 0x93, 0x41, 0x16, 0xA2, -0x81, 0x20, 0xD1, 0x08, 0xB7, 0x55, 0x0B, 0x9E, 0x4A, 0x85, -0xF1, 0xB2, 0xE3, 0xE5, 0xBF, 0xCD, 0x3B, 0xB0, 0x9B, 0x6C, -0x6E, 0xEF, 0xA8, 0x97, 0xDB, 0x69, 0xAC, 0xE2, 0x58, 0x61, -0xE2, 0x18, 0xA1, 0x60, 0x42, 0x21, 0xF6, 0x0F, 0x82, 0x9C, -0x9C, 0x43, 0x5B, 0x77, 0x3F, 0xAC, 0x49, 0x06, 0xCA, 0x26, -0x58, 0x07, 0x23, 0x4C, 0xEC, 0xC9, 0xD7, 0xB1, 0x57, 0x13, -0x89, 0xFB, 0x57, 0x86, 0xD0, 0x72, 0xF8, 0x0B, 0xB4, 0x9E, -0xBA, 0x05, 0x4A, 0x26, 0x81, 0x21, 0x5D, 0x0B, 0xA3, 0x4D, -0x0A, 0xE5, 0x64, 0x37, 0xF4, 0xFF, 0x6C, 0x84, 0xA8, 0xF7, -0x26, 0x86, 0xDB, 0x7A, 0x4A, 0x16, 0x7C, 0xF4, 0x5D, 0x5B, -0x57, 0xDF, 0x50, 0x4F, 0xCF, 0x03, 0x8B, 0xC1, 0x04, 0x17, -0xC9, 0x01, 0x87, 0x3B, 0x04, 0x62, 0x92, 0x80, 0x5D, 0xA2, -0x86, 0x67, 0xB0, 0x17, 0x19, 0x3B, 0xB6, 0x41, 0xCD, 0x86, -0xA4, 0x7F, 0xD2, 0x8F, 0xDA, 0xB2, 0x7A, 0x9C, 0x7D, 0xF5, -0x14, 0x9A, 0xFE, 0x7A, 0x15, 0xBA, 0x95, 0x2A, 0x64, 0xE5, -0x6E, 0x46, 0xEC, 0xEA, 0xA7, 0xA0, 0x14, 0x0B, 0xD8, 0x44, -0x62, 0x6B, 0x94, 0x44, 0x01, 0x4D, 0x58, 0x0C, 0x9C, 0xF5, -0x4D, 0x7D, 0xC7, 0x4E, 0x97, 0x75, 0xFE, 0x10, 0x04, 0x7F, -0x6F, 0xFC, 0x7C, 0x2B, 0x25, 0x11, 0x43, 0xAA, 0x9A, 0x07, -0x3D, 0xEC, 0x81, 0x3B, 0xC4, 0x0C, 0xDF, 0xC0, 0x00, 0x56, -0xFC, 0x24, 0x9E, 0x0D, 0x39, 0x07, 0xCE, 0x7E, 0x78, 0x1A, -0x35, 0xFB, 0x2F, 0x62, 0xE4, 0xE1, 0x2C, 0xE2, 0x9E, 0xDB, -0x80, 0x57, 0xF7, 0xE7, 0x42, 0xAA, 0x36, 0x82, 0x4F, 0xFA, -0x10, 0x24, 0x10, 0x43, 0xC5, 0xC8, 0x60, 0x90, 0x9B, 0xA1, -0xE4, 0x11, 0x10, 0x13, 0x4E, 0x40, 0x6E, 0x88, 0xF9, 0x51, -0x94, 0x1D, 0x3F, 0x7E, 0xFE, 0xDF, 0xAD, 0xFF, 0xBA, 0x52, -0x99, 0x60, 0x0C, 0x85, 0x9D, 0x31, 0x40, 0xCB, 0x03, 0x82, -0x42, 0xF4, 0xE0, 0x71, 0x19, 0x34, 0x7D, 0xD8, 0x8C, 0x08, -0x45, 0x38, 0xB6, 0x64, 0xA7, 0x63, 0xC7, 0x0B, 0xE9, 0x30, -0x45, 0x45, 0xB0, 0xB5, 0x46, 0x08, 0x9D, 0xC0, 0x08, 0x0E, -0xCD, 0x20, 0x58, 0xA6, 0x81, 0x4A, 0xA6, 0x84, 0x48, 0x28, -0x84, 0x56, 0x63, 0x41, 0x68, 0x50, 0xF8, 0xA1, 0x57, 0xB6, -0x67, 0x4D, 0x2F, 0x0E, 0x63, 0xFC, 0x3A, 0x3B, 0x7F, 0xE7, -0xDF, 0xBE, 0xFC, 0xF6, 0xDA, 0xC6, 0x8D, 0x31, 0x6C, 0x89, -0x67, 0x8B, 0xAC, 0x5C, 0x89, 0x08, 0x93, 0x19, 0x19, 0x59, -0xCF, 0x21, 0xC2, 0xB6, 0x12, 0xFA, 0x60, 0x2D, 0x44, 0x1C, -0x31, 0x74, 0x34, 0x6B, 0xA9, 0x42, 0x09, 0x75, 0x88, 0x9A, -0x4D, 0x4C, 0x25, 0x68, 0x4A, 0x00, 0xA9, 0x50, 0x0C, 0xB3, -0x39, 0x14, 0x96, 0xA7, 0x22, 0x8E, 0x49, 0xE5, 0xAA, 0x3F, -0x2C, 0x95, 0x27, 0x0B, 0xB4, 0x67, 0x57, 0x6E, 0x8A, 0xF7, -0xA1, 0xE3, 0xE4, 0x72, 0x5B, 0x0A, 0x0C, 0x1A, 0x2D, 0x34, -0xC1, 0x3A, 0x78, 0x39, 0x6C, 0xAE, 0x52, 0x24, 0xE4, 0x32, -0x05, 0x14, 0x62, 0x06, 0x0A, 0x25, 0x03, 0x39, 0x57, 0x08, -0x89, 0x48, 0x0C, 0x8D, 0x5E, 0x0F, 0x99, 0x52, 0x09, 0x8D, -0x52, 0x03, 0xAE, 0x80, 0x7E, 0x8B, 0x2D, 0xD3, 0xFB, 0xB1, -0x88, 0xC8, 0xC5, 0x0B, 0x41, 0xFA, 0xB0, 0xD7, 0x07, 0x6F, -0x76, 0x69, 0xAC, 0x21, 0xE6, 0x8B, 0x06, 0xAD, 0xC1, 0x29, -0x13, 0x0B, 0x59, 0x27, 0x32, 0x10, 0xB2, 0x4F, 0x24, 0x97, -0xE6, 0x81, 0xC7, 0xD6, 0x7F, 0xB1, 0x90, 0x7D, 0x2F, 0xC4, -0x62, 0xF0, 0x38, 0xE4, 0x18, 0x87, 0xE0, 0xD4, 0x11, 0x8F, -0xE9, 0xBD, 0xC5, 0x58, 0xFF, 0xA7, 0xC0, 0x62, 0xB1, 0xA8, -0x13, 0x6C, 0x09, 0xBA, 0xB4, 0x8C, 0x34, 0x6A, 0x5F, 0xFE, -0xBE, 0xC2, 0xEA, 0x8A, 0x73, 0x47, 0x83, 0x44, 0x32, 0x28, -0x34, 0x1A, 0x30, 0x52, 0x36, 0xD6, 0x25, 0x01, 0x45, 0x6C, -0x9E, 0x70, 0xF9, 0x98, 0x98, 0x98, 0x98, 0x3C, 0x5A, 0x7C, -0xF4, 0xA3, 0xC2, 0xC2, 0xC2, 0x40, 0xDD, 0x37, 0x33, 0x0C, -0x63, 0xD5, 0xE9, 0x74, 0xD2, 0xA5, 0x94, 0xFC, 0x40, 0x71, -0x71, 0x71, 0x12, 0x95, 0x4A, 0xA5, 0x08, 0xB3, 0x58, 0xAC, -0x31, 0x71, 0x71, 0x6B, 0x0B, 0x0F, 0xBF, 0xBB, 0xAA, 0xB4, -0xB4, 0x34, 0xA5, 0xBC, 0xFC, 0xCC, 0xD6, 0xAA, 0xAA, 0xAA, -0x1D, 0x35, 0x35, 0x35, 0x39, 0x75, 0x75, 0x75, 0x7B, 0x2E, -0x5C, 0xB8, 0xB0, 0xF3, 0xC8, 0x91, 0x23, 0x29, 0xC5, 0xC5, -0xC5, 0xE9, 0xA9, 0x2C, 0x09, 0x04, 0x02, 0x2B, 0x9F, 0xCF, -0x0F, 0xFC, 0x7E, 0xD0, 0x8B, 0x31, 0xFF, 0x0B, 0x25, 0x2D, -0x52, 0x75, 0x3C, 0x77, 0xAA, 0x9E, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Refresh2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x03, 0xDF, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0xB4, 0x54, 0x6D, 0x4C, 0x5B, 0x55, 0x18, -0x7E, 0xCE, 0xB9, 0xB7, 0xB7, 0x2D, 0x6D, 0xB9, 0xED, 0xCA, -0x04, 0x1C, 0x74, 0x8C, 0x82, 0x8C, 0x31, 0x56, 0x46, 0xE6, -0x9C, 0xC9, 0x7E, 0xEC, 0x8F, 0xFE, 0x51, 0x14, 0xD9, 0x8C, -0x31, 0x71, 0xA2, 0x59, 0x82, 0x9B, 0x1F, 0x09, 0x9A, 0x25, -0xFE, 0xF0, 0x97, 0xFE, 0x21, 0xC1, 0x1F, 0x26, 0x4B, 0xFC, -0x4A, 0x70, 0x9A, 0x48, 0x64, 0x28, 0x84, 0x04, 0x84, 0x30, -0xB7, 0x91, 0x6C, 0xD3, 0x2C, 0xCB, 0xB6, 0x3A, 0x1C, 0x1B, -0xE3, 0x63, 0x0C, 0xB8, 0x85, 0x16, 0x5A, 0xBE, 0x5A, 0x5A, -0xA0, 0xA5, 0xF7, 0xF5, 0x87, 0x17, 0x72, 0x35, 0x73, 0x2B, -0x6E, 0x3E, 0xC9, 0x9B, 0x73, 0xF2, 0x9E, 0x37, 0xCF, 0x73, -0x9E, 0xF3, 0xBE, 0x39, 0x8C, 0x88, 0xB0, 0x11, 0x94, 0xEC, -0x2C, 0x16, 0xC7, 0x46, 0xC7, 0x72, 0x9C, 0x0E, 0x87, 0xAB, -0x7C, 0x77, 0xB9, 0x07, 0x00, 0xBF, 0x70, 0xF1, 0x82, 0x12, -0x89, 0xC6, 0x26, 0x9C, 0x4E, 0xE7, 0x80, 0xDF, 0x1F, 0x98, -0xD7, 0xD7, 0x33, 0x6C, 0x0C, 0xE5, 0x00, 0xEA, 0x76, 0x7B, -0x76, 0x6E, 0xD9, 0xF7, 0xE4, 0xDE, 0x9C, 0x1D, 0x45, 0xC5, -0xB3, 0x49, 0x4E, 0x69, 0x93, 0x8A, 0x62, 0xE8, 0xE8, 0xEA, -0x8A, 0xF7, 0x0F, 0xDE, 0x19, 0x02, 0xF0, 0x09, 0x80, 0xB3, -0xF8, 0x0F, 0x78, 0x27, 0xEF, 0xF1, 0xEC, 0xB3, 0x23, 0x7D, -0x37, 0x2E, 0x13, 0xD1, 0x02, 0x11, 0x2D, 0x13, 0x51, 0x82, -0x88, 0x56, 0xB5, 0x35, 0x78, 0xD3, 0x7B, 0x65, 0xC4, 0xCC, -0x71, 0x1E, 0x40, 0xF5, 0x46, 0xC9, 0x73, 0x5F, 0xA8, 0x78, -0xAE, 0x83, 0x88, 0x7E, 0x25, 0xA2, 0xA5, 0xC5, 0x70, 0x78, -0x72, 0x7A, 0x6A, 0xEA, 0x76, 0x70, 0x26, 0x34, 0x10, 0x9C, -0x99, 0x19, 0x08, 0x4E, 0x4D, 0xDF, 0x59, 0x8C, 0x44, 0x43, -0x9A, 0xE8, 0x70, 0x61, 0x6E, 0xF6, 0x19, 0x00, 0x7B, 0x36, -0xF2, 0x44, 0x5F, 0x12, 0x91, 0x1B, 0xC0, 0xD3, 0xD3, 0x93, -0xFE, 0xFE, 0x34, 0x9B, 0x15, 0x5C, 0xE0, 0x50, 0x49, 0x55, -0x39, 0x13, 0x63, 0x44, 0x6A, 0x7C, 0x25, 0x1E, 0xC7, 0x62, -0x64, 0x41, 0x74, 0xB9, 0xF2, 0x8A, 0x00, 0x04, 0x19, 0x63, -0xA3, 0x00, 0xAA, 0x84, 0x14, 0xC8, 0xCD, 0x5D, 0x3F, 0x77, -0x1E, 0x29, 0x7C, 0xA2, 0x70, 0xB3, 0x32, 0xAE, 0x5C, 0x4E, -0xB7, 0xDB, 0x7D, 0xE0, 0x2C, 0x24, 0x30, 0x16, 0x32, 0x8A, -0xC6, 0xA8, 0x68, 0x10, 0x48, 0x94, 0x24, 0x66, 0x14, 0xA5, -0x25, 0xA3, 0x51, 0x9A, 0xF5, 0xFB, 0xFD, 0xA3, 0xB2, 0xDD, -0x2E, 0x64, 0x6E, 0x72, 0x18, 0x3B, 0xBB, 0xBB, 0xCF, 0xA5, -0xE2, 0xE0, 0x70, 0x62, 0x75, 0x65, 0x3F, 0x4B, 0xB2, 0xEE, -0xB9, 0x68, 0x98, 0x9B, 0x25, 0xC9, 0x6C, 0x10, 0x24, 0xE2, -0x06, 0x51, 0x65, 0x1C, 0x49, 0x46, 0x4C, 0xE0, 0x9C, 0xDB, -0x00, 0xE4, 0x02, 0xC8, 0x5C, 0x5C, 0x8A, 0x32, 0xAB, 0xD9, -0x12, 0x58, 0x58, 0x98, 0x2B, 0xB5, 0xDB, 0x37, 0xB5, 0x88, -0x29, 0x08, 0xB8, 0xA2, 0xE1, 0x68, 0x42, 0x76, 0x38, 0x9C, -0x19, 0xA2, 0x23, 0x0B, 0x9C, 0x4B, 0xBA, 0xB3, 0x24, 0x18, -0xE2, 0x00, 0x66, 0x00, 0xF4, 0x26, 0x55, 0x08, 0x16, 0x93, -0xA9, 0x10, 0x80, 0x2C, 0xCB, 0x8E, 0xB1, 0xE2, 0x82, 0x02, -0x53, 0x2A, 0x02, 0xC3, 0xB2, 0xC3, 0x51, 0x02, 0x20, 0x03, -0x9C, 0xCB, 0x5A, 0xDF, 0xC4, 0x75, 0x81, 0xBF, 0xC2, 0x0A, -0x20, 0x9B, 0x33, 0x0A, 0xAA, 0xAA, 0x7A, 0x4B, 0x10, 0x84, -0xE4, 0x84, 0xA2, 0x1C, 0x9A, 0x9D, 0x0F, 0xCF, 0xF3, 0x14, -0x04, 0xDA, 0xEA, 0x3F, 0xAD, 0x2F, 0x01, 0x60, 0x00, 0x90, -0x01, 0x40, 0xD6, 0x22, 0x5D, 0x8B, 0x34, 0x00, 0x46, 0x00, -0x22, 0x63, 0xCC, 0x26, 0x08, 0x86, 0x12, 0x00, 0xBE, 0x86, -0x6F, 0x4F, 0xA6, 0x4F, 0x85, 0xA6, 0x47, 0x52, 0x71, 0x10, -0xBF, 0x7A, 0xC9, 0xDB, 0x03, 0xC0, 0x0D, 0x80, 0x00, 0x38, -0xB5, 0xFC, 0xAA, 0xB6, 0x2E, 0x6B, 0xE2, 0x4C, 0x13, 0xBB, -0x3E, 0x11, 0xF0, 0x6D, 0xEF, 0xEE, 0xFC, 0x25, 0x0B, 0x80, -0x37, 0x15, 0x07, 0xF8, 0xA9, 0xAD, 0xF9, 0xC3, 0xE2, 0xED, -0x45, 0xD5, 0x00, 0x26, 0x00, 0x70, 0x00, 0x16, 0xED, 0xF6, -0x56, 0x00, 0x36, 0x6D, 0x6F, 0x03, 0x30, 0x16, 0x4F, 0x2C, -0x45, 0xDA, 0x9A, 0xDB, 0x1B, 0xA7, 0x67, 0x42, 0x2F, 0x42, -0xF7, 0x96, 0xF7, 0xC5, 0xBE, 0xBD, 0x4F, 0x35, 0x08, 0xA2, -0x08, 0xC6, 0xD8, 0x47, 0x7F, 0x5C, 0xFF, 0xFD, 0x5A, 0xA9, -0xA7, 0x2C, 0x06, 0x20, 0x0C, 0x20, 0xAE, 0x39, 0x98, 0x05, -0x10, 0x6D, 0x3A, 0xD5, 0xB8, 0xBF, 0xB5, 0xB9, 0xFD, 0xE5, -0x1B, 0xBD, 0x37, 0x2B, 0x46, 0xEE, 0x0E, 0x06, 0x00, 0xF0, -0x07, 0x8E, 0xA9, 0x64, 0xE0, 0xED, 0xB5, 0xB5, 0xEF, 0x57, -0x9C, 0x38, 0xF1, 0xF9, 0xB2, 0xC5, 0x22, 0x3F, 0x93, 0xEF, -0xDA, 0xFA, 0xAE, 0x55, 0xB6, 0xBC, 0x52, 0xF9, 0x52, 0x15, -0xDC, 0x85, 0xDB, 0x62, 0x89, 0xC4, 0xCA, 0xF2, 0xD0, 0xE0, -0xB0, 0xF5, 0xEB, 0xAF, 0x1A, 0xA4, 0xEC, 0xCC, 0xCC, 0xE1, -0x58, 0x6C, 0xF9, 0x80, 0xB7, 0xF7, 0xEA, 0x9A, 0x53, 0xF5, -0xBE, 0x02, 0x6F, 0xD7, 0x1C, 0xA3, 0xA1, 0xE1, 0x7E, 0x9C, -0xEB, 0xB9, 0xB8, 0xA8, 0x22, 0x69, 0x5B, 0xCB, 0x97, 0x95, -0x7A, 0xF2, 0x67, 0xE7, 0x23, 0xC7, 0x63, 0xE1, 0x85, 0xAD, -0x44, 0x60, 0x26, 0xAB, 0x35, 0xC2, 0x88, 0x3E, 0xF6, 0xF9, -0xC7, 0x6F, 0x69, 0x25, 0x46, 0x00, 0x2B, 0xFF, 0xFA, 0x55, -0x18, 0x25, 0xC9, 0x59, 0x5F, 0x57, 0x17, 0x9A, 0x0C, 0x28, -0x38, 0xD3, 0xF3, 0x1B, 0xBC, 0xD7, 0xAE, 0xAC, 0xD5, 0x6D, -0x06, 0x10, 0x7C, 0x80, 0x69, 0x41, 0x1B, 0x5D, 0xDC, 0xB3, -0x07, 0x19, 0x0E, 0x67, 0xDE, 0xF1, 0x0F, 0xDE, 0xBB, 0x4B, -0x0C, 0x68, 0x3A, 0xD5, 0x82, 0x71, 0xC5, 0xB7, 0x46, 0x2E, -0xEB, 0xC8, 0x39, 0x00, 0x55, 0xF7, 0xE5, 0x93, 0x2E, 0x97, -0xD4, 0xF3, 0xFD, 0x4D, 0xC0, 0xED, 0xDE, 0xF6, 0x6C, 0xCD, -0x5B, 0x35, 0xA7, 0x23, 0xE1, 0x39, 0x34, 0x35, 0xB7, 0xE9, -0xC9, 0xB3, 0x00, 0x04, 0x74, 0xA5, 0xAA, 0x6E, 0x4F, 0xF7, -0xC8, 0xAD, 0x63, 0x7D, 0x4C, 0x77, 0x95, 0x96, 0xBD, 0x7A, -0xF4, 0xE8, 0xB1, 0xD3, 0x46, 0x41, 0x40, 0x6B, 0x4B, 0x87, -0xD2, 0xDB, 0xD7, 0xBB, 0x46, 0xEE, 0xFA, 0x07, 0xF9, 0x86, -0xC0, 0x00, 0xE0, 0x8D, 0xD7, 0x5E, 0xAF, 0xDD, 0xE1, 0x29, -0xFD, 0x4C, 0x94, 0x80, 0x93, 0x5F, 0x7C, 0x73, 0xBE, 0x6F, -0xE0, 0xF6, 0x01, 0x00, 0x12, 0x80, 0xC7, 0x00, 0xF8, 0xF0, -0x10, 0x60, 0x55, 0x95, 0xCF, 0x57, 0xE7, 0xBB, 0x0B, 0xBE, -0x13, 0x24, 0x11, 0x3F, 0x7C, 0xFF, 0x63, 0xAB, 0xE2, 0x1B, -0x3F, 0xA4, 0x7D, 0x09, 0xA6, 0x87, 0x25, 0x07, 0x00, 0xBC, -0x79, 0xF8, 0x08, 0x1D, 0xAC, 0xAC, 0x20, 0x70, 0xD6, 0xA2, -0xA5, 0x72, 0x00, 0x6C, 0xC1, 0xA3, 0x82, 0x67, 0xD7, 0x9E, -0x1C, 0xB3, 0xC1, 0xD4, 0xA8, 0x6B, 0x66, 0x2E, 0xFE, 0x27, -0x14, 0x3C, 0xD2, 0x9B, 0x6B, 0xF8, 0x73, 0x00, 0xD6, 0xD2, -0x86, 0xAE, 0xCA, 0xDF, 0x49, 0x07, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Stop2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x88, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x94, 0x95, 0x5B, 0x6C, 0x93, 0xF7, 0x1D, -0x86, 0x9F, 0xCF, 0x9F, 0xCF, 0xC7, 0xD8, 0x81, 0x1C, 0xC8, -0x81, 0x90, 0x12, 0x60, 0x10, 0xAA, 0x14, 0x92, 0x06, 0x46, -0x12, 0xC1, 0x80, 0x4C, 0x1D, 0x74, 0x80, 0xAA, 0x8A, 0x55, -0xD0, 0x4C, 0x45, 0xE2, 0x62, 0x93, 0x60, 0xD3, 0x4A, 0x41, -0xAB, 0x36, 0x69, 0xDD, 0x34, 0xA4, 0x51, 0xA1, 0x5E, 0x4C, -0x55, 0xD1, 0x54, 0xD1, 0x32, 0x44, 0x45, 0x55, 0x4D, 0x6D, -0x09, 0x42, 0x5B, 0xE8, 0xC4, 0x50, 0x8B, 0x96, 0x90, 0x10, -0x20, 0x07, 0xC8, 0xD1, 0x31, 0x4E, 0x88, 0xE3, 0xC4, 0xFE, -0x12, 0x7F, 0x3E, 0xC4, 0xF6, 0x67, 0x7F, 0xFF, 0x5D, 0x54, -0x54, 0x14, 0xED, 0xC0, 0xDE, 0xBB, 0xF7, 0xE2, 0xF7, 0x3C, -0x77, 0xBF, 0x57, 0xE2, 0xBF, 0xC7, 0xF4, 0xCC, 0xBA, 0xAA, -0x17, 0xDB, 0xDA, 0x0E, 0xAD, 0xAF, 0x2C, 0x2D, 0xDF, 0xEE, -0x76, 0xB9, 0xEB, 0x84, 0x44, 0x3E, 0xA1, 0xAA, 0xB7, 0xEE, -0x0E, 0xDC, 0xFA, 0xC7, 0x07, 0x67, 0xFF, 0x7C, 0x67, 0x21, -0x12, 0xBF, 0xCC, 0xFF, 0x9B, 0x82, 0xF2, 0xA5, 0xBE, 0x37, -0x7E, 0xF9, 0xB3, 0xF6, 0x50, 0x68, 0x4A, 0xFC, 0xAF, 0xF8, -0x03, 0x63, 0xE2, 0xC7, 0x87, 0x5F, 0xB9, 0x08, 0x98, 0x9F, -0x8E, 0x6E, 0xA2, 0x6D, 0x3E, 0x11, 0xFB, 0x06, 0xA0, 0x8B, -0x9C, 0xC8, 0xA4, 0x17, 0x45, 0x3E, 0x12, 0x11, 0x99, 0x8E, -0x0E, 0x91, 0xB9, 0x76, 0x4D, 0xE8, 0x8B, 0x8B, 0x22, 0x9D, -0xC9, 0x7C, 0x4B, 0x34, 0xF2, 0x60, 0x54, 0x00, 0x3F, 0x7C, -0x12, 0x67, 0x78, 0xBC, 0xAC, 0x58, 0x55, 0xFD, 0xAE, 0xC8, -0x8A, 0x73, 0x05, 0x0E, 0x37, 0xB1, 0x54, 0x82, 0x79, 0x55, -0x21, 0xA9, 0xA6, 0x10, 0x48, 0xE4, 0x67, 0x66, 0x30, 0x0F, -0x0E, 0x62, 0xBA, 0x73, 0x07, 0x5D, 0x55, 0xC9, 0xEB, 0x39, -0x92, 0xC9, 0x38, 0xF1, 0x44, 0x8C, 0xB4, 0x96, 0xA6, 0xA6, -0x72, 0x25, 0x42, 0x88, 0xCF, 0x2D, 0x2E, 0xF3, 0xF1, 0x7F, -0x2B, 0xA8, 0xAE, 0x5D, 0xF1, 0xA6, 0x7F, 0x78, 0xFC, 0xA7, -0x00, 0x93, 0xE1, 0x49, 0xB2, 0xB9, 0x1C, 0xBA, 0x6C, 0x40, -0x97, 0x72, 0xE4, 0xF5, 0x1C, 0x5A, 0x30, 0x08, 0x9D, 0x9D, -0x48, 0x9D, 0x9D, 0xE4, 0xA2, 0x51, 0x04, 0x06, 0x72, 0x42, -0x47, 0x08, 0x9D, 0xD4, 0x62, 0x86, 0x99, 0xB9, 0x30, 0x00, -0x69, 0x35, 0xF3, 0x07, 0x93, 0x9D, 0x57, 0x9E, 0x14, 0x3C, -0x33, 0xDE, 0xEF, 0xFF, 0x3D, 0xC0, 0xE8, 0xE8, 0x28, 0x16, -0xA3, 0x11, 0x91, 0x5F, 0xC4, 0x6A, 0xB4, 0x60, 0x5B, 0xD4, -0xE0, 0xCB, 0x1B, 0xE4, 0x67, 0x67, 0x49, 0x75, 0x77, 0xB3, -0xD0, 0xD9, 0x49, 0x7E, 0x62, 0x02, 0xF1, 0xF1, 0xC7, 0xB8, -0x64, 0x33, 0x46, 0x93, 0x15, 0x5D, 0x4B, 0x23, 0x1B, 0x61, -0xF2, 0x61, 0x00, 0x80, 0xF0, 0x74, 0xE8, 0x23, 0xC0, 0xF9, -0x8D, 0xE0, 0xDC, 0xA5, 0xB3, 0x57, 0x01, 0x86, 0x1E, 0x0E, -0xE2, 0x76, 0x9B, 0x49, 0x25, 0x33, 0x58, 0x4D, 0x4E, 0xD2, -0x5F, 0xDE, 0x60, 0xBE, 0xB1, 0x91, 0xF4, 0xE9, 0xD3, 0x64, -0x65, 0x99, 0x6E, 0xBF, 0x9F, 0xDE, 0x07, 0x0F, 0xC8, 0x68, -0x1A, 0xF1, 0xE3, 0xC7, 0x89, 0xAC, 0x5B, 0x87, 0x76, 0xFB, -0x0E, 0x16, 0x8B, 0x8D, 0xC5, 0x44, 0x0A, 0xDD, 0x00, 0x13, -0xC1, 0x11, 0xBC, 0x9E, 0x12, 0x7E, 0xFB, 0xF6, 0xAF, 0xAE, -0x7C, 0x2D, 0x58, 0x65, 0x2A, 0x6D, 0x7B, 0xF1, 0xB5, 0x15, -0x59, 0x5D, 0xC1, 0x9A, 0xB7, 0x90, 0xCC, 0x66, 0x29, 0xF4, -0x79, 0x50, 0xAE, 0x7E, 0x41, 0x6A, 0xFF, 0x7E, 0x26, 0x03, -0x01, 0xC6, 0x4B, 0x4A, 0x48, 0x38, 0x1C, 0xDC, 0x07, 0xEE, -0x03, 0xF9, 0xF2, 0x72, 0xFA, 0xEB, 0xEA, 0x98, 0x08, 0x04, -0x58, 0xD8, 0xBD, 0x1B, 0xB5, 0xA7, 0x17, 0xBB, 0xD7, 0x4B, -0x52, 0x40, 0x22, 0x9D, 0x23, 0x1E, 0x51, 0x39, 0x72, 0xF0, -0x78, 0xB3, 0xD3, 0x63, 0xF2, 0x1A, 0x5E, 0x3D, 0xD6, 0xD6, -0x06, 0x90, 0x34, 0xCC, 0x52, 0x51, 0x66, 0xA4, 0xCC, 0x67, -0x45, 0x8F, 0xA7, 0xF1, 0xEF, 0xDF, 0xCF, 0x98, 0xA2, 0x10, -0xDA, 0xB7, 0x8F, 0xA2, 0xDF, 0xFD, 0xE6, 0xE1, 0xC3, 0xB9, -0x39, 0x46, 0x80, 0x61, 0x20, 0xA1, 0x69, 0xAC, 0x7D, 0xFF, -0x4F, 0xD3, 0xCA, 0xD1, 0xA3, 0x0C, 0x28, 0x0A, 0x43, 0x7B, -0xF6, 0xE0, 0xB3, 0x3A, 0x71, 0xF6, 0x07, 0x70, 0x8C, 0xCC, -0x32, 0x75, 0xBF, 0x9F, 0x82, 0x12, 0x17, 0xAF, 0x1D, 0x3C, -0x78, 0xC0, 0xB0, 0xB3, 0xB8, 0x71, 0x25, 0x80, 0x57, 0xC9, -0x23, 0xAB, 0x60, 0xB2, 0x95, 0x71, 0xE5, 0xE4, 0x49, 0xB2, -0x9A, 0x46, 0xFF, 0xFA, 0xF5, 0xB4, 0x7C, 0xF8, 0x41, 0x72, -0x7E, 0x21, 0x3E, 0x3A, 0xAB, 0x69, 0x04, 0x01, 0x3F, 0x10, -0xD7, 0x75, 0xE6, 0xA3, 0xF1, 0xAE, 0xBA, 0x13, 0xC7, 0xE6, -0x86, 0xB6, 0x6D, 0x23, 0xAD, 0xAA, 0x7C, 0xFA, 0xD6, 0x5B, -0x14, 0x35, 0x35, 0x70, 0x6E, 0xB7, 0xE0, 0x4C, 0x73, 0x94, -0x53, 0x7C, 0xC5, 0xCA, 0x1F, 0x35, 0x2E, 0x37, 0x94, 0xBA, -0x8A, 0x76, 0x42, 0x92, 0x64, 0xD2, 0x4C, 0x96, 0x02, 0x66, -0x26, 0x27, 0xE9, 0x3B, 0x7F, 0x9E, 0x80, 0x24, 0xB1, 0xA4, -0xAD, 0x8D, 0xB0, 0xA2, 0x0C, 0xCD, 0x4C, 0x4E, 0x15, 0xC4, -0x01, 0x05, 0x98, 0x01, 0x32, 0x80, 0x51, 0x36, 0x2C, 0x9D, -0x9F, 0x9C, 0x19, 0xD8, 0x78, 0xE2, 0x04, 0x77, 0x81, 0xC1, -0x0B, 0x17, 0x98, 0x9D, 0x9A, 0xA2, 0x21, 0x5A, 0xCC, 0xB2, -0x1B, 0x69, 0xAA, 0x7A, 0x63, 0x48, 0xF7, 0x62, 0x3B, 0x0C, -0x5A, 0x46, 0x76, 0x8E, 0xC6, 0x54, 0xEE, 0x8A, 0x45, 0x62, -0x42, 0xA0, 0x46, 0xA3, 0x88, 0x58, 0x8C, 0x3E, 0x59, 0xA6, -0xB2, 0xB1, 0x91, 0x70, 0x68, 0x36, 0xBC, 0xBC, 0xA2, 0xD2, -0x91, 0x06, 0x0A, 0x01, 0x37, 0x90, 0x05, 0xB2, 0xB9, 0xB4, -0x5B, 0x4D, 0x65, 0xA6, 0xD7, 0xD7, 0xD7, 0x33, 0x08, 0xA8, -0xD3, 0xD3, 0xE4, 0xB3, 0x59, 0xAA, 0x14, 0x23, 0x85, 0xC1, -0x3C, 0xF9, 0xE9, 0x1C, 0x49, 0x55, 0xAC, 0x36, 0x7A, 0xED, -0xB2, 0x5A, 0x93, 0x2F, 0x2D, 0xAC, 0xE9, 0xF1, 0x40, 0x9D, -0x9D, 0x88, 0xF0, 0xA3, 0x02, 0x71, 0x49, 0xC2, 0x00, 0x84, -0x42, 0x7E, 0x93, 0x6F, 0xCD, 0x73, 0x23, 0x5B, 0x5A, 0x5A, -0x6A, 0x86, 0x5E, 0x7A, 0x89, 0x1A, 0x97, 0x8B, 0x35, 0xAB, -0x57, 0x33, 0x1E, 0x08, 0x8E, 0xC7, 0x17, 0x66, 0x65, 0xC4, -0x6A, 0x72, 0x40, 0x48, 0x08, 0xF2, 0x42, 0x90, 0x2C, 0x2E, -0x62, 0x7C, 0xFB, 0x5A, 0xCC, 0x45, 0x76, 0x34, 0x4F, 0xEC, -0x9E, 0xC1, 0xD8, 0x13, 0xF9, 0x3B, 0xFD, 0x10, 0x36, 0xFA, -0xF1, 0x6B, 0xE3, 0x14, 0xFA, 0x7C, 0xC4, 0x2D, 0x16, 0xBC, -0xB9, 0x1C, 0xD9, 0xAE, 0x2E, 0xAA, 0x2A, 0x97, 0xAF, 0xFB, -0xEB, 0xA7, 0x9F, 0x0D, 0x1B, 0x64, 0x5B, 0xC7, 0x9B, 0x67, -0xCE, 0x28, 0xC7, 0x4E, 0x9F, 0x8E, 0xCC, 0x45, 0x63, 0x1D, -0x43, 0x5D, 0x37, 0x83, 0x9A, 0x43, 0x6C, 0x98, 0xEE, 0xED, -0x25, 0x05, 0x14, 0x14, 0x17, 0x63, 0x37, 0x9B, 0xB1, 0xAA, -0x06, 0x2A, 0xC6, 0x34, 0xAA, 0x22, 0x3A, 0x86, 0xE1, 0xD9, -0xAB, 0xF2, 0x92, 0xB5, 0x85, 0xAB, 0xB4, 0xAD, 0xCE, 0xD6, -0xCB, 0xD1, 0xAF, 0x98, 0x5E, 0x08, 0xD1, 0x52, 0xD7, 0x8C, -0x6D, 0x6C, 0x8C, 0x78, 0x5F, 0x1F, 0x3E, 0x45, 0xA1, 0xEE, -0xD8, 0x1B, 0xAE, 0x44, 0x26, 0xBA, 0xF4, 0xDA, 0x17, 0x97, -0xEF, 0x29, 0x53, 0x73, 0x77, 0x87, 0xEE, 0xDD, 0x1B, 0x1E, -0xE8, 0xED, 0x4A, 0x2D, 0x29, 0x71, 0x35, 0x6E, 0x6A, 0xDE, -0x59, 0x7B, 0xEB, 0xE8, 0xCF, 0x51, 0x03, 0x01, 0xF6, 0x1E, -0x38, 0xC0, 0x77, 0xF6, 0xEE, 0xE5, 0xE6, 0xCC, 0x24, 0x8A, -0xDB, 0x8D, 0xB3, 0x6C, 0x19, 0x81, 0x8F, 0xFE, 0x72, 0x41, -0xC6, 0x5B, 0x1C, 0x68, 0xD9, 0xBC, 0xF1, 0x75, 0xAF, 0xE6, -0xC1, 0x96, 0x31, 0xA3, 0xC4, 0x53, 0x6C, 0xD9, 0xB1, 0x9D, -0xDC, 0x7B, 0xEF, 0x51, 0x11, 0x89, 0xE0, 0x9E, 0x09, 0x53, -0xFD, 0x93, 0x23, 0x3E, 0xA7, 0xB7, 0xB0, 0x6E, 0x74, 0xCA, -0x5F, 0x91, 0x33, 0x64, 0x6B, 0xD6, 0x3C, 0x5B, 0xBB, 0xE5, -0xBB, 0xCD, 0xDB, 0x97, 0x89, 0xB7, 0xDF, 0x21, 0x7C, 0xFE, -0x3C, 0x95, 0x66, 0x33, 0xAD, 0x97, 0x2E, 0x71, 0x7D, 0x60, -0x90, 0xF4, 0xE4, 0x30, 0xDE, 0xF4, 0x1C, 0xB9, 0x54, 0x82, -0xEE, 0xCF, 0xFF, 0xF6, 0xAA, 0x1C, 0x1C, 0x1B, 0x4B, 0x34, -0x6F, 0xD8, 0xB0, 0xEF, 0xD9, 0xF5, 0xCF, 0x95, 0x44, 0x63, -0x09, 0x52, 0x06, 0x05, 0x4F, 0x61, 0x11, 0x6B, 0x9E, 0xDF, -0x4C, 0xF9, 0xE0, 0x20, 0x56, 0xBB, 0x1D, 0xF1, 0x20, 0xC8, -0xB2, 0x95, 0xAB, 0xD8, 0xD4, 0xBC, 0xD5, 0xD9, 0x50, 0xBB, -0xC1, 0x55, 0x91, 0x43, 0x32, 0xBE, 0x7F, 0x16, 0x77, 0xFB, -0x65, 0x4A, 0x10, 0xAC, 0xBC, 0x70, 0x81, 0x70, 0xD1, 0x12, -0xC2, 0xA1, 0x00, 0x06, 0xA7, 0x87, 0xD2, 0xA5, 0xC5, 0xCC, -0x75, 0xDD, 0xBA, 0x72, 0xF2, 0xD4, 0x3B, 0x67, 0x25, 0x80, -0xDD, 0xAD, 0x5B, 0xAB, 0x4E, 0xBE, 0xFB, 0xC7, 0x89, 0xD9, -0x64, 0x08, 0x6D, 0x6C, 0x8A, 0x84, 0xAB, 0x9C, 0xFA, 0xDA, -0xD5, 0x54, 0x44, 0x16, 0x90, 0x7B, 0x7A, 0xC0, 0xE3, 0x81, -0xA2, 0x22, 0x44, 0x3E, 0x0F, 0xBA, 0x8E, 0x94, 0xCD, 0xC2, -0x84, 0x1F, 0x22, 0x51, 0xC4, 0xCB, 0x2F, 0x33, 0x57, 0xEC, -0x65, 0x3C, 0xF8, 0x10, 0x39, 0x9D, 0xC1, 0x6C, 0xCC, 0x63, -0xB2, 0x5B, 0xA9, 0x5D, 0xDB, 0x60, 0x03, 0xD2, 0x32, 0xC0, -0xC8, 0x78, 0x60, 0xC1, 0x66, 0xB7, 0xCE, 0xEF, 0xDA, 0xB2, -0xF1, 0x85, 0x99, 0x84, 0x15, 0x93, 0x55, 0xC2, 0x98, 0x4F, -0x43, 0x49, 0x19, 0xAE, 0xA6, 0x26, 0xA4, 0xCA, 0xE5, 0x60, -0xB7, 0x23, 0x15, 0x2D, 0x45, 0xF2, 0x15, 0x82, 0xD7, 0x0B, -0x0D, 0xCF, 0x43, 0x6B, 0x2B, 0x29, 0x9B, 0x89, 0x44, 0x22, -0x81, 0xCD, 0x68, 0xC2, 0x6E, 0x72, 0x50, 0xBA, 0xAC, 0x9C, -0xDB, 0xB7, 0x6F, 0xEF, 0xBA, 0x78, 0xF1, 0x93, 0xFB, 0x00, -0xF2, 0xA3, 0xB7, 0xFA, 0xCF, 0x1B, 0x9D, 0x5D, 0xEB, 0x6A, -0x37, 0x59, 0x37, 0x7F, 0xBF, 0xA9, 0xC9, 0xAA, 0x69, 0x84, -0x33, 0x39, 0x12, 0x09, 0x15, 0xC9, 0x20, 0xE1, 0xF1, 0x2D, -0x41, 0x58, 0x2C, 0x20, 0xCB, 0x60, 0xB6, 0x40, 0x81, 0x07, -0xC9, 0xE9, 0x44, 0x59, 0x88, 0x91, 0x4C, 0xA5, 0x30, 0x19, -0x65, 0x6C, 0x76, 0x27, 0x65, 0x15, 0xE5, 0x0C, 0x0D, 0x0F, -0x1F, 0xDA, 0xB6, 0x6D, 0xC7, 0x27, 0x8F, 0xB8, 0xD2, 0x93, -0x0B, 0xD4, 0xD1, 0xD1, 0xBE, 0xA7, 0x61, 0xE7, 0x0F, 0x3E, -0x53, 0x17, 0x14, 0xD2, 0xD9, 0x14, 0x19, 0x4D, 0xC7, 0x63, -0xB4, 0xE0, 0xB3, 0x39, 0x90, 0x2D, 0x66, 0x0C, 0x48, 0xE8, -0x42, 0xA0, 0xE9, 0x39, 0x64, 0x61, 0xC0, 0xE1, 0xB0, 0x3F, -0x7E, 0xFE, 0x3D, 0x49, 0x92, 0xAE, 0x3D, 0xD5, 0x72, 0x0A, -0x21, 0x4E, 0x45, 0x62, 0xD1, 0x45, 0x55, 0xCF, 0x8A, 0xD0, -0x5C, 0x44, 0xCC, 0xCF, 0x2B, 0x22, 0x16, 0x8B, 0x09, 0x35, -0xA9, 0x8A, 0xE4, 0x62, 0x42, 0xE4, 0xF5, 0xAF, 0xA7, 0x32, -0x1E, 0x8F, 0x2B, 0x42, 0x88, 0x5F, 0x3F, 0x0D, 0x53, 0x2A, -0x2F, 0x2F, 0x77, 0x17, 0x14, 0x14, 0x94, 0x78, 0xBD, 0xBE, -0xC2, 0x5D, 0x2F, 0xB4, 0x96, 0xBC, 0x7E, 0xF4, 0x17, 0x87, -0x22, 0xB3, 0x91, 0xFF, 0xB8, 0xFC, 0x37, 0xBB, 0xBB, 0x7B, -0x0E, 0x1F, 0x3E, 0x7C, 0xA4, 0xB6, 0xB6, 0xB6, 0x1A, 0x58, -0x0E, 0xAC, 0x02, 0xAC, 0xDF, 0x82, 0x3E, 0x5E, 0xEA, 0xEB, -0xEB, 0x9D, 0x6E, 0xB7, 0x5B, 0xAE, 0xA9, 0xA9, 0x29, 0xEA, -0xEB, 0x1B, 0xF0, 0x39, 0x5D, 0xF6, 0x54, 0x73, 0x53, 0x8B, -0xBB, 0xBA, 0xBA, 0xB2, 0x50, 0x36, 0x98, 0xDD, 0x66, 0xAB, -0xD5, 0x62, 0xB1, 0x5A, 0x6C, 0x06, 0x60, 0x26, 0x1C, 0x0E, -0x4D, 0x06, 0x83, 0x91, 0x54, 0x2A, 0xE5, 0x6C, 0x6F, 0x6F, -0x8F, 0x3B, 0x1C, 0x8E, 0x69, 0xBB, 0xDD, 0xAE, 0x5C, 0xBF, -0x7E, 0x5D, 0x05, 0x72, 0x8F, 0x98, 0xFF, 0x1A, 0x00, 0xFC, -0x64, 0x6E, 0x7F, 0x37, 0xBA, 0xF4, 0x32, 0x00, 0x00, 0x00, -0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 -}; - -static const unsigned char Toolbar_Wiimote2_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x05, 0x57, 0x49, 0x44, 0x41, -0x54, 0x78, 0x9C, 0xED, 0x54, 0x69, 0x6C, 0x54, 0x55, 0x18, -0x3D, 0xD3, 0xD9, 0x3A, 0xFB, 0xBC, 0x59, 0xDE, 0x9B, 0x79, -0xAF, 0x33, 0xD3, 0xBE, 0x4E, 0x67, 0x6B, 0xA1, 0x74, 0x99, -0xD2, 0x95, 0x96, 0x62, 0x8B, 0x58, 0x96, 0x4A, 0x82, 0x4D, -0x04, 0xA2, 0x80, 0x80, 0x2C, 0x2A, 0xBB, 0x10, 0xD0, 0x96, -0x88, 0xA1, 0x48, 0x8C, 0x26, 0x04, 0x13, 0xA2, 0x44, 0xB6, -0x44, 0x13, 0xB1, 0x9A, 0x80, 0x85, 0xD0, 0x52, 0x45, 0x04, -0x4C, 0xDC, 0x08, 0x5B, 0x6B, 0x89, 0x11, 0x52, 0x22, 0x4B, -0xCB, 0x56, 0x59, 0x07, 0xDA, 0xCF, 0x3B, 0x13, 0x20, 0xB2, -0x05, 0xE2, 0x6F, 0x4F, 0x72, 0xB7, 0xF7, 0x6E, 0xBE, 0x73, -0xCF, 0xF9, 0xBE, 0x7B, 0x81, 0xFF, 0xF1, 0x04, 0x28, 0xEF, -0x5F, 0x2A, 0x0A, 0x73, 0xF3, 0x0B, 0x5E, 0x96, 0xE5, 0xB4, -0x19, 0x63, 0x9F, 0x1B, 0xB9, 0xF5, 0xB5, 0x59, 0xD3, 0x1B, -0xC6, 0x3C, 0x53, 0xD1, 0x30, 0x61, 0xDC, 0x0B, 0x0D, 0x6E, -0x41, 0xCC, 0x2F, 0xCF, 0xCD, 0xD7, 0xEF, 0xFB, 0xF5, 0xE7, -0x23, 0x6C, 0x63, 0xFF, 0xD3, 0x12, 0x28, 0xEE, 0x4E, 0xBE, -0xDA, 0xDA, 0xB4, 0x76, 0xEA, 0x8C, 0xD9, 0x33, 0x7B, 0xBA, -0xFF, 0xC2, 0xE2, 0x45, 0x2B, 0xD0, 0xF8, 0xDE, 0x4A, 0x8C, -0xA8, 0xA9, 0x86, 0x56, 0xA7, 0x45, 0xD0, 0x2B, 0xA1, 0xF1, -0xFD, 0xD5, 0x38, 0xF0, 0x5D, 0x2B, 0xDA, 0x3B, 0x3B, 0x71, -0xE5, 0xCA, 0x95, 0x0E, 0x91, 0xE7, 0xCB, 0xC6, 0x4D, 0x9C, -0xDC, 0xF3, 0x54, 0x0A, 0x88, 0xE8, 0xDB, 0x50, 0x24, 0x3C, -0x6E, 0xD1, 0xC2, 0xF9, 0x98, 0xBF, 0xE0, 0x75, 0x7C, 0xD9, -0xF4, 0x19, 0x0E, 0xB7, 0x1F, 0x42, 0x67, 0xFB, 0x11, 0xD8, -0xCC, 0x02, 0x23, 0xD1, 0x61, 0xE6, 0xDC, 0x79, 0x58, 0xB1, -0xF2, 0x5D, 0xE8, 0x92, 0x00, 0xC1, 0x95, 0xE2, 0x70, 0x38, -0xB8, 0x45, 0xB9, 0x05, 0x79, 0xC3, 0xB7, 0x6F, 0xDF, 0xF1, -0x05, 0x0B, 0x71, 0xF3, 0x71, 0x04, 0x2A, 0x51, 0x14, 0xC7, -0xB0, 0xB1, 0xE2, 0x78, 0xC7, 0x61, 0xE8, 0x8C, 0x46, 0x98, -0xF5, 0x16, 0xAC, 0x5F, 0xBF, 0x21, 0xD1, 0x0E, 0xEC, 0x3F, -0x80, 0xA9, 0xD3, 0xA7, 0x61, 0xE3, 0xA6, 0xDD, 0x89, 0xCD, -0x26, 0xBD, 0x29, 0x7E, 0x18, 0xFC, 0x76, 0xF0, 0x08, 0x38, -0x5E, 0x87, 0xE9, 0x85, 0x83, 0x8B, 0x24, 0xA7, 0xE7, 0xF2, -0xA8, 0xB1, 0xB5, 0x93, 0xD8, 0xEF, 0x0D, 0x8F, 0x54, 0xA0, -0xD7, 0xD9, 0x3B, 0x16, 0x2C, 0x9C, 0x03, 0xBD, 0x91, 0xC3, -0xB9, 0xD3, 0x67, 0xC0, 0x09, 0x76, 0x9C, 0x3E, 0x75, 0x0A, -0xAD, 0xBB, 0xBE, 0x41, 0x49, 0x71, 0x29, 0xE6, 0xCC, 0x9D, -0x8B, 0x86, 0x86, 0x06, 0xD4, 0x8C, 0x1A, 0x8E, 0xA5, 0x4B, -0x96, 0xE2, 0xEC, 0xE9, 0xD3, 0x30, 0x5B, 0x0D, 0x30, 0xA8, -0x2C, 0xE8, 0xE9, 0xBD, 0x8C, 0x68, 0x41, 0x01, 0x74, 0x06, -0x43, 0x6D, 0x6B, 0x4B, 0xCB, 0x46, 0x16, 0xEF, 0xD2, 0x43, -0x39, 0x50, 0x42, 0x4B, 0x53, 0xA6, 0xBD, 0x84, 0x75, 0xEB, -0xD6, 0x25, 0x3E, 0xB4, 0xB5, 0xED, 0x81, 0xA2, 0x2F, 0x86, -0xFC, 0xC2, 0x22, 0x5C, 0xBF, 0x71, 0x13, 0xDD, 0xA7, 0xCE, -0xC0, 0xCA, 0x5B, 0x20, 0x49, 0x29, 0xB8, 0x7C, 0xE9, 0x02, -0x8E, 0xB6, 0x77, 0x80, 0xE7, 0x39, 0x24, 0x91, 0x16, 0x7D, -0xB7, 0xFA, 0x91, 0x11, 0xF6, 0xA3, 0xA3, 0xF3, 0x38, 0x72, -0x06, 0x66, 0xE3, 0xC6, 0xCD, 0xEB, 0x8A, 0x07, 0x09, 0x92, -0x86, 0x8F, 0x2C, 0x9F, 0xF8, 0xF9, 0xE6, 0xAD, 0x90, 0xFD, -0x32, 0x4E, 0x9C, 0x38, 0x8E, 0xCA, 0xCA, 0x72, 0x0C, 0xAD, -0xAA, 0x82, 0x52, 0xA9, 0x82, 0x5A, 0x45, 0xE0, 0x44, 0x3B, -0xFA, 0xFA, 0x08, 0xC7, 0x3B, 0x8F, 0xA2, 0xAB, 0xAB, 0x0B, -0xC6, 0x64, 0x1D, 0x62, 0xD7, 0x62, 0xB8, 0x41, 0x97, 0x61, -0xB1, 0x5B, 0x13, 0x41, 0x7E, 0xFA, 0x71, 0x1F, 0x4A, 0xA3, -0xE5, 0x70, 0x72, 0xDE, 0xDE, 0x87, 0x08, 0x9A, 0xB7, 0xEF, -0xDA, 0x92, 0xE1, 0x4F, 0x8B, 0x65, 0xF8, 0x22, 0x28, 0x2A, -0xAC, 0x42, 0xED, 0xE8, 0x91, 0xF8, 0x7E, 0xEF, 0x5E, 0xE8, -0xF5, 0xC9, 0xE0, 0x38, 0x07, 0x44, 0xC1, 0x05, 0xAF, 0xD7, -0x83, 0x74, 0x39, 0x02, 0x39, 0x3D, 0x00, 0xA3, 0x59, 0x09, -0x93, 0x51, 0x87, 0x48, 0x46, 0x0E, 0x53, 0xE2, 0xC0, 0xAA, -0xC6, 0x77, 0xD1, 0xF0, 0xCE, 0x6A, 0x6C, 0xD8, 0xBC, 0x09, -0xC3, 0x2A, 0xCB, 0x4C, 0x1A, 0x7D, 0xF2, 0x8C, 0xFB, 0x08, -0xE2, 0x9D, 0xDE, 0x68, 0xA8, 0xD7, 0x6A, 0x81, 0xB2, 0x92, -0x62, 0x6C, 0x6B, 0x6E, 0x43, 0xF9, 0x90, 0x21, 0x50, 0x28, -0x14, 0x98, 0x35, 0x7B, 0x16, 0xDE, 0xAE, 0xAF, 0x47, 0x3B, -0xB3, 0xA5, 0x8F, 0x62, 0x50, 0x6B, 0x14, 0x70, 0x58, 0x79, -0x5C, 0xB8, 0x78, 0x91, 0xE5, 0xA5, 0x1E, 0x2E, 0x97, 0x1B, -0x8B, 0x97, 0x2C, 0x83, 0x2A, 0x49, 0x89, 0x3F, 0xBB, 0x4E, -0x62, 0xF9, 0xF2, 0x65, 0x70, 0x5A, 0xC5, 0x8F, 0x58, 0x48, -0xF5, 0xBD, 0x1C, 0xDC, 0x9D, 0x78, 0x7D, 0x72, 0x4C, 0x74, -0xDA, 0xD4, 0x7D, 0x49, 0x0A, 0x3C, 0x5F, 0x3B, 0x16, 0x8D, -0xAB, 0x57, 0x41, 0x11, 0x53, 0xB3, 0xCA, 0xD1, 0xE3, 0x54, -0xF7, 0xC9, 0xC7, 0x55, 0x21, 0xB2, 0xB2, 0x32, 0x71, 0xF3, -0x5A, 0x3F, 0x4C, 0x66, 0x0E, 0x53, 0xA7, 0x4C, 0xC6, 0x0F, -0xFB, 0xF7, 0x60, 0xDB, 0xF6, 0x96, 0x2D, 0xBD, 0x7F, 0x9F, -0x99, 0x78, 0x4F, 0x41, 0x1C, 0x2E, 0x9E, 0x97, 0x0E, 0xFE, -0xCE, 0x2E, 0x29, 0xA9, 0xD1, 0xDC, 0xDC, 0x8C, 0x14, 0xD1, -0x85, 0xEC, 0xDC, 0x6C, 0x8C, 0xAE, 0x1D, 0x83, 0xF1, 0x2F, -0x4E, 0xC2, 0xA0, 0xCC, 0x3C, 0xB8, 0x24, 0x09, 0x0E, 0xBB, -0x1D, 0x16, 0x8B, 0x85, 0xD9, 0x23, 0xC0, 0xC5, 0xF6, 0x5C, -0x38, 0x7F, 0x0E, 0x4A, 0x4D, 0x12, 0xCE, 0xF6, 0x9C, 0xC4, -0xDC, 0x37, 0xE7, 0xE1, 0x7A, 0xEF, 0x35, 0xE4, 0x46, 0x23, -0x13, 0x1E, 0xCA, 0x45, 0xBC, 0x2B, 0x2D, 0x2C, 0x9B, 0xAC, -0xD6, 0x24, 0x53, 0x30, 0x14, 0xA2, 0x9A, 0xEA, 0x51, 0x54, -0x57, 0x5B, 0x47, 0x65, 0x85, 0x95, 0x94, 0x9F, 0x17, 0xA5, -0xEA, 0xCA, 0x6A, 0xCA, 0xCD, 0x29, 0x21, 0x97, 0x24, 0x92, -0xD3, 0xC9, 0x91, 0xD5, 0x6A, 0x23, 0x93, 0xC9, 0x48, 0x0E, -0x07, 0x4F, 0x3E, 0x9F, 0x87, 0x42, 0xC1, 0x2C, 0x8A, 0x44, -0xC2, 0x14, 0x0A, 0x67, 0x51, 0xF5, 0xD0, 0x11, 0x54, 0x54, -0xC2, 0x7C, 0x7E, 0x00, 0xAA, 0x84, 0x55, 0x5E, 0xDF, 0x4C, -0xAD, 0x5A, 0x4B, 0xA9, 0xE9, 0x11, 0xCA, 0x1C, 0x10, 0xA5, -0x57, 0x5F, 0x99, 0x46, 0xCB, 0x16, 0xBD, 0x45, 0x75, 0x75, -0x13, 0x28, 0x1A, 0x2D, 0x23, 0x59, 0xF6, 0x92, 0xCD, 0x61, -0x23, 0x1B, 0x67, 0x23, 0xA6, 0x84, 0x5C, 0x2E, 0x17, 0x79, -0x3C, 0x3E, 0x4A, 0x4F, 0x4B, 0xA3, 0x60, 0x24, 0x42, 0x81, -0xF4, 0x4C, 0x1A, 0x52, 0x5A, 0x45, 0xC5, 0x05, 0xC5, 0x6D, -0xF7, 0xE5, 0xE0, 0x0E, 0x58, 0xAA, 0x11, 0xF3, 0xF9, 0x52, -0xDF, 0x38, 0x7F, 0xBE, 0xFB, 0x03, 0x9E, 0xB7, 0xC1, 0x60, -0x70, 0x63, 0x60, 0x38, 0x13, 0xD9, 0x83, 0x07, 0xE0, 0x8F, -0x43, 0x1D, 0xF8, 0x7A, 0xE7, 0x0E, 0x66, 0x63, 0x3F, 0x6E, -0xF5, 0x5F, 0x65, 0x4F, 0x5E, 0x5C, 0x38, 0x41, 0xA7, 0x33, -0x41, 0xAB, 0xD5, 0xB1, 0xD2, 0x66, 0x6F, 0x20, 0xA9, 0x60, -0x73, 0x58, 0xC0, 0xE9, 0x4D, 0xBF, 0xEC, 0x6C, 0x6B, 0xC9, -0x7F, 0xE8, 0x62, 0x44, 0xB2, 0x22, 0xFC, 0xB1, 0x23, 0xC7, -0x2E, 0xB9, 0x05, 0x57, 0x4D, 0xF7, 0x85, 0x9E, 0x26, 0x93, -0x5E, 0x07, 0xA7, 0xCB, 0x8B, 0xBC, 0xEC, 0xC1, 0x88, 0x66, -0x47, 0xB0, 0xE6, 0x93, 0x8F, 0x71, 0xED, 0xC6, 0x55, 0xDC, -0x8E, 0xB1, 0x76, 0x9B, 0xC9, 0x56, 0xA9, 0x58, 0x70, 0x4D, -0xE2, 0xDE, 0x68, 0x34, 0xEC, 0x7C, 0x4A, 0x82, 0xD9, 0x68, -0x81, 0xCD, 0x60, 0xED, 0xDD, 0xBD, 0xB7, 0xD5, 0xF2, 0xC8, -0xCA, 0xD0, 0x6A, 0xB4, 0xBC, 0xE0, 0x72, 0x9B, 0x7C, 0x9E, -0xB4, 0x42, 0x95, 0x2A, 0xE9, 0x56, 0xB2, 0x4E, 0x43, 0x19, -0xA1, 0x81, 0x34, 0x65, 0xFC, 0x64, 0x2A, 0x1F, 0x5A, 0x43, -0x82, 0xDB, 0x43, 0x76, 0xBB, 0x95, 0xF9, 0xEF, 0x20, 0x9B, -0xCD, 0x42, 0x92, 0x24, 0x51, 0x6A, 0xAA, 0x9F, 0xD2, 0xE4, -0x74, 0xF2, 0xFB, 0x83, 0x94, 0x97, 0x9D, 0x47, 0xC5, 0x45, -0x25, 0x9F, 0x3E, 0xB6, 0xF4, 0xEE, 0x20, 0xD9, 0xEE, 0xE4, -0xA4, 0x38, 0x1F, 0xCF, 0xF3, 0x2B, 0xE3, 0x5E, 0x18, 0x8C, -0x66, 0xAA, 0x28, 0xAF, 0xA0, 0x70, 0x38, 0x44, 0x82, 0x20, -0x30, 0xFF, 0x79, 0x96, 0xF0, 0xF8, 0x28, 0x32, 0x82, 0x34, -0xF2, 0xCB, 0x7E, 0x0A, 0xB0, 0x02, 0x09, 0x85, 0x22, 0x17, -0x9F, 0x14, 0xFC, 0x2E, 0x94, 0x5A, 0xAD, 0x3A, 0x24, 0xB9, -0x45, 0x21, 0x27, 0x27, 0x1A, 0x60, 0xC9, 0x6C, 0x34, 0xE8, -0x8C, 0xC4, 0xD9, 0xB8, 0xC4, 0xE9, 0xD9, 0x45, 0x23, 0xB7, -0xDB, 0x45, 0xA2, 0xE8, 0x4D, 0x28, 0xF0, 0xC5, 0x49, 0xD2, -0x83, 0x4D, 0xE1, 0x81, 0x03, 0x4C, 0x35, 0xC3, 0x9E, 0xB5, -0x3D, 0x2D, 0x09, 0x0C, 0x7A, 0xA3, 0x9D, 0xB3, 0x99, 0xA3, -0x72, 0x6A, 0x50, 0x64, 0x4B, 0x5D, 0x4A, 0x8A, 0x94, 0xC1, -0xCA, 0x74, 0x8E, 0xD5, 0x6A, 0xFD, 0x90, 0x29, 0x59, 0x23, -0x08, 0xEE, 0xB5, 0x92, 0xE4, 0x9B, 0x1D, 0x08, 0x04, 0xF8, -0x50, 0x28, 0x2C, 0x06, 0x33, 0xB2, 0xC2, 0x4F, 0x1D, 0xFC, -0xDF, 0xB0, 0x58, 0x6D, 0xBC, 0xC7, 0x93, 0x32, 0x88, 0x59, -0x12, 0x62, 0xE5, 0xE9, 0xF0, 0x78, 0x24, 0x07, 0xB3, 0xCF, -0xCA, 0x4E, 0x6F, 0x97, 0xE5, 0x80, 0x43, 0x96, 0xE5, 0xEC, -0x60, 0x38, 0xD3, 0xFB, 0x9F, 0x82, 0x3F, 0x02, 0x5A, 0xA6, -0xC0, 0xC4, 0x71, 0x16, 0xBD, 0x20, 0x88, 0xA6, 0xB8, 0xB2, -0x47, 0x6D, 0xFA, 0x07, 0xB6, 0x5C, 0xA9, 0xA4, 0x39, 0x43, -0x02, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, -0xAE, 0x42, 0x60, 0x82 -}; - -#endif - diff --git a/Source/Core/DolphinWX/resources/toolbar_browse.c b/Source/Core/DolphinWX/resources/toolbar_browse.c deleted file mode 100644 index 1f2c0368dc..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_browse.c +++ /dev/null @@ -1,303 +0,0 @@ -static const unsigned char toolbar_browse_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x37, -0x2f, 0x30, 0x34, 0x6b, 0xeb, 0x0c, 0x3b, 0x00, 0x00, 0x0d, 0x67, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x6b, 0x6c, 0x5c, 0xd7, 0x71, -0xc7, 0x7f, 0xe7, 0xdc, 0xe7, 0x3e, 0xb9, 0x94, 0x44, 0xbd, 0x2c, 0x59, -0xb4, 0x1d, 0x07, 0xae, 0x15, 0xcb, 0x8c, 0x1b, 0x07, 0x89, 0xfb, 0x30, -0x8d, 0xe6, 0x4b, 0x01, 0x07, 0x16, 0x90, 0x0f, 0xaa, 0x11, 0xb4, 0x92, -0x11, 0x34, 0xfa, 0x50, 0xa0, 0x56, 0x9a, 0xf6, 0x83, 0xe1, 0xc6, 0xa2, -0x13, 0xa4, 0x89, 0x61, 0x3b, 0xb6, 0xf3, 0x4d, 0x42, 0x52, 0x4b, 0x49, -0x1c, 0x47, 0x68, 0x0b, 0xdb, 0x40, 0xd1, 0x3a, 0x68, 0x0a, 0x33, 0x45, -0x5a, 0xa7, 0x8e, 0x1f, 0xb4, 0x1d, 0xcb, 0x0f, 0x89, 0x12, 0x25, 0x5a, -0xa4, 0x44, 0x8a, 0xe2, 0x63, 0x49, 0xee, 0xee, 0xbd, 0xf7, 0xcc, 0xf4, -0xc3, 0x5d, 0x52, 0x0f, 0x4b, 0xa2, 0x02, 0xb1, 0x2d, 0x32, 0xc0, 0xe1, -0x1e, 0xec, 0xf2, 0x9e, 0xf9, 0xff, 0xcf, 0xcc, 0x9c, 0x33, 0x33, 0xbb, -0x46, 0x55, 0xf9, 0x6d, 0x16, 0xfb, 0xff, 0x0d, 0xe0, 0x6a, 0xc5, 0xff, -0xdf, 0x58, 0xf4, 0x5f, 0xbf, 0x65, 0x6a, 0x22, 0x3c, 0x29, 0xc2, 0x76, -0x11, 0x10, 0x61, 0x40, 0x94, 0xaf, 0x7c, 0xe1, 0xeb, 0xda, 0xbf, 0xdc, -0xba, 0xcc, 0x72, 0xbb, 0xd0, 0x4f, 0x1f, 0x31, 0x35, 0x11, 0x5e, 0x12, -0xa1, 0x47, 0x04, 0x44, 0xa1, 0x4d, 0x02, 0x11, 0xee, 0x7b, 0xe7, 0x10, -0xfb, 0xfa, 0x0e, 0x2c, 0x9f, 0xce, 0x65, 0x77, 0x21, 0x03, 0x4f, 0x1b, -0xe8, 0x31, 0x06, 0xe2, 0xb2, 0x21, 0x8a, 0xcc, 0xb9, 0x1f, 0x3e, 0xfd, -0x3b, 0x1f, 0x63, 0x2b, 0xec, 0x5d, 0x3e, 0x7d, 0xcb, 0x69, 0x81, 0x9f, -0x3d, 0x6a, 0xee, 0x17, 0xe1, 0x49, 0x51, 0xe8, 0xea, 0x36, 0x74, 0xac, -0xb6, 0x64, 0x2d, 0xc3, 0x89, 0xc3, 0xca, 0xd4, 0xb8, 0x20, 0xaa, 0x88, -0x30, 0x25, 0xc2, 0x75, 0xf7, 0x7e, 0x4b, 0xa7, 0x96, 0x43, 0xe7, 0xb2, -0x59, 0xe0, 0xa5, 0xc7, 0x4d, 0x0d, 0x43, 0x1f, 0x06, 0x56, 0x6c, 0x30, -0x6c, 0xd8, 0x72, 0x17, 0xd7, 0xff, 0xe1, 0xbf, 0xd0, 0xfd, 0xfb, 0xdf, -0xe3, 0xda, 0x5b, 0x36, 0x11, 0x95, 0x3c, 0xc0, 0x00, 0xd4, 0x80, 0xfb, -0x97, 0xcb, 0x0a, 0xcb, 0x46, 0x40, 0xe1, 0x69, 0x94, 0x5a, 0x10, 0xc1, -0x35, 0xb7, 0xdc, 0xc4, 0x9a, 0x9b, 0x1f, 0xc1, 0xfa, 0x1d, 0xc4, 0x95, -0x1b, 0xd9, 0xf8, 0xbb, 0x7d, 0xac, 0xd9, 0x54, 0xc0, 0xd8, 0x45, 0x75, -0xbb, 0x86, 0x0e, 0x7e, 0xb0, 0x2c, 0x7a, 0x97, 0x85, 0x40, 0xff, 0x13, -0xa6, 0x17, 0xd8, 0x0a, 0x70, 0x6d, 0x0f, 0x74, 0xdd, 0xf8, 0x30, 0xf9, -0x01, 0xe7, 0x33, 0x7d, 0xea, 0x75, 0x8e, 0xfc, 0xea, 0x51, 0x2a, 0xab, -0x2a, 0x94, 0x3a, 0x42, 0x30, 0xb9, 0x15, 0xfe, 0x73, 0xff, 0xe3, 0xf7, -0x2c, 0x87, 0x15, 0x96, 0x85, 0x80, 0x2a, 0xbb, 0x55, 0xa1, 0xdc, 0x05, -0x6b, 0x37, 0xff, 0x05, 0x61, 0x71, 0x33, 0xe0, 0xd3, 0xac, 0x1f, 0x67, -0x68, 0xe0, 0xbb, 0x38, 0xb1, 0x88, 0xad, 0xd1, 0xb5, 0xb1, 0x82, 0x35, -0x8b, 0x27, 0xf7, 0xd6, 0xe5, 0xd0, 0x7d, 0xd5, 0x04, 0xfa, 0x9f, 0x30, -0xbd, 0x28, 0xbd, 0x00, 0x1b, 0x7b, 0xaa, 0x14, 0x57, 0x7c, 0x89, 0x85, -0xdd, 0x1f, 0x3e, 0xf8, 0x14, 0x4a, 0x08, 0xb6, 0x00, 0xb6, 0x4a, 0xa5, -0xab, 0x83, 0xb8, 0x12, 0xa2, 0x18, 0x14, 0xb6, 0x8e, 0x0d, 0x8f, 0x5c, -0xad, 0xfa, 0xab, 0x27, 0xa0, 0xca, 0x6e, 0x51, 0x08, 0x4a, 0xd0, 0x75, -0xc3, 0x97, 0x30, 0x76, 0x05, 0xe0, 0x33, 0x31, 0xfc, 0xf7, 0x34, 0x67, -0x8f, 0x81, 0x09, 0xc0, 0xc6, 0xe0, 0x95, 0xc0, 0xab, 0xd1, 0xb9, 0xb6, -0x84, 0xb5, 0x1e, 0x28, 0xb5, 0x17, 0x9f, 0x7a, 0xb8, 0xe7, 0x6a, 0xdd, -0xe8, 0xaa, 0x08, 0xbc, 0xf4, 0x1d, 0xd3, 0xab, 0x4a, 0xaf, 0x2a, 0x74, -0xdf, 0xde, 0x41, 0x50, 0xde, 0x09, 0xf8, 0x88, 0x9b, 0x67, 0xfa, 0xd4, -0x01, 0x8c, 0xb5, 0x18, 0xeb, 0x61, 0xbd, 0x00, 0xeb, 0x17, 0xb0, 0x7e, -0x95, 0x55, 0x1b, 0x6a, 0x18, 0x7f, 0xd1, 0x8d, 0x6e, 0xbd, 0x2a, 0xf4, -0xfc, 0x86, 0xa9, 0x44, 0xff, 0x77, 0x4c, 0x2f, 0x50, 0x53, 0xe8, 0x41, -0x41, 0x94, 0x3b, 0x55, 0xc1, 0x0b, 0x61, 0xfd, 0xe6, 0x3f, 0xc6, 0x98, -0x15, 0x80, 0x63, 0x7e, 0x72, 0x3f, 0xe8, 0x0c, 0xc6, 0xab, 0x61, 0x14, -0x8c, 0xb5, 0x78, 0x9e, 0x8f, 0x31, 0x05, 0x82, 0x42, 0x99, 0x4a, 0x2d, -0xe6, 0x4c, 0xa3, 0x85, 0xa2, 0x3b, 0x9e, 0xfe, 0xab, 0x9d, 0x9d, 0x22, -0x3b, 0x07, 0x44, 0x98, 0xfa, 0xf3, 0xef, 0xea, 0x00, 0x40, 0xdf, 0x36, -0x73, 0x9e, 0xde, 0xcb, 0xdd, 0xdc, 0x97, 0xbd, 0xc8, 0x7e, 0xf6, 0xa8, -0xe9, 0x31, 0x86, 0x1d, 0xc0, 0x9d, 0xc6, 0xd0, 0xb3, 0xf0, 0xfe, 0xc2, -0x23, 0xaa, 0xf9, 0xd8, 0xd0, 0x03, 0x37, 0x7d, 0xee, 0x17, 0x18, 0x7b, -0x33, 0x2a, 0x67, 0x98, 0x18, 0xba, 0x9d, 0xb9, 0x69, 0x47, 0x63, 0xbe, -0x46, 0x96, 0xae, 0xc4, 0x8f, 0x56, 0xe2, 0x07, 0x45, 0xac, 0x51, 0xc8, -0x26, 0x38, 0x3d, 0x74, 0x94, 0x0f, 0xde, 0x18, 0x27, 0x4b, 0xb3, 0x0b, -0x53, 0x8d, 0x85, 0xbc, 0xe9, 0x4d, 0x11, 0x06, 0x44, 0x78, 0xde, 0x16, -0x57, 0x0f, 0xc5, 0xc5, 0x02, 0x23, 0x47, 0x8e, 0x5d, 0x94, 0xcc, 0x45, -0x2d, 0xf0, 0xe2, 0xb7, 0xcd, 0x0e, 0x63, 0xd8, 0x6d, 0xa0, 0xdb, 0x18, -0xc0, 0x80, 0x39, 0xe7, 0x39, 0x6d, 0xff, 0x51, 0xcd, 0xe7, 0x1b, 0x7b, -0xb6, 0x60, 0xec, 0x27, 0x01, 0x47, 0x96, 0xbc, 0x08, 0xcc, 0xe0, 0xf9, -0x05, 0x7c, 0x3f, 0x03, 0x4d, 0x30, 0xb4, 0x40, 0xbd, 0xfc, 0x08, 0x35, -0x96, 0x8e, 0xae, 0x02, 0x7e, 0x18, 0x21, 0x02, 0x9a, 0xb9, 0xb3, 0x0b, -0xe5, 0xd2, 0x83, 0xd2, 0x83, 0xb2, 0x1d, 0x78, 0x22, 0x9b, 0x1d, 0x1b, -0x98, 0x99, 0x61, 0x7f, 0x31, 0x66, 0xdf, 0xa7, 0xef, 0xbe, 0x7b, 0x2a, -0x8f, 0x99, 0x2f, 0x5f, 0xdc, 0x02, 0x7d, 0xdb, 0x0c, 0xb7, 0x6f, 0xe1, -0x39, 0x63, 0xd8, 0x6a, 0x4c, 0x5b, 0x9f, 0x81, 0x6a, 0x17, 0x94, 0x56, -0x40, 0x5c, 0x85, 0x4a, 0x17, 0xc4, 0xd5, 0xdf, 0xa3, 0xb2, 0xc6, 0x60, -0x3d, 0x83, 0xb1, 0x9d, 0x60, 0xfe, 0x12, 0x63, 0xff, 0x00, 0x48, 0x69, -0x4c, 0x7c, 0x86, 0x46, 0xfd, 0x20, 0x49, 0x23, 0xa6, 0xd5, 0x28, 0x92, -0x26, 0x1d, 0x60, 0x6b, 0x18, 0x53, 0xc0, 0x5a, 0x8b, 0x71, 0x4d, 0x34, -0x9d, 0x42, 0x9a, 0x93, 0x04, 0xd1, 0x6a, 0x20, 0x60, 0xae, 0x9e, 0x31, -0x3b, 0x7e, 0x8a, 0x99, 0xf1, 0x71, 0xea, 0xb3, 0x86, 0xb9, 0xa6, 0x61, -0x6e, 0xde, 0x30, 0xdf, 0x50, 0x44, 0x14, 0x27, 0x20, 0x4e, 0xa7, 0x44, -0x78, 0xf8, 0xde, 0x07, 0xbe, 0xfa, 0x64, 0xf7, 0xcd, 0x8f, 0x7d, 0x94, -0x40, 0xdf, 0x36, 0xc3, 0x6d, 0x9f, 0x60, 0xb7, 0x31, 0xf4, 0x59, 0x03, -0x61, 0xd1, 0xb0, 0xee, 0x63, 0xb0, 0xea, 0xba, 0xf5, 0x94, 0x57, 0x7f, -0x8e, 0xb0, 0x74, 0x07, 0x41, 0xe1, 0x0e, 0x8c, 0x5d, 0xd5, 0x36, 0x5c, -0x70, 0xc1, 0x48, 0x11, 0xf7, 0x1a, 0x8d, 0xf1, 0xcf, 0x92, 0xb4, 0x2c, -0x59, 0x2b, 0x20, 0x69, 0x46, 0x64, 0x69, 0x09, 0x91, 0x32, 0x86, 0x08, -0x55, 0x83, 0x91, 0x0c, 0x49, 0xe7, 0xd1, 0x64, 0x8e, 0x35, 0x9b, 0xef, -0xa7, 0xbc, 0xf6, 0x36, 0x20, 0x5d, 0x1c, 0x73, 0xa7, 0x8f, 0x30, 0x37, -0x71, 0x9c, 0xe9, 0x91, 0xc3, 0x8c, 0x0d, 0x1e, 0x64, 0x62, 0xbc, 0xce, -0xd0, 0xf1, 0x84, 0xc6, 0x7c, 0x86, 0x88, 0x22, 0xc2, 0xbe, 0x07, 0x9f, -0xd9, 0x73, 0xdf, 0x82, 0x15, 0xce, 0x23, 0xf0, 0xc9, 0x9b, 0x99, 0x34, -0x86, 0x5a, 0x47, 0x97, 0x65, 0xe3, 0x96, 0x2a, 0xab, 0x3f, 0xfe, 0x55, -0xca, 0x5d, 0x5b, 0x2f, 0x01, 0x38, 0x40, 0xb2, 0x97, 0xdb, 0x9f, 0x19, -0x54, 0x26, 0x49, 0xe7, 0x9f, 0x22, 0x6d, 0xfc, 0x02, 0xd7, 0x32, 0x64, -0xa9, 0x47, 0x96, 0x04, 0x64, 0x49, 0x84, 0x4a, 0x84, 0x48, 0x00, 0x62, -0xd0, 0xcc, 0x21, 0x59, 0x82, 0x24, 0x2d, 0xc2, 0xd2, 0xc7, 0x29, 0x76, -0x7d, 0x8a, 0xb8, 0xba, 0x11, 0x11, 0x87, 0x8a, 0x23, 0xaa, 0x74, 0x12, -0x57, 0x2b, 0x80, 0x03, 0xe0, 0xe4, 0x7b, 0xaf, 0xf2, 0xe1, 0xab, 0x3f, -0xe5, 0xad, 0x81, 0x31, 0x4e, 0x9d, 0x6a, 0xe1, 0x9c, 0x22, 0xca, 0x5d, -0x0f, 0x3d, 0x9b, 0xd7, 0x16, 0xfe, 0x02, 0x78, 0x00, 0x51, 0x6a, 0x06, -0xc3, 0xea, 0x6e, 0x8f, 0xb5, 0x37, 0x3f, 0x42, 0xb1, 0xf3, 0x53, 0x0b, -0x1e, 0x4f, 0xd6, 0x3a, 0x41, 0x63, 0xe6, 0x3f, 0xc8, 0x5a, 0xaf, 0x90, -0xb5, 0xfe, 0x0b, 0xeb, 0x4f, 0xe3, 0x07, 0x82, 0xb5, 0x8a, 0xb1, 0xed, -0x88, 0x16, 0x50, 0x97, 0xcf, 0x0d, 0x82, 0x25, 0xc3, 0x33, 0x8a, 0xe0, -0x40, 0x3d, 0xc4, 0x81, 0x3a, 0x41, 0x52, 0x87, 0x4b, 0x1d, 0x33, 0x27, -0xdf, 0x62, 0x62, 0xe8, 0x4d, 0x92, 0x96, 0x25, 0x49, 0x7c, 0x32, 0x17, -0xa3, 0xb6, 0x8c, 0x1f, 0x95, 0xe8, 0x58, 0xbb, 0x91, 0x4a, 0xd7, 0x1a, -0x3a, 0x56, 0xaf, 0xe1, 0xc6, 0xbb, 0xfe, 0x84, 0xb4, 0xf9, 0x7d, 0xc6, -0xc6, 0x53, 0xd4, 0x39, 0x54, 0xb9, 0x13, 0x38, 0x4b, 0x00, 0x60, 0xc5, -0xda, 0xd5, 0xa8, 0x8e, 0xe5, 0xc1, 0x89, 0x47, 0xb1, 0x73, 0x0b, 0xa0, -0xb8, 0x6c, 0x96, 0x93, 0x87, 0xbe, 0xc7, 0xcc, 0xe9, 0x7f, 0xc3, 0xf3, -0x1c, 0x9e, 0x9f, 0xe1, 0x05, 0x42, 0x10, 0x14, 0xf1, 0xc3, 0x0c, 0x3f, -0x70, 0x58, 0xcf, 0x61, 0x8d, 0x00, 0x8a, 0x3a, 0xcd, 0x81, 0x8a, 0x82, -0x3a, 0x0c, 0x8a, 0xc1, 0x61, 0xc4, 0xa2, 0x19, 0x48, 0x0a, 0x59, 0x0a, -0x69, 0x4b, 0x49, 0x5b, 0x96, 0x24, 0xf5, 0xc8, 0x5c, 0x80, 0xd3, 0x18, -0xf5, 0x8b, 0x78, 0x51, 0x95, 0xa0, 0x58, 0x21, 0x73, 0x4a, 0x7d, 0x62, -0x9c, 0xb9, 0x89, 0x13, 0x68, 0x6b, 0x9a, 0x20, 0x0c, 0xf2, 0x80, 0xcc, -0xf7, 0x73, 0x31, 0x15, 0x5f, 0x24, 0xe0, 0xf9, 0x1e, 0x22, 0xf4, 0x1b, -0x43, 0x6f, 0x7d, 0x12, 0x26, 0x86, 0x5e, 0x60, 0x65, 0xf7, 0x17, 0x18, -0x7a, 0xe3, 0x51, 0x66, 0xa7, 0x0f, 0x61, 0x6d, 0x8d, 0xcc, 0x09, 0x5e, -0x96, 0x61, 0xb3, 0x94, 0x2c, 0x4b, 0x08, 0xb2, 0x84, 0x20, 0x4c, 0xf0, -0x83, 0x04, 0xcf, 0x66, 0x18, 0xe3, 0x40, 0x04, 0x71, 0x8a, 0x66, 0x8a, -0x4a, 0x7b, 0x64, 0xe0, 0x32, 0x90, 0xcc, 0x90, 0x25, 0x96, 0xac, 0x69, -0x48, 0x5a, 0x3e, 0x69, 0x16, 0x90, 0xba, 0x08, 0x31, 0x05, 0x4c, 0x5c, -0x24, 0x08, 0x2b, 0x84, 0x85, 0x32, 0x51, 0xa9, 0x4c, 0x18, 0x85, 0x18, -0x23, 0x90, 0x29, 0xae, 0xe5, 0x98, 0x98, 0x4c, 0xf3, 0x75, 0x73, 0x03, -0xf7, 0x9f, 0x47, 0xa0, 0xef, 0x80, 0xb2, 0xf7, 0x81, 0x6e, 0x44, 0x19, -0x30, 0x68, 0xef, 0xe8, 0xa0, 0xa3, 0x58, 0xdd, 0x4b, 0xd2, 0xac, 0x33, -0x37, 0x7d, 0x14, 0x6b, 0x2b, 0x60, 0x7d, 0x30, 0x06, 0x51, 0x87, 0xba, -0x14, 0x68, 0x81, 0xce, 0x63, 0xb4, 0x01, 0xda, 0x00, 0xaf, 0x99, 0x9f, -0xf3, 0xaa, 0xb9, 0x22, 0x07, 0x92, 0x81, 0x64, 0xb9, 0x45, 0x24, 0x03, -0x97, 0x1a, 0xb2, 0xd4, 0xd0, 0x4a, 0x03, 0xd2, 0x2c, 0x22, 0xd3, 0x02, -0xf8, 0x45, 0xac, 0x57, 0xc6, 0x0f, 0xcb, 0x84, 0xc5, 0x32, 0x61, 0xa1, -0x48, 0x10, 0x45, 0x58, 0x0b, 0xb8, 0x26, 0xce, 0x35, 0x69, 0xd6, 0xa7, -0x79, 0xf7, 0xdd, 0x79, 0x44, 0x04, 0x55, 0x86, 0xfa, 0x0e, 0xec, 0x79, -0xf3, 0x23, 0x16, 0x18, 0x39, 0x72, 0x8c, 0xea, 0x0d, 0x3c, 0x6f, 0x0c, -0xbb, 0x92, 0x24, 0xe3, 0xe8, 0xaf, 0xe7, 0x51, 0xfe, 0x09, 0xbf, 0xb8, -0x0a, 0xf1, 0x3c, 0xac, 0x57, 0xc0, 0xd8, 0x00, 0x63, 0x0d, 0x18, 0x87, -0xd1, 0x26, 0x4a, 0x84, 0x53, 0x1f, 0x9b, 0x81, 0xa8, 0x03, 0xe3, 0x00, -0x87, 0x64, 0x2c, 0x12, 0x50, 0x77, 0x76, 0xee, 0x32, 0x43, 0x9a, 0x7a, -0x64, 0x59, 0x80, 0xd3, 0x22, 0x78, 0x15, 0xbc, 0xa0, 0x42, 0x10, 0x57, -0x09, 0x0a, 0x25, 0xc2, 0x28, 0xc6, 0x0f, 0x03, 0xac, 0x69, 0x83, 0x6f, -0x4d, 0x31, 0x3b, 0x3e, 0xc2, 0x6b, 0xaf, 0x9e, 0x66, 0x7e, 0xae, 0x85, -0x88, 0x02, 0xec, 0xe2, 0x1c, 0x39, 0x2f, 0x17, 0x8a, 0x37, 0x7c, 0xf6, -0xe7, 0xaa, 0xf4, 0x8b, 0x53, 0x1a, 0xb3, 0x2d, 0x8e, 0x0c, 0x4c, 0xd3, -0x9c, 0x99, 0x20, 0xb0, 0x33, 0x58, 0x93, 0x60, 0x3d, 0x8b, 0x17, 0xc4, -0x04, 0x61, 0x11, 0x3f, 0x2c, 0xe3, 0x79, 0x65, 0xac, 0x29, 0xe6, 0xa7, -0x8c, 0xf3, 0x11, 0x67, 0x91, 0xd4, 0x22, 0x69, 0x7b, 0xf7, 0xdd, 0x39, -0xa3, 0x4d, 0x40, 0x9c, 0x87, 0x12, 0x83, 0x57, 0xc4, 0x8f, 0xaa, 0x44, -0xa5, 0x1a, 0x51, 0xa9, 0x42, 0x5c, 0x2c, 0x11, 0x44, 0x21, 0x16, 0x87, -0xa6, 0x75, 0xd2, 0xfa, 0x28, 0xe3, 0xc7, 0x86, 0xf8, 0xef, 0x97, 0x47, -0x99, 0x3c, 0x3d, 0x87, 0x73, 0x02, 0xca, 0xbe, 0xdd, 0x3f, 0xd9, 0xf3, -0xc2, 0x45, 0x09, 0xf4, 0x1d, 0x50, 0xd2, 0x56, 0x82, 0x08, 0xbb, 0x54, -0x99, 0x12, 0xa7, 0x34, 0x1b, 0x4d, 0x0e, 0xbf, 0x71, 0x86, 0x13, 0xef, -0x9e, 0x80, 0xd6, 0x28, 0x56, 0xcf, 0x60, 0x69, 0x60, 0x11, 0xac, 0x35, -0x58, 0x6b, 0x81, 0xbc, 0x54, 0x54, 0x97, 0x03, 0x77, 0xa9, 0xb6, 0x5d, -0xe7, 0x82, 0x21, 0x06, 0x71, 0x06, 0x55, 0x0f, 0x8c, 0x8f, 0xf5, 0x22, -0xfc, 0x30, 0x26, 0x88, 0x63, 0xc2, 0x28, 0xc4, 0xb3, 0x8a, 0x71, 0xf3, -0xb8, 0xb9, 0x31, 0xe6, 0x4e, 0x1d, 0xe1, 0x9d, 0x57, 0x07, 0x79, 0xe5, -0x97, 0xa3, 0xd4, 0xa7, 0xe7, 0x70, 0xb9, 0xeb, 0x0c, 0xe8, 0xe2, 0xee, -0x5f, 0xe2, 0x26, 0x06, 0x78, 0xe7, 0x97, 0x3b, 0x19, 0x78, 0x6e, 0xef, -0x76, 0x0c, 0xfb, 0x16, 0x52, 0x2a, 0xeb, 0x79, 0x78, 0x61, 0xc4, 0x9a, -0xee, 0x2a, 0x6b, 0xaf, 0x5b, 0x49, 0x50, 0xac, 0x60, 0x6c, 0x88, 0x41, -0x30, 0xcc, 0x62, 0x64, 0x1a, 0x64, 0x06, 0x5c, 0x03, 0x95, 0x16, 0xe2, -0xa4, 0x1d, 0xc0, 0x67, 0x5d, 0x28, 0x4b, 0x0c, 0x49, 0xe2, 0x93, 0x64, -0x25, 0x9c, 0x56, 0xc0, 0xef, 0x24, 0x2a, 0xad, 0x24, 0x88, 0x8b, 0x78, -0x56, 0x21, 0x6b, 0xd0, 0xaa, 0x4f, 0x72, 0xec, 0xc8, 0x38, 0xc7, 0x8e, -0x4c, 0xd1, 0x6a, 0x34, 0x49, 0x33, 0x97, 0x5b, 0x4f, 0x19, 0x50, 0xa1, -0xf7, 0xa1, 0x9f, 0xec, 0x99, 0x3e, 0x17, 0xfc, 0x45, 0x09, 0x00, 0xf4, -0xff, 0xc3, 0xe7, 0xf9, 0xf0, 0x57, 0xff, 0x7c, 0x4f, 0x9b, 0x44, 0x8d, -0x73, 0x89, 0x04, 0x31, 0xab, 0xae, 0x29, 0xb2, 0x62, 0x5d, 0x99, 0xda, -0x9a, 0x02, 0x46, 0x53, 0x54, 0xe6, 0x40, 0xe6, 0x91, 0xb4, 0x89, 0xb8, -0x0c, 0x75, 0x9a, 0x27, 0x7c, 0x92, 0xe7, 0x38, 0x2a, 0x8a, 0x4b, 0x21, -0x4d, 0x7c, 0x52, 0x57, 0x44, 0x4c, 0x15, 0xbc, 0x0e, 0x82, 0x62, 0x27, -0x81, 0xef, 0x31, 0x73, 0x66, 0x92, 0xb1, 0x91, 0xd3, 0x8c, 0x0c, 0xcf, -0xd0, 0x9c, 0x6f, 0x90, 0x26, 0x59, 0x7e, 0xad, 0xe4, 0x7d, 0xa5, 0x01, -0x11, 0x7a, 0x1f, 0x7a, 0xf6, 0xa3, 0xe0, 0x2f, 0x49, 0x20, 0x97, 0xbd, -0xfc, 0xe0, 0x6f, 0x76, 0x6e, 0x32, 0xb0, 0x0f, 0xf2, 0x8a, 0x0b, 0x03, -0x28, 0x58, 0xcf, 0xa7, 0x63, 0x75, 0x89, 0x2d, 0x77, 0x74, 0x21, 0xd9, -0x2c, 0x92, 0xb5, 0x70, 0x2e, 0xc5, 0xa5, 0x0e, 0x97, 0x29, 0x22, 0x06, -0xd4, 0xe4, 0x97, 0x99, 0x51, 0x10, 0x87, 0x3a, 0x21, 0x4d, 0x3c, 0x32, -0x57, 0x40, 0x28, 0x83, 0x5f, 0xc5, 0x8b, 0xaa, 0xf8, 0x1e, 0x1c, 0x7a, -0x67, 0x94, 0x91, 0xe3, 0x63, 0xb4, 0x9a, 0xad, 0x45, 0xe0, 0xed, 0xd7, -0x7d, 0xa2, 0xec, 0xfa, 0xda, 0x8f, 0x2f, 0x0e, 0x7e, 0x09, 0x02, 0x67, -0x89, 0xec, 0xff, 0xeb, 0x9d, 0x77, 0x02, 0x3b, 0xc8, 0xeb, 0xd8, 0x9a, -0xb1, 0x96, 0x5b, 0xee, 0xd8, 0xc4, 0xad, 0x77, 0xef, 0x65, 0x76, 0xec, -0x65, 0xce, 0x1c, 0xfd, 0x47, 0x66, 0x27, 0x0e, 0x93, 0x65, 0x16, 0x27, -0x3e, 0xe0, 0x61, 0x8c, 0xc5, 0x1a, 0xc1, 0x23, 0xc3, 0x68, 0x0a, 0x2e, -0x25, 0x4d, 0xc0, 0xb9, 0x10, 0x67, 0x4a, 0x60, 0x2b, 0xd8, 0xb0, 0x8c, -0xef, 0x5b, 0x26, 0xc7, 0x4e, 0xf3, 0xf6, 0xc0, 0x79, 0x04, 0x86, 0x44, -0xd9, 0xf5, 0xe0, 0x8f, 0xf6, 0xbc, 0x70, 0x29, 0xe0, 0x8b, 0x5e, 0xb1, -0x04, 0x7a, 0xe0, 0xcb, 0x6c, 0x7f, 0x4c, 0x7f, 0xbe, 0xfd, 0xb1, 0x3d, -0xf7, 0x2d, 0xe4, 0xec, 0xd6, 0x28, 0x9b, 0xb6, 0x7c, 0x1e, 0xeb, 0xc7, -0x54, 0xd7, 0xdf, 0x45, 0xd2, 0xc8, 0x68, 0x36, 0x3c, 0x9a, 0xad, 0x98, -0x56, 0x52, 0x26, 0x75, 0x1d, 0x08, 0x1d, 0x28, 0x55, 0x44, 0x4b, 0x88, -0x44, 0x88, 0xf8, 0xed, 0x98, 0x10, 0x34, 0x75, 0x48, 0x96, 0xe6, 0x43, -0xa0, 0x5a, 0x0d, 0x09, 0xa3, 0x76, 0x4e, 0x95, 0x5f, 0x25, 0x4f, 0x5e, -0x09, 0xf8, 0x2b, 0x24, 0x90, 0xcb, 0xf7, 0x77, 0xed, 0xec, 0x51, 0xa5, -0x26, 0x02, 0x6b, 0xaf, 0x29, 0xd1, 0xb1, 0xf1, 0x8f, 0x80, 0x94, 0xfa, -0xd8, 0x6b, 0x4c, 0x9e, 0x3c, 0x46, 0xab, 0x15, 0x93, 0xb9, 0x0a, 0x6a, -0x6b, 0xd8, 0x70, 0x25, 0x26, 0x5c, 0x85, 0x09, 0x3a, 0x51, 0xaf, 0x8c, -0x52, 0x40, 0x24, 0x40, 0xc5, 0xe6, 0x97, 0x9c, 0x38, 0x54, 0x04, 0x11, -0x87, 0x13, 0x30, 0x7e, 0xcc, 0xda, 0x75, 0x05, 0x8c, 0xf5, 0xf2, 0xb0, -0x51, 0x7a, 0xaf, 0xb4, 0x6f, 0x74, 0xc5, 0x04, 0x44, 0xd9, 0xee, 0xda, -0xcd, 0xda, 0x1b, 0x6e, 0xfb, 0x0c, 0x5e, 0x10, 0x03, 0x29, 0xc7, 0x5f, -0x7f, 0x86, 0x24, 0x29, 0x90, 0x69, 0x19, 0xfc, 0x1a, 0x61, 0x61, 0x15, -0x61, 0x69, 0x25, 0x51, 0xb1, 0x13, 0x2f, 0xac, 0x62, 0xfd, 0x12, 0x98, -0x18, 0xd5, 0x10, 0xc9, 0xbc, 0xfc, 0x52, 0x13, 0x45, 0x55, 0x72, 0x5f, -0xc7, 0x82, 0x5f, 0x64, 0xdd, 0xfa, 0x2a, 0x36, 0x08, 0xd0, 0x5c, 0xc7, -0xd6, 0x1f, 0x7c, 0xe3, 0xf1, 0xda, 0x95, 0x14, 0xfc, 0x4b, 0xd6, 0xc4, -0x0b, 0x99, 0xea, 0xfa, 0xd5, 0x79, 0x1f, 0xa7, 0x56, 0x83, 0x6b, 0x7a, -0xee, 0x05, 0x52, 0xa6, 0x47, 0xdf, 0xe5, 0xf4, 0x87, 0xc7, 0x50, 0xaf, -0x8a, 0x17, 0xd6, 0x08, 0x8b, 0x9d, 0x44, 0xe5, 0x6a, 0x9e, 0xc7, 0x68, -0x4a, 0x26, 0x09, 0x99, 0x5a, 0x54, 0xfd, 0xdc, 0x02, 0x78, 0x08, 0x20, -0x6a, 0x40, 0x0c, 0xa8, 0x45, 0xf1, 0xc0, 0x8b, 0x89, 0xca, 0x55, 0xd6, -0xad, 0x9b, 0x66, 0x68, 0x30, 0x41, 0x33, 0x87, 0x2a, 0xf7, 0x00, 0xfb, -0x97, 0xc2, 0x77, 0x59, 0x0b, 0x2c, 0x80, 0x5f, 0xbb, 0x8a, 0x1e, 0x11, -0xba, 0x45, 0x0d, 0x37, 0xf6, 0x6c, 0x21, 0x2c, 0x77, 0x02, 0x29, 0xc3, -0x6f, 0xff, 0x3b, 0xea, 0xd5, 0xf0, 0xe3, 0x95, 0xc4, 0xa5, 0x95, 0x14, -0x2a, 0x9d, 0xc4, 0xa5, 0x0a, 0x41, 0x14, 0x63, 0x8d, 0xa3, 0x7e, 0x66, -0x8a, 0x99, 0x89, 0x59, 0x54, 0x04, 0x35, 0x1e, 0x6a, 0x02, 0xc4, 0x84, -0x28, 0xf9, 0xab, 0xf1, 0x42, 0x8c, 0x1f, 0x63, 0xc3, 0x02, 0x36, 0xaa, -0x71, 0xed, 0xa6, 0x1a, 0xd6, 0x0f, 0x16, 0xe2, 0x60, 0xc7, 0x52, 0xe0, -0x97, 0x24, 0x00, 0x50, 0xeb, 0x5a, 0x89, 0x28, 0x77, 0x8a, 0x42, 0x18, -0x5a, 0xd6, 0x6f, 0xee, 0x05, 0x32, 0x9a, 0xf5, 0x71, 0x26, 0x46, 0x86, -0x09, 0x8a, 0xab, 0x88, 0x2b, 0x2b, 0x28, 0x54, 0x6b, 0xc4, 0xa5, 0x12, -0x41, 0xe0, 0x63, 0x24, 0x25, 0x9d, 0x3d, 0xcd, 0xd1, 0xf7, 0x47, 0x38, -0xfc, 0xde, 0x38, 0x59, 0xd2, 0xc8, 0x41, 0x99, 0x30, 0xef, 0x11, 0xf9, -0x05, 0x4c, 0x50, 0xc0, 0x86, 0x05, 0xbc, 0xa8, 0x80, 0x1f, 0x16, 0xf0, -0xe2, 0x0a, 0xd5, 0x95, 0x35, 0xaa, 0x1d, 0x31, 0xed, 0x26, 0x70, 0x6f, -0xdf, 0xb6, 0x9d, 0xdd, 0x57, 0x4d, 0x20, 0x88, 0x42, 0x44, 0xd8, 0x21, -0x6a, 0x58, 0xb7, 0xa1, 0x83, 0x35, 0x37, 0x7d, 0x1a, 0x48, 0x19, 0x79, -0xff, 0x15, 0xa2, 0xca, 0x2a, 0x0a, 0xd5, 0x1c, 0x7c, 0x54, 0x28, 0xe2, -0xf9, 0x1e, 0x2a, 0x4d, 0xd2, 0xfa, 0x28, 0x47, 0xdf, 0x1b, 0x66, 0xe2, -0xd4, 0x19, 0x66, 0xa6, 0xea, 0x0c, 0x1e, 0xaa, 0x83, 0x24, 0xa8, 0xf1, -0xc0, 0x8b, 0x30, 0x7e, 0x11, 0x2f, 0x28, 0x12, 0x44, 0x25, 0xc2, 0xb8, -0x44, 0x10, 0x17, 0x09, 0x0b, 0x45, 0xfc, 0x42, 0x95, 0xeb, 0xae, 0x2f, -0xe1, 0xf9, 0xde, 0x82, 0xfa, 0x7b, 0xae, 0x9a, 0x80, 0xab, 0x8f, 0xd6, -0x44, 0xe8, 0x51, 0x2c, 0xeb, 0xae, 0xeb, 0x06, 0x32, 0x20, 0x63, 0xf2, -0xe4, 0x71, 0xe2, 0x4a, 0x07, 0x85, 0x72, 0x89, 0x30, 0x8e, 0xf0, 0x3c, -0x20, 0x9d, 0x23, 0x9d, 0x3a, 0xc1, 0xe1, 0x5f, 0x0f, 0x72, 0xf4, 0x83, -0x31, 0x92, 0x66, 0x42, 0x9a, 0xa4, 0x8c, 0x8c, 0xce, 0x33, 0x38, 0x38, -0x8f, 0xc5, 0x61, 0xfd, 0x00, 0x2f, 0x88, 0xf0, 0xa3, 0x02, 0x7e, 0x5c, -0x20, 0x88, 0x22, 0xbc, 0x30, 0xc0, 0x7a, 0x7e, 0x7e, 0xcb, 0x77, 0x15, -0xb0, 0xde, 0x22, 0x81, 0x25, 0xfb, 0xa7, 0x4b, 0x12, 0x58, 0x70, 0x1f, -0x55, 0x43, 0x10, 0x7a, 0x40, 0x4a, 0xfd, 0xf4, 0x30, 0x7e, 0xe0, 0x11, -0xc6, 0x21, 0x7e, 0xe0, 0x61, 0x48, 0x71, 0xad, 0x19, 0x92, 0xa9, 0x61, -0x0e, 0xbd, 0x35, 0xc8, 0xe0, 0xfb, 0xa7, 0x68, 0x36, 0x9a, 0x38, 0xd1, -0x29, 0x11, 0x48, 0x93, 0x8c, 0xe1, 0xe1, 0x06, 0x47, 0x8e, 0xcc, 0xe1, -0xd1, 0xc2, 0xf7, 0x0d, 0x41, 0xe8, 0xe3, 0x07, 0x7e, 0x9e, 0x14, 0xa2, -0xa0, 0x19, 0xa0, 0xc4, 0xe1, 0x79, 0x4d, 0xad, 0xde, 0xbe, 0x6d, 0xa6, -0x76, 0x71, 0x64, 0xb9, 0x2c, 0x79, 0x0a, 0x89, 0x2c, 0xa4, 0x11, 0xca, -0xdc, 0xf4, 0x19, 0x40, 0x98, 0x3e, 0x39, 0x84, 0x67, 0x05, 0xab, 0x09, -0x9a, 0x26, 0x48, 0x3a, 0x47, 0x52, 0x1f, 0xe7, 0xe0, 0xdb, 0x27, 0x19, -0x1d, 0x9e, 0x22, 0x6d, 0x25, 0x0b, 0x95, 0xd3, 0x80, 0xb6, 0x1b, 0xbf, -0x59, 0xe6, 0x38, 0x76, 0x7c, 0x9e, 0x46, 0x0b, 0x36, 0x7f, 0xc2, 0x62, -0xc2, 0x00, 0xe3, 0x42, 0x70, 0x16, 0xc1, 0xa2, 0xae, 0x85, 0x24, 0x73, -0x34, 0xe6, 0x9b, 0xa8, 0xc8, 0xb9, 0x10, 0xee, 0x04, 0x5e, 0xe0, 0x12, -0xb2, 0x34, 0x01, 0xcd, 0x3b, 0x72, 0x2a, 0xca, 0x89, 0xa3, 0x27, 0xa9, -0x9f, 0x3a, 0x46, 0xe3, 0xcc, 0x87, 0x68, 0x73, 0x92, 0x2c, 0x31, 0xe0, -0x1a, 0x9c, 0x3e, 0x39, 0xc5, 0x7b, 0x07, 0x27, 0x99, 0xad, 0xcf, 0x23, -0x79, 0xd1, 0xbd, 0xd0, 0xbd, 0xdb, 0xa7, 0xca, 0x90, 0x2a, 0x3b, 0x54, -0x41, 0xc5, 0x31, 0x3a, 0x32, 0xc7, 0xd4, 0xb4, 0xe3, 0xa6, 0x9b, 0x12, -0xae, 0xd9, 0xd4, 0x80, 0xb4, 0x82, 0xe7, 0xf9, 0xa0, 0x29, 0xae, 0x31, -0xc9, 0xa9, 0xd1, 0x3a, 0xce, 0xb9, 0x73, 0x21, 0xf4, 0x5c, 0x1d, 0x01, -0x69, 0x67, 0xa3, 0x22, 0x0c, 0x1e, 0x69, 0x12, 0xfc, 0x70, 0x2f, 0x9d, -0x9d, 0x05, 0x9c, 0xcb, 0x98, 0x9f, 0xcf, 0x18, 0x1e, 0x6e, 0x32, 0x33, -0xd3, 0xc2, 0xa5, 0xe9, 0x42, 0xc5, 0xb4, 0x08, 0xfe, 0x81, 0x1f, 0xee, -0xd9, 0xff, 0xcd, 0x2f, 0xee, 0x7c, 0x5e, 0xa1, 0x47, 0x95, 0x1e, 0x55, -0x40, 0x85, 0xd9, 0x99, 0x06, 0xaf, 0xbf, 0x96, 0x32, 0x38, 0x38, 0xcb, -0xf5, 0xd7, 0x17, 0xa8, 0x56, 0x02, 0x54, 0x84, 0xa9, 0xa9, 0xf9, 0xc5, -0xd2, 0xf1, 0x02, 0x02, 0x97, 0x94, 0x25, 0x93, 0xb9, 0x6f, 0xff, 0x99, -0x79, 0x8e, 0x76, 0x30, 0x19, 0x63, 0xf2, 0x46, 0xad, 0xef, 0x63, 0x0c, -0x88, 0x08, 0x2e, 0x73, 0x88, 0x3b, 0xab, 0xb0, 0xdd, 0x25, 0xdc, 0xf7, -0xe0, 0x8f, 0xce, 0x36, 0x9f, 0xbe, 0x7e, 0xaf, 0xe9, 0x00, 0xfa, 0x17, -0x49, 0xb4, 0xc5, 0x5a, 0x8b, 0x17, 0xf8, 0x58, 0x6b, 0x51, 0x55, 0xc4, -0x39, 0x5c, 0xe6, 0xb8, 0x00, 0xd3, 0x8e, 0xbe, 0x03, 0x7a, 0xc9, 0x0b, -0x6d, 0x49, 0x02, 0x7f, 0xf7, 0xa7, 0xe6, 0x56, 0xa0, 0xff, 0xdc, 0xba, -0x40, 0x2f, 0x98, 0xe8, 0xd9, 0xf9, 0x90, 0xc2, 0xae, 0xbf, 0x7d, 0x46, -0x2f, 0x6a, 0xf2, 0xbe, 0x6d, 0x66, 0x37, 0x79, 0x55, 0x75, 0xd9, 0xc0, -0x3c, 0x47, 0xfa, 0xfb, 0x0e, 0xe8, 0x5d, 0x97, 0xfb, 0x87, 0x2b, 0xfa, -0x9a, 0xf5, 0x9b, 0x5f, 0x34, 0xb7, 0x02, 0x7d, 0x5c, 0x70, 0xac, 0xb5, -0x81, 0x4f, 0x01, 0xfd, 0x0a, 0xcf, 0x7f, 0xed, 0xc7, 0x97, 0xde, 0xa9, -0x05, 0xe9, 0xdb, 0x66, 0x3a, 0xc8, 0x53, 0xf3, 0x1d, 0x5c, 0xde, 0x3d, -0x9e, 0xec, 0x3b, 0xa0, 0x5f, 0x59, 0x6a, 0xbd, 0xdf, 0xe8, 0x7b, 0xe2, -0x6f, 0xe4, 0xae, 0x90, 0x07, 0x75, 0xfe, 0xd6, 0xd4, 0x43, 0xcf, 0xea, -0x9b, 0x97, 0x79, 0xe4, 0xb2, 0xd2, 0xb7, 0xcd, 0x6c, 0x6a, 0xaf, 0x77, -0x2e, 0x91, 0x01, 0xf2, 0x9d, 0x9f, 0xbe, 0x92, 0x35, 0x96, 0xfd, 0xa7, -0x06, 0xff, 0xd7, 0xf2, 0x5b, 0xff, 0x6b, 0x95, 0xff, 0x01, 0x3a, 0xbb, -0x29, 0xfe, 0x9c, 0xd4, 0x1a, 0x60, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_file_open.c b/Source/Core/DolphinWX/resources/toolbar_file_open.c deleted file mode 100644 index d2f8741931..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_file_open.c +++ /dev/null @@ -1,214 +0,0 @@ -static const unsigned char toolbar_file_open_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x09, 0x40, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x99, 0x6b, 0x6c, 0x5b, 0xe5, 0x19, -0xc7, 0x7f, 0xc7, 0x97, 0x24, 0x4d, 0xda, 0x24, 0xae, 0xe3, 0xd8, 0x0d, -0x2d, 0x71, 0xc5, 0x56, 0x21, 0x40, 0x34, 0xd0, 0x31, 0x09, 0x6d, 0x12, -0x01, 0xa1, 0x49, 0x9b, 0x18, 0xec, 0xc3, 0x24, 0x3e, 0x82, 0x98, 0x60, -0x1b, 0x91, 0xa6, 0xa1, 0x49, 0x1b, 0xbb, 0x68, 0x21, 0x9a, 0xa6, 0x4d, -0x1a, 0xdb, 0x90, 0x36, 0x36, 0xb4, 0x0f, 0x5b, 0x87, 0xd8, 0x97, 0x7d, -0x21, 0x6c, 0x93, 0x26, 0x31, 0x09, 0x8a, 0xd6, 0x01, 0x83, 0x96, 0xa6, -0xd5, 0x68, 0x97, 0x40, 0x49, 0xda, 0x38, 0x8d, 0x6f, 0xc7, 0xb1, 0x8f, -0xe3, 0xbb, 0xfd, 0xbe, 0xfb, 0xf0, 0x9e, 0x9b, 0xed, 0xe3, 0xd4, 0xe5, -0x22, 0x86, 0xc4, 0x23, 0xbd, 0x3a, 0xc7, 0xc7, 0xf6, 0xf1, 0xff, 0xff, -0x7f, 0x6e, 0xef, 0x73, 0xac, 0x49, 0x29, 0xf9, 0x28, 0x9b, 0xef, 0xc3, -0x06, 0xf0, 0x5e, 0xed, 0x63, 0x02, 0x1f, 0xb6, 0x7d, 0x4c, 0xe0, 0xc3, -0xb6, 0x40, 0x3f, 0x1f, 0xfa, 0xd7, 0xaf, 0xb5, 0xb8, 0x90, 0xc4, 0x85, -0x20, 0x2e, 0x25, 0xea, 0x5c, 0x12, 0x97, 0x92, 0xc3, 0x42, 0x30, 0x2e, -0x25, 0x4b, 0x42, 0xb2, 0xf0, 0x85, 0xef, 0xc8, 0xc5, 0x0f, 0x1a, 0x70, -0xa7, 0x69, 0x9d, 0x65, 0xf4, 0xf5, 0xa7, 0xb4, 0xfb, 0x25, 0xcc, 0x4a, -0x05, 0x70, 0xda, 0x04, 0x8a, 0x90, 0x20, 0x04, 0xd8, 0xe7, 0x12, 0xa4, -0x70, 0x9d, 0xab, 0xe3, 0xed, 0x77, 0x3d, 0x2a, 0x8f, 0xf5, 0xf3, 0xc3, -0x4f, 0x7f, 0x4f, 0x9b, 0x11, 0x92, 0x19, 0x21, 0x89, 0x9b, 0xf7, 0x39, -0xf6, 0xe0, 0xcf, 0xfa, 0xfb, 0x6e, 0x4f, 0x02, 0xff, 0xfe, 0xad, 0x76, -0x0a, 0x98, 0x01, 0x07, 0xa8, 0x34, 0xd7, 0x68, 0x6c, 0x9a, 0x91, 0xd0, -0x04, 0x23, 0xa1, 0x30, 0x43, 0x23, 0xc3, 0x8c, 0x47, 0x23, 0x20, 0xea, -0xa4, 0xd7, 0xde, 0xe1, 0xcc, 0x3f, 0x5f, 0xa5, 0x56, 0x6b, 0x20, 0x05, -0x4f, 0xdc, 0xf5, 0x5d, 0xf9, 0x48, 0xe7, 0x8f, 0xfc, 0xf9, 0x31, 0x6d, -0xd6, 0x14, 0x62, 0x46, 0x08, 0x66, 0x84, 0xe4, 0x36, 0x17, 0x69, 0xb7, -0x30, 0x0b, 0x5f, 0x7d, 0x5c, 0x3e, 0xf6, 0xae, 0x08, 0xbc, 0xfc, 0xa4, -0x76, 0x1f, 0x70, 0x54, 0x03, 0x24, 0xb0, 0xef, 0xc6, 0x59, 0xc6, 0xf6, -0x1d, 0x64, 0x38, 0x34, 0xc9, 0xd0, 0xc8, 0x08, 0x88, 0xba, 0x5a, 0xb2, -0xe1, 0x9c, 0x8b, 0x3a, 0x88, 0x06, 0x6f, 0xbd, 0xb1, 0xc4, 0xca, 0xa9, -0xb3, 0x08, 0xc9, 0x92, 0x94, 0x3c, 0x22, 0x4c, 0xa0, 0x52, 0x72, 0x58, -0x48, 0x66, 0xdc, 0x40, 0x2d, 0xe0, 0xe3, 0x63, 0x3e, 0xa2, 0x11, 0x08, -0xfa, 0x05, 0x2b, 0xab, 0x60, 0x6c, 0xdb, 0x9f, 0x39, 0xf8, 0xf5, 0x5f, -0xc8, 0x35, 0x4e, 0x6a, 0xdd, 0x68, 0x8f, 0x74, 0x37, 0x5d, 0x3b, 0x07, -0x84, 0x20, 0x8e, 0x06, 0x1a, 0x70, 0xed, 0xe7, 0x1f, 0x22, 0x1c, 0xbf, -0xde, 0x04, 0x6b, 0x2e, 0xcb, 0x3c, 0x3a, 0xf7, 0xde, 0x58, 0x04, 0xf3, -0xea, 0x8c, 0x94, 0xbc, 0x68, 0x7d, 0x44, 0xba, 0xbe, 0x32, 0x3c, 0x1c, -0x60, 0x72, 0x72, 0x80, 0xc9, 0x89, 0x00, 0xfb, 0xa7, 0x34, 0x06, 0xfc, -0xa6, 0x10, 0x52, 0x70, 0xd3, 0xf5, 0xf0, 0xb7, 0x17, 0x60, 0x23, 0x09, -0xc0, 0x7d, 0x9c, 0xd4, 0x16, 0x3c, 0xe5, 0x76, 0x93, 0x32, 0xc9, 0x38, -0x04, 0xa4, 0xfa, 0xc5, 0xe0, 0xe0, 0x2e, 0xc2, 0xd3, 0xd7, 0x2a, 0xf0, -0xb2, 0xe5, 0x2c, 0x84, 0xb9, 0x5c, 0x71, 0x65, 0xc2, 0x0c, 0xc7, 0x26, -0xec, 0x4b, 0xd6, 0xd5, 0xc0, 0x80, 0x9f, 0x89, 0xc8, 0x6e, 0xa6, 0xf6, -0xef, 0x21, 0x12, 0x09, 0x32, 0xb2, 0x4b, 0x9a, 0x62, 0xd4, 0xcd, 0x63, -0x3b, 0xb6, 0x1b, 0x0e, 0x41, 0x42, 0x11, 0x88, 0x7b, 0x61, 0xff, 0xf9, -0xef, 0x19, 0x37, 0xbd, 0xba, 0xf4, 0xed, 0x07, 0xc9, 0x73, 0x52, 0x83, -0x23, 0xb2, 0xcd, 0x03, 0x79, 0x34, 0xa8, 0x55, 0x2b, 0xea, 0x47, 0x10, -0x2a, 0x4b, 0x65, 0xd3, 0x45, 0xc4, 0xbc, 0x66, 0x91, 0x91, 0xc2, 0x26, -0x33, 0x1a, 0x1a, 0x65, 0xd7, 0xc8, 0x10, 0xe1, 0xe8, 0x18, 0x13, 0x91, -0xdd, 0x8c, 0x8d, 0x07, 0x5d, 0x80, 0xcd, 0xd0, 0x43, 0x76, 0x2c, 0xc7, -0xa6, 0x26, 0x6d, 0xaf, 0xc5, 0x01, 0x7e, 0xf5, 0x34, 0xb3, 0x66, 0xf8, -0xcd, 0x06, 0x02, 0x1c, 0x09, 0x8f, 0xb2, 0xbf, 0x56, 0x87, 0x7c, 0x89, -0xfc, 0x4f, 0x7f, 0xc7, 0xed, 0x8f, 0x3e, 0xc4, 0x52, 0xa7, 0x07, 0x96, -0xec, 0x7b, 0x8a, 0x9a, 0xa9, 0xb4, 0x30, 0x81, 0x37, 0x41, 0x34, 0xbd, -0xc9, 0x98, 0xde, 0xb9, 0xed, 0xee, 0xcf, 0x3a, 0xe1, 0x66, 0x03, 0xf6, -0xf0, 0x9a, 0x74, 0x13, 0x70, 0xdc, 0x30, 0x30, 0x60, 0xbf, 0x35, 0xfb, -0x9b, 0x67, 0x90, 0x7b, 0x86, 0x61, 0x78, 0x10, 0x76, 0x8f, 0x40, 0xd0, -0x0f, 0x43, 0xbb, 0x86, 0x08, 0x85, 0xc6, 0xb8, 0xb0, 0xb1, 0x3d, 0x7e, -0x66, 0xb9, 0xf4, 0x2c, 0x70, 0xb0, 0x9d, 0x80, 0xcb, 0xa5, 0x5b, 0x89, -0x15, 0x42, 0x53, 0xd3, 0x2e, 0x90, 0x6e, 0xf0, 0x1d, 0x47, 0x2c, 0x92, -0xb2, 0xa7, 0x77, 0x1c, 0xb0, 0x5e, 0x64, 0x94, 0x19, 0x45, 0x18, 0x1b, -0x81, 0x91, 0x5d, 0x30, 0x32, 0x04, 0x03, 0x83, 0x03, 0x84, 0x26, 0x22, -0x84, 0xc2, 0x21, 0xc2, 0x93, 0x61, 0x76, 0x0d, 0x05, 0xa8, 0x94, 0x8b, -0xb4, 0xb8, 0xc8, 0x99, 0xe5, 0x52, 0xfc, 0xc7, 0x4f, 0x71, 0xcf, 0xf7, -0xbf, 0xa6, 0x3d, 0x67, 0x13, 0xb8, 0xf3, 0x5b, 0xf2, 0xa5, 0xe7, 0x1f, -0x57, 0x49, 0x22, 0x5b, 0x0d, 0x68, 0xd5, 0x4c, 0x20, 0xd2, 0xa5, 0x7a, -0xd3, 0xe5, 0x0d, 0xf3, 0x9a, 0xfb, 0xbc, 0x87, 0x77, 0x9c, 0x6b, 0x0e, -0xc9, 0x46, 0x43, 0x90, 0x4c, 0x49, 0xf4, 0x1c, 0xa4, 0x33, 0xd0, 0x12, -0x70, 0x30, 0x1e, 0x25, 0x1c, 0xbd, 0x8a, 0xc9, 0xa9, 0x29, 0xc6, 0x43, -0x63, 0x20, 0xca, 0x14, 0x72, 0x9b, 0x5c, 0xba, 0xb0, 0x4a, 0x7a, 0x33, -0x4d, 0xb9, 0x54, 0xa5, 0xde, 0xb4, 0x83, 0x6f, 0x16, 0x78, 0xae, 0xad, -0x13, 0x5b, 0x5e, 0xc8, 0x25, 0xd6, 0xd8, 0x1b, 0x8b, 0x7a, 0x10, 0xe8, -0x24, 0xd1, 0xf0, 0x00, 0xdf, 0x91, 0xf8, 0x2e, 0xef, 0xe8, 0x7a, 0x8d, -0xe4, 0x66, 0x05, 0x5d, 0x6f, 0x62, 0x18, 0x82, 0xe0, 0xe0, 0x08, 0xb1, -0xe9, 0x9b, 0xb9, 0xfe, 0x93, 0xd3, 0x4c, 0x1e, 0xb8, 0x86, 0xa0, 0xaf, -0x4e, 0xa5, 0x78, 0x89, 0x42, 0xf6, 0x3c, 0xe7, 0xde, 0x39, 0x45, 0x31, -0x9f, 0xa6, 0xd5, 0x6c, 0x20, 0x24, 0xb4, 0x5a, 0xe0, 0xf3, 0x81, 0x51, -0xb2, 0x9d, 0x37, 0xd3, 0x16, 0x42, 0x76, 0x1e, 0xc0, 0x4c, 0xbd, 0x5a, -0xee, 0xc8, 0x03, 0xe1, 0x01, 0xb0, 0xe1, 0xe4, 0x45, 0x57, 0x7e, 0xa8, -0x55, 0x2e, 0x55, 0x49, 0x25, 0x0c, 0xf4, 0x4c, 0x19, 0x5d, 0xaf, 0xd2, -0x68, 0x48, 0xc2, 0x57, 0xdd, 0xc4, 0x81, 0x1b, 0x6f, 0x25, 0x3c, 0x75, -0x88, 0xd1, 0xbd, 0x53, 0x20, 0x4a, 0xe4, 0x36, 0x4e, 0x71, 0xfe, 0xf4, -0x3f, 0x30, 0xb2, 0x6f, 0x53, 0x29, 0xa6, 0x09, 0x04, 0xc0, 0xef, 0x57, -0x80, 0xfd, 0x7e, 0x47, 0x47, 0x21, 0x60, 0x33, 0x67, 0x27, 0x3b, 0xdd, -0x04, 0x04, 0x79, 0x80, 0x42, 0x26, 0xa3, 0x08, 0x58, 0xf1, 0x6b, 0xc5, -0x76, 0x57, 0xd8, 0x58, 0x1e, 0x50, 0x04, 0x1a, 0xb5, 0x1a, 0x7a, 0x7a, -0x0b, 0x3d, 0x65, 0x90, 0xda, 0x28, 0x50, 0x2e, 0x37, 0x18, 0x1e, 0x3b, -0x40, 0xf4, 0x9a, 0xbb, 0x39, 0xfc, 0xe9, 0x9b, 0x09, 0x4f, 0xdd, 0x40, -0x30, 0x18, 0xa0, 0x5c, 0x58, 0x43, 0x5f, 0x7f, 0x9d, 0x95, 0xd7, 0x9e, -0x41, 0xdf, 0x7c, 0x13, 0xd9, 0xaa, 0x10, 0xf0, 0x43, 0x20, 0x80, 0x0d, -0xde, 0xef, 0x53, 0x04, 0xac, 0x54, 0x11, 0x1a, 0x54, 0x6b, 0x50, 0xae, -0xda, 0xd7, 0x16, 0xbd, 0x3c, 0xb0, 0x06, 0x50, 0xab, 0xd5, 0xcc, 0x1c, -0xa0, 0x3d, 0x8c, 0x3c, 0x48, 0x18, 0xb9, 0x3c, 0x7a, 0x32, 0x47, 0x32, -0xa1, 0xa3, 0xa7, 0x0d, 0x82, 0x83, 0x63, 0x84, 0xa7, 0x6f, 0xe7, 0xe0, -0xad, 0x9f, 0x21, 0x7a, 0xcd, 0x9d, 0x0c, 0x8f, 0x46, 0x40, 0x54, 0x30, -0x52, 0xa7, 0x58, 0x3d, 0xf5, 0x27, 0x92, 0xe7, 0x5f, 0xc4, 0xc8, 0x9e, -0x07, 0x40, 0xd3, 0xd4, 0x0a, 0x98, 0x6a, 0xfb, 0x7c, 0x0a, 0xb8, 0xdf, -0x54, 0x5e, 0xd3, 0x1c, 0xe5, 0x01, 0x2e, 0xe9, 0xb8, 0x7b, 0xcd, 0xb1, -0x2e, 0x02, 0x2d, 0xa1, 0x08, 0x6c, 0x65, 0xf2, 0x66, 0x2f, 0xb0, 0x3c, -0xd0, 0x4d, 0x60, 0xfd, 0xed, 0x0d, 0x4e, 0xbf, 0x72, 0x0e, 0x80, 0xd1, -0xc8, 0x75, 0x84, 0xaf, 0xbe, 0x97, 0x43, 0x77, 0x7c, 0x91, 0xf0, 0xd5, -0xb3, 0xa0, 0x69, 0x34, 0xaa, 0x59, 0x92, 0xcb, 0x8b, 0xac, 0x5c, 0x3c, -0x4e, 0xf2, 0xfc, 0xf3, 0x34, 0x6b, 0x45, 0xbc, 0xcc, 0xa7, 0x81, 0xe6, -0x73, 0x08, 0xb8, 0x17, 0x38, 0x85, 0xaa, 0xd9, 0x82, 0x4c, 0xde, 0x56, -0x7f, 0xed, 0x87, 0x0f, 0x73, 0xda, 0xcb, 0x03, 0x79, 0xeb, 0xbc, 0x51, -0xdd, 0x26, 0x38, 0x10, 0xf0, 0x0c, 0x23, 0x23, 0x67, 0x70, 0xfa, 0x95, -0x73, 0x1c, 0xb8, 0xee, 0x2e, 0x0e, 0x7f, 0xee, 0x27, 0xe0, 0x1b, 0x04, -0x6d, 0x10, 0x23, 0xb3, 0xcc, 0xca, 0xf1, 0x05, 0x92, 0x6f, 0xfd, 0x1d, -0x23, 0x73, 0xd6, 0x13, 0xb0, 0x65, 0x96, 0xfa, 0x9a, 0x66, 0x92, 0xd0, -0xda, 0xc1, 0x5b, 0xea, 0x5b, 0x2b, 0x67, 0x28, 0x12, 0x12, 0xc0, 0x0c, -0x9f, 0xb6, 0x4e, 0x0c, 0x20, 0x84, 0xea, 0x6e, 0x00, 0xf9, 0x8c, 0x4e, -0x64, 0x5f, 0xc8, 0x24, 0x20, 0x5c, 0xc7, 0x16, 0xc9, 0xf5, 0x34, 0xa3, -0x91, 0x4f, 0x70, 0xf8, 0xce, 0x1f, 0x80, 0x6c, 0xd0, 0xa8, 0x6c, 0x73, -0xe2, 0xaf, 0xdf, 0x40, 0x4f, 0xbc, 0xbe, 0x23, 0x68, 0x4f, 0x12, 0xbe, -0xf6, 0xf0, 0xb1, 0xc0, 0x5b, 0x66, 0x6d, 0x04, 0xd7, 0x93, 0x2e, 0x42, -0x70, 0xd4, 0x7a, 0xdf, 0xb3, 0x8c, 0x02, 0xd4, 0xab, 0xd5, 0xee, 0x3c, -0xb0, 0x09, 0xe8, 0xc4, 0x0e, 0x7d, 0x19, 0xa4, 0x0a, 0xb3, 0x13, 0x7f, -0x99, 0x43, 0xdf, 0x78, 0xe3, 0xca, 0xc1, 0x9b, 0xea, 0x5b, 0xe0, 0x35, -0x9f, 0xe3, 0x0d, 0xc0, 0x9e, 0x37, 0xb6, 0xcb, 0x60, 0x94, 0x6d, 0x02, -0xf9, 0xf9, 0x39, 0x15, 0x3e, 0xd0, 0x31, 0x52, 0xde, 0xbb, 0x20, 0x5f, -0xb2, 0x06, 0x94, 0x9c, 0x95, 0x07, 0xa2, 0xe6, 0x1c, 0x5b, 0x35, 0xca, -0xc5, 0x6d, 0x8c, 0x7c, 0x99, 0x58, 0xfc, 0x16, 0x10, 0x55, 0xd6, 0xdf, -0x7c, 0xf6, 0xdd, 0x81, 0xc7, 0x01, 0xef, 0x73, 0x85, 0x8f, 0xe6, 0x8a, -0x7d, 0x6b, 0x68, 0xda, 0xd4, 0xcd, 0x6c, 0x54, 0xf9, 0x60, 0x87, 0x0f, -0x78, 0x8c, 0x94, 0x96, 0x17, 0xea, 0xd5, 0xba, 0xab, 0x17, 0x38, 0x79, -0x90, 0x4a, 0xe4, 0x18, 0xde, 0x13, 0x61, 0x74, 0xef, 0x3e, 0x10, 0x65, -0x56, 0x5e, 0x3b, 0x7a, 0xe5, 0xe0, 0x5d, 0xa1, 0xe3, 0xf7, 0x3b, 0x35, -0xbf, 0x4d, 0x7d, 0xb3, 0xfa, 0xb4, 0x04, 0x6c, 0x64, 0xda, 0xaa, 0x4f, -0xdb, 0xd8, 0xda, 0x35, 0xd4, 0x0b, 0x35, 0xdf, 0x92, 0xd5, 0x4b, 0x2e, -0xf5, 0x1d, 0x4f, 0xac, 0xaf, 0xe5, 0x89, 0x4e, 0xcf, 0x80, 0xac, 0xa0, -0x27, 0x4e, 0x50, 0x29, 0xa6, 0xfb, 0x03, 0xac, 0xb5, 0xc7, 0xba, 0x55, -0xf7, 0x2d, 0x02, 0x16, 0x09, 0x0d, 0x47, 0x33, 0x21, 0x20, 0xa5, 0x43, -0xa3, 0xe9, 0x54, 0xa3, 0xf9, 0x39, 0x9e, 0x73, 0xdf, 0xdf, 0xcb, 0x03, -0x79, 0x80, 0x5a, 0xb5, 0x69, 0xee, 0x2a, 0x9d, 0xdd, 0x63, 0xb9, 0xd4, -0xc0, 0x28, 0xd4, 0x98, 0xb9, 0xe3, 0x16, 0x10, 0x65, 0xd6, 0x97, 0x5f, -0xe8, 0x09, 0xba, 0x8b, 0x80, 0xeb, 0xdc, 0xe7, 0x77, 0x6a, 0x7d, 0xa7, -0xfa, 0x12, 0xd7, 0xf4, 0x26, 0x20, 0x91, 0x75, 0xc0, 0xd3, 0x11, 0x3e, -0xde, 0x04, 0x24, 0x6b, 0x12, 0xc8, 0xea, 0xf5, 0xae, 0x24, 0x4e, 0x5d, -0x2a, 0x31, 0xbc, 0x3b, 0xc4, 0x68, 0x68, 0x2f, 0x8d, 0x4a, 0x96, 0xc4, -0xca, 0xcb, 0x3b, 0x83, 0x76, 0x03, 0xf7, 0x75, 0x24, 0xad, 0x5f, 0x79, -0xc1, 0x56, 0xde, 0x1d, 0xfb, 0x42, 0xed, 0x7d, 0xca, 0x55, 0xc8, 0x15, -0xda, 0xe0, 0x75, 0x3d, 0xf5, 0xe8, 0x22, 0x60, 0x35, 0x33, 0x80, 0xa2, -0x51, 0x61, 0xcf, 0x6e, 0x1f, 0x96, 0x4f, 0xf5, 0x6c, 0x85, 0xe8, 0x81, -0x9b, 0x41, 0x94, 0x48, 0xac, 0xbc, 0x7a, 0x45, 0xa0, 0xbd, 0xc2, 0xc8, -0xef, 0xea, 0xc0, 0x16, 0x78, 0x29, 0x9c, 0xd8, 0xbf, 0x98, 0xea, 0x44, -0xc7, 0x62, 0xe7, 0x5c, 0xdc, 0x33, 0x84, 0x14, 0x81, 0x2a, 0x7b, 0x86, -0xfd, 0x20, 0x25, 0x8d, 0x86, 0x24, 0x99, 0x6c, 0xf0, 0xa9, 0x6b, 0x63, -0x20, 0xb6, 0x59, 0x3d, 0xfb, 0x72, 0x5f, 0xa0, 0xad, 0xba, 0xde, 0x59, -0x36, 0xed, 0xe5, 0x4a, 0x5a, 0xa4, 0x02, 0xde, 0x32, 0x49, 0xe4, 0xda, -0x9b, 0xf7, 0xe2, 0xfc, 0x1c, 0xed, 0xfe, 0xf0, 0x24, 0x20, 0x9d, 0x66, -0x56, 0x2c, 0xd6, 0x61, 0x52, 0x11, 0x48, 0x25, 0x5b, 0x0c, 0x0c, 0x0e, -0x10, 0x9b, 0x8a, 0x92, 0xbb, 0xf4, 0x5f, 0xea, 0xd5, 0x82, 0xda, 0xaf, -0xd0, 0x5b, 0xe9, 0xce, 0x4e, 0xdb, 0xf6, 0x9e, 0x0b, 0x3c, 0x66, 0x85, -0xb1, 0x42, 0xa7, 0xd5, 0x84, 0xcd, 0xac, 0xaa, 0xff, 0x6d, 0xea, 0x7b, -0x58, 0xcf, 0x32, 0x0a, 0x60, 0x18, 0x4d, 0x75, 0x37, 0x24, 0xa9, 0x34, -0xc4, 0xf6, 0x1f, 0x04, 0x61, 0x70, 0x69, 0xed, 0x3f, 0xf6, 0x66, 0xab, -0x5f, 0xd0, 0xee, 0x65, 0x3d, 0xfd, 0xb0, 0x92, 0xd3, 0x9d, 0xb4, 0xad, -0x16, 0xac, 0xa7, 0x60, 0x79, 0xbd, 0x0d, 0xd6, 0xda, 0xfc, 0x1c, 0x7f, -0xf4, 0x7a, 0xac, 0xd2, 0x55, 0x46, 0x1f, 0xfe, 0xa5, 0xd3, 0xcc, 0x0a, -0xdb, 0xca, 0xaf, 0x8d, 0x26, 0x64, 0xb2, 0x10, 0xdb, 0x17, 0xa6, 0x51, -0xdb, 0x22, 0x99, 0x58, 0xb5, 0x4b, 0xa1, 0xbf, 0x63, 0x1b, 0x1c, 0x70, -0x25, 0x67, 0x57, 0x89, 0x74, 0x77, 0x58, 0x13, 0x6c, 0xb3, 0xa9, 0xca, -0x64, 0xa9, 0xac, 0xea, 0xfd, 0xf1, 0x33, 0x5d, 0xe0, 0x01, 0x1e, 0xf3, -0x52, 0xdf, 0xd3, 0x03, 0x96, 0x17, 0x24, 0x90, 0x37, 0xd4, 0xeb, 0x54, -0x1a, 0x82, 0x03, 0x01, 0x26, 0xa3, 0xbb, 0x59, 0x5f, 0x7d, 0xdb, 0xde, -0xb3, 0xb8, 0x37, 0x5e, 0x9d, 0x8a, 0x43, 0x7b, 0x53, 0xb2, 0x8e, 0x56, -0x43, 0x6a, 0x36, 0x21, 0xb3, 0x05, 0xa9, 0x1c, 0xa4, 0xb6, 0x7a, 0xc1, -0x03, 0xe0, 0x58, 0x2f, 0xf5, 0x7b, 0x13, 0x90, 0x2c, 0x49, 0x98, 0x29, -0x6c, 0xab, 0xd7, 0xe9, 0x2c, 0x44, 0x63, 0x63, 0x20, 0x8a, 0x24, 0x2e, -0xac, 0xb7, 0x55, 0x0f, 0x37, 0x81, 0x4e, 0x73, 0xef, 0x26, 0xa5, 0x84, -0x46, 0x0b, 0xf4, 0xbc, 0x09, 0x3a, 0xe7, 0x4c, 0x55, 0x3b, 0xd8, 0x12, -0xf0, 0xa5, 0x9d, 0x3e, 0xe0, 0x49, 0xa0, 0x65, 0x56, 0x22, 0xcb, 0x03, -0x19, 0x1d, 0x6e, 0x3a, 0x32, 0x4c, 0x3e, 0x9b, 0xa1, 0x5e, 0xab, 0xb7, -0x4d, 0x4c, 0x6e, 0xc5, 0xc1, 0xde, 0xee, 0x3a, 0x93, 0x94, 0x84, 0x74, -0x0e, 0xd2, 0x5b, 0x0e, 0xe8, 0x3e, 0xff, 0x96, 0x3b, 0x0a, 0x7c, 0x73, -0x7e, 0x8e, 0x42, 0x2f, 0xf5, 0x7b, 0x12, 0x10, 0xae, 0x5e, 0x70, 0x71, -0x43, 0x25, 0xdc, 0xe4, 0x84, 0xc6, 0xb9, 0x73, 0xba, 0xb3, 0x5f, 0xe9, -0xd8, 0xf2, 0xba, 0x81, 0x0b, 0x09, 0x7a, 0xc1, 0x0c, 0x91, 0x2d, 0x15, -0xe3, 0x56, 0xa5, 0xb9, 0x8c, 0xad, 0xa1, 0xaa, 0xcd, 0x13, 0xf3, 0x73, -0x5c, 0x00, 0x3c, 0x9f, 0x87, 0x5e, 0x9e, 0x80, 0x74, 0x08, 0x54, 0xeb, -0x10, 0x0a, 0x05, 0x41, 0x94, 0x49, 0x6e, 0x96, 0xf0, 0xfb, 0x5d, 0x0d, -0xc7, 0x45, 0x44, 0x4a, 0x15, 0x1e, 0x99, 0xbc, 0x02, 0xdd, 0x6c, 0xf6, -0xad, 0xf6, 0x12, 0x6a, 0x3c, 0x3c, 0x6a, 0x6f, 0x93, 0x2f, 0x03, 0xfa, -0xf2, 0x04, 0x5c, 0x1e, 0x38, 0xb3, 0x02, 0xf1, 0x58, 0x8b, 0x2d, 0xbd, -0x68, 0x97, 0x58, 0x29, 0x41, 0x9a, 0xe0, 0xb7, 0x0c, 0xc8, 0x16, 0xda, -0x41, 0xf7, 0xa1, 0xf6, 0x12, 0x2a, 0x44, 0x16, 0xfb, 0x55, 0xfa, 0xca, -0x08, 0xa8, 0x91, 0x2d, 0x0f, 0x8c, 0x2f, 0xaf, 0x42, 0x36, 0x2b, 0x88, -0x4d, 0xd6, 0xd4, 0x03, 0x60, 0x01, 0x5b, 0x45, 0xd0, 0x0d, 0xa5, 0x76, -0xb3, 0xd5, 0x17, 0x60, 0x50, 0xa1, 0xb1, 0x88, 0xaa, 0x2a, 0xef, 0x09, -0xb4, 0xdb, 0xba, 0xfe, 0xa1, 0xb1, 0xec, 0x47, 0x5f, 0xd1, 0xee, 0x91, -0x5e, 0xdd, 0xaf, 0x3f, 0xb0, 0xa0, 0x04, 0x58, 0x44, 0x85, 0x87, 0xb3, -0x0d, 0x78, 0x1f, 0x40, 0xbb, 0xad, 0x27, 0x01, 0x80, 0x85, 0x07, 0xb4, -0x79, 0x76, 0x68, 0x22, 0x1e, 0x66, 0x81, 0x5e, 0x6c, 0xdb, 0xb7, 0xbf, -0xcf, 0xa0, 0xdd, 0xb6, 0x23, 0x01, 0x4e, 0x6a, 0x2c, 0x3c, 0xc9, 0x1f, -0x80, 0xfb, 0x77, 0xb8, 0xc7, 0x1a, 0x0a, 0xf4, 0x51, 0xf7, 0xac, 0xfa, -0x41, 0x82, 0x76, 0xdb, 0xce, 0x04, 0x4c, 0x5b, 0x78, 0x40, 0xbb, 0x8f, -0xf6, 0x3f, 0x1e, 0xf2, 0xa8, 0x44, 0xcc, 0xbf, 0x9b, 0xca, 0xf1, 0x7e, -0x5a, 0x5f, 0x04, 0xfe, 0x9f, 0xed, 0x23, 0xff, 0x47, 0xf7, 0x47, 0x9e, -0xc0, 0xff, 0x00, 0x3b, 0x1c, 0x36, 0x87, 0xb9, 0x4b, 0x27, 0xd9, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_fullscreen.c b/Source/Core/DolphinWX/resources/toolbar_fullscreen.c deleted file mode 100644 index d810c8c884..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_fullscreen.c +++ /dev/null @@ -1,209 +0,0 @@ -static const unsigned char toolbar_fullscreen_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x32, 0x2f, 0x30, 0x34, 0x1c, 0xf3, 0x42, 0xbb, 0x00, 0x00, 0x08, 0xfd, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x99, 0x6d, 0x8c, 0x5c, 0x55, -0x19, 0xc7, 0x7f, 0xe7, 0xdc, 0x3b, 0xb3, 0xd3, 0x7d, 0x9d, 0xdd, 0xae, -0xdb, 0x97, 0xa5, 0x20, 0x45, 0x5b, 0x88, 0x06, 0x96, 0xa2, 0x89, 0x01, -0x02, 0x09, 0x24, 0x46, 0x43, 0xd0, 0xf2, 0x45, 0xa3, 0x92, 0x40, 0x62, -0xf4, 0x03, 0x31, 0xa1, 0x26, 0x4a, 0x8c, 0x7e, 0x32, 0xc6, 0x17, 0x34, -0xc4, 0x7e, 0xd2, 0x4f, 0x06, 0x05, 0x85, 0xc4, 0x48, 0x42, 0x69, 0x08, -0x46, 0x01, 0x13, 0x10, 0x50, 0x69, 0xa5, 0xa5, 0x4b, 0xb1, 0x2d, 0x76, -0xdf, 0xcb, 0xbe, 0xbf, 0xce, 0xce, 0xdc, 0x3b, 0x33, 0xe7, 0x3c, 0x7e, -0x38, 0x77, 0x66, 0xee, 0xbd, 0x3b, 0xb3, 0x2d, 0x12, 0x68, 0x9a, 0xf4, -0x49, 0xce, 0x3e, 0xe7, 0x9e, 0x73, 0x77, 0xef, 0xf3, 0x3c, 0xff, 0xe7, -0xed, 0x9c, 0x55, 0x22, 0xc2, 0xa5, 0x4c, 0xfa, 0x62, 0x0b, 0xf0, 0x7e, -0xe9, 0xb2, 0x02, 0x17, 0x9b, 0x2e, 0x2b, 0x70, 0xb1, 0xe9, 0x92, 0x57, -0xc0, 0x6f, 0xb5, 0xf1, 0xb7, 0x47, 0x54, 0xde, 0x0a, 0x07, 0xc4, 0xf2, -0x45, 0x2b, 0x0c, 0x89, 0x80, 0xb5, 0x90, 0xe0, 0x02, 0x62, 0x23, 0x9e, -0x5e, 0xdf, 0x6c, 0xef, 0xc2, 0xd7, 0x8f, 0x59, 0xe1, 0x90, 0x58, 0x0e, -0x7e, 0xf7, 0x31, 0x59, 0x6e, 0x26, 0xa7, 0x6a, 0x56, 0x07, 0x5e, 0x7c, -0x44, 0xdd, 0x8f, 0xf0, 0x4b, 0x11, 0xf2, 0xff, 0xb7, 0x30, 0xb1, 0xe7, -0xf7, 0xa1, 0x40, 0x6d, 0x7d, 0x59, 0x84, 0x6f, 0x3f, 0xf4, 0xb8, 0xfc, -0x36, 0x2d, 0xeb, 0x06, 0x17, 0x7a, 0xfe, 0x17, 0xea, 0x7e, 0xb1, 0x3c, -0x6a, 0x85, 0x7c, 0xed, 0xe3, 0x22, 0x20, 0x00, 0xd1, 0x3c, 0x9a, 0x46, -0x3f, 0x5a, 0x50, 0x6c, 0xaf, 0xe5, 0xef, 0x5c, 0x78, 0x0d, 0xcd, 0x0b, -0x3c, 0xfa, 0xb3, 0x7b, 0xd5, 0xfd, 0xe9, 0x8d, 0x04, 0x02, 0x7f, 0x79, -0x58, 0xe5, 0x15, 0x8c, 0x00, 0xf9, 0xda, 0xdf, 0xcf, 0xe5, 0xe0, 0xca, -0x2b, 0x60, 0x6b, 0x3f, 0x64, 0x33, 0xce, 0x32, 0xd6, 0x82, 0x31, 0x49, -0xbe, 0x61, 0x6e, 0xc1, 0x9a, 0x88, 0xbf, 0xc7, 0x79, 0x18, 0xc2, 0xf2, -0x2a, 0xcc, 0x2f, 0xb9, 0x79, 0x1c, 0x09, 0x2b, 0x5c, 0xfd, 0xfd, 0x27, -0x1a, 0xee, 0x94, 0x88, 0x01, 0xb1, 0x3c, 0x28, 0xca, 0x09, 0x0f, 0xd0, -0xd5, 0x09, 0x37, 0xed, 0x83, 0x4c, 0xef, 0x6d, 0xb0, 0xed, 0x01, 0x74, -0xfe, 0x4e, 0xc4, 0x96, 0x40, 0x4a, 0x20, 0x01, 0x62, 0x4b, 0x88, 0x04, -0x60, 0x43, 0x44, 0x4a, 0x88, 0x0d, 0x62, 0xa3, 0x8c, 0x98, 0x10, 0x6b, -0x03, 0xc4, 0x86, 0x58, 0x13, 0x52, 0x5a, 0x1c, 0x41, 0x6c, 0x85, 0x6a, -0xb8, 0x4e, 0xb0, 0x3a, 0x87, 0xb5, 0x42, 0xa5, 0x58, 0x20, 0x2c, 0xae, -0x63, 0x05, 0xd6, 0xe7, 0x67, 0x00, 0xc8, 0x64, 0x60, 0x6b, 0xde, 0x7d, -0x7f, 0x74, 0x02, 0x4a, 0x41, 0x03, 0x09, 0xe0, 0x41, 0xe0, 0x87, 0x4d, -0x15, 0xb0, 0xc2, 0xfe, 0x1a, 0xac, 0xb9, 0x1c, 0x0c, 0xdd, 0x00, 0xde, -0xb6, 0x7b, 0xd1, 0xd7, 0x3c, 0x0e, 0x52, 0x74, 0x43, 0x69, 0x10, 0xe5, -0x14, 0x36, 0x05, 0xaa, 0x6b, 0xc3, 0x4e, 0xa8, 0xe2, 0x04, 0xd5, 0xe2, -0x39, 0xc4, 0x56, 0xa9, 0xac, 0x4f, 0x53, 0x29, 0xcd, 0x63, 0xad, 0x25, -0x5c, 0x39, 0x47, 0xb5, 0x1c, 0x24, 0x50, 0x69, 0x35, 0x4f, 0x93, 0xa7, -0xe1, 0xca, 0x41, 0xf8, 0xef, 0x18, 0x94, 0x2b, 0x75, 0x8f, 0xdb, 0xdf, -0x5a, 0x01, 0xcb, 0x90, 0x72, 0xb2, 0x31, 0xb8, 0x13, 0xfc, 0xfc, 0x2d, -0xf8, 0xbb, 0x7f, 0x0d, 0x12, 0x10, 0x14, 0x97, 0x78, 0xfd, 0xd0, 0x77, -0x78, 0xeb, 0xb5, 0x43, 0xac, 0xad, 0x94, 0x50, 0x8a, 0xc4, 0x80, 0x26, -0x73, 0x00, 0x15, 0x9b, 0xd7, 0x9e, 0x23, 0x1e, 0x63, 0xa0, 0x9c, 0xe5, -0xbb, 0x3b, 0xa1, 0xa7, 0xb3, 0x21, 0x93, 0x56, 0xd0, 0xdb, 0x03, 0xd3, -0x73, 0xf5, 0xa5, 0xa1, 0xb8, 0xcc, 0x49, 0x17, 0x8a, 0x05, 0x69, 0x5f, -0x2f, 0xe8, 0x6d, 0x5f, 0x8f, 0x84, 0x5f, 0xe3, 0x89, 0x1f, 0xdd, 0xc6, -0xfc, 0xbb, 0x93, 0x4e, 0x18, 0xed, 0x3e, 0xdc, 0x4a, 0x81, 0xda, 0x5e, -0x5c, 0xd8, 0xa6, 0x3c, 0x35, 0x37, 0x55, 0x58, 0x5a, 0x86, 0xf5, 0x22, -0x6c, 0xef, 0xa7, 0x6e, 0xf2, 0xae, 0x8e, 0x86, 0x02, 0xe9, 0xa4, 0x99, -0x46, 0x20, 0x61, 0x0d, 0xaf, 0xef, 0x0e, 0xc4, 0x86, 0xbc, 0x7e, 0xe8, -0x7b, 0x75, 0xe1, 0x3f, 0x7e, 0xd3, 0x0d, 0xdc, 0xbc, 0xff, 0x6e, 0x06, -0xae, 0x18, 0xac, 0xe3, 0x2f, 0x36, 0x16, 0xbd, 0x31, 0x9f, 0x90, 0xfa, -0x3c, 0x16, 0xa5, 0xd6, 0x22, 0xe9, 0x35, 0x63, 0x59, 0x98, 0x9b, 0xe5, -0x8d, 0xa3, 0xff, 0x62, 0x7c, 0x7c, 0x84, 0x6a, 0x15, 0xd6, 0xd6, 0xa1, -0xab, 0x43, 0xa1, 0xb4, 0x26, 0xe3, 0xbb, 0x9c, 0xda, 0xac, 0xf3, 0x4f, -0xc7, 0x40, 0xa4, 0x66, 0xa4, 0x8c, 0x84, 0x40, 0x95, 0xe1, 0xd7, 0x0e, -0x3b, 0xe1, 0xf7, 0x5d, 0xcf, 0xfe, 0x07, 0xbe, 0x09, 0x7a, 0x1f, 0xe8, -0x1b, 0x5d, 0x12, 0xf6, 0x03, 0x94, 0x94, 0x81, 0x30, 0x7a, 0x3f, 0x04, -0x29, 0x83, 0x84, 0x6e, 0x5d, 0xca, 0x48, 0xc4, 0xb1, 0x65, 0x90, 0x0a, -0x2a, 0xe2, 0x58, 0x37, 0xa4, 0x52, 0xa2, 0xbf, 0xbd, 0x83, 0x3b, 0x7b, -0xfb, 0x78, 0xf1, 0x85, 0xe7, 0x18, 0x1f, 0x1f, 0xa5, 0x58, 0x82, 0xee, -0x2e, 0x1f, 0x4f, 0x67, 0xb0, 0x52, 0x41, 0xa8, 0x6c, 0x94, 0xbe, 0x15, -0x02, 0x0a, 0x97, 0x12, 0xc5, 0x06, 0xa0, 0x7c, 0x0a, 0x6b, 0xce, 0xe7, -0x6f, 0xbe, 0xeb, 0xf3, 0xa0, 0x3e, 0x01, 0xfa, 0x93, 0x80, 0x05, 0x0c, -0x88, 0x71, 0x1c, 0x1b, 0x61, 0x2e, 0x14, 0x96, 0xa6, 0x38, 0xf2, 0xcc, -0xcf, 0x19, 0x7f, 0xeb, 0x25, 0xfc, 0x5c, 0x27, 0xd7, 0xdd, 0xfc, 0x05, -0x86, 0xee, 0xf8, 0x52, 0xea, 0xd3, 0x8d, 0x22, 0xa3, 0x3c, 0x0f, 0xe9, -0xea, 0x46, 0x99, 0x2a, 0x43, 0xd7, 0xdf, 0xc4, 0xe4, 0xc4, 0x28, 0xd6, -0x82, 0xf6, 0xb3, 0x78, 0xd9, 0x0e, 0x8c, 0x59, 0x07, 0x2a, 0xe7, 0x47, -0x20, 0x5e, 0x70, 0xea, 0x08, 0x48, 0xa5, 0xee, 0xdb, 0x1f, 0xd9, 0xb9, -0x1d, 0xf4, 0x6e, 0x90, 0x00, 0x50, 0x48, 0xf5, 0x38, 0x54, 0x4e, 0x3a, -0xcb, 0x46, 0x2e, 0x51, 0x2e, 0x16, 0x79, 0xf6, 0x57, 0x0f, 0x13, 0x06, -0x01, 0x22, 0x50, 0x2e, 0x16, 0x38, 0xf6, 0xd7, 0x27, 0x58, 0x9b, 0x1a, -0xe6, 0xd6, 0xcf, 0xde, 0x95, 0x72, 0x9f, 0x86, 0x0b, 0x49, 0x54, 0x7a, -0xfb, 0xfa, 0xb6, 0xa2, 0xa2, 0xf2, 0xaa, 0x74, 0x06, 0xaf, 0xad, 0x1d, -0x1d, 0x94, 0x9b, 0x0a, 0x0f, 0xa9, 0x4a, 0x9c, 0x70, 0x63, 0x03, 0x62, -0x43, 0x2a, 0xab, 0xc3, 0x8d, 0x2c, 0x62, 0x23, 0xab, 0x53, 0x42, 0xca, -0x47, 0x20, 0x3c, 0x06, 0x26, 0x8c, 0xf9, 0xb9, 0x70, 0xf4, 0xf9, 0xc3, -0x94, 0x23, 0xe1, 0x85, 0xc6, 0x38, 0x33, 0xfc, 0x26, 0x8b, 0xb3, 0xd3, -0x8d, 0x95, 0x44, 0x89, 0x8f, 0x59, 0x50, 0x04, 0xad, 0x5c, 0xf6, 0x51, -0x5e, 0x96, 0x4c, 0x5b, 0x27, 0xda, 0xcb, 0x36, 0x97, 0x3e, 0x8d, 0x80, -0xb5, 0xd4, 0x53, 0x82, 0x31, 0x20, 0x12, 0x62, 0xca, 0x0b, 0x8d, 0xac, -0x62, 0x0c, 0x48, 0x40, 0x25, 0x28, 0x70, 0xe2, 0xcf, 0x3f, 0x65, 0x69, -0x7a, 0x82, 0x81, 0x5d, 0xbb, 0xd9, 0xf3, 0xa9, 0x5b, 0xc8, 0xb6, 0xe5, -0xc0, 0x0a, 0xd3, 0x63, 0x23, 0xce, 0x5a, 0x71, 0x19, 0x23, 0x39, 0x47, -0xcf, 0x9c, 0xa1, 0xb7, 0xaf, 0x1f, 0xac, 0xb0, 0xb6, 0xb2, 0xc2, 0x91, -0x7f, 0xbc, 0xca, 0xda, 0xca, 0x2a, 0x7b, 0xf6, 0x5e, 0xcb, 0xde, 0x3d, -0x7b, 0xea, 0x2e, 0xa0, 0x23, 0xb3, 0x6a, 0x2f, 0x83, 0x97, 0xed, 0x44, -0xf9, 0x4b, 0x2d, 0x11, 0xd8, 0x18, 0xc4, 0x12, 0x53, 0xc0, 0x06, 0x04, -0x0b, 0x47, 0x1b, 0xa9, 0xd2, 0x18, 0x2a, 0xa5, 0x39, 0x5e, 0xfc, 0xcd, -0x37, 0x58, 0x3c, 0x77, 0x0a, 0x11, 0x98, 0x1e, 0x3d, 0xcb, 0xc4, 0xa9, -0xb7, 0xf8, 0xdc, 0x7d, 0xdf, 0x02, 0xb1, 0x14, 0x96, 0x97, 0x1a, 0xe9, -0x38, 0xa5, 0x48, 0xad, 0x27, 0x58, 0x98, 0x9d, 0xe5, 0xf0, 0x53, 0x7f, -0x24, 0x08, 0x42, 0x44, 0x60, 0x72, 0x72, 0x8a, 0xa9, 0xc9, 0x49, 0xee, -0xb8, 0xfd, 0x76, 0x17, 0x13, 0x91, 0x11, 0xb5, 0x9f, 0xc3, 0x6f, 0xeb, -0x40, 0xe9, 0x4c, 0x4b, 0x04, 0x12, 0x2e, 0x24, 0xb1, 0xee, 0xd1, 0x58, -0xe7, 0x42, 0xd6, 0x9a, 0xba, 0x02, 0x62, 0x2c, 0xa7, 0x5e, 0x79, 0x8c, -0x85, 0xa9, 0x53, 0x09, 0xeb, 0x2e, 0xce, 0xbc, 0xcb, 0xd9, 0x37, 0x8f, -0x82, 0xb5, 0x74, 0x74, 0xe7, 0x93, 0x96, 0x4f, 0x0c, 0x37, 0x39, 0xfa, -0xcf, 0x57, 0x09, 0x83, 0x30, 0xa1, 0xe0, 0xdb, 0x6f, 0x9f, 0x62, 0x7e, -0x6e, 0xbe, 0x8e, 0x80, 0xd6, 0xe0, 0x65, 0xdb, 0xf1, 0x32, 0xed, 0xa8, -0xd6, 0x5d, 0x7f, 0x2a, 0x06, 0x24, 0x19, 0x5b, 0x62, 0x03, 0x4a, 0x73, -0x6f, 0x02, 0x91, 0x67, 0x19, 0xc3, 0xcc, 0xd9, 0x23, 0x1b, 0x5b, 0x65, -0x81, 0xf1, 0xd3, 0x27, 0xc1, 0x58, 0x06, 0x06, 0xaf, 0xda, 0xe0, 0x3a, -0x35, 0xda, 0x31, 0xb8, 0x0b, 0xac, 0x65, 0x6a, 0x72, 0xb2, 0x11, 0x23, -0x31, 0x25, 0xce, 0x8e, 0x8c, 0xba, 0x6f, 0x45, 0x06, 0xf3, 0xb3, 0x9d, -0x68, 0x2f, 0x87, 0x6c, 0x72, 0xee, 0x3a, 0x6f, 0x10, 0x57, 0xc3, 0x42, -0xbd, 0xaa, 0x62, 0x0d, 0xd6, 0xda, 0x84, 0xe0, 0xb5, 0xb3, 0x42, 0x39, -0x28, 0x81, 0x35, 0x5c, 0x77, 0xe3, 0xa7, 0x13, 0xc2, 0xc7, 0x95, 0xe9, -0xec, 0xe8, 0x04, 0x6b, 0x09, 0x83, 0xb0, 0xb1, 0xc7, 0xc6, 0xae, 0xba, -0x16, 0xc4, 0x5e, 0xb6, 0x0b, 0x2f, 0xd3, 0x8e, 0x34, 0xea, 0xf6, 0xf9, -0x11, 0xa8, 0xbb, 0x90, 0x01, 0x6b, 0xcb, 0x94, 0x56, 0x26, 0x12, 0x31, -0xd0, 0x91, 0xef, 0x6f, 0x58, 0x3f, 0x76, 0x00, 0xd9, 0x75, 0xf5, 0x1e, -0x30, 0x96, 0x97, 0x9f, 0x3b, 0xec, 0x90, 0x6c, 0xe2, 0x42, 0x4f, 0x3d, -0xf9, 0x7b, 0xca, 0x41, 0x89, 0x1d, 0x3b, 0x07, 0x9b, 0xba, 0x58, 0xff, -0xd6, 0xad, 0x0e, 0x01, 0xed, 0x46, 0x26, 0xd7, 0x83, 0xf6, 0xb7, 0xa4, -0xc5, 0x6c, 0xad, 0x80, 0xa4, 0xba, 0x81, 0xca, 0xfa, 0x39, 0x4c, 0xd4, -0x25, 0xd6, 0x5c, 0x68, 0xf7, 0x0d, 0xb7, 0x26, 0xad, 0x1f, 0xcd, 0x07, -0x76, 0xee, 0xe2, 0xcc, 0xf0, 0x71, 0x16, 0x66, 0x67, 0x9a, 0x9f, 0xc2, -0x04, 0xc2, 0x20, 0xe4, 0x95, 0x97, 0x5e, 0x62, 0xef, 0xde, 0x6b, 0x37, -0x66, 0x29, 0x81, 0xc1, 0x9d, 0x3b, 0x12, 0x08, 0x64, 0xb6, 0xe4, 0xf1, -0x32, 0x9d, 0x88, 0xb4, 0x56, 0x60, 0xd3, 0x34, 0x5a, 0x2e, 0xcc, 0x62, -0x4d, 0xa3, 0x31, 0x13, 0x63, 0x78, 0xe7, 0xe8, 0xcb, 0xf5, 0x6c, 0x25, -0x34, 0xf8, 0x0b, 0xcf, 0x3c, 0xe5, 0x8c, 0x90, 0xf2, 0xff, 0xf8, 0x33, -0x02, 0x23, 0x67, 0x47, 0x98, 0x9b, 0x9d, 0xdf, 0x88, 0x10, 0xf0, 0xa7, -0xa7, 0x9f, 0xe5, 0x6b, 0x5f, 0xbe, 0x07, 0xad, 0xdd, 0xb3, 0xdf, 0xd6, -0x83, 0xf6, 0xdb, 0x11, 0x69, 0xed, 0x42, 0x9b, 0xa6, 0xd1, 0xd2, 0xf2, -0x78, 0x02, 0x81, 0xe9, 0xf1, 0x31, 0x4e, 0xff, 0xfb, 0xef, 0x1b, 0x84, -0x07, 0x58, 0x5b, 0x59, 0x69, 0x54, 0xf2, 0x16, 0x4a, 0x20, 0x10, 0x04, -0x21, 0xc5, 0x52, 0x98, 0xc8, 0xeb, 0xb5, 0x77, 0x66, 0xe7, 0x17, 0x38, -0xf9, 0x9f, 0x33, 0xf5, 0xc2, 0x99, 0xc9, 0xf5, 0xa2, 0xb4, 0xbf, 0x69, -0x10, 0x6f, 0x40, 0xa0, 0xa6, 0xab, 0x35, 0x50, 0x09, 0x0a, 0x18, 0xd3, -0x58, 0x3b, 0x79, 0xfc, 0x88, 0x4b, 0xb5, 0xb5, 0x0f, 0xcb, 0x46, 0x9e, -0x3e, 0x3f, 0x37, 0x43, 0x22, 0xde, 0xb6, 0xa7, 0xd7, 0x86, 0x4f, 0x9e, -0xa6, 0x63, 0x8b, 0xdb, 0xcb, 0xe4, 0x7a, 0xb0, 0x56, 0x36, 0x75, 0xa1, -0x64, 0x0c, 0x44, 0xfe, 0x6a, 0xc5, 0xc5, 0x40, 0x61, 0x7e, 0x14, 0x53, -0x73, 0x2b, 0x05, 0x85, 0xd5, 0xb5, 0x8d, 0xb7, 0x06, 0x31, 0x9e, 0x8e, -0x8b, 0xd6, 0xf5, 0xa0, 0xf5, 0x7b, 0xeb, 0xc5, 0x62, 0x2c, 0x8d, 0xf6, -0xa0, 0x74, 0x16, 0xa5, 0xde, 0x4b, 0x0c, 0x44, 0x64, 0x0c, 0x84, 0x85, -0x65, 0x8c, 0x81, 0x6c, 0x16, 0xaa, 0x15, 0x10, 0xab, 0x92, 0xd6, 0xab, -0x59, 0x3a, 0xcd, 0x63, 0x56, 0x4f, 0x3f, 0x9f, 0x0f, 0x95, 0x9d, 0xdb, -0xb3, 0x88, 0x71, 0x29, 0x34, 0xb3, 0xa5, 0x8f, 0x72, 0x50, 0x42, 0xea, -0x7d, 0xfe, 0x79, 0x10, 0xa8, 0x59, 0xdf, 0x4a, 0x4d, 0x81, 0x55, 0xac, -0x81, 0xbe, 0x1e, 0xb7, 0x3f, 0x33, 0x3b, 0xc3, 0xc0, 0xc0, 0x76, 0xba, -0xbb, 0xf3, 0xc9, 0x7b, 0x9c, 0x88, 0x67, 0xfc, 0x6c, 0xa2, 0x36, 0xc4, -0x11, 0xad, 0x09, 0x98, 0xcd, 0x66, 0x9b, 0x0a, 0xde, 0xd7, 0xdb, 0xc3, -0xbe, 0xeb, 0xb7, 0x81, 0xcc, 0xa1, 0x34, 0x6c, 0xfd, 0xe8, 0xed, 0x64, -0x73, 0xbd, 0x54, 0xc2, 0x22, 0xc6, 0x94, 0xdf, 0x3b, 0x02, 0x41, 0xe8, -0xae, 0x51, 0x00, 0x7a, 0xf3, 0xb0, 0x5a, 0x80, 0xb0, 0x0c, 0x33, 0x33, -0xd3, 0x0e, 0x5e, 0x2f, 0xea, 0x18, 0xb5, 0x83, 0x5b, 0x2b, 0x50, 0xaa, -0x4c, 0xae, 0xcd, 0xb5, 0x01, 0x35, 0x37, 0x88, 0xbf, 0xe3, 0x9e, 0xcb, -0x89, 0xa3, 0x68, 0x7d, 0x9f, 0x15, 0xaa, 0x95, 0x15, 0xb4, 0x82, 0x6c, -0xc7, 0x0e, 0xae, 0xf9, 0xcc, 0x83, 0x88, 0x68, 0xd6, 0x97, 0xce, 0x51, -0x2a, 0xac, 0x5d, 0x18, 0x02, 0xf1, 0x5e, 0x68, 0x79, 0xc5, 0xa1, 0x60, -0x8c, 0x73, 0x83, 0x5d, 0x3b, 0xa0, 0x3f, 0x0f, 0x99, 0x48, 0xe5, 0x7a, -0x75, 0x6e, 0xb0, 0xc6, 0x7a, 0x0b, 0x4a, 0xbf, 0x17, 0x3f, 0x37, 0x3b, -0x9f, 0xef, 0xa2, 0xff, 0x63, 0x77, 0x33, 0x74, 0xcf, 0x1f, 0xc8, 0xf5, -0x5c, 0xc9, 0xea, 0xdc, 0x18, 0x8b, 0x93, 0x27, 0x58, 0x5e, 0x5c, 0x68, -0xf9, 0x37, 0x5b, 0xa6, 0xd1, 0xd9, 0x05, 0x77, 0x2f, 0xe3, 0xc5, 0x54, -0xec, 0xe9, 0x56, 0xe4, 0x7b, 0x5c, 0xa7, 0xa5, 0xb4, 0x46, 0x29, 0x0f, -0xa5, 0xb5, 0xb3, 0x83, 0x72, 0xcf, 0x68, 0x1f, 0xa5, 0x7d, 0x77, 0x18, -0xc9, 0x6c, 0x41, 0xfb, 0x6d, 0x28, 0xdd, 0x86, 0x9f, 0xed, 0x40, 0x67, -0xb6, 0xa0, 0xfd, 0x76, 0xfc, 0x5c, 0x0f, 0x9e, 0xdf, 0x8e, 0x97, 0xe9, -0x20, 0x93, 0xeb, 0xc5, 0x6f, 0xeb, 0xc6, 0xf3, 0x3b, 0x68, 0xeb, 0xdc, -0x46, 0x5b, 0xfb, 0x00, 0xd6, 0x08, 0x8b, 0x13, 0x27, 0x98, 0x7a, 0xfb, -0x2f, 0x2c, 0x4c, 0x9e, 0x60, 0x69, 0xb9, 0x78, 0x81, 0x0a, 0x58, 0x8e, -0x11, 0x5d, 0x5b, 0x84, 0x21, 0x9c, 0x1d, 0x83, 0xab, 0xae, 0x68, 0x28, -0xa1, 0x14, 0x68, 0xdf, 0x43, 0x2b, 0x1f, 0xe5, 0xf9, 0x78, 0x7e, 0x16, -0xe5, 0x39, 0x81, 0xb5, 0x9f, 0x41, 0x7b, 0x59, 0xb4, 0xdf, 0x86, 0xf6, -0x73, 0x68, 0xaf, 0x0d, 0xe5, 0x65, 0xd1, 0x5e, 0x16, 0xa5, 0x6b, 0x6b, -0x6e, 0x5d, 0xfb, 0xed, 0xd1, 0x3c, 0xe7, 0xf2, 0xbc, 0x15, 0x4c, 0xb5, -0x4c, 0x69, 0x65, 0x9a, 0xb5, 0xb9, 0x71, 0xd6, 0x16, 0xc6, 0x59, 0x18, -0x7f, 0x83, 0xf9, 0xc9, 0xe3, 0x8c, 0x8d, 0xcd, 0x50, 0xad, 0x26, 0x82, -0xf8, 0xd8, 0x66, 0x08, 0x3c, 0x4d, 0xec, 0xde, 0xa5, 0x18, 0xc0, 0x3b, -0xa3, 0xee, 0x96, 0xac, 0xb3, 0xdd, 0x65, 0x23, 0x51, 0x0e, 0x24, 0x55, -0x05, 0x94, 0x8b, 0x56, 0xad, 0x0d, 0x56, 0x34, 0xca, 0x54, 0xf0, 0x8c, -0x46, 0x1b, 0x05, 0xda, 0x00, 0x21, 0x28, 0x0f, 0x88, 0x86, 0xf2, 0x80, -0x5a, 0x61, 0xf2, 0x41, 0xf9, 0x80, 0x46, 0x29, 0x1f, 0xa5, 0x32, 0xa0, -0x34, 0xa6, 0x5a, 0x61, 0x6d, 0x61, 0x8a, 0xe9, 0xf1, 0xd3, 0xcc, 0xcd, -0xcc, 0x51, 0xa9, 0x5a, 0x52, 0xf4, 0x74, 0x4b, 0x05, 0xc4, 0x72, 0x10, -0x38, 0x00, 0x8d, 0xeb, 0xc5, 0x72, 0x19, 0xce, 0xcd, 0xd6, 0xdf, 0x00, -0x29, 0x23, 0x94, 0x1b, 0x8f, 0xb5, 0x9d, 0x54, 0x51, 0xfb, 0x80, 0x68, -0x19, 0x38, 0x18, 0x5f, 0x48, 0x04, 0xf1, 0x43, 0x8f, 0xcb, 0x8a, 0x15, -0x0e, 0xd4, 0xd3, 0x69, 0xd4, 0xd8, 0x49, 0x34, 0xe2, 0xc5, 0x2a, 0x3d, -0x8f, 0xd7, 0x87, 0x0f, 0x90, 0x0e, 0xfc, 0xe0, 0x49, 0x59, 0x89, 0x2f, -0x34, 0xfd, 0xff, 0xc0, 0x4f, 0xbe, 0xaa, 0xee, 0xc3, 0x69, 0x9a, 0x8f, -0xaf, 0x7f, 0x08, 0x02, 0xb6, 0xa2, 0x65, 0x9c, 0xf0, 0xbf, 0x4b, 0x6f, -0x34, 0x55, 0x00, 0xe0, 0xc7, 0x5f, 0x51, 0x3d, 0x38, 0x77, 0xda, 0x4f, -0xea, 0x3e, 0xf2, 0x43, 0xa4, 0x63, 0x38, 0x9f, 0x3f, 0x98, 0xb6, 0x7c, -0x8d, 0x5a, 0x2a, 0x70, 0xa9, 0xd0, 0x25, 0xff, 0x4f, 0xbe, 0xcb, 0x0a, -0x5c, 0x6c, 0xba, 0xac, 0xc0, 0xc5, 0xa6, 0xff, 0x01, 0x9c, 0xeb, 0xc5, -0xd9, 0xf7, 0xbc, 0x76, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_help.c b/Source/Core/DolphinWX/resources/toolbar_help.c deleted file mode 100644 index cc0ee5979c..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_help.c +++ /dev/null @@ -1,306 +0,0 @@ -static const unsigned char toolbar_help_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0d, 0x87, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x79, 0x8c, 0x5e, 0xd5, 0x79, -0xc6, 0x7f, 0xef, 0x39, 0x77, 0xf9, 0x96, 0xd9, 0xbc, 0x60, 0xb0, 0x01, -0x63, 0xb3, 0x43, 0xb0, 0xec, 0xb6, 0x41, 0xcd, 0x62, 0xc0, 0x04, 0x04, -0xaa, 0x48, 0x30, 0x25, 0x8d, 0x02, 0x6e, 0xab, 0xd8, 0x21, 0xa4, 0x49, -0x93, 0x02, 0x8a, 0xd4, 0x26, 0x55, 0xdb, 0x64, 0xa0, 0x8b, 0x5b, 0x45, -0x6a, 0x9c, 0x45, 0x28, 0x49, 0x17, 0x4c, 0x5a, 0xfa, 0x47, 0x91, 0x5a, -0x20, 0x0d, 0x90, 0x88, 0x76, 0x6c, 0x52, 0xb6, 0x84, 0x80, 0x5d, 0x1b, -0x82, 0xeb, 0x05, 0x0f, 0xe3, 0x05, 0xc6, 0xc6, 0xf6, 0xd8, 0x33, 0xdf, -0x72, 0xef, 0x39, 0xe7, 0xed, 0x1f, 0xf7, 0x7e, 0x9f, 0xc7, 0xe3, 0x05, -0x1b, 0xa2, 0x46, 0x1c, 0xcd, 0xd1, 0x77, 0x46, 0x73, 0xe7, 0xdc, 0xe7, -0x39, 0xcf, 0xf3, 0xbe, 0xe7, 0x3d, 0x67, 0x46, 0x54, 0x95, 0x77, 0x73, -0x33, 0xbf, 0x6c, 0x00, 0xef, 0xb4, 0x45, 0xbf, 0xcc, 0x97, 0xff, 0xe3, -0xc7, 0x7a, 0xa4, 0x33, 0xfe, 0xe4, 0x83, 0xe3, 0x6f, 0xcb, 0x0a, 0xf2, -0x8b, 0xb2, 0xd0, 0x0f, 0x7f, 0x57, 0xe6, 0xa9, 0xb2, 0x24, 0xc0, 0x92, -0x10, 0x98, 0x17, 0x60, 0x61, 0x50, 0x06, 0x82, 0x82, 0x0f, 0x10, 0x94, -0xed, 0x41, 0x19, 0x0e, 0xca, 0x1a, 0xaf, 0xac, 0x77, 0xb6, 0xfe, 0xf0, -0x31, 0xa6, 0x51, 0x38, 0x35, 0x32, 0xef, 0x88, 0xc0, 0xd0, 0x72, 0x19, -0x50, 0xb8, 0x29, 0x28, 0x77, 0xaa, 0xb2, 0x28, 0x28, 0x1c, 0xab, 0xfb, -0xc9, 0xe3, 0xd0, 0x1d, 0x1f, 0xf0, 0xca, 0x23, 0x41, 0xe5, 0x9f, 0x4c, -0x52, 0x5b, 0x5b, 0x82, 0xef, 0x74, 0x00, 0x3d, 0x19, 0x22, 0x6f, 0x9b, -0xc0, 0x93, 0x9f, 0x94, 0x41, 0x2d, 0x80, 0x0f, 0x04, 0xa0, 0x12, 0x43, -0x4f, 0x05, 0xfa, 0x6b, 0x45, 0x60, 0xd5, 0x62, 0xd0, 0x50, 0xf4, 0xcc, -0xc1, 0x78, 0x1b, 0x0e, 0xb6, 0x60, 0x7f, 0x13, 0xf6, 0xb5, 0x21, 0xf3, -0x87, 0xc9, 0x78, 0xe5, 0x49, 0x45, 0xfe, 0x30, 0x4e, 0x6b, 0xeb, 0x4a, -0x02, 0xa1, 0x43, 0xe6, 0xad, 0x48, 0x9c, 0x72, 0x0c, 0x3c, 0x75, 0x9b, -0x2c, 0x01, 0xee, 0x33, 0xc2, 0x3c, 0x63, 0x60, 0x5a, 0x0f, 0xcc, 0x3e, -0xf7, 0x02, 0xaa, 0xf3, 0x3e, 0x80, 0x9d, 0x71, 0x09, 0x26, 0xe9, 0xc3, -0x24, 0x75, 0x70, 0x2d, 0xc8, 0x1b, 0xb8, 0x7d, 0xdb, 0x70, 0xfb, 0x87, -0xe9, 0xdd, 0xb3, 0x95, 0x81, 0xdd, 0x5b, 0x98, 0x93, 0xb5, 0x69, 0x67, -0xb0, 0xb7, 0x09, 0x5b, 0xc7, 0xa0, 0xe1, 0x04, 0x81, 0x2b, 0x83, 0xf2, -0x5c, 0xbb, 0xd5, 0xf8, 0xab, 0xb4, 0x52, 0xfb, 0x73, 0x40, 0x4a, 0x12, -0x1d, 0x22, 0xc7, 0x6d, 0xa7, 0xa4, 0xc0, 0xd3, 0xb7, 0xc9, 0xa0, 0x08, -0x5f, 0x01, 0x98, 0xd1, 0x0f, 0x67, 0x7f, 0xe0, 0x66, 0xd2, 0x4b, 0x6f, -0xc1, 0xf4, 0xce, 0x05, 0xd7, 0x80, 0xbc, 0x59, 0xf4, 0x13, 0x8c, 0x1b, -0x23, 0x1b, 0x18, 0xdb, 0xf6, 0x02, 0xd9, 0xc4, 0x04, 0xde, 0x0b, 0x23, -0x87, 0x60, 0xdb, 0x21, 0x68, 0x97, 0x16, 0x53, 0xe5, 0xc7, 0x62, 0xec, -0xc7, 0x2b, 0x69, 0xfa, 0x26, 0xe0, 0x81, 0x70, 0x22, 0x15, 0x4e, 0x5a, -0x81, 0xa7, 0x6e, 0x93, 0xfb, 0xac, 0xb0, 0x3c, 0x89, 0xe1, 0xbc, 0x85, -0x97, 0xd1, 0x7b, 0xdd, 0x57, 0x31, 0xfd, 0xe7, 0x96, 0xc0, 0x9a, 0x84, -0xfd, 0x9b, 0x71, 0x23, 0x6b, 0xf1, 0x6f, 0xac, 0x23, 0x1c, 0x1a, 0xc5, -0x4d, 0xec, 0x45, 0x3d, 0x84, 0x00, 0xa6, 0x76, 0x3a, 0xb6, 0x3a, 0x93, -0xa8, 0xf7, 0x74, 0x2a, 0x33, 0xe7, 0x52, 0x9b, 0x31, 0x87, 0x83, 0xaf, -0xbd, 0xc4, 0xde, 0xcd, 0x2f, 0x31, 0xa7, 0x0e, 0x03, 0x09, 0x6c, 0xdc, -0x0f, 0x07, 0x1d, 0x28, 0x5c, 0xe1, 0xbd, 0xff, 0x61, 0xb3, 0xd5, 0xbe, -0xbe, 0x5a, 0x49, 0xdf, 0xe4, 0xc8, 0xb8, 0x78, 0x7b, 0x0a, 0xfc, 0xf7, -0x6d, 0x72, 0x9f, 0x11, 0x96, 0xd7, 0x53, 0xb8, 0xe8, 0x23, 0x9f, 0xa1, -0xb2, 0xf8, 0xcb, 0x85, 0x45, 0x5c, 0x0b, 0xbf, 0xe9, 0x5f, 0x71, 0x9b, -0xfe, 0x99, 0xb0, 0x6f, 0x0b, 0x68, 0x01, 0xb8, 0xe3, 0xfd, 0x50, 0x12, -0x50, 0x5f, 0x8c, 0x7d, 0xf9, 0x99, 0xce, 0x98, 0x47, 0xdf, 0xec, 0xf3, -0xf0, 0xcd, 0x71, 0x46, 0x36, 0xbc, 0x80, 0xcb, 0x1d, 0xc1, 0xc3, 0x2b, -0x07, 0x61, 0x77, 0xab, 0x1b, 0xec, 0x1b, 0xac, 0xb5, 0xd7, 0xd5, 0xab, -0xe9, 0x5e, 0xc0, 0x1f, 0x4f, 0x85, 0xb7, 0x54, 0xe0, 0xc9, 0x15, 0x72, -0x9f, 0x31, 0x2c, 0xef, 0xab, 0xc3, 0x45, 0xbf, 0xfd, 0x35, 0xe2, 0x8b, -0x3f, 0x06, 0xae, 0x8d, 0xee, 0xf9, 0x1f, 0xdc, 0xd3, 0x5f, 0x44, 0x0f, -0x6c, 0x42, 0x14, 0x8c, 0x2d, 0x40, 0x1b, 0x0a, 0xe3, 0xa2, 0x20, 0x52, -0x74, 0x2d, 0x3f, 0xa5, 0xfc, 0x61, 0x63, 0xcf, 0x30, 0x87, 0x76, 0x0f, -0xd3, 0x7b, 0xc6, 0x7c, 0xce, 0xbe, 0xf4, 0x52, 0xb6, 0x6f, 0x78, 0x99, -0xe0, 0x3d, 0x17, 0xd4, 0xa1, 0xe9, 0x95, 0x7d, 0x19, 0x00, 0x0b, 0x72, -0xe7, 0xff, 0x0e, 0xf8, 0x2d, 0x4e, 0x10, 0x0b, 0x27, 0xdc, 0x89, 0x87, -0x96, 0xcb, 0x9d, 0x0a, 0xcb, 0x2b, 0x09, 0x5c, 0x78, 0xcb, 0xdf, 0x10, -0x5f, 0x70, 0x23, 0xb8, 0x26, 0x7e, 0xe3, 0x77, 0x71, 0x8f, 0xdd, 0x84, -0x1c, 0xdc, 0x84, 0xb1, 0x74, 0xbb, 0xd8, 0x02, 0xa4, 0x48, 0x31, 0x73, -0x67, 0x2c, 0x02, 0x48, 0x11, 0x99, 0x42, 0x49, 0x0a, 0xd8, 0xb7, 0xf3, -0x55, 0x76, 0x6d, 0xdb, 0xca, 0x9c, 0x73, 0xcf, 0x29, 0x7c, 0x22, 0x70, -0x49, 0x8f, 0x50, 0x39, 0x8c, 0xea, 0xc3, 0xfb, 0x0e, 0x36, 0xee, 0x00, -0xcc, 0xe4, 0x4d, 0x6f, 0x72, 0x3b, 0xae, 0x85, 0x9e, 0xf8, 0x84, 0x2c, -0x32, 0xc2, 0x8b, 0xb1, 0x85, 0x5f, 0xbb, 0xee, 0x46, 0x6a, 0x57, 0xff, -0x25, 0x20, 0xe4, 0x4f, 0xff, 0x09, 0x3a, 0xfc, 0x70, 0x01, 0xb8, 0x04, -0xa8, 0x0a, 0xad, 0x4c, 0xd8, 0x30, 0x92, 0xb0, 0x65, 0x34, 0x66, 0xcf, -0xb8, 0xa5, 0xed, 0x0e, 0xbf, 0x6f, 0x76, 0xaf, 0x63, 0x46, 0xea, 0x79, -0xcf, 0x8c, 0x36, 0x35, 0x13, 0x70, 0x5e, 0xc8, 0x1d, 0x38, 0x07, 0xce, -0x0b, 0x71, 0x52, 0xa5, 0xd2, 0xd3, 0xc3, 0xe8, 0xce, 0x3d, 0x10, 0x60, -0x2c, 0x83, 0xf5, 0x87, 0x14, 0x1f, 0xc0, 0x2b, 0x63, 0x22, 0x72, 0xf9, -0xf4, 0xde, 0xea, 0x96, 0x63, 0xd9, 0xe8, 0xb8, 0x16, 0x52, 0xe5, 0x3e, -0x05, 0x2e, 0x38, 0x6f, 0x36, 0xd5, 0xcb, 0xff, 0x00, 0x5c, 0x93, 0xec, -0x99, 0x7b, 0xd0, 0xe1, 0xff, 0xc0, 0xd8, 0x92, 0xbd, 0x14, 0x2b, 0xff, -0x93, 0x2d, 0x29, 0x4f, 0x6d, 0xae, 0x20, 0xe9, 0x00, 0x0b, 0xae, 0x5d, -0xc6, 0x95, 0xef, 0xbb, 0x81, 0xd3, 0xe7, 0x2f, 0x20, 0xad, 0xf7, 0x75, -0xe7, 0x7b, 0x6d, 0xe3, 0x53, 0x8c, 0x6e, 0xdb, 0xc0, 0xd6, 0xb5, 0x5f, -0xe7, 0x12, 0x36, 0x15, 0xef, 0x28, 0xde, 0x43, 0xa3, 0xd1, 0xc4, 0x05, -0x21, 0x4a, 0x53, 0xb2, 0x66, 0x46, 0x5f, 0xa4, 0xcc, 0x4a, 0x84, 0xdd, -0x6d, 0x05, 0xa5, 0xdf, 0x05, 0xfd, 0x33, 0x60, 0x39, 0xc7, 0xb0, 0xd1, -0x31, 0x15, 0x78, 0xfc, 0x77, 0xe4, 0x13, 0x46, 0x58, 0x3d, 0xbd, 0x07, -0x16, 0xde, 0x7a, 0x0f, 0xf1, 0xdc, 0x2b, 0x71, 0xaf, 0x3e, 0x4e, 0xfe, -0xfc, 0x5f, 0x23, 0x93, 0x2d, 0x63, 0xe0, 0xb1, 0x0d, 0x35, 0x36, 0xee, -0x48, 0xb8, 0x7c, 0xe9, 0x67, 0xb9, 0x62, 0xd9, 0x97, 0x48, 0x6a, 0x7d, -0x47, 0xcd, 0x37, 0xb5, 0xbd, 0xf2, 0xd8, 0xbd, 0x54, 0x1e, 0xff, 0x3c, -0xb9, 0x83, 0xdc, 0x09, 0xce, 0x17, 0x4a, 0x88, 0x58, 0x5c, 0xe6, 0x91, -0xa0, 0x64, 0x1e, 0x9e, 0x3d, 0x58, 0xaa, 0x10, 0x14, 0x55, 0x39, 0xff, -0x8f, 0x9f, 0x08, 0x5b, 0x4f, 0x4a, 0x81, 0x00, 0x83, 0x00, 0xe7, 0x5e, -0x7a, 0x19, 0xf1, 0x19, 0xbf, 0x4a, 0x18, 0xdb, 0x4e, 0xfb, 0x85, 0x6f, -0x22, 0x0a, 0x52, 0xe4, 0x6a, 0x34, 0xc0, 0xc6, 0x9d, 0x09, 0x1b, 0x77, -0x24, 0xdc, 0x70, 0xd7, 0xbd, 0x2c, 0xb8, 0xe6, 0xd6, 0x62, 0x55, 0x0f, -0x0e, 0x93, 0x3f, 0xbf, 0x0a, 0x37, 0xbc, 0x06, 0xbf, 0x6b, 0x1d, 0xc1, -0x83, 0xc6, 0x03, 0xd8, 0xb9, 0x4b, 0xc8, 0xdf, 0xfb, 0x05, 0xa6, 0x5f, -0x74, 0x05, 0x17, 0xff, 0xc6, 0xef, 0xb3, 0xf7, 0x8c, 0xb3, 0xd9, 0xff, -0xf7, 0x4b, 0xcb, 0x1c, 0x29, 0x28, 0xe0, 0x9c, 0x2f, 0xe6, 0x10, 0x43, -0x22, 0x81, 0x19, 0x91, 0x30, 0x9a, 0x29, 0x20, 0x04, 0xf4, 0x0e, 0xe0, -0xce, 0xa9, 0x58, 0x8f, 0x0a, 0xe2, 0xef, 0x2f, 0x93, 0xa5, 0xaa, 0xcc, -0x9b, 0x51, 0x87, 0xfa, 0xfc, 0x2b, 0xc0, 0xb5, 0x68, 0x3d, 0x7f, 0x2f, -0xda, 0x9e, 0xe8, 0x02, 0xef, 0xa4, 0xc5, 0x9f, 0x6d, 0x4f, 0x59, 0x70, -0xcd, 0xb2, 0x2e, 0x78, 0xff, 0xd2, 0xfd, 0xb4, 0x57, 0x2f, 0x22, 0xff, -0xe9, 0x2a, 0xc2, 0xee, 0x75, 0xc5, 0xb3, 0x0a, 0xa1, 0x79, 0x80, 0xec, -0xe5, 0x87, 0xf0, 0xab, 0xaf, 0xe4, 0x67, 0x0f, 0xae, 0x04, 0x60, 0xe6, -0xaf, 0x7c, 0x84, 0xde, 0x5f, 0x5f, 0x0e, 0xe5, 0x82, 0x04, 0x04, 0xc5, -0xa0, 0x65, 0x60, 0xa9, 0x18, 0x66, 0xc6, 0x9d, 0x0c, 0x00, 0x28, 0x4b, -0x8f, 0x15, 0xc8, 0x47, 0x11, 0x50, 0x58, 0xae, 0x0a, 0xa7, 0x0d, 0xd4, -0x48, 0xcf, 0x7e, 0x1f, 0x6e, 0xf7, 0x8b, 0xe4, 0x3b, 0x7f, 0xd2, 0x05, -0x1f, 0x26, 0xe5, 0xf8, 0x3d, 0xe3, 0x96, 0xcb, 0x97, 0x7e, 0xb6, 0x50, -0x6d, 0x6c, 0x98, 0x6d, 0xff, 0xf2, 0x29, 0x7c, 0xf3, 0x40, 0x17, 0x78, -0xa7, 0x33, 0x49, 0xb5, 0x3d, 0x8f, 0xde, 0xc3, 0xe8, 0xab, 0x1b, 0x01, -0x98, 0xf6, 0xa1, 0x3b, 0x8b, 0xdd, 0x97, 0x22, 0xd7, 0x86, 0x12, 0x78, -0x41, 0xc2, 0x30, 0x23, 0x12, 0x8c, 0x08, 0x22, 0x82, 0xc2, 0x39, 0x3b, -0xf6, 0x4e, 0x2c, 0x3a, 0x21, 0x81, 0x7f, 0xbb, 0x45, 0x06, 0x82, 0x72, -0x53, 0x1c, 0xc1, 0xf4, 0x39, 0xe7, 0x83, 0x6b, 0xd1, 0x7e, 0x75, 0xe8, -0x08, 0xe0, 0x93, 0xc7, 0x00, 0xb3, 0xe6, 0x5f, 0x06, 0xc0, 0xe6, 0xb5, -0x0f, 0xf0, 0x83, 0xad, 0x67, 0xf2, 0xa2, 0x5c, 0x7f, 0xd4, 0xf3, 0x53, -0x89, 0xfc, 0xef, 0xb3, 0x3f, 0x00, 0x20, 0x3d, 0x6b, 0x61, 0x37, 0x90, -0x15, 0x83, 0x88, 0x01, 0xb1, 0x88, 0xb1, 0x60, 0x2d, 0xd6, 0x1a, 0x7a, -0xad, 0xe9, 0x46, 0x6e, 0x80, 0xa5, 0x27, 0x24, 0xa0, 0xca, 0x55, 0xaa, -0xd0, 0x13, 0x43, 0x34, 0x7d, 0x3e, 0xda, 0xdc, 0x4f, 0x6b, 0xfb, 0xd3, -0x47, 0xee, 0xac, 0x93, 0xfa, 0xc5, 0xb3, 0xb2, 0xee, 0xef, 0xfa, 0x9e, -0xf9, 0x5c, 0x73, 0xfb, 0x4a, 0x16, 0xff, 0xd1, 0xe3, 0xa4, 0x1f, 0x5e, -0x7d, 0x18, 0xfc, 0x14, 0x22, 0x5b, 0xc6, 0x92, 0x23, 0x00, 0x84, 0x20, -0x85, 0x7d, 0xc4, 0xa0, 0x62, 0xc1, 0x46, 0x88, 0x8d, 0x11, 0xb1, 0x88, -0x58, 0x2a, 0x46, 0x90, 0x32, 0x46, 0x80, 0x85, 0x27, 0x24, 0x10, 0xca, -0x9a, 0xbe, 0x2f, 0x81, 0xa8, 0xe7, 0x34, 0xb2, 0xd7, 0x5f, 0x3a, 0xbc, -0x9a, 0x9e, 0xa3, 0x88, 0x7c, 0x70, 0x6e, 0x93, 0xad, 0x3f, 0x7e, 0x00, -0x80, 0x4b, 0x3f, 0x74, 0x2b, 0x17, 0xbe, 0xff, 0x06, 0x00, 0x24, 0x1d, -0xe8, 0xd6, 0x41, 0x9d, 0xdf, 0x69, 0x3b, 0xe1, 0x3f, 0x77, 0xd4, 0x99, -0x70, 0x86, 0x05, 0xd7, 0x2c, 0x03, 0xa0, 0x35, 0xb2, 0xbe, 0x78, 0x06, -0x5b, 0xd8, 0xc6, 0x44, 0x88, 0x8d, 0x90, 0x28, 0x46, 0xa2, 0x08, 0x31, -0x86, 0xde, 0xc8, 0x80, 0x74, 0xf3, 0xe7, 0xc0, 0x89, 0x15, 0x80, 0x25, -0x41, 0x21, 0x16, 0x48, 0xfa, 0x67, 0x93, 0x8d, 0x6e, 0x3e, 0xc2, 0x36, -0x1d, 0xe0, 0x9d, 0x20, 0x8e, 0x51, 0x4e, 0x7b, 0xe6, 0xf3, 0x34, 0xb7, -0x3d, 0x59, 0x58, 0xa2, 0xd6, 0x87, 0xb6, 0xc6, 0x68, 0xfc, 0xd7, 0xe0, -0x11, 0xe0, 0x37, 0xed, 0x4f, 0x78, 0x70, 0x4b, 0x1f, 0xa3, 0x3a, 0x93, -0x8f, 0xfe, 0xe9, 0x03, 0xf4, 0xcf, 0x3a, 0x1b, 0x80, 0x7d, 0x4f, 0xdd, -0x4f, 0xa0, 0x50, 0x00, 0xb1, 0x18, 0x6b, 0x31, 0x51, 0x8c, 0x89, 0x22, -0xc4, 0x94, 0x56, 0x12, 0x41, 0xb5, 0xcb, 0x60, 0xc9, 0x54, 0x02, 0x47, -0xa4, 0xd1, 0xa0, 0x0c, 0x08, 0x50, 0xb5, 0x80, 0x6b, 0x91, 0x1f, 0xd8, -0x49, 0x08, 0xe5, 0xf6, 0xaf, 0xe5, 0xce, 0xab, 0x47, 0x96, 0x06, 0x7e, -0xfc, 0x00, 0x7e, 0xf5, 0x55, 0x64, 0x67, 0x2c, 0xc2, 0x54, 0x06, 0xc8, -0xb6, 0xad, 0xe9, 0x06, 0xec, 0xae, 0xf1, 0x88, 0xe7, 0x5e, 0xaf, 0xb2, -0xaf, 0x65, 0x59, 0x70, 0xcd, 0x32, 0xae, 0xbd, 0x7d, 0x65, 0x77, 0x73, -0x6b, 0x8d, 0xac, 0xe7, 0xf5, 0x1f, 0x7d, 0x83, 0x10, 0x2c, 0x6a, 0x0d, -0x18, 0x8b, 0xd8, 0x08, 0x63, 0x23, 0xac, 0x08, 0x6a, 0x02, 0x2a, 0xbe, -0xfb, 0xa2, 0xe3, 0x95, 0x9c, 0x53, 0x09, 0x2c, 0x32, 0x02, 0x56, 0x80, -0xbc, 0x49, 0x6b, 0xcf, 0x08, 0xc6, 0x14, 0xd2, 0x50, 0x7e, 0xea, 0x94, -0xda, 0xa6, 0xd3, 0xfc, 0xce, 0x75, 0xdd, 0x20, 0x45, 0xe1, 0x85, 0xd1, -0x0a, 0x2f, 0xee, 0xa9, 0x30, 0x77, 0xc1, 0x62, 0x6e, 0xba, 0x7d, 0x65, -0x37, 0xd8, 0x01, 0xc6, 0xd7, 0x3d, 0xc2, 0xf0, 0x3f, 0xac, 0x28, 0x4e, -0x64, 0x08, 0x5a, 0x06, 0xae, 0xb1, 0x31, 0x36, 0x8a, 0x8b, 0x82, 0xd0, -0x7a, 0x10, 0xd3, 0xad, 0x9b, 0x8e, 0xc7, 0x60, 0x2a, 0x81, 0x62, 0xf5, -0x7c, 0xa1, 0x80, 0x86, 0xa2, 0x0c, 0xec, 0x2a, 0xd0, 0x01, 0x7e, 0x0c, -0x02, 0x9d, 0x97, 0xa8, 0xc2, 0x73, 0xaf, 0x57, 0x79, 0x79, 0x7f, 0xca, -0xe2, 0x65, 0x5f, 0x62, 0xf1, 0xad, 0x5f, 0xec, 0x3e, 0xd3, 0xda, 0xbc, -0x96, 0x3d, 0x8f, 0xdc, 0xcd, 0xd8, 0xcf, 0xd7, 0xd2, 0xf6, 0x42, 0x50, -0x43, 0x30, 0xa6, 0xb0, 0x4b, 0x09, 0xde, 0x46, 0x11, 0x26, 0x14, 0x72, -0x7b, 0x84, 0x56, 0x27, 0x8b, 0x9d, 0xa4, 0x02, 0x18, 0x81, 0xa0, 0x02, -0xae, 0x45, 0x50, 0x41, 0x3a, 0x16, 0x42, 0x8f, 0x28, 0x8f, 0x8f, 0x47, -0x60, 0x3c, 0x33, 0xbc, 0xbc, 0x3f, 0xe5, 0xda, 0xdb, 0x57, 0xf2, 0xde, -0x1b, 0x3f, 0xd3, 0x05, 0x3e, 0xfa, 0xbd, 0x15, 0xb4, 0x46, 0xb7, 0x93, -0x7b, 0xc1, 0x79, 0xc1, 0xa9, 0xe0, 0xd5, 0x10, 0x24, 0x22, 0xb2, 0x31, -0x51, 0x7c, 0x98, 0x80, 0x38, 0x87, 0x22, 0x18, 0x85, 0x86, 0x87, 0x70, -0xb8, 0xdc, 0x59, 0xf7, 0x96, 0x04, 0x44, 0x84, 0x56, 0x2e, 0xb4, 0xf6, -0x8e, 0x40, 0x30, 0x65, 0x81, 0xaf, 0xc5, 0x76, 0x2f, 0xe5, 0xa6, 0xdf, -0x21, 0x32, 0x65, 0x32, 0x55, 0x18, 0x3e, 0x14, 0xd3, 0x3f, 0x6b, 0x6e, -0x17, 0xfc, 0xf8, 0xb3, 0xf7, 0x33, 0x7a, 0xff, 0x0a, 0xbc, 0x07, 0x17, -0x84, 0x3c, 0x40, 0x1e, 0xc0, 0x63, 0x50, 0x13, 0x61, 0x6c, 0x8c, 0x89, -0x13, 0xa2, 0x24, 0x25, 0x8a, 0x13, 0x22, 0x31, 0xa8, 0x0f, 0x84, 0x72, -0x83, 0xd8, 0xe7, 0x94, 0x49, 0xf5, 0xda, 0x81, 0xa9, 0x04, 0xa6, 0xa6, -0xd1, 0x35, 0x8a, 0xd0, 0x74, 0x42, 0x36, 0xf6, 0x66, 0x91, 0xde, 0x88, -0x08, 0x6a, 0x09, 0x18, 0x82, 0x0a, 0x5e, 0x05, 0xef, 0xc1, 0xbb, 0xe2, -0x84, 0xd5, 0xed, 0xe5, 0xf7, 0x2d, 0x27, 0xdd, 0x74, 0x0a, 0xf0, 0xe6, -0xf7, 0xef, 0x26, 0x77, 0x90, 0x79, 0x21, 0xf3, 0x65, 0xf1, 0x86, 0x25, -0x48, 0x84, 0xda, 0x18, 0x1b, 0x57, 0x88, 0xd3, 0x94, 0x38, 0x49, 0x89, -0xe3, 0x18, 0x63, 0x2c, 0x52, 0xde, 0x4b, 0x4c, 0xe4, 0x5a, 0xac, 0xfe, -0xe1, 0x95, 0x5a, 0xf3, 0x56, 0x0a, 0x1c, 0x08, 0x0a, 0x07, 0x9c, 0x61, -0xfc, 0x8d, 0x5d, 0x24, 0xf5, 0x7e, 0xb2, 0x66, 0x83, 0xee, 0x8c, 0x21, -0xa0, 0xc1, 0x13, 0xca, 0xca, 0x65, 0x6a, 0x53, 0x85, 0x99, 0xb1, 0x27, -0xf4, 0x1c, 0xae, 0x48, 0x1b, 0x6f, 0x6c, 0xc7, 0x07, 0xc1, 0x05, 0xc8, -0xd5, 0x90, 0x63, 0x08, 0xc4, 0x60, 0x63, 0xa2, 0xa4, 0x4a, 0x5c, 0xa9, -0x92, 0xa4, 0x55, 0xe2, 0x24, 0xc5, 0x1a, 0x83, 0x66, 0x39, 0x1a, 0x02, -0x78, 0xcf, 0xee, 0xcc, 0xe3, 0x83, 0x3f, 0xa1, 0x85, 0xa6, 0x2a, 0xb0, -0xde, 0x2b, 0x8c, 0xe5, 0x42, 0x7b, 0xa2, 0x05, 0x2a, 0x88, 0x49, 0xc0, -0xa6, 0x60, 0x52, 0xd4, 0x24, 0x04, 0x49, 0x50, 0x8d, 0xf0, 0xc1, 0xe2, -0x82, 0xc1, 0x39, 0x21, 0x77, 0x42, 0x9e, 0x0b, 0xce, 0x09, 0xd3, 0xac, -0xe3, 0xcc, 0x1d, 0x3f, 0x22, 0x34, 0xc7, 0x68, 0x8d, 0xac, 0x27, 0x73, -0x42, 0x16, 0x0c, 0xb9, 0x5a, 0x1c, 0x11, 0x6a, 0x12, 0x24, 0x4e, 0x88, -0xd3, 0x1a, 0x49, 0xb5, 0x46, 0x5a, 0xad, 0x93, 0x56, 0xaa, 0xc4, 0x49, -0x82, 0x35, 0x16, 0x09, 0x8a, 0x3a, 0x4f, 0xc8, 0x3d, 0x3b, 0x32, 0x4f, -0xe8, 0x64, 0x96, 0x93, 0x51, 0x00, 0x31, 0x0f, 0x05, 0xe5, 0x2b, 0xfb, -0xbd, 0xe0, 0x82, 0x21, 0xcf, 0x3d, 0xd8, 0x42, 0xd6, 0xd0, 0x39, 0xb1, -0x93, 0xa3, 0xe4, 0xa8, 0x77, 0x04, 0x0d, 0x04, 0xf5, 0xc5, 0x61, 0xbe, -0xf4, 0x6c, 0x3b, 0x08, 0xaf, 0x3c, 0xff, 0x0c, 0x2f, 0xac, 0x98, 0xcd, -0x99, 0xa9, 0x47, 0x24, 0x2a, 0xfd, 0x6e, 0xc1, 0x94, 0x69, 0x32, 0xa9, -0x10, 0xa7, 0x15, 0xd2, 0x6a, 0xad, 0x00, 0x1f, 0xc7, 0x88, 0x2a, 0x21, -0xcf, 0x08, 0xb9, 0x23, 0x64, 0x39, 0x3b, 0xda, 0x39, 0x2d, 0xef, 0x08, -0x3e, 0x74, 0xb4, 0x7e, 0x68, 0x70, 0x48, 0xc7, 0x4e, 0xa8, 0xc0, 0xa7, -0x1f, 0xf6, 0xeb, 0x42, 0x60, 0x38, 0x04, 0x65, 0x57, 0x0b, 0x9c, 0x13, -0x90, 0x18, 0x89, 0x52, 0x4c, 0x5c, 0xc3, 0x26, 0x35, 0x4c, 0x5a, 0x47, -0x92, 0x1a, 0x44, 0x55, 0xd4, 0x54, 0x50, 0x5b, 0xc1, 0x4b, 0x42, 0x90, -0x18, 0x47, 0xcc, 0x4f, 0xc7, 0xea, 0x6c, 0xe3, 0x74, 0x7a, 0xaf, 0xbd, -0x8b, 0xfc, 0xaa, 0x2f, 0x20, 0xbd, 0xb3, 0x20, 0xae, 0x20, 0x49, 0x0d, -0x5b, 0xad, 0x11, 0xd7, 0x7a, 0xa9, 0xf6, 0xf4, 0x52, 0xeb, 0xe9, 0xa3, -0x5a, 0xef, 0x21, 0xad, 0x54, 0xb0, 0x36, 0x2a, 0xce, 0x19, 0xb9, 0xc3, -0xb7, 0x33, 0xf2, 0x56, 0xc6, 0xd6, 0xa6, 0xc3, 0xfb, 0x30, 0x39, 0x80, -0x57, 0x1f, 0xe5, 0xd9, 0xa3, 0x14, 0x00, 0x14, 0x79, 0xd8, 0x07, 0xbd, -0x63, 0x67, 0x5b, 0x99, 0xe3, 0x15, 0xab, 0x02, 0x12, 0x61, 0xe2, 0xb8, -0x48, 0x3d, 0x21, 0x20, 0x3e, 0xc7, 0x59, 0x87, 0xfa, 0x42, 0x09, 0xf1, -0x1e, 0x2d, 0x2f, 0x3c, 0xf7, 0xe5, 0xca, 0xb2, 0x7b, 0x1e, 0x60, 0xee, -0x65, 0x1f, 0x04, 0xe0, 0xd0, 0xe6, 0x1b, 0xd9, 0xfc, 0xcd, 0x8f, 0x23, -0x51, 0x5c, 0x64, 0x9a, 0x24, 0x25, 0x49, 0x8b, 0xc0, 0x8d, 0xa2, 0x18, -0x01, 0xd4, 0x39, 0x7c, 0x96, 0xe3, 0x5a, 0x2d, 0x42, 0xb3, 0xc5, 0xcf, -0x27, 0x32, 0x1a, 0x2e, 0x9f, 0x4c, 0x60, 0xfb, 0xe0, 0x90, 0x1e, 0xeb, -0x32, 0xf8, 0x68, 0x02, 0x62, 0xec, 0x2a, 0x1f, 0xc2, 0x1d, 0x2d, 0x17, -0x78, 0xad, 0x11, 0x38, 0x3f, 0x51, 0x54, 0x05, 0x31, 0x51, 0x51, 0xa7, -0x88, 0x10, 0x54, 0x91, 0xc4, 0x61, 0x5c, 0x8e, 0x71, 0x0e, 0xe7, 0x3c, -0x12, 0x3c, 0xa2, 0xca, 0x8c, 0xea, 0x44, 0x17, 0x3c, 0x40, 0xef, 0x05, -0xef, 0xa7, 0xd2, 0xdb, 0x8f, 0x4d, 0x12, 0xa2, 0x38, 0x21, 0x4e, 0xd2, -0x22, 0xe7, 0xdb, 0x08, 0x50, 0x42, 0x96, 0x13, 0xda, 0x19, 0xae, 0xd1, -0xc4, 0x35, 0x9a, 0x8c, 0x4c, 0xb4, 0xd8, 0xd5, 0xce, 0x70, 0xb9, 0x27, -0x84, 0xae, 0x7d, 0x06, 0x8f, 0x05, 0xfe, 0x28, 0x0b, 0x01, 0xfc, 0xde, -0xa7, 0x3f, 0xb5, 0xdd, 0x07, 0xfd, 0x5e, 0xe6, 0x3c, 0x23, 0x4d, 0xc7, -0xfe, 0x66, 0x8e, 0xcf, 0x5d, 0x71, 0xc5, 0x2c, 0x06, 0x13, 0xa7, 0x44, -0x95, 0x1a, 0x49, 0xbd, 0x8f, 0xb4, 0x77, 0x80, 0xb4, 0x6f, 0x1a, 0xd5, -0xfe, 0x69, 0x54, 0xfa, 0x8a, 0xbe, 0xf8, 0xc2, 0x39, 0xec, 0xdb, 0xfc, -0x5c, 0x77, 0xbe, 0xd6, 0x6b, 0x2f, 0xd2, 0x33, 0x30, 0x9d, 0x7a, 0xdf, -0x00, 0xb5, 0xde, 0x3e, 0x2a, 0xb5, 0x3a, 0x49, 0x92, 0x62, 0x44, 0xc0, -0xf9, 0xc2, 0x32, 0x13, 0x0d, 0xdc, 0xc4, 0x04, 0xaf, 0x8f, 0x37, 0x78, -0x79, 0xa2, 0x4d, 0x96, 0xe5, 0x78, 0xef, 0x3b, 0xab, 0xbf, 0x6e, 0x70, -0x48, 0xef, 0x3f, 0x1e, 0x81, 0x63, 0x1e, 0xea, 0xbf, 0x73, 0x73, 0xed, -0xdc, 0x3c, 0xcf, 0x5f, 0x48, 0xe2, 0xb8, 0xbf, 0xa7, 0x5a, 0x61, 0x61, -0x7f, 0x8d, 0xde, 0xde, 0x3a, 0x51, 0xbd, 0x4e, 0x94, 0x56, 0x31, 0x69, -0x82, 0xd8, 0x42, 0x3c, 0xa5, 0xd8, 0x29, 0x55, 0xb5, 0xbb, 0xe5, 0x9b, -0x4a, 0x2f, 0xd5, 0x4b, 0xaf, 0x47, 0x44, 0x68, 0x6e, 0x7a, 0x02, 0xc9, -0x5b, 0x88, 0x31, 0x48, 0x79, 0x07, 0xa3, 0xbe, 0x04, 0xde, 0x6c, 0x92, -0x8f, 0x4f, 0x90, 0x8f, 0x8f, 0xb3, 0xfb, 0xe0, 0x38, 0xeb, 0xc7, 0x9a, -0xb4, 0xda, 0x2d, 0xb2, 0xcc, 0xe1, 0x43, 0xd7, 0x3e, 0x8b, 0x06, 0x87, -0x74, 0xfd, 0x29, 0x11, 0xe0, 0xd1, 0xcf, 0xc9, 0x37, 0xee, 0xfd, 0xee, -0x5d, 0x22, 0xf2, 0xb7, 0x95, 0x24, 0xa1, 0xde, 0x25, 0xd1, 0x43, 0x5c, -0xab, 0x63, 0xab, 0x15, 0x6c, 0x92, 0x16, 0x35, 0xbb, 0xb5, 0x80, 0x14, -0x35, 0x48, 0x77, 0x77, 0x90, 0xf2, 0x6b, 0xf2, 0x99, 0x56, 0x09, 0xde, -0x13, 0x5c, 0x19, 0xa8, 0x8d, 0x06, 0x6e, 0xa2, 0x41, 0x3e, 0x3e, 0xce, -0xd6, 0x83, 0x0d, 0x36, 0x8f, 0x37, 0x69, 0xb5, 0x8b, 0xd5, 0x0f, 0x3e, -0x74, 0x72, 0xff, 0x5d, 0x83, 0x43, 0xfa, 0xf5, 0xe3, 0x81, 0x3f, 0x3e, -0x81, 0x92, 0xc4, 0xaa, 0x6f, 0x7d, 0xe7, 0x21, 0x6b, 0xed, 0x8d, 0x69, -0x9a, 0xd0, 0x53, 0xa9, 0xf0, 0x9e, 0xbe, 0x1a, 0x03, 0x3d, 0x75, 0xa2, -0x5a, 0x8d, 0xa8, 0x5a, 0xc1, 0xa6, 0x15, 0x4c, 0x1c, 0x23, 0xd6, 0x22, -0xc6, 0x94, 0xd5, 0x63, 0x59, 0xfe, 0x6a, 0x07, 0x77, 0xb1, 0xe2, 0xc1, -0x39, 0x7c, 0xee, 0xf0, 0xad, 0x16, 0x79, 0xb3, 0x85, 0x6b, 0x4c, 0x70, -0x68, 0xbc, 0xc1, 0xcb, 0x07, 0x9b, 0xec, 0x69, 0x36, 0x69, 0xb7, 0x32, -0x72, 0xe7, 0xbb, 0xd6, 0x51, 0x58, 0x3d, 0x38, 0xa4, 0x2b, 0x4e, 0x04, -0xfe, 0xc4, 0x04, 0x80, 0x6f, 0x7f, 0xb4, 0x77, 0x5a, 0xa3, 0xd1, 0x1c, -0xb2, 0xd6, 0x2e, 0x4c, 0xd2, 0x98, 0x6a, 0x9a, 0x72, 0x4e, 0xbd, 0xca, -0x59, 0x3d, 0x35, 0xd2, 0x5a, 0x15, 0x5b, 0xa9, 0x10, 0xa5, 0x29, 0x26, -0x4e, 0xca, 0x43, 0x88, 0xa1, 0xa8, 0xbf, 0x41, 0x83, 0xa2, 0x21, 0x10, -0x82, 0x27, 0xe4, 0x0e, 0x9f, 0x65, 0xf8, 0x76, 0x1b, 0xd7, 0x6a, 0xd1, -0x98, 0x68, 0x32, 0x3c, 0xd1, 0x62, 0x64, 0xa2, 0x45, 0xb3, 0xdd, 0x26, -0x6b, 0xe7, 0xe4, 0x9d, 0x9c, 0x7f, 0x0a, 0xe0, 0xdf, 0x92, 0x00, 0xc0, -0xbd, 0x37, 0xf7, 0x4e, 0x9b, 0x68, 0x34, 0x87, 0x22, 0x6b, 0x16, 0xc6, -0x51, 0x4c, 0x92, 0xc4, 0xf4, 0x54, 0x53, 0xce, 0xaa, 0x56, 0x99, 0x55, -0x4d, 0xa9, 0xa4, 0x29, 0x36, 0x2d, 0x09, 0x44, 0x51, 0x79, 0x30, 0x2f, -0x08, 0x04, 0xef, 0x8b, 0x14, 0x99, 0x67, 0xf8, 0x76, 0xc6, 0xfe, 0x56, -0xc6, 0x68, 0xb3, 0xcd, 0x8e, 0x46, 0xbb, 0x6b, 0x97, 0xdc, 0x39, 0x9c, -0x2f, 0x76, 0xdc, 0x12, 0xcb, 0x49, 0x83, 0x3f, 0x29, 0x02, 0x00, 0xdf, -0xfa, 0xcd, 0xde, 0x69, 0x8d, 0x46, 0xe3, 0xdf, 0x8d, 0x98, 0xab, 0xa2, -0xc8, 0x12, 0xc5, 0x31, 0x69, 0x5c, 0x90, 0x99, 0x9e, 0xc6, 0xf4, 0xc7, -0x31, 0xfd, 0x71, 0x44, 0x6a, 0x2d, 0xb1, 0x29, 0x3c, 0x9f, 0xab, 0xd2, -0xf6, 0x81, 0xf1, 0xdc, 0x73, 0x20, 0xcb, 0x79, 0xb3, 0xed, 0x68, 0xe4, -0x39, 0x59, 0x9e, 0x93, 0x67, 0x79, 0xd7, 0x2e, 0x3e, 0x04, 0x74, 0x52, -0xba, 0x1c, 0x1c, 0xd2, 0xbb, 0x4f, 0x16, 0xfc, 0x49, 0x13, 0x00, 0xe0, -0xd1, 0xcf, 0xc9, 0xca, 0xaf, 0x7d, 0x7b, 0x50, 0x84, 0x2f, 0x5b, 0x53, -0x5c, 0x79, 0xd8, 0x28, 0x22, 0xb2, 0x96, 0x28, 0xb2, 0x58, 0x6b, 0x31, -0xc6, 0x74, 0x83, 0x56, 0x55, 0xf1, 0x41, 0xf1, 0xde, 0xe3, 0xbc, 0xc7, -0x3b, 0x7f, 0x18, 0xb4, 0x0f, 0x84, 0x50, 0x06, 0x6a, 0x61, 0x99, 0xed, -0xc0, 0xf2, 0xc1, 0x21, 0x5d, 0x7b, 0x2a, 0xe0, 0x4f, 0x8d, 0x40, 0xd9, -0xfe, 0xe2, 0x5a, 0xbb, 0x48, 0x55, 0x57, 0x19, 0x23, 0x57, 0x19, 0x63, -0x30, 0x62, 0x30, 0x46, 0x8a, 0x34, 0x49, 0x71, 0x09, 0x05, 0x9d, 0x8b, -0x5b, 0x2d, 0x80, 0x86, 0x40, 0x08, 0xda, 0x05, 0xad, 0xda, 0xb5, 0xcb, -0x01, 0x60, 0xd5, 0xa9, 0xae, 0xfa, 0x3b, 0x22, 0xd0, 0x69, 0x83, 0x57, -0xcb, 0x55, 0x46, 0x64, 0x85, 0x18, 0x59, 0x2a, 0x22, 0x03, 0x66, 0x0a, -0x01, 0x80, 0xa0, 0xa1, 0x4b, 0xa2, 0x58, 0xec, 0x2e, 0xf0, 0x75, 0xc0, -0x2a, 0x8e, 0x53, 0xa0, 0xfd, 0xbf, 0x10, 0x98, 0xdc, 0x06, 0xaf, 0x96, -0xa5, 0xc0, 0x22, 0x8a, 0x6b, 0x8f, 0x79, 0x65, 0xef, 0xb4, 0x03, 0x14, -0x80, 0xb7, 0x53, 0x94, 0xc3, 0x6b, 0x06, 0x87, 0x74, 0xf8, 0x1d, 0xbf, -0xb4, 0x6c, 0xbf, 0xb0, 0xbf, 0xd4, 0xff, 0xb2, 0xda, 0xbb, 0xfe, 0x9f, -0x3d, 0xde, 0xf5, 0x04, 0xfe, 0x0f, 0x54, 0x13, 0xec, 0xcc, 0x99, 0x7c, -0x3d, 0x8f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, -0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c b/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c deleted file mode 100644 index 0f4f24f4e7..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.c +++ /dev/null @@ -1,316 +0,0 @@ -static const unsigned char toolbar_plugin_dsp_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x31, 0x2f, 0x30, 0x34, 0x0e, 0x46, 0xed, 0x55, 0x00, 0x00, 0x0e, 0x01, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x7b, 0x70, 0x5c, 0xd5, -0x7d, 0xc7, 0x3f, 0xe7, 0xde, 0xdd, 0x95, 0xb4, 0xbb, 0xd2, 0x4a, 0xb6, -0x2c, 0xc9, 0xef, 0xb5, 0xc0, 0x74, 0xc0, 0xd8, 0x56, 0xcc, 0x18, 0x4c, -0x93, 0x60, 0xd9, 0xbc, 0xfa, 0x4a, 0x6c, 0x92, 0x29, 0x01, 0x6d, 0x82, -0xe5, 0x96, 0x92, 0xa1, 0x0f, 0x70, 0x28, 0x90, 0x09, 0xc2, 0xb5, 0x5d, -0x10, 0xd3, 0x16, 0x06, 0x1b, 0x48, 0x4a, 0x81, 0x38, 0x36, 0x29, 0x52, -0x5c, 0xc1, 0xd4, 0x40, 0x26, 0x6d, 0x02, 0xd8, 0x96, 0x5d, 0x52, 0x0c, -0x64, 0x40, 0xb6, 0x6c, 0x17, 0xe3, 0x58, 0x92, 0x1d, 0xc9, 0x96, 0x56, -0x5e, 0x69, 0xb5, 0x2b, 0x69, 0x77, 0xa5, 0xbd, 0xe7, 0xf4, 0x8f, 0xfb, -0xd8, 0xab, 0xb5, 0x64, 0x4c, 0xa0, 0x93, 0xe9, 0x6f, 0xe7, 0xce, 0x9e, -0xbd, 0xf7, 0x3c, 0xbe, 0xdf, 0xf3, 0x7b, 0x9c, 0xdf, 0x39, 0x77, 0x85, -0x52, 0x8a, 0xff, 0xcf, 0xe2, 0xb9, 0xd8, 0x8a, 0x91, 0xba, 0xc6, 0x5a, -0xc0, 0xbe, 0x42, 0x40, 0x1c, 0xd8, 0xdc, 0xd4, 0xdc, 0xb0, 0x3f, 0xbf, -0xee, 0x03, 0x0f, 0xfc, 0x6b, 0x58, 0x29, 0x55, 0xab, 0x94, 0x0c, 0x4b, -0xa9, 0x6a, 0x95, 0x92, 0x28, 0xa5, 0x50, 0x4a, 0x22, 0xa5, 0x8a, 0x2b, -0x25, 0xdb, 0xa4, 0x54, 0xad, 0xcf, 0x3e, 0xfb, 0x97, 0xad, 0x9f, 0x95, -0x80, 0xb8, 0x90, 0x06, 0x22, 0x75, 0x8d, 0x61, 0x60, 0x33, 0xb0, 0x06, -0x28, 0xb5, 0x6e, 0x77, 0x01, 0xf5, 0xf9, 0xc0, 0x1f, 0x7a, 0x68, 0x57, -0x8d, 0x52, 0xaa, 0x5e, 0x4a, 0xb9, 0xc6, 0x02, 0xee, 0x06, 0x8d, 0x4d, -0x42, 0xca, 0xf3, 0xc8, 0x3c, 0x25, 0xa5, 0xda, 0xf6, 0xc2, 0x0b, 0xf7, -0xc4, 0x3f, 0x37, 0x02, 0x91, 0xba, 0xc6, 0x52, 0x60, 0x1b, 0xb0, 0x2e, -0xef, 0xd1, 0xe6, 0xa6, 0xe6, 0x86, 0x2d, 0xee, 0x1b, 0x1b, 0x37, 0xbe, -0x5c, 0xaf, 0x94, 0xba, 0x57, 0x4a, 0x59, 0x93, 0x0f, 0x78, 0x32, 0xe0, -0x79, 0x04, 0xec, 0xe7, 0x71, 0x29, 0xe5, 0xfa, 0x1f, 0xfe, 0x70, 0xc3, -0xab, 0x9f, 0x99, 0x40, 0xa4, 0xae, 0x71, 0x2d, 0xb0, 0x83, 0xdc, 0x8c, -0x03, 0xb4, 0x61, 0xce, 0xfa, 0x21, 0x87, 0xc9, 0xe6, 0x7f, 0xaf, 0x97, -0x52, 0x6d, 0x52, 0x4a, 0x86, 0x4d, 0x40, 0x26, 0x38, 0xbf, 0x3f, 0x88, -0xdf, 0x1f, 0xc4, 0xeb, 0xf5, 0xe1, 0xf5, 0xfa, 0x26, 0x00, 0xcd, 0x66, -0xc7, 0x49, 0xa7, 0x53, 0x24, 0x93, 0x09, 0x12, 0x89, 0x41, 0xb2, 0xd9, -0x6c, 0x3e, 0xc1, 0xf5, 0xdb, 0xb7, 0x7f, 0x67, 0xe7, 0x6f, 0x4d, 0x20, -0x52, 0xd7, 0x58, 0x6f, 0x81, 0x77, 0xcb, 0x4e, 0x60, 0x43, 0x53, 0x73, -0xc3, 0x10, 0xc0, 0x23, 0x8f, 0xbc, 0x5e, 0x23, 0xa5, 0xdc, 0xaa, 0x94, -0xac, 0x35, 0x07, 0x56, 0x78, 0x3c, 0x1e, 0xca, 0xca, 0x66, 0xe0, 0xf7, -0x07, 0x29, 0x2b, 0x29, 0x64, 0xe6, 0xf4, 0x00, 0xe5, 0xa1, 0x22, 0x0a, -0xbd, 0x1e, 0x8a, 0xbc, 0x1e, 0x0c, 0x43, 0x21, 0xb3, 0x8a, 0xe8, 0x60, -0x92, 0xc1, 0xc4, 0x28, 0x9d, 0x7d, 0x31, 0x06, 0x92, 0xc3, 0xc4, 0x07, -0x63, 0xf4, 0x9f, 0x8b, 0x5a, 0x24, 0x1d, 0x22, 0xb7, 0xec, 0xd8, 0xf1, -0xb7, 0x17, 0xad, 0x09, 0x87, 0x80, 0x65, 0x36, 0x9d, 0x79, 0x33, 0xbf, -0xa1, 0xa9, 0xb9, 0xe1, 0x29, 0xfb, 0xc7, 0xa3, 0x8f, 0xfe, 0x74, 0x83, -0x52, 0x72, 0xab, 0x3d, 0xa3, 0xba, 0xee, 0x65, 0xda, 0xb4, 0x19, 0x14, -0x17, 0x97, 0x32, 0x7f, 0x76, 0x31, 0x97, 0x57, 0x97, 0x51, 0xe4, 0xf3, -0x20, 0x0d, 0x85, 0xb2, 0x40, 0x4b, 0x43, 0x21, 0xb3, 0xd2, 0x22, 0x21, -0x91, 0x86, 0xc2, 0x30, 0x24, 0xfd, 0x83, 0xc3, 0xb4, 0x75, 0x76, 0x33, -0x98, 0x48, 0xd0, 0x7d, 0xe6, 0x34, 0xa3, 0xa9, 0x51, 0x9b, 0x40, 0x5c, -0x29, 0xb5, 0x60, 0xe7, 0xce, 0xfb, 0x2f, 0xca, 0x27, 0xdc, 0x51, 0xc8, -0xed, 0xa8, 0x60, 0x9a, 0xcc, 0x8b, 0xd6, 0xac, 0x97, 0x0a, 0xc1, 0x0e, -0xa5, 0x58, 0x6b, 0xf2, 0x55, 0x94, 0x95, 0xcd, 0x60, 0xda, 0xb4, 0x4a, -0x16, 0xcc, 0x0b, 0x71, 0xc5, 0xc2, 0x52, 0xfc, 0x85, 0x3a, 0xd2, 0x00, -0x99, 0x55, 0x08, 0x05, 0x3d, 0x7d, 0x49, 0xba, 0x7b, 0x87, 0x88, 0x0d, -0xa5, 0x18, 0x4c, 0x8c, 0x3a, 0xb3, 0x2c, 0xa5, 0xc4, 0xef, 0xf3, 0x50, -0x51, 0x12, 0x64, 0xf1, 0xbc, 0x59, 0xf4, 0x0f, 0x95, 0x50, 0xe8, 0xf3, -0x72, 0xf4, 0xf8, 0x31, 0xb2, 0x46, 0x16, 0x0b, 0xc3, 0x3a, 0xe0, 0xa9, -0x48, 0x5d, 0x63, 0x69, 0x53, 0x73, 0xc3, 0x05, 0x89, 0xb8, 0x09, 0x84, -0x5d, 0xe5, 0x36, 0x1b, 0x3c, 0x80, 0x52, 0x6a, 0x9f, 0x52, 0xd4, 0x00, -0x68, 0x9a, 0x46, 0x55, 0x55, 0x98, 0x8a, 0x8a, 0xe9, 0x2c, 0xaf, 0x99, -0x4e, 0xf9, 0xb4, 0x02, 0x94, 0x02, 0x95, 0x55, 0x8c, 0x67, 0x0d, 0x8e, -0x9f, 0x1c, 0xe0, 0xa3, 0x93, 0x31, 0x0e, 0x1f, 0xfd, 0x25, 0xfd, 0xe7, -0xba, 0xf1, 0x79, 0x0b, 0xf1, 0x79, 0x0b, 0x98, 0x37, 0xf7, 0x0a, 0xfc, -0xfe, 0x10, 0x42, 0x40, 0x7a, 0x6c, 0x9c, 0x33, 0x03, 0x43, 0xf4, 0xc7, -0x93, 0xcc, 0x28, 0x0e, 0x30, 0x3d, 0x58, 0xcc, 0xdc, 0x99, 0xb3, 0xe9, -0xec, 0x3e, 0xe5, 0x68, 0x1e, 0x78, 0x0a, 0x98, 0x1f, 0xa9, 0x6b, 0xfc, -0x10, 0xb8, 0xa5, 0xa9, 0xb9, 0xa1, 0xed, 0x93, 0x08, 0xd4, 0xba, 0xca, -0x8e, 0x0d, 0x6e, 0xd9, 0xb2, 0x7b, 0x0d, 0x98, 0xe0, 0x01, 0xc2, 0xe1, -0xcb, 0x99, 0x3d, 0xab, 0x94, 0x6b, 0xaf, 0x99, 0x8e, 0xd7, 0xa3, 0xa1, -0x14, 0x8c, 0xa7, 0x0c, 0x3e, 0x3a, 0x11, 0xe7, 0xa3, 0x5f, 0xc7, 0xe8, -0xee, 0xe9, 0xe2, 0x3f, 0x7e, 0xfe, 0x1c, 0x89, 0xe4, 0xc0, 0x84, 0x81, -0xde, 0x79, 0xef, 0xa7, 0xd4, 0x2c, 0xb9, 0x9e, 0x9a, 0x25, 0xab, 0x01, -0x10, 0x42, 0xe0, 0xd1, 0x35, 0x52, 0x63, 0xe3, 0x78, 0x75, 0x9d, 0xf9, -0x55, 0xb3, 0x38, 0x13, 0xed, 0x25, 0x95, 0x4e, 0x01, 0x84, 0xef, 0xb8, -0xe3, 0x9f, 0xd6, 0x34, 0x35, 0x37, 0xbc, 0x16, 0xa9, 0x6b, 0x6c, 0x03, -0xf6, 0x45, 0xea, 0x1a, 0x57, 0x4d, 0x46, 0x62, 0xaa, 0x85, 0xcc, 0xa9, -0x28, 0xa5, 0x5a, 0x2b, 0x84, 0x59, 0x0e, 0x85, 0xca, 0x99, 0x3b, 0xbb, -0x8c, 0x2f, 0x7f, 0xb1, 0x1c, 0xa1, 0x0b, 0x40, 0xd1, 0x7b, 0x36, 0xcd, -0xc1, 0xf7, 0xfa, 0x18, 0x1e, 0x19, 0xa3, 0x2f, 0x7a, 0x9a, 0xdd, 0xaf, -0x6f, 0x23, 0x93, 0x49, 0x71, 0xe3, 0xf5, 0xb5, 0xdc, 0x74, 0xe3, 0x6a, -0x96, 0x2c, 0x5e, 0xc4, 0xe1, 0xf6, 0xa3, 0xbc, 0xf1, 0xe6, 0x5e, 0xde, -0xdc, 0xb3, 0x07, 0x80, 0x9a, 0xc5, 0xab, 0x40, 0x81, 0x26, 0x04, 0x1e, -0x4d, 0xc3, 0xa7, 0xe9, 0x68, 0x42, 0x30, 0xa7, 0x72, 0x26, 0x27, 0x4e, -0x75, 0x00, 0xca, 0x9e, 0xd0, 0xd7, 0x30, 0x83, 0xc8, 0x5a, 0x60, 0x2b, -0xb0, 0x2a, 0x1f, 0xa8, 0xe6, 0x2a, 0xd7, 0xb8, 0xca, 0x5d, 0x76, 0x41, -0x29, 0x59, 0x23, 0xa5, 0x19, 0x6d, 0xfc, 0xfe, 0x20, 0x73, 0x67, 0x17, -0x81, 0x00, 0x04, 0x1c, 0x3f, 0x91, 0x60, 0xdf, 0x81, 0x33, 0x8c, 0x8c, -0x8e, 0x03, 0x8a, 0x03, 0x6f, 0xbf, 0x4c, 0x26, 0x93, 0xe2, 0xbe, 0x0d, -0x7f, 0xc5, 0x83, 0xf7, 0xdf, 0xcb, 0xb2, 0x65, 0x4b, 0xf1, 0xfa, 0xbc, -0x2c, 0x5b, 0xb6, 0x94, 0x07, 0xef, 0xbf, 0x97, 0x6f, 0xdf, 0x59, 0x4f, -0xdb, 0xe1, 0x3d, 0x9c, 0xed, 0x3d, 0x89, 0x34, 0x41, 0xa2, 0x09, 0x81, -0xcf, 0xa3, 0x53, 0xe8, 0xf1, 0x52, 0x35, 0xbd, 0xdc, 0x1a, 0x13, 0x2c, -0xd0, 0x34, 0x35, 0x37, 0xbc, 0x86, 0xb9, 0xea, 0xd7, 0x5a, 0x0b, 0xeb, -0x94, 0x04, 0x1c, 0x07, 0x76, 0xc7, 0x7b, 0xa5, 0x54, 0x8d, 0x19, 0xab, -0x25, 0x05, 0x05, 0x85, 0x54, 0x55, 0x16, 0xa1, 0x24, 0x74, 0x74, 0x24, -0xf9, 0xe0, 0x83, 0x18, 0xf6, 0x1a, 0x10, 0xed, 0x3f, 0x4d, 0x77, 0xcf, -0xc7, 0x5c, 0xbb, 0x62, 0x39, 0x7f, 0x70, 0xf3, 0xf5, 0x78, 0x3c, 0x3a, -0x99, 0xcc, 0x18, 0xef, 0xbe, 0xfb, 0x2b, 0x62, 0xb1, 0x01, 0x3c, 0x1e, -0x9d, 0xaf, 0x7f, 0xfd, 0xab, 0x54, 0x56, 0xcc, 0xe0, 0xd8, 0xf1, 0x83, -0xd8, 0x21, 0xd8, 0x24, 0xa1, 0xe1, 0xd3, 0x75, 0x42, 0xfe, 0x00, 0x01, -0x7f, 0xc0, 0x1e, 0x39, 0xfc, 0xcd, 0x6f, 0xfe, 0x83, 0x0d, 0xb8, 0xd5, -0xfa, 0xbe, 0xf7, 0x42, 0x04, 0x26, 0x15, 0x1b, 0xa0, 0x52, 0x8a, 0x60, -0xd0, 0x8f, 0x57, 0x17, 0x28, 0x43, 0x71, 0xfc, 0x78, 0x9c, 0x5c, 0x8e, -0xa3, 0x38, 0xd9, 0x61, 0x72, 0xbe, 0xe1, 0xfa, 0x5a, 0x34, 0x4d, 0x23, -0x95, 0x4a, 0xf3, 0xe7, 0x7f, 0xf1, 0xd7, 0x7c, 0xef, 0xe1, 0xbf, 0xe7, -0xd6, 0xdb, 0xd7, 0x73, 0xb8, 0xfd, 0x18, 0x9a, 0xa6, 0xb1, 0x62, 0xc5, -0x72, 0xfa, 0xa2, 0x9d, 0x48, 0xa5, 0x90, 0x56, 0x5b, 0x21, 0xc0, 0xa3, -0x6b, 0x78, 0x75, 0x9d, 0xe9, 0x25, 0x21, 0x40, 0xd9, 0x5a, 0x58, 0x9a, -0x47, 0x60, 0xed, 0xa7, 0x22, 0xf0, 0xd0, 0x43, 0xbb, 0x56, 0xe6, 0x96, -0x7e, 0x45, 0x49, 0xc0, 0x63, 0xc6, 0x77, 0x03, 0x06, 0x06, 0xd3, 0x4e, -0x58, 0x54, 0x4a, 0xd2, 0xdd, 0xf3, 0x31, 0x00, 0xc1, 0x60, 0x00, 0x81, -0xe0, 0x64, 0x47, 0x27, 0x67, 0x7b, 0xfb, 0x9c, 0xbe, 0x0e, 0x1d, 0x6e, -0x47, 0x58, 0x9f, 0xb1, 0xb1, 0xb4, 0x6b, 0x62, 0x00, 0x05, 0xba, 0x66, -0x6a, 0x61, 0x5a, 0xa8, 0x94, 0xdc, 0xda, 0xaa, 0x6c, 0xb3, 0xb6, 0x09, -0x84, 0xf3, 0xcd, 0xe8, 0x82, 0x04, 0xdc, 0x29, 0x82, 0xae, 0x7b, 0x4c, -0xc0, 0x06, 0x44, 0xa3, 0xa3, 0x0e, 0x70, 0xb7, 0x16, 0x00, 0x86, 0x87, -0x47, 0x50, 0x4a, 0x71, 0x49, 0x75, 0x98, 0x99, 0x55, 0x95, 0x4e, 0x5f, -0x4b, 0x97, 0x2c, 0x46, 0x29, 0xc5, 0xe1, 0xf6, 0xa3, 0x56, 0xdf, 0x12, -0x69, 0xb5, 0x05, 0xd3, 0x17, 0x74, 0x4d, 0x23, 0x58, 0x58, 0x64, 0x8f, -0x8e, 0x1d, 0xba, 0xdd, 0x26, 0x0d, 0xac, 0x74, 0x63, 0xbc, 0x60, 0x3a, -0xad, 0x94, 0xc4, 0xf4, 0x58, 0xf0, 0x78, 0xbc, 0x26, 0x68, 0xc3, 0x5c, -0x5d, 0xdd, 0xc0, 0x95, 0x52, 0xcc, 0x9e, 0xb5, 0x90, 0x9e, 0x33, 0x27, -0xd8, 0xfd, 0xda, 0xcf, 0xf8, 0xd2, 0x17, 0x57, 0x50, 0x58, 0x58, 0xc8, -0xf6, 0xe7, 0x9f, 0xa6, 0xed, 0xf0, 0x51, 0x2e, 0xad, 0x0e, 0x53, 0x5e, -0x5e, 0x4e, 0xcb, 0x2b, 0xbb, 0xe9, 0xe8, 0xec, 0x22, 0x18, 0x28, 0x35, -0x4d, 0x48, 0x82, 0x72, 0x39, 0xb3, 0x47, 0xd3, 0x08, 0x05, 0x82, 0xe4, -0x4c, 0x48, 0xe5, 0xe7, 0x63, 0x35, 0xd6, 0xe5, 0xac, 0x51, 0x93, 0x69, -0xc0, 0x59, 0xf9, 0x72, 0xd9, 0xa2, 0x79, 0x95, 0x97, 0x16, 0x22, 0x0d, -0x45, 0x6c, 0x20, 0x85, 0x94, 0xc6, 0x04, 0x13, 0xfa, 0xbd, 0xcb, 0x96, -0x03, 0x70, 0xe4, 0xc8, 0x31, 0x1e, 0x7f, 0xe2, 0x69, 0x06, 0x87, 0x12, -0xf8, 0x7c, 0x05, 0x5c, 0xb3, 0xfc, 0x2a, 0x7c, 0xbe, 0x02, 0x7e, 0xf4, -0x62, 0x13, 0xff, 0xf2, 0xbc, 0x99, 0x66, 0x5d, 0xf5, 0x85, 0x9b, 0xcd, -0xc5, 0x0f, 0xe9, 0xf8, 0x80, 0x86, 0x40, 0x17, 0x1a, 0xba, 0x26, 0xd0, -0x35, 0x1d, 0x57, 0x28, 0xcd, 0xc7, 0xe5, 0x8e, 0x96, 0x13, 0x34, 0x10, -0xc7, 0x8c, 0x44, 0x0e, 0x6b, 0xc7, 0x46, 0x2d, 0x32, 0xd2, 0x30, 0x73, -0x99, 0x4c, 0x26, 0x6b, 0x01, 0xc7, 0x9a, 0x2d, 0x45, 0xc0, 0x5f, 0xca, -0xaa, 0xeb, 0x6e, 0x67, 0xdf, 0x81, 0x9f, 0xf0, 0xd6, 0xde, 0xfd, 0xbc, -0x73, 0xf0, 0x7d, 0xaa, 0xab, 0xc3, 0x00, 0xb4, 0x1f, 0x39, 0xe6, 0x0c, -0x72, 0xed, 0x35, 0x6b, 0x99, 0x3d, 0xeb, 0x32, 0xa7, 0x6f, 0xdb, 0x07, -0x84, 0x10, 0x26, 0x78, 0xa1, 0x51, 0x1c, 0x08, 0x10, 0x8b, 0xc7, 0x1d, -0xf3, 0xb2, 0xa4, 0xd5, 0x22, 0x34, 0x25, 0x81, 0xb6, 0x3c, 0xc6, 0x96, -0x09, 0x01, 0x88, 0x5c, 0x2e, 0x63, 0x27, 0x68, 0x52, 0x62, 0xab, 0xda, -0x36, 0xa3, 0x85, 0x97, 0x5e, 0x45, 0x20, 0x10, 0xe2, 0x9d, 0x77, 0x5f, -0x27, 0x36, 0x70, 0xc6, 0x01, 0xee, 0xf3, 0x15, 0x32, 0x77, 0xce, 0xe5, -0x2c, 0x59, 0xb4, 0x92, 0xa2, 0xa2, 0x12, 0xab, 0x5f, 0x13, 0xbd, 0xb0, -0x4c, 0x48, 0x60, 0x9a, 0x91, 0x26, 0xac, 0x45, 0x86, 0x29, 0x37, 0x5a, -0x6e, 0xb3, 0xba, 0xb0, 0x0f, 0x48, 0x69, 0xaa, 0x17, 0x94, 0xe5, 0xc0, -0x39, 0xf0, 0x39, 0x02, 0x39, 0x07, 0x56, 0x4a, 0x51, 0x59, 0x11, 0x66, -0xcd, 0x9f, 0xfc, 0x0d, 0xc9, 0xe1, 0x41, 0x92, 0xc9, 0x01, 0xbc, 0xde, -0x02, 0x4a, 0x43, 0x95, 0x8e, 0x19, 0xda, 0x3b, 0x35, 0xab, 0x57, 0x07, -0xa6, 0x10, 0x20, 0x94, 0x49, 0x20, 0xa7, 0x1d, 0xc5, 0x6d, 0xb7, 0x3d, -0xb2, 0x72, 0xd7, 0xae, 0x8d, 0xfb, 0x71, 0x65, 0x07, 0x91, 0xba, 0xc6, -0x95, 0xf6, 0x8e, 0xf0, 0x13, 0x9c, 0x58, 0xc5, 0x27, 0x33, 0x21, 0x69, -0x48, 0xa4, 0x34, 0x1c, 0xd0, 0xf9, 0x9a, 0x50, 0x4a, 0x72, 0xee, 0x5c, -0x0f, 0xa7, 0xbb, 0x8f, 0x31, 0x3c, 0x3c, 0xe8, 0xd4, 0x2b, 0x2b, 0xad, -0x64, 0xf6, 0xac, 0xcb, 0x98, 0x51, 0x3e, 0xcf, 0xb9, 0xa7, 0xa4, 0x34, -0x17, 0x76, 0x21, 0xd0, 0x04, 0x68, 0x9a, 0xc0, 0x5f, 0x58, 0x48, 0xcc, -0xd5, 0xa7, 0x25, 0x93, 0x66, 0xa5, 0x6e, 0x27, 0x76, 0x33, 0x2c, 0x05, -0xd8, 0xba, 0x75, 0xfd, 0x21, 0x3b, 0xda, 0x8c, 0x8d, 0x65, 0xe8, 0x8d, -0x25, 0xcd, 0x9c, 0x5e, 0xda, 0x97, 0x31, 0xa1, 0xac, 0x94, 0xe4, 0xd4, -0xe9, 0x23, 0xbc, 0xb2, 0xfb, 0x71, 0xf6, 0x1d, 0x68, 0xe2, 0x64, 0xc7, -0x87, 0xf4, 0x45, 0xbb, 0xe8, 0x8b, 0x76, 0x11, 0xed, 0x3f, 0xc5, 0xf1, -0x13, 0xef, 0xb1, 0x77, 0xff, 0x4b, 0xec, 0x3b, 0xf0, 0x12, 0xc3, 0x23, -0x39, 0x1b, 0x17, 0x42, 0x59, 0x24, 0x4c, 0xe3, 0x29, 0xf4, 0x15, 0x38, -0x13, 0x33, 0x85, 0x38, 0x7e, 0x90, 0xef, 0xc4, 0xb6, 0x2c, 0x05, 0xf6, -0xbb, 0x67, 0x78, 0x7c, 0x3c, 0x93, 0x67, 0x46, 0x86, 0x5b, 0x53, 0x80, -0xe2, 0xc3, 0x43, 0x7b, 0x38, 0xd4, 0xbe, 0x0f, 0x80, 0x40, 0x20, 0xc0, -0x4d, 0x37, 0xac, 0xe2, 0xf7, 0xaf, 0xbd, 0x9a, 0xea, 0xea, 0x30, 0x7d, -0x7d, 0x51, 0x4e, 0x76, 0x74, 0xf1, 0xe6, 0x5b, 0xfb, 0x38, 0xdc, 0x7e, -0x94, 0x5f, 0xec, 0xd9, 0xce, 0x1f, 0xaf, 0xbe, 0x83, 0x72, 0xff, 0xa5, -0x08, 0x4c, 0xd3, 0x31, 0x94, 0x49, 0xc4, 0x6d, 0x42, 0x53, 0x1c, 0x3a, -0x38, 0x7e, 0xe0, 0x26, 0xd0, 0x35, 0x59, 0x4d, 0xf7, 0x5a, 0xa0, 0xa4, -0x81, 0x34, 0xa4, 0xf9, 0x2d, 0x6d, 0x07, 0x37, 0x07, 0x3b, 0xd4, 0xbe, -0xd7, 0x01, 0xbf, 0x64, 0xf1, 0x22, 0x36, 0xfd, 0xdd, 0x77, 0x29, 0x29, -0x2e, 0x46, 0x08, 0x81, 0x00, 0x42, 0xa1, 0x12, 0x16, 0x5e, 0x7a, 0x09, -0x37, 0xdd, 0xb8, 0x8a, 0x5f, 0xbc, 0xb1, 0x97, 0x27, 0xb7, 0xfd, 0x80, -0xb7, 0xde, 0x7e, 0x99, 0xf0, 0xd7, 0x36, 0xa0, 0x89, 0x90, 0xe3, 0xc4, -0x00, 0xa3, 0xe9, 0x14, 0xf9, 0xb3, 0xdf, 0xd4, 0xdc, 0xb0, 0x3f, 0x52, -0xd7, 0x78, 0x1e, 0x3e, 0xb7, 0x09, 0xb9, 0x09, 0x84, 0xed, 0x82, 0x94, -0xaa, 0xcd, 0x36, 0x93, 0x74, 0x26, 0x8b, 0xcc, 0x2a, 0x8a, 0x0b, 0x0b, -0x26, 0x98, 0xd0, 0xd9, 0xde, 0x0e, 0x07, 0x7c, 0x75, 0x75, 0x98, 0x27, -0xfe, 0xf1, 0x11, 0x42, 0x25, 0x25, 0xe8, 0xba, 0x8e, 0x47, 0xd7, 0xd1, -0x3d, 0x1e, 0xeb, 0x5b, 0x47, 0xd7, 0x74, 0x6e, 0xbe, 0x69, 0x35, 0x77, -0xdd, 0x59, 0xcf, 0xf0, 0x48, 0x9c, 0x5f, 0x7e, 0xb8, 0x07, 0x5d, 0x13, -0x08, 0xcb, 0x79, 0x0d, 0x29, 0x19, 0x4d, 0xa7, 0x2e, 0x34, 0xfb, 0x9f, -0x8e, 0x80, 0xe9, 0xc8, 0x66, 0x67, 0x67, 0xfa, 0xfb, 0x31, 0x0c, 0x89, -0x2e, 0xb4, 0x09, 0xf6, 0x7f, 0xf8, 0xc8, 0x3e, 0xa7, 0xe1, 0xe6, 0x87, -0xbf, 0x8b, 0xa6, 0x69, 0xe8, 0x9a, 0x86, 0x6e, 0x81, 0xf6, 0xe8, 0xba, -0x59, 0xd6, 0x75, 0x74, 0x5d, 0x43, 0xd7, 0x74, 0xbe, 0x76, 0xcb, 0x57, -0xa8, 0xac, 0x98, 0x41, 0xfb, 0xc7, 0xbf, 0x22, 0x33, 0x96, 0x46, 0x58, -0xa1, 0x53, 0x2a, 0x75, 0x31, 0xe0, 0x1d, 0x7c, 0x0e, 0x81, 0xa6, 0xe6, -0x86, 0x53, 0x93, 0x55, 0x50, 0x4a, 0x76, 0xe5, 0x8e, 0x3e, 0x0c, 0x27, -0x0a, 0xd9, 0xeb, 0x42, 0x6c, 0xe0, 0x0c, 0x7d, 0x51, 0x93, 0xfb, 0x0d, -0xd7, 0xd7, 0x52, 0x35, 0xb3, 0x12, 0xa1, 0x09, 0x33, 0x23, 0x1d, 0x4d, -0xd1, 0xb0, 0xf1, 0x51, 0xbe, 0x54, 0xfb, 0x87, 0x7c, 0x79, 0xd5, 0x1f, -0xf1, 0xfd, 0x7f, 0x7e, 0x01, 0x4d, 0xd3, 0xcc, 0xe7, 0x42, 0xb0, 0x62, -0xc5, 0x72, 0xd2, 0x63, 0x29, 0x3a, 0xba, 0x4f, 0x58, 0xe1, 0x13, 0x2b, -0x18, 0x7c, 0xe2, 0xc4, 0x9f, 0x4f, 0xc0, 0x92, 0xd6, 0xfc, 0x0a, 0x52, -0xaa, 0x2e, 0x3b, 0x34, 0xa6, 0xd3, 0x29, 0x06, 0x12, 0x23, 0xe8, 0x42, -0x38, 0x26, 0x64, 0x83, 0x07, 0xd3, 0xf6, 0x6d, 0x87, 0x14, 0x9a, 0xc6, -0x33, 0x3f, 0x78, 0x9e, 0x03, 0xff, 0xf5, 0xdf, 0xce, 0xf3, 0x97, 0x5f, -0x79, 0x95, 0x9d, 0x3f, 0xfe, 0x89, 0xe9, 0x17, 0x42, 0x50, 0x55, 0x51, -0x01, 0x40, 0x4f, 0xff, 0x6f, 0x10, 0x02, 0xc7, 0x84, 0x52, 0xe9, 0x51, -0x37, 0xa6, 0x0b, 0x6e, 0xea, 0xf3, 0x09, 0xd8, 0xa1, 0xb4, 0xd6, 0xbe, -0xa1, 0x94, 0x6a, 0xb3, 0x77, 0x64, 0xd9, 0x6c, 0x96, 0x74, 0x66, 0x8c, -0xe2, 0x82, 0x02, 0x27, 0x6c, 0x0e, 0x8f, 0xe4, 0xfa, 0xaf, 0xac, 0xac, -0xb0, 0xfd, 0x1d, 0x01, 0xfc, 0xec, 0x3f, 0xdf, 0x38, 0x6f, 0xc0, 0xb6, -0x43, 0xed, 0x4e, 0x39, 0x10, 0x34, 0x37, 0x2f, 0x42, 0x68, 0x96, 0x01, -0x59, 0x04, 0x32, 0x19, 0xa7, 0x4e, 0x4b, 0xcb, 0xa6, 0x43, 0x90, 0x0b, -0xed, 0x17, 0x4b, 0xc0, 0x69, 0x90, 0x33, 0x21, 0x49, 0x2a, 0x35, 0x42, -0xdf, 0x60, 0x02, 0x69, 0x48, 0x8a, 0xbc, 0x66, 0x7a, 0x1d, 0x8f, 0xf7, -0xe6, 0x5a, 0x9b, 0x19, 0x1a, 0xca, 0x24, 0xce, 0xc2, 0x85, 0x97, 0x9c, -0x37, 0x60, 0x30, 0x18, 0xb0, 0xea, 0x28, 0x4e, 0x76, 0x74, 0x02, 0xa0, -0x5b, 0x1a, 0x31, 0xa4, 0x24, 0x3d, 0x36, 0x36, 0x19, 0x4e, 0xc8, 0x6d, -0x6e, 0x2e, 0x8e, 0x80, 0xdd, 0xe0, 0xf9, 0xe7, 0xef, 0x39, 0x64, 0x3b, -0x55, 0x26, 0x93, 0x66, 0x38, 0x95, 0xc6, 0xc8, 0x4a, 0x0a, 0x3c, 0x5e, -0xa4, 0x34, 0x28, 0x9f, 0x3e, 0xd7, 0x69, 0x70, 0xb8, 0xfd, 0xa8, 0xe9, -0x84, 0x96, 0xc6, 0xfe, 0x6c, 0x5d, 0xe4, 0x3c, 0xf0, 0xf5, 0xdf, 0xba, -0xdd, 0x49, 0xc5, 0xdf, 0x39, 0xf8, 0x3e, 0x00, 0xc5, 0xfe, 0x20, 0x00, -0x86, 0x94, 0xc4, 0x92, 0x09, 0x77, 0x93, 0xae, 0x29, 0xc8, 0x38, 0xf7, -0x27, 0x10, 0xb0, 0x36, 0x0e, 0xb6, 0x4d, 0xd4, 0xda, 0xf7, 0xa5, 0x94, -0x6d, 0x52, 0x4a, 0xb2, 0xd9, 0x2c, 0x67, 0x62, 0x31, 0x0c, 0x4b, 0x03, -0x4a, 0x29, 0xfc, 0x45, 0x25, 0x4e, 0xfb, 0x37, 0xf7, 0xb4, 0xa2, 0x64, -0x6e, 0xa5, 0xbe, 0x76, 0xc5, 0xd5, 0xfc, 0xe8, 0x85, 0xef, 0xb3, 0xbe, -0x3e, 0xc2, 0xfa, 0x75, 0x11, 0xb6, 0x3f, 0xf7, 0x34, 0xe1, 0x05, 0xf3, -0x91, 0x52, 0xf1, 0xe3, 0x97, 0xfe, 0x8d, 0x68, 0xb4, 0x1f, 0x80, 0x6b, -0x2e, 0xbf, 0xda, 0x5c, 0xed, 0xb3, 0x59, 0xfa, 0xe3, 0x83, 0xbf, 0x3d, -0x01, 0x4b, 0xec, 0x33, 0x21, 0x87, 0x80, 0x52, 0xaa, 0xcd, 0xd6, 0xc2, -0xc0, 0x50, 0x9c, 0xf1, 0xb1, 0x2c, 0xd3, 0xfc, 0x7e, 0x7c, 0x9a, 0xce, -0xfc, 0x59, 0x0b, 0x9d, 0x86, 0xd1, 0x68, 0x3f, 0x8f, 0x3f, 0xf9, 0x0c, -0x86, 0x94, 0x18, 0x86, 0x81, 0x61, 0x18, 0x84, 0xc3, 0xf3, 0xb8, 0x23, -0xf2, 0x0d, 0xbe, 0x15, 0xf9, 0x06, 0xe5, 0xe5, 0xe5, 0x48, 0x43, 0xf2, -0xf3, 0x37, 0xf6, 0xd0, 0xd4, 0xdc, 0x02, 0xc0, 0x95, 0x0b, 0x16, 0x51, -0x35, 0xad, 0x92, 0xac, 0x94, 0x64, 0xb2, 0xe3, 0xc4, 0xa7, 0xd6, 0xc0, -0x84, 0x34, 0xda, 0x96, 0xc9, 0x92, 0xb9, 0x56, 0xa0, 0x3e, 0x8f, 0x80, -0x7d, 0x8f, 0x74, 0x3a, 0x45, 0xdf, 0x50, 0x82, 0xb2, 0x22, 0x3f, 0xc1, -0x02, 0x1f, 0xa2, 0xb0, 0x80, 0x65, 0x8b, 0xae, 0xe3, 0x83, 0xa3, 0x07, -0x00, 0xd8, 0xb3, 0x77, 0x3f, 0x23, 0x23, 0xa3, 0xdc, 0x7d, 0xd7, 0x7a, -0x66, 0xce, 0xac, 0x42, 0x48, 0xe1, 0x64, 0xc7, 0x67, 0x7b, 0xfb, 0x78, -0xf6, 0xb9, 0xed, 0x8e, 0xe9, 0x04, 0x0a, 0x03, 0x7c, 0xfb, 0x2b, 0x77, -0x9a, 0xe6, 0x39, 0x3e, 0x4e, 0x6a, 0x6c, 0x9c, 0xd8, 0xd4, 0x1a, 0x70, -0x3b, 0xb1, 0x13, 0x39, 0xce, 0x23, 0xd0, 0xd4, 0xdc, 0xf0, 0x62, 0xa4, -0xae, 0x71, 0x1b, 0x50, 0x6a, 0xa7, 0xad, 0x4a, 0xc9, 0x56, 0xfb, 0x79, -0x32, 0x99, 0x60, 0x60, 0x38, 0xc1, 0x82, 0xf2, 0x6a, 0x4a, 0x8b, 0xfc, -0x78, 0x75, 0x9d, 0xda, 0x65, 0xab, 0xe9, 0x3e, 0x7b, 0x82, 0xe8, 0xc0, -0x59, 0x00, 0x0e, 0xbe, 0xfb, 0x3e, 0x07, 0xdf, 0x7d, 0x9f, 0xc5, 0x57, -0x5e, 0xc1, 0x92, 0x25, 0x8b, 0xe8, 0xeb, 0xeb, 0xa7, 0xa3, 0xa3, 0x8b, -0x8e, 0xce, 0x1c, 0x9e, 0x40, 0x61, 0x80, 0x27, 0xee, 0x7e, 0x8c, 0x79, -0x15, 0xf3, 0x18, 0x4a, 0x8d, 0x32, 0x32, 0x96, 0xa1, 0xab, 0xef, 0x2c, -0x59, 0xc3, 0x70, 0xc3, 0x69, 0x75, 0x95, 0xdd, 0x1a, 0x70, 0x7c, 0x75, -0xaa, 0x4d, 0xbd, 0x6d, 0x46, 0x6b, 0x01, 0x76, 0xee, 0x7c, 0xe0, 0x94, -0x94, 0xaa, 0x4b, 0x4a, 0x45, 0xd6, 0x30, 0xf8, 0xb8, 0xa7, 0x9b, 0xac, -0x21, 0x99, 0x53, 0x36, 0x8d, 0xe9, 0xc1, 0x20, 0xf3, 0xcb, 0x2b, 0xb9, -0xef, 0xb6, 0x07, 0xb9, 0x74, 0xce, 0x65, 0x13, 0x3a, 0x69, 0x3f, 0x72, -0x8c, 0xa6, 0xe6, 0x97, 0x79, 0x6b, 0x4f, 0xeb, 0x04, 0xf0, 0xd5, 0x33, -0x17, 0xf0, 0xc4, 0xdd, 0x8f, 0x11, 0xae, 0x0a, 0x93, 0x1a, 0x1f, 0x23, -0x91, 0x4a, 0x91, 0x18, 0x1d, 0xa5, 0x3b, 0xda, 0x4b, 0x9e, 0xb8, 0x83, -0x8a, 0x9b, 0x80, 0xa3, 0x81, 0xa9, 0x08, 0x6c, 0x76, 0x13, 0x00, 0x50, -0x4a, 0xbd, 0x6a, 0xfb, 0xc1, 0xb9, 0xc1, 0x73, 0x9c, 0x1d, 0x1c, 0x20, -0xe4, 0x2f, 0xc2, 0xab, 0xe9, 0x14, 0x79, 0x7d, 0x54, 0x86, 0xca, 0xd8, -0xb8, 0xee, 0x61, 0xee, 0xfa, 0xea, 0x5d, 0xcc, 0xaf, 0x9a, 0x3f, 0x69, -0xa7, 0x2b, 0xae, 0xb8, 0x9a, 0xfb, 0xfe, 0xf4, 0x1e, 0x9e, 0xb9, 0xe7, -0x49, 0x66, 0xcf, 0x98, 0x43, 0x22, 0x35, 0x4a, 0x6c, 0x78, 0x98, 0x73, -0xc3, 0x49, 0x8e, 0xf7, 0xfc, 0x86, 0x9e, 0x68, 0x9f, 0xbb, 0x7a, 0x57, -0x4b, 0xcb, 0xa6, 0x21, 0x70, 0x42, 0x7a, 0xd8, 0x7e, 0xe0, 0x3e, 0xa5, -0x98, 0x74, 0x43, 0xd3, 0xd4, 0xdc, 0x70, 0x2a, 0x52, 0xd7, 0xb8, 0x19, -0xd8, 0x1c, 0xa9, 0x6b, 0x5c, 0xd7, 0xd4, 0xdc, 0xf0, 0xa2, 0x52, 0x72, -0x27, 0xe6, 0xa9, 0x31, 0xf1, 0x44, 0x92, 0xb7, 0xff, 0xe7, 0x08, 0xab, -0x97, 0xd4, 0x90, 0x19, 0x1f, 0x47, 0xd7, 0x34, 0x84, 0x10, 0x78, 0x85, -0xe0, 0xba, 0xa5, 0xd7, 0xb1, 0xea, 0x0b, 0xb5, 0xa4, 0x33, 0x29, 0x4e, -0xf7, 0x9d, 0x46, 0x58, 0x49, 0xfe, 0x95, 0xe1, 0x45, 0x28, 0xcc, 0xf0, -0x9a, 0x48, 0xa5, 0x48, 0x8f, 0x8f, 0x91, 0x4c, 0xa7, 0x19, 0x1c, 0x1d, -0xe1, 0xc3, 0x93, 0x1f, 0xf3, 0x51, 0xe7, 0xc9, 0x7c, 0x18, 0xee, 0x97, -0x1c, 0xee, 0xa3, 0x94, 0x56, 0x77, 0xa5, 0x29, 0x77, 0x64, 0x4d, 0xcd, -0x0d, 0x5b, 0xac, 0xf4, 0xb5, 0x1e, 0x78, 0xf1, 0xa5, 0x97, 0xbe, 0x77, -0x28, 0x12, 0x79, 0xac, 0x55, 0x29, 0x6a, 0x41, 0x71, 0xe2, 0x74, 0x27, -0xbd, 0xb1, 0x28, 0xe1, 0xaa, 0xd9, 0x84, 0x2b, 0x67, 0x32, 0xbd, 0xb8, -0x98, 0x02, 0x8f, 0x17, 0xaf, 0x47, 0xc7, 0xa3, 0xe9, 0xe8, 0x9a, 0xc6, -0x9c, 0xca, 0xb0, 0x99, 0x65, 0x02, 0x03, 0x23, 0x49, 0xb2, 0x86, 0x64, -0xdc, 0xc8, 0x92, 0x1e, 0x1f, 0x27, 0x91, 0x1a, 0xe5, 0xd7, 0x67, 0x7a, -0x38, 0x7e, 0xaa, 0x8b, 0xc4, 0x48, 0x72, 0x32, 0x08, 0x6e, 0xa0, 0xee, -0x13, 0xb9, 0x09, 0x27, 0xd4, 0x17, 0x7c, 0x4b, 0x09, 0x10, 0xa9, 0x6b, -0x0c, 0x59, 0x84, 0x86, 0x6e, 0xbf, 0xfd, 0xd1, 0x95, 0xf9, 0x33, 0x60, -0xb7, 0xf7, 0x7a, 0x3c, 0x84, 0x82, 0xc5, 0x94, 0x15, 0x97, 0x50, 0xe0, -0xf5, 0xa1, 0x09, 0x41, 0x45, 0xd9, 0x34, 0xa7, 0x5e, 0xdf, 0x60, 0x0c, -0x29, 0x15, 0xc3, 0xa9, 0x11, 0x06, 0x12, 0x49, 0x86, 0x86, 0x27, 0x84, -0xcb, 0x7c, 0xe9, 0x6a, 0x69, 0xd9, 0xb4, 0xc0, 0x1a, 0xbf, 0x14, 0x70, -0x87, 0xa6, 0x5a, 0xf7, 0x1b, 0xd2, 0x4f, 0x24, 0x90, 0x2f, 0xb7, 0xdd, -0xf6, 0xc8, 0x0e, 0xac, 0x90, 0x9a, 0xdf, 0xf6, 0x73, 0x7c, 0x69, 0xbe, -0xb6, 0xa5, 0x65, 0xd3, 0x6b, 0x00, 0x91, 0xba, 0xc6, 0xdd, 0xe4, 0x34, -0xd0, 0xd5, 0xd4, 0xdc, 0xb0, 0xc0, 0x5d, 0xf1, 0x13, 0x0f, 0x77, 0xf3, -0x65, 0xd7, 0xae, 0x8d, 0xeb, 0xa5, 0x94, 0x9b, 0xa5, 0x94, 0x5d, 0xee, -0x93, 0xb9, 0xcf, 0x09, 0x7c, 0x1c, 0xa8, 0x77, 0x81, 0xdf, 0xc1, 0x44, -0xf3, 0xd9, 0x90, 0xdf, 0xe0, 0x53, 0x6b, 0xc0, 0x2d, 0xb7, 0xde, 0xba, -0x65, 0x0d, 0xb9, 0xb7, 0xf7, 0x93, 0xae, 0x94, 0x17, 0x29, 0x71, 0x4c, -0xa7, 0xdd, 0xdc, 0xd2, 0xb2, 0xe9, 0x94, 0x75, 0x80, 0xbb, 0x83, 0x89, -0xe7, 0x54, 0xdb, 0x9a, 0x9a, 0x1b, 0xbe, 0x93, 0xdf, 0xf0, 0x33, 0x11, -0x70, 0xcb, 0xad, 0xb7, 0x6e, 0x09, 0x91, 0x3b, 0xbb, 0x2c, 0x75, 0x0d, -0x6e, 0xff, 0x76, 0x83, 0xb5, 0x1d, 0xb1, 0xd5, 0x2a, 0xb7, 0xb6, 0xb4, -0x6c, 0x1a, 0xb2, 0xec, 0x7d, 0x03, 0xe6, 0x7b, 0x80, 0x52, 0x57, 0xfd, -0x0d, 0xee, 0x77, 0x76, 0xff, 0x27, 0x04, 0x3e, 0x8b, 0x5c, 0x00, 0xf8, -0xab, 0x98, 0xff, 0x0e, 0x38, 0x35, 0x55, 0xdb, 0xdf, 0x39, 0x01, 0xeb, -0xe5, 0xba, 0xfd, 0x97, 0x86, 0x2e, 0xeb, 0x6a, 0x9d, 0xec, 0x4f, 0x24, -0x93, 0xc9, 0xef, 0x9c, 0xc0, 0x67, 0x95, 0xff, 0x05, 0x96, 0xea, 0xa2, -0x83, 0x62, 0xef, 0x6d, 0x06, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c b/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c deleted file mode 100644 index 1ba72127ab..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.c +++ /dev/null @@ -1,291 +0,0 @@ -static const unsigned char toolbar_plugin_gfx_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x35, -0x2f, 0x30, 0x34, 0xc1, 0xe2, 0xc4, 0xb0, 0x00, 0x00, 0x0c, 0xd7, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x7b, 0x70, 0x1d, 0xd7, 0x5d, -0xc7, 0x3f, 0xe7, 0xec, 0xbd, 0x7b, 0xaf, 0x74, 0xaf, 0xa4, 0x6b, 0x59, -0x96, 0xec, 0xc4, 0x0f, 0xc5, 0x8e, 0x49, 0x5a, 0x3b, 0xb1, 0xf2, 0x98, -0x42, 0xc0, 0xc5, 0x8a, 0x69, 0x71, 0xa0, 0xc4, 0x0e, 0x30, 0xc3, 0xa4, -0x9d, 0x0e, 0x86, 0x36, 0x81, 0x32, 0xb4, 0x83, 0x0b, 0x03, 0xc3, 0xc0, -0x80, 0x31, 0x1d, 0x9e, 0xd3, 0x69, 0x5d, 0x86, 0x76, 0x32, 0xcc, 0xa4, -0xb8, 0x33, 0xa4, 0x11, 0x7f, 0xd0, 0xa4, 0xa1, 0x21, 0x93, 0x26, 0xae, -0x95, 0x07, 0x4d, 0x6c, 0x9c, 0xc6, 0x76, 0x1c, 0x27, 0x76, 0x6d, 0x49, -0x96, 0x65, 0x57, 0x2f, 0x4b, 0xf7, 0xa1, 0x7b, 0x75, 0x1f, 0xbb, 0xe7, -0xc7, 0x1f, 0xfb, 0xd0, 0xde, 0x87, 0x12, 0x3b, 0x0d, 0xd3, 0xe1, 0x37, -0x3a, 0xda, 0x3d, 0xab, 0xdd, 0xb3, 0xdf, 0xef, 0xef, 0x75, 0x7e, 0xe7, -0xac, 0x94, 0x88, 0xf0, 0xff, 0x59, 0xf4, 0x4f, 0x1a, 0xc0, 0x8f, 0x2b, -0xb1, 0xff, 0x8b, 0x41, 0x3f, 0xfa, 0xdb, 0xff, 0xd0, 0x8f, 0xd0, 0xef, -0xf5, 0x24, 0xf8, 0x81, 0xc0, 0xda, 0x22, 0xd1, 0xfe, 0xd8, 0xe1, 0x7f, -0xfb, 0xf3, 0xb1, 0xf7, 0xfa, 0x2e, 0xf5, 0x5e, 0x5d, 0x68, 0xd7, 0x43, -0x5f, 0xec, 0x47, 0x18, 0x10, 0x18, 0x00, 0x06, 0x40, 0x32, 0x08, 0x3b, -0x9a, 0x40, 0x2f, 0xa1, 0xf7, 0xf1, 0x2e, 0xd3, 0x17, 0xc9, 0x0a, 0x9c, -0x44, 0xe4, 0x04, 0x30, 0x86, 0xc8, 0x93, 0xdf, 0x7b, 0xfc, 0x2f, 0xdf, -0x95, 0xd8, 0x35, 0x13, 0xd8, 0xf5, 0xf0, 0x97, 0xfa, 0x81, 0x41, 0x90, -0x07, 0x80, 0x1d, 0x40, 0x86, 0xba, 0x47, 0x5b, 0x83, 0x6e, 0xd2, 0x7e, -0x00, 0xbc, 0xce, 0x1a, 0x21, 0x89, 0x46, 0x4b, 0x8d, 0x89, 0xc8, 0xb7, -0x81, 0x83, 0x47, 0x86, 0xf6, 0xb7, 0x24, 0xf3, 0xae, 0x04, 0xee, 0xfb, -0x9d, 0x2f, 0x0d, 0x82, 0xda, 0x07, 0xec, 0x09, 0x81, 0x46, 0x61, 0x0b, -0x2c, 0xc6, 0x6c, 0x16, 0x63, 0x36, 0x65, 0xcb, 0x3b, 0x82, 0xe0, 0xa6, -0x3a, 0x58, 0xd4, 0x31, 0x0f, 0x94, 0x18, 0x30, 0x42, 0xdc, 0x8e, 0x23, -0x8e, 0x8b, 0x53, 0xad, 0xb0, 0x02, 0x97, 0xb8, 0x18, 0x28, 0x97, 0xb0, -0x0b, 0x59, 0x92, 0xae, 0x43, 0xd2, 0xa9, 0x79, 0xf7, 0xab, 0xa5, 0xd7, -0x88, 0x08, 0x88, 0x01, 0xe1, 0x1b, 0xc0, 0xbe, 0x23, 0x43, 0xfb, 0xb3, -0xd7, 0x44, 0xe0, 0xbe, 0xdf, 0xfd, 0xf2, 0x00, 0xf0, 0x65, 0x60, 0x10, -0x54, 0x78, 0xdd, 0xd1, 0x9a, 0xb9, 0x64, 0x07, 0x73, 0xc9, 0x4e, 0x16, -0xda, 0xd2, 0x14, 0x12, 0x29, 0xaa, 0x68, 0xd6, 0xa4, 0x6d, 0xfa, 0xda, -0xe2, 0xf4, 0xb6, 0xdb, 0xf4, 0xb4, 0xc5, 0x71, 0x8d, 0xa1, 0x3b, 0x19, -0x27, 0x93, 0x88, 0xe3, 0xb8, 0x86, 0x9a, 0x2b, 0x38, 0xc6, 0xe0, 0xb8, -0xc6, 0xef, 0xbb, 0x5c, 0xce, 0x2e, 0x50, 0xaa, 0x54, 0x29, 0x55, 0x6b, -0xcc, 0xe4, 0x17, 0xa8, 0x54, 0xab, 0xa4, 0x4d, 0x8d, 0x54, 0x21, 0x47, -0xe7, 0xc2, 0x3c, 0x49, 0x71, 0x3d, 0x42, 0x46, 0xc0, 0x75, 0x41, 0x64, -0x0c, 0xe1, 0x8e, 0x28, 0x89, 0x96, 0x41, 0xfc, 0x4b, 0x9f, 0x39, 0x38, -0xa0, 0x94, 0x3a, 0x02, 0x64, 0x02, 0xf0, 0x97, 0x53, 0xdd, 0x4c, 0xb5, -0xaf, 0x60, 0x3a, 0xb5, 0x82, 0x4c, 0x9b, 0xcd, 0xcf, 0xad, 0xed, 0xe2, -0x9e, 0x1b, 0x3b, 0xb8, 0x39, 0xd3, 0xc6, 0xa6, 0x4c, 0x1b, 0xb6, 0x56, -0x54, 0x5c, 0xa8, 0x38, 0x86, 0x8a, 0x2b, 0x94, 0x1d, 0xa1, 0xea, 0x1a, -0x26, 0xf2, 0x65, 0x7e, 0x54, 0x28, 0x23, 0x18, 0x04, 0x85, 0x31, 0x0a, -0xad, 0x15, 0xda, 0x68, 0xd6, 0x74, 0xa6, 0x71, 0x5c, 0x17, 0x4b, 0x69, -0x32, 0x1b, 0xd7, 0x51, 0x73, 0x0c, 0x0b, 0xd5, 0x2a, 0x57, 0x72, 0x79, -0x26, 0xf3, 0x39, 0xe2, 0xd5, 0x0a, 0xa9, 0xcb, 0x23, 0x24, 0x2a, 0x55, -0x70, 0x14, 0xd4, 0x9c, 0x7e, 0x44, 0xfe, 0x00, 0x38, 0xf0, 0x8e, 0x04, -0xd0, 0x6a, 0x3f, 0x4a, 0x65, 0xd0, 0x9a, 0xbc, 0xdd, 0xc6, 0xc9, 0x95, -0x1b, 0x58, 0x8c, 0xb7, 0xf1, 0xab, 0xb7, 0xac, 0xe2, 0x23, 0xeb, 0xbb, -0xd9, 0xb9, 0xbe, 0x0b, 0x01, 0x6a, 0x06, 0x1c, 0x03, 0x6f, 0xce, 0x95, -0x19, 0xcf, 0x57, 0x39, 0x3b, 0x5f, 0xe2, 0xf5, 0xc9, 0x05, 0xc4, 0xb8, -0xbc, 0x31, 0x5d, 0x00, 0x71, 0xc1, 0x18, 0x30, 0xfe, 0xf1, 0x1a, 0xfa, -0xab, 0x3b, 0xd3, 0xa4, 0xdb, 0x12, 0x74, 0xa5, 0xda, 0x59, 0xd9, 0xd7, -0xcb, 0x42, 0xdf, 0x2a, 0xca, 0xe7, 0xdf, 0x22, 0x31, 0x37, 0x87, 0x32, -0x02, 0xe2, 0xec, 0x8b, 0x12, 0x68, 0x72, 0xa1, 0xfb, 0xfe, 0xf0, 0x91, -0x15, 0xba, 0xe6, 0xcc, 0x89, 0x65, 0x31, 0x9d, 0xee, 0xe2, 0x74, 0xcf, -0x7a, 0x36, 0x76, 0xa7, 0xf9, 0xb3, 0xbb, 0x6f, 0x62, 0x55, 0xbb, 0x8d, -0x06, 0x0c, 0x70, 0x78, 0x22, 0xc7, 0x2b, 0x93, 0x05, 0x4e, 0xcd, 0x96, -0x28, 0x56, 0x8d, 0x67, 0x6a, 0xd7, 0x20, 0x01, 0x18, 0x63, 0x3c, 0xdf, -0x0d, 0xc1, 0x2d, 0x73, 0x6e, 0xdc, 0xb0, 0xff, 0xb7, 0xfa, 0x3b, 0xec, -0x4d, 0xbf, 0x49, 0xb5, 0x54, 0xe5, 0xb1, 0xea, 0x36, 0xfe, 0x7e, 0xdd, -0x27, 0x68, 0xb3, 0xe3, 0xac, 0x8d, 0xb7, 0xd3, 0x3b, 0x72, 0x96, 0xf2, -0xcc, 0x55, 0x54, 0xa9, 0x02, 0x22, 0x77, 0x1c, 0x19, 0xda, 0x7f, 0xa2, -0xa5, 0x05, 0x74, 0xcd, 0xdd, 0x23, 0x31, 0x0b, 0x49, 0xc4, 0xb9, 0xd4, -0xd3, 0xc7, 0x1d, 0x6b, 0x57, 0xf0, 0xa9, 0x5b, 0xd7, 0x53, 0x16, 0xf8, -0x61, 0xbe, 0xc6, 0x8b, 0x33, 0x39, 0x86, 0xa7, 0xb2, 0x2c, 0x56, 0x5d, -0x0f, 0x4b, 0x4c, 0x88, 0x6b, 0x41, 0x5c, 0x41, 0x1c, 0xff, 0x68, 0x40, -0x1c, 0x01, 0x63, 0x10, 0x25, 0x80, 0xf1, 0x02, 0x39, 0x68, 0xc6, 0xf8, -0x6a, 0x10, 0x94, 0x12, 0xd0, 0x70, 0xa0, 0xf2, 0x14, 0xfb, 0x3e, 0x30, -0x43, 0xf2, 0xc3, 0x7b, 0x11, 0x6d, 0xf3, 0xfb, 0x87, 0xff, 0x0b, 0x33, -0x3a, 0xc4, 0x57, 0xb6, 0x3d, 0xc4, 0x48, 0xb1, 0x48, 0x2c, 0xa6, 0x49, -0xc5, 0x62, 0xa0, 0xab, 0xe0, 0xca, 0x1e, 0xa0, 0x35, 0x01, 0xd1, 0xea, -0x5e, 0x62, 0x16, 0x65, 0x11, 0x4a, 0xed, 0x09, 0xb6, 0xac, 0xca, 0xf0, -0xa3, 0x8a, 0xcb, 0xac, 0xe3, 0xf0, 0xf4, 0xec, 0x2c, 0xf9, 0x9a, 0x8b, -0x49, 0x2a, 0xe2, 0x31, 0x0b, 0x71, 0x05, 0x63, 0x0c, 0xe2, 0xe2, 0x01, -0x77, 0x41, 0x5c, 0xe5, 0x13, 0x50, 0x88, 0xab, 0x11, 0x03, 0xf8, 0xe4, -0x30, 0x0a, 0x31, 0x0a, 0x44, 0xa1, 0xc4, 0xf2, 0x08, 0x68, 0x0b, 0xa5, -0x84, 0x5f, 0x9f, 0x7d, 0x95, 0xc4, 0x8e, 0x3f, 0xc2, 0x9d, 0x9f, 0xa1, -0xf8, 0xbd, 0xa7, 0x28, 0x5d, 0x99, 0xe3, 0x97, 0x27, 0x2b, 0x7c, 0x6d, -0xfb, 0xe7, 0x10, 0x23, 0x14, 0x3a, 0x3a, 0x49, 0xcd, 0xe7, 0x40, 0x6b, -0x70, 0xcd, 0x60, 0xe0, 0x46, 0xcd, 0x16, 0x10, 0x76, 0x1b, 0xad, 0x99, -0x75, 0x05, 0xad, 0x84, 0xa3, 0xf3, 0x59, 0x72, 0x06, 0x4e, 0x95, 0x17, -0x28, 0x8a, 0x8b, 0xb6, 0x04, 0xa5, 0x41, 0x34, 0x20, 0x0a, 0x31, 0x1a, -0x31, 0x3e, 0x78, 0xc7, 0x07, 0xef, 0xf7, 0x31, 0xca, 0x27, 0xa4, 0xc0, -0xd5, 0x88, 0x58, 0x60, 0x0c, 0xca, 0xcf, 0x91, 0x4a, 0x83, 0x52, 0xa0, -0x2c, 0xa8, 0x9d, 0xa9, 0x21, 0x02, 0x73, 0xff, 0xf1, 0x18, 0x4e, 0xa1, -0x48, 0x39, 0x5b, 0xa6, 0x56, 0xb6, 0x50, 0x71, 0x0b, 0xa5, 0x15, 0x39, -0x51, 0xac, 0x56, 0x61, 0x36, 0x1c, 0x68, 0x19, 0xc4, 0x1f, 0xfb, 0xec, -0x57, 0x07, 0xb0, 0x74, 0x06, 0xd7, 0x50, 0x34, 0x16, 0x66, 0xb1, 0xc2, -0xa5, 0xd9, 0x39, 0x2e, 0x17, 0xf2, 0xa4, 0x6a, 0x15, 0x8c, 0x9d, 0xc0, -0xd5, 0x16, 0x61, 0x5a, 0x55, 0x0a, 0x14, 0x28, 0xa5, 0x3d, 0x57, 0x88, -0x03, 0x68, 0x3f, 0xf7, 0x2b, 0x30, 0x1a, 0x31, 0xde, 0x1c, 0x20, 0x81, -0xef, 0x07, 0x8f, 0x29, 0x9f, 0x80, 0xd6, 0xa8, 0x98, 0xe2, 0xdb, 0x6b, -0x06, 0xe9, 0x7b, 0xe2, 0x09, 0x4a, 0xe3, 0x57, 0x71, 0x1d, 0x97, 0xea, -0x42, 0x95, 0x67, 0x3e, 0xf0, 0x6b, 0x98, 0x72, 0x0d, 0xb7, 0x5c, 0xa3, -0x54, 0x75, 0x90, 0xaa, 0x83, 0xf6, 0x26, 0xbb, 0xcc, 0xbd, 0x0f, 0x1e, -0xc8, 0x1c, 0x19, 0xda, 0x9f, 0xad, 0xb7, 0x80, 0x62, 0x07, 0x02, 0x6e, -0x71, 0x91, 0xb6, 0x8a, 0xc3, 0xe6, 0x33, 0x79, 0xda, 0x94, 0x40, 0xdc, -0x42, 0xb4, 0xf6, 0x6f, 0xf1, 0xb4, 0x57, 0x6c, 0x4f, 0x53, 0xb1, 0x6d, -0xca, 0x6d, 0xed, 0x54, 0x92, 0x6d, 0x94, 0x52, 0x69, 0x94, 0x56, 0x28, -0x4b, 0xa3, 0x2c, 0xe5, 0x9f, 0x2b, 0x88, 0x29, 0x14, 0xca, 0x23, 0x16, -0x68, 0x3c, 0x20, 0xae, 0x75, 0x68, 0x85, 0x47, 0x76, 0xee, 0x43, 0x9e, -0x3f, 0xc8, 0x2f, 0xe6, 0x14, 0xc6, 0xd5, 0x3c, 0x7b, 0xeb, 0x03, 0x3c, -0x72, 0xcf, 0xef, 0x51, 0x9b, 0x2b, 0x60, 0xe6, 0x8b, 0xac, 0x9e, 0x9c, -0xc2, 0xcd, 0x17, 0xd1, 0x56, 0x58, 0x7f, 0x6e, 0x03, 0x5e, 0x68, 0x70, -0x21, 0x35, 0xa0, 0x94, 0x60, 0x4a, 0x8b, 0xac, 0xc8, 0xe6, 0x21, 0x1e, -0x43, 0x2c, 0xcd, 0xe6, 0x2d, 0x37, 0x31, 0x31, 0x3e, 0xc5, 0x62, 0xa9, -0xec, 0xfb, 0x99, 0x22, 0xa5, 0xf2, 0xa4, 0x2c, 0xed, 0xf9, 0xa4, 0xa5, -0x21, 0x66, 0xb1, 0x90, 0x4a, 0x53, 0x4c, 0x77, 0x50, 0x4a, 0xa7, 0x29, -0xa6, 0xda, 0xd1, 0xbe, 0x76, 0x95, 0xf6, 0x49, 0x59, 0x1a, 0xb4, 0x02, -0x4b, 0xa3, 0x14, 0x60, 0x5c, 0x44, 0x29, 0xc4, 0x2f, 0x21, 0xbe, 0x76, -0xcf, 0x67, 0xf8, 0xe7, 0xbb, 0x1f, 0xc6, 0xd4, 0x5c, 0x4c, 0xa5, 0x46, -0x7c, 0x62, 0x9a, 0xbe, 0xe9, 0x59, 0xba, 0xa7, 0x67, 0x51, 0xc5, 0x32, -0x52, 0x73, 0x20, 0x95, 0xf4, 0x18, 0xfb, 0xd9, 0xb3, 0xd1, 0x02, 0x83, -0x88, 0xc2, 0x8a, 0xc7, 0xf8, 0xfc, 0x5f, 0x7c, 0x8a, 0xbb, 0xee, 0xdc, -0x44, 0x0a, 0x21, 0x2e, 0xa0, 0xc4, 0x9b, 0xd6, 0x45, 0x84, 0x33, 0xa3, -0x53, 0xe4, 0x0b, 0x8b, 0x9c, 0x7c, 0x73, 0x8c, 0xd1, 0xf1, 0x49, 0x2e, -0x4f, 0x4c, 0x31, 0x3f, 0x97, 0x27, 0x9d, 0x2b, 0x92, 0x8e, 0xcf, 0x42, -0x2c, 0x06, 0x96, 0x66, 0x21, 0x9d, 0xa6, 0x9c, 0x4c, 0xb2, 0xd0, 0xde, -0x86, 0x93, 0xb0, 0x29, 0xdb, 0x89, 0x25, 0x0b, 0x29, 0x15, 0xba, 0xa2, -0x57, 0x2e, 0x08, 0xba, 0xe6, 0x90, 0x58, 0x2c, 0xd3, 0x56, 0x58, 0xa0, -0x7b, 0x7e, 0x1e, 0xbb, 0x58, 0x82, 0x72, 0x0d, 0x55, 0xad, 0x61, 0x5b, -0x36, 0xc6, 0x56, 0xd1, 0x4a, 0x66, 0xb0, 0xc9, 0x02, 0x0a, 0xfa, 0x51, -0xd0, 0xd9, 0xb3, 0x92, 0x2d, 0xdb, 0x6e, 0x66, 0x95, 0x18, 0xda, 0x83, -0xf7, 0xf8, 0xa4, 0x45, 0xe0, 0xa7, 0x37, 0xf6, 0x62, 0x44, 0xd8, 0x79, -0xdb, 0x3a, 0xc4, 0x08, 0x65, 0x03, 0x63, 0x93, 0x39, 0x4e, 0x8f, 0x4c, -0xf1, 0xc6, 0xdb, 0x17, 0x19, 0x1f, 0x9f, 0xe2, 0xd2, 0xe8, 0xb8, 0x47, -0x28, 0x66, 0xd1, 0x13, 0xd3, 0x60, 0x59, 0x60, 0x69, 0xdc, 0x58, 0x8c, -0x45, 0xdb, 0xf6, 0x2c, 0x01, 0x60, 0x04, 0x8c, 0xd0, 0x56, 0x2e, 0x63, -0xd5, 0x6a, 0xe0, 0xb8, 0x50, 0x73, 0x51, 0x35, 0x07, 0x5c, 0x97, 0x1b, -0xfa, 0x56, 0xf2, 0xf3, 0x1f, 0xbe, 0x93, 0xe4, 0x96, 0x9d, 0x3c, 0xfe, -0xc5, 0x2f, 0x44, 0x8a, 0xc2, 0x86, 0x20, 0xfe, 0xd8, 0xe7, 0xbe, 0xba, -0x03, 0xa5, 0x50, 0x02, 0xab, 0xd7, 0x74, 0x63, 0x0c, 0xb4, 0x5b, 0x9e, -0xbf, 0x56, 0x50, 0xe4, 0x5d, 0x61, 0xc1, 0xd5, 0xb8, 0x46, 0x70, 0xfd, -0xfa, 0xca, 0x16, 0x83, 0x12, 0x21, 0xa5, 0x5c, 0x36, 0xf5, 0x75, 0xb2, -0xb9, 0x2f, 0xcd, 0x9e, 0x9f, 0xd9, 0x88, 0x18, 0x61, 0xbe, 0xa6, 0x79, -0xe5, 0xcc, 0x04, 0x17, 0x2e, 0x4e, 0x73, 0x71, 0x62, 0x86, 0xf9, 0x6c, -0x8e, 0x2b, 0xe3, 0xe3, 0x58, 0x5a, 0x93, 0x56, 0xa5, 0x06, 0x02, 0x06, -0x5c, 0x83, 0x72, 0x0d, 0x76, 0x3c, 0xc6, 0xa6, 0x8d, 0xeb, 0xd8, 0xba, -0xa9, 0x8f, 0xdb, 0x37, 0xf7, 0xb1, 0xee, 0xc6, 0x1e, 0xb2, 0x4e, 0x92, -0x93, 0x25, 0x9a, 0x64, 0xa4, 0xc1, 0x85, 0xfa, 0x11, 0x40, 0x09, 0x37, -0xdd, 0x74, 0x03, 0x49, 0xdf, 0x5d, 0x00, 0x2e, 0xe4, 0xab, 0x9c, 0xbf, -0x7c, 0x95, 0x2b, 0x57, 0x66, 0xb9, 0x7c, 0xe5, 0x2a, 0xd9, 0xf9, 0x02, -0x22, 0xc2, 0x27, 0xf7, 0xee, 0xc1, 0x35, 0xe0, 0x9a, 0x18, 0xae, 0x81, -0x18, 0x42, 0x12, 0x97, 0x0e, 0xed, 0xd0, 0xae, 0x5d, 0x76, 0xdd, 0xd6, -0x87, 0x6c, 0xed, 0xf5, 0xd2, 0xaa, 0x08, 0xb9, 0x9a, 0x45, 0xd5, 0x85, -0x37, 0xdf, 0x1e, 0xa7, 0x58, 0xb3, 0x30, 0x22, 0xb4, 0x5b, 0x0e, 0x16, -0x82, 0xad, 0x5c, 0x6e, 0xbf, 0xa5, 0x2f, 0x74, 0x53, 0x63, 0x4c, 0x08, -0xac, 0x68, 0x6c, 0x94, 0x82, 0x74, 0x57, 0x86, 0x85, 0xec, 0x7c, 0x70, -0x79, 0xa0, 0x3e, 0x06, 0x44, 0xfa, 0x51, 0x20, 0x28, 0x12, 0x09, 0x9b, -0x38, 0xde, 0x40, 0x87, 0x8f, 0x9d, 0xe3, 0x9f, 0x86, 0x86, 0xeb, 0xa9, -0x0b, 0x24, 0x93, 0x76, 0x60, 0x7d, 0x44, 0x20, 0x97, 0xcd, 0xf3, 0xcc, -0x53, 0x87, 0xd9, 0xbe, 0x73, 0x3b, 0xdd, 0xab, 0x56, 0xe1, 0xfa, 0x55, -0x42, 0x87, 0xe5, 0xd0, 0x69, 0xd5, 0x48, 0x69, 0x87, 0x94, 0xe5, 0x90, -0x8e, 0xd7, 0xd8, 0xbe, 0xb5, 0x0f, 0xe3, 0x03, 0x15, 0xbf, 0xda, 0x34, -0xa1, 0xc2, 0x04, 0x47, 0x14, 0x73, 0x4e, 0x3b, 0x39, 0xb7, 0x8d, 0xab, -0x4e, 0x3b, 0x55, 0x62, 0x68, 0x1d, 0x21, 0xe0, 0x29, 0x36, 0x53, 0x47, -0xc0, 0x57, 0x3e, 0x20, 0xf4, 0xae, 0xee, 0xc1, 0x12, 0xc1, 0x18, 0x21, -0xdd, 0x95, 0xf6, 0xca, 0x59, 0x55, 0x4f, 0x60, 0x71, 0xb1, 0xcc, 0xfc, -0x7c, 0x81, 0x8e, 0xce, 0x0e, 0x8c, 0xc0, 0x33, 0x4f, 0x1d, 0x66, 0xe2, -0xe2, 0x04, 0x4f, 0x7c, 0xf3, 0x09, 0xee, 0xfe, 0xd9, 0x0f, 0xb1, 0xe5, -0xce, 0x01, 0x0c, 0x30, 0x5f, 0x8b, 0x31, 0x5b, 0x8e, 0xf9, 0x96, 0xf2, -0x5a, 0x4a, 0x3b, 0x58, 0x18, 0x04, 0xe8, 0x8e, 0x57, 0xbc, 0x09, 0xac, -0x66, 0xa3, 0x80, 0xb2, 0xb1, 0xa8, 0x48, 0x6c, 0x69, 0xae, 0x50, 0xfe, -0xc2, 0x3d, 0x48, 0xbf, 0x0d, 0x12, 0xb5, 0xc0, 0xa0, 0x28, 0x8f, 0x84, -0x31, 0x90, 0x10, 0x83, 0x11, 0xc3, 0xfa, 0x0d, 0x37, 0x34, 0x05, 0x4e, -0xb0, 0xda, 0xca, 0xce, 0xe7, 0x49, 0xa5, 0x3b, 0x38, 0x7e, 0xf4, 0x24, -0x13, 0x17, 0x27, 0x40, 0xa0, 0x52, 0x2e, 0xf3, 0xf2, 0xe1, 0x17, 0x18, -0x39, 0x77, 0x81, 0x5f, 0xd8, 0xfd, 0x2b, 0x58, 0xf1, 0x44, 0xb0, 0xd8, -0x0a, 0x5b, 0xae, 0x16, 0x0b, 0x87, 0x9c, 0xab, 0xda, 0xe1, 0xb0, 0x4a, -0x79, 0xa1, 0x11, 0x1c, 0xb5, 0x5e, 0x22, 0xe1, 0xfd, 0x5d, 0x35, 0x2c, -0xa7, 0xa2, 0xbb, 0x12, 0xc1, 0x92, 0xce, 0x18, 0x86, 0x9f, 0x3f, 0xca, -0x42, 0xa9, 0xec, 0x65, 0x18, 0x17, 0xfa, 0x56, 0xaf, 0xf4, 0xfc, 0x38, -0x68, 0xbe, 0xb9, 0x9f, 0x7e, 0xf2, 0x79, 0x5e, 0x7e, 0xe1, 0x28, 0xc3, -0xcf, 0xbe, 0xe8, 0xcf, 0xbe, 0xbe, 0x1b, 0x08, 0x5c, 0x19, 0xbf, 0xc4, -0xd0, 0xbf, 0x7c, 0x9d, 0x42, 0x2e, 0x1f, 0xba, 0x59, 0xb4, 0x35, 0x4a, -0x98, 0xec, 0x7c, 0xe0, 0x3a, 0x32, 0xc5, 0x04, 0xad, 0x85, 0x01, 0x96, -0x08, 0x88, 0x0f, 0x5e, 0x44, 0x18, 0x1b, 0x99, 0xe0, 0x8f, 0xff, 0xee, -0x31, 0x5e, 0x3d, 0x35, 0xca, 0xf8, 0x4c, 0x81, 0x45, 0xaf, 0x84, 0x6d, -0x6a, 0xb9, 0xf9, 0x1c, 0xdf, 0x7f, 0xe1, 0xe8, 0x12, 0x70, 0x24, 0x5c, -0xe3, 0x8a, 0x08, 0xdd, 0xab, 0x7a, 0x48, 0xa5, 0x3b, 0xf1, 0x57, 0x94, -0xcb, 0x82, 0x0f, 0x18, 0x04, 0x9a, 0xb7, 0x94, 0x3f, 0x37, 0x7a, 0xf3, -0x23, 0x31, 0x2f, 0x03, 0x53, 0x58, 0xf2, 0xff, 0x50, 0x22, 0x59, 0xa8, -0x7e, 0xf4, 0x85, 0x52, 0x85, 0x7f, 0x3c, 0xf4, 0xdd, 0x88, 0x7e, 0x1a, -0x45, 0x1a, 0x4e, 0x83, 0x05, 0xb9, 0xf7, 0xcb, 0xb6, 0x13, 0xec, 0xbc, -0x7f, 0x77, 0x5d, 0xa0, 0x07, 0xe7, 0x4d, 0xd8, 0x1b, 0xdc, 0x46, 0x5b, -0x1e, 0xf8, 0x60, 0xa2, 0x57, 0x78, 0xcf, 0xe5, 0xe6, 0xe6, 0xa2, 0x8f, -0x0d, 0xd7, 0x13, 0x88, 0xa4, 0xcd, 0xe5, 0x20, 0xb7, 0x22, 0x20, 0xf5, -0xbf, 0xc2, 0xf3, 0xed, 0xbb, 0x76, 0x11, 0xb3, 0x13, 0xb8, 0xe6, 0x1a, -0xc0, 0xb3, 0x04, 0x3e, 0xaa, 0xf9, 0x80, 0x00, 0x80, 0x32, 0xb4, 0x34, -0xdf, 0x52, 0x16, 0x0a, 0xed, 0xeb, 0x6d, 0x09, 0xbc, 0xf3, 0x5e, 0x45, -0xab, 0xa0, 0xf6, 0x4e, 0x82, 0xbd, 0x1e, 0x63, 0x24, 0x5c, 0x98, 0x4d, -0x5e, 0xba, 0x44, 0x21, 0x97, 0x63, 0xfd, 0x2d, 0x5b, 0x5b, 0x82, 0x57, -0x81, 0xbf, 0xfb, 0xee, 0x12, 0x8b, 0xf9, 0x16, 0xb0, 0x7c, 0xbf, 0x17, -0x28, 0x16, 0x8a, 0x2d, 0x91, 0xd4, 0x59, 0x20, 0x24, 0x42, 0xa3, 0x05, -0x84, 0xa6, 0x3c, 0x1a, 0xed, 0x45, 0x08, 0x04, 0x7f, 0xfa, 0xef, 0x67, -0x9f, 0xa1, 0xbd, 0xa3, 0x8b, 0xf9, 0x99, 0xa9, 0xd0, 0x2a, 0x6b, 0xfa, -0x37, 0x13, 0x4f, 0x24, 0xbc, 0x91, 0x1a, 0xdc, 0x26, 0xf4, 0xf7, 0x18, -0xc4, 0x7d, 0x22, 0x81, 0xfb, 0x88, 0x40, 0xa9, 0xb8, 0xd0, 0x88, 0xbd, -0x7e, 0x45, 0x26, 0x22, 0xc3, 0xc0, 0xe0, 0xd2, 0x7e, 0x4c, 0x13, 0x0b, -0x00, 0x6e, 0xbd, 0x7d, 0x0b, 0xfd, 0x3f, 0xb5, 0x09, 0xdb, 0x4e, 0x32, -0x7a, 0xee, 0x3c, 0x67, 0x4f, 0x9d, 0xa6, 0x5a, 0xa9, 0xd4, 0x11, 0x10, -0xbc, 0x74, 0x5a, 0x59, 0x2c, 0x87, 0x83, 0x09, 0x90, 0x9b, 0x9d, 0x66, -0xd5, 0xda, 0x75, 0x4b, 0xd9, 0x46, 0xd5, 0x6b, 0x3e, 0x1e, 0x03, 0x3b, -0xe6, 0x13, 0xd1, 0x9e, 0x65, 0xc0, 0x9b, 0x3b, 0xae, 0x4e, 0xcd, 0x34, -0x42, 0xc9, 0xd6, 0x11, 0x08, 0x10, 0x87, 0x16, 0x88, 0x6c, 0x2e, 0x01, -0x24, 0x92, 0x09, 0x76, 0x7f, 0xfc, 0x37, 0x58, 0xd9, 0xd7, 0x1b, 0x06, -0x65, 0xef, 0x8d, 0x6b, 0xd9, 0xf4, 0xc1, 0x0f, 0xf2, 0xf4, 0xe3, 0xff, -0xee, 0x93, 0x90, 0x3a, 0x77, 0x6a, 0xdc, 0xa9, 0xcb, 0x5e, 0x9d, 0xa2, -0x6f, 0xdd, 0xba, 0x66, 0xf0, 0xda, 0x03, 0x1f, 0x36, 0xab, 0x3e, 0x78, -0x05, 0x98, 0xbe, 0x32, 0xd9, 0xd2, 0x02, 0xd1, 0x34, 0x3a, 0x2c, 0x91, -0x14, 0x19, 0xcd, 0xf7, 0x22, 0xc2, 0xd6, 0xbb, 0xee, 0x60, 0x45, 0x6f, -0xaf, 0xb7, 0x90, 0x97, 0xa5, 0x1a, 0x6c, 0x45, 0x4f, 0x2f, 0x1f, 0x1a, -0xbc, 0xb7, 0x2e, 0xbd, 0x46, 0x9f, 0x8b, 0x5e, 0xcf, 0xce, 0x4c, 0xd5, -0xf9, 0x79, 0xa0, 0x71, 0x3b, 0xee, 0xb5, 0x44, 0xdc, 0xb7, 0x40, 0x2c, -0x12, 0xc4, 0xfe, 0x04, 0x31, 0xfa, 0xd6, 0xd9, 0x3a, 0xed, 0x3f, 0x3a, -0xb4, 0x3f, 0x57, 0x47, 0x00, 0x91, 0x13, 0x2c, 0xf3, 0x62, 0x44, 0xd8, -0x72, 0xd7, 0xdd, 0x1e, 0xf0, 0xc0, 0x58, 0xbe, 0x81, 0x8c, 0xc0, 0xa6, -0x2d, 0x5b, 0x5b, 0x80, 0xf6, 0xee, 0xf0, 0xae, 0x79, 0xb1, 0x55, 0xca, -0x67, 0x89, 0x5b, 0xf5, 0xc0, 0x13, 0x91, 0x66, 0xfb, 0xa4, 0x42, 0xff, -0xf7, 0x5d, 0x78, 0xa1, 0xb0, 0xc8, 0xdc, 0xcc, 0x6c, 0x93, 0xf6, 0xeb, -0x08, 0x7c, 0xf7, 0xeb, 0x7f, 0x92, 0x13, 0x9f, 0x44, 0x48, 0x24, 0x62, -0x85, 0x78, 0x22, 0x11, 0xe2, 0x0a, 0x48, 0x08, 0x2c, 0x4d, 0xa1, 0x61, -0x16, 0x6b, 0x6d, 0x01, 0x3b, 0xe9, 0x05, 0x6f, 0x14, 0x74, 0x72, 0x19, -0xf0, 0x96, 0x5f, 0xff, 0x04, 0x0a, 0x3a, 0xf1, 0xea, 0xeb, 0x8d, 0xee, -0xf3, 0x64, 0x70, 0x52, 0xbf, 0x22, 0xf3, 0x02, 0x79, 0x40, 0x44, 0x9a, -0xe2, 0x77, 0x76, 0x72, 0x8a, 0x95, 0xab, 0xfb, 0xfc, 0x82, 0x6f, 0x89, -0xbd, 0x01, 0xaa, 0x95, 0x72, 0x64, 0x26, 0xae, 0x1b, 0x90, 0xc1, 0xfb, -0xef, 0xe7, 0x86, 0xfe, 0xf5, 0x74, 0x65, 0xba, 0xea, 0x4b, 0x03, 0x2b, -0x5c, 0x89, 0x86, 0x29, 0x33, 0xcc, 0x3a, 0xd4, 0xbb, 0xe9, 0xe9, 0xe3, -0x4d, 0x04, 0x86, 0x9b, 0x2c, 0xe0, 0xe1, 0x97, 0x43, 0x12, 0xb5, 0x40, -0x60, 0x05, 0x23, 0xbc, 0xf6, 0xd2, 0x4b, 0x21, 0xbe, 0x20, 0x0d, 0x82, -0x67, 0xe6, 0x33, 0xc7, 0xff, 0x67, 0xd9, 0x18, 0xd8, 0x72, 0xe7, 0x6d, -0xac, 0x5c, 0xd9, 0xb5, 0xe4, 0xe3, 0x41, 0xf3, 0xdd, 0x28, 0x6e, 0xd5, -0x83, 0x07, 0x90, 0xa0, 0x72, 0x75, 0xe1, 0xd8, 0xcb, 0x3f, 0x68, 0x74, -0x9f, 0xb1, 0x47, 0x87, 0xf6, 0x9f, 0x6c, 0x49, 0xe0, 0xf9, 0x6f, 0xfc, -0x69, 0xf0, 0x81, 0xa1, 0x29, 0x0e, 0x2e, 0x9e, 0x3b, 0xc7, 0x2b, 0xcf, -0x3d, 0x17, 0x6a, 0xd8, 0x5f, 0x9b, 0x73, 0xe6, 0xf8, 0x31, 0x5e, 0x7b, -0xf1, 0xa5, 0x65, 0x03, 0xf7, 0xf4, 0xd1, 0x63, 0x21, 0xe0, 0x68, 0x96, -0x89, 0x45, 0x81, 0xab, 0x40, 0x81, 0x1e, 0x70, 0xc7, 0x80, 0xe3, 0xc0, -0xcc, 0x74, 0x8e, 0xe7, 0xbe, 0xf5, 0x9f, 0x8d, 0xda, 0x0f, 0xdd, 0x67, -0x23, 0xad, 0x76, 0xe6, 0x44, 0x0e, 0x02, 0x87, 0x82, 0xdc, 0x1d, 0xf1, -0x06, 0xde, 0x38, 0x7a, 0x8c, 0xb1, 0xb7, 0xcf, 0xd2, 0xb3, 0xba, 0x0f, -0xbb, 0x2d, 0xc9, 0x95, 0xb1, 0x8b, 0x14, 0xb2, 0xb9, 0xfa, 0x9b, 0xa2, -0x15, 0x05, 0x70, 0xe4, 0x3b, 0xcf, 0x72, 0xe1, 0xad, 0xb7, 0xd9, 0xfd, -0xe0, 0x6e, 0x56, 0xf4, 0x64, 0xea, 0xca, 0xe5, 0x30, 0x53, 0xfb, 0xae, -0x12, 0x25, 0x30, 0x7a, 0xfe, 0x32, 0xdf, 0xfa, 0xd7, 0x6f, 0x36, 0xc2, -0x03, 0x38, 0x18, 0xed, 0x34, 0x6d, 0xee, 0x8e, 0x00, 0x0f, 0x7f, 0xf2, -0x6f, 0x5e, 0x67, 0x99, 0x58, 0x68, 0xe0, 0xd4, 0x7c, 0xa5, 0xf1, 0xa2, -0x3f, 0xfe, 0x86, 0x9b, 0xfb, 0xd9, 0xfb, 0xd9, 0xdf, 0xac, 0xaf, 0xef, -0x23, 0x63, 0x18, 0x81, 0x4a, 0xc5, 0x61, 0xe4, 0x87, 0xe3, 0xfc, 0xe0, -0xfb, 0xc7, 0x39, 0x7f, 0xfa, 0xad, 0x96, 0xe0, 0x1f, 0x1d, 0xda, 0xff, -0xf9, 0xa0, 0xd3, 0xd2, 0x02, 0xde, 0x3b, 0xe5, 0xb7, 0x80, 0x61, 0x05, -0x99, 0xeb, 0xfa, 0x86, 0x16, 0xb9, 0x57, 0x22, 0xd7, 0x92, 0x6d, 0x49, -0x3e, 0xfa, 0xc0, 0x2e, 0xaf, 0x98, 0x93, 0x7a, 0xe0, 0x73, 0x57, 0xf3, -0x4c, 0x5c, 0xbc, 0xcc, 0xe8, 0xd9, 0x0b, 0x9c, 0x3a, 0xfa, 0xda, 0x3b, -0x8d, 0x3e, 0x06, 0xfc, 0x55, 0x14, 0x3c, 0x2c, 0x63, 0x01, 0x80, 0x87, -0x3e, 0xf1, 0x85, 0x6d, 0x78, 0xd1, 0x9e, 0x59, 0xae, 0x88, 0x6f, 0xba, -0xba, 0xcc, 0x7d, 0x1f, 0xd9, 0x73, 0x1f, 0xeb, 0x37, 0x7b, 0xaf, 0x9c, -0x9d, 0x9c, 0x61, 0x71, 0xb1, 0xcc, 0xd8, 0xd9, 0x0b, 0x4c, 0x8c, 0x8e, -0xb1, 0x58, 0x6c, 0xb1, 0xdd, 0xd0, 0x2c, 0x59, 0x60, 0x30, 0x1a, 0xbc, -0xcb, 0x12, 0xa8, 0x23, 0xf1, 0xf1, 0xbf, 0xde, 0x00, 0x1c, 0xc2, 0xdb, -0x44, 0xe2, 0xba, 0xac, 0xf1, 0xfe, 0xc9, 0x21, 0x60, 0x5f, 0x30, 0xf3, -0xc2, 0x12, 0x78, 0x78, 0x87, 0x6f, 0x64, 0x23, 0x91, 0xf3, 0x4f, 0x3f, -0x78, 0x60, 0x2f, 0x9e, 0xf9, 0xfa, 0xdf, 0x77, 0x78, 0xad, 0xe5, 0x04, -0x1e, 0xf0, 0x43, 0x51, 0xe0, 0x50, 0x0f, 0x1e, 0xde, 0xe5, 0x2b, 0xe5, -0x48, 0x43, 0xdf, 0x27, 0xb2, 0x8f, 0xc8, 0xf6, 0xf6, 0xfb, 0x28, 0x27, -0xf0, 0x52, 0xe4, 0xa1, 0x47, 0x87, 0xf6, 0x5f, 0x6c, 0x75, 0x43, 0x23, -0x78, 0xb8, 0xc6, 0xef, 0xc4, 0x2d, 0x88, 0x6c, 0xc3, 0x73, 0xab, 0x07, -0xf0, 0xc8, 0x64, 0xae, 0x07, 0x29, 0x9e, 0x4f, 0x9f, 0xf0, 0xdb, 0x30, -0x30, 0xdc, 0xa8, 0xe9, 0x40, 0x5a, 0x81, 0x8e, 0xca, 0x75, 0x7f, 0xa9, -0x6f, 0x24, 0x03, 0xf0, 0xe9, 0x07, 0x0f, 0x6c, 0xc0, 0x73, 0xaf, 0xa0, -0xb5, 0x92, 0x61, 0xff, 0x78, 0x62, 0x39, 0xb0, 0x81, 0xbc, 0x1b, 0xe8, -0xa8, 0xbc, 0xe7, 0x7f, 0x35, 0x08, 0xa4, 0x15, 0xa1, 0xeb, 0x95, 0xeb, -0x01, 0xdc, 0x28, 0x3f, 0x36, 0x81, 0x9f, 0xb4, 0xfc, 0x2f, 0x83, 0x5f, -0xe1, 0x0b, 0x7d, 0x74, 0xae, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c b/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c deleted file mode 100644 index 0c21d7c26f..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.c +++ /dev/null @@ -1,239 +0,0 @@ -static const unsigned char toolbar_plugin_pad_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x31, 0x2f, 0x30, 0x34, 0x0e, 0x46, 0xed, 0x55, 0x00, 0x00, 0x0a, 0x6a, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5f, 0x8c, 0x5c, 0xd7, -0x5d, 0xc7, 0x3f, 0xe7, 0xdc, 0x7b, 0xe7, 0xde, 0x99, 0xd9, 0x3f, 0xb3, -0xb1, 0xbd, 0x76, 0xdc, 0x84, 0xac, 0x31, 0xa4, 0x89, 0xe8, 0x9f, 0x15, -0x15, 0x22, 0x45, 0x21, 0xb1, 0x1b, 0x25, 0x8a, 0x02, 0x28, 0xe6, 0x89, -0x07, 0x5a, 0x39, 0x7d, 0xe1, 0x01, 0x24, 0x12, 0x1e, 0x10, 0x52, 0xd5, -0x07, 0xf3, 0x08, 0xa8, 0x28, 0x41, 0x6a, 0xc0, 0x48, 0x34, 0x81, 0x8a, -0x06, 0x90, 0x4a, 0x8c, 0x10, 0x14, 0x89, 0x56, 0x5d, 0x22, 0x51, 0xda, -0xaa, 0x21, 0x9b, 0xe0, 0xa4, 0x69, 0x12, 0xdb, 0xeb, 0x64, 0xbd, 0xf6, -0xee, 0x7a, 0xff, 0xcd, 0xee, 0xcc, 0xce, 0xcc, 0x39, 0xbf, 0xf3, 0xe3, -0xe1, 0xdc, 0xd9, 0x5d, 0x68, 0xa5, 0xcc, 0xce, 0x5a, 0xa9, 0x7a, 0xa5, -0x9f, 0xe6, 0xce, 0x8e, 0xe6, 0xde, 0xef, 0xe7, 0xfc, 0xbe, 0xe7, 0xf7, -0x3b, 0xe7, 0xce, 0x1a, 0x55, 0xe5, 0x27, 0xf9, 0xb0, 0x3f, 0x6e, 0x01, -0x07, 0x3d, 0xd2, 0x5b, 0x75, 0xa1, 0xb5, 0xbf, 0xf8, 0x54, 0x43, 0x24, -0x9c, 0xf1, 0x5e, 0xce, 0x78, 0x91, 0x8f, 0x3b, 0x2f, 0x53, 0xce, 0x0b, -0xde, 0xcb, 0x9c, 0xf3, 0xf2, 0xaa, 0xf7, 0x72, 0xc1, 0x79, 0xb9, 0x70, -0xdf, 0x1f, 0xbf, 0xb9, 0x7e, 0xab, 0xee, 0x09, 0x60, 0x6e, 0x85, 0x85, -0xda, 0x5f, 0x7a, 0xe4, 0x9c, 0x97, 0xf0, 0xa4, 0xf7, 0xd2, 0xf0, 0x5e, -0x70, 0x65, 0xfc, 0xd0, 0xb9, 0x93, 0x75, 0xe7, 0xe5, 0x99, 0xfb, 0xff, -0xf4, 0xad, 0x73, 0x07, 0x97, 0x1e, 0x8f, 0x03, 0x01, 0xf8, 0x2f, 0x3f, -0xd6, 0xc0, 0x98, 0x17, 0x45, 0xe4, 0xd4, 0x1e, 0x91, 0x38, 0x2f, 0x24, -0x63, 0x35, 0xbc, 0x17, 0x36, 0x17, 0xd7, 0x76, 0x20, 0x5c, 0xf9, 0xb9, -0xf7, 0x32, 0xe3, 0xbc, 0xfc, 0xfa, 0xc3, 0xcf, 0xce, 0x1d, 0x38, 0x1b, -0x43, 0x03, 0x74, 0x9e, 0x7f, 0xb4, 0x91, 0xa5, 0xc9, 0x37, 0x8d, 0x35, -0xd3, 0xbe, 0x14, 0x6d, 0x8e, 0x1f, 0xa1, 0x72, 0xd7, 0x31, 0xd2, 0xd1, -0xdb, 0x40, 0x2b, 0xe0, 0xba, 0xb0, 0x75, 0x93, 0xce, 0xb5, 0x6b, 0x2c, -0x5e, 0x5a, 0xe0, 0xc6, 0xfc, 0x6a, 0x1f, 0x00, 0xe7, 0x65, 0xd6, 0x79, -0x7f, 0xfa, 0xb1, 0xbf, 0x9c, 0x3f, 0x10, 0xc4, 0xd0, 0x73, 0x20, 0xa8, -0xbe, 0x28, 0x21, 0x4c, 0x13, 0x20, 0xa4, 0x96, 0xe2, 0x97, 0x3f, 0x41, -0x32, 0xf9, 0x61, 0x28, 0x7e, 0x1e, 0xd2, 0x11, 0xa0, 0x0b, 0x74, 0x80, -0x0e, 0xc5, 0xcf, 0x5c, 0xe3, 0xae, 0x3b, 0xff, 0x8b, 0x89, 0x8b, 0xaf, -0xf2, 0xc6, 0xec, 0x55, 0xbc, 0x17, 0x80, 0x69, 0xe0, 0x45, 0xe0, 0xf4, -0x41, 0x00, 0x86, 0xca, 0xc0, 0xfa, 0xf9, 0x4f, 0x9d, 0x4d, 0x92, 0xe4, -0xf9, 0xc4, 0x1a, 0x4c, 0x96, 0x91, 0x3f, 0xfc, 0x4b, 0xd8, 0xc9, 0x5f, -0x05, 0x7b, 0x72, 0x57, 0xf8, 0xf6, 0x65, 0x68, 0x5f, 0x03, 0xe9, 0x40, -0x5e, 0x83, 0xf1, 0x06, 0x5c, 0xbb, 0x48, 0xeb, 0x3f, 0xfe, 0x95, 0x57, -0x5e, 0xbe, 0x4a, 0xbb, 0xdd, 0xeb, 0xdb, 0xea, 0x89, 0x33, 0xcf, 0x5d, -0xff, 0xeb, 0x61, 0x01, 0x86, 0xca, 0x80, 0x48, 0x38, 0x07, 0x10, 0x82, -0xa1, 0xfe, 0xe0, 0x2f, 0x60, 0x27, 0x1f, 0x01, 0xfb, 0x51, 0xd0, 0x4d, -0xd8, 0xfe, 0x6f, 0xd8, 0xf8, 0x2e, 0xb4, 0x9b, 0xd0, 0xe9, 0x40, 0xb7, -0x1b, 0x23, 0x00, 0x77, 0xde, 0x4b, 0xfd, 0x93, 0x0f, 0xf0, 0x91, 0xce, -0x37, 0xf8, 0xee, 0xcb, 0x73, 0xf1, 0x62, 0xaa, 0xe7, 0x80, 0xa1, 0x01, -0xf6, 0xdd, 0x07, 0x16, 0x9e, 0xbe, 0xff, 0x71, 0x2f, 0x61, 0xca, 0xfb, -0x80, 0x99, 0x18, 0x23, 0x3d, 0x7a, 0x0f, 0xd8, 0x7b, 0x41, 0x5b, 0xb0, -0xf5, 0x55, 0xd8, 0xfa, 0x0e, 0xf8, 0x0e, 0xa8, 0xc6, 0x08, 0x21, 0xbe, -0x8a, 0x83, 0xcb, 0xb3, 0xd0, 0xde, 0xa4, 0x71, 0xcf, 0x49, 0x0e, 0xdd, -0x36, 0x82, 0xa2, 0xa8, 0x32, 0xf5, 0x0f, 0xbf, 0x79, 0xe4, 0xf1, 0x0f, -0x0c, 0xa0, 0xac, 0xf5, 0x38, 0x2f, 0x54, 0x4e, 0x1c, 0x87, 0xec, 0x6e, -0xa0, 0x07, 0x9b, 0xff, 0x08, 0xdb, 0x0b, 0xe0, 0x7d, 0x0c, 0x91, 0x28, -0xbe, 0x0f, 0x60, 0x2d, 0x24, 0x09, 0xac, 0xde, 0x00, 0xf1, 0xdc, 0x75, -0x47, 0x03, 0x8c, 0x45, 0x55, 0x51, 0xd5, 0x33, 0xc3, 0x02, 0xec, 0xdb, -0x42, 0x5e, 0x64, 0xda, 0xaa, 0xc5, 0x06, 0xa5, 0x98, 0x3c, 0x02, 0xf9, -0xed, 0xd0, 0x7e, 0x0d, 0xb6, 0xae, 0x44, 0xb1, 0x7d, 0x80, 0x7e, 0xf4, -0x01, 0x8c, 0x81, 0x34, 0x8d, 0x20, 0xce, 0x71, 0xf8, 0xe8, 0x38, 0x58, -0x4b, 0x88, 0x00, 0xd3, 0xc3, 0x02, 0xec, 0x3b, 0x03, 0x5e, 0xc2, 0xb4, -0xf7, 0x42, 0x32, 0x5e, 0x07, 0x33, 0x02, 0xf4, 0xe0, 0xe6, 0x7f, 0xee, -0xfa, 0xbd, 0xd7, 0x8b, 0xe1, 0xdc, 0x2e, 0x40, 0x5f, 0x7c, 0xa5, 0x02, -0x45, 0x11, 0x23, 0xcb, 0x38, 0xd4, 0x28, 0x50, 0x20, 0x1c, 0x00, 0x60, -0xff, 0x19, 0xf0, 0x82, 0x35, 0x06, 0x71, 0x3e, 0xd6, 0x79, 0xb7, 0x0c, -0xad, 0x9b, 0xf1, 0x43, 0xd5, 0x68, 0x9d, 0xbd, 0x36, 0x52, 0x8d, 0xd6, -0xa9, 0x54, 0x20, 0xcf, 0xe3, 0x39, 0x44, 0x20, 0x63, 0x08, 0x41, 0x09, -0x61, 0xf8, 0x66, 0x3a, 0x14, 0x80, 0xb1, 0x06, 0xf1, 0x25, 0x40, 0x6b, -0x21, 0x8e, 0x3c, 0xec, 0x99, 0xb0, 0xa5, 0xff, 0xfb, 0x42, 0xb3, 0x0c, -0xaa, 0xd5, 0x08, 0x60, 0x4c, 0xcc, 0x0e, 0x10, 0x24, 0x10, 0x42, 0x38, -0x10, 0xc0, 0x30, 0x16, 0x9a, 0xf1, 0x3e, 0xb0, 0x71, 0x73, 0x03, 0xb6, -0x56, 0x61, 0x6b, 0x61, 0xd7, 0x2e, 0x7b, 0x85, 0x5b, 0x1b, 0x85, 0x17, -0x05, 0xd4, 0x6a, 0x31, 0x8a, 0x62, 0x37, 0x03, 0x22, 0xdc, 0xb8, 0xd9, -0x8a, 0x00, 0x1a, 0x66, 0x3e, 0x30, 0x00, 0xe7, 0x65, 0xce, 0x97, 0xeb, -0x9e, 0xf6, 0xc2, 0x42, 0xbc, 0x42, 0x5f, 0x78, 0xbf, 0xd2, 0xa4, 0x69, -0x1c, 0xed, 0x5a, 0x0d, 0xea, 0x75, 0x18, 0x1d, 0x8d, 0x19, 0x48, 0xd3, -0x98, 0xa1, 0x6e, 0x97, 0xcd, 0xb5, 0x2d, 0x9c, 0x73, 0x88, 0x28, 0x21, -0xe8, 0xdc, 0x07, 0x06, 0xe0, 0xbd, 0xcc, 0xf4, 0xcb, 0xe8, 0xcd, 0x77, -0x97, 0x61, 0xe9, 0x52, 0xfc, 0xa0, 0x6f, 0x95, 0xa2, 0x88, 0xa2, 0x47, -0x46, 0xa2, 0xf0, 0xd1, 0xd1, 0x08, 0x52, 0xa9, 0x44, 0xf1, 0xbd, 0x1e, -0xb4, 0x5a, 0x5c, 0x9d, 0x5b, 0x46, 0x7a, 0x3e, 0x66, 0x40, 0x86, 0xcf, -0xc0, 0x30, 0x73, 0xe0, 0x82, 0x31, 0x66, 0xdd, 0x18, 0xd3, 0xb8, 0x3e, -0xbf, 0xc2, 0xf1, 0xa5, 0xeb, 0xa4, 0x13, 0xe3, 0xbb, 0xe2, 0xf3, 0x3c, -0x9e, 0xf7, 0x81, 0x92, 0x64, 0xd7, 0xf7, 0xdd, 0x2e, 0x6c, 0x6e, 0xe2, -0x56, 0xd6, 0x78, 0xeb, 0xf2, 0x12, 0x5e, 0x04, 0x09, 0x61, 0x3d, 0xa8, -0x5e, 0x18, 0x16, 0x60, 0xdf, 0x19, 0x78, 0xe0, 0xe9, 0x77, 0x36, 0xbc, -0x97, 0x0b, 0xde, 0x0b, 0x9d, 0xed, 0x1e, 0x6f, 0xbf, 0x72, 0x09, 0x36, -0x9b, 0x71, 0x0e, 0x18, 0x13, 0x05, 0x67, 0xd9, 0xae, 0x78, 0x88, 0xe2, -0xdb, 0x6d, 0x68, 0x36, 0x61, 0x65, 0x85, 0xef, 0x7d, 0xef, 0x32, 0xad, -0xcd, 0x0e, 0x22, 0x01, 0x91, 0x70, 0xe1, 0xb7, 0xfe, 0xb9, 0xbd, 0xf1, -0x81, 0x01, 0x00, 0x38, 0x91, 0x73, 0xce, 0x0b, 0xbd, 0x9e, 0x67, 0xe1, -0xda, 0x1a, 0x8b, 0x97, 0x16, 0x60, 0x63, 0x23, 0x8a, 0xec, 0xf7, 0x00, -0xe7, 0x62, 0x6f, 0x68, 0xb5, 0xa2, 0xf0, 0xb5, 0x35, 0x58, 0x5a, 0xe2, -0xbd, 0xef, 0xbf, 0xcb, 0xe5, 0xcb, 0x4b, 0x38, 0xe7, 0x11, 0x09, 0x00, -0xe7, 0x86, 0x15, 0x3f, 0x34, 0xc0, 0x23, 0xcf, 0x5e, 0xbd, 0xfa, 0xd6, -0x68, 0xb8, 0xe0, 0xbd, 0xd0, 0xeb, 0xf6, 0x98, 0x9d, 0x7d, 0x8f, 0xf9, -0xd7, 0xaf, 0xc0, 0xf5, 0xeb, 0xb0, 0xb4, 0x04, 0xab, 0xab, 0x51, 0xf0, -0xda, 0x1a, 0xac, 0xac, 0xc0, 0x8d, 0x1b, 0x30, 0x3f, 0xcf, 0xa5, 0x57, -0xde, 0xe1, 0xa5, 0x6f, 0xbd, 0x4d, 0xb7, 0xeb, 0x10, 0x09, 0x7c, 0xe3, -0x28, 0x7c, 0xee, 0xa3, 0x7c, 0xf6, 0x20, 0x00, 0x43, 0x2d, 0xa7, 0x4f, -0xbf, 0x70, 0xe2, 0x09, 0x55, 0x7d, 0xee, 0xd3, 0xdf, 0x71, 0x4c, 0x6e, -0x29, 0x60, 0xb0, 0x89, 0x61, 0xf2, 0xc8, 0x18, 0x77, 0xff, 0xec, 0x24, -0x8d, 0x23, 0xe5, 0x9c, 0x00, 0x70, 0x8e, 0x95, 0xc5, 0x75, 0x2e, 0xbe, -0x7e, 0x8d, 0x77, 0xdf, 0x5b, 0xc1, 0x79, 0x41, 0xbc, 0x70, 0xbd, 0x80, -0x2f, 0x7e, 0xd8, 0x94, 0x55, 0x28, 0xcc, 0x8a, 0xe8, 0xe9, 0x8d, 0x3f, -0xe9, 0xec, 0x7b, 0x73, 0xb3, 0x6f, 0x80, 0x87, 0xfe, 0xfe, 0xa7, 0x9f, -0x00, 0x9e, 0x0b, 0x41, 0xc9, 0x7a, 0x81, 0xcf, 0xbe, 0xd4, 0x25, 0x77, -0xca, 0xce, 0x55, 0xac, 0xa1, 0x5e, 0x2f, 0xa8, 0xd7, 0x52, 0x42, 0x50, -0x9a, 0x9b, 0x5d, 0x36, 0x9a, 0xdb, 0x88, 0xf3, 0x71, 0xd2, 0x4a, 0xa0, -0x93, 0xc2, 0xd3, 0x1f, 0x49, 0x68, 0xa1, 0xfd, 0x32, 0x8a, 0x48, 0x98, -0x0d, 0x41, 0x4f, 0x6f, 0x7e, 0xa1, 0xbb, 0x2f, 0x88, 0x7d, 0x01, 0x9c, -0x7e, 0xe1, 0xc4, 0xb4, 0xb5, 0xe6, 0x9b, 0x40, 0x23, 0x04, 0xc5, 0x26, -0x86, 0xa9, 0x4a, 0xca, 0x03, 0x2f, 0x39, 0xf2, 0x1b, 0x4d, 0x50, 0xe2, -0xea, 0x12, 0x83, 0x6a, 0x29, 0x4c, 0xc3, 0xff, 0xe9, 0xb8, 0xcb, 0x87, -0x2c, 0x5f, 0x7b, 0xb0, 0xc2, 0x7c, 0xaa, 0xb8, 0x05, 0xa1, 0xd7, 0x94, -0x72, 0x32, 0x2b, 0x21, 0xe8, 0xcc, 0xe6, 0x17, 0xba, 0xfb, 0xda, 0xa1, -0xed, 0x6b, 0x0e, 0x84, 0xa0, 0xcf, 0x89, 0x68, 0x43, 0x44, 0xc9, 0xf2, -0x84, 0xa9, 0x7b, 0x1a, 0x3c, 0xfa, 0xc9, 0xdf, 0xe1, 0x57, 0xfe, 0x70, -0x86, 0x3b, 0x1e, 0xfe, 0x4c, 0xb9, 0xc3, 0x0a, 0x38, 0xe7, 0x63, 0x78, -0x8f, 0x2f, 0xf7, 0xc0, 0x21, 0x28, 0xaf, 0x7e, 0x2c, 0xe7, 0xab, 0xbf, -0x56, 0x65, 0xf5, 0x70, 0x4a, 0x3e, 0x9e, 0x51, 0xbd, 0x3b, 0x23, 0xbf, -0x33, 0xc3, 0x5a, 0xd3, 0xbf, 0xc5, 0xa9, 0xda, 0x53, 0x95, 0xb3, 0xfb, -0xd1, 0x34, 0x70, 0x06, 0xee, 0xff, 0x9b, 0x9f, 0x7a, 0xd2, 0x18, 0xf3, -0xb4, 0x31, 0x50, 0x54, 0x53, 0x4e, 0xde, 0x7b, 0x1b, 0x9f, 0xfe, 0xd0, -0xe7, 0xf9, 0xc5, 0xb1, 0xc7, 0xe8, 0x69, 0x8f, 0xd7, 0xb7, 0xbe, 0xcd, -0xd7, 0xdf, 0xfc, 0x2b, 0xda, 0x5f, 0x9f, 0x61, 0x62, 0x6e, 0x9b, 0xb1, -0x1b, 0x3d, 0x82, 0x2a, 0x6b, 0x47, 0x52, 0xae, 0xdf, 0x91, 0xf1, 0xda, -0xc7, 0x2a, 0xac, 0xd5, 0xc0, 0xc7, 0xe5, 0x33, 0xc6, 0x58, 0xc0, 0xe2, -0x83, 0xd0, 0x5c, 0xec, 0xd0, 0x7e, 0xbb, 0x8b, 0x73, 0x81, 0x10, 0x74, -0x3d, 0x84, 0x70, 0xa2, 0xf3, 0x67, 0x7e, 0x20, 0x2b, 0x0d, 0xd4, 0xc8, -0xee, 0xfb, 0xd2, 0x1d, 0x0d, 0x63, 0xcc, 0x39, 0x63, 0x20, 0x49, 0x0d, -0x47, 0xa7, 0x46, 0x78, 0xe8, 0xd0, 0x67, 0xf8, 0xc4, 0xd8, 0xc3, 0x78, -0x1c, 0xff, 0x7e, 0xf3, 0x05, 0xfe, 0x6e, 0xfe, 0x19, 0xbc, 0x0d, 0xf8, -0x87, 0xc6, 0x71, 0x32, 0x82, 0x0b, 0x01, 0x2f, 0x01, 0x27, 0x01, 0x1f, -0x04, 0x27, 0x01, 0x95, 0x80, 0x86, 0x80, 0xb1, 0x09, 0x49, 0x92, 0x90, -0x25, 0x29, 0xd6, 0xe4, 0x98, 0x63, 0x16, 0x59, 0x0b, 0xf8, 0x1b, 0x3d, -0x20, 0x34, 0x54, 0x79, 0x9c, 0x01, 0xb7, 0x99, 0x03, 0x01, 0x84, 0xa0, -0x67, 0x8d, 0xa1, 0x61, 0x8c, 0xd2, 0x38, 0x52, 0xe3, 0x58, 0xed, 0x04, -0xa7, 0x0e, 0xff, 0x06, 0xed, 0xd0, 0xe2, 0xcb, 0xef, 0xfe, 0x11, 0xdf, -0x5a, 0xfd, 0x37, 0x24, 0x28, 0x12, 0x02, 0x3e, 0x84, 0xf2, 0x3c, 0x46, -0xd0, 0xe8, 0xfd, 0xa0, 0xbb, 0x61, 0x51, 0x52, 0x6b, 0xa9, 0xa4, 0x19, -0x79, 0x96, 0x91, 0xa6, 0x09, 0xbd, 0x93, 0x42, 0x67, 0xd5, 0xe1, 0xdb, -0x40, 0xec, 0x0d, 0x03, 0x01, 0x0c, 0x34, 0x07, 0x44, 0xf4, 0x29, 0x11, -0x85, 0xc4, 0x90, 0x37, 0x12, 0x1e, 0x3d, 0x7a, 0x96, 0x6d, 0x69, 0xf3, -0xb5, 0xc5, 0xaf, 0x30, 0xb3, 0xfc, 0x2f, 0x74, 0xbd, 0xa7, 0xe7, 0x3d, -0x3d, 0x11, 0x7a, 0x22, 0xb8, 0x20, 0x78, 0x89, 0x30, 0x3e, 0x28, 0x7e, -0x07, 0x28, 0x20, 0xaa, 0x44, 0xd7, 0x5a, 0xf2, 0x2c, 0xa5, 0x5e, 0x14, -0x8c, 0x55, 0xeb, 0x8c, 0x8f, 0xd6, 0xc8, 0x6f, 0xcf, 0x00, 0x83, 0x2a, -0x53, 0xe9, 0x6f, 0xdb, 0x81, 0x36, 0x39, 0xef, 0x9b, 0x81, 0xe9, 0x67, -0x8f, 0x4d, 0x1b, 0x63, 0xa6, 0x8c, 0x51, 0xf2, 0xdb, 0x32, 0x3e, 0x54, -0xdc, 0xcd, 0xf1, 0xda, 0x49, 0xde, 0xde, 0xba, 0xc8, 0xdf, 0x5e, 0xf9, -0x62, 0x7f, 0x63, 0x5e, 0x8e, 0x6e, 0xd8, 0x15, 0x1a, 0xb4, 0x04, 0x08, -0x31, 0x33, 0x12, 0x5f, 0x43, 0x09, 0x90, 0x24, 0x96, 0x4a, 0x96, 0x51, -0xcb, 0x73, 0x82, 0x2a, 0x1d, 0xef, 0xc8, 0x27, 0x9b, 0xd8, 0x2b, 0x1d, -0xbc, 0x57, 0x54, 0x79, 0x10, 0x98, 0x3d, 0x30, 0x80, 0x88, 0x3e, 0x6e, -0x4c, 0x5c, 0xe6, 0x68, 0x55, 0xf9, 0xb9, 0xc6, 0x7d, 0xb4, 0xa5, 0xc5, -0x57, 0xae, 0xfc, 0x39, 0x1d, 0xe7, 0x50, 0xd8, 0x03, 0x50, 0x46, 0x39, -0xd2, 0x7d, 0xf1, 0x12, 0x34, 0x02, 0x94, 0x05, 0xc3, 0x5a, 0x4b, 0x25, -0x49, 0xa9, 0x56, 0x72, 0x6a, 0x79, 0x0e, 0x40, 0xd7, 0x79, 0xf2, 0x5a, -0x86, 0x29, 0x2c, 0xda, 0x15, 0x54, 0x39, 0x05, 0x3c, 0x73, 0x60, 0x80, -0x10, 0xf4, 0x94, 0x31, 0x8a, 0xad, 0x59, 0x9c, 0x06, 0x8e, 0xd5, 0xa6, -0xf8, 0x9f, 0xb5, 0x97, 0x79, 0x63, 0xed, 0x22, 0xfd, 0x0a, 0x56, 0xee, -0x6b, 0x63, 0xed, 0xd7, 0x5d, 0xef, 0xef, 0xcd, 0x46, 0x28, 0x37, 0xf6, -0x59, 0x92, 0x52, 0x54, 0x2a, 0xd4, 0x8a, 0x82, 0xb1, 0x6a, 0x95, 0x91, -0xa2, 0x40, 0x24, 0x50, 0xc9, 0x32, 0x2a, 0x69, 0x86, 0xa9, 0x02, 0x1b, -0x8a, 0xaa, 0x4e, 0xbd, 0x9f, 0xb6, 0x81, 0x00, 0x44, 0x74, 0xca, 0x18, -0x30, 0x05, 0xf8, 0x00, 0x79, 0x5a, 0xe5, 0xdb, 0xf3, 0x2f, 0x11, 0x94, -0xb2, 0x51, 0x29, 0xaa, 0x01, 0x51, 0xca, 0xdd, 0x95, 0xee, 0xd8, 0xa4, -0x0f, 0x85, 0x31, 0x58, 0x6b, 0x49, 0x93, 0x84, 0x6a, 0xa5, 0x60, 0xac, -0x56, 0x67, 0xa2, 0x3e, 0xc2, 0x58, 0xad, 0x4e, 0xad, 0x52, 0xa1, 0xe3, -0x1c, 0xa9, 0xb5, 0x24, 0xd6, 0x62, 0xaa, 0xb6, 0x9c, 0x23, 0xdc, 0x9a, -0x39, 0x10, 0x42, 0x98, 0x02, 0x83, 0x0d, 0x71, 0xb9, 0xd0, 0xd5, 0x6d, -0xde, 0xdb, 0xbe, 0x4c, 0x9a, 0x66, 0x88, 0x04, 0x34, 0x08, 0x12, 0x4c, -0xf9, 0xe8, 0x04, 0x50, 0xc5, 0x98, 0x78, 0x1e, 0x17, 0xd3, 0x86, 0xc4, -0x5a, 0xb2, 0x34, 0xa5, 0xc8, 0x2a, 0x8c, 0x56, 0x6b, 0x4c, 0x8c, 0x8c, -0x70, 0x68, 0x74, 0x94, 0xb1, 0x5a, 0x8d, 0xc4, 0x18, 0x7a, 0xde, 0xef, -0xc0, 0x6b, 0xd9, 0xcd, 0x07, 0x3d, 0x06, 0xc9, 0x00, 0xc6, 0x28, 0xbe, -0x6b, 0xc1, 0x58, 0x7e, 0xd0, 0xbc, 0x88, 0x37, 0x1d, 0x46, 0x8a, 0x2a, -0x12, 0x02, 0x4e, 0x04, 0x5f, 0x56, 0x9d, 0xa0, 0x71, 0xe9, 0x40, 0xf9, -0x18, 0xc8, 0x60, 0x49, 0x12, 0xbb, 0x63, 0x9b, 0x7a, 0x5e, 0x30, 0x56, -0xab, 0x31, 0x51, 0xaf, 0x33, 0x56, 0xab, 0x92, 0x67, 0x95, 0x58, 0xbd, -0xbc, 0x67, 0xdb, 0x39, 0xba, 0xce, 0x21, 0x1d, 0x19, 0x58, 0xfc, 0xa0, -0x00, 0x73, 0xc6, 0x30, 0x65, 0xda, 0x42, 0xd7, 0x0b, 0x3f, 0xd8, 0x78, -0x8d, 0x6a, 0x25, 0x27, 0x4b, 0x53, 0x8c, 0x31, 0xd1, 0xe3, 0x22, 0x3b, -0x15, 0x27, 0x8e, 0x5e, 0xec, 0xb4, 0x89, 0x4d, 0xc8, 0xd2, 0x84, 0x3c, -0x8d, 0xd5, 0xa6, 0x9e, 0xe7, 0xd4, 0x8b, 0x9c, 0x5a, 0xf9, 0x7d, 0x09, -0x81, 0x76, 0xb7, 0xcb, 0xc6, 0xf6, 0x36, 0x1b, 0xad, 0x16, 0xad, 0x4e, -0x07, 0xb7, 0x26, 0x7d, 0x0b, 0xcd, 0xdd, 0x12, 0x80, 0x10, 0xc2, 0x2c, -0x98, 0x29, 0xda, 0x81, 0xed, 0xe5, 0x2e, 0x6f, 0xe4, 0xdf, 0xe7, 0x78, -0xe3, 0x30, 0x69, 0x92, 0x90, 0x67, 0x29, 0xd6, 0xd8, 0x58, 0xa1, 0xe2, -0xaa, 0x1a, 0x00, 0x4b, 0xe9, 0x79, 0x6b, 0x49, 0x92, 0x84, 0x4a, 0x9a, -0x92, 0xa5, 0x69, 0x7c, 0x4d, 0x12, 0x4c, 0x69, 0x9b, 0x56, 0xa7, 0xc3, -0xca, 0xe6, 0x26, 0xcb, 0xcd, 0x26, 0x8b, 0xcd, 0x26, 0x9b, 0x0b, 0x1d, -0x64, 0x3b, 0xf4, 0x6f, 0xfd, 0xbe, 0x25, 0x74, 0x20, 0x00, 0x11, 0xbd, -0x00, 0x7a, 0x26, 0x04, 0x08, 0xd7, 0x61, 0x29, 0xdb, 0x40, 0x55, 0x99, -0x1c, 0x1f, 0x07, 0x53, 0xa3, 0xc8, 0x2c, 0x59, 0x92, 0x90, 0xd8, 0x84, -0xc4, 0x5a, 0xac, 0xd9, 0x23, 0xbe, 0x0c, 0x5b, 0xfe, 0xdd, 0x00, 0xae, -0xb4, 0xcc, 0x56, 0xb7, 0xcb, 0xfa, 0xd6, 0x16, 0x8b, 0xcd, 0x26, 0xd7, -0x56, 0x57, 0x59, 0x5e, 0xdc, 0x60, 0xfb, 0x52, 0x6f, 0xaf, 0xff, 0x07, -0xda, 0x27, 0x0f, 0x04, 0x60, 0x0c, 0xeb, 0x40, 0x43, 0xbb, 0x9e, 0xf4, -0x8a, 0xb2, 0xd8, 0x5a, 0xa7, 0x79, 0x7b, 0x87, 0xc3, 0x63, 0x63, 0x4c, -0xd4, 0xeb, 0x8c, 0xe4, 0x39, 0x45, 0xa5, 0xb2, 0x33, 0xc2, 0x18, 0x13, -0x6b, 0x7e, 0x7f, 0x62, 0x8a, 0x10, 0x42, 0xc0, 0x8b, 0xd0, 0x75, 0x8e, -0x56, 0x69, 0x9b, 0x9b, 0xcd, 0x26, 0x8b, 0x1b, 0x1b, 0xac, 0x5c, 0xdb, -0xa4, 0xf5, 0x66, 0x87, 0xe0, 0x76, 0x46, 0x7f, 0x7d, 0x50, 0x80, 0x81, -0x56, 0xa3, 0x93, 0x9f, 0x1f, 0x79, 0x10, 0x98, 0x31, 0x7d, 0x8b, 0x58, -0x43, 0x52, 0x4b, 0x31, 0x93, 0x86, 0x62, 0x22, 0x67, 0xb4, 0x5e, 0x65, -0xb4, 0x5a, 0xa5, 0x9e, 0xe7, 0xd4, 0x4a, 0x90, 0x24, 0x49, 0xb0, 0xc4, -0x1e, 0xd1, 0x9f, 0xec, 0x9d, 0x5e, 0x8f, 0xad, 0x6e, 0x97, 0xcd, 0x76, -0x3b, 0xfa, 0x7e, 0xbd, 0xc5, 0xd6, 0x3b, 0x5d, 0x3a, 0x4b, 0x8e, 0x10, -0xc2, 0xde, 0x5b, 0x9e, 0xd1, 0xf3, 0xfa, 0x4f, 0xb7, 0x0c, 0x00, 0xe0, -0xf0, 0xe7, 0x6a, 0x67, 0x81, 0xe7, 0x77, 0xbe, 0x68, 0xc0, 0x18, 0x83, -0xb5, 0x09, 0x66, 0xdc, 0x60, 0x47, 0x13, 0xb2, 0x7a, 0x42, 0x3a, 0x92, -0x90, 0xa5, 0xe9, 0x8e, 0x9d, 0x20, 0xf6, 0x03, 0x27, 0x42, 0xcf, 0x7b, -0xba, 0x5b, 0x8e, 0xce, 0x6a, 0x8f, 0xee, 0xb2, 0xa7, 0xb7, 0x1a, 0xf7, -0xc6, 0xff, 0x4f, 0xc2, 0x53, 0x7a, 0x5e, 0xdf, 0xb7, 0x03, 0xef, 0x1b, -0x00, 0x60, 0xe2, 0x0f, 0xaa, 0x1f, 0x2f, 0x21, 0x76, 0x9a, 0x4c, 0xff, -0xc9, 0x79, 0x84, 0x32, 0x3b, 0x11, 0x6a, 0xfd, 0xb6, 0x50, 0x76, 0xe7, -0x6d, 0x25, 0x74, 0x04, 0xef, 0xcb, 0xa5, 0xc6, 0x0f, 0x0b, 0x07, 0x78, -0x42, 0xcf, 0xeb, 0xbe, 0x7e, 0xad, 0x19, 0x6a, 0x53, 0x3f, 0xfe, 0xfb, -0xc5, 0x93, 0xaa, 0x9c, 0x03, 0x1a, 0xa0, 0x3b, 0x42, 0xfa, 0x4d, 0xa8, -0x5f, 0x95, 0xfa, 0xef, 0xe3, 0x33, 0xdf, 0x72, 0x59, 0x1d, 0x7e, 0x64, -0xa3, 0x9a, 0x2d, 0xc5, 0xbf, 0xba, 0x5f, 0x2d, 0x07, 0xfa, 0x9d, 0xb8, -0xfe, 0x7b, 0x95, 0xb3, 0xc0, 0x19, 0xe0, 0x4c, 0xbc, 0xcc, 0x6e, 0x27, -0xdd, 0x0b, 0xd0, 0x7f, 0xff, 0x23, 0x9e, 0x42, 0xcf, 0x00, 0xcf, 0xef, -0x77, 0xd4, 0xf7, 0x1e, 0xb7, 0xe4, 0x97, 0xfa, 0xe2, 0x77, 0xd3, 0x71, -0x55, 0xa6, 0x81, 0x53, 0xaa, 0x9c, 0x2a, 0x05, 0x9f, 0xda, 0x05, 0x51, -0x88, 0x8d, 0x69, 0x8e, 0x38, 0xda, 0xb3, 0xc0, 0x8c, 0x9e, 0xd7, 0xab, -0x07, 0xbd, 0xf7, 0x2d, 0x01, 0xf8, 0x71, 0x1e, 0x3f, 0xf1, 0xff, 0xad, -0xf2, 0xbf, 0xbd, 0x42, 0x09, 0x81, 0x50, 0xaf, 0xf9, 0xba, 0x00, 0x00, -0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c b/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c deleted file mode 100644 index 03188b6dff..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_wiimote.c +++ /dev/null @@ -1,174 +0,0 @@ -static const unsigned char toolbar_plugin_wiimote_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, -0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xF9, -0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7C, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0B, 0x12, 0x00, 0x00, 0x0B, -0x12, 0x01, 0xD2, 0xDD, 0x7E, 0xFC, 0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6F, -0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x4D, 0x61, 0x63, 0x72, 0x6F, 0x6D, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x20, 0x4D, 0x58, 0x20, 0x32, -0x30, 0x30, 0x34, 0x87, 0x76, 0xAC, 0xCF, 0x00, 0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, -0x72, 0x65, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x00, 0x39, 0x2F, 0x31, -0x31, 0x2F, 0x30, 0x34, 0x0E, 0x46, 0xED, 0x55, 0x00, 0x00, 0x0A, 0x05, 0x49, 0x44, 0x41, 0x54, -0x78, 0x9C, 0xD5, 0x9A, 0x59, 0x6C, 0x5C, 0x57, 0x19, 0xC7, 0x7F, 0xE7, 0xDE, 0x3B, 0xE3, 0xF1, -0x32, 0xF6, 0x38, 0x8B, 0xB3, 0x37, 0x4E, 0x93, 0x66, 0x81, 0x46, 0x75, 0xD3, 0x06, 0x4A, 0xD5, -0x25, 0xA9, 0x68, 0x84, 0x2A, 0x44, 0x52, 0x21, 0xCA, 0x26, 0x91, 0xF4, 0xA1, 0x88, 0x17, 0x48, -0x49, 0x85, 0x90, 0x78, 0xC1, 0x12, 0x0F, 0x88, 0x4A, 0x94, 0x14, 0x50, 0x04, 0x3C, 0xD0, 0x20, -0xDE, 0x80, 0x36, 0x2E, 0x81, 0x8A, 0xAD, 0xAA, 0x8B, 0x44, 0x4B, 0xB7, 0xC4, 0x69, 0xB6, 0x36, -0x8D, 0x13, 0x27, 0xB1, 0x1D, 0xC7, 0xF1, 0x32, 0xB6, 0x67, 0xC6, 0x33, 0x73, 0xCF, 0x39, 0x1F, -0x0F, 0xE7, 0xDE, 0x8C, 0xDB, 0x20, 0x75, 0x3C, 0xB6, 0x52, 0xF5, 0x4A, 0xC7, 0x73, 0x67, 0xF1, -0xBD, 0xFF, 0xDF, 0xF9, 0xFE, 0xDF, 0x77, 0xCE, 0xE7, 0xB1, 0x12, 0x11, 0x3E, 0xCE, 0x87, 0xF7, -0x51, 0x0B, 0x98, 0xEB, 0x11, 0xCC, 0xD7, 0x85, 0xC6, 0x7F, 0xF5, 0x40, 0xC6, 0x18, 0xBB, 0x4B, -0x6B, 0xB3, 0x4B, 0x1B, 0x73, 0x5B, 0xA8, 0x4D, 0x7B, 0xA8, 0x0D, 0x5A, 0x9B, 0xBE, 0x50, 0x9B, -0x63, 0x5A, 0x9B, 0xAE, 0x50, 0x9B, 0xAE, 0xBB, 0x9E, 0x7C, 0x27, 0x3B, 0x5F, 0xF7, 0x04, 0x50, -0xF3, 0x61, 0xA1, 0xC2, 0x6F, 0x77, 0x74, 0x6A, 0x63, 0xF7, 0x6A, 0x6D, 0x32, 0x5A, 0x1B, 0xC2, -0x68, 0x5C, 0x77, 0x1E, 0x9A, 0x6C, 0xA8, 0xCD, 0xD3, 0xF7, 0x3C, 0x75, 0xA6, 0x73, 0xEE, 0xD2, -0xDD, 0x31, 0x27, 0x00, 0xFD, 0xFB, 0x87, 0x32, 0x28, 0x75, 0xC8, 0x18, 0xB3, 0x6D, 0x86, 0x48, -0x42, 0x6D, 0xF0, 0x9B, 0x1B, 0xD0, 0xDA, 0x30, 0x75, 0x65, 0xFC, 0x1A, 0x44, 0x18, 0xBD, 0xAF, -0xB5, 0xE9, 0x0E, 0xB5, 0x79, 0xF8, 0xC1, 0x03, 0x7D, 0x73, 0x8E, 0x46, 0xCD, 0x00, 0xC5, 0x83, -0x9F, 0xCB, 0x24, 0x02, 0xFF, 0x25, 0xE5, 0xA9, 0x0E, 0x1D, 0x89, 0x56, 0xCB, 0x17, 0x93, 0x5C, -0xBD, 0x94, 0x20, 0xBD, 0x00, 0x24, 0x09, 0x61, 0x09, 0x72, 0x23, 0x14, 0x07, 0x06, 0xB8, 0xD2, -0x3B, 0xC8, 0x50, 0xFF, 0x58, 0x0C, 0x40, 0xA8, 0x4D, 0x4F, 0xA8, 0xF5, 0xF6, 0x87, 0x7E, 0xD3, -0x3F, 0x27, 0x88, 0x9A, 0x73, 0xC0, 0x8A, 0x1C, 0x32, 0xD6, 0x76, 0x60, 0xC1, 0x06, 0x1E, 0xA9, -0x7B, 0xEF, 0xC0, 0x6F, 0xDB, 0x00, 0xA9, 0x2D, 0x10, 0x34, 0x01, 0x25, 0xA0, 0x08, 0x14, 0x49, -0xAD, 0x1B, 0x60, 0xF5, 0xAA, 0x57, 0x69, 0x3D, 0x71, 0x8C, 0x53, 0x3D, 0x17, 0xD0, 0xDA, 0x00, -0x74, 0x00, 0x87, 0x80, 0xED, 0x73, 0x01, 0xA8, 0x29, 0x02, 0xD9, 0x5F, 0x3F, 0xB0, 0xDB, 0xF7, -0xFD, 0x83, 0xBE, 0xA7, 0x50, 0x89, 0x04, 0x75, 0x0F, 0xDE, 0x8D, 0xD7, 0xF6, 0x79, 0xF0, 0xD6, -0x56, 0x84, 0x4F, 0x9F, 0x83, 0xC2, 0x00, 0x98, 0x22, 0xD4, 0x35, 0x40, 0x4B, 0x06, 0x06, 0x4E, -0x90, 0x7F, 0xF9, 0x05, 0x8E, 0xBE, 0x75, 0x81, 0x42, 0xA1, 0x1C, 0xDB, 0x6A, 0xCF, 0xAE, 0x67, -0x2E, 0xFF, 0xAE, 0x56, 0x80, 0x9A, 0x22, 0x60, 0x8C, 0xED, 0x04, 0xB0, 0x56, 0xD1, 0x78, 0xFF, -0x56, 0xBC, 0xB6, 0x1D, 0xE0, 0x6D, 0x06, 0x99, 0x82, 0xE9, 0x23, 0x30, 0xF1, 0x3A, 0x14, 0x26, -0xA1, 0x58, 0x84, 0x52, 0xC9, 0x0D, 0x0B, 0xAC, 0xDA, 0x44, 0xE3, 0x67, 0xEE, 0xE3, 0xD6, 0xE2, -0x8B, 0xBC, 0xFE, 0x56, 0x9F, 0xBB, 0x98, 0x48, 0x27, 0x50, 0x33, 0xC0, 0xAC, 0xD7, 0x81, 0xC1, -0xFD, 0xF7, 0xEC, 0xD4, 0xC6, 0xB6, 0x6B, 0x6D, 0x51, 0xAD, 0xCD, 0x04, 0x4B, 0x36, 0x82, 0xB7, -0x09, 0x24, 0x0F, 0xB9, 0x67, 0x21, 0xF7, 0x1A, 0xE8, 0x22, 0x88, 0xB8, 0x61, 0xAD, 0x7B, 0x34, -0x21, 0x9C, 0xEB, 0x81, 0xC2, 0x14, 0x99, 0x8D, 0x6B, 0x59, 0xB8, 0xA0, 0x09, 0x41, 0x10, 0xA1, -0xFD, 0x0F, 0x5F, 0x5F, 0xBC, 0xF3, 0x86, 0x01, 0x44, 0xB5, 0x9E, 0x50, 0x1B, 0x92, 0x6B, 0x96, -0x43, 0x62, 0x3D, 0x50, 0x86, 0xA9, 0xE7, 0x60, 0x7A, 0x10, 0xB4, 0x76, 0xC3, 0x18, 0x27, 0x3E, -0x06, 0xF0, 0x3C, 0xF0, 0x7D, 0x18, 0x1B, 0x02, 0xA3, 0x59, 0xBD, 0x32, 0x03, 0xCA, 0x43, 0x44, -0x10, 0x91, 0x5D, 0xB5, 0x02, 0xCC, 0xDA, 0x42, 0xDA, 0x98, 0x0E, 0x4F, 0x3C, 0x3C, 0x2B, 0xA4, -0xDA, 0x16, 0x43, 0xDD, 0x32, 0x28, 0xBC, 0x0D, 0xB9, 0xF3, 0x4E, 0x6C, 0x0C, 0x10, 0x8F, 0x18, -0x40, 0x29, 0x08, 0x02, 0x07, 0x12, 0x86, 0x2C, 0x5A, 0xD2, 0x02, 0x9E, 0x87, 0x75, 0x00, 0x1D, -0xB5, 0x02, 0xCC, 0x3A, 0x02, 0xDA, 0xD8, 0x0E, 0xAD, 0x0D, 0x7E, 0x4B, 0x23, 0xA8, 0x26, 0xA0, -0x0C, 0x23, 0xFF, 0xA9, 0xF8, 0xBD, 0x5C, 0x76, 0x23, 0x0C, 0x2B, 0x00, 0xB1, 0xF8, 0x64, 0x12, -0x52, 0x29, 0x37, 0x12, 0x09, 0x16, 0x66, 0x52, 0x08, 0x60, 0xE7, 0x00, 0x30, 0xFB, 0x08, 0x68, -0x83, 0xA7, 0x14, 0x26, 0xD4, 0xAE, 0xCE, 0x87, 0x57, 0x21, 0x3F, 0xE2, 0xDE, 0x14, 0x71, 0xD6, -0x99, 0x69, 0x23, 0x11, 0x67, 0x9D, 0x64, 0x12, 0xEA, 0xEA, 0xDC, 0x39, 0x38, 0x20, 0xA5, 0xB0, -0x56, 0xB0, 0xB6, 0xF6, 0xC5, 0xB4, 0x26, 0x00, 0xE5, 0x29, 0x8C, 0x8E, 0x00, 0xF2, 0x83, 0x6E, -0xE6, 0x61, 0x46, 0xC2, 0x46, 0xFE, 0x8F, 0x85, 0x26, 0x12, 0x50, 0x5F, 0xEF, 0x00, 0x94, 0x72, -0xD1, 0x01, 0xAC, 0xB1, 0x58, 0x6B, 0xE7, 0x04, 0x50, 0x8B, 0x85, 0xBA, 0xB5, 0xB6, 0x4C, 0x8C, -0x4C, 0x40, 0x6E, 0x0C, 0x72, 0x83, 0x15, 0xBB, 0xCC, 0x14, 0xEE, 0x79, 0x4E, 0x78, 0x2A, 0x05, -0x0D, 0x0D, 0x6E, 0xA4, 0x52, 0x95, 0x08, 0x18, 0xC3, 0xD0, 0x48, 0xDE, 0x01, 0x88, 0xED, 0xBE, -0x61, 0x00, 0xA1, 0x36, 0x7D, 0x3A, 0xDA, 0xF7, 0x14, 0x06, 0x07, 0xDD, 0x15, 0x62, 0xE1, 0x71, -0xA5, 0x09, 0x02, 0x37, 0xDB, 0x0D, 0x0D, 0xD0, 0xD8, 0x08, 0xE9, 0xB4, 0x8B, 0x40, 0x10, 0xB8, -0x08, 0x95, 0x4A, 0x4C, 0x8D, 0xE7, 0x08, 0xC3, 0x10, 0x63, 0x04, 0x6B, 0xA5, 0xEF, 0x86, 0x01, -0x68, 0x6D, 0xBA, 0xE3, 0x32, 0x3A, 0x72, 0xF1, 0x2A, 0x0C, 0xF7, 0xBA, 0x37, 0x62, 0xAB, 0xA4, -0x52, 0x4E, 0x74, 0x53, 0x93, 0x13, 0x9E, 0x4E, 0x3B, 0x90, 0x64, 0xD2, 0x89, 0x2F, 0x97, 0x21, -0x9F, 0xE7, 0x42, 0xDF, 0x55, 0x4C, 0x59, 0xBB, 0x08, 0x98, 0xDA, 0x23, 0x50, 0x4B, 0x0E, 0x74, -0x29, 0xA5, 0xB2, 0x4A, 0xA9, 0xCC, 0xE5, 0xFE, 0x51, 0x96, 0x0F, 0x5F, 0x26, 0x68, 0x6D, 0xA9, -0x88, 0xAF, 0xAB, 0x73, 0xE7, 0x31, 0x90, 0xEF, 0x57, 0x7C, 0x5F, 0x2A, 0xC1, 0xD4, 0x14, 0xE1, -0xE8, 0x38, 0x67, 0xCE, 0x0D, 0xA3, 0x8D, 0xC1, 0x58, 0x9B, 0xB5, 0x22, 0x5D, 0xB5, 0x02, 0xCC, -0x3A, 0x02, 0xF7, 0xED, 0x3F, 0x3B, 0xA1, 0xB5, 0xE9, 0xD2, 0xDA, 0x50, 0x9C, 0x2E, 0xF3, 0xDE, -0xD1, 0x5E, 0x98, 0x9A, 0x74, 0x39, 0xA0, 0x94, 0x13, 0x9C, 0x48, 0x54, 0xC4, 0x83, 0x13, 0x5F, -0x28, 0xC0, 0xE4, 0x24, 0x8C, 0x8E, 0xF2, 0xE6, 0x9B, 0xE7, 0xC8, 0x4F, 0x15, 0x31, 0xC6, 0x62, -0x8C, 0xED, 0xFA, 0xE6, 0xE1, 0xC2, 0xC4, 0x0D, 0x03, 0x00, 0x08, 0x8D, 0xE9, 0x0C, 0xB5, 0xA1, -0x5C, 0xD6, 0x0C, 0x0E, 0x8C, 0x73, 0xA5, 0x77, 0x10, 0x26, 0x26, 0x9C, 0xC8, 0x78, 0x0D, 0x08, -0x43, 0xB7, 0x36, 0xE4, 0xF3, 0x4E, 0xF8, 0xF8, 0x38, 0x0C, 0x0F, 0x73, 0xE9, 0xF4, 0x45, 0xCE, -0x9D, 0x1B, 0x26, 0x0C, 0x35, 0xC6, 0x58, 0x80, 0xCE, 0x5A, 0xC5, 0xD7, 0x0C, 0xB0, 0xE3, 0xC0, -0x85, 0x0B, 0x7A, 0x78, 0x51, 0x97, 0xD6, 0x86, 0x72, 0xA9, 0x4C, 0x4F, 0xCF, 0x25, 0xFA, 0x4F, -0x9E, 0x87, 0xCB, 0x97, 0x61, 0x78, 0x18, 0xC6, 0xC6, 0x9C, 0xE0, 0xF1, 0x71, 0x18, 0x1D, 0x85, -0xA1, 0x21, 0xE8, 0xEF, 0xA7, 0xF7, 0xE8, 0x59, 0xFE, 0xFD, 0xCA, 0x7B, 0x94, 0x4A, 0x21, 0xC6, -0x58, 0xF4, 0xE5, 0x0D, 0x14, 0x8F, 0x7D, 0xE1, 0xD1, 0xB9, 0x00, 0xD4, 0xB4, 0x9D, 0x7E, 0x71, -0xFD, 0xBE, 0x3D, 0x82, 0x3C, 0x53, 0xDC, 0xF2, 0x77, 0x6C, 0x63, 0x16, 0x50, 0x78, 0xBE, 0xA2, -0x6D, 0x71, 0x33, 0xEB, 0x6F, 0x69, 0x23, 0xB3, 0x38, 0xCA, 0x09, 0x80, 0x30, 0x64, 0xF4, 0x4A, -0x96, 0x13, 0x27, 0x07, 0xB8, 0x78, 0x69, 0x94, 0x50, 0x1B, 0x8C, 0x36, 0xD8, 0x42, 0x33, 0xFA, -0xCC, 0x76, 0x0C, 0x16, 0x2B, 0xD2, 0x63, 0xB1, 0xDB, 0xF7, 0x5D, 0xFA, 0xE3, 0xAC, 0x9B, 0x9B, -0x59, 0x03, 0xBC, 0xB4, 0xE1, 0x89, 0x3D, 0xC0, 0x33, 0x56, 0x04, 0xE3, 0x97, 0xC8, 0x6F, 0xF9, -0x33, 0xE2, 0x97, 0xB9, 0x76, 0x15, 0x4F, 0xD1, 0xD8, 0x98, 0xA2, 0xB1, 0x21, 0xC0, 0x5A, 0x61, -0x72, 0xAA, 0xC4, 0xC4, 0xE4, 0x34, 0x26, 0xD4, 0x2E, 0x69, 0x8D, 0x45, 0xD9, 0x24, 0xFA, 0xF4, -0x0E, 0xAC, 0x0E, 0xB0, 0x58, 0x8C, 0x08, 0x16, 0xDB, 0x63, 0x44, 0xB6, 0x7F, 0xAF, 0xFF, 0x4F, -0xB3, 0x82, 0x98, 0x55, 0x15, 0x7A, 0x71, 0xFD, 0xBE, 0x0E, 0x4F, 0xA9, 0x9F, 0xC5, 0xCF, 0x1B, -0x9A, 0x17, 0xB3, 0x61, 0xE3, 0x53, 0xBC, 0x33, 0xFC, 0x0B, 0xC6, 0x47, 0x4F, 0x82, 0x80, 0x88, -0x50, 0x2A, 0x86, 0x8C, 0x8E, 0xB8, 0x2D, 0x82, 0x11, 0xFB, 0xBE, 0x15, 0x77, 0x61, 0x6A, 0x1D, -0xDB, 0xDA, 0x9E, 0xA0, 0xD4, 0x9C, 0xE0, 0x8D, 0x77, 0x8F, 0x70, 0x71, 0x74, 0xC0, 0x95, 0xD7, -0x1A, 0x3B, 0xB4, 0x59, 0x45, 0xE0, 0x5F, 0xEB, 0xBF, 0x7B, 0x54, 0xB9, 0x1B, 0xD1, 0xB4, 0x62, -0x29, 0x77, 0x7C, 0xE7, 0x51, 0x82, 0x4D, 0x2D, 0x84, 0x8B, 0x8A, 0x1C, 0x3B, 0xF4, 0x13, 0x4E, -0xFF, 0xE3, 0x40, 0xD4, 0x06, 0x08, 0x22, 0x82, 0x15, 0x89, 0xF6, 0x3A, 0x6E, 0x75, 0xDE, 0xBC, -0xE4, 0x11, 0xEE, 0x58, 0xF8, 0x0D, 0x92, 0x52, 0x07, 0xA1, 0x85, 0xB2, 0xE6, 0xED, 0xDE, 0xE3, -0xBC, 0x74, 0xFA, 0x55, 0x8C, 0xD5, 0x71, 0x24, 0xF6, 0x7C, 0xBF, 0xFF, 0xB9, 0xAA, 0x1B, 0x9C, -0xAA, 0x01, 0xFE, 0x76, 0xCB, 0xDE, 0xBD, 0x0A, 0xF6, 0x2B, 0xA5, 0x48, 0xAF, 0x58, 0xCA, 0xD6, -0x7D, 0x8F, 0x11, 0xDC, 0x99, 0x81, 0x36, 0x1F, 0x0C, 0x30, 0x6A, 0xC8, 0x1D, 0x3F, 0xCB, 0xC9, -0x97, 0x0F, 0x70, 0x79, 0xE0, 0x55, 0x46, 0xC6, 0x4E, 0x62, 0x45, 0x58, 0xD8, 0xBC, 0x91, 0xE5, -0x2D, 0x5B, 0xD8, 0xBC, 0xF4, 0xCB, 0x34, 0xA9, 0x85, 0x50, 0xD6, 0x4E, 0xBC, 0x58, 0x30, 0x02, -0xA1, 0xE6, 0xDD, 0x73, 0xA7, 0x79, 0xE1, 0x78, 0x37, 0x5A, 0x6B, 0x2C, 0x36, 0x6B, 0x44, 0xD6, -0xFC, 0x60, 0xE0, 0x50, 0x55, 0x56, 0xAA, 0xCA, 0x42, 0x7F, 0x5D, 0xF7, 0xED, 0x8C, 0x52, 0x74, -0x2A, 0x14, 0xC9, 0x54, 0x1D, 0x1D, 0x8F, 0x7D, 0x8D, 0x60, 0x53, 0x33, 0x2C, 0xF2, 0x5D, 0xAB, -0x38, 0x64, 0xE1, 0x5C, 0x99, 0x26, 0x59, 0xCE, 0xA7, 0xEF, 0xFA, 0x21, 0x94, 0x34, 0x94, 0x42, -0xF7, 0x58, 0x8E, 0x1E, 0xE3, 0x73, 0x00, 0x5F, 0x81, 0xF8, 0x90, 0x50, 0x50, 0x17, 0xB0, 0x61, -0xCD, 0x26, 0x7A, 0xAF, 0x5E, 0xE2, 0xD4, 0xC0, 0xBB, 0x88, 0x90, 0x01, 0x76, 0x52, 0x65, 0x9B, -0x59, 0x55, 0x19, 0x35, 0xD8, 0xDD, 0x46, 0x24, 0x63, 0x45, 0xB8, 0x79, 0xC7, 0xFD, 0xD4, 0xAF, -0x5C, 0x00, 0x4B, 0x02, 0x28, 0x0B, 0x9C, 0xD1, 0x70, 0xBE, 0x0C, 0x26, 0xEA, 0xBE, 0xAC, 0xB8, -0x11, 0xB7, 0x94, 0x42, 0x34, 0x66, 0x3C, 0x47, 0x81, 0xEF, 0x41, 0x22, 0x80, 0x86, 0x3A, 0x68, -0xA9, 0xE7, 0xB3, 0xB7, 0xDE, 0x43, 0x7D, 0xAA, 0x11, 0x00, 0x41, 0x3A, 0xAB, 0xD1, 0x55, 0x35, -0x80, 0x45, 0x1E, 0xB7, 0x08, 0x75, 0x99, 0x34, 0x6B, 0xEE, 0xDA, 0x0A, 0xCB, 0x93, 0x4E, 0xFC, -0xC5, 0x32, 0xF4, 0x4F, 0xC3, 0x74, 0x19, 0x8A, 0x61, 0x64, 0x0F, 0x03, 0xDA, 0x80, 0xB6, 0x0E, -0x2A, 0x1E, 0x31, 0x98, 0x15, 0x67, 0x1F, 0xA5, 0x20, 0xE1, 0x43, 0x7D, 0x12, 0x9A, 0xEA, 0x49, -0x66, 0x9A, 0xB9, 0x73, 0xD5, 0x27, 0xE3, 0x5B, 0xB6, 0xFF, 0x68, 0xC5, 0xCE, 0xAA, 0x9A, 0x9C, -0x0F, 0x05, 0x78, 0x76, 0xED, 0xB7, 0x3A, 0xAC, 0xD8, 0x76, 0x2B, 0x96, 0xF5, 0xF7, 0xDE, 0x0D, -0x29, 0x05, 0x29, 0x1F, 0xC6, 0x42, 0x38, 0x3D, 0x05, 0x85, 0x12, 0x14, 0xCA, 0x15, 0x88, 0xD2, -0x0C, 0x90, 0x18, 0xC6, 0xC4, 0x23, 0x02, 0x11, 0xC0, 0x07, 0x92, 0x3E, 0xA4, 0x12, 0x2E, 0x0A, -0xE9, 0x14, 0x9F, 0x58, 0xB6, 0x0E, 0xE5, 0xFB, 0x51, 0xB3, 0x2F, 0xF7, 0xCF, 0x0B, 0x80, 0x11, -0xBB, 0xD3, 0x20, 0x18, 0x2C, 0xCB, 0xD6, 0xDC, 0x0C, 0x99, 0x04, 0x94, 0x2C, 0x9C, 0x9A, 0x88, -0xC4, 0x97, 0xFE, 0x3F, 0x44, 0x0C, 0x52, 0x36, 0x6E, 0xC4, 0x30, 0xF1, 0xEC, 0xFB, 0x3E, 0xD4, -0x25, 0x20, 0x95, 0x84, 0x86, 0x24, 0x34, 0xD4, 0x91, 0x6E, 0x4C, 0xD3, 0x9A, 0x6A, 0x8A, 0x5D, -0xB7, 0xAD, 0x1A, 0x80, 0x0F, 0x4D, 0x62, 0x8B, 0x6C, 0x53, 0x22, 0xB4, 0xAD, 0x58, 0x49, 0x42, -0x7C, 0x48, 0x05, 0x70, 0x65, 0x1A, 0x86, 0xA6, 0x9C, 0x10, 0x45, 0xC5, 0xE3, 0x56, 0xDC, 0x2C, -0x6B, 0xEB, 0x66, 0x3C, 0x16, 0x5D, 0x8E, 0x22, 0x60, 0x05, 0x94, 0xE7, 0xAC, 0x93, 0x72, 0xA2, -0x69, 0x48, 0xBA, 0xCF, 0x27, 0x03, 0x08, 0x7C, 0xDA, 0xEA, 0x5B, 0x19, 0xCA, 0x8D, 0x21, 0x48, -0xFB, 0xBC, 0x00, 0x18, 0xB1, 0xED, 0xCA, 0xF3, 0x58, 0xBC, 0x74, 0x05, 0x84, 0x1A, 0xF0, 0xE0, -0x62, 0xD6, 0x89, 0x82, 0x4A, 0x62, 0x5E, 0x4B, 0xE0, 0x0F, 0x78, 0x5F, 0x9B, 0x19, 0xB6, 0xF1, -0x20, 0xF0, 0x9D, 0xF0, 0xA6, 0x94, 0x1B, 0x75, 0x81, 0xAB, 0x50, 0x9E, 0x02, 0x81, 0x25, 0xC9, -0xE6, 0x78, 0x55, 0xAF, 0x2A, 0x07, 0xAA, 0x89, 0x40, 0xBB, 0x92, 0xA8, 0xC2, 0x68, 0x03, 0x65, -0x0B, 0xD9, 0xE9, 0xA8, 0xFF, 0xA5, 0x92, 0x94, 0xD7, 0xC4, 0xCB, 0xFB, 0xAB, 0x11, 0xCA, 0x19, -0x35, 0xF0, 0x21, 0xF0, 0xDC, 0xCC, 0xA7, 0x53, 0xD0, 0xDC, 0x00, 0x8D, 0x51, 0x8F, 0x5C, 0x8A, -0x93, 0x5F, 0x23, 0xD6, 0x42, 0x65, 0x63, 0x32, 0x77, 0x00, 0x23, 0x16, 0xA5, 0x3C, 0x72, 0xB9, -0x49, 0x37, 0xA3, 0x23, 0x05, 0xD0, 0xE2, 0x4A, 0x60, 0xFC, 0x87, 0x2B, 0xE3, 0x39, 0x08, 0x2F, -0x7A, 0x54, 0xDE, 0xFB, 0xB3, 0xCB, 0xF3, 0x20, 0xE1, 0x55, 0x12, 0xB6, 0x31, 0xE5, 0xC4, 0x27, -0x03, 0x97, 0x27, 0xA5, 0xD0, 0xE5, 0x51, 0xBE, 0xCC, 0x58, 0x29, 0x57, 0xB5, 0xF8, 0xAA, 0x00, -0x2C, 0xD2, 0xA7, 0xAC, 0x69, 0x1F, 0x1C, 0x1A, 0x70, 0x09, 0x3A, 0x9C, 0x73, 0xB3, 0x99, 0xF0, -0x9D, 0xFF, 0x2D, 0x15, 0x7F, 0x1B, 0x3B, 0xA3, 0xD6, 0xE3, 0x6C, 0xE1, 0x45, 0x9E, 0x4F, 0x06, -0x0E, 0x20, 0x95, 0x70, 0xC9, 0x1B, 0xF8, 0xEE, 0xF3, 0xF9, 0x12, 0x64, 0x0B, 0x30, 0x96, 0x87, -0xA9, 0x02, 0xE7, 0xF3, 0x57, 0x88, 0x76, 0x07, 0x7D, 0xF3, 0x02, 0x60, 0xC4, 0xF6, 0x28, 0xA5, -0xDA, 0xB3, 0xB9, 0x2C, 0x67, 0xDE, 0x79, 0x9B, 0xF5, 0xC9, 0xDB, 0x61, 0x41, 0xDA, 0x89, 0x4A, -0x04, 0x4E, 0x24, 0x89, 0xEB, 0x7F, 0x51, 0x45, 0xE2, 0xFD, 0xA8, 0xE2, 0x04, 0x5E, 0xC5, 0x46, -0xE0, 0x56, 0xE5, 0x5C, 0x09, 0x46, 0x26, 0xE1, 0x4A, 0x16, 0x86, 0xB2, 0x9C, 0x18, 0xEE, 0x65, -0xAC, 0x34, 0x15, 0x5F, 0xA1, 0x67, 0x5E, 0x00, 0x2C, 0xD2, 0x85, 0xC8, 0x2E, 0x6B, 0x84, 0xD7, -0x8E, 0xBF, 0x41, 0xA6, 0x21, 0x43, 0xDB, 0x9A, 0x76, 0x68, 0x6D, 0x82, 0x46, 0x81, 0x64, 0xC2, -0xD9, 0xC3, 0xF3, 0x2A, 0x33, 0xAE, 0x98, 0xF1, 0x5C, 0x45, 0xD5, 0x4A, 0x45, 0xC2, 0xA3, 0x6D, -0x45, 0xBE, 0x08, 0x63, 0x39, 0x18, 0x9A, 0x80, 0x81, 0x31, 0xAE, 0x0E, 0x0E, 0xF0, 0xC2, 0xD0, -0x11, 0x66, 0xEC, 0xCD, 0xAA, 0xEA, 0x93, 0xAB, 0x89, 0x40, 0x97, 0x52, 0x2A, 0x8B, 0x48, 0x26, -0x57, 0xCC, 0xF1, 0xFC, 0x2B, 0x7F, 0xE1, 0x53, 0x57, 0xB7, 0x70, 0xDB, 0xC6, 0xDB, 0xA1, 0xB5, -0x01, 0xD2, 0xF5, 0x6E, 0x35, 0x8D, 0x6D, 0x11, 0xC4, 0x30, 0x32, 0xA3, 0xCC, 0xCA, 0xB5, 0x8D, -0x1B, 0xC5, 0x10, 0x72, 0x45, 0x67, 0x9B, 0x91, 0x49, 0xB8, 0x32, 0xC1, 0xD9, 0xC1, 0x5E, 0x0E, -0xF5, 0xFF, 0x97, 0x69, 0x5D, 0x8A, 0x6F, 0x9B, 0xAD, 0x16, 0xA0, 0xAA, 0xDD, 0xE8, 0x2F, 0x6F, -0xFA, 0xEA, 0xFD, 0x40, 0xB7, 0x9B, 0x43, 0x85, 0xE7, 0xFB, 0xB4, 0xA6, 0x33, 0x6C, 0x5D, 0xBD, -0x99, 0x9B, 0x96, 0xAD, 0x26, 0xD1, 0xDC, 0xE8, 0x12, 0xB3, 0x3E, 0xE9, 0x3C, 0x1E, 0xF8, 0xAE, -0x64, 0x82, 0xCB, 0x8D, 0x78, 0x2D, 0x98, 0x2E, 0xC1, 0x54, 0x11, 0xA6, 0x0A, 0x30, 0x31, 0xCD, -0xE4, 0xD8, 0x18, 0xFF, 0x1C, 0x38, 0xC2, 0xC9, 0x89, 0x0B, 0x58, 0x63, 0x66, 0xDE, 0x72, 0x57, -0xE7, 0xE0, 0xE1, 0xE7, 0xE7, 0x0D, 0x00, 0xE0, 0xE7, 0x37, 0x7D, 0x65, 0x37, 0x70, 0xB0, 0xF2, -0x9B, 0x0A, 0xCF, 0xF3, 0xF0, 0x82, 0x80, 0xB5, 0xAD, 0x2B, 0x58, 0xD9, 0xBC, 0x84, 0x45, 0xE9, -0x05, 0x2C, 0x49, 0x2F, 0xAC, 0x44, 0x21, 0x06, 0x30, 0xD6, 0x95, 0xC9, 0xB2, 0x66, 0x34, 0x37, -0xCE, 0xA5, 0xC9, 0x21, 0x4E, 0x8D, 0x5F, 0xA2, 0x37, 0x7F, 0x19, 0x6B, 0x0C, 0x1F, 0xD0, 0xF0, -0x78, 0xE7, 0xE0, 0xE1, 0xA7, 0xAB, 0x12, 0x35, 0x1B, 0x00, 0x80, 0xFD, 0xAB, 0x1E, 0xB9, 0x2D, -0x82, 0xE8, 0x80, 0x19, 0xD5, 0x5A, 0x29, 0xD4, 0x0C, 0xAF, 0x2B, 0xCF, 0x63, 0x65, 0x6A, 0x01, -0x28, 0x85, 0xE0, 0x1A, 0x9A, 0x6C, 0x58, 0x60, 0x3C, 0xCC, 0xA1, 0x8D, 0x8E, 0xFF, 0x9C, 0xF8, -0x41, 0xE1, 0x00, 0x7B, 0x3A, 0x07, 0x0F, 0xCF, 0xEA, 0xDB, 0x9A, 0x9A, 0x9A, 0xFA, 0x9F, 0xAE, -0xFA, 0xD2, 0x5E, 0xA0, 0x53, 0x44, 0x32, 0xF1, 0x6B, 0x12, 0xFD, 0x14, 0x40, 0x94, 0xAA, 0x9C, -0x03, 0x22, 0x16, 0x4B, 0xA5, 0x4B, 0x93, 0xEB, 0x17, 0xAA, 0x9E, 0x48, 0xFC, 0xB1, 0xD9, 0x6A, -0x99, 0xD3, 0xF7, 0xC4, 0x4F, 0xAE, 0xFC, 0xE2, 0x6E, 0x60, 0x97, 0xC0, 0xAE, 0x6B, 0x82, 0x25, -0x46, 0x71, 0xAF, 0xC8, 0x8C, 0xD7, 0xED, 0xF5, 0xC2, 0xBB, 0x81, 0x83, 0xB3, 0x9D, 0xF5, 0x99, -0xC7, 0xBC, 0x7C, 0x53, 0xFF, 0xE3, 0x15, 0x0F, 0xB7, 0x08, 0x74, 0x80, 0x6C, 0x13, 0xD8, 0x16, -0x89, 0xDE, 0x26, 0x22, 0xD7, 0x40, 0x70, 0x0B, 0x53, 0x1F, 0x6E, 0xB6, 0x7B, 0x80, 0xEE, 0xCE, -0xC1, 0xC3, 0x17, 0xE6, 0x7A, 0xEF, 0x79, 0x01, 0xF8, 0x28, 0x8F, 0x8F, 0xFD, 0x7F, 0xAB, 0xFC, -0x0F, 0x31, 0xEC, 0x4B, 0xC9, 0x60, 0x91, 0x6E, 0xE5, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, -0x44, 0xAE, 0x42, 0x60, 0x82 -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_refresh.c b/Source/Core/DolphinWX/resources/toolbar_refresh.c deleted file mode 100644 index 30ed5bedd6..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_refresh.c +++ /dev/null @@ -1,306 +0,0 @@ -static const unsigned char toolbar_refresh_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x30, 0x2f, 0x30, 0x34, 0xb6, 0xfa, 0x8a, 0x30, 0x00, 0x00, 0x0d, 0x8f, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9a, 0x7b, 0x70, 0x5c, 0xd5, -0x79, 0xc0, 0x7f, 0xe7, 0xdc, 0x7b, 0xf7, 0xee, 0x43, 0x4f, 0x5b, 0x46, -0xb2, 0x8d, 0xf1, 0x82, 0x4d, 0x31, 0x31, 0x83, 0xd7, 0x35, 0xa4, 0xc0, -0x34, 0xb5, 0x30, 0x34, 0x9d, 0x90, 0x92, 0x38, 0x0d, 0x9d, 0x96, 0x86, -0x26, 0xea, 0x3f, 0x5a, 0x13, 0xa7, 0x18, 0x93, 0xb4, 0x03, 0x34, 0xc4, -0x32, 0xd3, 0xa6, 0xd3, 0x32, 0xc5, 0xf6, 0xd0, 0x92, 0xec, 0x86, 0x06, -0x98, 0x4e, 0x4b, 0xa7, 0x21, 0x05, 0x3c, 0x93, 0xc4, 0x34, 0x0c, 0x96, -0x0b, 0xc5, 0x6d, 0x20, 0xb0, 0x56, 0x81, 0xd6, 0xef, 0x15, 0x46, 0x92, -0x1f, 0xb2, 0xb4, 0x5a, 0x69, 0x1f, 0x77, 0xef, 0xe3, 0xeb, 0x1f, 0x77, -0x57, 0x96, 0xfc, 0x80, 0x64, 0xac, 0x94, 0xe9, 0x4c, 0xbf, 0x9d, 0x33, -0x7b, 0x57, 0xf7, 0x9e, 0x7b, 0xbe, 0xdf, 0xf9, 0xbe, 0xf3, 0x9d, 0xef, -0x9c, 0x23, 0x25, 0x22, 0xfc, 0x5f, 0x16, 0xfd, 0x51, 0x2b, 0x70, 0xb1, -0x62, 0x7e, 0xd8, 0x03, 0x6a, 0x93, 0x4a, 0xa2, 0x59, 0x5f, 0x2f, 0x4b, -0xd1, 0x24, 0xd1, 0x80, 0x26, 0x8f, 0x62, 0x1f, 0x9a, 0x7e, 0x34, 0x4f, -0x49, 0x9f, 0x14, 0x7e, 0xf1, 0xea, 0x9e, 0x47, 0xbf, 0x0b, 0xb9, 0x90, -0xfa, 0x8a, 0x6a, 0x43, 0xd3, 0x87, 0x66, 0x53, 0x5d, 0xe1, 0x33, 0x45, -0x9d, 0xf5, 0x3b, 0x2c, 0x4f, 0xa3, 0xe9, 0x93, 0x3f, 0x91, 0xfc, 0xff, -0x8a, 0xe6, 0x0d, 0x3d, 0xcf, 0x07, 0xa0, 0x36, 0xaa, 0x36, 0x34, 0xbb, -0x51, 0xa4, 0xb0, 0x80, 0x76, 0x58, 0x71, 0xc5, 0x0a, 0x6e, 0x5c, 0x7e, -0x03, 0xf3, 0xa3, 0xed, 0x58, 0x86, 0xc1, 0xc9, 0xa9, 0x93, 0xbc, 0x79, -0xec, 0x0d, 0x0e, 0x0f, 0x1d, 0xa5, 0x58, 0xa8, 0x34, 0x20, 0x0a, 0x68, -0xb6, 0xca, 0x03, 0xb2, 0xfd, 0x03, 0x1b, 0xfd, 0xb6, 0xea, 0x01, 0x72, -0xb2, 0x41, 0x72, 0xbf, 0x28, 0x80, 0xb7, 0xd0, 0xa4, 0xb0, 0x61, 0xc5, -0x9a, 0xab, 0xd8, 0xf6, 0x9b, 0xdb, 0x59, 0xd2, 0xbc, 0x04, 0x8d, 0xc6, -0xc0, 0x40, 0xd7, 0x3f, 0x06, 0x06, 0xef, 0x4d, 0x1d, 0xe5, 0x07, 0xf9, -0xef, 0x93, 0xdd, 0xf3, 0x14, 0xe3, 0x85, 0xa9, 0x06, 0x48, 0x3f, 0x9a, -0xcf, 0xc9, 0x1f, 0xcd, 0x76, 0x2b, 0xf5, 0xd7, 0x2a, 0x89, 0xe6, 0x49, -0x14, 0xdd, 0x28, 0x7a, 0x64, 0x83, 0x3c, 0x3d, 0xe7, 0x00, 0x6a, 0x83, -0xda, 0x86, 0xe6, 0x5e, 0x2c, 0xf8, 0xcc, 0xed, 0x9f, 0xe1, 0xe1, 0x5b, -0x1f, 0xc6, 0xc0, 0xe0, 0xa5, 0xfc, 0x8b, 0x1c, 0x2c, 0xbc, 0xc3, 0xa4, -0x3f, 0x86, 0x6d, 0x46, 0xb0, 0x0c, 0x83, 0xcb, 0x9b, 0xaf, 0x64, 0xcd, -0xbc, 0x9b, 0xb8, 0xba, 0x79, 0x15, 0xc3, 0xe5, 0x41, 0x1e, 0xdd, 0xf7, -0xa7, 0x3c, 0xfb, 0xea, 0x8b, 0xd4, 0x7c, 0x0f, 0x34, 0x39, 0x34, 0x37, -0xcb, 0xd7, 0x42, 0x08, 0xb5, 0x43, 0xf5, 0xa1, 0xd8, 0x82, 0x22, 0x74, -0x41, 0xe8, 0x93, 0xaf, 0xc8, 0xd6, 0x39, 0x05, 0x50, 0x69, 0x95, 0x42, -0xf1, 0x16, 0x1a, 0xae, 0x5b, 0xbb, 0x86, 0xec, 0xef, 0x7c, 0x87, 0x81, -0x13, 0xfb, 0xd8, 0xf1, 0xd3, 0x47, 0xa8, 0xa9, 0x49, 0xda, 0xe2, 0x71, -0xe2, 0xb6, 0x4d, 0xd4, 0xb2, 0xb0, 0x4c, 0x13, 0x53, 0x6b, 0xb4, 0xd6, -0xcc, 0xb7, 0x16, 0x70, 0x5b, 0xe7, 0x9d, 0xdc, 0xd0, 0x7a, 0x2b, 0x4f, -0x1e, 0x79, 0x94, 0x87, 0x7f, 0xb0, 0x8d, 0x62, 0xa9, 0x1c, 0x42, 0x28, -0xb6, 0xa2, 0xd9, 0x82, 0x22, 0xd5, 0x1a, 0x6d, 0xe5, 0xf7, 0xaf, 0xff, -0x3c, 0xff, 0xf4, 0xee, 0xb3, 0x9c, 0x2c, 0x14, 0xb7, 0xcb, 0x26, 0xd9, -0x7c, 0xb1, 0x00, 0x67, 0x87, 0xd1, 0x6d, 0x08, 0x90, 0x80, 0xfb, 0x6e, -0xfd, 0x2a, 0xbb, 0x0e, 0xff, 0x90, 0x07, 0xfe, 0xf5, 0x3e, 0x5c, 0x35, -0xc9, 0xbc, 0xa6, 0x26, 0x9a, 0xa3, 0x51, 0x22, 0xe6, 0x99, 0xc0, 0x65, -0x1a, 0x06, 0xf1, 0x48, 0x84, 0x9a, 0x39, 0xc5, 0xce, 0xd3, 0xdf, 0xe1, -0x89, 0x91, 0x87, 0xb9, 0x2b, 0xb9, 0x91, 0x17, 0x7a, 0xfe, 0x91, 0xae, -0xf6, 0x56, 0x08, 0x48, 0x11, 0xf0, 0x1c, 0x3e, 0xa9, 0x55, 0xf3, 0x57, -0xb1, 0xf7, 0x8b, 0xaf, 0xf0, 0xb9, 0x6b, 0x7f, 0x9d, 0x98, 0x69, 0x83, -0x47, 0xea, 0x62, 0x95, 0x9f, 0x05, 0xa0, 0xd2, 0x2a, 0x09, 0x74, 0x03, -0xdc, 0x7e, 0xcb, 0xed, 0x94, 0xdc, 0x29, 0x76, 0xbc, 0xf1, 0x08, 0x2d, -0xb1, 0x18, 0x2d, 0xf1, 0x38, 0x11, 0xd3, 0xa4, 0x52, 0x73, 0xc9, 0x1f, -0x3c, 0xc9, 0xbf, 0xbf, 0x7c, 0x88, 0x57, 0x7e, 0xfc, 0x5f, 0x0c, 0xe4, -0xde, 0x63, 0xac, 0x50, 0x02, 0x11, 0x2c, 0xd3, 0xe4, 0x7d, 0xef, 0x00, -0xdb, 0x8e, 0xdf, 0xc3, 0x92, 0xe8, 0x15, 0x3c, 0x7b, 0xd7, 0x33, 0x2c, -0x9c, 0xd7, 0x0e, 0x3e, 0xa4, 0x3a, 0x52, 0xbc, 0x72, 0xd7, 0x1e, 0x96, -0x37, 0xad, 0xc0, 0xd0, 0x1a, 0xe5, 0x03, 0xde, 0x5c, 0xa8, 0x3f, 0xdb, -0x02, 0x9b, 0x00, 0x94, 0x0d, 0xbf, 0x77, 0xfd, 0x9d, 0x3c, 0xfa, 0x1f, -0x7f, 0x41, 0x53, 0x34, 0x4a, 0x73, 0x2c, 0x86, 0x65, 0x18, 0x4c, 0x95, -0x2b, 0x1c, 0x7c, 0x7d, 0x84, 0x43, 0xfb, 0x8e, 0x73, 0xfa, 0x54, 0x91, -0xd1, 0x53, 0x93, 0xfc, 0xf7, 0x3b, 0x43, 0xbc, 0xf4, 0xe2, 0x00, 0xaf, -0xff, 0xf4, 0x30, 0xa5, 0x8a, 0x03, 0x80, 0x23, 0x15, 0xbe, 0x7b, 0xfa, -0x61, 0x16, 0x45, 0x92, 0x3c, 0xb2, 0x7e, 0x2b, 0x1f, 0x5f, 0xb4, 0x86, -0xfe, 0x2f, 0xbd, 0xcc, 0xa4, 0x1a, 0x65, 0x77, 0xed, 0xef, 0x59, 0xa4, -0xae, 0xe4, 0xb2, 0xae, 0x05, 0xe0, 0x87, 0x9d, 0x35, 0x97, 0x00, 0xeb, -0x01, 0x16, 0x2e, 0x5b, 0xc4, 0xab, 0xc7, 0x5e, 0x61, 0xd2, 0x2b, 0xd0, -0x14, 0x8b, 0x11, 0x8f, 0x44, 0xa8, 0xb8, 0x2e, 0xef, 0xbd, 0x35, 0xca, -0xc9, 0xa1, 0x22, 0x4e, 0xd5, 0x23, 0xf0, 0x04, 0xf1, 0x04, 0xaf, 0xe6, -0x53, 0x9a, 0xac, 0xf2, 0xce, 0xc0, 0x31, 0x76, 0xbe, 0xf0, 0x3a, 0xc7, -0x86, 0x4f, 0x53, 0xf3, 0x3c, 0xa6, 0xdc, 0x49, 0xb2, 0xa3, 0x5b, 0xb8, -0xb1, 0xfd, 0x16, 0x76, 0x7d, 0x71, 0x17, 0xb9, 0x5a, 0x3f, 0xdf, 0x2e, -0xdc, 0xcf, 0x81, 0xf2, 0x00, 0xae, 0x78, 0x78, 0xae, 0x3f, 0xb7, 0x16, -0xa8, 0xbb, 0x4f, 0x12, 0xe0, 0xfa, 0xab, 0xd7, 0xf0, 0xf2, 0xe0, 0xbf, -0x90, 0xb0, 0x6d, 0x9a, 0x6c, 0x1b, 0xad, 0x14, 0x85, 0x91, 0x12, 0x85, -0xe3, 0x65, 0xbc, 0x9a, 0x0f, 0x01, 0xb3, 0x8a, 0xf8, 0xe0, 0x3a, 0x3e, -0xe3, 0x63, 0x25, 0x76, 0xfd, 0xf0, 0x2d, 0x06, 0xde, 0x1e, 0xa4, 0xe2, -0xba, 0x4c, 0xd4, 0x8a, 0x3c, 0x33, 0xba, 0x83, 0x17, 0x0a, 0x7f, 0xcb, -0x3f, 0x9f, 0x7e, 0x82, 0xc9, 0x72, 0x99, 0xc3, 0x53, 0xfb, 0xd1, 0xd8, -0x61, 0x10, 0xf2, 0x41, 0x7d, 0x43, 0x5d, 0xf4, 0x38, 0x68, 0x58, 0x60, -0x2d, 0x80, 0x52, 0xa0, 0x62, 0x9a, 0x49, 0x77, 0x9c, 0x44, 0x34, 0x4a, -0xdc, 0xb6, 0x11, 0xa0, 0x34, 0x5a, 0xc5, 0x75, 0x3c, 0xf0, 0x81, 0x80, -0x1c, 0x3e, 0xc9, 0xcc, 0xb6, 0x5e, 0x95, 0xf9, 0xab, 0x5e, 0x85, 0x4f, -0x1f, 0x3e, 0x85, 0xc0, 0x15, 0x9c, 0x8a, 0xcb, 0x4f, 0x5e, 0x3b, 0xc4, -0xde, 0xd7, 0xf6, 0xe3, 0xd4, 0x6a, 0xe4, 0x4b, 0x87, 0xf8, 0xb7, 0xf1, -0x1f, 0x53, 0xaa, 0x56, 0x99, 0x74, 0x1c, 0x8a, 0x95, 0x0a, 0x45, 0xb7, -0x40, 0xa2, 0xc9, 0x0e, 0x2d, 0xe0, 0xd3, 0x7a, 0xb1, 0x00, 0x8d, 0x90, -0x12, 0xf6, 0x44, 0xb3, 0x62, 0xb4, 0x7c, 0x82, 0x98, 0x6d, 0x93, 0xb0, -0x6d, 0x62, 0x91, 0x08, 0x8e, 0xeb, 0xe2, 0x4c, 0xb8, 0xf8, 0x6e, 0x3d, -0xdc, 0x0a, 0x7d, 0xf2, 0x2d, 0x19, 0x9c, 0x7e, 0xc3, 0x36, 0xb6, 0xa6, -0x37, 0x65, 0xb7, 0xa3, 0xc8, 0x21, 0x24, 0x03, 0x84, 0x53, 0xc3, 0x93, -0x14, 0x27, 0x2a, 0xb4, 0xb4, 0xc6, 0x08, 0x82, 0x00, 0x3f, 0x08, 0xf0, -0x7d, 0x9f, 0x40, 0x84, 0x11, 0x67, 0x88, 0x8a, 0x53, 0x6b, 0xb8, 0x50, -0x12, 0xd8, 0x73, 0x31, 0x00, 0x0d, 0x0b, 0xa4, 0x00, 0x94, 0x52, 0xe4, -0x27, 0x8e, 0x10, 0xb5, 0x2c, 0xe2, 0x91, 0x08, 0xb6, 0x65, 0x21, 0x80, -0x37, 0xe5, 0x23, 0x22, 0x20, 0x90, 0xf9, 0x56, 0xef, 0x0b, 0x8d, 0xca, -0x59, 0xd2, 0xe1, 0x85, 0xcf, 0x76, 0x15, 0x90, 0x34, 0x95, 0xc1, 0xc2, -0x85, 0xed, 0xfc, 0xda, 0x6f, 0xac, 0xa0, 0xbd, 0x3d, 0x81, 0x69, 0x18, -0x28, 0xa5, 0x10, 0x11, 0xdc, 0x20, 0xa0, 0xea, 0xba, 0x1c, 0x99, 0xda, -0xcf, 0x82, 0xa6, 0x4e, 0x54, 0x00, 0xf8, 0xa1, 0xdb, 0x5e, 0x8c, 0x34, -0x2c, 0xd0, 0x06, 0xa0, 0x9b, 0xe1, 0xd2, 0x96, 0xc5, 0x78, 0x56, 0x91, -0x68, 0x24, 0x42, 0xc4, 0x34, 0xd1, 0x4a, 0x11, 0x04, 0x17, 0x7e, 0x41, -0x7a, 0x43, 0xb6, 0x47, 0x69, 0x7a, 0x4c, 0xc3, 0x60, 0xc9, 0xf2, 0x0e, -0x56, 0x5e, 0x77, 0x29, 0x2d, 0x89, 0x38, 0xb6, 0x65, 0x11, 0x88, 0x84, -0xca, 0xd7, 0x21, 0x3c, 0xdf, 0xe7, 0x50, 0xf1, 0x00, 0xf3, 0x12, 0x0b, -0x42, 0x0b, 0x48, 0xd8, 0xee, 0x5c, 0x00, 0x4c, 0x5b, 0xa0, 0xea, 0x57, -0x88, 0xc7, 0x4c, 0x6c, 0xd3, 0xc4, 0x32, 0x8c, 0xfa, 0x6c, 0x7b, 0x01, -0xe5, 0xd3, 0xd9, 0x6e, 0xe0, 0x49, 0x02, 0x45, 0xeb, 0xe5, 0x09, 0xe6, -0x5d, 0x99, 0xc0, 0x27, 0xa0, 0xe4, 0x38, 0x78, 0x41, 0x50, 0x87, 0x0f, -0xc2, 0x22, 0x82, 0x17, 0x04, 0x1c, 0x2a, 0x1e, 0xa4, 0xc3, 0x5a, 0x0c, -0x9e, 0x02, 0x91, 0xf3, 0x0e, 0xe2, 0x69, 0xcb, 0xce, 0x90, 0x5e, 0x32, -0x1f, 0x08, 0x10, 0x8a, 0x52, 0x8c, 0x56, 0x4f, 0x71, 0x45, 0x6b, 0x27, -0x96, 0x61, 0x84, 0x00, 0xa6, 0x89, 0x19, 0x33, 0x50, 0x13, 0x61, 0x2f, -0x4e, 0x3f, 0x9a, 0x56, 0x29, 0xe0, 0xb9, 0xf0, 0x97, 0x30, 0x71, 0xa4, -0xc4, 0xa1, 0x09, 0x8f, 0x91, 0xe6, 0x02, 0x89, 0x76, 0x1b, 0x3b, 0x62, -0x11, 0x6f, 0x8b, 0x60, 0x18, 0x06, 0x66, 0xdc, 0x00, 0x25, 0xd4, 0x3c, -0x8f, 0x8a, 0xeb, 0x12, 0x4f, 0xcc, 0x27, 0x92, 0x30, 0x70, 0x26, 0xce, -0x8d, 0xa5, 0x59, 0xd2, 0xa4, 0x37, 0x66, 0xdb, 0x08, 0x58, 0x8f, 0x90, -0x44, 0x28, 0x00, 0xfd, 0x64, 0xc8, 0x9d, 0x0f, 0x44, 0x89, 0x08, 0x2a, -0xad, 0x04, 0x20, 0x72, 0x99, 0x49, 0xd7, 0xd5, 0x6d, 0x2c, 0xeb, 0xec, -0x64, 0x49, 0x47, 0x07, 0x09, 0xdb, 0x66, 0x78, 0x6c, 0x8c, 0xd7, 0x5f, -0x3e, 0xcc, 0xf1, 0xc3, 0x13, 0x04, 0xa1, 0x2f, 0xad, 0x06, 0xf2, 0xc0, -0x6e, 0x98, 0x9d, 0x0e, 0x28, 0xa5, 0x50, 0x4a, 0xa1, 0xf5, 0xec, 0x6f, -0x15, 0x26, 0x6f, 0xe8, 0xa8, 0x02, 0x53, 0xe1, 0x2b, 0x1f, 0xb7, 0xe8, -0xe1, 0x57, 0x05, 0xc9, 0x88, 0x9a, 0xa5, 0xfc, 0xa6, 0x6c, 0x8a, 0x80, -0xe7, 0x14, 0x24, 0x15, 0x0a, 0xf1, 0x01, 0x11, 0x24, 0xa0, 0x1f, 0xd8, -0x9a, 0xc9, 0xf4, 0xf6, 0xcf, 0x84, 0x98, 0x0d, 0xb0, 0xd8, 0xa4, 0xf3, -0x9a, 0x36, 0xae, 0xec, 0xea, 0x62, 0x69, 0x47, 0x07, 0x4d, 0xb1, 0x18, -0xa7, 0x8a, 0x45, 0xde, 0xd8, 0x7b, 0x98, 0xc1, 0xdc, 0x29, 0x5c, 0xd7, -0x07, 0xe8, 0x96, 0x8c, 0xec, 0x51, 0x69, 0xb5, 0x94, 0x30, 0x8a, 0xa4, -0x08, 0xc7, 0x50, 0x77, 0xfd, 0xfb, 0x82, 0xb1, 0x5d, 0xa9, 0x33, 0xd7, -0x0d, 0x63, 0xce, 0x04, 0x50, 0x5f, 0x55, 0x29, 0x02, 0x76, 0x2b, 0x54, -0x5b, 0x34, 0x66, 0x11, 0x9d, 0x1f, 0x41, 0x5c, 0xa1, 0x7a, 0xb2, 0x46, -0xcd, 0x09, 0x27, 0x50, 0x60, 0x87, 0x64, 0xe4, 0xde, 0x46, 0x9d, 0x86, -0x0b, 0xe5, 0x81, 0xa4, 0x94, 0x05, 0x09, 0x02, 0x04, 0x50, 0x5a, 0x63, -0x6a, 0x4d, 0xc2, 0xb6, 0x69, 0xee, 0x88, 0x61, 0x18, 0xc6, 0x34, 0x00, -0xb0, 0x47, 0x32, 0x32, 0x08, 0x0c, 0x72, 0x26, 0x0c, 0x4e, 0xa7, 0xc6, -0x33, 0xe0, 0x1a, 0x25, 0x05, 0xb4, 0x89, 0x9c, 0x9b, 0x3e, 0xa8, 0xb4, -0x4a, 0x49, 0x46, 0x72, 0x59, 0xd2, 0xa0, 0x79, 0x52, 0x69, 0xda, 0x6c, -0xcb, 0x62, 0xd1, 0xea, 0x79, 0x74, 0x5e, 0xd2, 0x8a, 0x88, 0x30, 0x3a, -0x56, 0xe4, 0xf8, 0x3b, 0x13, 0x94, 0x8e, 0x3b, 0x04, 0x5e, 0xb0, 0x49, -0xa5, 0x55, 0xab, 0x64, 0xe4, 0x0f, 0xce, 0x05, 0xa8, 0x0a, 0xbe, 0x08, -0x41, 0x10, 0x20, 0x22, 0x28, 0xa5, 0x88, 0x47, 0x22, 0xb4, 0xce, 0x8f, -0x11, 0x89, 0x18, 0x38, 0x0e, 0x88, 0x90, 0xca, 0x92, 0xbe, 0xe0, 0xa0, -0xaa, 0xf7, 0xea, 0xd9, 0x70, 0x33, 0x15, 0x6e, 0xad, 0x03, 0x35, 0xe0, -0xc6, 0x01, 0xd2, 0x0f, 0x64, 0xd7, 0x62, 0x90, 0x52, 0x28, 0x12, 0x0b, -0x6d, 0x96, 0x2c, 0x9c, 0xc7, 0x65, 0x0b, 0x16, 0x20, 0x22, 0xb4, 0xc4, -0xe3, 0x04, 0x26, 0x8c, 0xe8, 0x31, 0x2a, 0x43, 0x35, 0x24, 0xa0, 0x47, -0xa5, 0xd5, 0x66, 0xc9, 0x48, 0xa1, 0x01, 0x90, 0x03, 0xba, 0x03, 0x07, -0x6a, 0x8e, 0x47, 0xb5, 0x56, 0xa3, 0xe6, 0xba, 0xb8, 0x9e, 0x87, 0x00, -0xb6, 0x1d, 0x21, 0xd2, 0x6e, 0xc2, 0xa4, 0x02, 0xce, 0x1f, 0x39, 0x7e, -0x56, 0x91, 0x8c, 0x4c, 0xd4, 0xc1, 0x66, 0xc3, 0x69, 0xf2, 0x48, 0xe3, -0x52, 0x11, 0x8d, 0x44, 0x68, 0x8e, 0xc5, 0x50, 0x80, 0x1f, 0x04, 0x14, -0x9a, 0x9a, 0x28, 0x2c, 0x2d, 0x51, 0x3d, 0xee, 0x21, 0x12, 0x80, 0xf0, -0x59, 0xe0, 0xe9, 0x46, 0x80, 0xcc, 0x01, 0x88, 0x04, 0x54, 0x8e, 0x38, -0x9c, 0x9e, 0x9a, 0x62, 0xac, 0x54, 0x62, 0xa2, 0x52, 0x61, 0xaa, 0x5a, -0xa5, 0xe6, 0xba, 0x88, 0x35, 0xed, 0xc3, 0xc9, 0x74, 0x3a, 0x9b, 0xbc, -0x18, 0x88, 0xf3, 0x49, 0xe6, 0xcf, 0x7a, 0x07, 0xd1, 0xe4, 0x45, 0x09, -0x4e, 0xd1, 0xc3, 0xa9, 0xb9, 0x68, 0x20, 0x62, 0x9a, 0xd8, 0x96, 0x15, -0xce, 0x4b, 0xb6, 0x89, 0x8e, 0x42, 0x7d, 0x55, 0x97, 0x82, 0x33, 0x2e, -0xf4, 0x7c, 0x08, 0x00, 0xd5, 0x11, 0x8f, 0x93, 0xba, 0x88, 0x89, 0x66, -0xb2, 0x52, 0x41, 0x6b, 0xcd, 0xf1, 0x53, 0x05, 0x2a, 0x27, 0x6a, 0x33, -0xc3, 0xe8, 0x52, 0x20, 0xaf, 0xfe, 0x52, 0x25, 0xd1, 0xf4, 0xa0, 0xc8, -0xd7, 0x4b, 0x2e, 0xb3, 0xb9, 0xf7, 0x43, 0xb7, 0x57, 0xce, 0xe7, 0x7e, -0xbd, 0x64, 0x48, 0xab, 0x6c, 0x4e, 0x20, 0x59, 0xf3, 0x3c, 0x26, 0x0a, -0x15, 0x2a, 0x0b, 0xdd, 0xe9, 0xd9, 0x5c, 0x6b, 0x8d, 0xa1, 0x14, 0xca, -0x56, 0x50, 0x3e, 0x0b, 0x40, 0x32, 0x32, 0xa1, 0xd2, 0xea, 0x29, 0xa0, -0x27, 0x08, 0x02, 0xa6, 0x86, 0xaa, 0xbc, 0x37, 0x3e, 0xca, 0xa9, 0xce, -0x22, 0xca, 0xd6, 0x54, 0x86, 0x1d, 0xaa, 0xa5, 0x5a, 0x23, 0x72, 0xe4, -0x24, 0x23, 0xa1, 0xf9, 0x0d, 0x5a, 0x51, 0x6c, 0x69, 0x6c, 0xb5, 0x28, -0x05, 0xe9, 0xc7, 0xb2, 0x10, 0xba, 0x47, 0x01, 0x21, 0x87, 0x90, 0x47, -0xc8, 0x13, 0x90, 0xcf, 0xdc, 0xd7, 0x9b, 0x87, 0xd9, 0x13, 0xd5, 0x2c, -0x18, 0x4d, 0x8e, 0x80, 0xf5, 0x7e, 0xe0, 0x33, 0x59, 0xac, 0x50, 0x72, -0x1c, 0x62, 0x91, 0x48, 0x38, 0x1e, 0x09, 0x03, 0x8b, 0xb2, 0x55, 0xc3, -0x02, 0x49, 0x38, 0x77, 0x4d, 0xbc, 0x0d, 0xb8, 0x17, 0xc2, 0x98, 0x6e, -0x18, 0xe1, 0x93, 0xe1, 0x6c, 0x2a, 0x00, 0x05, 0xc2, 0x30, 0xba, 0x6f, -0xba, 0xce, 0x76, 0x25, 0x4a, 0x83, 0xb6, 0x34, 0x86, 0xa1, 0xc3, 0xb8, -0x5f, 0xbf, 0x27, 0x02, 0xe2, 0x0b, 0x12, 0x08, 0x81, 0x2f, 0xe1, 0xb5, -0x2f, 0x39, 0x09, 0x98, 0x40, 0xe8, 0x27, 0xa0, 0x40, 0x40, 0x8e, 0x80, -0xbc, 0x3c, 0x24, 0x79, 0xb5, 0x45, 0xad, 0x25, 0xa0, 0x5f, 0xa3, 0x59, -0xb8, 0xb8, 0x8d, 0xeb, 0x7e, 0x65, 0x19, 0x8b, 0xdb, 0xdb, 0x29, 0x39, -0x0e, 0xef, 0x8d, 0x8e, 0x72, 0xe8, 0xc4, 0x09, 0x4e, 0x1c, 0x2c, 0x50, -0x3b, 0xe6, 0x85, 0xa9, 0xfc, 0xe3, 0xa2, 0x66, 0xcd, 0xc4, 0x92, 0x91, -0xcd, 0x2a, 0xad, 0x9e, 0x07, 0xfa, 0x44, 0xa4, 0xdb, 0xf3, 0x66, 0xed, -0x58, 0xe4, 0x81, 0xf5, 0x33, 0x95, 0x0f, 0x09, 0xc0, 0x30, 0x35, 0xdd, -0x57, 0x7d, 0x82, 0xc3, 0x13, 0xef, 0x12, 0xb3, 0x6d, 0x22, 0xa6, 0x19, -0x8e, 0x47, 0x01, 0xd7, 0xf5, 0x71, 0x3d, 0x8f, 0xaa, 0xe3, 0x52, 0xad, -0xba, 0x54, 0x2a, 0x4e, 0xaa, 0x5a, 0xae, 0xe1, 0xbb, 0xc1, 0xda, 0x19, -0x6f, 0xcf, 0xa9, 0xad, 0xaa, 0x1b, 0x28, 0xa0, 0x40, 0x24, 0x4c, 0xcd, -0xab, 0xae, 0x8b, 0x1b, 0x04, 0x78, 0xf5, 0x54, 0x64, 0xd6, 0x0e, 0x4a, -0xbd, 0x97, 0xce, 0xd9, 0x5a, 0x94, 0x8c, 0xec, 0xc9, 0x92, 0xbe, 0x39, -0x9d, 0xce, 0xae, 0xe2, 0xcc, 0xe4, 0x94, 0x07, 0x9e, 0xaf, 0x47, 0x90, -0xb3, 0x2a, 0xd0, 0xef, 0xfb, 0xd2, 0x1d, 0x8f, 0x44, 0x68, 0x49, 0x24, -0x68, 0x8e, 0x46, 0x69, 0x8a, 0x46, 0xc3, 0x41, 0x67, 0x18, 0x98, 0x86, -0x41, 0x20, 0x82, 0xe3, 0xba, 0x14, 0xcb, 0x65, 0x4e, 0x4e, 0x4c, 0x30, -0x74, 0x62, 0x9c, 0xf1, 0x93, 0xa5, 0x90, 0x30, 0xb4, 0x6a, 0x8f, 0x6c, -0x91, 0x89, 0x2c, 0xe9, 0x7d, 0xe9, 0x87, 0xb2, 0x48, 0x20, 0x78, 0x8e, -0x8f, 0xe7, 0x79, 0x78, 0x9e, 0x87, 0xeb, 0xfb, 0x78, 0xf5, 0x74, 0x7c, -0x1a, 0x42, 0x2e, 0x00, 0x00, 0xa1, 0x5f, 0xf6, 0x66, 0x32, 0xfb, 0x80, -0x7d, 0xe7, 0xbb, 0x3f, 0x4b, 0x82, 0xf0, 0x6d, 0x51, 0xcb, 0x66, 0x55, -0xc7, 0x6a, 0x06, 0xcb, 0xfb, 0xd1, 0x4a, 0x61, 0x6a, 0x4d, 0xb4, 0x9e, -0x92, 0x6b, 0xa5, 0xc2, 0x75, 0x85, 0xeb, 0x32, 0x59, 0xa8, 0x32, 0x79, -0xba, 0x0a, 0x41, 0x98, 0x9e, 0x23, 0xac, 0x97, 0x87, 0x42, 0xab, 0xf6, -0x92, 0x21, 0x4d, 0x36, 0x7c, 0xad, 0x1f, 0x26, 0x7f, 0xae, 0xef, 0x53, -0x73, 0x5d, 0x6a, 0x75, 0x88, 0xce, 0x96, 0x2e, 0xde, 0x67, 0x68, 0xba, -0xf9, 0x8b, 0xdf, 0x9d, 0x0e, 0x57, 0x68, 0x38, 0x6e, 0x99, 0xe5, 0xad, -0x57, 0x61, 0x1a, 0x06, 0xa2, 0x14, 0x7e, 0x3d, 0x7d, 0xf6, 0x3c, 0x0f, -0xc7, 0x75, 0x99, 0x28, 0x95, 0x79, 0xf7, 0xc0, 0x10, 0x43, 0xc3, 0xe3, -0x78, 0x35, 0x0f, 0x09, 0x97, 0xa4, 0x3d, 0x99, 0xaf, 0xf7, 0x4e, 0xcf, -0x07, 0x59, 0xd2, 0x0d, 0x28, 0x54, 0x7d, 0xec, 0x39, 0x9e, 0x47, 0xb5, -0x0e, 0xef, 0xfa, 0x3e, 0x09, 0xbf, 0xa9, 0xf1, 0x4c, 0x6e, 0x6e, 0x00, -0x7c, 0x0a, 0xe2, 0xc3, 0x60, 0xf1, 0x08, 0x97, 0xc6, 0x17, 0x87, 0x6e, -0x03, 0x20, 0x82, 0xef, 0xfb, 0x38, 0x9e, 0xc7, 0x58, 0xb1, 0xc4, 0x9b, -0x6f, 0x1f, 0x65, 0x68, 0x64, 0x0c, 0xcf, 0x99, 0x56, 0xfe, 0xa9, 0xcc, -0xd7, 0x7b, 0x9f, 0x3e, 0x27, 0xa4, 0x06, 0xa0, 0x44, 0x61, 0x46, 0x42, -0xd5, 0x6a, 0xae, 0x4b, 0xd9, 0x71, 0xa8, 0xd6, 0x6a, 0xac, 0x9c, 0x7f, -0x0d, 0x07, 0x86, 0x0e, 0x34, 0x00, 0x0a, 0x73, 0x05, 0x90, 0xc7, 0x83, -0x98, 0x15, 0x61, 0x59, 0xf3, 0x55, 0xc4, 0x6c, 0x1b, 0xdb, 0xb6, 0xb1, -0x4c, 0x13, 0xad, 0xc3, 0xa8, 0x14, 0x8d, 0x84, 0xeb, 0x8b, 0xfa, 0x9a, -0x3a, 0xac, 0xe3, 0xb3, 0x19, 0xce, 0x84, 0xd4, 0x2c, 0x69, 0xd2, 0x0f, -0x66, 0x3f, 0x4b, 0x00, 0x5a, 0x29, 0x22, 0x71, 0x0b, 0xa5, 0x35, 0x95, -0x3a, 0x40, 0xb9, 0x56, 0xe3, 0xf2, 0xb6, 0xe5, 0x30, 0x25, 0x73, 0x6c, -0x01, 0x8f, 0x3c, 0x3e, 0x04, 0xae, 0xd0, 0x62, 0xb6, 0xd1, 0x1c, 0x8b, -0xd1, 0x5c, 0x5f, 0x53, 0x5f, 0xd3, 0xba, 0x9a, 0xae, 0xf8, 0x22, 0x9a, -0x62, 0x51, 0x6e, 0x5c, 0x73, 0x15, 0x2b, 0x97, 0x5f, 0x4a, 0x44, 0x9b, -0xa8, 0x40, 0x25, 0xf1, 0x39, 0x9a, 0x7e, 0x28, 0xdb, 0x37, 0xad, 0xfc, -0x03, 0xd9, 0x24, 0x01, 0x7d, 0x4a, 0xc0, 0x32, 0x4c, 0x5a, 0x3a, 0x62, -0x68, 0xa0, 0xec, 0x38, 0x4c, 0x39, 0x0e, 0x95, 0x5a, 0x8d, 0x84, 0x4a, -0xd4, 0xd3, 0x6b, 0xa0, 0x9e, 0x3d, 0x7c, 0xe8, 0x01, 0xc7, 0x87, 0x8a, -0x1f, 0x9a, 0xd2, 0xad, 0x7a, 0xf8, 0xd4, 0x58, 0xd2, 0xb4, 0x84, 0x62, -0x70, 0x9a, 0x75, 0x2d, 0x77, 0xb0, 0xae, 0xe5, 0x0e, 0x86, 0x6b, 0x47, -0x79, 0xe2, 0xc4, 0x56, 0x2a, 0x41, 0x89, 0x1b, 0xd6, 0xfc, 0x12, 0x8b, -0x3a, 0xdb, 0xd9, 0xbb, 0xf7, 0x00, 0x93, 0x93, 0x95, 0x36, 0x3f, 0x08, -0xb6, 0xa4, 0x1f, 0xc8, 0x6e, 0x69, 0xf8, 0x3d, 0x01, 0x68, 0xad, 0x69, -0x6b, 0x8f, 0x33, 0xaf, 0xb3, 0x89, 0x00, 0x28, 0x55, 0xab, 0x94, 0x1c, -0x87, 0xee, 0xcb, 0x6e, 0x65, 0xe8, 0xc4, 0x70, 0x3d, 0x68, 0x00, 0xd0, -0x0f, 0x73, 0x60, 0x01, 0xd9, 0x2a, 0xfb, 0xf0, 0xc1, 0x52, 0x06, 0x11, -0x6d, 0xf2, 0xb1, 0xa6, 0x14, 0x1b, 0x3a, 0xb7, 0x72, 0x53, 0xfc, 0xd3, -0x6c, 0xda, 0xf9, 0x87, 0x1c, 0x73, 0xf6, 0xd3, 0xd3, 0x79, 0x3f, 0x51, -0xcb, 0x22, 0x66, 0x59, 0x2c, 0x4f, 0x2e, 0xe4, 0xf6, 0xdb, 0xd6, 0xb0, -0x2c, 0xd9, 0x45, 0xcc, 0xb2, 0x31, 0xd1, 0xa8, 0x00, 0x54, 0x00, 0x96, -0x36, 0x68, 0x6f, 0x49, 0xb0, 0xe4, 0x63, 0x1d, 0xc4, 0x22, 0x11, 0xaa, -0xae, 0xcb, 0x64, 0xb5, 0x8a, 0x0e, 0x4c, 0xee, 0xb8, 0xfa, 0xb7, 0xe9, -0x7f, 0x6d, 0x77, 0xa3, 0xd9, 0x7c, 0x3d, 0xe3, 0x9d, 0x03, 0x0b, 0x00, -0x78, 0x30, 0x36, 0x3a, 0xc5, 0xb0, 0x77, 0x90, 0xf5, 0x2d, 0x77, 0x53, -0xf5, 0xca, 0x74, 0x3f, 0xbe, 0x8e, 0x81, 0x91, 0x01, 0x76, 0x1d, 0xd9, -0xc9, 0xf7, 0x7b, 0x9f, 0x61, 0xe3, 0x25, 0x8f, 0xf0, 0xdd, 0xd3, 0x7d, -0x94, 0xfd, 0x12, 0xf3, 0xda, 0x9a, 0x59, 0xb7, 0xee, 0x1a, 0x46, 0x46, -0xc6, 0x39, 0xb0, 0x7f, 0x84, 0xe1, 0xc1, 0x71, 0x10, 0xe8, 0x5c, 0xda, -0xca, 0xa2, 0xe5, 0xed, 0x44, 0x22, 0x26, 0x15, 0xd7, 0x0d, 0xf7, 0x93, -0xaa, 0x55, 0xee, 0xf9, 0xe5, 0xaf, 0xd1, 0xbf, 0xbf, 0x9f, 0xc9, 0xb1, -0xa9, 0x46, 0x8b, 0xcf, 0x37, 0x2e, 0xe6, 0x06, 0xc0, 0xa7, 0xdf, 0xa9, -0x78, 0xdd, 0x86, 0xd6, 0x54, 0xbc, 0x12, 0x37, 0x3f, 0x76, 0x0b, 0x03, -0x23, 0x03, 0x20, 0x30, 0x32, 0x34, 0xce, 0xe7, 0x1f, 0xff, 0x5d, 0xbe, -0x77, 0xf7, 0x3f, 0xd0, 0x33, 0xef, 0x21, 0x9e, 0x1d, 0x7b, 0x9c, 0xa1, -0xda, 0x51, 0x0c, 0xad, 0xe9, 0xea, 0x6a, 0xa3, 0x6d, 0x7e, 0x82, 0xea, -0xf5, 0x2e, 0x35, 0xcf, 0x9b, 0xde, 0x43, 0x2a, 0xd7, 0x6a, 0x94, 0x2a, -0x15, 0x8a, 0x95, 0x0a, 0x9b, 0xd7, 0xfc, 0x31, 0x37, 0x2d, 0xf9, 0x55, -0x6e, 0xfb, 0xbb, 0xdb, 0x66, 0xb6, 0x38, 0x7d, 0x02, 0x34, 0x37, 0xa7, -0x94, 0x5e, 0xb8, 0xc5, 0xb8, 0xf7, 0xe0, 0x4f, 0xe8, 0xde, 0xbe, 0x8e, -0x81, 0x63, 0x03, 0x8d, 0x9d, 0x37, 0xf0, 0x61, 0x64, 0xa8, 0xc0, 0x6f, -0x3d, 0x76, 0x27, 0x6f, 0x8e, 0xbf, 0xc6, 0xdd, 0x9d, 0x7f, 0xce, 0x27, -0x5b, 0xee, 0x42, 0x79, 0x16, 0x8e, 0xe7, 0x21, 0x22, 0x18, 0x5a, 0x63, -0x68, 0x4d, 0x20, 0x42, 0xd9, 0x71, 0x28, 0x96, 0xcb, 0xb8, 0x9e, 0xc1, -0x83, 0x1f, 0xdf, 0xca, 0xa7, 0x96, 0x7d, 0x9a, 0x2d, 0x3f, 0xfa, 0x06, -0x53, 0xc7, 0xa7, 0x7b, 0xbf, 0xbf, 0xe1, 0x3e, 0xf0, 0x01, 0x87, 0x7c, -0x3f, 0x8f, 0xa8, 0x7b, 0xce, 0x24, 0x81, 0x33, 0x24, 0x07, 0x6c, 0x21, -0x5c, 0x6a, 0xa6, 0x10, 0xb0, 0xa3, 0x26, 0x1b, 0xbf, 0xf0, 0x05, 0xee, -0x5e, 0x79, 0x3f, 0x6d, 0x56, 0x07, 0xaf, 0x8d, 0xbf, 0xc4, 0xfe, 0xc9, -0x7d, 0x9c, 0x70, 0x8e, 0xf3, 0xf6, 0xd8, 0x5b, 0x2c, 0xb0, 0x2e, 0x45, -0x89, 0xc5, 0x8d, 0x97, 0xdc, 0xcc, 0x75, 0x5d, 0x37, 0x12, 0xb7, 0xe2, -0x3c, 0xb8, 0xfb, 0x41, 0x76, 0x7e, 0x6f, 0x67, 0xd8, 0x19, 0xa1, 0xa4, -0x66, 0x25, 0x93, 0x73, 0x02, 0xf0, 0x65, 0xb5, 0x05, 0xe8, 0x0b, 0x7f, -0x00, 0xd0, 0x27, 0x7f, 0x13, 0x1e, 0x1f, 0xa9, 0x2f, 0xab, 0x56, 0xc2, -0x88, 0x91, 0x6a, 0xe4, 0x2f, 0x2b, 0xaf, 0xbd, 0x82, 0x8d, 0x9f, 0xda, -0xc0, 0x27, 0x16, 0x7e, 0x92, 0x76, 0xbb, 0x83, 0x80, 0x00, 0x1f, 0x7f, -0xd6, 0xf7, 0xfb, 0x53, 0xc7, 0xf8, 0xe6, 0xab, 0xdf, 0xe4, 0xe5, 0x5d, -0xbb, 0xa1, 0x32, 0xdd, 0xd4, 0x76, 0xc9, 0xcc, 0x3e, 0xd5, 0x99, 0x1b, -0x80, 0xb4, 0xfa, 0x12, 0xf0, 0x54, 0x5d, 0xd1, 0x9e, 0x99, 0x26, 0xae, -0xdf, 0x6f, 0x25, 0x1c, 0x78, 0xdd, 0x33, 0xff, 0xde, 0xb5, 0xac, 0x8d, -0xd5, 0x2b, 0xaf, 0x65, 0xed, 0x8a, 0x75, 0xb8, 0xbe, 0x47, 0x2d, 0xf0, -0x70, 0x7d, 0x8f, 0xff, 0x1c, 0x7e, 0x9b, 0x1f, 0xed, 0x7d, 0x91, 0xe0, -0xb8, 0xcc, 0xec, 0xf9, 0x9c, 0x64, 0x64, 0xf5, 0x39, 0x6d, 0xcf, 0x11, -0xc0, 0x2a, 0x42, 0xd3, 0x7e, 0xe0, 0xa9, 0xa3, 0x4a, 0xab, 0x4d, 0x84, -0x96, 0x3a, 0x67, 0x4b, 0x51, 0x9b, 0x0a, 0x1d, 0xd5, 0x78, 0x53, 0xfe, -0x39, 0xf5, 0xa8, 0xaf, 0xd9, 0xcf, 0x97, 0x0d, 0xcf, 0x09, 0xc0, 0xcf, -0x23, 0xf5, 0x2d, 0x97, 0x3e, 0xa0, 0xe7, 0x67, 0xac, 0xb2, 0x1d, 0xe8, -0x3b, 0x6f, 0x2a, 0xcf, 0x47, 0x00, 0x30, 0xdd, 0x70, 0xe8, 0x56, 0x3d, -0x84, 0x6e, 0xd5, 0xd8, 0x66, 0x81, 0x70, 0xed, 0x91, 0x27, 0x74, 0xb9, -0xe7, 0xcf, 0x76, 0xc7, 0x73, 0xde, 0xf3, 0xff, 0xff, 0xad, 0xf2, 0x11, -0xcb, 0xff, 0x00, 0x23, 0xdd, 0xb3, 0x7f, 0xe6, 0x37, 0xca, 0x79, 0x00, -0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_stop.c b/Source/Core/DolphinWX/resources/toolbar_stop.c deleted file mode 100644 index 47dfd9f577..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_stop.c +++ /dev/null @@ -1,260 +0,0 @@ -static const unsigned char toolbar_stop_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0b, 0x61, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x49, 0x8c, 0x5d, 0xc7, 0x75, -0x86, 0xbf, 0xaa, 0xba, 0xc3, 0x1b, 0x38, 0x3c, 0x36, 0x9b, 0xa4, 0x2d, -0x83, 0x14, 0x69, 0x45, 0x32, 0x18, 0xd0, 0x26, 0xb3, 0xc8, 0xc2, 0x8b, -0x50, 0xf4, 0x26, 0x4a, 0x80, 0x00, 0xd4, 0x22, 0x80, 0x80, 0x08, 0x82, -0xdb, 0x8b, 0x44, 0x1e, 0x00, 0x33, 0x59, 0x64, 0x45, 0x04, 0xa6, 0x21, -0x38, 0x32, 0x04, 0x28, 0x22, 0x99, 0x00, 0x81, 0x93, 0x05, 0x05, 0x04, -0xbd, 0x0d, 0xe8, 0x0c, 0x48, 0x82, 0x38, 0x01, 0x2d, 0x7b, 0x23, 0x07, -0x71, 0x68, 0x5b, 0x59, 0x49, 0xb6, 0x9a, 0x54, 0x8b, 0xa4, 0xba, 0x5f, -0x8f, 0xaf, 0xdf, 0xeb, 0x77, 0x87, 0x3a, 0x27, 0x8b, 0xba, 0x6f, 0xe8, -0x66, 0x37, 0xd9, 0x4d, 0x09, 0x11, 0x54, 0x40, 0xe1, 0xde, 0x37, 0xd5, -0xfd, 0xff, 0x73, 0xfe, 0x33, 0x54, 0x75, 0x1b, 0x55, 0xe5, 0x93, 0x3c, -0xec, 0xc7, 0x0d, 0xe0, 0xc3, 0x8e, 0xe8, 0xe3, 0x7c, 0xf8, 0x8b, 0x2f, -0xfe, 0x8d, 0x19, 0xdc, 0x7f, 0xef, 0x7b, 0x7f, 0xf4, 0x48, 0x52, 0x30, -0x1f, 0x95, 0x84, 0xbe, 0xfb, 0xdd, 0x7f, 0x3d, 0xae, 0xaa, 0xe7, 0x54, -0xe5, 0x9c, 0x88, 0x1c, 0x17, 0xd1, 0xd3, 0xaa, 0xd2, 0x12, 0x11, 0x44, -0x04, 0x55, 0x99, 0x11, 0x91, 0x5b, 0x22, 0x72, 0x43, 0x44, 0x7e, 0xb6, -0xb2, 0xd2, 0xfb, 0xfe, 0x16, 0xcb, 0x28, 0xec, 0x8e, 0xcc, 0x87, 0x22, -0xf0, 0xea, 0xab, 0xff, 0xd9, 0x52, 0x95, 0x67, 0x55, 0xf5, 0x82, 0xaa, -0x9e, 0x09, 0x40, 0x95, 0x31, 0xd0, 0xc3, 0xfb, 0x8d, 0xaf, 0x3d, 0x22, -0xb2, 0x2c, 0x22, 0xff, 0xe0, 0xbd, 0xfc, 0xdd, 0xfa, 0x7a, 0xf9, 0xc3, -0x0a, 0xfc, 0x60, 0x02, 0xe8, 0x4e, 0x88, 0x3c, 0x32, 0x81, 0xd7, 0x5e, -0xbb, 0x71, 0x09, 0xf4, 0x82, 0x88, 0xb6, 0x54, 0x95, 0x5a, 0x2d, 0xa5, -0xd9, 0x6c, 0xb2, 0x77, 0xef, 0x5e, 0x8c, 0x31, 0x24, 0x49, 0x3a, 0x04, -0x5b, 0x14, 0x05, 0xbd, 0xde, 0x1a, 0x6b, 0x6b, 0x3d, 0x3a, 0x9d, 0x15, -0x3a, 0x9d, 0x0e, 0x65, 0x59, 0x8c, 0x93, 0x7b, 0xc3, 0x7b, 0xff, 0xa7, -0x79, 0xce, 0xcd, 0x8a, 0x80, 0x0c, 0xc8, 0x3c, 0x8c, 0xc4, 0xae, 0x63, -0xe0, 0xca, 0x95, 0x37, 0xce, 0x19, 0x63, 0xae, 0x59, 0x6b, 0x8f, 0x5b, -0x6b, 0x99, 0x98, 0x98, 0xe0, 0xf1, 0xc7, 0x3f, 0xc5, 0xc1, 0x83, 0x75, -0x1a, 0x8d, 0x88, 0x28, 0xb2, 0x44, 0x91, 0xc3, 0x7b, 0x10, 0x81, 0x6e, -0x37, 0x67, 0x6d, 0x2d, 0x63, 0x65, 0xa5, 0xc7, 0xc2, 0xc2, 0x2a, 0x13, -0x13, 0x07, 0xc8, 0xf3, 0x9c, 0x95, 0x95, 0x25, 0xee, 0xde, 0xbd, 0x47, -0x96, 0x65, 0x00, 0x67, 0x8d, 0x31, 0x6f, 0xc6, 0xb1, 0xff, 0xf3, 0xa2, -0xb0, 0x2f, 0x01, 0xa6, 0x22, 0x31, 0x20, 0xb2, 0xed, 0xd8, 0x95, 0x07, -0xae, 0x5e, 0xfd, 0xf1, 0x25, 0x63, 0xcc, 0xb7, 0x00, 0x0e, 0x1f, 0x3e, -0xc4, 0xa9, 0x53, 0x47, 0x39, 0x7c, 0x38, 0x25, 0x4d, 0x2d, 0x22, 0x0c, -0x41, 0x3f, 0xe8, 0x7e, 0x6e, 0x6e, 0x99, 0xd9, 0xd9, 0x7b, 0xf4, 0x7a, -0xeb, 0x88, 0x94, 0xcc, 0xcf, 0xcf, 0x33, 0x37, 0x37, 0x37, 0xf4, 0x88, -0xaa, 0xfc, 0xc8, 0x7b, 0x7d, 0x4e, 0x35, 0x5a, 0x00, 0x3c, 0x20, 0x0f, -0xf2, 0xc2, 0x8e, 0x3d, 0x70, 0xf5, 0xea, 0x8f, 0xae, 0x59, 0x6b, 0xa7, -0xd2, 0x34, 0xe5, 0x0b, 0x5f, 0xf8, 0x1c, 0x4f, 0x3d, 0xb5, 0x87, 0x5a, -0xcd, 0x0c, 0xc1, 0xad, 0xaf, 0x7b, 0x16, 0x17, 0x73, 0x56, 0x57, 0x0b, -0xfa, 0xfd, 0x30, 0xbd, 0xf7, 0x88, 0x78, 0x92, 0xc4, 0x91, 0xa6, 0x31, -0xf5, 0x7a, 0x4a, 0xab, 0xb5, 0x97, 0x03, 0x07, 0x5a, 0xdc, 0xbd, 0x3b, -0xc7, 0xbb, 0xef, 0xde, 0xe2, 0xc0, 0x81, 0x09, 0xea, 0xf5, 0x3a, 0xb3, -0xb3, 0xef, 0xb1, 0xbe, 0xbe, 0x0e, 0xf0, 0x5b, 0xc6, 0xe8, 0xbf, 0xa9, -0x96, 0xcf, 0x40, 0xb4, 0xc0, 0xc6, 0xb8, 0xb8, 0x6f, 0xec, 0xc8, 0x03, -0x57, 0xae, 0xbc, 0x71, 0xcd, 0x5a, 0x3b, 0xd5, 0x6c, 0x36, 0x39, 0x7b, -0xf6, 0x14, 0xc7, 0x8e, 0xc5, 0x43, 0x8b, 0x2e, 0x2c, 0x78, 0xee, 0xdd, -0xcb, 0xe9, 0xf5, 0x4a, 0x44, 0x3c, 0xde, 0x4b, 0x75, 0xf5, 0x63, 0x57, -0xc1, 0x7b, 0x8f, 0xf7, 0x25, 0x65, 0x29, 0xb4, 0x5a, 0x7b, 0x38, 0x72, -0xe4, 0x08, 0x79, 0x5e, 0xf2, 0xd6, 0x5b, 0xff, 0x4b, 0x51, 0x64, 0x78, -0xef, 0xb9, 0x7b, 0xf7, 0x0e, 0x2b, 0x2b, 0xcb, 0x83, 0xb8, 0xf8, 0x85, -0xaa, 0xf9, 0x6d, 0x63, 0x92, 0x36, 0xe0, 0xb7, 0xf3, 0xc2, 0x43, 0x0b, -0xd9, 0x6b, 0xaf, 0xdd, 0xb8, 0x06, 0x4c, 0xed, 0xdf, 0xdf, 0xe2, 0x99, -0x67, 0x3e, 0xcf, 0xd1, 0xa3, 0x71, 0x65, 0x71, 0x78, 0xfb, 0xed, 0x92, -0xd9, 0xd9, 0x92, 0x2c, 0x53, 0x8c, 0x31, 0x80, 0xc1, 0x54, 0x99, 0x3d, -0x5c, 0x4d, 0x35, 0x87, 0xf6, 0x02, 0x60, 0x61, 0x61, 0x89, 0x9f, 0xff, -0xfc, 0x2d, 0x96, 0x96, 0x96, 0x38, 0x79, 0xf2, 0xd7, 0xb1, 0xd6, 0x21, -0xa2, 0x1c, 0x3e, 0x7c, 0x84, 0x5a, 0xad, 0x31, 0xf8, 0xdd, 0xe7, 0x55, -0xfd, 0xdf, 0x02, 0x6e, 0xd3, 0x22, 0x3b, 0x27, 0xf0, 0xea, 0xab, 0xff, -0x71, 0x41, 0x55, 0xa7, 0x6a, 0xb5, 0x1a, 0x5f, 0xfa, 0xd2, 0xe7, 0x98, -0x98, 0x88, 0x10, 0x81, 0x76, 0x5b, 0xf9, 0xe5, 0x2f, 0x95, 0x7e, 0xff, -0x61, 0xf4, 0x19, 0x12, 0x0a, 0xf7, 0xa3, 0x17, 0xaa, 0xf0, 0xfe, 0xfb, -0xb3, 0xbc, 0xf3, 0xce, 0x3b, 0x3c, 0xf1, 0xc4, 0x53, 0xc3, 0xf4, 0x7b, -0xe4, 0xc8, 0x11, 0xa2, 0x68, 0xa8, 0xec, 0xdf, 0x2b, 0xcb, 0xee, 0x37, -0x01, 0x3b, 0x5e, 0xf4, 0x76, 0x44, 0xe0, 0x95, 0x57, 0xfe, 0xfd, 0x8c, -0xaa, 0x5e, 0x76, 0xce, 0xf1, 0xc5, 0x2f, 0x9e, 0x62, 0x62, 0x22, 0x58, -0xfe, 0xf6, 0x6d, 0xcf, 0x9d, 0x3b, 0x21, 0xfd, 0x81, 0x32, 0x50, 0xe0, -0xd6, 0x52, 0x1c, 0x7d, 0x3e, 0x78, 0x3d, 0xe2, 0x10, 0x3e, 0xeb, 0xf5, -0x3a, 0xdc, 0xbe, 0x3d, 0xc3, 0xa7, 0x3f, 0xfd, 0x19, 0x54, 0x15, 0x63, -0x2c, 0x87, 0x0e, 0x1d, 0x62, 0x4c, 0xf6, 0x17, 0x8b, 0x62, 0xed, 0xc4, -0x76, 0x38, 0x1f, 0xe0, 0x01, 0xbd, 0xa6, 0x0a, 0x27, 0x4f, 0x3e, 0xc9, -0xd1, 0xa3, 0x75, 0x44, 0xe0, 0xd6, 0xad, 0x9c, 0xc5, 0xc5, 0xb2, 0x2a, -0x44, 0x7e, 0x58, 0x9c, 0x02, 0x78, 0x45, 0x55, 0x87, 0x44, 0x46, 0xc0, -0x47, 0x0c, 0xc2, 0x7b, 0xba, 0xe1, 0x33, 0x55, 0xe8, 0x74, 0x56, 0x59, -0x5e, 0x5e, 0x22, 0x8e, 0x6b, 0xa8, 0x0a, 0x69, 0x5a, 0x63, 0xcf, 0x9e, -0xbd, 0x83, 0x2f, 0xed, 0x57, 0x95, 0x3f, 0x63, 0x1b, 0x19, 0x6d, 0x49, -0xe0, 0xe5, 0x97, 0xff, 0xe5, 0xcb, 0xaa, 0x7a, 0x66, 0xdf, 0xbe, 0x7d, -0x3c, 0xf9, 0xe4, 0x41, 0x8c, 0x31, 0xb4, 0xdb, 0x05, 0x0b, 0x0b, 0x05, -0xde, 0xcb, 0x70, 0x6e, 0xac, 0xb2, 0xba, 0xc5, 0x1c, 0x00, 0xdf, 0x9c, -0x48, 0x46, 0x84, 0x07, 0xef, 0x77, 0x3a, 0xab, 0x14, 0x45, 0x86, 0x48, -0x78, 0xbf, 0xd5, 0x3a, 0x80, 0xea, 0xd0, 0xb3, 0x2f, 0x64, 0xd9, 0xf2, -0x96, 0x5e, 0xd8, 0x92, 0x80, 0xaa, 0x5e, 0x52, 0x55, 0x4e, 0x9e, 0xfc, -0x2c, 0xfb, 0xf6, 0x25, 0xf4, 0xfb, 0xc2, 0xec, 0xec, 0xfa, 0x58, 0x1b, -0x30, 0xf2, 0xc0, 0x78, 0xfb, 0x30, 0xf0, 0xc6, 0xe8, 0xba, 0x99, 0x8c, -0x56, 0x32, 0x31, 0x15, 0x38, 0x86, 0x80, 0x45, 0x94, 0xa2, 0x28, 0x86, -0xeb, 0x39, 0xe7, 0x68, 0x36, 0x9b, 0x18, 0x33, 0xf8, 0x1e, 0xdf, 0xdc, -0x0a, 0xeb, 0x7d, 0x69, 0xf4, 0xa5, 0x97, 0xfe, 0xf1, 0xbc, 0xb5, 0xf6, -0xfa, 0xe4, 0xe4, 0x41, 0xce, 0x9e, 0x3d, 0xcd, 0xe4, 0x64, 0x9d, 0x99, -0x99, 0x35, 0x3a, 0x9d, 0x02, 0x63, 0x2c, 0xc6, 0x8c, 0x32, 0x4d, 0x7b, -0x7e, 0x8e, 0x9b, 0x3f, 0x7d, 0x93, 0xf5, 0x5e, 0x77, 0xab, 0xb5, 0xef, -0x1b, 0x69, 0x5a, 0xe3, 0xd8, 0x89, 0x5f, 0xa3, 0xde, 0x68, 0x52, 0x14, -0x39, 0x79, 0x5e, 0x52, 0x96, 0x05, 0x79, 0x5e, 0x54, 0x85, 0x2c, 0x90, -0x0f, 0x5e, 0x31, 0x74, 0x3a, 0xab, 0xcc, 0xcf, 0xdd, 0xa5, 0x0c, 0x29, -0xf9, 0x56, 0xbd, 0x3e, 0x71, 0x62, 0x73, 0x3a, 0xbd, 0xaf, 0x90, 0xa9, -0xea, 0x94, 0xaa, 0x30, 0x39, 0x79, 0x90, 0x03, 0x07, 0xea, 0xac, 0xae, -0xe6, 0x2c, 0x2d, 0xad, 0x63, 0xad, 0xc5, 0x98, 0x51, 0xba, 0x04, 0xb8, -0xf9, 0xd3, 0x37, 0x39, 0x75, 0xea, 0x33, 0x3c, 0xf7, 0x07, 0xe7, 0x76, -0x44, 0x60, 0x7d, 0x3d, 0xe7, 0x9f, 0xff, 0xe9, 0xbf, 0x58, 0xeb, 0xea, -0xd0, 0x53, 0x03, 0xcf, 0x85, 0x87, 0x0b, 0xa8, 0x62, 0xad, 0x41, 0x55, -0x69, 0x36, 0xea, 0xcc, 0x63, 0x06, 0xe2, 0x7f, 0xbc, 0xdb, 0x6d, 0x9f, -0x01, 0xfe, 0x67, 0x7c, 0xcd, 0x0d, 0x12, 0xba, 0x74, 0xe9, 0xef, 0x5b, -0xaa, 0xf2, 0x6c, 0x14, 0xc5, 0x1c, 0x3a, 0x34, 0x51, 0xa5, 0xcc, 0xf5, -0x0d, 0x5a, 0x1f, 0x14, 0x2a, 0x11, 0xcf, 0x7a, 0xaf, 0xcb, 0xef, 0x3f, -0x77, 0x0e, 0xef, 0xd9, 0xd1, 0x4c, 0x92, 0x84, 0xdf, 0xf9, 0xdd, 0xdf, -0xac, 0x80, 0x6f, 0x0e, 0xfa, 0x10, 0x0f, 0xc6, 0x54, 0x55, 0xc0, 0x80, -0x73, 0x8e, 0x34, 0xad, 0xc1, 0x50, 0x72, 0x7a, 0x7e, 0xb3, 0x51, 0x36, -0x78, 0x40, 0x44, 0x9f, 0xb6, 0x56, 0x69, 0x36, 0x1b, 0x34, 0x9b, 0x09, -0x45, 0x21, 0xb4, 0xdb, 0xdd, 0xca, 0xea, 0x21, 0xc5, 0xc1, 0xc6, 0x7c, -0xee, 0xfd, 0x8e, 0x8c, 0x3f, 0x1c, 0x49, 0x92, 0x6c, 0xb0, 0xbe, 0x88, -0xa0, 0xa2, 0x15, 0x68, 0x83, 0x31, 0x06, 0x6b, 0x0c, 0xa2, 0x82, 0x28, -0x44, 0x91, 0xc3, 0x8c, 0x12, 0xc0, 0xe9, 0x07, 0x12, 0x50, 0xd5, 0x33, -0xaa, 0x42, 0xa3, 0xd1, 0xa0, 0x56, 0x8b, 0x59, 0x5d, 0xcd, 0x10, 0x91, -0x2a, 0xe8, 0xcc, 0x98, 0x84, 0xc6, 0x49, 0xef, 0x8e, 0x40, 0xf8, 0x8d, -0x8c, 0x05, 0xef, 0x28, 0x0d, 0x1b, 0x0c, 0x91, 0xb5, 0x58, 0x6b, 0xf0, -0x62, 0x80, 0x92, 0x5a, 0x2d, 0xa5, 0xd3, 0x19, 0x66, 0xa3, 0xd6, 0x43, -0x08, 0xc8, 0x39, 0x11, 0x4b, 0x14, 0x45, 0x34, 0x1a, 0x35, 0xee, 0xdc, -0x59, 0x44, 0xc4, 0x57, 0x96, 0xd9, 0x18, 0xc0, 0x83, 0xb1, 0x5b, 0x0f, -0x8c, 0x08, 0xc8, 0xb0, 0x4f, 0x42, 0x03, 0x78, 0x67, 0xc1, 0x59, 0x83, -0xb3, 0x16, 0x54, 0x50, 0x63, 0xb1, 0x26, 0xd8, 0xbf, 0x52, 0xda, 0xb9, -0x87, 0x10, 0xd0, 0x16, 0x08, 0x69, 0x9a, 0x56, 0xbd, 0x7c, 0x7f, 0xe8, -0x81, 0x8d, 0xd6, 0x7f, 0x74, 0x09, 0x0d, 0x08, 0x84, 0xe6, 0x2e, 0x78, -0xc2, 0x20, 0x38, 0x63, 0x02, 0x78, 0x67, 0x71, 0xd6, 0xa2, 0x28, 0x42, -0x90, 0x54, 0x78, 0xda, 0xd6, 0x4d, 0xe7, 0xa6, 0x18, 0x90, 0x33, 0x03, -0x1d, 0x8a, 0xc0, 0xea, 0x6a, 0x77, 0xcc, 0xf2, 0x61, 0x99, 0x8f, 0x42, -0x42, 0xde, 0x97, 0xc3, 0x6e, 0x55, 0xd5, 0x63, 0x8d, 0xc1, 0x1a, 0x70, -0xd6, 0x11, 0xbb, 0x08, 0x6b, 0x42, 0x7d, 0xb0, 0x66, 0x20, 0xdf, 0xed, -0x3b, 0xea, 0xcd, 0x12, 0x02, 0x6c, 0xe5, 0x62, 0x2a, 0xeb, 0x8f, 0x77, -0x9a, 0xf7, 0x93, 0x78, 0x14, 0x0f, 0x94, 0xa5, 0x1f, 0x93, 0x4f, 0x58, -0xcf, 0x59, 0x4b, 0xe4, 0xc2, 0x34, 0x80, 0xb3, 0x42, 0x29, 0x86, 0xa2, -0xc8, 0xb7, 0xe9, 0xb3, 0xb6, 0x20, 0x20, 0xa2, 0x18, 0x23, 0x23, 0x02, -0x3e, 0x58, 0x80, 0xca, 0x03, 0xa3, 0x16, 0x79, 0x34, 0x1e, 0x8d, 0x40, -0x59, 0x91, 0x10, 0x9c, 0x09, 0xba, 0x8f, 0x9d, 0x23, 0x89, 0x23, 0xe2, -0xc8, 0x85, 0x6a, 0xed, 0x43, 0x2a, 0x2d, 0x8a, 0x02, 0x19, 0x11, 0xb8, -0xf9, 0x40, 0x02, 0xaa, 0x82, 0xc1, 0x90, 0x65, 0x19, 0xab, 0xab, 0xdd, -0xca, 0x23, 0xa3, 0xc2, 0x25, 0xf2, 0xd1, 0x04, 0xf1, 0x40, 0x3e, 0x06, -0xc1, 0x1a, 0x1b, 0xc0, 0x47, 0x11, 0x49, 0xe4, 0x88, 0x9c, 0xa3, 0xf0, -0x25, 0xc6, 0x1a, 0x0c, 0x86, 0x6e, 0x77, 0x6d, 0xdc, 0x03, 0xcb, 0x0f, -0x24, 0x20, 0x22, 0x37, 0x8c, 0xb5, 0xe7, 0xf2, 0xac, 0x4f, 0xaf, 0xbb, -0xce, 0x40, 0x77, 0x66, 0xd0, 0xb3, 0xc0, 0xb0, 0x97, 0x19, 0xfd, 0x66, -0xf7, 0x04, 0xca, 0xd2, 0x83, 0x86, 0xc0, 0x4d, 0x22, 0x47, 0x2d, 0x89, -0xa8, 0xa5, 0x31, 0x49, 0xe4, 0xc2, 0xe7, 0x3e, 0x80, 0xcf, 0xf2, 0xac, -0xb2, 0xfe, 0x90, 0xc0, 0x8d, 0x87, 0x11, 0x58, 0x0e, 0xac, 0x3b, 0x2c, -0x2e, 0x2c, 0x52, 0xaf, 0xa5, 0xe4, 0x59, 0x8e, 0xa8, 0x60, 0x08, 0x1e, -0x52, 0x01, 0xd1, 0x40, 0x26, 0x49, 0x52, 0xfa, 0xfd, 0x9c, 0x34, 0x4d, -0x76, 0x0c, 0x3e, 0xcb, 0xf2, 0x0a, 0xbc, 0x25, 0x8d, 0x23, 0x1a, 0x69, -0x42, 0x3d, 0x49, 0xa8, 0xc5, 0x11, 0xce, 0x39, 0x4a, 0x09, 0x2e, 0x55, -0x55, 0x96, 0x96, 0x97, 0xf1, 0x5e, 0xc7, 0x3d, 0x70, 0x9f, 0x84, 0x36, -0xb4, 0x12, 0xaa, 0x7a, 0x53, 0x51, 0xba, 0x6b, 0x5d, 0xfa, 0xfd, 0x5e, -0x60, 0xae, 0x42, 0x64, 0xc0, 0xa2, 0x18, 0x35, 0x18, 0x06, 0x7b, 0xde, -0x92, 0xc7, 0x8e, 0x3e, 0xce, 0x8f, 0xdf, 0xf8, 0x49, 0x00, 0xb5, 0x43, -0xf0, 0x3f, 0x79, 0xf3, 0x17, 0x44, 0x36, 0x80, 0xaf, 0x27, 0x49, 0x20, -0x90, 0x26, 0xa4, 0x49, 0x5c, 0xe5, 0x7f, 0x10, 0x14, 0xaf, 0xc2, 0xf2, -0xf2, 0x52, 0xd5, 0xd9, 0x0e, 0x97, 0xb8, 0xb1, 0x79, 0xcd, 0xcd, 0x1e, -0xb8, 0x6e, 0x8c, 0xb9, 0xd4, 0xed, 0x76, 0xf1, 0x65, 0x49, 0x91, 0x15, -0x38, 0x43, 0x55, 0xde, 0xc1, 0x20, 0x94, 0x3e, 0x48, 0x0a, 0x51, 0x6a, -0xb5, 0x06, 0x59, 0x2e, 0xfc, 0xe0, 0x07, 0xff, 0x8d, 0xf7, 0x83, 0xb6, -0x3a, 0xb8, 0x3c, 0xe8, 0x5c, 0x51, 0xf5, 0xa8, 0x0c, 0xf2, 0xbd, 0xe2, -0x8c, 0xa1, 0x91, 0xc6, 0xa4, 0x71, 0x44, 0xb3, 0x96, 0xd2, 0x48, 0x13, -0xe2, 0x28, 0xc2, 0x5a, 0xc8, 0x4b, 0x8f, 0x57, 0xa1, 0xf4, 0xc2, 0xc2, -0xe2, 0x12, 0x59, 0x5e, 0xe0, 0x65, 0x18, 0x64, 0xd7, 0xa7, 0xa7, 0x2f, -0xae, 0x3c, 0xd0, 0x03, 0x57, 0xaf, 0xfe, 0xe1, 0xcf, 0xc4, 0xfb, 0x19, -0x2f, 0x9e, 0x85, 0x85, 0x36, 0xbe, 0xcc, 0x31, 0x06, 0x22, 0x0b, 0x91, -0xb5, 0x24, 0xce, 0x91, 0x38, 0x4b, 0xec, 0x0c, 0x91, 0x05, 0x67, 0x14, -0x4b, 0x68, 0xd6, 0x8d, 0x2a, 0x2a, 0x1e, 0xd4, 0xa3, 0x3e, 0x68, 0xdc, -0xa8, 0x60, 0x35, 0x3c, 0x24, 0xb1, 0x96, 0x7a, 0x1c, 0xd1, 0xac, 0x25, -0xec, 0xa9, 0xd7, 0xd8, 0xdf, 0x6c, 0xb0, 0xb7, 0x5e, 0xa3, 0x9e, 0x26, -0x95, 0xf6, 0x4d, 0xd8, 0x13, 0x94, 0x9e, 0xac, 0x28, 0xf8, 0x60, 0xee, -0x03, 0xbc, 0x94, 0xe3, 0xd6, 0x7f, 0x7d, 0x2b, 0xaf, 0x6e, 0x71, 0x2e, -0xa4, 0xdf, 0x17, 0x2f, 0x17, 0xda, 0xed, 0x36, 0x93, 0x13, 0x93, 0x24, -0x91, 0xc5, 0x60, 0x89, 0x6c, 0xc8, 0x46, 0xce, 0x04, 0x40, 0x45, 0xc5, -0xbe, 0x1c, 0x5c, 0xd5, 0x63, 0x6c, 0x28, 0x80, 0x6a, 0xc0, 0x62, 0xc0, -0x99, 0xca, 0xea, 0x0e, 0x67, 0x2d, 0x49, 0xe4, 0x48, 0xe3, 0x88, 0x5a, -0x12, 0x93, 0xc6, 0x31, 0x49, 0xec, 0x30, 0xc6, 0x50, 0x7a, 0xc1, 0x8b, -0x90, 0x97, 0x25, 0x79, 0xe9, 0x79, 0xff, 0xce, 0x2c, 0xfd, 0x2c, 0xc3, -0x0f, 0xfb, 0x24, 0x66, 0xa6, 0xa7, 0x2f, 0x6e, 0x75, 0x18, 0xbc, 0xe5, -0x7e, 0xe0, 0xb2, 0x17, 0x7f, 0x21, 0x2f, 0x72, 0xe6, 0xdb, 0x1f, 0x90, -0x3e, 0xf6, 0x18, 0x91, 0x0d, 0x6d, 0x6e, 0xe4, 0x0c, 0xb1, 0x46, 0xc4, -0xce, 0x52, 0x3a, 0x4b, 0xe1, 0x2d, 0x79, 0x69, 0x42, 0x4e, 0xb7, 0x06, -0x2f, 0x82, 0x68, 0xe8, 0x2e, 0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x91, 0x75, -0xc4, 0x91, 0x0d, 0xa9, 0x32, 0x8e, 0x48, 0xa2, 0x88, 0xc8, 0x59, 0xc0, -0x50, 0x8a, 0xa7, 0x14, 0x4f, 0x3f, 0x2f, 0xe8, 0x17, 0x05, 0xf3, 0x0b, -0x6d, 0x16, 0x16, 0x97, 0x29, 0xca, 0xb2, 0x92, 0x23, 0x00, 0x97, 0xb6, -0x02, 0x0f, 0xdb, 0x1c, 0x6c, 0x7d, 0xe3, 0x1b, 0x7f, 0xfd, 0x7a, 0x1c, -0x45, 0x5f, 0xae, 0x25, 0x31, 0x4f, 0x7e, 0xf6, 0x04, 0x07, 0xf6, 0xb7, -0xa8, 0xc5, 0x11, 0x69, 0x1c, 0x11, 0x55, 0xf9, 0x59, 0x34, 0xe8, 0xbc, -0xf4, 0x42, 0xe9, 0x3d, 0xa5, 0xf7, 0x55, 0xc6, 0x90, 0x6a, 0x3f, 0x05, -0xd6, 0x84, 0xde, 0x26, 0x76, 0x96, 0xc8, 0xb9, 0x6a, 0x56, 0x0d, 0x9a, -0x2a, 0x85, 0x0f, 0x72, 0xe9, 0x65, 0x05, 0xdd, 0x2c, 0xe3, 0x83, 0x76, -0x9b, 0x77, 0x6f, 0xcd, 0xb0, 0x9e, 0x65, 0xe3, 0x04, 0x6e, 0x4e, 0x4f, -0x5f, 0xfc, 0x8d, 0xed, 0x08, 0x6c, 0x79, 0xb4, 0x18, 0x3b, 0xfb, 0xed, -0xb2, 0x2c, 0xce, 0xe7, 0xd0, 0x9a, 0xb9, 0xfd, 0x1e, 0xd1, 0x89, 0x08, -0xbb, 0x77, 0x4f, 0xa8, 0x9a, 0x71, 0x8c, 0x73, 0x96, 0xc8, 0x00, 0x55, -0xd5, 0x14, 0x11, 0x64, 0x10, 0xc0, 0x63, 0x06, 0xb1, 0x55, 0xf5, 0xb6, -0xd6, 0xe2, 0xaa, 0x6a, 0xae, 0x28, 0x5e, 0xa4, 0x02, 0x5f, 0xd2, 0xcb, -0x0a, 0x7a, 0x59, 0xc6, 0xfc, 0xc2, 0x02, 0xb7, 0xde, 0xbb, 0x4d, 0x96, -0x97, 0x94, 0xde, 0x8f, 0xa7, 0xce, 0xa9, 0xed, 0xc0, 0x6f, 0xeb, 0x01, -0x80, 0xaf, 0x7f, 0xed, 0xaf, 0xfe, 0xc4, 0x18, 0xfb, 0x17, 0xb5, 0x24, -0xa1, 0x59, 0xaf, 0xf1, 0xc4, 0x89, 0xe3, 0xb4, 0xf6, 0xee, 0xa5, 0x9e, -0xc4, 0x95, 0x27, 0x42, 0xd7, 0x68, 0xad, 0x19, 0xd6, 0x99, 0x00, 0xaf, -0x1a, 0x95, 0x1b, 0x06, 0x25, 0x4f, 0x35, 0x00, 0x2f, 0x7d, 0xd0, 0x7a, -0xb0, 0x7c, 0x4e, 0x2f, 0xcb, 0x99, 0xbd, 0x73, 0x97, 0xbb, 0x73, 0xf7, -0xe8, 0x67, 0x39, 0x79, 0x51, 0x8c, 0x6b, 0xff, 0x8f, 0xa7, 0xa7, 0x2f, -0x5e, 0x79, 0x24, 0x02, 0x00, 0x5f, 0x7d, 0xf1, 0xea, 0xf5, 0xc8, 0xb9, -0xf3, 0x69, 0x45, 0xe2, 0xf8, 0xb1, 0x63, 0x1c, 0xd8, 0x37, 0x22, 0x91, -0x44, 0x11, 0xae, 0x22, 0x32, 0xd8, 0x51, 0x0d, 0xf5, 0x53, 0x15, 0x3b, -0xa9, 0xb6, 0x8f, 0x41, 0x6a, 0x21, 0x48, 0xfb, 0x79, 0xc1, 0x7a, 0x9e, -0xb3, 0xba, 0xb6, 0xc6, 0xad, 0xd9, 0x59, 0x96, 0x57, 0x57, 0xe9, 0x67, -0x39, 0xa5, 0x2f, 0x29, 0xfd, 0x10, 0xfc, 0xeb, 0xd3, 0xd3, 0x17, 0xbf, -0xf2, 0x20, 0xf0, 0xf0, 0x90, 0xd3, 0xe9, 0xc8, 0xb9, 0xa9, 0xac, 0x28, -0x6e, 0xa8, 0xea, 0x69, 0x11, 0xcf, 0xdb, 0xbf, 0xfa, 0x15, 0x47, 0x26, -0x0f, 0xf1, 0xa9, 0xc3, 0x87, 0x68, 0xa4, 0x29, 0x49, 0xec, 0x49, 0x22, -0x47, 0xec, 0x1c, 0xce, 0x1a, 0xac, 0xb1, 0xc3, 0x63, 0x10, 0x25, 0x00, -0xf7, 0x5e, 0x28, 0x45, 0xc8, 0x8b, 0xb2, 0xca, 0x32, 0x25, 0x6b, 0xbd, -0x75, 0xee, 0xcd, 0xcf, 0x31, 0xdf, 0x6e, 0xd3, 0xeb, 0xe7, 0xe4, 0x45, -0x1e, 0x62, 0x48, 0x76, 0x07, 0xfe, 0xa1, 0x1e, 0x00, 0xf8, 0xfa, 0x57, -0xff, 0xb2, 0x95, 0x97, 0xe5, 0x8d, 0xc8, 0xb9, 0xd3, 0x71, 0xe4, 0x48, -0xe3, 0x98, 0x46, 0xbd, 0xc6, 0xe1, 0x83, 0x93, 0x4c, 0xb4, 0x5a, 0xd4, -0x6b, 0x29, 0xf1, 0x30, 0x38, 0x03, 0x01, 0x34, 0xb4, 0x1b, 0xa2, 0xe1, -0x10, 0xa0, 0xf0, 0x9e, 0xbc, 0x28, 0x59, 0xe9, 0x74, 0x58, 0x5a, 0x59, -0xa6, 0xbd, 0xb8, 0xc8, 0x7a, 0x16, 0x80, 0x17, 0x83, 0xd6, 0x7a, 0x54, -0x71, 0x77, 0x0c, 0x7e, 0x47, 0x04, 0x00, 0xbe, 0xf6, 0xe2, 0xd5, 0x56, -0x96, 0xe7, 0xd7, 0xad, 0xb5, 0x4f, 0x27, 0xb1, 0x23, 0x8e, 0x22, 0xe2, -0x28, 0x22, 0x89, 0x63, 0xf6, 0xed, 0xd9, 0x43, 0xb3, 0xd1, 0x64, 0x4f, -0xb3, 0x41, 0x12, 0x27, 0x38, 0x17, 0x1a, 0x32, 0xef, 0x4b, 0xb2, 0xbc, -0xa0, 0xdf, 0xef, 0xb3, 0xd6, 0x5d, 0x63, 0xa5, 0xd3, 0x21, 0xcb, 0x73, -0xfa, 0x79, 0x41, 0x51, 0x16, 0x21, 0xf5, 0x4a, 0xb0, 0xfa, 0x78, 0xba, -0x9c, 0x9e, 0xbe, 0xf8, 0xed, 0x9d, 0x82, 0xdf, 0x31, 0x81, 0xc1, 0xf8, -0xca, 0xd4, 0x2b, 0x97, 0x8c, 0x31, 0xdf, 0x72, 0xd6, 0xe2, 0x5c, 0x28, -0x4e, 0x51, 0x95, 0xd3, 0xc3, 0x46, 0xc4, 0x0d, 0x25, 0x04, 0x21, 0x60, -0x45, 0x06, 0x69, 0xb6, 0x1c, 0xa6, 0x5b, 0x11, 0x19, 0xca, 0xa5, 0x7a, -0xfc, 0x0c, 0x30, 0x35, 0x3d, 0x7d, 0xf1, 0x87, 0xbb, 0x01, 0xbf, 0x6b, -0x02, 0x00, 0x2f, 0xbc, 0xf0, 0xf2, 0x69, 0x63, 0xcc, 0x65, 0x6b, 0xcc, -0x39, 0x53, 0xe9, 0xde, 0x1a, 0x13, 0xb2, 0x11, 0xa1, 0x67, 0x02, 0x86, -0xe7, 0x9a, 0xa2, 0x32, 0xb4, 0xb2, 0x6c, 0x38, 0x72, 0x04, 0x42, 0x7f, -0x7f, 0x79, 0xb7, 0x56, 0xff, 0x50, 0x04, 0x06, 0xe3, 0xf9, 0xe7, 0xbf, -0xf3, 0xb4, 0x31, 0x4c, 0x59, 0x63, 0x9f, 0x35, 0xc6, 0xb4, 0xac, 0x1d, -0x6c, 0xc0, 0xc7, 0xf6, 0x0a, 0x3a, 0x6a, 0xf0, 0x94, 0x0d, 0xc0, 0x6f, -0x02, 0x97, 0xd9, 0xa6, 0x41, 0xfb, 0x7f, 0x21, 0x30, 0x3e, 0x9e, 0x7f, -0xfe, 0x3b, 0xe7, 0x81, 0x33, 0x84, 0x63, 0x8f, 0xe3, 0xd5, 0x1c, 0x8c, -0x65, 0x02, 0xe0, 0x19, 0x42, 0x3b, 0x7c, 0x63, 0x7a, 0xfa, 0xe2, 0xad, -0x0f, 0xfd, 0xd0, 0x6a, 0x7c, 0x64, 0x7f, 0xa9, 0xff, 0xb8, 0xc6, 0x27, -0xfe, 0x9f, 0x3d, 0x3e, 0xf1, 0x04, 0xfe, 0x0f, 0xa4, 0xff, 0x07, 0x95, -0xd9, 0xf3, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, -0xae, 0x42, 0x60, 0x82, -}; From 3510454a94c3725c0dfb04341785a1f8c40c0c15 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 16:13:38 -0600 Subject: [PATCH 414/627] Hopeful Windows buildfix (this better not break OS X) --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 1f1d8a3619..0841c72696 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -18,6 +18,7 @@ #include // System #include #include +#include #include #include "Common.h" @@ -596,11 +597,11 @@ void CConfigMain::CreateGUIControls() theme_selection->SetSelection(theme_selection->GetCount() - 1); }); - theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, [this,theme_selection](wxEvent&) + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function([this,theme_selection](wxEvent&) { SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); main_frame->InitBitmaps(); - }); + })); auto const scInterface = new wxBoxSizer(wxHORIZONTAL); scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); From c00339449a3e467caf937b4b5f2b74db55036c9b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 16:27:02 -0600 Subject: [PATCH 415/627] buildfix --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 0841c72696..968cee42ab 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -18,7 +18,6 @@ #include // System #include #include -#include #include #include "Common.h" @@ -43,6 +42,14 @@ #include "Main.h" #include "VideoBackendBase.h" +#if defined(__APPLE__) +#include +using std::tr1::function; +#else +#include +using std::function; +#endif + #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize) extern CFrame* main_frame; @@ -597,7 +604,8 @@ void CConfigMain::CreateGUIControls() theme_selection->SetSelection(theme_selection->GetCount() - 1); }); - theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function([this,theme_selection](wxEvent&) + // std::function = avoid error on msvc + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([this,theme_selection](wxEvent&) { SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); main_frame->InitBitmaps(); From 644c8f2713d5706757a8d551080066dedf9e327e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 17:52:32 -0600 Subject: [PATCH 416/627] Enhance an error message. Fix issue 5893. --- Source/Core/Core/Src/ActionReplay.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index 77f5778061..98857fae97 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -679,7 +679,8 @@ bool Subtype_MasterCodeAndWriteToCCXXXXXX(const ARAddr addr, const u32 data) // u8 mcode_type = (data & 0xFF0000) >> 16; // u8 mcode_count = (data & 0xFF00) >> 8; // u8 mcode_number = data & 0xFF; - PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)", current_code->name.c_str()); + PanicAlertT("Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" + "Master codes are not needed. Do not use master codes.", current_code->name.c_str()); return false; } From 511342edadfe004e2ae253b3d34a69077d19a805 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 14 Jan 2013 02:37:32 +0200 Subject: [PATCH 417/627] Gameini database update. --- Data/User/GameConfig/G2RE52.ini | 16 ++++++++++++++++ Data/User/GameConfig/G5SE7D.ini | 18 ++++++++++++++++++ Data/User/GameConfig/G5SP7D.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GP5E01.ini | 13 ++++++++++++- Data/User/GameConfig/GP5J01.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/GP5P01.ini | 21 +++++++++++++++++++++ Data/User/GameConfig/GVLD69.ini | 17 +++++++++++++++++ Data/User/GameConfig/GVLE69.ini | 12 +++++++++++- Data/User/GameConfig/GVLF69.ini | 17 +++++++++++++++++ Data/User/GameConfig/GVLP69.ini | 17 +++++++++++++++++ Data/User/GameConfig/R6BE78.ini | 4 ++-- Data/User/GameConfig/R6BJ78.ini | 4 ++-- Data/User/GameConfig/R6BK78.ini | 4 ++-- Data/User/GameConfig/R6BP78.ini | 4 ++-- Data/User/GameConfig/R6BX78.ini | 4 ++-- Data/User/GameConfig/SDBE78.ini | 18 ++++++++++++++++++ Data/User/GameConfig/SDBP78.ini | 18 ++++++++++++++++++ 17 files changed, 214 insertions(+), 12 deletions(-) create mode 100644 Data/User/GameConfig/G2RE52.ini create mode 100644 Data/User/GameConfig/G5SE7D.ini create mode 100644 Data/User/GameConfig/G5SP7D.ini create mode 100644 Data/User/GameConfig/GP5J01.ini create mode 100644 Data/User/GameConfig/GP5P01.ini create mode 100644 Data/User/GameConfig/GVLD69.ini create mode 100644 Data/User/GameConfig/GVLF69.ini create mode 100644 Data/User/GameConfig/GVLP69.ini create mode 100644 Data/User/GameConfig/SDBE78.ini create mode 100644 Data/User/GameConfig/SDBP78.ini diff --git a/Data/User/GameConfig/G2RE52.ini b/Data/User/GameConfig/G2RE52.ini new file mode 100644 index 0000000000..36b3a33431 --- /dev/null +++ b/Data/User/GameConfig/G2RE52.ini @@ -0,0 +1,16 @@ +# G2RE52 - Shrek SuperSlam +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G5SE7D.ini b/Data/User/GameConfig/G5SE7D.ini new file mode 100644 index 0000000000..eeaed0f7ad --- /dev/null +++ b/Data/User/GameConfig/G5SE7D.ini @@ -0,0 +1,18 @@ +# G5SE7D - Spyro +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs efb to Ram for proper lighting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/G5SP7D.ini b/Data/User/GameConfig/G5SP7D.ini new file mode 100644 index 0000000000..d972f28a22 --- /dev/null +++ b/Data/User/GameConfig/G5SP7D.ini @@ -0,0 +1,18 @@ +# G5SP7D - Spyro +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = Needs efb to Ram for proper lighting. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/GP5E01.ini b/Data/User/GameConfig/GP5E01.ini index 589be35233..96b6520c59 100644 --- a/Data/User/GameConfig/GP5E01.ini +++ b/Data/User/GameConfig/GP5E01.ini @@ -2,7 +2,7 @@ [EmuState] #The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -Issues="Some graphical bugs" +EmulationIssues = [OnLoad] #Add memory patches to be loaded once on boot here. [OnFrame] @@ -381,3 +381,14 @@ $Press L+X: Player Stops Moving 0022A392 00000001 00000000 40000000 [Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GP5J01.ini b/Data/User/GameConfig/GP5J01.ini new file mode 100644 index 0000000000..0bb483a730 --- /dev/null +++ b/Data/User/GameConfig/GP5J01.ini @@ -0,0 +1,21 @@ +# GP5J01 - Mario Party 5 +[EmuState] +#The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnLoad] +#Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GP5P01.ini b/Data/User/GameConfig/GP5P01.ini new file mode 100644 index 0000000000..f05d88efae --- /dev/null +++ b/Data/User/GameConfig/GP5P01.ini @@ -0,0 +1,21 @@ +# GP5P01 - Mario Party 5 +[EmuState] +#The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnLoad] +#Add memory patches to be loaded once on boot here. +[OnFrame] +[ActionReplay] +[Core] +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBCopyEnable = True +EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GVLD69.ini b/Data/User/GameConfig/GVLD69.ini new file mode 100644 index 0000000000..59306d751d --- /dev/null +++ b/Data/User/GameConfig/GVLD69.ini @@ -0,0 +1,17 @@ +# GVLD69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLE69.ini b/Data/User/GameConfig/GVLE69.ini index c823a972a1..b7a55cecaf 100644 --- a/Data/User/GameConfig/GVLE69.ini +++ b/Data/User/GameConfig/GVLE69.ini @@ -1,7 +1,17 @@ # GVLE69 - Marvel Nemesis: Rise of the Imperfects [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 +SkipIdle = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLF69.ini b/Data/User/GameConfig/GVLF69.ini new file mode 100644 index 0000000000..1f5785f150 --- /dev/null +++ b/Data/User/GameConfig/GVLF69.ini @@ -0,0 +1,17 @@ +# GVLF69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GVLP69.ini b/Data/User/GameConfig/GVLP69.ini new file mode 100644 index 0000000000..b7a55cecaf --- /dev/null +++ b/Data/User/GameConfig/GVLP69.ini @@ -0,0 +1,17 @@ +# GVLE69 - Marvel Nemesis: Rise of the Imperfects +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +SkipIdle = 0 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/R6BE78.ini b/Data/User/GameConfig/R6BE78.ini index 067eae1c63..963ed05ebb 100644 --- a/Data/User/GameConfig/R6BE78.ini +++ b/Data/User/GameConfig/R6BE78.ini @@ -1,8 +1,8 @@ # R6BE78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/User/GameConfig/R6BJ78.ini index 91e0a5aa71..dec4da7dbb 100644 --- a/Data/User/GameConfig/R6BJ78.ini +++ b/Data/User/GameConfig/R6BJ78.ini @@ -1,8 +1,8 @@ # R6BJ78 - Blob Colorful Na Kibou [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/User/GameConfig/R6BK78.ini index 28f22a58ed..1de85fe4c8 100644 --- a/Data/User/GameConfig/R6BK78.ini +++ b/Data/User/GameConfig/R6BK78.ini @@ -1,8 +1,8 @@ # R6BK78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/User/GameConfig/R6BP78.ini index 4afc6d1f80..d668b175ba 100644 --- a/Data/User/GameConfig/R6BP78.ini +++ b/Data/User/GameConfig/R6BP78.ini @@ -1,8 +1,8 @@ # R6BP78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/User/GameConfig/R6BX78.ini index 81f003a9bc..6448f5d6e0 100644 --- a/Data/User/GameConfig/R6BX78.ini +++ b/Data/User/GameConfig/R6BX78.ini @@ -1,8 +1,8 @@ # R6BX78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Some GFX Glitches +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SDBE78.ini b/Data/User/GameConfig/SDBE78.ini new file mode 100644 index 0000000000..f6af5ac5a5 --- /dev/null +++ b/Data/User/GameConfig/SDBE78.ini @@ -0,0 +1,18 @@ +# SDBE78 - de Blob 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/SDBP78.ini b/Data/User/GameConfig/SDBP78.ini new file mode 100644 index 0000000000..cfdb9551ee --- /dev/null +++ b/Data/User/GameConfig/SDBP78.ini @@ -0,0 +1,18 @@ +# SDBP78 - de Blob 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True From 47792b02a526597642e8e4e40991c0fb108b521d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 13 Jan 2013 22:28:36 -0500 Subject: [PATCH 418/627] Fix a small text overlapping issue in the MemcardManager. --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 3f8f0de7a7..6831e83d61 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -777,6 +777,9 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card) memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles); t_Status[card]->SetLabel(wxLabel); + // Done so text doesn't overlap the UI. + this->Fit(); + return true; } From 020ab743a90c165e836d4bb3cce57cb60443ad7e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 22:20:33 -0600 Subject: [PATCH 419/627] re-enable PulseAudio backend --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 14 ++++++++------ Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index b21aec45ba..5660edca0a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -96,18 +96,20 @@ namespace AudioCommon { std::vector backends; - if (NullSound::isValid()) + if (NullSound::isValid()) backends.push_back(BACKEND_NULLSOUND); - if (DSound::isValid()) + if (DSound::isValid()) backends.push_back(BACKEND_DIRECTSOUND); - if (XAudio2::isValid()) + if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); - if (AOSound::isValid()) + if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); - if (AlsaSound::isValid()) + if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); - if (CoreAudioSound::isValid()) + if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); + if (PulseAudio::isValid()) + backends.push_back(BACKEND_PULSEAUDIO); return backends; } diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 923a338190..faa94c22e0 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -77,7 +77,7 @@ bool PulseAudio::PulseInit() pa_sample_spec ss = {}; ss.format = PA_SAMPLE_S16LE; ss.channels = 2; - ss.rate = m_mixer->GetSampleRate(); + ss.rate = m_mixer->GetSampleRate(); int error; pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK, From 4ea4f2eb45071db2f580e1a2f5d2ce2d978a39ae Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 13 Jan 2013 23:42:18 -0500 Subject: [PATCH 420/627] 'width' and 'height' parameters of wxBitmapFromMemoryRGBA should be unsigned. Not a big deal, but it's good to do it for the sake of maintaining practicalities. --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 6831e83d61..b3a7ab22b8 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -39,11 +39,11 @@ const u8 hdr[] = { 0x00,0x00,0x00,0x00 }; -wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, int width, int height) +wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height) { - int stride = (4*width); + u32 stride = (4*width); - int bytes = (stride*height) + sizeof(hdr); + u32 bytes = (stride*height) + sizeof(hdr); bytes = (bytes+3)&(~3); @@ -54,13 +54,13 @@ wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, int width, int height u8 *pixelData = pdata + sizeof(hdr); - for (int y=0;y Date: Mon, 14 Jan 2013 14:20:41 -0600 Subject: [PATCH 421/627] This removes the Lock Thread to Core option. Please file your complaints appropriately. --- Source/Core/Core/Src/ConfigManager.cpp | 2 -- Source/Core/Core/Src/Core.cpp | 7 ++----- Source/Core/Core/Src/CoreParameter.cpp | 4 +--- Source/Core/Core/Src/CoreParameter.h | 1 - Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 1 - Source/Core/DolphinWX/Src/ConfigMain.cpp | 8 -------- Source/Core/DolphinWX/Src/ConfigMain.h | 2 -- 7 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 180e6c981d..3417b0eb55 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -221,7 +221,6 @@ void SConfig::SaveSettings() ini.Set("Core", "DSPThread", m_LocalCoreStartupParameter.bDSPThread); ini.Set("Core", "DSPHLE", m_LocalCoreStartupParameter.bDSPHLE); ini.Set("Core", "SkipIdle", m_LocalCoreStartupParameter.bSkipIdle); - ini.Set("Core", "LockThreads", m_LocalCoreStartupParameter.bLockThreads); ini.Set("Core", "DefaultGCM", m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Set("Core", "DVDRoot", m_LocalCoreStartupParameter.m_strDVDRoot); ini.Set("Core", "Apploader", m_LocalCoreStartupParameter.m_strApploader); @@ -361,7 +360,6 @@ void SConfig::LoadSettings() ini.Get("Core", "DSPHLE", &m_LocalCoreStartupParameter.bDSPHLE, true); ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true); ini.Get("Core", "SkipIdle", &m_LocalCoreStartupParameter.bSkipIdle, true); - ini.Get("Core", "LockThreads", &m_LocalCoreStartupParameter.bLockThreads, false); ini.Get("Core", "DefaultGCM", &m_LocalCoreStartupParameter.m_strDefaultGCM); ini.Get("Core", "DVDRoot", &m_LocalCoreStartupParameter.m_strDVDRoot); ini.Get("Core", "Apploader", &m_LocalCoreStartupParameter.m_strApploader); diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index e92b9088bc..141071d70a 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -310,8 +310,7 @@ void CpuThread() g_video_backend->Video_Prepare(); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core + Common::SetCurrentThreadAffinity(1); // Force to first core #if defined(_WIN32) && defined(_M_X64) EMM::InstallExceptionHandler(); // Let's run under memory watch @@ -344,8 +343,7 @@ void FifoPlayerThread() Common::SetCurrentThreadName("FIFO-GPU thread"); } - if (_CoreParameter.bLockThreads) - Common::SetCurrentThreadAffinity(1); // Force to first core + Common::SetCurrentThreadAffinity(1); // Force to first core g_bStarted = true; @@ -371,7 +369,6 @@ void EmuThread() Common::SetCurrentThreadName("Emuthread - Starting"); - if (_CoreParameter.bLockThreads) { if (cpu_info.num_cores > 3) // Force to third, non-HT core Common::SetCurrentThreadAffinity(4); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index dee2452cb3..b38c49ef7a 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -45,8 +45,7 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableFPRF(false), bCPUThread(true), bDSPThread(false), bDSPHLE(true), bSkipIdle(true), bNTSC(false), bForceNTSCJ(false), - bHLE_BS2(true), bLockThreads(false), - bEnableCheats(false), + bHLE_BS2(true), bEnableCheats(false), bMergeBlocks(false), bRunCompareServer(false), bRunCompareClient(false), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), @@ -74,7 +73,6 @@ void SCoreStartupParameter::LoadDefaults() bRunCompareServer = false; bDSPHLE = true; bDSPThread = true; - bLockThreads = true; bEnableFPRF = false; bMMU = false; bMMUBAT = false; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 8aa6be83e5..8da55e7d8a 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -103,7 +103,6 @@ struct SCoreStartupParameter bool bNTSC; bool bForceNTSCJ; bool bHLE_BS2; - bool bLockThreads; bool bEnableCheats; bool bMergeBlocks; diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index a44ff65f21..54709a9cce 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -104,7 +104,6 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) { Common::SetCurrentThreadName("DSP thread"); - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads) { if (cpu_info.num_cores > 3) { diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 42dc5df20b..33a639db1c 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -112,7 +112,6 @@ EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged) EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged) -EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged) @@ -211,7 +210,6 @@ void CConfigMain::UpdateGUI() EnableCheats->Disable(); CPUEngine->Disable(); - LockThreads->Disable(); _NTSCJ->Disable(); // Disable stuff on AudioPage @@ -332,7 +330,6 @@ void CConfigMain::InitializeGUIValues() // General - Advanced CPUEngine->SetSelection(startup_params.iCPUCore); - LockThreads->SetValue(startup_params.bLockThreads); _NTSCJ->SetValue(startup_params.bForceNTSCJ); @@ -546,7 +543,6 @@ void CConfigMain::CreateGUIControls() UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Limit by FPS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); - LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock Threads to Cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Populate the General settings @@ -562,7 +558,6 @@ void CConfigMain::CreateGUIControls() wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); sbAdvanced->Add(CPUEngine, 0, wxALL, 5); - sbAdvanced->Add(LockThreads, 0, wxALL, 5); sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); @@ -860,9 +855,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true); break; - case ID_LOCKTHREADS: - SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads = LockThreads->IsChecked(); - break; case ID_NTSCJ: SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked(); break; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 0e594101df..d8a362d205 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -69,7 +69,6 @@ private: ID_FRAMELIMIT_USEFPSFORLIMITING, ID_CPUENGINE, - ID_LOCKTHREADS, ID_DSPTHREAD, ID_NTSCJ, @@ -143,7 +142,6 @@ private: wxCheckBox* EnableOpenCL; wxRadioBox* CPUEngine; wxCheckBox* DSPThread; - wxCheckBox* LockThreads; wxCheckBox* _NTSCJ; From 5005d528c4e4df24994af94843799870d914ac71 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 14 Jan 2013 14:43:49 -0600 Subject: [PATCH 422/627] This changes Linux to control Wiimotes on the interrupt channel. Which in turn allows -TR wiimotes to work in Linux. --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 55 ++++++++++--------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 4 +- .../Core/Src/HW/WiimoteReal/WiimoteRealBase.h | 4 +- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index f56c11e248..134c27cb22 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -34,11 +34,6 @@ #include "WiimoteReal.h" #include "Host.h" -// Identify the wiimote device by its class -#define WM_DEV_CLASS_0 0x04 -#define WM_DEV_CLASS_1 0x25 -#define WM_DEV_CLASS_2 0x00 - namespace WiimoteReal { @@ -95,9 +90,15 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) // Display discovered devices for (i = 0; (i < found_devices) && (found_wiimotes < max_wiimotes); ++i) { - if ((scan_info[i].dev_class[0] == WM_DEV_CLASS_0) && - (scan_info[i].dev_class[1] == WM_DEV_CLASS_1) && - (scan_info[i].dev_class[2] == WM_DEV_CLASS_2)) + char name[1000]; + memset(name, 0, sizeof(name)); + ERROR_LOG(WIIMOTE, "found a device..."); + if (hci_read_remote_name(device_sock, &scan_info[i].bdaddr, sizeof(name), name, 0) < 0) { + ERROR_LOG(WIIMOTE, "name request failed"); + continue; + } + ERROR_LOG(WIIMOTE, "device name %s", name); + if (IsValidBluetoothName(name)) { bool new_wiimote = true; // Determine if this wiimote has already been found. @@ -146,24 +147,24 @@ bool Wiimote::Connect() // Output channel addr.l2_psm = htobs(WM_OUTPUT_CHANNEL); - if ((out_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(out_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + if ((cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || + connect(cmd_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open output socket to wiimote."); - close(out_sock); - out_sock = -1; + close(cmd_sock); + cmd_sock = -1; return false; } // Input channel addr.l2_psm = htobs(WM_INPUT_CHANNEL); - if ((in_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(in_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + if ((int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || + connect(int_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open input socket from wiimote."); - close(in_sock); - close(out_sock); - in_sock = out_sock = -1; + close(int_sock); + close(cmd_sock); + int_sock = cmd_sock = -1; return false; } @@ -204,17 +205,17 @@ void Wiimote::Close() { Host_ConnectWiimote(index, false); - close(out_sock); - close(in_sock); + close(cmd_sock); + close(int_sock); - out_sock = -1; - in_sock = -1; + cmd_sock = -1; + int_sock = -1; } } bool Wiimote::IsOpen() const { - return out_sock != -1 && in_sock != -1; + return cmd_sock != -1 && int_sock != -1; } int Wiimote::IORead(unsigned char *buf) @@ -226,19 +227,19 @@ int Wiimote::IORead(unsigned char *buf) fd_set fds; FD_ZERO(&fds); - FD_SET(in_sock, &fds); + FD_SET(int_sock, &fds); - if (select(in_sock + 1, &fds, NULL, NULL, &tv) == -1) + if (select(int_sock + 1, &fds, NULL, NULL, &tv) == -1) { ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1); return 0; } - if (!FD_ISSET(in_sock, &fds)) + if (!FD_ISSET(int_sock, &fds)) return 0; // Read the pending message into the buffer - int r = read(in_sock, buf, MAX_PAYLOAD); + int r = read(int_sock, buf, MAX_PAYLOAD); if (r == -1) { // Error reading data @@ -265,7 +266,7 @@ int Wiimote::IORead(unsigned char *buf) int Wiimote::IOWrite(unsigned char* buf, int len) { - return write(out_sock, buf, len); + return write(int_sock, buf, len); } }; // WiimoteReal diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 1f9285f37e..5565975ae5 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -44,7 +44,7 @@ Wiimote::Wiimote(const unsigned int _index) #ifdef __APPLE__ , inputlen(0) #elif defined(__linux__) && HAVE_BLUEZ - , out_sock(-1), in_sock(-1) + , cmd_sock(-1), int_sock(-1) #elif defined(_WIN32) , dev_handle(0), stack(MSBT_STACK_UNKNOWN) #endif diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 15c8044acd..f932e2bfd2 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -71,8 +71,8 @@ public: int inputlen; #elif defined(__linux__) && HAVE_BLUEZ bdaddr_t bdaddr; // Bluetooth address - int out_sock; // Output socket - int in_sock; // Input socket + int cmd_sock; // Command socket + int int_sock; // Interrupt socket void Close(); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h index 4b66eb4930..75a6d3e6a3 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h @@ -34,8 +34,8 @@ // The 4 most significant bits of the first byte of an outgoing command must be // 0x50 if sending on the command channel and 0xA0 if sending on the interrupt -// channel. On Mac we use interrupt channel; on Windows/Linux, command. -#ifndef __APPLE__ +// channel. On Mac and Linux we use interrupt channel; on Windows, command. +#ifdef _WIN32 #define WM_SET_REPORT 0x50 #else #define WM_SET_REPORT 0xA0 From 8cf3ea3eeaa92ae02b39a455cd4389b4b71844ef Mon Sep 17 00:00:00 2001 From: lioncash Date: Mon, 14 Jan 2013 16:29:52 -0500 Subject: [PATCH 423/627] GetTextureBGRA()'s 'width' and 'height' parameters should be unsigned. --- .../Plugin_VideoSoftware/Src/DebugUtil.cpp | 16 ++++++++++------ .../Plugins/Plugin_VideoSoftware/Src/DebugUtil.h | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp index 8ee2243719..57fc57a906 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp @@ -62,8 +62,8 @@ void SaveTexture(const char* filename, u32 texmap, s32 mip) TexImage0& ti0 = texUnit.texImage0[subTexmap]; - int width = ti0.width + 1; - int height = ti0.height + 1; + u32 width = ti0.width + 1; + u32 height = ti0.height + 1; u8 *data = new u8[width * height * 4]; @@ -74,19 +74,23 @@ void SaveTexture(const char* filename, u32 texmap, s32 mip) delete []data; } -void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, int width, int height) +void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height) { u8 sample[4]; - for (int y = 0; y < height; y++) - for (int x = 0; x < width; x++) { + for (u32 y = 0; y < height; y++) + { + for (u32 x = 0; x < width; x++) + { TextureSampler::SampleMip(x << 7, y << 7, mip, false, texmap, sample); - // rgba to bgra + + // RGBA to BGRA *(dst++) = sample[2]; *(dst++) = sample[1]; *(dst++) = sample[0]; *(dst++) = sample[3]; } + } } s32 GetMaxTextureLod(u32 texmap) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h index 4b2f0b86aa..efb104458d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h @@ -22,7 +22,7 @@ namespace DebugUtil { void Init(); - void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, int width, int height); + void GetTextureBGRA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height); void DumpActiveTextures(); From 032013c4bcbf4fa1451ea8be7c8c28f3200ae160 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 14 Jan 2013 17:49:49 -0600 Subject: [PATCH 424/627] Make IsValidBluetoothName just check for "Nintendo RVL-" rather than having a bunch of hardcoded names. --- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 19 ++++++------------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 5565975ae5..dc4e96785b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include +#include #include #include "Common.h" @@ -512,19 +513,11 @@ void StateChange(EMUSTATE_CHANGE newState) // TODO: disable/enable auto reporting, maybe } -bool IsValidBluetoothName(const char* name) { - static const char* kValidWiiRemoteBluetoothNames[] = { - "Nintendo RVL-CNT-01", - "Nintendo RVL-CNT-01-TR", - "Nintendo RVL-WBC-01", - }; - if (name == NULL) - return false; - for (size_t i = 0; i < ARRAYSIZE(kValidWiiRemoteBluetoothNames); i++) - if (strcmp(name, kValidWiiRemoteBluetoothNames[i]) == 0) - return true; - return false; +bool IsValidBluetoothName(const std::string& name) +{ + std::string const prefix("Nintendo RVL-"); + return name.size() > prefix.size() && + std::equal(prefix.begin(), prefix.end(), name.begin()); } - }; // end of namespace diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index f932e2bfd2..9fdb305a56 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -117,7 +117,7 @@ void StateChange(EMUSTATE_CHANGE newState); int FindWiimotes(Wiimote** wm, int max_wiimotes); -bool IsValidBluetoothName(const char* name); +bool IsValidBluetoothName(const std::string& name); }; // WiimoteReal From b8e66a48a1b0d6a7e167bdeb784b99515bccb4e9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 14 Jan 2013 17:55:23 -0600 Subject: [PATCH 425/627] Fix hang on Linux Dolphin close when wiimotes are connected. --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 134c27cb22..ec838d9313 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -215,7 +215,7 @@ void Wiimote::Close() bool Wiimote::IsOpen() const { - return cmd_sock != -1 && int_sock != -1; + return IsConnected() && cmd_sock != -1 && int_sock != -1; } int Wiimote::IORead(unsigned char *buf) From 6f17342b50bafc531d5005819b41dcafb3b5f545 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 14 Jan 2013 20:40:16 -0600 Subject: [PATCH 426/627] Improve an error message. --- Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index 22914366b0..ea23e532e7 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -205,8 +205,9 @@ void WiimoteConfigDiag::PairUpRealWiimotes(wxCommandEvent&) UpdateGUI(); } else if (paired < 0) - PanicAlertT("A supported bluetooth device was not found!\n" - "(Only the Microsoft bluetooth stack is supported.)"); + PanicAlertT("A supported bluetooth device could not be found!\n" + "If you are not using Microsoft's bluetooth stack " + "you must manually pair your wiimotes and use only the \"Refresh\" button."); } #endif From 86ee5600dc9f77bfef73f72b09e59ee3823c28a3 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 15 Jan 2013 22:27:49 +1300 Subject: [PATCH 427/627] Fix bug: reuse after free. static should not have been used here. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 49684ef5af..545002f914 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -787,9 +787,10 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } else { - static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); - bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; - for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) + CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); + size_t size = s_Usb->m_WiiMotes.size(); + bool* wiiMoteConnected = new bool[size]; + for (unsigned int i = 0; i < size; i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); std::string tContentFile(m_ContentFile.c_str()); From 6d4a566bc49ba29f52d58ec1bdbc020c67537bef Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 15 Jan 2013 22:29:26 +1100 Subject: [PATCH 428/627] Changed SoundTouch to use float samples, allowing SSE to be used. Made the DPL2 decoder disabled by default. Re-added the audio hack used by the Accurate VBeam emulation option. --- Externals/soundtouch/STTypes.h | 4 +-- Source/Core/AudioCommon/Src/OpenALStream.cpp | 35 ++++++++++++++------ Source/Core/Core/Src/ConfigManager.cpp | 2 +- Source/Core/Core/Src/CoreParameter.cpp | 4 +-- Source/Core/Core/Src/HW/SystemTimers.cpp | 3 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 1 + 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h index 28f0ee9110..9855939119 100644 --- a/Externals/soundtouch/STTypes.h +++ b/Externals/soundtouch/STTypes.h @@ -103,8 +103,8 @@ namespace soundtouch /// However, if you still prefer to select the sample format here /// also in GNU environment, then please #undef the INTEGER_SAMPLE /// and FLOAT_SAMPLE defines first as in comments above. - #define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples - //#define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples + //#define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples + #define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples #endif diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 94112c130d..489954e351 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -176,6 +176,7 @@ void OpenALStream::SoundLoop() soundTouch.setChannels(2); soundTouch.setSampleRate(ulFrequency); + soundTouch.setTempo(1.0); soundTouch.setSetting(SETTING_USE_QUICKSEEK, 0); soundTouch.setSetting(SETTING_USE_AA_FILTER, 0); soundTouch.setSetting(SETTING_SEQUENCE_MS, 1); @@ -197,7 +198,16 @@ void OpenALStream::SoundLoop() numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; numSamples = m_mixer->Mix(realtimeBuffer, numSamples); - soundTouch.putSamples(realtimeBuffer, numSamples); + + // Convert the samples from short to float + float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; + for (u32 i = 0; i < numSamples; ++i) + { + dest[i * 2 + 0] = (float)realtimeBuffer[i * 2 + 0] / (1 << 16); + dest[i * 2 + 1] = (float)realtimeBuffer[i * 2 + 1] / (1 << 16); + } + + soundTouch.putSamples(dest, numSamples); if (iBuffersProcessed == iBuffersFilled) { @@ -241,16 +251,8 @@ void OpenALStream::SoundLoop() #else if (surround_capable) { - // Convert the samples from short to float for the dpl2 decoder - float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; - for (u32 i = 0; i < nSamples; ++i) - { - dest[i * 2 + 0] = (float)sampleBuffer[i * 2 + 0] / (1<<16); - dest[i * 2 + 1] = (float)sampleBuffer[i * 2 + 1] / (1<<16); - } - float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS]; - dpl2decode(dest, nSamples, dpl2); + dpl2decode(sampleBuffer, nSamples, dpl2); alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency); ALenum err = alGetError(); @@ -268,7 +270,18 @@ void OpenALStream::SoundLoop() #endif if (!surround_capable) { - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, sampleBuffer, nSamples * 2 * 2, ulFrequency); +#if defined(__APPLE__) + // Convert the samples from float to short + short stereo[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; + for (u32 i = 0; i < nSamples; ++i) + { + stereo[i * 2 + 0] = (short)((float)sampleBuffer[i * 2 + 0] * (1 << 16)); + stereo[i * 2 + 1] = (short)((float)sampleBuffer[i * 2 + 1] * (1 << 16)); + } + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * 2 * 2, ulFrequency); +#else + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency); +#endif } alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 210769c8a5..3bec0a8df3 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -369,7 +369,7 @@ void SConfig::LoadSettings() ini.Get("Core", "Apploader", &m_LocalCoreStartupParameter.m_strApploader); ini.Get("Core", "EnableCheats", &m_LocalCoreStartupParameter.bEnableCheats, false); ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); - ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, true); + ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, false); ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 14); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index b8294ce815..d44bd136f7 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -49,7 +49,7 @@ SCoreStartupParameter::SCoreStartupParameter() bEnableCheats(false), bMergeBlocks(false), bRunCompareServer(false), bRunCompareClient(false), - bDPL2Decoder(true), iLatency(14), + bDPL2Decoder(false), iLatency(14), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), @@ -85,7 +85,7 @@ void SCoreStartupParameter::LoadDefaults() bMergeBlocks = false; SelectedLanguage = 0; bWii = false; - bDPL2Decoder = true; + bDPL2Decoder = false; iLatency = 14; iPosX = 100; diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index b520c51b39..b9f9fe0107 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -160,7 +160,8 @@ void DSPCallback(u64 userdata, int cyclesLate) void AudioDMACallback(u64 userdata, int cyclesLate) { - int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32); + int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.bVBeam?2:1; + int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32 * fields); DSP::UpdateAudioDMA(); // Push audio to speakers. CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA); } diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ddc8025d88..687176ce0d 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -366,6 +366,7 @@ void CConfigMain::InitializeGUIValues() VolumeText->SetLabel(wxString::Format(wxT("%d %%"), ac_Config.m_Volume)); DSPThread->SetValue(startup_params.bDSPThread); DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); + DPL2Decoder->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); DPL2Decoder->SetValue(startup_params.bDPL2Decoder); LatencySlider->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); LatencySlider->SetValue(startup_params.iLatency); From 799b032b98000f2a7ada1a11ab8a001eb0c58882 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 15 Jan 2013 23:14:11 +1100 Subject: [PATCH 429/627] Readd the OpenAL option. The OpenAL backend requires OpenAL Soft to be installed: http://kcat.strangesoft.net/openal.html You may need to rename soft_oal.dll to OpenAL32.dll in the Dolphin folder. Windows users may also need to update their OpenAL drivers by downloading them from http://connect.creativelabs.com/openal/Downloads/oalinst.zip --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 5660edca0a..99ae42b93a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -110,6 +110,8 @@ namespace AudioCommon backends.push_back(BACKEND_COREAUDIO); if (PulseAudio::isValid()) backends.push_back(BACKEND_PULSEAUDIO); + if (OpenALStream::isValid()) + backends.push_back(BACKEND_OPENAL); return backends; } From e75a7b4572967a60fd5130ac3409c28b79a62580 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 15 Jan 2013 06:41:11 -0600 Subject: [PATCH 430/627] Fix a gcc initialization order warning. --- Source/Core/Core/Src/CoreParameter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 35f5afa57a..75b613d229 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -47,8 +47,8 @@ SCoreStartupParameter::SCoreStartupParameter() bSkipIdle(true), bNTSC(false), bForceNTSCJ(false), bHLE_BS2(true), bEnableCheats(false), bMergeBlocks(false), - bRunCompareServer(false), bRunCompareClient(false), bDPL2Decoder(false), iLatency(14), + bRunCompareServer(false), bRunCompareClient(false), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), From a9388ce2e2b7d235cc943f19e16bdccf99cb68b3 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 16 Jan 2013 00:10:49 +1100 Subject: [PATCH 431/627] Added backwards compatibility with old OpenAL drivers. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 40 +++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 489954e351..25bece8e8d 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -184,6 +184,11 @@ void OpenALStream::SoundLoop() soundTouch.setSetting(SETTING_OVERLAP_MS, 12); bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder; +#if defined(__APPLE__) + bool float32_capable = false; +#else + bool float32_capable = true; +#endif while (!threadData) { @@ -270,18 +275,33 @@ void OpenALStream::SoundLoop() #endif if (!surround_capable) { -#if defined(__APPLE__) - // Convert the samples from float to short - short stereo[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; - for (u32 i = 0; i < nSamples; ++i) + if (float32_capable) { - stereo[i * 2 + 0] = (short)((float)sampleBuffer[i * 2 + 0] * (1 << 16)); - stereo[i * 2 + 1] = (short)((float)sampleBuffer[i * 2 + 1] * (1 << 16)); + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency); + ALenum err = alGetError(); + if (err == AL_INVALID_ENUM) + { + float32_capable = false; + } + else if (err != 0) + { + ERROR_LOG(AUDIO, "Error occurred while buffering float32 data: %08x", err); + } + + } + + if (!float32_capable) + { + // Convert the samples from float to short + short stereo[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS]; + for (u32 i = 0; i < nSamples; ++i) + { + stereo[i * 2 + 0] = (short)((float)sampleBuffer[i * 2 + 0] * (1 << 16)); + stereo[i * 2 + 1] = (short)((float)sampleBuffer[i * 2 + 1] * (1 << 16)); + } + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * 2 * 2, ulFrequency); + } - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * 2 * 2, ulFrequency); -#else - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency); -#endif } alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); From 7402a89e6e07ae2001e66e8a61cd7c6bf1700832 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 16 Jan 2013 00:14:31 +1100 Subject: [PATCH 432/627] OSX build fix --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 25bece8e8d..cfe6a40630 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -275,6 +275,7 @@ void OpenALStream::SoundLoop() #endif if (!surround_capable) { +#if !defined(__APPLE__) if (float32_capable) { alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency); @@ -289,7 +290,7 @@ void OpenALStream::SoundLoop() } } - +#endif if (!float32_capable) { // Convert the samples from float to short From 866cdc5961590e3a17cf3d6f753fb96c6b66dc9e Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 15 Jan 2013 12:00:35 -0500 Subject: [PATCH 433/627] Get rid of unused iterators in JitCache. --- .../Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 496ddebf7a..a8cc0e9b46 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -370,29 +370,27 @@ bool JitBlock::ContainsAddress(u32 em_address) { LinkBlockExits(i); JitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; // equal_range(b) returns pair representing the range // of element with key b ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { - // PanicAlert("Linking block %i to block %i", iter2->second, i); - LinkBlockExits(iter2->second); + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { + // PanicAlert("Linking block %i to block %i", iter->second, i); + LinkBlockExits(iter->second); } } void JitBlockCache::UnlinkBlock(int i) { JitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { - JitBlock &sourceBlock = blocks[iter2->second]; + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { + JitBlock &sourceBlock = blocks[iter->second]; for (int e = 0; e < 2; e++) { if (sourceBlock.exitAddress[e] == b.originalAddress) @@ -458,7 +456,7 @@ bool JitBlock::ContainsAddress(u32 em_address) // !! this works correctly under assumption that any two overlapping blocks end at the same address if (destroy_block) { - std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1, it; + std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1; while (it2 != block_map.end() && it2->first.second < pAddr + length) { #ifdef JIT_UNLIMITED_ICACHE From 1cf7cbb936a47d305f5d82e75f2f6f57c8553a8a Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 15 Jan 2013 12:47:13 -0500 Subject: [PATCH 434/627] Fix a clear bug in aldlist.cpp. Properly clears itself now. --- Source/Core/AudioCommon/Src/aldlist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp index 69d42148ae..5e2e072f7b 100644 --- a/Source/Core/AudioCommon/Src/aldlist.cpp +++ b/Source/Core/AudioCommon/Src/aldlist.cpp @@ -48,7 +48,7 @@ ALDeviceList::ALDeviceList() const char *actualDeviceName = NULL; // DeviceInfo vector stores, for each enumerated device, it's device name, selection status, spec version #, and extension support - vDeviceInfo.empty(); + vDeviceInfo.clear(); vDeviceInfo.reserve(10); defaultDeviceIndex = 0; @@ -151,7 +151,7 @@ ALDeviceList::~ALDeviceList() } } - vDeviceInfo.empty(); + vDeviceInfo.clear(); } /* From d9aecd80b1b5b9141ad08032c05995475845ca17 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 15 Jan 2013 15:20:33 -0600 Subject: [PATCH 435/627] Real fix for Linux Wiimote disconnect hanging. Fixes issue 5903. --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index dc4e96785b..2381793f30 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -320,7 +320,7 @@ void Wiimote::ThreadFunc() Common::SleepCurrentThread(1); #else bool read = false; - while (Write() || (read = true, Read())) + while (Write() || (read = true, IsOpen() && Read())) { if (m_audio_reports.Size() && !read) Read(); From 7d11f8cedd7c135d96880f19ecbd3ff87a60a11f Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 15 Jan 2013 17:50:50 -0500 Subject: [PATCH 436/627] - Made GenRandomCode's 'size' parameter unsigned. Doesn't make sense to have the capability of being able to be negative. - Made CodesToHeader's 'numCodes' unsigned for the same reason. - Removed some type-casts from other functions. --- Source/Core/Core/Src/DSP/DSPCodeUtil.cpp | 22 +++++++++++----------- Source/Core/Core/Src/DSP/DSPCodeUtil.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp index ca9c01d5dc..7f2cc8e2e6 100644 --- a/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp @@ -104,10 +104,10 @@ bool Compare(const std::vector &code1, const std::vector &code2) return code1.size() == code2.size() && code1.size() == count_equal; } -void GenRandomCode(int size, std::vector &code) +void GenRandomCode(u32 size, std::vector &code) { code.resize(size); - for (int i = 0; i < size; i++) + for (u32 i = 0; i < size; i++) { code[i] = rand() ^ (rand() << 8); } @@ -144,28 +144,28 @@ void CodeToHeader(const std::vector &code, std::string _filename, } void CodesToHeader(const std::vector *codes, const std::vector* filenames, - int numCodes, const char *name, std::string &header) + u32 numCodes, const char *name, std::string &header) { std::vector > codes_padded; char buffer[1024]; - int reserveSize = 0; - for(int i = 0; i < numCodes; i++) + u32 reserveSize = 0; + for(u32 i = 0; i < numCodes; i++) { codes_padded.push_back(codes[i]); // Pad with nops to 32byte boundary while (codes_padded.at(i).size() & 0x7f) codes_padded.at(i).push_back(0); - reserveSize += (int)codes_padded.at(i).size(); + reserveSize += (u32)codes_padded.at(i).size(); } header.clear(); header.reserve(reserveSize * 4); - sprintf(buffer, "#define NUM_UCODES %d\n\n", numCodes); + sprintf(buffer, "#define NUM_UCODES %u\n\n", numCodes); header.append(buffer); header.append("const char* UCODE_NAMES[NUM_UCODES] = {\n"); - for (int i = 0; i < numCodes; i++) + for (u32 i = 0; i < numCodes; i++) { std::string filename; if (! SplitPath(filenames->at(i), NULL, &filename, NULL)) @@ -176,7 +176,7 @@ void CodesToHeader(const std::vector *codes, const std::vector header.append("};\n\n"); header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n"); - for(int i = 0; i < numCodes; i++) + for(u32 i = 0; i < numCodes; i++) { if(codes[i].size() == 0) continue; @@ -197,7 +197,7 @@ void CodesToHeader(const std::vector *codes, const std::vector void CodeToBinaryStringBE(const std::vector &code, std::string &str) { str.resize(code.size() * 2); - for (int i = 0; i < (int)code.size(); i++) + for (size_t i = 0; i < code.size(); i++) { str[i * 2 + 0] = code[i] >> 8; str[i * 2 + 1] = code[i] & 0xff; @@ -207,7 +207,7 @@ void CodeToBinaryStringBE(const std::vector &code, std::string &str) void BinaryStringBEToCode(const std::string &str, std::vector &code) { code.resize(str.size() / 2); - for (int i = 0; i < (int)code.size(); i++) + for (size_t i = 0; i < code.size(); i++) { code[i] = ((u16)(u8)str[i * 2 + 0] << 8) | ((u16)(u8)str[i * 2 + 1]); } diff --git a/Source/Core/Core/Src/DSP/DSPCodeUtil.h b/Source/Core/Core/Src/DSP/DSPCodeUtil.h index 2a2ebfb228..525e21a9fb 100644 --- a/Source/Core/Core/Src/DSP/DSPCodeUtil.h +++ b/Source/Core/Core/Src/DSP/DSPCodeUtil.h @@ -26,11 +26,11 @@ bool Assemble(const char *text, std::vector &code, bool force = false); bool Disassemble(const std::vector &code, bool line_numbers, std::string &text); bool Compare(const std::vector &code1, const std::vector &code2); -void GenRandomCode(int size, std::vector &code); +void GenRandomCode(u32 size, std::vector &code); void CodeToHeader(const std::vector &code, std::string _filename, const char *name, std::string &header); void CodesToHeader(const std::vector *codes, const std::vector *filenames, - int numCodes, const char *name, std::string &header); + u32 numCodes, const char *name, std::string &header); // Big-endian, for writing straight to file using File::WriteStringToFile. void CodeToBinaryStringBE(const std::vector &code, std::string &str); From 6612763a9a98bd7f371b13beda654c34ffd4d81d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 15 Jan 2013 19:56:08 -0600 Subject: [PATCH 437/627] Change audio latency setting to a wxSpinCtrl, fixes layout problem on linux. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 28 ++++++++++-------------- Source/Core/DolphinWX/Src/ConfigMain.h | 3 +-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 03f3a7af11..ef907842dd 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -120,7 +120,6 @@ EVT_CHECKBOX(ID_DSPTHREAD, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DUMP_AUDIO, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_DPL2DECODER, CConfigMain::AudioSettingsChanged) -EVT_SLIDER(ID_LATENCY, CConfigMain::AudioSettingsChanged) EVT_CHOICE(ID_BACKEND, CConfigMain::AudioSettingsChanged) EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) @@ -217,7 +216,7 @@ void CConfigMain::UpdateGUI() DSPEngine->Disable(); DSPThread->Disable(); DPL2Decoder->Disable(); - LatencySlider->Disable(); + Latency->Disable(); // Disable stuff on GamecubePage GCSystemLang->Disable(); @@ -365,9 +364,8 @@ void CConfigMain::InitializeGUIValues() DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); DPL2Decoder->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); DPL2Decoder->SetValue(startup_params.bDPL2Decoder); - LatencySlider->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); - LatencySlider->SetValue(startup_params.iLatency); - LatencyText->SetLabel(wxString::Format(wxT("%d"), startup_params.iLatency)); + Latency->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); + Latency->SetValue(startup_params.iLatency); // add backends to the list AddAudioBackends(); @@ -525,7 +523,7 @@ void CConfigMain::InitializeGUITooltips() DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work.")); #endif - LatencySlider->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only.")); + Latency->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only.")); } void CConfigMain::CreateGUIControls() @@ -630,14 +628,14 @@ void CConfigMain::CreateGUIControls() wxDefaultPosition, wxDefaultSize, 0); BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString); - LatencySlider = new wxSlider(AudioPage, ID_LATENCY, 0, 0, 30, - wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL); - LatencyText = new wxStaticText(AudioPage, wxID_ANY, wxT(""), - wxDefaultPosition, wxDefaultSize, 0); + Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, + wxSP_ARROW_KEYS, 0, 30); + + Latency->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &CConfigMain::AudioSettingsChanged, this); if (Core::GetState() != Core::CORE_UNINITIALIZED) { - LatencySlider->Disable(); + Latency->Disable(); BackendSelection->Disable(); DPL2Decoder->Disable(); } @@ -657,8 +655,7 @@ void CConfigMain::CreateGUIControls() sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); sBackend->Add(TEXT_BOX(AudioPage, _("Latency:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); - sBackend->Add(LatencySlider, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); - sBackend->Add(LatencyText, wxGBPosition(1, 2), wxDefaultSpan, wxALL, 5); + sBackend->Add(Latency, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings")); sbBackend->Add(sBackend, 0, wxEXPAND); @@ -945,15 +942,14 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) case ID_BACKEND: VolumeSlider->Enable(SupportsVolumeChanges(std::string(BackendSelection->GetStringSelection().mb_str()))); - LatencySlider->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); + Latency->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); DPL2Decoder->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); ac_Config.sBackend = BackendSelection->GetStringSelection().mb_str(); ac_Config.Update(); break; case ID_LATENCY: - SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = LatencySlider->GetValue(); - LatencyText->SetLabel(wxString::Format(wxT("%d"), LatencySlider->GetValue())); + SConfig::GetInstance().m_LocalCoreStartupParameter.iLatency = Latency->GetValue(); break; default: diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 6f7a5b83b8..68459d1770 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -159,8 +159,7 @@ private: wxCheckBox* DPL2Decoder; wxArrayString wxArrayBackends; wxChoice* BackendSelection; - wxSlider* LatencySlider; - wxStaticText* LatencyText; + wxSpinCtrl* Latency; // Interface wxCheckBox* ConfirmStop; From ddf23094c299cb061baaa7a110ecb7413130d094 Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 15 Jan 2013 21:15:31 -0500 Subject: [PATCH 438/627] Fix two unsigned/signed mismatch warnings. --- Source/Core/VideoCommon/Src/BPStructs.cpp | 2 +- Source/Core/VideoCommon/Src/LightingShaderGen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index c975b12240..9ba2afbbd1 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -517,7 +517,7 @@ void BPWritten(const BPCmd& bp) // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; - for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp index a506acadfc..f32e5dfeee 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp @@ -23,7 +23,7 @@ int GetLightingShaderId(u32* out) { - for (int i = 0; i < xfregs.numChan.numColorChans; ++i) + for (u32 i = 0; i < xfregs.numChan.numColorChans; ++i) { out[i] = xfregs.color[i].enablelighting ? (u32)xfregs.color[i].hex : From b2acae44b780ecf86ffb88cd32861edb25642e20 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 15 Jan 2013 21:15:54 -0600 Subject: [PATCH 439/627] Real wiimote continuous scanning working on Linux. Windows and OS X totally broken from various refactoring. --- Source/Core/Core/Src/HW/Wiimote.h | 2 +- .../Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 2 +- .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 2 +- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 229 ++++++------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 312 ++++++++++++------ .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 73 +++- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 16 +- 7 files changed, 370 insertions(+), 266 deletions(-) diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h index 5e0ab8d05e..d514cf9909 100644 --- a/Source/Core/Core/Src/HW/Wiimote.h +++ b/Source/Core/Core/Src/HW/Wiimote.h @@ -38,7 +38,7 @@ void Update(int _number); namespace WiimoteReal { -unsigned int Initialize(); +void Initialize(); void Shutdown(); void Refresh(); diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index 5c34fff9ac..cfb81bb768 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -248,7 +248,7 @@ void Wiimote::RequestStatus(const wm_request_status* const rs) { using namespace WiimoteReal; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[m_index]) { diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index b7652e973a..30fad4b458 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -685,7 +685,7 @@ void Wiimote::Update() { using namespace WiimoteReal; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[m_index]) { Report rpt = g_wiimotes[m_index]->ProcessReadQueue(); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index ec838d9313..82630aaebb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -15,16 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include -#include - -#include -#include -#include -#include -#include -#include - #include #include #include @@ -32,114 +22,117 @@ #include "Common.h" #include "WiimoteReal.h" -#include "Host.h" namespace WiimoteReal { +WiimoteScanner::WiimoteScanner() + : run_thread() + , want_wiimotes() + , device_id(-1) + , device_sock(-1) +{ + // Get the id of the first bluetooth device. + device_id = hci_get_route(NULL); + if (device_id < 0) + { + NOTICE_LOG(WIIMOTE, "Bluetooth not found."); + return; + } + + // Create a socket to the device + device_sock = hci_open_dev(device_id); + if (device_sock < 0) + { + ERROR_LOG(WIIMOTE, "Unable to open bluetooth."); + return; + } +} + +bool WiimoteScanner::IsReady() const +{ + return device_sock > 0; +} + +WiimoteScanner::~WiimoteScanner() +{ + if (IsReady()) + close(device_sock); +} + // Find wiimotes. // Does not replace already found wiimotes even if they are disconnected. // wm is an array of max_wiimotes wiimotes // Returns the total number of found wiimotes. -int FindWiimotes(Wiimote** wm, int max_wiimotes) +std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { - int device_id; - int device_sock; - int found_devices; - int found_wiimotes = 0; - int i; + std::vector found_wiimotes; - // Count the number of already found wiimotes - for (i = 0; i < MAX_WIIMOTES; ++i) - { - if (wm[i]) - found_wiimotes++; - } + // supposedly 1.28 seconds + int const wait_len = 1; - // Get the id of the first bluetooth device. - if ((device_id = hci_get_route(NULL)) < 0) + int const max_infos = 255; + inquiry_info scan_infos[max_infos] = {}; + auto* scan_infos_ptr = scan_infos; + + // Scan for bluetooth devices + int const found_devices = hci_inquiry(device_id, wait_len, max_infos, NULL, &scan_infos_ptr, IREQ_CACHE_FLUSH); + if (found_devices < 0) { - NOTICE_LOG(WIIMOTE, "Bluetooth not found."); + ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices."); return found_wiimotes; } - // Create a socket to the device - if ((device_sock = hci_open_dev(device_id)) < 0) - { - ERROR_LOG(WIIMOTE, "Unable to open bluetooth."); - return found_wiimotes; - } + DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices); - int try_num = 0; - while ((try_num < 5) && (found_wiimotes < max_wiimotes)) + // Display discovered devices + for (int i = 0; (i < found_devices) && (found_wiimotes.size() < max_wiimotes); ++i) { - inquiry_info scan_info_arr[128]; - inquiry_info* scan_info = scan_info_arr; - memset(&scan_info_arr, 0, sizeof(scan_info_arr)); - - // Scan for bluetooth devices for approximately one second - found_devices = hci_inquiry(device_id, 1, 128, NULL, &scan_info, IREQ_CACHE_FLUSH); - if (found_devices < 0) + ERROR_LOG(WIIMOTE, "found a device..."); + + // BT names are a maximum of 248 bytes apparently + char name[255] = {}; + if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 0) < 0) { - ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices."); - return found_wiimotes; + ERROR_LOG(WIIMOTE, "name request failed"); + continue; } - DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices); - - // Display discovered devices - for (i = 0; (i < found_devices) && (found_wiimotes < max_wiimotes); ++i) + ERROR_LOG(WIIMOTE, "device name %s", name); + if (IsValidBluetoothName(name)) { - char name[1000]; - memset(name, 0, sizeof(name)); - ERROR_LOG(WIIMOTE, "found a device..."); - if (hci_read_remote_name(device_sock, &scan_info[i].bdaddr, sizeof(name), name, 0) < 0) { - ERROR_LOG(WIIMOTE, "name request failed"); - continue; - } - ERROR_LOG(WIIMOTE, "device name %s", name); - if (IsValidBluetoothName(name)) + bool new_wiimote = true; + + // TODO: do this + + // Determine if this wiimote has already been found. + //for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j) + //{ + // if (wm[j] && bacmp(&scan_infos[i].bdaddr,&wm[j]->bdaddr) == 0) + // new_wiimote = false; + //} + + if (new_wiimote) { - bool new_wiimote = true; - // Determine if this wiimote has already been found. - for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j) - { - if (wm[j] && bacmp(&scan_info[i].bdaddr,&wm[j]->bdaddr) == 0) - new_wiimote = false; - } + // Found a new device + char bdaddr_str[18] = {}; + ba2str(&scan_infos[i].bdaddr, bdaddr_str); - if (new_wiimote) - { - // Find an unused slot - unsigned int k = 0; - for (; k < MAX_WIIMOTES && !(WIIMOTE_SRC_REAL & g_wiimote_sources[k] && !wm[k]); ++k); - wm[k] = new Wiimote(k); - - // Found a new device - char bdaddr_str[18]; - ba2str(&scan_info[i].bdaddr, bdaddr_str); - - NOTICE_LOG(WIIMOTE, "Found wiimote %i, (%s).", - wm[k]->index + 1, bdaddr_str); - - wm[k]->bdaddr = scan_info[i].bdaddr; - ++found_wiimotes; - } + auto* const wm = new Wiimote; + wm->bdaddr = scan_infos[i].bdaddr; + found_wiimotes.push_back(wm); + + NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str); } } - try_num++; } - close(device_sock); return found_wiimotes; } // Connect to a wiimote with a known address. -bool Wiimote::Connect() +bool Wiimote::Open() { - if (IsConnected()) - return false; - sockaddr_l2 addr; addr.l2_family = AF_BLUETOOTH; addr.l2_bdaddr = bdaddr; @@ -148,7 +141,7 @@ bool Wiimote::Connect() // Output channel addr.l2_psm = htobs(WM_OUTPUT_CHANNEL); if ((cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(cmd_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + connect(cmd_sock, (sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open output socket to wiimote."); close(cmd_sock); @@ -159,7 +152,7 @@ bool Wiimote::Connect() // Input channel addr.l2_psm = htobs(WM_INPUT_CHANNEL); if ((int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 || - connect(int_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) + connect(int_sock, (sockaddr*)&addr, sizeof(addr)) < 0) { DEBUG_LOG(WIIMOTE, "Unable to open input socket from wiimote."); close(int_sock); @@ -168,57 +161,37 @@ bool Wiimote::Connect() return false; } - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); - - m_connected = true; - - // Do the handshake - Handshake(); - - // Set LEDs - SetLEDs(WIIMOTE_LED_1 << index); - - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); - return true; } -// Disconnect a wiimote. -void Wiimote::RealDisconnect() +void Wiimote::StartThread() { - if (!IsConnected()) - return; - - NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i.", index + 1); - - m_connected = false; + m_run_thread = true; + m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); +} +void Wiimote::StopThread() +{ + m_run_thread = false; if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); - - Close(); } void Wiimote::Close() { - if (IsOpen()) - { - Host_ConnectWiimote(index, false); + close(cmd_sock); + close(int_sock); - close(cmd_sock); - close(int_sock); - - cmd_sock = -1; - int_sock = -1; - } + cmd_sock = -1; + int_sock = -1; } bool Wiimote::IsOpen() const { - return IsConnected() && cmd_sock != -1 && int_sock != -1; + return cmd_sock != -1;// && int_sock != -1; } -int Wiimote::IORead(unsigned char *buf) +int Wiimote::IORead(u8* buf) { // Block select for 1/2000th of a second timeval tv; @@ -232,11 +205,11 @@ int Wiimote::IORead(unsigned char *buf) if (select(int_sock + 1, &fds, NULL, NULL, &tv) == -1) { ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1); - return 0; + return -1; } if (!FD_ISSET(int_sock, &fds)) - return 0; + return -1; // Read the pending message into the buffer int r = read(int_sock, buf, MAX_PAYLOAD); @@ -250,21 +223,15 @@ int Wiimote::IORead(unsigned char *buf) // This can happen if the bluetooth dongle is disconnected ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected. " "Wiimote %i will be disconnected.", index + 1); - Close(); } - return 0; - } - else if (!r) - { - // Disconnect - Close(); + r = 0; } return r; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::IOWrite(u8 const* buf, int len) { return write(int_sock, buf, len); } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 2381793f30..2735c1a312 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -23,6 +23,7 @@ #include "IniFile.h" #include "StringUtil.h" #include "Timer.h" +#include "Host.h" #include "WiimoteReal.h" @@ -33,15 +34,20 @@ unsigned int g_wiimote_sources[MAX_WIIMOTES]; namespace WiimoteReal { +void HandleFoundWiimotes(const std::vector&); +void HandleWiimoteConnect(Wiimote*); +void HandleWiimoteDisconnect(int index); + bool g_real_wiimotes_initialized = false; -unsigned int g_wiimotes_found = 0; -std::mutex g_refresh_lock; +std::recursive_mutex g_refresh_lock; -Wiimote *g_wiimotes[MAX_WIIMOTES]; +Wiimote* g_wiimotes[MAX_WIIMOTES]; -Wiimote::Wiimote(const unsigned int _index) - : index(_index) +WiimoteScanner g_wiimote_scanner; + +Wiimote::Wiimote() + : index() #ifdef __APPLE__ , inputlen(0) #elif defined(__linux__) && HAVE_BLUEZ @@ -49,8 +55,8 @@ Wiimote::Wiimote(const unsigned int _index) #elif defined(_WIN32) , dev_handle(0), stack(MSBT_STACK_UNKNOWN) #endif - , leds(0), m_last_data_report(Report((u8 *)NULL, 0)) - , m_channel(0), m_connected(false) + , m_last_data_report(Report((u8 *)NULL, 0)) + , m_channel(0), m_run_thread(false) { #if defined(__linux__) && HAVE_BLUEZ bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; @@ -61,8 +67,11 @@ Wiimote::Wiimote(const unsigned int _index) Wiimote::~Wiimote() { - RealDisconnect(); + StopThread(); + if (IsOpen()) + Close(); + ClearReadQueue(); // clear write queue @@ -111,7 +120,7 @@ void Wiimote::ControlChannel(const u16 channel, const void* const data, const u3 { // Check for custom communication if (99 == channel) - Disconnect(); + EmuStop(); else { InterruptChannel(channel, data, size); @@ -168,6 +177,9 @@ bool Wiimote::Read() rpt.first = new unsigned char[MAX_PAYLOAD]; rpt.second = IORead(rpt.first); + if (0 == rpt.second) + Close(); + if (rpt.second > 0 && m_channel > 0) { // Add it to queue m_read_reports.Push(rpt); @@ -234,24 +246,18 @@ void Wiimote::Update() delete[] rpt.first; } -void Wiimote::Disconnect() +void Wiimote::EmuStop() { m_channel = 0; DisableDataReporting(); -} -bool Wiimote::IsConnected() const -{ - return m_connected; + NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting"); } // Rumble briefly void Wiimote::Rumble() { - if (!IsConnected()) - return; - unsigned char buffer = 0x01; DEBUG_LOG(WIIMOTE, "Starting rumble..."); SendRequest(WM_CMD_RUMBLE, &buffer, 1); @@ -264,37 +270,29 @@ void Wiimote::Rumble() } // Set the active LEDs. -// leds is a bitwise or of WIIMOTE_LED_1 through WIIMOTE_LED_4. +// leds is a bitwise OR of WIIMOTE_LED_1 through WIIMOTE_LED_4. void Wiimote::SetLEDs(int new_leds) { - unsigned char buffer; - - if (!IsConnected()) - return; - // Remove the lower 4 bits because they control rumble - buffer = leds = (new_leds & 0xF0); - + u8 const buffer = (new_leds & 0xF0); SendRequest(WM_CMD_LED, &buffer, 1); } -// Send a handshake -bool Wiimote::Handshake() +bool Wiimote::EmuStart() { + // Send a handshake + // Set buffer[0] to 0x04 for continuous reporting - unsigned char buffer[2] = {0x04, 0x30}; + u8 const buffer[2] = {0x04, 0x30}; - if (!IsConnected()) - return 0; - - DEBUG_LOG(WIIMOTE, "Sending handshake to wiimote"); + NOTICE_LOG(WIIMOTE, "Sending handshake to wiimote"); return SendRequest(WM_CMD_REPORT_TYPE, buffer, 2); } // Send a packet to the wiimote. // report_type should be one of WIIMOTE_CMD_LED, WIIMOTE_CMD_RUMBLE, etc. -bool Wiimote::SendRequest(unsigned char report_type, unsigned char* data, int length) +bool Wiimote::SendRequest(u8 report_type, u8 const* data, int length) { unsigned char buffer[32] = {WM_SET_REPORT | WM_BT_OUTPUT, report_type}; @@ -303,59 +301,99 @@ bool Wiimote::SendRequest(unsigned char report_type, unsigned char* data, int le return (IOWrite(buffer, length + 2) != 0); } +unsigned int CalculateWantedWiimotes() +{ + // Figure out how many real wiimotes are required + unsigned int wanted_wiimotes = 0; + for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i]) + ++wanted_wiimotes; + + return wanted_wiimotes; +} + +void WiimoteScanner::WantWiimotes(size_t count) +{ + want_wiimotes = count; +} + +void WiimoteScanner::StartScanning() +{ + run_thread = true; + scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); +} + +void WiimoteScanner::StopScanning() +{ + run_thread = false; + if (scan_thread.joinable()) + { + scan_thread.join(); + NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped"); + } +} + +void WiimoteScanner::ThreadFunc() +{ + Common::SetCurrentThreadName("Wiimote Scanning Thread"); + + NOTICE_LOG(WIIMOTE, "Wiimote scanning has started"); + + while (run_thread) + { + auto const found_wiimotes = FindWiimotes(want_wiimotes); + HandleFoundWiimotes(found_wiimotes); +#if 1 + { + // TODO: this code here is ugly + std::lock_guard lk(g_refresh_lock); + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + if (g_wiimotes[i] && !g_wiimotes[i]->IsOpen()) + HandleWiimoteDisconnect(i); + } +#endif + //std::this_thread::yield(); + Common::SleepCurrentThread(500); + } +} + void Wiimote::ThreadFunc() { - char thname[] = "Wiimote # Thread"; - thname[8] = (char)('1' + index); - Common::SetCurrentThreadName(thname); + Common::SetCurrentThreadName("Wiimote Device Thread"); // rumble briefly Rumble(); // main loop - while (IsOpen()) + while (m_run_thread && IsOpen()) { #ifdef __APPLE__ while (Write()) {} Common::SleepCurrentThread(1); #else - bool read = false; - while (Write() || (read = true, IsOpen() && Read())) + // TODO: this is all a mess + while (m_run_thread && IsOpen()) { - if (m_audio_reports.Size() && !read) - Read(); - Common::SleepCurrentThread(m_audio_reports.Size() ? 5 : 2); - read = false; + bool const did_write = Write(); + + if (did_write) + break; + else + if (!Read()) + break; + + // TODO: what is this doing? + //if (m_audio_reports.Size() && did_write) + // Read(); + + // TODO: make work well + //Common::SleepCurrentThread(m_audio_reports.Size() ? 5 : 2); + Common::SleepCurrentThread(2); } #endif } } -#ifndef _WIN32 -// Connect all discovered wiimotes -// Return the number of wiimotes that successfully connected. -static int ConnectWiimotes(Wiimote** wm) -{ - int connected = 0; - - for (int i = 0; i < MAX_WIIMOTES; ++i) - { - if (!wm[i] || wm[i]->IsConnected()) - continue; - - if (wm[i]->Connect()) - ++connected; - else - { - delete wm[i]; - wm[i] = NULL; - } - } - - return connected; -} -#endif - void LoadSettings() { std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + WIIMOTE_INI_NAME ".ini"; @@ -373,71 +411,124 @@ void LoadSettings() } } -unsigned int Initialize() +void Initialize() { - // Return if already initialized + NOTICE_LOG(WIIMOTE, "WiimoteReal::Initialize"); + + std::lock_guard lk(g_refresh_lock); + if (g_real_wiimotes_initialized) - return g_wiimotes_found; + return; - memset(g_wiimotes, 0, sizeof(g_wiimotes)); + auto const wanted_wiimotes = CalculateWantedWiimotes(); + g_wiimote_scanner.WantWiimotes(wanted_wiimotes); - // Only call FindWiimotes with the number of slots configured for real wiimotes - unsigned int wanted_wiimotes = 0; - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]) - ++wanted_wiimotes; + //if (wanted_wiimotes > 0) + g_wiimote_scanner.StartScanning(); - // Don't bother initializing if we don't want any real wiimotes - if (0 == wanted_wiimotes) - { - g_wiimotes_found = 0; - return 0; - } - - // Initialized g_real_wiimotes_initialized = true; - - g_wiimotes_found = FindWiimotes(g_wiimotes, wanted_wiimotes); - - DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted", - g_wiimotes_found, wanted_wiimotes); - -#ifndef _WIN32 - atexit(WiimoteReal::Shutdown); - g_wiimotes_found = ConnectWiimotes(g_wiimotes); -#endif - - DEBUG_LOG(WIIMOTE, "Connected to %i Real Wiimotes", g_wiimotes_found); - - return g_wiimotes_found; } void Shutdown(void) { - if (false == g_real_wiimotes_initialized) + NOTICE_LOG(WIIMOTE, "WiimoteReal::Shutdown"); + + g_wiimote_scanner.StopScanning(); + + std::lock_guard lk(g_refresh_lock); + + if (!g_real_wiimotes_initialized) return; - // Uninitialized g_real_wiimotes_initialized = false; - // Delete wiimotes for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (g_wiimotes[i]) + HandleWiimoteDisconnect(i); +} + +void ChangeWiimoteSource(unsigned int index, int source) +{ + std::lock_guard lk(g_refresh_lock); + + g_wiimote_sources[index] = source; + + // source is emulated, kill any real connection + if (!(WIIMOTE_SRC_REAL & g_wiimote_sources[index])) + HandleWiimoteDisconnect(index); + + auto const wanted_wiimotes = CalculateWantedWiimotes(); + g_wiimote_scanner.WantWiimotes(wanted_wiimotes); +} + +void HandleWiimoteConnect(Wiimote* wm) +{ + std::lock_guard lk(g_refresh_lock); + + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + { + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i]) { - delete g_wiimotes[i]; - g_wiimotes[i] = NULL; + g_wiimotes[i] = wm; + + wm->index = i; + wm->StartThread(); + wm->SetLEDs(WIIMOTE_LED_1 << i); + + Host_ConnectWiimote(i, true); + + NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1); + + wm = NULL; + break; } + } + + delete wm; + + auto const want_wiimotes = CalculateWantedWiimotes(); + g_wiimote_scanner.WantWiimotes(want_wiimotes); +} + +void HandleWiimoteDisconnect(int index) +{ + // locked above + //std::lock_guard lk(g_refresh_lock); + + Host_ConnectWiimote(index, false); + + if (g_wiimotes[index]) + { + delete g_wiimotes[index]; + g_wiimotes[index] = NULL; + + NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); + } + + auto const want_wiimotes = CalculateWantedWiimotes(); + g_wiimote_scanner.WantWiimotes(want_wiimotes); +} + +void HandleFoundWiimotes(const std::vector& wiimotes) +{ + std::for_each(wiimotes.begin(), wiimotes.end(), [](Wiimote* const wm) + { + if (wm->Open()) + HandleWiimoteConnect(wm); + else + delete wm; + }); } // This is called from the GUI thread void Refresh() { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); #ifdef _WIN32 Shutdown(); Initialize(); #else +/* // Make sure real wiimotes have been initialized if (!g_real_wiimotes_initialized) { @@ -477,12 +568,13 @@ void Refresh() g_wiimotes_found = num_wiimotes; } +*/ #endif } void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->InterruptChannel(_channelID, _pData, _Size); @@ -490,7 +582,7 @@ void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u3 void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->ControlChannel(_channelID, _pData, _Size); @@ -500,7 +592,7 @@ void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 // Read the Wiimote once void Update(int _WiimoteNumber) { - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->Update(); @@ -508,7 +600,7 @@ void Update(int _WiimoteNumber) void StateChange(EMUSTATE_CHANGE newState) { - //std::lock_guard lk(g_refresh_lock); + //std::lock_guard lk(g_refresh_lock); // TODO: disable/enable auto reporting, maybe } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 9fdb305a56..5f8206bf14 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -20,6 +20,7 @@ #define WIIMOTE_REAL_H #include +#include #include "WiimoteRealBase.h" #include "ChunkFile.h" @@ -41,7 +42,7 @@ class Wiimote : NonCopyable { friend class WiimoteEmu::Wiimote; public: - Wiimote(const unsigned int _index); + Wiimote(); ~Wiimote(); void ControlChannel(const u16 channel, const void* const data, const u32 size); @@ -52,16 +53,28 @@ public: bool Read(); bool Write(); - bool Connect(); - bool IsConnected() const; + + void StartThread(); + void StopThread(); + + // "handshake" / stop packets + bool EmuStart(); + void EmuStop(); + + // connecting and disconnecting from physical devices + bool Open(); + void Close(); + + // TODO: change to something like IsRelevant bool IsOpen() const; - void Disconnect(); + + void SetLEDs(int leds); + void DisableDataReporting(); void Rumble(); void SendPacket(const u8 rpt_id, const void* const data, const unsigned int size); - void RealDisconnect(); - const unsigned int index; + int index; #if defined(__APPLE__) IOBluetoothDevice *btd; @@ -74,8 +87,6 @@ public: int cmd_sock; // Command socket int int_sock; // Interrupt socket - void Close(); - #elif defined(_WIN32) char devicepath[255]; // Unique wiimote reference //ULONGLONG btaddr; // Bluetooth address @@ -83,7 +94,6 @@ public: OVERLAPPED hid_overlap; // Overlap handle enum win_bt_stack_t stack; // Type of bluetooth stack to use #endif - unsigned char leds; // Currently lit leds protected: Report m_last_data_report; @@ -91,21 +101,51 @@ protected: private: void ClearReadQueue(); - bool SendRequest(unsigned char report_type, unsigned char* data, int length); - bool Handshake(); - void SetLEDs(int leds); - int IORead(unsigned char* buf); - int IOWrite(unsigned char* buf, int len); + bool SendRequest(u8 report_type, u8 const* data, int length); + + int IORead(u8* buf); + int IOWrite(u8 const* buf, int len); + void ThreadFunc(); - bool m_connected; + bool m_run_thread; std::thread m_wiimote_thread; + Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; Common::FifoQueue m_audio_reports; }; -extern std::mutex g_refresh_lock; +class WiimoteScanner +{ +public: + WiimoteScanner(); + ~WiimoteScanner(); + + bool IsReady() const; + + void WantWiimotes(size_t count); + + void StartScanning(); + void StopScanning(); + + std::vector FindWiimotes(size_t max_wiimotes); + +private: + void ThreadFunc(); + + std::thread scan_thread; + + volatile bool run_thread; + + // TODO: this should probably be atomic + volatile size_t want_wiimotes; + + int device_id; + int device_sock; +}; + +extern std::recursive_mutex g_refresh_lock; extern Wiimote *g_wiimotes[4]; void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size); @@ -116,6 +156,7 @@ void DoState(PointerWrap &p); void StateChange(EMUSTATE_CHANGE newState); int FindWiimotes(Wiimote** wm, int max_wiimotes); +void ChangeWiimoteSource(unsigned int index, int source); bool IsValidBluetoothName(const std::string& name); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index ea23e532e7..ba2186d17a 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -4,11 +4,12 @@ #include "HW/WiimoteReal/WiimoteReal.h" #include "Frame.h" -const wxString& ConnectedWiimotesString() +wxString ConnectedWiimotesString() { - static wxString str; - str.Printf(_("%i connected"), WiimoteReal::Initialize()); - return str; + //static wxString str; + //str.Printf(_("%i connected"), WiimoteReal::Initialize()); + //return str; + return "TODO: this text"; } WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) @@ -222,13 +223,16 @@ void WiimoteConfigDiag::SelectSource(wxCommandEvent& event) // This needs to be changed now in order for refresh to work right. // Revert if the dialog is canceled. int index = m_wiimote_index_from_ctrl_id[event.GetId()]; - g_wiimote_sources[index] = event.GetInt(); + + WiimoteReal::ChangeWiimoteSource(index, event.GetInt()); + if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID) wiimote_configure_bt[index]->Disable(); else wiimote_configure_bt[index]->Enable(); } +// TODO: race conditiions void WiimoteConfigDiag::UpdateWiimoteStatus() { for (int index = 0; index < 4; ++index) @@ -241,7 +245,7 @@ void WiimoteConfigDiag::UpdateWiimoteStatus() if (WIIMOTE_SRC_EMU & g_wiimote_sources[index]) CFrame::ConnectWiimote(index, true); else if (WIIMOTE_SRC_REAL & g_wiimote_sources[index] && WiimoteReal::g_wiimotes[index]) - CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsConnected()); + CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsOpen()); } } } From 54497be653dfdf2de558426cf460a8b8a96bd524 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 15 Jan 2013 22:57:25 -0600 Subject: [PATCH 440/627] Untested Windows buildfix attempt. --- .../Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 16 +- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 6 +- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 213 ++++++++---------- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 19 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 14 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 13 +- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 2 +- 7 files changed, 139 insertions(+), 144 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 49afee8ad1..b22f1c7795 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -21,9 +21,19 @@ namespace WiimoteReal { -int FindWiimotes(Wiimote **wm, int max_wiimotes) +WiimoteScanner::WiimoteScanner() { - return 0; + return; +} + +std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +{ + return std::vector() +} + +bool WiimoteScanner::IsReady() const +{ + return false; } bool Wiimote::Connect() @@ -31,7 +41,7 @@ bool Wiimote::Connect() return 0; } -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { return; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 82630aaebb..24e25e9a2b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -131,7 +131,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) } // Connect to a wiimote with a known address. -bool Wiimote::Open() +bool Wiimote::Connect() { sockaddr_l2 addr; addr.l2_family = AF_BLUETOOTH; @@ -177,7 +177,7 @@ void Wiimote::StopThread() m_wiimote_thread.join(); } -void Wiimote::Close() +void Wiimote::Disconnect() { close(cmd_sock); close(int_sock); @@ -186,7 +186,7 @@ void Wiimote::Close() int_sock = -1; } -bool Wiimote::IsOpen() const +bool Wiimote::IsConnected() const { return cmd_sock != -1;// && int_sock != -1; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index cc05bc10e1..f862193ff9 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -127,12 +127,21 @@ inline void init_lib() namespace WiimoteReal { +WiimoteScanner::WiimoteScanner() +{ + init_lib(); +} + // Find and connect wiimotes. // Does not replace already found wiimotes even if they are disconnected. // wm is an array of max_wiimotes wiimotes // Returns the total number of found and connected wiimotes. -int FindWiimotes(Wiimote** wm, int max_wiimotes) +std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { + PairUp(); + + std::vector wiimotes; + GUID device_id; HANDLE dev; HDEVINFO device_info; @@ -142,8 +151,6 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; HIDD_ATTRIBUTES attr; - init_lib(); - // Count the number of already found wiimotes for (int i = 0; i < MAX_WIIMOTES; ++i) { @@ -207,22 +214,11 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) // Find an unused slot unsigned int k = 0; - for (; k < MAX_WIIMOTES && !(WIIMOTE_SRC_REAL & g_wiimote_sources[k] && !wm[k]); ++k); - wm[k] = new Wiimote(k); - wm[k]->dev_handle = dev; - memcpy(wm[k]->devicepath, detail_data->DevicePath, 197); + auto const wm = new Wiimote; + wm->dev_handle = dev; + memcpy(wm->devicepath, detail_data->DevicePath, 197); - if (!wm[k]->Connect()) - { - ERROR_LOG(WIIMOTE, "Unable to connect to wiimote %i.", wm[k]->index + 1); - delete wm[k]; - wm[k] = NULL; - CloseHandle(dev); - } - else - { - ++found_wiimotes; - } + found_wiimotes.push_back(wm); } if (detail_data) @@ -233,87 +229,64 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) return found_wiimotes; } +bool WiimoteScanner::IsReady() const +{ + // TODO: impl + return true; +} + // Connect to a wiimote with a known device path. bool Wiimote::Connect() { - if (IsConnected()) return false; + dev_handle = CreateFile(devicepath, + (GENERIC_READ | GENERIC_WRITE), + (FILE_SHARE_READ | FILE_SHARE_WRITE), + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - if (!dev_handle) + if (dev_handle == INVALID_HANDLE_VALUE) { - dev_handle = CreateFile(devicepath, - (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE), - NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - if (dev_handle == INVALID_HANDLE_VALUE) - return false; + dev_handle = 0; + return false; } hid_overlap.hEvent = CreateEvent(NULL, 1, 1, _T("")); hid_overlap.Offset = 0; hid_overlap.OffsetHigh = 0; - m_connected = true; - - // Try a handshake to see if the device is actually connected - if (!Handshake()) - { - m_connected = false; - return false; - } - - // Set LEDs - SetLEDs(WIIMOTE_LED_1 << index); - - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); - + // TODO: do this elsewhere // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate +/* if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL)) { ERROR_LOG(WIIMOTE, "Failed to set wiimote thread priority"); } - - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); +*/ return true; } -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { - if (!IsConnected()) - return; - - m_connected = false; - - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); - CloseHandle(dev_handle); dev_handle = 0; - ResetEvent(&hid_overlap); + //ResetEvent(&hid_overlap); + CloseHandle(hid_overlap.hEvent); } -bool Wiimote::IsOpen() const +bool Wiimote::IsConnected() const { - return IsConnected(); + return dev_handle != 0; } int Wiimote::IORead(unsigned char* buf) { - DWORD b, r; - - init_lib(); - - if (!IsConnected()) - return 0; - - *buf = 0; + //*buf = 0; if (!ReadFile(dev_handle, buf, MAX_PAYLOAD, &b, &hid_overlap)) { // Partial read - b = GetLastError(); - + auto const b = GetLastError(); if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) { // Remote disconnect @@ -321,7 +294,7 @@ int Wiimote::IORead(unsigned char* buf) return 0; } - r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); + auto const r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); if (r == WAIT_TIMEOUT) { // Timeout - cancel and continue @@ -357,77 +330,71 @@ int Wiimote::IORead(unsigned char* buf) int Wiimote::IOWrite(unsigned char* buf, int len) { - DWORD bytes, dw; - int i; - - init_lib(); - - if (!IsConnected()) - return 0; - switch (stack) { - case MSBT_STACK_UNKNOWN: - { - // Try to auto-detect the stack type - if (i = WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap)) - { - // Bluesoleil will always return 1 here, even if it's not connected - stack = MSBT_STACK_BLUESOLEIL; - return i; - } - - if (i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1)) - { - stack = MSBT_STACK_MS; - return i; - } - - dw = GetLastError(); - // Checking for 121 = timeout on semaphore/device off/disconnected to - // avoid trouble with other stacks toshiba/widcomm - if (dw == 121) - { - NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: Timeout"); - RealDisconnect(); - } - else ERROR_LOG(WIIMOTE, - "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); - return 0; - } - - case MSBT_STACK_MS: - i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); - dw = GetLastError(); - - if (dw == 121) - { - // Semaphore timeout - NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); - RealDisconnect(); - return 0; - } + case MSBT_STACK_UNKNOWN: + { + // Try to auto-detect the stack type + DWORD bytes = 0; + auto i = WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + if (i) + { + // Bluesoleil will always return 1 here, even if it's not connected + stack = MSBT_STACK_BLUESOLEIL; return i; + } - case MSBT_STACK_BLUESOLEIL: - return WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); + if (i) + { + stack = MSBT_STACK_MS; + return i; + } + + auto const dw = GetLastError(); + // Checking for 121 = timeout on semaphore/device off/disconnected to + // avoid trouble with other stacks toshiba/widcomm + if (dw == 121) + { + NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: Timeout"); + return 0; + } + else + { + ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); + // Correct? + return -1 + } + break; + } + case MSBT_STACK_MS: + { + i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); + dw = GetLastError(); + + if (dw == 121) + { + // Semaphore timeout + NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); + RealDisconnect(); + return 0; + } + + return i; + break; + } + case MSBT_STACK_BLUESOLEIL: + return WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + break; } return 0; } -int UnPair() -{ - // TODO: - return 0; -} - // WiiMote Pair-Up, function will return amount of either new paired or unpaired devices // negative number on failure int PairUp(bool unpair) { - init_lib(); - // match strings like "Nintendo RVL-WBC-01", "Nintendo RVL-CNT-01", "Nintendo RVL-CNT-01-TR" const std::wregex wiimote_device_name(L"Nintendo RVL-\\w{3}-\\d{2}(-\\w{2})?"); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 64de880180..95068fe650 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -10,6 +10,19 @@ } @end +WiimoteScanner::WiimoteScanner() +{} + +std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +{ + return std::vector(); +} + +bool WiimoteScanner::IsReady() const +{ + return false; +} + @implementation SearchBT - (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender error: (IOReturn) error @@ -92,7 +105,7 @@ WARN_LOG(WIIMOTE, "Lost channel to wiimote %i", wm->index + 1); - wm->RealDisconnect(); + wm->Disconnect(); } @end @@ -182,7 +195,7 @@ bool Wiimote::Connect() if (ichan == NULL || cchan == NULL) { ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); - RealDisconnect(); + Disconnect(); return false; } @@ -207,7 +220,7 @@ bool Wiimote::Connect() } // Disconnect a wiimote. -void Wiimote::RealDisconnect() +void Wiimote::Disconnect() { if (!IsConnected()) return; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 2735c1a312..d25a78490d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -69,8 +69,8 @@ Wiimote::~Wiimote() { StopThread(); - if (IsOpen()) - Close(); + if (IsConnected()) + Disconnect(); ClearReadQueue(); @@ -178,7 +178,7 @@ bool Wiimote::Read() rpt.second = IORead(rpt.first); if (0 == rpt.second) - Close(); + Disconnect(); if (rpt.second > 0 && m_channel > 0) { // Add it to queue @@ -348,7 +348,7 @@ void WiimoteScanner::ThreadFunc() // TODO: this code here is ugly std::lock_guard lk(g_refresh_lock); for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) - if (g_wiimotes[i] && !g_wiimotes[i]->IsOpen()) + if (g_wiimotes[i] && !g_wiimotes[i]->IsConnected()) HandleWiimoteDisconnect(i); } #endif @@ -365,14 +365,14 @@ void Wiimote::ThreadFunc() Rumble(); // main loop - while (m_run_thread && IsOpen()) + while (m_run_thread && IsConnected()) { #ifdef __APPLE__ while (Write()) {} Common::SleepCurrentThread(1); #else // TODO: this is all a mess - while (m_run_thread && IsOpen()) + while (m_run_thread && IsConnected()) { bool const did_write = Write(); @@ -512,7 +512,7 @@ void HandleFoundWiimotes(const std::vector& wiimotes) { std::for_each(wiimotes.begin(), wiimotes.end(), [](Wiimote* const wm) { - if (wm->Open()) + if (wm->Connect()) HandleWiimoteConnect(wm); else delete wm; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 5f8206bf14..4c65768666 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -62,11 +62,11 @@ public: void EmuStop(); // connecting and disconnecting from physical devices - bool Open(); - void Close(); + bool Connect(); + void Disconnect(); // TODO: change to something like IsRelevant - bool IsOpen() const; + bool IsConnected() const; void SetLEDs(int leds); @@ -141,8 +141,13 @@ private: // TODO: this should probably be atomic volatile size_t want_wiimotes; +#if defined(_WIN32) + + +#elif defined(__linux__) && HAVE_BLUEZ int device_id; - int device_sock; + int device_sock; +#endif }; extern std::recursive_mutex g_refresh_lock; diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index ba2186d17a..b259cde2b9 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -245,7 +245,7 @@ void WiimoteConfigDiag::UpdateWiimoteStatus() if (WIIMOTE_SRC_EMU & g_wiimote_sources[index]) CFrame::ConnectWiimote(index, true); else if (WIIMOTE_SRC_REAL & g_wiimote_sources[index] && WiimoteReal::g_wiimotes[index]) - CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsOpen()); + CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsConnected()); } } } From 62f56eb731fa66f8613438777d13941626be3fa5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 15 Jan 2013 23:05:30 -0600 Subject: [PATCH 441/627] Sloppily fix wiimotes not being connected after boot. --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index d25a78490d..516fa3a51e 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -596,6 +596,8 @@ void Update(int _WiimoteNumber) if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->Update(); + else + Host_ConnectWiimote(_WiimoteNumber, false); } void StateChange(EMUSTATE_CHANGE newState) From 87431666639c7036ea0f5b0d499df639cefb3d51 Mon Sep 17 00:00:00 2001 From: lioncash Date: Wed, 16 Jan 2013 09:42:51 -0500 Subject: [PATCH 442/627] Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names). This also gets rid of some more typecasts in some cases. --- .../VideoCommon/Src/FramebufferManagerBase.h | 2 +- Source/Core/VideoCommon/Src/RenderBase.cpp | 22 +++++------ Source/Core/VideoCommon/Src/RenderBase.h | 24 ++++++------ .../Src/FramebufferManager.cpp | 2 +- .../Plugin_VideoDX11/Src/FramebufferManager.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 27 +++++-------- .../Plugins/Plugin_VideoDX9/Src/D3DBase.cpp | 29 ++++++++------ Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h | 6 +-- .../Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 16 ++++---- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h | 16 ++++---- .../Src/FramebufferManager.cpp | 6 +-- .../Plugin_VideoDX9/Src/FramebufferManager.h | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 38 +++++++++---------- .../Src/FramebufferManager.cpp | 2 +- .../Plugin_VideoOGL/Src/FramebufferManager.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 6 +-- 16 files changed, 98 insertions(+), 104 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index e529bb1a39..902e781a70 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -17,7 +17,7 @@ struct XFBSourceBase // TODO: only DX9 uses the width/height params virtual void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const = 0; + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const = 0; virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0; diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 8e1d012fa2..1ea7afbc1e 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -60,12 +60,12 @@ std::string Renderer::s_sScreenshotName; volatile bool Renderer::s_bScreenshot; // The framebuffer size -int Renderer::s_target_width; -int Renderer::s_target_height; +unsigned int Renderer::s_target_width; +unsigned int Renderer::s_target_height; // TODO: Add functionality to reinit all the render targets when the window is resized. -int Renderer::s_backbuffer_width; -int Renderer::s_backbuffer_height; +unsigned int Renderer::s_backbuffer_width; +unsigned int Renderer::s_backbuffer_height; TargetRectangle Renderer::target_rc; @@ -163,7 +163,7 @@ int Renderer::EFBToScaledY(int y) }; } -void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) +void Renderer::CalculateTargetScale(unsigned int x, unsigned int y, unsigned int &scaledX, unsigned int &scaledY) { if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) { @@ -172,15 +172,15 @@ void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) } else { - scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; - scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; + scaledX = x * (efb_scale_numeratorX / efb_scale_denominatorX); + scaledY = y * (efb_scale_numeratorY / efb_scale_denominatorY); } } // return true if target size changed -bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier) +bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, unsigned int multiplier) { - int newEFBWidth, newEFBHeight; + u32 newEFBWidth, newEFBHeight; // TODO: Ugly. Clean up switch (s_LastEFBScale) @@ -374,7 +374,7 @@ void Renderer::DrawDebugText() // TODO: remove extern bool g_aspect_wide; -void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) +void Renderer::UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height) { float FloatGLWidth = (float)backbuffer_width; float FloatGLHeight = (float)backbuffer_height; @@ -492,7 +492,7 @@ void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) target_rc.bottom = YOffset + iHeight; } -void Renderer::SetWindowSize(int width, int height) +void Renderer::SetWindowSize(u32 width, u32 height) { if (width < 1) width = 1; diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 5376577cbd..38cab83562 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -67,14 +67,14 @@ public: virtual void RestoreState() = 0; // Ideal internal resolution - determined by display resolution (automatic scaling) and/or a multiple of the native EFB resolution - static int GetTargetWidth() { return s_target_width; } - static int GetTargetHeight() { return s_target_height; } + static u32 GetTargetWidth() { return s_target_width; } + static u32 GetTargetHeight() { return s_target_height; } // Display resolution - static int GetBackbufferWidth() { return s_backbuffer_width; } - static int GetBackbufferHeight() { return s_backbuffer_height; } + static u32 GetBackbufferWidth() { return s_backbuffer_width; } + static u32 GetBackbufferHeight() { return s_backbuffer_height; } - static void SetWindowSize(int width, int height); + static void SetWindowSize(u32 width, u32 height); // EFB coordinate conversion functions @@ -82,7 +82,7 @@ public: virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0; static const TargetRectangle& GetTargetRectangle() { return target_rc; } - static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height); + static void UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height); // Use this to upscale native EFB coordinates to IDEAL internal resolution @@ -132,8 +132,8 @@ public: protected: - static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); - static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1); + static void CalculateTargetScale(unsigned int x, unsigned int y, unsigned int &scaledX, unsigned int &scaledY); + static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, unsigned int multiplier = 1); static void CheckFifoRecording(); static void RecordVideoMemory(); @@ -151,12 +151,12 @@ protected: bool bLastFrameDumped; // The framebuffer size - static int s_target_width; - static int s_target_height; + static u32 s_target_width; + static u32 s_target_height; // TODO: Add functionality to reinit all the render targets when the window is resized. - static int s_backbuffer_width; - static int s_backbuffer_height; + static u32 s_backbuffer_width; + static u32 s_backbuffer_height; static TargetRectangle target_rc; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp index cb94884eb7..6d9c0ff232 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp @@ -193,7 +193,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const { D3D::drawShadedTexSubQuad(tex->GetSRV(), &sourcerc, texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false), diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h index 83db4370db..30b99ce0f2 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h @@ -64,7 +64,7 @@ struct XFBSource : public XFBSourceBase ~XFBSource() { tex->Release(); } void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const; + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void CopyEFB(float Gamma); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 44eaaf5dcf..1355ac2990 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -691,18 +691,14 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) } // In D3D, the viewport rectangle must fit within the render target. - int X = intendedX; - if (X < 0) - X = 0; + u32 X = intendedX; + u32 Y = intendedY; + u32 Wd = intendedWd; + u32 Ht = intendedHt; - int Y = intendedY; - if (Y < 0) - Y = 0; - - int Wd = intendedWd; if (X + Wd > GetTargetWidth()) Wd = GetTargetWidth() - X; - int Ht = intendedHt; + if (Y + Ht > GetTargetHeight()) Ht = GetTargetHeight() - Y; @@ -928,20 +924,17 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Prepare to copy the XFBs to our backbuffer UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - int X = GetTargetRectangle().left; - int Y = GetTargetRectangle().top; - int Width = GetTargetRectangle().right - GetTargetRectangle().left; - int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; + u32 X = GetTargetRectangle().left; + u32 Y = GetTargetRectangle().top; + u32 Width = GetTargetRectangle().right - GetTargetRectangle().left; + u32 Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // TODO: Redundant checks... - if (X < 0) X = 0; - if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; if (Y > s_backbuffer_height) Y = s_backbuffer_height; - if (Width < 0) Width = 0; - if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; + D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); D3D::context->RSSetViewports(1, &vp); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp index ff3f68a6cd..7b33844f92 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp @@ -49,9 +49,9 @@ LPDIRECT3DSURFACE9 back_buffer_z; D3DCAPS9 caps; HWND hWnd; -static int multisample; -static int resolution; -static int xres, yres; +static unsigned int multisample; +static unsigned int resolution; +static unsigned int xres, yres; static bool auto_depth_stencil = false; #define VENDOR_NVIDIA 4318 @@ -480,24 +480,25 @@ const D3DCAPS9 &GetCaps() } // returns true if size was changed -bool FixTextureSize(int& width, int& height) +bool FixTextureSize(u32& width, u32& height) { - int oldw = width, oldh = height; + u32 oldw = width; + u32 oldh = height; // conditional nonpow2 support should work fine for us if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL)) { // all texture dimensions need to be powers of two - width = (int)MakePow2((u32)width); - height = (int)MakePow2((u32)height); + width = MakePow2(width); + height = MakePow2(height); } if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) { width = height = max(width, height); } - width = min(width, (int)caps.MaxTextureWidth); - height = min(height, (int)caps.MaxTextureHeight); + width = min(width, (u32)caps.MaxTextureWidth); + height = min(height, (u32)caps.MaxTextureHeight); return (width != oldw) || (height != oldh); } @@ -515,18 +516,22 @@ bool CheckDepthStencilSupport(D3DFORMAT target_format, D3DFORMAT depth_format) D3DFORMAT GetSupportedDepthTextureFormat() { - for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) + for (size_t i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) + { if (D3D::CheckTextureSupport(D3DUSAGE_DEPTHSTENCIL, DepthFormats[i])) return DepthFormats[i]; + } return D3DFMT_UNKNOWN; } D3DFORMAT GetSupportedDepthSurfaceFormat(D3DFORMAT target_format) { - for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) + for (size_t i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) + { if (D3D::CheckDepthStencilSupport(target_format, DepthFormats[i])) return DepthFormats[i]; + } return D3DFMT_UNKNOWN; } @@ -567,7 +572,7 @@ void ShowD3DError(HRESULT err) PanicAlert("Driver Internal Error"); break; case D3DERR_OUTOFVIDEOMEMORY: - PanicAlert("Out of vid mem"); + PanicAlert("Out of video memory"); break; default: // MessageBox(0,_T("Other error or success"),_T("ERROR"),0); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h index d1e7eeaa91..bd55c87819 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h @@ -75,7 +75,7 @@ const char *VertexShaderVersionString(); void ShowD3DError(HRESULT err); // returns true if size was changed -bool FixTextureSize(int& width, int& height); +bool FixTextureSize(u32& width, u32& height); // returns true if format is supported bool CheckTextureSupport(DWORD usage, D3DFORMAT tex_format); @@ -115,8 +115,8 @@ void EnableAlphaToCoverage(); struct Resolution { char name[32]; - int xres; - int yres; + unsigned int xres; + unsigned int yres; std::set bitdepths; std::set refreshes; }; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index 9510ad444c..a8343d7987 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -365,10 +365,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, flo */ void drawShadedTexQuad(IDirect3DTexture9 *texture, const RECT *rSource, - int SourceWidth, - int SourceHeight, - int DestWidth, - int DestHeight, + u32 SourceWidth, + u32 SourceHeight, + u32 DestWidth, + u32 DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma) @@ -399,11 +399,11 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture, void drawShadedTexSubQuad(IDirect3DTexture9 *texture, const MathUtil::Rectangle *rSource, - int SourceWidth, - int SourceHeight, + u32 SourceWidth, + u32 SourceHeight, const MathUtil::Rectangle *rDest, - int DestWidth, - int DestHeight, + u32 DestWidth, + u32 DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h index 882f112ece..217ddf069b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h @@ -65,20 +65,20 @@ namespace D3D void quad2d(float x1, float y1, float x2, float y2, u32 color, float u1=0, float v1=0, float u2=1, float v2=1); void drawShadedTexQuad(IDirect3DTexture9 *texture, const RECT *rSource, - int SourceWidth, - int SourceHeight, - int DestWidth, - int DestHeight, + u32 SourceWidth, + u32 SourceHeight, + u32 DestWidth, + u32 DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma = 1.0f); void drawShadedTexSubQuad(IDirect3DTexture9 *texture, const MathUtil::Rectangle *rSource, - int SourceWidth, - int SourceHeight, + u32 SourceWidth, + u32 SourceHeight, const MathUtil::Rectangle *rDest, - int DestWidth, - int DestHeight, + u32 DestWidth, + u32 DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma = 1.0f); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp index 1903bce989..f1d1fa3133 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp @@ -44,8 +44,8 @@ FramebufferManager::Efb FramebufferManager::s_efb; FramebufferManager::FramebufferManager() { bool depth_textures_supported = true; - int target_width = Renderer::GetTargetWidth(); - int target_height = Renderer::GetTargetHeight(); + u32 target_width = Renderer::GetTargetWidth(); + u32 target_height = Renderer::GetTargetHeight(); s_efb.color_surface_Format = D3DFMT_A8R8G8B8; // EFB color texture - primary render target @@ -161,7 +161,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const { D3D::drawShadedTexSubQuad(texture, &sourcerc, texWidth, texHeight, &drawrc, width , height, PixelShaderCache::GetColorCopyProgram(0), VertexShaderCache::GetSimpleVertexShader(0)); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h index 5b5993a12b..dad5eda513 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h @@ -58,7 +58,7 @@ struct XFBSource : public XFBSourceBase ~XFBSource() { texture->Release(); } void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const; + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void CopyEFB(float Gamma); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index f750313642..8bd5cda969 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -288,10 +288,10 @@ Renderer::Renderer() UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastAA = g_ActiveConfig.iMultisampleMode; - int SupersampleCoeficient = (s_LastAA % 3) + 1; + u32 SupersampleCoefficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoefficient); // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); @@ -305,7 +305,7 @@ Renderer::Renderer() SetupDeviceObjects(); - for (int stage = 0; stage < 8; stage++) + for (u32 stage = 0; stage < 8; stage++) D3D::SetSamplerState(stage, D3DSAMP_MAXANISOTROPY, 1 << g_ActiveConfig.iMaxAnisotropy); D3DVIEWPORT9 vp; @@ -468,8 +468,10 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // if depth textures aren't supported by the hardware, just return if (type == PEEK_Z) + { if (FramebufferManager::GetEFBDepthTexture() == NULL) return 0; + } // We're using three surfaces here: // - pEFBSurf: EFB Surface. Source surface when peeking, destination surface when poking. @@ -693,16 +695,14 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) } // In D3D, the viewport rectangle must fit within the render target. - int X = intendedX; - if (X < 0) - X = 0; - int Y = intendedY; - if (Y < 0) - Y = 0; - int Wd = intendedWd; + u32 X = intendedX; + u32 Y = intendedY; + u32 Wd = intendedWd; + u32 Ht = intendedHt; + if (X + Wd > GetTargetWidth()) Wd = GetTargetWidth() - X; - int Ht = intendedHt; + if (Y + Ht > GetTargetHeight()) Ht = GetTargetHeight() - Y; @@ -907,18 +907,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } - int X = GetTargetRectangle().left; - int Y = GetTargetRectangle().top; - int Width = GetTargetRectangle().right - GetTargetRectangle().left; - int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; + u32 X = GetTargetRectangle().left; + u32 Y = GetTargetRectangle().top; + u32 Width = (GetTargetRectangle().right - GetTargetRectangle().left); + u32 Height = (GetTargetRectangle().bottom - GetTargetRectangle().top); // Sanity check - if (X < 0) X = 0; - if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; if (Y > s_backbuffer_height) Y = s_backbuffer_height; - if (Width < 0) Width = 0; - if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; @@ -1153,10 +1149,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - int SupersampleCoeficient = (s_LastAA % 3) + 1; + u32 SupersampleCoefficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoefficient); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface()); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 0e37c3adb6..08c1ecc64d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -299,7 +299,7 @@ GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_r } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const { // Texture map xfbSource->texture onto the main buffer diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h index ffe3399705..d077b2f2ac 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h @@ -63,7 +63,7 @@ struct XFBSource : public XFBSourceBase void CopyEFB(float Gamma); void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, int width, int height) const; + const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; const GLuint texture; }; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index e3c35a6511..3f62db8787 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -323,8 +323,8 @@ Renderer::Renderer() return; // TODO: fail // Decide frambuffer size - s_backbuffer_width = (int)GLInterface->GetBackBufferWidth(); - s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); + s_backbuffer_width = GLInterface->GetBackBufferWidth(); + s_backbuffer_height = GLInterface->GetBackBufferHeight(); // Handle VSync on/off #ifdef __APPLE__ @@ -1047,7 +1047,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Textured triangles are necessary because of post-processing shaders // Disable all other stages - for (int i = 1; i < 8; ++i) + for (unsigned int i = 1; i < 8; ++i) OGL::TextureCache::DisableStage(i); // Update GLViewPort From 0ef3bd9c778a786ec439950f65c863d64ccf98b6 Mon Sep 17 00:00:00 2001 From: lioncash Date: Wed, 16 Jan 2013 15:46:11 -0500 Subject: [PATCH 443/627] Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)." Turns out I was wrong in my previous commit. My bad. This reverts commit 87431666639c7036ea0f5b0d499df639cefb3d51. --- .../VideoCommon/Src/FramebufferManagerBase.h | 2 +- Source/Core/VideoCommon/Src/RenderBase.cpp | 22 +++++------ Source/Core/VideoCommon/Src/RenderBase.h | 24 ++++++------ .../Src/FramebufferManager.cpp | 2 +- .../Plugin_VideoDX11/Src/FramebufferManager.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 27 ++++++++----- .../Plugins/Plugin_VideoDX9/Src/D3DBase.cpp | 29 ++++++-------- Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h | 6 +-- .../Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 16 ++++---- Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h | 16 ++++---- .../Src/FramebufferManager.cpp | 6 +-- .../Plugin_VideoDX9/Src/FramebufferManager.h | 2 +- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 38 ++++++++++--------- .../Src/FramebufferManager.cpp | 2 +- .../Plugin_VideoOGL/Src/FramebufferManager.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 6 +-- 16 files changed, 104 insertions(+), 98 deletions(-) diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h index 902e781a70..e529bb1a39 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.h @@ -17,7 +17,7 @@ struct XFBSourceBase // TODO: only DX9 uses the width/height params virtual void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const = 0; + const MathUtil::Rectangle &drawrc, int width, int height) const = 0; virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0; diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 1ea7afbc1e..8e1d012fa2 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -60,12 +60,12 @@ std::string Renderer::s_sScreenshotName; volatile bool Renderer::s_bScreenshot; // The framebuffer size -unsigned int Renderer::s_target_width; -unsigned int Renderer::s_target_height; +int Renderer::s_target_width; +int Renderer::s_target_height; // TODO: Add functionality to reinit all the render targets when the window is resized. -unsigned int Renderer::s_backbuffer_width; -unsigned int Renderer::s_backbuffer_height; +int Renderer::s_backbuffer_width; +int Renderer::s_backbuffer_height; TargetRectangle Renderer::target_rc; @@ -163,7 +163,7 @@ int Renderer::EFBToScaledY(int y) }; } -void Renderer::CalculateTargetScale(unsigned int x, unsigned int y, unsigned int &scaledX, unsigned int &scaledY) +void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) { if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) { @@ -172,15 +172,15 @@ void Renderer::CalculateTargetScale(unsigned int x, unsigned int y, unsigned int } else { - scaledX = x * (efb_scale_numeratorX / efb_scale_denominatorX); - scaledY = y * (efb_scale_numeratorY / efb_scale_denominatorY); + scaledX = x * (int)efb_scale_numeratorX / (int)efb_scale_denominatorX; + scaledY = y * (int)efb_scale_numeratorY / (int)efb_scale_denominatorY; } } // return true if target size changed -bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, unsigned int multiplier) +bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier) { - u32 newEFBWidth, newEFBHeight; + int newEFBWidth, newEFBHeight; // TODO: Ugly. Clean up switch (s_LastEFBScale) @@ -374,7 +374,7 @@ void Renderer::DrawDebugText() // TODO: remove extern bool g_aspect_wide; -void Renderer::UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height) +void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) { float FloatGLWidth = (float)backbuffer_width; float FloatGLHeight = (float)backbuffer_height; @@ -492,7 +492,7 @@ void Renderer::UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height) target_rc.bottom = YOffset + iHeight; } -void Renderer::SetWindowSize(u32 width, u32 height) +void Renderer::SetWindowSize(int width, int height) { if (width < 1) width = 1; diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 38cab83562..5376577cbd 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -67,14 +67,14 @@ public: virtual void RestoreState() = 0; // Ideal internal resolution - determined by display resolution (automatic scaling) and/or a multiple of the native EFB resolution - static u32 GetTargetWidth() { return s_target_width; } - static u32 GetTargetHeight() { return s_target_height; } + static int GetTargetWidth() { return s_target_width; } + static int GetTargetHeight() { return s_target_height; } // Display resolution - static u32 GetBackbufferWidth() { return s_backbuffer_width; } - static u32 GetBackbufferHeight() { return s_backbuffer_height; } + static int GetBackbufferWidth() { return s_backbuffer_width; } + static int GetBackbufferHeight() { return s_backbuffer_height; } - static void SetWindowSize(u32 width, u32 height); + static void SetWindowSize(int width, int height); // EFB coordinate conversion functions @@ -82,7 +82,7 @@ public: virtual TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) = 0; static const TargetRectangle& GetTargetRectangle() { return target_rc; } - static void UpdateDrawRectangle(u32 backbuffer_width, u32 backbuffer_height); + static void UpdateDrawRectangle(int backbuffer_width, int backbuffer_height); // Use this to upscale native EFB coordinates to IDEAL internal resolution @@ -132,8 +132,8 @@ public: protected: - static void CalculateTargetScale(unsigned int x, unsigned int y, unsigned int &scaledX, unsigned int &scaledY); - static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, unsigned int multiplier = 1); + static void CalculateTargetScale(int x, int y, int &scaledX, int &scaledY); + static bool CalculateTargetSize(unsigned int framebuffer_width, unsigned int framebuffer_height, int multiplier = 1); static void CheckFifoRecording(); static void RecordVideoMemory(); @@ -151,12 +151,12 @@ protected: bool bLastFrameDumped; // The framebuffer size - static u32 s_target_width; - static u32 s_target_height; + static int s_target_width; + static int s_target_height; // TODO: Add functionality to reinit all the render targets when the window is resized. - static u32 s_backbuffer_width; - static u32 s_backbuffer_height; + static int s_backbuffer_width; + static int s_backbuffer_height; static TargetRectangle target_rc; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp index 6d9c0ff232..cb94884eb7 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp @@ -193,7 +193,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const + const MathUtil::Rectangle &drawrc, int width, int height) const { D3D::drawShadedTexSubQuad(tex->GetSRV(), &sourcerc, texWidth, texHeight, &drawrc, PixelShaderCache::GetColorCopyProgram(false), diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h index 30b99ce0f2..83db4370db 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h @@ -64,7 +64,7 @@ struct XFBSource : public XFBSourceBase ~XFBSource() { tex->Release(); } void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; + const MathUtil::Rectangle &drawrc, int width, int height) const; void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void CopyEFB(float Gamma); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 1355ac2990..44eaaf5dcf 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -691,14 +691,18 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) } // In D3D, the viewport rectangle must fit within the render target. - u32 X = intendedX; - u32 Y = intendedY; - u32 Wd = intendedWd; - u32 Ht = intendedHt; + int X = intendedX; + if (X < 0) + X = 0; + int Y = intendedY; + if (Y < 0) + Y = 0; + + int Wd = intendedWd; if (X + Wd > GetTargetWidth()) Wd = GetTargetWidth() - X; - + int Ht = intendedHt; if (Y + Ht > GetTargetHeight()) Ht = GetTargetHeight() - Y; @@ -924,17 +928,20 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Prepare to copy the XFBs to our backbuffer UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - u32 X = GetTargetRectangle().left; - u32 Y = GetTargetRectangle().top; - u32 Width = GetTargetRectangle().right - GetTargetRectangle().left; - u32 Height = GetTargetRectangle().bottom - GetTargetRectangle().top; + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // TODO: Redundant checks... + if (X < 0) X = 0; + if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; if (Y > s_backbuffer_height) Y = s_backbuffer_height; + if (Width < 0) Width = 0; + if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; - D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height); D3D::context->RSSetViewports(1, &vp); D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp index 7b33844f92..ff3f68a6cd 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp @@ -49,9 +49,9 @@ LPDIRECT3DSURFACE9 back_buffer_z; D3DCAPS9 caps; HWND hWnd; -static unsigned int multisample; -static unsigned int resolution; -static unsigned int xres, yres; +static int multisample; +static int resolution; +static int xres, yres; static bool auto_depth_stencil = false; #define VENDOR_NVIDIA 4318 @@ -480,25 +480,24 @@ const D3DCAPS9 &GetCaps() } // returns true if size was changed -bool FixTextureSize(u32& width, u32& height) +bool FixTextureSize(int& width, int& height) { - u32 oldw = width; - u32 oldh = height; + int oldw = width, oldh = height; // conditional nonpow2 support should work fine for us if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL)) { // all texture dimensions need to be powers of two - width = MakePow2(width); - height = MakePow2(height); + width = (int)MakePow2((u32)width); + height = (int)MakePow2((u32)height); } if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) { width = height = max(width, height); } - width = min(width, (u32)caps.MaxTextureWidth); - height = min(height, (u32)caps.MaxTextureHeight); + width = min(width, (int)caps.MaxTextureWidth); + height = min(height, (int)caps.MaxTextureHeight); return (width != oldw) || (height != oldh); } @@ -516,22 +515,18 @@ bool CheckDepthStencilSupport(D3DFORMAT target_format, D3DFORMAT depth_format) D3DFORMAT GetSupportedDepthTextureFormat() { - for (size_t i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) - { + for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) if (D3D::CheckTextureSupport(D3DUSAGE_DEPTHSTENCIL, DepthFormats[i])) return DepthFormats[i]; - } return D3DFMT_UNKNOWN; } D3DFORMAT GetSupportedDepthSurfaceFormat(D3DFORMAT target_format) { - for (size_t i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) - { + for (int i = 0; i < sizeof(DepthFormats)/sizeof(D3DFORMAT); ++i) if (D3D::CheckDepthStencilSupport(target_format, DepthFormats[i])) return DepthFormats[i]; - } return D3DFMT_UNKNOWN; } @@ -572,7 +567,7 @@ void ShowD3DError(HRESULT err) PanicAlert("Driver Internal Error"); break; case D3DERR_OUTOFVIDEOMEMORY: - PanicAlert("Out of video memory"); + PanicAlert("Out of vid mem"); break; default: // MessageBox(0,_T("Other error or success"),_T("ERROR"),0); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h index bd55c87819..d1e7eeaa91 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h @@ -75,7 +75,7 @@ const char *VertexShaderVersionString(); void ShowD3DError(HRESULT err); // returns true if size was changed -bool FixTextureSize(u32& width, u32& height); +bool FixTextureSize(int& width, int& height); // returns true if format is supported bool CheckTextureSupport(DWORD usage, D3DFORMAT tex_format); @@ -115,8 +115,8 @@ void EnableAlphaToCoverage(); struct Resolution { char name[32]; - unsigned int xres; - unsigned int yres; + int xres; + int yres; std::set bitdepths; std::set refreshes; }; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index a8343d7987..9510ad444c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -365,10 +365,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, flo */ void drawShadedTexQuad(IDirect3DTexture9 *texture, const RECT *rSource, - u32 SourceWidth, - u32 SourceHeight, - u32 DestWidth, - u32 DestHeight, + int SourceWidth, + int SourceHeight, + int DestWidth, + int DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma) @@ -399,11 +399,11 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture, void drawShadedTexSubQuad(IDirect3DTexture9 *texture, const MathUtil::Rectangle *rSource, - u32 SourceWidth, - u32 SourceHeight, + int SourceWidth, + int SourceHeight, const MathUtil::Rectangle *rDest, - u32 DestWidth, - u32 DestHeight, + int DestWidth, + int DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h index 217ddf069b..882f112ece 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h @@ -65,20 +65,20 @@ namespace D3D void quad2d(float x1, float y1, float x2, float y2, u32 color, float u1=0, float v1=0, float u2=1, float v2=1); void drawShadedTexQuad(IDirect3DTexture9 *texture, const RECT *rSource, - u32 SourceWidth, - u32 SourceHeight, - u32 DestWidth, - u32 DestHeight, + int SourceWidth, + int SourceHeight, + int DestWidth, + int DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma = 1.0f); void drawShadedTexSubQuad(IDirect3DTexture9 *texture, const MathUtil::Rectangle *rSource, - u32 SourceWidth, - u32 SourceHeight, + int SourceWidth, + int SourceHeight, const MathUtil::Rectangle *rDest, - u32 DestWidth, - u32 DestHeight, + int DestWidth, + int DestHeight, IDirect3DPixelShader9 *PShader, IDirect3DVertexShader9 *Vshader, float Gamma = 1.0f); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp index f1d1fa3133..1903bce989 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp @@ -44,8 +44,8 @@ FramebufferManager::Efb FramebufferManager::s_efb; FramebufferManager::FramebufferManager() { bool depth_textures_supported = true; - u32 target_width = Renderer::GetTargetWidth(); - u32 target_height = Renderer::GetTargetHeight(); + int target_width = Renderer::GetTargetWidth(); + int target_height = Renderer::GetTargetHeight(); s_efb.color_surface_Format = D3DFMT_A8R8G8B8; // EFB color texture - primary render target @@ -161,7 +161,7 @@ void FramebufferManager::GetTargetSize(unsigned int *width, unsigned int *height } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const + const MathUtil::Rectangle &drawrc, int width, int height) const { D3D::drawShadedTexSubQuad(texture, &sourcerc, texWidth, texHeight, &drawrc, width , height, PixelShaderCache::GetColorCopyProgram(0), VertexShaderCache::GetSimpleVertexShader(0)); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h index dad5eda513..5b5993a12b 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.h @@ -58,7 +58,7 @@ struct XFBSource : public XFBSourceBase ~XFBSource() { texture->Release(); } void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; + const MathUtil::Rectangle &drawrc, int width, int height) const; void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void CopyEFB(float Gamma); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 8bd5cda969..f750313642 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -288,10 +288,10 @@ Renderer::Renderer() UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); s_LastAA = g_ActiveConfig.iMultisampleMode; - u32 SupersampleCoefficient = (s_LastAA % 3) + 1; + int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoefficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); // Make sure to use valid texture sizes D3D::FixTextureSize(s_target_width, s_target_height); @@ -305,7 +305,7 @@ Renderer::Renderer() SetupDeviceObjects(); - for (u32 stage = 0; stage < 8; stage++) + for (int stage = 0; stage < 8; stage++) D3D::SetSamplerState(stage, D3DSAMP_MAXANISOTROPY, 1 << g_ActiveConfig.iMaxAnisotropy); D3DVIEWPORT9 vp; @@ -468,10 +468,8 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) // if depth textures aren't supported by the hardware, just return if (type == PEEK_Z) - { if (FramebufferManager::GetEFBDepthTexture() == NULL) return 0; - } // We're using three surfaces here: // - pEFBSurf: EFB Surface. Source surface when peeking, destination surface when poking. @@ -695,14 +693,16 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection) } // In D3D, the viewport rectangle must fit within the render target. - u32 X = intendedX; - u32 Y = intendedY; - u32 Wd = intendedWd; - u32 Ht = intendedHt; - + int X = intendedX; + if (X < 0) + X = 0; + int Y = intendedY; + if (Y < 0) + Y = 0; + int Wd = intendedWd; if (X + Wd > GetTargetWidth()) Wd = GetTargetWidth() - X; - + int Ht = intendedHt; if (Y + Ht > GetTargetHeight()) Ht = GetTargetHeight() - Y; @@ -907,14 +907,18 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); } - u32 X = GetTargetRectangle().left; - u32 Y = GetTargetRectangle().top; - u32 Width = (GetTargetRectangle().right - GetTargetRectangle().left); - u32 Height = (GetTargetRectangle().bottom - GetTargetRectangle().top); + int X = GetTargetRectangle().left; + int Y = GetTargetRectangle().top; + int Width = GetTargetRectangle().right - GetTargetRectangle().left; + int Height = GetTargetRectangle().bottom - GetTargetRectangle().top; // Sanity check + if (X < 0) X = 0; + if (Y < 0) Y = 0; if (X > s_backbuffer_width) X = s_backbuffer_width; if (Y > s_backbuffer_height) Y = s_backbuffer_height; + if (Width < 0) Width = 0; + if (Height < 0) Height = 0; if (Width > (s_backbuffer_width - X)) Width = s_backbuffer_width - X; if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y; @@ -1149,10 +1153,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons UpdateDrawRectangle(s_backbuffer_width, s_backbuffer_height); - u32 SupersampleCoefficient = (s_LastAA % 3) + 1; + int SupersampleCoeficient = (s_LastAA % 3) + 1; s_LastEFBScale = g_ActiveConfig.iEFBScale; - CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoefficient); + CalculateTargetSize(s_backbuffer_width, s_backbuffer_height, SupersampleCoeficient); D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); D3D::dev->SetDepthStencilSurface(D3D::GetBackBufferDepthSurface()); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index 08c1ecc64d..0e37c3adb6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -299,7 +299,7 @@ GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_r } void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const + const MathUtil::Rectangle &drawrc, int width, int height) const { // Texture map xfbSource->texture onto the main buffer diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h index d077b2f2ac..ffe3399705 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h @@ -63,7 +63,7 @@ struct XFBSource : public XFBSourceBase void CopyEFB(float Gamma); void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight); void Draw(const MathUtil::Rectangle &sourcerc, - const MathUtil::Rectangle &drawrc, u32 width, u32 height) const; + const MathUtil::Rectangle &drawrc, int width, int height) const; const GLuint texture; }; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 3f62db8787..e3c35a6511 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -323,8 +323,8 @@ Renderer::Renderer() return; // TODO: fail // Decide frambuffer size - s_backbuffer_width = GLInterface->GetBackBufferWidth(); - s_backbuffer_height = GLInterface->GetBackBufferHeight(); + s_backbuffer_width = (int)GLInterface->GetBackBufferWidth(); + s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); // Handle VSync on/off #ifdef __APPLE__ @@ -1047,7 +1047,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Textured triangles are necessary because of post-processing shaders // Disable all other stages - for (unsigned int i = 1; i < 8; ++i) + for (int i = 1; i < 8; ++i) OGL::TextureCache::DisableStage(i); // Update GLViewPort From 246b11791bb415060eba52ee415c116ea64322ff Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 16 Jan 2013 16:14:23 -0600 Subject: [PATCH 444/627] More attempts at a Windows buildfix. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 43 ++++++++++--------- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 24 ++--------- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 3 -- 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index f862193ff9..e285a33729 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -151,13 +151,6 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; HIDD_ATTRIBUTES attr; - // Count the number of already found wiimotes - for (int i = 0; i < MAX_WIIMOTES; ++i) - { - if (wm[i]) - found_wiimotes++; - } - device_data.cbSize = sizeof(device_data); // Get the device id @@ -187,19 +180,6 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) if (!SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) continue; - // Determine if this wiimote has already been found. - bool found = false; - for(int i = 0; i < MAX_WIIMOTES; i++) - { - if(wm[i] && strcmp(wm[i]->devicepath, detail_data->DevicePath) == 0) - { - found = true; - break; - } - } - if (found) - continue; - // Open new device dev = CreateFile(detail_data->DevicePath, (GENERIC_READ | GENERIC_WRITE), @@ -391,6 +371,26 @@ int Wiimote::IOWrite(unsigned char* buf, int len) return 0; } +// return true if a device using MS BT stack is available +bool CanPairUp() +{ + BLUETOOTH_FIND_RADIO_PARAMS radioParam; + radioParam.dwSize = sizeof(radioParam); + + HANDLE hRadio; + HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); + + if (NULL != hFindRadio) + { + Bth_BluetoothFindRadioClose(hFindRadio); + return true; + } + else + { + return false; + } +} + // WiiMote Pair-Up, function will return amount of either new paired or unpaired devices // negative number on failure int PairUp(bool unpair) @@ -409,7 +409,8 @@ int PairUp(bool unpair) srch.fReturnConnected = true; srch.fReturnUnknown = true; srch.fIssueInquiry = true; - srch.cTimeoutMultiplier = 2; // == (2 * 1.28) seconds + // multiple of 1.28 seconds + srch.cTimeoutMultiplier = 1; BLUETOOTH_FIND_RADIO_PARAMS radioParam; radioParam.dwSize = sizeof(radioParam); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index b259cde2b9..d38eadb0e1 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -71,11 +71,11 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); #ifdef _WIN32 - wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition); - pairup_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::PairUpRealWiimotes, this); + //wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition); + //pairup_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::PairUpRealWiimotes, this); + // TODO: text if can't Pair #endif - // "Real wiimotes" layout wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Real Wiimotes")); wxFlexGridSizer* const real_wiimotes_sizer = new wxFlexGridSizer(3, 5, 5); @@ -194,24 +194,6 @@ void WiimoteConfigDiag::UpdateGUI() connected_wiimotes_txt->SetLabel(ConnectedWiimotesString()); } -#ifdef _WIN32 -void WiimoteConfigDiag::PairUpRealWiimotes(wxCommandEvent&) -{ - const int paired = WiimoteReal::PairUp(); - - if (paired > 0) - { - // TODO: Maybe add a label of newly paired up wiimotes? - WiimoteReal::Refresh(); - UpdateGUI(); - } - else if (paired < 0) - PanicAlertT("A supported bluetooth device could not be found!\n" - "If you are not using Microsoft's bluetooth stack " - "you must manually pair your wiimotes and use only the \"Refresh\" button."); -} -#endif - void WiimoteConfigDiag::RefreshRealWiimotes(wxCommandEvent&) { WiimoteReal::Refresh(); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index 2b2e60de4a..fbd715bd40 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -24,9 +24,6 @@ class WiimoteConfigDiag : public wxDialog public: WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin); -#ifdef _WIN32 - void PairUpRealWiimotes(wxCommandEvent& event); -#endif void RefreshRealWiimotes(wxCommandEvent& event); From 8d9f0c147c65c4ffc633470b25272cf2fed2d476 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 16 Jan 2013 16:45:03 -0600 Subject: [PATCH 445/627] Actually add the Boomy theme to Themes/ Right now the icons are huge. Resize the PNGs to 24x24? --- Data/User/Themes/Boomy/README.txt | 1 + Data/User/Themes/Boomy/browse.png | Bin 8 -> 3606 bytes Data/User/Themes/Boomy/config.png | Bin 8 -> 3399 bytes Data/User/Themes/Boomy/dsp.png | Bin 8 -> 3761 bytes Data/User/Themes/Boomy/fullscreen.png | Bin 8 -> 2477 bytes Data/User/Themes/Boomy/gcpad.png | Bin 8 -> 2842 bytes Data/User/Themes/Boomy/graphics.png | Bin 8 -> 3462 bytes Data/User/Themes/Boomy/help.png | Bin 8 -> 3638 bytes Data/User/Themes/Boomy/open.png | Bin 8 -> 2543 bytes Data/User/Themes/Boomy/pause.png | Bin 8 -> 3293 bytes Data/User/Themes/Boomy/play.png | Bin 544 -> 3306 bytes Data/User/Themes/Boomy/refresh.png | Bin 8 -> 3647 bytes Data/User/Themes/Boomy/screenshot.png | Bin 8 -> 2477 bytes Data/User/Themes/Boomy/stop.png | Bin 8 -> 3088 bytes Data/User/Themes/Boomy/wiimote.png | Bin 8 -> 2741 bytes 15 files changed, 1 insertion(+) create mode 100644 Data/User/Themes/Boomy/README.txt mode change 120000 => 100644 Data/User/Themes/Boomy/browse.png mode change 120000 => 100644 Data/User/Themes/Boomy/config.png mode change 120000 => 100644 Data/User/Themes/Boomy/dsp.png mode change 120000 => 100644 Data/User/Themes/Boomy/fullscreen.png mode change 120000 => 100644 Data/User/Themes/Boomy/gcpad.png mode change 120000 => 100644 Data/User/Themes/Boomy/graphics.png mode change 120000 => 100644 Data/User/Themes/Boomy/help.png mode change 120000 => 100644 Data/User/Themes/Boomy/open.png mode change 120000 => 100644 Data/User/Themes/Boomy/pause.png mode change 120000 => 100644 Data/User/Themes/Boomy/refresh.png mode change 120000 => 100644 Data/User/Themes/Boomy/screenshot.png mode change 120000 => 100644 Data/User/Themes/Boomy/stop.png mode change 120000 => 100644 Data/User/Themes/Boomy/wiimote.png diff --git a/Data/User/Themes/Boomy/README.txt b/Data/User/Themes/Boomy/README.txt new file mode 100644 index 0000000000..97a5aecef0 --- /dev/null +++ b/Data/User/Themes/Boomy/README.txt @@ -0,0 +1 @@ +Boomy: Milosz Wlazlo [miloszwl@miloszwl.com] diff --git a/Data/User/Themes/Boomy/browse.png b/Data/User/Themes/Boomy/browse.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/browse.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/browse.png b/Data/User/Themes/Boomy/browse.png new file mode 100644 index 0000000000000000000000000000000000000000..495092f7b00075b2fd2e095299d6e36c169ecf10 GIT binary patch literal 3606 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 literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/User/Themes/Boomy/gcpad.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/gcpad.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/User/Themes/Boomy/gcpad.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd46e7ea2d6e7460662b273d326739278628377 GIT binary patch literal 2842 zcmV+#3+42QP)DZyIWI9WFEBI? zM(tGq019eJL_t(|oYk6Nj9k}U$3N%Xd*|Mn**~+fy>{G$tTCjC=${o8B1Ivw8zqVY zDCUU=S~-2;0VEP05K`3#^9ZOYL2AHAG=Yi+kV=dY6p2<{B2n6^A)DZ&X%gG(WWDz8 zdjHMt%+Aa?zw_ha+}T}drOeJ+sd}ZK=FX1h-tXu9zUTKl=gt~cDKW+gBJk)HM|!#7uR+mT=}{8 zGUL4b`oqu89XK0919YB$w2`IBH;pyZz7%baAE9#BG1Af7Kr7(7uyvEpwQDS1THwa~ zY99dSW!8Cr`mw*9KM=&wb0Da`C?QM}Af%S!mp?%=`C%x29?}t@3v_@E#m`*ht~>vW ziHooD#_UzR7l3KtMd0*70EWuI`uR_tO_JpK#2QSNkw5%P*vVf7dvaI!_GM^a1L;6s zgYgDjyGZLl{*_l=zDm2@>)YyyGtXWB>tO+g%792X2M~gx{@^cQCm#X(QP54;{%_d$ zF0`A_=|Hy|BLH{aOZ}4%@R80p`0mSd@nWjyfT02Q-3Jz)zW;GAVaoe}nHVEIdJoup zL0ho(RoMCt_ztMX2qC_TgUhqf-lTEQNe3_02*dKFaYOe&X?<+_QFEELSJ~l(xhn|?OF}$br>Cu z8A#KZp>CJWwJn@;h$tcG+y@5Wz0CB>=*@SRVd+x*pl_9;h@wYEqVUnt2vVs;@x30j zT3nr5MtVMGK!(r2FmvF7F=pKu)3`pr!ttf+q!Z)2;`2P7_kogR*Z18nY;NLK)_Cjk z5?%xeVLhl`7#3jP8F=97cQ(A23*HNz?H+HxatSt@aSj+01!vi=c!=WLZD=-OWrgp3 z?=r2;4k7`OaN)Q9xxMj$0RT9WbIuFBo@e3O8jF_}U}GbS?DqiYVsB`*qVTmfSX$z} z@4w6C%S$-t5eWe2h7~_Fz$4FIz53Q@xZu6e>-LzPeUJIqufX-|u(SlLt5NXU8mz3q zjT z|Li1%D9noJ>5V_>?0a*wZ-9sX{->V+ zo(n^(gm9wsXMP|n4b;f)`_df^W6U{YAW02Jr$%__&}aC>*u!`n z|9Cjpg!hJdjNNs^EyDc0neV-{Hp_!~VSG*o$< z0k@e00feAujiF(T(l}D%SnUL-4*v%2(BjMQ{t@3={Wl~i5&}Mi@;pY+=>4F(VNp_R zsiYZsmXW3jy^}&`)#2Mf>@<9zA-NZE5qh#jh~4{4aF9r{_IA z5qcuHAb5!|J}7<%C?Kjt*IM!{rCt<_RqKq8*2r(q0D~%1>2KSCHaYK`f$3+DO&epT zj8XF2GCow?&GFhv-rl;%-(LA*e`8*bZrBwXv;+t-GZJ4z36La~N|sT}bAl=z@5m>c z*ee~pS5$crm_0Cnh(2yiT;^z1`MJh@w57#YuKYP2=TO)KP)0e@een`B0+a>AT1zEK zsaA4oc@99=dGcC@DJn z@9)hBBix!f z5JH#&gAH-H(A90;+rCViW{3nd2og;B=mb#3n0Ou+(}u)avNWa0DvVZZOpJ_hXmpgZ zT8+dQdfxBAYuU{QJqF1D#wfmP!B~FKyofg)Mv5vD0!{>9R-K@6=|K4y$Y4nlyJMSr zUNBaxF;TBGR;!X{l~}#JXWKct&LJHcSp1*>bH*@b+CtY0KiGJUY9%L2Q;adu<03m1 zCyrk1w24i~(u6#X)ux{3)Qg;2`F#n2cDKvM_BI=>7OhSPw?adL{%2*I_B!KvkI>9|u#T$Shfskl2L8TCCY4z6@Lb-2kq% z%vQI{`qmbU%_i4YS6N=%VEa;Uum1x|?% zMWwPc!Wa{4et%+$5JJF<&~=VhX`7qPCW{*ztX$iq^=60Qc1C}FP=J9}qm!Q>c@UT} zeT!H_QcE$DhGHUTv|eSjTBV-n)Jl*fNwCBo(Vy&{UXQJAm(6xN`hLB|);nD~OO6o2 z-dmp0^ZHM>3;^Kp=W1tx=Xbtnz!-zI31-}2M-#GoLOPO=rRk2HAoc?%LeG1;TaM0Z zkM6Rkw;K1x|4+hGdS2hR1MeFEVB!y|A1@(xnoR%6d4w`M5o-OmPDZyIWILYFf_s9 z#IOJW4A)6SK~#90)tY;79oJpQKj-Ydd#`k_q-$B0?8Fbnj!9ZOvGSNgz{QGbaiGKw zFvFys4u&>?GPHvW1H-_8F&&=MXh1j|BFFC z`rH4|kI?V+B=~{A+9J{Z*x`Ts^Rf5(F7;krXxBqu>_-?77yt%9G6*}GKrf;9@h;OB z$qJlARrTi&L$z z0++ZLD3`DcS(2_p(y4j(tEJb72#5jU8^FFJL;JJWMBu*P{qg|tWnd6gc-_&Oxnu`( z$xas9(i9RYs%X}vZTi~c^tRjdw8e3ap*tBTlZfNEhMFrl#^AWd@4H;iE>NmeDOGFC ztf% zSd6#vtGBG;BkQ}_xxNblY6ctwZ_bq&&sRA+U*h%21;n_#F1^v%7C% zRlAJ_3~+cN$19TsPR*7mR*h$B*B}8HV?5st!7X!c+_3+*`aA4Rze%-J<+18E{(jvj zXtU$2jknV~a+dPURaB`0B6l1a+JB;@1$52bBQXm}#JSYd#~o`|@TptZQx^DPzQ&6) zIfkdQELL3)OH7DsL0mx`|7buQ0b>v)fbjx3XvX+z5R?+oaG>%O`#vy3^22)(ZS(tw z{|hrZ#8`@tjh4Cip#9y@bv5~`I?JK zD&jE8D$1Nh`H3NZ>qp~UhCXbYu;U!Q%I#Ew70ou8rjy{9N$ znd6ryD|~JH=MW0* ztX5$*9B3KDAN%ZA2e5Po*HAPTX0gJh**Pv3@}z1NjGe&M7GYXd3KS@%Jy(bWXg~KW zFd8x593X-32ahSAfYzv(;@fKm>3iY{O5;~?9hd4tm1jQiYnXBkw_KxCb&#rq_9nZ` zy$>G992wf5t+#+;2Lf(!k+zD%<}-QPltA1v;#??G~>jOM;&+k#2D`4h}te%|0%@@&D zSbuH<{=(KEY0REH!(3j#bT-K`2WejdA6f^rR2 ztzla>##YfvX0XWu3i?sd*|U-@+iqr+7}|sP_@qVPr#JRuMA&)TI>ZQN17njpPLE9S z#@iPeAD`mV=(tBHX3-PVU|C>k+*pi7+x9F0U<8cNRxV@JYT&p~b5S)1T$daAR`T;7 zzLVsZojm@wnjFU_8x*@zfnzNUHQ%mf!MPIGZ$hWTucE92u>T9a0#1_B0LgK`aaJjSMt>)5)f zkJ~r*vF^qmvQCndC7NWU!G-z}KnXY9bOTA>T>viRtDL`ll`B_fxqRg++4%w@!YB9c z!8PET7_NaBLK2q_?a;1WcHP#8Z0+^ZstCE7Mb(8j-yWw}voIpGTMib2tz2%ur7v_- zV@wFFXl#^%bXSIj?0j%}pgsmf`cWV#5(%3)-av|)ktZFl;x0)*Vw+b590$BzuGjR!URVYb51)sw~eb#J5^$6 z9U1n7=eya}vkqkyups7P#Su2BBMJxIR|61BjfD363O zkPw3r!}<+3GzCtu+RD!7Nu@hDe)J?07bifVQZDoI;TIS=cY$Bn{VQ1UM6lQjTdo!h zhn%b0;jl`1p%EOlULxWBT{SGHqPr5olFk^0pFhe%sqAGK7y4GO^!zwzzPX=%@_Al< z;V8q;zUa@sz8eT!8NbBPzkHoSE+4vCv^7eY?0n!lGQ|X~g#nfbh!0*w7#o@3kN@s5 zUOhF+_)LLCuY_%Cx%nL5f8pp7a3oygiU{4SdPt=^@mG|~f)5x3nzxicH+u6UF)ssC zSn~f+B3Y<@^o3G|e?0Wvh<+MH8cu@+x%bPq6YRWycU_`G5d`GPE?`QWgsB>um|V^Ik=( zp!QCJy&hvET$oK>xT6Hg?(ks914^!FIVeIkMTh(M{h(1^W$MJ6J{z~It; zOcM(LZoPdA{Xew{+fFii?mTBtou*o;)DaN8bXr*~hl2@_o1JFW+I36WM%8OR9s@h( z6VaY!z?(a+PR%qz$<`4F5Qi3sY%T#Lk_mQy{5M$H*Bb_9?~QBO^uZ7E^yB~TlaM-h zYTT*IUY(+E-MVJ*+5;apt3G%In7%UE(gM*mIxLYC8O`@1!q&U)U`21Qw~&{m8f-;R zFCQAbw=TU#pNn44&P>($d7yDS?zKeRw?Hfs#Qp>^`qtSx?LRuSKUYTpkrOQQVno<- z*WDiQz*xS4jKHQXTU&tk?(nX8u~o`viCgu+6Om^7q(cAqU3j6e$lT0qllJQfeD~{r zk`tdqNF-u~cp?$v3P=bnO`%~HYi$8L=>=~TbaEN+mS6t_3Oe!X>y7U7WN=cyBJ%=y zKt!72cXo1$m8<*wf^Uhv0jia9WG1c~kiq-!=Z60EbY;5gO9LxhiH0dN%sSM&>FMK5 z1csX|;Nh1;616~J1tYxn(n}$}APs_N<}=6tXW1Coa_4QVT-mkc<3aP?C~nn*2auq0 zb>Y~{KWKEHu}6pYpKM9s`EUGb@PVNz4lbTM$1Bf07i!pFn{(#)F z;AobKMS-h8fgW(jfaAc-bdKk~^`DK}58Y=Yt#;-_4g!aQ+#T@--Z*-UvA56Cv$_wv zEydNIXQ~RzGB`|vaGT-{wZ#KdMI2i3T zZSIZ$4}bD+UT2wDXyDX*rSYOa{)U_T+56ewtgr7QV;F%-#bM-!) z9oql-pwrR<-aF;DfMErh>-vTkxmP0Bl5I&o`oJ!)n3HO%zYo(b06zBd#{|GoMCaX%-GorOpK1PSZuM~ z&@5SCFdDqe5~w5b@xR^x9Kzc~;<~Ky{>dR=Uoi8+5_ourZ)78p^G`o`U@xBe`rmhW zt>pwB@Iz7HP!As7y_&P+$cXbfuFSeFN0s<3w?C1ZvX%Q07*qoM6N<$g3d3d^#A|> literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/help.png b/Data/User/Themes/Boomy/help.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/help.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/help.png b/Data/User/Themes/Boomy/help.png new file mode 100644 index 0000000000000000000000000000000000000000..2b972ac7e17f07b13cab822e63aac65ce82588bc GIT binary patch literal 3638 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 IM6N<$g6C@06aWAK literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/open.png b/Data/User/Themes/Boomy/open.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/open.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/open.png b/Data/User/Themes/Boomy/open.png new file mode 100644 index 0000000000000000000000000000000000000000..77cacb0c0ede55729626fded5df1e8c75315c1b8 GIT binary patch literal 2543 zcmVDZyIWIIXFf@5y zqtyTa2|!6iK~#90?U`$ATjd$Yf5(?3P1+=`*QM@&EsSZtrufNh$d#oA1L0@Lug>0w1=0OyI+|KtCV) z*RQp>ki>-`E+y(*5|@(0LNG2ROG2{nh40A44;pZ%X`N;C^{2G^CCo|%aM}clkRSxu z=MtoFovY*RcRebP_4C6|e@~kck{Kb1oA){P;LrN|ZchUL{;hTjm;nca*(8vggx>~Z~oQpb$25-Hw#LB6&2+5L^JR(e> zQgT>GX52t6;NxRHq7exC1uLsyY}=nX`1N1NHBM^XXpeL^T{{PaAdUtaaP8+GA{@Wo z1ZytKJUaK@SOoLxjFh}+eMGvxGCUk$a&myli2(bjGzR>p5K?f{_3*bBU?T~@eVo)5 zJmq$iGRZgur256+;4Z?`*DCO`496zyOV-uEfS-xTZl?C{Arc8PvP+s` z)Xif%wi^yXLJ^32VgLE>88^MU^z8@9b5esNvdsf|G^kZ8>PHYNOJ&nV#Jpyak-{c3 z8X9HS$PnS^7!#4*jEx6ffX&cDb}YxHCT*|90eu$_R*rCW&=LQ~T&kZ$lDM=X-Er*|B%USyORMHm}_ zkzFt{1OtNugeD?{!Xd(wVRj7#sFaJexX791QvAnHanJX^rafm9xbs``rRN`4Ng`Vf zXw^(0(xrOS%e-4D?JHU9Zw;NWxd$#DN=cB|LSA(Y;e3O5`?9asKo_FtTq`DW(Yo z!0%Up{eDMBAz(9SCp+B)1bKi$CZh;g@oU9)SJ+q{Py`ya8hUyQJ!O#EC{Qjp7#=%7 z^qRXl{OOwsPu)N;7@%BOLtlTLmDip@-+U9ic3b@}?Ueg@q0WRsdd(E*f0xh8kY-RFhFR(n&O%39jCO8oA3?n0FaQc;V9JuZ-4u9?^;2Q*O5F@k9%JBt~Z~Yx3bJi2EWtRGy zW|Gj_!CUHED`zMY62J_fwoVKngz9bp`HW6vU&tgNT*ns4^)#cAPjL9oAAoGosBClM zuirpVyuKr7PZGZN@Ug&KW^Dx5lP*GV)Oz2ui~`iF)$Tm73FyQQeHo+*vlD-rL*IDg z%E6oJTi`XH;|;)`H@3@Qlx+g}`8gFn&@ocpyC7e(29%tY2cqU2TQ$nXZH#=GSo{_c zRo35p_T7QU0q=8#kLHSfYiQck&1_WpV22NQjFgra>eafd7dUy4O5_;c6Jd1kJ`iPA zUORf_;9a5P_d7MeO?|Wav;=Hq+Nw|6*xEJJ3pL-8)k`k*9Z#&U<%v$ufUKY=PEaYP z`va`C$GTPbEdmw^4M#H}Af-d2=~ScnIi7Rh-^&AefLgU_?kb(#W4YA8DAbs_;}#HQ z)|X%C3A&4b>)hveYJI2r64&%5Adz*z(-A)21SD$`$m;d3Bu-r_F}yp(XlO5uN|waR z%R7U11NU_#tzUV;R^A=^LhXIZRmc_E;B`Iq=ptY>Gk~H|Vb5+KmQVF;h3J8sL6k_W zyn02Ty~4=v>cAFwDV*59nCe8wV&`1kGlUd@Dtm_gASI24B$;gRscT~(wpl&(37p76$BAHmVOQFAG z8ys*YXIF`IcUTi_v#H8tsjTY#@iSfE0Uq;G-_rw@7bK83)az6lf&&32qq|vOecRr% zxHn#%ibH!-vW`|mYBnLW1*sgQwtB$>;8-v9dlQf>Nth{YtJmo)L}OzhiX<+qw^a`} zflhPpCZ&W%3-r7RI_FGPJJ=HNrJX+DNuXs`BFh6A9d0@@Og@{TUaPlFOm4-&-tIb+ zl!SB+(pwJbKL3_G3Vd^ZjzTZ>dlC??UT|?kCEVnM#<_F4vtQ}h^16Ww33|Z{ku4SD zR;9U&t)Z&T6Z3Oi06d?EUY>w-2vqA33I#!wNp6<#`&|vkMMO#!9+|uX-E8))_7ZA5 zJZf)~F9Z7W1Y90CvjXv0i!Hrqmslx5n&7t#$QIf`_o4O@Dnu6hRr<;ZsF5uXj4!W3 zHY~Z zcppH!ttSD1g$J~Gc4#6VW`SO8+qb{Zpxw430ZwWxJjow``**m<8VdAL_pJIsf_B@^ z1Wa3aK)a9jKOXX^M9jaN%JF_$Uj+W2?IZt3_eY+<{{TB2Hix-OC)of1002ovPDHLk FV1hQ}!8iZ_ literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/pause.png b/Data/User/Themes/Boomy/pause.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/pause.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/pause.png b/Data/User/Themes/Boomy/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..433a6cc3407e73fbfca5893a45e66df75fddf5b0 GIT binary patch literal 3293 zcmV<33?lQ1P)DZyIWIIXFf@5y zqtyTa3@%ATK~#90)tXCeUDtJnzrFW)+=nP#QX(lOmMlfERW(keqN5CID?m_B3dpk# z3?s^Ifsb5?wq^foV(oRgY}P%6b#t5v3^rcg=|Mezu1mSyz&UAo;qolc8Rr$e4+ljPpD*8WAB za=9SjhGZT^;<4Aj+i$;nLMe4oYkg2_&CJXUPd>Sq-MhD ztJSB`Xfrc2O`4{(T5H_ByF`*C0M9C={woaaUuBto4NwJ%A(1V|V`bpNh5tOKl=?ov z+}teBJhPvz#l0k|0*9g2tqi>V_PZCg)~Bk~ zD$hRq3;m#aBA1C8qYuf7548Bi-^P3t2v8{IY}ZY zr2vI0oZX*Qag5>xK%=q7uYdhMYiny9J^K4-ZE#MQo13RpstkYk6%qRrz}$C{?Gt$O z&3`{5BBx5F5?}xN5oTrroP&B@_~;{HFnAPwMuhz9@f#7ieS47)Km3rxho2tV@BI8c zK`>JGpX7P(6+llGy=@VA%e;^DMxVaR^-w)r9 zIr#7T{SG&8UT5FFFCro+rJ0?bWkU96v#fh)E1VC>fLs)Tqeq`&|Nb)0!HpX!tE+iY zi0r61dGLaWjEIbZj~V#SWW#qN(CM^kHrEKl5+aT`F0o_B)Ns-+5%-sDA)`%Q==InC z`I}nn%~yeswnach&WQ*|kA8`r zJ0k`I$Kv8T&MB0V5rOyK`){sZ{SDvv#vcNEfJ0QP^Q5U8W#h_~4_I9MsF*VxRhE}i zM8G*I^e;G<ASo&Q@^_Zr$pWWp)(( zVFH$xZu9cXCpmIt|LFH=YWc-4mJ0%oMq}lHIZ2Z9v!DIXC_|ovyKg-yDwQg|Zo9~m zJ9+x_kH2@noj$MzMC6o+W6z%5Oi!0-w^P>E)+d@U@AcL?*47#ufPr_KA$Sp?-EKZ~ z&Tt+1n>!FeD}_R+R?2`HivP)8uYUY~yc-CdJNFMY5%)q6gv`#)6qY#z?}~!tiF7(G z=I3jOP)NZat=6z55c>Tdd-qO1FsEMckEAnR^j`Z)6;+^+Q5=^*sp1-P@_qsvB;=et zr?pV6R;X4ZvdmGh_X^E>iyKC;+wJhg6SFuUv{Cw#WZX9QdfiRu3Xt1V6n&utE`NO<*)e8?=T}DW1p>wTEWF@1`_C5KyUk` zXrG{HHrFVX;s@m6^*vm`txf0Lxzj3|JBM?E!eNy1;El#;jUYI@r2JhsZ#wT=1Mc`x zht5H}-J6KKzs&I5?|0d|cWxBju_cb3WqrNB#hh`sDq_(}p%oZy2u*-iK1*7;kz;L( zfVVSUfS`!}WT!bMQ7#7~SJ_HJl}fnjoIIbDkH4NNv>zCa0*rR#PLXBl7Jb&H84#3m zV*=JkfFc9q78z=_oukM)H@-%a4fYEX#0X z0+%0|0fiz-658!vk&$sv?^_8!Hw?=gqC31t90&Az>xc-(#GB6X>!O9ip_TUFgMcV7 z1jdlr9HkWsMX%SL%s}&g0vl}9Id@4!NRt8m-a5nGoD#tm1uW0=!bTep*rRhkYSvov zeCs*Jc$YCs5e0@)6i|vo;xNDzz!i!lO^WD`2wZv;fu?gpuh(I*Cr>8JV6Ne#{IHnv$l)`{82vEB491+%PP6oFO*TF`(JsFtf-xpJFc zZwzo{rNy;tcgeDxG|ez3;_~GW>2%gdbM7szvb1=QYAIr>60@TmQ;I?YKaL!VVxbqduL(cZ0mjk4?LAP^U6;?4#VK!7x(RB-~2pL7!YU;ct6gqCCx3l^@p_% z>wH17h5LvTocJDxqU+Qs0;326Q%EPG9EC(-fL4m!IRm>o|!#FfkvSTw09$;eA==iefjV#7Nvaw6a^Xu#<#^r z8I0CMfguh9N>NB0hD4!3DMelcA@jkT`hY0Mk3iB%&a|6hwwQs*!%glX2o5%1g~J(m|TBo~E?BU2ZHc z(rmXGBq_Pg$?XXIPZt)>e(Pc2;So=#17l7lS$0W8jyY$!dhHtXduG`?H%ldsi9$;h z7(!z(TA`IjsiNZi!ew&0{dJaBmRYIS=?_xUEcI*1Js$W+W&q&jZ~sj# z&GSovF~>$8UM?}Wdk-_U8s$<#$Yg@ z+w0QmbV$;aL7I`}nYUhNM@6t0=N1;uzPerT+a@p^-#YciIi=M1jn)|Bi&Ic|y5ESH zk%Yi6Sm%Z|n~&_)IX99^ar^7QsfC5JzkD3GJfP(+_njvf83~lDgwjt;)_3cPAN`lrC(4=)wCXNz{d}fhk%_Egblzi z1LxVILHmCpFgad)@dqb?KJ`tD@jLrV{bw~k_y6qi bxhL>{%8v*xMYfFQ00000NkvXXu0mjfRA5Ld literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/play.png b/Data/User/Themes/Boomy/play.png index 678dc345b70d5891518b6ce42edec8b6228e6fb8..87fc7a1ba94c756af514766b8f7feb47853c8925 100644 GIT binary patch literal 3306 zcmVEWDZyIWIIXFf@5y zqtyTa3_D3gK~#90)tXz3UDbKVe`~G1_c>>d$38RTu`$8M!~)9|!EPc&vZ{iUhxi4> zNIX;mp*V_Ka*?<^@Z?l+gi<0T3U(`1X&;PK&1*&42hv1Ew$n(o0?8y0@C6v#gD*34 z=6){wvc9hmd!NhLGvhHtMJ#FQ-1q+fzyG)X-?!F`QB}Uk!+zcXKI;fR&znE_=exzpbJ=aPgo z1p(=hxfO}qUIWLDojzcUIbp5cX{}{=c$mBIzJrmG3IhWHL0}02hxZ@?jYh)KQq25( zlX`uD;o%{YBw>DjmaA8<5yvsWgT|Qu2}A#PX=uFUzTrQXS#y55|JRBeb)6>d_A1dwkt?1Jwlt1siP=!xEnc%{O3+&o;U)O%OZrw@{ zbTj+mENeUk*#4roE&?yU_?vyI`igUo{rm4{csP&zrAwYGS91FUrIUdxr(*B(&g&kB z{Ih0rkxQ4x*|zOVs4B)-Mn^~KOZy{fx^&NKIM+}>PpHD4J@>MGdj%1=crjsSCMyb& z?-r+D|N1vH8cV2Zmq-tIk3s&PF8fRs78e(oo0}yJ%cu&aQke}K20LHcq$+>QDrvML zffrtQ{X43%9K@uQ+@5T$e;XJHT%=5-q^@ z-d|i?AWdUL^7m`CAym7{J`u-rE2^*}0aZP!s_fbGWj1b%Xt#xliB?}5&{H5!B{+ES z0nVNKBd1QCUZ%!!GFqgGDZtSMETW`orxqyAIjYqv#&o{NQ|lt|{PX{DNL6PO zts(-KFE>fk9^ejvjzt1I{P5TK@sA&6Xei>1H%{^4haaITHxcPqq@z$yLT*sZFfdRp z@}=}>;L`Q`nVC9w-8F&;3=IwP?6VK^*kgae zM;~3_%{Tv-X0zFid`F2+)H}_csuVXDP{kU9L8%T@0MkkSyBm$^eQOdpdi39Fs`5w> zgp7_37na$gzoYB`@1#&1CsZm?x3G!8*S~%r&p-bdcipv--~H}Q#>X%9snO|5S60QC zq6!#r&QU6rp__7g=tcs|S_u(-$XcaZ9iUo`NK;{Yx>5LdZgJ4_^B$nQ-{~Jw6!E?9 zeT(zwuP`=tipj|-cJIEIFm%hJFCwUD0oq`U!5V|8APPa?Fg*j-n~0``|UGKOk6Fl*;%~Oi#~?HS^{Tr)?qD_ z%cVYrsNI5q91u~0AYfpi%)&zJCdXOsLY_vWLAhMQdsdxM6!GnE@8_wf4w0q}KKS4~ z?RMNV0nNcXo6o>noH1Bqu_ljyk!c5Rr9dq&B&DL4Z?EV)y;|UDHXCf)HnOS${d3#4 z5uSPGQTFfO&BVlI>h;-N2?T4%2{>C!gSB}|^_=MDal;yreVsfMfrW(z#@KFd!t#D5 z|BbG=2G$zi{N~sA>Q{I3#vAW2IXQ?|sOX zE0cxAdbB83&KjJ_!I#2-YPrNfDIyF4tc4`=coi}))MsXilN2xA$h8TL`gGGoTgl#ypETwKl-oU2>vDoibVRQ zczJqydYa9{n~4I8!4lZqjhx8=r3L$4cYlew*#+Kz_bkm;3l+`V01UXiEq2Cr)20*# zl%tSR7!rjJV+@%Wya-8_kz}4vu1wI5V|=$yVtj1u$V!L7Hxp3RSG@SAlQdy!`Z}dM z?yEE+UbQlFfnQYtfFJ(gAD=bG{(U)$s8-7C zx@RY~!9glfSSVp})?%&c)|nh$F$x(vg6xJ<@Uv&FTkNv5W!X|@xRG|AVH+#dK_ zDgf}q@Bc$B$+DAyb9=+UQ3^u_DrL5eY-YGtqf#yrb{A((0L|MC(R|~RdQXyO%r7o7 zJ3q(t%nYqK2cBj{mF`vCb%S3Q0e~ModAt@U$!pfyhoaCC1_5CZ5QQNdH*BCfP-R1P zfGCV`E^o-Z&xn(hcDv0|V~P32MdBo(ous5$-q3j|+LAuI92-0G)AfR1H-XOh?%@}Y z8e@Lqti`#!I0c2L=Nl2%O(Dn^tVqXZv##BWNH<-I+m8c>$HtDFx*hPhO#tADCtlcV zjCsWxbHLc%#@iN^+7`CcIoA}GZj@!&Nga^)_pjV;)ISq}&UpOspFLy@hpn-X7-MR^ z4R~+I(*d0CC6)m{1H8g24ch+;f&TIM<3BqD>?1$+*jdcZm?H-~PTmfm92+}w@iX7F o7=NWFU8GbZ8()Nlj2>E@cM*00D$aL_t(Y$L*4_Y7|iv zhCgg9fRP>jT&;XqLQ$h2TqwR*HlzHYvic8h6~C%-s2o z%>?2&vze8MP5$oQd(QdJ{rTZvD>~Hm29Q#^t$t9C)F0~mMRR@wwZWT9sl$kfq9|@= zS+=IWIIU+{z&IizrF5&$oKpcU7Tr@v5fSQcN@?p%e{ign(pC+bboE^Ln_#Ge*=%-I z-L0>F_D)kDi_~}OSS{2~DW$u8e|@h1pnwR7=2_VJBR#OwtOq!RRpGhtSvV3hVJN&= z1SoUZJigE2hEO)^GguS82w4RWrf_8fmlE6&-Yx=+gzXdC4}?*(UU(T06+BtWq6!`h zMGhM|Yzk!sk6HkG0g=PTQh)DZyIWI9VFEBK= z`id|B01b~xL_t(|ob8%>a9q`Sz<=l5d-v``Pg_Q^jq!p_F)@SJHKf2awJOWc&rx=s812n`k)27oh#rDvW?1l!IPD`gD1w50)Gz^vt#cd$4R)N;<6-JUD zvb0)hA9wHL>mPSlmi&NZtd!|YznwFCSNEQKzTf%2^PTUUBPAmIUl#pQD{!%5e%J$Q zlS-mlUoT71B+-B-k76I1el$->pA>%a>Yhix3%QW`ifTjChh|e<;WI^@^*bz2qv?}B zk^KLP<_$g12cR~pHZ;3Yq_BW?SaHP)Zd`r?^P}xphQZ0Hle~HC4Gs?-rC6vmAPQ)< z$^)|f0~`Ie>H%`HL2|z+fVa@3uwliTtJwCN+gZ}Q1dYbPK-WJ82JcNB#?uVl@fa>(QOEj zfctL!D!UHSC3j1)$O@33LP8e#`BY+$nav@dz!k7%lNQ z5!0knbIBh($-lpRh*y66Ukv2lW2{gD5iHZ>eeVF z;D?s>(bR3G63Pra-qR9>|;M01s0F96m z_C&K{w0we?ZIiHVVvz`r>*7qf_-;Mi3Vre|8JvE@HnyfWWw)cqAtVEYQ^S)KCn~hG z#t4D{KM3%BpFo5WXNZbZYq(Gn*mE%e4GW|Ilv3m;ju5ph;*kipWg&n!koi{c z3ysQI(&2^Ab`_8`mBGS=?flwrtf0L;foT{hr4SL^AfW2H9GTkBf~HPX0QjNXUW_y> z&<3EJ;nJ4Hcvg{UBtpbA(Mk~n7k)u{L$*h0dQ8J$$?^_XUUw-ii8!`p5r~A!*C9OL z=TPwg^AZa}3rN`RTmVd4pz2qM$4qR~#4?QfYs+h%xdjMra2%<;n$1fegj z2J*men4JzNrBF(t_3UpICU5Ad0#o5DAGhe?R|Uz4nx*`vY>I&A6eJZ2@c|JepdZ+p z$@KQmgqRJm*rfBCHm>aIVrfSQO|clKibdYodziu8DO}eF=$4G^QE9c5Fp8uI$540u z`+~7usWaCNW6lInUsWjrb}Lj{G-eT1qlKK zP+DVZO~STm?ucO+#xwx1M=~-9400w6PN&8*;2I?bw27RXKB%-xNk(#6(x7=#Y1(Yd zV$te(bY9Ymh%h=<*&XzTlv$_v+bjGZk*F12y2r0n!g-*J6-TC=v^8mMomdWeXM{BDBQg1SX8=F)Bkf zB%nv7)n>^^p#hKsx&sGljz_gtqvpD}o`(Ro9U;j>S-b9|RPdnkXzSQ9bS<5`geo;ORzy%mIi5RE{{Do|2#hQbB9Y@lypVCu%dp=u#lB{!%5;^q|PsOD?my_d~Z=&gXu;WJs%QP9RzHJSGYi zDhu7|*<5Rlp%ltiP(BMlGBTmk>M5Wn2m+>ts=PNo%BjvG%GOkd9jc{TBXZ;Bq7Vx<>&ahmc3e6Ohl`*PDmg6V)sjO^$%|e&91%tWa_sVv$HV9ti`B zvQ@(ZNjP^+ybZV)!kBIt;gjKPDgXt-FuHHL&UPhAgSIq=p~JXezb69X3la!{FX6Q> zISH6R=qI2+K#qXCJS2IwMXe>EU!z&LxQ*+6Wf_ax+bKB??~RUf=)?(594t^f=7p*J z4&mNAb5_C=XrRZhwJ-z^>ln1LM{LRpu(Mn-zO|+hpYo)?Ab(tuYdH28&L&M{EH4h1w zq&=Ch_fF3TS<($CRDJ9@o=3F~@A^Iozp3#|Zf*d43gW|H@d%g37l&>GAcF7vIG)E? zvBaBiA7yA{49}TX{;AB@d!Ifhqz0fwVMapLYOYJ!aj4d6tek%h2Zjzb019&jkjI0V z6=7NPRm5x?+qSVx6RpFj6pe)Ii~5>6tmCs8&V6k32pEuFzt((Hx7>TwhaP)4H0j_#&EOQEpsw6)TrtN<^EeKqc`xntmwT zH?8~w*(3pdO29HqS~_BApzJtIIS!Rtjf6_n(`%rfJ$&c^$A^j^n$oR$_|#a^w1i@C znsqIAu&(6}hHFQ8;>1=eL5UmI{1S^g+u6JK0F#rIHa`fqq#wv`Y4|+>Xsu~$k29~c zi2x{7tCSpv?#pgv=)`b6XaLX;b6^44D*N!kQU(!i^0B5A8#=dgQ~c9x+WChZbN18I zc|TFhB4$}EPcG#4+t#ow*+tBI4Eq7D(%5*=zj)9Q@b{*Nt_j{jV<0X&q-P3)P{Sx!q znpwB*8b(IOIk10(;lXhb=v>;$qUG&GA|@5r4fm6(RqpxauhGB1pUJVQMvKokF6IWn zr{Ae~-GT08HeuC=t zE;Y}a-a{(aYLqG!ij@kR*ZeUzE%{Y$`@7p_wm5wPG&iS|Ubw}$_uxB zoN$iw_Sjo2ur5W3#f_KT%ynHi61Uk8KI z)tMWBwE7b8R9(@YnI^8^ZzUXf-828*wXBWRE3akkigmcYM=kJheUJYfew!cdeUad} z%^z&vwUi-t+(et@07e{{SQ1vw!9{ R%6R|)002ovPDHLkV1nDZyIWI9XFEBJ5 z^Fq4-00{j_L_t(|ob8!yj9gV2$A9PCJG0Y$o!ze6m!%*@TZjghqKN?l2_!~C(DFs2 zl0ahg12Lf{N{oIo#uqfie$r0{1%<><Ly_0TU2VX{Du0u`PDr%f7$P&fGgQ=RAHm zcV_OrJF_hkXqxm%&OYa!b9e9aJpbqIoK+&irA+!_3-EsFvH};IE-P@c>5^B#Z?*Ba zM^xSl2gLG4D-4N%wUFQfVk4ej-)!%~*N<7@kXR0W_c2*+CZ}pv2VQ(c-H-4~5%T}H zFtO+Np+IeYS%hyt^tk*sE$apsdj1#cez81ig?#PfA|L?KJeo#7T2O4S1OIU~4~QGtM&Bf-yAS|w91=i#8#=SPg5z)W344zIY+e| zBv5HJPm`zN%0c+=7?dk@kK5l`0n3nbvN5<5{QNEWyMGN55EPeq{m^%K>$O9yt&~uT z#DFGq02Q0po+BP(pq%BqJE5nuA(K|n+XK^c^`)V>%t;rD1!-R|=xtw*gkR%{AKk|M zyOT~B?LOQ}f!bbN*rq%+H&s|#hV>$B@276^u8xKR>7TmL z(+%9b|854Z7_8$jHWs}xpOE@I7NyoA=`~|nn49H|qyJ)je1vKh*4Ck`L!q=L>l|+e;Sx^M6T=r33mP}hG+RHYV zK8=92)Kh{nAQEEA3yrK|3`jsFC~)G>KV@lpf`MJT+4HGe$hPIc3e#gF&RTI9BRNOU zoT0a`AFQypvci#nyvo|jDtq=`%icYE>Mo!ovuZDcm+eIPODz%D7{n4&zy<^hM;ocq z7%HVXUi{5BSUh(M5ttr5%fzX-_}qQp04SOx~K+Tc1h+A+8btYvC)vJoROCC-kFx^G1W^Ru03FNbV$?mBM} zSHnWRs$vb++JxY>vqCv2fi+xr+#9p=wFVl`R>h}2& zsJoB>Ys-{YCK55wk?(I*0#tquY0 zMkd#T_P3c<1QL^=u_H_zTZG<&2Q>|M)Wk zBWFjLo1Nc?5b&p`pXF;`z6Y({v)|T(_S+F@?LwQT(bDpG0)grAF;4&c?;C^%SX)_X zRPq)|AP@v0#Zs8a>$P`g=NCBnpELEsnaTB{w7+Q(Z$O}?t2Iyw3K-K^J9+$wOSQER z%SN6)KQ}`n-nOULhEJZRV~g9%H-cfmN)5z8<$fGdsh;z;?R3^T~Uhh-dt4qBg`4tqGXTW}6D$ z*W1Is>$ic-p)_p$=m(EcttX&ua@m^?o#i3w~bAw$w zpg#|pNacEUZm`CB3rfEiKQ}v{@1p->cQbU)AISAw$?Dt~i<2iT&Jb9Mkx=awX=hA&uAZ|eRmkiY(e{NDBXsi?LcR?p#66ITo0b#j+f~m zlk3HA>&EjtXzScYTl)ak2#XUZn0os!EKHtYX}NfT3RsR2U0Z}9oE?L!u4pKs6lmW= zD<9?gczzb;If1pGL3>%W--h;cXs-?BWzk+1rE6<$UHk3PJm>Pf6->2EX=R$VxpCGO z##tDDgZathjE&7uttNu_*k%YkP3+#K7{EKD?v|{x-DM+D4kT3tl#5oa4OTSDRPc;O z8wJ_`At(=shVp<~Ve&!wfJP}Fr81y2rdnZbVT$ST)6C7xQK?!|^mI!F#BvZg0FCR# zav9Fe*53drBa|DDwVhN^`+#T}I2d0@1o1~4*cLr zS&1(+{r|vEzN+rSX_}9(e+UA$qGg=$ze{g4RRG|}Ur{|cciKq8bn6`Y4 rS}Jg<&?Wy*zRL<+Y`Uz##isuOoa@Ee_q=wt00000NkvXXu0mjfxc{a3 literal 0 HcmV?d00001 diff --git a/Data/User/Themes/Boomy/stop.png b/Data/User/Themes/Boomy/stop.png deleted file mode 120000 index ee6976f609..0000000000 --- a/Data/User/Themes/Boomy/stop.png +++ /dev/null @@ -1 +0,0 @@ -play.png \ No newline at end of file diff --git a/Data/User/Themes/Boomy/stop.png b/Data/User/Themes/Boomy/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4f74338d48761fd363e6bcc38ddc8ccb625ca3 GIT binary patch literal 3088 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 epFKYD1pW`C{|A-X^A8UI0000DZyIWI9WFEBI? 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 Date: Wed, 16 Jan 2013 17:09:09 -0600 Subject: [PATCH 446/627] Remove some unused resource files. --- .../DolphinWX/Src/Debugger/CodeWindow.cpp | 11 +- .../Src/Debugger/CodeWindowFunctions.cpp | 9 - Source/Core/DolphinWX/Src/Globals.h | 2 - .../DolphinWX/resources/toolbar_browse.xpm | 202 ------------ .../resources/toolbar_debugger_pause.c | 277 ---------------- .../resources/toolbar_debugger_play.c | 278 ---------------- .../DolphinWX/resources/toolbar_file_open.xpm | 141 -------- .../resources/toolbar_fullscreen.xpm | 132 -------- .../Core/DolphinWX/resources/toolbar_help.xpm | 283 ---------------- .../Core/DolphinWX/resources/toolbar_pause.c | 277 ---------------- .../DolphinWX/resources/toolbar_pause.xpm | 148 --------- .../Core/DolphinWX/resources/toolbar_play.c | 278 ---------------- .../Core/DolphinWX/resources/toolbar_play.xpm | 149 --------- .../resources/toolbar_plugin_dsp.xpm | 303 ----------------- .../resources/toolbar_plugin_gfx.xpm | 310 ------------------ .../resources/toolbar_plugin_options.c | 286 ---------------- .../resources/toolbar_plugin_options.xpm | 112 ------- .../resources/toolbar_plugin_pad.xpm | 228 ------------- .../DolphinWX/resources/toolbar_refresh.xpm | 192 ----------- .../Core/DolphinWX/resources/toolbar_stop.xpm | 126 ------- 20 files changed, 3 insertions(+), 3741 deletions(-) delete mode 100644 Source/Core/DolphinWX/resources/toolbar_browse.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_debugger_pause.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_debugger_play.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_file_open.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_help.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_pause.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_pause.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_play.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_play.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_options.c delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_refresh.xpm delete mode 100644 Source/Core/DolphinWX/resources/toolbar_stop.xpm diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 2917f1637d..1c0776862c 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -52,10 +52,7 @@ extern "C" // Bitmaps { - #include "../../resources/toolbar_play.c" - #include "../../resources/toolbar_pause.c" #include "../../resources/toolbar_add_memorycheck.c" - #include "../../resources/toolbar_debugger_delete.c" #include "../../resources/toolbar_add_breakpoint.c" } @@ -563,23 +560,21 @@ bool CCodeWindow::JITBlockLinking() void CCodeWindow::InitBitmaps() { // load original size 48x48 - m_Bitmaps[Toolbar_DebugGo] = wxGetBitmapFromMemory(toolbar_play_png); m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png); m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png); - m_Bitmaps[Toolbar_DebugPause] = wxGetBitmapFromMemory(toolbar_pause_png); // scale to 24x24 for toolbar - for (size_t n = Toolbar_DebugGo; n < ToolbarDebugBitmapMax; n++) + for (size_t n = 0; n < ToolbarDebugBitmapMax; n++) m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(24, 24)); } void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) { - int w = m_Bitmaps[Toolbar_DebugGo].GetWidth(), - h = m_Bitmaps[Toolbar_DebugGo].GetHeight(); + int w = m_Bitmaps[0].GetWidth(), + h = m_Bitmaps[0].GetHeight(); toolBar->SetToolBitmapSize(wxSize(w, h)); toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]); diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp index 05915ecd20..706b398dce 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp @@ -54,15 +54,6 @@ #include "ConfigManager.h" -extern "C" // Bitmaps -{ - #include "../../resources/toolbar_play.c" - #include "../../resources/toolbar_pause.c" - #include "../../resources/toolbar_add_memorycheck.c" - #include "../../resources/toolbar_debugger_delete.c" - #include "../../resources/toolbar_add_breakpoint.c" -} - // Save and load settings // ----------------------------- void CCodeWindow::Load() diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index 36a37de6cc..85ac104923 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -26,8 +26,6 @@ enum { - Toolbar_DebugGo, - Toolbar_DebugPause, Toolbar_Step, Toolbar_StepOver, Toolbar_Skip, diff --git a/Source/Core/DolphinWX/resources/toolbar_browse.xpm b/Source/Core/DolphinWX/resources/toolbar_browse.xpm deleted file mode 100644 index 1c4ea9fb26..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_browse.xpm +++ /dev/null @@ -1,202 +0,0 @@ -/* XPM */ -static const char *toolbar_browse_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 148 2", -" c #14100F", -". c #161211", -"X c #191614", -"o c #1C1816", -"O c #1E1C1B", -"+ c #24211F", -"@ c #252322", -"# c #292524", -"$ c #242628", -"% c #272829", -"& c #2C2D2D", -"* c #323233", -"= c #3C3E3F", -"- c #3D3F40", -"; c #414345", -": c #4A4D4F", -"> c #4B4E50", -", c #4E5153", -"< c #505456", -"1 c #50585D", -"2 c #425C69", -"3 c #4A626E", -"4 c #54636B", -"5 c #5E656A", -"6 c #4D6672", -"7 c #4F6A77", -"8 c #516A76", -"9 c #546D7B", -"0 c #596D79", -"q c #5D727D", -"w c #6A6C6E", -"e c #656E73", -"r c #6F7274", -"t c #61727C", -"y c #5D7684", -"u c #5D7E90", -"i c #617783", -"p c #617986", -"a c #647C89", -"s c #67808D", -"d c #6C828E", -"f c #738087", -"g c #778288", -"h c #628294", -"j c #698594", -"k c #6D8897", -"l c #678799", -"z c #6C8B9D", -"x c #728691", -"c c #758995", -"v c #7A8C95", -"b c #738C9A", -"n c #798E9B", -"m c #75909F", -"M c #7B909C", -"N c #6F8FA0", -"B c #708FA0", -"V c #7492A4", -"C c #7A95A6", -"Z c #7997A9", -"A c #7D9AAA", -"S c #869094", -"D c #84949D", -"F c #89969F", -"G c #8597A1", -"H c #8798A2", -"J c #8C9BA5", -"K c #829DAC", -"L c #8B9EAA", -"P c #939EA5", -"I c #839FB0", -"U c #8EA1AC", -"Y c #91A2AD", -"T c #9BA6AC", -"R c #85A1B3", -"E c #8AA4B4", -"W c #8EA8B8", -"Q c #93A5B1", -"! c #96A8B3", -"~ c #9BAAB2", -"^ c #94ACBC", -"/ c #9DAFBB", -"( c #9CB0BD", -") c #A2AEB4", -"_ c #A0AFB8", -"` c #A7B2B7", -"' c #ADB1B3", -"] c #A4B3BC", -"[ c #AAB5BC", -"{ c #AEB9BF", -"} c #B0B9BF", -"| c #BDBEBF", -" . c #9DB3C2", -".. c #A2B6C4", -"X. c #A3B9C7", -"o. c #ACBAC2", -"O. c #A6BBC9", -"+. c #AABECB", -"@. c #B3BDC3", -"#. c #B1BFC8", -"$. c #AEC2CE", -"%. c #B6C0C6", -"&. c #B9C2C6", -"*. c #B4C2CC", -"=. c #BDC5CB", -"-. c #BEC8CE", -";. c #AEC2D0", -":. c #B2C5D1", -">. c #B9C7D0", -",. c #B5C8D3", -"<. c #BBCBD5", -"1. c #B7CBD9", -"2. c #BECED8", -"3. c #C1C3C5", -"4. c #C0C7CB", -"5. c #C2CACE", -"6. c #C4CDD2", -"7. c #C8CFD3", -"8. c #C0CFD9", -"9. c #C5D1D7", -"0. c #CCD2D6", -"q. c #C4D2DB", -"w. c #CBD6DD", -"e. c #CED8DF", -"r. c #D1D6D9", -"t. c #D4D9DD", -"y. c #D8DCDF", -"u. c #C5D6E1", -"i. c #CBD7E0", -"p. c #CDD9E1", -"a. c #D3DDE3", -"s. c #DADFE2", -"d. c #D6E0E7", -"f. c #DCE2E6", -"g. c #D5E1E9", -"h. c #DBE4E9", -"j. c #E1E4E6", -"k. c #E1E6EA", -"l. c #E4E9ED", -"z. c #E9ECEE", -"x. c #E6ECF1", -"c. c #EAEEF1", -"v. c #EDF1F4", -"b. c #F2F4F6", -"n. c #F5F7F8", -"m. c #F7F8FA", -"M. c #FBFCFC", -"N. c None", -/* pixels */ -"N.N.N.N.N.N.N.N.N.N.N.N.N.N.` @.&.=.5.7.5.4.=.@.[ N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.N.N.N.N.` 7.f.k.k.j.s.r.0.6.5.5.5.6.7.0.y.j.k.k.f.0.} N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.N.} f.l.t.5.{ [ [ { %.=.5.6.6.-.*.*.o.[ _ ~ T ~ ` &.r.k.j.&.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.@.b.s.o.) @.6.f.x.n.M.M.m.n.v.c.x.h.d.a.p.i.q.<.:.O.( Q U ) 0.b.5.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.7.b.[ ] 9.h.x.c.v.b.n.M.M.n.v.v.l.k.h.a.a.p.w.q.<.,.:.;.$.O.( L T z.s.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.@.>.d.d.h.k.l.c.v.n.M.M.n.v.v.l.k.h.a.a.p.w.q.<.,.:.$.+.O.X.X.^ Q m.N.N.N.N.N.N.N.N.N.N.N.", -"N.>.M.a.w.p.a.h.k.l.c.v.b.n.n.b.v.c.l.k.h.a.a.w.q.8.<.,.$.$.+.O.X. .^ ..m.x.N.N.N.N.N.N.N.N.N.N.", -"N.N.8.M.h.i.a.d.h.l.z.c.v.v.v.v.v.x.l.h.d.a.p.w.q.2.<.,.$.$.+.O. .( +.c.v.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u +.n.m.l.d.d.h.l.l.c.v.v.c.c.x.l.h.d.a.p.i.q.2.,.:.+.O.X.O.:.d.M.l.+.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u u V $.k.m.m.b.c.x.l.l.c.l.a.9.6.6.6.-.=.*.<.2.<.<.2.i.h.v.m.c.w.+.X.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h h h B E *.a.z.b.M.M.f.6.7.0.5.=.=.4.7.0.5.6.l.M.M.M.b.l.a.q.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z z N B Z K ^ .%.r.6.@.@.-.7.0.7.&.@.&.0.0.y.b.x.h.d.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z A I K ] r.@.%.k.M.M.M.M.M.M.m.a.{ =.0.6.x.l.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z A Z [ t.[ t.M.M.M.M.M.M.M.M.M.M.m.-.{ r.5.l.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z Z ! y.[ s.M.M.M.M.M.M.M.M.M.M.M.M.M.6.@.r.6.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.h l l B V Z C r.@.w.n.M.M.M.M.M.M.M.M.M.M.M.M.M.v.@.=.6.e.a.w.<.:.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.b A V V V o.7.-.f.M.M.M.M.M.M.M.M.M.M.M.M.M.M.n.t.[ 0.-.h.g.*.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.[ b.0.c h b 0.@.s.k.m.m.m.M.M.M.M.M.M.M.m.m.n.n.b.a.-.&.=.T 5.b.%.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.5.n.T q 6 2 v 0.-.f.k.b.m.m.m.M.M.M.M.M.m.m.n.b.b.v.a.e.@.7.6 8 F z.y.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.Y 8 9 9 7 ) 6.w.f.k.b.n.m.M.M.M.M.M.M.m.m.n.b.b.l.a.a.#.0.x 8 8 v m.N.N.N.N.N.N.N.N.N.N.N.", -"N.6.M.J y d d a @.=.s.j.l.c.n.m.M.M.M.M.M.M.M.m.n.b.v.f.s.a.=.0.L a a c n.v.N.N.N.N.N.N.N.N.N.N.", -"N.N.w.b.! n M n &.=.f.k.z.v.b.m.M.M.M.M.M.M.m.m.n.b.z.j.f.s.5.7.~ c L f.b.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h -.m.f.@.Y &.=.f.l.z.b.n.m.m.M.M.M.M.M.M.m.n.v.z.k.f.s.5.6.o.0.m.x.+.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.u u A >.c.z.0.=.s.l.c.b.n.m.M.M.M.M.M.M.m.m.n.v.z.k.f.f.=.5.t.n.i.+.X.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h h h V ^ o.5.0.c.c.b.n.m.m.M.M.M.M.M.m.m.n.b.z.l.f.f.%.0.<.i.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z z z C 0.=.b.c.b.n.m.M.M.M.M.M.M.m.m.n.b.z.k.j.f.%.7.q.i.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V B =.=.k.b.b.n.m.m.M.M.M.M.m.m.n.b.v.z.k.c.6.6.-.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V V U t.=.m.n.n.n.n.m.m.m.m.m.n.n.b.c.z.v.k.@.0.6.d.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.h h l z B V Z V @.7.0.M.m.m.m.m.m.m.m.n.n.n.b.b.n.v.@.0.-.h.a.w.<.$.O.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.h l z N V Z A C 7.5.0.m.M.M.M.M.M.M.M.M.m.m.m.c.%.0.=.=.h.a.w.<.:.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.N.z C V V Z A K K 7.7.=.z.M.M.M.M.M.m.m.m.n.t.@.0.&.t.6.w.a.g.*.N.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.N.` z.0.n j B A R W E =.t.=.6.s.z.v.v.c.k.r.=.5.y.=.@.6.f.w * ' b.@.N.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.=.m.) t 3 2 3 9 a k C A ! 5.r.0.5.5.5.5.6.0.0.@.[ o.n ~ r . % S v.r.N.N.N.N.N.N.N.N.N.N.N.", -"N.N.M.Y 6 8 8 9 9 8 8 8 8 9 9 9 d Y { %.&.@.` H i 9 9 6 7 4 & ; - o $ g M.N.N.N.N.N.N.N.N.N.N.N.", -"N.9.M.G y a a a a a a a a a a a p y y p p p y y p a a a s 0 & : e = o & 3.M.N.N.N.N.N.N.N.N.N.N.", -"N.N.t.c.L c b n n n n n n n n n n n n n n n n n n n n n n C t @ > e = X = 5 N.N.N.N.N.N.N.N.N.N.", -"N.N.h 8.m.t.] Y L L U U Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y U U L Q f # : e = o @ N.N.N.N.N.N.N.N.N.N.", -"N.N.u u K 8.v.v.f.6.#.o.] ( ( / / / / / / / / / ( ( ( ..o.-.t.n.| # : e = O & N.N.N.N.N.N.N.N.N.", -"N.N.h h h h V ( 8.h.v.b.v.x.k.f.a.a.a.e.e.a.a.a.h.k.c.b.M.M.m.c.x.T # : e = O & N.N.N.N.N.N.N.N.", -"N.N.h h l z z z B Z E .*.2.p.h.l.x.v.b.n.m.M.M.M.M.M.M.b.x.h.d.a.g.P # : e = O & N.N.N.N.N.N.N.", -"N.N.h h l z B V C A K R E W ^ .X.+.:.8.i.a.h.c.b.M.M.n.v.x.k.h.a.w.u.F # > e = O & N.N.N.N.N.N.", -"N.u h h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.<.1.D % , e = O & N.N.N.N.N.", -"N.N.h h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.<.$.,.1 o < e = O & N.N.N.N.", -"N.N.x h l z B V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.k.h.a.w.2.:.Q N.N.+ < e = O & N.N.N.", -"N.N.N.c k z N V Z A I E W ^ ...O.$.,.q.p.d.k.c.n.M.M.n.v.x.l.h.d.w.o.H N.N.N.N.@ < e = + @ N.N.", -"N.N.N.N.N.c b m C A R E ^ ^ .X.O.$.,.q.p.d.l.v.m.M.M.M.n.c.h.9.[ H N.N.N.N.N.N.N.@ < 5 * o N.N.", -"N.N.N.N.N.N.N.N.v n C K E ^ / ..O.$.<.q.a.d.l.x.c.v.k.0.@.~ F N.N.N.N.N.N.N.N.N.N.N.# ; & X N.N.", -"N.N.N.N.N.N.N.N.N.N.N.N.N.N.v D D G H J J J J J F N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.& N.N.N.N." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c b/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c deleted file mode 100644 index d2d21a30de..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_debugger_pause.c +++ /dev/null @@ -1,277 +0,0 @@ -static const unsigned char toolbar_pause_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x2e, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x4b, 0x6c, 0x5d, 0xd7, 0x75, -0x86, 0xbf, 0xbd, 0xf7, 0x79, 0xdc, 0x87, 0x28, 0x5d, 0x52, 0x22, 0x29, -0x25, 0x96, 0x2c, 0x45, 0xb0, 0x55, 0x35, 0x4e, 0xa4, 0xa2, 0xa3, 0x0c, -0x6a, 0x2b, 0x40, 0x50, 0x4f, 0x0a, 0xc8, 0xb3, 0x0e, 0x0c, 0x23, 0xca, -0xa4, 0x4a, 0x1c, 0xc0, 0x4a, 0x07, 0x1d, 0x09, 0x45, 0x64, 0x18, 0xa9, -0x03, 0x03, 0xae, 0x65, 0xb5, 0x40, 0x91, 0x64, 0xa0, 0x00, 0x0d, 0xa7, -0x85, 0xd3, 0x0e, 0xda, 0xa2, 0x69, 0xa1, 0x38, 0x9d, 0x14, 0x28, 0x50, -0x39, 0xb1, 0x91, 0x0a, 0xb2, 0x65, 0x3d, 0x28, 0x89, 0x22, 0xef, 0x25, -0xef, 0x9b, 0xf7, 0x3c, 0xf6, 0x5e, 0x1d, 0xec, 0x73, 0x1f, 0x94, 0x48, -0x89, 0xb2, 0x83, 0x1a, 0xde, 0xc0, 0xc1, 0xb9, 0x8f, 0x7d, 0xcf, 0xf9, -0xff, 0xb5, 0xfe, 0xfd, 0xaf, 0xb5, 0x0f, 0xa9, 0x44, 0x84, 0xcf, 0xf3, -0xd0, 0x9f, 0x35, 0x80, 0x4f, 0x3b, 0x82, 0xcf, 0xf2, 0xe6, 0xa7, 0x4f, -0xff, 0x58, 0x0d, 0x5f, 0xff, 0xe8, 0x47, 0x7f, 0xf6, 0x89, 0xa4, 0xa0, -0x7e, 0x57, 0x12, 0xfa, 0xe1, 0x0f, 0xff, 0xe5, 0xa0, 0x88, 0x9c, 0x10, -0x71, 0x27, 0x9c, 0x73, 0x07, 0x9d, 0x93, 0x63, 0x22, 0xae, 0xe6, 0x9c, -0xc3, 0x39, 0x87, 0x88, 0xbb, 0xee, 0x9c, 0xbb, 0xe1, 0x9c, 0xbb, 0xe4, -0x9c, 0x7b, 0xaf, 0xd5, 0xea, 0xff, 0x7c, 0x93, 0xcb, 0x08, 0x3c, 0x1e, -0x99, 0x4f, 0x45, 0xe0, 0xcd, 0x37, 0xff, 0xa3, 0x26, 0xe2, 0x5e, 0x10, -0x91, 0x33, 0x22, 0x72, 0xdc, 0x03, 0x15, 0x26, 0x40, 0x8f, 0x5e, 0x6f, -0x7c, 0x6f, 0x71, 0xce, 0x35, 0x9d, 0x73, 0xff, 0x68, 0xad, 0xfb, 0xfb, -0xf5, 0xf5, 0xfc, 0x97, 0x05, 0xf8, 0xe1, 0x01, 0x20, 0xdb, 0x21, 0xf2, -0x89, 0x09, 0xbc, 0xf5, 0xd6, 0xa5, 0x73, 0x20, 0x67, 0x9c, 0x93, 0x9a, -0x88, 0x50, 0x2a, 0xc5, 0x54, 0xab, 0x55, 0xa6, 0xa6, 0xa6, 0x50, 0x4a, -0x11, 0x45, 0xf1, 0x08, 0x6c, 0x96, 0x65, 0xf4, 0xfb, 0x5d, 0xba, 0xdd, -0x3e, 0x9d, 0x4e, 0x8b, 0x4e, 0xa7, 0x43, 0x9e, 0x67, 0x93, 0xe4, 0xde, -0xb5, 0xd6, 0xfe, 0x45, 0x9a, 0x72, 0xb9, 0x20, 0xe0, 0x86, 0x64, 0x1e, -0x45, 0xe2, 0xb1, 0xd7, 0xc0, 0xdb, 0x6f, 0xbf, 0x7b, 0x42, 0x29, 0x75, -0x51, 0x6b, 0x7d, 0x50, 0x6b, 0xcd, 0xcc, 0xcc, 0x0c, 0x4f, 0x3e, 0xb9, -0x97, 0xdd, 0xbb, 0xcb, 0x54, 0x2a, 0x01, 0x41, 0xa0, 0x09, 0x02, 0x83, -0xb5, 0xe0, 0x1c, 0xf4, 0x7a, 0x29, 0xdd, 0x6e, 0x42, 0xab, 0xd5, 0xa7, -0xd1, 0x68, 0x33, 0x33, 0x33, 0x4d, 0x9a, 0xa6, 0xb4, 0x5a, 0x6b, 0xdc, -0xbd, 0xbb, 0x44, 0x92, 0x24, 0x00, 0xcf, 0x2a, 0xa5, 0xfe, 0x2b, 0x0c, -0xed, 0x5f, 0x65, 0x99, 0x7e, 0x0d, 0x50, 0x05, 0x89, 0x21, 0x91, 0x2d, -0xc7, 0x63, 0x65, 0xe0, 0xc2, 0x85, 0xff, 0x3c, 0xa7, 0x94, 0xfa, 0x3e, -0xc0, 0xdc, 0xdc, 0x2c, 0xcf, 0x3c, 0xb3, 0x9f, 0xb9, 0xb9, 0x98, 0x38, -0xd6, 0x38, 0xc7, 0x08, 0xf4, 0xc3, 0x5e, 0x2f, 0x2f, 0x37, 0x59, 0x5c, -0x5c, 0xa2, 0xdf, 0x5f, 0xc7, 0xb9, 0x9c, 0x95, 0x95, 0x15, 0x96, 0x97, -0x97, 0x47, 0x19, 0x11, 0x71, 0xbf, 0xb2, 0x56, 0xfe, 0x54, 0x24, 0x68, -0x00, 0x16, 0x70, 0x0f, 0xcb, 0xc2, 0xb6, 0x33, 0x70, 0xe1, 0xc2, 0xaf, -0x2e, 0x6a, 0xad, 0x4f, 0xc5, 0x71, 0xcc, 0x57, 0xbf, 0x7a, 0x84, 0xa7, -0x9f, 0xde, 0x41, 0xa9, 0xa4, 0x46, 0xe0, 0xd6, 0xd7, 0x2d, 0xab, 0xab, -0x29, 0xed, 0x76, 0xc6, 0x60, 0xe0, 0x0f, 0x6b, 0x2d, 0xce, 0x59, 0xa2, -0xc8, 0x10, 0xc7, 0x21, 0xe5, 0x72, 0x4c, 0xad, 0x36, 0xc5, 0xf4, 0x74, -0x8d, 0xbb, 0x77, 0x97, 0xf9, 0xf8, 0xe3, 0x1b, 0x4c, 0x4f, 0xcf, 0x50, -0x2e, 0x97, 0x59, 0x5c, 0xbc, 0xc5, 0xfa, 0xfa, 0x3a, 0xc0, 0x1f, 0x29, -0x25, 0xff, 0x2a, 0x92, 0x3f, 0x0f, 0x41, 0x83, 0x8d, 0xeb, 0xe2, 0x81, -0xb1, 0xad, 0x0c, 0xbc, 0xfd, 0xf6, 0xbb, 0x17, 0xb5, 0xd6, 0xa7, 0xaa, -0xd5, 0x2a, 0xcf, 0x3e, 0xfb, 0x0c, 0x07, 0x0e, 0x84, 0xa3, 0x88, 0x36, -0x1a, 0x96, 0xa5, 0xa5, 0x94, 0x7e, 0x3f, 0xc7, 0x39, 0x8b, 0xb5, 0xae, -0x38, 0xdb, 0x89, 0xb3, 0xc3, 0x5a, 0x8b, 0xb5, 0x39, 0x79, 0xee, 0xa8, -0xd5, 0x76, 0x30, 0x3f, 0x3f, 0x4f, 0x9a, 0xe6, 0xbc, 0xff, 0xfe, 0x07, -0x64, 0x59, 0x82, 0xb5, 0x96, 0xbb, 0x77, 0xef, 0xd0, 0x6a, 0x35, 0x87, -0xeb, 0xe2, 0x37, 0x22, 0xea, 0x8f, 0x95, 0x8a, 0xea, 0x80, 0xdd, 0x2a, -0x0b, 0x8f, 0x2c, 0x64, 0x6f, 0xbd, 0x75, 0xe9, 0x22, 0x70, 0x6a, 0xd7, -0xae, 0x1a, 0xcf, 0x3f, 0xff, 0x15, 0xf6, 0xef, 0x0f, 0x8b, 0x88, 0xc3, -0xd5, 0xab, 0x39, 0x8b, 0x8b, 0x39, 0x49, 0x22, 0x28, 0xa5, 0x00, 0x85, -0x2a, 0x9c, 0xdd, 0x9f, 0x55, 0x71, 0x8c, 0xe2, 0x05, 0x40, 0xa3, 0xb1, -0xc6, 0xaf, 0x7f, 0xfd, 0x3e, 0x6b, 0x6b, 0x6b, 0x1c, 0x3d, 0xfa, 0xfb, -0x68, 0x6d, 0x70, 0x4e, 0x98, 0x9b, 0x9b, 0xa7, 0x54, 0xaa, 0x0c, 0x7f, -0xf7, 0x15, 0x11, 0xfb, 0x13, 0xc0, 0xdc, 0x77, 0x91, 0xed, 0x13, 0x78, -0xf3, 0xcd, 0x7f, 0x3f, 0x23, 0x22, 0xa7, 0x4a, 0xa5, 0x12, 0x5f, 0xff, -0xfa, 0x11, 0x66, 0x66, 0x02, 0x9c, 0x83, 0x7a, 0x5d, 0xf8, 0xe8, 0x23, -0x61, 0x30, 0x78, 0x14, 0x7d, 0x46, 0x84, 0xfc, 0xeb, 0xf1, 0x1b, 0x11, -0xb8, 0x7d, 0x7b, 0x91, 0x0f, 0x3f, 0xfc, 0x90, 0xc3, 0x87, 0x9f, 0x1e, -0xd9, 0xef, 0xfc, 0xfc, 0x3c, 0x41, 0x30, 0x52, 0xf6, 0x9f, 0xe4, 0x79, -0xef, 0x15, 0x40, 0x4f, 0x16, 0xbd, 0x6d, 0x11, 0x78, 0xe3, 0x8d, 0x7f, -0x3b, 0x2e, 0x22, 0xe7, 0x8d, 0x31, 0x7c, 0xed, 0x6b, 0xcf, 0x30, 0x33, -0xe3, 0x23, 0x7f, 0xf3, 0xa6, 0xe5, 0xce, 0x1d, 0x6f, 0x7f, 0x20, 0x0c, -0x15, 0xb8, 0xb9, 0x14, 0xc7, 0xdf, 0x0f, 0xdf, 0x8f, 0x39, 0xf8, 0xef, -0xfa, 0xfd, 0x0e, 0x37, 0x6f, 0x5e, 0x67, 0xdf, 0xbe, 0x2f, 0x22, 0x22, -0x28, 0xa5, 0x99, 0x9d, 0x9d, 0x65, 0x42, 0xf6, 0x67, 0xb3, 0xac, 0x7b, -0x68, 0x2b, 0x9c, 0x0f, 0xc9, 0x80, 0x5c, 0x14, 0x81, 0xa3, 0x47, 0x9f, -0x62, 0xff, 0xfe, 0x32, 0xce, 0xc1, 0x8d, 0x1b, 0x29, 0xab, 0xab, 0x79, -0x51, 0x88, 0xec, 0xa8, 0x38, 0x79, 0xf0, 0x82, 0x88, 0x8c, 0x88, 0x8c, -0x81, 0x8f, 0x19, 0xf8, 0xcf, 0x64, 0xc3, 0x77, 0x22, 0xd0, 0xe9, 0xb4, -0x69, 0x36, 0xd7, 0x08, 0xc3, 0x12, 0x22, 0x8e, 0x38, 0x2e, 0xb1, 0x63, -0xc7, 0xd4, 0x70, 0xd2, 0x2e, 0x11, 0xf7, 0x97, 0x6c, 0x21, 0xa3, 0x4d, -0x5d, 0xe8, 0xf5, 0xd7, 0xff, 0xf9, 0x9b, 0x5a, 0xeb, 0xe3, 0xbb, 0x76, -0xed, 0xe4, 0xa9, 0xa7, 0x76, 0xa3, 0x94, 0xa2, 0x5e, 0xcf, 0x68, 0x34, -0x32, 0x94, 0xd2, 0x13, 0x52, 0x10, 0x3e, 0xf8, 0xe0, 0x32, 0x8d, 0x46, -0x9d, 0x6e, 0xb7, 0x43, 0xb3, 0xd9, 0xe0, 0xcb, 0x5f, 0x3e, 0xce, 0xe1, -0xc3, 0x47, 0x0a, 0x32, 0x7e, 0xd6, 0xb5, 0x6b, 0x57, 0x69, 0xb7, 0xd7, -0xe8, 0xf7, 0xfb, 0x74, 0x3a, 0x6d, 0x0e, 0x1c, 0x38, 0xc4, 0xfc, 0xfc, -0xbe, 0x11, 0x71, 0xf0, 0x24, 0x94, 0x52, 0x38, 0xe7, 0x3f, 0xab, 0xd5, -0xa6, 0x69, 0xb5, 0x5a, 0xc3, 0x80, 0xbc, 0x94, 0x24, 0xcd, 0x57, 0x81, -0x8f, 0xb6, 0x45, 0x40, 0x44, 0xce, 0x89, 0x08, 0x47, 0x8f, 0x7e, 0x89, -0x9d, 0x3b, 0x23, 0x06, 0x03, 0xc7, 0xe2, 0xe2, 0x3a, 0xce, 0x29, 0x94, -0x92, 0x11, 0x81, 0xf7, 0xde, 0xfb, 0x6f, 0xae, 0x5e, 0xfd, 0x0d, 0xdf, -0xf8, 0xc6, 0x1f, 0x02, 0x7b, 0x80, 0x43, 0x54, 0xab, 0xf3, 0xa4, 0xa9, -0x1b, 0x65, 0xe3, 0xca, 0x95, 0x0f, 0x58, 0x5c, 0xfc, 0xa8, 0x98, 0x33, -0x1c, 0x55, 0x96, 0x97, 0x53, 0x44, 0xc0, 0x39, 0x29, 0xf4, 0x2f, 0x38, -0x97, 0xe3, 0x9c, 0x43, 0x29, 0x30, 0xc6, 0x50, 0xad, 0x56, 0xe9, 0x76, -0xdb, 0x43, 0xc7, 0x7b, 0x05, 0x38, 0xf3, 0x48, 0x02, 0xaf, 0xbd, 0xf6, -0x4f, 0x27, 0xb5, 0xd6, 0x07, 0xa7, 0xa7, 0x6b, 0xcc, 0xce, 0x56, 0x71, -0x0e, 0x6e, 0xdd, 0xea, 0x93, 0x65, 0x76, 0x14, 0xfd, 0x61, 0x02, 0x96, -0x96, 0x6e, 0xf3, 0xf2, 0xcb, 0x27, 0x39, 0x72, 0x64, 0xff, 0xe8, 0xf7, -0x69, 0x6a, 0xf9, 0xc5, 0x2f, 0x96, 0x0b, 0x02, 0x8e, 0x46, 0x63, 0xe5, -0x81, 0x39, 0x49, 0x92, 0xf3, 0xb3, 0x9f, 0xfd, 0xcf, 0x28, 0x43, 0x9e, -0x84, 0xbb, 0x6f, 0x3d, 0x29, 0x2a, 0x95, 0x2a, 0xbd, 0x6e, 0xbb, 0xc8, -0x92, 0x3b, 0x79, 0xfa, 0xf4, 0x8f, 0xbf, 0x77, 0xbf, 0x9d, 0x3e, 0xb0, -0x06, 0x44, 0xe4, 0x94, 0x88, 0x63, 0xcf, 0x9e, 0xdd, 0x4c, 0x4f, 0x97, -0x69, 0xb7, 0x53, 0xd6, 0xd6, 0xd6, 0x27, 0x9a, 0x30, 0xef, 0xf5, 0xd6, -0x3a, 0xd6, 0xd6, 0x1a, 0x1b, 0x80, 0x81, 0x77, 0x9a, 0x21, 0x78, 0x11, -0xa1, 0xdd, 0x6e, 0x3e, 0x74, 0xce, 0x70, 0x1d, 0xf9, 0x9b, 0x3b, 0x10, -0x41, 0x2b, 0x85, 0x42, 0xa8, 0x56, 0xca, 0x80, 0x1a, 0x8a, 0xff, 0xc9, -0x5e, 0xaf, 0x7e, 0xfc, 0x7e, 0xbc, 0x1b, 0x08, 0x9c, 0x3b, 0xf7, 0x0f, -0x35, 0x11, 0xf7, 0x42, 0x10, 0x84, 0xcc, 0xce, 0xce, 0x14, 0x96, 0x39, -0x04, 0xef, 0x8a, 0x82, 0xe4, 0x89, 0x74, 0x3a, 0x2d, 0xe6, 0xe7, 0x6b, -0x88, 0x50, 0x48, 0xc1, 0x1f, 0xad, 0xd6, 0xb0, 0x25, 0x10, 0xfa, 0xfd, -0x1e, 0x7b, 0xf7, 0x4e, 0x3f, 0x30, 0xa7, 0x5e, 0xef, 0x8f, 0xa4, 0x33, -0x5e, 0xf4, 0x5e, 0xfb, 0x4a, 0x15, 0x55, 0xa0, 0x90, 0x51, 0x1c, 0x97, -0x40, 0xa9, 0xe2, 0x1a, 0x72, 0xf2, 0x7e, 0x02, 0x1b, 0x24, 0xe4, 0x9c, -0x3c, 0xa7, 0xb5, 0x50, 0xad, 0x56, 0xa8, 0x56, 0x23, 0xb2, 0xcc, 0x51, -0xaf, 0xf7, 0x0a, 0xcd, 0x7b, 0x8b, 0x1b, 0x46, 0xb0, 0xdb, 0xed, 0xf0, -0xc4, 0x13, 0xb3, 0x38, 0x1f, 0xb4, 0x51, 0xfa, 0x93, 0x64, 0xdc, 0x36, -0xf7, 0x7a, 0xdd, 0x4d, 0xe7, 0x0c, 0x06, 0x76, 0x43, 0xab, 0x2d, 0x4e, -0x0a, 0xd0, 0x0a, 0xa5, 0x14, 0x5a, 0x29, 0x9c, 0x38, 0x9c, 0x40, 0x10, -0x18, 0xd4, 0xd8, 0xc9, 0x8e, 0x3d, 0x34, 0x03, 0x22, 0x72, 0x5c, 0xc4, -0x51, 0xa9, 0x54, 0x28, 0x95, 0x42, 0xda, 0xed, 0x64, 0x43, 0xe4, 0x27, -0xdb, 0x82, 0x7b, 0xf7, 0xee, 0x32, 0x33, 0xb3, 0x13, 0x6b, 0xd9, 0x70, -0x34, 0x9b, 0xe9, 0x48, 0x16, 0x8d, 0xc6, 0xca, 0xa6, 0x73, 0xea, 0xf5, -0xde, 0xc4, 0xe2, 0x1d, 0xdb, 0xb0, 0x42, 0x11, 0x68, 0x4d, 0x60, 0x34, -0x46, 0x1b, 0xb4, 0x86, 0x52, 0x29, 0x9e, 0xc8, 0x10, 0xb5, 0x87, 0x66, -0xc0, 0xef, 0xa6, 0x34, 0x41, 0x10, 0x50, 0xa9, 0x94, 0xb8, 0x73, 0x67, -0x15, 0xe7, 0x6c, 0x11, 0x99, 0x8d, 0x0b, 0x38, 0x4d, 0x13, 0x0e, 0x1f, -0xfe, 0x3d, 0xac, 0x9d, 0xf4, 0x7c, 0x0a, 0x37, 0xf1, 0x04, 0xb2, 0x2c, -0xe5, 0xf0, 0xe1, 0xfd, 0x5b, 0xce, 0x19, 0x06, 0x04, 0xf1, 0xe0, 0x8d, -0x06, 0xa3, 0x15, 0x46, 0x6b, 0x10, 0x87, 0x28, 0x8d, 0x56, 0x3e, 0xfe, -0xc5, 0xef, 0x4f, 0x3c, 0x82, 0x80, 0xd4, 0xc0, 0x11, 0xc7, 0x71, 0xd1, -0xcb, 0x0f, 0x0a, 0x5b, 0xdb, 0x68, 0x9f, 0xa0, 0x68, 0x36, 0xd7, 0x28, -0x95, 0xe2, 0x07, 0xe4, 0xe1, 0xf5, 0x3d, 0x5c, 0xc0, 0xad, 0x4d, 0xe7, -0xdc, 0xb9, 0xd3, 0x2a, 0x9a, 0x3b, 0x87, 0x73, 0x82, 0xc2, 0x61, 0x94, -0xf2, 0xe0, 0x8d, 0xc6, 0x68, 0x8d, 0x20, 0x38, 0xbc, 0xa4, 0xfc, 0x5d, -0x37, 0x6f, 0x3a, 0xef, 0x5b, 0x03, 0xee, 0xf8, 0x50, 0x87, 0xce, 0x41, -0xbb, 0xdd, 0x9b, 0x88, 0xbc, 0xbf, 0xcc, 0xf0, 0xdc, 0xef, 0x77, 0xd9, -0xbb, 0x77, 0x6e, 0x14, 0xdd, 0xb1, 0x25, 0x8e, 0x9d, 0x65, 0x7d, 0xbd, -0xbf, 0xc5, 0x9c, 0x71, 0xb7, 0x2a, 0x62, 0xd1, 0x4a, 0xa1, 0x15, 0x18, -0x6d, 0x08, 0x4d, 0x80, 0x56, 0x3e, 0x4b, 0x5a, 0xb9, 0x91, 0x63, 0x6d, -0x8b, 0x80, 0xb7, 0x33, 0x5d, 0x80, 0xa0, 0x88, 0xfe, 0x64, 0xa7, 0x39, -0x26, 0x51, 0x2e, 0x07, 0x23, 0x57, 0xd9, 0x4a, 0x42, 0x95, 0x4a, 0xb8, -0xe9, 0x9c, 0x3c, 0x9f, 0x94, 0x8f, 0xbf, 0x9e, 0x29, 0xb4, 0x1f, 0x18, -0x8d, 0x02, 0x8c, 0x76, 0xe4, 0x4e, 0x91, 0x65, 0xe9, 0x16, 0x7d, 0xd6, -0xa6, 0x19, 0x10, 0x94, 0x72, 0x63, 0x02, 0xd6, 0x47, 0x80, 0x22, 0x03, -0xe3, 0x16, 0x19, 0x6a, 0xb5, 0x9d, 0xa3, 0xc8, 0x3a, 0x37, 0xbe, 0x46, -0xb7, 0x9b, 0x14, 0x91, 0x95, 0x2d, 0xe7, 0xb4, 0x5a, 0x5d, 0xf2, 0xdc, -0x4b, 0xc8, 0x28, 0xaf, 0xfb, 0xd0, 0x18, 0xa2, 0x30, 0x20, 0x0c, 0x8c, -0x6f, 0xea, 0xac, 0xb7, 0xd2, 0x2c, 0xcb, 0x70, 0x63, 0x02, 0x97, 0x1f, -0x99, 0x01, 0x85, 0x22, 0x49, 0x12, 0xda, 0xed, 0x5e, 0x91, 0x91, 0x71, -0x4f, 0xef, 0x5b, 0x09, 0x3f, 0x37, 0x0c, 0xcb, 0x1b, 0xa2, 0x3b, 0xbc, -0x47, 0x1c, 0x07, 0xf4, 0x7a, 0xeb, 0x88, 0x08, 0xc6, 0xc4, 0x9b, 0xce, -0xf1, 0xeb, 0xa2, 0x85, 0xc2, 0xa1, 0x95, 0xf6, 0xe0, 0x83, 0x80, 0x28, -0x30, 0x04, 0xc6, 0x90, 0xd9, 0x1c, 0xa5, 0x15, 0x0a, 0x45, 0xaf, 0xd7, -0x9d, 0xcc, 0x40, 0xf3, 0x7e, 0x02, 0x1b, 0x6c, 0xd4, 0x39, 0x77, 0x49, -0x44, 0x48, 0x93, 0x01, 0xfd, 0xde, 0x3a, 0xc3, 0xdd, 0x9c, 0x12, 0xc1, -0x15, 0x05, 0x2c, 0xcf, 0xf3, 0xc2, 0x46, 0x1b, 0x0f, 0xd8, 0xa3, 0x73, -0x3e, 0x6a, 0xd6, 0x5a, 0xf2, 0x7c, 0xeb, 0x39, 0xc6, 0x78, 0x97, 0x31, -0x4a, 0x11, 0x05, 0x86, 0x52, 0x14, 0x50, 0x8a, 0x43, 0xe2, 0x30, 0xc0, -0x14, 0xc0, 0x15, 0x8a, 0x24, 0x4d, 0x8a, 0xe8, 0x8f, 0x08, 0x5c, 0x7a, -0x14, 0x81, 0xa6, 0x73, 0x42, 0xaf, 0xd7, 0x61, 0xb5, 0xb1, 0x4a, 0xb9, -0x14, 0xa3, 0x47, 0x99, 0x11, 0x10, 0x8b, 0x38, 0x87, 0xcd, 0x73, 0x8c, -0x31, 0x9b, 0x6e, 0xda, 0x2b, 0x95, 0x88, 0x3c, 0xcf, 0xc8, 0xf3, 0x14, -0xad, 0xf5, 0xa6, 0x73, 0xa6, 0xa7, 0xa7, 0x30, 0x4a, 0x13, 0x87, 0x21, -0x95, 0x38, 0xa6, 0x1c, 0x45, 0x94, 0xc2, 0x80, 0x30, 0x08, 0x50, 0xba, -0xf0, 0x1c, 0x11, 0xd6, 0x9a, 0x4d, 0xac, 0x95, 0xc9, 0x0c, 0x3c, 0x20, -0xa1, 0xfb, 0x0b, 0xd9, 0x65, 0x41, 0xe8, 0x75, 0x7b, 0x0c, 0x06, 0x7d, -0xcf, 0x5c, 0x1c, 0x81, 0x02, 0x8d, 0xa0, 0x44, 0xa1, 0xf0, 0x99, 0x78, -0xe2, 0x89, 0x27, 0xe9, 0xf7, 0x93, 0x11, 0xb0, 0xe1, 0x39, 0x49, 0x52, -0xb2, 0x2c, 0x23, 0xcb, 0x32, 0xe6, 0xe6, 0xf6, 0x6d, 0x3a, 0x27, 0x4f, -0x73, 0xe2, 0x30, 0xa0, 0x1c, 0x45, 0x54, 0xe2, 0x88, 0x72, 0x1c, 0x11, -0x47, 0x61, 0xe1, 0xff, 0xe0, 0x10, 0xac, 0x38, 0x9a, 0xcd, 0xb5, 0x0d, -0x4d, 0xde, 0x76, 0x32, 0xf0, 0x8e, 0x6f, 0x01, 0x7a, 0xd8, 0x3c, 0x27, -0x4b, 0x32, 0x8c, 0x02, 0xad, 0x14, 0x81, 0x56, 0x04, 0x5a, 0xd0, 0x80, -0x12, 0xa8, 0x96, 0xab, 0x5c, 0xb9, 0x72, 0x9b, 0x5e, 0x6f, 0x0c, 0x70, -0x65, 0xa5, 0xc5, 0xb5, 0x6b, 0x77, 0xc9, 0xb2, 0x9c, 0x34, 0xcd, 0x30, -0x26, 0xe2, 0xf2, 0xe5, 0x0f, 0xe9, 0x74, 0xd6, 0x47, 0x73, 0xee, 0x2d, -0xad, 0xb2, 0xb4, 0x78, 0x8f, 0x6a, 0x29, 0x62, 0xaa, 0x12, 0xb3, 0xa3, -0x1c, 0x53, 0x8a, 0x42, 0x02, 0xe3, 0xbd, 0xdf, 0x8a, 0x23, 0xb7, 0x8e, -0xc6, 0xea, 0x1a, 0x49, 0x9a, 0x61, 0x9d, 0x1d, 0xc2, 0x7b, 0x67, 0x61, -0xe1, 0x6c, 0xeb, 0x7e, 0x02, 0x0f, 0x3c, 0x95, 0x38, 0xf3, 0xca, 0x4f, -0x3e, 0x0e, 0xc3, 0xe0, 0xe0, 0x17, 0xf7, 0xed, 0x63, 0xdf, 0xfc, 0x3c, -0x51, 0x18, 0x10, 0x68, 0x0d, 0x78, 0x3f, 0xce, 0xad, 0x25, 0xcd, 0x2d, -0xb9, 0xf5, 0x87, 0xb5, 0x0e, 0xeb, 0x7c, 0x41, 0xb2, 0x85, 0xfb, 0x88, -0x13, 0x9c, 0xf8, 0x1e, 0x87, 0xa2, 0xeb, 0xd4, 0x28, 0x02, 0xa3, 0x08, -0x03, 0x53, 0x48, 0x27, 0xa2, 0x1c, 0x85, 0x44, 0x61, 0x80, 0x56, 0x8a, -0xdc, 0x39, 0x06, 0x69, 0x46, 0x77, 0x30, 0xa0, 0xb3, 0x3e, 0xe0, 0xb7, -0x57, 0xfe, 0x97, 0x6e, 0xbf, 0x47, 0x96, 0xdb, 0xa1, 0x84, 0x5e, 0x58, -0x58, 0x38, 0xfb, 0xc0, 0xf3, 0xd4, 0x4d, 0x36, 0x34, 0xf2, 0x73, 0x67, -0xdd, 0x99, 0x7a, 0xbd, 0xce, 0x9e, 0x99, 0x3d, 0x44, 0x81, 0x46, 0xa1, -0x09, 0xb4, 0x77, 0x23, 0xa3, 0x7c, 0xda, 0xb2, 0x22, 0x7d, 0xf9, 0xf0, -0x2c, 0x16, 0xa5, 0x7d, 0x01, 0x14, 0x05, 0x1a, 0x05, 0xc6, 0xb7, 0xc5, -0x46, 0x19, 0x8c, 0xd6, 0x44, 0x81, 0x21, 0x0e, 0x03, 0x4a, 0x51, 0x48, -0x1c, 0x86, 0x44, 0xa1, 0x41, 0x29, 0x45, 0x5e, 0x04, 0x21, 0xcd, 0x73, -0xd2, 0xdc, 0x72, 0xfb, 0xce, 0x22, 0x83, 0x24, 0xc1, 0x8e, 0xfa, 0x24, -0xae, 0x6f, 0x06, 0x7e, 0x53, 0x02, 0x22, 0x72, 0xde, 0x3a, 0x7b, 0x26, -0xcd, 0x52, 0x56, 0xea, 0xf7, 0x88, 0xbf, 0xf0, 0x05, 0x02, 0xed, 0xdb, -0xdc, 0xc0, 0x28, 0x42, 0x09, 0x08, 0x8d, 0x26, 0x37, 0x9a, 0xcc, 0x6a, -0xd2, 0x5c, 0x79, 0x4f, 0xd7, 0xca, 0x67, 0x62, 0x18, 0x79, 0x0c, 0x1a, -0x30, 0x46, 0x11, 0x68, 0x43, 0x18, 0x68, 0x6f, 0x95, 0x61, 0x40, 0x14, -0x04, 0x04, 0xc6, 0x67, 0x35, 0x77, 0x96, 0xdc, 0x59, 0x06, 0x69, 0xc6, -0x20, 0xcb, 0x58, 0x69, 0xd4, 0x69, 0xac, 0x36, 0xc9, 0xf2, 0xbc, 0xd8, -0x5e, 0x02, 0x70, 0x6e, 0x33, 0xf0, 0x9b, 0x4a, 0x08, 0xe0, 0xbb, 0xdf, -0xfd, 0xbb, 0x9f, 0x86, 0x41, 0xf0, 0xcd, 0x52, 0x14, 0xf2, 0xd4, 0x97, -0x0e, 0x31, 0xbd, 0xab, 0x46, 0x29, 0x0c, 0x88, 0xc3, 0x80, 0xa0, 0xb0, -0x39, 0x27, 0xe2, 0xed, 0xd2, 0xba, 0x09, 0x39, 0x15, 0x1b, 0x19, 0x7c, -0xe5, 0xd0, 0xca, 0xf7, 0x36, 0xa1, 0xd1, 0x04, 0xc6, 0x14, 0x47, 0xd1, -0xa0, 0x89, 0x90, 0x59, 0x4b, 0x92, 0x65, 0xf4, 0x93, 0x8c, 0x5e, 0x92, -0x70, 0xaf, 0x5e, 0xe7, 0xe3, 0x1b, 0xd7, 0x59, 0x4f, 0x92, 0x49, 0x02, -0x97, 0x17, 0x16, 0xce, 0xfe, 0xc1, 0x56, 0x04, 0x36, 0xdd, 0x13, 0x87, -0x46, 0xbf, 0x9a, 0xe7, 0xd9, 0xc9, 0x14, 0x6a, 0xd7, 0x6f, 0xde, 0x22, -0x38, 0x14, 0xa0, 0xa7, 0x76, 0xf8, 0xaa, 0x19, 0x86, 0x18, 0xa3, 0x09, -0x14, 0x50, 0x54, 0x4d, 0xe7, 0x1c, 0xae, 0xd8, 0xd7, 0x4e, 0x5a, 0x86, -0x2e, 0xaa, 0xb7, 0xd6, 0x1a, 0x53, 0x54, 0x73, 0x41, 0xb0, 0xce, 0x15, -0xe0, 0x73, 0xfa, 0x49, 0x46, 0x3f, 0x49, 0x58, 0x69, 0x34, 0xb8, 0x71, -0xeb, 0x26, 0x49, 0x9a, 0x93, 0x5b, 0x3b, 0x69, 0x9d, 0xa7, 0xb6, 0x02, -0xbf, 0x65, 0x06, 0x00, 0x5e, 0xfe, 0xce, 0xdf, 0xfe, 0xb9, 0x52, 0xfa, -0xaf, 0x4b, 0x51, 0x44, 0xb5, 0x5c, 0xe2, 0xf0, 0xa1, 0x83, 0xd4, 0xa6, -0xa6, 0x28, 0x47, 0x61, 0x91, 0x09, 0xdf, 0x35, 0x6a, 0xad, 0x46, 0x75, -0xc6, 0xc3, 0x2b, 0x46, 0x91, 0x86, 0xd1, 0xf3, 0x0b, 0xf1, 0xc0, 0x73, -0xeb, 0xb5, 0xee, 0x23, 0x9f, 0xd2, 0x4f, 0x52, 0x16, 0xef, 0xdc, 0xe5, -0xee, 0xf2, 0x12, 0x83, 0x24, 0x25, 0xcd, 0xb2, 0x49, 0xed, 0x7f, 0x6f, -0x61, 0xe1, 0xec, 0xdb, 0x9f, 0x88, 0x00, 0xc0, 0xb7, 0x4f, 0x5f, 0x78, -0x27, 0x30, 0xe6, 0x64, 0x5c, 0x90, 0x38, 0x78, 0xe0, 0x00, 0xd3, 0x3b, -0xc7, 0x24, 0xa2, 0x20, 0xc0, 0x14, 0x44, 0x86, 0x3b, 0xaa, 0x91, 0x7e, -0xc4, 0x93, 0x71, 0xe2, 0x1d, 0xca, 0x4b, 0xcd, 0x2f, 0xd2, 0x41, 0x9a, -0xb1, 0x9e, 0xa6, 0xb4, 0xbb, 0x5d, 0x6e, 0x2c, 0x2e, 0xd2, 0x6c, 0xb7, -0x19, 0x24, 0x29, 0xb9, 0xcd, 0xc9, 0xed, 0x08, 0xfc, 0x4f, 0x17, 0x16, -0xce, 0x7e, 0xeb, 0x61, 0xe0, 0xe1, 0x11, 0x4f, 0xa7, 0x03, 0x63, 0x4e, -0x25, 0x59, 0x76, 0x49, 0x44, 0x8e, 0x39, 0x67, 0xb9, 0x7a, 0xed, 0x1a, -0xf3, 0x7b, 0x66, 0xd9, 0x3b, 0x37, 0x4b, 0x25, 0x8e, 0x89, 0x42, 0x4b, -0x14, 0x18, 0x42, 0x63, 0x30, 0x5a, 0xa1, 0x95, 0x46, 0xa9, 0xa2, 0xef, -0xa1, 0xb0, 0x56, 0xeb, 0xc8, 0x9d, 0x23, 0xcd, 0xf2, 0xc2, 0x65, 0x72, -0xba, 0xfd, 0x75, 0x96, 0x56, 0x96, 0x59, 0xa9, 0xd7, 0xe9, 0x0f, 0x52, -0xd2, 0x2c, 0xf5, 0x6b, 0xc8, 0x3d, 0x1e, 0xf8, 0x47, 0x66, 0x00, 0xe0, -0xe5, 0x6f, 0xff, 0x4d, 0x2d, 0xcd, 0xf3, 0x4b, 0x81, 0x31, 0xc7, 0x46, -0x1e, 0x5e, 0x2e, 0x31, 0xb7, 0x7b, 0x0f, 0x33, 0xb5, 0x1a, 0xe5, 0x52, -0x4c, 0x38, 0x5a, 0x9c, 0x9e, 0x00, 0x82, 0x5f, 0x13, 0xe2, 0xb7, 0xa2, -0x99, 0xb5, 0xa4, 0x59, 0x4e, 0xab, 0xd3, 0x61, 0xad, 0xd5, 0xa4, 0xbe, -0xba, 0xca, 0x7a, 0xe2, 0x81, 0x67, 0x79, 0xb1, 0x37, 0x18, 0x57, 0xdc, -0x6d, 0x83, 0xdf, 0x16, 0x01, 0x80, 0xef, 0x9c, 0xbe, 0x50, 0x4b, 0xd2, -0xf4, 0x1d, 0xad, 0xf5, 0x73, 0x51, 0x68, 0x08, 0x03, 0xdf, 0xb7, 0x44, -0x61, 0xc8, 0xce, 0x1d, 0x3b, 0xa8, 0x56, 0xaa, 0xec, 0xa8, 0x56, 0x88, -0xc2, 0x08, 0x63, 0x0c, 0x00, 0xd6, 0xe6, 0x24, 0x69, 0xc6, 0x60, 0x30, -0xa0, 0xdb, 0xeb, 0xd2, 0xea, 0x74, 0x48, 0xd2, 0x94, 0x41, 0x9a, 0x91, -0xe5, 0x99, 0xb7, 0x5e, 0x67, 0x47, 0x45, 0xb0, 0x18, 0xe7, 0x16, 0x16, -0xce, 0xbe, 0xba, 0x5d, 0xf0, 0xdb, 0x26, 0x30, 0x1c, 0xdf, 0x3a, 0xf5, -0xc6, 0x39, 0xa5, 0xd4, 0xf7, 0x8d, 0xd6, 0x18, 0xe3, 0x8b, 0x53, 0x50, -0x78, 0xba, 0xdf, 0x88, 0x98, 0x91, 0x84, 0xc0, 0x2f, 0x58, 0xe7, 0x86, -0x36, 0x9b, 0x8f, 0xec, 0xd6, 0x39, 0x37, 0x92, 0x4b, 0x71, 0xfb, 0xeb, -0xc0, 0xa9, 0x85, 0x85, 0xb3, 0xbf, 0x7c, 0x1c, 0xf0, 0x8f, 0x4d, 0x00, -0xe0, 0xa5, 0x97, 0x5e, 0x3f, 0xa6, 0x94, 0x3a, 0xaf, 0x95, 0x3a, 0xa1, -0x0a, 0xdd, 0x6b, 0xa5, 0xbc, 0x1b, 0xe1, 0xb7, 0x86, 0x30, 0xec, 0xff, -0x0b, 0x19, 0x15, 0x51, 0x76, 0x32, 0x7e, 0xe4, 0x58, 0xdc, 0xb6, 0x09, -0x9c, 0x7f, 0xdc, 0xa8, 0x7f, 0x2a, 0x02, 0xc3, 0xf1, 0xe2, 0x8b, 0x3f, -0x78, 0x4e, 0x29, 0x4e, 0x69, 0xa5, 0x5f, 0x50, 0x4a, 0xd5, 0xb4, 0x1e, -0x6e, 0xc0, 0xc7, 0x0f, 0x91, 0x87, 0x80, 0x9d, 0x13, 0x84, 0x0d, 0xc0, -0x2f, 0x03, 0xe7, 0xd9, 0xa2, 0x41, 0xfb, 0x7f, 0x21, 0x30, 0x39, 0x5e, -0x7c, 0xf1, 0x07, 0x27, 0x81, 0xe3, 0xf8, 0xc7, 0x1e, 0x07, 0x8b, 0x63, -0x38, 0x9a, 0x78, 0xc0, 0xd7, 0xf1, 0xed, 0xf0, 0xa5, 0x85, 0x85, 0xb3, -0x37, 0x3e, 0xf5, 0x4d, 0x8b, 0xf1, 0x3b, 0xfb, 0x4b, 0xfd, 0x67, 0x35, -0x3e, 0xf7, 0xff, 0xec, 0xf1, 0xb9, 0x27, 0xf0, 0x7f, 0xca, 0x8f, 0x08, -0x2e, 0x45, 0xb6, 0x8c, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, -0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_play.c b/Source/Core/DolphinWX/resources/toolbar_debugger_play.c deleted file mode 100644 index c77e26af54..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_debugger_play.c +++ /dev/null @@ -1,278 +0,0 @@ -static const unsigned char toolbar_play_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x3b, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5b, 0x8c, 0x5d, 0xd5, 0x79, -0xc7, 0x7f, 0x6b, 0xad, 0xbd, 0xf7, 0x39, 0x67, 0x8e, 0xc7, 0x3e, 0x33, -0xe3, 0xb1, 0x31, 0xc1, 0xc6, 0xc4, 0x02, 0xcb, 0x15, 0xc1, 0x6e, 0x22, -0x45, 0xb2, 0xaa, 0x82, 0x93, 0x87, 0xf8, 0x05, 0xc5, 0x48, 0x3c, 0x54, -0x02, 0xa1, 0x38, 0x8a, 0x5a, 0x72, 0x91, 0xb8, 0x3c, 0xf0, 0xe4, 0x54, -0x71, 0x84, 0x52, 0x22, 0x24, 0x0a, 0x76, 0x2b, 0x55, 0x69, 0x1f, 0x8c, -0x54, 0xcd, 0x6b, 0x45, 0xda, 0x07, 0xd2, 0x44, 0x45, 0xb6, 0xd3, 0x48, -0xb4, 0x02, 0xc9, 0x24, 0x10, 0xf0, 0x05, 0x18, 0xdb, 0x83, 0x2f, 0x33, -0x73, 0xe6, 0x7e, 0x2e, 0xfb, 0xb2, 0xbe, 0xaf, 0x0f, 0x7b, 0x9f, 0xcb, -0xd8, 0x33, 0xe3, 0x31, 0x44, 0x45, 0x2c, 0x69, 0xe9, 0xdc, 0xf7, 0xfe, -0xff, 0xbf, 0xff, 0xb7, 0xfe, 0xdf, 0xb7, 0xd6, 0x8c, 0x51, 0x55, 0xbe, -0xc8, 0xc3, 0x7e, 0xde, 0x00, 0x3e, 0xeb, 0x08, 0x3e, 0xcf, 0x9b, 0x3f, -0xf9, 0xe4, 0x3f, 0x9b, 0xce, 0xf3, 0x5f, 0xfc, 0xe2, 0x6f, 0x3e, 0x55, -0x2a, 0x98, 0x3f, 0x55, 0x0a, 0xfd, 0xfc, 0xe7, 0xbf, 0xda, 0xa9, 0xaa, -0x07, 0x54, 0xe5, 0x80, 0x88, 0xec, 0x14, 0xd1, 0xbd, 0xaa, 0x52, 0x13, -0x11, 0x44, 0x04, 0x55, 0x19, 0x17, 0x91, 0x8b, 0x22, 0x72, 0x52, 0x44, -0xde, 0x99, 0x9f, 0x6f, 0xfe, 0x72, 0x85, 0xcb, 0x28, 0xdc, 0x1e, 0x99, -0xcf, 0x44, 0xe0, 0xa5, 0x97, 0xde, 0xa8, 0xa9, 0xca, 0x23, 0xaa, 0xfa, -0xb4, 0xaa, 0xee, 0xcb, 0x81, 0x2a, 0x7d, 0xa0, 0xbb, 0xcf, 0x97, 0xbf, -0xf6, 0x88, 0xc8, 0x9c, 0x88, 0xfc, 0xbb, 0xf7, 0xf2, 0xaf, 0xad, 0x56, -0x76, 0xaa, 0x00, 0xdf, 0x99, 0x00, 0xba, 0x1e, 0x22, 0x9f, 0x9a, 0xc0, -0xcb, 0x2f, 0x9f, 0x3c, 0x0a, 0xfa, 0xb4, 0x88, 0xd6, 0x54, 0x95, 0x72, -0xb9, 0x44, 0xb5, 0x5a, 0x65, 0x70, 0x70, 0x10, 0x63, 0x0c, 0x51, 0x54, -0xea, 0x82, 0x4d, 0xd3, 0x94, 0x66, 0x73, 0x89, 0xa5, 0xa5, 0x26, 0x8b, -0x8b, 0xf3, 0x2c, 0x2e, 0x2e, 0x92, 0x65, 0x69, 0x3f, 0xb9, 0xd3, 0xde, -0xfb, 0xe7, 0x92, 0x84, 0x33, 0x05, 0x01, 0xe9, 0x90, 0xb9, 0x15, 0x89, -0xdb, 0x5e, 0x03, 0xc7, 0x8e, 0x9d, 0x3e, 0x60, 0x8c, 0x39, 0x61, 0xad, -0xdd, 0x69, 0xad, 0x65, 0x78, 0x78, 0x98, 0xbb, 0xef, 0xbe, 0x83, 0x91, -0x91, 0x0a, 0x03, 0x03, 0x01, 0x41, 0x60, 0x09, 0x02, 0x87, 0xf7, 0x20, -0x02, 0x8d, 0x46, 0xc2, 0xd2, 0x52, 0xcc, 0xfc, 0x7c, 0x93, 0x7a, 0x7d, -0x81, 0xe1, 0xe1, 0x21, 0x92, 0x24, 0x61, 0x7e, 0x7e, 0x96, 0xab, 0x57, -0xaf, 0x11, 0xc7, 0x31, 0xc0, 0x83, 0xc6, 0x98, 0xff, 0x09, 0x43, 0xff, -0x77, 0x69, 0x6a, 0x9f, 0x07, 0x4c, 0x41, 0xa2, 0x43, 0x64, 0xd5, 0x71, -0x5b, 0x0a, 0x1c, 0x3f, 0xfe, 0xdf, 0x47, 0x8d, 0x31, 0x3f, 0x01, 0xd8, -0xb2, 0x65, 0x94, 0xfb, 0xef, 0xdf, 0xce, 0x96, 0x2d, 0x25, 0x4a, 0x25, -0x8b, 0x08, 0x5d, 0xd0, 0x6b, 0x3d, 0x9f, 0x9c, 0x9c, 0x63, 0x62, 0xe2, -0x1a, 0xcd, 0x66, 0x0b, 0x91, 0x8c, 0xa9, 0xa9, 0x29, 0x26, 0x27, 0x27, -0xbb, 0x8a, 0xa8, 0xca, 0x6f, 0xbd, 0xd7, 0xbf, 0x52, 0x0d, 0xea, 0x80, -0x07, 0x64, 0x2d, 0x15, 0xd6, 0xad, 0xc0, 0xf1, 0xe3, 0xbf, 0x3d, 0x61, -0xad, 0x3d, 0x5c, 0x2a, 0x95, 0x78, 0xe0, 0x81, 0xdd, 0xdc, 0x77, 0xdf, -0x06, 0xca, 0x65, 0xd3, 0x05, 0xd7, 0x6a, 0x79, 0x66, 0x66, 0x12, 0x16, -0x16, 0x52, 0xda, 0xed, 0x7c, 0x7a, 0xef, 0x11, 0xf1, 0x44, 0x91, 0xa3, -0x54, 0x0a, 0xa9, 0x54, 0x4a, 0xd4, 0x6a, 0x83, 0x0c, 0x0d, 0xd5, 0xb8, -0x7a, 0x75, 0x92, 0x8f, 0x3f, 0xbe, 0xc8, 0xd0, 0xd0, 0x30, 0x95, 0x4a, -0x85, 0x89, 0x89, 0xcb, 0xb4, 0x5a, 0x2d, 0x80, 0xbf, 0x34, 0x46, 0xff, -0x53, 0x35, 0x3b, 0x08, 0x41, 0x9d, 0xe5, 0xeb, 0xe2, 0xa6, 0xb1, 0x2e, -0x05, 0x8e, 0x1d, 0x3b, 0x7d, 0xc2, 0x5a, 0x7b, 0xb8, 0x5a, 0xad, 0xf2, -0xe0, 0x83, 0xf7, 0xb3, 0x63, 0x47, 0xd8, 0x8d, 0x68, 0xbd, 0xee, 0xb9, -0x76, 0x2d, 0xa1, 0xd9, 0xcc, 0x10, 0xf1, 0x78, 0x2f, 0xc5, 0xa3, 0xef, -0x7b, 0x14, 0xbc, 0xf7, 0x78, 0x9f, 0x91, 0x65, 0x42, 0xad, 0xb6, 0x81, -0xad, 0x5b, 0xb7, 0x92, 0x24, 0x19, 0xef, 0xbe, 0xfb, 0x1e, 0x69, 0x1a, -0xe3, 0xbd, 0xe7, 0xea, 0xd5, 0x2b, 0xcc, 0xcf, 0xcf, 0x75, 0xd6, 0xc5, -0x1f, 0x54, 0xcd, 0xb7, 0x8c, 0x89, 0xa6, 0x01, 0xbf, 0x9a, 0x0a, 0xb7, -0x2c, 0x64, 0x2f, 0xbf, 0x7c, 0xf2, 0x04, 0x70, 0x78, 0xd3, 0xa6, 0x1a, -0x07, 0x0f, 0x7e, 0x85, 0xed, 0xdb, 0xc3, 0x22, 0xe2, 0x70, 0xfe, 0x7c, -0xc6, 0xc4, 0x44, 0x46, 0x1c, 0x2b, 0xc6, 0x18, 0xc0, 0x60, 0x0a, 0x67, -0xcf, 0x1f, 0x4d, 0x31, 0xbb, 0xf1, 0x02, 0xa0, 0x5e, 0x9f, 0xe5, 0xf7, -0xbf, 0x7f, 0x97, 0xd9, 0xd9, 0x59, 0xf6, 0xec, 0xf9, 0x33, 0xac, 0x75, -0x88, 0x28, 0x5b, 0xb6, 0x6c, 0xa5, 0x5c, 0x1e, 0xe8, 0xfc, 0xee, 0x2b, -0xaa, 0xfe, 0x5f, 0x00, 0x77, 0xc3, 0x45, 0xd6, 0x4f, 0xe0, 0xa5, 0x97, -0xfe, 0xeb, 0x69, 0x55, 0x3d, 0x5c, 0x2e, 0x97, 0xf9, 0xc6, 0x37, 0x76, -0x33, 0x3c, 0x1c, 0x20, 0x02, 0xd3, 0xd3, 0xca, 0x87, 0x1f, 0x2a, 0xed, -0xf6, 0xad, 0xe8, 0xd3, 0x25, 0x94, 0x3f, 0xef, 0xbd, 0x50, 0x85, 0x4f, -0x3e, 0x99, 0xe0, 0xc2, 0x85, 0x0b, 0xec, 0xda, 0x75, 0x5f, 0xd7, 0x7e, -0xb7, 0x6e, 0xdd, 0x4a, 0x10, 0x74, 0x33, 0xfb, 0xe1, 0x2c, 0x6b, 0x3c, -0x05, 0xd8, 0xfe, 0xa2, 0xb7, 0x2e, 0x02, 0x2f, 0xbe, 0xf8, 0x9b, 0x7d, -0xaa, 0xfa, 0x8a, 0x73, 0x8e, 0xfd, 0xfb, 0xef, 0x67, 0x78, 0x38, 0x8f, -0xfc, 0xa5, 0x4b, 0x9e, 0x2b, 0x57, 0x72, 0xfb, 0x03, 0xa5, 0x93, 0x81, -0x2b, 0xa7, 0x62, 0xef, 0xf3, 0xce, 0xeb, 0x1e, 0x87, 0xfc, 0xb3, 0x66, -0x73, 0x91, 0x4b, 0x97, 0xc6, 0xd9, 0xb6, 0xed, 0x4b, 0xa8, 0x2a, 0xc6, -0x58, 0x46, 0x47, 0x47, 0xe9, 0x4b, 0xfb, 0x23, 0x69, 0xba, 0x74, 0xcf, -0x6a, 0x38, 0xd7, 0x50, 0x40, 0x4f, 0xa8, 0xc2, 0x9e, 0x3d, 0xf7, 0xb2, -0x7d, 0x7b, 0x05, 0x11, 0xb8, 0x78, 0x31, 0x61, 0x66, 0x26, 0x2b, 0x0a, -0x91, 0xef, 0x16, 0xa7, 0x5f, 0xff, 0xfa, 0x37, 0x34, 0x1a, 0x4b, 0xa8, -0x6a, 0x97, 0x48, 0x0f, 0x78, 0x8f, 0x41, 0xfe, 0x9e, 0x2e, 0xfb, 0x4c, -0x15, 0x16, 0x17, 0x17, 0x98, 0x9b, 0x9b, 0x25, 0x0c, 0xcb, 0xa8, 0x0a, -0xa5, 0x52, 0x99, 0x0d, 0x1b, 0x06, 0x3b, 0x5f, 0xda, 0xa4, 0x2a, 0x7f, -0xcb, 0x2a, 0x69, 0xb4, 0x22, 0x81, 0x17, 0x5e, 0x78, 0xfd, 0x3b, 0xaa, -0xba, 0x6f, 0xe3, 0xc6, 0x8d, 0xdc, 0x7b, 0xef, 0x08, 0xc6, 0x18, 0xa6, -0xa7, 0x53, 0xea, 0xf5, 0x14, 0xef, 0xa5, 0x3b, 0x3b, 0x85, 0xe8, 0xfa, -0xf5, 0xeb, 0xbc, 0xfe, 0xfa, 0xaf, 0x38, 0x7b, 0xf6, 0x5c, 0x97, 0x44, -0x3e, 0x3b, 0xc0, 0x6f, 0x34, 0x12, 0x2d, 0xc0, 0xf7, 0xde, 0x5f, 0x5c, -0x5c, 0x20, 0x4d, 0x63, 0x44, 0xf2, 0xf7, 0x6b, 0xb5, 0x21, 0x54, 0xbb, -0xca, 0x3e, 0x11, 0xc7, 0x73, 0x2b, 0xaa, 0xb0, 0x22, 0x01, 0x55, 0x3d, -0xaa, 0xaa, 0xec, 0xd9, 0xf3, 0x65, 0x36, 0x6e, 0x8c, 0x68, 0xb7, 0x85, -0x89, 0x89, 0x56, 0x5f, 0x1b, 0xd0, 0x53, 0x20, 0x4f, 0x25, 0x38, 0x78, -0xf0, 0x01, 0xce, 0x9d, 0xfb, 0x23, 0xa7, 0x4e, 0x9d, 0x5e, 0xa6, 0xc6, -0x72, 0x32, 0x5a, 0xa4, 0x89, 0x29, 0xc0, 0xd1, 0x05, 0x2c, 0xa2, 0xa4, -0x69, 0xa7, 0x16, 0x28, 0xce, 0x39, 0xaa, 0xd5, 0x2a, 0xc6, 0x74, 0xbe, -0xc7, 0x53, 0xeb, 0x22, 0xf0, 0xfc, 0xf3, 0xff, 0x71, 0x48, 0x55, 0x77, -0x0e, 0x0d, 0xd5, 0x18, 0x1d, 0xad, 0x22, 0x02, 0x97, 0x2f, 0x37, 0x49, -0xd3, 0x1e, 0xe0, 0x0e, 0x81, 0x8e, 0x45, 0x02, 0x3c, 0xfc, 0xf0, 0xd7, -0xf8, 0xf1, 0x8f, 0x1f, 0x65, 0x68, 0x28, 0xe2, 0x8d, 0x37, 0x4e, 0xf1, -0xe1, 0x87, 0x1f, 0xa1, 0x2a, 0x37, 0x11, 0xe9, 0x57, 0xa4, 0xa3, 0x50, -0x4e, 0x42, 0x6e, 0x50, 0xcc, 0x30, 0x30, 0x50, 0x2d, 0xf2, 0x46, 0x01, -0x39, 0xb4, 0xd2, 0x42, 0xbe, 0x89, 0x80, 0xaa, 0x1e, 0x56, 0x15, 0x36, -0x6f, 0x1e, 0x61, 0x68, 0xa8, 0xc2, 0xc2, 0x42, 0xc2, 0xec, 0x6c, 0xeb, -0x06, 0xe0, 0xd2, 0xf5, 0xfb, 0x99, 0x99, 0x3a, 0x77, 0xdd, 0x35, 0x82, -0x08, 0x0c, 0x0d, 0x0d, 0xf2, 0xec, 0xb3, 0x0f, 0xf3, 0xd8, 0x63, 0x7f, -0xc1, 0x47, 0x1f, 0x5d, 0xe0, 0xcd, 0x37, 0xff, 0x97, 0x66, 0xb3, 0xd9, -0x8d, 0x7c, 0x47, 0x89, 0x4e, 0xd4, 0x3b, 0xcd, 0x9d, 0xaa, 0x14, 0x37, -0x17, 0x50, 0xc5, 0x1a, 0x83, 0x41, 0xa9, 0x0e, 0x54, 0x00, 0xd3, 0x49, -0xfe, 0xbb, 0x1b, 0x8d, 0xe9, 0x7d, 0x6b, 0x12, 0x38, 0x7a, 0xf4, 0xdf, -0x6a, 0xaa, 0xf2, 0x48, 0x10, 0x84, 0x8c, 0x8e, 0x0e, 0x17, 0x96, 0xd9, -0xa2, 0xbf, 0xa3, 0xec, 0x00, 0xef, 0xa4, 0x50, 0x1c, 0x27, 0x54, 0x2a, -0x51, 0xb7, 0xb0, 0x89, 0xc0, 0xd7, 0xbf, 0x7e, 0x1f, 0xcf, 0x3f, 0xff, -0x18, 0x77, 0xdd, 0xb5, 0x91, 0xdf, 0xfd, 0xee, 0x4d, 0xc6, 0xc7, 0x2f, -0xf5, 0xa9, 0xd1, 0xe9, 0x4a, 0x57, 0x56, 0xc5, 0x98, 0xa2, 0x0a, 0x18, -0x70, 0xce, 0x51, 0x2a, 0x95, 0xa1, 0x9b, 0x72, 0x7a, 0xe8, 0x46, 0x02, -0xcb, 0x5a, 0x09, 0x11, 0x7d, 0xc8, 0x5a, 0xa5, 0x5a, 0x1d, 0xa0, 0x5a, -0x8d, 0x48, 0x53, 0x61, 0x7a, 0xba, 0x51, 0xf8, 0x77, 0x6e, 0x71, 0xd0, -0xf3, 0xf3, 0x1e, 0xa0, 0xbc, 0xdf, 0xe9, 0x1f, 0x51, 0x14, 0xf1, 0xbd, -0xef, 0x7d, 0x8b, 0xf3, 0xe7, 0xaf, 0x30, 0x36, 0x76, 0x8a, 0xc9, 0xc9, -0x29, 0x76, 0xef, 0xbe, 0x97, 0x30, 0x74, 0xcb, 0xa2, 0x2f, 0x22, 0xa8, -0x68, 0x01, 0xda, 0x60, 0x8c, 0xc1, 0x1a, 0x83, 0xa8, 0x20, 0x0a, 0x41, -0xe0, 0x30, 0x3d, 0x03, 0xd8, 0xbb, 0xa6, 0x02, 0xaa, 0xba, 0x4f, 0x55, -0x18, 0x18, 0x18, 0xa0, 0x5c, 0x0e, 0x59, 0x58, 0x88, 0x97, 0x45, 0x7e, -0x79, 0x5b, 0xe0, 0xbb, 0xef, 0xe7, 0xe4, 0x57, 0x9e, 0xbb, 0x76, 0xdd, -0xc9, 0x73, 0xcf, 0x3d, 0xca, 0xde, 0xbd, 0x3b, 0x78, 0xfb, 0xed, 0x33, -0x4c, 0x4c, 0x5c, 0x2d, 0xae, 0xd9, 0x59, 0xbc, 0xd2, 0x8b, 0x3e, 0x86, -0xc0, 0x5a, 0x02, 0x67, 0x71, 0xd6, 0x61, 0x2d, 0x94, 0xcb, 0xa5, 0x3e, -0x85, 0xa8, 0xdd, 0x82, 0x80, 0x1c, 0x10, 0x51, 0x82, 0x20, 0x60, 0x60, -0xa0, 0xcc, 0xc2, 0x42, 0xeb, 0x26, 0xc7, 0x59, 0xee, 0x42, 0x9e, 0x46, -0xa3, 0x41, 0xb9, 0x5c, 0xc2, 0x7b, 0x56, 0x9d, 0x51, 0x14, 0xf1, 0xed, -0x6f, 0xef, 0xe7, 0xa9, 0xa7, 0x0e, 0x91, 0xa6, 0x0d, 0x3e, 0xf8, 0xe0, -0x3c, 0xed, 0x76, 0xdc, 0x33, 0x01, 0xcd, 0xc1, 0x3b, 0x9b, 0xcf, 0xc0, -0x5a, 0x9c, 0x31, 0x58, 0x63, 0xb1, 0x26, 0x8f, 0x7f, 0x91, 0x69, 0x07, -0x6e, 0xa5, 0x40, 0x2d, 0x2f, 0x24, 0xa5, 0xa2, 0x97, 0x6f, 0xaf, 0xe8, -0x3c, 0xbd, 0x5a, 0xe0, 0x69, 0x36, 0x1b, 0x6c, 0xdb, 0x36, 0xb2, 0xaa, -0x02, 0xfd, 0x73, 0xdb, 0xb6, 0x11, 0x9e, 0x79, 0xe6, 0x51, 0xf6, 0xef, -0xdf, 0xcd, 0xc4, 0xc4, 0x65, 0xea, 0xf5, 0xd9, 0x5c, 0x09, 0x04, 0x6b, -0xc8, 0x09, 0x38, 0x5b, 0x4c, 0x83, 0xb5, 0x79, 0x4a, 0xf5, 0x9c, 0xe8, -0xe6, 0x71, 0xc3, 0x1a, 0x90, 0x7d, 0x9d, 0x3c, 0x14, 0x81, 0x85, 0x85, -0x06, 0xc6, 0xd8, 0x6e, 0x6e, 0xc2, 0xf2, 0x7e, 0x26, 0xff, 0x8d, 0xae, -0xb8, 0x06, 0xd6, 0x1a, 0xdf, 0xfc, 0xe6, 0xd7, 0xf8, 0xea, 0x57, 0x77, -0xf3, 0xc6, 0x1b, 0xef, 0x30, 0x39, 0x39, 0x87, 0x35, 0xa6, 0x20, 0xe0, -0x08, 0x5d, 0x80, 0x35, 0xf9, 0x75, 0xad, 0x91, 0xa2, 0x66, 0xac, 0xde, -0x51, 0x2f, 0x23, 0x90, 0xdb, 0x99, 0x2d, 0x22, 0x0e, 0x22, 0x82, 0x31, -0xfd, 0x9d, 0xe6, 0x72, 0x12, 0xcb, 0xad, 0x71, 0xfd, 0x04, 0x00, 0xca, -0xe5, 0x32, 0x43, 0x43, 0x83, 0x4c, 0x5e, 0x9f, 0xc3, 0x18, 0x83, 0x2b, -0x72, 0x3f, 0x70, 0x16, 0x03, 0x38, 0x2b, 0x64, 0x62, 0x48, 0xd3, 0x64, -0x95, 0x3e, 0x6b, 0x05, 0x02, 0x22, 0x8a, 0x31, 0xd2, 0x23, 0xe0, 0xf3, -0x08, 0x50, 0x28, 0xd0, 0x6b, 0x91, 0x7b, 0xa3, 0xd5, 0x6a, 0x22, 0x32, -0x74, 0x5b, 0x0a, 0xbc, 0xff, 0xfe, 0x25, 0xde, 0x7e, 0xfb, 0x1c, 0xad, -0x56, 0x8c, 0x2b, 0x52, 0x27, 0x74, 0x8e, 0x28, 0x0c, 0x08, 0x83, 0xdc, -0xa5, 0x8c, 0xcf, 0xad, 0x34, 0x4d, 0x53, 0xa4, 0x47, 0xe0, 0xcc, 0x9a, -0x04, 0x54, 0x05, 0x83, 0x21, 0x8e, 0x63, 0x16, 0x16, 0x1a, 0x85, 0x22, -0xbd, 0x9e, 0x5e, 0xc4, 0x70, 0x43, 0x06, 0xd1, 0x6c, 0xb6, 0xb9, 0xe3, -0x8e, 0x91, 0x75, 0x29, 0x30, 0x35, 0x35, 0xc7, 0x5b, 0x6f, 0x9d, 0x63, -0x6a, 0x6a, 0x96, 0x2c, 0xcb, 0x30, 0x08, 0xd6, 0xd8, 0x1c, 0x7c, 0x10, -0x10, 0x05, 0x8e, 0xc0, 0x39, 0x52, 0x9f, 0x61, 0xac, 0xc1, 0x60, 0xba, -0x6d, 0x49, 0x31, 0xe6, 0xd6, 0x24, 0x20, 0x22, 0x27, 0x8d, 0xb5, 0x07, -0x92, 0xb8, 0x4d, 0xb3, 0xd1, 0xa2, 0x93, 0x77, 0xa6, 0x53, 0x3d, 0xa1, -0xdb, 0xcb, 0x40, 0xaf, 0xf8, 0x84, 0x61, 0xb4, 0xa6, 0x02, 0xcd, 0x66, -0xcc, 0x3b, 0xef, 0x5c, 0xe0, 0xf2, 0xe5, 0xeb, 0xa4, 0x69, 0x4a, 0x96, -0x79, 0x50, 0xc1, 0x19, 0x43, 0x14, 0x38, 0xca, 0x51, 0x40, 0xb9, 0x14, -0x12, 0x05, 0x0e, 0x80, 0xcc, 0xe7, 0xe0, 0xe3, 0x24, 0x2e, 0xa2, 0xdf, -0x25, 0x70, 0xf2, 0x56, 0x04, 0xe6, 0x72, 0xd6, 0x8b, 0xcc, 0xd4, 0x67, -0xa8, 0x94, 0x4b, 0x24, 0x71, 0x82, 0xa8, 0x60, 0xc8, 0x15, 0x52, 0x01, -0x51, 0xed, 0x1d, 0xde, 0xdc, 0x62, 0x0d, 0x9c, 0x3d, 0x7b, 0x89, 0xf3, -0xe7, 0x2f, 0xd3, 0x6a, 0xb5, 0xc9, 0xb2, 0x0c, 0xdf, 0x05, 0x6f, 0x29, -0x85, 0x01, 0x03, 0xa5, 0x88, 0x4a, 0x14, 0x51, 0x0e, 0x03, 0x9c, 0x73, -0x64, 0xe2, 0xbb, 0xd7, 0x9d, 0x9d, 0x9b, 0xc3, 0x7b, 0xed, 0x57, 0xe0, -0x56, 0x29, 0xa4, 0x67, 0x14, 0x7d, 0xa4, 0xb1, 0xd4, 0xa0, 0xdd, 0x6e, -0x52, 0xad, 0x0e, 0x80, 0x0a, 0x81, 0x31, 0x39, 0x68, 0x35, 0x18, 0x3c, -0x5e, 0xa4, 0x78, 0xdd, 0xe9, 0x20, 0x6f, 0x76, 0xa1, 0x7a, 0x7d, 0x9e, -0x33, 0x67, 0xce, 0xb2, 0xb8, 0xd8, 0xe8, 0x15, 0x3e, 0xef, 0x31, 0x28, -0xce, 0x5a, 0xa2, 0xc0, 0x51, 0x89, 0xa2, 0x9c, 0x40, 0x29, 0x22, 0x0a, -0x1d, 0xaa, 0x90, 0x79, 0x8f, 0xa0, 0x78, 0x15, 0xe6, 0xe6, 0x66, 0x97, -0x35, 0x79, 0xeb, 0x51, 0xe0, 0x35, 0x63, 0xcc, 0xd1, 0x46, 0xa3, 0x81, -0xcf, 0x32, 0xd2, 0x38, 0xc5, 0x19, 0x8a, 0xf2, 0x0e, 0x06, 0x21, 0xf3, -0x79, 0x4a, 0x21, 0x79, 0x15, 0x6d, 0x36, 0x5b, 0xc5, 0x21, 0x56, 0x7e, -0x8d, 0x56, 0xab, 0xcd, 0x7b, 0xef, 0x7d, 0xc8, 0x95, 0x2b, 0x93, 0x85, -0xc5, 0x7a, 0xb4, 0x28, 0x56, 0xce, 0x1a, 0x9c, 0xc9, 0xc1, 0x97, 0xc2, -0x80, 0x6a, 0xb9, 0xc4, 0x40, 0x29, 0x22, 0x0c, 0x02, 0xac, 0x85, 0x24, -0xf3, 0x78, 0x15, 0x32, 0x2f, 0xd4, 0x67, 0x66, 0x89, 0x93, 0x14, 0x2f, -0xdd, 0xc8, 0xbc, 0x36, 0x36, 0x76, 0x64, 0xfe, 0x46, 0x02, 0xcb, 0x0a, -0xd9, 0xf1, 0xe3, 0x7f, 0xfd, 0x8e, 0x78, 0x3f, 0xee, 0xc5, 0x53, 0xaf, -0x4f, 0xe3, 0xb3, 0x04, 0x63, 0x20, 0xb0, 0x10, 0x58, 0x4b, 0xe4, 0x1c, -0x91, 0xb3, 0x84, 0xce, 0x10, 0x58, 0x70, 0x46, 0xd9, 0xba, 0x65, 0x33, -0x23, 0x23, 0x23, 0x78, 0x0f, 0x67, 0xcf, 0x8e, 0x73, 0xfa, 0xd4, 0x5b, -0x5c, 0xbb, 0x32, 0x09, 0x2a, 0x18, 0x15, 0xac, 0xe6, 0x37, 0x89, 0xac, -0xa5, 0x12, 0x06, 0x54, 0xcb, 0x11, 0x1b, 0x2a, 0x65, 0x36, 0x55, 0x07, -0x18, 0xac, 0x94, 0xf3, 0xe8, 0x07, 0xf9, 0xbe, 0x5d, 0x44, 0x49, 0x33, -0x4f, 0x9c, 0xa6, 0x5c, 0x9f, 0xbc, 0x8e, 0x97, 0xac, 0x3f, 0xfa, 0xaf, -0xde, 0x08, 0xfe, 0x26, 0x05, 0x8a, 0x44, 0xfa, 0xa5, 0x78, 0x79, 0x7a, -0x7a, 0x7a, 0x9a, 0xcd, 0xc3, 0x9b, 0x89, 0x02, 0x8b, 0xc1, 0x12, 0xd8, -0xdc, 0x8d, 0x9c, 0xc9, 0x01, 0xa5, 0x05, 0xfb, 0x5d, 0x77, 0x7f, 0x89, -0xb9, 0xd9, 0x05, 0xde, 0x7f, 0xf7, 0x2c, 0xcd, 0x56, 0x0b, 0x15, 0xcd, -0xdb, 0x00, 0x0c, 0xb8, 0xbc, 0x2d, 0x76, 0xc6, 0x75, 0xd3, 0xa6, 0x14, -0x06, 0x94, 0xa3, 0x90, 0x52, 0x18, 0x12, 0x85, 0x0e, 0x63, 0x0c, 0x99, -0x17, 0xbc, 0x08, 0x49, 0x96, 0x91, 0x64, 0x9e, 0x4f, 0xae, 0x4c, 0xd0, -0x8e, 0x63, 0x7c, 0xb7, 0x4f, 0x62, 0x7c, 0x6c, 0xec, 0xc8, 0x4a, 0x87, -0xc1, 0x37, 0x13, 0x50, 0xd5, 0x57, 0xbc, 0xf8, 0xa7, 0x93, 0x34, 0x61, -0x6a, 0xfa, 0x3a, 0xa5, 0x3b, 0xef, 0x24, 0xb0, 0x79, 0x9b, 0x1b, 0x38, -0x43, 0xa8, 0x01, 0xa1, 0xb3, 0x64, 0xce, 0x92, 0x7a, 0x4b, 0x92, 0x19, -0xce, 0xbf, 0xfb, 0x01, 0xc6, 0x0b, 0xe5, 0x20, 0x40, 0x34, 0xef, 0x2e, -0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x81, 0x75, 0x84, 0x81, 0xcd, 0xad, 0x32, -0x0c, 0x88, 0x82, 0x80, 0xc0, 0x59, 0xc0, 0x90, 0x89, 0x27, 0x13, 0x4f, -0x3b, 0x49, 0x69, 0xa7, 0x29, 0x53, 0xf5, 0x69, 0xea, 0x33, 0x73, 0xa4, -0x59, 0x86, 0x48, 0x37, 0xfc, 0x47, 0x57, 0x02, 0x0f, 0xab, 0x1c, 0x6c, -0xfd, 0xe8, 0x47, 0xff, 0xf4, 0x6a, 0x18, 0x04, 0xdf, 0x29, 0x47, 0x21, -0xf7, 0x7e, 0xf9, 0x1e, 0x86, 0x36, 0xd5, 0x28, 0x87, 0x01, 0xa5, 0x30, -0x20, 0x28, 0xfc, 0x59, 0x54, 0xf1, 0xde, 0x93, 0x79, 0x21, 0xf3, 0x9e, -0xcc, 0xfb, 0xc2, 0x31, 0x84, 0x7c, 0x3f, 0x05, 0xd6, 0xe4, 0xbd, 0x4d, -0xe8, 0x2c, 0x81, 0x73, 0xc5, 0x2c, 0x1a, 0x34, 0x55, 0x52, 0x9f, 0xa7, -0x4b, 0x33, 0x4e, 0x69, 0xc4, 0x31, 0xd7, 0xa7, 0xa7, 0xf9, 0xf8, 0xe2, -0x38, 0xad, 0x38, 0xee, 0x27, 0x70, 0x66, 0x6c, 0xec, 0xc8, 0x9f, 0xaf, -0x46, 0x60, 0xc5, 0xa3, 0xc5, 0xd0, 0xd9, 0x9f, 0x66, 0x59, 0x7a, 0x28, -0x81, 0xda, 0xf8, 0xa5, 0xcb, 0x04, 0xf7, 0x04, 0xd8, 0xc1, 0x0d, 0x79, -0xd5, 0x0c, 0x43, 0x9c, 0xb3, 0x04, 0x06, 0x28, 0xaa, 0xa6, 0x14, 0xae, -0x24, 0xa2, 0xfd, 0xc7, 0x11, 0xf9, 0xce, 0xca, 0x80, 0x2d, 0xba, 0x4b, -0x63, 0x0c, 0x8a, 0xe2, 0x45, 0x0a, 0xf0, 0x19, 0xcd, 0x38, 0xa5, 0x19, -0xc7, 0x4c, 0xd5, 0xeb, 0x5c, 0xbc, 0x7c, 0x89, 0x38, 0xc9, 0xc8, 0xbc, -0xef, 0xb7, 0xce, 0xc3, 0xab, 0x81, 0x5f, 0x55, 0x01, 0x80, 0x1f, 0xfe, -0xe0, 0x1f, 0x9f, 0x35, 0xc6, 0xfe, 0x7d, 0x39, 0x8a, 0xa8, 0x56, 0xca, -0xec, 0xba, 0x67, 0x27, 0xb5, 0xc1, 0x41, 0x2a, 0x51, 0x58, 0x28, 0x61, -0x71, 0xd6, 0x62, 0xad, 0xe9, 0xd6, 0x99, 0x1c, 0x5e, 0x31, 0x0a, 0x19, -0x3a, 0x85, 0x5b, 0x35, 0x07, 0x9e, 0xf9, 0x3c, 0xd7, 0xf3, 0xc8, 0x27, -0x34, 0xe3, 0x84, 0x89, 0x2b, 0x57, 0xb9, 0x3a, 0x79, 0x8d, 0x76, 0x9c, -0x90, 0xa4, 0x69, 0x7f, 0xee, 0x3f, 0x33, 0x36, 0x76, 0xe4, 0xd8, 0xa7, -0x22, 0x00, 0xf0, 0xfd, 0x27, 0x8f, 0xbf, 0x16, 0x38, 0x77, 0xa8, 0x54, -0x90, 0xd8, 0xb9, 0x63, 0x07, 0x43, 0x1b, 0x7b, 0x24, 0xa2, 0x20, 0xc0, -0x15, 0x44, 0x3a, 0x3b, 0xaa, 0x6e, 0xfe, 0x14, 0xc5, 0x4e, 0x8a, 0xed, -0x63, 0x9e, 0x6a, 0xf9, 0x22, 0x6d, 0x27, 0x29, 0xad, 0x24, 0x61, 0x61, -0x69, 0x89, 0x8b, 0x13, 0x13, 0xcc, 0x2d, 0x2c, 0xd0, 0x8e, 0x13, 0x32, -0x9f, 0x91, 0xf9, 0x2e, 0xf8, 0x57, 0xc7, 0xc6, 0x8e, 0x7c, 0x77, 0x2d, -0xf0, 0x70, 0x8b, 0xd3, 0xe9, 0xc0, 0xb9, 0xc3, 0x71, 0x9a, 0x9e, 0x54, -0xd5, 0xbd, 0x22, 0x9e, 0xf3, 0x1f, 0x7d, 0xc4, 0xd6, 0xcd, 0xa3, 0xdc, -0xb1, 0x65, 0x94, 0x81, 0x52, 0x89, 0x28, 0xf4, 0x44, 0x81, 0x23, 0x74, -0x0e, 0x67, 0xf3, 0x0d, 0x48, 0xe7, 0x18, 0x44, 0xc9, 0x81, 0x7b, 0x2f, -0x64, 0x22, 0x24, 0x69, 0x56, 0xb8, 0x4c, 0xc6, 0x52, 0xb3, 0xc5, 0xb5, -0xa9, 0x49, 0xa6, 0xa6, 0xa7, 0x69, 0xb6, 0x13, 0x92, 0x34, 0xc9, 0xd7, -0x90, 0xdc, 0x1e, 0xf8, 0x5b, 0x2a, 0x00, 0xf0, 0xc3, 0xef, 0xff, 0x43, -0x2d, 0xc9, 0xb2, 0x93, 0x81, 0x73, 0x7b, 0xc3, 0xc0, 0x51, 0x0a, 0x43, -0x06, 0x2a, 0x65, 0xb6, 0x8c, 0x6c, 0x66, 0xb8, 0x56, 0xa3, 0x52, 0x2e, -0x11, 0x76, 0x17, 0x67, 0x4e, 0x00, 0xcd, 0xdb, 0x0d, 0xd1, 0x7c, 0xe3, -0x93, 0x7a, 0x4f, 0x92, 0x66, 0xcc, 0x2f, 0x2e, 0x32, 0x3b, 0x3f, 0xc7, -0xf4, 0xcc, 0x0c, 0xad, 0x38, 0x07, 0x9e, 0x66, 0x45, 0x95, 0xee, 0x55, -0xdc, 0x75, 0x83, 0x5f, 0x17, 0x01, 0x80, 0x1f, 0x3c, 0x79, 0xbc, 0x16, -0x27, 0xc9, 0x6b, 0xd6, 0xda, 0x87, 0xa2, 0xd0, 0x11, 0x06, 0x01, 0x61, -0x10, 0x10, 0x85, 0x21, 0x1b, 0x37, 0x6c, 0xa0, 0x3a, 0x50, 0x65, 0x43, -0x75, 0x80, 0x28, 0x8c, 0x70, 0x2e, 0x6f, 0xc8, 0xbc, 0xcf, 0x88, 0x93, -0x94, 0x76, 0xbb, 0xcd, 0x52, 0x63, 0x89, 0xf9, 0xc5, 0x45, 0xe2, 0x24, -0xa1, 0x9d, 0xa4, 0xa4, 0x59, 0xde, 0xd0, 0x79, 0x29, 0xda, 0x92, 0x3e, -0xbb, 0x1c, 0x1b, 0x3b, 0xf2, 0xd3, 0xf5, 0x82, 0x5f, 0x37, 0x81, 0xce, -0xf8, 0xee, 0xe1, 0x17, 0x8f, 0x1a, 0x63, 0x7e, 0xe2, 0xac, 0xc5, 0xb9, -0xbc, 0x38, 0x05, 0x85, 0xa7, 0xe7, 0x1b, 0x11, 0xd7, 0x4d, 0x21, 0xc8, -0x17, 0xac, 0x48, 0xc7, 0x66, 0xb3, 0xae, 0xdd, 0x8a, 0x48, 0x37, 0x5d, -0x8a, 0xdb, 0x8f, 0x03, 0x87, 0xc7, 0xc6, 0x8e, 0x9c, 0xba, 0x1d, 0xf0, -0xb7, 0x4d, 0x00, 0xe0, 0x89, 0x27, 0x5e, 0xd8, 0x6b, 0x8c, 0x79, 0xc5, -0x1a, 0x73, 0xc0, 0xd8, 0xde, 0xc6, 0xdb, 0x16, 0x95, 0xda, 0x16, 0xb6, -0xd3, 0x39, 0xd7, 0x14, 0x95, 0x6e, 0x94, 0x65, 0xd9, 0x49, 0x1d, 0x90, -0xf7, 0xf7, 0xaf, 0xdc, 0x6e, 0xd4, 0x3f, 0x13, 0x81, 0xce, 0x78, 0xfc, -0xf1, 0x9f, 0x3d, 0x64, 0x0c, 0x87, 0xad, 0xb1, 0x8f, 0x18, 0x63, 0x6a, -0xbd, 0x0d, 0x78, 0x6f, 0xc7, 0xd3, 0x01, 0x9c, 0xef, 0x25, 0x96, 0x01, -0x3f, 0x03, 0xbc, 0xc2, 0x2a, 0x0d, 0xda, 0xff, 0x0b, 0x81, 0xfe, 0xf1, -0xf8, 0xe3, 0x3f, 0x3b, 0x04, 0xec, 0x23, 0x3f, 0xf6, 0xd8, 0x59, 0xcc, -0xce, 0x98, 0x23, 0x07, 0x3c, 0x4e, 0xde, 0x0e, 0x9f, 0x1c, 0x1b, 0x3b, -0x72, 0xf1, 0x33, 0xdf, 0xb4, 0x18, 0x7f, 0xb2, 0xbf, 0xd4, 0x7f, 0x5e, -0xe3, 0x0b, 0xff, 0xcf, 0x1e, 0x5f, 0x78, 0x02, 0xff, 0x07, 0xe2, 0x1a, -0xeb, 0x6e, 0x4b, 0x67, 0x61, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_file_open.xpm b/Source/Core/DolphinWX/resources/toolbar_file_open.xpm deleted file mode 100644 index 74ed5a17e3..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_file_open.xpm +++ /dev/null @@ -1,141 +0,0 @@ -/* XPM */ -static const char *toolbar_file_open_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 87 1", -" c #B09454", -". c #B69B5C", -"X c #BA9F5E", -"o c #BFA45D", -"O c #B59A65", -"+ c #BEA263", -"@ c #BDA269", -"# c #C2A551", -"$ c #C5A955", -"% c #C9AE57", -"& c #C2A65D", -"* c #C5A95E", -"= c #C8AC5B", -"- c #CDB25C", -"; c #D1B45F", -": c #C6AB60", -"> c #CBAF64", -", c #C4A96A", -"< c #CBB165", -"1 c #CDB36D", -"2 c #D2B661", -"3 c #D6B962", -"4 c #DABD65", -"5 c #D4B86F", -"6 c #C4AF79", -"7 c #D0B971", -"8 c #D2B978", -"9 c #DEC167", -"0 c #DFC272", -"q c #DEC37A", -"w c #E6C265", -"e c #E3C46A", -"r c #E7C86C", -"t c #EACC6E", -"y c #FBD465", -"u c #FAD56C", -"i c #FDD96F", -"p c #E5C772", -"a c #E6C975", -"s c #EECF70", -"d c #E6CB7A", -"f c #E9CE7D", -"g c #EFD071", -"h c #F4D474", -"j c #FAD771", -"k c #FAD976", -"l c #F6D778", -"z c #F7DA7B", -"x c #FADB7B", -"c c #FEE07D", -"v c #DCCC8E", -"b c #DECE91", -"n c #DFD099", -"m c #E7CD81", -"M c #EAD284", -"N c #EAD48B", -"B c #F7DB83", -"V c #FBDE83", -"C c #F4DD8E", -"Z c #E1D395", -"A c #EBD791", -"S c #EBD995", -"D c #E6D89C", -"F c #ECDC9C", -"G c #F6DF90", -"H c #FBE086", -"J c #FBE28B", -"K c #FFE98E", -"L c #F7E091", -"P c #FCE592", -"I c #FFE995", -"U c #FCEA9B", -"Y c #ECDFA2", -"T c #ECE0A5", -"R c #ECE1A8", -"E c #FDEEA3", -"W c #FDEFA8", -"Q c #FFF1A5", -"! c #FEF2AC", -"~ c #F6EEB9", -"^ c #FEF4B2", -"/ c #FFF9B7", -"( c #FFF6BA", -") c #FFF8BD", -"_ c #FFFBC3", -"` c #FFFEC9", -"' c None", -/* pixels */ -"'''''''''''''''''''''''''''''''''''''. 6''''''''", -"'''''''''''''''''''''''''''''.Xo&&=$#*b_`'''''''", -"'''''''''''''''''''''+:><2222----%$fHJJJJJJJJJ'''''''", -"''''''''CPJJHVVVxxxkhhtree432;&fHHHHHHHHH'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*dHVVVVVVVV'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*dHVVVVVVVV'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*aHxxxxxxxx'''''''", -"'''''''OLPJJHVVVxxxkhhtree432;*axxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pxxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pxxxxxxxxx'''''''", -"'''''''OLPJJJHVVxxxkhhtrre4432*pkkkkkkkkk'''''''", -"'''''''OGPJJJHVVxxxkhhtrre9432*rkkkkkkkkk'''''''", -"'''''''OGPJJJHVVxxxkhhtrre9432*ekjjjjjjj''''''''", -"'''''''OGPJJJHVVxxxkhhttre9432*ejjjjjjjj''''''''", -"'''''''OGPJJJHVVxxxkhhttre9432*eiuuuuuu'''''''''", -"''''''''CPJJJHVVxxxkhhttee4''''eiuuuuu''''''''''", -"''''''''NIJJJHVVxxxkhht''''''''wuuuu''''''''''''", -"'''''''''CPJJHVVzzl''''''''''''wyyy'''''''''''''", -"'''''''''''MJBB''''''''''''''''wyy''''''''''''''", -"'''''''''''''''''''''''''''''''wy'''''''''''''''", -"'''''''''''''''''''''''''''''''3''''''''''''''''" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm b/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm deleted file mode 100644 index 8d492ca57e..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_fullscreen.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char *toolbar_fullscreen_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 78 1", -" c #0EA437", -". c #0EA539", -"X c #3FAD34", -"o c #74BC1D", -"O c #7BBE1D", -"+ c #54B332", -"@ c #64B72E", -"# c #6FBB29", -"$ c #76BD25", -"% c #7BBF24", -"& c #73BD2A", -"* c #7ABF29", -"= c #7EC027", -"- c #7DC02F", -"; c #80C125", -": c #83C32E", -"> c #82C337", -", c #88C537", -"< c #88C53C", -"1 c #8CC742", -"2 c #95CB56", -"3 c #95CC5E", -"4 c #97CD63", -"5 c #98CD62", -"6 c #A3D274", -"7 c #7FC1E3", -"8 c #ACD78D", -"9 c #AED88F", -"0 c #ADD891", -"q c #B0D994", -"w c #B5DC9F", -"e c #B9DDA4", -"r c #BBDEAB", -"t c #BDDFB0", -"y c #BFE0B3", -"u c #C1E1B5", -"i c #C2E2BB", -"p c #80C1E3", -"a c #8BC6E5", -"s c #8FC9E6", -"d c #92CAE7", -"f c #96CCE8", -"g c #9BCEE8", -"h c #9FD0EA", -"j c #A3D2EB", -"k c #ABD6EC", -"l c #AFD8ED", -"z c #B3DAEE", -"x c #B8DCEF", -"c c #B4DBF0", -"v c #BBDEF0", -"b c #BFE0F1", -"n c #D1D0D0", -"m c #C6E3C2", -"M c #CBE6CD", -"N c #C5E9CF", -"B c #D3EBCE", -"V c #DCEECC", -"C c #CDE7D3", -"Z c #CFE8D8", -"A c #D2EFDE", -"S c #D6ECE6", -"D c #D7ECE9", -"F c #DAEDEE", -"G c #C4E2F3", -"H c #CAE6F6", -"J c #D6EBF6", -"K c #DCEFF6", -"L c #D4EBF9", -"P c #DCEFFC", -"I c #DFF0FC", -"U c #E1E0E0", -"Y c #ECF6EC", -"T c #E2F1FD", -"R c #EAF5FA", -"E c #F4FBF7", -"W c #F3F9FD", -"Q c gray100", -/* pixels */ -"nUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUn", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQWJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJWQU", -"UQT77pppppppppppppppppppppppppppppppppppppp77TQU", -"UQTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTQU", -"UQTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTQU", -"UQTssddddddddddddddddddddddddddddddddddddddssTQU", -"UQTddddddddddddddddddddddddddddddddddddddddddTQU", -"UQRffffffffffffffffffffffffffffffffffffffffffRQU", -"UQRgggggggggggggggggfffgjfgggggggggggggggggggRQU", -"UQRgggggggggggggggggkHHHPcgggggggggggggggggggRQU", -"UQRhhjjjjjjjjjjjjjhjLTTTTTvjjhjjjjjjjjjjjjjhhRQU", -"UQRjjjjjjjjjjjjjjjjkITIIITPPLjjjjjjjjjjjjjjjjRQU", -"UQRjjjjkkkkkkkkkkjjvPIIIIITTTGkjjkkkkkkkkkkjjRQU", -"UQRkkjkjkkkkkkkkkkHTIIIIIIIIIIPHkkkkkkkkkkjkGWQU", -"UQRkkGLGlkkkklkzzlLTIIIIIIIIIITPzkllllllkzGLTWQU", -"UQWHGTTTGzHHvlGPPLLTIIIIIIIIIITPzlzzzzzzlLTTPWQU", -"UQWIIIITLLTTIHPTTTTIIIIIIIIIIIIPGzzzzzzzzLTIPWQU", -"UQWPIIIITTIITTIIIIIIIIIIIIIIIIITTGzxxxxvLPTIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIITGxvvvvbITIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIITPGvvvvvHTIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIILGGGGPTIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIITHGPPPIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIPPPTIIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIITTIIIIIIIPWQU", -"UQWPIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIPWQU", -"UQWPIIIIIIIIIIIIITTTTTTTTTTTTTTTTTTTTTIIIIIIPWQU", -"UQWPIIIIIIIITTTTTTKSZMmureeweryimMADKTTTTTTIPWQU", -"UQWPIIIITTTTFCt9621,:=OOOOOOOOOOO;:,126qyCFTTWQU", -"UQWPITTTDi83<=OOOO%%%=============%%%OOOO=<50YQU", -"UQWTTAw4>$oo%%***************************%%ooVQU", -"UQEr3-oo$***********************************$VQU", -"UQVoo$*************************************$$VQU", -"UQV&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&VQU", -"UQV&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&VQU", -"UQV##&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&##VQU", -"UQV@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@VQU", -"UQB++++++++++++++++++++++++++++++++++++++++++BQU", -"UQBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBQU", -"UQN ...................................... NQU", -"UQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"UQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQU", -"nUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUn" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_help.xpm b/Source/Core/DolphinWX/resources/toolbar_help.xpm deleted file mode 100644 index cdf5d7a9cb..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_help.xpm +++ /dev/null @@ -1,283 +0,0 @@ -/* XPM */ -static const char *toolbar_help_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 229 2", -" c #121F74", -". c #0F2276", -"X c #062D7C", -"o c #092D7C", -"O c #132376", -"+ c #192677", -"@ c #152678", -"# c #192678", -"$ c #132D7C", -"% c #1C2E7D", -"& c #04307F", -"* c #08317F", -"= c #16317F", -"- c #232F7E", -"; c #292D7E", -": c #362F7F", -"> c #22317E", -", c #012F83", -"< c #0A2E81", -"1 c #023483", -"2 c #093384", -"3 c #00398A", -"4 c #163C87", -"5 c #143D8A", -"6 c #013F90", -"7 c #233482", -"8 c #2B3581", -"9 c #2D3D87", -"0 c #223C88", -"q c #293F88", -"w c #373784", -"e c #303C86", -"r c #473E89", -"t c #00408D", -"y c #0E4089", -"u c #03488F", -"i c #16438B", -"p c #014493", -"a c #014B94", -"s c #0B4D92", -"d c #004F9A", -"f c #134F93", -"g c #055097", -"h c #0B5094", -"j c #01559C", -"k c #00589E", -"l c #085A9E", -"z c #125094", -"x c #115698", -"c c #22458D", -"v c #2C448B", -"b c #2D4A8F", -"n c #33478D", -"m c #3B448B", -"M c #35498F", -"N c #224F95", -"B c #255596", -"V c #2A5194", -"C c #245C9D", -"Z c #2C5E9D", -"A c #395495", -"S c #375798", -"D c #355A9A", -"F c #3A5B9A", -"G c #2D619E", -"H c #3E639E", -"J c #005CA3", -"K c #0D5EA1", -"L c #0262A6", -"P c #0065AB", -"I c #0069AE", -"U c #1563A5", -"Y c #1C66A5", -"T c #1F68A6", -"R c #176BAB", -"E c #0064B2", -"W c #006DB2", -"Q c #106FB0", -"! c #0071B6", -"~ c #0C73B5", -"^ c #0074B9", -"/ c #1273B3", -"( c #1C79B6", -") c #2666A3", -"_ c #2C65A2", -"` c #2569A6", -"' c #2A6AA6", -"] c #266EA9", -"[ c #2C6EA9", -"{ c #3567A2", -"} c #3A65A1", -"| c #336BA5", -" . c #3A69A3", -".. c #336EA8", -"X. c #2C71AA", -"o. c #3373AB", -"O. c #3579AF", -"+. c #3D79AF", -"@. c #2176B2", -"#. c #297DB7", -"$. c #207FBB", -"%. c #3577B0", -"&. c #347AB2", -"*. c #3D7CB2", -"=. c #4F4A91", -"-. c #5B4E92", -";. c #435495", -":. c #465E9B", -">. c #4A5D9B", -",. c #555597", -"<. c #644E91", -"1. c #665898", -"2. c #43629E", -"3. c #49609D", -"4. c #55639E", -"5. c #4165A0", -"6. c #4B6DA5", -"7. c #566FA7", -"8. c #5A6BA4", -"9. c #536FAA", -"0. c #5670A7", -"q. c #5778AC", -"w. c #427CB1", -"e. c #517EB0", -"r. c #6E69A3", -"t. c #6B76AA", -"y. c #7174A9", -"u. c #8272A7", -"i. c #8476AA", -"p. c #8872A8", -"a. c #2580BB", -"s. c #2C83BD", -"d. c #3386BD", -"f. c #3488BF", -"g. c #398ABF", -"h. c #4585B7", -"j. c #4884B7", -"k. c #448BBD", -"l. c #488DBF", -"z. c #5282B3", -"x. c #5B81B1", -"c. c #5688B7", -"v. c #5488B8", -"b. c #7C89B6", -"n. c #738DB8", -"m. c #6091BD", -"M. c #348AC0", -"N. c #3692C8", -"B. c #3E95C9", -"V. c #428DC1", -"C. c #569ECA", -"Z. c #6295C0", -"A. c #679AC4", -"S. c #729CC5", -"D. c #7C9BC2", -"F. c #60A3CE", -"G. c #7DACCF", -"H. c #6CA7D1", -"J. c #6FABD3", -"K. c #8F84B4", -"L. c #998AB7", -"P. c #9B8FB9", -"I. c #A397BE", -"U. c #83ACCE", -"Y. c #8FAFCE", -"T. c #94A7C9", -"R. c #9DA7C9", -"E. c #97AECE", -"W. c #9BABCB", -"Q. c #92B4D2", -"!. c #93BFDC", -"~. c #99BFDA", -"^. c #A2A5C8", -"/. c #A0ABCB", -"(. c #B2A7C9", -"). c #B6AECD", -"_. c #A3B1CF", -"`. c #A6B4D1", -"'. c #AAB5D1", -"]. c #A7B8D4", -"[. c #ABBAD5", -"{. c #A0BED9", -"}. c #AEBFD8", -"|. c #B2BED7", -" X c #95C3DF", -".X c #A3C4DD", -"XX c #B7C2D9", -"oX c #B9C4DC", -"OX c #95C4E0", -"+X c #9DC7E2", -"@X c #9DC9E4", -"#X c #A2C7E0", -"$X c #A5CAE2", -"%X c #AECDE3", -"&X c #B0CCE2", -"*X c #BACCE0", -"=X c #BFD7E8", -"-X c #CDCCCC", -";X c #D0CFCF", -":X c #C7C5DB", -">X c #CDC4DB", -",X c #D4D3D3", -" O # % > > > > % + O > 4.'.gXhXdXqX-XjXjXjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXjXjX.>.>.>.;.;.M 9 > O O ;.'.hXhXrX,XjXjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXjXqXdXhX7X8.@ @ 7 M ;.>.>.>.>.>.>.>.>.>.>.>.>.;.M 7 @ @ 8.7XhXsX,XjXjXjXjXjXjXjXjX", -"jXjXjXjXjXjXjXqXhXhXXXv . 7 M >.>.>.:.:.:.:.:.:.:.:.:.:.:.:.>.>.>.M 7 . v XXhXsX.;.q @ % _.hXsX,XjXjXjXjXjXjX", -"jXjXjXjXjXXw D } H 2.2.c o 7.hXdX,XjXjXjX", -"jXjXjXsXhX[.o 4 F 5.} } { G e.gXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhX(.7 { } } 5.F 4 o [.hXwXjXjXjX", -"jXjXqXhXgXD 2 V } } { { { _ *XhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhXhX-.V | { } 5.V * S gXdX,XjXjX", -"jXjXsXhX].& i } .{ { | _ z.hXhXhXhXhXhXhXhXeX^.E.3XhXhXhXhXhXhXhXhXI.7 ..{ { } } i X ].hXqXjXjX", -"jXX; ..| { { .B 1 6.hXsX-XjX", -"jXwXhX6Xy j _ { | | | | _ 3XhXhXhXhXhXhXhX1.N O.o.' m.hXhXhXhXhXhXhX4X; | | | | { { j y 6XhX,XjX", -"jXrXhXE.1 / %.{ | .........X6XuXgXhXhXhXiX: [ o.X.T U.hXhXhXhXhXhXhX>X; o...| | { O.Q 1 E.hXqXjX", -"jXdXhXx.t ( d...| ....o.o.[ o.w.v.Z.S.U.D.5 l l d *.pXhXhXhXhXhXhXhXL.0 o.....| ..d.( t x.hXrXjX", -" c #BB221B", -", c #9C2721", -"< c #9F2821", -"1 c #A32821", -"2 c #AA2821", -"3 c #B32821", -"4 c #BC2821", -"5 c #A2312A", -"6 c #AB312A", -"7 c #B3312A", -"8 c #BC312A", -"9 c #C7150D", -"0 c #C41B13", -"q c #CB1E16", -"w c #D31D15", -"e c #C3231B", -"r c #CB241C", -"t c #D1221A", -"y c #C42921", -"u c #CB2921", -"i c #D32921", -"p c #C1322A", -"a c #AE544F", -"s c #AF5751", -"d c #B05954", -"f c #B25D58", -"g c #B5645F", -"h c #CB5A55", -"j c #CF5D58", -"k c #D25A55", -"l c #D15D58", -"z c #D5615B", -"x c #CC6762", -"c c #CFA9A6", -"v c #D3AEAB", -"b c #DAAEAC", -"n c #DBB0AE", -"m c #D5BAB9", -"M c #E3B1AF", -"N c #E4B6B4", -"B c #EAB6B4", -"V c #CDCCCC", -"C c #D0CFCF", -"Z c #DFCAC9", -"A c #D4D3D3", -"S c #D8D7D7", -"D c #D7D8D6", -"F c #D8D8D7", -"G c #DCDCDB", -"H c #E6C5C4", -"J c #E9C5C4", -"K c #E2CECD", -"L c #EBCECC", -"P c #E5D0CF", -"I c #EED0CE", -"U c #E4D3D1", -"Y c #EED3D2", -"T c #E0DFDF", -"R c #F0DCDB", -"E c #E0E0DF", -"W c #E8E0DF", -"Q c #E3E3E3", -"! c #EBE4E4", -"~ c #E7E8E7", -"^ c #E8E8E7", -"/ c #E8E7E8", -"( c #E6EBEA", -") c #ECECEC", -"_ c #F1E7E7", -"` c #F0E8E7", -"' c #F3EAEA", -"] c #E9F0EF", -"[ c #F0F0EF", -"{ c #ECF2F2", -"} c #F2F2F2", -"| c #F5FBFB", -" . c #FAFCFC", -".. c None", -/* pixels */ -"....................................F D V V V V V V V V D F ....................................", -"..............................F V V A S G Q Q Q ~ Q Q G F A V V F ..............................", -"..........................A V A G ~ ^ ) ) ) ) ^ ^ ) ) ) ) ^ ~ G A V A ..........................", -"......................F V D Q ^ ) ^ ^ ) ) ) ) ) ) ) ) ) ) ^ ^ ) ^ Q S V S ......................", -"....................V A Q ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ^ ^ ) Q A V ....................", -"................G V F ^ ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ^ ^ G V G ................", -"..............F V Q ) ^ ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ^ ) Q V S ..............", -"............F V Q ) / ) ) ) ) ) ) ) ) ) ) [ [ [ [ [ [ ) ) ) ) ) ) ) ) ) ) ^ ) Q V S ............", -"..........G V Q ) ^ ) ) ) ) ) ) ) ) [ } } } } } } } } } [ ) ) ) ) ) ) ) ) ) ^ ^ Q V G ..........", -"..........V T ) ^ ) ) ) ) ) ) ) } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ) ^ ) Q V ..........", -"........V F ) ^ ) ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ ) G V ........", -"......G C ^ ^ ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ ^ A F ......", -"......V Q ) ) ) ) ) ) ) } } } } } } } } } } } } } } } } } } } } } } } [ ) ) ) ) ) ) ^ Q V ......", -"....D A ) ^ ) ) ) ) ) } } } } | | | | | | } } } } } } | | | | | | } } } [ ) ) ) ) ) ^ ) S A ....", -"....V Q ) ) ) ) ) ) [ } } | J k l l j h x ' | } } | R z k l j j h H | } } ) ) ) ) ) ) ^ Q V ....", -"..G A ^ ) ) ) ) ) [ } } } | M 9 0 0 0 O 4 ` | | | .Y q 9 0 0 & O M | } } } [ ) ) ) ) ^ ) A G ..", -"..V G ) ) ) ) ) ) } } } } | B q r r e e p ' .| | .Y i r r r e & b { ~ ~ ^ ) ) ) ) ) ^ ) T V ..", -"..V ~ ) ) ) ) ) ) } } } } | B w t r r e p ' .} } | L i t r r e & b { Q Q Q G G Q ^ ) ) ^ ^ V ..", -"G A ^ ) ) ) ) ) [ } } } } | B w t r r e p ' | } } | I i t r r e & b { ~ Q Q Q G G G G ~ ) ) A G ", -"S S ) ) ) ) ) ) } } } } } .B w r r e e p _ | } } | Y i t r r e & b { ~ Q Q Q G G G F D G / G D ", -"V G ) ) ) ) ) [ } } } } } .B q r r e > 8 _ | } } | Y u r r e e & b { ~ Q Q Q E G G G F A A F V ", -"V Q ) ) ) ) ) [ } } } } } .B 0 e e e > 8 ' .| | .Y u e e e > & b { ~ Q Q Q E G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } .N 0 e e > > 8 ' . . . .Y y e e > > % b { ^ ~ Q Q Q G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } .N & > > > * 8 ' . . . .Y 4 > > > : % b { ^ ~ Q Q Q G G G F A A C V ", -"V Q ) ) ) ) ) [ } } } } } .N % > : : * 7 ' . . . .Y 4 > > : : @ b { ^ ~ Q Q Q G G G F A A C V ", -"V Q ) ) ) ) ) [ } } } } } | n % : : : $ 7 ' . . . .Y 3 : : : ; @ b { ^ ~ Q Q Q G G G F A A V V ", -"V Q ) ) ) ) ) [ } } } } } { b @ ; ; ; $ 6 ' .| | .Y 3 ; ; ; ; + v { ~ ~ Q Q Q G G G F A A V V ", -"C G ) ) ) ) ) [ } } } } ) { b + ; ; - # 6 ` | | | .U 2 ; ; ; - + v { ~ Q Q Q E G G G F A A V V ", -"S S ) ) ) ) ) [ } } } } ^ { v + - - - # 5 ! | } } .U 2 - - - - X v { ~ Q Q Q E G G G D A A V S ", -"G A ^ ) ) ) ) ) } } } ) ~ { v X - = = o 5 ! | } } | P 1 - - = = X v { ~ Q Q Q G G G G D A C V G ", -"..V ~ ) ) ) ) ) [ } } Q Q { v X = = = o 5 ! } } } | K < = = = = X v { Q Q Q Q G G G F A A C V ..", -"..C G ) ) ) ) ) ) } ) Q Q { v X = = = o 5 ! } } [ } K < = = = = X v ] Q Q Q E G G G F A A V C ..", -"..G A ) ) ) ) ) ) } ~ Q Q ) c . . . , W } ) ) } Z o . . . c ) Q Q E G G G G D A A V G ..", -"....V Q ) ) ) ) ) ) Q Q Q ( m a d d d s g ! ) ) ) { U f d d d d a m ( Q Q G G G G F A A V V ....", -"....D D ) ) ) ) ) ) G E Q Q ~ ( ) ) { { { ) ) ) ) ^ ) { { { ) ) ( Q Q Q G G G G F D A A V D ....", -"......V Q ) ) ) ) ^ G G Q Q Q Q Q ~ ~ ~ ^ ^ ^ ^ ^ ^ ^ ~ ~ ~ Q Q Q Q Q G G G G G D A A V V ......", -"......G A ^ ) ) ) Q G G G E Q Q Q Q Q Q ~ ~ ~ ~ ~ ~ ~ ~ Q Q Q Q Q Q G G G G G F A A C V G ......", -"........V G ) ) ) Q G G G G G Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q E G G G G G F D A A V V ........", -"..........V Q ) ) E F G G G G G Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q G G G G G G F D A A V V ..........", -"..........G V Q ) G D F G G G G G G E Q Q Q Q Q Q Q Q Q E G G G G G G G F D A A V V G ..........", -"............F V Q G A D F G G G G G G G G G G G G G G G G G G G G G G F A A A V V F ............", -"..............F V S A A A D F G G G G G G G G G G G G G G G G G G F D A A A V V F ..............", -"................G V V A A A A D F G G G G G G G G G G G G G G F D A A A A V V G ................", -"....................V V C A A A A D F F F G G G G G G F F D D A A A A C V V ....................", -"......................G V V C A A A A A A D D D D D D A A A A A A C V V G ......................", -"..........................A V V V A A A A A A A A A A A A A C V V V A ..........................", -"..............................G A V V V V A A A A A A V V V V A G ..............................", -"....................................G F A V V V V V V A F G ...................................." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_play.c b/Source/Core/DolphinWX/resources/toolbar_play.c deleted file mode 100644 index c77e26af54..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_play.c +++ /dev/null @@ -1,278 +0,0 @@ -static const unsigned char toolbar_play_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x14, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x34, -0x2f, 0x30, 0x34, 0x79, 0x5e, 0xa3, 0xd5, 0x00, 0x00, 0x0c, 0x3b, 0x49, -0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x9a, 0x5b, 0x8c, 0x5d, 0xd5, 0x79, -0xc7, 0x7f, 0x6b, 0xad, 0xbd, 0xf7, 0x39, 0x67, 0x8e, 0xc7, 0x3e, 0x33, -0xe3, 0xb1, 0x31, 0xc1, 0xc6, 0xc4, 0x02, 0xcb, 0x15, 0xc1, 0x6e, 0x22, -0x45, 0xb2, 0xaa, 0x82, 0x93, 0x87, 0xf8, 0x05, 0xc5, 0x48, 0x3c, 0x54, -0x02, 0xa1, 0x38, 0x8a, 0x5a, 0x72, 0x91, 0xb8, 0x3c, 0xf0, 0xe4, 0x54, -0x71, 0x84, 0x52, 0x22, 0x24, 0x0a, 0x76, 0x2b, 0x55, 0x69, 0x1f, 0x8c, -0x54, 0xcd, 0x6b, 0x45, 0xda, 0x07, 0xd2, 0x44, 0x45, 0xb6, 0xd3, 0x48, -0xb4, 0x02, 0xc9, 0x24, 0x10, 0xf0, 0x05, 0x18, 0xdb, 0x83, 0x2f, 0x33, -0x73, 0xe6, 0x7e, 0x2e, 0xfb, 0xb2, 0xbe, 0xaf, 0x0f, 0x7b, 0x9f, 0xcb, -0xd8, 0x33, 0xe3, 0x31, 0x44, 0x45, 0x2c, 0x69, 0xe9, 0xdc, 0xf7, 0xfe, -0xff, 0xbf, 0xff, 0xb7, 0xfe, 0xdf, 0xb7, 0xd6, 0x8c, 0x51, 0x55, 0xbe, -0xc8, 0xc3, 0x7e, 0xde, 0x00, 0x3e, 0xeb, 0x08, 0x3e, 0xcf, 0x9b, 0x3f, -0xf9, 0xe4, 0x3f, 0x9b, 0xce, 0xf3, 0x5f, 0xfc, 0xe2, 0x6f, 0x3e, 0x55, -0x2a, 0x98, 0x3f, 0x55, 0x0a, 0xfd, 0xfc, 0xe7, 0xbf, 0xda, 0xa9, 0xaa, -0x07, 0x54, 0xe5, 0x80, 0x88, 0xec, 0x14, 0xd1, 0xbd, 0xaa, 0x52, 0x13, -0x11, 0x44, 0x04, 0x55, 0x19, 0x17, 0x91, 0x8b, 0x22, 0x72, 0x52, 0x44, -0xde, 0x99, 0x9f, 0x6f, 0xfe, 0x72, 0x85, 0xcb, 0x28, 0xdc, 0x1e, 0x99, -0xcf, 0x44, 0xe0, 0xa5, 0x97, 0xde, 0xa8, 0xa9, 0xca, 0x23, 0xaa, 0xfa, -0xb4, 0xaa, 0xee, 0xcb, 0x81, 0x2a, 0x7d, 0xa0, 0xbb, 0xcf, 0x97, 0xbf, -0xf6, 0x88, 0xc8, 0x9c, 0x88, 0xfc, 0xbb, 0xf7, 0xf2, 0xaf, 0xad, 0x56, -0x76, 0xaa, 0x00, 0xdf, 0x99, 0x00, 0xba, 0x1e, 0x22, 0x9f, 0x9a, 0xc0, -0xcb, 0x2f, 0x9f, 0x3c, 0x0a, 0xfa, 0xb4, 0x88, 0xd6, 0x54, 0x95, 0x72, -0xb9, 0x44, 0xb5, 0x5a, 0x65, 0x70, 0x70, 0x10, 0x63, 0x0c, 0x51, 0x54, -0xea, 0x82, 0x4d, 0xd3, 0x94, 0x66, 0x73, 0x89, 0xa5, 0xa5, 0x26, 0x8b, -0x8b, 0xf3, 0x2c, 0x2e, 0x2e, 0x92, 0x65, 0x69, 0x3f, 0xb9, 0xd3, 0xde, -0xfb, 0xe7, 0x92, 0x84, 0x33, 0x05, 0x01, 0xe9, 0x90, 0xb9, 0x15, 0x89, -0xdb, 0x5e, 0x03, 0xc7, 0x8e, 0x9d, 0x3e, 0x60, 0x8c, 0x39, 0x61, 0xad, -0xdd, 0x69, 0xad, 0x65, 0x78, 0x78, 0x98, 0xbb, 0xef, 0xbe, 0x83, 0x91, -0x91, 0x0a, 0x03, 0x03, 0x01, 0x41, 0x60, 0x09, 0x02, 0x87, 0xf7, 0x20, -0x02, 0x8d, 0x46, 0xc2, 0xd2, 0x52, 0xcc, 0xfc, 0x7c, 0x93, 0x7a, 0x7d, -0x81, 0xe1, 0xe1, 0x21, 0x92, 0x24, 0x61, 0x7e, 0x7e, 0x96, 0xab, 0x57, -0xaf, 0x11, 0xc7, 0x31, 0xc0, 0x83, 0xc6, 0x98, 0xff, 0x09, 0x43, 0xff, -0x77, 0x69, 0x6a, 0x9f, 0x07, 0x4c, 0x41, 0xa2, 0x43, 0x64, 0xd5, 0x71, -0x5b, 0x0a, 0x1c, 0x3f, 0xfe, 0xdf, 0x47, 0x8d, 0x31, 0x3f, 0x01, 0xd8, -0xb2, 0x65, 0x94, 0xfb, 0xef, 0xdf, 0xce, 0x96, 0x2d, 0x25, 0x4a, 0x25, -0x8b, 0x08, 0x5d, 0xd0, 0x6b, 0x3d, 0x9f, 0x9c, 0x9c, 0x63, 0x62, 0xe2, -0x1a, 0xcd, 0x66, 0x0b, 0x91, 0x8c, 0xa9, 0xa9, 0x29, 0x26, 0x27, 0x27, -0xbb, 0x8a, 0xa8, 0xca, 0x6f, 0xbd, 0xd7, 0xbf, 0x52, 0x0d, 0xea, 0x80, -0x07, 0x64, 0x2d, 0x15, 0xd6, 0xad, 0xc0, 0xf1, 0xe3, 0xbf, 0x3d, 0x61, -0xad, 0x3d, 0x5c, 0x2a, 0x95, 0x78, 0xe0, 0x81, 0xdd, 0xdc, 0x77, 0xdf, -0x06, 0xca, 0x65, 0xd3, 0x05, 0xd7, 0x6a, 0x79, 0x66, 0x66, 0x12, 0x16, -0x16, 0x52, 0xda, 0xed, 0x7c, 0x7a, 0xef, 0x11, 0xf1, 0x44, 0x91, 0xa3, -0x54, 0x0a, 0xa9, 0x54, 0x4a, 0xd4, 0x6a, 0x83, 0x0c, 0x0d, 0xd5, 0xb8, -0x7a, 0x75, 0x92, 0x8f, 0x3f, 0xbe, 0xc8, 0xd0, 0xd0, 0x30, 0x95, 0x4a, -0x85, 0x89, 0x89, 0xcb, 0xb4, 0x5a, 0x2d, 0x80, 0xbf, 0x34, 0x46, 0xff, -0x53, 0x35, 0x3b, 0x08, 0x41, 0x9d, 0xe5, 0xeb, 0xe2, 0xa6, 0xb1, 0x2e, -0x05, 0x8e, 0x1d, 0x3b, 0x7d, 0xc2, 0x5a, 0x7b, 0xb8, 0x5a, 0xad, 0xf2, -0xe0, 0x83, 0xf7, 0xb3, 0x63, 0x47, 0xd8, 0x8d, 0x68, 0xbd, 0xee, 0xb9, -0x76, 0x2d, 0xa1, 0xd9, 0xcc, 0x10, 0xf1, 0x78, 0x2f, 0xc5, 0xa3, 0xef, -0x7b, 0x14, 0xbc, 0xf7, 0x78, 0x9f, 0x91, 0x65, 0x42, 0xad, 0xb6, 0x81, -0xad, 0x5b, 0xb7, 0x92, 0x24, 0x19, 0xef, 0xbe, 0xfb, 0x1e, 0x69, 0x1a, -0xe3, 0xbd, 0xe7, 0xea, 0xd5, 0x2b, 0xcc, 0xcf, 0xcf, 0x75, 0xd6, 0xc5, -0x1f, 0x54, 0xcd, 0xb7, 0x8c, 0x89, 0xa6, 0x01, 0xbf, 0x9a, 0x0a, 0xb7, -0x2c, 0x64, 0x2f, 0xbf, 0x7c, 0xf2, 0x04, 0x70, 0x78, 0xd3, 0xa6, 0x1a, -0x07, 0x0f, 0x7e, 0x85, 0xed, 0xdb, 0xc3, 0x22, 0xe2, 0x70, 0xfe, 0x7c, -0xc6, 0xc4, 0x44, 0x46, 0x1c, 0x2b, 0xc6, 0x18, 0xc0, 0x60, 0x0a, 0x67, -0xcf, 0x1f, 0x4d, 0x31, 0xbb, 0xf1, 0x02, 0xa0, 0x5e, 0x9f, 0xe5, 0xf7, -0xbf, 0x7f, 0x97, 0xd9, 0xd9, 0x59, 0xf6, 0xec, 0xf9, 0x33, 0xac, 0x75, -0x88, 0x28, 0x5b, 0xb6, 0x6c, 0xa5, 0x5c, 0x1e, 0xe8, 0xfc, 0xee, 0x2b, -0xaa, 0xfe, 0x5f, 0x00, 0x77, 0xc3, 0x45, 0xd6, 0x4f, 0xe0, 0xa5, 0x97, -0xfe, 0xeb, 0x69, 0x55, 0x3d, 0x5c, 0x2e, 0x97, 0xf9, 0xc6, 0x37, 0x76, -0x33, 0x3c, 0x1c, 0x20, 0x02, 0xd3, 0xd3, 0xca, 0x87, 0x1f, 0x2a, 0xed, -0xf6, 0xad, 0xe8, 0xd3, 0x25, 0x94, 0x3f, 0xef, 0xbd, 0x50, 0x85, 0x4f, -0x3e, 0x99, 0xe0, 0xc2, 0x85, 0x0b, 0xec, 0xda, 0x75, 0x5f, 0xd7, 0x7e, -0xb7, 0x6e, 0xdd, 0x4a, 0x10, 0x74, 0x33, 0xfb, 0xe1, 0x2c, 0x6b, 0x3c, -0x05, 0xd8, 0xfe, 0xa2, 0xb7, 0x2e, 0x02, 0x2f, 0xbe, 0xf8, 0x9b, 0x7d, -0xaa, 0xfa, 0x8a, 0x73, 0x8e, 0xfd, 0xfb, 0xef, 0x67, 0x78, 0x38, 0x8f, -0xfc, 0xa5, 0x4b, 0x9e, 0x2b, 0x57, 0x72, 0xfb, 0x03, 0xa5, 0x93, 0x81, -0x2b, 0xa7, 0x62, 0xef, 0xf3, 0xce, 0xeb, 0x1e, 0x87, 0xfc, 0xb3, 0x66, -0x73, 0x91, 0x4b, 0x97, 0xc6, 0xd9, 0xb6, 0xed, 0x4b, 0xa8, 0x2a, 0xc6, -0x58, 0x46, 0x47, 0x47, 0xe9, 0x4b, 0xfb, 0x23, 0x69, 0xba, 0x74, 0xcf, -0x6a, 0x38, 0xd7, 0x50, 0x40, 0x4f, 0xa8, 0xc2, 0x9e, 0x3d, 0xf7, 0xb2, -0x7d, 0x7b, 0x05, 0x11, 0xb8, 0x78, 0x31, 0x61, 0x66, 0x26, 0x2b, 0x0a, -0x91, 0xef, 0x16, 0xa7, 0x5f, 0xff, 0xfa, 0x37, 0x34, 0x1a, 0x4b, 0xa8, -0x6a, 0x97, 0x48, 0x0f, 0x78, 0x8f, 0x41, 0xfe, 0x9e, 0x2e, 0xfb, 0x4c, -0x15, 0x16, 0x17, 0x17, 0x98, 0x9b, 0x9b, 0x25, 0x0c, 0xcb, 0xa8, 0x0a, -0xa5, 0x52, 0x99, 0x0d, 0x1b, 0x06, 0x3b, 0x5f, 0xda, 0xa4, 0x2a, 0x7f, -0xcb, 0x2a, 0x69, 0xb4, 0x22, 0x81, 0x17, 0x5e, 0x78, 0xfd, 0x3b, 0xaa, -0xba, 0x6f, 0xe3, 0xc6, 0x8d, 0xdc, 0x7b, 0xef, 0x08, 0xc6, 0x18, 0xa6, -0xa7, 0x53, 0xea, 0xf5, 0x14, 0xef, 0xa5, 0x3b, 0x3b, 0x85, 0xe8, 0xfa, -0xf5, 0xeb, 0xbc, 0xfe, 0xfa, 0xaf, 0x38, 0x7b, 0xf6, 0x5c, 0x97, 0x44, -0x3e, 0x3b, 0xc0, 0x6f, 0x34, 0x12, 0x2d, 0xc0, 0xf7, 0xde, 0x5f, 0x5c, -0x5c, 0x20, 0x4d, 0x63, 0x44, 0xf2, 0xf7, 0x6b, 0xb5, 0x21, 0x54, 0xbb, -0xca, 0x3e, 0x11, 0xc7, 0x73, 0x2b, 0xaa, 0xb0, 0x22, 0x01, 0x55, 0x3d, -0xaa, 0xaa, 0xec, 0xd9, 0xf3, 0x65, 0x36, 0x6e, 0x8c, 0x68, 0xb7, 0x85, -0x89, 0x89, 0x56, 0x5f, 0x1b, 0xd0, 0x53, 0x20, 0x4f, 0x25, 0x38, 0x78, -0xf0, 0x01, 0xce, 0x9d, 0xfb, 0x23, 0xa7, 0x4e, 0x9d, 0x5e, 0xa6, 0xc6, -0x72, 0x32, 0x5a, 0xa4, 0x89, 0x29, 0xc0, 0xd1, 0x05, 0x2c, 0xa2, 0xa4, -0x69, 0xa7, 0x16, 0x28, 0xce, 0x39, 0xaa, 0xd5, 0x2a, 0xc6, 0x74, 0xbe, -0xc7, 0x53, 0xeb, 0x22, 0xf0, 0xfc, 0xf3, 0xff, 0x71, 0x48, 0x55, 0x77, -0x0e, 0x0d, 0xd5, 0x18, 0x1d, 0xad, 0x22, 0x02, 0x97, 0x2f, 0x37, 0x49, -0xd3, 0x1e, 0xe0, 0x0e, 0x81, 0x8e, 0x45, 0x02, 0x3c, 0xfc, 0xf0, 0xd7, -0xf8, 0xf1, 0x8f, 0x1f, 0x65, 0x68, 0x28, 0xe2, 0x8d, 0x37, 0x4e, 0xf1, -0xe1, 0x87, 0x1f, 0xa1, 0x2a, 0x37, 0x11, 0xe9, 0x57, 0xa4, 0xa3, 0x50, -0x4e, 0x42, 0x6e, 0x50, 0xcc, 0x30, 0x30, 0x50, 0x2d, 0xf2, 0x46, 0x01, -0x39, 0xb4, 0xd2, 0x42, 0xbe, 0x89, 0x80, 0xaa, 0x1e, 0x56, 0x15, 0x36, -0x6f, 0x1e, 0x61, 0x68, 0xa8, 0xc2, 0xc2, 0x42, 0xc2, 0xec, 0x6c, 0xeb, -0x06, 0xe0, 0xd2, 0xf5, 0xfb, 0x99, 0x99, 0x3a, 0x77, 0xdd, 0x35, 0x82, -0x08, 0x0c, 0x0d, 0x0d, 0xf2, 0xec, 0xb3, 0x0f, 0xf3, 0xd8, 0x63, 0x7f, -0xc1, 0x47, 0x1f, 0x5d, 0xe0, 0xcd, 0x37, 0xff, 0x97, 0x66, 0xb3, 0xd9, -0x8d, 0x7c, 0x47, 0x89, 0x4e, 0xd4, 0x3b, 0xcd, 0x9d, 0xaa, 0x14, 0x37, -0x17, 0x50, 0xc5, 0x1a, 0x83, 0x41, 0xa9, 0x0e, 0x54, 0x00, 0xd3, 0x49, -0xfe, 0xbb, 0x1b, 0x8d, 0xe9, 0x7d, 0x6b, 0x12, 0x38, 0x7a, 0xf4, 0xdf, -0x6a, 0xaa, 0xf2, 0x48, 0x10, 0x84, 0x8c, 0x8e, 0x0e, 0x17, 0x96, 0xd9, -0xa2, 0xbf, 0xa3, 0xec, 0x00, 0xef, 0xa4, 0x50, 0x1c, 0x27, 0x54, 0x2a, -0x51, 0xb7, 0xb0, 0x89, 0xc0, 0xd7, 0xbf, 0x7e, 0x1f, 0xcf, 0x3f, 0xff, -0x18, 0x77, 0xdd, 0xb5, 0x91, 0xdf, 0xfd, 0xee, 0x4d, 0xc6, 0xc7, 0x2f, -0xf5, 0xa9, 0xd1, 0xe9, 0x4a, 0x57, 0x56, 0xc5, 0x98, 0xa2, 0x0a, 0x18, -0x70, 0xce, 0x51, 0x2a, 0x95, 0xa1, 0x9b, 0x72, 0x7a, 0xe8, 0x46, 0x02, -0xcb, 0x5a, 0x09, 0x11, 0x7d, 0xc8, 0x5a, 0xa5, 0x5a, 0x1d, 0xa0, 0x5a, -0x8d, 0x48, 0x53, 0x61, 0x7a, 0xba, 0x51, 0xf8, 0x77, 0x6e, 0x71, 0xd0, -0xf3, 0xf3, 0x1e, 0xa0, 0xbc, 0xdf, 0xe9, 0x1f, 0x51, 0x14, 0xf1, 0xbd, -0xef, 0x7d, 0x8b, 0xf3, 0xe7, 0xaf, 0x30, 0x36, 0x76, 0x8a, 0xc9, 0xc9, -0x29, 0x76, 0xef, 0xbe, 0x97, 0x30, 0x74, 0xcb, 0xa2, 0x2f, 0x22, 0xa8, -0x68, 0x01, 0xda, 0x60, 0x8c, 0xc1, 0x1a, 0x83, 0xa8, 0x20, 0x0a, 0x41, -0xe0, 0x30, 0x3d, 0x03, 0xd8, 0xbb, 0xa6, 0x02, 0xaa, 0xba, 0x4f, 0x55, -0x18, 0x18, 0x18, 0xa0, 0x5c, 0x0e, 0x59, 0x58, 0x88, 0x97, 0x45, 0x7e, -0x79, 0x5b, 0xe0, 0xbb, 0xef, 0xe7, 0xe4, 0x57, 0x9e, 0xbb, 0x76, 0xdd, -0xc9, 0x73, 0xcf, 0x3d, 0xca, 0xde, 0xbd, 0x3b, 0x78, 0xfb, 0xed, 0x33, -0x4c, 0x4c, 0x5c, 0x2d, 0xae, 0xd9, 0x59, 0xbc, 0xd2, 0x8b, 0x3e, 0x86, -0xc0, 0x5a, 0x02, 0x67, 0x71, 0xd6, 0x61, 0x2d, 0x94, 0xcb, 0xa5, 0x3e, -0x85, 0xa8, 0xdd, 0x82, 0x80, 0x1c, 0x10, 0x51, 0x82, 0x20, 0x60, 0x60, -0xa0, 0xcc, 0xc2, 0x42, 0xeb, 0x26, 0xc7, 0x59, 0xee, 0x42, 0x9e, 0x46, -0xa3, 0x41, 0xb9, 0x5c, 0xc2, 0x7b, 0x56, 0x9d, 0x51, 0x14, 0xf1, 0xed, -0x6f, 0xef, 0xe7, 0xa9, 0xa7, 0x0e, 0x91, 0xa6, 0x0d, 0x3e, 0xf8, 0xe0, -0x3c, 0xed, 0x76, 0xdc, 0x33, 0x01, 0xcd, 0xc1, 0x3b, 0x9b, 0xcf, 0xc0, -0x5a, 0x9c, 0x31, 0x58, 0x63, 0xb1, 0x26, 0x8f, 0x7f, 0x91, 0x69, 0x07, -0x6e, 0xa5, 0x40, 0x2d, 0x2f, 0x24, 0xa5, 0xa2, 0x97, 0x6f, 0xaf, 0xe8, -0x3c, 0xbd, 0x5a, 0xe0, 0x69, 0x36, 0x1b, 0x6c, 0xdb, 0x36, 0xb2, 0xaa, -0x02, 0xfd, 0x73, 0xdb, 0xb6, 0x11, 0x9e, 0x79, 0xe6, 0x51, 0xf6, 0xef, -0xdf, 0xcd, 0xc4, 0xc4, 0x65, 0xea, 0xf5, 0xd9, 0x5c, 0x09, 0x04, 0x6b, -0xc8, 0x09, 0x38, 0x5b, 0x4c, 0x83, 0xb5, 0x79, 0x4a, 0xf5, 0x9c, 0xe8, -0xe6, 0x71, 0xc3, 0x1a, 0x90, 0x7d, 0x9d, 0x3c, 0x14, 0x81, 0x85, 0x85, -0x06, 0xc6, 0xd8, 0x6e, 0x6e, 0xc2, 0xf2, 0x7e, 0x26, 0xff, 0x8d, 0xae, -0xb8, 0x06, 0xd6, 0x1a, 0xdf, 0xfc, 0xe6, 0xd7, 0xf8, 0xea, 0x57, 0x77, -0xf3, 0xc6, 0x1b, 0xef, 0x30, 0x39, 0x39, 0x87, 0x35, 0xa6, 0x20, 0xe0, -0x08, 0x5d, 0x80, 0x35, 0xf9, 0x75, 0xad, 0x91, 0xa2, 0x66, 0xac, 0xde, -0x51, 0x2f, 0x23, 0x90, 0xdb, 0x99, 0x2d, 0x22, 0x0e, 0x22, 0x82, 0x31, -0xfd, 0x9d, 0xe6, 0x72, 0x12, 0xcb, 0xad, 0x71, 0xfd, 0x04, 0x00, 0xca, -0xe5, 0x32, 0x43, 0x43, 0x83, 0x4c, 0x5e, 0x9f, 0xc3, 0x18, 0x83, 0x2b, -0x72, 0x3f, 0x70, 0x16, 0x03, 0x38, 0x2b, 0x64, 0x62, 0x48, 0xd3, 0x64, -0x95, 0x3e, 0x6b, 0x05, 0x02, 0x22, 0x8a, 0x31, 0xd2, 0x23, 0xe0, 0xf3, -0x08, 0x50, 0x28, 0xd0, 0x6b, 0x91, 0x7b, 0xa3, 0xd5, 0x6a, 0x22, 0x32, -0x74, 0x5b, 0x0a, 0xbc, 0xff, 0xfe, 0x25, 0xde, 0x7e, 0xfb, 0x1c, 0xad, -0x56, 0x8c, 0x2b, 0x52, 0x27, 0x74, 0x8e, 0x28, 0x0c, 0x08, 0x83, 0xdc, -0xa5, 0x8c, 0xcf, 0xad, 0x34, 0x4d, 0x53, 0xa4, 0x47, 0xe0, 0xcc, 0x9a, -0x04, 0x54, 0x05, 0x83, 0x21, 0x8e, 0x63, 0x16, 0x16, 0x1a, 0x85, 0x22, -0xbd, 0x9e, 0x5e, 0xc4, 0x70, 0x43, 0x06, 0xd1, 0x6c, 0xb6, 0xb9, 0xe3, -0x8e, 0x91, 0x75, 0x29, 0x30, 0x35, 0x35, 0xc7, 0x5b, 0x6f, 0x9d, 0x63, -0x6a, 0x6a, 0x96, 0x2c, 0xcb, 0x30, 0x08, 0xd6, 0xd8, 0x1c, 0x7c, 0x10, -0x10, 0x05, 0x8e, 0xc0, 0x39, 0x52, 0x9f, 0x61, 0xac, 0xc1, 0x60, 0xba, -0x6d, 0x49, 0x31, 0xe6, 0xd6, 0x24, 0x20, 0x22, 0x27, 0x8d, 0xb5, 0x07, -0x92, 0xb8, 0x4d, 0xb3, 0xd1, 0xa2, 0x93, 0x77, 0xa6, 0x53, 0x3d, 0xa1, -0xdb, 0xcb, 0x40, 0xaf, 0xf8, 0x84, 0x61, 0xb4, 0xa6, 0x02, 0xcd, 0x66, -0xcc, 0x3b, 0xef, 0x5c, 0xe0, 0xf2, 0xe5, 0xeb, 0xa4, 0x69, 0x4a, 0x96, -0x79, 0x50, 0xc1, 0x19, 0x43, 0x14, 0x38, 0xca, 0x51, 0x40, 0xb9, 0x14, -0x12, 0x05, 0x0e, 0x80, 0xcc, 0xe7, 0xe0, 0xe3, 0x24, 0x2e, 0xa2, 0xdf, -0x25, 0x70, 0xf2, 0x56, 0x04, 0xe6, 0x72, 0xd6, 0x8b, 0xcc, 0xd4, 0x67, -0xa8, 0x94, 0x4b, 0x24, 0x71, 0x82, 0xa8, 0x60, 0xc8, 0x15, 0x52, 0x01, -0x51, 0xed, 0x1d, 0xde, 0xdc, 0x62, 0x0d, 0x9c, 0x3d, 0x7b, 0x89, 0xf3, -0xe7, 0x2f, 0xd3, 0x6a, 0xb5, 0xc9, 0xb2, 0x0c, 0xdf, 0x05, 0x6f, 0x29, -0x85, 0x01, 0x03, 0xa5, 0x88, 0x4a, 0x14, 0x51, 0x0e, 0x03, 0x9c, 0x73, -0x64, 0xe2, 0xbb, 0xd7, 0x9d, 0x9d, 0x9b, 0xc3, 0x7b, 0xed, 0x57, 0xe0, -0x56, 0x29, 0xa4, 0x67, 0x14, 0x7d, 0xa4, 0xb1, 0xd4, 0xa0, 0xdd, 0x6e, -0x52, 0xad, 0x0e, 0x80, 0x0a, 0x81, 0x31, 0x39, 0x68, 0x35, 0x18, 0x3c, -0x5e, 0xa4, 0x78, 0xdd, 0xe9, 0x20, 0x6f, 0x76, 0xa1, 0x7a, 0x7d, 0x9e, -0x33, 0x67, 0xce, 0xb2, 0xb8, 0xd8, 0xe8, 0x15, 0x3e, 0xef, 0x31, 0x28, -0xce, 0x5a, 0xa2, 0xc0, 0x51, 0x89, 0xa2, 0x9c, 0x40, 0x29, 0x22, 0x0a, -0x1d, 0xaa, 0x90, 0x79, 0x8f, 0xa0, 0x78, 0x15, 0xe6, 0xe6, 0x66, 0x97, -0x35, 0x79, 0xeb, 0x51, 0xe0, 0x35, 0x63, 0xcc, 0xd1, 0x46, 0xa3, 0x81, -0xcf, 0x32, 0xd2, 0x38, 0xc5, 0x19, 0x8a, 0xf2, 0x0e, 0x06, 0x21, 0xf3, -0x79, 0x4a, 0x21, 0x79, 0x15, 0x6d, 0x36, 0x5b, 0xc5, 0x21, 0x56, 0x7e, -0x8d, 0x56, 0xab, 0xcd, 0x7b, 0xef, 0x7d, 0xc8, 0x95, 0x2b, 0x93, 0x85, -0xc5, 0x7a, 0xb4, 0x28, 0x56, 0xce, 0x1a, 0x9c, 0xc9, 0xc1, 0x97, 0xc2, -0x80, 0x6a, 0xb9, 0xc4, 0x40, 0x29, 0x22, 0x0c, 0x02, 0xac, 0x85, 0x24, -0xf3, 0x78, 0x15, 0x32, 0x2f, 0xd4, 0x67, 0x66, 0x89, 0x93, 0x14, 0x2f, -0xdd, 0xc8, 0xbc, 0x36, 0x36, 0x76, 0x64, 0xfe, 0x46, 0x02, 0xcb, 0x0a, -0xd9, 0xf1, 0xe3, 0x7f, 0xfd, 0x8e, 0x78, 0x3f, 0xee, 0xc5, 0x53, 0xaf, -0x4f, 0xe3, 0xb3, 0x04, 0x63, 0x20, 0xb0, 0x10, 0x58, 0x4b, 0xe4, 0x1c, -0x91, 0xb3, 0x84, 0xce, 0x10, 0x58, 0x70, 0x46, 0xd9, 0xba, 0x65, 0x33, -0x23, 0x23, 0x23, 0x78, 0x0f, 0x67, 0xcf, 0x8e, 0x73, 0xfa, 0xd4, 0x5b, -0x5c, 0xbb, 0x32, 0x09, 0x2a, 0x18, 0x15, 0xac, 0xe6, 0x37, 0x89, 0xac, -0xa5, 0x12, 0x06, 0x54, 0xcb, 0x11, 0x1b, 0x2a, 0x65, 0x36, 0x55, 0x07, -0x18, 0xac, 0x94, 0xf3, 0xe8, 0x07, 0xf9, 0xbe, 0x5d, 0x44, 0x49, 0x33, -0x4f, 0x9c, 0xa6, 0x5c, 0x9f, 0xbc, 0x8e, 0x97, 0xac, 0x3f, 0xfa, 0xaf, -0xde, 0x08, 0xfe, 0x26, 0x05, 0x8a, 0x44, 0xfa, 0xa5, 0x78, 0x79, 0x7a, -0x7a, 0x7a, 0x9a, 0xcd, 0xc3, 0x9b, 0x89, 0x02, 0x8b, 0xc1, 0x12, 0xd8, -0xdc, 0x8d, 0x9c, 0xc9, 0x01, 0xa5, 0x05, 0xfb, 0x5d, 0x77, 0x7f, 0x89, -0xb9, 0xd9, 0x05, 0xde, 0x7f, 0xf7, 0x2c, 0xcd, 0x56, 0x0b, 0x15, 0xcd, -0xdb, 0x00, 0x0c, 0xb8, 0xbc, 0x2d, 0x76, 0xc6, 0x75, 0xd3, 0xa6, 0x14, -0x06, 0x94, 0xa3, 0x90, 0x52, 0x18, 0x12, 0x85, 0x0e, 0x63, 0x0c, 0x99, -0x17, 0xbc, 0x08, 0x49, 0x96, 0x91, 0x64, 0x9e, 0x4f, 0xae, 0x4c, 0xd0, -0x8e, 0x63, 0x7c, 0xb7, 0x4f, 0x62, 0x7c, 0x6c, 0xec, 0xc8, 0x4a, 0x87, -0xc1, 0x37, 0x13, 0x50, 0xd5, 0x57, 0xbc, 0xf8, 0xa7, 0x93, 0x34, 0x61, -0x6a, 0xfa, 0x3a, 0xa5, 0x3b, 0xef, 0x24, 0xb0, 0x79, 0x9b, 0x1b, 0x38, -0x43, 0xa8, 0x01, 0xa1, 0xb3, 0x64, 0xce, 0x92, 0x7a, 0x4b, 0x92, 0x19, -0xce, 0xbf, 0xfb, 0x01, 0xc6, 0x0b, 0xe5, 0x20, 0x40, 0x34, 0xef, 0x2e, -0xc1, 0x61, 0x01, 0xe7, 0x0c, 0x81, 0x75, 0x84, 0x81, 0xcd, 0xad, 0x32, -0x0c, 0x88, 0x82, 0x80, 0xc0, 0x59, 0xc0, 0x90, 0x89, 0x27, 0x13, 0x4f, -0x3b, 0x49, 0x69, 0xa7, 0x29, 0x53, 0xf5, 0x69, 0xea, 0x33, 0x73, 0xa4, -0x59, 0x86, 0x48, 0x37, 0xfc, 0x47, 0x57, 0x02, 0x0f, 0xab, 0x1c, 0x6c, -0xfd, 0xe8, 0x47, 0xff, 0xf4, 0x6a, 0x18, 0x04, 0xdf, 0x29, 0x47, 0x21, -0xf7, 0x7e, 0xf9, 0x1e, 0x86, 0x36, 0xd5, 0x28, 0x87, 0x01, 0xa5, 0x30, -0x20, 0x28, 0xfc, 0x59, 0x54, 0xf1, 0xde, 0x93, 0x79, 0x21, 0xf3, 0x9e, -0xcc, 0xfb, 0xc2, 0x31, 0x84, 0x7c, 0x3f, 0x05, 0xd6, 0xe4, 0xbd, 0x4d, -0xe8, 0x2c, 0x81, 0x73, 0xc5, 0x2c, 0x1a, 0x34, 0x55, 0x52, 0x9f, 0xa7, -0x4b, 0x33, 0x4e, 0x69, 0xc4, 0x31, 0xd7, 0xa7, 0xa7, 0xf9, 0xf8, 0xe2, -0x38, 0xad, 0x38, 0xee, 0x27, 0x70, 0x66, 0x6c, 0xec, 0xc8, 0x9f, 0xaf, -0x46, 0x60, 0xc5, 0xa3, 0xc5, 0xd0, 0xd9, 0x9f, 0x66, 0x59, 0x7a, 0x28, -0x81, 0xda, 0xf8, 0xa5, 0xcb, 0x04, 0xf7, 0x04, 0xd8, 0xc1, 0x0d, 0x79, -0xd5, 0x0c, 0x43, 0x9c, 0xb3, 0x04, 0x06, 0x28, 0xaa, 0xa6, 0x14, 0xae, -0x24, 0xa2, 0xfd, 0xc7, 0x11, 0xf9, 0xce, 0xca, 0x80, 0x2d, 0xba, 0x4b, -0x63, 0x0c, 0x8a, 0xe2, 0x45, 0x0a, 0xf0, 0x19, 0xcd, 0x38, 0xa5, 0x19, -0xc7, 0x4c, 0xd5, 0xeb, 0x5c, 0xbc, 0x7c, 0x89, 0x38, 0xc9, 0xc8, 0xbc, -0xef, 0xb7, 0xce, 0xc3, 0xab, 0x81, 0x5f, 0x55, 0x01, 0x80, 0x1f, 0xfe, -0xe0, 0x1f, 0x9f, 0x35, 0xc6, 0xfe, 0x7d, 0x39, 0x8a, 0xa8, 0x56, 0xca, -0xec, 0xba, 0x67, 0x27, 0xb5, 0xc1, 0x41, 0x2a, 0x51, 0x58, 0x28, 0x61, -0x71, 0xd6, 0x62, 0xad, 0xe9, 0xd6, 0x99, 0x1c, 0x5e, 0x31, 0x0a, 0x19, -0x3a, 0x85, 0x5b, 0x35, 0x07, 0x9e, 0xf9, 0x3c, 0xd7, 0xf3, 0xc8, 0x27, -0x34, 0xe3, 0x84, 0x89, 0x2b, 0x57, 0xb9, 0x3a, 0x79, 0x8d, 0x76, 0x9c, -0x90, 0xa4, 0x69, 0x7f, 0xee, 0x3f, 0x33, 0x36, 0x76, 0xe4, 0xd8, 0xa7, -0x22, 0x00, 0xf0, 0xfd, 0x27, 0x8f, 0xbf, 0x16, 0x38, 0x77, 0xa8, 0x54, -0x90, 0xd8, 0xb9, 0x63, 0x07, 0x43, 0x1b, 0x7b, 0x24, 0xa2, 0x20, 0xc0, -0x15, 0x44, 0x3a, 0x3b, 0xaa, 0x6e, 0xfe, 0x14, 0xc5, 0x4e, 0x8a, 0xed, -0x63, 0x9e, 0x6a, 0xf9, 0x22, 0x6d, 0x27, 0x29, 0xad, 0x24, 0x61, 0x61, -0x69, 0x89, 0x8b, 0x13, 0x13, 0xcc, 0x2d, 0x2c, 0xd0, 0x8e, 0x13, 0x32, -0x9f, 0x91, 0xf9, 0x2e, 0xf8, 0x57, 0xc7, 0xc6, 0x8e, 0x7c, 0x77, 0x2d, -0xf0, 0x70, 0x8b, 0xd3, 0xe9, 0xc0, 0xb9, 0xc3, 0x71, 0x9a, 0x9e, 0x54, -0xd5, 0xbd, 0x22, 0x9e, 0xf3, 0x1f, 0x7d, 0xc4, 0xd6, 0xcd, 0xa3, 0xdc, -0xb1, 0x65, 0x94, 0x81, 0x52, 0x89, 0x28, 0xf4, 0x44, 0x81, 0x23, 0x74, -0x0e, 0x67, 0xf3, 0x0d, 0x48, 0xe7, 0x18, 0x44, 0xc9, 0x81, 0x7b, 0x2f, -0x64, 0x22, 0x24, 0x69, 0x56, 0xb8, 0x4c, 0xc6, 0x52, 0xb3, 0xc5, 0xb5, -0xa9, 0x49, 0xa6, 0xa6, 0xa7, 0x69, 0xb6, 0x13, 0x92, 0x34, 0xc9, 0xd7, -0x90, 0xdc, 0x1e, 0xf8, 0x5b, 0x2a, 0x00, 0xf0, 0xc3, 0xef, 0xff, 0x43, -0x2d, 0xc9, 0xb2, 0x93, 0x81, 0x73, 0x7b, 0xc3, 0xc0, 0x51, 0x0a, 0x43, -0x06, 0x2a, 0x65, 0xb6, 0x8c, 0x6c, 0x66, 0xb8, 0x56, 0xa3, 0x52, 0x2e, -0x11, 0x76, 0x17, 0x67, 0x4e, 0x00, 0xcd, 0xdb, 0x0d, 0xd1, 0x7c, 0xe3, -0x93, 0x7a, 0x4f, 0x92, 0x66, 0xcc, 0x2f, 0x2e, 0x32, 0x3b, 0x3f, 0xc7, -0xf4, 0xcc, 0x0c, 0xad, 0x38, 0x07, 0x9e, 0x66, 0x45, 0x95, 0xee, 0x55, -0xdc, 0x75, 0x83, 0x5f, 0x17, 0x01, 0x80, 0x1f, 0x3c, 0x79, 0xbc, 0x16, -0x27, 0xc9, 0x6b, 0xd6, 0xda, 0x87, 0xa2, 0xd0, 0x11, 0x06, 0x01, 0x61, -0x10, 0x10, 0x85, 0x21, 0x1b, 0x37, 0x6c, 0xa0, 0x3a, 0x50, 0x65, 0x43, -0x75, 0x80, 0x28, 0x8c, 0x70, 0x2e, 0x6f, 0xc8, 0xbc, 0xcf, 0x88, 0x93, -0x94, 0x76, 0xbb, 0xcd, 0x52, 0x63, 0x89, 0xf9, 0xc5, 0x45, 0xe2, 0x24, -0xa1, 0x9d, 0xa4, 0xa4, 0x59, 0xde, 0xd0, 0x79, 0x29, 0xda, 0x92, 0x3e, -0xbb, 0x1c, 0x1b, 0x3b, 0xf2, 0xd3, 0xf5, 0x82, 0x5f, 0x37, 0x81, 0xce, -0xf8, 0xee, 0xe1, 0x17, 0x8f, 0x1a, 0x63, 0x7e, 0xe2, 0xac, 0xc5, 0xb9, -0xbc, 0x38, 0x05, 0x85, 0xa7, 0xe7, 0x1b, 0x11, 0xd7, 0x4d, 0x21, 0xc8, -0x17, 0xac, 0x48, 0xc7, 0x66, 0xb3, 0xae, 0xdd, 0x8a, 0x48, 0x37, 0x5d, -0x8a, 0xdb, 0x8f, 0x03, 0x87, 0xc7, 0xc6, 0x8e, 0x9c, 0xba, 0x1d, 0xf0, -0xb7, 0x4d, 0x00, 0xe0, 0x89, 0x27, 0x5e, 0xd8, 0x6b, 0x8c, 0x79, 0xc5, -0x1a, 0x73, 0xc0, 0xd8, 0xde, 0xc6, 0xdb, 0x16, 0x95, 0xda, 0x16, 0xb6, -0xd3, 0x39, 0xd7, 0x14, 0x95, 0x6e, 0x94, 0x65, 0xd9, 0x49, 0x1d, 0x90, -0xf7, 0xf7, 0xaf, 0xdc, 0x6e, 0xd4, 0x3f, 0x13, 0x81, 0xce, 0x78, 0xfc, -0xf1, 0x9f, 0x3d, 0x64, 0x0c, 0x87, 0xad, 0xb1, 0x8f, 0x18, 0x63, 0x6a, -0xbd, 0x0d, 0x78, 0x6f, 0xc7, 0xd3, 0x01, 0x9c, 0xef, 0x25, 0x96, 0x01, -0x3f, 0x03, 0xbc, 0xc2, 0x2a, 0x0d, 0xda, 0xff, 0x0b, 0x81, 0xfe, 0xf1, -0xf8, 0xe3, 0x3f, 0x3b, 0x04, 0xec, 0x23, 0x3f, 0xf6, 0xd8, 0x59, 0xcc, -0xce, 0x98, 0x23, 0x07, 0x3c, 0x4e, 0xde, 0x0e, 0x9f, 0x1c, 0x1b, 0x3b, -0x72, 0xf1, 0x33, 0xdf, 0xb4, 0x18, 0x7f, 0xb2, 0xbf, 0xd4, 0x7f, 0x5e, -0xe3, 0x0b, 0xff, 0xcf, 0x1e, 0x5f, 0x78, 0x02, 0xff, 0x07, 0xe2, 0x1a, -0xeb, 0x6e, 0x4b, 0x67, 0x61, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, -0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_play.xpm b/Source/Core/DolphinWX/resources/toolbar_play.xpm deleted file mode 100644 index e7bae8dc84..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_play.xpm +++ /dev/null @@ -1,149 +0,0 @@ -/* XPM */ -static const char *toolbar_play_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 95 2", -" c #9D0F08", -". c #A5160F", -"X c #AE170F", -"o c #B5160F", -"O c #A31710", -"+ c #A51A12", -"@ c #AA1B14", -"# c #A11E18", -"$ c #A81F18", -"% c #B31A13", -"& c #BC1A11", -"* c #A5211A", -"= c #AD231C", -"- c #B3231C", -"; c #BC241C", -": c #AA2B24", -"> c #AE322B", -", c #B9322B", -"< c #B03933", -"1 c #CA1006", -"2 c #CE170E", -"3 c #D1180F", -"4 c #C31B12", -"5 c #CC1A12", -"6 c #D11A11", -"7 c #C3241C", -"8 c #CB241C", -"9 c #D3231B", -"0 c #D32C25", -"q c #D23B34", -"w c #B4403B", -"e c #AF4B45", -"r c #B84C46", -"t c #B6534E", -"y c #B65F5A", -"u c #BA635E", -"i c #BE6560", -"p c #BE6C67", -"a c #D24E47", -"s c #C0625D", -"d c #CE625C", -"f c #D7635E", -"g c #C46661", -"h c #CA6662", -"j c #CE6862", -"k c #D36762", -"l c #D36863", -"z c #DC6964", -"x c #DE716B", -"c c #C67874", -"v c #D07874", -"b c #C98581", -"n c #CD918D", -"m c #D2918D", -"M c #D39D9B", -"N c #E38985", -"B c #E6A39F", -"V c #D3A5A2", -"C c #DCB6B3", -"Z c #D7B9B6", -"A c #D8B9B6", -"S c #D8BBB9", -"D c #E3B5B2", -"F c #CDCCCC", -"G c #D9C4C2", -"H c #D0CFCF", -"J c #DBCBCA", -"K c #D4D3D3", -"L c #D8D7D7", -"P c #D7D8D6", -"I c #D8D8D7", -"U c #DCDCDB", -"Y c #EBC5C3", -"T c #E4CAC8", -"R c #E2D1D0", -"E c #EDD5D4", -"W c #E0DFDF", -"Q c #E9DBDA", -"! c #F1D9D8", -"~ c #E0E0DF", -"^ c #E4E3E3", -"/ c #EAE5E4", -"( c #E8E8E7", -") c #E8E7E8", -"_ c #E6E9E8", -"` c #ECECEC", -"' c #F2EDEC", -"] c #EEF0EF", -"[ c #F0F0EF", -"{ c #EDF2F2", -"} c #F2F3F2", -"| c #F1F8F7", -" . c #F4FBFB", -".. c #F9FEFE", -"X. c None", -/* pixels */ -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.I P F F F F F F F F P I X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.I F F K L U ^ ^ ^ ^ ^ ^ U I K F F I X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.K F K U ( ( ` ` ` ` ( ( ` ` ` ` ( ( U K F K X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.I F P ^ ( ` ( ( ` ` ` ` ` ` ` ` ` ` ( ( ` ( ^ L F L X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.F K ^ ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ( ( ` ^ K F X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.U F I ( ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ( ( U F U X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.I F ^ ` ( ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ( ` ^ F L X.X.X.X.X.X.X.", -"X.X.X.X.X.X.I F ^ ` ) ` ` ` ` ` ` ` ` ` ` [ [ [ [ [ [ ` ` ` ` ` ` ` ` ` ` ( ` ^ F L X.X.X.X.X.X.", -"X.X.X.X.X.U F ^ ` ( ` ` ` ` ` ` ` ` [ } } } } } } } } } [ ` ` ` ` ` ` ` ` ` ( ( ^ F U X.X.X.X.X.", -"X.X.X.X.X.F W ` ( ` ` ` ` ` ` ` } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ` ( ` ^ F X.X.X.X.X.", -"X.X.X.X.F I ` ( ` ` ` ` ` ` ` } } } } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ` U F X.X.X.X.", -"X.X.X.U H ( ( ` ` ` ` ` ` } } } } | } } } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ( K I X.X.X.", -"X.X.X.F ^ ` ` ` ` ` ` ` } } } } } E } .} } } } } } } } } } } } } } } [ ` ` ` ` ` ` ( ^ F X.X.X.", -"X.X.P K ` ( ` ` ` ` ` } } } } } .f a Y .. .} } } } } } } } } } } } } } [ ` ` ` ` ` ( ` L K X.X.", -"X.X.F ^ ` ` ` ` ` ` [ } } } } } .z 1 9 x ! .. .| | } } } } } } } } } } } ` ` ` ` ` ` ( ^ F X.X.", -"X.U K ( ` ` ` ` ` [ } } } } } } ..z 5 9 3 0 N ' .. .| | | } } } } } } } } } [ ` ` ` ` ( ` K U X.", -"X.F U ` ` ` ` ` ` } } } } } } } ..z 6 9 9 9 2 q B | ..} ` ` ` ( ( ( ( ( ( ( ` ` ` ` ` ( ` W F X.", -"X.F ^ ` ` ` ` ` ` } } } } } } } ..z 6 9 9 9 9 5 5 a D | | ` ` ` ( ( ( ^ ^ ^ U U ^ ( ` ` ( ( F X.", -"U K ( ` ` ` ` ` [ } } } } } } } ..z 6 9 9 9 8 8 8 4 4 d T .{ ` ` ( ( ( ^ ^ ^ U U U U ( ` ` K U ", -"L L ` ` ` ` ` ` } } } } } } } | ..z 5 9 9 8 8 8 8 7 7 & ; v Q .` ( ( ( ^ ^ ^ U U U I P U ) U P ", -"F U ` ` ` ` ` [ } } } } } } } | ..z 5 8 8 8 8 8 7 7 7 ; ; o , m / { _ ( ^ ^ ^ ~ U U U I K K I F ", -"F ^ ` ` ` ` ` [ } } } } } } | | ..l 4 8 8 8 8 7 7 7 ; ; ; - % X w V ` { ^ ^ ^ ~ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } } | | .k 4 7 7 7 7 7 7 7 ; ; ; - - - @ + t A ` _ ^ ^ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } } | } | l 4 7 7 7 7 7 ; ; ; ; - - - = = * + # y J _ ^ U U U I K K H F ", -"F ^ ` ` ` ` ` [ } } } } } | } ` | l & 7 7 7 ; ; ; ; ; - - - = = = * + # y J _ ^ U U U I K K H F ", -"F ^ ` ` ` ` ` [ } } } } } } ` ` | j & ; ; ; ; ; ; ; - - - - = = + + t Z ` _ ^ ^ U U U I K K F F ", -"F ^ ` ` ` ` ` [ } } } } } ` ` ` | h % ; ; ; ; ; - - - - - = $ . w V ` { ( ^ ^ ^ U U U I K K F F ", -"H U ` ` ` ` ` [ } } } } ` ( ` ` | h % - - - - - - - - = = . > n / { _ ( ^ ^ ^ ~ U U U I K K F F ", -"L L ` ` ` ` ` [ } } } } ( ( ( ` | g % - - - - - - - = @ = c Q .] ( ( ( ^ ^ ^ ~ U U U P K K F L ", -"U K ( ` ` ` ` ` } } } ` ( ( ( ` | g @ - - - - = = @ @ s T .} ` ` ( ( ( ^ ^ ^ U U U U P K H F U ", -"X.F ( ` ` ` ` ` [ } } ^ ^ ( ( ( { g @ = = = = @ + r C | | ` ` ` ( ( ( ^ ^ ^ ^ U U U I K K H F X.", -"X.H U ` ` ` ` ` ` } ` ^ ^ ( ( ( { i + = = $ . < M ' .] ` ` ` ( ( ( ( ^ ^ ^ ~ U U U I K K F H X.", -"X.U K ` ` ` ` ` ` } ( ^ ^ ^ ( ( { i + * O : b / .{ ` ` ` ` ( ( ( ( ^ ^ ^ ~ U U U U P K K F U X.", -"X.X.F ^ ` ` ` ` ` ` ^ ^ ^ ^ ^ ( { u * p R | { ` ` ` ` ( ( ( ( ( ^ ^ ^ ^ U U U U I K K F F X.X.", -"X.X.P P ` ` ` ` ` ` U ~ ^ ^ ^ ^ ` y e S { { ` ` ` ` ( ( ( ( ( ( ^ ^ ^ ^ U U U U I P K K F P X.X.", -"X.X.X.F ^ ` ` ` ` ( U U ^ ^ ^ ^ ^ G ^ { ( ( ( ( ( ( ( ( ( ( ^ ^ ^ ^ ^ U U U U U P K K F F X.X.X.", -"X.X.X.U K ( ` ` ` ^ U U U ~ ^ ^ ^ _ _ ^ ( ( ( ( ( ( ( ( ^ ^ ^ ^ ^ ^ U U U U U I K K H F U X.X.X.", -"X.X.X.X.F U ` ` ` ^ U U U U U ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ~ U U U U U I P K K F F X.X.X.X.", -"X.X.X.X.X.F ^ ` ` ~ I U U U U U ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ U U U U U U I P K K F F X.X.X.X.X.", -"X.X.X.X.X.U F ^ ` U P I U U U U U U ~ ^ ^ ^ ^ ^ ^ ^ ^ ^ ~ U U U U U U U I P K K F F U X.X.X.X.X.", -"X.X.X.X.X.X.I F ^ U K P I U U U U U U U U U U U U U U U U U U U U U U I K K K F F I X.X.X.X.X.X.", -"X.X.X.X.X.X.X.I F L K K K P I U U U U U U U U U U U U U U U U U U I P K K K F F I X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.U F F K K K K P I U U U U U U U U U U U U U U I P K K K K F F U X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.F F H K K K K P I I I U U U U U U I I P P K K K K H F F X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.U F F H K K K K K K P P P P P P K K K K K K H F F U X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.K F F F K K K K K K K K K K K K K H F F F K X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.U K F F F F K K K K K K F F F F K U X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.", -"X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.U I K F F F F F F K I U X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm deleted file mode 100644 index 3d84871078..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_dsp.xpm +++ /dev/null @@ -1,303 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_dsp_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 249 2", -" c #3C3937", -". c #3F3C3A", -"X c #413E3C", -"o c #44413F", -"O c #464341", -"+ c #4A4745", -"@ c #4B4846", -"# c #4D4C4A", -"$ c #524F4E", -"% c #545252", -"& c #595655", -"* c #5A5857", -"= c #575959", -"- c #5D5C5B", -"; c #7D4945", -": c #7D504E", -"> c #615F5E", -", c #7C5856", -"< c #745D5B", -"1 c #7B5D5A", -"2 c #62605F", -"3 c #6F605D", -"4 c #7F605E", -"5 c #5F6363", -"6 c #656564", -"7 c #686665", -"8 c #6A6867", -"9 c #6C6B6A", -"0 c #746564", -"q c #796462", -"w c #736D6B", -"e c #7B6B6A", -"r c #67706F", -"t c #73706F", -"y c #6E7575", -"u c #747372", -"i c #7A7574", -"p c #757877", -"a c #7A7877", -"s c #777D7C", -"d c #7C7C7C", -"f c #9D1B14", -"g c #9B1E18", -"h c #A3170F", -"j c #A41A12", -"k c #AC1911", -"l c #A11F18", -"z c #B41B13", -"x c #BB1E15", -"c c #95241D", -"v c #9C221B", -"b c #BC2017", -"n c #B5251E", -"m c #BC231B", -"M c #9C2620", -"N c #952A24", -"B c #992A24", -"V c #962D28", -"C c #9D2F29", -"Z c #96322C", -"A c #9C332D", -"S c #943732", -"D c #9A3630", -"F c #933A35", -"G c #9E3934", -"H c #953F3A", -"J c #9B3F39", -"K c #A62D26", -"L c #AC2B23", -"P c #A22F29", -"I c #B42B24", -"U c #A6352E", -"Y c #AA332D", -"T c #B1312B", -"R c #A93630", -"E c #A23C35", -"W c #AA3B35", -"Q c #A43E38", -"! c #C11F17", -"~ c #C12017", -"^ c #C12119", -"/ c #8B413D", -"( c #9A413C", -") c #A3423D", -"_ c #A9413B", -"` c #884440", -"' c #834A46", -"] c #844F4C", -"[ c #9A4741", -"{ c #964A46", -"} c #9B4944", -"| c #9B4E49", -" . c #8C504C", -".. c #93524F", -"X. c #9A514D", -"o. c #825654", -"O. c #8D5653", -"+. c #965551", -"@. c #9D5753", -"#. c #9F5955", -"$. c #975E5A", -"%. c #995F5C", -"&. c #A44742", -"*. c #A34944", -"=. c #A34E49", -"-. c #AC4E48", -";. c #B14F4A", -":. c #A2524D", -">. c #A9524D", -",. c #A55954", -"<. c #A95F5B", -"1. c #93625F", -"2. c #9C615E", -"3. c #A9625E", -"4. c #B6625D", -"5. c #806562", -"6. c #826866", -"7. c #896966", -"8. c #866D6C", -"9. c #8C6B69", -"0. c #9C6562", -"q. c #9F6F6C", -"w. c #84716F", -"e. c #8C706E", -"r. c #9D716E", -"t. c #857270", -"y. c #8D7775", -"u. c #817F7E", -"i. c #897C7B", -"p. c #937B79", -"a. c #A36461", -"s. c #AB6662", -"d. c #A06966", -"f. c #AA6964", -"g. c #A76E6B", -"h. c #B06B66", -"j. c #B26D69", -"k. c #A6716E", -"l. c #AC716E", -"z. c #A17572", -"x. c #AC7672", -"c. c #AC7A76", -"v. c #AA7E7B", -"b. c #B17773", -"n. c #BC7C79", -"m. c #C1716C", -"M. c #7C807F", -"N. c #82807F", -"B. c #A5807D", -"V. c #AB817F", -"C. c #B3807C", -"Z. c #7D8382", -"A. c #848483", -"S. c #888685", -"D. c #848887", -"F. c #8A8887", -"G. c #868B8A", -"H. c #8D8B8A", -"J. c #9B8583", -"K. c #908F8E", -"L. c #91908F", -"P. c #98908F", -"I. c #8D9494", -"U. c #959493", -"Y. c #989695", -"T. c #949897", -"R. c #999897", -"E. c #959B9A", -"W. c #9C9C9B", -"Q. c #A28482", -"!. c #AB8583", -"~. c #AB8987", -"^. c #A78B89", -"/. c #B58784", -"(. c #B98682", -"). c #B28986", -"_. c #B38F8D", -"`. c #BA8F8C", -"'. c #A9918F", -"]. c #B2918E", -"[. c #A79694", -"{. c #AC9594", -"}. c #AB9896", -"|. c #A19F9E", -" X c #AA9C9B", -".X c #B39592", -"XX c #BA9491", -"oX c #B89A97", -"OX c #B49D9B", -"+X c #BA9B99", -"@X c #A1A09F", -"#X c #B5A19F", -"$X c #BBA09E", -"%X c #9DA3A3", -"&X c #A5A4A3", -"*X c #ABA6A5", -"=X c #A5A8A7", -"-X c #A9A8A7", -";X c #A5ABAA", -":X c #ACABAB", -">X c #BEA5A3", -",X c #B1AEAD", -"XkXkX0XA.dXvXkXH.", -"nXG x I i D.H.U.R.@X&X:X3X6X0XdXhXkXvXnXNX|.U.:X8X0X3X:XH.y ..b m k k.zXdXpXE `.cXkXdXN.0XkXhXF.", -"lXA x Y d H.U.R.W.&X-X:X3X6X0XdXfXkXxXnXMXK.F.:X3X3X,X&XA.9 4 m m z X.jXdXgX*.b.kXfXpXd 3XhXpXu.", -"kXC x U A.U.Y.W.&X&X-X:X3X3X6X0XdXfXhXkXMXH.u U.&X-X|.F.u 6 0 I m x J dXdXgX,.s.gXdX0Xd ,XdX3XA.", -"kXA x U D.R.W.|.&X-X-X:X1X3X3X6X0XfXvXMXSXR.6 u N.A.d w 7 > 6 Y m b A 0XdXgX<.,.sX0X3Xa :XdXR.R.", -"lXA x U F.&X@X&X&X-X-X:X:X3X6XdXkXvXMXZXAX6X- 7 8 9 8 6 2 * - Q m m A 4XdXgXs.:.9X6X-Xi 1X0Xu.GX", -"bXJ x Y S.=X&X-X-X-X:X,X3X0XdXkXvXvXnXnXMXAXu & > 2 > - & $ = ) b m C 3XdXgXf.=.5X3XW.a 3X&Xa GX", -"MX| x I i.:X:X:X:X:X:X3X6X0XdXhXkXkXkXvXZXFXdX$ % & & % $ + % ) b m A 4XdXdX3.:.2X1XS.N.3Xd |.GX", -"AXg.k m 8.;X&XW.W.&X-X,X3X0X0XdXdXfXhXMXZXAXFX1X# o + + O # Q m b A 0XdXsX,.#.:X-Xu L.Y.u GXGX", -"SX.Xj m O.D.F.K.R.&X-X:X3X8X0X0XiX0XkXMXMXZXZXSXfXi # X . @ 6 R m x ( sX0XsX&.0.;XY.9 Y.9 GXGXGX", -"GXuXv ~ J s S.K.Y.|.&X:X,X3X3X6X8XdXvXvXnXMXMXZXZXZXkX6X3XkXP.L m z @.dX0X0XE r.=Xd i u K.GXGXGX", -"GXvX[ x L t S.H.Y.W.&X-X:X3X3X3X6XhXkXvXvXnXnXMXMXnXnXnXnXcXe.n m k z.gX0X.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXhX6X6X0XsXsX0X9X9X0XsX0X8X3X3X7X:Xx.4.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXGXGXdX8X3X3X8X8X8X3X3X3X5X3X:X~.j.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX", -"GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXkXdX3X3X3X3X3X,X{.XXn.GXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGX" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm deleted file mode 100644 index aa147a96a6..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_gfx.xpm +++ /dev/null @@ -1,310 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_gfx_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 256 2", -" c #0C4F95", -". c #164C91", -"X c #1A4F91", -"o c #0E5096", -"O c #0E5298", -"+ c #135296", -"@ c #1A5395", -"# c #17589B", -"$ c #15488E", -"% c #3E6292", -"& c #145EA1", -"* c #1D5EA0", -"= c #0963A7", -"- c #0663A8", -"; c #0B65A9", -": c #0E6BAD", -"> c #0661A7", -", c #1462A4", -"< c #116BAD", -"1 c #1D6BAC", -"2 c #1566A9", -"3 c #1E70AE", -"4 c #056BB0", -"5 c #156FB0", -"6 c #0D74B4", -"7 c #0374B9", -"8 c #0A77B8", -"9 c #0A7BBB", -"0 c #0B78B7", -"q c #1372B2", -"w c #1D74B3", -"e c #157BBB", -"r c #1B7BBA", -"t c #226EAD", -"y c #2868A6", -"u c #366EA8", -"i c #396FA8", -"p c #3A6AA4", -"a c #2371AF", -"s c #3D70A9", -"d c #3572AC", -"f c #2374B3", -"g c #2579B6", -"h c #247CBB", -"j c #2B7DBA", -"k c #2976B3", -"l c #327AB5", -"z c #3D7CB3", -"x c #317EBB", -"c c #4D6B93", -"v c #446796", -"b c #567598", -"n c #4174AB", -"m c #497AAF", -"M c #4A79AE", -"N c #447DB2", -"B c #4A7EB2", -"V c #547EB0", -"C c #007DC5", -"Z c #0B80BF", -"A c #0F8CBF", -"S c #1888BA", -"D c #2C87AF", -"F c #3A87A9", -"G c #3886AA", -"H c #2488B3", -"J c #2780BE", -"K c #2B82BE", -"L c #3381BC", -"P c #3B83BD", -"I c #3D81B7", -"U c #56859E", -"Y c #708D9E", -"T c #7E959F", -"R c #4685A4", -"E c #4481B5", -"W c #4D82B5", -"Q c #4385BA", -"! c #4C85B9", -"~ c #4D8ABD", -"^ c #448ABD", -"/ c #5084B7", -"( c #5186B9", -") c #538BBD", -"_ c #5C88B7", -"` c #5485A1", -"' c #618FBC", -"] c #6D92BB", -"[ c #789BBB", -"{ c #7394A6", -"} c #0383C4", -"| c #0A82C1", -" . c #0B8DC3", -".. c #0086CA", -"X. c #018CCD", -"o. c #078CC8", -"O. c #1C85C3", -"+. c #1387C5", -"@. c #0190CE", -"#. c #1E93CF", -"$. c #1291CF", -"%. c #008FD1", -"&. c #0194D2", -"*. c #0897D4", -"=. c #0C99D6", -"-. c #0299D8", -";. c #0E9AD9", -":. c #0598D4", -">. c #1499D6", -",. c #1C9AD6", -"<. c #129AD8", -"1. c #1E9AD4", -"2. c #2485C3", -"3. c #2C86C2", -"4. c #2589C7", -"5. c #2C8BC5", -"6. c #2B8CC9", -"7. c #3386C2", -"8. c #3A86C1", -"9. c #3C8AC4", -"0. c #328EC9", -"q. c #378DC8", -"w. c #2993CE", -"e. c #3392CC", -"r. c #3B93CC", -"t. c #3393C7", -"y. c #229DD5", -"u. c #2B9DD5", -"i. c #239CD8", -"p. c #2A9FD9", -"a. c #3C99D3", -"s. c #2BA2DA", -"d. c #2CA6DA", -"f. c #34A3D7", -"g. c #34A4DA", -"h. c #3CA5DD", -"j. c #34AADC", -"k. c #3BADDE", -"l. c #428BC4", -"z. c #4D8EC3", -"x. c #538EC1", -"c. c #588FC1", -"v. c #4292CA", -"b. c #469ACE", -"n. c #5491C3", -"m. c #5B94C3", -"M. c #5F9BCB", -"N. c #499DD4", -"B. c #6999C2", -"V. c #6299C8", -"C. c #6995C0", -"Z. c #769DC3", -"A. c #53A4CF", -"S. c #41A7DF", -"D. c #44ACDE", -"F. c #4BAFDF", -"G. c #4AA4DA", -"H. c #58A8D8", -"J. c #59B0DF", -"K. c #63AED8", -"L. c #6AB1D4", -"P. c #78B7D6", -"I. c #6FA3CA", -"U. c #46AAE0", -"Y. c #4CADE2", -"T. c #52AFE3", -"R. c #4EB0E0", -"E. c #54B1E3", -"W. c #5CB5E4", -"Q. c #5EB6E8", -"!. c #61B7E4", -"~. c #65B9E6", -"^. c #6ABBE7", -"/. c #63BAEA", -"(. c #6CBDE9", -"). c #75BBE5", -"_. c #72BEE9", -"`. c #6FC1EE", -"'. c #75C1EB", -"]. c #7BC4EC", -"[. c #7DC6F0", -"{. c #8E8C8C", -"}. c #878584", -"|. c #939291", -" X c #9D9C9B", -".X c #999897", -"XX c #87989F", -"oX c #A09F9E", -"OX c #A1A09F", -"+X c #939DA7", -"@X c #849CB3", -"#X c #98A1A3", -"$X c #9CA7AA", -"%X c #85A2BF", -"&X c #99A5B4", -"*X c #A5A4A4", -"=X c #A9A7A6", -"-X c #ABA8A6", -";X c #ACABAB", -":X c #A2ACAF", -">X c #B1AEAC", -",X c #B2B0AF", -"X>X>X>X>X>X>X>X>X,X5X6X9XqXqXwXbXnXnXmXmXMXMXMXMXMXMXMXMXmXmXbXbXbX9XbXUXUXUX", -"UXUXUXUX-X:Xv % v c c c c b b b b Y T XX+X#X#X$X$X$X:X2X2X0X7XqXeXnXnXnXnXnXnXnXnXnXbXwXMX>XUXUX", -"UXUXUXUX;X&X@ $ . . . . . . . . . 9 @.o.o. . . .A A S S S H H D D F F F R R R ` ` U { bXCX;X|.UX", -"UXUXUXUX>X@X@ X @ @ @ @ @ @ @ @ @ 0 -.*.=.;.<.<.;.;.-.-.-.-.&.&.&.%.%.X.X.......} C 5.mXCX;X|.UX", -"UXUXUXUX>X[ @ @ @ @ @ @ @ @ @ # @ 5 <.,.1.i.i.i.i.i.,.>.=.:.&.&.&.&.X.X.X.X.......C t.NXCX;X|.UX", -"UXUXUXUX>XrXs n n s s s i i u u p l h.h.h.h.h.h.g.g.g.s.p.,.<.:.&.&.&.X.X.X.......C r.BXZX=X|.UX", -"UXUXUX-X>XrXn m m m B B B B B W B ( J.W.W.W.W.W.W.W.W.E.E.Y.D.k.d.d.s.s.y.y.y.1.#.$.A.CXAX*X|.UX", -"UXUXUX-X>X%Xn m N N N N N B B W W / H.W.!.!.!.!.!.!.W.W.W.E.E.R.D.k.j.j.j.g.f.f.f.u.L.ZXSX*X|.UX", -"UXUXUX-X;X[ N N N N N E E W W W / / H.~.~.~.^.^.~.~.~.!.W.W.E.E.F.D.j.j.j.g.f.f.f.u.L.AXSXOXUXUX", -"UXUXUX-X2XB.z N N E E E W ! W ( ( ( H.(.^.(.(.(.(.^.^.~.~.!.W.E.E.F.k.j.j.j.g.f.f.u.P.DXSXoXUXUX", -"UXUXUX-X5XB.z E E E E ! ! ! ( ) ) ) M.(._._._._._._.(.^.~.~.W.W.E.R.D.j.j.j.g.f.f.u.P.DXSX XUXUX", -"UXUXUX=X0XI.z E Q Q Q ! ~ ) ) ) ) ) M._.'.'.'.'.'._._.(.^.~.!.W.W.E.F.k.j.j.j.f.f.u.pXGXSX XUXUX", -"UXUXUX=X0XK.I Q Q Q Q ~ ~ ) ) c.c.m.M._.].].].].].'.'._.(.^.~.!.W.E.R.D.j.j.j.g.f.u.gXHXSX XUXUX", -"UXUXUX=X3XD.L Q ^ ^ ~ ~ ) x.n.n.m.m.m.).].].cXcX].].].'._.(.^.~.W.W.E.D.j.d.s.y.,.X.P.HXSX XUXUX", -"UXUXUX-XsX,.8 3 g L ^ ~ x.n.m.m.M.V.V.).vXvXvXvXvXcX].'._.(.~.W.E.D.h.s.;.:.&.X.X...pXKXSX XUXUX", -"UXUXUX-XiX=.} : : q w g l L P l.z.z.n.K.'.].].[.'.'.^.Q.E.Y.U.h.g.s.i.,.*.&.&.X.X...pXKXSX XUXUX", -"UXUXUX-XiX:.X.6 6 q w g g j j x L P P N./.(.`.`.(./.Q.E.T.Y.U.h.h.g.p.,.*.&.&.@.X...gXHXSX XUXUX", -"UXUXUX-XiX&.%.9 6 q w h j j L L 8.8.8.b././.(.(././.Q.E.T.Y.U.h.h.g.p.,.*.&.&.X.X...hXHXSX XUXUX", -"UXUXUX-XaX%.&.} 6 0 r h j K L 7.8.9.l.v.Q././././.Q.W.E.Y.Y.S.h.g.g.p.,.:.&.&.X.X...hXGXZX.XUXUX", -"UXUXUX>XP.X.X.X.0 0 r h J K 7.7.9.9.l.v.T.Q././.Q.W.E.E.Y.U.S.h.g.p.i.>.:.&.&.X.X...hXDXCX.XUXUX", -"UXUX-X>XL.X.X.&.Z 9 e S 2.3.7.7.q.q.v.v.F.W.W.W.W.E.E.Y.Y.U.h.h.g.p.i.>.&.&.&.X.X...xXFXCX.XUXUX", -"UXUX-X>XK...X.&.} 9 Z O.2.3.5.0.q.r.r.v.G.E.E.E.E.T.Y.Y.U.S.h.g.s.p.,.*.&.&.&.X.X...xXAXNX.XUXUX", -"UXUX-X.:.&.&.X.X.X...xXZXMX|.UXUX", -"UXUX-X5XH...X.X.@.} | | O.4.6.6.e.e.r.r.a.U.U.U.U.U.U.h.h.h.g.p.i.,.*.&.&.&.X.X...o.jXVXmX|.UXUX", -"UXUX-X2Xb.C } } ..| 9 | +.O.2.5.6.0.e.e.a.h.S.S.S.h.h.h.g.g.s.p.,.=.&.&.&.@.X.X...o.jXBXmX|.UXUX", -"UXUX-X3Xt.7 9 9 9 9 0 0 0 e r h J K K 3.3.0.e.e.e.e.e.e.w.w.w.#.$.@.@.X.X.X.X.X...o.lXMXbX|.UXUX", -"UXUX=X8XK 4 6 6 6 6 6 6 6 6 q w g g g g g j K K j j j h h h r e 0 0 0 0 8 8 8 8 7 0 4XmXbX|.UXUX", -"UXUX=X8Xj > ; ; - - > = = ; ; < < 1 1 t a f f f f f f f w w q < : < < < < < < < ; 2 &XnXbX|.UXUX", -"UXUX=X2XdXuXtXZ.Z.B.m.~ Q z l k t t 1 2 , , , , , , , , , , , , , , , , , , , & & & &XbXbX|.UXUX", -"UXUX-X=X-X;X;X,X5X5X5X3X3X3XfXfXsXyXyXyXuXtXZ.C.' _ W N d y y * # # # O o o + o + &XeXwX|.UXUX", -"UXUX-X-X-X-X-X-X-X-X-X-X-X=X=X=X-X-X;X>X,X5X0X9X9XbXzXlXlXlXlXdXiXuXrXrXZ.] _ V M p +XqX9X|.UXUX", -"UX=X*X*X*X*X*X*X=X=X=X=X=X-X-X-X-X-X-X-X;X;X;X>X,X5X5X6X7X7X7X9X9XwXwXbXbXbXkXkXmXkX2X7X9X|.UXUX", -"UXUXJXSXCXMXbX9X9X5X;X;X=X=X=X*X*X*X*X=X=X=X-X;X;X5X5X5X5X5X6X7X7X7X7X7X7X6X6X6X5X5X5X6X9X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXPXPXPXJXAXCXNXmXbXbX9X0X5X5X;X;X;X;X;X;X>X,X5X5X5X5X5X5X5X5X5X>X;X5X7X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXmXmXbXbXMXbXbXnXmXmXMXMXMXNXMXMXmXbXbX9X0X6X5X;X-X-X=X=X*X;X6X|.UXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUX6X5X;X5X6X9X;X{.{.{.{.|..X.X*X7XbXMXMXMXCXCXCXSXJXJXZXMXbX9XbX7XUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUX5X;X;X5X6X9XbXbX6X5X5X>X;X=X*X X;X9X9X6X,X;X;X;X5XbXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX>X;X;X,X5X7X9XbXmXMXCXZXAXZXZXCXMXMXbXwX9X0X5X;X;X;X;XUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX;X;X>X5X6X9XbXmXMXCXCXZXAXAXAXZXCXMXmXbX9X7X5X>X;X;X;X;XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUX;X;X;X>X5X7X9XbXmXMXCXZXAXAXSXAXZXAXCXMXmX9X9X5X,X;X;X;X;XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX>X;X>X5X7X9XbXmXCXZXAXSXSXSXSXZXSXJXCXCXmX7X6X5X;X;X;X*XUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX*X5X>X5X9XqXbXMXCXZXAXSXSXSXSXAXSXKXJXMXSXmX5X5X;X>X;XUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUX;X6X5X7XqXbXMXCXZXAXSXSXSXSXAXAXKXLXSXmXLXCX;X5X6XUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUX-XwX9X9XbXmXMXCXZXAXSXSXAXZXCXJXPXPXmXMXIXJX;XUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUX{.6XmXMXMXMXCXCXZXZXZXZXZXCXSXIXIXPXmXCX5XUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX*X9XMXAXSXJXJXJXJXSXAXSXLXCX7X{.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX|. X*X=X*X X|.}.UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_options.c b/Source/Core/DolphinWX/resources/toolbar_plugin_options.c deleted file mode 100644 index 13976bf5ee..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_options.c +++ /dev/null @@ -1,286 +0,0 @@ -static const unsigned char toolbar_plugin_options_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, -0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, 0x87, 0x00, 0x00, 0x00, -0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, -0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, -0x12, 0x00, 0x00, 0x0b, 0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, -0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, -0x72, 0x65, 0x00, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x6d, 0x65, 0x64, 0x69, -0x61, 0x20, 0x46, 0x69, 0x72, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x20, -0x4d, 0x58, 0x20, 0x32, 0x30, 0x30, 0x34, 0x87, 0x76, 0xac, 0xcf, 0x00, -0x00, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x00, 0x39, 0x2f, 0x31, -0x38, 0x2f, 0x30, 0x34, 0x73, 0x4e, 0xa2, 0xdf, 0x00, 0x00, 0x0c, 0x97, -0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xd5, 0x99, 0x6b, 0x8c, 0x5d, 0xd5, -0x75, 0x80, 0xbf, 0xbd, 0xcf, 0xfb, 0xdc, 0x79, 0x5c, 0x63, 0x7b, 0x8c, -0x5f, 0x78, 0x10, 0x85, 0x16, 0xd3, 0x8a, 0x81, 0xa9, 0x11, 0x29, 0xc4, -0x0c, 0x24, 0x54, 0x51, 0xda, 0xca, 0xa6, 0xa0, 0x96, 0xaa, 0x1a, 0x33, -0x36, 0xd8, 0x40, 0x48, 0x8a, 0x93, 0x36, 0x25, 0x90, 0x84, 0x4e, 0x7e, -0xf5, 0x19, 0xd9, 0x56, 0xa8, 0xfa, 0xa3, 0x42, 0x63, 0x34, 0x4a, 0xa5, -0xb6, 0xa2, 0xc0, 0x7f, 0x5a, 0x9b, 0xa0, 0x04, 0x42, 0x6a, 0x3c, 0xd8, -0xc1, 0xd8, 0x01, 0x93, 0x19, 0xcf, 0xd8, 0xcc, 0xfb, 0xbe, 0x1f, 0xe7, -0xb5, 0x77, 0x7f, 0x9c, 0x7b, 0xaf, 0x67, 0x0c, 0xe3, 0xf8, 0x45, 0x50, -0x97, 0xb4, 0xaf, 0x8e, 0xce, 0x3d, 0x67, 0xef, 0xf5, 0xed, 0xb5, 0xf6, -0xda, 0x6b, 0xed, 0x23, 0xb4, 0xd6, 0xfc, 0x7f, 0x16, 0xf3, 0x4a, 0x77, -0xb8, 0x6d, 0xdb, 0xb6, 0x3e, 0xa0, 0x5b, 0x6b, 0xdd, 0xdd, 0xb8, 0x35, -0x02, 0x8c, 0x0e, 0x0f, 0x0f, 0x8f, 0x5c, 0xe9, 0xb1, 0x00, 0xc4, 0x95, -0xb0, 0xc0, 0xf6, 0x1d, 0x3b, 0xfa, 0xd0, 0x0c, 0x80, 0xde, 0xa2, 0x35, -0x59, 0xd0, 0x68, 0x7d, 0xb6, 0x35, 0x24, 0x0f, 0xbc, 0x00, 0xec, 0x1d, -0x1e, 0x1e, 0x1e, 0xbd, 0xec, 0x41, 0x1b, 0x72, 0x59, 0x00, 0x0f, 0x3f, -0xf2, 0x48, 0x0f, 0xb0, 0x07, 0x4d, 0x5f, 0x7a, 0x47, 0xa3, 0x35, 0x68, -0x34, 0xe8, 0xc5, 0x10, 0xe7, 0x8c, 0xb3, 0x0f, 0x18, 0x1c, 0x1e, 0x1e, -0xce, 0x5f, 0xba, 0xea, 0xa9, 0x5c, 0x16, 0xc0, 0xce, 0x5d, 0xbb, 0x0e, -0x40, 0x43, 0x79, 0x9d, 0xfe, 0xb8, 0x9e, 0x4f, 0x7b, 0x7b, 0x07, 0x8e, -0xe3, 0x62, 0x9a, 0x26, 0x4a, 0x29, 0x6a, 0xb5, 0x2a, 0x95, 0x4a, 0x99, -0x7c, 0x6e, 0x1e, 0xa5, 0x54, 0xf3, 0xf5, 0x51, 0xe0, 0xbe, 0xcb, 0x75, -0xad, 0xcb, 0x02, 0x78, 0xf4, 0xb1, 0xc7, 0xef, 0x02, 0x0e, 0xa6, 0x00, -0x1a, 0xdf, 0xcf, 0x70, 0x6b, 0x6f, 0x2f, 0x1b, 0x36, 0x6c, 0x60, 0xc5, -0x8a, 0x15, 0x78, 0x9e, 0x8f, 0x52, 0x8a, 0x72, 0xb9, 0xcc, 0xe4, 0xe4, -0x24, 0x47, 0x8e, 0xbc, 0xc3, 0x87, 0x27, 0x3f, 0xa0, 0x52, 0x29, 0x37, -0xbb, 0xc8, 0x4b, 0x29, 0xef, 0xd9, 0xbf, 0x7f, 0xff, 0xe1, 0xcf, 0x04, -0x00, 0xe0, 0xf1, 0xaf, 0x3c, 0xf1, 0x12, 0xb0, 0x15, 0xad, 0xe9, 0xe8, -0xcc, 0xf2, 0xe4, 0x93, 0x4f, 0xa2, 0x95, 0x46, 0x69, 0xc5, 0xfc, 0x7c, -0x0e, 0xd3, 0x34, 0xf0, 0x3c, 0x0f, 0xa5, 0x34, 0x41, 0x10, 0x70, 0xf8, -0xf0, 0x61, 0x7e, 0xfa, 0xd3, 0x37, 0x28, 0x97, 0x8a, 0x4d, 0xd7, 0xca, -0x9b, 0xa6, 0xf9, 0x85, 0xe7, 0x9f, 0x7f, 0xfe, 0xed, 0xcf, 0x04, 0xe0, -0x89, 0xaf, 0x7e, 0x6d, 0x03, 0x30, 0x4a, 0xc3, 0xf7, 0x6f, 0xbd, 0xe5, -0x56, 0x2c, 0xdb, 0x61, 0x7e, 0x7e, 0x9e, 0x24, 0x49, 0x50, 0x4a, 0x21, -0xa5, 0x64, 0xcd, 0x9a, 0x35, 0x6c, 0xdc, 0xb8, 0x91, 0x4c, 0x26, 0xc3, -0xcf, 0xde, 0x7a, 0x8b, 0xff, 0x3d, 0xf4, 0x33, 0x0a, 0xf9, 0x1c, 0x4a, -0x29, 0xb4, 0xd6, 0xa3, 0x9d, 0x9d, 0x9d, 0xbd, 0xfb, 0xf6, 0xed, 0x9b, -0xbf, 0xd8, 0xf1, 0xe5, 0xf9, 0xfe, 0xdc, 0xb5, 0xeb, 0xd1, 0x9e, 0xc7, -0x1e, 0x7b, 0x7c, 0xe0, 0x7c, 0xcf, 0xfc, 0xf3, 0x73, 0x3f, 0x18, 0x93, -0x52, 0xee, 0x95, 0x52, 0x22, 0xa5, 0xe4, 0xf0, 0xc8, 0x61, 0xe6, 0xe6, -0xe6, 0x90, 0x52, 0x62, 0x18, 0x06, 0x52, 0x4a, 0x92, 0x24, 0xe1, 0xd4, -0xa9, 0x53, 0xbc, 0xfa, 0xea, 0xab, 0x8c, 0x8e, 0x8e, 0xb2, 0xe9, 0xb6, -0xdb, 0xb8, 0xe5, 0x96, 0x5e, 0xfc, 0x4c, 0x06, 0xcb, 0xb2, 0x30, 0x0c, -0xa3, 0xbb, 0x58, 0x2c, 0xee, 0xb9, 0x58, 0xe5, 0xcf, 0x0b, 0xb0, 0x6b, -0xd7, 0xa3, 0x3d, 0x52, 0xca, 0x03, 0x42, 0x88, 0xa1, 0xaf, 0x3c, 0xf1, -0xd5, 0xad, 0xe7, 0xed, 0x44, 0xca, 0x41, 0x29, 0x65, 0x5e, 0x8a, 0x14, -0x62, 0x7e, 0x6e, 0x96, 0x26, 0x50, 0xb3, 0x19, 0x86, 0x01, 0xc0, 0x91, -0x23, 0x47, 0x18, 0x1f, 0x1f, 0xa7, 0xb7, 0xb7, 0x97, 0xf5, 0xeb, 0x37, -0x60, 0x59, 0x16, 0xa6, 0x69, 0x02, 0x6c, 0x7b, 0xe8, 0xa1, 0x87, 0xee, -0xbe, 0x22, 0x00, 0x3b, 0x77, 0xed, 0xea, 0x16, 0x42, 0x1c, 0x10, 0x42, -0x64, 0x85, 0x94, 0x48, 0x21, 0x87, 0xbe, 0xf6, 0x17, 0x4f, 0xf6, 0x2c, -0xd5, 0xc9, 0xbe, 0xbd, 0x7b, 0x0a, 0x2d, 0x2b, 0x08, 0x49, 0xa1, 0x58, -0x40, 0xa9, 0xe4, 0x13, 0x21, 0x2c, 0xcb, 0xe4, 0xbd, 0x63, 0xc7, 0xc8, -0xe7, 0xf3, 0xf4, 0xf6, 0xf6, 0xd2, 0xd9, 0x99, 0xc5, 0x34, 0x4d, 0x0c, -0xc3, 0x40, 0x6b, 0xfd, 0xec, 0x15, 0x01, 0x10, 0x42, 0x0c, 0x09, 0x21, -0xb2, 0x42, 0x08, 0x84, 0x10, 0x08, 0x29, 0xb2, 0x52, 0xc8, 0xa1, 0xdd, -0x5f, 0xff, 0x46, 0x76, 0xa9, 0x8e, 0xf6, 0xec, 0xf9, 0xfe, 0xf7, 0x84, -0x94, 0xa3, 0xa2, 0xa1, 0xec, 0xec, 0xec, 0x0c, 0xad, 0xf7, 0x85, 0xc0, -0x30, 0x0c, 0x4c, 0xd3, 0xc0, 0xb2, 0x2c, 0x1c, 0xd7, 0xe1, 0xc3, 0x93, -0x27, 0xe9, 0xea, 0x5a, 0x45, 0x57, 0xd7, 0xaa, 0xa6, 0x1b, 0x21, 0x84, -0xe8, 0xeb, 0xef, 0xef, 0x5f, 0x72, 0xa2, 0x2e, 0x08, 0x60, 0xe7, 0xae, -0x5d, 0x0f, 0x09, 0x44, 0xdf, 0xc2, 0xc1, 0x1b, 0xad, 0x47, 0x08, 0x39, -0x74, 0xde, 0xce, 0xa4, 0xdc, 0x2d, 0x85, 0x40, 0x08, 0x49, 0xb1, 0x50, -0x24, 0x8e, 0x63, 0x84, 0x10, 0x48, 0x29, 0x11, 0x42, 0x60, 0x9a, 0x16, -0xb6, 0x6d, 0xe3, 0x38, 0x0e, 0xa6, 0x65, 0x32, 0x3d, 0x3d, 0xc5, 0x75, -0xd7, 0xfd, 0xc6, 0x42, 0x00, 0x80, 0x87, 0x2e, 0x0b, 0x40, 0x20, 0x06, -0x9b, 0x4a, 0x3b, 0xae, 0xcb, 0xb5, 0xdd, 0xd7, 0x2e, 0x84, 0xd8, 0xfa, -0x57, 0xdf, 0x7c, 0xea, 0x6f, 0x96, 0xea, 0xec, 0xfb, 0xff, 0xf4, 0x0f, -0xaf, 0x08, 0x29, 0x0f, 0x36, 0x9f, 0x9f, 0x9b, 0x9d, 0x6d, 0xbd, 0x6b, -0x9a, 0xa9, 0x05, 0x6c, 0xdb, 0xc6, 0x75, 0x5d, 0x5c, 0xd7, 0xa5, 0x58, -0x2c, 0xb2, 0x7c, 0xf9, 0x72, 0x32, 0x99, 0x4c, 0x0b, 0x12, 0x38, 0xef, -0x7a, 0x3b, 0x2f, 0xc0, 0x23, 0x3b, 0x77, 0xf6, 0x01, 0xdd, 0x08, 0x81, -0x94, 0x06, 0xbf, 0xf7, 0xb9, 0x3b, 0x78, 0xf0, 0xc1, 0x07, 0x59, 0x7d, -0xf5, 0xea, 0x85, 0x10, 0x83, 0x4f, 0x7d, 0xeb, 0x99, 0x25, 0x07, 0x11, -0x42, 0x74, 0x0b, 0x21, 0x40, 0x08, 0x0a, 0xc5, 0x3c, 0x51, 0x14, 0x61, -0x34, 0xfc, 0xdf, 0xb6, 0x6d, 0x1c, 0xdb, 0xc6, 0x75, 0x1d, 0x1c, 0xc7, -0xc6, 0x30, 0x0c, 0x6a, 0xf5, 0x1a, 0x8e, 0xe3, 0x22, 0x65, 0x4b, 0x95, -0xee, 0xfe, 0xfe, 0xfe, 0x25, 0x5d, 0xf5, 0xbc, 0x00, 0x02, 0xb6, 0x90, -0xce, 0x02, 0x9e, 0xef, 0xb1, 0x76, 0xdd, 0x5a, 0x1c, 0xc7, 0x61, 0x60, -0x60, 0x00, 0xd7, 0xf3, 0x16, 0x42, 0x0c, 0x3d, 0xfd, 0xcc, 0x77, 0x3f, -0xe6, 0xab, 0x7f, 0xfd, 0xd4, 0x33, 0x43, 0x40, 0xb7, 0x48, 0xfb, 0x42, -0x0a, 0x49, 0x50, 0xaf, 0x23, 0x0d, 0x99, 0xba, 0x8f, 0xd5, 0x98, 0x7d, -0xc7, 0xc5, 0xb6, 0x6d, 0x2c, 0xd3, 0x24, 0x8a, 0x22, 0x2c, 0xdb, 0x3a, -0xb7, 0xab, 0x9b, 0x2f, 0x09, 0x00, 0xe8, 0x13, 0x8d, 0x0b, 0xcb, 0xb2, -0x59, 0xb7, 0x76, 0x2d, 0xc7, 0x4f, 0x9c, 0xa0, 0x5a, 0xad, 0xf2, 0xf0, -0x8e, 0xed, 0xb8, 0xae, 0xdb, 0x7c, 0x2e, 0x2b, 0x04, 0x43, 0xdf, 0xf9, -0xee, 0x60, 0x16, 0xe0, 0x99, 0x6f, 0x3f, 0xdb, 0xf7, 0xad, 0xa7, 0xbf, -0x73, 0x00, 0x18, 0x10, 0x88, 0x56, 0x67, 0xeb, 0xd6, 0xaf, 0xa7, 0x33, -0x9b, 0xc5, 0x32, 0x2d, 0x1c, 0xc7, 0xc6, 0xf5, 0x5c, 0x3c, 0xcf, 0xc3, -0x71, 0x1c, 0x2c, 0xcb, 0x42, 0x1a, 0x92, 0x30, 0x0c, 0xd3, 0x04, 0xf0, -0x12, 0x37, 0xd4, 0x45, 0x00, 0x1a, 0x7a, 0x34, 0x20, 0x84, 0x60, 0xc5, -0x8a, 0x15, 0x84, 0x51, 0xc4, 0xa1, 0x43, 0x6f, 0xf3, 0xc6, 0x1b, 0x6f, -0xd2, 0xd1, 0xd1, 0xc9, 0x03, 0x0f, 0xdc, 0x4f, 0x23, 0xd1, 0x44, 0x6b, -0x7a, 0x94, 0x52, 0x87, 0x9f, 0xf9, 0xf6, 0xb3, 0xbf, 0xd4, 0x5a, 0x1f, -0x00, 0xdd, 0x97, 0xee, 0xc5, 0x1a, 0xd7, 0xf3, 0xb8, 0xf7, 0xf7, 0xef, -0xe5, 0x9e, 0x7b, 0xbe, 0x80, 0x69, 0x9a, 0xd8, 0x8e, 0x8d, 0xe7, 0x79, -0xf8, 0x9e, 0x87, 0xeb, 0xb9, 0x2d, 0xf7, 0x01, 0xa8, 0x56, 0x2a, 0xc4, -0x71, 0xbc, 0x30, 0xc9, 0xbb, 0x28, 0x69, 0x15, 0x34, 0x3b, 0x76, 0x3c, -0xdc, 0x23, 0xa5, 0x4c, 0xe7, 0x4f, 0x6b, 0xda, 0xdb, 0x3b, 0x38, 0x7a, -0xf4, 0x28, 0x42, 0x08, 0xf2, 0x85, 0x02, 0xaf, 0xfe, 0xf7, 0xff, 0x70, -0xef, 0x17, 0xbf, 0xc8, 0xfd, 0x0f, 0xdc, 0xcf, 0x8b, 0x2f, 0xfe, 0x17, -0x5a, 0x29, 0xb4, 0x10, 0xdd, 0x82, 0x86, 0xda, 0x5a, 0xd3, 0xd5, 0xd5, -0xc5, 0xa6, 0x4d, 0xbf, 0xcb, 0x4d, 0x37, 0xdd, 0x44, 0xbd, 0x1e, 0xf0, -0xda, 0xc1, 0xd7, 0x70, 0x9a, 0xca, 0xfb, 0x3e, 0x7e, 0xc6, 0xc7, 0x73, -0x5d, 0x10, 0x82, 0x38, 0x49, 0x48, 0x12, 0x45, 0x9c, 0x24, 0xd4, 0x6b, -0x35, 0x92, 0x24, 0xb9, 0x24, 0x2b, 0x2c, 0xac, 0xc8, 0x3a, 0x9b, 0x17, -0x42, 0x4a, 0xda, 0xdb, 0xda, 0x38, 0x7d, 0xfa, 0x4c, 0x2b, 0x3a, 0xe4, -0xf3, 0x79, 0x0e, 0xbd, 0x7d, 0x88, 0xcf, 0xdd, 0x7e, 0x3b, 0x9b, 0x37, -0xdf, 0xc9, 0x8f, 0x7e, 0xf4, 0x3a, 0x68, 0x81, 0xe7, 0xba, 0xdc, 0xf0, -0x9b, 0xd7, 0xb3, 0x69, 0xd3, 0x26, 0x56, 0xae, 0x5c, 0x89, 0x52, 0x8a, -0xe9, 0xa9, 0x69, 0x8e, 0xfe, 0xfc, 0x5d, 0x12, 0x95, 0xe0, 0x79, 0x1e, -0x6d, 0x99, 0x0c, 0x6d, 0x6d, 0x19, 0x7c, 0xcf, 0xc7, 0x34, 0x4d, 0x92, -0x24, 0x26, 0x49, 0x12, 0xa2, 0x30, 0x24, 0x8a, 0x22, 0x2a, 0x95, 0x72, -0x2b, 0x6f, 0x6a, 0xc8, 0xe8, 0x45, 0x03, 0x2c, 0xa4, 0x97, 0x42, 0x10, -0x84, 0x01, 0x49, 0x92, 0x34, 0x62, 0xb4, 0x44, 0x20, 0x18, 0x1b, 0x3b, -0x85, 0x14, 0x82, 0xcf, 0xdf, 0xf9, 0x79, 0xd0, 0x90, 0xcd, 0x66, 0xb9, -0xfe, 0x86, 0xeb, 0x71, 0x1c, 0x07, 0xad, 0x34, 0x93, 0x93, 0x53, 0x9c, -0x38, 0x71, 0x82, 0x5c, 0x2e, 0x8f, 0x65, 0x99, 0xf8, 0xbe, 0x4f, 0xc6, -0xf7, 0x69, 0x6b, 0x6b, 0x23, 0x93, 0xf1, 0xb1, 0x6d, 0x1b, 0xad, 0x35, -0x61, 0x98, 0x10, 0x06, 0x21, 0x41, 0x10, 0x50, 0x28, 0xe4, 0xa9, 0xd7, -0xeb, 0x0b, 0x95, 0xcf, 0x0f, 0x0f, 0x0f, 0x8f, 0x5d, 0x82, 0x05, 0x52, -0xff, 0x85, 0x74, 0x0d, 0x14, 0x0a, 0x85, 0xc6, 0xee, 0x99, 0x6e, 0xf3, -0x86, 0x21, 0xd1, 0x1a, 0x26, 0x4e, 0x9f, 0x61, 0xe5, 0xe8, 0x2f, 0xb9, -0xe3, 0x8e, 0x3b, 0x5a, 0xef, 0x8d, 0x8d, 0x8e, 0x31, 0x3a, 0x36, 0xd6, -0x48, 0x9f, 0x4d, 0x7c, 0xcf, 0xc3, 0x71, 0x9d, 0xd6, 0xec, 0xfb, 0x19, -0x1f, 0xd7, 0x71, 0x00, 0x08, 0x82, 0x80, 0x7a, 0x10, 0x50, 0xad, 0xd5, -0xa8, 0xd5, 0xea, 0xcc, 0xce, 0xcc, 0x10, 0x45, 0xd1, 0x42, 0x17, 0x3a, -0x78, 0xa1, 0xca, 0x9f, 0x6b, 0x81, 0xd1, 0x85, 0x65, 0xe0, 0x47, 0x67, -0xce, 0xb0, 0xfe, 0x9a, 0x0d, 0x98, 0x86, 0x81, 0x65, 0x9f, 0xdd, 0x29, -0xb5, 0xd6, 0xbc, 0xfb, 0xee, 0x31, 0xe2, 0x28, 0xa1, 0x56, 0xaf, 0x32, -0x39, 0x39, 0x4d, 0x10, 0xd4, 0x11, 0x42, 0xe0, 0xfb, 0x5e, 0x9a, 0x2a, -0x38, 0x4e, 0xc3, 0xef, 0xd3, 0x85, 0x6b, 0xdb, 0x36, 0x42, 0xa6, 0x11, -0xa7, 0x1e, 0x04, 0x54, 0x2b, 0x55, 0x2a, 0x95, 0x0a, 0xb9, 0x7c, 0x8e, -0x42, 0x21, 0x7f, 0xee, 0x22, 0x7e, 0xf9, 0x62, 0x00, 0x16, 0xd5, 0x03, -0xdb, 0xb7, 0x6f, 0xd7, 0x86, 0x61, 0xe2, 0x38, 0x0e, 0xae, 0xe7, 0xb2, -0x7e, 0xfd, 0x35, 0x64, 0x3b, 0x97, 0xe1, 0xba, 0xee, 0xc7, 0x20, 0x1a, -0x79, 0xfc, 0xa2, 0x5c, 0xc7, 0xb2, 0x2c, 0x1c, 0xdb, 0x4e, 0x67, 0xdf, -0x75, 0x5b, 0xe1, 0x12, 0x01, 0x51, 0x18, 0x51, 0xa9, 0x56, 0x29, 0x16, -0x8a, 0xe4, 0xf3, 0x79, 0xf2, 0x85, 0x02, 0xc7, 0xdf, 0x3b, 0x46, 0xa9, -0x54, 0x24, 0x08, 0x02, 0x94, 0x52, 0x88, 0x38, 0x39, 0xf3, 0xc2, 0xbf, -0xfd, 0x70, 0xed, 0x25, 0x59, 0xa0, 0x61, 0x85, 0x11, 0xad, 0x75, 0x8f, -0x52, 0x09, 0x49, 0x9c, 0x90, 0xcf, 0xe7, 0x69, 0x6f, 0xef, 0x04, 0x01, -0x86, 0x61, 0xe0, 0xd8, 0x36, 0x86, 0x69, 0x20, 0xc5, 0xd9, 0xe8, 0x2b, -0x64, 0xba, 0x6b, 0x9b, 0x0d, 0x00, 0xdb, 0x4e, 0xf3, 0x1d, 0xb3, 0x91, -0xdf, 0x68, 0xad, 0x08, 0xc3, 0x88, 0x5a, 0xb5, 0x4a, 0xa9, 0x54, 0xa2, -0x58, 0x2c, 0x52, 0x2a, 0x95, 0x19, 0x3f, 0x75, 0x8a, 0x4a, 0xa5, 0x4c, -0x14, 0x45, 0xad, 0xc9, 0xe8, 0x7d, 0xeb, 0xad, 0xec, 0x4b, 0x42, 0xf6, -0xdc, 0xa7, 0xd5, 0x05, 0xd7, 0xc9, 0x8b, 0x00, 0x94, 0xd2, 0x23, 0x42, -0x24, 0x3d, 0x71, 0x22, 0x31, 0xe2, 0x88, 0x4a, 0xb9, 0x4c, 0xb1, 0x98, -0x4f, 0x95, 0xb2, 0x2c, 0x68, 0x24, 0x64, 0x96, 0x65, 0x62, 0x1a, 0x06, -0x52, 0xa6, 0x6b, 0x23, 0x4d, 0x95, 0x4d, 0x0c, 0x33, 0x05, 0x91, 0x86, -0x81, 0x00, 0x92, 0x24, 0x21, 0x0c, 0x43, 0x6a, 0xd5, 0x1a, 0xa5, 0x52, -0x89, 0x42, 0xb1, 0x48, 0xb1, 0x58, 0x64, 0x72, 0xf2, 0x23, 0x66, 0x66, -0xa6, 0x08, 0xc3, 0xb0, 0xe5, 0xfb, 0xcb, 0x72, 0x39, 0xae, 0x3f, 0x79, -0xd2, 0x57, 0x70, 0xe0, 0x15, 0x21, 0xef, 0xde, 0x72, 0x81, 0x10, 0x8b, -0x37, 0x32, 0xad, 0x0e, 0x2a, 0xa5, 0x48, 0xe2, 0x98, 0x28, 0x8e, 0x09, -0xc3, 0x80, 0xd9, 0x99, 0x69, 0xca, 0xa5, 0x12, 0xf5, 0x20, 0x20, 0x0c, -0x03, 0xe2, 0x38, 0x06, 0x4d, 0x3a, 0xeb, 0x96, 0xd9, 0x98, 0x75, 0x1b, -0xdb, 0xb6, 0x30, 0x1b, 0x2e, 0xa6, 0x92, 0x84, 0x20, 0x0c, 0xa9, 0x54, -0x2a, 0x14, 0x0b, 0x45, 0x72, 0xf9, 0x1c, 0xb9, 0x5c, 0x8e, 0x42, 0xa1, -0xc0, 0xd4, 0xd4, 0x14, 0xe3, 0xe3, 0x63, 0x04, 0x41, 0xb0, 0x28, 0xf6, -0xdf, 0xf9, 0x93, 0x9f, 0x60, 0xa3, 0xb1, 0x20, 0x6b, 0xc2, 0xd0, 0x2b, -0x42, 0x5e, 0x50, 0x3e, 0x74, 0xee, 0xc9, 0xdc, 0xcb, 0x4a, 0x29, 0x84, -0x10, 0xc4, 0x51, 0x44, 0x80, 0x00, 0x2a, 0x4c, 0x4c, 0x8c, 0x83, 0x10, -0xe9, 0x59, 0x8f, 0x5a, 0x70, 0xe6, 0xd3, 0x88, 0x5a, 0x5a, 0x93, 0x2e, -0xc2, 0x86, 0xf2, 0x71, 0x1c, 0x13, 0x84, 0x21, 0xf5, 0x5a, 0x9d, 0x4a, -0xa5, 0x42, 0xb9, 0x52, 0xa1, 0x52, 0xa9, 0x30, 0x31, 0x7e, 0x8a, 0x99, -0x99, 0xe9, 0x96, 0xf2, 0x4d, 0xd7, 0x79, 0xe4, 0xc6, 0xe5, 0xac, 0xfb, -0xa0, 0x93, 0x89, 0x37, 0x73, 0x48, 0x34, 0x20, 0x7a, 0x14, 0x0c, 0x01, -0xf7, 0xfd, 0x2a, 0x80, 0x8f, 0x15, 0xf5, 0xfd, 0xfd, 0xfd, 0x7b, 0x80, -0xdd, 0x52, 0x2e, 0x28, 0x40, 0x1c, 0x07, 0xdf, 0xcf, 0xb0, 0xea, 0xea, -0xd5, 0x5c, 0x75, 0xd5, 0x55, 0x78, 0x9e, 0x87, 0xeb, 0xa6, 0x29, 0x81, -0x65, 0x59, 0x98, 0x86, 0x99, 0xce, 0xbc, 0x56, 0x24, 0x71, 0x42, 0x18, -0x85, 0x04, 0xf5, 0x80, 0x5a, 0x23, 0x54, 0x96, 0xca, 0x25, 0xc6, 0x4f, -0x8d, 0x51, 0x2c, 0x16, 0x5a, 0x21, 0xb3, 0xa9, 0xfc, 0xce, 0x3f, 0xb8, -0x8b, 0xcd, 0x7f, 0xb4, 0x95, 0xe4, 0xc5, 0xe7, 0x78, 0xff, 0x6f, 0xff, -0x85, 0xa9, 0xe3, 0xd3, 0x84, 0x40, 0x88, 0x20, 0x84, 0xdd, 0xf7, 0x69, -0xb5, 0xef, 0x62, 0x01, 0x3a, 0x49, 0xcf, 0x33, 0xbb, 0x9b, 0x65, 0xa0, -0x69, 0x9a, 0x0d, 0x37, 0x71, 0x58, 0x76, 0xd5, 0x55, 0xac, 0x5c, 0xd9, -0x85, 0xef, 0xfb, 0xd8, 0x8d, 0x7a, 0x56, 0x36, 0xf2, 0x1a, 0xad, 0xd2, -0xd4, 0x20, 0x8e, 0xa2, 0xd4, 0x02, 0xf5, 0x34, 0xce, 0x4f, 0x4f, 0x4f, -0x12, 0x04, 0x41, 0x2b, 0x5c, 0x36, 0x43, 0xf5, 0x36, 0x77, 0x8a, 0xcd, -0x6b, 0xda, 0x71, 0xbe, 0xf9, 0xaf, 0x20, 0xa1, 0xfa, 0xdc, 0x5f, 0xf2, -0xf3, 0xbf, 0xff, 0x77, 0x8a, 0xf3, 0xb5, 0x26, 0x40, 0x3e, 0x84, 0x5b, -0xfe, 0x44, 0xab, 0xd1, 0x0b, 0x06, 0x68, 0x40, 0xdc, 0x4c, 0xba, 0xa1, -0x64, 0x9b, 0x15, 0x55, 0x0a, 0x92, 0x2e, 0x60, 0xdb, 0xb6, 0xe9, 0xe8, -0xe8, 0xa4, 0xad, 0xbd, 0x03, 0xdf, 0xf7, 0xb1, 0xcc, 0x34, 0x54, 0x6a, -0xad, 0x89, 0xe3, 0x98, 0x6a, 0xa5, 0x4c, 0xa1, 0x50, 0x20, 0x97, 0x9b, -0x27, 0x8a, 0x22, 0xe2, 0x38, 0x5e, 0x34, 0xeb, 0x9e, 0x54, 0xfc, 0xb1, -0x3d, 0xc3, 0xed, 0x22, 0x8f, 0x69, 0x18, 0x98, 0xbf, 0x7d, 0x3b, 0xce, -0x9f, 0x7f, 0x03, 0x35, 0x77, 0x9a, 0xa9, 0xa7, 0x1f, 0xe5, 0xdd, 0xff, -0x3c, 0xd2, 0x04, 0x20, 0x84, 0xfd, 0x7f, 0xaa, 0xd5, 0xf6, 0x8b, 0x02, -0x58, 0x00, 0xf1, 0x32, 0xd0, 0x0d, 0x2c, 0x8a, 0xf7, 0xcd, 0x66, 0x9a, -0xe6, 0xc2, 0x4a, 0x0a, 0xa5, 0x14, 0x4a, 0x29, 0x92, 0x24, 0x69, 0xb5, -0xe6, 0xbd, 0xe6, 0x38, 0xeb, 0x32, 0xf0, 0x67, 0xd9, 0x1c, 0xab, 0x2b, -0xf3, 0xc8, 0x7a, 0x80, 0xd4, 0x20, 0x10, 0xb8, 0x5b, 0x77, 0x60, 0x6e, -0xbc, 0x99, 0xe0, 0xf0, 0xeb, 0xfc, 0xe2, 0xd9, 0x7f, 0xe4, 0xf4, 0xb1, -0x5c, 0x13, 0x80, 0x10, 0xae, 0xdd, 0xb6, 0x84, 0x15, 0x96, 0x3c, 0x56, -0x19, 0x1e, 0x1e, 0x7e, 0x07, 0xe8, 0x69, 0x40, 0xb4, 0x36, 0xaf, 0x38, -0x8e, 0x89, 0xa2, 0x88, 0x20, 0x68, 0xfa, 0xf8, 0xd9, 0x16, 0x04, 0x01, -0xf5, 0x7a, 0x9d, 0xb0, 0x91, 0xa4, 0x35, 0x67, 0xbe, 0xa9, 0xfc, 0x1f, -0xfe, 0x4e, 0x27, 0x4f, 0xde, 0xe6, 0xb3, 0x36, 0x6b, 0x81, 0x69, 0x90, -0x68, 0x4d, 0x14, 0x85, 0x44, 0x41, 0x9d, 0xd2, 0x4b, 0xcf, 0x93, 0xcc, -0x7d, 0x84, 0xb9, 0x6e, 0x03, 0x5d, 0x9b, 0x6f, 0x04, 0x4b, 0xa0, 0x00, -0x05, 0x68, 0x58, 0xb2, 0x8c, 0xbd, 0xa0, 0x93, 0xb9, 0xfe, 0xfe, 0xfe, -0xbb, 0x80, 0x41, 0x9a, 0x07, 0xb9, 0x17, 0x29, 0x9b, 0x56, 0x09, 0xb6, -0x6c, 0xea, 0x62, 0xe5, 0x32, 0x8f, 0xa4, 0x54, 0x26, 0x3a, 0x33, 0x45, -0x74, 0x66, 0x0a, 0x35, 0x97, 0x47, 0x57, 0x6a, 0x10, 0xc7, 0x68, 0xa5, -0xf0, 0x6e, 0xdf, 0x8c, 0x7b, 0xeb, 0x6d, 0xd4, 0x3f, 0x38, 0xc6, 0xb1, -0xbf, 0x7b, 0x9e, 0xd3, 0x1f, 0xd6, 0x88, 0x48, 0xad, 0x10, 0xc1, 0xb2, -0x47, 0xb5, 0xfa, 0xd8, 0x69, 0xf6, 0x79, 0x4f, 0xe6, 0x9a, 0x32, 0x3c, -0x3c, 0xfc, 0xda, 0xf0, 0xf0, 0xf0, 0xdd, 0xa4, 0x16, 0xd9, 0xcf, 0x05, -0xa4, 0xbb, 0xfe, 0xcc, 0x0c, 0xdd, 0x1f, 0xfe, 0x82, 0x2f, 0x4f, 0x1e, -0xe7, 0x4b, 0x6d, 0x45, 0x3a, 0x54, 0x0d, 0x95, 0x24, 0x08, 0xc7, 0x46, -0xb6, 0x65, 0x10, 0x19, 0x0f, 0x65, 0x9b, 0x24, 0xa8, 0xd4, 0x0a, 0x61, -0x48, 0xf9, 0xd0, 0x9b, 0x24, 0x95, 0x3c, 0x46, 0xb6, 0x9d, 0x65, 0x37, -0x2e, 0x27, 0x06, 0x92, 0xb3, 0x6d, 0xcb, 0x27, 0x8d, 0x73, 0x51, 0x5f, -0x68, 0x1a, 0x6e, 0xb5, 0x1d, 0xa0, 0xbf, 0xbf, 0x7f, 0x03, 0xe9, 0xfa, -0x68, 0x36, 0x80, 0x91, 0x55, 0xaf, 0xff, 0xf8, 0xb1, 0xb6, 0xb1, 0xb1, -0x2f, 0x19, 0x96, 0x89, 0xd7, 0xe1, 0x11, 0xac, 0x5b, 0xc1, 0xf8, 0xfb, -0x3e, 0xd9, 0x55, 0x6d, 0x48, 0xc7, 0xc1, 0x70, 0x1d, 0x44, 0xc6, 0x43, -0xb4, 0xb7, 0x41, 0xa1, 0x84, 0x2a, 0x95, 0x89, 0x55, 0x82, 0x0e, 0x43, -0x54, 0xb5, 0x42, 0x7d, 0xf4, 0x03, 0x64, 0x9b, 0x8b, 0xb7, 0xae, 0x0b, -0xcb, 0x9f, 0xa0, 0x5e, 0x6d, 0x01, 0x6c, 0x25, 0xfd, 0x40, 0x72, 0xe9, -0x00, 0xe7, 0xc0, 0x8c, 0x01, 0x63, 0xc0, 0x6b, 0x0b, 0xef, 0x0f, 0x0a, -0x63, 0x04, 0x18, 0x51, 0x49, 0x92, 0x0d, 0x6b, 0x21, 0xe5, 0xf9, 0x32, -0xb3, 0xe3, 0x39, 0xa6, 0x4e, 0x66, 0x58, 0xe3, 0xba, 0x08, 0x23, 0x8b, -0xb0, 0x6d, 0x8c, 0xf6, 0x36, 0x64, 0x47, 0x1b, 0xba, 0x5c, 0x42, 0x55, -0x0c, 0x92, 0x5a, 0x42, 0x12, 0x45, 0x94, 0xdf, 0x3b, 0x8a, 0xff, 0x5b, -0x37, 0x20, 0xdb, 0x3d, 0xa4, 0x0d, 0x71, 0x0b, 0x40, 0x7c, 0xe2, 0x81, -0xd7, 0x05, 0xb9, 0xd0, 0xc5, 0xc8, 0xa0, 0x4e, 0xc6, 0x80, 0xbd, 0x5a, -0x69, 0xe2, 0x30, 0xa6, 0x52, 0xaa, 0x52, 0x9c, 0xce, 0x33, 0x76, 0x7c, -0x96, 0xea, 0xd4, 0x1c, 0x71, 0xb1, 0x8c, 0x56, 0x0a, 0xe1, 0xbb, 0x18, -0xd9, 0x0e, 0x64, 0x47, 0x07, 0xf8, 0x2e, 0x89, 0x69, 0x10, 0xab, 0x98, -0xb8, 0x56, 0x21, 0x2e, 0x17, 0xd0, 0x89, 0xc2, 0xf1, 0x20, 0x06, 0x62, -0x04, 0xf1, 0x59, 0x2b, 0x7f, 0xba, 0x00, 0x0d, 0x88, 0xef, 0x01, 0x23, -0x2a, 0x51, 0x44, 0xb5, 0x90, 0x52, 0xae, 0xcc, 0xec, 0xc4, 0x3c, 0x27, -0x8f, 0xce, 0x10, 0xce, 0xcc, 0x12, 0x97, 0x4a, 0xa0, 0x14, 0xc2, 0x75, -0x30, 0xda, 0x7d, 0x84, 0xef, 0x81, 0x65, 0x82, 0x61, 0xa4, 0xad, 0x11, -0x96, 0x73, 0xe5, 0x96, 0xf2, 0x24, 0x4b, 0x8c, 0x75, 0xc5, 0xbf, 0x52, -0x2e, 0x90, 0x01, 0xb4, 0x3e, 0x98, 0xc4, 0x49, 0xb6, 0x5e, 0xae, 0x53, -0x98, 0x2d, 0x32, 0xf1, 0xbe, 0x89, 0x6d, 0x09, 0xba, 0x37, 0x26, 0x98, -0xed, 0x6d, 0x80, 0x46, 0x98, 0x26, 0x86, 0xeb, 0x62, 0xb8, 0x0e, 0x49, -0xc5, 0xc4, 0xe9, 0x5a, 0x01, 0x40, 0x65, 0xe2, 0x23, 0xe6, 0x4a, 0x82, -0x04, 0x9a, 0x00, 0x9f, 0xf8, 0x3d, 0xed, 0x53, 0x03, 0x18, 0xd4, 0xc9, -0x3b, 0x83, 0xc2, 0xd8, 0xad, 0x13, 0xb5, 0x3f, 0x0e, 0x22, 0xaa, 0x85, -0x0a, 0x42, 0x80, 0x52, 0x9a, 0x38, 0x08, 0xb9, 0xf6, 0xfa, 0x0e, 0xa4, -0x6d, 0xa3, 0xc2, 0x10, 0xad, 0x12, 0x10, 0x02, 0xf7, 0x9a, 0xb5, 0x98, -0xd9, 0x0e, 0xc2, 0xb9, 0x1c, 0x23, 0xaf, 0x4d, 0x10, 0x71, 0x36, 0x0a, -0xc5, 0x4b, 0x94, 0x9a, 0x9f, 0xa6, 0x05, 0x18, 0xd4, 0xc9, 0x0b, 0x83, -0xc2, 0xe8, 0x53, 0x4a, 0x0f, 0x44, 0xf5, 0x88, 0x4a, 0xbe, 0x42, 0x92, -0x68, 0x82, 0x6a, 0x40, 0x79, 0xae, 0xc4, 0x75, 0xd7, 0x58, 0x18, 0x12, -0x92, 0x6a, 0x0d, 0x67, 0xf5, 0xd5, 0xb8, 0xeb, 0xd6, 0x50, 0x19, 0x9d, -0xe0, 0xc7, 0xff, 0xf1, 0x36, 0x1f, 0x4d, 0x27, 0x24, 0xa4, 0x1b, 0x59, -0xc3, 0x7d, 0x3e, 0xb1, 0xd4, 0xbc, 0x22, 0xdf, 0x89, 0x7f, 0x25, 0x88, -0x30, 0x86, 0x10, 0x62, 0x40, 0x4a, 0x81, 0x61, 0x5b, 0x58, 0xae, 0x85, -0xed, 0x3b, 0xd8, 0x8e, 0xc5, 0xea, 0x65, 0xb0, 0x6c, 0x4d, 0x16, 0xd3, -0x73, 0x99, 0x3a, 0x3e, 0xc1, 0x87, 0x27, 0x72, 0x04, 0xa1, 0x42, 0x69, -0xcd, 0x82, 0xa3, 0xae, 0x91, 0x41, 0x9d, 0xdc, 0xf2, 0x99, 0x01, 0xb4, -0x20, 0x60, 0x40, 0x48, 0x81, 0x90, 0x12, 0x69, 0xca, 0xb4, 0x72, 0x93, -0x8d, 0x3a, 0x23, 0x51, 0xc4, 0x51, 0x92, 0x1e, 0x98, 0xa9, 0x45, 0x3a, -0xe5, 0x81, 0x9e, 0x46, 0x74, 0xfb, 0x98, 0xfc, 0xda, 0x00, 0x00, 0x06, -0x85, 0xb1, 0x07, 0xd8, 0xdd, 0x1a, 0x5c, 0x8a, 0x45, 0xff, 0x9f, 0xa3, -0x38, 0xa4, 0x69, 0xfd, 0xc0, 0xa0, 0x4e, 0xde, 0x59, 0xaa, 0xcf, 0x4f, -0x25, 0x8c, 0x2e, 0x25, 0x83, 0x3a, 0xf9, 0x3a, 0x69, 0x3e, 0x35, 0x02, -0xa9, 0xc2, 0x0b, 0xdb, 0x39, 0xb2, 0x17, 0xe8, 0x3b, 0x9f, 0xf2, 0xf0, -0x6b, 0xb6, 0xc0, 0x42, 0x19, 0x14, 0xc6, 0x16, 0x60, 0x80, 0x34, 0xbf, -0xea, 0x6e, 0xdc, 0x3e, 0x48, 0x0a, 0xb7, 0x77, 0x29, 0x97, 0x39, 0x57, -0x3e, 0x33, 0x80, 0x2b, 0x25, 0xff, 0x07, 0x5d, 0xc7, 0x73, 0x8e, 0xf4, -0x50, 0x34, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -0x42, 0x60, 0x82, -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm deleted file mode 100644 index d858e78f13..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_options.xpm +++ /dev/null @@ -1,112 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_options_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 58 1", -" c #666463", -". c #696665", -"X c #6E6B6A", -"o c #706D6C", -"O c #767372", -"+ c #797776", -"@ c #7A7877", -"# c #7D7B7A", -"$ c #817F7E", -"% c #82807F", -"& c #858382", -"* c #888786", -"= c #8A8887", -"- c #8C8B8A", -"; c #908E8D", -": c #92908F", -"> c #959392", -", c #999796", -"< c #999897", -"1 c #9D9B9A", -"2 c #A19F9E", -"3 c #A2A09F", -"4 c #A4A2A1", -"5 c #A9A7A7", -"6 c #A9A8A7", -"7 c #ADACAB", -"8 c #B0AFAE", -"9 c #B1B0AF", -"0 c #B5B4B3", -"q c #B8B7B6", -"w c #B8B8B7", -"e c #BCBCBB", -"r c #C0BFBF", -"t c #C0C0BF", -"y c #C4C4C3", -"u c #C8C7C6", -"i c #C7C8C7", -"p c #C8C8C7", -"a c #CCCCCB", -"s c #D0CFCF", -"d c #D0D0CF", -"f c #D4D3D3", -"g c #D8D7D7", -"h c #D8D8D7", -"j c #DCDBDB", -"k c #E0DFDF", -"l c #E0E0DF", -"z c #E4E3E3", -"x c #E8E7E7", -"c c #E8E8E7", -"v c #ECEBEB", -"b c #F0EFEF", -"n c #F0F1EF", -"m c #EFF0F0", -"M c #F4F4F4", -"N c #F8F8F7", -"B c #FDFDFD", -"V c None", -/* pixels */ -"VVVVVVVVVVVVVVVVVVVVV%&&***VVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVVyfaaaaVVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVV=XVVVVVyjfappVVVVV+6VVVVVVVVVVVVVV", -"VVVVVVVVVVVV#0j1VVVVVujfsaaVVVVVexjVVVVOyM&VVVV", -"VVVV4zxy=VVVXyMBBBBMzgdffgjjfaauefMOVVV8xfafVVVV", -"VVV#avMMzq#XefbBBNhyepfhjjjzvzsuyfBxO>zze99z1VVV", -"VVV0jzvMNMjufvBBveejvMMMbvxzzMMhyefBNxu0q00ejVVV", -"VV-fjzxvMMNvvBBjqgNBBNMvvvczjjvBzyeffwwwwq08x7VV", -"VVo2ajzcvMMNNBjqzBBNzfuuajvvzjfzBzyeeeeww0ykt+VV", -"VVVV@0jxvMMMNxwzBBvp711<14qzNxgfzBfeteeqtjf-VVVV", -"VVVVVV-pzvMNMtfBBxe1>VVVVVV>yBvfsxMueeefj4VVVVVV", -"VVVVVVV.yzvNhyNBve,VVVVVVVVVV0BzffMjetzjXVVVVVVV", -"VVVVVVVVazvvujBNa1VVVVVVVVVVVVyNhfjcuezzVVVVVVVV", -"VVVVVVV-zzvzpvNz0dweeyupafgzcxvM7VVVVVVVVVVVVVVBjajMzzMc1VVVVVVVVVVVV>7jnzefjff&VVVVVVV", -"VVVVVVVVvvafMvzcBuVVVVVVVVVVVVqzMvefczf0.VVVVVVV", -"VVVVVV5zgypafNMkxMMw>VVVVVV>OzBjsfjjgsafggdyeejNBBxy8X@0hzzhu#VVV", -"VVVVhsfc8VVVOvhafhjzzhdaaahcNBBBBvwXVVV=ejh4VVVV", -"VVVV*NuOVVVV;zuaffjzxvMNNNBBBBBBBBg+VVVV.,wOVVVV", -"VVVVV+VVVVVVhaypafxxzxvMMNMxhhBBBBN0VVVVVVXVVVVV", -"VVVVVVVVVVV6jwyupjffjjvvMNfy07cBBBBz*VVVVVVVVVVV", -"VVVVVVVVVVOleeryafXV*fcvMNa$V eBBBBNe.VVVVVVVVVV", -"VVVVVVVVVVedqeerjaj0VVVVVyjkzvyVVVVV1j0#VVVVVVVVVVVV", -"VVVVVVVVVVVVVV2OVVVVVyhjzvyVVVVVX*VVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVVydffgyVVVVVVVVVVVVVVVVVVVVV", -"VVVVVVVVVVVVVVVVVVVVV&&&%%$VVVVVVVVVVVVVVVVVVVVV" -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm b/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm deleted file mode 100644 index ea09e14ab3..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_plugin_pad.xpm +++ /dev/null @@ -1,228 +0,0 @@ -/* XPM */ -static const char *toolbar_plugin_pad_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 174 2", -" c #78110C", -". c #6D1511", -"X c #7F332E", -"o c #763E3B", -"O c #8D0C05", -"+ c #8A140D", -"@ c #961A14", -"# c #A50500", -"$ c #A90000", -"% c #AC0C03", -"& c #B60300", -"* c #BB0600", -"= c #B70E05", -"- c #BB0A00", -"; c #A3160E", -": c #AA170E", -"> c #AB180F", -", c #A41911", -"< c #AF1C12", -"1 c #AC1F18", -"2 c #B51D14", -"3 c #BA1E16", -"4 c #92221C", -"5 c #9D241D", -"6 c #A3241C", -"7 c #AC241A", -"8 c #B1241C", -"9 c #BA241B", -"0 c #B32C1E", -"q c #BB2A1F", -"w c #8F2F29", -"e c #922721", -"r c #9F2620", -"t c #9F2E27", -"y c #993029", -"u c #9C3B35", -"i c #A22E27", -"p c #A6322B", -"a c #A9342D", -"s c #B23222", -"d c #B1362B", -"f c #BA3029", -"g c #B43829", -"h c #A83D36", -"j c #C6261D", -"k c #CA251C", -"l c #D2251D", -"z c #A7433D", -"x c #8C5552", -"c c #9E5551", -"v c #A04843", -"b c #AC4943", -"n c #A74E48", -"m c #AB4E49", -"M c #BC4640", -"N c #B44B45", -"B c #BB4C45", -"V c #A1534E", -"C c #AF524C", -"Z c #BB544A", -"A c #BF5B49", -"S c #AA5651", -"D c #B05A54", -"F c #9B6F6D", -"G c #AC6661", -"H c #AC6B67", -"J c #B96762", -"K c #BE6862", -"L c #AE726F", -"P c #B9706B", -"I c #B57673", -"U c #B27D79", -"Y c #BA7F7B", -"T c #C5564F", -"R c #C46756", -"E c #C36861", -"W c #C06E69", -"Q c #C27D7A", -"! c #B3817E", -"~ c #CF8577", -"^ c #C3837F", -"/ c #CA837C", -"( c #979695", -") c #9D9C9C", -"_ c #AF8481", -"` c #AF8C8A", -"' c #B68582", -"] c #BE8581", -"[ c #BC8987", -"{ c #B38C8A", -"} c #BD8D89", -"| c #B2918F", -" . c #B9918E", -".. c #A09F9E", -"X. c #BC9592", -"o. c #B99A97", -"O. c #BA9A98", -"+. c #A1A09F", -"@. c #B1A09F", -"#. c #A4A3A3", -"$. c #A8A7A7", -"%. c #A9A8A7", -"&. c #ACABAB", -"*. c #B3A5A4", -"=. c #B0AFAF", -"-. c #BFACAB", -";. c #B1B0AF", -":. c #B3B2B2", -">. c #BAB5B5", -",. c #B8B8B7", -"<. c #BCBBBB", -"1. c #CB8481", -"2. c #CC8A81", -"3. c #C48E8A", -"4. c #C69592", -"5. c #CB9693", -"6. c #CB9895", -"7. c #CA9B99", -"8. c #DA9A97", -"9. c #D49D9B", -"0. c #DAA89D", -"q. c #C4A4A2", -"w. c #CBAAA9", -"e. c #D3AEAC", -"r. c #C6B4B3", -"t. c #CAB6B5", -"y. c #C2BFBE", -"u. c #CABBBA", -"i. c #D5B6B4", -"p. c #DBB3B0", -"a. c #DFBBB7", -"s. c #D2BDBC", -"d. c #D9BBB9", -"f. c #E1BEB8", -"g. c #C2C0BF", -"h. c #E4C0B6", -"j. c #C4C3C3", -"k. c #C9C7C6", -"l. c #C7C9C9", -"z. c #CCCBCB", -"x. c #D2C4C3", -"c. c #DCC4C3", -"v. c #D1CFCE", -"b. c #DECECD", -"n. c #DBD0CF", -"m. c #CFD3D3", -"M. c #D4D3D3", -"N. c #D8D7D7", -"B. c #D8D8D7", -"V. c #D5DADA", -"C. c #DBDBDB", -"Z. c #E1C7C5", -"A. c #E0D0CF", -"S. c #E4D4D3", -"D. c #E9D5D3", -"F. c #E1DFDE", -"G. c #E9D9D8", -"H. c #EBE1DF", -"J. c #DDDFE0", -"K. c #DDE2E2", -"L. c #E3E3E3", -"P. c #E9E6E5", -"I. c #EBE8E6", -"U. c #E0E7E8", -"Y. c #E6E9EA", -"T. c #ECECEC", -"R. c #F0EFEF", -"E. c #ECEFF0", -"W. c #EDF2F3", -"Q. c #EEFCFD", -"!. c #F3F3F4", -"~. c #F4FBFB", -"^. c #FAFDFD", -"/. c None", -/* pixels */ -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/././././././././././././././././././././.!././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././.T./././././././.C.N.M.k.z./././././././././././././././.", -"/././././././././././././././././././.L./././././././.M.B.C.J.K.U.L.L.P.I.!././././././././././.", -"/./././././././././././././././././.P././././././././.v.M.M.] N D c.T.T.W.W.W./././././././././.", -"/././././././././././././././././././././././././././.g.l.m.u - O w.~.H./ W d.W././././././././.", -"/././././././././././././././././.N./././././././././.<.M.K.k.` -.T.^.X.& & n T.!./././././././.", -"/././././././././././././././././.M././././././.C.z.&.<.N.s.b.!.!.!.~.C.L G s.!.T./././././././.", -"/././././././././././././././././.l./././.T.L.C.M.M.:.j.I k 3 7.~.~.~.^.^.^.~.T.T./././././././.", -"/././././././././././././././././.j.T.I.P.L.L.L.K.C.,.j.F 1 6 q.~.Z.T N p.^.!.R.T.!././././././.", -"/././.L.C.M.l././././././././.T.I.P.I.I.I.I.T.Y.C.n.k.<.V.,.g.W.^.U * # G ^.!.T.T.T././././././.", -"/./.C.L.L.C.M.C././././.F.C.L.P.I.T.W.T.T.!.u.M f } L.<.' b h D c.U.o.X.L.!.T.T.T.T.!./././././.", -"/.B.L.F.C.L.T.Y.L.P.L.C.N.C.L.I.W.F.H.!.!.~.y.v 9.Y.K.! ; 2 9 : t x.~.~.!.T.I.T.T.T.T./././././.", -"/.z.M.N.L.b.] e.W.W.W.I.L.L.I.I.8.6 P ^.~.!.T.C.V.L.j.z 3 k k j : ' V.P.L.L.I.T.T.T.T.!././././.", -"/.j.N.L.N.a # ^ ^.d.5.T.I.L.E.t.C G A.!.C.M.B.Y.T.M.*.4 k l l k 2 S V.z.N.L.L.T.T.T.T.T././././.", -"M.z.B.P.W.{ @ 3.D.k 7 S.W.L.V.r.{ .x.C.L.!.G.6.S.V.@.. 9 k k j < Z K.z.M.C.L.P.T.T.T.T.!./././.", -",.M.K.x.J Q | F.O.y w b.T.l._ 5 , , r X.K.!.B $ H V.v.X + 8 q 0 s 2.U.j.k.M.C.L.I.T.T.T.T./././.", -",.M.L.*.% = i.4.D C.Y.!.l.>.i 2 j j 3 p k.K.} V x.z.M.s.h 7 g R 0.P.L.<.<.z.N.L.L.T.T.T.T.!././.", -">.M.F.M.u 1.Q.m * B !.L.j.F , j l l k : Y C.W.W.T.z.&.C.P.a.f.H.W.L.C.,.:.k.M.C.L.P.T.T.T.T././.", -":.M.B.L.V.E.W.c d [ !.C.l.o @ k l l j > K K.C.C.B.M.$.&.l.C.U.J.B.B.C.:.&.<.z.M.C.L.I.T.T.T.!./.", -",.y.B.C.I.T.T.L.U.~.!.C.M.x 8 j j q 0 / U.M.M.M.M.:.&.<.k.z.M.N.B.C.$.#.:.j.z.N.L.L.T.T.T.T./.", -"<.+.z.C.L.P.I.T.T.T.T.L.V.t.e ; 7 g A ~ S.L.k.<.j.j.%.=.<.k.M.M.N.B.C.#.( &.>.k.M.C.L.P.T.T.T.!.", -";.) &.j.M.F.L.P.P.P.L.L.j.V.c.E Z ~ h.I.Y.C.,.j././.%.&.<.k.M.M.N.B././.) ) &.<.z.M.C.L.I.T.T.T.", -"/.+.%.;.,.j.z.M.N.N.N.C.z.%.M.Y.P.T.T.L.B.C./././././.<.<.k.M.M.C././././.#.#.:.y.z.N.L.L.T.T.T.", -"/...&.:.<.j.z.v.M.M.N.C.B.&.&.<.z.N.M.M.B.F././././././././././././././././.$.#.>.k.M.C.L.P.T.T.", -"/.) &.:.<.j.z.M.M.M.N.B.C.g.&.<.k.M.M.N.N.L./././././././././././././././././.=.%.<.z.M.C.L.I.!.", -"/.#.%.:.<.j.z.M.M.M.N.B.C.z.;.<.k.M.M.N.N.T././././././././././././././././././.<.&.<.z.N.C.P./.", -"/.&.%.:.<.j.z.M.M.M.N.B.C.M.&.,.k.M.M.M.L./././././././././././././././././././././.j.z.N.P././.", -"/.&.$.:.<.j.z.M.M.M.N.B.C.L./.j.k.M.C./././././././././././././././././././././././././././././.", -"/.=.%.:.<.j.z.M.M.M.N.B.B.T././././././././././././././././././././././././././././././././././.", -"/.<.$.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/.v.#.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.%.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.C./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.L./././././././././././././././././././././././././././././././././././.", -"/./.&.:.<.j.z.M.M.M.N.B.L./././././././././././././././././././././././././././././././././././.", -"/./.,.=.<.j.z.M.M.M.N.B././././././././././././././././././././././././././././././././././././.", -"/./.k.&.<.j.z.M.M.M.N.B././././././././././././././././././././././././././././././././././././.", -"/././.:.,.j.z.M.M.M.N.L././././././././././././././././././././././././././././././././././././.", -"/./././.,.j.z.M.M.M.B./././././././././././././././././././././././././././././././././././././.", -"/././././.k.z.M.M.C././././././././././././././././././././././././././././././././././././././.", -"/./././././.B.N././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././.", -"/./././././././././././././././././././././././././././././././././././././././././././././././." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_refresh.xpm b/Source/Core/DolphinWX/resources/toolbar_refresh.xpm deleted file mode 100644 index 51f6897f57..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_refresh.xpm +++ /dev/null @@ -1,192 +0,0 @@ -/* XPM */ -static const char *toolbar_refresh_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 138 2", -" c #990A02", -". c #97160F", -"X c #9D160F", -"o c #9D1710", -"O c #9A1912", -"+ c #9C1F18", -"@ c #B00D05", -"# c #A5170F", -"$ c #AC160F", -"% c #B3160E", -"& c #A31710", -"* c #A81710", -"= c #A31C15", -"- c #AB1A13", -"; c #A21F18", -": c #B41B14", -"> c #BA1A12", -", c #B51F18", -"< c #9D231C", -"1 c #A3231C", -"2 c #AB231C", -"3 c #B3231C", -"4 c #BD231B", -"5 c #9E2720", -"6 c #9F2C25", -"7 c #A32822", -"8 c #AE2C25", -"9 c #A12F28", -"0 c #B02620", -"q c #B82720", -"w c #A1312A", -"e c #A53934", -"r c #AF3832", -"t c #B13832", -"y c #B93B35", -"u c #CE170E", -"i c #D5160F", -"p c #C31E16", -"a c #CA1C14", -"s c #D21D14", -"d c #C4231B", -"f c #CB231B", -"g c #D2231B", -"h c #C42820", -"j c #D42C24", -"k c #C2312A", -"l c #CC322B", -"z c #C63932", -"x c #CC3830", -"c c #AD423C", -"v c #B3433D", -"b c #BA433D", -"n c #CC463F", -"m c #DA4039", -"M c #AB4A44", -"N c #AD4E49", -"B c #B44640", -"V c #B24A44", -"C c #B74F4A", -"Z c #B75752", -"A c #B6625D", -"S c #B9645F", -"D c #BC716C", -"F c #BE7672", -"G c #C4504B", -"H c #C8524B", -"J c #D5534D", -"K c #C35651", -"L c #C36C67", -"P c #CB6B66", -"I c #CF6D68", -"U c #D86862", -"Y c #C4706B", -"T c #C9716C", -"R c #E27D78", -"E c #CD837F", -"W c #C28481", -"Q c #CF8F8C", -"! c #D58884", -"~ c #C6918D", -"^ c #C8918D", -"/ c #D5908C", -"( c #CD9B99", -") c #DD9D9A", -"_ c #E18D89", -"` c #E59490", -"' c #E59B97", -"] c #E59F9B", -"[ c #D5A29F", -"{ c #DDA19E", -"} c #E6A09C", -"| c #DDA5A2", -" . c #D4B1AE", -".. c #D5BAB7", -"X. c #DCB8B6", -"o. c #D9BDBB", -"O. c #E0A7A4", -"+. c #E2C1BF", -"@. c #E9C2BF", -"#. c #CDCCCC", -"$. c #DCC7C5", -"%. c #DBC8C7", -"&. c #D0CFCF", -"*. c #DBC9C8", -"=. c #D4D3D3", -"-. c #D8D7D7", -";. c #D7D8D6", -":. c #D8D8D7", -">. c #DCDCDB", -",. c #E4C3C2", -"<. c #EBC6C4", -"1. c #EAC8C7", -"2. c #E0CAC8", -"3. c #EBCFCE", -"4. c #ECD0CE", -"5. c #E6D7D6", -"6. c #EFD5D4", -"7. c #E1D8D7", -"8. c #E1DBDA", -"9. c #EFDCDB", -"0. c #E0E0DF", -"q. c #E3E3E2", -"w. c #EBE6E6", -"e. c #E5E8E7", -"r. c #E8E7E8", -"t. c #E7EBEA", -"y. c #ECECEC", -"u. c #F1E5E4", -"i. c #F2ECEC", -"p. c #F0F0EF", -"a. c #EAF1F1", -"s. c #F3F3F3", -"d. c #F8F7F7", -"f. c #F8F8F7", -"g. c #F3F7F8", -"h. c #F6FCFC", -"j. c #FAFCFC", -"k. c None", -/* pixels */ -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.:.;.#.#.#.#.#.#.#.#.;.:.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.:.#.#.=.-.>.q.q.e.e.q.q.>.:.=.#.#.:.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.=.#.=.>.e.r.y.y.y.y.r.r.y.y.y.y.r.r.>.=.#.=.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.:.#.;.q.r.y.r.r.y.y.y.y.y.y.y.y.y.y.r.r.y.r.q.-.#.-.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.#.=.q.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.r.r.y.q.=.#.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.>.#.:.r.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.r.r.>.#.>.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.:.#.q.y.r.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.r.y.q.#.-.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.:.#.q.y.r.y.y.y.y.y.y.y.y.y.y.p.p.p.p.p.p.y.y.y.y.y.y.y.y.y.y.r.y.q.#.-.k.k.k.k.k.k.", -"k.k.k.k.k.>.#.q.y.r.y.y.y.y.y.y.y.y.p.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.y.y.y.r.r.q.#.>.k.k.k.k.k.", -"k.k.k.k.k.#.8.y.r.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.y.r.y.q.#.k.k.k.k.k.", -"k.k.k.k.#.:.y.r.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.p.y.y.y.y.y.y.t.y.>.#.k.k.k.k.", -"k.k.k.>.&.r.r.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.g.h.h.h.h.h.h.h.h.h.s.y.y.y.y.y.r.r.=.:.k.k.k.", -"k.k.k.#.q.y.y.y.y.y.y.y.s.s.s.s.s.s.s.s.s.s.s.s.h.,.P T T T Y Y Y D S ( s.y.y.y.y.y.r.q.#.k.k.k.", -"k.k.;.=.y.r.y.y.y.y.y.s.s.s.s.g.s.s.s.s.d.s.d.d.j.{ @ $ $ $ # # # c 5.s.y.y.y.y.y.r.y.-.=.k.k.", -"k.k.#.q.y.y.y.y.y.y.p.s.s.s.g.9.g.g.d.d.d.d.d.d.j.| : 3 3 2 2 2 ; Z w.g.s.y.y.y.y.y.y.r.q.#.k.k.", -"k.>.=.r.y.y.y.y.y.p.s.s.s.h.<.j ` h.d.d.d.d.d.d.j.O.: 3 3 2 2 2 ; X.h.s.s.s.p.y.y.y.y.r.y.=.>.k.", -"k.#.>.y.y.y.y.y.y.s.s.s.g.u.m i s ' j.f.d.f.f.f.j.O.: 3 3 2 2 2 = c 8.t.e.r.y.y.y.y.y.r.y.8.#.k.", -"k.#.e.y.y.y.y.y.y.s.s.s.h.R i g g s } j.f.f.f.d.h.| : 3 3 2 2 2 1 X F t.q.q.>.>.q.r.y.y.r.r.#.k.", -">.=.r.y.y.y.y.y.p.s.s.g.6.j g g g g a ] j.d.s.s.h.| : 3 , 2 2 2 1 1 7 *.e.q.q.>.>.>.>.e.y.y.=.>.", -"-.-.y.y.y.y.y.y.s.s.s.h._ u g g g f a ' h.s.s.s.j.| : : y 3 2 2 1 1 X W a.q.q.>.>.>.:.;.>.r.>.;.", -"#.>.y.y.y.y.y.p.s.s.s.g.J a f f f a U h.s.d.d.d.j.| @ K u.L * 2 1 1 O N e.q.q.0.>.>.>.:.=.=.:.#.", -"#.q.y.y.y.y.y.p.s.s.g.u.l f f f f f @.h.d.d.f.f.j.) G i.j.+.2 1 1 1 + w 8.e.q.0.>.>.>.:.=.=.#.#.", -"#.q.y.y.y.y.y.p.s.s.g.4.h f f f a x i.g.d.f.j.j.j.6.u.j.g.y.t ; 1 1 + 9 7.e.q.q.>.>.>.:.=.=.#.#.", -"#.e.y.y.y.y.y.p.s.s.h.1.d d d d p n i.f.d.f.j.j.j.j.j.d.d.i.B = 1 1 + w 7.e.q.q.>.>.>.:.=.=.&.#.", -"#.q.y.y.y.y.y.p.s.s.g.3.h d d d p z i.f.d.f.j.j.j.j.f.d.f.y.r ; 1 < + 9 7.e.q.q.>.>.>.:.=.=.&.#.", -"#.q.y.y.y.y.y.p.s.s.g.u.k 4 4 4 4 4 <.h.d.f.j.j.j.j.f.d.j.,.1 1 1 < + w 8.e.q.q.>.>.>.:.=.=.#.#.", -"#.q.y.y.y.y.y.p.s.s.s.s.H > 4 4 4 > I j.d.d.f.f.f.f.d.d.j.L & 1 1 < O N e.e.q.q.>.>.>.:.=.=.#.#.", -"&.>.y.y.y.y.y.p.s.s.s.h.! % 4 4 4 4 , | j.f.d.d.d.d.f.j.[ = 1 1 < < . W a.q.q.0.>.>.>.:.=.=.#.#.", -"-.-.y.y.y.y.y.p.s.s.s.g.2.q 3 3 3 3 , 3 / s.j.j.j.j.s.Q 1 ; 1 < < < 5 %.t.q.q.0.>.>.>.;.=.=.#.-.", -">.=.r.y.y.y.y.y.s.s.s.y.y.T % 3 3 3 3 3 - b E | | E v & 1 1 < < < . D y.q.q.q.>.>.>.>.;.=.&.#.>.", -"k.#.e.y.y.y.y.y.p.s.s.q.t.7.y - 3 3 3 2 2 - * # # & = 1 1 1 < < O e 7.t.q.q.q.>.>.>.:.=.=.&.#.k.", -"k.&.>.y.y.y.y.y.y.s.y.q.q.a.X.0 - 2 2 2 2 2 2 2 1 1 1 1 1 < < O 5 ..a.q.q.q.0.>.>.>.:.=.=.#.&.k.", -"k.>.=.y.y.y.y.y.y.s.r.q.q.q.a. .8 * 2 2 2 2 1 1 1 1 1 < < < O 6 .a.q.q.q.0.>.>.>.>.;.=.=.#.>.k.", -"k.k.#.q.y.y.y.y.y.y.q.q.q.q.q.a.$.C & = 1 1 1 1 1 1 < < O O N $.a.q.q.q.q.>.>.>.>.:.=.=.#.#.k.k.", -"k.k.;.;.y.y.y.y.y.y.>.0.q.q.q.q.y.r.( V 1 o o o O O O < M ( r.y.q.q.q.q.>.>.>.>.:.;.=.=.#.;.k.k.", -"k.k.k.#.q.y.y.y.y.r.>.>.q.q.q.q.q.e.a.r.o.^ D A A D ~ o.r.a.e.q.q.q.q.>.>.>.>.>.;.=.=.#.#.k.k.k.", -"k.k.k.>.=.r.y.y.y.e.>.>.>.0.q.q.q.q.q.e.y.a.a.y.y.a.a.y.e.q.q.q.q.q.>.>.>.>.>.:.=.=.&.#.>.k.k.k.", -"k.k.k.k.#.>.y.y.y.q.>.>.>.>.>.q.q.q.q.q.q.q.q.e.e.q.q.q.q.q.q.q.0.>.>.>.>.>.:.;.=.=.#.#.k.k.k.k.", -"k.k.k.k.k.#.q.y.y.0.:.>.>.>.>.>.q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.>.>.>.>.>.>.:.;.=.=.#.#.k.k.k.k.k.", -"k.k.k.k.k.>.#.q.y.>.;.:.>.>.>.>.>.>.0.q.q.q.q.q.q.q.q.q.0.>.>.>.>.>.>.>.:.;.=.=.#.#.>.k.k.k.k.k.", -"k.k.k.k.k.k.:.#.q.>.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.=.=.=.#.#.:.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.:.#.-.=.=.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.;.=.=.=.#.#.:.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.>.#.#.=.=.=.=.;.:.>.>.>.>.>.>.>.>.>.>.>.>.>.>.:.;.=.=.=.=.#.#.>.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.#.#.&.=.=.=.=.;.:.:.:.>.>.>.>.>.>.:.:.;.;.=.=.=.=.&.#.#.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.>.#.#.&.=.=.=.=.=.=.;.;.;.;.;.;.=.=.=.=.=.=.&.#.#.>.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.=.#.#.#.=.=.=.=.=.=.=.=.=.=.=.=.=.&.#.#.#.=.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.>.=.#.#.#.#.=.=.=.=.=.=.#.#.#.#.=.>.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.", -"k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.>.:.=.#.#.#.#.#.#.=.:.>.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k." -}; diff --git a/Source/Core/DolphinWX/resources/toolbar_stop.xpm b/Source/Core/DolphinWX/resources/toolbar_stop.xpm deleted file mode 100644 index c9fbb24767..0000000000 --- a/Source/Core/DolphinWX/resources/toolbar_stop.xpm +++ /dev/null @@ -1,126 +0,0 @@ -/* XPM */ -static const char *toolbar_stop_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 72 1", -" c #96150D", -". c #9B140D", -"X c #971911", -"o c #9A1811", -"O c #9C1F18", -"+ c #A3160E", -"@ c #A31911", -"# c #AC1811", -"$ c #A01F18", -"% c #B41811", -"& c #BE1911", -"* c #9D231C", -"= c #A4231C", -"- c #AB231C", -"; c #B3231C", -": c #BB231C", -"> c #AC2B24", -", c #B32B24", -"< c #BB2B24", -"1 c #A1302A", -"2 c #CB160E", -"3 c #C41911", -"4 c #CB1911", -"5 c #C3241C", -"6 c #CB241C", -"7 c #D2231B", -"8 c #C42C24", -"9 c #CC2C24", -"0 c #D12C24", -"q c #C48A86", -"w c #C88B87", -"e c #C68E8A", -"r c #C98E8A", -"t c #C6918E", -"y c #CE918E", -"u c #D2938F", -"i c #CD9895", -"p c #D69390", -"a c #DC9490", -"s c #E1928E", -"d c #E19491", -"f c #CDCCCC", -"g c #D0CFCF", -"h c #DFCDCB", -"j c #D4D3D3", -"k c #D8D7D7", -"l c #D7D8D6", -"z c #D8D8D7", -"x c #DCDCDB", -"c c #E1CFCE", -"v c #E3D1CF", -"b c #E6D2D1", -"n c #EDD7D6", -"m c #E4DDDC", -"M c #EFD9D8", -"N c #F0DAD9", -"B c #E0E0DF", -"V c #E3E3E3", -"C c #E8E7E7", -"Z c #E6E8E7", -"A c #E8E8E7", -"S c #E8E7E8", -"D c #E7E9E9", -"F c #ECECEC", -"G c #F1E7E6", -"H c #F0F0EF", -"J c #EDF3F3", -"K c #F2F2F2", -"L c #F1F8F7", -"P c #F6FCFC", -"I c #F9FFFF", -"U c None", -/* pixels */ -"UUUUUUUUUUUUUUUUUUzlfffffffflzUUUUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUzffjkxVVVCVVxzjffzUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUjfjxZDDDDDDDDDDDACxjfjUUUUUUUUUUUUU", -"UUUUUUUUUUUzflVAFDDDDFFFFFFDDDADAVkfkUUUUUUUUUUU", -"UUUUUUUUUUfjVDDDDFFFFFFFFFFFFFFDAADVjfUUUUUUUUUU", -"UUUUUUUUxfzADDDFFFFFFFFFFFFFFFFFFDAADxfxUUUUUUUU", -"UUUUUUUzfVFDDFFFFFFFFFFFFFFFFFFFFFFDDDVfkUUUUUUU", -"UUUUUUzfVFDDFFFFFFFFFHHHHHHFFFFFFFFFDDDVfkUUUUUU", -"UUUUUxfVFDFFFFFFFFHKKKKKKKKKHFFFFFFFFFAAVfxUUUUU", -"UUUUUfmFDFFFFFFFKKKKKKKKKKKKKKKHFFFFFFFADVfUUUUU", -"UUUUfzDDFFFFFFFKKKKKKKKKKKKKKKKKKHFFFFFFDDxfUUUU", -"UUUxgADFFFFFFKKKKKKKKKKKKKKKKKKKKKHFFFFFDDAjzUUU", -"UUUfVDFFFFFFKKKKKKKKKKKKKKKKKKKKKKKHFFFFFDDVfUUU", -"UUljDDFFFFFKKKKKKKKKKKKKKKKKKKKKKKKKHFFFFFDDkjUU", -"UUfVFFFFFFHKKKKIIIIIIIIIIIIIIIIIIKKKKFFFFFDAVfUU", -"UxjADFFFFHKKKLGdsssddaaaaappuuyyiFKKKKHFFFFADjxU", -"UfxFFFFFFKKKKLn6244433&&%%%#@@@.*mDZZAFFFFFDDmfU", -"UfCDFFFFFKKKKPM077766555::;;--=$1mDVVVxxVAFFACfU", -"xjDDFFFFHKKKKPN077776655::;;--=$1mDZVVVxxxxZDDjx", -"kkFFFFFFKKKKKPN077776655::;;--=$1mFCVVVxxxzlxSxl", -"fxFFFFFHKKKKKPN077766555::;;--=O1mFCVVVBxxxzjjzf", -"fVFFFFFHKKKKKPN96666655::;;;--=O1mFCVVVBxxxzjjff", -"fVFFFFFHKKKKKPN96666555::;;--==O1mFAZVVVxxxzjjff", -"fVDFFFFHKKKKKPN8555555::;;;--==O1mFAZVVVxxxzjjgf", -"fVFFFFFHKKKKKPn855555:::;;---==O1mFAZVVVxxxzjjgf", -"fVFFFFFHKKKKKLb<:::::::;;;--==*O1mFAZVVVxxxzjjff", -"fVFFFFFHKKKKKJb<:::::;;;;--===*O1mFCZVVVxxxzjjff", -"gxFFFFFHKKKKFFv<;;;;;;;----==**O1mFCVVVBxxxzjjff", -"kkFFFFFHKKKKAFv,;;;;;;----===**O1mFCVVVBxxxljjfk", -"xjDDFFFFKKKFZFc,--------===****O1mFZVVVxxxxljgfx", -"UfZDFFFFHKKVVFc>------====*****O1mDVVVVxxxzjjgfU", -"UgxFFFFFFKFVVDh=+@@@@@ooooXXXXX *mDVVVBxxxzjjfgU", -"UxjDDFFFFKCVVZmrwwrrrrrrreeeeeeqtBZVVBxxxxljjfxU", -"UUfVFFFFFFVVVVZJJJJJJLLLLLLLJJJJJVVVVxxxxzjjffUU", -"UUllDDFFFFxBVVVVZCAADDDFDDDAAACZVVVVxxxxzljjflUU", -"UUUfVFFFFAxxVVVVVZCCAAAAAAACCCVVVVVxxxxxljjffUUU", -"UUUxjDDFFVxxxBVVVVVVZCCCCCZZVVVVVVxxxxxzjjgfxUUU", -"UUUUfxFDFVxxxxxVVVVVVVVVVVVVVVVVBxxxxxzljjffUUUU", -"UUUUUfVFFBzxxxxxVVVVVVVVVVVVVVVxxxxxxzljjffUUUUU", -"UUUUUxfVFxlzxxxxxxBVVVVVVVVVBxxxxxxxzljjffxUUUUU", -"UUUUUUzfVxjlzxxxxxxxxxxxxxxxxxxxxxxzjjjffzUUUUUU", -"UUUUUUUzfkjjjlzxxxxxxxxxxxxxxxxxxzljjjffzUUUUUUU", -"UUUUUUUUxffjjjjlzxxxxxxxxxxxxxxzljjjjffxUUUUUUUU", -"UUUUUUUUUUffgjjjjlzzzxxxxxxzzlljjjjgffUUUUUUUUUU", -"UUUUUUUUUUUxffgjjjjjjlllllljjjjjjgffxUUUUUUUUUUU", -"UUUUUUUUUUUUUjfffjjjjjjjjjjjjjgfffjUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUxjffffjjjjjjffffjxUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUUUUxzjffffffjzxUUUUUUUUUUUUUUUUUU" -}; From 8456f2ee98e3020c9d953a08b6bd4c5629be9325 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 16 Jan 2013 17:18:17 -0600 Subject: [PATCH 447/627] Resize Boomy icons to 24x24px and optipng them. --- Data/User/Themes/Boomy/browse.png | Bin 3606 -> 1708 bytes Data/User/Themes/Boomy/config.png | Bin 3399 -> 1735 bytes Data/User/Themes/Boomy/dsp.png | Bin 3761 -> 1877 bytes Data/User/Themes/Boomy/fullscreen.png | Bin 2477 -> 1387 bytes Data/User/Themes/Boomy/gcpad.png | Bin 2842 -> 1604 bytes Data/User/Themes/Boomy/graphics.png | Bin 3462 -> 1800 bytes Data/User/Themes/Boomy/help.png | Bin 3638 -> 1808 bytes Data/User/Themes/Boomy/open.png | Bin 2543 -> 1493 bytes Data/User/Themes/Boomy/pause.png | Bin 3293 -> 1750 bytes Data/User/Themes/Boomy/play.png | Bin 3306 -> 1743 bytes Data/User/Themes/Boomy/refresh.png | Bin 3647 -> 1761 bytes Data/User/Themes/Boomy/screenshot.png | Bin 2477 -> 1387 bytes Data/User/Themes/Boomy/stop.png | Bin 3088 -> 1677 bytes Data/User/Themes/Boomy/wiimote.png | Bin 2741 -> 1616 bytes 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Data/User/Themes/Boomy/browse.png b/Data/User/Themes/Boomy/browse.png index 495092f7b00075b2fd2e095299d6e36c169ecf10..3b3c5274678fa549fc1ecbe009711b0522a4cffb 100644 GIT binary patch delta 1635 zcmV-p2Auhp9IOp$iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1poj50drDELIAGL9O(c603c&XQcVB=dL{q>fP?@5`Tzg`fam}Kbua(` z>RI+y?e7jT@qQ9O|`7=H$0OGiWi{{a60|De66lK=n(P)S5VR7l6Im0O5iXBEeP z-@crE?sLw`%*o6dO*5I;Tsx+PrlOUqG*yry)|!_ZiVvlVJ`{XVuoo(|DzS)nC{)mg z*47vC)`n`TNLvc_l0+w-#4$rMoyp9cGjpzcpS}0@eaiPgATF$3*y4 z6fypm9sKqiAOhBMD1TS>Kf3*fBV>wmg#8OtCQG=UJ14?Hk+%r27958XicgNu&Xp_E zx6)qv72Wn&3Y>7&Joz2zZdpFzq=2Wxzt-INW2tBkKsDYc-}0Is~D@7DU^fvs6qM@H8P=CE*Q(HRCD|*M>rlQ ztY&=hj0FYPitvNtc=nwWGrJg@IzYaETK+7 zRHA;r(rv9Z)_<3lZdhJi`9y0ye93d=^9o*a58njVa%Z`ozvG$@ewN1EX9&tWQ0@?= zmOxICMn6W6PJpo}lOSe@#C@zzKr&cd3Y7__ckO2Dbj{mXS>E31ByODYjAsm3L+p4t zGQ}ONEgqxSI*#kE5oEh$^AVnxAR5FdlnfvVNkYZ2H-91u|A3)JP@bY#t>TygzV9M} zAc$uyh;X94(&;pR|D8&%T14C;R*J}|2eMA!w?QIIEST7kMwTed5$hUGVJrD^oqVZ; zG9eevzRtyq;Xs6Ee4oVq*o^?RbSis#?T!6PY4YU~LB5LX1t>|tgxDncJ0O8LbQ#4Z zRHi|p)_)*h%oF$9ocm*w`IAd#I7lBu_#TkDw;lw?ArY82sk~#b5pEx}I}T<@5G1%x zh>eG&QHqWgCV@0|(7J#d)W8bM3+Fifa+C9aT~9}m{*l0aO3{7bNpOGqB7Edspd4Bv zJZFt`qhT`LYxTz`XZDdV6zI2>iNXvz%_3T16Mw&(*Y@Y zoR784Tj9G((Z2WbD@29XpcAUrarRap5G!ohDbAB~xgCGltPwj25&Oylj#B zRDTtev)gE9jQtN;WDKM!dxBhU_qP4lv$1l9MEjH{W+;@$=(W4FR|i;?!8ir*3b^?y zTemgH6@t1I4uRrrqGd@)C7YvPc>W}<)oy!p zGmg$Qd-S^_d>?$*;3$pn12Cr)GnY+MV*n_Kuw&)?D$N(3BaM2rR(mWhwiyoM5%7I$ z8Q<7U?mGGEiu?A>gz2l+FiFJP#Xdj@*a@7t5+D>f)m|H1`~0z&9pxzE*ch?01b;k= z;@id&Sj%8IOz&vUuTCy5w3GlztWk;upm|vbi3Z;xv~VB7Yg(IKfCkP0zY{pEKpR6J zxEFX*L~e;9y&uRa#Uk(o@TY%!>6h01xBshkjYWndtnb0mpIxf^$EGMC3%I}t&<{R! zsqSw*BATeP+rYvA000zpMObu0a*=@;U;rg_MObuXVRU6WV{&C-bY%cCFflVNFflDL zHdHY-Iy5voF*YqQHaajcm_)Qj0000bbVXQnWMOn=I&E)cX=Zr?k&PDHLkV1fcS^g93m delta 3564 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 diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/User/Themes/Boomy/dsp.png index 834e785fbbc6a0d4b101dc7f1c8a06ada4140d4a..22752cdf74856c5b792f61adc6d5b9981fb02afd 100644 GIT binary patch delta 1795 zcmV+e2mJW49n}tMiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1poj50drDELIAGL9O(c603c&XQcVB=dL{q>fP?@5`Tzg`fam}Kbua(` z>RI+y?e7jT@qQ9O|`7=H$0OGiWi{{a60|De66lK=n(_(?=TR2Ufr!C8!5WdQ)- z??30+>reh~l^fUWo;cHmb- zL+$U+Y}&Fp#`-5Ap#F$o==`WT}pP6qRKlSp)`EzGK7n``PEX&X0 z2mnCXwR3llZ{v1+ea+hSzZxH({0wfNoSa;;b;~+irkCp!g;!p=;QWQ2x(=$c*6S@g z_Tnkeo;a#3%O6!$`IXc(376rnyYEn799Lm)p65Rw9UZ?dgn#hmnduGrTd$e1e95r? z{qI%3fAnEbAKoh^y4@+8HqKf)I%@6IlvgiZbn^76_l6MeO+46lBl+8|-DK&qj(rE`{qDZMI{3`reCUJkblYtoF*DP0{KQkLI_eZH8&R8?MtG>3Zz(C+v9J zTQtt=^)D&1-16}WBg4b3)TB4yNxTcoAOlD=RaGsEP1EkQ3WHvB_Ds)U&~xeXyroN* zICA7Uk3Rai`T6szYEe~{Bu3h8;TX)#E|3Tk>{%5kh5M##`Ti>Bo3`r>|vP`=*Brx8j6tfV{VFof(xEz8k#-@rf zrmCz}Wq(xHmAbA>Osw$cE8nftS*NbL#zv<|#3qu+LeMI5Xg5t7!&$6Bo?(D_!bDY- zmtu_N<%Pa-P^s%$9c!oOj``=FKd9=LY}+vl_4*R7kmA_!D6W#^v#_)Y4!~>R;`-y z;D3XU_}&kGY^c>TGBRTAn$`9#9#Yn&K~+krsc;D`bdVQ-XV8vyJ=!$Q@r7Q`<%PaX zQrD%bEH$w)J~3``a>CG1%h>3MV<%2Zv5}faZ*ftQdRfRyEJYu&0K91#A8IDh$)Ae;^%)EL7B zl=TbFSHPwU1tRvnu8Oarlsz=g$Zs+|$bQr|~5`fd>izJdWAa zG^>T|zB3oj?fCnD4}{mQU2o0QMxVIh(=PWeiZL1=8P^^fcKqx)`;R{Fxlql?k&PDHLkV1n|SZ>j(Q delta 3719 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 diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/User/Themes/Boomy/fullscreen.png index 2fc00ac60075d3f1622d8cf523a94eae6abfab4d..1a8f7f8de2ec1ea5c12c539b5cf9a0b3cbace831 100644 GIT binary patch delta 1301 zcmV+w1?u{(6YC0UiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1poj50drDELIAGL9O(c603c&XQcVB=dL{q>fP?@5`Tzg`fam}Kbua(` z>RI+y?e7jT@qQ9O|`7=H$0OGiWi{{a60|De66lK=n&4oO5oR7l6|mA!8qMHq*l znVsF+v+v^bIhNv>kc1Q|5JET&LZ;zEi2r~;fHq1KsOYFr=t4smiH44X0s>Kpk_ZU} zA_y@dh)et#+h-!j=eygFnR$oe&W;@i$?)>KYy*u;5|9|ZtngY1|At*)c zg&FU8*?Vf<6TAm6uy>T5c<-~pTzOAd0@uWIQz`7bpMd)M0|;QW;&ceS102#CB_7<~ z1)f}R7`r`jX$jV`Cc-)IIj=R&cmd#)z}afb)UlJtX&!q69oO)-hqK#w+r^cAob6-F z44ZW+vmQm3QRW4CKYu6B99tdK+6Gg3!C3|0hQN2mdjMv&=J1gdM|tX{k67P`SeUzv zD@uahLdu7T-NKh0e7TKxCE`5Zd&CJL2$cjH2f#Xbu+CwDS#|_MpjJs>{Mc)(uY10{ zaE8X@2$M%npc6wBA4Jhas{rD`TL^wI7tdyUjrQ6Cjk;&Fs(;Wb-~u(Jz_@_`#)CF> z7Vcc3aj?ppZ=WNrzW{U~bjdr*EZ+JGV>CxjK1XZ>Tn4sJ)?VS-#n0J#v`m^NKt>1w zfE@yy2WNZOEN621C~5r}%IzPB!hLWBKVJNdyWd|2Wtf?Lm1m!y!Q~lJ7Nk02qS<7- z+a|7#0XZ-f*nc62Jh-BR&o_wEl=Zt`Fn8r+#wRB@{_G5^tvSRC-j}S-x0s%q;-?!o z=xuLvYUUJ?29u))y+&4m7Exqli320whVo z;{AL4a{D&c1}bsN#CV0cGD4KphkNG<0u46r;<7(5aeob0WCQ{6f|QoXB!~>&?RR@r zk}4q#V(&dl1(LK*6xZ0RV7wa=Xvlk;xT1#&0UgD70WFH9R*Ti8MI?X(SXx*l>lbJp zA>t?shlnGoj-liFzN=zi4zkWeyt8bqERttih(Ml~+`IcL5*QE#aN=26UPVFx1@lWQ z5Jot3@_%W(KCoY4Zw~sMO~hL|k2VRx;fI#&bP4R*Bogp4h_x1qqDN(9g1j79_ZI@C zq2J9&6M%qH2Bj2A1+-Fw-%bs0M+Hg^zXR$um^d^=WBNtrZ(rX%1G@wSqzth62$~I; zYzledP?14L5n4w?CMGfoQCz_!RZKF9NovGtoqwd-q%l2rX01AbO$632$&sE^kfIxsiTPe;HV8# z3o)=SX@66>6pAiz88{EL_ilyv-vR;^r5FdyzpRiB*aV9AKK-v0{XYR1?{=ULglf8x zcOzf`C3HntbYx+4WjbSWWnpw>05UK!Gc7PNEipD!F*Z6hG&(UhEig7ZFff=zv_=2` z03~!qSaf7zbY(hiZ)9m^c>ppnF*7YNF)cARR53O>G%-3dG%YYTIxsL6AklP@Ml=Zk LNkvXXu0mjfGvq36 delta 2425 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 diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/User/Themes/Boomy/graphics.png index f31f60c469da05ba6a618b96757606d7e6a485b3..408593c89431aa007dd9a4f343d3b42eb10a2759 100644 GIT binary patch delta 1718 zcmV;n21)sb8;A~SiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1poj50drDELIAGL9O(c603c&XQcVB=dL{q>fP?@5`Tzg`fam}Kbua(` z>RI+y?e7jT@qQ9O|`7=H$0OGiWi{{a60|De66lK=n(tVu*cR2Ufr!AXpsbsYfU z=l{O%x6Ink(2ddpr3DK`3xU`Wf>QT`ka#eF(P(10dhzCgR85qFS8iTROia1xNdqX1 zTYy%fElWl0-cCD9r?d2%Z+-tipCf<_@`QpBDJ`$Oy%u{|QTL_{GXA|eS{#A-y`!1;*yIC8#5>d(D;3?%r<_g~f+ zYsqz>knDC!aQK#WF2Z6>e#$&UAZX=m4; zPMz@MyI<6to-(!3IpWIFOqEciV)sxwygnK^edD_BVpz{1QekYYl-r41iaLo=Ax5PX zHAOO6Cv|7&=6_rN&>P-qbYE#xG8J(^k!CB1L?Y&yE7*4@6- zjrpss#I7oG-H5P%`_5Sp+`Us3;p4?s3(MuVe4uP<9!S#@*0 zW1~A#Ms2FW9n<6X?3y*XbFV+XbKZ^ls}-iJ5bcQAv31LYDkZ;vf$$=*g!Z z^Z58ye}8-PJyTOt4nF*#ou9eOo~WsZVl-5xT2`o)HtNbkjH%i;ltt0Vbv;wb+QPPt zwT^D5r))HJJ6#EvE?(2?4W0Ve8IiMV^GhCm@+qlo8IGC+NeD?%P?j_*$}$0@Dk4%6 z<)@!s_R4SHFvv-Q2$#=aaryjJIoCuO4QnYCB7cZXfTS#_N}3It4eCKxUDu)el=&qmIo&YI1ZyASMFHX6#RvUmRh%~ng~4BF%48fDUMWRqh| zjWgM%-J(&kvUt<2rDan3FK$*M;N6H=6@RgH*y~$aTDE0&Mk=_yddsNa7j>;QG48A1 zddBX(yG>5EG@G<4s){1f?Pnjp|B>!yS4!y}tX7dTycZGg;_Llx*NHdhtlwHy6v-#2 z&**J#5@FcuyMF1SefRA$F_x4iWr4)T?SWG#Kk~uJQzBwHrSuo5a?TQKctyk`!GF%1 zH*R?Qwbuo5&Jqa2e&5IMop$ih0h5zsIvYK!x7J*_aK*X*oOkJe7xa7mNGZLFcOk*i z7k(xv6VHoy2@gaBkP;CfBFt=?b?*cF4f=gI7nZHBuIX)d)pZ?3DwZXGz|V1I?)WhY z;OO%|l~PKP^P%7ecouun27rhV5mF$f)W=#%=`8+?*YN?mbH|T?1OV{#bH|{8y?7jl zuop8(sIi3WIEN2#32TVCG&DLfHZ3qVIxsMpM6^Z# z001R)MObuXVRU6WZEs|0W_bWIFflVNFflDLHdHY-Iy5mlGBhnPHaajc79i1dkw!EL M07*qoM6N<$f~xi_j{pDw delta 3419 zcmV-h4W#mj4u%^>iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hX4Qo1am@3 zR0s$N2z&@+hyVZp32;bRa{vGf5&!@T5&_cPe*BZm1~ijQ1|NS6*GWV{RCt`#ntN~^ z*Imay=j^?EuXL}ZYgv};#1F-eNm@Ix@|Z%v#foWhpu`R^!=#-KhBkpRw1W!+!@z(s z9iG!^U50it%%r$8q!EA6q@f{`Ca#qSO>CUTb{r>mZAq48S1(KVp?h^7yXVIr`_SHp z5<3mk;Ws+kJ*$7+v)}LUb$;ipl!);ES@cgDz>h1j|BFFC`rH4|kI?V+B=~{A+9J{Z z*x`Ts^Rf5(F7;krXxBqu>_-?77yt%9G6*}GKrf;9@h;OB$qJlAV^WJA&Y*I#|>(50n@%Lfnocj*C;RumYF37$}#p3t5t`L(-{v z_p7DXhzN)Q;TyodBSZVM*F@mH-~I9c@MT~SRCwLdnz>{LbIDE?+R_vfDXM7Jq;2}z z;`FxL^t6A)agCun87Gs7%mBxW@0hT+S{~s#GaeYs};qs8p+@O^s9`N9V#k zNpU?wM!$};x zz6$|r1{?!#&XpO@S2;Uh;`PY|#JIdMT>x>x7%=|v8v3g{)1=!Hbfwx^+1JZL-zv)I z-y(l8H-|C;;_QnOXmX+Z{_v3%y5`J@Wig%Z;&jh?Hg>1^v%7C%RlAJ_3~+cN$19Ts zPR*7mR*h$B*B}8HV?5st!7X!c+_3+*`aA4Rze%-J<+18E{(jvjXtU$2jknV~a+dPU zRaB`0B6l1a+JB;@1$52bBQXm}#JSYd#~pubSMaG@*HaewVZO$TGdYH*vMg3z4@*pl zYe8H=9RFxQ906kxC4lh)IcUcCY7mqX&~Tvg6#G6fL-NCW5pDDPhyM#RI>cADJ;X?{ zNGzsF#bThV;L0ALH38A;USbwy5lZa|wyetVql(L{S0C|#N3mnSQHZTsgC zBNRG1NzLa#YjDkA;6}|B5Oy1_nRNxNgroCWat2P77buF0wgja?G$0Bw8Zkb2#|Q8C zG0G>Tz}1LYU<}I7kxGM7pe(4JsUd#?bN}%ePN7ISTc%dFP;m>T6**C?R$(?AXc@#G z`|MW-uyh93P&5{1vBIUKldvz8Zq7+Ac5}( zk13yk)~J}`+iM2td*TU7<5zJVm+C^5XFl+2m~subT%%NVkg9|BCcDhN4<3KW92wf5 zt+#+;2Lf(!k+zD%<}-QPltA1v;#??G~>jOM;&+k#2D`4h}te%|0%@@&DSbuH<{=(KEY0REH!*)PKE-0G?E9G_rShaK?fImoA!f0VN>faCP)esMrrOcI zc9r%?SsJtgOQRHETtq3vFCo5m&u94OyC25XTuh}#d}5lu=~=p`XHms6Qga}c^cefu zv(W;Bh{B4;`21gdio5RIL<%7;pv0TjMT9e>Q{)SaoP2YP(eX(xPfUL?KbI$+E0T`S zLM#TBW+9!XoJ_LN-iDK~Dcgx93n>-4qE{{my5^8rEYnt4pnHBEyI6v94OOjSTQU}=BcSd2y6_ACKl1dPyDE@Rbd;J8q8Q8fo#mmB(4^79|QljN42 zJpRQmM2f)5)fkJ~r* zvF^qmvQCndC7NWU!G-z}KnXY9bOTA>T>viRtDL`ll`B_fxqRg++4%w@!YB9c!8PET z7_NaBLK2q_?a;1WcHP#8Z0+^ZstCE7Mb(8j-yWw}voIpGTMib2tz2%ur7v_-V@wFF zXl#^%bXSIj?0kQ4d7wT9MEX%6C=v;qINm^qkDcS6hKB2@3nY_vV0}a&m(BCcQ-|5U zb35IuR^j?pLWkwhY1K$+hm_@zj@Q_}wGZP16~Edvp~3`56mw2HIk%0gPCHd%XdNNo zDK=9_z*jyX^ser~62TZD-IeyrSyfM9ak0$&e1VS64vc@mGfy36;^G8PeDewJ{@D+) z<<0>NFkg!?TaNjb@>)teSQrH8j#s=1tY)KtvazU0Y-z4g{=z*-zYP+#z@R9PgfWm1 zgAv2}4L39ePO#d_&gV&`J2-yyBoh}WK%i1C^YY;r7&&)=U)cRCSn))#*a};&77K@* ztJ>kPN_l^w5gfH%BH{gAH7uv1yAr{Y&KQQDKgvR>>}41i`c|*>{5WX7xu1UWd0u|u zD8tXb=+C~s8wgw(zr@hLe4RorAG%qzHA`G5d`GPE?`QWgsB>um|V^Ik=( zp!R=Gg1sJNBwUzHUb;jfmt*}cTU&xxfxr9i5{vm3uzbH4C>Dw>k0X7JhrA2zE#cm6Q4v#Bw~elA`#*WNC+%Vp<#a(Yi$8L=>=~TbaEN+mS6t_3Oe!X>y7U7WN=cy zBJ%=yKt!72cXo1$m8<*wf^Uhv0jia9WG1c~kiq-!=Z60EbY;5gO9LxhiH0dN%sSM& z>FMK51csX|;Nh1;616~J1tYxn(n}$}APs_N<}=6tXW1Coa_4QVT-mkc<3WG(-6(F= zg9nhHa&_U@%RgvzpRq@W_MdD?;Q4R-Y4CxeDGn~4JI5=}Jr`=&Uz>C0_%U94@ug)0 z_w>e41iA8~{K!F}`$AII&%yf?DzV)At+7I1lBdvDkL=FOng4`YP2HrS&jIp=R z(zCh`yDiC;v5OS4x%!);6$O8A87zo>{JlZ@Rk7eIMC#AL}=JubiEnVR5m{*x3tA zjE=EbY_Z+YELmVM8obLAs3Y<5zuo{G!rMgRx~%d3$su50F!RC^czB0zWFwLDPd|8I zFP{1O-*y_&P+$cXbfuFSeFN0s<3w?C1ZvX%Q07(Z$PDHLkV1hG(oKXM( diff --git a/Data/User/Themes/Boomy/help.png b/Data/User/Themes/Boomy/help.png index 2b972ac7e17f07b13cab822e63aac65ce82588bc..e2cfe659913b8a718cedad0eb674d50e6086b83f 100644 GIT binary patch delta 1730 zcmV;z20i(<9FPuwiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^1ZP1_ zK>z@;j|==^1poj50drDELIAGL9O(c603c&XQcVB=dL{q>fP?@5`Tzg`fam}Kbua(` z>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)0001yG!%aYv`IukR7l6gm0gHk zR~d$%wf5fU>~r>Gj zdLQ2J<6E!df2e<-JQ%&_{Ka3zx7<-5^!WD=10Il56=8=Fc3ELl?(mJHZiGqWIB)T4 z%37<#=zT%A08T#w0pMUjgri=dKUXN1?igftQQyD;D*)s>3@DuiJTdF)bb5K7= zy`wm14l#E0Bs+H9$;P10Kxm1^4pJOHhPg3CXYmSYE_edQ!g9tI>*QtN>gl(^cR({C zsucMA`jI9V z3mkuec7vIf!@D*G6DRJ?(bfUNSfNij5d;CQn~{I5 zwY;mqt^q`0MA~U)NLSl9=Of|(hf-^sm|3vv_p;~ShiL!$Yb^imcXW&<_eum|4`I}U zZ-v-G#|Xd-(Bb9`gqc>?cDr!`UWB8Bu>onONK!?f!cY;+wF|6Ve2tFr$h|Utxk^;+ zCoGlGPN*k2U26f(i_p61zzY9p<}81<64^FTi9l;4OR!mju{oJ>EX+(3pZO&|MO;{= zSnj3V+fO-)P+3l+lQ7pwG1jdDrfn3FC-C< z;KL6ye*F6=(}Bhey@TtCDiu6|WTnZarDdjD9gMXv0Y3ne6BD3EZ{LNW(%gT^FBal_ zX`z+joFXV!iPmkRvT-Xz!=sFZ9hm3>Mk{PoCJPWM6 z^ND)Tzp}_Db_Qsz=Tc*PTe&?@P+CWY0zp_JC`A;b3PIk+%>EtX8z?83)tJUojmc{_ zxL9uzr&%f@Ck1}0z@C`+HvoU&50@3A846 zj&_=}(n)A_6Ot^)T00{mKLmaZwBIfMzLEKzk10eXR7xFIT0f$-KA=gpH-u6}5y4vP ztaV-I+`NeV5qM67*OkKkxA+H!{@3@z$=Be?yD52|8U=O(BR~G&DLf zHZ3qVIxsMpM6^Z#001R)MObuXVRU6WZEs|0W_bWIFflVNFflDLHdHY-Iy5mlGBhnP YHaajc79i1dkw!EL07*qoM6N<$f^%6F?*IS* delta 3596 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 PMl=ZkNkvXXu0mjfBeZ8y delta 2492 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 Hu0mjfkbUt| delta 3261 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 YHaajc79i1dkw!EL07*qoM6N<$g6#wKwg3PC delta 3604 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 LNkvXXu0mjfGvq36 delta 2425 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 delta 3042 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 Date: Wed, 16 Jan 2013 20:16:56 -0500 Subject: [PATCH 448/627] Move DSP settings to dolphin.ini --- Source/Core/AudioCommon/AudioCommon.vcxproj | 2 - .../AudioCommon/AudioCommon.vcxproj.filters | 2 - Source/Core/AudioCommon/CMakeLists.txt | 1 - Source/Core/AudioCommon/Src/AudioCommon.cpp | 22 ++++-- Source/Core/AudioCommon/Src/AudioCommon.h | 3 +- .../AudioCommon/Src/AudioCommonConfig.cpp | 68 ------------------- .../Core/AudioCommon/Src/AudioCommonConfig.h | 51 -------------- Source/Core/Common/Src/CommonPaths.h | 1 - Source/Core/Common/Src/FileUtil.cpp | 1 - Source/Core/Common/Src/FileUtil.h | 1 - Source/Core/Core/Src/ConfigManager.cpp | 20 ++++++ Source/Core/Core/Src/ConfigManager.h | 16 +++++ Source/Core/Core/Src/DSPEmulator.cpp | 2 - Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 1 + Source/Core/DolphinWX/Src/ConfigMain.cpp | 38 +++++------ 15 files changed, 71 insertions(+), 158 deletions(-) delete mode 100644 Source/Core/AudioCommon/Src/AudioCommonConfig.cpp delete mode 100644 Source/Core/AudioCommon/Src/AudioCommonConfig.h diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index a983005318..abb5dbf505 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -191,7 +191,6 @@ - @@ -204,7 +203,6 @@ - diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index af5fe12220..30ff35a073 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -3,7 +3,6 @@ - @@ -26,7 +25,6 @@ - diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index 0e610bd847..3b6d0cea4d 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -1,5 +1,4 @@ set(SRCS Src/AudioCommon.cpp - Src/AudioCommonConfig.cpp Src/DPL2Decoder.cpp Src/Mixer.cpp Src/WaveFile.cpp diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 99ae42b93a..e14b9ac45e 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -27,6 +27,10 @@ #include "OpenALStream.h" #include "PulseAudioStream.h" #include "../../Core/Src/Movie.h" +#include "../../Core/Src/ConfigManager.h" + +// This shouldn't be a global, at least not here. +SoundStream *soundStream; namespace AudioCommon { @@ -34,7 +38,7 @@ namespace AudioCommon { // TODO: possible memleak with mixer - std::string backend = ac_Config.sBackend; + std::string backend = SConfig::GetInstance().sBackend; if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); else if (backend == BACKEND_NULLSOUND && NullSound::isValid()) @@ -54,10 +58,10 @@ namespace AudioCommon if (soundStream != NULL) { - ac_Config.Update(); + UpdateSoundStream(); if (soundStream->Start()) { - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) { std::string audio_file_name = File::GetUserPath(D_DUMPAUDIO_IDX) + "audiodump.wav"; File::CreateFullPath(audio_file_name); @@ -82,7 +86,7 @@ namespace AudioCommon if (soundStream) { soundStream->Stop(); - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) soundStream->GetMixer()->StopLogAudio(); //soundStream->StopLogAudio(); delete soundStream; @@ -122,7 +126,7 @@ namespace AudioCommon { return true; } - return ac_Config.m_EnableJIT; + return SConfig::GetInstance().m_EnableJIT; } void PauseAndLock(bool doLock, bool unpauseOnUnlock) @@ -143,4 +147,12 @@ namespace AudioCommon } } } + void UpdateSoundStream() + { + if (soundStream) + { + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); + soundStream->SetVolume(SConfig::GetInstance().m_Volume); + } + } } diff --git a/Source/Core/AudioCommon/Src/AudioCommon.h b/Source/Core/AudioCommon/Src/AudioCommon.h index e7a111b0a1..b7b32e7498 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.h +++ b/Source/Core/AudioCommon/Src/AudioCommon.h @@ -19,14 +19,12 @@ #define _AUDIO_COMMON_H_ #include "Common.h" -#include "AudioCommonConfig.h" #include "SoundStream.h" class CMixer; extern SoundStream *soundStream; -extern AudioCommonConfig ac_Config; // UDSPControl union UDSPControl @@ -60,6 +58,7 @@ namespace AudioCommon std::vector GetSoundBackends(); bool UseJIT(); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); + void UpdateSoundStream(); } #endif // _AUDIO_COMMON_H_ diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp deleted file mode 100644 index 49f50b6880..0000000000 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "AudioCommon.h" -#include "CommonPaths.h" -#include "FileUtil.h" -#include "../../Core/Src/ConfigManager.h" - -AudioCommonConfig ac_Config; - -// This shouldn't be a global, at least not here. -SoundStream *soundStream; - -// Load from given file -void AudioCommonConfig::Load() -{ - IniFile file; - file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - - file.Get("Config", "EnableJIT", &m_EnableJIT, true); - file.Get("Config", "DumpAudio", &m_DumpAudio, false); -#if defined __linux__ && HAVE_ALSA - file.Get("Config", "Backend", &sBackend, BACKEND_ALSA); -#elif defined __APPLE__ - file.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO); -#elif defined _WIN32 - file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); -#else - file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); -#endif - file.Get("Config", "Volume", &m_Volume, 100); -} - -// Set the values for the file -void AudioCommonConfig::SaveSettings() -{ - IniFile file; - file.Load(File::GetUserPath(F_DSPCONFIG_IDX)); - - file.Set("Config", "EnableJIT", m_EnableJIT); - file.Set("Config", "DumpAudio", m_DumpAudio); - file.Set("Config", "Backend", sBackend); - file.Set("Config", "Volume", m_Volume); - - file.Save(File::GetUserPath(F_DSPCONFIG_IDX)); -} - -// Update according to the values (stream/mixer) -void AudioCommonConfig::Update() { - if (soundStream) { - soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); - soundStream->SetVolume(m_Volume); - } -} diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h deleted file mode 100644 index 48807b3ffd..0000000000 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef _AUDIO_COMMON_CONFIG_H_ -#define _AUDIO_COMMON_CONFIG_H_ - -#include -#include "IniFile.h" - -// Backend Types -#define BACKEND_NULLSOUND "No audio output" -#define BACKEND_ALSA "ALSA" -#define BACKEND_AOSOUND "AOSound" -#define BACKEND_COREAUDIO "CoreAudio" -#define BACKEND_DIRECTSOUND "DSound" -#define BACKEND_OPENAL "OpenAL" -#define BACKEND_PULSEAUDIO "Pulse" -#define BACKEND_XAUDIO2 "XAudio2" - -struct AudioCommonConfig -{ - bool m_EnableJIT; - bool m_DumpAudio; - int m_Volume; - std::string sBackend; - - // Load from given file - void Load(); - - // Self explanatory - void SaveSettings(); - - // Update according to the values (stream/mixer) - void Update(); -}; - -#endif //AUDIO_COMMON_CONFIG diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index c39056a946..9e14d7cf7e 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -94,7 +94,6 @@ // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) #define DOLPHIN_CONFIG "Dolphin.ini" -#define DSP_CONFIG "DSP.ini" #define DEBUGGER_CONFIG "Debugger.ini" #define LOGGER_CONFIG "Logger.ini" diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index acd4588126..d7b248a722 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -681,7 +681,6 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) paths[D_THEMES_IDX] = paths[D_USER_IDX] + THEMES_DIR DIR_SEP; paths[D_WIISYSCONF_IDX] = paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP; paths[F_DOLPHINCONFIG_IDX] = paths[D_CONFIG_IDX] + DOLPHIN_CONFIG; - paths[F_DSPCONFIG_IDX] = paths[D_CONFIG_IDX] + DSP_CONFIG; paths[F_DEBUGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; paths[F_LOGGERCONFIG_IDX] = paths[D_CONFIG_IDX] + LOGGER_CONFIG; paths[F_MAINLOG_IDX] = paths[D_LOGS_IDX] + MAIN_LOG; diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 0947db4f5c..451b1b6929 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -52,7 +52,6 @@ enum { D_WIISYSCONF_IDX, D_THEMES_IDX, F_DOLPHINCONFIG_IDX, - F_DSPCONFIG_IDX, F_DEBUGGERCONFIG_IDX, F_LOGGERCONFIG_IDX, F_MAINLOG_IDX, diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index a4f45f4ffc..9cd768992f 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -256,6 +256,12 @@ void SConfig::SaveSettings() ini.Set("Movie", "PauseMovie", m_PauseMovie); ini.Set("Movie", "Author", m_strMovieAuthor); + // DSP + ini.Set("DSP", "EnableJIT", m_EnableJIT); + ini.Set("DSP", "DumpAudio", m_DumpAudio); + ini.Set("DSP", "Backend", sBackend); + ini.Set("DSP", "Volume", m_Volume); + ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); m_SYSCONF->Save(); } @@ -404,6 +410,20 @@ void SConfig::LoadSettings() // Movie ini.Get("General", "PauseMovie", &m_PauseMovie, false); ini.Get("Movie", "Author", &m_strMovieAuthor, ""); + + // DSP + ini.Get("Config", "EnableJIT", &m_EnableJIT, true); + ini.Get("Config", "DumpAudio", &m_DumpAudio, false); + #if defined __linux__ && HAVE_ALSA + ini.Get("Config", "Backend", &sBackend, BACKEND_ALSA); + #elif defined __APPLE__ + ini.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO); + #elif defined _WIN32 + ini.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); + #else + ini.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); + #endif + ini.Get("Config", "Volume", &m_Volume, 100); } m_SYSCONF = new SysConf(); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index cbe1b4d1cb..e92d29ee65 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -26,6 +26,16 @@ #include "HW/SI_Device.h" #include "SysConf.h" +// DSP Backend Types +#define BACKEND_NULLSOUND "No audio output" +#define BACKEND_ALSA "ALSA" +#define BACKEND_AOSOUND "AOSound" +#define BACKEND_COREAUDIO "CoreAudio" +#define BACKEND_DIRECTSOUND "DSound" +#define BACKEND_OPENAL "OpenAL" +#define BACKEND_PULSEAUDIO "Pulse" +#define BACKEND_XAUDIO2 "XAudio2" + struct SConfig : NonCopyable { // Wii Devices @@ -83,6 +93,12 @@ struct SConfig : NonCopyable bool m_ShowLag; std::string m_strMovieAuthor; + // DSP settings + bool m_EnableJIT; + bool m_DumpAudio; + int m_Volume; + std::string sBackend; + SysConf* m_SYSCONF; // save settings diff --git a/Source/Core/Core/Src/DSPEmulator.cpp b/Source/Core/Core/Src/DSPEmulator.cpp index 2f1c7649a7..907eb225b3 100644 --- a/Source/Core/Core/Src/DSPEmulator.cpp +++ b/Source/Core/Core/Src/DSPEmulator.cpp @@ -22,8 +22,6 @@ DSPEmulator *CreateDSPEmulator(bool HLE) { - ac_Config.Load(); - if (HLE) { return new DSPHLE(); diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index 7981c677a8..b22be91104 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -26,6 +26,7 @@ #include "DSPHLE.h" #include "UCodes/UCodes.h" #include "../AudioInterface.h" +#include "ConfigManager.h" DSPHLE::DSPHLE() { m_InitMixer = false; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index db5f76b684..ae07eb78b8 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -321,9 +321,6 @@ void CConfigMain::InitializeGUIValues() { const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter; - // Load DSP Settings. - ac_Config.Load(); - // General - Basic CPUThread->SetValue(startup_params.bCPUThread); SkipIdle->SetValue(startup_params.bSkipIdle); @@ -354,17 +351,17 @@ void CConfigMain::InitializeGUIValues() if (startup_params.bDSPHLE) DSPEngine->SetSelection(0); else - DSPEngine->SetSelection(ac_Config.m_EnableJIT ? 1 : 2); + DSPEngine->SetSelection(SConfig::GetInstance().m_EnableJIT ? 1 : 2); // Audio - VolumeSlider->Enable(SupportsVolumeChanges(ac_Config.sBackend)); - VolumeSlider->SetValue(ac_Config.m_Volume); - VolumeText->SetLabel(wxString::Format(wxT("%d %%"), ac_Config.m_Volume)); + VolumeSlider->Enable(SupportsVolumeChanges(SConfig::GetInstance().sBackend)); + VolumeSlider->SetValue(SConfig::GetInstance().m_Volume); + VolumeText->SetLabel(wxString::Format(wxT("%d %%"), SConfig::GetInstance().m_Volume)); DSPThread->SetValue(startup_params.bDSPThread); - DumpAudio->SetValue(ac_Config.m_DumpAudio ? true : false); - DPL2Decoder->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); + DumpAudio->SetValue(SConfig::GetInstance().m_DumpAudio ? true : false); + DPL2Decoder->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL); DPL2Decoder->SetValue(startup_params.bDPL2Decoder); - Latency->Enable(std::string(ac_Config.sBackend) == BACKEND_OPENAL); + Latency->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL); Latency->SetValue(startup_params.iLatency); // add backends to the list AddAudioBackends(); @@ -858,9 +855,6 @@ void CConfigMain::OnOk(wxCommandEvent& WXUNUSED (event)) // Save the config. Dolphin crashes to often to save the settings on closing only SConfig::GetInstance().SaveSettings(); - - // Save Audio settings - ac_Config.SaveSettings(); } // Core settings @@ -880,7 +874,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) break; case ID_FRAMELIMIT: SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection(); - ac_Config.Update(); + AudioCommon::UpdateSoundStream(); break; case ID_FRAMELIMIT_USEFPSFORLIMITING: SConfig::GetInstance().b_UseFPS = UseFPSForLimiting->IsChecked(); @@ -938,13 +932,13 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) case ID_DSPENGINE: SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE = DSPEngine->GetSelection() == 0; if (!DSPEngine->GetSelection() == 0) - ac_Config.m_EnableJIT = DSPEngine->GetSelection() == 1; - ac_Config.Update(); + SConfig::GetInstance().m_EnableJIT = DSPEngine->GetSelection() == 1; + AudioCommon::UpdateSoundStream(); break; case ID_VOLUME: - ac_Config.m_Volume = VolumeSlider->GetValue(); - ac_Config.Update(); + SConfig::GetInstance().m_Volume = VolumeSlider->GetValue(); + AudioCommon::UpdateSoundStream(); VolumeText->SetLabel(wxString::Format(wxT("%d %%"), VolumeSlider->GetValue())); break; @@ -960,8 +954,8 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) VolumeSlider->Enable(SupportsVolumeChanges(std::string(BackendSelection->GetStringSelection().mb_str()))); Latency->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); DPL2Decoder->Enable(std::string(BackendSelection->GetStringSelection().mb_str()) == BACKEND_OPENAL); - ac_Config.sBackend = BackendSelection->GetStringSelection().mb_str(); - ac_Config.Update(); + SConfig::GetInstance().sBackend = BackendSelection->GetStringSelection().mb_str(); + AudioCommon::UpdateSoundStream(); break; case ID_LATENCY: @@ -969,7 +963,7 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) break; default: - ac_Config.m_DumpAudio = DumpAudio->GetValue(); + SConfig::GetInstance().m_DumpAudio = DumpAudio->GetValue(); break; } } @@ -983,7 +977,7 @@ void CConfigMain::AddAudioBackends() { BackendSelection->Append(wxString::FromAscii((*iter).c_str())); int num = BackendSelection->\ - FindString(wxString::FromAscii(ac_Config.sBackend.c_str())); + FindString(wxString::FromAscii(SConfig::GetInstance().sBackend.c_str())); BackendSelection->SetSelection(num); } } From 178b1b38621b82ad7669633546996bab9d7b8ac9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 16 Jan 2013 20:22:00 -0600 Subject: [PATCH 449/627] Fix theme loading on non-Windows. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 11 +++++++++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ae07eb78b8..d4777a7907 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -595,7 +595,13 @@ void CConfigMain::CreateGUIControls() // theme selection auto const theme_selection = new wxChoice(DisplayPage, wxID_ANY); - CFileSearch cfs(CFileSearch::XStringVector(1, "*"), CFileSearch::XStringVector(1, File::GetUserPath(D_THEMES_IDX))); + CFileSearch::XStringVector theme_dirs; + theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX)); +#if !defined(_WIN32) + theme_dirs.push_back(SHARED_USER_DIR THEMES_DIR); +#endif + + CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs); auto const& sv = cfs.GetFileNames(); std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename) { @@ -603,7 +609,8 @@ void CConfigMain::CreateGUIControls() SplitPath(filename, NULL, &name, &ext); name += ext; - theme_selection->Append(name); + if (-1 == theme_selection->FindString(name)) + theme_selection->Append(name); if (SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name == name) theme_selection->SetSelection(theme_selection->GetCount() - 1); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index f07fcd10f3..eb139bd5c1 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -495,7 +495,14 @@ void CFrame::RecreateToolbar() void CFrame::InitBitmaps() { - wxString dir(File::GetUserPath(D_THEMES_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"); + std::string theme(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"); + std::string dir(File::GetUserPath(D_THEMES_IDX) + theme); + +#if !defined(_WIN32) + // If theme does not exist in user's dir load from shared directory + if (!File::Exists(dir)) + dir = SHARED_USER_DIR THEMES_DIR "/" + theme; +#endif m_Bitmaps[Toolbar_FileOpen].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Refresh].LoadFile(dir + "refresh.png", wxBITMAP_TYPE_PNG); From 12162a269b13cf946f762905c29adf5bf3dc9a7f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 16 Jan 2013 22:23:42 -0500 Subject: [PATCH 450/627] Change GetCmdForHotkey to use a switch. Cuts down on if-statement spam. Also fixed a typo in ConfigMain. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 97 +++++++++++++++--------- 2 files changed, 64 insertions(+), 35 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index d4777a7907..fbc2a18346 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -494,7 +494,7 @@ void CConfigMain::InitializeGUITooltips() // Display - Interface ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); - UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); + UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occurred.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index b2a60b606c..d390b8afcd 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -313,7 +313,7 @@ CFrame::CFrame(wxFrame* parent, ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener(); if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(); - // Start debugging mazimized + // Start debugging maximized if (UseDebugger) this->Maximize(true); // Debugger class if (UseDebugger) @@ -740,78 +740,107 @@ bool IsHotkey(wxKeyEvent &event, int Id) int GetCmdForHotkey(unsigned int key) { - if (key == HK_OPEN) + switch (key) + { + case HK_OPEN: return wxID_OPEN; - if (key == HK_CHANGE_DISC) + + case HK_CHANGE_DISC: return IDM_CHANGEDISC; - if (key == HK_REFRESH_LIST) + + case HK_REFRESH_LIST: return wxID_REFRESH; - if (key == HK_PLAY_PAUSE) + case HK_PLAY_PAUSE: return IDM_PLAY; - if (key == HK_STOP) + + case HK_STOP: return IDM_STOP; - if (key == HK_RESET) + + case HK_RESET: return IDM_RESET; - if (key == HK_FRAME_ADVANCE) + + case HK_FRAME_ADVANCE: return IDM_FRAMESTEP; - if (key == HK_START_RECORDING) + case HK_START_RECORDING: return IDM_RECORD; - if (key == HK_PLAY_RECORDING) + + case HK_PLAY_RECORDING: return IDM_PLAYRECORD; - if (key == HK_EXPORT_RECORDING) + + case HK_EXPORT_RECORDING: return IDM_RECORDEXPORT; - if (key == HK_READ_ONLY_MODE) + + case HK_READ_ONLY_MODE: return IDM_RECORDREADONLY; - if (key == HK_FULLSCREEN) + case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN; - if (key == HK_SCREENSHOT) + + case HK_SCREENSHOT: return IDM_SCREENSHOT; - if (key == HK_WIIMOTE1_CONNECT) + case HK_WIIMOTE1_CONNECT: return IDM_CONNECT_WIIMOTE1; - if (key == HK_WIIMOTE2_CONNECT) + + case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2; - if (key == HK_WIIMOTE3_CONNECT) + + case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3; - if (key == HK_WIIMOTE4_CONNECT) + + case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4; - if (key == HK_LOAD_STATE_SLOT_1) + case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1; - if (key == HK_LOAD_STATE_SLOT_2) + + case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2; - if (key == HK_LOAD_STATE_SLOT_3) + + case HK_LOAD_STATE_SLOT_3: return IDM_LOADSLOT3; - if (key == HK_LOAD_STATE_SLOT_4) + + case HK_LOAD_STATE_SLOT_4: return IDM_LOADSLOT4; - if (key == HK_LOAD_STATE_SLOT_5) + + case HK_LOAD_STATE_SLOT_5: return IDM_LOADSLOT5; - if (key == HK_LOAD_STATE_SLOT_6) + + case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6; - if (key == HK_LOAD_STATE_SLOT_7) + + case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7; - if (key == HK_LOAD_STATE_SLOT_8) + + case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8; - if (key == HK_SAVE_STATE_SLOT_1) + case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1; - if (key == HK_SAVE_STATE_SLOT_2) + + case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2; - if (key == HK_SAVE_STATE_SLOT_3) + + case HK_SAVE_STATE_SLOT_3: return IDM_SAVESLOT3; - if (key == HK_SAVE_STATE_SLOT_4) + + case HK_SAVE_STATE_SLOT_4: return IDM_SAVESLOT4; - if (key == HK_SAVE_STATE_SLOT_5) + + case HK_SAVE_STATE_SLOT_5: return IDM_SAVESLOT5; - if (key == HK_SAVE_STATE_SLOT_6) + + case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6; - if (key == HK_SAVE_STATE_SLOT_7) + + case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7; - if (key == HK_SAVE_STATE_SLOT_8) + + case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8; + } return -1; } From 6f7f02aeafa2e4aac3a8bcbb4ca844f9ba5948e7 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 16 Jan 2013 21:42:01 -0600 Subject: [PATCH 451/627] Fix translations for the recent spelling error correction. Also update the pot file while we are at it. --- Languages/po/ar.po | 1960 ++++++++++++------------ Languages/po/ca.po | 1970 +++++++++++++------------ Languages/po/cs.po | 1956 ++++++++++++------------ Languages/po/de.po | 1944 ++++++++++++------------ Languages/po/dolphin-emu.pot | 1926 ++++++++++++------------ Languages/po/el.po | 2708 +++++++++++++++++++--------------- Languages/po/en.po | 1926 ++++++++++++------------ Languages/po/es.po | 1959 ++++++++++++------------ Languages/po/fa.po | 1958 ++++++++++++------------ Languages/po/fr.po | 1959 ++++++++++++------------ Languages/po/he.po | 1926 ++++++++++++------------ Languages/po/hu.po | 1962 ++++++++++++------------ Languages/po/it.po | 1940 ++++++++++++------------ Languages/po/ja.po | 1958 ++++++++++++------------ Languages/po/ko.po | 1959 ++++++++++++------------ Languages/po/nb.po | 1956 ++++++++++++------------ Languages/po/nl.po | 1958 ++++++++++++------------ Languages/po/pl.po | 1959 ++++++++++++------------ Languages/po/pt.po | 1959 ++++++++++++------------ Languages/po/pt_BR.po | 1959 ++++++++++++------------ Languages/po/ru.po | 1986 +++++++++++++------------ Languages/po/sr.po | 1898 ++++++++++++------------ Languages/po/tr.po | 1963 ++++++++++++------------ Languages/po/zh_CN.po | 1941 ++++++++++++------------ Languages/po/zh_TW.po | 1939 ++++++++++++------------ 25 files changed, 25267 insertions(+), 24262 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 083a3b5917..0324afea2b 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-12-27 08:27-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: mansoor\n" "Language-Team: \n" "Language: \n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(كثير جدا العرض)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " لعبة : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! لا" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sنسخ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d هرتز" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i متصل" @@ -151,147 +144,147 @@ msgstr "%sاستيراد GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&حول البرنامج " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&التشغيل من محرك الاقراص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&نقاط التوقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&استعراض الايزو " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&مدير الاسرار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&محاكاة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&ملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&الاطار المسبق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ملء الشاشة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&مساعدة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&تحميل الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&بطاقه الذكره جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ùتح" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&خيارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&وقÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&وضع للقراءة Ùقط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&تحديث القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&تسجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&إعادة اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&الصوت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&أدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Ùديو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&القائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&معلومات عن اللعبة" @@ -311,7 +304,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(معروÙ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ايقاÙ)" @@ -319,19 +312,19 @@ msgstr "(ايقاÙ)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 بت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 بت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "الرؤية ثلاثية الأبعاد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 بت" @@ -339,20 +332,20 @@ msgstr "8 بت" msgid "" msgstr "<أدخل اسم هنا>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<لم يتم العثور على القرارات>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<لا شيء>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<اضغط على Ù…Ùتاح>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<النظام>" @@ -360,25 +353,27 @@ msgstr "<النظام>" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ناÙذة اللعب عبر النت Ù…Ùتوح بالÙعل!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "اللعبة ليست قيد التشغيل حاليا." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "لم يتم العثور على جهاز بلوتوث!\n" "(Ùقط بلوتوث مايكروسوÙت معتمد.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -410,13 +405,13 @@ msgstr "" "\n" "يجب عليك إعادة توجيه البرنامج منÙØ° الهوست!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "اسرار" @@ -424,19 +419,19 @@ msgstr "اسرار" msgid "About Dolphin" msgstr "ترجمة البرنامج بواسطة الررائع" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "تسريع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "ضبط:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -449,8 +444,8 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "العمل" @@ -470,7 +465,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -491,7 +486,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -499,7 +494,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -507,27 +503,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "كرت الشاشه :" @@ -536,11 +532,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "أض٠باتش" @@ -548,13 +544,13 @@ msgstr "أض٠باتش" msgid "Add new pane" msgstr "إضاÙØ© جزء جديد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "العنوان :" @@ -580,50 +576,50 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "ضبط السيطرة على ضغط التناظرية المطلوبة لتنشيط الأزرار." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "متقدم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "إعدادات متقدمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -636,19 +632,19 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "بديل ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "تصÙية متباينة الخواص :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "تنعيم الحواÙ:" @@ -660,15 +656,15 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "تطبيق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -678,27 +674,27 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد إيقاÙ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabic" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -706,12 +702,12 @@ msgstr "نسبة العرض :" msgid "At least one pane must remain open." msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "صوت الخلÙية :" @@ -719,24 +715,24 @@ msgstr "صوت الخلÙية :" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "تلقائي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "تلقائي (Multiple of 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "تلقائي حجم الناÙذة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "ضبط حجم الناÙذة تلقائي " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -759,12 +755,12 @@ msgstr "&تسجل" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "إعدادات الخلÙية" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "الخلÙية:" @@ -782,15 +778,15 @@ msgid "Bad File Header" msgstr "سيء بداية المل٠" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "تÙاصيل بنر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "بنر:" @@ -798,11 +794,11 @@ msgstr "بنر:" msgid "Bar" msgstr "شريط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "الأساسية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "إعدادات أساسية" @@ -830,42 +826,42 @@ msgstr "اليسار أزرق" msgid "Blue Right" msgstr "اليمين أزرق" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "يلزم التحكم: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "معطلة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "أستعرض" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "لتصÙØ­ دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "العازلة :" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "أزرار" @@ -886,31 +882,15 @@ msgstr "العصا الأيمن " msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "محرك محاكي المعالج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "شاشة القوائم المؤقته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"احتساب القيم من عمق ثلاثي الأبعاد الرسومات لكل بكسل بدلا من قمة الرأس " -"الواحدة.\n" -"وعلى النقيض من بكسل الإضاءة التي هي مجرد تعزيز، لكل بكسل عمق العمليات " -"الحسابية اللازمة لمضاهاة صحيح عدد قليل من الألعاب.\n" -"\n" -"إذا لم تكن متأكدا اترك هذا التحقق." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -924,7 +904,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "إلغاء" @@ -940,7 +920,7 @@ msgstr "لا يمكن Ùتح %s" msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -951,7 +931,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -959,12 +939,12 @@ msgstr "" "لا يمكن استخدام هذا المل٠كبطاقة الذاكرة.\n" "هل تحاول استخدام Ù†Ùس المل٠ÙÙŠ كل من Ùتحات?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "غير قادر العثور على ويموت: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "غير قادر على العثور ويموت بواسطة معالج الاتصال %02x" @@ -978,7 +958,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalan" @@ -986,24 +966,24 @@ msgstr "Catalan" msgid "Center" msgstr "مركز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "تغيير" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "تغيير &القرص" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "تغيير القرص" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "تغيير اللعبة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1019,12 +999,11 @@ msgstr "Changes sign to zFar Parameter (بعد التصحيح)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (بعد التصحيح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "تغيير هذه ليس لها أي أثر ÙÙŠ حين أن المحاكي قيد التشغيل!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "شات" @@ -1032,47 +1011,47 @@ msgstr "شات" msgid "Cheat Code" msgstr "اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "بحث عن اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "قائمة الاسرار" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1080,15 +1059,15 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "اختيار مل٠لاستخدام راÙعة التطبيقات: (ينطبق على الأقراص مصنوعة من الادله Ùقط)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "اختيار مجلد لاستخراج" @@ -1102,8 +1081,8 @@ msgstr "الكلاسيكية" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "أزال" @@ -1115,22 +1094,22 @@ msgstr "" "أثناء قطع الاتصال اللعبة العميل قيد التشغيل! يتم تعطيل اللعب شبكة. يجب عليك " "يدويا إيقا٠اللعبة." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "إغلاق" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "رمز المعلومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "رمز: " @@ -1142,91 +1121,91 @@ msgstr "الأمر" msgid "Comment" msgstr "التعليق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "إعدادات التحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "تكوين منصات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "تأكيد على التوقÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr " توصيل ويموت%i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "توصيل ويموت 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "توصيل ويموت 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "توصيل ويموت 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "توصيل ويموت 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "توصيل" @@ -1246,12 +1225,12 @@ msgstr "GCIتحويل إلى " msgid "Copy failed" msgstr "Ùشل نسخ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "نسخ إلى بطاقة الذاكرة %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "الأساسية" @@ -1260,7 +1239,7 @@ msgstr "الأساسية" msgid "Could not create %s" msgstr "لا يمكن إنشاء %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "لا يمكن تهيئة الخلÙية %s." @@ -1281,12 +1260,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "لا يمكن التعر٠مل٠ايزو %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "لا يمكن Ø­Ùظ %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1307,11 +1286,11 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1319,17 +1298,17 @@ msgstr "" "لا يمكن التهيئة الأساسية.\n" "تحقق التكوين الخاص بك." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "الاحصاء :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "البلد:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "إنشاء رموز اسرار" @@ -1338,28 +1317,7 @@ msgstr "إنشاء رموز اسرار" msgid "Create new perspective" msgstr "إنشاء منظور جديد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr " KDE-Look.org تم بواسطة" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -" Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr " VistaIcons.com تم بواسطة" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -" black_rider and published on ForumW.org > Web DevelopmentsCreated by " -"black_rider and published on ForumW.org > Web Developments black_rider and " -"published on ForumW.org > Web Developments تم بواسطة" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "المنشئ :" @@ -1367,11 +1325,11 @@ msgstr "المنشئ :" msgid "Critical" msgstr "حرج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "محصول" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1385,12 +1343,12 @@ msgstr "" msgid "Crossfade" msgstr "الإبهات المتداخل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "المسار الحالي تغيرت من %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "هاك مخصص العرض" @@ -1398,11 +1356,11 @@ msgstr "هاك مخصص العرض" msgid "Custom Projection Hack Settings" msgstr "إعدادات هاك مخصص العرض" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "تخصيص بعض المعلمات العرض على إملائي." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Czech" @@ -1414,36 +1372,36 @@ msgstr "" msgid "D-Pad" msgstr "الاسهم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulation (سريع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD Root:" @@ -1455,11 +1413,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "حجم البيانات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "التاريخ :" @@ -1476,11 +1434,11 @@ msgstr "" msgid "Dead Zone" msgstr "المنطقة الميتة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "التصحيح" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "التصحيح" @@ -1488,24 +1446,24 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" @@ -1514,11 +1472,11 @@ msgid "Default font" msgstr "الخط الاÙتراضي" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "حذ٠الحÙظ" @@ -1527,11 +1485,11 @@ msgstr "حذ٠الحÙظ" msgid "Delete the existing file '%s'?" msgstr "حذ٠المل٠الموجود '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "الوصÙ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "كشÙ" @@ -1542,13 +1500,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1572,20 +1530,16 @@ msgstr "" "Ùشل الدليل الاختباري\n" " Ùˆ Ùشل دليل الاختباري الاحتياطية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "تعطيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "تعطيل الضباب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "تعطيل العمق لكل بكسل" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1599,7 +1553,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1615,7 +1569,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "القرص" @@ -1624,11 +1578,11 @@ msgstr "القرص" msgid "Disc Read Error" msgstr "خطأ قراءة القرص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "العرض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1642,20 +1596,24 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "موقع دولÙين" @@ -1663,55 +1621,60 @@ msgstr "موقع دولÙين" msgid "Dolphin Configuration" msgstr "إعدادات دولÙين" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "دولÙين على مدونة قوقل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملÙات " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "تم تعيين دولÙين حاليا إخÙاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "أسÙÙ„" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "تحميل اسرار للعبة" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu وأضا٠%lu تم تحميل الاسرار " @@ -1720,27 +1683,27 @@ msgstr "%lu وأضا٠%lu تم تحميل الاسرار " msgid "Drums" msgstr "الطبول" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "تÙريغ الإطارات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump Textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1750,7 +1713,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1760,7 +1723,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1770,17 +1733,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "خروج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" @@ -1797,11 +1760,11 @@ msgstr "" msgid "EUROPE" msgstr "أوروبا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "بداية تحديث الذاكرة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "تحرير" @@ -1809,7 +1772,7 @@ msgstr "تحرير" msgid "Edit ActionReplay Code" msgstr "تعديل رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "تعديل الاعدادات" @@ -1817,12 +1780,12 @@ msgstr "تعديل الاعدادات" msgid "Edit Patch" msgstr "تعديل الباتش" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "تعديل المنظور الحالي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "تحرير" @@ -1830,7 +1793,7 @@ msgstr "تحرير" msgid "Effect" msgstr "تأثير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "عازل الإطار المضمن " @@ -1838,7 +1801,7 @@ msgstr "عازل الإطار المضمن " msgid "Emu Thread already running" msgstr "المحاكي قيد التشغيل بالÙعل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1847,7 +1810,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1863,19 +1826,19 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "محاكاة ويموت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "حالة المحاكاه: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "تمكين" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1892,72 +1855,71 @@ msgstr "" "يتطلب ملء الشاشة للعمل.\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "تمكين تنظيم حساب الإطار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "تمكين التخزين المؤقت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "تمكين الاسرار " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Enable Dual Core (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "تمكين الاختصارات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Enable Idle Skipping (لزيادة السرعة)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU تمكين" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "تمكين شاشة عريضة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "تمكين الإطار السلكي" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1971,7 +1933,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد X1." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1979,11 +1941,11 @@ msgstr "" "تمكين الوصول السريع القرص.اللازمة لعدد قليل من الألعاب. (ON = Fast, OFF = " "Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "تمكين صÙحات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1995,7 +1957,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2007,24 +1969,41 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشÙÙ‚ الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2036,13 +2015,13 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذه غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2056,14 +2035,14 @@ msgstr "" msgid "End" msgstr "نهاية" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "تحسينات" @@ -2081,17 +2060,17 @@ msgstr "دخول %d/%d" msgid "Entry 1/%d" msgstr "دخول 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "المساواة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "خطأ" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "خطأ ÙÙŠ تحميل اللغة المختارة. يتراجع إلى النظام الاÙتراضية." @@ -2128,32 +2107,32 @@ msgstr "" msgid "Execute" msgstr "تنÙيذ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Ùشل تصدير" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "تصدير تسجيل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "تصدير جميع الحÙظ" @@ -2169,7 +2148,7 @@ msgstr "تصدير Ø­Ùظ باسم" msgid "Extension" msgstr "تمديد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "عزل الاطار الخارجي" @@ -2181,44 +2160,44 @@ msgstr "معلمة إضاÙية" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "استخراج Apploader" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "استخراج الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "استخراج التقسيم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "استخراج %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "استخراج كاÙØ© الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "استخراج دليل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "استخراج" @@ -2226,7 +2205,7 @@ msgstr "استخراج" msgid "FIFO Byte" msgstr "بايت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "لاعبين" @@ -2234,7 +2213,7 @@ msgstr "لاعبين" msgid "FRANCE" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "الحجم :" @@ -2242,15 +2221,15 @@ msgstr "الحجم :" msgid "Failed to Connect!" msgstr "خطأ الاتصال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "لم اسمع!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "اللعبه لاتوجد ÙÙŠ قاعده البيانات." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ùشل ÙÙŠ الاستخراج إلى %s!" @@ -2350,41 +2329,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "Ùشل لكتابة عنوان لمل٠%d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "مل٠المعلومات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "المل٠لا يتضمن اسرار." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "تحويل مل٠إلى .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2401,7 +2380,7 @@ msgstr "" "مل٠يحتوي على ملحق \"%s\"\n" "ملحقات الصالحة (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "لم يتم التعر٠على المل٠كمل٠بطاقة ذاكرة" @@ -2414,19 +2393,19 @@ msgstr "مل٠غير مضغوط " msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2434,27 +2413,27 @@ msgstr "" msgid "First Block" msgstr "أول بلوك" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "الإصلاح اختبارية" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "العرض 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "العرض 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Ùرض وحدة التحكم على النظام الياباني" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2466,7 +2445,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2478,7 +2457,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2512,43 +2491,43 @@ msgstr "الإطار" msgid "Frame " msgstr "الإطار" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "الإطار المسبق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "الإطار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "مجموعة الإطار " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "تخطي الإطار " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "حد الإطار:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "إطارات لتسجيل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "تحكم بكاميرا اللعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "French" @@ -2556,16 +2535,16 @@ msgstr "French" msgid "Frets" msgstr "الحنق" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "من" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "شاشه كامله" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "دقة العرض :" @@ -2577,7 +2556,7 @@ msgstr "GCI File(*.gci)" msgid "GCMic Configuration" msgstr "GCMic اعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "تحكم الجيم كيوب" @@ -2585,27 +2564,27 @@ msgstr "تحكم الجيم كيوب" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "معر٠اللعبة:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "لعبة تستخدم بالÙعل!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "اللعبة ليست على التوالي!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "لم يتم العثور على لعبة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "إعدادات معينه للعبه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "إعدادات اللعبة" @@ -2613,25 +2592,25 @@ msgstr "إعدادات اللعبة" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "إعدادات تحكم جيم كيوب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "تحميل اسرار" @@ -2646,20 +2625,20 @@ msgstr "" "GeckoCode Ùشل تشغيل (CT%i CST%i) (%s)\n" "(إما غير رمز سيئة أو نوع رمز غير مدعومة حتى الآن.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "عام" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "الإعدادات العامة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "German" @@ -2668,19 +2647,19 @@ msgstr "German" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "الرسومات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "إعدادات الرسومات" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "أكبر من" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2696,7 +2675,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا، اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Greek" @@ -2716,11 +2695,11 @@ msgstr "اليمين أخضر" msgid "Guitar" msgstr "غيتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "هاك" @@ -2728,7 +2707,7 @@ msgstr "هاك" msgid "Header checksum failed" msgstr "عنوان اختباري Ùشل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebrew" @@ -2740,7 +2719,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "مساعدة" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2761,11 +2740,11 @@ msgstr "" msgid "Hide" msgstr "إخÙاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "إخÙاء مؤشر الماوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2779,8 +2758,8 @@ msgstr "" msgid "Home" msgstr "الصÙحة الرئيسية" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "هوست" @@ -2788,17 +2767,17 @@ msgstr "هوست" msgid "Hotkey Configuration" msgstr "إعدادات الاختصارات" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "الاختصارات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hungarian" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ويموت هجين" @@ -2820,7 +2799,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL إعدادات" @@ -2828,19 +2807,19 @@ msgstr "IPL إعدادات" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR المؤشر" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR حساسية:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2852,7 +2831,7 @@ msgstr "إيطاليا" msgid "Icon" msgstr " أيقونة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2860,12 +2839,12 @@ msgstr "" "إذا كانت محددة، سيتم تحديث سجلات المربع المحيط. المستخدمة من قبل لعبه بابير " "ماريو" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2875,11 +2854,11 @@ msgstr "" "لجعلها Ùعالة Audio Throttle يجب عليك تعطيل NTSC:60, PAL:50 إذا قمت بتعيين " "حد الإطار أعلى من السرعة لعبة الاÙتراضية " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "تجاهل تنسيق التغييرات " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2893,7 +2872,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2907,7 +2886,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Ø­Ùظ استيراد" @@ -2915,23 +2894,23 @@ msgstr "Ø­Ùظ استيراد" msgid "Import failed, try again?" msgstr "Ùشل الاستيراد، حاول مرة أخرى؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "المل٠يحتوي على طول المستوردة غير صالحة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2943,16 +2922,16 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "تتعطل ÙÙŠ اللعبة" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "ÙÙŠ اللعبة" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "معلومات" @@ -2960,7 +2939,7 @@ msgstr "معلومات" msgid "Information" msgstr "المعلومات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "معلومات" @@ -2972,7 +2951,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -2980,11 +2959,11 @@ msgstr "SD Card ادرج " msgid "Insert name here.." msgstr "أدخل اسم هنا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -2993,34 +2972,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3041,15 +3020,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "الدقة الداخلية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (بطيئة جدا)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "تتعطل ÙÙŠ المقدمة" @@ -3058,11 +3037,11 @@ msgstr "تتعطل ÙÙŠ المقدمة" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "قيمة غير صالحة!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -3083,7 +3062,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "تسجيل المل٠غير صالح" @@ -3091,21 +3070,21 @@ msgstr "تسجيل المل٠غير صالح" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "غير صالح حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italian" @@ -3113,16 +3092,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (موصى به)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL recompiler (تجريبي )" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanese" @@ -3130,7 +3109,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3141,17 +3120,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "المÙتاح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korean" @@ -3169,19 +3148,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "الكتابة Ùوق آخر حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "آخر حالة محÙوظة" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3191,8 +3174,8 @@ msgstr "اليسار" msgid "Left Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3200,89 +3183,89 @@ msgstr "" "انقر الأيسر لاكتشا٠مÙاتيح الاختصار.\n" "أدخل لمسح المساحة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "أقل من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "الحد من عدد الإطارات ÙÙŠ الثانية " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "تحميل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "تحميل القوام المخصص" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "1 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "2 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "3 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "4 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "5 تحميل حالة " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "6 تحميل حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "7 تحميل حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "8 تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3296,31 +3279,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "قيمة تحميل إعداد مسبق من هاك نماذج المتوÙرة." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "المحلية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Lock Threads to Cores" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "سجل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "سجل الإعدادات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "نوع السجل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3332,12 +3311,12 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "مختلÙان النواتج" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "تسجيل" @@ -3356,7 +3335,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3370,24 +3349,24 @@ msgstr "" msgid "Main Stick" msgstr "العصا الأيسر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "معر٠المنتج :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "المنتج :" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "عالي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "بطاقة الذاكرة لديه بالÙعل باستثناء هذا العنوان" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "بطاقة الذاكرة Ùتحت بالÙعل" @@ -3396,7 +3375,7 @@ msgid "Memory Byte" msgstr "ذاكرة بايت" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "بطاقة الذاكرة" @@ -3431,20 +3410,20 @@ msgstr "حجم بطاقة الذاكرة لا تتطابق مع حجم المل msgid "Menu" msgstr "القائمة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "الميكروÙون" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "منخÙض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3453,7 +3432,7 @@ msgstr "إعدادات منوعة" msgid "Modifier" msgstr "معدل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3478,7 +3457,7 @@ msgstr "موشن بلس" msgid "Motor" msgstr "محرك" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3500,7 +3479,7 @@ msgstr "" msgid "Multiply" msgstr "تضاعÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3600,16 +3579,16 @@ msgstr "التبويب" msgid "NP Up" msgstr "Ùوق" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "الاسم :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "الاسم :" @@ -3618,20 +3597,20 @@ msgstr "الاسم :" msgid "Native GCI files(*.gci)" msgstr "Native GCI files(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "بحث جديد" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "الصÙحة التالية" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "البحث التالي" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "اسمك :" @@ -3639,7 +3618,7 @@ msgstr "اسمك :" msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "لم يتم العثور على الايزو " @@ -3661,7 +3640,7 @@ msgstr "لا الالتحام" msgid "No file loaded" msgstr "لا يوجد مل٠تحميل" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3674,33 +3653,33 @@ msgstr "لا مل٠مسجل" msgid "No save folder found for title %s" msgstr "لا Ø­Ùظ المجلد نتيجة البحث عن العنوان %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "لا شيء" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "لا يساوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "غير مجموعة" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "غير متصل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "ملاحظات" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "ملاحظات :" @@ -3709,7 +3688,7 @@ msgstr "ملاحظات :" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "إشعار" @@ -3717,16 +3696,16 @@ msgstr "إشعار" msgid "Num Lock" msgstr "ارقام القÙÙ„" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "عدد من رموز :" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "ننشوك" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "تسريع ننشوك" @@ -3734,11 +3713,11 @@ msgstr "تسريع ننشوك" msgid "Object" msgstr "الهدÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "نطاق الهدÙ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "إيقاÙ" @@ -3746,52 +3725,52 @@ msgstr "إيقاÙ" msgid "Offset:" msgstr "تعويض :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Ùقط %d كتل متاحة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ùتح الملÙ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL : لا يمكن إنشاء سياق الجهاز %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL : لا يمكن العثور على أجهزة الصوت" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL : لا يمكن Ùتح الجهاز %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3804,7 +3783,7 @@ msgstr "خيارات" msgid "Orange" msgstr "البرتقالي" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3814,8 +3793,8 @@ msgstr "" "انقر بالزر الأيمن للتصدير كاÙØ© Ø­Ùظ,\n" "واستيراد وحÙظ لبطاقة ذاكرة جديدة\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "أخرى" @@ -3827,19 +3806,19 @@ msgstr "" "العميل قطع أخرى ÙÙŠ حين يتم تشغيل اللعبة! تم تعطيل تشغيل نت. كنت يدويا إيقا٠" "اللعبة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "الإخراج" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "تشغيل التسجيل" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "تحكم" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "تحكم" @@ -3855,7 +3834,7 @@ msgstr "صÙحة لأسÙÙ„" msgid "Page Up" msgstr "أعلى الصÙحة" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "اقتران" @@ -3867,34 +3846,34 @@ msgstr "الÙقرة" msgid "Parameters" msgstr "معلمات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "قسم %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "باتش" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "وقÙØ©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "لكل بكسل إضاءة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "مثالية" @@ -3903,36 +3882,36 @@ msgstr "مثالية" msgid "Perspective %d" msgstr "مشهد %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "بدأ اللعبه" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "تشغيل التسجيل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "بدأ/ايقاÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "قابلة للتشغيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "خيارات التشغيل" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3944,54 +3923,54 @@ msgstr "الرجاء إنشاء منظور قبل الحÙظ" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "تحكم 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "المنÙØ° :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4004,11 +3983,11 @@ msgstr "إعدادات مسبقة :" msgid "Prev Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "الصÙحة السابقة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "القيمة السابقة" @@ -4016,7 +3995,7 @@ msgstr "القيمة السابقة" msgid "Print" msgstr "طباعة" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "المل٠الشخصي" @@ -4024,7 +4003,7 @@ msgstr "المل٠الشخصي" msgid "Properties" msgstr "خصائص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "إزالة التخزين المؤقت" @@ -4032,8 +4011,8 @@ msgstr "إزالة التخزين المؤقت" msgid "Question" msgstr "السؤال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "خروج" @@ -4051,7 +4030,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4059,46 +4038,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "روسيا" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "قوه" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "وضع القراءة Ùقط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "حقيقي" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "ويموت حقيقي " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "ويموت حقيقي " -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "إعادة توصيل تأكيد ويموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "إعادة تحميل حالة ويموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "تسجيل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "تسجيل معلومات" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "تسجيل الخيارات" @@ -4114,7 +4093,7 @@ msgstr "اليسار أحمر" msgid "Red Right" msgstr "اليمين أحمر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4128,29 +4107,29 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد لا شيء." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "تحديث" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "تحديث قائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "تحديث القائمة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "إزالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4160,17 +4139,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "تقدم إلى الشاشة الرئيسية" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "إعادة ضبط" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "النتائج" @@ -4192,29 +4171,25 @@ msgstr "العصا الايمن" msgid "Rumble" msgstr "هزاز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russian" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Ø­Ùظ الحالة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "آمنة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "معدل العينة :" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Ø­Ùظ" @@ -4222,90 +4197,90 @@ msgstr "Ø­Ùظ" msgid "Save GCI as..." msgstr "GCI Ø­Ùظ باسم " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "1 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "2 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "3 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "4 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "5 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "6 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "7 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "8 Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Ø­Ùظ حالة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Ùحص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "التقاط صوره" @@ -4313,25 +4288,25 @@ msgstr "التقاط صوره" msgid "Scroll Lock" msgstr "انتقل تأمين" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "بحث عن اسرار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4342,20 +4317,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "حدد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4373,23 +4348,23 @@ msgstr "اختر Ø­Ùظ مل٠للاستيراد" msgid "Select floating windows" msgstr "اختر النواÙØ° العائمة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4407,11 +4382,15 @@ msgstr "" "\n" "إذاغير متأكد حدد التلقائي." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "تحديد الخط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4427,7 +4406,7 @@ msgstr "" "إذا لم تكن متأكدا، استخدم دقة سطح المكتب.\n" "إذا لم تكن متأكدا من ذلك ØŒ استخدم أعلى دقة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4443,11 +4422,11 @@ msgstr "" "\n" "Direct3D إذا لم تكن متأكدا استخدام ." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "إرسال" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "موضع الاستشعار:" @@ -4455,24 +4434,24 @@ msgstr "موضع الاستشعار:" msgid "Separator" msgstr "الÙاصل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي الأجهزة مثل استخدام محول شبكة" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" @@ -4482,11 +4461,17 @@ msgstr "تعيين كاÙتراضي بطاقة الذاكرة %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "إعدادات" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" @@ -4494,7 +4479,7 @@ msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" msgid "Shake" msgstr "هزة" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "الاسم المختصر :" @@ -4502,105 +4487,105 @@ msgstr "الاسم المختصر :" msgid "Shoulder Buttons" msgstr "أزرار الكتÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "اظهار &لوحة المراقبة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "اظهار السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "عرض شريط الحالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "أظهر شريط الأدوات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "اظهر محرك الاقراص" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "إظهار نسخة الصادرات للمناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "أظهر عدد الاطارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Ùرنسا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "جيم كيوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "إظهار مدخلات العرض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "إيطاليا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "اليابان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "كوريا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "أظهر اللغة :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "عرض سجل الاعدادات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "اوروبا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "عرض الاجهزه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "إظهار المناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "إظهار الإحصاءات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "امريكا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad اظهار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ظهور رسالة قبل وق٠اللعبة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4608,39 +4593,39 @@ msgstr "" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "إظهار اول كتلة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "إظهار كتل Ø­Ùظ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "إظهار Ø­Ùظ التعليقات" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "إظهار أيقونة الحÙظ " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "إظهارعنوان الحÙظ " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4651,11 +4636,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4669,27 +4654,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ويموت جانبي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "تخطي البيوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4700,7 +4685,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4716,17 +4701,17 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "B خانة " @@ -4734,7 +4719,7 @@ msgstr "B خانة " msgid "Snapshot" msgstr "لقطة" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software Renderer" @@ -4749,11 +4734,11 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "إعدادات الصوت" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "غير صالحة %s خلÙية الصوت." @@ -4767,17 +4752,17 @@ msgstr "Ùشل إنشاء المخزن المؤقت الصوت : %s" msgid "Space" msgstr "مجال" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanish" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "مكبر الصوت:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4797,7 +4782,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا حدد 528*640 ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "تسريع معدل نقل القرص" @@ -4805,51 +4790,55 @@ msgstr "تسريع معدل نقل القرص" msgid "Square Stick" msgstr "مربع العصا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "وحدة تحكم القياسية" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "بدء &اللعب عبر الشبكة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "الحالة" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ø­Ùظ الحالة" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "عصا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "اغلق اللعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4863,7 +4852,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا التحقق." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "امتداد لناÙذة" @@ -4888,8 +4877,8 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "نظام اللغة :" @@ -4897,7 +4886,7 @@ msgstr "نظام اللغة :" msgid "TAIWAN" msgstr "تايوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "الإدخال" @@ -4918,30 +4907,30 @@ msgstr "الجدول الأيسر" msgid "Table Right" msgstr "الجدول الأيمن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "اخذ لقطه من الشاشه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "اختبار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4957,13 +4946,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4985,7 +4974,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "المل٠%s بالÙعل Ù…Ùتوح، لن المل٠غير عنوان مكتوب." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "لا وجود له (%s) المل٠الذي حددته" @@ -5002,7 +4991,7 @@ msgstr "يمكن أن يكون اسم لا تحتوي على الأحر٠'ØŒ'" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5015,11 +5004,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا، استخدم القيمة الثانية الأسرع من الجهة اليمنى." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Ø­Ùظ تحاول نسخة له حجم مل٠غير صالح" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5051,21 +5040,18 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "ثيم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "اختيار ثيم خاظئ" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5077,11 +5063,11 @@ msgid "" "Replay itself." msgstr "هذه المحاكاة إعادة العمل لا تدعم تعديل الرموز التي اعادتها العمل Ù†Ùسه." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5100,7 +5086,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5108,7 +5094,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها هذا المؤل٠مل٠التكوين" @@ -5122,35 +5108,35 @@ msgid "Tilt" msgstr "إمالة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "العنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "إلى" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "تبديل جميع أنواع السجل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "اللعب بالشاشة كاملة" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "حاول تحميل نوع مل٠غير معروÙ." @@ -5168,7 +5154,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turkish" @@ -5180,12 +5166,12 @@ msgstr "القرص الدوار" msgid "Type" msgstr "نوع" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP منÙØ° :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5221,12 +5207,12 @@ msgstr "" "decrypted code. Make sure you typed it correctly.\n" "هل ترغب ÙÙŠ تجاهل هذا الخط ØŒ ومواصلة تحليل?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "غير محدود %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "التراجع عن تحميل الحالة" @@ -5234,7 +5220,7 @@ msgstr "التراجع عن تحميل الحالة" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "غير معروÙ" @@ -5263,8 +5249,8 @@ msgstr "" msgid "Up" msgstr "أعلى" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "التحديث" @@ -5272,23 +5258,23 @@ msgstr "التحديث" msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "استخدام شاشة كاملة" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "استخدام الهيكس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5301,7 +5287,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5315,15 +5301,15 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Ùائدة" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "تحديد أقصى معدل الاطار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "القيمة" @@ -5331,23 +5317,23 @@ msgstr "القيمة" msgid "Value:" msgstr "القيمة:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "القيمة:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Ùديو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "الصوت" @@ -5362,7 +5348,7 @@ msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" msgid "WAD installation failed: error creating ticket" msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5375,16 +5361,16 @@ msgstr "" "إذا لم تكن متأكدا اترك هذا غير محددة." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "التنبيه" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5416,7 +5402,7 @@ msgstr "" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5424,7 +5410,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5432,7 +5418,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5452,7 +5438,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5460,7 +5446,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" @@ -5468,23 +5454,23 @@ msgstr "شاشة واسعة هاك" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "الوي" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5492,17 +5478,17 @@ msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: لا يمكن القراءة من الملÙ" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "تحكم الوي" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "ويموت %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5515,19 +5501,19 @@ msgstr "" "أو ربما هو بسبب الخمول وقت مستقطع أو لسبب آخر.\n" "هل تريد إعادة الاتصال على الÙور?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "ويموت متصل" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "محرك ويموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "إعدادات ويموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "تحكم الوي" @@ -5547,27 +5533,27 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "العمل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "الكتابة على الملÙ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "الكتابة على الملÙ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "الكتابة إلى ناÙذة" @@ -5604,23 +5590,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "لا يمكنك إغلاق أجزاء الصÙحات التي Ùيها." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "عليك اختيار لعبة!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "يجب إدخال اسم!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "يجب إدخال صالح العشري، أو الست عشرية قيمة ثماني." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -5641,7 +5627,7 @@ msgstr "" "يجب أن يكون 0x%04x (but is 0x%04llx)\n" "هل تريد إنشاء واحدة جديدة?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP هاك" @@ -5654,12 +5640,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[انتظار]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5675,7 +5661,7 @@ msgstr "" msgid "[Custom]" msgstr "[مخصص]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5693,7 +5679,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5707,11 +5693,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5728,7 +5714,7 @@ msgstr "Ùشل ÙÙŠ قراءة البيانات من ملÙ: %s" msgid "failed to read header" msgstr "Ùشل ÙÙŠ قراءة عنوان" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التقرير." @@ -5747,7 +5733,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5759,7 +5745,7 @@ msgstr "zFar تصحيح: " msgid "zNear Correction: " msgstr "zNear تصحيح: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "أو" @@ -5767,6 +5753,9 @@ msgstr "أو" #~ msgid "%d %%" #~ msgstr "%d هرتز" +#~ msgid "%d Hz" +#~ msgstr "%d هرتز" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "تخطي الإطار " @@ -5848,6 +5837,21 @@ msgstr "أو" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "احتساب القيم من عمق ثلاثي الأبعاد الرسومات لكل بكسل بدلا من قمة الرأس " +#~ "الواحدة.\n" +#~ "وعلى النقيض من بكسل الإضاءة التي هي مجرد تعزيز، لكل بكسل عمق العمليات " +#~ "الحسابية اللازمة لمضاهاة صحيح عدد قليل من الألعاب.\n" +#~ "\n" +#~ "إذا لم تكن متأكدا اترك هذا التحقق." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -5902,6 +5906,24 @@ msgstr "أو" #~ msgid "Could not get info about plugin %s" #~ msgstr "لا يمكن إنشاء %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr " KDE-Look.org تم بواسطة" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ " Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] تم بواسطة" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr " VistaIcons.com تم بواسطة" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ " black_rider and published on ForumW.org > Web DevelopmentsCreated by " +#~ "black_rider and published on ForumW.org > Web Developments black_rider " +#~ "and published on ForumW.org > Web Developments تم بواسطة" + #~ msgid "DList Cache" #~ msgstr "Caché DList" @@ -5915,6 +5937,9 @@ msgstr "أو" #~ msgid "Disable Lighting" #~ msgstr "تعطيل إضاءة" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "تعطيل العمق لكل بكسل" + #~ msgid "Disable Textures" #~ msgstr "Texturesتعطيل " @@ -6190,6 +6215,9 @@ msgstr "أو" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "تحميل المل٠المحدد (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Lock Threads to Cores" + #, fuzzy #~ msgid "Lua Script Console" #~ msgstr "الكتابة إلى وحدة التحكم" @@ -6267,6 +6295,9 @@ msgstr "أو" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "معدل العينة :" + #~ msgid "Scale:" #~ msgstr "النطاق :" @@ -6378,6 +6409,9 @@ msgstr "أو" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "Theme selection went wrong" +#~ msgstr "اختيار ثيم خاظئ" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index 2ed147917d..a004e7fe5f 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-08-19 08:36-0500\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" "Language: Catalan\n" @@ -22,17 +22,17 @@ msgstr "" "X-Language: ca_ES\n" "X-Source-Language: C\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(masses per ensenyar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Joc:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NO" @@ -60,14 +60,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i connectat" @@ -164,147 +157,147 @@ msgstr "%sImportar GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs lliures; %u Entrades Lliures" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Arrencar des de la unitat de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Punts d'interrupció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Cerca ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestor de &Trucs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Arxiu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Abança imatge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Configuració de &gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Configuració de &tecles d'accés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Càrrega estat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Administrador de targeta de memòria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Obrir ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcions" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Modalitat de només &lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&So" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Aturar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Visualitza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -324,7 +317,7 @@ msgstr "(-) + ZAprop" msgid "(UNKNOWN)" msgstr "(DESCONEGUT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(Deshabilitat)" @@ -332,19 +325,19 @@ msgstr "(Deshabilitat)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bits" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bits" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bits" @@ -352,20 +345,20 @@ msgstr "8 bits" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -373,25 +366,27 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Una finestra de «NetPlay» ja és oberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "No s'està executant cap joc actualment." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "No s'ha trobat cap dispositiu bluetooth compatible! \n" "(Només la pila Bluetooth de Microsoft és compatible.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -426,13 +421,13 @@ msgstr "" "\n" "Vostè ha d'enviar el port TCP per rebre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-placa base" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codis AR " @@ -440,19 +435,19 @@ msgstr "Codis AR " msgid "About Dolphin" msgstr "Sobre Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Acceleració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisió:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulació acurada de Vbeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -467,8 +462,8 @@ msgstr "" "\n" "Si no n'esteu segur, activeu l'EFB a mode textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acció" @@ -495,7 +490,7 @@ msgstr "" "Error d' «Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a codi afegit " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -521,16 +516,17 @@ msgstr "" "Error d'«Action Replay»: Mida no vàlida (%08x: Adreça = %08x) a l'escriure " "al punter (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error d'«Action Replay»: Valor no vàlid (%08x) en la copia de memòria (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Error d'«Action Replay»r: Codi Mestre i escriure a CCXXXXXX no està " "implementat (% s)" @@ -540,27 +536,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error d'«Action Replay»: línia de codi AR no vàlida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "«Action Replay»: Codi condicional: Mida no vàlida %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipus de codi Normal no vàlid %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Codi Normal %i: %08x subtipus invàlid (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Codi Normal 0: Subtipus no vàlid %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -569,11 +565,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -581,13 +577,13 @@ msgstr "Afegeix Pegat" msgid "Add new pane" msgstr "Afegeix un nou panell" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Afegir ..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adreça IP/Nom màquina:" @@ -627,50 +623,50 @@ msgstr "" "\n" "NOTA: Comproveu la finestra de Log o consola dels valors adquirits." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar la pressió de control analògic per activar els botons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configuració avançada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tots els fitxers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -683,20 +679,20 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrat anisotròpic:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -708,15 +704,15 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -726,16 +722,16 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Àrab" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -743,13 +739,13 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -757,12 +753,12 @@ msgstr "Relació d'aspecte:" msgid "At least one pane must remain open." msgstr "Almenys un panell ha de romandre obert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -770,24 +766,24 @@ msgstr "Suport d'àudio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error en obrir el dispositiu AO \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Mida de la finestra)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajust automàtic de la mida de la finestra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -810,12 +806,12 @@ msgstr "&Registres" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Configuració del Suport" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Suport:" @@ -833,15 +829,15 @@ msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalls del Imatge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Imatge:" @@ -849,11 +845,11 @@ msgstr "Imatge:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Bàsic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configuració bàsica" @@ -881,42 +877,42 @@ msgstr "Blau esquerra" msgid "Blue Right" msgstr "Blau dret" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Abaix" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controls enllaçats: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Trencat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Examinar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botons" @@ -937,37 +933,15 @@ msgstr "Palanca-C" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motor d'emulació de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Llistes de memòria cau de pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula la profunditat dels gràfics 3D per-píxel en contes de per vèrtex.\n" -"En contra de d'il·luminació per píxel (que quasi no millora), els càlculs de " -"profunditat per píxel són necessaris per emular bé un conjunt petit de " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desmarcat.Calcula la profunditat dels " -"gràfics 3D per-pixel en contes de per vèrtex.\n" -"En contra de l'il·luminació per píxel (que quasi no millora), els càlculs de " -"profunditat per píxel són necessaris per emular bé un conjunt petit de " -"jocs.\n" -"\n" -"Si no n'esteu segurs, deixeu-ho desmarcat." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -988,7 +962,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancel·lar" @@ -1004,7 +978,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -1015,7 +989,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1023,12 +997,12 @@ msgstr "" "No es pot usar aquest arxiu com una targeta de memòria. \n" "Està tractant d'usar el mateix arxiu en les dues ranures?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No es pot trobar WiiMote per bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No es pot trobar l'identificador de connexió WiiMote %02x" @@ -1042,7 +1016,7 @@ msgstr "No es pot llegir des del connector DVD - Interfície DVD: Error greu" msgid "Caps Lock" msgstr "Bloc Maj." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Català" @@ -1050,24 +1024,24 @@ msgstr "Català" msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Canviar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Canviar &Disc ..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Canviar Disc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Canvi de joc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1083,12 +1057,11 @@ msgstr "Canvia el signe del paràmetre zLluny (després de correcció)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Canvia el signe del paràmetre zAprop (després de correcció)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Canviar això no tindrà cap efecte mentre l'emulador s'executa!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Truc" @@ -1096,47 +1069,47 @@ msgstr "Truc" msgid "Cheat Code" msgstr "Codi de trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cerca trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Administrador de trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Xinès (simplificat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1144,7 +1117,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1152,8 +1125,8 @@ msgstr "" "Trieu l'arxiu a utilitzar com «apploader»: (s'aplica als discos construïts a " "partir de només els directoris)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Seleccioneu la carpeta on extreure" @@ -1167,8 +1140,8 @@ msgstr "Clàssic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Esborrar" @@ -1180,22 +1153,22 @@ msgstr "" "Client desconnectat mentre el joc s'estava executant! NetPlay s'ha " "desactivat. Haurà d'aturar manualment el joc." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Tancar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Configurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Codi d'Informació" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Codi:" @@ -1207,91 +1180,91 @@ msgstr "Comanda" msgid "Comment" msgstr "Comentari" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Comprimeix ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configuració" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configuració" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar Control" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar a l'aturar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Connectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Connectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Connectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Connectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Connectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connectant ..." @@ -1311,12 +1284,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Copia fallada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a la targeta de memòria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Nucli" @@ -1325,7 +1298,7 @@ msgstr "Nucli" msgid "Could not create %s" msgstr "No s'ha pogut crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "No s'ha pogut inicialitzar el suport %s." @@ -1346,12 +1319,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No es pot reconèixer el fitxer ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "No s'ha pogut desar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1373,11 +1346,11 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1385,17 +1358,17 @@ msgstr "" "No s'ha pogut inicialitzar el nucli. \n" "Verifiqueu la configuració." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Compta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crear Codi AR" @@ -1404,25 +1377,7 @@ msgstr "Crear Codi AR" msgid "Create new perspective" msgstr "Crear una nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Creat per KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Creat per VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creador:" @@ -1430,11 +1385,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Crític" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Retallar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1448,12 +1403,12 @@ msgstr "" msgid "Crossfade" msgstr "Atenuar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directori actual ha canviat de %s a %s després de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Projecció personalitzada" @@ -1461,11 +1416,11 @@ msgstr "Projecció personalitzada" msgid "Custom Projection Hack Settings" msgstr "Configuració de la projecció personalitzada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Txec" @@ -1477,36 +1432,36 @@ msgstr "" msgid "D-Pad" msgstr "Direcció digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulació DSP HLE (ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1518,11 +1473,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Mida de dades" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" @@ -1539,11 +1494,11 @@ msgstr "Arxius Datel MaxDrive/Pro (*. sav)" msgid "Dead Zone" msgstr "Zona morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depuració" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Depuració" @@ -1551,24 +1506,24 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Descomprimint ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1577,11 +1532,11 @@ msgid "Default font" msgstr "Font per defecte" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Eliminar partida desada" @@ -1590,11 +1545,11 @@ msgstr "Eliminar partida desada" msgid "Delete the existing file '%s'?" msgstr "Eliminar el fitxer existent '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descripció" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1606,13 +1561,13 @@ msgid "" msgstr "" "Detectat intent de llegir més dades des del DVD que caben dins de la memòria." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1636,20 +1591,16 @@ msgstr "" "Ha fallat la suma de comprovació\n" "i també ha fallat la comprovació de la suma de la copia del directory" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deshabilitar boira" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Deshabilitar la profunditat per-pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1664,7 +1615,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1680,7 +1631,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disc" @@ -1689,11 +1640,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Error de lectura de disc" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1707,20 +1658,24 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuració de gràfics de Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Lloc &Web Dolphin" @@ -1728,32 +1683,32 @@ msgstr "Lloc &Web Dolphin" msgid "Dolphin Configuration" msgstr "Configuració de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuració de Wiimote emulat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuració Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1761,7 +1716,7 @@ msgstr "" "Dolphin no ha pogut trobar cap ISO GC/Wii. Feu doble clic aquí per buscar-" "les ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1769,16 +1724,21 @@ msgstr "" "Dolphin està actualment configurat per ocultar tots els jocs. Feu doble clic " "aquí per mostrar tots-los ..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Avall" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Descarregar Codis (base de dades WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregat %lu codis. (Afegits %lu)" @@ -1787,27 +1747,27 @@ msgstr "Descarregat %lu codis. (Afegits %lu)" msgid "Drums" msgstr "Tambors" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Bolcat d'àudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Bolcat de destinació EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Bolcat d'imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Bolcat de textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1818,7 +1778,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1828,7 +1788,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1838,17 +1798,17 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandès" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Sortir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Còpies EFB" @@ -1869,11 +1829,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualitzacions recents de memòria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Edita" @@ -1881,7 +1841,7 @@ msgstr "Edita" msgid "Edit ActionReplay Code" msgstr "Modificar codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modificar configuració" @@ -1889,12 +1849,12 @@ msgstr "Modificar configuració" msgid "Edit Patch" msgstr "Modificar el pagat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modificar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Modificació ..." @@ -1902,7 +1862,7 @@ msgstr "Modificació ..." msgid "Effect" msgstr "Efecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" @@ -1910,7 +1870,7 @@ msgstr "Activar la memòria cau d'imatge («Frame Buffer»)" msgid "Emu Thread already running" msgstr "El fil de l'emulador ja s'està executant" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1924,7 +1884,7 @@ msgstr "" "\n" "Si no n'esteu segur, activeu l'emulació virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1940,19 +1900,19 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote emulat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estat d'emulació:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1969,72 +1929,71 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar les millors tècniques disponibles" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Habilitar memòria cau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activar Trucs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar Doble nucli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Habilitar Doble nucli (acceleració)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activar tecles d'accés ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salt d'inactiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salt d'inactiu (acceleració)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Habilitar pantalla panoràmica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Habilitar malla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2046,7 +2005,7 @@ msgstr "" "Millora la qualitat visual de les textures que es troben en un angle de " "visió obliqua." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2054,11 +2013,11 @@ msgstr "" "Habilitar l'accés al disc ràpid. Necessari per a alguns jocs. (Activat = " "ràpid, Desactivat = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Habilitar pàgines" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2070,7 +2029,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2082,7 +2041,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2090,7 +2049,7 @@ msgstr "" "Activi aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2100,11 +2059,28 @@ msgstr "" "Gestió de memòria. Precisa en el maquinari, però lent per emular. " "(Activat=compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2116,7 +2092,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2124,7 +2100,7 @@ msgstr "" "Activa la memòria de la Unitat de Gestió, necessari per a alguns jocs. " "(Activat = compatible, Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2138,14 +2114,14 @@ msgstr "" msgid "End" msgstr "Fi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Anglès" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Millores" @@ -2163,17 +2139,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error en carregar l'idioma seleccionat. Es retorna a l'idioma per defecte " @@ -2213,32 +2189,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Fallada d'exportació" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar fitxer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar gravació ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar totes les partides desades" @@ -2254,7 +2230,7 @@ msgstr "Desar exportació com a..." msgid "Extension" msgstr "Extensió" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Memòria cau d'imatge externa" @@ -2266,44 +2242,44 @@ msgstr "Paràmetre addicional" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paràmetre addicional útil només a ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extreure tots els arxius ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extreure «Apploader» ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extreure DOL ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extreure del repertori ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extreure arxiu ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extreure partició ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraient %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extreure tots els arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraient Directori" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraient ..." @@ -2311,7 +2287,7 @@ msgstr "Extraient ..." msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2319,7 +2295,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Mida FST:" @@ -2327,15 +2303,15 @@ msgstr "Mida FST:" msgid "Failed to Connect!" msgstr "Error al connectar!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Error a l'escoltar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Error al descarregar codis." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Error a l' extreure a %s!" @@ -2453,41 +2429,41 @@ msgstr "No s'ha pogut escriure la capçalera per %s" msgid "Failed to write header for file %d" msgstr "No s'ha pogut escriure la capçalera pel fitxer% d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Jugador fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "informació del fitxer" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "L'arxiu no conté codis." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Arxiu convertit a. GCI" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2504,7 +2480,7 @@ msgstr "" "L'arxiu té la extensió \"%s\n" "les extensions vàlides són (.raw /.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "L'arxiu no es pot reconèixer com una targeta de memòria" @@ -2517,19 +2493,19 @@ msgstr "Arxiu no comprimit" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2537,27 +2513,27 @@ msgstr "" msgid "First Block" msgstr "Primer Bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Arregla les sumes de comprovació" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Força la consola com NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtrat de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2570,7 +2546,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2582,7 +2558,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2618,43 +2594,43 @@ msgstr "Imatge" msgid "Frame " msgstr "Imatge" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar imatges" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Bolcat d'imatges utilitzant FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Rang d'imatges" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salta imatge&s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limit d'imatges/s:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Imatges a Enregistrar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Visió lliure" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francès" @@ -2662,16 +2638,16 @@ msgstr "Francès" msgid "Frets" msgstr "Trasts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "de" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Pantalla completa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolució de pantalla a pantalla completa:" @@ -2684,7 +2660,7 @@ msgstr "Arxiu de GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Control GC" @@ -2692,27 +2668,27 @@ msgstr "Control GC" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID del Joc:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "El joc encara està en marxa!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "El joc no està funcionant!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Joc no trobat!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Configuració de jocs específics" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuració de joc" @@ -2720,25 +2696,25 @@ msgstr "Configuració de joc" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configuració control Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codis Gecko" @@ -2753,20 +2729,20 @@ msgstr "" "Codi Gecko ha fallat a executar (CT%i CST%i) (%s) \n" "(Pot ser un codi incorrecte o el tipus de codi encara no està suportat.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "General" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Configuració General" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemany" @@ -2777,19 +2753,19 @@ msgstr "" "Aconseguir codi AR: l'índex és major que la grandària de la llista de codis " "%lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gràfics" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configuració de gràfics" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Més gran que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2807,7 +2783,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grec" @@ -2827,11 +2803,11 @@ msgstr "Verd dret" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "S'ha cridat HCI_CMD_INQUIRY , si us plau informeu!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Modificacions" @@ -2839,7 +2815,7 @@ msgstr "Modificacions" msgid "Header checksum failed" msgstr "Comprovació de la checksum de capçalera ha fallat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreu" @@ -2851,7 +2827,7 @@ msgstr "Alçada" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2872,11 +2848,11 @@ msgstr "" msgid "Hide" msgstr "Oculta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Ocultar el cursor del ratolí" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2890,8 +2866,8 @@ msgstr "" msgid "Home" msgstr "Inici" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Amfitrió" @@ -2899,17 +2875,17 @@ msgstr "Amfitrió" msgid "Hotkey Configuration" msgstr "Tecla d'accés de configuració" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tecles d'accés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongarès" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Híbrid" @@ -2937,7 +2913,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Configuració de IPL" @@ -2945,19 +2921,19 @@ msgstr "Configuració de IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Punter IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilitat d'IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -2969,20 +2945,20 @@ msgstr "ITÀLIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si el FPS és irregular, aquesta opció pot ser útil. (Activat = compatible, " "Desactivat = ràpid)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2993,11 +2969,11 @@ msgstr "" "del joc complet (NTSC: 60, PAL: 50), també cal deshabilitar la regulació de " "so DSP per a fer-ho efectiu." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignora els canvis de format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3011,7 +2987,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3025,7 +3001,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Desar importació" @@ -3033,7 +3009,7 @@ msgstr "Desar importació" msgid "Import failed, try again?" msgstr "Fallada a l'importació, tornar a provar?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3041,11 +3017,11 @@ msgstr "" "L'arxiu importat té extensió sgc \n" "però té una capçalera incorrecte." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "l'Arxiu importat té una longitud no vàlida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3053,7 +3029,7 @@ msgstr "" "L'Arxiu importat té extensio sav \n" "però la capçalera és incorrecte" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3065,16 +3041,16 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "En Joc" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "En-joc" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3082,7 +3058,7 @@ msgstr "Info" msgid "Information" msgstr "Informació" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3094,7 +3070,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3102,11 +3078,11 @@ msgstr "Inserir la targeta SD" msgid "Insert name here.." msgstr "Introduïu un nom aquí .." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3117,34 +3093,34 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3165,15 +3141,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Error intern LZO - lzo_init () ha fallat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolució Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Intèrpret (molt lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Introducció" @@ -3182,11 +3158,11 @@ msgstr "Introducció" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Mida no vàlida (%x) o paraula màgica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor invàlid!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Invàlid bat.map o entrada al directori" @@ -3210,7 +3186,7 @@ msgstr "" "% s\n" "És possible que necessiti re-descarregar aquest joc." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Enregistrament de fitxer invàlid" @@ -3218,21 +3194,21 @@ msgstr "Enregistrament de fitxer invàlid" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Estat invàlid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italià" @@ -3240,16 +3216,16 @@ msgstr "Italià" msgid "JAPAN" msgstr "JAPÓ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomanat)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador JITIL experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonès" @@ -3257,7 +3233,7 @@ msgstr "Japonès" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3268,17 +3244,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Clau" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Corea" @@ -3296,19 +3272,23 @@ msgstr "Botó L" msgid "L-Analog" msgstr "L-Analògic" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Últim estat sobreescrit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Últim estat desat" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3318,8 +3298,8 @@ msgstr "Esquerra" msgid "Left Stick" msgstr "Palanca esquerra" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3327,7 +3307,7 @@ msgstr "" "Clic esquerre per detectar tecles d'accés. \n" "Entrar a l'espai per esborrar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3337,7 +3317,7 @@ msgstr "" "Clic mig per desactivar. \n" "Clic det per més opcions." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3345,76 +3325,76 @@ msgstr "" "Clic Esquerra/Dreta per més opcions. \n" "Clic Mig per deshabilitar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menys de" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar per FPS " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carrega textures personalitzades" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar ranura d'estat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar ranura d'estat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar ranura d'estat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar ranura d'estat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar ranura d'estat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar ranura d'estat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar ranura d'estat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar ranura d'estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3428,31 +3408,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carrega els valors preestablerts dels patrons disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Bloca els fils d'execució als nuclis" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Registre Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuració del registre Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipus de registre Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3465,12 +3441,12 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Sortides del registrador Log" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Inici de sessió" @@ -3491,7 +3467,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3505,24 +3481,24 @@ msgstr "Arxius MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Palanca principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Fabricant:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricant:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Màxim" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La targeta de memòria ja té una entrada amb aquest títol." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Targeta de memòria ja oberta." @@ -3531,7 +3507,7 @@ msgid "Memory Byte" msgstr "Byte de memòria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Targeta de memòria" @@ -3569,20 +3545,20 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Micròfon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mínim" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3591,7 +3567,7 @@ msgstr "Altres Configuracions" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3616,7 +3592,7 @@ msgstr "Motion Plus®" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3639,7 +3615,7 @@ msgstr "" msgid "Multiply" msgstr "Múltiple" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3739,16 +3715,16 @@ msgstr "NP Tabulador" msgid "NP Up" msgstr "NP Amunt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nom:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nom:" @@ -3757,20 +3733,20 @@ msgstr "Nom:" msgid "Native GCI files(*.gci)" msgstr "Arxius natius GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nou escaneig" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Pàgina següent" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Següent escaneig" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Sobrenom:" @@ -3778,7 +3754,7 @@ msgstr "Sobrenom:" msgid "No Country (SDK)" msgstr "No país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "No s'han trobat ISOs o WADs" @@ -3800,7 +3776,7 @@ msgstr "No acoblament" msgid "No file loaded" msgstr "No s'ha carregat cap fitxer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "No hi ha entrades lliures a l'índex de directoris" @@ -3813,33 +3789,33 @@ msgstr "Arxiu no enregistrat" msgid "No save folder found for title %s" msgstr "No s'ha trobat la carpeta de partides desades per el joc %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Cap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noruega Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Sense establir" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "No està connectat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notes:" @@ -3848,7 +3824,7 @@ msgstr "Notes:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Avís" @@ -3856,16 +3832,16 @@ msgstr "Avís" msgid "Num Lock" msgstr "Bloq Numèric" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Nombre de codis:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchukâ„¢" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Acceleració del Nunchuk" @@ -3873,11 +3849,11 @@ msgstr "Acceleració del Nunchuk" msgid "Object" msgstr "Objecte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rang d'objecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Apagar" @@ -3885,52 +3861,52 @@ msgstr "Apagar" msgid "Offset:" msgstr "Desplaçament:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Només queden %d blocs disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Obre fitxer ..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: no es pot crear el context pel dispositiu %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: no es poden trobar dispositius de so" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: no es pot obrir el dispositiu %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" @@ -3943,7 +3919,7 @@ msgstr "Opcions" msgid "Orange" msgstr "Taronja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3953,8 +3929,8 @@ msgstr "" "Feu clic dret i exporteu totes les partides desades,\n" "i importeu les partides desades una targeta de memòria nova\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Altres" @@ -3966,19 +3942,19 @@ msgstr "" "Un altre client s'ha desconnectat mentre joc s'estava executant! NetPlay " "s'ha desactivat. Aturar manualment el joc." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Sortida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Reproduir gravació..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Control" @@ -3994,7 +3970,7 @@ msgstr "Avançar pàgina" msgid "Page Up" msgstr "Retrocedir Pàgina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Aparellar" @@ -4006,34 +3982,34 @@ msgstr "Paràgraf" msgid "Parameters" msgstr "Paràmetres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partició %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Pegats" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Il·luminació per píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfecte" @@ -4042,36 +4018,36 @@ msgstr "Perfecte" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Executar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproduir enregistrament" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Reproduir/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opcions de reproducció" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4083,54 +4059,54 @@ msgstr "Creeu una perspectiva abans de desar" msgid "Plus-Minus" msgstr "Més-Menys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portuguès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4143,11 +4119,11 @@ msgstr "Preestablerts:" msgid "Prev Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Pàgina anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4155,7 +4131,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4163,7 +4139,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propietats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Netejar memòria cau" @@ -4171,8 +4147,8 @@ msgstr "Netejar memòria cau" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sortir" @@ -4190,7 +4166,7 @@ msgstr "Botó R" msgid "R-Analog" msgstr "R-Analògic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4198,46 +4174,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RÚSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rang" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Només lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar tornar a connectar el Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Tornar a connectar el Wiimote al carregar l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Enregistrar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informació d'enregistrament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Enregistrant Opcions" @@ -4253,7 +4229,7 @@ msgstr "Vermell Esquerra" msgid "Red Right" msgstr "Vermell Dret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4268,29 +4244,29 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Cap" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualitzar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualitzar llista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualitza la llista de jocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Treure" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4300,17 +4276,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderitzar a la finestra principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultats" @@ -4332,29 +4308,25 @@ msgstr "Palanca dreta" msgid "Rumble" msgstr "Vibració" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar DSP LLE en un fil d'execució dedicat (no recomanat)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rússia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "&Desa l'estat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Segur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Freqüència de mostreig:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Desar" @@ -4362,90 +4334,90 @@ msgstr "Desar" msgid "Save GCI as..." msgstr "Anomena i desa GCI..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Desar ranura estat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Desar ranura estat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Desar ranura estat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Desar ranura estat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Desar ranura estat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Desar ranura estat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Desar ranura estat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Desar ranura estat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Desar Estat ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Cercant ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Capturar" @@ -4453,25 +4425,25 @@ msgstr "Capturar" msgid "Scroll Lock" msgstr "Bloc desplaçament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Cerca trucs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4482,20 +4454,20 @@ msgid "Section %s not found in SYSCONF" msgstr "La secció %s no trobada a SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4512,23 +4484,23 @@ msgstr "Seleccioneu un arxiu de salvar la importació" msgid "Select floating windows" msgstr "Seleccioneu finestres flotants" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4546,11 +4518,16 @@ msgstr "" "\n" "Si no n'esteu segurs, seleccioneu Automàtic" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "L'arxiu especificat \"%s\" no existeix" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Font seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4566,7 +4543,7 @@ msgstr "" "Si no n'esteu segurs, utilitzeu la resolució de l'escriptori.\n" "Si encara no n'esteu segurs, utilitzeu la resolució més alta que us funciona." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4582,11 +4559,11 @@ msgstr "" "\n" "Si no n'esteu segurs, utilitzeu Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Barra de sensors de posició" @@ -4594,26 +4571,26 @@ msgstr "Barra de sensors de posició" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port sèrie 1 - Aquest és el port que utilitzen els dispositius com ara " "d'adaptador de xarxa" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir com a targeta de memòria predeterminada %c" @@ -4625,11 +4602,17 @@ msgstr "" "SetARCode_IsActive: L'índex és major que la grandària de la llista de codis " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configuració ..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No es troba el fitxer de configuració" @@ -4637,7 +4620,7 @@ msgstr "SetupWiiMem: No es troba el fitxer de configuració" msgid "Shake" msgstr "Sacsejar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nom curt:" @@ -4645,105 +4628,105 @@ msgstr "Nom curt:" msgid "Shoulder Buttons" msgstr "Botons LR" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar Barra d'e&stat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar Barra d'&eines" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar unitats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar regions de copia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostra FPS (imatges/s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itàlia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar Japó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar la &Configuració del registre de log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar estadístiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar un missatge de confirmació abans d'aturar el joc." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4751,39 +4734,39 @@ msgstr "" "Deshabilitar d'això pot evitar els missatges molestos i no crítics, però " "també pot significar que Dolphin de sobte es pengi sense cap explicació." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostra primer bloc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostra blocs de partida desada" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostra desar un comentari" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostra icona de desar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostra títol desat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4795,11 +4778,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconeguda" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4813,27 +4796,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Xinès simplificat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Salta l'accés d'EFB des de la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4845,7 +4828,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4862,17 +4845,17 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Ranura B" @@ -4880,7 +4863,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Captura" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderitzat per programari" @@ -4897,11 +4880,11 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Configuració de so" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Suport de so %s invàlid." @@ -4915,17 +4898,17 @@ msgstr "Ha fallat la creació del buffer de so: %s" msgid "Space" msgstr "Espai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanyol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volum de l'altaveu:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4946,7 +4929,7 @@ msgstr "" "\n" "Si no n'esteu segur, seleccioneu 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accelerar la tassa de transferència de Disc" @@ -4954,51 +4937,55 @@ msgstr "Accelerar la tassa de transferència de Disc" msgid "Square Stick" msgstr "Palanca quadrada" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Control estàndard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Iniciar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Iniciar grava&ció" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Iniciar gravació" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Estat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estats desats" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Palanca" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Aturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5012,7 +4999,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ajustar a la finestra" @@ -5037,8 +5024,8 @@ msgstr "Arxius de partides desades importats correctament" msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5046,7 +5033,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5067,30 +5054,30 @@ msgstr "Taula esquerra" msgid "Table Right" msgstr "Taula dreta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capturar pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Memòria cau de textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Superposició del format de textura" @@ -5106,13 +5093,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5135,7 +5122,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "El fitxer %s ja estava oberta, la capçalera de l'arxiu no s'escriurà." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "L'arxiu especificat (%s) no existeix" @@ -5152,7 +5139,7 @@ msgstr "El nom no pot contenir el caràcter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El resultat del desxifratge el codi AR no conté cap línia." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5165,12 +5152,12 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho al segon valor més ràpid de la dreta." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "El fitxer de partida guardada que està intentant copiar té la mida invàlida" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5203,14 +5190,11 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema visual" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Hi ha hagut un error a la selecció del tema visual." - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5219,7 +5203,7 @@ msgstr "" "Hi ha d'haver una entrada per 00000001/00000002. El seu bolcat de la NAND " "probablement és incompleta." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5235,11 +5219,11 @@ msgstr "" "Aquest simulador «ActionReplay» no és compatible amb els codis que " "modifiquen «ActionReplay»." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5257,7 +5241,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5269,7 +5253,7 @@ msgstr "" "Causa millores importants de velocitat en ordinadors amb més d'un nucli, " "però també poden causar interferències/fallades." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Li permetrà editar manualment el fitxer de configuració INI" @@ -5283,35 +5267,35 @@ msgid "Tilt" msgstr "Inclinació" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Títol" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Activar tots els tipus de registre de Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Activar pantalla completa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Dalt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Xinés tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "S'ha intentat de carregar un tipus de fitxer desconegut." @@ -5331,7 +5315,7 @@ msgstr "" "Intentant de llegir des d'un SYSCONF invàlid \n" "identificadors de Wiimote bt no estan disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turc" @@ -5343,12 +5327,12 @@ msgstr "Taula DJ" msgid "Type" msgstr "Tipus" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5384,12 +5368,12 @@ msgstr "" "desenciptat vàlid. Assegureu-vos que l'heu escrit correctament.\n" "Voleu ignorar aquesta línia i continuar analitzant?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i Indefinit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Desfer la càrrega de l'estat" @@ -5397,7 +5381,7 @@ msgstr "Desfer la càrrega de l'estat" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconegut" @@ -5427,8 +5411,8 @@ msgstr "" msgid "Up" msgstr "Amunt" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualitzar" @@ -5436,23 +5420,23 @@ msgstr "Actualitzar" msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Utilitzar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Utilitzeu hexagonal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Utilitzar advertències" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5465,7 +5449,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5480,15 +5464,15 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Sincronització Vertical" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5496,23 +5480,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbositat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volum" @@ -5527,7 +5511,7 @@ msgstr "instal·lació del WAD ha fallat: Error en crear %s" msgid "WAD installation failed: error creating ticket" msgstr "instal·lació del WAD ha fallat: Error en crear %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5540,16 +5524,16 @@ msgstr "" "Si no n'esteu segurs, deixeu-ho desmarcat." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertència" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertència - Inicialitzant DOL en mode de consola incorrecte!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertència - Inicialitzant ELF en mode de consola incorrecte!" @@ -5583,7 +5567,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5591,7 +5575,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5599,7 +5583,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5619,7 +5603,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Fitxer no obert." @@ -5627,7 +5611,7 @@ msgstr "WaveFileWriter - Fitxer no obert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" @@ -5635,23 +5619,23 @@ msgstr "Modificació de pantalla panoràmica" msgid "Width" msgstr "Ample" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5659,17 +5643,17 @@ msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No s'ha pogut llegir des de l'arxiu" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5682,19 +5666,19 @@ msgstr "" "o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n" "Vols tornar a connectar-lo immediatament?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote connectat" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configuració de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5714,27 +5698,27 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Treballant ..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escriu a consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Escriu en un Fitxer" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escriu en un Fitxer" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escriu a una Finestra" @@ -5773,23 +5757,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No pots tancar panells que tenen pàgines." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Heu de triar un joc!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Heu d'introduir un nom!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5812,7 +5796,7 @@ msgstr "" "Hauria de ser 0x%04x (però és 0x%04llx) \n" "Vol generar un de nou?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Modificador ZTP" @@ -5825,12 +5809,12 @@ msgstr "Codi Zero 3 no està suportat" msgid "Zero code unknown to dolphin: %08x" msgstr "Codi Zero desconegut per Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Esperant ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5846,7 +5830,7 @@ msgstr "" msgid "[Custom]" msgstr "[ Personalitzar ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5865,7 +5849,7 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5880,11 +5864,11 @@ msgstr "" "\n" "Si no n'esteu segur, deixeu-ho desmarcat." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5901,7 +5885,7 @@ msgstr "Error al llegir les dades del fitxer: %s" msgid "failed to read header" msgstr "Error al llegir la capçalera" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Llegint Opcode des de%x Si us plau, informeu." @@ -5922,7 +5906,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -5934,10 +5918,13 @@ msgstr "Correcció zLluny:" msgid "zNear Correction: " msgstr "Correcció ZAprop" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| O" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Per defecte)" @@ -5991,6 +5978,28 @@ msgstr "| O" #~ "\n" #~ "Si no n'esteu segur, deixeu-ho desmarcat." +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula la profunditat dels gràfics 3D per-píxel en contes de per " +#~ "vèrtex.\n" +#~ "En contra de d'il·luminació per píxel (que quasi no millora), els càlculs " +#~ "de profunditat per píxel són necessaris per emular bé un conjunt petit de " +#~ "jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desmarcat.Calcula la profunditat dels " +#~ "gràfics 3D per-pixel en contes de per vèrtex.\n" +#~ "En contra de l'il·luminació per píxel (que quasi no millora), els càlculs " +#~ "de profunditat per píxel són necessaris per emular bé un conjunt petit de " +#~ "jocs.\n" +#~ "\n" +#~ "Si no n'esteu segurs, deixeu-ho desmarcat." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6021,6 +6030,21 @@ msgstr "| O" #~ msgid "Could not copy %s to %s" #~ msgstr "No s'ha pogut copiar de %s a %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creat per KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creat per Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creat per VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creat per black_rider i publicat en ForumW.org > Web Developments" + #~ msgid "Danish" #~ msgstr "Danès" @@ -6030,6 +6054,9 @@ msgstr "| O" #~ msgid "Disable Lighting" #~ msgstr "Deshabilitar l'il·luminació" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Deshabilitar la profunditat per-pixel" + #~ msgid "Disable Textures" #~ msgstr "Deshabilitar Textures" @@ -6237,6 +6264,9 @@ msgstr "| O" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Carrega els fitxer especificats (DOL, ELF, GCM, ISO, WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Bloca els fils d'execució als nuclis" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Baix nivell (LLE) o alt nivell (HLE) d'àudio" @@ -6288,6 +6318,9 @@ msgstr "| O" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Requerit per a l'ús de la font japonesa." +#~ msgid "Sample Rate:" +#~ msgstr "Freqüència de mostreig:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6368,6 +6401,9 @@ msgstr "| O" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Iniciar la finestra de renderitzat a pantalla completa." +#~ msgid "Theme selection went wrong" +#~ msgstr "Hi ha hagut un error a la selecció del tema visual." + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 20786807b1..7b4eba10fa 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-12 12:07+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" "Language: Czech\n" @@ -18,17 +18,17 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" "X-Poedit-Basepath: D:\\cygwin\\home\\Administrátor\\dolphin-emu\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(příliÅ¡ mnoho pro zobrazení)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Hra : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NE" @@ -56,14 +56,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopírovat%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "PÅ™ipojeno %i" @@ -158,147 +151,147 @@ msgstr "%sImportovat GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Volných Bloků; %u Volných Záznamů Adr" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& A" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "O progr&amu..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Zavést z DVD Mechaniky..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Body pÅ™eruÅ¡ení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procházet pro ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Správce &Cheatů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulace" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Soubor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Postup snímkem" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Celá obrazovka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafická nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&NápovÄ›da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Nastavení &klávesových zkratek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Nahrát Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Správce Pa&měťových karet (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Pa&měť" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otevřít..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "V&olby" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Resetovat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Za&stavit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Nás&troje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Zobrazit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -318,7 +311,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEZNÃMÃ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(vypnuto)" @@ -326,19 +319,19 @@ msgstr "(vypnuto)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -346,20 +339,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Žádné rozliÅ¡ení nenalezeno>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -367,25 +360,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay je už otevÅ™ené!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Hra v souÄasnosti neběží!" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Podporované zařízení bluetooth nebylo nalezeno!\n" "(Pouze zásobník Microsoft bluetooth je podporován)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "Musíte pÅ™esmÄ›rovat Váš TCP port na hostitele!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM Základní Deska" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kódy AR" @@ -433,19 +428,19 @@ msgstr "Kódy AR" msgid "About Dolphin" msgstr "O Dolphinu" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Zrychlení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "PÅ™esnost:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Precizní emulace VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -458,8 +453,8 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te radÄ›jí EFB do Textury." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ÄŒinnost" @@ -486,7 +481,7 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Kódu PÅ™idat " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -513,15 +508,16 @@ msgstr "" "Chyba Action Replay: Neplatná velikost (%08x : adresa = %08x) v Zápisu Do " "Ukazatele (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Chyba Action Replay: Neplatná hodnota (%08x) v Kopii PamÄ›ti (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Chyba Action Replay: Hlavní Kód a Zápis do CCXXXXXX nejsou zavedeny (%s)" @@ -530,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Chyba Action Replay: neplatný řádek kódu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Podmínkový kód: Neplatná Velikost %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Neplatný Normální Kód Typu %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normální Kód %i: Neplatný podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normální Kód 0: Neplatný Podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptér:" @@ -559,11 +555,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -571,13 +567,13 @@ msgstr "PÅ™idat Záplatu" msgid "Add new pane" msgstr "PÅ™idat nový panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "PÅ™idat..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresa :" @@ -617,48 +613,48 @@ msgstr "" "\n" "Poznámka: Zkontrolujte Konzoli/Okno protokolu pro získané hodnoty\"" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Upravte tlak analogového ovládání potÅ™ebný k aktivaci tlaÄítek." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "PokroÄilé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "PokroÄilá Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -670,19 +666,19 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Střídat Äasování Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analyzovat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Vyhlazení okrajů" @@ -694,15 +690,15 @@ msgstr "ZavadÄ›Ä aplikace má Å¡patnou velikost... je to vážnÄ› zavadÄ›Ä?" msgid "Apploader unable to load from file" msgstr "ZavadÄ›Ä aplikace nemohl naÄíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Použít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -712,16 +708,16 @@ msgstr "" "\n" " Pokud si nejste jisti, zvolte (vypnuto)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ArabÅ¡tina" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,12 +725,12 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -742,12 +738,12 @@ msgstr "PomÄ›r Stran:" msgid "At least one pane must remain open." msgstr "Alespoň jeden panel musí být otevÅ™en." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Podpůrná vrstva zvuku:" @@ -755,24 +751,24 @@ msgstr "Podpůrná vrstva zvuku:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Chyba pÅ™i otevírání zařízení zvukového výstupu.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Násobek 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Velikost Okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Automaticky upravovat Velikost Okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -794,12 +790,12 @@ msgstr "Registr BP" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Nastavení podpůrné vrstvy" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Podpůrná vrstva:" @@ -817,15 +813,15 @@ msgid "Bad File Header" msgstr "Å patná hlaviÄka souboru" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Plakát" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detaily Plakátu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Plakát:" @@ -833,11 +829,11 @@ msgstr "Plakát:" msgid "Bar" msgstr "Vibráto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Základní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Základní nastavení" @@ -865,42 +861,42 @@ msgstr "Modrá vlevo" msgid "Blue Right" msgstr "Modrá vpravo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Dole" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Spojené ovladaÄe: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Rozbité" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procházet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Procházet pro pÅ™idání adresáře" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Vyrovnávací paměť:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "TlaÄítka" @@ -921,30 +917,15 @@ msgstr "Kr-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Jádro Emulátoru Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Ukládat pÅ™edvyt. obj. do vyr. pam." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle bodu.\n" -"Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky podle " -"pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" -"\n" -"Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -959,7 +940,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ZruÅ¡it" @@ -975,7 +956,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou oÄekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -986,7 +967,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -994,12 +975,12 @@ msgstr "" "Nelze použít tento soubor jako paměťovou kartu.\n" "Snažíte se použít stejný soubor v obou slotech?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nelze najít Wiimote podle bz: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nelze najít Wiimote pomocí obslužné rutiny spojení %02x" @@ -1013,7 +994,7 @@ msgstr "Nelze Äíst ze zásuvného modulu DVD - DVD-Rozhraní: Závažná chyba msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "KatalánÅ¡tina" @@ -1021,24 +1002,24 @@ msgstr "KatalánÅ¡tina" msgid "Center" msgstr "StÅ™ed" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "ZmÄ›nit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "VymÄ›nit &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "VymÄ›nit Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ZmÄ›nit hru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1054,12 +1035,11 @@ msgstr "ZmÄ›ní znaménko na Parametr zFar (po korekci)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "ZmÄ›ní znaménko na Parametr zNear (po korekci)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "ZmÄ›na tohoto se neprojeví, pokud emulátor běží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1067,47 +1047,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Hledání Cheatů" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Správce Cheatů" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Zkontrolovat celistvost oddílu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Kontrolování celistvosti..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1115,7 +1095,7 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1123,8 +1103,8 @@ msgstr "" "Zvolte soubor, který má být použit jako zavadÄ›Ä aplikace: (platí pouze pro " "disky sestavené z adresářů)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Zvolte adresář pro umístÄ›ní extrakce" @@ -1138,8 +1118,8 @@ msgstr "Klasické" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "VyÄistit" @@ -1150,22 +1130,22 @@ msgid "" msgstr "" "Klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru musíte ukonÄit ruÄnÄ›." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zavřít" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Nastavit..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informace o kódu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kód:" @@ -1177,91 +1157,91 @@ msgstr "Příkaz" msgid "Comment" msgstr "Komentář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Komprimuji ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Nastavit Ovládání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Nastavit Pady" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "PÅ™i zastavení Potvrdit" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "PÅ™ipojit Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "PÅ™ipojit Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "PÅ™ipojit Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "PÅ™ipojit Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "PÅ™ipojit Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "PÅ™ipojuji..." @@ -1281,12 +1261,12 @@ msgstr "PÅ™evést na GCI" msgid "Copy failed" msgstr "Kopírování selhalo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopírovat na Paměťovou kartu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Jádro" @@ -1295,7 +1275,7 @@ msgstr "Jádro" msgid "Could not create %s" msgstr "Nelze vytvoÅ™it %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Nelze spustit podpůrnou vrstvu %s." @@ -1316,12 +1296,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nelze rozpoznat ISO soubor %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Nelze uložit %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1342,11 +1322,11 @@ msgstr "" "SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " "zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1354,17 +1334,17 @@ msgstr "" "Nelze spustit jádro.\n" "Zkontrolujte VaÅ¡e nastavení." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "PoÄet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "ZemÄ›:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "VytvoÅ™it AR kód" @@ -1373,25 +1353,7 @@ msgstr "VytvoÅ™it AR kód" msgid "Create new perspective" msgstr "VytvoÅ™it novou perspektivu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "VytvoÅ™il KDE-look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "VytvoÅ™il VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "VytvoÅ™il black_rider a publikováno na ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Tvůrce:" @@ -1399,11 +1361,11 @@ msgstr "Tvůrce:" msgid "Critical" msgstr "Kritické" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Oříznout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1417,12 +1379,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "SouÄasný adresář se zmÄ›nil z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Vlastní Hack Projekce" @@ -1430,11 +1392,11 @@ msgstr "Vlastní Hack Projekce" msgid "Custom Projection Hack Settings" msgstr "Nastavení Vlastního Hacku Projekce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ÄŒeÅ¡tina" @@ -1446,36 +1408,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulace (rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilátor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "KoÅ™en DVD:" @@ -1487,11 +1449,11 @@ msgstr "DVDLowRead - Fatální chyba: nelze Äíst ze svazku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatální chyba: nelze pÅ™eÄíst svazek" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Velikost data" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" @@ -1508,11 +1470,11 @@ msgstr "Soubory Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Mrtvá Zóna" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "LadÄ›ní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "LadÄ›ní" @@ -1520,24 +1482,24 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1546,11 +1508,11 @@ msgid "Default font" msgstr "Výchozí typ písma" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Smazat" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Smazat Uloženou Hru" @@ -1559,11 +1521,11 @@ msgstr "Smazat Uloženou Hru" msgid "Delete the existing file '%s'?" msgstr "Vymazat existující soubor '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Popis" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Zjistit" @@ -1576,13 +1538,13 @@ msgstr "" "ZjiÅ¡tÄ›n pokus o pÅ™eÄtení více dat z DVD, než se vejde do výstupní pamÄ›ti. " "Zásek." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1606,20 +1568,16 @@ msgstr "" "Kontrolní souÄet adresáře\n" "i záložní kontrolní souÄet Adresáře selhal" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Zakázat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Zakázat Mlhu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Zakázat Hloubku Podle Pixelu" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1633,7 +1591,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1649,7 +1607,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1658,11 +1616,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Chyba Ätení disku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1676,20 +1634,24 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafická Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Webová stránka Dolphin" @@ -1697,32 +1659,32 @@ msgstr "&Webová stránka Dolphin" msgid "Dolphin Configuration" msgstr "Dolphin Nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Nastavení Emulovaného Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1730,7 +1692,7 @@ msgstr "" "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " "souborů..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1738,16 +1700,21 @@ msgstr "" "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " "pro zobrazení vÅ¡ech her..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Dolů" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Stáhnout kódy (Databáze WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Stáhnuto %lu kódů. (přídáno %lu)" @@ -1756,27 +1723,27 @@ msgstr "Stáhnuto %lu kódů. (přídáno %lu)" msgid "Drums" msgstr "Bubny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Vypsat Zvuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Vypsat Cíl EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Vypsat Snímky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Vypsat Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1786,7 +1753,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1796,7 +1763,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1806,17 +1773,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "NizozemÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "O&dejít" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Kopie" @@ -1836,11 +1803,11 @@ msgstr "" msgid "EUROPE" msgstr "EVROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "PÅ™edÄasné Aktualizace PamÄ›ti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Upravit" @@ -1848,7 +1815,7 @@ msgstr "Upravit" msgid "Edit ActionReplay Code" msgstr "Upravit kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Upravit nastavení" @@ -1856,12 +1823,12 @@ msgstr "Upravit nastavení" msgid "Edit Patch" msgstr "Upravit záplatu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Upravit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Upravit" @@ -1869,7 +1836,7 @@ msgstr "Upravit" msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" @@ -1877,7 +1844,7 @@ msgstr "VnoÅ™ená Vyr. PamÄ›t Snímků" msgid "Emu Thread already running" msgstr "Vlákno Emulace již běží" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1891,7 +1858,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zaÅ¡krtnÄ›te místo tohoto virtuální emulaci XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1907,19 +1874,19 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulovaný Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stav Emulace:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Povolit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1935,72 +1902,71 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Zapnout BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Povolit výpoÄet ohraniÄujícího rámeÄku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Povolit vyrovnávací paměť" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Povolit Cheaty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Povolit dvojité jádro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Zapnout dvojité jádro (zrychlení)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Povolit klávesové zkratky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Povolit PÅ™eskakování NeÄinných Příkazů (zrychlení)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Zapnout MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Povolit Å irokoúhlou obrazovku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Povolit DrátÄ›ný Model" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2014,7 +1980,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2022,11 +1988,11 @@ msgstr "" "Zapnout rychlý přístup k disku. NÄ›které hry to potÅ™ebují. (ZAPNUTO = rychlé, " "VYPNUTO = Kompatibilní)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Zapnout stránky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2039,7 +2005,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2051,7 +2017,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2059,7 +2025,7 @@ msgstr "" "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " "pro VÅ ECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2069,11 +2035,28 @@ msgstr "" "napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2085,7 +2068,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2093,7 +2076,7 @@ msgstr "" "Povolí Jednotku Správy PamÄ›ti, potÅ™ebnou v nÄ›jakých hrách. (ZAPNUTO = " "Kompatibilní, VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2107,14 +2090,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "AngliÄtina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "VylepÅ¡ení" @@ -2132,17 +2115,17 @@ msgstr "Záznam %d/%d" msgid "Entry 1/%d" msgstr "Záznam 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Rovná se" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Chyba" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Chyba pÅ™i nahrávání zvoleného jazyka. Vracím se na výchozí jazyk systému." @@ -2182,32 +2165,32 @@ msgstr "Obslužná rutina výjimky - přístup pod paměťovým místem. %08llx% msgid "Execute" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Export Selhal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportovat Soubor" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportovat Nahrávku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportovat Nahrávku..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportovat vÅ¡echny Uložené hry" @@ -2223,7 +2206,7 @@ msgstr "Exportovat Uloženou hru jako..." msgid "Extension" msgstr "Rozšíření" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "VnÄ›jší vyrovnávací paměť Snímků" @@ -2235,44 +2218,44 @@ msgstr "Extra Parametr" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parametr užiteÄný pouze v ''Metroid: Other M''" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrahovat VÅ¡echny Soubory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrahovat ZavadÄ›Ä Aplikace..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrahovat DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrahovat Adresář..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrahovat Soubor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrahovat Oddíl..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrahuji %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extrahuji VÅ¡echny Soubory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extrahuji Adresář" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrahuji..." @@ -2280,7 +2263,7 @@ msgstr "Extrahuji..." msgid "FIFO Byte" msgstr "FIFO Bajt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "PÅ™ehrávaÄ FIFO" @@ -2288,7 +2271,7 @@ msgstr "PÅ™ehrávaÄ FIFO" msgid "FRANCE" msgstr "FRANCIE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Velikost FST:" @@ -2296,15 +2279,15 @@ msgstr "Velikost FST:" msgid "Failed to Connect!" msgstr "PÅ™ipojení Selhalo!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Naslouchání Selhalo!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Stahování kódů selhalo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Nelze extrahovat do %s!" @@ -2423,19 +2406,19 @@ msgstr "Zápis hlaviÄky selhal pro %s" msgid "Failed to write header for file %d" msgstr "Selhal zápis hlaviÄky souboru %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "PerÅ¡tina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2443,23 +2426,23 @@ msgstr "" "závažná desynchronizace. PÅ™ehrávání ukonÄeno. (Chyba v PlayWiimote: %u != " "%u, bajt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "PÅ™ehrávaÄ Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informace o souboru" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Soubor neobsahoval žádné kódy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Soubor pÅ™eveden na .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2476,7 +2459,7 @@ msgstr "" "Soubor má příponu \"%s\"\n" "platné přípony jsou (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Soubor nerozpoznán jako paměťová karta" @@ -2489,19 +2472,19 @@ msgstr "Soubor není komprimovaný" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Neznámý režim otevÅ™ení : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Najít další" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Najít pÅ™edchozí" @@ -2509,27 +2492,27 @@ msgstr "Najít pÅ™edchozí" msgid "First Block" msgstr "První blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Spravit Kontrolní SouÄty" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Vynutit 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Vynutit 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Donutit konzoli být jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Vynutit Filtrování Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2541,7 +2524,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2553,7 +2536,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2589,42 +2572,42 @@ msgstr "Snímek" msgid "Frame " msgstr "Snímek" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Postup Snímkem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Uložení snímků použije FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Informace o snímku" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Rozsah Snímku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "PÅ™es&kakování snímků:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limit Snímků:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Snímky k Nahrání" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Rozhlížení pomocí myÅ¡i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "FrancouzÅ¡tina" @@ -2632,16 +2615,16 @@ msgstr "FrancouzÅ¡tina" msgid "Frets" msgstr "Pražce" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "CelObr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "RozliÅ¡ení celé obrazovky:" @@ -2653,7 +2636,7 @@ msgstr "Soubor GCI(*.gci)" msgid "GCMic Configuration" msgstr "Nastavení GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" @@ -2661,27 +2644,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID Hry:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Hra už běží!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Hra neběží!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Hra nenalezena!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Nastavení Konkrétní Hry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Nastavení Hry" @@ -2689,25 +2672,25 @@ msgstr "Nastavení Hry" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Soubory uložených her GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kódy Gecko" @@ -2722,20 +2705,20 @@ msgstr "" "Nelze spustit GeckoKód (CT%i CST%i) (%s)\n" "(buÄ Å¡patný kód, nebo typ kódu není jeÅ¡tÄ› podporován. Zkuste použít )" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Obecné" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Obecná Nastavení" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "NÄ›mÄina" @@ -2744,19 +2727,19 @@ msgstr "NÄ›mÄina" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index je vÄ›tší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafická nastavení" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "VÄ›tší než" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2773,7 +2756,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "ŘeÄtina" @@ -2793,11 +2776,11 @@ msgstr "Zelená vpravo" msgid "Guitar" msgstr "Kytara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Byl zavolán HCI_CMD_INQUIRY, prosím ohlaste!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacky" @@ -2805,7 +2788,7 @@ msgstr "Hacky" msgid "Header checksum failed" msgstr "Kontrolní souÄet hlaviÄky selhal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "HebrejÅ¡tina" @@ -2817,7 +2800,7 @@ msgstr "Výška" msgid "Help" msgstr "NápovÄ›da" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2837,11 +2820,11 @@ msgstr "" msgid "Hide" msgstr "Skrýt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Skrýt kurzor myÅ¡i" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2855,8 +2838,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hostovat" @@ -2864,17 +2847,17 @@ msgstr "Hostovat" msgid "Hotkey Configuration" msgstr "Nastavení klávesových zkratek" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "MaÄarÅ¡tina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybridní Wiimote" @@ -2900,7 +2883,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Nastavení IPL" @@ -2908,19 +2891,19 @@ msgstr "Nastavení IPL" msgid "IR" msgstr "InfrÄ." -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "InfraÄer. Ukazovátko" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Citlivost InfraÄer.:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -2932,7 +2915,7 @@ msgstr "ITÃLIE" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2940,14 +2923,14 @@ msgstr "" "Pokud je zaÅ¡krtnuto, registry ohraniÄujícího rámeÄku budou aktualizovány. " "Používáno v hrách Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Pokud jsou SzS nestálé, tato volba může pomoci. (ZAPNUTO = Kompatibilní, " "VYPNUTO = Rychlé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2957,11 +2940,11 @@ msgstr "" "mÄ›li byste také vypnout PÅ™iÅ¡krcení Zvuku v DSP (v závislosti na hÅ™e může " "spravit klikání zvuku, ale také může způsobit neustálý hluk)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorovat ZmÄ›ny Formátu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2975,7 +2958,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2989,7 +2972,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importovat Uloženou hru" @@ -2997,7 +2980,7 @@ msgstr "Importovat Uloženou hru" msgid "Import failed, try again?" msgstr "Import selhal, zkusit znovu?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3005,11 +2988,11 @@ msgstr "" "Importovaný soubor má příponu gsc\n" "ale nemá správnou hlaviÄku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Importovaný soubor má neplatnou délku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3017,7 +3000,7 @@ msgstr "" "\"Importovaný soubor má příponu sav\n" "ale nemá správnou hlaviÄku\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3029,16 +3012,16 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Ve HÅ™e" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3046,7 +3029,7 @@ msgstr "Info" msgid "Information" msgstr "Informace" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Vstup" @@ -3058,7 +3041,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte ZaÅ¡ifrovaný nebo RozÅ¡ifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3066,11 +3049,11 @@ msgstr "Vložit SD Kartu" msgid "Insert name here.." msgstr "Zde vložte jméno..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" @@ -3081,23 +3064,23 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Instaluji WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Chyba v kontrole celistvosti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Kontrola celistvosti dokonÄena" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Kontrola celistvosti dokonÄena. Nebyly nalezeny žádné chyby." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3106,11 +3089,11 @@ msgstr "" "Kontrola celistvosti oddílu %d selhala. Váš výpis ISO je pravÄ›podobnÄ› " "poÅ¡kozen nebo byl nesprávnÄ› opraven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3131,15 +3114,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "VnitÅ™ní chyba LZO - lzo_init() selhalo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "VnitÅ™ní RozliÅ¡ení:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "PÅ™evadÄ›Ä (VELMI pomalé)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3148,11 +3131,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Neplatná Velikost(%x) nebo Kouzelné slovo (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Neplatná Hodnota!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Neplatný bat.map nebo záznam adr." @@ -3176,7 +3159,7 @@ msgstr "" "%s\n" "Možná budete muset hru znovu vypsat." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Neplatný soubor s nahrávkou" @@ -3184,21 +3167,21 @@ msgstr "Neplatný soubor s nahrávkou" msgid "Invalid search parameters (no object selected)" msgstr "Neplatné parametry hledání (není vybrán žádný objekt)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Neplatný Å™etÄ›zec hledání (nelze pÅ™evést na Äíslo)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "Neplatný Å™etÄ›zec hledání (jsou podporovány pouze sudé délky Å™etÄ›zce)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Neplatný stav" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "ItalÅ¡tina" @@ -3206,16 +3189,16 @@ msgstr "ItalÅ¡tina" msgid "JAPAN" msgstr "JAPONSKO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilátor (doporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimentální rekompilátor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "JaponÅ¡tina" @@ -3223,7 +3206,7 @@ msgstr "JaponÅ¡tina" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3233,17 +3216,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Okno vždy navrchu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Klávesa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "KorejÅ¡tina" @@ -3261,19 +3244,23 @@ msgstr "TlaÄítko L" msgid "L-Analog" msgstr "Levý Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Jazyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Poslední PÅ™epsaný Stav" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Poslední Uložený Stav" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3283,8 +3270,8 @@ msgstr "Vlevo" msgid "Left Stick" msgstr "Levý Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3292,7 +3279,7 @@ msgstr "" "Levé kliknutí pro detekci zkratky.\n" "Zadejte mezerník pro vyÄiÅ¡tÄ›ní." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3302,7 +3289,7 @@ msgstr "" "ProstÅ™ední kliknutí pro vyÄiÅ¡tÄ›ní.\n" "Pravé kliknutí pro více možností." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3310,76 +3297,76 @@ msgstr "" "Levé/Pravé kliknutí pro více možností.\n" "ProstÅ™ední pro vymazání." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menší než" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitovat podle SzS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Nahrát" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Nahrát Vlastní Textury" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Nahrát Slot Stavu 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Nahrát Slot Stavu 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Nahrát Slot Stavu 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Nahrát Slot Stavu 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Nahrát Slot Stavu 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Nahrát Slot Stavu 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Nahrát Slot Stavu 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Nahrát Slot Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3393,31 +3380,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "NaÄíst pÅ™ednastavené hodnoty z dostupných hackových vzorů." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Místní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Uzamknout Vlákna do Jader" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Záznam" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Nastavení Záznamu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "Zaznamenat SzS do souboru" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Typy Záznamu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3429,12 +3412,12 @@ msgstr "" "\n" ".Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Výstup ZapisovaÄe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Protokolování" @@ -3455,7 +3438,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3469,24 +3452,24 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Hlavní Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Výrobce:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Výrobce:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Pam. karta už má uložení pro tento název" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Pam. karta již otevÅ™ena" @@ -3495,7 +3478,7 @@ msgid "Memory Byte" msgstr "Bajt PamÄ›ti" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Paměťová karta" @@ -3532,20 +3515,20 @@ msgstr "Velikost paměťové karty se neshoduje s velikosti hlaviÄky" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3554,7 +3537,7 @@ msgstr "Ostatní Nastavení" msgid "Modifier" msgstr "Modifikátor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3579,7 +3562,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3601,7 +3584,7 @@ msgstr "" msgid "Multiply" msgstr "Násobit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3703,16 +3686,16 @@ msgstr "NK Tab" msgid "NP Up" msgstr "NK Nahoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Jméno:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Jméno: " @@ -3721,20 +3704,20 @@ msgstr "Jméno: " msgid "Native GCI files(*.gci)" msgstr "Původní soubory CGI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nové Skenování" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Další Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Další Skenování" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "PÅ™ezdívka :" @@ -3742,7 +3725,7 @@ msgstr "PÅ™ezdívka :" msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Nenalezena žádná ISO nebo WADS" @@ -3764,7 +3747,7 @@ msgstr "Žádné pÅ™ipínání" msgid "No file loaded" msgstr "Není naÄten žádný soubor" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Žádné volné záznamy indexu adresáře" @@ -3777,33 +3760,33 @@ msgstr "Žádný soubor s nahrávkou" msgid "No save folder found for title %s" msgstr "Nebyl nalezen žádný ukládací adresář pro název %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Žádný" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norský BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nerovná se" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Nenastaven" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "NepÅ™ipojen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Poznámky" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Poznámky:" @@ -3812,7 +3795,7 @@ msgstr "Poznámky:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "UpozornÄ›ní" @@ -3820,16 +3803,16 @@ msgstr "UpozornÄ›ní" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "PoÄet Kódů:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "NunÄak" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Zrychlení NunÄaku" @@ -3837,11 +3820,11 @@ msgstr "Zrychlení NunÄaku" msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rozsah Objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Vypnuto" @@ -3849,52 +3832,52 @@ msgstr "Vypnuto" msgid "Offset:" msgstr "Logická Adresa:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "Zobrazovat zprávy na obrazovce" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Pouze bloky %d jsou dostupné" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otevřít soubor..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: nelze vytvoÅ™it kontext pro zařízení %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nelze nalézt zvuková zařízení" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: nelze otevřít zařízení %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Dekodér Textury" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" @@ -3907,7 +3890,7 @@ msgstr "Volby" msgid "Orange" msgstr "Oranžová" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3917,8 +3900,8 @@ msgstr "" "KliknÄ›te pravým tlaÄítkem a exportujte vÅ¡echna uložení,\n" "a importujte je do nové paměťové karty\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Jiné" @@ -3929,19 +3912,19 @@ msgid "" msgstr "" "Jiný klient odpojen pÅ™i bÄ›hu hry!! NetPlay je vypnut. Hru ukonÄete ruÄnÄ›." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Výstup" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "S&pustit nahrávku..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3957,7 +3940,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Spárovat" @@ -3969,34 +3952,34 @@ msgstr "Odstavec" msgid "Parameters" msgstr "Parametry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Oddíl %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Záplaty" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pozastavit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Pozastavit na konci filmu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "OsvÄ›tlení Podle Pixelu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Dokonalá" @@ -4005,36 +3988,36 @@ msgstr "Dokonalá" msgid "Perspective %d" msgstr "Perspektiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Spustit" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "PÅ™ehrát nahrávku" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "PÅ™ehrát/Pozastavit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Hratelné" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Možnosti PÅ™ehrávání" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4046,54 +4029,54 @@ msgstr "PÅ™ed uložením si prosím vytvoÅ™te perspektivu" msgid "Plus-Minus" msgstr "Plus-Mínus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "PortugalÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "PortugalÅ¡tina (Brazilská)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4106,11 +4089,11 @@ msgstr "PÅ™edvolby:" msgid "Prev Page" msgstr "PÅ™ed. stránka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "PÅ™edchozí Stránka" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "PÅ™edchozí Hodnota" @@ -4118,7 +4101,7 @@ msgstr "PÅ™edchozí Hodnota" msgid "Print" msgstr "Vytisknout" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4126,7 +4109,7 @@ msgstr "Profil" msgid "Properties" msgstr "Vlastnosti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Zahodit Vyrovnávací Paměť" @@ -4134,8 +4117,8 @@ msgstr "Zahodit Vyrovnávací Paměť" msgid "Question" msgstr "Otázka" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "UkonÄit" @@ -4153,7 +4136,7 @@ msgstr "TlaÄítko R" msgid "R-Analog" msgstr "Pravý Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4161,46 +4144,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSKO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rozsah" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Režim pouze pro Ätení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Opravdová" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Opravdový Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Opravdové Wiimoty" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Potvrzení o znovupÅ™ipojení Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Znovu pÅ™ipojit Wiimote pÅ™i Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Nahrávat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informace o Nahrávání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Možnosti Nahrávání" @@ -4216,7 +4199,7 @@ msgstr "ÄŒervená vlevo" msgid "Red Right" msgstr "ÄŒervená vpravo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4230,29 +4213,29 @@ msgstr "" "\n" "Pokud si nejste jisti, vyberte Žádný." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Obnovit" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Obnovit Seznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Obnovit seznam her" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Odstranit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4262,17 +4245,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Vykreslit do Hlavního okna" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Resetovat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Výsledky" @@ -4294,29 +4277,25 @@ msgstr "Pravý Stick" msgid "Rumble" msgstr "Vibrace" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Spustit DSP LLE na samostatném vláknÄ› (nedoporuÄeno)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "RuÅ¡tina" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Uložit Sta&v" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "BezpeÄná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Vzorkovací frekvence:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Uložit" @@ -4324,90 +4303,90 @@ msgstr "Uložit" msgid "Save GCI as..." msgstr "Uložit GCI jako..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Uložit do Slotu Stavu 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Uložit do Slotu Stavu 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Uložit do Slotu Stavu 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Uložit do Slotu Stavu 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Uložit do Slotu Stavu 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Uložit do Slotu Stavu 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Uložit do Slotu Stavu 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Uložit do Slotu Stavu 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Uložit Stav..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Skenuji..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "SnímkObrz" @@ -4415,23 +4394,23 @@ msgstr "SnímkObrz" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Hledat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Hledat Podadresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Hledat v souÄasném objektu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Hledat hexadecimální hodnotu:" @@ -4442,20 +4421,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sekce %s nebyla v SYSCONF nalezena" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Vybrat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4473,23 +4452,23 @@ msgstr "Vyberte soubor s uloženou pozicí pro import" msgid "Select floating windows" msgstr "Vybrat plovoucí okna" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Vyberte stav k uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4505,11 +4484,16 @@ msgstr "" "Vynutit 4:3: Roztáhne obraz na pomÄ›r4:3.\n" "Roztáhnout do okna: Roztáhne obraz do velikosti okna." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Zadaný soubor \"%s\" neexistuje" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Vybraný typ písma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4526,7 +4510,7 @@ msgstr "" "Pokud si stále nejste jisti, použijte takové nejvyšší rozliÅ¡ení, které Vám " "funguje." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4542,11 +4526,11 @@ msgstr "" "\n" "Pokud si nejste jisti, použijte Direct3D 9" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Poslat" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "UmístÄ›ní Senzorové TyÄe:" @@ -4554,26 +4538,26 @@ msgstr "UmístÄ›ní Senzorové TyÄe:" msgid "Separator" msgstr "OddÄ›lovaÄ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "SrbÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Sériový port 1 - Tito je port, který používají zařízení jako internetový " "adaptér" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Nastavit jako výchozí paměťovou kartu %c" @@ -4583,11 +4567,17 @@ msgstr "Nastavit jako výchozí paměťovou kartu %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index je vÄ›tší než velikost seznamu ar kódu %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Nastavení..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nelze najít soubor s nastavením" @@ -4595,7 +4585,7 @@ msgstr "SetupWiiMem: Nelze najít soubor s nastavením" msgid "Shake" msgstr "TÅ™es" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Krátké Jméno:" @@ -4603,105 +4593,105 @@ msgstr "Krátké Jméno:" msgid "Shoulder Buttons" msgstr "Zadní TlaÄítka" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Zobrazit &Konzoli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Zobrazit Záznam" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Zobrazit &Stavový řádek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Zobrazit Panel Nás&trojů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Zobrazit Disky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Zobrazit EFB Regiony Kopie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Zobrazit Snímky za Sekundu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Zobrazit Francii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Zobrazit GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Zobrazit Obrazovku Vstupu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Zobrazit Itálii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Zobrazit JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Zobrazit Koreu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Jazyk Zobrazení:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Zobrazit Nastavení &Záznamu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Zobrazit PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Zobrazit Platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Zobrazit Regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Zobrazit Statistiky" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Zobrazit Tchaj-wan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Zobrazit USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Zobrazit Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Zobrazit Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Zobrazí rámeÄek s potvrzením pÅ™ed zastavením hry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4709,15 +4699,15 @@ msgstr "" "Vypnutím tohoto se můžete vyhnout otravným a nezávažným zprávám, ale Dolphin " "může také být náhle ukonÄen bez jakéhokoliv vysvÄ›tlení." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Zobrazit první blok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Zobrazit poÄítadlo zpoždÄ›ní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4727,23 +4717,23 @@ msgstr "" "Tyto zprávy zahrnují zápisy do paměťových karet, podpůrné vrstvy videa a " "informace o CPU a ÄiÅ¡tÄ›ní mezipamÄ›ti JIT." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Zobrazit uložené bloky" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Zobrazit komentář uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Zobrazit ikonu uložení" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Zobrazit název uložení" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4755,11 +4745,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Zobrazit neznámé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4773,27 +4763,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "PÅ™eskoÄit EFB Přístup z Procesoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4805,7 +4795,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4821,17 +4811,17 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4839,7 +4829,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snímek" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Softwarový VykreslovaÄ" @@ -4856,11 +4846,11 @@ msgstr "" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Nastavení Zvuku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Podpůrná vrstva zvuku %s je neplatná." @@ -4874,17 +4864,17 @@ msgstr "VytvoÅ™ení vyrovnávací pamÄ›ti zvuku selhalo: %s" msgid "Space" msgstr "Mezerník" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Å panÄ›lÅ¡tina" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hlasitost Reproduktoru:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4904,7 +4894,7 @@ msgstr "" "\n" "Pokud si nejste jisti, zvolte 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Zvýšit rychlost pÅ™enosu Disku" @@ -4912,51 +4902,55 @@ msgstr "Zvýšit rychlost pÅ™enosu Disku" msgid "Square Stick" msgstr "ÄŒtvercový Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standardní OvladaÄ" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Spustit &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "ZaÄít na&hrávat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "ZaÄít Nahrávat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Stav" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ukládání stavu" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Zastavit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4970,7 +4964,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Roztáhnout do Okna" @@ -4995,8 +4989,8 @@ msgstr "Uložení byly úspěšnÄ› importovány" msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Jazyk Systému:" @@ -5004,7 +4998,7 @@ msgstr "Jazyk Systému:" msgid "TAIWAN" msgstr "TCHAJ-WAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Vstup" @@ -5025,30 +5019,30 @@ msgstr "Deska vlevo" msgid "Table Right" msgstr "Deska vpravo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "VytvoÅ™it Snímek Obrazovky" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bonga)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Vyrovnávací Paměť Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "PÅ™ekryv Formátu Textury" @@ -5064,13 +5058,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní souÄet byl úspěšnÄ› opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5093,7 +5087,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Soubor %s je už otevÅ™en, hlaviÄka souboru nebude zapsána." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Zadaný soubor (%s) neexistuje" @@ -5110,7 +5104,7 @@ msgstr "Jméno nemůže obsahovat znak ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Výsledný rozÅ¡ifrovaný kód AR neobsahuje žádné řádky." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5122,11 +5116,11 @@ msgstr "" "\n" "Pokud si nejste jisti, použijte hodnotu zcela vpravo." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Uložená hra, kterou se snažíte zkopírovat má neplatnou délku souboru" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5159,14 +5153,11 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Vzhled" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "VýbÄ›r vzhledu se zvrtl" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5175,7 +5166,7 @@ msgstr "" "Musí existovat lístek pro 00000001/00000002. VaÅ¡e NAND vypsání je " "pravdÄ›podobnÄ› neúplné" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5191,11 +5182,11 @@ msgstr "" "Tento simulátor action replay nepodporuje kód, který mÄ›ní samotný Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5213,7 +5204,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5224,7 +5215,7 @@ msgstr "" "Způsobí výrazné zvýšení rychlosti na PC s více než jedním jádrem, ale také " "může způsobovat obÄasné chyby/pády." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Tohle Vám umožní RuÄnÄ› Upravovat konfiguraÄní soubory INI" @@ -5238,35 +5229,35 @@ msgid "Tilt" msgstr "NaklánÄ›ní" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Název" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Zapnout VÅ¡echny Typy Záznamů" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "PÅ™epnout na Celou Obrazovku" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "NahoÅ™e" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "TradiÄní ČínÅ¡tina" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Pokus o naÄtení souboru neznámého typu." @@ -5286,7 +5277,7 @@ msgstr "" "Pokus o Ätení z neplatného SYSCONF\n" "ID bt wiimote nejsou dostupné" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "TureÄtina" @@ -5298,12 +5289,12 @@ msgstr "ToÄna" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5339,12 +5330,12 @@ msgstr "" "rozÅ¡ifrovaný kód. UjistÄ›te se, že jste ho správnÄ› zadali.\n" "ChtÄ›li byste tento řádek ignorovat a pokraÄovat v analýze?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Nedefinován %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Vrátit zpÄ›t Nahrání Stavu" @@ -5352,7 +5343,7 @@ msgstr "Vrátit zpÄ›t Nahrání Stavu" msgid "Unexpected 0x80 call? Aborting..." msgstr "NeoÄekávané volání 0x80? UkonÄování..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Neznámé" @@ -5381,8 +5372,8 @@ msgstr "Neznámá zpráva s id:%d pÅ™ijata od hráÄe:%d Vyhazuji hráÄe!" msgid "Up" msgstr "Nahoru" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aktualizovat" @@ -5390,23 +5381,23 @@ msgstr "Aktualizovat" msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Použít Celou Obrazovku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Použít Å estnáctkovou soustavu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Použít Obslužné Rutiny Paniky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5419,7 +5410,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5433,15 +5424,15 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Pomůcky" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Synch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Hodnota" @@ -5449,23 +5440,23 @@ msgstr "Hodnota" msgid "Value:" msgstr "Hodnota:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Hodnota:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Úroveň" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Obraz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Hlasitost" @@ -5479,7 +5470,7 @@ msgstr "Instalace WAD selhala: chyba pÅ™i vytváření %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalace WAD selhala: chyba pÅ™i vytváření lístku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5492,16 +5483,16 @@ msgstr "" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Varování" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Varování - DOL se spouÅ¡tí ve Å¡patném režimu konzole!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Varování - ELF se spouÅ¡tí ve Å¡patném režimu konzole!" @@ -5533,7 +5524,7 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5545,7 +5536,7 @@ msgstr "" "mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze " "pro Ätení." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5557,7 +5548,7 @@ msgstr "" "naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " "desynchronizaci." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5591,7 +5582,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - soubor není otevÅ™en." @@ -5599,7 +5590,7 @@ msgstr "WaveFileWriter - soubor není otevÅ™en." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" @@ -5607,23 +5598,23 @@ msgstr "Hack Å irokoúhlého obrazu" msgid "Width" msgstr "Šířka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5631,17 +5622,17 @@ msgstr "Wii soubory s uložením (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD Nelze Äíst ze souboru" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5654,19 +5645,19 @@ msgstr "" "nebo je to vyprÅ¡ení limitu neaktivity, nebo z jiného důvodu.\n" "Chcete ho hned znovu pÅ™ipojit?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote PÅ™ipojen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote nastavení" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimoty" @@ -5686,26 +5677,26 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Pracuji..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Zapsat do Konzole" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Zapsat do LadiÄe" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Zapsat do Souboru" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Zapsat do Okna" @@ -5744,25 +5735,25 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nemůžete zavřít panely, které mají uvnitÅ™ stránky." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Musíte si zvolit hru!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Musíte zadat jméno!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musíte zadat platnou hodnotu v desítkové, Å¡estnáctkové nebo osmiÄkové " "soustavÄ›." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -5785,7 +5776,7 @@ msgstr "" "MÄ›l by být 0x%04x (ale je 0x%04llx)\n" "Chcete vytvoÅ™it nový?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5798,12 +5789,12 @@ msgstr "Kód Zero 3 není podporován" msgid "Zero code unknown to dolphin: %08x" msgstr "Nulový kód, který dolphin nezná: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Äekám ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5819,7 +5810,7 @@ msgstr "" msgid "[Custom]" msgstr "[Vlastní]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5838,7 +5829,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5853,11 +5844,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -5874,7 +5865,7 @@ msgstr "ÄŒtení dat selhalo ze souboru: %s" msgid "failed to read header" msgstr "Nelze Äíst z hlaviÄky" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." @@ -5893,7 +5884,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -5905,10 +5896,13 @@ msgstr "Korekce z Far:" msgid "zNear Correction: " msgstr "Korekce zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| NEBO" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Výchozí)" @@ -5987,6 +5981,21 @@ msgstr "| NEBO" #~ "\n" #~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "VypoÄítat hodnoty hloubky 3D grafiky podle pixelu, radÄ›ji než podle " +#~ "bodu.\n" +#~ "Na rozdíl od osvÄ›tlení pixelu (což je pouze vylepÅ¡en), výpoÄty hloubky " +#~ "podle pixelu jsou potÅ™ebné ke správné emulaci malého poÄtu her.\n" +#~ "\n" +#~ "Pokud si nejste jisti, nechejte toto zaÅ¡krtnuté." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6020,6 +6029,21 @@ msgstr "| NEBO" #~ msgid "Could not copy %s to %s" #~ msgstr "Nelze kopírovat %s do %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "VytvoÅ™il KDE-look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "VytvoÅ™il Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VytvoÅ™il VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "VytvoÅ™il black_rider a publikováno na ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Vyrovnávací paměť DList" @@ -6029,6 +6053,9 @@ msgstr "| NEBO" #~ msgid "Disable Lighting" #~ msgstr "Zakázat OsvÄ›tlení" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Zakázat Hloubku Podle Pixelu" + #~ msgid "Disable Textures" #~ msgstr "Zakázat Textury" @@ -6251,6 +6278,9 @@ msgstr "| NEBO" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Nahraje urÄený soubor (DOL, ELF, GCM, ISO, WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Uzamknout Vlákna do Jader" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Nízkoúrovňový (lle) nebo vysokoúrovňový (hle) zvuk" @@ -6300,6 +6330,9 @@ msgstr "| NEBO" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Nutné pro použití Japonského písma ROM" +#~ msgid "Sample Rate:" +#~ msgstr "Vzorkovací frekvence:" + #~ msgid "Scale:" #~ msgstr "ZmÄ›na Velikosti:" @@ -6386,6 +6419,9 @@ msgstr "| NEBO" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Spustí vykreslovací okno v režimu celé obrazovky." +#~ msgid "Theme selection went wrong" +#~ msgstr "VýbÄ›r vzhledu se zvrtl" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/de.po b/Languages/po/de.po index e1f0943053..28831cdf4a 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-02-17 01:23+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: LucasX \n" "Language-Team: \n" "Language: German\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (zu viele zum anzeigen)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Spiel: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NICHT" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Nicht Verbunden" @@ -156,147 +149,147 @@ msgstr "%sGCI importieren%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u freie Blöcke; %u freie Verzeichniseinträge" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& UND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Ãœber &Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "Von &DVD-Laufwerk starten..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Haltepunkte" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "Nach ISOs &suchen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Cheat Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Datei" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Hilfe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Status &laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memory-Card Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Arbeitsspeicher" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Ö&ffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Optionen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Pau&se" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Register" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Sound" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Sto&pp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Werkzeuge" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ansicht" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -316,7 +309,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UNBEKANNT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(aus)" @@ -324,19 +317,19 @@ msgstr "(aus)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 Bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 Bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 Bit" @@ -344,20 +337,20 @@ msgstr "8 Bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -365,25 +358,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Ein NetPlay Fenster ist bereits geöffnet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Es wird derzeit kein Spiel ausgeführt." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Konnte kein unterstütztes Bluetooth-Gerät finden!\n" "(Nur der Microsoft Bluetooth-Stack wird unterstüzt.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "TCP Port zum Hoster muss geöffnet sein!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -432,19 +427,19 @@ msgstr "AR Codes" msgid "About Dolphin" msgstr "Ãœber Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Beschleunigung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Genaue VBeam Emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -453,8 +448,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Aktion" @@ -481,7 +476,7 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im folgendem " "Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, fuzzy, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -508,16 +503,17 @@ msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x : address = %08x) im " "geschriebennen Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Action Replay Fehler: Fehlerhafte Größe (%08x) im kopierten Speicher (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Fehler: Master-Code und schreiben in CCXXXXXX nicht umgesetzt " "in (%s)" @@ -527,27 +523,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fehler: Fehlerhafter AR-Code in Zeile: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, fuzzy, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: _Bedingungs_-Code: Fehlerhafte Größe %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, fuzzy, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ungültiger _Normal-Code-Type_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, fuzzy, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ %i: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, fuzzy, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: _Normal-Code_ 0: Fehlerhafte _subtype_ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Grafikkarte:" @@ -556,11 +552,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -568,13 +564,13 @@ msgstr "Patch hinzufügen" msgid "Add new pane" msgstr "Neue Palette hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Hinzufügen..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse: " @@ -614,50 +610,50 @@ msgstr "" "\n" "NOTIZ: Prüfe im Logfenster/Konsole die ermittelten Werte." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Erweitert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle Dateien (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -668,20 +664,20 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropische Filterung:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -694,31 +690,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Ãœbernehmen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,13 +722,13 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -740,12 +736,12 @@ msgstr "Seitenverhältnis:" msgid "At least one pane must remain open." msgstr "Mindestens eine Palette muss geöffnet bleiben." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -753,26 +749,26 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Fenstergröße:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -795,12 +791,12 @@ msgstr "Register" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Backend Einstellungen" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Audio Backend:" @@ -819,15 +815,15 @@ msgid "Bad File Header" msgstr "Ungültige Header-Datei" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -835,11 +831,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Leiste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Grundeinstellungen" @@ -867,42 +863,42 @@ msgstr "Blau links" msgid "Blue Right" msgstr "Blau rechts" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Unten" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Defekt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Durchsuchen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Tasten" @@ -924,26 +920,16 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulator Engine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "Anzeigeliste zwischenspeichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -952,7 +938,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Abbrechen" @@ -969,7 +955,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -979,7 +965,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -988,12 +974,12 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kann WiiMote bei BD: %02x:%02x:%02x:%02x:%02x:%02x nicht finden." -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kann Wiimote bei Verbindungs-Handle %02x nicht finden." @@ -1007,7 +993,7 @@ msgstr "Kann von DVD_Plugin/DVD-Schnittstelle nicht lesen: Fataler Fehler" msgid "Caps Lock" msgstr "Feststellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -1015,24 +1001,24 @@ msgstr "" msgid "Center" msgstr "Mitte" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Wechseln" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Disc &wechseln..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Disc wechseln" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Spiel wechseln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1050,13 +1036,12 @@ msgstr "Parameter _sign_ zu zFar ändern (nach Korrektur)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Parameter _sign_ zu zNear ändern (nach Korrektur)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Änderung dieser Option zeigt keine Auswirkung, solange die Emulation läuft." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1064,48 +1049,48 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cheat Suche" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Cheat Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1113,15 +1098,15 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "Wähle eine Datei als Apploader aus: (Gilt nur für Discs aus Verzeichnissen)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Ordner zum Extrahieren auswählen" @@ -1135,8 +1120,8 @@ msgstr "Klassik" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Löschen" @@ -1148,22 +1133,22 @@ msgstr "" "Client kann während ein Spiel emmuliert wird, nicht verbunden werden! " "NetPlay ist deaktiviert. Sie müssen zuerst manuell das Spiel beenden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Schließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&Konfiguration" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code: " @@ -1175,92 +1160,92 @@ msgstr "Befehl" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Komprimiere ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfiguration" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfigurieren" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Steuerung bearbeiten" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Pads konfigurieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Bestätigung beim Beenden" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote %i verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3 verbinden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4 verbinden" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Verbinden..." @@ -1280,12 +1265,12 @@ msgstr "Zu GCI konvertieren" msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Auf Memcard %c kopieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Kern" @@ -1294,7 +1279,7 @@ msgstr "Kern" msgid "Could not create %s" msgstr "%s konnte nicht erstellt werden" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Konnte Backend %s nicht initialisieren." @@ -1315,12 +1300,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Konnte ISO-Datei %s nicht erkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Konnte %s nicht speichern." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 #, fuzzy msgid "" "Could not set pads. The player left or the game is currently running!\n" @@ -1343,11 +1328,11 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 #, fuzzy msgid "" "Couldn't init the core.\n" @@ -1356,17 +1341,17 @@ msgstr "" "Konnte denn _Core nicht init_.\n" "Kontrolliere deine Konfiguartion." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Anzahl:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR-Code erstellen" @@ -1375,26 +1360,7 @@ msgstr "AR-Code erstellen" msgid "Create new perspective" msgstr "Neue Perspektive erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Erstellt von KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Erstellt von VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Erstellt von black_rider und veröffentlicht auf ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Ersteller: " @@ -1402,11 +1368,11 @@ msgstr "Ersteller: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Abschneiden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1417,13 +1383,13 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "Aktuelles Verzeichnis wird gemäß wxFileSelector von %s nach %s geändert!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Benutzerdefinierter Projection-Hack" @@ -1431,11 +1397,11 @@ msgstr "Benutzerdefinierter Projection-Hack" msgid "Custom Projection Hack Settings" msgstr "Benutzerdefinierter Projection-Hack Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Einige orthographische Projection Parameter anpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tschechisch" @@ -1447,37 +1413,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emulation (schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE Recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1489,11 +1455,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Datengröße" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" @@ -1510,11 +1476,11 @@ msgstr "Datel MaxDrive/Pro Dateien(*.sav)" msgid "Dead Zone" msgstr "Tote Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1523,24 +1489,24 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1549,11 +1515,11 @@ msgid "Default font" msgstr "Standard Schriftart" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Löschen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Spielstand löschen" @@ -1562,12 +1528,12 @@ msgstr "Spielstand löschen" msgid "Delete the existing file '%s'?" msgstr "Wollen Sie die vorhandende Datei '%s' löschen?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Frage" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Erkenne" @@ -1578,13 +1544,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1608,22 +1574,17 @@ msgstr "" "Die Verzeichnis-Prüfsumme ist fehlerhaft,\n" "und ebenfalls die Backup-Verzeichnis-Prüfsumme." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "kein Nebel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Farbtiefe" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1632,7 +1593,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1642,7 +1603,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disc" @@ -1651,11 +1612,11 @@ msgstr "Disc" msgid "Disc Read Error" msgstr "Disc Lesefehler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Anzeige" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1666,20 +1627,24 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Webseite" @@ -1687,33 +1652,33 @@ msgstr "Dolphin &Webseite" msgid "Dolphin Configuration" msgstr "Dolphin Konfiguration" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulierte-Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1721,7 +1686,7 @@ msgstr "" "Dolphin konnte keine GC oder Wii ISOs finden. Hier doppelklicken um nach " "ISOs zu suchen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1729,16 +1694,21 @@ msgstr "" "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " "doppelklicken um alle Spiele anzuzeigen..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Runter" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Codes Herunterladen (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" @@ -1747,34 +1717,34 @@ msgstr "%lu Codes heruntergeladen. (%lu hinzugefügt)" msgid "Drums" msgstr "Trommeln" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Audio dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB-Target dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Frames dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Texturen dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1782,24 +1752,24 @@ msgid "" "If unsure, leave this unchecked." msgstr "Angezeigte Spieltexturen nach User/Dump/Textures// dumpen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holländisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Beenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB Kopie-Regionen" @@ -1821,11 +1791,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Bearbeiten" @@ -1833,7 +1803,7 @@ msgstr "Bearbeiten" msgid "Edit ActionReplay Code" msgstr "ActionReplay Code bearbeiten" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Einstellungen bearbeiten" @@ -1841,12 +1811,12 @@ msgstr "Einstellungen bearbeiten" msgid "Edit Patch" msgstr "Patch bearbeiten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Aktuelle Ansicht ändern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Bearbeiten..." @@ -1854,7 +1824,7 @@ msgstr "Bearbeiten..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1862,7 +1832,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "Emu-Thread läuft bereits." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1871,7 +1841,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1881,19 +1851,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulierte Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulierbarkeit:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1903,74 +1873,73 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Cache verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Cheats aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Dual Core aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Tastenkürzel aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Idle-Skipping aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Idle-Skipping aktivieren (Beschleunigung)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Breitbildmodus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Drahtgitter aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1982,7 +1951,7 @@ msgstr "" "Anisotropische Filterung aktivieren.\n" "Verbessert die Grafikqualität bei schrägen Blickwinkeln." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1990,11 +1959,11 @@ msgstr "" "Aktiviert schnellen Zugriff auf die Disc. Wird für einige Spiele benötigt. " "(ON = Schnell, OFF = Kompatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Blättern verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2002,7 +1971,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2010,7 +1979,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2018,7 +1987,7 @@ msgstr "" "Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " "beschleunigen. Dies für JEDES andere Spiel deaktivieren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2028,11 +1997,28 @@ msgstr "" "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " "Emulieren. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2040,7 +2026,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2048,7 +2034,7 @@ msgstr "" "Aktiviert die Speicher-Verwaltungs-Einheit, die für einige Spiele gebraucht " "wird. (ON = Kompatibel, OFF = Schnell)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2059,14 +2045,14 @@ msgstr "" msgid "End" msgstr "Ende" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Englisch" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Erweiterungen" @@ -2084,17 +2070,17 @@ msgstr "Eintrag %d/%d" msgid "Entry 1/%d" msgstr "Eintrag 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Gleich" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Fehler" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fehler beim Laden der ausgewählten Sprache. Kehre nun zu dem Systemstandart " @@ -2135,32 +2121,32 @@ msgstr "" msgid "Execute" msgstr "Ausführen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exportieren fehlgeschlagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Datei exportieren" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Aufnahme exportieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Aufnahme exportieren..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Alle Spielstände exportieren" @@ -2176,7 +2162,7 @@ msgstr "Spielstand exportieren als..." msgid "Extension" msgstr "Erweiterung" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "Extra Parameter" @@ -2189,44 +2175,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra Parameter nur in ''Metroid: Other M'' sinnvoll." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Alle Dateien extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Ordner extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Datei extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partition extrahieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrahiere %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Alle Dateien extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Ordner extrahieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrahieren..." @@ -2234,7 +2220,7 @@ msgstr "Extrahieren..." msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "Spieler" @@ -2243,7 +2229,7 @@ msgstr "Spieler" msgid "FRANCE" msgstr "FRANKREICH" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Größe:" @@ -2251,16 +2237,16 @@ msgstr "FST Größe:" msgid "Failed to Connect!" msgstr "Verbindungsaufbau fehlgeschlagen!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 #, fuzzy msgid "Failed to Listen!!" msgstr "_Listen_ Fehlgeschlagen!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Download von Codes ist Fehlgeschlagen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Entpacken nach %s ist Fehlgeschlagen!" @@ -2371,43 +2357,43 @@ msgstr "Fehler beim Schreiben eines Header für %s" msgid "Failed to write header for file %d" msgstr "Fehler beim Schreiben eines Header für Datei %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Datei enthielt keine Codes." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Datei zu .gci konvertiert." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2424,7 +2410,7 @@ msgstr "" "Die Datei besitzt die Erweiterung \"%s\",\n" "gültige Erweiterungen sind (.raw/.gcp)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Diese Datei wird nicht als Memorycard anerkannt." @@ -2437,19 +2423,19 @@ msgstr "Datei nicht komprimiert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2457,29 +2443,29 @@ msgstr "" msgid "First Block" msgstr "Erster Block" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Prüfsummen korrigieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9 erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3 erzwingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Konsole auf NTSC-J umschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Filterung erzwingen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2492,7 +2478,7 @@ msgstr "" "Verbessert Textur-Qualität (besonders bei hoher interner Auflösung) aber " "verursacht Fehler in einigen Spielen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2503,7 +2489,7 @@ msgstr "" "Zwingt das Spiel, Grafiken für Breitbild-Auflösungen auszugeben.\n" "Dies kann Grafikfehler verursachen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2538,45 +2524,45 @@ msgstr "Nächster Frame" msgid "Frame " msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Frame-Dumps verwenden FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "Einzelbildwiedergabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frames ü&berspringen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Frei Umsehen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Französisch" @@ -2584,16 +2570,16 @@ msgstr "Französisch" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Vollbild" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Vollbildauflösung:" @@ -2607,7 +2593,7 @@ msgstr "GCI Datei(*.gci)" msgid "GCMic Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC-Pad" @@ -2615,27 +2601,27 @@ msgstr "GC-Pad" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spiel ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Spiel wird bereits emuliert!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Spiel wird nicht emuliert!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spiel nicht gefunden!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spiel-Spezifische Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spieleinstellungen" @@ -2643,26 +2629,26 @@ msgstr "Spieleinstellungen" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2678,21 +2664,21 @@ msgstr "" "(Entweder ist der Code Fehlerhafter oder der Code-Typ wird noch nicht " "unterstützt.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Allgemein" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Deutsch" @@ -2701,19 +2687,19 @@ msgstr "Deutsch" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Der Index ist größer als AR-Codelisten-Größe %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafik Einstellungen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Größer als" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2724,7 +2710,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Griechisch" @@ -2744,11 +2730,11 @@ msgstr "Grün rechts" msgid "Guitar" msgstr "Gitarre" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wurde aufgerufen, bitte berichten!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2756,7 +2742,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header-Prüfsumme fehlerhaft" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebräisch" @@ -2768,7 +2754,7 @@ msgstr "Höhe" msgid "Help" msgstr "Hilfe" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2789,11 +2775,11 @@ msgstr "" msgid "Hide" msgstr "Verbergen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Mauszeiger verstecken" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2807,8 +2793,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2816,17 +2802,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tastenkürzel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungarisch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" @@ -2854,7 +2840,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL Einstellungen" @@ -2862,19 +2848,19 @@ msgstr "IPL Einstellungen" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR-Zeiger" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR-Empfindlichkeit" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO Verzeichnisse" @@ -2886,20 +2872,20 @@ msgstr "ITALIEN" msgid "Icon" msgstr "Symbol" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Wenn die FPS sprunghaft ist, kann diese Option helfen. (ON = Kompatibel, OFF " "= Schnell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2910,12 +2896,12 @@ msgstr "" "(NTSC:60, PAL:50) eingestellt ist, muss Audio Throttle in den DSP-" "Einstellungen deaktiviert werden, damit dies wirksam wird." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Formatänderungen emulieren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2924,7 +2910,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2933,7 +2919,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Spielstand importieren" @@ -2941,7 +2927,7 @@ msgstr "Spielstand importieren" msgid "Import failed, try again?" msgstr "Importieren fehlgeschlagen, noch einmal versuchen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2949,11 +2935,11 @@ msgstr "" "Die importierte Datei hat die Erweiterung gsc, aber besitzt keinen korrekten " "Header." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Importierte Datei hat eine ungültige Länge" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2961,7 +2947,7 @@ msgstr "" "Importierte Datei hat die Erweiterung sav,\n" "aber besitzt keinen korrekten Header." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2972,16 +2958,16 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Ingame" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -2989,7 +2975,7 @@ msgstr "Info" msgid "Information" msgstr "Informationen" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Eingabe" @@ -3001,7 +2987,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3009,12 +2995,12 @@ msgstr "SD-Karte einlegen" msgid "Insert name here.." msgstr "Namen hier eingeben.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3025,36 +3011,36 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Interface Einstellungen" @@ -3076,16 +3062,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Internationaler LZO-Fehler - lzo_init() fehlerhaft" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Vollbildauflösung:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (SEHR langsam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3094,11 +3080,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ungültige Größe (%x) oder _Zauberwort_ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ungültigen Wert!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Ungültige bat.map oder Verzeichnis-Eintrag" @@ -3122,7 +3108,7 @@ msgstr "" "%s\n" " Möglicherweise müssen Sie dieses Spiel neu dumpen." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ungültige Aufnahmedatei" @@ -3130,21 +3116,21 @@ msgstr "Ungültige Aufnahmedatei" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Ungültiger Status" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italienisch" @@ -3152,16 +3138,16 @@ msgstr "Italienisch" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (empfohlen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimenteller Recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanisch" @@ -3169,7 +3155,7 @@ msgstr "Japanisch" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3179,17 +3165,17 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Taste" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreanisch" @@ -3207,19 +3193,23 @@ msgstr "L Taste" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Sprache:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Letzter überschriebener Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Letzter gespeicherter Status" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3229,8 +3219,8 @@ msgstr "Links" msgid "Left Stick" msgstr "Stick links" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3238,7 +3228,7 @@ msgstr "" "Zum Erkennen, auf Tastenkürzel linksklicken.\n" "Drücken Sie die Leertaste, zum löschen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3248,7 +3238,7 @@ msgstr "" "Mittlere Maustaste zum Löschen.\n" "Rechtsklick für weitere Optionen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3256,78 +3246,78 @@ msgstr "" "Links/Rechts-Klick für mehr Optionen.\n" "Mittlere Maustaste zum Löschen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Kleiner als" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Laden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Hochauflösende Texturen laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Status aus Slot 1 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Status aus Slot 2 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Status aus Slot 3 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Status aus Slot 4 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Status aus Slot 5 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Status aus Slot 6 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Status aus Slot 7 laden" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Status aus Slot 8 laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3340,34 +3330,29 @@ msgstr "Hochauflösende Texturen aus User/Load/Textures// laden" msgid "Load preset values from hack patterns available." msgstr "Lade _Preset_-Werte aus dem verfügbarren Hack-Struktur_-en_." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "Threads an Cores binden" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 #, fuzzy msgid "Log Types" msgstr "Typ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3375,13 +3360,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 #, fuzzy msgid "Logger Outputs" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3402,7 +3387,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3416,24 +3401,24 @@ msgstr "MadCatz Gameshark Dateien(*.gcs)" msgid "Main Stick" msgstr "Main Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Hersteller ID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Hersteller:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Memorycard hat bereits eine Spielstand für diesen Tittel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Memorycard ist bereits geöffnet" @@ -3443,7 +3428,7 @@ msgid "Memory Byte" msgstr "Speicher" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Memory Card" @@ -3480,21 +3465,21 @@ msgstr "" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3503,7 +3488,7 @@ msgstr "Sonstige Einstellungen" msgid "Modifier" msgstr "Modifikator" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3524,7 +3509,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3539,7 +3524,7 @@ msgstr "" msgid "Multiply" msgstr "Stern" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3638,16 +3623,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Hoch" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Name:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Name: " @@ -3656,20 +3641,20 @@ msgstr "Name: " msgid "Native GCI files(*.gci)" msgstr "Native GCI Dateien(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Neuer Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Nächste Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Nächster Scan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Nickname:" @@ -3677,7 +3662,7 @@ msgstr "Nickname:" msgid "No Country (SDK)" msgstr "Kein Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Keine ISOs oder WADs gefunden" @@ -3699,7 +3684,7 @@ msgstr "Nicht Andocken" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Keine freien Verzeichnis-Indexeinträge." @@ -3713,33 +3698,33 @@ msgstr "Ungültige Aufnahmedatei" msgid "No save folder found for title %s" msgstr "Keinen Spielstand-Ordner für Tittel %s gefunden." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Keine" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norwegisch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ungleich" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Nicht Festgelegt" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nicht Verbunden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notizen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notizen: " @@ -3748,7 +3733,7 @@ msgstr "Notizen: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Notizen" @@ -3756,16 +3741,16 @@ msgstr "Notizen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Anzahl von Codes: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuck Beschleunigung" @@ -3773,11 +3758,11 @@ msgstr "Nunchuck Beschleunigung" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Aus" @@ -3785,52 +3770,52 @@ msgstr "Aus" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Nur %d Blöcke verfügbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Datei öffnen..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kann Kontext für Gerät %s nicht erstellen" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kann kein Sound-Gerät finden" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kann Gerät %s nicht öffnen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3843,7 +3828,7 @@ msgstr "Optionen" msgid "Orange" msgstr "Orange" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3854,8 +3839,8 @@ msgstr "" "klicke Rechts und exportiere alle Spielstände,\n" "und importiere die Spielstände auf eine neue Memorycard.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3867,19 +3852,19 @@ msgstr "" "Der andere Client wurde, während das Spiel läuft, getrennt! Nun ist NetPlay " "inaktiv. Beenden Sie nun manuell das Spiel." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Ausgabe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Au&fnahme abspielen..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3895,7 +3880,7 @@ msgstr "Bild Ab" msgid "Page Up" msgstr "Bild Hoch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Verbinden" @@ -3907,35 +3892,35 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Parameter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Pixel Beleuchtung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekt" @@ -3944,37 +3929,37 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektive %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Start" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Start/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Spielbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Optionen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -3986,55 +3971,55 @@ msgstr "Bitte legen Sie vor dem Speichern eine Perspektive fest" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugiesisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilianisch)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4047,11 +4032,11 @@ msgstr "" msgid "Prev Page" msgstr "Vorh. Seite" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Vorherige Seite" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Vorheriger Wert" @@ -4059,7 +4044,7 @@ msgstr "Vorheriger Wert" msgid "Print" msgstr "Druck" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4067,7 +4052,7 @@ msgstr "Profil" msgid "Properties" msgstr "Eigenschaften" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Cache löschen" @@ -4075,8 +4060,8 @@ msgstr "Cache löschen" msgid "Question" msgstr "Frage" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Beenden" @@ -4094,7 +4079,7 @@ msgstr "R Taste" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4102,50 +4087,50 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Weite" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Nur-Lese-Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Echt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Wiederverbindung Bestätigen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote wiederverbinden, beim laden eines State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Aufnahme abspielen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4161,7 +4146,7 @@ msgstr "Rot links" msgid "Red Right" msgstr "Rot rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4175,29 +4160,29 @@ msgstr "" "Lässt das gerenderte Bild feiner aussehen, aber führt auch zu starkem Abfall " "der Performance." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Aktualisieren" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Liste aktualisieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Spieleliste aktualisieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Entfernen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4207,17 +4192,17 @@ msgstr "" "Szene als Drahtgittermodell rendern.\n" "Dies ist nur für Debugging nützlich." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Im Hauptfenster Rendern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Zurücksetzen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Ergebnisse" @@ -4239,29 +4224,25 @@ msgstr "Stick rechts" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Führt DSP LLE in einem eigenen Thread aus (nicht empfohlen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "S&tatus speichern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sicher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Abtastrate:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Speichern" @@ -4269,91 +4250,91 @@ msgstr "Speichern" msgid "Save GCI as..." msgstr "CGI speichern unter..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Status in Slot 1 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Status in Slot 2 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Status in Slot 3 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Status in Slot 4 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Status in Slot 5 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Status in Slot 6 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Status in Slot 7 speichern" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Status in Slot 8 speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Status speichern..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Suche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4361,24 +4342,24 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Rollen Feststell" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Suche" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4389,21 +4370,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Ausgewähltes %s nicht gefunden in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4421,23 +4402,23 @@ msgstr "Speicherdatei zum Importieren auswählen" msgid "Select floating windows" msgstr "Wähle unverankerte Fenster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4454,11 +4435,16 @@ msgstr "" "Erzwinge 4:3: Bild auf das Verhältnis 4:3 strecken.\n" "An Fenster anpassen: Bild auf Fenstergröße strecken." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Die ausgewählte Datei \"%s\" existiert nicht" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Ausgewählte Schriftart" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4468,7 +4454,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4478,11 +4464,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Senden" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Position der Sensorleiste:" @@ -4490,26 +4476,26 @@ msgstr "Position der Sensorleiste:" msgid "Separator" msgstr "Trennzeichen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serieller Port 1 - Dies ist der Port, den Geräte, wie der Net-Adapter, " "benutzen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Als Standard-Speicherkarte %c auswählen" @@ -4520,11 +4506,17 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Der Index ist größer als die AR-Code-Listengröße %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Einstellungen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" @@ -4532,7 +4524,7 @@ msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" msgid "Shake" msgstr "Schütteln" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kurzer Name:" @@ -4541,109 +4533,109 @@ msgstr "Kurzer Name:" msgid "Shoulder Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "&Konsole anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "&Log anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "&Statusleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "&Werkzeugleiste anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Laufwerke anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB Kopie-Regionen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Frankreich anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 #, fuzzy msgid "Show Input Display" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Italien anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korea anzeigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Sprache anzeigen:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "Tastenkürzel Einstellungen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Plattformen anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Regionen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Statistiken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Taiwan anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Hinweisfenster anzeigen, bevor die Emulation beendet wird." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4653,39 +4645,39 @@ msgstr "" "aber es kann dann vorkommen, dass Dolphin plötzlich ohne eine Warnung " "abstürzt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Ersten Block anzeigen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Blöcke anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Kommentar anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Symbol anzeigen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Namen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4693,11 +4685,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Unbekannte Anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4709,29 +4701,29 @@ msgstr "" msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass ausschalten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4739,7 +4731,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4749,17 +4741,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4767,7 +4759,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4779,11 +4771,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Sound Einstelungen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Sound-Backend %s ist ungültig." @@ -4797,17 +4789,17 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s" msgid "Space" msgstr "Leertaste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanisch" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4819,7 +4811,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disc-Ãœbertragungsrate beschleunigen" @@ -4827,51 +4819,55 @@ msgstr "Disc-Ãœbertragungsrate beschleunigen" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standard-Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Starte &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Aufnahme starten" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Aufnahme starten" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Status" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Status" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4880,7 +4876,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "An Fenstergröße anpassen" @@ -4905,8 +4901,8 @@ msgstr "Die gespeicherte Datei wurde erfolgreich importiert" msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Systemsprache:" @@ -4914,7 +4910,7 @@ msgstr "Systemsprache:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4936,31 +4932,31 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Screenshot erstellen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Testen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Cache löschen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Texturformat" @@ -4977,13 +4973,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5008,7 +5004,7 @@ msgstr "" "Die Datei %s wurde bereits geöffnet, der Header für die Datei wird nicht " "geschrieben." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Die angegebene Datei (%s) existiert nicht" @@ -5025,7 +5021,7 @@ msgstr "Der Name darf nicht das Zeichen \",\" enthalten" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5033,13 +5029,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Der Spielstand, denn Sie versuchen zu kopieren, hat eine ungültige " "Dateigröße." -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5073,14 +5069,11 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Theme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Theme-Auswahl schiefgelaufen" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5089,7 +5082,7 @@ msgstr "" "Es müsste ein Ticket für 00000001/00000002 vorhanden sein. Ihr NAND-Dump ist " "wahrscheinlich unvollständig." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5106,11 +5099,11 @@ msgstr "" "Dieser Action-Replay-Simulator unterstützt keine Codes, die sich selber " "verändern können." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5121,7 +5114,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5134,7 +5127,7 @@ msgstr "" "als einem Kern,\n" "kann aber gelegentlich Abstürze/Fehler verursachen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" @@ -5148,37 +5141,37 @@ msgid "Tilt" msgstr "Neigung" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "Oben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 #, fuzzy msgid "Toggle All Log Types" msgstr "Alle umschalten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Vollbildmodus wechseln" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Oben" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Versuche gerade einen unbekannten Dateityp zu Laden." @@ -5198,7 +5191,7 @@ msgstr "" "Versuche gerade eine ungültige SYSCONF zu Lesen\n" "Wiimote BT-IDs sind nicht verfügbar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Türkisch" @@ -5210,12 +5203,12 @@ msgstr "" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5246,12 +5239,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Undefiniert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Status laden rückgängig machen" @@ -5259,7 +5252,7 @@ msgstr "Status laden rückgängig machen" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Unbekannt" @@ -5289,8 +5282,8 @@ msgstr "" msgid "Up" msgstr "Hoch" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Update" @@ -5298,24 +5291,24 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Vollbild" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Hex verwenden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Warnmeldungen anzeigen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5323,7 +5316,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5332,15 +5325,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Hilfsmittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Wert" @@ -5348,23 +5341,23 @@ msgstr "Wert" msgid "Value:" msgstr "Wert:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Wert: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Ausführung" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Lautstärke" @@ -5379,7 +5372,7 @@ msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" msgid "WAD installation failed: error creating ticket" msgstr "WAD-Installation fehlgeschlagen: _Fehler erstellt_ %S" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5388,16 +5381,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Warnungen" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warnung - Starte DOL im falschen Consolen-Modus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warnung - Starte ELF im falschen Consolen-Modus!" @@ -5429,7 +5422,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5437,7 +5430,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5445,7 +5438,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5465,7 +5458,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Konnte Datei nicht öffnen." @@ -5473,7 +5466,7 @@ msgstr "WaveFileWriter - Konnte Datei nicht öffnen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Breitbild Hack" @@ -5481,24 +5474,24 @@ msgstr "Breitbild Hack" msgid "Width" msgstr "Weite" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5506,17 +5499,17 @@ msgstr "Wii Speicherdateien (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Konnte die Datei nicht lesen" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5529,19 +5522,19 @@ msgstr "" "oder die Wiimote war zulange inaktiv oder andere Ursachen.\n" "Soll die Wiimote jetzt wieder verbunden werden?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Verbunden" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5562,27 +5555,27 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Arbeite..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "In Konsole ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "In Datei ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "In Datei ausgeben" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 #, fuzzy msgid "Write to Window" msgstr "In Fenster zeigen ->" @@ -5620,24 +5613,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Es können keine Paletten geschlossen werden, die Seiten behinhalten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Sie müssen ein Spiel auswählen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Sie müssen einen Namen eingeben!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 #, fuzzy msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -5658,7 +5651,7 @@ msgid "" msgstr "" "Ihre SYSCONF-Datei hat eine falsche Größe - Sollte 0x%04x (Aber ist 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP Hack" @@ -5671,12 +5664,12 @@ msgstr "Zero 3 Code wird nicht unterstüzt" msgid "Zero code unknown to dolphin: %08x" msgstr "Der Zero Code ist in Dolphin unbekannt: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ warte ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5688,7 +5681,7 @@ msgstr "" msgid "[Custom]" msgstr "[Benutzerdefiniert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5699,7 +5692,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5708,11 +5701,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5729,7 +5722,7 @@ msgstr "Fehler beim Lesen von Daten aus der Datei: %s" msgid "failed to read header" msgstr "Fehler beim Lesen des Header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." @@ -5748,7 +5741,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -5760,7 +5753,7 @@ msgstr "zFar Korrektion: " msgid "zNear Correction: " msgstr "zNear Korrektion: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ODER" @@ -5770,6 +5763,9 @@ msgstr "| ODER" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Add function" #~ msgstr "&Funktion hinzufügen" @@ -5956,6 +5952,24 @@ msgstr "| ODER" #~ msgid "Count: %i" #~ msgstr "Anzahl: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Erstellt von KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Erstellt von Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." +#~ "com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Erstellt von VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Erstellt von black_rider und veröffentlicht auf ForumW.org > Web " +#~ "Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -5971,6 +5985,10 @@ msgstr "| ODER" #~ msgid "Disable Lighting" #~ msgstr "keine Beleuchtung" +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Farbtiefe" + #~ msgid "Disable Textures" #~ msgstr "keine Texturen" @@ -6238,6 +6256,10 @@ msgstr "| ODER" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Lade die ausgewählte Datei (DOL, ELF, GCM, ISO, WAD)" +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "Threads an Cores binden" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Wähle die 'low level' (LLE) oder 'high level' (HLE) Audioemulation" @@ -6331,6 +6353,9 @@ msgstr "| ODER" #~ msgid "Running script...\n" #~ msgstr "Script ausführen...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Abtastrate:" + #~ msgid "Save code" #~ msgstr "Code speichern" @@ -6457,6 +6482,9 @@ msgstr "| ODER" #~ msgid "The file " #~ msgstr "Die Datei " +#~ msgid "Theme selection went wrong" +#~ msgstr "Theme-Auswahl schiefgelaufen" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index b217b76fd7..b94a5f384c 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "" @@ -53,14 +53,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -145,147 +138,147 @@ msgstr "" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -305,7 +298,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" @@ -313,19 +306,19 @@ msgstr "" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -333,20 +326,20 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -354,23 +347,24 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -389,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -403,19 +397,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -424,8 +418,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -445,7 +439,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -466,7 +460,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -474,7 +468,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -482,27 +477,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -511,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "" @@ -523,13 +518,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -555,48 +550,48 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -604,19 +599,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -628,42 +623,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +666,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "" @@ -684,24 +679,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -720,12 +715,12 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" @@ -743,15 +738,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -759,11 +754,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -791,42 +786,42 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" @@ -847,25 +842,15 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -874,7 +859,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -890,7 +875,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -898,18 +883,18 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" @@ -923,7 +908,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -931,24 +916,24 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -962,12 +947,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -975,47 +959,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "" @@ -1023,14 +1007,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1044,8 +1028,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1055,22 +1039,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1082,91 +1066,91 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1186,12 +1170,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1200,7 +1184,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1218,12 +1202,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1238,27 +1222,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1267,24 +1251,7 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1292,11 +1259,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1307,12 +1274,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1320,11 +1287,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" @@ -1336,36 +1303,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "" @@ -1377,11 +1344,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" @@ -1398,11 +1365,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1410,24 +1377,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "" @@ -1436,11 +1403,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1449,11 +1416,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1464,13 +1431,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "" @@ -1492,20 +1459,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1514,7 +1477,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1524,7 +1487,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1533,11 +1496,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1548,20 +1511,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1569,53 +1536,58 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1624,58 +1596,58 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" @@ -1692,11 +1664,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1704,7 +1676,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1712,12 +1684,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1725,7 +1697,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1733,7 +1705,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1742,7 +1714,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1752,19 +1724,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1774,72 +1746,71 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1848,17 +1819,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1866,7 +1837,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1874,24 +1845,41 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1899,13 +1887,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1916,14 +1904,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1941,17 +1929,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1986,32 +1974,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2027,7 +2015,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2039,44 +2027,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" @@ -2084,7 +2072,7 @@ msgstr "" msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2092,7 +2080,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2100,15 +2088,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2205,41 +2193,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2252,7 +2240,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2265,19 +2253,19 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2285,27 +2273,27 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2313,7 +2301,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2321,7 +2309,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2352,42 +2340,42 @@ msgstr "" msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2395,16 +2383,16 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "" @@ -2416,7 +2404,7 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" @@ -2424,27 +2412,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" @@ -2452,25 +2440,25 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2483,20 +2471,20 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" @@ -2505,19 +2493,19 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2528,7 +2516,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2548,11 +2536,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2560,7 +2548,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" @@ -2572,7 +2560,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2586,11 +2574,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2601,8 +2589,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2610,17 +2598,17 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" @@ -2642,7 +2630,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "" @@ -2650,19 +2638,19 @@ msgstr "" msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "" @@ -2674,29 +2662,29 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2705,7 +2693,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2714,7 +2702,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2722,23 +2710,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2746,16 +2734,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2763,7 +2751,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2775,7 +2763,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "" @@ -2783,11 +2771,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "" @@ -2796,34 +2784,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "" @@ -2842,15 +2830,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2859,11 +2847,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2884,7 +2872,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" @@ -2892,21 +2880,21 @@ msgstr "" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2914,16 +2902,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2931,24 +2919,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -2966,19 +2954,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -2988,96 +2980,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3088,31 +3080,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3120,12 +3108,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3144,7 +3132,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3158,24 +3146,24 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" @@ -3184,7 +3172,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3213,20 +3201,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "" @@ -3235,7 +3223,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3256,7 +3244,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3271,7 +3259,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3369,16 +3357,16 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" @@ -3387,20 +3375,20 @@ msgstr "" msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3408,7 +3396,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "" @@ -3430,7 +3418,7 @@ msgstr "" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3443,33 +3431,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3478,7 +3466,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3486,16 +3474,16 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" @@ -3503,11 +3491,11 @@ msgstr "" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3515,52 +3503,52 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3573,15 +3561,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3591,19 +3579,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3619,7 +3607,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3631,34 +3619,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3667,36 +3655,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "" @@ -3708,54 +3696,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3768,11 +3756,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3780,7 +3768,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3788,7 +3776,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3796,8 +3784,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3815,7 +3803,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3823,46 +3811,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3878,7 +3866,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3887,46 +3875,46 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3948,29 +3936,25 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" @@ -3978,90 +3962,90 @@ msgstr "" msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4069,23 +4053,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4096,20 +4080,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4124,23 +4108,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4151,11 +4135,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4165,7 +4153,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4175,11 +4163,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4187,24 +4175,24 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4214,11 +4202,17 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4226,7 +4220,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4234,141 +4228,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4376,11 +4370,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4391,27 +4385,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4419,7 +4413,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4429,17 +4423,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "" @@ -4447,7 +4441,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4459,11 +4453,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4477,17 +4471,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4499,7 +4493,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4507,51 +4501,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4560,7 +4558,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4585,8 +4583,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "" @@ -4594,7 +4592,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4615,30 +4613,30 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4654,13 +4652,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4679,7 +4677,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4696,7 +4694,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4704,11 +4702,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4739,12 +4737,8 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +msgid "Theme:" msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 @@ -4753,7 +4747,7 @@ msgid "" "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4765,11 +4759,11 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4780,7 +4774,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4788,7 +4782,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4802,35 +4796,35 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4848,7 +4842,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4860,12 +4854,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4896,12 +4890,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" @@ -4909,7 +4903,7 @@ msgstr "" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" @@ -4938,8 +4932,8 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" @@ -4947,23 +4941,23 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4971,7 +4965,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4980,15 +4974,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -4996,23 +4990,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "" @@ -5026,7 +5020,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5035,16 +5029,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5069,7 +5063,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5077,7 +5071,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5085,7 +5079,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5105,7 +5099,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5113,7 +5107,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" @@ -5121,23 +5115,23 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5145,17 +5139,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5164,19 +5158,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5196,26 +5190,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5252,23 +5246,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5286,7 +5280,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" @@ -5299,12 +5293,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5316,7 +5310,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5327,7 +5321,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5336,11 +5330,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "" @@ -5357,7 +5351,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5376,7 +5370,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5388,6 +5382,6 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 1b25d933e3..782563be9f 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-24 11:46+0200\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" "Language: Greek\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(πολλά αποτελέσματα για να εμφανιστοÏν)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Παιχνίδι : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -44,7 +44,8 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." +msgstr "" +"Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format @@ -56,14 +57,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sΑντιγÏαφή%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i Συνδεδεμένο" @@ -77,7 +71,8 @@ msgstr "%s υπάÏχει ήδη, θέλετε αντικατάσταση;" #: Source/Core/DiscIO/Src/CompressedBlob.cpp:167 #, c-format msgid "%s failed to be scrubbed. Probably the image is corrupt." -msgstr "%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." +msgstr "" +"%s απέτυχε να γίνει scrubbed. Πιθανότατα το αÏχείο εικόνας είναι φθαÏμένο." #: Source/Core/Core/Src/HW/GCMemcard.cpp:95 #, c-format @@ -104,7 +99,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s απέτυχε να φοÏτώσει ως κάÏτα μνήμης \n" -"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας μνήμης (0x%x bytes)" +"το αÏχείο δεν είναι αÏκετά μεγάλο ώστε να αποτελεί έγκυÏο αÏχείο κάÏτας " +"μνήμης (0x%x bytes)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -135,7 +131,9 @@ msgstr "Το %s είναι ήδη συμπιεσμένο! Δε γίνεται ν #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:345 #, c-format msgid "%s is too long for the filename, max chars is 45" -msgstr "Το %s είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ για όνομα αÏχείου, ο μέγιστος αÏιθμός χαÏακτήÏων είναι 45" +msgstr "" +"Το %s είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ για όνομα αÏχείου, ο μέγιστος αÏιθμός χαÏακτήÏων " +"είναι 45" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:200 #, c-format @@ -157,147 +155,147 @@ msgstr "%sΕισαγωγή GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ΕλεÏθεÏα μπλοκ; %u ΕλεÏθεÏες Θέσεις Φακέλων" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&ΠεÏί..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Εκκίνηση από τον οδηγό DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Σημεία Διακοπής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ΕÏÏεση ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&ΔιαχειÏιστής Cheat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Εξομοίωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&ΑÏχείο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Βοήθεια" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&ΔιαχειÏιστής ΚαÏτών Μνήμης (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Μνήμη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Άνοιγμα..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&ΠαÏση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&ΚαταχωÏητές" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Ήχος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Διακοπή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Βίντεο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&ΠÏοβολή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -317,7 +315,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ΑΓÎΩΣΤΟ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ανενεÏγό)" @@ -325,19 +323,19 @@ msgstr "(ανενεÏγό)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,20 +343,20 @@ msgstr "8 bit" msgid "" msgstr "<Εισάγετε όνομα εδώ>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Δε βÏέθηκαν αναλÏσεις>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<Τίποτα>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<Πατήστε ΠλήκτÏο>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<Συστήματος>" @@ -366,33 +364,37 @@ msgstr "<Συστήματος>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Ένα παÏάθυÏο NetPlay είναι ήδη ανοιχτό!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Αυτή τη στιγμή δεν εκτελείται κάπιο παιχνίδι." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Δε βÏέθηκε υποστηÏιζόμενη συσκευή bluetooth!\n" "(ΥποστηÏίζεται μόνο το Microsoft bluetooth stack)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -406,21 +408,23 @@ msgstr "" " - ΔÏο ΠυÏήνες [ΑÎΕÎΕΡΓΟ]\n" " - Throttle Ήχου [ΑÎΕÎΕΡΓΟ]\n" " - DSP-HLE με \"Null Audio\" ή DSP-LLE\n" -" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" +" - ΧειÏοκίνητη εισαγωγή του ακÏιβοÏÏ‚ αÏÎ¹Î¸Î¼Î¿Ï Ï„Ï‰Î½ ελεγκτών που θα " +"χÏησιμοποιηθοÏν σαν [Τυπικός Ελεγκτής]\n" "\n" "Όλοι οι παίκτες Ï€Ïέπει να έχουν την ίδια έκδοση και Ïυθμίσεις του Dolphin.\n" -"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες Ï€Ïιν την εκκίνηση.\n" +"ΑπενεÏγοποιήστε όλες τις κάÏτες μνήμης ή στείλτε τες σε όλους τους παίκτες " +"Ï€Ïιν την εκκίνηση.\n" "Η υποστήÏιξη Wiimote δεν έχει ακόμα υλοποιηθεί.\n" "\n" "Θα Ï€Ïέπει να έχετε κάνει Ï€Ïοώθηση της πόÏτας TCP στον host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Κωδικοί AR" @@ -428,32 +432,34 @@ msgstr "Κωδικοί AR" msgid "About Dolphin" msgstr "Σχετικά με το Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Επιτάχυνση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "ΑκÏίβεια:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "ΑκÏιβής VBeam εξομοίωση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Εξομοιώνει με ακÏίβεια τα EFB αντίγÏαφα.\n" -"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες του gameplay.\n" +"Κάποια παιχνίδια βασίζονται σε αυτό για οÏισμένα εφέ γÏαφικών ή λειτουÏγίες " +"του gameplay.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε EFB ΑντίγÏαφα σε Υφή." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ΕνέÏγεια" @@ -474,60 +480,79 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) στην " +"ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill και Slide (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Fill " +"και Slide (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram Write και Fill (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Ram " +"Write και Fill (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write To Pointer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Σφάλμα Action Replay: Μη έγκυÏο μέγεθος (%08x : διεÏθυνση = %08x) σε Write " +"To Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Σφάλμα Action Replay: Μη έγκυÏη τιμή (%08x) σε Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format -msgid "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" -msgstr "Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν έχουν υλοποιηθεί (%s)" +#, fuzzy, c-format +msgid "" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." +msgstr "" +"Σφάλμα Action Replay: Οι λειτουÏγίες Master Code και Write To CCXXXXXX δεν " +"έχουν υλοποιηθεί (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format msgid "Action Replay Error: invalid AR code line: %s" msgstr "Σφάλμα Action Replay: μη έγκυÏη γÏαμμή κώδικα AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: Μη έγκυÏο μέγεθος %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Μη έγκυÏος Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Μη έγκυÏο subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Μη έγκυÏο Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "ΠÏοσαÏμογέας:" @@ -536,11 +561,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -548,13 +573,13 @@ msgstr "ΠÏοσθήκη Patch" msgid "Add new pane" msgstr "ΠÏοσθήκη νέου pane" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "ΠÏοσθήκη..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ΔιεÏθυνση :" @@ -562,7 +587,8 @@ msgstr "ΔιεÏθυνση :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." @@ -572,76 +598,81 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την ενεÏγοποίηση των κουμπιών." +msgstr "" +"ΡÏθμιση της απαιτοÏμενης πίεσης του Î±Î½Î±Î»Î¿Î³Î¹ÎºÎ¿Ï Ï‡ÎµÎ¹ÏιστηÏίου για την " +"ενεÏγοποίηση των κουμπιών." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Για Ï€ÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " +"emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, και 6 μέσα από το παÏάθυÏο εξομοίωσης.\n" +"ΕπιτÏέπει την εναλλαγή οÏισμένων επιλογών με τα πλήκτÏα συντόμευσης 3, 4, 5, " +"και 6 μέσα από το παÏάθυÏο εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Εναλλακτικός ΧÏονισμός Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Ανάλυση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Εξομάλυνση ΟÏίων:" @@ -653,15 +684,15 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "ΕφαÏμογή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -671,16 +702,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε (ανενεÏγό)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ΑÏαβικά" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -688,12 +719,14 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για πάντα!" +msgstr "" +"Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " +"πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -701,12 +734,12 @@ msgstr "Αναλογία Οθόνης:" msgid "At least one pane must remain open." msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοιχτό." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -714,30 +747,31 @@ msgstr "Backend Ήχου:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Σφάλμα ανοίγματος AO συσκευής.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Αυτόματα" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Αυτόματα (Πολλαπλάσιο του 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Αυτόματα (Μέγεθος ΠαÏαθÏÏου)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Αυτόματη ΠÏοσαÏμογή Μεγέθους ΠαÏαθÏÏου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική ανάλυση.\n" +"ΠÏοσαÏμόζει αυτόματα το μέγεθος του παÏαθÏÏου σÏμφωνα με την εσωτεÏική " +"ανάλυση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -753,12 +787,12 @@ msgstr "BP ΚαταχωÏητές" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" @@ -776,15 +810,15 @@ msgid "Bad File Header" msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "ΛεπτομέÏειες Εικονιδίου:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Εικονίδιο:" @@ -792,11 +826,11 @@ msgstr "Εικονίδιο:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Βασικές" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Βασικές Ρυθμίσεις" @@ -824,42 +858,42 @@ msgstr "ΑÏιστεÏÏŒ Μπλε" msgid "Blue Right" msgstr "Δεξί Μπλε" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Βάση" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Δεσμευμένοι ΧειÏισμοί: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Χαλασμένο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "ΕÏÏεση" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Κουμπιά" @@ -880,27 +914,15 @@ msgstr "Stick ΚάμεÏας" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Μηχανή Εξομοίωσης CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" -"Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" -"\n" -"Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -910,11 +932,12 @@ msgid "" msgstr "" "Υπολογίζει τον φωτισμό των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" "Μειώνει την ταχÏτητα εξομοίωσης κατά κάποιο ποσοστό (ανάλογα με την GPU).\n" -"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες φοÏές Ï€Ïοβλήματα.\n" +"Αυτή συνήθως είναι μια ασφαλής βελτίωση, αλλά μποÏεί να Ï€Ïοκαλέσει οÏισμένες " +"φοÏές Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "ΆκυÏο" @@ -928,9 +951,10 @@ msgstr "Αποτυχία ανοίγματος %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "Δεν μποÏεί να γίνει κατάÏγηση καταχώÏησης συμβάντων όταν οÏισμένα εκκÏεμοÏν." +msgstr "" +"Δεν μποÏεί να γίνει κατάÏγηση καταχώÏησης συμβάντων όταν οÏισμένα εκκÏεμοÏν." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -941,7 +965,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -949,12 +973,12 @@ msgstr "" "Αδυναμία χÏήσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… αÏχείου σαν κάÏτα μνήμης.\n" "ΠÏοσπαθείτε να χÏησιμοποιήσετε το ίδιο αÏχείο σε δÏο slot;" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Αποτυχία εÏÏεσης WiiMote με bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Αδυναμία εÏÏεσης του WiiMote με handle σÏνδεσης %02x" @@ -968,7 +992,7 @@ msgstr "Αδυναμία ανάγνωσης από το DVD_Plugin - DVD-Interfa msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Καταλανικά" @@ -976,24 +1000,24 @@ msgstr "Καταλανικά" msgid "Center" msgstr "ΚέντÏο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Αλλαγή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Αλλαγή &Δίσκου..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Αλλαγή Δίσκου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Αλλαγή ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1009,12 +1033,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Αυτή η αλλαγή δε θα έχει επίπτωση όσο ο εξομοιωτής εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Συνομιλία" @@ -1022,47 +1045,47 @@ msgstr "Συνομιλία" msgid "Cheat Code" msgstr "Κωδικός Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Αναζήτηση Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "ΔιαχείÏιση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Έλεγχος ΑκεÏαιότητας Κατάτμησης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Έλεγχος ακεÏαιότητας..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Κινέζικα (Απλοποιημένα)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1070,12 +1093,16 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που απαÏτίζονται μόνο από φακέλους)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Επιλέξτε ένα αÏχείο για χÏήση ως apploader: (έχει εφαÏμογή σε δίσκους που " +"απαÏτίζονται μόνο από φακέλους)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Επιλέξτε τον φάκελο Ï€Ïος αποσυμπίεση" @@ -1089,31 +1116,35 @@ msgstr "Κλασικό ΧειÏιστήÏιο" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "ΚαθάÏισ." #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Ο Client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεÏγοποιηθεί. Θα Ï€Ïέπει να σταματήσετε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Κλείσιμο" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ρυ&θμίσεις..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "ΠληÏοφοÏίες ΚωδικοÏ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Κωδικός: " @@ -1125,91 +1156,91 @@ msgstr "Εντολή" msgid "Comment" msgstr "Σχόλιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Συμπίεση ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Ρυθμίσεις ΧειÏιστηÏίου" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Ρυθμίσεις ΧειÏιστηÏίων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Επιβεβαίωση Διακοπής" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "ΣÏνδεση Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "ΣÏνδεση Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "ΣÏνδεση Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "ΣÏνδεση Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "ΣÏνδεση Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Γίνεται ΣÏνδεση..." @@ -1229,12 +1260,12 @@ msgstr "ΜετατÏοπή σε GCI" msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "ΑντιγÏαφή στην κάÏτα μνήμης %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "ΠυÏήνας" @@ -1243,52 +1274,61 @@ msgstr "ΠυÏήνας" msgid "Could not create %s" msgstr "Αποτυχία δημιουÏγίας %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Αποτυχία εκκίνησης backend %s" #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format -msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." msgstr "" -"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" -" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." +"Δεν μπόÏεσε να γίνει ανάγνωση \"%s\". Δεν υπάÏχει δίσκος στον οδηγό, ή δεν " +"είναι ένα αντίγÏαφο εικόνας GC/Wii.\n" +" Σημειώστε πως αυθεντικοί Gamecube και Wii δίσκοι δεν μποÏοÏν να αναγνωστοÏν " +"από τους πεÏισσότεÏους PC DVD οδηγοÏÏ‚." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format msgid "Could not recognize ISO file %s" msgstr "Αποτυχία αναγνώÏισης του αÏχείου ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Αποτυχία αποθήκευσης του %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι Ï„Ïέχει!\n" -"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος το παÏόν)" +"Αδυναμία καθοÏÎ¹ÏƒÎ¼Î¿Ï Ï‡ÎµÎ¹ÏιστηÏίων. Ο παίκτης εγκατέλειψε ή το παιχνίδι " +"Ï„Ïέχει!\n" +"(ο καθοÏισμός των χειÏιστηÏίων ενώ το παιχνίδι Ï„Ïέχει δεν υποστηÏίζεται Ï€Ïος " +"το παÏόν)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Δεν μπόÏεσε να γίνει εγγÏαφή των αÏχείων της κάÏτας μνήμης %s.\n" "\n" -"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει Ï€Ïοστασία εγγÏαφής;" +"Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " +"Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1296,17 +1336,17 @@ msgstr "" "Αδυναμία εκκίνησης του πυÏήνα.\n" "Ελέξγτε τις Ïυθμίσεις σας." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Πλήθος:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "ΧώÏα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" @@ -1315,23 +1355,7 @@ msgstr "ΔημιουÏγία ÎšÏ‰Î´Î¹ÎºÎ¿Ï AR" msgid "Create new perspective" msgstr "ΔημιουÏγία νέας οπτικής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "ΔημιουÏγήθηκε από KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "ΔημιουÏγήθηκε από VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "ΔημιουÏγός: " @@ -1339,11 +1363,11 @@ msgstr "ΔημιουÏγός: " msgid "Critical" msgstr "ΚÏίσιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Κόψιμο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1357,12 +1381,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ο Ï„Ïέχων φάκελος άλλαξε από %s σε %s μετά από τον wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "ΠÏοσαÏμοζόμενο Projection Hack" @@ -1370,11 +1394,11 @@ msgstr "ΠÏοσαÏμοζόμενο Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ρυθμίσεις ΠÏοσαÏμοζόμενου Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Τσέχικα" @@ -1386,36 +1410,36 @@ msgstr "D" msgid "D-Pad" msgstr "Ψηφιακό Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1425,13 +1449,14 @@ msgstr "DVDLowRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία αν #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:332 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -msgstr "DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" +msgstr "" +"DVDLowUnencryptedRead - Σφάλμα ΤεÏματισμοÏ: αποτυχία ανάγνωσης από τον τομέα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Μέγεθος Δεδομένων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "ΗμεÏομηνία:" @@ -1448,11 +1473,11 @@ msgstr "ΑÏχεία Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "ÎεκÏή Ζώνη" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1460,24 +1485,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" @@ -1486,11 +1511,11 @@ msgid "Default font" msgstr "ΠÏοεπιλεγμένη γÏαμματοσειÏά" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "ΔιαγÏαφή" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "ΔιαγÏαφή Αποθήκευσης" @@ -1499,26 +1524,30 @@ msgstr "ΔιαγÏαφή Αποθήκευσης" msgid "Delete the existing file '%s'?" msgstr "ΔιαγÏαφή του υπάÏχοντος αÏχείου '%s';" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "ΠεÏιγÏαφή" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Ανίχνευση" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα χωÏάνε μέσα στο buffer. Clamp." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Εντοπίστηκε Ï€Ïοσπάθεια ανάγνωσης πεÏισσότεÏων δεδομένων από το DVD από όσα " +"χωÏάνε μέσα στο buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1542,44 +1571,46 @@ msgstr "" "Το checksum του Καταλόγου απέτυχε\n" " καθώς και το checksum του εφεδÏÎ¹ÎºÎ¿Ï ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απέτυχε" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "ΑπενεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "ΑπενεÏγοποίηση Ομίχλης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "ΑπενεÏγοποιεί την XFB εξομοίωση.\n" -"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" +"ΕπιταχÏνει αÏκετά την εξομοίωση αλλά Ï€Ïοκαλεί μεγάλα ελαττώματα σε πολλά " +"παιχνίδια που βασίζονται σε αυτήν (ειδικά σε homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "ΑπενεÏγοποιεί την εξομοίωση των EFB αντιγÏαφών.\n" -"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" +"ΧÏησιμοποιοÏνται συχνά για post-processing ή render-to-texture εφέ, έτσι αν " +"και επιλέγοντάς το αυξάνονται κατά Ï€Î¿Î»Ï Î¿Î¹ επιδόσεις, σχεδόν πάντα " +"Ï€ÏοκαλοÏνται Ï€Ïοβλήματα.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Δίσκος" @@ -1588,11 +1619,11 @@ msgstr "Δίσκος" msgid "Disc Read Error" msgstr "Σφάλμα Ανάγνωσης Δίσκου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1606,20 +1637,24 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ρυθμίσεις ΓÏαφικών Dolphin %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Ιστοσελίδα του &Dolphin" @@ -1627,49 +1662,62 @@ msgstr "Ιστοσελίδα του &Dolphin" msgid "Dolphin Configuration" msgstr "Ρυθμίσεις Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Ρυθμίσεις Dolphin Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση αÏχείων..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " +"αÏχείων..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " +"εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." + +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Κάτω" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ΜεταφόÏτωση Κωδικών (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν %lu)" @@ -1678,47 +1726,49 @@ msgstr "ΜεταφοÏτώθηκαν %lu κωδικοί. (Ï€Ïοστέθηκαν msgid "Drums" msgstr "ΤÏμπανα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Εξαγωγή EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Εξαγωγή ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Εξαγωγή Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/Frames/\n" +"Εξαγωγή όλων των απεικονισμένων καÏέ σε ένα AVI αÏχείο στο User/Dump/" +"Frames/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures//\n" +"Εξαγωγή των αποκωδικοποιημένων υφών του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï ÏƒÏ„Î¿ User/Dump/Textures/" +"/\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1728,34 +1778,42 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Ολλανδικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Έ&ξοδος" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB ΑντίγÏαφα" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δοÏνε τους νέους οδηγοÏÏ‚." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"ΣΦΑΛΜΑ: Αυτή η έκδοση του Dolphin απαιτεί TAP-Win32 οδηγοÏÏ‚ που να είναι " +"τουλάχιστον έκδοσης %d.%d -- Αν Ï€Ïόσφατα αναβαθμίσατε την διανομή του " +"Dolphin σας, πιθανότατα απαιτείται μία επανεκκίνηση ώστε τα Windows να δοÏνε " +"τους νέους οδηγοÏÏ‚." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" msgstr "ΕΥΡΩΠΗ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "ΕνημεÏώσεις Μνήμης ÎωÏίς" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "ΕπεξεÏγασία" @@ -1763,7 +1821,7 @@ msgstr "ΕπεξεÏγασία" msgid "Edit ActionReplay Code" msgstr "ΕπεξεÏγασία ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ΕπεξεÏγασία Ρυθμίσεων" @@ -1771,12 +1829,12 @@ msgstr "ΕπεξεÏγασία Ρυθμίσεων" msgid "Edit Patch" msgstr "ΕπεξεÏγασία Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "ΕπεξεÏγασία Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "ΕπεξεÏγασία..." @@ -1784,7 +1842,7 @@ msgstr "ΕπεξεÏγασία..." msgid "Effect" msgstr "Εφέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1792,122 +1850,130 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "Το νήμα εξομοίωσης εκτελείται ήδη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Εξομοιώνει τα XFBs με ακÏίβεια.\n" -"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +"ΕπιβÏαδÏνει αÏκετά την εξομοίωση και αποτÏέπει την απόδοση γÏαφικών υψηλής " +"ανάλυσης, αλλά είναι απαÏαίτητο για την σωστή εξομοίωση οÏισμένου αÏÎ¹Î¸Î¼Î¿Ï " +"παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε εικονική XFB εξομοίωση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Εξομοιώνει XFBs χÏησιμοποιώντας GPU αντικείμενα υφής.\n" -"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" +"ΔιοÏθώνει πολλά παιχνίδια που δεν δουλεÏουν χωÏίς XFB εξομοίωση, χωÏίς " +"παÏάληλα να είναι αÏγή όπως η Ï€Ïαγματική XFB εξομοίωση. ΠαÏόλα αυτά μποÏεί " +"να αποτÏχει σε πολλά άλλα παιχνίδια (ειδικά homebrew εφαÏμογές).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Εξομοιωμένο Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Κατάσταση ΛειτουÏγίας:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "ΕνεÏγοποίηση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" +"ΕνεÏγοποιεί 3D εφέ μέσω στεÏεοσκοπίας χÏησιμοποιώντας την τεχνολογία 3D " +"Vision της Nvidia αν υποστηÏίζεται από την GPU.\n" "Πιθανώς μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα.\n" "ΧÏειάζεται λειτουÏγία πλήÏης οθόνης για να λειτουÏγήσει.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "ΕνεÏγοποίηση BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "ΕνεÏγοποίηση Bounding Box Υπολογισμών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "ΕνεÏγοποίηση Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "ΕνεÏγοποίηση Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "ΕνεÏγοποίηση Î”Î¹Ï€Î»Î¿Ï Î Ï…Ïήνα (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "ΕνεÏγοποίηση ΣυντομεÏσεων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ΕνεÏγοποίηση Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "ΕνεÏγοποίηση Idle Skipping (επιτάχυνση)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "ΕνεÏγοποίηση MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "ΕνεÏγοποίηση ΕυÏείας Οθόνης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "ΕνεÏγοποίηση Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1916,69 +1982,109 @@ msgid "" "If unsure, select 1x." msgstr "" "ΕνεÏγοποιεί το ανισοτÏοπικό φιλτÏάÏισμα.\n" -"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές γωνίες.\n" +"Βελτιώνει την ποιότητα απεικόνισης των υφών που βÏίσκονται σε οξείες οπτικές " +"γωνίες.\n" "ΜποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε έναν μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. (ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"ΕνεÏγοποιεί τη γÏήγοÏη Ï€Ïόσβαση δίσκου. ΑπαÏαίτητο για μεÏικά παιχνίδια. " +"(ΕÎΕΡΓΟ = ΓÏήγοÏο, ΑÎΕÎΕΡΓΟ = Συμβατό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "ΕνεÏγοποίηση σελίδων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την απεικόνιση.\n" +"ΕνεÏγοποιήστε το αν θέλετε ολόκληÏη η οθόνη να χÏησιμοποιηθεί για την " +"απεικόνιση.\n" "Αν αυτό είναι απενεÏγοποιημένο, θα δημιουÏγηθεί ένα παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" +"ΕνεÏγοποιήστε το αν θέλετε να χÏησιμοποιήσετε το κÏÏιο παÏάθυÏο του Dolphin " +"για απεικόνιση αντί για ξεχωÏιστό παÏάθυÏο απεικόνισης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " +"Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +msgid "" +"Enables Block Address Translation (BAT); a function of the Memory Management " +"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " +"Fast)" +msgstr "" +"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " +"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " +"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" +"ΕνεÏγοποιεί την Ï€Ïοοδευτική σάÏωση αν υποστηÏίζεται από το εξομοιωμένο " +"λογισμικό. Τα πεÏισσότεÏα παιχνίδια δεν την χÏειάζονται αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"ΕνεÏγοποιεί τη Μονάδα ΔιαχείÏισης Μνήμης, απαÏαίτητο για μεÏικά παιχνίδια. " +"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1992,14 +2098,14 @@ msgstr "" msgid "End" msgstr "Τέλος" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Αγγλικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Βελτιώσεις" @@ -2017,29 +2123,40 @@ msgstr "ΕγγÏαφή %d/%d" msgid "Entry 1/%d" msgstr "ΕγγÏαφή 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Ίσο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Σφάλμα" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." -msgstr "Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +msgstr "" +"Αποτυχία φόÏτωσης της επιλεγμένης γλώσσας. ΕπαναφοÏά στην Ï€Ïοεπιλογή " +"συστήματος." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Σφάλμα: Μετά από \"%s\", βÏέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d (0x%X). Ματαίωση φόÏτωσης σημείου αποθήκευσης..." +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Σφάλμα: Μετά από \"%s\", βÏέθηκε %d (0x%X) αντί του σημείου αποθήκευσης %d " +"(0x%X). Ματαίωση φόÏτωσης σημείου αποθήκευσης..." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή να κÏασάÏουν." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Σφάλμα: ΠÏοσπάθεια Ï€Ïόσβασης των %s γÏαμματοσειÏών αλλά δεν είναι " +"φοÏτωμένες. Τα παιχνίδια μποÏεί να μη δείχνουν τις γÏαμματοσειÏές σωστά, ή " +"να κÏασάÏουν." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2052,38 +2169,39 @@ msgstr "Euphoria" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" +msgstr "" +"ΧειÏιστής εξαιÏέσεων - Ï€Ïόσβαση κάτω από την πεÏιοχή μνήμης. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" msgstr "Εκτέλεση" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Αποτυχία Εξαγωγής" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Εξαγωγή ΑÏχείου" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Εξαγωγή ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Εξαγωγή ΕγγÏαφής..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Εξαγωγή όλων των αποθηκεÏσεων" @@ -2099,7 +2217,7 @@ msgstr "Εξαγωγή αποθήκευσης ως..." msgid "Extension" msgstr "Επέκταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "ΕξωτεÏικό Frame Buffer" @@ -2111,44 +2229,44 @@ msgstr "Επιπλέον ΠαÏάμετÏος" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Η Επιπλέον ΠαÏάμετÏος είναι χÏήσιμη μόνο στο ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Εξαγωγή όλων των αÏχείων..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Εξαγωγή Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Εξαγωγή DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Εξαγωγή Φακέλου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Εξαγωγή ΑÏχείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Εξαγωγή Κατάτμησης..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Γίνεται εξαγωγή %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Γίνεται εξαγωγή όλων των αÏχείων" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Γίνεται εξαγωγή φακέλου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." @@ -2156,7 +2274,7 @@ msgstr "Γίνεται εξαγωγή..." msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "ΑναπαÏαγωγή FIFO" @@ -2164,7 +2282,7 @@ msgstr "ΑναπαÏαγωγή FIFO" msgid "FRANCE" msgstr "ΓΑΛΛΙΑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Μέγεθος FST:" @@ -2172,15 +2290,15 @@ msgstr "Μέγεθος FST:" msgid "Failed to Connect!" msgstr "Αποτυχία σÏνδεσης!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Αποτυχία ακÏόασης!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Αποτυχία μεταφόÏτωσης κωδικών." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Αποτυχία εξαγωγής στο %s!" @@ -2200,10 +2318,12 @@ msgstr "" "Αποτυχία φόÏτωσης DSP ROM:\t%s\n" "\n" "Αυτό το αÏχείο χÏειάζεται για να χÏησιμοποιηθεί το DSP LLE.\n" -"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής ιδιοκτησίας.\n" +"Δεν συμπεÏιλαμβάνεται με το Dolphin γιατί πεÏιέχει δεδομένα πνευματικής " +"ιδιοκτησίας.\n" "ΧÏησιμοποιήστε το DSPSpy για να εξάγετε το αÏχείο από την κονσόλα σας.\n" "\n" -"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM dumps.\n" +"ΜποÏείτε να χÏησιμοποιήσετε την DSP HLE μηχανή η οποία δεν χÏειάζεται ROM " +"dumps.\n" "(Επιλέξτε την από την καÏτέλα \"Ήχος\" του παÏαθÏÏου των γενικών Ïυθμίσεων.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2298,40 +2418,43 @@ msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το msgid "Failed to write header for file %d" msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το αÏχείο %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "ΠεÏσικά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format -msgid "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" -msgstr "ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε PlayWiimote: %u != %u, byte %u.)%s" +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" +"ΑνεπανόÏθωτος αποσυγχÏονισμός. ΑκÏÏωση αναπαÏαγωγής. (Σφάλμα σε " +"PlayWiimote: %u != %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "ΑναπαÏαγωγή Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "ΠληÏοφοÏίες ΑÏχείου" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Το αÏχείο δεν πεÏιείχε κωδικοÏÏ‚." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Το αÏχείο μετατÏάπηκε σε .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2348,7 +2471,7 @@ msgstr "" "Το αÏχείο έχει επέκταση \"%s\"\n" "έγκυÏες επεκτάσεις είναι (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Το αÏχείο δεν αναγνωÏίζεται σαν κάÏτα μνήμης" @@ -2361,19 +2484,19 @@ msgstr "Το αÏχείο δεν είναι συμπιεσμένο" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "ΕÏÏεση επομένου" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "ΕÏÏεση Ï€ÏοηγοÏμενου" @@ -2381,27 +2504,27 @@ msgstr "ΕÏÏεση Ï€ÏοηγοÏμενου" msgid "First Block" msgstr "ΠÏώτο Μπλοκ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ΕπιδιόÏθωση Checksum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Επιβολή 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Επιβολή 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Επιβολή της Κονσόλας ως NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Επιβολή ΦιλτÏαÏίσματος Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2409,11 +2532,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Επιβάλλει φιλτÏάÏισμα υφών ακόμα κι αν το παιχνίδι το έχει απενεÏγοποιήσει.\n" -"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα σε οÏισμένα παιχνίδια.\n" +"Βελτιώνει ελαφÏÏŽÏ‚ την ποιότητα των υφών αλλά μποÏεί να Ï€Ïοκαλέσει Ï€Ïοβλήματα " +"σε οÏισμένα παιχνίδια.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2425,13 +2549,16 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" -"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM γÏαμματοσειÏά.\n" -"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." +"Επιβάλει τη NTSC-J λειτουÏγία για να χÏησιμοποιηθεί η Ιαπωνική ROM " +"γÏαμματοσειÏά.\n" +"Άμα αφεθεί αποεπιλεγμένο, το dolphin Ï€Ïοεπιλέγει τη NTSC-U και ενεÏγοποιεί " +"αυτόματα αυτήν την ÏÏθμιση όταν παίζονται Ιαπωνικά παιχνίδια." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" @@ -2459,42 +2586,42 @@ msgstr "ΚαÏέ" msgid "Frame " msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "ΠÏοώθηση ανά ΚαÏέ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "FFV1 Για Τα Εξαγώμενα ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "ΠληÏοφοÏίες ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "ΕÏÏος ΚαÏέ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "ΠαÏάλειψη Κ&αÏέ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "ΠεÏιοÏισμός ΚαÏέ:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "ΚαÏέ ΠÏος ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "ΕλεÏθεÏη Ματιά" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Γαλλικά" @@ -2502,16 +2629,16 @@ msgstr "Γαλλικά" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Από" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "ΠλήÏης Οθόνη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Ανάλυση ΠλήÏους Οθόνης:" @@ -2523,7 +2650,7 @@ msgstr "ΑÏχεία GCI(*.gci)" msgid "GCMic Configuration" msgstr "Ρυθμίσεις ΜικÏοφώνου GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" @@ -2531,27 +2658,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID ΠαιχνιδιοÏ:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Το παιχνίδι εκτελείται ήδη!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Το παιχνίδι δεν εκτελείται!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Το παιχνίδι δε βÏέθηκε!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Ρυθμίσεις ΣυγκεκÏιμένου ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" @@ -2559,25 +2686,25 @@ msgstr "Ρυθμίσεις ΠαιχνιδιοÏ" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GameCube αÏχεία αποθήκευσης(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Ρυθμίσεις ΧειÏιστηÏίου Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Κωδικοί Gecko" @@ -2585,60 +2712,70 @@ msgstr "Κωδικοί Gecko" #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported. Try using the native code handler by placing the codehandler.bin file into the Sys directory and restarting Dolphin.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Ο Κωδικός Gecko απέτυχε να εκτελεστεί (CT%i CST%i) (%s)\n" -"(Ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται. Δοκιμάστε να χÏησιμοποιήσετε τον εγγενή διαχειÏιστή κώδικα τοποθετώντας το codehandler.bin αÏχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" +"(Ή είναι ένας κακός κωδικός ή ο Ï„Ïπος του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î´ÎµÎ½ υποστηÏίζεται. " +"Δοκιμάστε να χÏησιμοποιήσετε τον εγγενή διαχειÏιστή κώδικα τοποθετώντας το " +"codehandler.bin αÏχείο στον φάκελο Sys και επανεκκινώντας το Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Γενικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Γενικές Ρυθμίσεις" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ΓεÏμανικά" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των κωδικών ar" +msgstr "" +"GetARCode: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος %lu της λίστας των " +"κωδικών ar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "ΓÏαφικά" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Ρυθμίσεις ΓÏαφικών" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "ΜεγαλÏτεÏο από" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render to texture εφέ.\n" +"Βελτιώνει Ï€Î¿Î»Ï Ï„Î·Î½ ποιότητα των υφών που παÏάγονται χÏησιμοποιώντας render " +"to texture εφέ.\n" "Μία αÏξηση της εσωτεÏικής ανάλυσης θα βελτιώσει το εφέ αυτής της ÏÏθμισης.\n" -"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν και σπάνια).\n" +"Μειώνει ελαφÏÏŽÏ‚ την επίδοση και είναι πιθανό να Ï€Ïοκαλέσει Ï€Ïοβλήματα (αν " +"και σπάνια).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Ελληνικά" @@ -2658,11 +2795,11 @@ msgstr "Δεξί ΠÏάσινο" msgid "Guitar" msgstr "ΚιθάÏα" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Γίνεται κλήση του HCI_CMD_INQUIRY, παÏακαλώ αναφέÏετε!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2670,7 +2807,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Αποτυχία ελέγχου κεφαλίδας" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "ΕβÏαϊκά" @@ -2682,7 +2819,7 @@ msgstr "Ύψος" msgid "Help" msgstr "Βοήθεια" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2702,17 +2839,18 @@ msgstr "" msgid "Hide" msgstr "ΑπόκÏυψη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "ΑπόκÏυψη Δείκτη ΠοντικιοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" "If unsure, leave this checked." msgstr "" -"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο εξομοίωσης.\n" +"ΑποκÏÏπτει τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Î½ βÏίσκεται πάνω από το παÏάθυÏο " +"εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." @@ -2720,8 +2858,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2729,33 +2867,37 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Ρυθμίσεις ΠλήκτÏων Συντόμευσης" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "ΠλήκτÏα Συντόμευσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "ΟυγγÏικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ΥβÏιδικό Wiimote" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS: ΑπόπειÏα ανάγνωσης δεδομένων από ένα άγνωστο εισιτήÏιο: " +"%08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο που δεν είναι διαθέσιμος στο nand dump\n" +"IOCTL_ES_LAUNCH: Το παιχνίδι Ï€Ïοσπάθησε να επαναφοÏτώσει ios ή έναν τίτλο " +"που δεν είναι διαθέσιμος στο nand dump\n" "TitleID %016llx.\n" "Το Dolphin πιθανότατα θα κολλήσει Ï„ÏŽÏα." @@ -2763,7 +2905,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" @@ -2771,19 +2913,19 @@ msgstr "Ρυθμίσεις IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Δείκτης IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Ευαισθησία IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -2795,47 +2937,66 @@ msgstr "ΙΤΑΛΙΑ" msgid "Icon" msgstr "Εικονίδιο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Εάν επιλεχθεί, οι καταχωÏητές bounding box θα ανανεώνονται. ΧÏησιμοποιοÏνται από τα Paper Mario παιχνίδια." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" +"Εάν επιλεχθεί, οι καταχωÏητές bounding box θα ανανεώνονται. ΧÏησιμοποιοÏνται " +"από τα Paper Mario παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Αν τα FPS διακυμαίνονται, αυτή η επιλογή μποÏείο να βοηθήσει. (ΕνεÏγό = " +"Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)." -msgstr "Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, PAL:50), χÏησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μποÏεί να διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές θόÏυβο αναλόγα με το παιχνίδι)." +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +msgstr "" +"Αν θέσετε τιμή υψηλότεÏη από την πλήÏη ταχÏτητα του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï (NTSC:60, " +"PAL:50), χÏησιμοποιήστε τον ήχο για να κάνετε Throttle μέσω DSP (μποÏεί να " +"διοÏθώσει οÏισμένα κλικαÏίσματα στον ήχο άλλα και να Ï€Ïοκαλέσει συνεχές " +"θόÏυβο αναλόγα με το παιχνίδι)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Αγνόηση Αλλαγών Format" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Αγνοεί οποιαδήποτε αλλαγή στο EFB format.\n" -"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" +"Βελτιώνει τις επιδόσεις σε πολλά παιχνίδια χωÏίς αÏνητικές συνέπειες. " +"ΠÏοκαλεί όμως ελαττώματα στα γÏαφικά σε ένα μικÏÏŒ αÏιθμό παιχνιδιών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Αγνοεί οποιοδήποτε αίτημα από την CPU για ανάγνωση ή εγγÏαφή στο EFB.\n" -"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ γÏαφικών.\n" +"Βελτιώνει τις επιδόσεις σε οÏισμένα παιχνίδια, αλλά μποÏεί να " +"απενεÏγοποιήσει οÏισμένα χαÏακτηÏιστικά που σχετίζονται με το gameplay ή εφέ " +"γÏαφικών.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Εισαγωγή Αποθήκευσης" @@ -2843,7 +3004,7 @@ msgstr "Εισαγωγή Αποθήκευσης" msgid "Import failed, try again?" msgstr "Αποτυχία εισαγωγής, δοκιμή ξανά;" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2851,11 +3012,11 @@ msgstr "" "Το αÏχείο εισαγωγής έχει επέκταση gsc\n" "αλλά δεν έχει σωστή κεφαλίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Το αÏχείο εισαγωγής έχει μη έγκυÏο μήκος" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2863,26 +3024,28 @@ msgstr "" "Το εισαγώμενο αÏχείο έχει sav επέκταση\n" "άλλα δεν έχει σωστή κεφαλίδα." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται στη σωστή εξομοίωση της ομίχλης.\n" +"Βελτιώνει τις επιδόσεις αλλά Ï€Ïοκαλεί Ï€Ïοβλήματα σε παιχνίδια που βασίζονται " +"στη σωστή εξομοίωση της ομίχλης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Εντός ΠαιχνιδιοÏ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ΠληÏοφοÏίες" @@ -2890,7 +3053,7 @@ msgstr "ΠληÏοφοÏίες" msgid "Information" msgstr "ΠληÏοφοÏίες" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Είσοδος" @@ -2902,7 +3065,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -2910,44 +3073,51 @@ msgstr "Εισαγωγή ΚάÏτας SD" msgid "Insert name here.." msgstr "Εισάγετε όνομα εδώ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει ακόμα." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " +"ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Σφάλμα Ελέγχου ΑκεÏαιότητας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Ο έλεγχος ακεÏαιότητας ολοκληÏώθηκε. Δε βÏέθηκαν σφάλματα." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format -msgid "Integrity check for partition %d failed. Your dump is most likely corrupted or has been patched incorrectly." -msgstr "Ο έλεγχος ακεÏαιότητας για την κατάτμηση %d απέτυχε. Το αÏχείο έχει πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος Ï„Ïόπο." +msgid "" +"Integrity check for partition %d failed. Your dump is most likely corrupted " +"or has been patched incorrectly." +msgstr "" +"Ο έλεγχος ακεÏαιότητας για την κατάτμηση %d απέτυχε. Το αÏχείο έχει " +"πιθανότατα αλλοιωθεί ή έχει γίνει patched με λάθος Ï„Ïόπο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -2968,15 +3138,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ΕσωτεÏικό Σφάλμα LZO - αποτυχία lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "ΕσωτεÏική Ανάλυση:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (ΠΟΛΥ αÏγός)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Εισαγωγή" @@ -2985,11 +3155,11 @@ msgstr "Εισαγωγή" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Μη έγκυÏο μέγεθος (%x) ή μαγική λέξη (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Μη έγκυÏη τιμή!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Μη έγκυÏο bat.map ή εγγÏαφή φακέλου" @@ -3013,7 +3183,7 @@ msgstr "" "%s\n" " Ίσως χÏειαστεί να ξαναεξάγετε την εικόνα Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï Î±Ï€ÏŒ τον δίσκο." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" @@ -3021,21 +3191,21 @@ msgstr "Μη έγκυÏο αÏχείο εγγÏαφής" msgid "Invalid search parameters (no object selected)" msgstr "Μη έγκυÏες παÏάμετÏοι αναζήτησης (δεν επιλέχθηκε αντικείμενο)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Μη έγκυÏο string αναζήτησης (δεν μποÏεί να γίνει μετατÏοπή σε νοÏμεÏο)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "Μη έγκυÏο string αναζήτησης (μόνο ζυγά μήκη string υποστηÏίζονται)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Ιταλικά" @@ -3043,16 +3213,16 @@ msgstr "Ιταλικά" msgid "JAPAN" msgstr "ΙΑΠΩÎΙΑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (Ï€Ïοτείνεται)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL δοκιμαστικός recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Ιαπωνικά" @@ -3060,7 +3230,7 @@ msgstr "Ιαπωνικά" msgid "KOREA" msgstr "ΚΟΡΕΑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3070,17 +3240,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "ΔιατήÏηση παÏαθÏÏου στην κοÏυφή." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "ΠλήκτÏο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "ΚοÏεάτικα" @@ -3098,19 +3268,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Αναλογική" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Γλώσσα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3120,8 +3294,8 @@ msgstr "ΑÏιστεÏά" msgid "Left Stick" msgstr "ΑÏιστεÏÏŒ Stick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3129,7 +3303,7 @@ msgstr "" "ΑÏιστεÏÏŒ κλίκ για εντοπισμό των πλήκτÏων συντόμευσης.\n" "Πατήστε το πλήκτÏο διαστήματος για καθαÏισμό." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3139,7 +3313,7 @@ msgstr "" "Μεσαίο κλικ για καθάÏισμα.\n" "Δεξί κλικ για πεÏισσότεÏες επιλογές." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3147,76 +3321,76 @@ msgstr "" "ΑÏιστεÏÏŒ/Δεξί κλικ για πεÏισσότεÏες επιλογές.\n" "Μεσαίο κλικ για καθάÏισμα." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "ΜικÏότεÏο από" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "ΠεÏιοÏισμός με βάση τα ΚαÏέ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "ΦόÏτωσ." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "ΦόÏτωση ΤÏοποποιημένων Υφών" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3230,46 +3404,45 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "ΦόÏτωση Ï€Ïοεπιλεγμένων τιμών από διαθέσιμα Ï€Ïότυπα hack." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Τοπικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "ΚαταγÏαφή" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Ρυθμίσεις ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "ΚαταγÏαφή FPS σε αÏχείο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "ΤÏποι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΚαταγÏάφει τον αÏιθμό των καÏέ ανά δευτεÏόλεπτο στο αÏχείο User/Logs/fps.txt. ΧÏησιμοποιήστε αυτό το χαÏακτηÏιστικό όταν θέλετε να μετÏήσετε την ταχÏτητα του Dolphin.\n" +"ΚαταγÏάφει τον αÏιθμό των καÏέ ανά δευτεÏόλεπτο στο αÏχείο User/Logs/fps." +"txt. ΧÏησιμοποιήστε αυτό το χαÏακτηÏιστικό όταν θέλετε να μετÏήσετε την " +"ταχÏτητα του Dolphin.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Έξοδοι ΚαταγÏαφής" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "ΚαταγÏαφή" @@ -3290,7 +3463,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3304,24 +3477,24 @@ msgstr "ΑÏχεία MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "ΚÏÏιο Stick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID ΔημιουÏγοÏ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "ΔημιουÏγός:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Μέγιστη" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Η κάÏτα μνήμης έχει ήδη αποθηκευμένα δεδομένα για τον τίτλο" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" @@ -3330,13 +3503,17 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "ΚάÏτα Μνήμης" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " +"χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3357,26 +3534,28 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της κεφαλίδας." +msgstr "" +"Το μέγεθος του αÏχείου της κάÏτας μνήμης δεν ταιÏιάζει με το μέγεθος της " +"κεφαλίδας." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" msgstr "ΜενοÏ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "ΜικÏόφωνο" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Ελάχιστη" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -3385,13 +3564,15 @@ msgstr "ΔιάφοÏες Ρυθμίσεις" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι κωδικοποιημένες.\n" +"ΤÏοποποιεί τις υφές ώστε να εμφανίζουν το format στο οποίο είναι " +"κωδικοποιημένες.\n" "ΧÏειάζεται επανεκκίνηση της εξομοίωσης στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." @@ -3409,7 +3590,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "ΜοτέÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3419,7 +3600,8 @@ msgid "" "\n" "\n" msgstr "" -"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί μία λεπτομεÏής πεÏιγÏαφή.\n" +"Μετακινήστε τον δείκτη του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Ï€Î¬Î½Ï‰ από μία επιλογή για να εμφανιστεί " +"μία λεπτομεÏής πεÏιγÏαφή.\n" "\n" "\n" "\n" @@ -3429,9 +3611,13 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " +"Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" @@ -3439,7 +3625,9 @@ msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "ΣΗΜΕΙΩΣΗ: Το μέγεθος της Ïοής δεν ταιÏιάζει με το Ï€Ïαγματικό μήκος των δεδομένων.\n" +msgstr "" +"ΣΗΜΕΙΩΣΗ: Το μέγεθος της Ïοής δεν ταιÏιάζει με το Ï€Ïαγματικό μήκος των " +"δεδομένων.\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3525,16 +3713,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Όνομα:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Όνομα: " @@ -3543,20 +3731,20 @@ msgstr "Όνομα: " msgid "Native GCI files(*.gci)" msgstr "ΑÏχεία Native GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Îέα Ανίχνευση" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Επόμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Επόμενη Ανίχνευση" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ψευδώνυμο :" @@ -3564,7 +3752,7 @@ msgstr "Ψευδώνυμο :" msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Δε βÏέθηκαν ISO ή WAD" @@ -3586,7 +3774,7 @@ msgstr "ΑπενεÏγοποίηση του docking" msgid "No file loaded" msgstr "Δεν φοÏτώθηκε αÏχείο" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Δεν υπάÏχουν ελεÏθεÏες εγγÏαφές φακέλων" @@ -3599,33 +3787,33 @@ msgstr "Κανένα εγγεγÏαμένο αÏχείο" msgid "No save folder found for title %s" msgstr "Δε βÏέθηκε φάκελος αποθήκευσης για τον τίτλο %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Καμία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ÎοÏβηγικά Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Όχι ίσο" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Μη ΟÏισμένο" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Μη Συνδεδεμένο" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Σημειώσεις" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Σημειώσεις: " @@ -3634,7 +3822,7 @@ msgstr "Σημειώσεις: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Σημείωση" @@ -3642,16 +3830,16 @@ msgstr "Σημείωση" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "ΑÏιθμός Κωδικών: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Επιτάχυνση Nunchuk" @@ -3659,11 +3847,11 @@ msgstr "Επιτάχυνση Nunchuk" msgid "Object" msgstr "Αντικείμενο" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "ΕÏÏος Αντικειμένου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "ΑνενεÏγός" @@ -3671,52 +3859,52 @@ msgstr "ΑνενεÏγός" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "Απεικόνιση Μηνυμάτων Στην Οθόνη" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Διαθέσιμα μόνο %d μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Άνοιγμα αÏχείου..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: δεν μποÏεί να δημιουÏγηθεί πεÏιεχόμενο για την συσκευή %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: αδυναμία εÏÏεσης συσκευών ήχου" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: αδυναμία ανοίγματος της συσκευής %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Αποκωδικοποιητής Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" @@ -3729,38 +3917,43 @@ msgstr "Ρυθμίσεις" msgid "Orange" msgstr "ΠοÏτοκαλί" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των block.\n" +"Η σειÏά των αÏχείων στον Κατάλογο ΑÏχείων δεν ταιÏιάζει με την σειÏά των " +"block.\n" "Κάντε δεξί κλίκ, εξάγετε όλα τα αÏχεία αποθήκευσης\n" "και εισάγετέ τα σε μία νέα κάÏτα μνήμης.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Άλλα" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Ο άλλος client έχει αποσυνδεθεί ενώ το παιχνίδι εκτελείται!! Το NetPlay έχει " +"απενεÏγοποιηθεί. Σταματήστε χειÏοκίνητα το παιχνίδι." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Έξοδος" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Αναπα&Ïαγωγή ΕγγÏαφής" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "ΧειÏιστήÏιο" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "ΧειÏιστήÏιο" @@ -3776,7 +3969,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "ΤαίÏιασμα" @@ -3788,34 +3981,34 @@ msgstr "ΠαÏάγÏαφος" msgid "Parameters" msgstr "ΠαÏάμετÏοι" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Κατάτμηση %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ΠαÏση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "ΠαÏση στο τέλος της ταινίας" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Φωτισμός ανά Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Τέλειο" @@ -3824,36 +4017,36 @@ msgstr "Τέλειο" msgid "Perspective %d" msgstr "Οπτική %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "ΑναπαÏαγωγή ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "ΑναπαÏαγωγή/ΠαÏση" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Παίζεται" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Ρυθμίσεις ΑναπαÏαγωγής" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -3865,54 +4058,54 @@ msgstr "ΠαÏακαλώ δημιουÏγήστε μια οπτική Ï€Ïιν msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "ΘÏÏα 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ΘÏÏα :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "ΠοÏτογαλικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u > %u" @@ -3925,11 +4118,11 @@ msgstr "ΠÏοεπιλογές: " msgid "Prev Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ΠÏοηγοÏμενη Σελίδα" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ΠÏοηγοÏμενη Τιμή" @@ -3937,7 +4130,7 @@ msgstr "ΠÏοηγοÏμενη Τιμή" msgid "Print" msgstr "ΕκτÏπωση" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "ΠÏοφίλ" @@ -3945,7 +4138,7 @@ msgstr "ΠÏοφίλ" msgid "Properties" msgstr "Ιδιότητες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ΚαθαÏισμός Cache" @@ -3953,8 +4146,8 @@ msgstr "ΚαθαÏισμός Cache" msgid "Question" msgstr "ΕÏώτηση" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Έξοδος" @@ -3972,7 +4165,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Αναλογική" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -3980,46 +4173,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "ΡΩΣΙΑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "ΕÏÏος" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Μόνο Για Ανάγνωση (ΕγγÏαφής)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "ΠÏαγματικό" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "ΠÏαγματικό Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "ΠÏαγματικά Wiimotes" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Επιβεβαίωση ΕπανασÏνδεσης Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ΕπανασÏνδεση Wiimote Κατά Την ΦόÏτωση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "ΕγγÏαφή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "ΠληÏοφοÏίες ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Ρυθμίσεις ΕγγÏαφής" @@ -4035,7 +4228,7 @@ msgstr "ΑÏιστεÏÏŒ Κόκκινο" msgid "Red Right" msgstr "Δεξί Κόκκινο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4049,29 +4242,29 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε Καμία." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Ανανέωση" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Ανανέωση Λίστας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Ανανέωση λίστας παιχνιδιών" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "ΑφαίÏεση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4081,17 +4274,17 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ΑναπαÏαγωγή στο ΚεντÏικό ΠαÏάθυÏο" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Επανεκκίνηση" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Αποτελέσματα" @@ -4113,29 +4306,25 @@ msgstr "Δεξί Stick" msgid "Rumble" msgstr "Δόνηση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Εκτέλεση DSP LLE σε ξεχωÏιστό νήμα (δεν Ï€Ïοτείνεται)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Ρώσικα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Απ&οθήκευση Σημείου Αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Ασφαλής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Ρυθμός Δειγματοληψίας:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Αποθήκ." @@ -4143,90 +4332,92 @@ msgstr "Αποθήκ." msgid "Save GCI as..." msgstr "Αποθήκευση GCI ως..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Αποθήκευση Σημείου Αποθήκευσης 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Αποθήκευση Σημείου Αποθήκευσης 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Αποθήκευση Σημείου Αποθήκευσης 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Αποθήκευση Σημείου Αποθήκευσης 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Αποθήκευση Σημείου Αποθήκευσης 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Αποθήκευση Σημείου Αποθήκευσης 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Αποθήκευση Σημείου Αποθήκευσης 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Αποθήκευση Σημείου Αποθήκευσης 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Αποθήκευση Σημείου..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της εγγÏαφής της ταινίας..." +msgstr "" +"Η ταινία του σημείου αποθήκευσης %s είναι αλλοιωμένη, γίνεται διακοπή της " +"εγγÏαφής της ταινίας..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Ανίχνευση..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Στιγμιότυπο" @@ -4234,49 +4425,47 @@ msgstr "Στιγμιότυπο" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Αναζήτηση" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Αναζήτηση Ï„Ïέχων Αντικειμένου" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Αναζήτηση δεκαεξαδικής Τιμής:" -#: Source/Core/Common/Src/SysConf.h:103 -#: Source/Core/Common/Src/SysConf.h:126 -#: Source/Core/Common/Src/SysConf.h:146 -#: Source/Core/Common/Src/SysConf.h:167 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "Η ενότητα %s δε βÏέθηκε στο SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Επιλογή" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4294,23 +4483,23 @@ msgstr "Επιλέξτε ένα αÏχείο αποθήκευσης για ει msgid "Select floating windows" msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4324,46 +4513,58 @@ msgstr "" "Αυτόματα: ΧÏήση της τοπικής αναλογίας οθόνης (4:3)\n" "Επιβολή 16:9: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 16:9.\n" "Επιβολή 4:3: ΠÏοσαÏμόζει την εικόνα σε αναλογία οθόνης 4:3.\n" -"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του παÏαθÏÏου.\n" +"ΠÏοσαÏμογή στο παÏάθυÏο: ΠÏοσαÏμόζει την εικόνα στην αναλογία του " +"παÏαθÏÏου.\n" "\n" "Αν δεν είστε σίγουÏοι επιλέξτε Αυτόματα." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Επιλεγμένη γÏαμματοσειÏά" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" -"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" +"Επιλέγει την ανάλυση της οθόνης που θα χÏησιμοποιηθεί σε λειτουÏγία πλήÏους " +"οθόνης. Αυτή θα Ï€Ïέπει να είναι πάντα μεγαλÏτεÏη ή ίση με την εσωτεÏική " +"ανάλυση. Το αντίκτυπο στις επιδόσεις είναι αμελητέο.\n" "\n" -"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας σας.\n" +"Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την ανάλυση της επιφάνειας εÏγασίας " +"σας.\n" "Αν πάλι δεν είστε σίγουÏοι, χÏησιμοποιήστε την υψηλότεÏη λειτουÏγική ανάλυση." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Επιλέγει το API γÏαφικών που θα χÏησιμοποιηθεί εσωτεÏικά.\n" -"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" +"Το Direct3D 9 συνήθως είναι το γÏηγοÏότεÏο. Το OpenGL είναι πεÏισσότεÏο " +"ακÏιβές όμως. Το Direct3D 11 βÏίσκεται κάπου ενδιάμεσα Î¼ÎµÏ„Î±Î¾Ï Ï„Ï‰Î½ δÏο.\n" "Σημειώστε ότι τα Direct3D backends είναι διαθέσιμα μόνο στα Windows.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε το Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Αποστολή" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Θέση Sensor Bar:" @@ -4371,23 +4572,26 @@ msgstr "Θέση Sensor Bar:" msgid "Separator" msgstr "ΔιαχωÏιστής" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "ΣεÏβικά" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο Ï€ÏοσαÏμογέας δικτÏου" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"ΣειÏιακή ΘÏÏα 1 - Αυτή είναι η θÏÏα που χÏησιμοποιοÏν οι συσκευές όπως ο " +"Ï€ÏοσαÏμογέας δικτÏου" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης %c" @@ -4395,13 +4599,21 @@ msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένη ΚάÏτα Μνήμης % #: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των κωδικών ar %lu" +msgstr "" +"SetARCode_IsActive: Ο δείκτης είναι μεγαλÏτεÏος από το μέγεθος λίστας των " +"κωδικών ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ρυθμίσεις..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσεων" @@ -4409,7 +4621,7 @@ msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσ msgid "Shake" msgstr "ΚοÏνημα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "ΣÏντομο Όνομα:" @@ -4417,158 +4629,165 @@ msgstr "ΣÏντομο Όνομα:" msgid "Shoulder Buttons" msgstr "Κουμπιά Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Εμφάνιση &Κονσόλας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Εμφάνιση ΠαÏαθÏÏου Κατα&γÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Εμφάνιση ΜπάÏας Κατάστασης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Εμφάνιση ΓÏαμμής &ΕÏγαλείων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Εμφάνιση Οδηγών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Εμφάνιση ΠεÏιοχών EFB ΑντιγÏαφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Εμφάνιση FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Εμφάνιση Γαλλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Εμφάνιση GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Εμφάνιση ΠÏοβολής ΧειÏισμών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Εμφάνιση Ιταλίας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Εμφάνιση JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Εμφάνιση ΚοÏέας" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Εμφάνιση Γλώσσας:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Εμφάνιση Ρυθμίσεων &ΚαταγÏαφέα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Εμφάνιση PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Εμφάνιση ΠλατφόÏμας" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Εμφάνιση ΠεÏιοχών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Εμφάνιση Στατιστικών" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Εμφάνιση Ταϊβάν" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Εμφάνιση USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Εμφάνιση Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Εμφάνιση Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Εμφάνιση επιβεβαίωσης Ï€Ïιν τη διακοπή ενός παιχνιδιοÏ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Show a message box when a potentially serious error has occurred.\n" +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Εμφάνιση μηνÏματος όταν Ï€ÏοκÏψει ένα πιθανά σοβαÏÏŒ σφάλμα.\n" -"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη κÏίσιμα σφάλματα, αλλά \n" +"ΑπενεÏγοποιώντας αυτήν την επιλογή μποÏεί να γλιτώσετε από ενοχλητικά μη " +"κÏίσιμα σφάλματα, αλλά \n" "το Dolphin μποÏεί να κÏασάÏει ξαφνικά χωÏίς καμία εξήγηση. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Εμφάνιση Ï€Ïώτου μπλοκ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Εμφάνιση μετÏητή καθυστέÏησης " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" -"These messages include memory card writes, video backend and CPU information, and JIT cache clearing." +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." msgstr "" "Εμφανίζει μηνÏματα στην πεÏιοχή της εξομοίωσης στην οθόνη.\n" -"Στα μηνÏματα αυτά πεÏιλαμβάνονται εγγÏαφές στην κάÏτα μνήμης, πληÏοφοÏίες σχετικά με την CPU και του βίντεο backend, καθώς και καθαÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î·Ï‚ JIT cache." +"Στα μηνÏματα αυτά πεÏιλαμβάνονται εγγÏαφές στην κάÏτα μνήμης, πληÏοφοÏίες " +"σχετικά με την CPU και του βίντεο backend, καθώς και καθαÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î·Ï‚ JIT " +"cache." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Εμφάνιση μπλοκ αποθήκευσης" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Εμφάνιση αποθηκευμένου σχολίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Εμφάνιση αποθηκευμένου εικονιδίου" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Εμφάνιση αποθηκευμένου τίτλου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο μέτÏησης της ταχÏτητας εξομοίωσης.\n" +"Εμφανίζει τον αÏιθμό των καÏέ που απεικονίζονται ανά δευτεÏόλεπτο, ως Ï„Ïόπο " +"μέτÏησης της ταχÏτητας εξομοίωσης.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Εμφάνιση Αγνώστων" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4582,61 +4801,66 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "ΠαÏάλειψη EFB ΠÏόσβασης από τη CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια σε διάφοÏα γÏαφικά εφέ.\n" +"ΠαÏάλειψη του destination alpha pass που χÏησιμοποιείται από πολλά παιχνίδια " +"σε διάφοÏα γÏαφικά εφέ.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της εξομοίωσης.\n" +"ΕπιταχÏνει ελαφÏÏŽÏ‚ τα EFB σε RAM αντίγÏαφα θυσιάζοντας την ακÏίβεια της " +"εξομοίωσης.\n" "ΜεÏικές φοÏές μποÏεί να βελτιώσει την οπτική ποιότητα.\n" -"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" +"Αν αντιμετωπίζετε Ï€Ïοβλήματα, δοκιμάστε να αυξήσετε την ακÏίβεια της cache " +"υφών ή απενεÏγοποιήστε αυτήν την επιλογή.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Θέση Î’" @@ -4644,25 +4868,28 @@ msgstr "Θέση Î’" msgid "Snapshot" msgstr "Στιγμιότυπο" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Απεικόνιση ΛογισμικοÏ" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα backends.\n" +"Η απεικόνιση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï ÎµÎ¯Î½Î±Î¹ αÏκετές βαθμίδες πιο αÏγή απ' ότι τα υπόλοιπα " +"backends.\n" "Είναι μόνο χÏήσιμη για debugging σκοποÏÏ‚.\n" -"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε σίγουÏοι, επιλέξτε 'Όχι'." +"Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " +"σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Το backend ήχου %s δεν είναι έγκυÏο." @@ -4676,29 +4903,38 @@ msgstr "Αποτυχία δημιουÏγίας buffer ήχου: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Ισπανικά" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Ένταση ηχείου:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"Specifies the resolution used to render at. A high resolution will improve " +"visual quality a lot but is also quite heavy on performance and might cause " +"glitches in certain games.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ Î±Î½Ï„Î¯ÎºÏ„Ï…Ï€Î¿ στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα παιχνίδια.\n" -"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" +"ΟÏίζει την ανάλυση που θα χÏησιμοποιηθεί κατά την απεικόνιση. Μια υψηλή " +"ανάλυση θα βελτιώσει την οπτική ποιότητα αÏκετά αλλά επίσης θα έχει βαÏÏ " +"αντίκτυπο στις επιδόσεις και μποÏεί να Ï€Ïοκαλέσει ελαττώματα σε οÏισμένα " +"παιχνίδια.\n" +"Το \"Πολλαπλάσιο του 640x528\" είναι λίγο πιο αÏγό από το \"Μέγεθος ΠαÏαθÏÏου" +"\" αλλά αποδίδει λιγότεÏα Ï€Ïοβλήματα. Γενικά, όσο χαμηλότεÏη είναι η " +"εσωτεÏική ανάλυση, θα είναι και καλÏτεÏες οι επιδόσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, επιλέξτε 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από τον Δίσκο" @@ -4706,63 +4942,69 @@ msgstr "Επιτάχυνση του Î¡Ï…Î¸Î¼Î¿Ï ÎœÎµÏ„Î±Ï†Î¿Ïάς από το msgid "Square Stick" msgstr "ΤετÏάγωνο Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Τυπικός Controller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Εκκίνηση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Εκκίνηση ΛειτουÏγίας &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Εκκίνηση Ε&γγÏαφής" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Εκκίνηση ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Λειτ." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Σημεία Αποθήκευσης" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Διακοπή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Αποθήκευση των EFB αντιγÏάφων σε GPU αντικείμενα υφών.\n" -"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" +"Αυτό δεν είναι τόσο ακÏιβές, αλλά δουλεÏει αÏκετά καλά για τα πεÏισσότεÏα " +"παιχνίδια και Ï€ÏοσφέÏει μεγάλη επιτάχυνση σε σχέση με EFB σε RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "ΠÏοσαÏμογή στο ΠαÏάθυÏο" @@ -4787,8 +5029,8 @@ msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -4796,7 +5038,7 @@ msgstr "Γλώσσα Συστήματος:" msgid "TAIWAN" msgstr "ΤΑΪΒΑÎ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Είσοδος" @@ -4817,30 +5059,30 @@ msgstr "ΑÏιστεÏÏŒ Table" msgid "Table Right" msgstr "Δεξί Table" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "ΔημιουÏγία Στιγμιότυπου" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Τέστ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Υφή" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache Υφών" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Επικάλυψη Του Format Υφών" @@ -4856,13 +5098,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4873,15 +5115,19 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Αδυναμία ανοίγματος του αÏχείου %s για εγγÏαφή. ΠαÏακαλώ ελέγξτε αν είναι " +"ήδη ανοιχτό από άλλο Ï€ÏόγÏαμμα." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format msgid "The file %s was already open, the file header will not be written." msgstr "Το αÏχείο %s ήταν ήδη ανοιχτό, η κεφαλίδα του αÏχείου δε θα γÏαφεί." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Το αÏχείο που επιλέξατε (%s) δεν υπάÏχει" @@ -4896,25 +5142,33 @@ msgstr "Το όνομα δεν μποÏεί να πεÏιέχει τον Ï‡Î±Ï #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:141 msgid "The resulting decrypted AR code doesn't contain any lines." -msgstr "Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." +msgstr "" +"Το αποτέλεσμα αποκÏυπτογÏάφησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï AR δεν πεÏιέχει καθόλου γÏαμμές." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" "If unsure, use the rightmost value." msgstr "" -"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να χάσει ανανεώσεις των υφών από την RAM.\n" +"Όσο πιο ασφαλής είναι αυτή η ÏÏθμιση, τόσο λιγότεÏο πιθανό ο εξομοιωτής να " +"χάσει ανανεώσεις των υφών από την RAM.\n" "\n" "Αν δεν είστε σίγουÏοι, χÏησιμοποιήστε την δεξιότεÏη τιμή." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" -msgstr "Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" +msgstr "" +"Το σημείο αποθήκευσης που Ï€Ïοσπαθείτε να αντιγÏάψετε έχει μη έγκυÏο μέγεθος" -#: Source/Core/DolphinWX/Src/Main.cpp:352 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην Ï€Ïοεπιλογή συστήματος." +#: Source/Core/DolphinWX/Src/Main.cpp:385 +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"Η επιλεγμένη γλώσσα δεν υποστηÏίζεται από το σÏστημά σας. ΕπαναφοÏά στην " +"Ï€Ïοεπιλογή συστήματος." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4941,58 +5195,78 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Θέμα" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Η επιλογή θέματος απέτυχε" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι πιθανότατα ημιτελές." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"ΠÏέπει να υπάÏχει εισητήÏιο για 00000001/00000002. Το NAND dump σας είναι " +"πιθανότατα ημιτελές." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." msgstr "" "Αυτές οι Ïυθμίσεις υπεÏισχÏουν των γενικών Ïυθμίσεων του Dolphin.\n" -"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις του Dolphin. " +"Αν είναι ακαθόÏιστη η επιλογή το παιχνίδι χÏησιμοποιεί τις γενικές Ïυθμίσεις " +"του Dolphin. " #: Source/Core/Core/Src/ActionReplay.cpp:355 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το ίδιο το Action Replay." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Αυτός ο Ï€Ïοσομοιωτής action replay δεν υποστηÏίζει κωδικοÏÏ‚ που αλλάζουν το " +"ίδιο το Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." -msgstr "Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά παιχνίδια." +msgstr "" +"Αυτό μποÏεί να Ï€Ïοκαλέσει καθυστεÏήσεις στο ÎœÎµÎ½Î¿Ï Wii και σε μεÏικά " +"παιχνίδια." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. " +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του παιχνιδιοÏ.\n" -"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" +"Αυτό το χαÏακτηÏιστικό σας επιτÏέπει να πειÏάξετε την κάμεÏα του " +"παιχνιδιοÏ.\n" +"ΚÏατώντας πατημένο το δεξί πλήκτÏο του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÏ„Îµ το ποντίκι για " +"να μετακινήσετε Ï„ÏιγÏÏω την κάμεÏα. ΚÏατώντας πατημένο το SHIFT πιέστε ένα " +"από τα WASD πλήκτÏα για να μετακινήσετε την κάμεÏα κατά μία καθοÏισμένη " +"απόσταση (SHIFT+0 για να κινηθεί γÏηγοÏότεÏα και SHIFT+9 για να κινηθεί πιο " +"αÏγά). Πατήστε SHIFT+R για να επαναφέÏετε την κάμεÏα στην αÏχική της θέση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ πυÏήνες.\n" +"ΧωÏίζει τα νήματα του Βίντεο και της CPU, ώστε να Ï„Ïέχουν σε ξεχωÏιστοÏÏ‚ " +"πυÏήνες.\n" "ΠÏοκαλεί μεγάλη επιτάχυνση σε PC με πεÏισσότεÏους από έναν πυÏήνες,\n" "αλλά μποÏεί να Ï€Ïοκαλέσει κÏασαÏίσματα ή άλλα Ï€Ïοβλήματα. " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" -msgstr "Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" +msgstr "" +"Αυτό σας επιτÏέπει την χειÏοκίνητη επεξεÏγασία του αÏχείου Ïυθμίσεων INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5004,35 +5278,35 @@ msgid "Tilt" msgstr "Πλάγιασμα" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Τίτλος" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Εώς" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Εναλλαγή Όλων ΤÏπων ΚαταγÏαφής " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Εναλλαγή ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "ΚοÏυφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Κινέζικα ΠαÏαδοσιακά " -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπου αÏχείο." @@ -5040,8 +5314,7 @@ msgstr "ΠÏοσπάθεια φόÏτωσης ενός άγνωστου Ï„Ïπο msgid "Triggers" msgstr "Σκανδάλες" -#: Source/Core/Common/Src/SysConf.h:91 -#: Source/Core/Common/Src/SysConf.h:114 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF" @@ -5053,7 +5326,7 @@ msgstr "" "ΠÏοσπάθεια ανάγνωσης από ένα μη έγκυÏο SYSCONF\n" "Τα Wiimote bt ids δεν είναι διαθέσιμα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "ΤουÏκικά" @@ -5065,12 +5338,12 @@ msgstr "Πικάπ" msgid "Type" msgstr "ΤÏπος" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "ΠόÏτα UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5098,18 +5371,21 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι τον πληκτÏολογήσατε σωστά.\n" +"Δεν μποÏεί να γίνει parse της γÏαμμής %lu από τον εισαγώμενο κωδικό AR ως " +"ένας έγκυÏος κωδικοποιημένος ή αποκωδικοποιημένος κωδικός. ΣιγουÏευτείτε ότι " +"τον πληκτÏολογήσατε σωστά.\n" "Θα θέλατε να αγνοήσετε αυτήν την γÏαμμή και να συνεχίσετε με το parsing;" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Μη οÏισμένο %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " @@ -5117,7 +5393,7 @@ msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " msgid "Unexpected 0x80 call? Aborting..." msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Άγνωστο" @@ -5146,8 +5422,8 @@ msgstr "Ελήφθη άγνωστο μήνυμα με:%d από τον παίκ msgid "Up" msgstr "Πάνω" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "ΕνημέÏωση" @@ -5155,23 +5431,23 @@ msgstr "ΕνημέÏωση" msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "ΧÏήση ΠλήÏους Οθόνης" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "ΧÏήση Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "ΧÏήση Οθονών ΠανικοÏ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5179,31 +5455,35 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "ΧÏησιμοποίηση πολλαπλών νημάτων για την αποκωδικοποίηση υφών.\n" -"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο πυÏήνες).\n" +"ΜποÏεί να βελτιώσει την ταχÏτητα (ειδικά σε CPUs με πεÏισσότεÏους από δÏο " +"πυÏήνες).\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μήνυμα σφάλματος.\n" -"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" +"Συνήθως άμα αποτÏχει η μεταγλώττιση ενός shader, θα εμφανιστεί ένα μήνυμα " +"σφάλματος.\n" +"ΠαÏόλα αυτά μποÏείτε να παÏαλείψετε το αναδυόμενο μÏνημα ώστε να έχετε " +"gameplay χωÏίς παÏεμβάσεις επιλέγοντας αυτήν την ÏÏθμιση.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "ΕÏγαλεία" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Κάθετος ΣυγχÏονισμός" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Τιμή" @@ -5211,23 +5491,23 @@ msgstr "Τιμή" msgid "Value:" msgstr "Τιμή:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Τιμή: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Αναλυτικότητα" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Βίντεο" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Ένταση" @@ -5241,29 +5521,30 @@ msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά Ï„ msgid "WAD installation failed: error creating ticket" msgstr "Αποτυχία εγκατάστασης WAD: σφάλμα κατά τη δημιουÏγία του εισιτηÏίου" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της εικόνας.\n" +"Αναμονή για την κάθετη ανανέωση της οθόνης ώστε να μειωθεί το σπάσιμο της " +"εικόνας.\n" "Μειώνει τις επιδόσεις αν η ταχÏτητα εξομοίωσης είναι μικÏότεÏη από 100%.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "ΠÏοειδοποίηση" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση DOL σε λάθος λειτουÏγία κονσόλας!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "ΠÏοειδοποίηση - εκκίνηση ELF σε λάθος λειτουÏγία κονσόλας!" @@ -5278,7 +5559,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων στον φάκελο:\n" +"ΠÏοειδοποίηση! Συστήνεται η δημιουÏγία αντιγÏάφου ασφαλείας όλων των αÏχείων " +"στον φάκελο:\n" "%s\n" "Θέλετε να συνεχίσετε;" @@ -5290,46 +5572,74 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης που υπάÏχουν στον φάκελο:\n" +"ΠÏοειδοποίηση: Αυτό θα αντικαταστήσει όλα τα υπάÏχοντα σημεία αποθήκευσης " +"που υπάÏχουν στον φάκελο:\n" "%s\n" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:825 -#, c-format -msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." -msgstr "ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης που βÏίσκεται μετά το τέλος της Ï„Ïέχουσας ταινίας. (byte %u > %u) (frame %u > %u). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." - -#: Source/Core/Core/Src/Movie.cpp:842 -#, c-format -msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." -msgstr "ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία εμφανίζει ασυμφωνία στο byte %d (0x%X). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί ασυγχÏονισμός." - -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save that's after the end of the current movie. (byte " +"%u > %u) (frame %u > %u). You should load another save before continuing, or " +"load this state with read-only mode off." +msgstr "" +"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης που βÏίσκεται μετά το τέλος " +"της Ï„Ïέχουσας ταινίας. (byte %u > %u) (frame %u > %u). Θα Ï€Ïέπει να " +"φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων " +"με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." + +#: Source/Core/Core/Src/Movie.cpp:855 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" +"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία " +"εμφανίζει ασυμφωνία στο byte %d (0x%X). Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο " +"αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη " +"την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " +"ασυγχÏονισμός." + +#: Source/Core/Core/Src/Movie.cpp:864 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "On frame %d, the savestate's movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία εμφανίζει ασυμφωνία στο καÏέ %d. Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί ασυγχÏονισμός.\n" +"ΠÏοειδοποίηση: ΦοÏτώσατε ένα σημείο αποθήκευσης του οποίου η ταινία " +"εμφανίζει ασυμφωνία στο καÏέ %d. Θα Ï€Ïέπει να φοÏτώσετε άλλο σημείο " +"αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων με απενεÏγοποιημένη " +"την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " +"ασυγχÏονισμός.\n" "\n" -"ΠεÏισσότεÏες πληÏοφοÏίες: Η Ï„Ïέχουσα ταινία έχει μήκος %d καÏέ και η ταινία του σημείου αποθήκευσης έχει μήκος %d καÏέ.\n" +"ΠεÏισσότεÏες πληÏοφοÏίες: Η Ï„Ïέχουσα ταινία έχει μήκος %d καÏέ και η ταινία " +"του σημείου αποθήκευσης έχει μήκος %d καÏέ.\n" "\n" "Στο καÏέ %d, η Ï„Ïέχουσα ταινία εμφανίζει τους χειÏισμοÏÏ‚:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "Στο καÏέ %d, η ταινία του σημείου αποθήκευσης εμφανίζει τους χειÏισμοÏÏ‚:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." @@ -5337,7 +5647,7 @@ msgstr "WaveFileWriter - το αÏχείο δεν είναι ανοιχτό." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" @@ -5345,23 +5655,23 @@ msgstr "Hack ΕυÏείας Οθόνης" msgid "Width" msgstr "Πλάτος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5369,17 +5679,17 @@ msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Αδυναμία ανάγνωσης από αÏχείο" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5392,19 +5702,19 @@ msgstr "" "ή πιθανόν να οφείλεται σε χÏόνο αδÏάνειας ή κάποιον άλλο λόγο.\n" "Θέλετε να γίνει άμεση επανασÏνδεση;" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Συνδεδεμένο Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "ÎœÎ¿Ï„Î­Ï Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5424,26 +5734,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Σε εÏγασία..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "ΕγγÏαφή στην Κονσόλα" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "ΕγγÏαφή στον Debugger" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "ΕγγÏαφή σε ΑÏχείο" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "ΕγγÏαφή στο ΠαÏάθυÏο" @@ -5482,25 +5792,26 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Δεν μποÏείτε να κλείσετε pane που έχουν σελίδες." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "ΠÏέπει να επιλέξετε ένα παιχνίδι!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "ΠÏέπει να εισάγετε ένα όνομα!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική ή δεκαεξαδική τιμή." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." -msgstr "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." +msgstr "" +"ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." #: Source/Core/Core/Src/CoreParameter.cpp:177 msgid "" @@ -5521,7 +5832,7 @@ msgstr "" "Θα έπÏεπε να είναι 0x%04x (αλλά είναι 0x%04llx)\n" "Θέλετε να δημιουÏγηθεί ένα καινοÏÏιο;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5534,12 +5845,12 @@ msgstr "Δεν υποστηÏίζεται ο Zero 3 code" msgid "Zero code unknown to dolphin: %08x" msgstr "Άγνωστος Zero code: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ σε αναμονή ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5555,21 +5866,26 @@ msgstr "" msgid "[Custom]" msgstr "[ΠÏοσαÏμοζόμενο]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[ΠΕΙΡΑΜΑΤΙΚΟ]\n" -"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" -"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" +"ΣτοχεÏει στην επιτάχυνση της εξομοίωσης φοÏτώνοντας την αποκωδικοποίηση των " +"υφών στην GPU χÏησιμοποιώντας το OpenCL framework.\n" +"ΠαÏ'όλα αυτά, Ï€Ïος το παÏόν είναι γνωστό ότι Ï€Ïοκαλεί Ï€Ïοβλήματα στις υφές " +"σε διάφοÏα παιχνίδια. Επίσης είναι πιο αÏγή από την τυπική αποκωδικοποίηση " +"υφών από την CPU στις πεÏισσότεÏες πεÏιπτώσεις.\n" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5583,11 +5899,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5604,7 +5920,7 @@ msgstr "αποτυχία ανάγνωσης δεδομένων από το Î±Ï msgid "failed to read header" msgstr "αποτυχία ανάγνωσης κεφαλίδας" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το αναφέÏετε." @@ -5612,7 +5928,9 @@ msgstr "iCacheJIT: Ανάγνωση Opcode από %x. ΠαÏακαλώ να το #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου μεγέθους %x" +msgstr "" +"δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " +"μεγέθους %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" @@ -5623,7 +5941,7 @@ msgstr "." msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -5635,10 +5953,13 @@ msgstr "zFar ΔιόÏθωση: " msgid "zNear Correction: " msgstr "zNear ΔιόÏθωση: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "" #~ "Automatically generate mipmaps rather than decoding them from memory.\n" #~ "Increases performance a bit but might cause minor texture defects.\n" @@ -5651,6 +5972,21 @@ msgstr "| OR" #~ "\n" #~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Υπολογισμός των τιμών βάθους των 3D γÏαφικών ανά pixel αντί ανά vertex.\n" +#~ "Αντίθετα με τον φωτισμό ανά pixel (που είναι απλά μία βελτίωση), οι " +#~ "υπολογισμοί του βάθους ανά pixel είναι απαÏαίτητοι για την σωστή " +#~ "εξομοίωση ενός μικÏÎ¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹ÏŽÎ½.\n" +#~ "\n" +#~ "Αν δεν είστε σίγουÏοι, αφήστε το επιλεγμένο." + #~ msgid "Cannot record movies in read-only mode." #~ msgstr "" #~ "Δεν μποÏεί να γίνει εγγÏαφή ταινιών σε λειτουÏγία μόνο για ανάγνωση." @@ -5658,9 +5994,30 @@ msgstr "| OR" #~ msgid "Clear failed." #~ msgstr "Το καθάÏισμα απέτυχε." +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ΔημιουÏγήθηκε από KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ΔημιουÏγήθηκε από Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl." +#~ "deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ΔημιουÏγήθηκε από VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "ΔημιουÏγήθηκε από black_rider και δημοσιεÏθηκε στο ForumW.org > Web " +#~ "Developments" + #~ msgid "Disable Lighting" #~ msgstr "ΑπενεÏγοποίηση ΦωτισμοÏ" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "ΑπενεÏγοποίηση Βάθους ανά Pixel" + #~ msgid "Disable Textures" #~ msgstr "ΑπενεÏγοποίηση Υφών" @@ -5698,6 +6055,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "ΦοÏτώνει το καθοÏισμένο αÏχείο (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Κλείδωμα Îημάτων στους ΠυÏήνες " + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Î§Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (LLE) ή Ï…ÏˆÎ·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï… (HLE) εξομοίωση ήχου" @@ -5707,12 +6067,18 @@ msgstr "| OR" #~ msgid "Opens the logger" #~ msgstr "Άνοιγμα της καταγÏαφής" +#~ msgid "Sample Rate:" +#~ msgstr "Ρυθμός Δειγματοληψίας:" + #~ msgid "Show this help message" #~ msgstr "Εμφάνιση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος βοήθειας" #~ msgid "Specify a video backend" #~ msgstr "Επιλέξτε ένα backend βίντεο" +#~ msgid "Theme selection went wrong" +#~ msgstr "Η επιλογή θέματος απέτυχε" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/en.po b/Languages/po/en.po index 33f3a1b2bd..b8e26d4bd2 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "" @@ -52,14 +52,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -144,147 +137,147 @@ msgstr "" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -304,7 +297,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" @@ -312,19 +305,19 @@ msgstr "" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -332,20 +325,20 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -353,23 +346,24 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -388,13 +382,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -402,19 +396,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -423,8 +417,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -444,7 +438,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -465,7 +459,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -473,7 +467,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -481,27 +476,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -510,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "" @@ -522,13 +517,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -554,48 +549,48 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -603,19 +598,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -627,42 +622,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -670,12 +665,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "" @@ -683,24 +678,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -719,12 +714,12 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" @@ -742,15 +737,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -758,11 +753,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -790,42 +785,42 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" @@ -846,25 +841,15 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -873,7 +858,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -889,7 +874,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -897,18 +882,18 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" @@ -922,7 +907,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -930,24 +915,24 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -961,12 +946,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -974,47 +958,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "" @@ -1022,14 +1006,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1043,8 +1027,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1054,22 +1038,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1081,91 +1065,91 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1185,12 +1169,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1199,7 +1183,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1217,12 +1201,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1237,27 +1221,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1266,24 +1250,7 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1291,11 +1258,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1306,12 +1273,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1319,11 +1286,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" @@ -1335,36 +1302,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "" @@ -1376,11 +1343,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" @@ -1397,11 +1364,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1409,24 +1376,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "" @@ -1435,11 +1402,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1448,11 +1415,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1463,13 +1430,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "" @@ -1491,20 +1458,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1513,7 +1476,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1523,7 +1486,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1532,11 +1495,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1547,20 +1510,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1568,53 +1535,58 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1623,58 +1595,58 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" @@ -1691,11 +1663,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1703,7 +1675,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1711,12 +1683,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1724,7 +1696,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1732,7 +1704,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1741,7 +1713,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1751,19 +1723,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1773,72 +1745,71 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1847,17 +1818,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1865,7 +1836,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1873,24 +1844,41 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1898,13 +1886,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1915,14 +1903,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1940,17 +1928,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1985,32 +1973,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2026,7 +2014,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2038,44 +2026,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" @@ -2083,7 +2071,7 @@ msgstr "" msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2091,7 +2079,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2099,15 +2087,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2204,41 +2192,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2251,7 +2239,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2264,19 +2252,19 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2284,27 +2272,27 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2312,7 +2300,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2320,7 +2308,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2351,42 +2339,42 @@ msgstr "" msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2394,16 +2382,16 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "" @@ -2415,7 +2403,7 @@ msgstr "" msgid "GCMic Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" @@ -2423,27 +2411,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" @@ -2451,25 +2439,25 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2482,20 +2470,20 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" @@ -2504,19 +2492,19 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2527,7 +2515,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2547,11 +2535,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2559,7 +2547,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" @@ -2571,7 +2559,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2585,11 +2573,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2600,8 +2588,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2609,17 +2597,17 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" @@ -2641,7 +2629,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "" @@ -2649,19 +2637,19 @@ msgstr "" msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "" @@ -2673,29 +2661,29 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2704,7 +2692,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2713,7 +2701,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2721,23 +2709,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2745,16 +2733,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2762,7 +2750,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2774,7 +2762,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "" @@ -2782,11 +2770,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "" @@ -2795,34 +2783,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "" @@ -2841,15 +2829,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2858,11 +2846,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2883,7 +2871,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" @@ -2891,21 +2879,21 @@ msgstr "" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2913,16 +2901,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2930,24 +2918,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -2965,19 +2953,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -2987,96 +2979,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3087,31 +3079,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3119,12 +3107,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3143,7 +3131,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3157,24 +3145,24 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" @@ -3183,7 +3171,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3212,20 +3200,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "" @@ -3234,7 +3222,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3255,7 +3243,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3270,7 +3258,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3368,16 +3356,16 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" @@ -3386,20 +3374,20 @@ msgstr "" msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3407,7 +3395,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "" @@ -3429,7 +3417,7 @@ msgstr "" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3442,33 +3430,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3477,7 +3465,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3485,16 +3473,16 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" @@ -3502,11 +3490,11 @@ msgstr "" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3514,52 +3502,52 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3572,15 +3560,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3590,19 +3578,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3618,7 +3606,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3630,34 +3618,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3666,36 +3654,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "" @@ -3707,54 +3695,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3767,11 +3755,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3779,7 +3767,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3787,7 +3775,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3795,8 +3783,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3814,7 +3802,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3822,46 +3810,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3877,7 +3865,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3886,46 +3874,46 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3947,29 +3935,25 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" @@ -3977,90 +3961,90 @@ msgstr "" msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4068,23 +4052,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4095,20 +4079,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4123,23 +4107,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4150,11 +4134,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4164,7 +4152,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4174,11 +4162,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4186,24 +4174,24 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4213,11 +4201,17 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4225,7 +4219,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4233,141 +4227,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4375,11 +4369,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4390,27 +4384,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4418,7 +4412,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4428,17 +4422,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "" @@ -4446,7 +4440,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4458,11 +4452,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4476,17 +4470,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4498,7 +4492,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4506,51 +4500,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4559,7 +4557,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4584,8 +4582,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "" @@ -4593,7 +4591,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4614,30 +4612,30 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4653,13 +4651,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4678,7 +4676,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4695,7 +4693,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4703,11 +4701,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4738,12 +4736,8 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +msgid "Theme:" msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 @@ -4752,7 +4746,7 @@ msgid "" "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4764,11 +4758,11 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4779,7 +4773,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4787,7 +4781,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4801,35 +4795,35 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4847,7 +4841,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4859,12 +4853,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4895,12 +4889,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" @@ -4908,7 +4902,7 @@ msgstr "" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" @@ -4937,8 +4931,8 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" @@ -4946,23 +4940,23 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4970,7 +4964,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4979,15 +4973,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -4995,23 +4989,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "" @@ -5025,7 +5019,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5034,16 +5028,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5068,7 +5062,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5076,7 +5070,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5084,7 +5078,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5104,7 +5098,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5112,7 +5106,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" @@ -5120,23 +5114,23 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5144,17 +5138,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5163,19 +5157,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5195,26 +5189,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5251,23 +5245,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5285,7 +5279,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" @@ -5298,12 +5292,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5315,7 +5309,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5326,7 +5320,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5335,11 +5329,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "" @@ -5356,7 +5350,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5375,7 +5369,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5387,6 +5381,6 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 55b75fc93d..f5749b6927 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-15 02:01+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Juego:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NO" @@ -55,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i conectado." @@ -159,147 +152,147 @@ msgstr "%sImportar GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Bloques libres; %u entradas de dir. libres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Y" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Acerca de..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Iniciar desde unidad de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Puntos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Buscar ISO en..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Administrador de &trucos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Archivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Avanzar &frame" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pantalla completa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Configuración gráfica" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ayuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Configuración de atajos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Cargar estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Administrador de tarjetas de memoria (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opciones" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo de solo lectura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reiniciar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Sonido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Detener" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Herramientas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Vista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -319,7 +312,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONOCIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(off)" @@ -327,19 +320,19 @@ msgstr "(off)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "Visión 3D" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -347,20 +340,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -368,25 +361,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "¡¡Una ventana de NetPlay ya está abierta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Ningún juego está emulándose actualmente." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "¡No se ha podido encontrar un dispositivo de Bluetooth soportado!\n" "(Solo se soporta el stack de Bluetooth de Microsoft)." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -421,13 +416,13 @@ msgstr "" "\n" "¡¡Debes redireccionar el puerto TCP para alojar!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Placa base AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -435,19 +430,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Acerca de Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleración" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Exactitud:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulación de VBeam Precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -461,8 +456,8 @@ msgstr "" "\n" "Si no estás seguro, elige EFB a textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acción" @@ -489,7 +484,7 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Añadido de código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -516,16 +511,17 @@ msgstr "" "Error de Action Replay: Tamaño no válido (%08x : dirección = %08x) en " "Escribir con el puntero (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Error de Action Replay: Código maestro y Escribir a CCXXXXXX no han sido " "implementados (%s)" @@ -535,27 +531,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Error de Action Replay: Línea de código AR no válida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Error de Action Replay: Código condicional: Tamaño no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Error de Action Replay: Tipo de Código Normal no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código Normal %i: Subtipo no válido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo no válido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -564,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Añadir parche" @@ -576,13 +572,13 @@ msgstr "Añadir parche" msgid "Add new pane" msgstr "Añadir nueva ventana" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Añadir..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Dirección:" @@ -622,49 +618,49 @@ msgstr "" "\n" "NOTA: Consulta LogWindow/Consola para ver los valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajusta la presión requerida del control analógico para activar los botones." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avanzado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configuración avanzada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -677,19 +673,19 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Sincronización alternativa del Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro anisotrópico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Antialias:" @@ -701,15 +697,15 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -719,16 +715,16 @@ msgstr "" "\n" "Si no estás seguro, selecciona (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,12 +732,12 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -749,12 +745,12 @@ msgstr "Relación de aspecto:" msgid "At least one pane must remain open." msgstr "Al menos una ventana debe permancer abierta." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Motor de Audio:" @@ -762,24 +758,24 @@ msgstr "Motor de Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error al abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (tamaño de ventana)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Autoajuste del tamaño de la ventana" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -801,12 +797,12 @@ msgstr "Registro BP" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Configuración del motor" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Motor:" @@ -824,15 +820,15 @@ msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalles de la imagen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Imagen:" @@ -840,11 +836,11 @@ msgstr "Imagen:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configuración básica" @@ -872,42 +868,42 @@ msgstr "Azul izquierda" msgid "Blue Right" msgstr "Azul derecha" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Inferior" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controles asignados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Busca un directorio de salida" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Búfer" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botones" @@ -928,32 +924,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "Registro CP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Caché de listas de visualización" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcular los valores de profundidad de los gráficos 3D por píxel en lugar de " -"por vértice.\n" -"En contraste con la iluminación de píxeles (que no es más que una mejora), " -"los cálculos por profundidad de píxel son necesarios para emular " -"correctamente un pequeño número de juegos.\n" -"\n" -"Si no estás seguro, deja esta marcada." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -970,7 +949,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -986,7 +965,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -997,7 +976,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1005,12 +984,12 @@ msgstr "" "No se puede usar ese archivo como una tarjeta de memoria.\n" "¿Estás intentando usar el mismo archivo en ambas ranuras?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "No se puede encontrar el WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "No se puede encontrar un WiiMote por el título de conexión %02x" @@ -1024,7 +1003,7 @@ msgstr "No se puede leer del DVD_Plugin - DVD-Interface: Error Fatal" msgid "Caps Lock" msgstr "Bloq Mayús" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalán" @@ -1032,24 +1011,24 @@ msgstr "Catalán" msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Cambiar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Cambiar &disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Cambiar disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Cambiar juego" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1065,13 +1044,12 @@ msgstr "Cambia el signo del parámetro zFar (después de la corrección)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia el signo del parámetro zNear (después de la corrección)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "¡Cambiar esto no tendrá ningún efecto mientras el emulador esté ejecutandose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1079,47 +1057,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Código de truco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Buscar trucos" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Administrador de trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Comprobar integridad de la partición" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Comprobando integridad..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chino Simplificado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1127,7 +1105,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1135,8 +1113,8 @@ msgstr "" "Escoge el archivo que usar como apploader (se aplica a los discos armados a " "partir de directorios solamente):" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escoge la carpeta de destino" @@ -1150,8 +1128,8 @@ msgstr "Clásico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpiar" @@ -1163,22 +1141,22 @@ msgstr "" "¡¡El cliente se desconectó mientras el juego estaba ejecutándose!! NetPlay " "ha sido deshabilitado. Debe detener el juego manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Cerrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Información del código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1190,91 +1168,91 @@ msgstr "Comando" msgid "Comment" msgstr "Comentario" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Comprimiendo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configuración" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar control" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar mandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar al detenerse" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Conectar teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Conectando..." @@ -1294,12 +1272,12 @@ msgstr "Convertir a GCI" msgid "Copy failed" msgstr "Fallo al copiar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar a tarjeta de memoria %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Núcleo" @@ -1308,7 +1286,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "No se pudo crear %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "No se pudo inicializar el motor %s." @@ -1329,12 +1307,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "No se pudo reconocer el archivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "No se pudo guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1357,11 +1335,11 @@ msgstr "" "¿Estás ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1369,17 +1347,17 @@ msgstr "" "No se pudo iniciar el núcleo.\n" "Revisa tu configuración." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Cuenta:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crear Código AR" @@ -1388,25 +1366,7 @@ msgstr "Crear Código AR" msgid "Create new perspective" msgstr "Crear nueva perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Creado por KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Creado por VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creador:" @@ -1414,11 +1374,11 @@ msgstr "Creador:" msgid "Critical" msgstr "Critico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1432,12 +1392,12 @@ msgstr "" msgid "Crossfade" msgstr "Fundido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "El directorio actual cambio de %s a %s luego de wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de proyección personalizado" @@ -1445,11 +1405,11 @@ msgstr "Hack de proyección personalizado" msgid "Custom Projection Hack Settings" msgstr "Configuración del hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar algunos párametros de la proyección ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Checo" @@ -1461,36 +1421,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad direccional" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulación DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1502,11 +1462,11 @@ msgstr "DVDLowRead - Error fatal: fallo al leer del volumen" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Error fatal: fallo al leer el volumen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Tamaño de datos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Fecha:" @@ -1523,11 +1483,11 @@ msgstr "Archivos Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Zona muerta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depurar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Depurarando" @@ -1535,24 +1495,24 @@ msgstr "Depurarando" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Descomprimir ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Predeterminado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1561,11 +1521,11 @@ msgid "Default font" msgstr "Fuente por defecto" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Borrar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Borrar guardado" @@ -1574,11 +1534,11 @@ msgstr "Borrar guardado" msgid "Delete the existing file '%s'?" msgstr "¿Borrar el archivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descripción" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1591,13 +1551,13 @@ msgstr "" "Se detectó un intento de leer más datos del DVD de los que entran en el " "búfer. Truncando." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1621,20 +1581,16 @@ msgstr "" "Falló la suma de verificación del directorio\n" " y falló la suma de verificación del directorio backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deshabilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deshabilitar niebla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Desactivar profundidad por píxel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1649,7 +1605,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1665,7 +1621,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1674,11 +1630,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Error de lectura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Pantalla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1692,20 +1648,24 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuración gráfica %s de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Website de Dolphin" @@ -1713,32 +1673,32 @@ msgstr "&Website de Dolphin" msgid "Dolphin Configuration" msgstr "Configuración de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuración de wiimote emulado de Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuración de wiimote de Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1746,7 +1706,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1754,16 +1714,21 @@ msgstr "" "Dolphin está configurado actualmente para esconder todos los juegos. Haz " "doble clic aquí para mostrarlos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Abajo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Descargar códigos (base de datos de WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Se descargaron %lu códigos. (%lu añadidos)" @@ -1772,27 +1737,27 @@ msgstr "Se descargaron %lu códigos. (%lu añadidos)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Depósito de audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Volcar objetivo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Volcar frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Volcar texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1802,7 +1767,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1812,7 +1777,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1822,17 +1787,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Salir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Copias de EFB" @@ -1853,11 +1818,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualización frecuente de memoria " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1865,7 +1830,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar configuración" @@ -1873,12 +1838,12 @@ msgstr "Editar configuración" msgid "Edit Patch" msgstr "Editar parche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1886,7 +1851,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efecto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Búfer de fotogramas embebido" @@ -1894,7 +1859,7 @@ msgstr "Búfer de fotogramas embebido" msgid "Emu Thread already running" msgstr "El proceso de emulación ya está ejecutándose" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1909,7 +1874,7 @@ msgstr "" "\n" "Si no estás seguro, activa Emulación virtual de XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1925,19 +1890,19 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado de emulación:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Habilitar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1953,72 +1918,71 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Habilitar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Permitir el cálculo del cuadro delimitador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Habilitar caché" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Habilitar trucos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Habilitar doble núcleo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Habilitar doble núcleo (mejora)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Habilitar atajos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Habilitar salto de fotogramas inactivos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Habilitar salto de fotogramas inactivos (mejora)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Habilitar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Habilitar pantalla panorámica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Habilitar \"alambrado\" (wireframe)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2032,7 +1996,7 @@ msgstr "" "\n" "Si no estás seguro, elige 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2040,11 +2004,11 @@ msgstr "" "Habilitar acceso rápido al disco. Es necesario para algunos juegos. (ON = " "Rápido, OFF=Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Habilitar páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2057,7 +2021,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2069,7 +2033,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2077,7 +2041,7 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2087,11 +2051,28 @@ msgstr "" "unidad de administración de memoria (MMU). Es preciso al hardware original, " "pero es lento para emular. (ON = compatible, OFF = rápido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2103,7 +2084,7 @@ msgstr "" "\n" "Si no estás seguro, déjalo sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2111,7 +2092,7 @@ msgstr "" "Habilita la Unidad de Manejo de Memoria(MMU), necesario para algunos juegos. " "(ON = Compatible, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2125,14 +2106,14 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Mejoras" @@ -2150,17 +2131,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Error al cargar el idioma seleccionado. Volviendo al predeterminado del " @@ -2201,32 +2182,32 @@ msgstr "Exception handler - acceso debajo del espacio de memoria. %08llx%08llx" msgid "Execute" msgstr "Ejecutar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Fallo al exportar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar archivo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar grabación..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado a uno de Wii (experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos los guardados" @@ -2242,7 +2223,7 @@ msgstr "Exportar guardado como..." msgid "Extension" msgstr "Extensión" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Buffer de frames externo" @@ -2254,44 +2235,44 @@ msgstr "Parámetro extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parámetro extra solo útil en ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extraer todos los archivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extraer Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extraer DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extraer directorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extraer archivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extraer partición..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extrayendo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extrayendo todos los archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extrayendo directorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extrayendo..." @@ -2299,7 +2280,7 @@ msgstr "Extrayendo..." msgid "FIFO Byte" msgstr "Byte de FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Jugador FIFO" @@ -2307,7 +2288,7 @@ msgstr "Jugador FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamaño del FST:" @@ -2315,15 +2296,15 @@ msgstr "Tamaño del FST:" msgid "Failed to Connect!" msgstr "¡Fallo al conectar!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "¡Fallo al escuchar!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Fallo al descargar los códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Fallo al extraer a %s!" @@ -2441,19 +2422,19 @@ msgstr "Fallo al escribir la cabecera para %s" msgid "Failed to write header for file %d" msgstr "Fallo al escribir la cabecera para el archivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Iraní" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2461,23 +2442,23 @@ msgstr "" "Desincronización fatal. Cancelando reproducción. (Error en PlayWiimote: %u !" "= %u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Jugador Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Información del fichero" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "El archivo no contenía códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Archivo convertido a .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2494,7 +2475,7 @@ msgstr "" "El archivo tiene la extensión \"%s\"\n" "Extensiones válidas son (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "El archivo no es reconocido como una tarjeta de memoria" @@ -2507,19 +2488,19 @@ msgstr "Archivo sin comprimir" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo desconocido de apertura : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Encontrar siguiente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Encontrar anterior" @@ -2527,27 +2508,27 @@ msgstr "Encontrar anterior" msgid "First Block" msgstr "Primer bloque" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Reparar sumas de verificación" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forzar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forzar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forzar consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forzar filtrado de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2561,7 +2542,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2574,7 +2555,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2610,42 +2591,42 @@ msgstr "Frame" msgid "Frame " msgstr "Frame " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avanzar &fotogramas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Volcado de fotogramas usa FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Info del frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salto de &fotogramas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Límite de fotogramas:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Frames a grabar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Cámara libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francés" @@ -2653,16 +2634,16 @@ msgstr "Francés" msgid "Frets" msgstr "Cuerdas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Desde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Pant. compl." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolución en pantalla completa:" @@ -2674,7 +2655,7 @@ msgstr "Archivo GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuración del micro de GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Pad GC" @@ -2682,27 +2663,27 @@ msgstr "Pad GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID del juego:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "¡El juego ya está ejecutándose!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "¡El juego no está ejecutándose!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "¡¡Juego no encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Configuración específica del juego" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurar Juego" @@ -2710,25 +2691,25 @@ msgstr "Configurar Juego" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Ficheros de guardado de GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configuración del Pad de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2745,20 +2726,20 @@ msgstr "" "usando el controlador de código nativo colocando el fichero codehandler.bin " "en el directorio Sys y reiniciando Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "General" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ajustes generales" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemán" @@ -2768,19 +2749,19 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: El índice es mayor que el tamaño de la lista de códigos AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configuración gráfica" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Mayor que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2798,7 +2779,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Griego" @@ -2818,11 +2799,11 @@ msgstr "Verde derecha" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ha sido llamada; ¡por favor, comunícalo!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2830,7 +2811,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Falló la suma de verificación de cabecera" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreo" @@ -2842,7 +2823,7 @@ msgstr "Altura" msgid "Help" msgstr "Ayuda" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2862,11 +2843,11 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2881,8 +2862,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hostear" @@ -2890,17 +2871,17 @@ msgstr "Hostear" msgid "Hotkey Configuration" msgstr "Configuración de atajos" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Atajos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote híbrido" @@ -2928,7 +2909,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Configuración IPL" @@ -2936,19 +2917,19 @@ msgstr "Configuración IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Puntero IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidad IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -2960,7 +2941,7 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icono" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2968,14 +2949,14 @@ msgstr "" "Si se elige, los registros del cuadro delimitador serán actualizados. Es " "usado por los juegos de Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2986,11 +2967,11 @@ msgstr "" "DSP para que tenga efecto (debería arreglar los \"clics\" de audio, pero " "puede causar ruido constante dependiendo del juego)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar cambios de formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3004,7 +2985,7 @@ msgstr "" "\n" "Si no estás seguro, déjala marcada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3018,7 +2999,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Guardado" @@ -3026,7 +3007,7 @@ msgstr "Importar Guardado" msgid "Import failed, try again?" msgstr "Fallo al importar. ¿Probar otra vez?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3034,11 +3015,11 @@ msgstr "" "El archivo importado tiene una extensión .gsc,\n" "pero no tiene la cabecera correcta." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "El archivo importado tiene una longitud no válida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3046,7 +3027,7 @@ msgstr "" "El archivo importado tiene extensión .sav,\n" "pero no tiene la cabecera correcta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3058,16 +3039,16 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "En juego" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Información" @@ -3075,7 +3056,7 @@ msgstr "Información" msgid "Information" msgstr "Información" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3087,7 +3068,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3095,11 +3076,11 @@ msgstr "Insertar tarjeta SD" msgid "Insert name here.." msgstr "Insertar un nombre aquí.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3110,23 +3091,23 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Error de comprobación de la integridad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Comprobación de la integridad finalizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Comprobación de la integridad finalizada. No se encontraron errores." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3135,11 +3116,11 @@ msgstr "" "Falló la comprobación de la integridad para la partición %d. Tu volcado está " "probablemente corrupto o ha sido parcheado incorrectamente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3160,15 +3141,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Error Interno de LZO - lzo_init() falló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolución interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Intérprete (MUY lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3177,11 +3158,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamaño no válido(%x) o Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "¡Valor no válido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map o entrada de directorio no válido" @@ -3205,7 +3186,7 @@ msgstr "" "%s\n" " Puede que necesitas volcar este juego de nuevo." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Archivo de grabación no válido" @@ -3214,21 +3195,21 @@ msgstr "Archivo de grabación no válido" msgid "Invalid search parameters (no object selected)" msgstr "Parametros de búsqueda inválidos (ningún objeto seleccionado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Estado no válido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3236,16 +3217,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÓN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonés" @@ -3253,7 +3234,7 @@ msgstr "Japonés" msgid "KOREA" msgstr "COREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3263,17 +3244,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Mantener la ventana siempre visible" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Clave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3291,19 +3272,23 @@ msgstr "Botón L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último estado sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último estado guardado" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3313,8 +3298,8 @@ msgstr "Izquierda" msgid "Left Stick" msgstr "Stick izquierdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3322,7 +3307,7 @@ msgstr "" "Clic izquierdo para detectar atajos.\n" "Introduce espacio para limpiar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3332,7 +3317,7 @@ msgstr "" "Clic medio para borrar.\n" "Clic der. para más opciones." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3340,76 +3325,76 @@ msgstr "" "Clic izq./der. para más opciones.\n" "Clic medio para borrar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Usar FPS para limitar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Cargar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Cargar texturas personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "&Cargar estado 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "&Cargar estado 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "&Cargar estado 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "&Cargar estado 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "&Cargar estado 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "&Cargar estado 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "&Cargar estado 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "&Cargar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3423,31 +3408,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Cargar valores ya definidos de los patrones de hack disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Fijar procesos en núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Registrar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuración de registro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "Escribir FPS en un fichero" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipos de registro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3460,12 +3441,12 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Salida de registro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Registrando" @@ -3486,7 +3467,7 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3500,24 +3481,24 @@ msgstr "Archivos MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID del fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Máx." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La tarjeta de memoria ya tiene un guardado para este juego" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "La tarjeta de memoria ya está abierta" @@ -3526,7 +3507,7 @@ msgid "Memory Byte" msgstr "Byte de memoria" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Tarjeta de memoria" @@ -3565,20 +3546,20 @@ msgstr "" msgid "Menu" msgstr "Menú" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mín." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3587,7 +3568,7 @@ msgstr "Configuraciones varias" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3612,7 +3593,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3635,7 +3616,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3736,16 +3717,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Arriba" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nombre:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nombre:" @@ -3754,20 +3735,20 @@ msgstr "Nombre:" msgid "Native GCI files(*.gci)" msgstr "Archivos nativos GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nuevo escaneado" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próximo escaneado" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Apodo:" @@ -3775,7 +3756,7 @@ msgstr "Apodo:" msgid "No Country (SDK)" msgstr "Ningún país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Ninguna ISO o WAD ha sido encontrada." @@ -3797,7 +3778,7 @@ msgstr "Sin uniones" msgid "No file loaded" msgstr "No se ha cargado ningún fichero" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "No hay entradas de índice de directorio libres" @@ -3810,33 +3791,33 @@ msgstr "No hay grabaciones guardadas" msgid "No save folder found for title %s" msgstr "No se encontró carpeta de guardado para el juego %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Ninguno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noruego Bokmal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "No igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "No definido" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Sin conectar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3845,7 +3826,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Aviso" @@ -3853,16 +3834,16 @@ msgstr "Aviso" msgid "Num Lock" msgstr "Bloq Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Número de códigos:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleración del nunchuk" @@ -3870,11 +3851,11 @@ msgstr "Aceleración del nunchuk" msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Rango de objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Off" @@ -3882,52 +3863,52 @@ msgstr "Off" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "Mensajes en pantalla" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Solo %d bloques disponibles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir archivo..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: no se puede crear el contexto para el dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: no se encuentran dispositivos de sonido" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: no se puede abrir el dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" @@ -3940,7 +3921,7 @@ msgstr "Opciones" msgid "Orange" msgstr "Naranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3951,8 +3932,8 @@ msgstr "" "Haz clic derecho y exporta todos los guardados,\n" "e impórtalos a una nueva tarjeta de memoria\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Otros" @@ -3964,19 +3945,19 @@ msgstr "" "¡¡El otro cliente se ha desconectado mientras el juego estaba ejecutándose!! " "NetPlay ha sido deshabilitado. Debes detener el juego manualmente." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Salida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Reproducir grabación" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad" @@ -3992,7 +3973,7 @@ msgstr "Pág. abajo" msgid "Page Up" msgstr "Pág. arriba" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Emparejar" @@ -4004,34 +3985,34 @@ msgstr "Párrafo" msgid "Parameters" msgstr "Parámetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partición %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Parches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Pausar al acabar la película" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminación por píxel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfecto" @@ -4040,36 +4021,36 @@ msgstr "Perfecto" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Reproducir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproducir grabación" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Reproducir/pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jugable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opciones de reproducción" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4081,54 +4062,54 @@ msgstr "Por favor, crea una perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Más-menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Puerto 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Puerto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugués" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematuro de la película en PlayWiimote. %u > %u" @@ -4141,11 +4122,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página previa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4153,7 +4134,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4161,7 +4142,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propiedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpiar caché" @@ -4169,8 +4150,8 @@ msgstr "Limpiar caché" msgid "Question" msgstr "Pregunta" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Salir" @@ -4188,7 +4169,7 @@ msgstr "R Botón" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4196,46 +4177,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rango" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Solo lectura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimotes reales" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmar reconectar Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote al cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Grabar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Información de la grabación" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opciones de grabación" @@ -4251,7 +4232,7 @@ msgstr "Rojo izquierda" msgid "Red Right" msgstr "Rojo derecha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4265,29 +4246,29 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualizar lista de juegos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Eliminar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4297,17 +4278,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar a ventana principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4329,29 +4310,25 @@ msgstr "Stick Derecho" msgid "Rumble" msgstr "Vibración" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Arranca DSPLLE en un proceso dedicado (no recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Ruso" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Guardar estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Frecuencia del sonido:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Guardar" @@ -4359,92 +4336,92 @@ msgstr "Guardar" msgid "Save GCI as..." msgstr "Guardar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Guardar estado 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Guardar estado 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Guardar estado 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Guardar estado 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Guardar estado 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Guardar estado 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Guardar estado 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Guardar estado 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Guardar estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "El estado guardado de la película %s está corrupto, deteniendo la " "grabación..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Pantallazo" @@ -4452,23 +4429,23 @@ msgstr "Pantallazo" msgid "Scroll Lock" msgstr "Bloq. desplazamiento" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Buscar objeto actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Busdar valor hexadecimal:" @@ -4479,20 +4456,20 @@ msgid "Section %s not found in SYSCONF" msgstr "No se ha encontrado la sección %s en SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4510,23 +4487,23 @@ msgstr "Selecciona un archivo de guardado para importar" msgid "Select floating windows" msgstr "Selecciona las ventanas flotantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4544,11 +4521,16 @@ msgstr "" "\n" "Si no estás seguro, elige Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "El archivo especificado \"%s\" no existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Fuente seleccionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4565,7 +4547,7 @@ msgstr "" "Si no estás seguro, elige la resolución que uses en el escritorio.\n" "Si sigues inseguro, elige la mayor resolución que te funcione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4581,11 +4563,11 @@ msgstr "" "\n" "Si no estás seguro, usa Direct3D9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posición de la barra sensora:" @@ -4593,26 +4575,26 @@ msgstr "Posición de la barra sensora:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Puerto serie 1 - Este es el puerto que dispositivos como el adaptador de red " "usan." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card por defecto %c" @@ -4624,11 +4606,17 @@ msgstr "" "SetARCode_IsActive: El índice es mayor que el tamaño de la lista de códigos " "AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configuración..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" @@ -4636,7 +4624,7 @@ msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nombre corto:" @@ -4644,105 +4632,105 @@ msgstr "Nombre corto:" msgid "Shoulder Buttons" msgstr "Botones laterales" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar barra de e&stado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar barra de herramien&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar regiones de copiado de EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar entrada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar configuración de ®istro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar regiones" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostar estadísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwán" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar una ventana de confirmación antes de detener un juego." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4751,15 +4739,15 @@ msgstr "" "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar primer bloque" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Mostrar contador de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4769,23 +4757,23 @@ msgstr "" "de tarjetas de memoria,sobre el motor de vídeo,información sobre la CPU y " "limpieza de la cache JIT." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar bloques de guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostrar comentario del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar icono del guardado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar título del guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4797,11 +4785,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconocido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4815,27 +4803,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote de costado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Saltar BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Saltar el acceso al EFB desde la CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4847,7 +4835,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4864,17 +4852,17 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Ranura B" @@ -4882,7 +4870,7 @@ msgstr "Ranura B" msgid "Snapshot" msgstr "Instántanea" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizado por software" @@ -4898,11 +4886,11 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si no estás seguro, " "elige No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Configuración de sonido" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "El motor de sonido %s no es válido." @@ -4916,17 +4904,17 @@ msgstr "Falló la creación del búfer de sonido: %s" msgid "Space" msgstr "Espacio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Español" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volumen del altavoz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4946,7 +4934,7 @@ msgstr "" "\n" "Si no estás seguro, elige 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Acelerar la transferencia de disco" @@ -4954,51 +4942,55 @@ msgstr "Acelerar la transferencia de disco" msgid "Square Stick" msgstr "Stick cuadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Control estándar" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Comenzar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Comenzar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Comenzar graba&ción" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Comenzar grabación" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Estado" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados guardados" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Detener" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5015,7 +5007,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Estirar a la ventana" @@ -5040,8 +5032,8 @@ msgstr "Los archivos de guardado se han importado con éxito." msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5049,7 +5041,7 @@ msgstr "Idioma del sistema:" msgid "TAIWAN" msgstr "TAIWÃN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5070,30 +5062,30 @@ msgstr "Tabla izquierda" msgid "Table Right" msgstr "Tabla derecha" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Captura de pantalla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prueba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Caché de texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Superposición del formato de la textura" @@ -5109,13 +5101,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5139,7 +5131,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "El archivo %s ya estaba abierto, la cabecera de archivo no será escrita." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "El archivo especificado (%s) no existe" @@ -5156,7 +5148,7 @@ msgstr "El nombre no puede contener coma (,)" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "El código AR descifrado que se ha obtenido no contiene ninguna línea." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5168,12 +5160,12 @@ msgstr "" "\n" "Si no estás seguro, utiliza el valor más a la derecha." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "El guardado que está tratando de copiar tiene un tamaño de archivo no válido" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5206,14 +5198,11 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema visual" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Hubo un error al seleccionar el tema" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5222,7 +5211,7 @@ msgstr "" "Debe haber un ticket para 00000001/00000002. Probablemente su volcado de " "NAND esté incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5238,12 +5227,12 @@ msgstr "" "El simulador de Action Replay no soporta códigos que modifiquen al Action " "Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5263,7 +5252,7 @@ msgstr "" "\n" "Si no estás seguro, deja esta casilla sin marcar." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5275,7 +5264,7 @@ msgstr "" "Provoca mejoras de velocidad muy grandes en PC con mas de un núcleo, pero " "puede ocasionar errores gráficos o del programa." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" @@ -5289,35 +5278,35 @@ msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Alternar todos los tipos de registro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Cambiar a pantalla completa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Superior" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Se trató de cargar un archivo de tipo desconocido." @@ -5337,7 +5326,7 @@ msgstr "" "Intentando leer de un SYSCONF no válido\n" "bt ids del Wiimote no están disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5349,12 +5338,12 @@ msgstr "Mesa de DJ" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Puerto UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5390,12 +5379,12 @@ msgstr "" "válido cifrado o descifrado. Asegúrate de que la has escrito correctamente.\n" "¿Te gustaría hacer caso omiso de esta línea y continuar el análisis?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Deshacer cargar estado" @@ -5403,7 +5392,7 @@ msgstr "Deshacer cargar estado" msgid "Unexpected 0x80 call? Aborting..." msgstr "¿Llamada inesperada a 0x80? Cancelando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconocido" @@ -5433,8 +5422,8 @@ msgstr "" msgid "Up" msgstr "Arriba" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualizar" @@ -5442,23 +5431,23 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Usar pantalla completa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar hexadecimal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar advertencias" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5471,7 +5460,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5486,15 +5475,15 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilidad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5502,23 +5491,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidad" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volumen" @@ -5532,7 +5521,7 @@ msgstr "La instalación del WAD falló: error al crear %s" msgid "WAD installation failed: error creating ticket" msgstr "La instalación del WAD falló: error al crear el ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5546,16 +5535,16 @@ msgstr "" "Si no estás seguro, déjala sin marcar" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advertencia" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advertencia - arrancando un DOL en un modo de consola incorrecto!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advertencia - arrancando un ELF en un modo de consola incorrecto!" @@ -5589,7 +5578,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5600,7 +5589,7 @@ msgstr "" "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5612,7 +5601,7 @@ msgstr "" "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5647,7 +5636,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - el archivo no está abierto." @@ -5655,7 +5644,7 @@ msgstr "WaveFileWriter - el archivo no está abierto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" @@ -5663,23 +5652,23 @@ msgstr "Hack de pantalla ancha (widescreen)" msgid "Width" msgstr "Ancho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5687,17 +5676,17 @@ msgstr "Archivos de guardado Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: No se pudo leer el archivo" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5710,19 +5699,19 @@ msgstr "" "o mucho tiempo de espera, o alguna otra razón.\n" "¿Desea reconectarlo inmediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configuración Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5742,26 +5731,26 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Trabajando..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escribir a la consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Escribir en el depurador" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escribir a archivo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escribir a ventana" @@ -5800,23 +5789,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "No puede cerrar ventanas que tengan páginas en ellas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "¡¡Debes elegir un juego!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "¡Debes escribir un nombre!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Debes introducir un valor decimal o hexadecimal válido." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -5839,7 +5828,7 @@ msgstr "" "Debería ser 0x%04x (pero es 0x%04llx)\n" "¿Quiere crear uno nuevo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Zelda TP hack" @@ -5852,12 +5841,12 @@ msgstr "Código Zero 3 no soportado" msgid "Zero code unknown to dolphin: %08x" msgstr "Código cero desconocido para Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ esperando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5873,7 +5862,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5893,7 +5882,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5908,11 +5897,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5929,7 +5918,7 @@ msgstr "Fallo al leer los datos del archivo: %s" msgid "failed to read header" msgstr "Fallo al leer la cabecera." -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leyendo Opcode desde %x. Por favor, comunícalo." @@ -5950,7 +5939,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "¡wxExecute dio un -1 al iniciar la aplicación!" @@ -5962,13 +5951,16 @@ msgstr "Correción zFar:" msgid "zNear Correction: " msgstr "Correción zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Recorrer frames" @@ -6051,6 +6043,22 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcular los valores de profundidad de los gráficos 3D por píxel en lugar " +#~ "de por vértice.\n" +#~ "En contraste con la iluminación de píxeles (que no es más que una " +#~ "mejora), los cálculos por profundidad de píxel son necesarios para emular " +#~ "correctamente un pequeño número de juegos.\n" +#~ "\n" +#~ "Si no estás seguro, deja esta marcada." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6102,6 +6110,21 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "No se pudo obtener información sobre el plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creado por black_rider y publicado en ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Caché DList" @@ -6115,6 +6138,9 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "Deshabilitar iluminación" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desactivar profundidad por píxel" + #~ msgid "Disable Textures" #~ msgstr "Deshabilitar texturas" @@ -6394,6 +6420,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Carga el archivo especificado (DOL, ELF, WAD, GCM, ISO)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Fijar procesos en núcleos" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "" #~ "Especifica emulación de audio de bajo nivel (LLE) o alto nivel (HLE)" @@ -6470,6 +6499,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Ejecutando script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Frecuencia del sonido:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6576,6 +6608,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "El archivo " +#~ msgid "Theme selection went wrong" +#~ msgstr "Hubo un error al seleccionar el tema" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index 1e78f5e761..d1ed36f150 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-17 09:31-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: H.Khakbiz\n" "Language-Team: H.Khakbiz\n" "Language: Farsi\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(برای نمایش دادن بسیار زیاد است)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "بازی :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! نه" @@ -56,14 +56,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sÚ©Ù¾ÛŒ%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i ارتباط برقرار شده" @@ -157,147 +150,147 @@ msgstr "%sوارد کردن جی سی Ø¢ÛŒ%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u بلوک های آزاد; %u ورودی های پوشه آزاد" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& Ùˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&درباره..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&بوت شدن از درایو دی ÙˆÛŒ دی..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&نقاط انÙصال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&مرور برای Ùایل های آیزو..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "مدیریت کدهای &تقلب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "تنظیمات پردازشگر &صدای دلÙین" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&حذ٠آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&حذ٠آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&برابرسازی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Ùایل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&پيشروى Ùریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&تمام صÙحه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "تنظیمات &گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "تنظیم &شرت کاتها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&جیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&بارگذاری وضعیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "مدیر &کارت حاÙظه (گیم کیوب)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&حاÙظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&باز کردن..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&گزینه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "ثبت کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "شروع &دوباره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&صدا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&توقÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ابزارها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&ویدیو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&دیدگاه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "تنظیمات &ویموت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&ویکی" @@ -317,7 +310,7 @@ msgstr "نزدیکz+(-)" msgid "(UNKNOWN)" msgstr "(ناشناخته)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(خاموش)" @@ -325,19 +318,19 @@ msgstr "(خاموش)" msgid "0x44" msgstr "Û°xÛ´Û´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "Û±Û¶ بیت" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "Û³Û² بیت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "نمایش سه بعدی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "Û¸ بیت" @@ -345,20 +338,20 @@ msgstr "Û¸ بیت" msgid "" msgstr "<اسم را اینجا وارد کنید>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<سایز تصویر پیدا نشد>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<هیچ>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<تکمه Ùشارى>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<سیستم>" @@ -366,25 +359,27 @@ msgstr "<سیستم>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "پنجره نت پلی از قبل باز است!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "بازی در حال حاضر اجرا نشده است." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "دستگاه بلوتوث مورد پشتیبانی پیدا نشد!\n" "(Ùقط نرم اÙزار پیاده سازی بلوتوث ماکروساÙت پشتیبانی میشود.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "شما باید درگاه TCP را به میزبان ارسال کنید!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "بÙرد٠مادر ای ام" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "کدهای اکشن ریپلی" @@ -433,19 +428,19 @@ msgstr "کدهای اکشن ریپلی" msgid "About Dolphin" msgstr "درباره دلÙین" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "شتاب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "دقت:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "برابرسازی دقیق ÙˆÛŒ بیم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "اگر در این مورد اطمینان ندارید، به جای آن گزینه ای ا٠بی به باÙت اشیاء را " "انتخاب کنید." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "اکشن" @@ -486,7 +481,7 @@ msgid "" msgstr "" "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در اضاÙÙ‡ کردن کد (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -511,15 +506,16 @@ msgid "" msgstr "" "خطای اکشن ریپلی: سایز نامعتبر (%08x : آدرس = %08x) در نوشتن به اشاره گر (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "خطای اکشن ریپلی: مقدار نامعتبر (%08x) در Ú©Ù¾ÛŒ حاÙظه (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "خطای اکشن ریپلی: کد مستر Ùˆ نوشتن در CCXXXXXX تکمیل نشده است (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -527,27 +523,27 @@ msgstr "خطای اکشن ریپلی: کد مستر Ùˆ نوشتن در CCXXXXXX msgid "Action Replay Error: invalid AR code line: %s" msgstr "خطای اکشن ریپلی: خط کد نامعتبر اکشن ریپلی: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "خطای اکشن ریپلی: کد نامعلوم: سایز نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "خطای اکشن ریپلی: الگوی کد عادی نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "خطای اکشن ریپلی: کد عادی %i: کد Ùرعی نامعتبر %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "خطای اکشن ریپلی: کد عادی Û°: کد Ùرعی نامعتبر %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "آداپتور:" @@ -556,11 +552,11 @@ msgstr "آداپتور:" msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -568,13 +564,13 @@ msgstr "اضاÙÙ‡ کردن وصله" msgid "Add new pane" msgstr "اضاÙÙ‡ کردن تکه جدید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "آدرس :" @@ -614,48 +610,48 @@ msgstr "" "\n" "توجه: پنجره/کنسول ثبت وقایع را برای بدست آوردن مقادیر برسی کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "تنظیم Ùشار کنترل آنالوگ برای Ùعال کردن دکمه ها لازم است." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "پیشرÙته" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "تنظیمات پیشرÙته" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "همه Ùایل های گیم کیوب/ÙˆÛŒ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "همه ایمیجهای گیم کیوب/ÙˆÛŒ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "همه Ùایل های گیم کیوب جی سی ام (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "همه وضعیت های ذخیره (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "همه Ùایل های آیزو ÙˆÛŒ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "همه Ùایل های آیزو Ùشرده شده گیم کیوب/ÙˆÛŒ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "همه Ùایل ها (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -667,19 +663,19 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "زمان بندی جایگزین برای ویموت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "تحلیل کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Ùیلتر ناهمسانگر:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "آنتی آلیاسینگ:" @@ -691,15 +687,15 @@ msgstr "سایز بارگذار برنامه اشتباه است...آیا این msgid "Apploader unable to load from file" msgstr "بارگذار برنامه ناتوان در بارگذاری از Ùایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "بار گذار برنامه:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "اعمال کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -709,16 +705,16 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، (خاموش) را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "عربی" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "آیا شما مطمئن هستید Ú©Ù‡ میخواهید \"%s\" را حذ٠کنید؟" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,14 +722,14 @@ msgstr "" "آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایلها را حذ٠کنید؟\n" "این Ùایل ها برای همیشه از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایل را حذ٠کنید؟ این Ùایل برای همیشه " "از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "نسبت طول به عرض تصویر:" @@ -741,12 +737,12 @@ msgstr "نسبت طول به عرض تصویر:" msgid "At least one pane must remain open." msgstr "حداقل یک قطه Ù…ÛŒ بایست باز بماند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "پشتوانه صدا:" @@ -754,24 +750,24 @@ msgstr "پشتوانه صدا:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: خطا در باز کردن دستگاه خروجی صدا.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "اتوماتیک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "اتوماتیک (ضریب Û¶Û´Û°xÛµÛ²Û¸)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "اتوماتیک (سایز پنجره)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "تنظیم اتوماتیک سایز پنجره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -793,12 +789,12 @@ msgstr "ثبت اشاره گر پایه" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "تنظیمات پشتوانه" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "پشتوانه:" @@ -816,15 +812,15 @@ msgid "Bad File Header" msgstr "سرخط ناصحیح Ùایل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "جزئیات نشان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "نشان:" @@ -832,11 +828,11 @@ msgstr "نشان:" msgid "Bar" msgstr "نوار" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "بنیانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "تنظیمات بنیانی" @@ -864,42 +860,42 @@ msgstr "آبی Ú†Ù¾" msgid "Blue Right" msgstr "آبی راست" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "پائین" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "کنترل های محدودیت: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "خراب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "مرور" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "مرور برای پوشه جهت اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "مرور برای پوشه آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "مرور برای پوشه خروجی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "حاÙظه موقت:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "دکمه ها" @@ -920,30 +916,15 @@ msgstr "استیک سی" msgid "CP reg" msgstr "ثبت سی Ù¾ÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "موتور پردازشگر برابرساز" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "لیست های حاÙظه ميانى تصویر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"محاسبه مقادیر عمق هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" -"در تضاد با نورپردازی پیکسل (Ú©Ù‡ صرÙا یک بهبود است)ØŒ محاسبات عمق هر پیکسل برای " -"به طور صحیح برابرسازی کردن تعداد Ú©Ù…ÛŒ از بازی ها لازم است.\n" -"\n" -"اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -957,7 +938,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "لغو کردن" @@ -973,7 +954,7 @@ msgstr "قادر به باز گشایی نیست %s" msgid "Cannot unregister events with events pending" msgstr "رویدادهایی را Ú©Ù‡ معوق اند نمی تواند از ثبت درآورد." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +965,7 @@ msgstr "" "%s\n" "این یک Ùایل کارت حاÙظه معتبر گیم کیوب نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -992,13 +973,13 @@ msgstr "" "قادر به استÙاده از این Ùایل به عنوان کارت حاÙظه نیست.\n" "آیا شما سعی دارید از یک Ùایل برای هر دو شکا٠استÙاده کنید؟" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "قادر به یاÙتن ویموت بواسطه دستگاه بلوتوث نیست: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "قادر به یاÙتن ویموت بواسطه دستگذار اتصال %02x نیست" @@ -1012,7 +993,7 @@ msgstr "قادر به خواندن از پلاگ-این دی ÙˆÛŒ دی نیست msgid "Caps Lock" msgstr "کپس لاک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "کاتالان" @@ -1020,24 +1001,24 @@ msgstr "کاتالان" msgid "Center" msgstr "مرکز" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "تعویض" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "تعویض &دیسک..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "تعویض دیسک" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "تعویض بازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1053,13 +1034,12 @@ msgstr "تغییرات علامت به پارامتر z-دور (بعد از تص msgid "Changes sign to zNear Parameter (after correction)" msgstr "تغییرات علامت به پارامتر z-نزدیک (بعد از تصحیح)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "تغییر دادن این مورد در حالی Ú©Ù‡ برابرساز در حال اجراست اثری نخواهد داشت!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Ú¯Ù¾ زدن" @@ -1067,47 +1047,47 @@ msgstr "Ú¯Ù¾ زدن" msgid "Cheat Code" msgstr "کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "جستجوی کد تقلب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "مدیر کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "برسی عدم نقص پارتیشن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "برسی عدم نقص..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "چینی (ساده شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "انتخاب یک پوشه ریشه برای دی ÙˆÛŒ دی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "انتخاب یک پوشه ریشه برای نند:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "انتخاب آیزو پیش Ùرض:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "انتخاب Ùایل برای باز کردن" @@ -1115,7 +1095,7 @@ msgstr "انتخاب Ùایل برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1123,8 +1103,8 @@ msgstr "" "انتخاب Ùایل برای استÙاده بعنوان بارگذار برنامه: (به دیسک هایی Ú©Ù‡ Ùقط از پوشه " "ها ساخته شده اند اعمال Ù…ÛŒ کند)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "انتخاب پوشه برای استخراج به آن" @@ -1138,8 +1118,8 @@ msgstr "کلاسیک" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "پاک کردن" @@ -1151,22 +1131,22 @@ msgstr "" "ارتباط مشتری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی از کار اÙتاد. شما " "باید بازی را دستی متوق٠کنید." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "بستن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ù¾ÛŒ&کربندی..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "مشخصات کد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "کد:" @@ -1178,91 +1158,91 @@ msgstr "دستور" msgid "Comment" msgstr "توضیح" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Ùشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Ùشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "در حال Ùشرده کردن آیزو" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "پیکربندی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "پیکربندی" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "کنترل پیکربندی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "پیکربندی گیم پدها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی Ùایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "تائید برای توقÙ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "اتصال ویموت %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "اتصال ویموت Û±" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "اتصال ویموت Û²" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "اتصال ویموت Û³" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "اتصال ویموت Û´" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "در حال اتصال..." @@ -1282,12 +1262,12 @@ msgstr "تبدیل به جی سی Ø¢ÛŒ" msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Ú©Ù¾ÛŒ به کارت حاÙظه %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "هسته" @@ -1296,7 +1276,7 @@ msgstr "هسته" msgid "Could not create %s" msgstr "قادر به ساخت نیست %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "قادر به نصب پشتوانه نیست %s" @@ -1317,12 +1297,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "قادر به تشخیص Ùایل آیزو %s نبود" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "قادر به ذخیره کردن نیست %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1344,11 +1324,11 @@ msgstr "" "آیا شما بازی را از روی یک سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید، Ùˆ یا شاید Ùایل " "ذخیره محاÙظت شده (Write Protect) است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "قادر به یاÙتن دستور باز برای پسوند 'ini' نیست!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1356,17 +1336,17 @@ msgstr "" "قادر به اينيت کردن هسته نیست.\n" "تنظیمات خود را Ú†Ú© کنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "شماردن:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "کشور:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "ساخت کد اکشن ریپلی" @@ -1375,26 +1355,7 @@ msgstr "ساخت کد اکشن ریپلی" msgid "Create new perspective" msgstr "ساخت پرسپکتیو جدید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "ساخته شده توسط KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"ساخته شده توسط Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "ساخته شده توسط VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"ساخته شده توسط black_rider Ùˆ منتشر شده در ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "سازنده:" @@ -1402,11 +1363,11 @@ msgstr "سازنده:" msgid "Critical" msgstr "بحرانی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "حذ٠قسمتی از تصوير" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1420,12 +1381,12 @@ msgstr "" msgid "Crossfade" msgstr "ضرب دری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "بعد از انتخابگر Ùایل wx پوشه Ùعلی از %s به %s تغییر کرد!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Ù‡Ú© کردن دستی تصویر" @@ -1433,11 +1394,11 @@ msgstr "Ù‡Ú© کردن دستی تصویر" msgid "Custom Projection Hack Settings" msgstr "تنظیمات مربوط به Ù‡Ú© کردن دستی تصویر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "دستکاری برخی از پارامتر های خطوط عمودی تصویر." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "چکوسلواکی" @@ -1449,36 +1410,36 @@ msgstr "D" msgid "D-Pad" msgstr "پد هدایتی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "موتور برابرساز پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "برابرسازی سطح بالای پردازشگر صدای دلÙین (سریع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Ù…Ùسر سطح پائین پردازشگر صدای دلÙین (کند)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "قرار دادن برابرساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "ری کامپایلر سطح پائین پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "تنظیمات پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "ریشه دی ÙˆÛŒ دی:" @@ -1493,11 +1454,11 @@ msgstr "" "خواندن سطح پائین کد گشایی شده دی ÙˆÛŒ دی - خطای مهلک: خواندن از روی دیسک با " "شکست مواجه شد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "اندازه داده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "تاریخ:" @@ -1514,11 +1475,11 @@ msgstr "Ùایل های داتل مکس درایو/حرÙÙ‡ ای (*,sav)" msgid "Dead Zone" msgstr "منطقه مرده" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "اشکال زدائی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "اشکال زدائی کردن" @@ -1526,24 +1487,24 @@ msgstr "اشکال زدائی کردن" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ناهمÙشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "ناهمÙشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "در حال ناهمÙشرده کردن آیزو" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "آیزو پیش Ùرز:" @@ -1552,11 +1513,11 @@ msgid "Default font" msgstr "دست خط پیش Ùرز" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "حذÙ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "حذ٠ذخیره" @@ -1565,11 +1526,11 @@ msgstr "حذ٠ذخیره" msgid "Delete the existing file '%s'?" msgstr "Ùایل موجود '%s' حذ٠شود؟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "شرح" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "شناسایی" @@ -1582,13 +1543,13 @@ msgstr "" "کوشش برای خواند داده بیشتر از دی ÙˆÛŒ دی نسبت به داده ای Ú©Ù‡ در حاÙظه میانجی " "گنجانده شده یاÙت شد. مهار کردن." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1612,20 +1573,16 @@ msgstr "" "Ú†Ú© سام پوشه با شکست مواجه شد\n" " Ùˆ Ú†Ú© سام بکاپ پوشه با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "از کارانداختن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "از کارانداختن مه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "از کارانداختن Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1640,7 +1597,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1656,7 +1613,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "دیسک" @@ -1665,11 +1622,11 @@ msgstr "دیسک" msgid "Disc Read Error" msgstr "خواندن دیسک با مشکل مواجه گردید" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "نمایش" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1683,20 +1640,24 @@ msgstr "" msgid "Divide" msgstr "تقسیم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "آیا Ù…ÛŒ خواهید برابرسازی Ùعلی را متوق٠کنید؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "دلÙین" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "دلÙین %s پیکربندی گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&وب سایت دلÙین" @@ -1704,32 +1665,32 @@ msgstr "&وب سایت دلÙین" msgid "Dolphin Configuration" msgstr "پیکر بندی دلÙین" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "پیکربندی ویمیوت برابرسازی شده دلÙین" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "دلÙین ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی گیم پد گیم کیوب دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Ùیلم های تاس دلÙین (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "پیکربندی ویموت دلÙین" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "دلÙین در &Ú¯ÙˆÚ¯Ù„ کد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1737,7 +1698,7 @@ msgstr "" "دلÙین قادر به پیدا کردن آیزو های گیم کیوب/ÙˆÛŒ نیست. برای مرور Ùایل ها دو بار " "اینجا کلیک کنید..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1745,16 +1706,21 @@ msgstr "" "دلÙین در حال حاضر ست شده است Ú©Ù‡ همه بازی ها را مخÙÛŒ کند. برای نمایش بازی ها " "دو بار اینجا کلیک کنید..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "پائین" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "دانلود کدها (WiiRD بانک اطلاعاتی)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu کد دانلود شد. (%lu عدد اضاÙÙ‡ شد)" @@ -1763,27 +1729,27 @@ msgstr "%lu کد دانلود شد. (%lu عدد اضاÙÙ‡ شد)" msgid "Drums" msgstr "طبل ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "مصنوعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "نسخه برداری صدا" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "نسخه برداری نشان حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "نسخه برداری Ùریم ها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "نسخه برداری باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1794,7 +1760,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1805,7 +1771,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1816,17 +1782,17 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "هلندی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Ø®&روج" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Ú©Ù¾ÛŒ های حاÙظه میانجی Ùریم جاساز شده (EFB)" @@ -1847,11 +1813,11 @@ msgstr "" msgid "EUROPE" msgstr "اروپا" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "به روز شدن های اولیه حاÙظه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "ویرایش" @@ -1859,7 +1825,7 @@ msgstr "ویرایش" msgid "Edit ActionReplay Code" msgstr "ویرایش کدهای اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "ویرایش پیکربندی" @@ -1867,12 +1833,12 @@ msgstr "ویرایش پیکربندی" msgid "Edit Patch" msgstr "ویرایش وصله" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "ویرایش چشم انداز جاری" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "ویرایش..." @@ -1880,7 +1846,7 @@ msgstr "ویرایش..." msgid "Effect" msgstr "اÙکت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "حاÙظه میانجی Ùریم جاساز شده (EFB)" @@ -1888,7 +1854,7 @@ msgstr "حاÙظه میانجی Ùریم جاساز شده (EFB)" msgid "Emu Thread already running" msgstr "ریسمان شبیه ساز قبلا اجرا شده است" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1902,7 +1868,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، گزینه اکس ا٠بی مجازی را Ùعال کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1919,19 +1885,19 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "ویموت برابرسازی شده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "وضعیت برابرساز:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ùراهم کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1947,72 +1913,71 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Ùعال کردن واقعه نگاری اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ùعال کردن انتقال آدرس بلوک" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ùعال کردن ادغام بلوک" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Ùعال کردن محاسبه حد جعبه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Ùعال کردن حاÙظه ميانى" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Ùعال کردن کدهای تقلب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Ùعال کردن پردازنده با دو هسته یا بیشتر (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Ùعال کردن شرت کاتها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ùعال کردن جهش بیکاری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Ùعال کردن جهش بیکاری (بالا بردن سرعت)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ùعال کردن واحد مدیریت حاÙظه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Ùعال کردن پويش تصاعدی (Progressive Scan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Ùعال کردن اسکیرین سیور" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Ùعال کردن صÙحه عریض" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Ùعال کردن خطوط Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2026,7 +1991,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، حالت 1x را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2034,11 +1999,11 @@ msgstr "" "Ùعال کردن دسترسی سریع به دیسک. این امر برای اجرای تعداد محدودی از بازی ها " "لازم است. (ON=سریع، OFF=سازگار)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Ùعال کردن صÙحات" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2050,7 +2015,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2062,7 +2027,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2070,7 +2035,7 @@ msgstr "" "برای بالا بردن سرعت بازی اÙسانه زلدا: شاهدخت سپیده دم این گزینه را Ùعال " "کنید. غیرÙعال برای هر بازی دیگر." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2079,11 +2044,28 @@ msgstr "" "انتقال آدرس بلوک را Ùعال Ù…ÛŒ کند; کارایی واحد مدیریت حاÙظه. بالا بردن دقت سخت " "اÙزار، اما سبب کند شدن برابرسازی میگردد. (روشن = سازگار، خاموش = سریع)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Ùعال کردن پروژه Ù‡Ú© دستی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2095,7 +2077,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2103,7 +2085,7 @@ msgstr "" "Ùعال کردن واحد مدیریت حاÙظه، برای بعضی از بازی ها لازم است. (روشن = سازگار، " "خاموش = سریع)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2117,14 +2099,14 @@ msgstr "" msgid "End" msgstr "پایان" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "انگلیسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "بهسازی" @@ -2142,17 +2124,17 @@ msgstr "ورودی %d/%d" msgid "Entry 1/%d" msgstr "ورودی 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "همگن" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "خطا" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "بارگذاری زبان انتخاب شده با شکست مواجه شد. برگشت به زبان پیش Ùرض سیستم." @@ -2192,32 +2174,32 @@ msgstr "دستگذار استثناء - دسترسی Ùضای پایینی حا msgid "Execute" msgstr "اجرا کردن" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "صادر کردن با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "صادر کردن Ùایل" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "صادر کردن ضبط" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "صادر کردن ضبط..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "صادر کردن ذخیره" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Ùایل ذخیره ÙˆÛŒ (آزمایشی)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "صادر کردن همه ذخیره ها" @@ -2233,7 +2215,7 @@ msgstr "صادر کردن ذخیره بعنوان..." msgid "Extension" msgstr "پسوند" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "حاÙظه میانجی خارجی Ùریم" @@ -2245,44 +2227,44 @@ msgstr "پارامتر اضاÙÛŒ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "پارامترهای یدکی Ù…Ùید تنها برای \"Metroid Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "استخراج همه Ùایل ها..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "استخراج بارگذار برنامه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "استخراج دال..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "استخراج پوشه..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "استخراج Ùایل..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "استخراج پارتیشن..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "استخراج کردن %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "استخراج کردن همه Ùایل ها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "استخراج کردن پوشه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "استخراج کردن..." @@ -2290,7 +2272,7 @@ msgstr "استخراج کردن..." msgid "FIFO Byte" msgstr "بایت ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "پخش کننده ÙÛŒÙÙˆ" @@ -2298,7 +2280,7 @@ msgstr "پخش کننده ÙÛŒÙÙˆ" msgid "FRANCE" msgstr "Ùرانسه" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "اندازه ا٠اس تی:" @@ -2306,15 +2288,15 @@ msgstr "اندازه ا٠اس تی:" msgid "Failed to Connect!" msgstr "اتصال با شکست مواجه شد!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "پذیرÙتن با شکست مواجه شد!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "دانلود کدها با شکست مواجه شد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "استخراج به %s با شکست مواجه شد!" @@ -2433,42 +2415,42 @@ msgstr "نوشتن سرخط برای %s با شکست مواجه شد" msgid "Failed to write header for file %d" msgstr "نوشتن سرخط برای Ùایل %d با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "پارسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "نسخه سریع واحد مدیریت حاÙظه. برای همه بازی ها عمل نمی کند." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" "همگاه سازی مجدد مهلک. خروج نمایش. (خطا در ویموت پخش: %u !=%u, بایت %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "پخش کننده ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "مشخصات Ùایل" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Ùایل شامل کدی نیست." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Ùایل تبدیل شده است به .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2485,7 +2467,7 @@ msgstr "" "Ùایل پسوند \"%s\" دارد\n" "پسوند های معتبر عبارتند از (.raw/,gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Ùایل به عنوان کارت حاÙظه شناخته نشده است" @@ -2498,19 +2480,19 @@ msgstr "Ùایل Ùشرده نیست" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "ورودی/خروجی Ùایل: حالت گشودن ناشناس : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Ùایل سیستم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع Ùایل 'ini' ناشناس است! باز نخواهد شد!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "پیدا کردن بعدی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "پیدا کردن قبلی" @@ -2518,27 +2500,27 @@ msgstr "پیدا کردن قبلی" msgid "First Block" msgstr "بلوک اول" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "درست کردن Ú†Ú© سام ها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Û±Û¶:Û¹ اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Û´:Û³ اجباری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "کنسول به عنوان NTSC-J اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Ùیلتر کردن باÙت اشیاء اجباری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2551,7 +2533,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2563,7 +2545,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2599,42 +2581,42 @@ msgstr "Ùریم" msgid "Frame " msgstr "Ùریم" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "پيشروى Ùریم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "نسخه برداری Ùریم از FFV1 استÙاده Ù…ÛŒ کند" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "مشخصات Ùریم" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "محدوده Ùریم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "پری&دن از روی Ùریم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "حد Ùریم:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Ùریم ها برای ضبط شدن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "نگاه آزاد" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Ùرانسوی" @@ -2642,16 +2624,16 @@ msgstr "Ùرانسوی" msgid "Frets" msgstr "تحریک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "از" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "تمام صÙحه" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "وضوح حالت تمام صÙحه:" @@ -2663,7 +2645,7 @@ msgstr "Ùایل جی سی Ø¢ÛŒ(*.gci)" msgid "GCMic Configuration" msgstr "پیکربندی میکروÙÙ† گیم کیوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "گیم پد گیم کیوب" @@ -2671,27 +2653,27 @@ msgstr "گیم پد گیم کیوب" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Ø¢ÛŒ دی بازی:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "بازی قبلا اجرا شده است!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "بازی اجرا نشده است!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "بازی پیدا نشد!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "تنظیمات مشخصات بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "پیکربندی بازی" @@ -2699,25 +2681,25 @@ msgstr "پیکربندی بازی" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Ùایل های ذخیره بازی گیم کیوب(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "گیم کیوب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "تنظیمات &دسته گیم کیوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "کارت های حاÙظه گیم کیوب (*.raw.*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "تنظیمات دسته گیم کیوب" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "کدهای گیکو" @@ -2734,20 +2716,20 @@ msgstr "" "توسط قرار دادن Ùایل codehandler.bin در داخل پوشه Sys Ùˆ شروع مجدد دلÙین " "استÙاده کنید.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Ú©Ù„ÛŒ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "تنظیمات جامع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "آلمانی" @@ -2756,19 +2738,19 @@ msgstr "آلمانی" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "گرÙتن کد اکشن ریپلی: Ùهرست بزرگتر از سایز لیست است %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "گراÙیک" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "تنظیمات گراÙیک" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "بزرگتر از" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2785,7 +2767,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "یونانی" @@ -2805,11 +2787,11 @@ msgstr "سبز راست" msgid "Guitar" msgstr "گیتار" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIY Ùرا خوانده شد، لطÙا گزارش دهید!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Ù‡Ú©" @@ -2817,7 +2799,7 @@ msgstr "Ù‡Ú©" msgid "Header checksum failed" msgstr "Ú†Ú© کردن سر خط برای یاÙتن خطا با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "عبری" @@ -2829,7 +2811,7 @@ msgstr "ارتÙاع" msgid "Help" msgstr "Ú©Ù…Ú©" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2851,11 +2833,11 @@ msgstr "" msgid "Hide" msgstr "مخÙÛŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "مخÙÛŒ کردن نشانگر" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2869,8 +2851,8 @@ msgstr "" msgid "Home" msgstr "خانه" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "میزبان" @@ -2878,17 +2860,17 @@ msgstr "میزبان" msgid "Hotkey Configuration" msgstr "پیکربندی شرت کات" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "شرت کاتها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "مجارستانی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "ویموت مخلوط" @@ -2915,7 +2897,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "تنظیمات Ø¢ÛŒ Ù¾ÛŒ ال" @@ -2923,19 +2905,19 @@ msgstr "تنظیمات Ø¢ÛŒ Ù¾ÛŒ ال" msgid "IR" msgstr "Ùروسرخ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "اشاره گر Ùروسرخ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "میزان حساسیت Ùروسرخ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "جزئیات آیزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "پوشه های آیزو" @@ -2947,7 +2929,7 @@ msgstr "ایتالیا" msgid "Icon" msgstr "تندیس" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2955,14 +2937,14 @@ msgstr "" "اگر انتخاب شود، ثبت حد جعبه به روز خواهد شد. از سوی بازی های پیپر ماریو " "استÙاده Ù…ÛŒ شود." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "اگر تعداد Ùریم های نمایش داده شده بر ثانیه نامنظم است، شاید این گزینه به رÙع " "آن Ú©Ù…Ú© کند. (روشن = سازگار، خاموش = سریع)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2972,11 +2954,11 @@ msgstr "" "استÙاده کنید از دریچه صدا با استÙاده از پردازشگر صدای دلÙین (شاید صدا های " "تیک را درست کند اما همچنین Ù…ÛŒ تواند موجب نویز ثابت بسته به بازی شود)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "تغییرات قالب بندی نادیده گرÙته شود" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2990,7 +2972,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3005,7 +2987,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "وارد کردن ذخیره" @@ -3013,7 +2995,7 @@ msgstr "وارد کردن ذخیره" msgid "Import failed, try again?" msgstr "وارد کردن با شکست مواجه شد، سعی دوباره؟" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3021,11 +3003,11 @@ msgstr "" "پسوند Ùایل وارد شده جی اس سی است\n" "اما دارای سرخط صحیح نمی باشد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "طول Ùایل وارد شده نامعتبر Ù…ÛŒ باشد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3033,7 +3015,7 @@ msgstr "" "پسوند Ùایل وارد شده اس ای ÙˆÛŒ Ù…ÛŒ باشد\n" "اما دارای سرخط صحیح نمی باشد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3045,16 +3027,16 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "در بازی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "در بازی" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "مشخصات" @@ -3062,7 +3044,7 @@ msgstr "مشخصات" msgid "Information" msgstr "مشخصات" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "ورودی" @@ -3074,7 +3056,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده Ùˆ یا کش٠شده..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "درج کارت اس دی" @@ -3082,11 +3064,11 @@ msgstr "درج کارت اس دی" msgid "Insert name here.." msgstr "درج اسم..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "نصب واد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "نصب به Ùهرست انتخاب ÙˆÛŒ" @@ -3097,23 +3079,23 @@ msgstr "" "نصب دستگذار استثناء Ùراخوانده شد، اما این پلتÙورم هنوز از این امکان پشتیبانی " "نمی کند." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "در حال نصب واد..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "خطای بررسی درست بودن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "بررسی درست بودن به پایان رسید" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "بررسی درست بودن به پایان رسید. خطایی پیدا نشد." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3122,11 +3104,11 @@ msgstr "" "بررسی درست بودن پارتیشن %d با شکست مواجه شد. نسخه برداری شما به احتمال زیاد " "خراب یا نادرست وصله خورده است." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "واسط گراÙیک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "تنظیمات واسط گراÙیک" @@ -3147,15 +3129,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "خطای داخلی LZO - lzo_init() با شکست مواجه شد" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "وضوح داخلی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Ù…Ùسر (بسیار کند)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "صÙحه نخست" @@ -3164,11 +3146,11 @@ msgstr "صÙحه نخست" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "سایز نا معتبر (%x) یا کلمه جادو (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "مقدار نامعتبر!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map نامعتبر یا ورودی پوشه" @@ -3192,7 +3174,7 @@ msgstr "" "%s\n" "شاید لازم باشد شما مجدد از این بازی نسخه برداری کنید." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ùایل ضبط نامعتبر" @@ -3200,21 +3182,21 @@ msgstr "Ùایل ضبط نامعتبر" msgid "Invalid search parameters (no object selected)" msgstr "پارامتر های جستجوی نامعتبر (هیچ شیئ انتخاب نشده)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عدد نیست)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "رشته جستجوی نامعتبر (Ùقط رشته های با طول زوج پشتیبانی Ù…ÛŒ شود)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "وضعیت نامعتبر" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "ایتالیایی" @@ -3222,16 +3204,16 @@ msgstr "ایتالیایی" msgid "JAPAN" msgstr "ژاپن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "ری کامپایلر جیت (تایید شده)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "ری کامپایلر آزمایشی جیتیل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "ژاپنی" @@ -3239,7 +3221,7 @@ msgstr "ژاپنی" msgid "KOREA" msgstr "کره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3249,17 +3231,17 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "پنجره را بر راس Ù†Ú¯Ù‡ دار" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "کلید" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "کره ای" @@ -3277,19 +3259,23 @@ msgstr "دکمه ال" msgid "L-Analog" msgstr "ال آنالوگ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "آخرین وضعیت بازنویسی شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "آخرین وضعیت ذخیره شده" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3299,8 +3285,8 @@ msgstr "Ú†Ù¾" msgid "Left Stick" msgstr "استیک Ú†Ù¾" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3308,7 +3294,7 @@ msgstr "" "کلیک Ú†Ù¾ برای کش٠کلیدهای Ùوری.\n" "کلید Ùاصله برای پاک کردن." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3318,7 +3304,7 @@ msgstr "" "کلیک وسط برای پاک کردن.\n" "کلیک راست برای گزینه های بیشتر." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3326,76 +3312,76 @@ msgstr "" "کلیک Ú†Ù¾/راست برای گزینه های بیشتر.\n" "کلیک وسط برای پاک کردن." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "کمتر از" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "محدود کردن توسط تعداد Ùریم ها بر ثانیه" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "بارگذاری" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "بارگذاری باÙت اشیاء دلخواه" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "بارگذاری وضعیت - شکا٠۱" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "بارگذاری وضعیت - شکا٠۲" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "بارگذاری وضعیت - شکا٠۳" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "بارگذاری وضعیت - شکا٠۴" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "بارگذاری وضعیت - شکا٠۵" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "بارگذاری وضعیت - شکا٠۶" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "بارگذاری وضعیت - شکا٠۷" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "بارگذاری وضعیت - شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "بارگذاری وضعیت..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "بارگذاری منوی سیستم ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "بارگذاری منوی سیستم ÙˆÛŒ %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3409,31 +3395,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "بارگذاری مقدار های از پیش تنظیم شده از الگوهای Ù‡Ú© موجود است." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "محلی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Ù‚ÙÙ„ کردن ریسمان ها به هسته های پردازنده (اینتل اچ تی)" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "ثبت وقایع" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "پیکر بندی ثبت وقایع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "ثبت Ùریم بر ثانیه به Ùایل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "انواع ثبت وقایع" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3445,12 +3427,12 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "خروجی های واقعه نگار" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "واقعه نگاری" @@ -3471,7 +3453,7 @@ msgstr "" "Ú†Ú© سام MD5 ناهمسان است\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ù‡Ú© کردن سرعت واحد مدیریت حاÙظه" @@ -3485,24 +3467,24 @@ msgstr "Ùایل های گیم شارک مد کتذ (*.gcs)" msgid "Main Stick" msgstr "استیک اصلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Ø¢ÛŒ دی سازنده" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "سازنده" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "حداکثر" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "کارت حاÙظه Ùایل ذخیره برای این عنوان را دارد" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "کارت حاÙظه قبلا باز شده است" @@ -3511,7 +3493,7 @@ msgid "Memory Byte" msgstr "بایت حاÙظه" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "کارت حاÙظه" @@ -3548,20 +3530,20 @@ msgstr "سایز کارت حاÙظه با سرخط تطابق ندارد" msgid "Menu" msgstr "Ùهرست انتخاب" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "میکروÙÙ†" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "حداقل" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" @@ -3570,7 +3552,7 @@ msgstr "تنظیمات متÙرقه" msgid "Modifier" msgstr "پیراینده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3595,7 +3577,7 @@ msgstr "موشن پلاس" msgid "Motor" msgstr "موتور" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3618,7 +3600,7 @@ msgstr "" msgid "Multiply" msgstr "ضریب" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3718,16 +3700,16 @@ msgstr "تب ان Ù¾ÛŒ" msgid "NP Up" msgstr "بالا ان Ù¾ÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "اسم:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "اسم:" @@ -3736,20 +3718,20 @@ msgstr "اسم:" msgid "Native GCI files(*.gci)" msgstr "Ùایل های جی سی Ø¢ÛŒ محلی(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "پویش جدید" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "صÙحه بعد" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "پویش بعدی" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "اسم مستعار :" @@ -3757,7 +3739,7 @@ msgstr "اسم مستعار :" msgid "No Country (SDK)" msgstr "بدون کشور (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "هیچ آیزو یا وادی پیدا نشد" @@ -3779,7 +3761,7 @@ msgstr "بدون جاخالی کردن" msgid "No file loaded" msgstr "هیچ Ùایلی بارگذاری نشده" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "بدون مقادیر اطلاعاتی Ùهرست پوشه آزاد" @@ -3792,33 +3774,33 @@ msgstr "بدون Ùایل ضبط شده" msgid "No save folder found for title %s" msgstr "پوشه Ùایل ذخیره برای عنوان %s پیدا نشد" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "هیچ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "بوکمال نروژی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "برابر نیست" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "ست نشده است" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "متصل نشده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "یادداشت ها" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "یادداشت ها:" @@ -3827,7 +3809,7 @@ msgstr "یادداشت ها:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "توجه" @@ -3835,16 +3817,16 @@ msgstr "توجه" msgid "Num Lock" msgstr "Ù‚ÙÙ„ کلید نام لاک" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "تعداد کدها:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "ننچاک" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "شتاب دهنده ننچاک" @@ -3852,11 +3834,11 @@ msgstr "شتاب دهنده ننچاک" msgid "Object" msgstr "شیی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "محدوده شیی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "خاموش" @@ -3864,52 +3846,52 @@ msgstr "خاموش" msgid "Offset:" msgstr "اÙست:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "پیام های روی صÙحه نمایش" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Ùقط بلوک های %d موجود است" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "باز کردن پوشه &شامل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "باز کردن پوشه &ذخیره ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "گشودن Ùایل..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "اپن ای ال (OpenAL): ناتوان در ساخت زمینه برای دستگاه %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "اپن ای ال (OpenAL): ناتوان در پیدا کردن دستگاهای صدا" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "اپن ای ال (OpenAL): ناتوان در باز کردن دستگاه صدا %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "کدبرداری باÙت اشیاء توسط OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "کدبرداری باÙت اشیاء توسط OpenMP" @@ -3922,7 +3904,7 @@ msgstr "گزینه ها" msgid "Orange" msgstr "نارنجی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3932,8 +3914,8 @@ msgstr "" "کلیک راست کنید Ùˆ تمام ذخیره ها را صادر کنید،\n" "Ùˆ ذخیره ها را به کارت حاÙظه ای جدید وارد کنید\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "غیره" @@ -3945,19 +3927,19 @@ msgstr "" "مشتری دیگری در حالی Ú©Ù‡ بازی در حال اجراست قطع شد!! نت پلی غیر Ùعال است. بازی " "را دستی متوق٠کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "خروجی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "ض&بط کردن بازی..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "گیم پد" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "گیم پد" @@ -3973,7 +3955,7 @@ msgstr "صÙحه پايينی" msgid "Page Up" msgstr "صÙحه بالایی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "جÙت شدن" @@ -3985,34 +3967,34 @@ msgstr "پاراگراÙ" msgid "Parameters" msgstr "پارامترها" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "پارتیشن %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "وصله ها" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Ù…Ú©Ø« در پایان Ùیلم" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "نورپردازی به ازای هر پیکسل" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "کامل" @@ -4021,36 +4003,36 @@ msgstr "کامل" msgid "Perspective %d" msgstr "چشم انداز %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "شروع بازی" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "شروع ضبط" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "شروع بازی/Ù…Ú©Ø«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "قابل بازی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "گزینه های بازنواخت" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." @@ -4062,54 +4044,54 @@ msgstr "لطÙا قبل از ذخیره کردن یک چشم انداز بساز msgid "Plus-Minus" msgstr "مینوس پلاس" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "درگاه Û´" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "درگاه :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "پرتقالی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "پرتقالی (برزیلی)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "اÙکت ها:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "پایان نابهنگام Ùیلم در کنترل کننده پخش. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u > %u" @@ -4122,11 +4104,11 @@ msgstr "حالت های از پیش تنظیم شده:" msgid "Prev Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "صÙحه قبلی" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "مقدار قبلی" @@ -4134,7 +4116,7 @@ msgstr "مقدار قبلی" msgid "Print" msgstr "چاپ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "پروÙایل" @@ -4142,7 +4124,7 @@ msgstr "پروÙایل" msgid "Properties" msgstr "خواص" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "پاکسازی حاÙظه ميانى" @@ -4150,8 +4132,8 @@ msgstr "پاکسازی حاÙظه ميانى" msgid "Question" msgstr "سوال" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "خارج شدن" @@ -4169,7 +4151,7 @@ msgstr "دکمه آر" msgid "R-Analog" msgstr "آر آنالوگ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "حاÙطه رم" @@ -4177,46 +4159,46 @@ msgstr "حاÙطه رم" msgid "RUSSIA" msgstr "روسیه" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "محدوده" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "حالت Ùقط خواندنی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "واقعی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "ویموت واقعی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "ویموت های واقعی" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "تایید اتصال ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "برقراری ارتباط مجدد ویموت در بارگذاری وضعیت" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "اطلاعات ضبط" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "گزینه های ضبط" @@ -4232,7 +4214,7 @@ msgstr "قرمز Ú†Ù¾" msgid "Red Right" msgstr "قرمز راست" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4247,29 +4229,29 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، \"هیچ\" را انتخاب کنید." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "به روز کردن" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "به روز کردن لیست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "به روز کردن لیست بازی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "پاک کردن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4279,17 +4261,17 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "نمایش در پنجره اصلی" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "شروع دوباره" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "نتایج" @@ -4311,31 +4293,27 @@ msgstr "استیک راست" msgid "Rumble" msgstr "شوک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" "اجرای شبیه ساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه (توصیه " "نمی شود)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "روسی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ذخ&یره وضعیت" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "بی خطر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "نرخ نمونه برداری:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ذخیره" @@ -4343,90 +4321,90 @@ msgstr "ذخیره" msgid "Save GCI as..." msgstr "ذخیره جی سی Ø¢ÛŒ بعنوان..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "ذخیره وضعیت - شکا٠۱" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "ذخیره وضعیت - شکا٠۲" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "ذخیره وضعیت - شکا٠۳" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "ذخیره وضعیت - شکا٠۴" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "ذخیره وضعیت - شکا٠۵" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "ذخیره وضعیت - شکا٠۶" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "ذخیره وضعیت - شکا٠۷" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "ذخیره وضعیت - شکا٠۸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ذخیره وضعیت..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "ذخیره بعنوان..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو Ùشرده شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "دخیره چشم انداز Ùعلی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو ناهمÙشرده شده" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "ذخیره وضعیت Ùیلم %s خراب است، ضبط Ùیلم میایستد..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB) تغییر سایز یاÙته" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "در حال پویش %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "پویش برای Ùایل های آیزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "در حال پویش..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "عکس Ùوری" @@ -4434,23 +4412,23 @@ msgstr "عکس Ùوری" msgid "Scroll Lock" msgstr "اسکرول لاک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "جستجو" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Ùیلتر جستجو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "جستجوی پوشه های Ùرعی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "جستجوی موضوع Ùعلی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "جستجو برای مقدار هگزا:" @@ -4461,20 +4439,20 @@ msgid "Section %s not found in SYSCONF" msgstr "بخش %s در SYSCONF پیدا نشد" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "انتخاب" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "انتخاب Ùایل ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "انتخاب Ùایل ÙˆÛŒ واد برای نصب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4492,23 +4470,23 @@ msgstr "یک Ùایل ذخیره برای وارد کردن انتخاب Ú©Ù†ÛŒ msgid "Select floating windows" msgstr "انتخاب پنجره های شناور" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "انتخاب Ùایل برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "انتخاب Ùایل ذخیره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "انتخاب وضعیت برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "انتخاب وضعیت برای ذخیره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4527,11 +4505,16 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، اتوماتیک را انتخاب کنید." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "دست خط انتخاب شده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4548,7 +4531,7 @@ msgstr "" "اگر همچنان اطمینان ندارید، از بالاترین وضوحی Ú©Ù‡ برای شما کار Ù…ÛŒ کند استÙاده " "کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4565,11 +4548,11 @@ msgstr "" "اگر در این مورد اطمینان ندارید، از Direct3D Û¹ برای ویندوز Ùˆ از OpenGL برای " "گینو لینوکس/مکینتاش استÙاده کنید." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Ùرستادن" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "موقعیت سنسور بار:" @@ -4577,26 +4560,26 @@ msgstr "موقعیت سنسور بار:" msgid "Separator" msgstr "جدا کننده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "صربستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "درگاه سریال Û± - این درگاهی است Ú©Ù‡ دستگاه هایی مانند آداپتور شبکه از آن " "استÙاده Ù…ÛŒ کنند" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "ست" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "ست کردن بعنوان آیزو &پیش Ùرض" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "ست کردن بعنوان کارت حاÙظه پیش Ùرض %c" @@ -4608,11 +4591,17 @@ msgstr "" "ست کردن کد اکشن ریپلی_Ùعال است: Ùهرست بزرگتر از سایز لیست کد اکشن ریپلی است " "%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "تنظیمات..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "برپاکردن حاÙظه ÙˆÛŒ: ناتوان در پیدا کردن Ùایل تنظیم" @@ -4620,7 +4609,7 @@ msgstr "برپاکردن حاÙظه ÙˆÛŒ: ناتوان در پیدا کردن Ù msgid "Shake" msgstr "لرزش" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "اسم کوتاه:" @@ -4628,105 +4617,105 @@ msgstr "اسم کوتاه:" msgid "Shoulder Buttons" msgstr "دکمه های شانه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "نمایش &میز Ùرمان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "نمایش &ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "نمایش نوار &وضعیت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "نمایش نوار &ابزار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "نمایش درایوها" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "نمایش مناطق Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "نمایش Ùریم بر ثانیه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "نمایش Ùرانسه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "نمایش گیم کیوب" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "نمایش ورودی تصویر" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "نمایش ایتالیا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "نمایش ژاپن" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "نمایش کره" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "نمایش زبان:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "نمایش &پیکربندی ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "نمایش پال" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "نمایش پایگاه ها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "نمایش مناطق" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "نمایش آمار" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "نمایش تایوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "نمایش ایالات متحده آمریکا" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "نمایش واد" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "نمایش ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "نمایش پنجره تایید قبل از متوق٠کردن بازی." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4735,15 +4724,15 @@ msgstr "" "گیری کند، اما همچنین بدان معناست Ú©Ù‡ دلÙین بدون هیچ توضیحی بطور ناگهانی خراب " "Ù…ÛŒ شود." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "نمایش بلوک اول" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "نمایش شمارنده تاخیر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4753,23 +4742,23 @@ msgstr "" "این پیام ها شامل نوشتن کارت حاÙظه، پشتوانه ویدیویی Ùˆ اطلاعات پردازشگر Ùˆ " "پاکسازی حاÙظه نهانگاه جیت Ù…ÛŒ شود." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "نمایش بلوک های ذخیره" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "نمایش توضیح ذخیره" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "نمایش تندیس ذخیره" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "نمایش عنوان ذخیره" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4780,11 +4769,11 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "نمایش ناشناخته" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4798,27 +4787,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "ویموت Ùرعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "چینی ساده شده" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "جهش از روی بایوس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "از قلم انداختن مقصد آلÙا پاس" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "از قلم انداختن دسترسی حاÙظه میانجی Ùریم جاساز شده (EFB) به پردازنده" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4830,7 +4819,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4847,17 +4836,17 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "شکا٠ای" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "شکا٠بی" @@ -4865,7 +4854,7 @@ msgstr "شکا٠بی" msgid "Snapshot" msgstr "عکس Ùوری" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "ارائه دهنده نرم اÙزاری" @@ -4882,11 +4871,11 @@ msgstr "" "آیا شما واقعا قصد Ùعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان " "ندارید، 'نه' را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "تنظیمات صدا" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "پشتوانه صدا %s معتبر نیست." @@ -4900,17 +4889,17 @@ msgstr "ایجاد حاÙظه میانجی صدا با شکست مواجه شد: msgid "Space" msgstr "Ùضا" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "اسپانیایی" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "حجم صدای اسپیکر:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4929,7 +4918,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه \"Û¶Û´Û°xÛµÛ²Û¸\" را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "بالا بردن نرخ نقل Ùˆ انتقال دادهای دیسک" @@ -4937,51 +4926,55 @@ msgstr "بالا بردن نرخ نقل Ùˆ انتقال دادهای دیسک" msgid "Square Stick" msgstr "استیک مربع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "کنترولر استاندارد" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "شروع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "شروع &نت پلی" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "شروع &ضبط" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "شروع ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "وضعیت" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "ذخیره های وضعیت" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "استیک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "توقÙ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4995,7 +4988,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "کشیدن تصویر به سایز Ùعلی پنجره" @@ -5020,8 +5013,8 @@ msgstr "Ùایل های ذخیره با موÙقیت وارد شدند" msgid "Swing" msgstr "نوسان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "زبان سیستم:" @@ -5029,7 +5022,7 @@ msgstr "زبان سیستم:" msgid "TAIWAN" msgstr "تایوان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "ورودی تاس" @@ -5050,30 +5043,30 @@ msgstr "جدول Ú†Ù¾" msgid "Table Right" msgstr "جدول راست" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "گرÙتن عکس Ùوری" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "تارو کونگا (بنگوس)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "آزمودن" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "حاÙظه ميانى باÙت اشیاء" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "قالب بندی باÙت اشیاء" @@ -5089,13 +5082,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "Ú†Ú© سام با موÙقیت درست شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "پوشه برگزیده قبلا در لیست بوده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5118,7 +5111,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Ùایل %s قبلا باز بود، سرخط Ùایل نوشته نخواهد شد." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Ùایلی Ú©Ù‡ شما مشخص (%s) کرده اید وجود ندارد" @@ -5135,7 +5128,7 @@ msgstr "اسم نمی تواند شامل کاراکتر 'ØŒ' باشد" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "نتیجه کد رمزگشایی شده اکشن ریپلی شامل هیچ خطی نیست." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5147,11 +5140,11 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، از Ú†Ù¾ ترین مقدار استÙاده کنید." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "سایز Ùایل ذخیره ای Ú©Ù‡ سعی در Ú©Ù¾ÛŒ کردن آن دارید بی اعتبار است" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5183,14 +5176,11 @@ msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "تم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "انتخاب تم اشتباه شد" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5199,7 +5189,7 @@ msgstr "" "باید بلیطی برای Û°Û°Û°Û°Û°Û°Û°Û±/Û°Û°Û°Û°Û°Û°Û°Û² وجود داشته باشد. نسخه برداری نند شما " "احتمالا ناقص است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5215,11 +5205,11 @@ msgstr "" "این شبیه ساز اکشن ریپلی از کدهایی Ú©Ù‡ توسط خود اکشن ریپلی پیراسته شده باشد " "پشتیبانی نمی کند." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "این مورد میتواند سبب کند شدن منوی ÙˆÛŒ Ùˆ تعدادی از بازی ها شود." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5237,7 +5227,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5249,7 +5239,7 @@ msgstr "" "سبب اÙزایش چشم گیر سرعت روی کامپیوترهایی با بیش از یک هسته Ù…ÛŒ شود، اما " "همچنین Ù…ÛŒ تواند خرابی های گاه Ùˆ بی گاه را سبب شود." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "این مورد به شما اجازه خواهد داد تا Ùایل پیکربندی INI را ویرایش کنید" @@ -5263,35 +5253,35 @@ msgid "Tilt" msgstr "لرزیدن" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "عنوان" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "به" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "تبدیل انواع ثبت وقایع" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "تبدیل حالت تمام صÙحه" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "بالا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "چینی سنتی" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "آزمایش برای بارگذاری Ùایل ناشناخته." @@ -5311,7 +5301,7 @@ msgstr "" "تلاش برای خواندن از SYSCONF نامعتبر\n" "Ø¢ÛŒ دی های بلوتوث ویموت موجود نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "ترکی" @@ -5323,12 +5313,12 @@ msgstr "ديسک" msgid "Type" msgstr "نوع" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "درگاه UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "ویموت UDP" @@ -5364,12 +5354,12 @@ msgstr "" "معتبر. وارسی کنید Ú©Ù‡ کد را درست وارد کرده باشید.\n" "آیا مایل هستید Ú©Ù‡ این خط را نادیده بگیرید Ùˆ به تجزیه ادامه دهید؟" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "تعری٠نشده %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "خنثی کردن وضعیت بارگذاری" @@ -5377,7 +5367,7 @@ msgstr "خنثی کردن وضعیت بارگذاری" msgid "Unexpected 0x80 call? Aborting..." msgstr "Ùرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوق٠می شود..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "ناشناخته" @@ -5406,8 +5396,8 @@ msgstr "پیام ناشناخته با Ø¢ÛŒ دی:%d از بازیکن:%d بیر msgid "Up" msgstr "بالا" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "به روز کردن" @@ -5415,23 +5405,23 @@ msgstr "به روز کردن" msgid "Upright Wiimote" msgstr "ویموت عمودی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "استÙاده از حالت پال Û¶Û° هرتز (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "استÙاده از حالت تمام صÙحه" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "استÙاده از حالت شانزده شانزدهی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "استÙاده از دستگذار پنیک" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5444,7 +5434,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5458,15 +5448,15 @@ msgstr "" "مزاحمت را از طریق Ùعال کردن این گزینه امکان پذیر سازد.\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "کاربردی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "هماهنگ کردن Ùرکانس عمودی بازی با صÙحه نمایش" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "مقدار" @@ -5474,23 +5464,23 @@ msgstr "مقدار" msgid "Value:" msgstr "مقدار:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "مقدار:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "دراز نویسی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "ویدیو" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "حجم صدا" @@ -5504,7 +5494,7 @@ msgstr "نصب واد با شکست مواجه شد: خطای ایجاد %s" msgid "WAD installation failed: error creating ticket" msgstr "نصب واد با شکست مواجه شد: خطای ایجاد بلیط" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5516,16 +5506,16 @@ msgstr "" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "اخطار" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "اخطار - شروع دال در حالت کنسول اشتباه!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "اخطار - شروع ای ال ا٠در حالت کنسول اشتباه!" @@ -5557,7 +5547,7 @@ msgstr "" "Ùˆ داشتن اسم یکسان مانند یک Ùایل در کارت حاÙظه شما\n" "ادامه Ù…ÛŒ دهید؟" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5569,7 +5559,7 @@ msgstr "" "دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط خواندنی خاموش بارگذاری " "کنید." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5580,7 +5570,7 @@ msgstr "" "ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را " "با حالت Ùقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5614,7 +5604,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "نویسنده Ùایل ویو - Ùایل باز نیست." @@ -5622,7 +5612,7 @@ msgstr "نویسنده Ùایل ویو - Ùایل باز نیست." msgid "Whammy" msgstr "بد شانسی" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Ù‡Ú© کردن صÙحه عریض" @@ -5630,23 +5620,23 @@ msgstr "Ù‡Ú© کردن صÙحه عریض" msgid "Width" msgstr "عرض" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "میز Ùرمان ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "ریشه ÙˆÛŒ نند:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "وارد کردن Ùایل ذخیره ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Ùایل های ذخیره ÙˆÛŒ (*.bin)|*.bin" @@ -5654,17 +5644,17 @@ msgstr "Ùایل های ذخیره ÙˆÛŒ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "ÙˆÛŒ واد: ناتوان در خواندن از Ùایل" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "ویموت %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5677,19 +5667,19 @@ msgstr "" "یا شاید این قطعی ناشی از وقÙÙ‡ بیهوده یا دلیلی دیگر باشد.\n" "آیا Ù…ÛŒ خواهید بی درنگ از نو متصل شوید؟" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "ویموت متصل شد" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "موتور ویموت" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "تنظیمات ویموت" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "ویموت ها" @@ -5709,26 +5699,26 @@ msgstr "پنجره ها راست" msgid "Word Wrap" msgstr "پیچیدن کلمه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "در حال کار..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "نوشتن در میز Ùرمان" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "نوشتن به صورت اشکال زدایی" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "نوشتن به Ùایل" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "نوشتن در پنجره" @@ -5768,23 +5758,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "شما نمی توانید قطعاتی Ú©Ù‡ حاوی صÙحات Ù…ÛŒ باشند را ببندید." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "شما باید یک بازی انتخاب کنید!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "شما باید یک اسم وارد کنید!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "شما باید یک مقدار صحیح برای دسیمال، هگزادسیمال یا اکتال وارد کنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "شما باید یک اسم معتبر برای پروÙایل وارد کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "برای اعمال تغییرات شما باید دلÙین را از نو اجرا کنید." @@ -5807,7 +5797,7 @@ msgstr "" "سایز Ùایل باید 0x%04x باشد (اما سایز این Ùایل 0x%04llx است)\n" "آیا میخواهید یک Ùایل جدید تولید شود؟" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Ù‡Ú© اÙسانه زلدا: شاهدخت سپیده دم" @@ -5820,12 +5810,12 @@ msgstr "کد صÙر Û³ پشتیبانی نمی شود" msgid "Zero code unknown to dolphin: %08x" msgstr "کد ناشناخته صÙر به دلÙین: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ منتظر بمانید ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5841,7 +5831,7 @@ msgstr "" msgid "[Custom]" msgstr "[دستی]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5860,7 +5850,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5874,11 +5864,11 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "بارگذار برنامه (.img)" @@ -5895,7 +5885,7 @@ msgstr "خواندن دادها از Ùایل با شکست مواجه شد: %s" msgid "failed to read header" msgstr "خواندن سرخط با شکست مواجه شد" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطÙا گزارش دهید." @@ -5914,7 +5904,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Ùرمان ناشناخته 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "خطای 1- wxExecute در اجرای برنامه!" @@ -5926,10 +5916,13 @@ msgstr "اصلاح z دور:" msgid "zNear Correction: " msgstr "اصلاح z نزدیک:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| یا" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "" #~ "Automatically generate mipmaps rather than decoding them from memory.\n" #~ "Increases performance a bit but might cause minor texture defects.\n" @@ -5941,18 +5934,52 @@ msgstr "| یا" #~ "\n" #~ "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "محاسبه مقادیر عمق هر پیکسل گراÙیک سه بعدی به جای هر ورتکس.\n" +#~ "در تضاد با نورپردازی پیکسل (Ú©Ù‡ صرÙا یک بهبود است)ØŒ محاسبات عمق هر پیکسل " +#~ "برای به طور صحیح برابرسازی کردن تعداد Ú©Ù…ÛŒ از بازی ها لازم است.\n" +#~ "\n" +#~ "اگر در این مورد اطمینان ندارید، این گزینه را رها کنید." + #~ msgid "Clear failed." #~ msgstr "پاک کردن با شکست مواجه شد." #~ msgid "Connected to %i Wiimotes" #~ msgstr "اتصال به ویموت ها %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ساخته شده توسط KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ساخته شده توسط Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." +#~ "com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ساخته شده توسط VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "ساخته شده توسط black_rider Ùˆ منتشر شده در ForumW.org > Web Developments" + #~ msgid "Danish" #~ msgstr "دانمارکی" #~ msgid "Disable Lighting" #~ msgstr "از کارانداختن روشنایی" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "از کارانداختن Per-Pixel Depth" + #~ msgid "Disable Textures" #~ msgstr "از کارانداختن باÙت اشیاء" @@ -6013,6 +6040,9 @@ msgstr "| یا" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "بارگذاری Ùایل مشخص شده (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Ù‚ÙÙ„ کردن ریسمان ها به هسته های پردازنده (اینتل اچ تی)" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "صدای سطح پائین (ال ال ای) Ùˆ یا سطح بالا (اچ ال ای)" @@ -6022,12 +6052,18 @@ msgstr "| یا" #~ msgid "Opens the logger" #~ msgstr "باز کردن واقعه نگار" +#~ msgid "Sample Rate:" +#~ msgstr "نرخ نمونه برداری:" + #~ msgid "Show this help message" #~ msgstr "نمایش این پیام Ú©Ù…Ú©ÛŒ" #~ msgid "Specify a video backend" #~ msgstr "مشخص کردن یک پشتوانه ویدیو" +#~ msgid "Theme selection went wrong" +#~ msgstr "انتخاب تم اشتباه شد" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/fr.po b/Languages/po/fr.po index fc4577e7f9..4bd54dafd1 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-22 10:47+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(trop nombreux pour être affichés)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Jeu :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -55,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopie%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i connectée(s)" @@ -157,147 +150,147 @@ msgstr "%sImporter GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u blocs libres, %u entrées de rép. libres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&A propos..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Démarrer à partir du lecteur..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Points d'arrêt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Rechercher des ISOs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestionnaire de &cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fichier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Avancement d'image" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Paramètres &Graphiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Aide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Paramètres des &Raccouris clavier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Charger l'état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Gestionnaire de cartes &mémoires (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ouvrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Options" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Mode &Lecture seule" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "Rafraîchir la &liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registres" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Son" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vidéo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Affichage" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -317,7 +310,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(aucun)" @@ -325,19 +318,19 @@ msgstr "(aucun)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,20 +338,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -366,25 +359,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Une fenêtre Netplay est déjà ouverte !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Il n'y a pas de jeu en cours d'émulation." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Aucun périphérique Bluetooth prise en charge n'a été détecté !\n" "(Seule la pile Bluetooth de Microsoft est prise en charge)." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "Vous devez indiquer le port TCP à l'hôte !!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codes AR" @@ -433,19 +428,19 @@ msgstr "Codes AR" msgid "About Dolphin" msgstr "A propos de Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Accéleration" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Précision :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulation fidèle VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Dans le doute, cochez plutôt EFB vers texture." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Action" @@ -487,7 +482,7 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " "code Ajout (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -514,16 +509,17 @@ msgstr "" "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " "vers Pointeur (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" @@ -532,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erreur Action Replay : code AR non valide à la ligne %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay : Code Conditionnel : Taille non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay : Type de Code Normal non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay ; Code Normal %i : Sous-type non valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay : Code Normal 0 : Sous-type non valide %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Carte :" @@ -561,11 +557,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Ajouter un patch" @@ -573,13 +569,13 @@ msgstr "Ajouter un patch" msgid "Add new pane" msgstr "Ajouter un nouveau panneau" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Ajouter..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse :" @@ -619,49 +615,49 @@ msgstr "" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajuste le contrôle analogique de pression requise pour activer les boutons." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avancé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Paramètres avancés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -673,19 +669,19 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Délai alternatif de communication avec la Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analyser" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrage anisotropique :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing :" @@ -697,15 +693,15 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Appliquer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -716,16 +712,16 @@ msgstr "" "\n" "Dans le doute, sélectionnez (aucun)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -733,14 +729,14 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " "définitivement !" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -748,12 +744,12 @@ msgstr "Format d'écran :" msgid "At least one pane must remain open." msgstr "Au moins un panneau doit rester ouvert." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -761,24 +757,24 @@ msgstr "Moteur audio :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon : impossible d'ouvrir le périphérique AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiple de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (taille de la fenêtre)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajuster auto. la taille de la fenêtre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -800,12 +796,12 @@ msgstr "Registres BP" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Moteur :" @@ -823,15 +819,15 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Détails de la bannière" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Bannière :" @@ -839,11 +835,11 @@ msgstr "Bannière :" msgid "Bar" msgstr "Barre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Paramètres de base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Paramètres de base" @@ -873,42 +869,42 @@ msgstr "Bleu Gauche" msgid "Blue Right" msgstr "Bleu Droite" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Bas" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Contrôles liés : %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Corrompu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer :" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Boutons" @@ -929,32 +925,15 @@ msgstr "Stick-C" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Moteur d'émulation du CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache des listes d'affichage" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que par " -"vertex.\n" -"Contrairement à l'éclairage par pixel (qui est une bonne amélioration), les " -"calculs de profondeur par pixel sont nécessaires pour émuler correctement un " -"petit nombre de jeux.\n" -"\n" -"Dans le doute, cochez cette case." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -970,7 +949,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuler" @@ -987,7 +966,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -998,7 +977,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1006,13 +985,13 @@ msgstr "" "Impossible d'utiliser ce fichier comme carte mémoire.\n" "Essayez-vous d'utiliser le même fichier sur les 2 slots ?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" @@ -1027,7 +1006,7 @@ msgstr "" msgid "Caps Lock" msgstr "Verr Maj" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalan" @@ -1035,24 +1014,24 @@ msgstr "Catalan" msgid "Center" msgstr "Centre" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Changer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "&Changer de disque..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Changer de disque" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Changer de Jeu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1068,12 +1047,11 @@ msgstr "Change le signe du paramètre zFar (après correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Change le signe du paramètre zNear (après correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changer ceci n'aura aucun effet durant l'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1081,47 +1059,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Rechercher un cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestionnaire de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Vérifier l'intégrité de la partition" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Vérification de l'intégrité..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinois (simplifié)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1129,7 +1107,7 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,8 +1115,8 @@ msgstr "" "Choisir un fichier comme apploader : (uniquement pour les disques créés à " "partir de dossiers)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Choisir le dossier de destination de l'extraction" @@ -1152,8 +1130,8 @@ msgstr "Classique" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Effacer" @@ -1165,22 +1143,22 @@ msgstr "" "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " "désactivé. Vous devez arrêter le jeu manuellement." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fermer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info du code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code :" @@ -1192,91 +1170,91 @@ msgstr "Commande" msgid "Comment" msgstr "Commentaire" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Compression de l'ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurer le contrôle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurer les manettes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmer l'arrêt de l'émulation" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Connecter la Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Connecter la 1ère Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Connecter la 2è Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Connecter la 3è Wiimote" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Connecter la 4è Wiimote" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connexion..." @@ -1296,12 +1274,12 @@ msgstr "Convertir en GCI" msgid "Copy failed" msgstr "Echec de la copie" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copier vers la carte mémoire %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1310,7 +1288,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossible de créer %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Impossible d'initialiser le moteur %s." @@ -1332,12 +1310,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossible de reconnaître le fichier ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Impossible de sauvegarder %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1360,11 +1338,11 @@ msgstr "" "Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " "peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1372,17 +1350,17 @@ msgstr "" "Impossible d'initialiser les composants de base.\n" "Vérifiez votre configuration." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Nombre :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Pays :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Créer un code AR" @@ -1391,25 +1369,7 @@ msgstr "Créer un code AR" msgid "Create new perspective" msgstr "Créer une nouvelle perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Créé par KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Créé par VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Créateur :" @@ -1417,11 +1377,11 @@ msgstr "Créateur :" msgid "Critical" msgstr "Critique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Couper" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1435,12 +1395,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Le dossier actuel a été changé de %s en %s après wxFileSelector !" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de projection personnalisé" @@ -1448,11 +1408,11 @@ msgstr "Hack de projection personnalisé" msgid "Custom Projection Hack Settings" msgstr "Paramètres du hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personnalise certains paramètres de projection orthographique." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tchèque" @@ -1464,36 +1424,36 @@ msgstr "D" msgid "D-Pad" msgstr "Pad numérique" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulation du DSP en HLE (rapide)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilateur du DSP en LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1505,11 +1465,11 @@ msgstr "DVDLowRead - Erreur fatale : impossible de lire le volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erreur fatale : impossible de lire le volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Taille des données" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Date :" @@ -1526,11 +1486,11 @@ msgstr "Fichiers Datel MaxDrive/Pro (*.sav)" msgid "Dead Zone" msgstr "Zone morte" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Débug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Débug" @@ -1538,24 +1498,24 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1564,11 +1524,11 @@ msgid "Default font" msgstr "Police par défaut" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Supprimer" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Supprimer la sauvegarde" @@ -1577,11 +1537,11 @@ msgstr "Supprimer la sauvegarde" msgid "Delete the existing file '%s'?" msgstr "Supprimer le fichier '%s' ?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Description" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Détecter" @@ -1594,13 +1554,13 @@ msgstr "" "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " "le buffer de sortie." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1624,20 +1584,16 @@ msgstr "" "La vérification de la somme de contrôle du dossier a échoué\n" " et la vérification de la somme de contrôle du dossier de sauvegarde a échoué" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Désactiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Désactiver la fumée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Désactiver la profondeur / pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1651,7 +1607,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1667,7 +1623,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disque" @@ -1676,11 +1632,11 @@ msgstr "Disque" msgid "Disc Read Error" msgstr "Erreur de lecture du disque" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1694,20 +1650,24 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configuration des graphismes %s pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Site &web de Dolphin" @@ -1715,32 +1675,32 @@ msgstr "Site &web de Dolphin" msgid "Dolphin Configuration" msgstr "Configuration de Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuration de la Wiimote pour Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1748,7 +1708,7 @@ msgstr "" "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " "fichiers..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1756,16 +1716,21 @@ msgstr "" "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " "afficher tous les jeux..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Bas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Télécharger des codes (sur WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" @@ -1774,27 +1739,27 @@ msgstr "%lu codes ont été téléchargés. (%lu ajoutés)" msgid "Drums" msgstr "Percussions" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Enregistrer le son" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Copier l'EFB cible" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Copier les images" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Copier les textures" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1805,7 +1770,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1815,7 +1780,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1825,17 +1790,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Néerlandais" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Quitter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Copies de l'EFB" @@ -1856,11 +1821,11 @@ msgstr "" msgid "EUROPE" msgstr "Europe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Premières mises à jour de mémoire" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editer" @@ -1868,7 +1833,7 @@ msgstr "Editer" msgid "Edit ActionReplay Code" msgstr "Editer le code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editer la configuration" @@ -1876,12 +1841,12 @@ msgstr "Editer la configuration" msgid "Edit Patch" msgstr "Editer le patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modifier la perspective actuelle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editer..." @@ -1889,7 +1854,7 @@ msgstr "Editer..." msgid "Effect" msgstr "Effets" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Buffer d'image embarqué" @@ -1897,7 +1862,7 @@ msgstr "Buffer d'image embarqué" msgid "Emu Thread already running" msgstr "Thread d'émulation déjà en cours d'exécution" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1911,7 +1876,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez plutôt Virtuel." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1927,19 +1892,19 @@ msgstr "" "applications homebrew).\n" "Dans le doute, sélectionnez cette case." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote émulée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Etat de l'émulation :" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1955,72 +1920,71 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Active le calcul de la boîte liée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Activer le cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activer les Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activer le Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activer le Dual Core (plus rapide)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activer les touches de raccourci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activer le saut d'inactivité" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activer le saut d'inactivité (plus rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activer le MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activer l'écran large (16/9è)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activer le rendu en fil de fer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2035,7 +1999,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2043,11 +2007,11 @@ msgstr "" "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " "ARRÊT = Compatible)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activer les appels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2060,7 +2024,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2072,7 +2036,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2080,7 +2044,7 @@ msgstr "" "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " "Désactiver pour TOUS les autres jeux." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2090,11 +2054,28 @@ msgstr "" "de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " "(ON = Compatible, OFF = Rapide)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2106,7 +2087,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2114,7 +2095,7 @@ msgstr "" "Activer le Memory Management Unit (unité de gestion de la mémoire), requis " "pour certains jeux. (ON = Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2128,14 +2109,14 @@ msgstr "" msgid "End" msgstr "Fin" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Anglais" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Améliorations" @@ -2153,17 +2134,17 @@ msgstr "Entrée %d/%d" msgid "Entry 1/%d" msgstr "Entrée 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Egal" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Erreur" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " @@ -2205,32 +2186,32 @@ msgstr "" msgid "Execute" msgstr "Exécuter" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Echec de l'exportation" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exporter un fichier" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exporter l'enregistrement..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exporter toutes les sauvegardes" @@ -2246,7 +2227,7 @@ msgstr "Exporter l'enregistrement sous..." msgid "Extension" msgstr "Extension" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Buffer d'image externe" @@ -2258,44 +2239,44 @@ msgstr "Paramètres supplémentaires" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Paramètre supplémentaire utile dans ''Metroid: Other M'' uniquement." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extraire tous les fichiers..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extraire l'Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extraire le DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extraire un dossier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extraire un fichier..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extraire une partition..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraction de %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extraction de tous les fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraction du dossier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraction..." @@ -2303,7 +2284,7 @@ msgstr "Extraction..." msgid "FIFO Byte" msgstr "Octet FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Lecteur FIFO" @@ -2311,7 +2292,7 @@ msgstr "Lecteur FIFO" msgid "FRANCE" msgstr "France" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Taille FST :" @@ -2319,15 +2300,15 @@ msgstr "Taille FST :" msgid "Failed to Connect!" msgstr "Connexion impossible !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Ecoute impossible !" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Impossible de télécharger les codes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Impossible d'extraire vers %s !" @@ -2447,19 +2428,19 @@ msgstr "Impossible d'écrire l'entête de %s" msgid "Failed to write header for file %d" msgstr "Impossible d'écire l'entête du fichier %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Perse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2467,23 +2448,23 @@ msgstr "" "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Lecteur FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Infos du fichier" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Le fichier ne contient pas de code." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fichier converti en .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2500,7 +2481,7 @@ msgstr "" "Le fichier a l'extension \"%s\"\n" "Les extensions valides sont (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Le fichier n'est pas reconnu comme une carte mémoire" @@ -2513,19 +2494,19 @@ msgstr "Fichier non compressé" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Trouver le suivant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Trouver le précédent" @@ -2533,27 +2514,27 @@ msgstr "Trouver le précédent" msgid "First Block" msgstr "Premier bloc" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corriger les sommes de contôle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forcer 16/9è" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forcer 4/3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forcer la console comme NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forcer le filtrage de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2566,7 +2547,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2579,7 +2560,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2615,42 +2596,42 @@ msgstr "Image" msgid "Frame " msgstr "Image " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avancement d'image" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "L'enregistrement d'images utilise FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Info image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Plage d'images :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Saut d'&image :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Image/s max :" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Images à enregistrer :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vue libre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Français" @@ -2658,16 +2639,16 @@ msgstr "Français" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Plein écran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Résolution en Plein écran :" @@ -2679,7 +2660,7 @@ msgstr "Fichier GCI (*.gci)" msgid "GCMic Configuration" msgstr "Configuration du micro GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Manette GC" @@ -2687,27 +2668,27 @@ msgstr "Manette GC" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID du jeu :" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Le jeu est déjà en cours d'émulation !" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Le jeu n'est pas en cours d'émulation !" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jeu non trouvé !!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Paramètres spécifiques au jeu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Config du Jeu" @@ -2715,25 +2696,25 @@ msgstr "Config du Jeu" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Fichiers de sauvegarde GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Paramètres de la manette GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codes Gecko" @@ -2750,20 +2731,20 @@ msgstr "" "avec le code natif en plaçant le fichier codehandler.bin dans le répertoire " "Sys, puis redémarrez Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Général" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Paramètres généraux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Allemand" @@ -2773,19 +2754,19 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Graphismes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Paramètres graphiques" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Plus grand que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2804,7 +2785,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grèque" @@ -2824,11 +2805,11 @@ msgstr "Vert Droite" msgid "Guitar" msgstr "Guitare" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Appel de HCI_CMD_INQUIRY, veuillez nous le signaler !" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2836,7 +2817,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Echec de la vérification de la somme de contrôle de l'entête" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hébreu" @@ -2848,7 +2829,7 @@ msgstr "Hauteur" msgid "Help" msgstr "Aide" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2870,11 +2851,11 @@ msgstr "" msgid "Hide" msgstr "Cacher" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Masquer le curseur de la souris" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2889,8 +2870,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Hôte" @@ -2898,17 +2879,17 @@ msgstr "Hôte" msgid "Hotkey Configuration" msgstr "Configuration des raccourcis clavier" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongrois" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote hybride" @@ -2936,7 +2917,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Paramètres IPL" @@ -2944,19 +2925,19 @@ msgstr "Paramètres IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Pointeur IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilité de l'IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2968,7 +2949,7 @@ msgstr "Italie" msgid "Icon" msgstr "Icône" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2976,14 +2957,14 @@ msgstr "" "Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les " "jeux Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " "Compatible, OFF = Vitesse)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2994,11 +2975,11 @@ msgstr "" "pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " "selon les jeux)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorer les changements de formats" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -3012,7 +2993,7 @@ msgstr "" "\n" "Dans le doute, cochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3026,7 +3007,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importer une sauvegarde" @@ -3034,7 +3015,7 @@ msgstr "Importer une sauvegarde" msgid "Import failed, try again?" msgstr "L'importation a échoué. Essayer de nouveau ?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3042,11 +3023,11 @@ msgstr "" "Le fichier importé a l'extension GSC\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Le fichier importé a une longueur non valide" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3054,7 +3035,7 @@ msgstr "" "Le fichier importé a l'extension SAV\n" "mais n'a pas une entête valide" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3066,16 +3047,16 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Dans le jeu" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3083,7 +3064,7 @@ msgstr "Info" msgid "Information" msgstr "Information" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrée" @@ -3095,7 +3076,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -3103,11 +3084,11 @@ msgstr "Insérer une carte SD" msgid "Insert name here.." msgstr "Indiquer un nom ici..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" @@ -3118,23 +3099,23 @@ msgstr "" "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " "encore en charge." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Installation du WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Erreur lors de la vérification de l'intégrité" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Vérification de l'intégrité terminée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3143,11 +3124,11 @@ msgstr "" "Echec de la vérification de l'intégrité pour la partition %d. Votre copie " "est certainement corrompue ou a été incorrectement patchée." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3168,15 +3149,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erreur interne LZO - échec de lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Résolution interne :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpréteur (TRES lent)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3185,11 +3166,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Taille invalide (%x) ou mot Magique (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valeur non valide !" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bar.map ou entrée dir non valide" @@ -3213,7 +3194,7 @@ msgstr "" "%s\n" "Vous devriez copier à nouveau ce jeu." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Fichier d'enregitrement non valide" @@ -3221,23 +3202,23 @@ msgstr "Fichier d'enregitrement non valide" msgid "Invalid search parameters (no object selected)" msgstr "Paramètres de recherche non valide (aucun objet sélectionné)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Texte de recherche non valide (impossible à convertir en nombre)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "Texte de recherche non valide (seules les longueurs de chaînes de caractères " "sont prises en charge)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Etat non valide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italien" @@ -3245,16 +3226,16 @@ msgstr "Italien" msgid "JAPAN" msgstr "Japon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilateur JIT (recommandé) " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilateur expérimental JIT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonais" @@ -3262,7 +3243,7 @@ msgstr "Japonais" msgid "KOREA" msgstr "Corée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3272,17 +3253,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Toujours au premier plan" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Touche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coréen" @@ -3300,19 +3281,23 @@ msgstr "Bouton L" msgid "L-Analog" msgstr "L Analog." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Dernier état écrasé" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Dernier état sauvegardé" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3322,8 +3307,8 @@ msgstr "Gauche" msgid "Left Stick" msgstr "Stick Gauche" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3331,7 +3316,7 @@ msgstr "" "Clic gauche pour détecter le raccourci clavier.\n" "Touche Espace pour effacer." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3341,7 +3326,7 @@ msgstr "" "Clic du milieu pour effacer.\n" "Clic droit pour plus d'options." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3349,76 +3334,76 @@ msgstr "" "Clic gauche/droit pour plus d'options.\n" "Clic sur molette pour effacer." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Plus petit que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Nb de FPS comme limite" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Charger" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Charger textures personnalisées" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Charger l'état du Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Charger l'état du Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Charger l'état du Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Charger l'état du Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Charger l'état du Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Charger l'état du Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Charger l'état du Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Charger l'état du Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3434,31 +3419,27 @@ msgstr "" "Charger les valeurs de pré-réglage à partir de la palette de hack " "disponibles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Verrouiller les threads aux coeurs" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Journal" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuration de la journalisation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "Enregistrer le nombre de FPS" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Types de journaux" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3471,12 +3452,12 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Sorties des journalisations" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Journalisation" @@ -3497,7 +3478,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -3511,24 +3492,24 @@ msgstr "Fichiers MadCatz Gameshark (*.gcs)" msgid "Main Stick" msgstr "Stick principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID concepteur :" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Concepteur :" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La carte mémoire contient déjà une sauvegarde pour ce titre" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Carte mémoire déjà chargée" @@ -3537,7 +3518,7 @@ msgid "Memory Byte" msgstr "Octet mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Carte mémoire" @@ -3576,20 +3557,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Micro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3598,7 +3579,7 @@ msgstr "Paramètres divers" msgid "Modifier" msgstr "Modif." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3624,7 +3605,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Vibreur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3646,7 +3627,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3747,16 +3728,16 @@ msgstr "NP Tabulation" msgid "NP Up" msgstr "NP Haut" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nom :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nom :" @@ -3765,20 +3746,20 @@ msgstr "Nom :" msgid "Native GCI files(*.gci)" msgstr "Fichiers natifs GCI (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nouvelle recherche" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Page suivante" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Recherche suivante" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Pseudo :" @@ -3786,7 +3767,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3808,7 +3789,7 @@ msgstr "Pas d'attachement" msgid "No file loaded" msgstr "Aucun fichier chargé" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Aucune entrée de dossier d'index libre" @@ -3821,33 +3802,33 @@ msgstr "Aucun fichier enregistré" msgid "No save folder found for title %s" msgstr "Aucun dossier de sauvegarde trouvé pour le titre %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Aucune" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvégien BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Différent" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Non défini" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notes" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notes :" @@ -3856,7 +3837,7 @@ msgstr "Notes :" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Note" @@ -3864,16 +3845,16 @@ msgstr "Note" msgid "Num Lock" msgstr "Verr. Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Nombre de codes :" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuck" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Accéleration du Nunchuck" @@ -3881,11 +3862,11 @@ msgstr "Accéleration du Nunchuck" msgid "Object" msgstr "Objet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Plage d'objets :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Arrêt" @@ -3893,52 +3874,52 @@ msgstr "Arrêt" msgid "Offset:" msgstr "Offset :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "Afficher les messages informatifs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "%d blocs disponibles seulement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL : impossible de créer le contexte pour le matériel %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL : impossible de trouver des périphériques audio" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL : impossible d'ouvrir le périphérique %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Décodeur de texture OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" @@ -3951,7 +3932,7 @@ msgstr "Options" msgid "Orange" msgstr "Orange" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3962,8 +3943,8 @@ msgstr "" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Autres" @@ -3975,19 +3956,19 @@ msgstr "" "Autre client déconnecté pendant que le jeu est en cours d'exécution !! " "NetPlay est désactivé. Vous devez arrêter le jeu manuellement." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Sortie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Jouer l'enregistrement..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Manette" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Manette " @@ -4003,7 +3984,7 @@ msgstr "Défil Bas" msgid "Page Up" msgstr "Défil Haut" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Jumeler" @@ -4015,34 +3996,34 @@ msgstr "Paragraphe" msgid "Parameters" msgstr "Paramètres" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partition %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patchs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Faire une pause à la fin du film" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Eclairage par pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Parfait" @@ -4051,36 +4032,36 @@ msgstr "Parfait" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Démarrer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Jouer l'enregistrement..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Démarrer/Arrêter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jouable" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Options de lecture" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -4092,54 +4073,54 @@ msgstr "Merci de créer une perspective avant de sauvegarder" msgid "Plus-Minus" msgstr "Plus-Moins" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugais (brésilien)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)" @@ -4152,11 +4133,11 @@ msgstr "Pré-réglages :" msgid "Prev Page" msgstr "Page préc." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Page précédente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valeur précédente" @@ -4164,7 +4145,7 @@ msgstr "Valeur précédente" msgid "Print" msgstr "Imprimer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4172,7 +4153,7 @@ msgstr "Profil" msgid "Properties" msgstr "Propriétés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Vider le cache" @@ -4180,8 +4161,8 @@ msgstr "Vider le cache" msgid "Question" msgstr "Question" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Quitter" @@ -4199,7 +4180,7 @@ msgstr "Bouton R" msgid "R-Analog" msgstr "R Analog." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4207,46 +4188,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Russie" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Etendue" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Mode Lecture seule" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Réel" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote physique" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimote physique" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmation de reconnexion de la Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconnecter la Wiimote lors du chargement d'un état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Enregistrer" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Infos sur l'enregistrement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Options d'enregistrement" @@ -4262,7 +4243,7 @@ msgstr "Rouge Gauche" msgid "Red Right" msgstr "Rouge Droite" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4277,29 +4258,29 @@ msgstr "" "\n" "Dans le doute, sélectionnez Aucune." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Rafraîchir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Rafraîchir la liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Rafraîchir la liste des jeux" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Retirer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4309,17 +4290,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Rendu dans la fenêtre principale" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Résultats" @@ -4341,29 +4322,25 @@ msgstr "Stick Droit" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Exécuter DSP LLE sur un thread dédié (non recommandé)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sau&vegarder l'état" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sûr " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Echantillonnage :" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Sauver" @@ -4371,92 +4348,92 @@ msgstr "Sauver" msgid "Save GCI as..." msgstr "Enregistrer GCI sous..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Sauvegarder l'état vers le Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Sauvegarder l'état vers le Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Sauvegarder l'état vers le Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Sauvegarder l'état vers le Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Sauvegarder l'état vers le Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Sauvegarder l'état vers le Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Sauvegarder l'état vers le Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Sauvegarder l'état vers le Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Enregistrer l'état" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " "film..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Recherche..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Capt écran" @@ -4464,23 +4441,23 @@ msgstr "Capt écran" msgid "Scroll Lock" msgstr "Arrêt défil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Rechercher" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Rechercher l'objet actuel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Rechercher une valeur Hexadécimale :" @@ -4491,20 +4468,20 @@ msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4522,23 +4499,23 @@ msgstr "Sélectionner un fichier de sauvegarde à importer" msgid "Select floating windows" msgstr "Sélectionner les fenêtres flottantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4557,11 +4534,16 @@ msgstr "" "\n" "Dans le doute, choisissez Auto." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Le fichier spécifié \"%s\" n'existe pas" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Police sélectionnée" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4578,7 +4560,7 @@ msgstr "" "Si vous ne savez toujours pas, sélectionnez la plus haute résolution " "affichée." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4594,11 +4576,11 @@ msgstr "" "\n" "Dans le doute, sélectionnez Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Envoyer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Position de la Sensor Bar :" @@ -4606,26 +4588,26 @@ msgstr "Position de la Sensor Bar :" msgid "Separator" msgstr "Séparateur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Port série 1 - C'est le port que les périphériques tels que l'adaptateur " "ethernet utilisent" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Définir comme carte mémoire par défaut : %c" @@ -4637,11 +4619,17 @@ msgstr "" "SetARCode_IsActive : L'index est plus grand que la taille de la liste des " "codes AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configurer..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" @@ -4649,7 +4637,7 @@ msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" msgid "Shake" msgstr "Secouement" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nom court :" @@ -4657,105 +4645,105 @@ msgstr "Nom court :" msgid "Shoulder Buttons" msgstr "Boutons latéraux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Afficher la &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Afficher le &journal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Afficher la barre d'&état" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Afficher la barre d'&outils" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Afficher les lecteurs" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Afficher les régions copiées d'EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Afficher les FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Afficher France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Afficher GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Afficher le graphisme en entrée" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Afficher Italie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Afficher Japon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Afficher Corée" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Afficher la langue :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Afficher la config. de journalisation" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Afficher PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Afficher les plateformes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Afficher les régions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Afficher les statistiques" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Afficher Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Afficher USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Afficher WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Afficher Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Demande confirmation avant d'arrêter le jeu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4764,15 +4752,15 @@ msgstr "" "mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " "explication." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Afficher le premier bloc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Afficher le compteur de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4782,23 +4770,23 @@ msgstr "" "Ces messages incluent les écritures de carte mémoire, la moteur de rendu " "vidéo et les infos du processeur, et l'effacement du cache JIT." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Afficher les blocs de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Afficher le commentaire de sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Afficher l'icône de la sauvegarde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Afficher le titre de sauvegarde" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4810,11 +4798,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Afficher les inconnus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4828,27 +4816,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Ignorer l'accès à l'EFB depuis le CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4860,7 +4848,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4877,17 +4865,17 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4895,7 +4883,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Capture" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Rendu logiciel" @@ -4912,11 +4900,11 @@ msgstr "" "Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " "'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Paramètres audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Le moteur audio %s n'est pas valide" @@ -4930,17 +4918,17 @@ msgstr "Echec de la création du buffer audio : %s" msgid "Space" msgstr "Espace" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espagnol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume du haut-parleur :" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4960,7 +4948,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Accélerer le taux de transfert du disque" @@ -4968,51 +4956,55 @@ msgstr "Accélerer le taux de transfert du disque" msgid "Square Stick" msgstr "Stick carré" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Contrôleur standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Démarrer &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Etat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Etats" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Arrêter" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -5026,7 +5018,7 @@ msgstr "" "\n" "Dans le doute, sélectionnez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Etirer à la fenêtre" @@ -5051,8 +5043,8 @@ msgstr "Fichiers de sauvegarde importés avec succès" msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Langue du système :" @@ -5060,7 +5052,7 @@ msgstr "Langue du système :" msgid "TAIWAN" msgstr "Taïwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrée TAS" @@ -5081,30 +5073,30 @@ msgstr "Table Gauche" msgid "Table Right" msgstr "Table Droite" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capture d'écran" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Infos de format de texture" @@ -5120,13 +5112,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5149,7 +5141,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Le fichier %s a déjà été ouvert, son entête n'a pas pu être écrite." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Le fichier que vous avez spécifié (%s) n'existe pas" @@ -5166,7 +5158,7 @@ msgstr "Le nom ne peut contenir le caractère ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Le code AR décrypté ne contient aucune ligne." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5178,12 +5170,12 @@ msgstr "" "\n" "Dans le doute, utilisez la position la plus à droite." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "La sauvegarde que vous essayez de copier a une taille de fichier non valide" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5216,14 +5208,11 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Thème" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "La sélection du thème a rencontré un problème" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5232,7 +5221,7 @@ msgstr "" "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " "probablement incomplète." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5248,11 +5237,11 @@ msgstr "" "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " "l'Action Replay lui-même." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5271,7 +5260,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5284,7 +5273,7 @@ msgstr "" "qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " "des plantages." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Ceci vous permettra de modifier manuellement le fichier de configuration INI" @@ -5299,35 +5288,35 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Titre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "A" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Activer tous les types de journaux" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Activer le plein écran" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Haut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Echec de chargement d'un type de fichier inconnu." @@ -5347,7 +5336,7 @@ msgstr "" "Essai de lecture à partir d'un SYSCONF non valide\n" "Les IDs BT de la Wiimote ne sont pas disponibles" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turque" @@ -5359,12 +5348,12 @@ msgstr "Tourne-disque" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP :" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP :" @@ -5400,12 +5389,12 @@ msgstr "" "décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i non défini" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "&Annuler le lancement d'état" @@ -5413,7 +5402,7 @@ msgstr "&Annuler le lancement d'état" msgid "Unexpected 0x80 call? Aborting..." msgstr "Appel 0x80 inattendu. Abandon..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Inconnu" @@ -5443,8 +5432,8 @@ msgstr "" msgid "Up" msgstr "Haut" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Mettre à jour" @@ -5452,23 +5441,23 @@ msgstr "Mettre à jour" msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "&Plein écran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Utiliser Hexa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Utiliser les gestionnaires de panique" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5481,7 +5470,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5496,15 +5485,15 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitaires" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Synchro verticale" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valeur" @@ -5512,23 +5501,23 @@ msgstr "Valeur" msgid "Value:" msgstr "Valeur :" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valeur" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Niveau de détail" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vidéo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volume" @@ -5542,7 +5531,7 @@ msgstr "Echec de l'installation du WAD : erreur lors de la création de %s" msgid "WAD installation failed: error creating ticket" msgstr "Echec de l'installation du WAD : erreur lors de la création du ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5555,16 +5544,16 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Attention" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attention : démarrage du DOL dans un mauvais mode de console !" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attention : démarrage de l'ELF dans un mauvais mode de console !" @@ -5598,7 +5587,7 @@ msgstr "" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5610,7 +5599,7 @@ msgstr "" "autre sauvegarde avant de continuer, ou charger cette sauvegarde en " "désactivant le mode Lecture seule." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5622,7 +5611,7 @@ msgstr "" "charger cet état en désactivant le mode Lecture seule. Dans le cas " "contraire, il y aura probablement une désynchronisation." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5657,7 +5646,7 @@ msgstr "" "DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fichier non ouvert." @@ -5665,7 +5654,7 @@ msgstr "WaveFileWriter - fichier non ouvert." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" @@ -5673,23 +5662,23 @@ msgstr "Hack écran large (16/9è)" msgid "Width" msgstr "Largeur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5697,17 +5686,17 @@ msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD : impossible de lire le fichier" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5720,19 +5709,19 @@ msgstr "" "ou bien c'est dû à un temps d'attente trop long, ou encore autre chose.\n" "Voulez-vous la reconnecter tout de suite ?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote connectée" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Vibreur de la Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Paramètres de la Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5752,26 +5741,26 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Travail..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Ecrire dans la console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Ecrire dans le débugueur" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Ecrire dans le fichier" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Ecrire dans la fenêtre" @@ -5811,23 +5800,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Vous ne pouvez pas fermer des panneaux contenant des appels." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Vous devez choisir un jeu !!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Vous devez entrer un nom !" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -5850,7 +5839,7 @@ msgstr "" "Il devrait être de 0x%04x (au lieu de 0x%04llx).\n" "Voulez-vous en générer un nouveau ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5863,12 +5852,12 @@ msgstr "Code Zero 3 non pris en charge" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code inconnu pour Dolphin : %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ attente ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5884,7 +5873,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personnalisé]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5903,7 +5892,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5917,11 +5906,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5938,7 +5927,7 @@ msgstr "Impossible de lire les données du fichier %s" msgid "failed to read header" msgstr "Impossible de lire l'entête" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." @@ -5959,7 +5948,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -5971,13 +5960,16 @@ msgstr "Correction zFar :" msgid "zNear Correction: " msgstr "Correction zNear :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "Image par image" @@ -6063,6 +6055,22 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcule la profondeur par pixel des valeurs des graphiques 3D plutôt que " +#~ "par vertex.\n" +#~ "Contrairement à l'éclairage par pixel (qui est une bonne amélioration), " +#~ "les calculs de profondeur par pixel sont nécessaires pour émuler " +#~ "correctement un petit nombre de jeux.\n" +#~ "\n" +#~ "Dans le doute, cochez cette case." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6117,6 +6125,21 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Impossible de charger les infos du plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Créé par KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Créé par Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Créé par VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Créé par black_rider et publié sur ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList" @@ -6129,6 +6152,9 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "Désactiver l'éclairage" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Désactiver la profondeur / pixel" + #~ msgid "Disable Textures" #~ msgstr "Désactiver les textures" @@ -6402,6 +6428,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Charge le fichier spécifié (DOL, ELF, GCM, ISO, WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Verrouiller les threads aux coeurs" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Emulation audio en bas niveau (LLE) ou en haut niveau (HLE)" @@ -6485,6 +6514,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Exécution du script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Echantillonnage :" + #~ msgid "Scale:" #~ msgstr "Echelle :" @@ -6591,6 +6623,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Le fichier " +#~ msgid "Theme selection went wrong" +#~ msgstr "La sélection du thème a rencontré un problème" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/he.po b/Languages/po/he.po index 8f03cb9bd0..0c2dbeb7f0 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(×רוך מידי)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "משחק:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! ל×" @@ -52,14 +52,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sהעתק%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -144,148 +137,148 @@ msgstr "" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d ×‘×œ×•×§×™× ×—×•×¤×©×™×™×; %d רשומות תיקייה חופשיות" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&×ודות" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&קובץ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&עזרה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 #, fuzzy msgid "&Hotkey Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&קול" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&עצור" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -305,7 +298,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "" @@ -313,19 +306,19 @@ msgstr "" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "" @@ -333,20 +326,20 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -354,23 +347,24 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -389,13 +383,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -403,19 +397,19 @@ msgstr "" msgid "About Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -424,8 +418,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "" @@ -445,7 +439,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -466,7 +460,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -474,7 +468,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -482,27 +477,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "" @@ -511,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "" @@ -523,13 +518,13 @@ msgstr "" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "" @@ -555,48 +550,48 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -604,19 +599,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -628,42 +623,42 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,12 +666,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "" @@ -684,24 +679,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -720,13 +715,13 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "" @@ -744,15 +739,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "" @@ -760,11 +755,11 @@ msgstr "" msgid "Bar" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "" @@ -792,42 +787,42 @@ msgstr "" msgid "Blue Right" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "" @@ -848,25 +843,15 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -875,7 +860,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "" @@ -891,7 +876,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -899,18 +884,18 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" @@ -924,7 +909,7 @@ msgstr "" msgid "Caps Lock" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -932,24 +917,24 @@ msgstr "" msgid "Center" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -963,12 +948,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "" @@ -976,47 +960,47 @@ msgstr "" msgid "Cheat Code" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "" @@ -1024,14 +1008,14 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "" @@ -1045,8 +1029,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "" @@ -1056,22 +1040,22 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "" @@ -1083,91 +1067,91 @@ msgstr "" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "" @@ -1187,12 +1171,12 @@ msgstr "" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1201,7 +1185,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1219,12 +1203,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1239,27 +1223,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "" @@ -1268,24 +1252,7 @@ msgstr "" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "" @@ -1293,11 +1260,11 @@ msgstr "" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1308,12 +1275,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1321,11 +1288,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" @@ -1337,36 +1304,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "" @@ -1378,11 +1345,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" @@ -1399,11 +1366,11 @@ msgstr "" msgid "Dead Zone" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1411,24 +1378,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "" @@ -1437,11 +1404,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "" @@ -1450,11 +1417,11 @@ msgstr "" msgid "Delete the existing file '%s'?" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "" @@ -1465,13 +1432,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "" @@ -1493,20 +1460,16 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1515,7 +1478,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1525,7 +1488,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "" @@ -1534,11 +1497,11 @@ msgstr "" msgid "Disc Read Error" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1549,20 +1512,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, fuzzy, c-format msgid "Dolphin %s Graphics Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "" @@ -1570,54 +1537,59 @@ msgstr "" msgid "Dolphin Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1626,58 +1598,58 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" @@ -1694,11 +1666,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1706,7 +1678,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1714,12 +1686,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1727,7 +1699,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1735,7 +1707,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1744,7 +1716,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1754,19 +1726,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1776,72 +1748,71 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1850,17 +1821,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1868,7 +1839,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1876,24 +1847,41 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1901,13 +1889,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1918,14 +1906,14 @@ msgstr "" msgid "End" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1943,17 +1931,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -1988,32 +1976,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2029,7 +2017,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2041,44 +2029,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" @@ -2086,7 +2074,7 @@ msgstr "" msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2094,7 +2082,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2102,15 +2090,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2207,41 +2195,41 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2254,7 +2242,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2267,19 +2255,19 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2287,27 +2275,27 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2315,7 +2303,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2323,7 +2311,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2354,42 +2342,42 @@ msgstr "" msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2397,16 +2385,16 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "&מסך מל×" @@ -2420,7 +2408,7 @@ msgstr "" msgid "GCMic Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" @@ -2428,27 +2416,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" @@ -2456,26 +2444,26 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2488,21 +2476,21 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "" @@ -2511,19 +2499,19 @@ msgstr "" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2534,7 +2522,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2554,11 +2542,11 @@ msgstr "" msgid "Guitar" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2566,7 +2554,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" @@ -2578,7 +2566,7 @@ msgstr "" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2592,11 +2580,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2607,8 +2595,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2616,17 +2604,17 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" @@ -2648,7 +2636,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "" @@ -2656,19 +2644,19 @@ msgstr "" msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "" @@ -2680,29 +2668,29 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2711,7 +2699,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2720,7 +2708,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2728,23 +2716,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -2752,16 +2740,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "" @@ -2769,7 +2757,7 @@ msgstr "" msgid "Information" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2781,7 +2769,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "" @@ -2789,11 +2777,11 @@ msgstr "" msgid "Insert name here.." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "" @@ -2802,34 +2790,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "" @@ -2848,15 +2836,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "" @@ -2865,11 +2853,11 @@ msgstr "" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2890,7 +2878,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" @@ -2898,21 +2886,21 @@ msgstr "" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "" @@ -2920,16 +2908,16 @@ msgstr "" msgid "JAPAN" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "" @@ -2937,24 +2925,24 @@ msgstr "" msgid "KOREA" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "" @@ -2972,19 +2960,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -2994,96 +2986,96 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +msgid "Load State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +msgid "Load State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +msgid "Load State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +msgid "Load State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 -msgid "Load State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -msgid "Load State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -msgid "Load State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -msgid "Load State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Load State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3094,32 +3086,28 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3127,12 +3115,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3151,7 +3139,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3165,24 +3153,24 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" @@ -3191,7 +3179,7 @@ msgid "Memory Byte" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3220,20 +3208,20 @@ msgstr "" msgid "Menu" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "" @@ -3242,7 +3230,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3263,7 +3251,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3278,7 +3266,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3376,16 +3364,16 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" @@ -3394,20 +3382,20 @@ msgstr "" msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3415,7 +3403,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "" @@ -3437,7 +3425,7 @@ msgstr "" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3450,33 +3438,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3485,7 +3473,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3493,16 +3481,16 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" @@ -3510,11 +3498,11 @@ msgstr "" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "" @@ -3522,52 +3510,52 @@ msgstr "" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3580,15 +3568,15 @@ msgstr "" msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3598,19 +3586,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3626,7 +3614,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3638,34 +3626,34 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "" @@ -3674,36 +3662,36 @@ msgstr "" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "" @@ -3715,54 +3703,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3775,11 +3763,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3787,7 +3775,7 @@ msgstr "" msgid "Print" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "" @@ -3795,7 +3783,7 @@ msgstr "" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3803,8 +3791,8 @@ msgstr "" msgid "Question" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "" @@ -3822,7 +3810,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "" @@ -3830,46 +3818,46 @@ msgstr "" msgid "RUSSIA" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3885,7 +3873,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3894,46 +3882,46 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "" @@ -3955,29 +3943,25 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "" @@ -3985,90 +3969,90 @@ msgstr "" msgid "Save GCI as..." msgstr "" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +msgid "Save State Slot 1" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +msgid "Save State Slot 2" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +msgid "Save State Slot 3" +msgstr "" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +msgid "Save State Slot 4" +msgstr "" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 -msgid "Save State Slot 4" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -msgid "Save State Slot 5" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -msgid "Save State Slot 6" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -msgid "Save State Slot 7" -msgstr "" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 msgid "Save State Slot 8" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4076,23 +4060,23 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4103,20 +4087,20 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4131,23 +4115,23 @@ msgstr "" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4158,11 +4142,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4172,7 +4160,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4182,11 +4170,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4194,24 +4182,24 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4221,12 +4209,18 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Settings..." msgstr "הגדרות קול" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4234,7 +4228,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4242,142 +4236,142 @@ msgstr "" msgid "Shoulder Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "הגדרות גרפיקה" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4385,11 +4379,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4400,27 +4394,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4428,7 +4422,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4438,17 +4432,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "" @@ -4456,7 +4450,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4468,11 +4462,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4486,17 +4480,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4508,7 +4502,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4516,51 +4510,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4569,7 +4567,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4594,8 +4592,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "" @@ -4603,7 +4601,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4624,30 +4622,30 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4663,13 +4661,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4688,7 +4686,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4705,7 +4703,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4713,11 +4711,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4748,12 +4746,8 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +msgid "Theme:" msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 @@ -4762,7 +4756,7 @@ msgid "" "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4774,11 +4768,11 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4789,7 +4783,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4797,7 +4791,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4811,35 +4805,35 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4857,7 +4851,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4869,12 +4863,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4905,12 +4899,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" @@ -4918,7 +4912,7 @@ msgstr "" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "" @@ -4947,8 +4941,8 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "" @@ -4956,24 +4950,24 @@ msgstr "" msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&מסך מל×" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -4981,7 +4975,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -4990,15 +4984,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5006,23 +5000,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "" @@ -5036,7 +5030,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5045,16 +5039,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "" @@ -5079,7 +5073,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5087,7 +5081,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5095,7 +5089,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5115,7 +5109,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5123,7 +5117,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" @@ -5131,23 +5125,23 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5155,17 +5149,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5174,19 +5168,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "" @@ -5206,26 +5200,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5262,23 +5256,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5296,7 +5290,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" @@ -5309,12 +5303,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5326,7 +5320,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5337,7 +5331,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5346,11 +5340,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "" @@ -5367,7 +5361,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5386,7 +5380,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5398,7 +5392,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index 3f91382e7c..afbfe65b93 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-12-28 09:44+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" "Language: Hungarian\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Hungarian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (túl sok kijelzÅ‘)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Játék:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NEM" @@ -55,14 +55,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sMásolás%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i csatlakoztatva" @@ -157,147 +150,147 @@ msgstr "%sGCI importálás%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u szabad blokk; %u szabad könyvtár bejegyzés" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& ÉS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Névjegy..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Bootolás DVD meghajtóról..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Töréspontok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ISO fájlok tallózása..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emuláció" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fájl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Képkocka léptetés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Teljes nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Súgó" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Ãllás betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memóriakártya kezelÅ‘ (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Megnyitás..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Szünet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Regiszterek" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Alapra állítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Hang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Leállítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Eszközök" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Kép" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Nézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -317,7 +310,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(ISMERETLEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ki)" @@ -325,19 +318,19 @@ msgstr "(ki)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -345,20 +338,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -366,25 +359,27 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Már egy NetPlay ablak nyitva van!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "A játék jelenleg nem fut." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nem található támogatott bluetooth eszköz!\n" "(Csak Microsoft rangsorolású bluetooth eszköz támogatott.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -419,13 +414,13 @@ msgstr "" "\n" "Továbbítani kell a TCP portot a host számára!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM alaplap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR kódok" @@ -433,19 +428,19 @@ msgstr "AR kódok" msgid "About Dolphin" msgstr "A Dolphin névjegye" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Gyorsítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Pontosság:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Pontos VBeam emuláció" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd az EFB textúrába másolása lehetÅ‘séget." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Művelet" @@ -487,7 +482,7 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a kód " "hozzáadásban (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -514,15 +509,16 @@ msgstr "" "Action Replay hiba: érvénytelen méret (%08x : address = %08x) a mutató " "írásában (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay hiba: érvénytelen érték (%08x) a memória másolásban (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -530,27 +526,27 @@ msgstr "Action Replay hiba: Mester kód és CCXXXXXX írása nincs beépítve (% msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay hiba: érvénytelen AR kód a(z) %s. sorban" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Feltételes kód: Érvénytelen méret %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Érvénytelen szabályszerű kód típus %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód %i: Érvénytelen alfaj %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Szabályszerű kód 0: Érvénytelen alfaj %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -559,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -571,13 +567,13 @@ msgstr "Patch hozzáadása" msgid "Add new pane" msgstr "Új mezÅ‘ hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Hozzáadás..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Cím:" @@ -617,52 +613,52 @@ msgstr "" "\n" "MEGJEGYZÉS: EllenÅ‘rizd a napló ablakot/konzolt a kapott értékekhez." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Az analóg irányító gombok aktiválásához szükséges lenyomás érzékenységének " "beállítása." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Haladó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Haladó beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Minden fájl (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -675,19 +671,19 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Változtatható Wiimote idÅ‘zítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotrópikus szűrés:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Élsimítás:" @@ -700,15 +696,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "A betöltÅ‘ program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "BetöltÅ‘ program:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Alkalmaz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -718,16 +714,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: (ki)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arab" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -735,12 +731,12 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -748,12 +744,12 @@ msgstr "Képarány:" msgid "At least one pane must remain open." msgstr "Legalább egy mezÅ‘nek megnyitva kell maradnia." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -761,24 +757,24 @@ msgstr "Hang feldolgozó:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Hiba az AO eszköz megnyitásakor.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Automatikus (640x528 többszöröse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatikus (ablak méret)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ablak méret automatikus állítása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -801,12 +797,12 @@ msgstr "&Regiszterek" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Feldolgozó:" @@ -824,15 +820,15 @@ msgid "Bad File Header" msgstr "Rossz fájl fejléc" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Játék kép" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Játék kép részletek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Játék kép:" @@ -840,11 +836,11 @@ msgstr "Játék kép:" msgid "Bar" msgstr "VevÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Alap beállítások" @@ -872,42 +868,42 @@ msgstr "Kék balra" msgid "Blue Right" msgstr "Kék jobbra" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Gomb" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Összekötött irányítások: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Hibás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Tallózás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Puffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Gombok" @@ -928,32 +924,15 @@ msgstr "C-kar" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Processzor emulátor motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "KijelzÅ‘ listák gyorsítótárazása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"A 3D-s grafika mélységének értékét képpont alapon számolja inkább, mintsem " -"csúcspont alapon.\n" -"Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a képpont " -"alapú mélység számítás csupán csak néhány játék pontos emulálásához " -"szükséges.\n" -"\n" -"Ha bizonytalan vagy, hagyd kijelölve." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -968,7 +947,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Mégse" @@ -984,7 +963,7 @@ msgstr "%s nem nyitható meg" msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -995,7 +974,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1003,12 +982,12 @@ msgstr "" "A fájl nem használható memóriakártyaként.\n" "Azonos fájlt próbálsz használni mindkét kártya helyén?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nem található WiiMote bd szerint: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nem található WiiMote %02x csatlakozás kezelÅ‘ szerint" @@ -1022,7 +1001,7 @@ msgstr "Sikertelen beolvasás a DVD_Plugin - DVD-felületbÅ‘l: végzetes hiba" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalán" @@ -1030,24 +1009,24 @@ msgstr "Katalán" msgid "Center" msgstr "Közép" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Váltás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Lemez &váltás..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Lemez váltás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Játék váltás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1063,12 +1042,11 @@ msgstr "Megváltoztatja a zFar paraméterhez tartozó jegyet (javítás után)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Megváltoztatja a zNear paraméterhez tartozó jegyet (javítás után)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "A változtatások nem érvényesülnek ameddig fut az emulátor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Csevegés" @@ -1076,47 +1054,47 @@ msgstr "Csevegés" msgid "Cheat Code" msgstr "Csalás kód" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Csalás keresés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Csalás kezelÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kínai (egyszerűsített)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1124,7 +1102,7 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1132,8 +1110,8 @@ msgstr "" "Válassz betöltÅ‘ programnak használandó fájlt: (csak könyvtárakból " "létrehozott lemezekre érvényesíthetÅ‘)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Válassz mappát a kitömörítéshez" @@ -1147,8 +1125,8 @@ msgstr "Klasszikus" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Törlés" @@ -1160,22 +1138,22 @@ msgstr "" "A kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. Kézileg " "kell leállítanod a játékot." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Bezárás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Be&állítások..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kód infó" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kód:" @@ -1187,91 +1165,91 @@ msgstr "Parancs" msgid "Comment" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "ISO tömörítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Beállítások" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Irányítás beállítás" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Irányítók beállítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Kilépéskor megerÅ‘sítés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "%i Wiimote csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3 csatlakoztatása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4 csatlakoztatása" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Csatlakozás..." @@ -1291,12 +1269,12 @@ msgstr "Konvertálás: GCI" msgid "Copy failed" msgstr "Másolás sikertelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "%c. memóriakártyára másolás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Mag" @@ -1305,7 +1283,7 @@ msgstr "Mag" msgid "Could not create %s" msgstr "%s nem hozható létre" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "%s hang feldolgozó iniciálása sikertelen." @@ -1326,12 +1304,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO fájl nem ismerhetÅ‘ fel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s nem menthetÅ‘ el" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1351,11 +1329,11 @@ msgstr "" "\n" "CD/DVD lemezrÅ‘l futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1363,17 +1341,17 @@ msgstr "" "A mag nem iniciálható.\n" "EllenÅ‘rizd a beállításokat." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Számláló:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Ország:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR kód létrehozása" @@ -1382,26 +1360,7 @@ msgstr "AR kód létrehozása" msgid "Create new perspective" msgstr "Új perspektíva készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Készítette: KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Készítette: VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Készítette: black_rider és közzétette ForumW.org > Web Developments oldalon" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "KészítÅ‘:" @@ -1409,11 +1368,11 @@ msgstr "KészítÅ‘:" msgid "Critical" msgstr "Kritikus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Levágás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1427,12 +1386,12 @@ msgstr "" msgid "Crossfade" msgstr "Kereszthalkítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ez a könyvtár megváltozott errÅ‘l: %s erre: %s a wxFileSelector után!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Egyedi megjelenítési hack" @@ -1440,11 +1399,11 @@ msgstr "Egyedi megjelenítési hack" msgid "Custom Projection Hack Settings" msgstr "Egyedi megjelenítési hack beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Cseh" @@ -1456,36 +1415,36 @@ msgstr "" msgid "D-Pad" msgstr "Digitális irányok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emuláció (gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE recompiler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1497,11 +1456,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Adatok mérete" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Dátum:" @@ -1518,11 +1477,11 @@ msgstr "Datel MaxDrive/Pro fájlok(*.sav)" msgid "Dead Zone" msgstr "Holtsáv" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "HibakeresÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Hibakeresés" @@ -1530,24 +1489,24 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "ISO kitömörítés" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1556,11 +1515,11 @@ msgid "Default font" msgstr "Alap betűtípus" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Mentés törlése" @@ -1569,11 +1528,11 @@ msgstr "Mentés törlése" msgid "Delete the existing file '%s'?" msgstr "Törlöd a meglévÅ‘ '%s' fájlt?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Leírás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Észlelés" @@ -1586,13 +1545,13 @@ msgstr "" "A kimeneti puffernél nagyobb adamennyiség kiolvasására történÅ‘ probálkozás " "észlelve a DVD lemezrÅ‘l. Beszabályozás." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1616,20 +1575,16 @@ msgstr "" "Könyvtár ellenÅ‘rzÅ‘ összeg hibás\n" " és a könyvtár biztonsági mentés ellenÅ‘rzÅ‘ összeg hibás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Kikapcsolás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Köd kikapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Képpont mélység kikapcsolása" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1644,7 +1599,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1661,7 +1616,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Lemez" @@ -1670,11 +1625,11 @@ msgstr "Lemez" msgid "Disc Read Error" msgstr "Lemez olvasási hiba" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "KijelzÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1688,20 +1643,24 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s grafikai beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &weblap" @@ -1709,32 +1668,32 @@ msgstr "Dolphin &weblap" msgid "Dolphin Configuration" msgstr "Dolphin beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin emulált Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1742,7 +1701,7 @@ msgstr "" "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " "kattintás ide..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1750,16 +1709,21 @@ msgstr "" "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " "kattintás ide a játékok megjelenítéséhez..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Le" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Kódok letöltése (WiiRD adatbázis)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Letöltve %lu kód. (hozzáadva %lu)" @@ -1768,27 +1732,27 @@ msgstr "Letöltve %lu kód. (hozzáadva %lu)" msgid "Drums" msgstr "Dobok" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Hang mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB cél letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Képkockák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Textúrák letárolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1799,7 +1763,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1809,7 +1773,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1819,17 +1783,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holland" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "K&ilépés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB másolatok" @@ -1850,11 +1814,11 @@ msgstr "" msgid "EUROPE" msgstr "EURÓPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Korai memória frissítés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Szerkesztés" @@ -1862,7 +1826,7 @@ msgstr "Szerkesztés" msgid "Edit ActionReplay Code" msgstr "ActionReplay kód szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Beállítások szerkesztése" @@ -1870,12 +1834,12 @@ msgstr "Beállítások szerkesztése" msgid "Edit Patch" msgstr "Patch szerkesztése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Jelenlegi perspektíva szerkesztése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Szerkesztés..." @@ -1883,7 +1847,7 @@ msgstr "Szerkesztés..." msgid "Effect" msgstr "Effektus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Beágyazott képkocka puffer" @@ -1891,7 +1855,7 @@ msgstr "Beágyazott képkocka puffer" msgid "Emu Thread already running" msgstr "Az emuláció már fut" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1905,7 +1869,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, jelöld ki inkább az XFB emulációt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1921,19 +1885,19 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulált Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emuláció állapota:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Használat" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1949,72 +1913,71 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Bounding Box kalkuláció használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Gyorsítótár használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Csalások használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Dual Core használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Dual Core használata (gyorsítás)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Gyorsbillentyűk használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Tétlen állapot mellÅ‘zése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Tétlen állapot mellÅ‘zése (gyorsítás)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU használata" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "SzéleskijelzÅ‘ bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Vonalháló bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2028,7 +1991,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2036,11 +1999,11 @@ msgstr "" "Gyors lemez hozzáférés használata. Szükséges néhány játékhoz. (BE = gyors, " "KI = kompatibilis)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Oldalak bekapcsolása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2052,7 +2015,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2064,7 +2027,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2072,7 +2035,7 @@ msgstr "" "Használatával The Legend of Zelda: Twilight Princess játék sebessége " "növekedik. A TÖBBI játéknál legyen kikapcsolva." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2082,11 +2045,28 @@ msgstr "" "funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " "kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2099,7 +2079,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2107,7 +2087,7 @@ msgstr "" "Bekapcsolja a memória kezelÅ‘ egységet (Memory Management Unit), szükséges " "néhány játékhoz. (BE = kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2121,14 +2101,14 @@ msgstr "" msgid "End" msgstr "Vége" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Angol" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Kép javítások" @@ -2146,17 +2126,17 @@ msgstr "%d/%d bejegyzés" msgid "Entry 1/%d" msgstr "1/%d bejegyzés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "EgyenlÅ‘" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Hiba" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Hiba a kiválasztott nyelv betöltése közben. Rendszer alapértelmezett " @@ -2198,32 +2178,32 @@ msgstr "Kivétel kezelÅ‘ - memória terület alatti hozzáférés. %08llx%08llx" msgid "Execute" msgstr "Végrehajtás" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exportálás sikertelen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Fájl exportálása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Felvétel exportálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Felvétel exportálása..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Minden mentés exportálása" @@ -2239,7 +2219,7 @@ msgstr "Exportálás mentése másként..." msgid "Extension" msgstr "KiegészítÅ‘" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "KülsÅ‘ képkocka puffer" @@ -2251,44 +2231,44 @@ msgstr "Extra paraméter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Az extra paraméter csak a ''Metroid: Other M'' játékban hasznos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Minden fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "BetöltÅ‘ program kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Könyvtár kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Fájl kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partíció kitömörítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Minden fájl kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Könyvtár kitömörítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Kitömörítés..." @@ -2296,7 +2276,7 @@ msgstr "Kitömörítés..." msgid "FIFO Byte" msgstr "FIFO bájt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO lejátszó" @@ -2304,7 +2284,7 @@ msgstr "FIFO lejátszó" msgid "FRANCE" msgstr "FRANCIAORSZÃG" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST méret:" @@ -2312,15 +2292,15 @@ msgstr "FST méret:" msgid "Failed to Connect!" msgstr "Csatlakozás sikertelen!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Meghallgatás sikertelen!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Kódok letöltése sikertelen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Kitömörítés nem sikerült ide: %s!" @@ -2439,41 +2419,41 @@ msgstr "Fejléc írása sikertelen a(z) %s számára" msgid "Failed to write header for file %d" msgstr "Fejléc írása sikertelen a(z) %d fájl számára" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo lejátszó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Fájl infó" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "A fájl nem tartalmazott kódokat." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fájl átkonvertálva .gci formátumba" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2490,7 +2470,7 @@ msgstr "" "A fájl \"%s\" kiterjesztésű\n" "az érvényes kiterjesztések (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "A fájl nem ismerhetÅ‘ fel memóriakártyaként" @@ -2503,19 +2483,19 @@ msgstr "A fájl nincs tömörítve" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2523,27 +2503,27 @@ msgstr "" msgid "First Block" msgstr "ElsÅ‘ blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Ãllandó ellenÅ‘rzőösszeg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Kényszerített 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Kényszerített 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Konzol kényszerítése NTSC-J típusra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Textúra szűrés kényszerítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2556,7 +2536,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2568,7 +2548,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2604,43 +2584,43 @@ msgstr "Képkocka" msgid "Frame " msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Képkocka léptetés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Képkocka mentések FFV1 használatával" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Képkocka rendezés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Képkocka k&ihagyás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Képkocka korlát:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "RögzítendÅ‘ képkockák" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Szabad nézet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francia" @@ -2648,16 +2628,16 @@ msgstr "Francia" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "EttÅ‘l:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Teljes méret" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Teljes kijelzÅ‘s felbontás:" @@ -2669,7 +2649,7 @@ msgstr "GCI fájl(*.gci)" msgid "GCMic Configuration" msgstr "GCMic beállítások" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC irányító" @@ -2677,27 +2657,27 @@ msgstr "GC irányító" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Játék azonosító:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "A játék már fut!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "A játék nem fut!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "A játék nem található!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "A játék sajátos beállításai" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Játék konfig" @@ -2705,25 +2685,25 @@ msgstr "Játék konfig" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube irányító beállítások" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko kódok" @@ -2738,20 +2718,20 @@ msgstr "" "GeckoCode futtatása sikertelen (CT%i CST%i) (%s)\n" "(vagy rossz a kód vagy a kód típus még nem támogatott.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Ãltalános" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ãltalános beállítások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Német" @@ -2760,19 +2740,19 @@ msgstr "Német" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafikai beállítások" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Nagyobb mint" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2790,7 +2770,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Görög" @@ -2810,11 +2790,11 @@ msgstr "Zöld jobbra" msgid "Guitar" msgstr "Gitár" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY kiadva, kérlek jelentsd!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hackek" @@ -2822,7 +2802,7 @@ msgstr "Hackek" msgid "Header checksum failed" msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Héber" @@ -2834,7 +2814,7 @@ msgstr "Magasság" msgid "Help" msgstr "Súgó" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2855,11 +2835,11 @@ msgstr "" msgid "Hide" msgstr "Elrejtés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Egérmutató elrejtése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2873,8 +2853,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2882,17 +2862,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Gyorsbillentyű beállítások" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Gyorsbill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Magyar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hibrid Wiimote" @@ -2920,7 +2900,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL beállítások" @@ -2928,19 +2908,19 @@ msgstr "IPL beállítások" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR mutató" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR érzékenysége:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -2952,7 +2932,7 @@ msgstr "OLASZORSZÃG" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2960,14 +2940,14 @@ msgstr "" "Kijelölés esetén a bounding box regiszterek frissítve lesznek. A Paper Mario " "játékok használják." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Ha az FPS értéke szabálytalan, akkor ez a beállítás segíthet. (BE = " "kompatibilis, KI = gyors)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2978,11 +2958,11 @@ msgstr "" "PAL:50), akkor a hatékonyság eléréséhez ki kell kapcsolni a hang " "szabályozást is a DSP beállításoknál. " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Formátum változások kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2996,7 +2976,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3011,7 +2991,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Mentés importálása" @@ -3019,7 +2999,7 @@ msgstr "Mentés importálása" msgid "Import failed, try again?" msgstr "Importálás sikertelen, megpróbálod újra?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3027,11 +3007,11 @@ msgstr "" "Az importált fájl gsc kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Az importált fájl hossza érvénytelen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3039,7 +3019,7 @@ msgstr "" "Az importált fájl sav kiterjesztésű\n" "de nem rendelkezik megfelelÅ‘ fejléccel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3051,16 +3031,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Elindul" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Infó" @@ -3068,7 +3048,7 @@ msgstr "Infó" msgid "Information" msgstr "Információk" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Bemenet" @@ -3080,7 +3060,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3088,11 +3068,11 @@ msgstr "SD kártya behelyezése" msgid "Insert name here.." msgstr "Ãrj be ide nevet..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" @@ -3102,34 +3082,34 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "WAD telepítése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3150,15 +3130,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "BelsÅ‘ LZO hiba - lzo_init() sikertelen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "BelsÅ‘ felbontás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (NAGYON lassú)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intró" @@ -3167,11 +3147,11 @@ msgstr "Intró" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Érvénytelen méret(%x) vagy mágikus szó (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Érvénytelen érték!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Érvénytelen bat.map vagy könyvtár bejegyzés" @@ -3195,7 +3175,7 @@ msgstr "" "%s\n" " Valószínűleg újra le kell mentened a játékot." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Nem megfelelÅ‘ rögzített fájl" @@ -3203,21 +3183,21 @@ msgstr "Nem megfelelÅ‘ rögzített fájl" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Olasz" @@ -3225,16 +3205,16 @@ msgstr "Olasz" msgid "JAPAN" msgstr "JAPÃN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (ajánlott)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL Recompiler (kísérleti)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japán" @@ -3242,7 +3222,7 @@ msgstr "Japán" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3253,17 +3233,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Bill." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreai" @@ -3281,19 +3261,23 @@ msgstr "L gomb" msgid "L-Analog" msgstr "Bal analóg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Nyelv:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Az utolsó felülírt mentés" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Utolsó mentett állás" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3303,8 +3287,8 @@ msgstr "Balra" msgid "Left Stick" msgstr "Bal kar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3312,7 +3296,7 @@ msgstr "" "Bal kattintás a gyorsbillentyű megadásához.\n" "Szóköz lenyomásával törlés." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3322,7 +3306,7 @@ msgstr "" "KözépsÅ‘ kattintás a törléshez.\n" "Jobb kattintás további beállításokhoz." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3330,76 +3314,76 @@ msgstr "" "Bal/jobb kattintás további beállításokhoz.\n" "KözépsÅ‘ kattintás a törléshez." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Kevesebb mint" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPS alapú korlátozás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Betöltés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Egyedi textúrák betöltése" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Ãllás betöltése az 1. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Ãllás betöltése a 2. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Ãllás betöltése a 3. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Ãllás betöltése a 4. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Ãllás betöltése az 5. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Ãllás betöltése a 6. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Ãllás betöltése a 7. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Ãllás betöltése a 8. helyrÅ‘l" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Ãllás betöltése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3413,31 +3397,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Gombkiosztási értékek betöltése a hack mintákból rendelkezésre áll." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Helyi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Folyamatágak magokhoz zárolása" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Napló" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Napló beállítások" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Napló típus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3450,12 +3430,12 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Napló kimenetek" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Naplózás" @@ -3476,7 +3456,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" @@ -3490,24 +3470,24 @@ msgstr "MadCatz Gameshark fájlok (*.gcs)" msgid "Main Stick" msgstr "FÅ‘kar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Gyártó azonosító:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Gyártó:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "A memóriakártyán már van mentés ehhez a játékhoz" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "A memóriakártya már meg van nyitva" @@ -3516,7 +3496,7 @@ msgid "Memory Byte" msgstr "Memória bájt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Memóriakártya" @@ -3553,20 +3533,20 @@ msgstr "A memóriakártya fájlmérete nem egyezik a fejléc méretével" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3575,7 +3555,7 @@ msgstr "Egyéb beállítások" msgid "Modifier" msgstr "Változó" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3600,7 +3580,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3622,7 +3602,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3722,16 +3702,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Cím:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Név:" @@ -3740,20 +3720,20 @@ msgstr "Név:" msgid "Native GCI files(*.gci)" msgstr "Natív GCI fájlok (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Új keresés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "KövetkezÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "KövetkezÅ‘ keresés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Becenév:" @@ -3761,7 +3741,7 @@ msgstr "Becenév:" msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Nem találhatók sem ISO sem WAD fájlok" @@ -3783,7 +3763,7 @@ msgstr "Nincs dokkolás" msgid "No file loaded" msgstr "Nincs fájl betöltve" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Nincs üres könyvtári jelzÅ‘szám bejegyzés" @@ -3796,33 +3776,33 @@ msgstr "Nincs rögzített fájl" msgid "No save folder found for title %s" msgstr "%s játékhoz nem található mentési mappa" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nincs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvég" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nem egyenlÅ‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Nincs beállítva" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nincs csatlakoztatva" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Megjegyzés" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Megjegyzések:" @@ -3831,7 +3811,7 @@ msgstr "Megjegyzések:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Megjegyzés" @@ -3839,16 +3819,16 @@ msgstr "Megjegyzés" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Kódok száma:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk gyorsítás" @@ -3856,11 +3836,11 @@ msgstr "Nunchuk gyorsítás" msgid "Object" msgstr "Elem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Elem hatótáv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Ki" @@ -3868,52 +3848,52 @@ msgstr "Ki" msgid "Offset:" msgstr "Eltolás:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Csak %d blokk szabad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Fájl megnyitása..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: környezet létrehozása sikertelen a(z) %s eszköz számára " -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nem található hang eszköz" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s eszköz nem nyitható meg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL textúra dekódoló" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" @@ -3926,7 +3906,7 @@ msgstr "LehetÅ‘ségek" msgid "Orange" msgstr "Narancs" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3936,8 +3916,8 @@ msgstr "" "Jobb kattintás az összes fájl exportálásához,\n" "és az állásmentések importálásához az új memóriakártyára\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Egyéb" @@ -3949,19 +3929,19 @@ msgstr "" "A másik kliens kapcsolata megszakadt játék közben! A NetPlay kikapcsolva. " "Kézileg kell leállítanod a játékot." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Kimenet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "F&elvétel visszajátszása..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Irányító" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Irányító" @@ -3977,7 +3957,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Társítás" @@ -3989,34 +3969,34 @@ msgstr "Paragraph" msgid "Parameters" msgstr "Paraméterek" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "%i partíció" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Javítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Szünet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Képpont alapú fényhatások" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Tökéletes" @@ -4025,36 +4005,36 @@ msgstr "Tökéletes" msgid "Perspective %d" msgstr "%d perspektíva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Felvétel visszajátszása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Indítás/Szünet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Játszható" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Visszajátszási lehetÅ‘ségek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4066,54 +4046,54 @@ msgstr "Hozz elÅ‘ször létre egy perspektívát mielÅ‘tt mentenél" msgid "Plus-Minus" msgstr "Plusz - minusz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "4. port" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugál" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugál (brazil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" @@ -4126,11 +4106,11 @@ msgstr "Gombkiosztás:" msgid "Prev Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ElÅ‘zÅ‘ lap" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ElÅ‘zÅ‘ érték" @@ -4138,7 +4118,7 @@ msgstr "ElÅ‘zÅ‘ érték" msgid "Print" msgstr "Nyomtatás" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4146,7 +4126,7 @@ msgstr "Profil" msgid "Properties" msgstr "Tulajdonságok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Gyorsítótár ürítése" @@ -4154,8 +4134,8 @@ msgstr "Gyorsítótár ürítése" msgid "Question" msgstr "Kérdés" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Kilépés" @@ -4173,7 +4153,7 @@ msgstr "R gomb" msgid "R-Analog" msgstr "Jobb analóg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4181,46 +4161,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "OROSZORSZÃG" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Hatótáv" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Ãrásvédett mód" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Valódi" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Valódi Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Valódi Wiimote-ok" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote újracsatlakoztatás megerÅ‘sítés" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Wiimote újracsatlakoztatása állás betöltéskor" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Rögzítés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Rögzítési infó" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Rögzítési beállítások" @@ -4236,7 +4216,7 @@ msgstr "Vörös balra" msgid "Red Right" msgstr "Vörös jobbra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4250,29 +4230,29 @@ msgstr "" "ErÅ‘sen csökkenti az emuláció sebességét és néha hibákat okoz.\n" "Ha bizonytalan vagy, válaszd ezt: Nincs. " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Frissítés" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "A lista frissítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Játéklista frissítése" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Törlés" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4282,17 +4262,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Megjelenítés a fÅ‘ablakban" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Alapra állítás" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Eredmények" @@ -4314,29 +4294,25 @@ msgstr "Jobb kar" msgid "Rumble" msgstr "Rumble funkció" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE futtatása egy dedikált folyamatágon (nem ajánlott)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Orosz" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Ãl&lás mentése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Biztonságos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Mintavételezési frekvencia:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Mentés" @@ -4344,90 +4320,90 @@ msgstr "Mentés" msgid "Save GCI as..." msgstr "GCI mentése másként..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Ãllás mentés az 1. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Ãllás mentés a 2. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Ãllás mentés a 3. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Ãllás mentés a 4. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Ãllás mentés az 5. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Ãllás mentés a 6. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Ãllás mentés a 7. helyre" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Ãllás mentés a 8. helyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Ãllás mentése..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Keresés..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Pillanatkép" @@ -4435,25 +4411,25 @@ msgstr "Pillanatkép" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Csalás keresés" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Keresés az almappákban" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4464,20 +4440,20 @@ msgid "Section %s not found in SYSCONF" msgstr "%s rész nem található a SYSCONF fájlban" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Választás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4495,23 +4471,23 @@ msgstr "Válassz importálandó mentési fájlt" msgid "Select floating windows" msgstr "Válassz lebegÅ‘ ablakokat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4529,11 +4505,16 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: Automatikus." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "A megadott \"%s\" fájl nem létezik" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Kiválasztott betűtípus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4549,7 +4530,7 @@ msgstr "" "Ha bizonytalan vagy, használd az asztali felbontást.\n" "Ha továbbra is bizonytalan vagy, használd a legmagasabb működÅ‘ felbontást." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4566,11 +4547,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, használd ezt: Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Küldés" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "ÉrzékelÅ‘ helyzete:" @@ -4578,25 +4559,25 @@ msgstr "ÉrzékelÅ‘ helyzete:" msgid "Separator" msgstr "Elválasztó" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Szerb" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "1. soros port - Ezt a portot használják azok az eszközök, mint a net adapter" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Beállítás alapértelmezett %c. memóriakártyaként" @@ -4607,11 +4588,17 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: A jelzÅ‘szám nagyobb mint az ar kód lista mérete %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Beállítások..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nem található a beállítási fájl" @@ -4619,7 +4606,7 @@ msgstr "SetupWiiMem: Nem található a beállítási fájl" msgid "Shake" msgstr "Rázás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Rövid cím:" @@ -4627,105 +4614,105 @@ msgstr "Rövid cím:" msgid "Shoulder Buttons" msgstr "Oldalsó gombok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Konzol &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Napló &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Ãllapotsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Eszközsor &mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Meghajtók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB másolat régiók megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS kijelzése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Franciaország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Bemeneti kijelzÅ‘ megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Olaszország mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korea mutatása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "A játék nyelve:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Napló &beállítások megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Platformok mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Régiók mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Statisztikák megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Tajvan mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad mutatása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii mutatása" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "A játék leállítása elÅ‘tt megjelenik egy megerÅ‘sítÅ‘ ablak." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4734,39 +4721,39 @@ msgstr "" "Kikapcsolásával megszűntethetÅ‘k a kellemetlen és nem végzetes üzenetek, de " "ezáltal a Dolphin hirtelen kifagyhat bármilyen magyarázat nélkül." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Az elsÅ‘ blokk megjelenítése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "MentendÅ‘ blokkok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "MentendÅ‘ megjegyzések megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "MentendÅ‘ ikonok megjelenítése" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "MentendÅ‘ címek megjelenítése" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4778,11 +4765,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Ismeretlen mutatása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4796,27 +4783,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "BIOS kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Az EFB processzor hozzáférésének átugrása" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4828,7 +4815,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4844,17 +4831,17 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "B hely" @@ -4862,7 +4849,7 @@ msgstr "B hely" msgid "Snapshot" msgstr "Pillanatkép" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Szoftveres képalkotó" @@ -4879,11 +4866,11 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " "válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Hang beállítások" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Érvénytelen %s hang feldolgozó." @@ -4897,17 +4884,17 @@ msgstr "Hang puffer létrehozása sikertelen: %s" msgid "Space" msgstr "Szóköz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanyol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hangszóró hangerÅ‘:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4927,7 +4914,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, válaszd ezt: 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "A lemez adatátviteli arány gyorsítása" @@ -4935,51 +4922,55 @@ msgstr "A lemez adatátviteli arány gyorsítása" msgid "Square Stick" msgstr "Négyzetes kar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Normál irányító" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Indítás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&NetPlay indítása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Felvétel in&dítása" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Felvétel indítása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Ãllap." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Ãllás mentések" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Leállítás" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4994,7 +4985,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelölve." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ablakhoz igazítás" @@ -5019,8 +5010,8 @@ msgstr "Mentés fájlok sikeresen importálva" msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -5028,7 +5019,7 @@ msgstr "Rendszer nyelv:" msgid "TAIWAN" msgstr "TAJVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS bemenet" @@ -5049,30 +5040,30 @@ msgstr "Tábla balra" msgid "Table Right" msgstr "Tábla jobbra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Pillanatkép készítése" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Teszt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textúra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Textúra gyorsítótár" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Textúra formátum átfedés" @@ -5088,13 +5079,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenÅ‘rzÅ‘ összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5117,7 +5108,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s fáj már meg van nyitva, a fájl fejléce nem írható." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Az általad megadott (%s) fájl nem létezik" @@ -5134,7 +5125,7 @@ msgstr "A név nem tartalmazhatja a ',' karaktert" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "A kapott kódolatlan AR kód nem tartalmaz sorokat." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5147,11 +5138,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, használd a második leggyorsabb értéket jobbról." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "A másolni kívánt mentés érvénytelen méretű" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5184,14 +5175,11 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Kinézet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Kinézet választáskor hiba történt" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5200,7 +5188,7 @@ msgstr "" "Kell lennie egy jegynek itt: 00000001/00000002. A NAND mentésed valószínűleg " "befejezetlen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5216,11 +5204,11 @@ msgstr "" "Az action replay szimulátor nem támogat olyan kódokat, amelyek módosítját " "magát az Action Replay-t." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5239,7 +5227,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5251,7 +5239,7 @@ msgstr "" "SzámottevÅ‘ sebességnövekedés érhetÅ‘ el egynél több magos számítógépeken, " "ugyanakkor véletlenszerű fagyásokat/hibákat is okozhat." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" @@ -5265,35 +5253,35 @@ msgid "Tilt" msgstr "Billentés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Cím" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "eddig:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Minden napló típus kijelölése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Váltás teljes nézetre" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Fent" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Hagyományos kínai" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Próbálkozás egy ismeretlen fájltípus betöltésével. " @@ -5313,7 +5301,7 @@ msgstr "" "Olvasási próbálkozás az érvénytelen SYSCONF fájlból\n" "Nem találhatóak Wiimote bt azonosítók " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Török" @@ -5325,12 +5313,12 @@ msgstr "Lemezjátszó" msgid "Type" msgstr "Típus" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5366,12 +5354,12 @@ msgstr "" "történÅ‘ elemzése nem lehetséges. GyÅ‘zÅ‘dj meg róla, hogy helyesen írtad be.\n" "Szeretnéd átugrani ezt a sort és folytatni az elemzést?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Meghatározatlan %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Ãllás betöltés törlése" @@ -5379,7 +5367,7 @@ msgstr "Ãllás betöltés törlése" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Ismeretlen" @@ -5410,8 +5398,8 @@ msgstr "" msgid "Up" msgstr "Fel" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Frissítés" @@ -5419,23 +5407,23 @@ msgstr "Frissítés" msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Teljes nézet használata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Hexa használat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "HibakezelÅ‘k használata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5448,7 +5436,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5463,15 +5451,15 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Kellékek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Érték" @@ -5479,23 +5467,23 @@ msgstr "Érték" msgid "Value:" msgstr "Érték:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Érték:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Kép" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "HangerÅ‘" @@ -5510,7 +5498,7 @@ msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" msgid "WAD installation failed: error creating ticket" msgstr "WAD telepítési hiba: hiba a(z) %s létrehozása közben" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5523,16 +5511,16 @@ msgstr "" "Ha bizonytalan vagy, hagyd kijelöletlenül." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Figyelem" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Figyelem - DOL indítása nem megfelelÅ‘ konzol módban!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Figyelem - ELF indítása nem megfelelÅ‘ konzol módban!" @@ -5564,7 +5552,7 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5576,7 +5564,7 @@ msgstr "" "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5588,7 +5576,7 @@ msgstr "" "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5623,7 +5611,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fájl nincs megnyitva." @@ -5631,7 +5619,7 @@ msgstr "WaveFileWriter - fájl nincs megnyitva." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Szélesvásznú hack" @@ -5639,23 +5627,23 @@ msgstr "Szélesvásznú hack" msgid "Width" msgstr "Szélesség" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii mentés importálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5663,17 +5651,17 @@ msgstr "Wii mentés fájlok (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Fájlból olvasás nem sikerült" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5686,19 +5674,19 @@ msgstr "" "esetleg az üresjárati idÅ‘korlát letelt vagy egyéb ok miatt történt.\n" "Újra akarod csatlakoztatni most?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote csatlakoztatva" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote beállítások" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimote" @@ -5718,27 +5706,27 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Folyamatban..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Ãrás a konzolba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Ãrás fájlba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Ãrás fájlba" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Ãrás az ablakba" @@ -5777,24 +5765,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nem zárhatod be a lapokat tartalmazó táblákat." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Választanod kell egy játékot!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Meg kell adnod egy nevet!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Be kell írnod egy érvényes decimális, hexadecimális vagy oktális értéket." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." @@ -5818,7 +5806,7 @@ msgstr "" "0x%04x méretűnek kellene lennie (azonban 0x%04llx méretű)\n" "Akarsz újat létrehozni?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5831,12 +5819,12 @@ msgstr "Zero 3 kód nem támogatott" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero ismeretlen az emulátor számára: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ várakozás ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5852,7 +5840,7 @@ msgstr "" msgid "[Custom]" msgstr "[Egyedi]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5871,7 +5859,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5885,11 +5873,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -5906,7 +5894,7 @@ msgstr "adatok olvasása a következÅ‘ fájlból sikertelen: %s" msgid "failed to read header" msgstr "a fejléc olvasása sikertelen" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." @@ -5925,7 +5913,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -5937,13 +5925,16 @@ msgstr "zFar javítás:" msgid "zNear Correction: " msgstr "zNear javítás: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| VAGY" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Képkocka léptetés" @@ -6030,6 +6021,22 @@ msgstr "| VAGY" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "A 3D-s grafika mélységének értékét képpont alapon számolja inkább, " +#~ "mintsem csúcspont alapon.\n" +#~ "Ellentétben a képpont megvilágítással (ami pusztán egy finomítás), a " +#~ "képpont alapú mélység számítás csupán csak néhány játék pontos " +#~ "emulálásához szükséges.\n" +#~ "\n" +#~ "Ha bizonytalan vagy, hagyd kijelölve." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6081,6 +6088,23 @@ msgstr "| VAGY" #~ msgid "Could not get info about plugin %s" #~ msgstr "%s pluginról nem szerezhetÅ‘ be infó" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Készítette: KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Készítette: Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Készítette: VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Készítette: black_rider és közzétette ForumW.org > Web Developments " +#~ "oldalon" + #~ msgid "DList Cache" #~ msgstr "DList gyorsítótár" @@ -6093,6 +6117,9 @@ msgstr "| VAGY" #~ msgid "Disable Lighting" #~ msgstr "Fényhatások kikapcsolása" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Képpont mélység kikapcsolása" + #~ msgid "Disable Textures" #~ msgstr "Textúrák kikapcsolása" @@ -6371,6 +6398,9 @@ msgstr "| VAGY" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Meghatározott fájlt tölt be (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Folyamatágak magokhoz zárolása" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Alacsony szintű (LLE) vagy magas szintű (HLE) hang" @@ -6449,6 +6479,9 @@ msgstr "| VAGY" #~ msgid "Running script...\n" #~ msgstr "Parancsfájl futtatása...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Mintavételezési frekvencia:" + #~ msgid "Scale:" #~ msgstr "Arányosítás:" @@ -6555,6 +6588,9 @@ msgstr "| VAGY" #~ msgid "The file " #~ msgstr "A fájl" +#~ msgid "Theme selection went wrong" +#~ msgstr "Kinézet választáskor hiba történt" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/it.po b/Languages/po/it.po index 38b130f7c2..fc10326f88 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-04-08 20:40+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" "Language: Italian\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (troppi per la visualizzazione)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Gioco : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopia%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Scollegato" @@ -155,147 +148,147 @@ msgstr "%sImporta GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocchi Liberi; %u Voci Directory Libere" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&A proposito di..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Avvia da Unità DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Punti di interruzione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Cerca ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gestore &Trucchi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&File" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Impostazioni &Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Aiuto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Impostazioni &Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carica Stato di Gioco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Gestore Memcard (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memoria" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Apri..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opzioni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Modalità in &Sola-lettura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Resetta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Suono" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Arresta" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Strumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Visualizza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -315,7 +308,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(SCONOSCIUTO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(nessuno)" @@ -323,19 +316,19 @@ msgstr "(nessuno)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -343,20 +336,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -364,25 +357,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Una finestra di Gioco-Online risulta già aperta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Al momento non c'è alcun gioco in esecuzione." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Non è stata trovata nessuna periferica supportata per il bluetooth!\n" "(Soltanto lo stack bluetooth di Microsoft è supportato.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "E' necessario inoltrare la porta TCP all'host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Scheda basata su AM" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Codici AR" @@ -432,19 +427,19 @@ msgstr "Codici AR" msgid "About Dolphin" msgstr "A proposito di Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Accellerazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulazione VBeam accurata" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -453,8 +448,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Azione" @@ -481,7 +476,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Aggiunta Codice (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -508,7 +503,7 @@ msgstr "" "Errore Action Replay: Dimensioni non valide (%08x : indirizzo = %08x) in " "operazioni di Scrittura Al Puntatore (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -516,9 +511,10 @@ msgstr "" "Memoria (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Errore Action Replay: Codice Principale a Scrittura in CCXXXXXX non " "implementate (%s)" @@ -528,27 +524,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Errore Action Replay: linea codice AR non valida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay - Codice Condizionale: Dimensioni non Valide %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo Codice Regolare %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay - Codice Regolare %i: Sottotipo %08x (%s) non valido" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay - Codice Regolare 0: Sottotipo %08x (%s) non valido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adattatore:" @@ -557,11 +553,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -569,13 +565,13 @@ msgstr "Aggiungi Patch" msgid "Add new pane" msgstr "Aggiungi nuovo riquadro" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Aggiungi..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Indirizzo:" @@ -617,52 +613,52 @@ msgstr "" "\n" "NOTA: Controlla la Finestra di Log o la Console per i valori acquisiti." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Regolare la pressione del comando analogico necessaria per attivare i " "pulsanti." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avanzate" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Impostazioni Avanzate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tutti i file (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -671,20 +667,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotropico:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -698,31 +694,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Applica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabo" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -730,13 +726,13 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -744,12 +740,12 @@ msgstr "Aspetto:" msgid "At least one pane must remain open." msgstr "Almeno un riquadro deve rimanere aperto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Interfaccia Audio:" @@ -757,26 +753,26 @@ msgstr "Interfaccia Audio:" msgid "AudioCommon: Error opening AO device.\n" msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Dimensioni Finestra:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -797,12 +793,12 @@ msgstr "Registri" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Interfaccia Audio:" @@ -821,15 +817,15 @@ msgid "Bad File Header" msgstr "File di Intestazione (Header) difettoso" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Dettagli Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -837,11 +833,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Impostazioni di Base" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Impostazioni di Base" @@ -870,42 +866,42 @@ msgstr "Blu Sinistro" msgid "Blue Right" msgstr "Blu Destro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Sotto" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controlli Associati: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Corrotto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Sfoglia" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Pulsanti" @@ -927,26 +923,16 @@ msgstr "Levetta di Controllo" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motore di Emulazione CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "Attiva Display List Caching" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -955,7 +941,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annulla" @@ -971,7 +957,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -981,7 +967,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,13 +975,13 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Impossibile trovate il WiiMote tramite bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Impossibile trovare il WiiMote attraverso l'handle di connessione %02x" @@ -1009,7 +995,7 @@ msgstr "Impossibile leggere da DVD_Plugin - Interfaccia DVD: Errore Fatale" msgid "Caps Lock" msgstr "Bloc Maiusc" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -1017,24 +1003,24 @@ msgstr "" msgid "Center" msgstr "Area Centrale" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Cambia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Cambia &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Cambia Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Cambia Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1050,14 +1036,13 @@ msgstr "Cambia segno al Parametro zFar (dopo la correzione)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Cambia segno al Parametro zNear (dopo la correzione)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "La modifica di quest'opzione non avrà alcun effetto finchè l'emulatore " "rimane attivo!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1065,48 +1050,48 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Codice Trucco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cerca Trucco" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestore Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Cinese (Semplificato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1114,7 +1099,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1122,8 +1107,8 @@ msgstr "" "Scegli il file da utilizzare come apploader: (vale per i dischi costruiti " "solo da directory)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Scegli la cartella in cui 'estrarre in'" @@ -1137,8 +1122,8 @@ msgstr "Controller Classico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Cancella" @@ -1150,22 +1135,22 @@ msgstr "" "Client disconnesso durante l'esecuzione del gioco!! La modalità di Gioco-" "Online è disabilitata. E' necessario arrestare il gioco manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Chiudi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigura..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Codice Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Codice: " @@ -1177,92 +1162,92 @@ msgstr "Comando" msgid "Comment" msgstr "Note" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Compressione ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurazione" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configura" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configura Controllo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configura Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Conferma alla Chiusura" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Collega Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Collega Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Collega Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Collega Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Collega Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Connessione in corso..." @@ -1282,12 +1267,12 @@ msgstr "Converti a GCI" msgid "Copy failed" msgstr "Copia non riuscita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copia nella Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1296,7 +1281,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Impossibile creare %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Impossibile inizializzare l'interfaccia %s." @@ -1317,12 +1302,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Impossibile riconoscere il file ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Impossibile salvare %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1345,11 +1330,11 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1357,17 +1342,17 @@ msgstr "" "Impossibile inizializzare il core.\n" "Verifica la tua configurazione." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Conteggio:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Paese:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Crea codice AR" @@ -1376,25 +1361,7 @@ msgstr "Crea codice AR" msgid "Create new perspective" msgstr "Crea nuova prospettiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Creata da KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Creata da VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Creatore: " @@ -1402,11 +1369,11 @@ msgstr "Creatore: " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Taglia Immagine lungo i Bordi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1417,12 +1384,12 @@ msgstr "" msgid "Crossfade" msgstr "Dissolvenza Incrociata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Directory corrente cambiata da %s a %s dopo wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack Proiezione Personalizzato" @@ -1430,11 +1397,11 @@ msgstr "Hack Proiezione Personalizzato" msgid "Custom Projection Hack Settings" msgstr "Impostazioni Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizza alcuni parametri di Proiezione Ortografica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Ceco" @@ -1446,37 +1413,37 @@ msgstr "" msgid "D-Pad" msgstr "Croce Direzionale" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulazione DSP HLE (veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Ricompilatore DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Origine DVD:" @@ -1488,11 +1455,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Dimensione Dati" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" @@ -1509,11 +1476,11 @@ msgstr "File Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Zona Morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1522,24 +1489,24 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Decompressione ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1548,11 +1515,11 @@ msgid "Default font" msgstr "Carattere predefinito" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Elimina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Elimina Save" @@ -1561,12 +1528,12 @@ msgstr "Elimina Save" msgid "Delete the existing file '%s'?" msgstr "Elimina l'esistente file di salvataggio '%s'" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Descrizione Vertex" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Rileva" @@ -1579,13 +1546,13 @@ msgstr "" "Individuato tentativo di leggere dal DVD più dati rispetto a quanti il " "buffer in uscita è capace di ospitarne. Bloccato." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1609,22 +1576,17 @@ msgstr "" "Falliti 'checksum' Directory\n" " e 'checksum' Directory di backup" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Disabilita Nebbia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Profondità Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1633,7 +1595,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1643,7 +1605,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1652,11 +1614,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Errore Lettura Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Aspetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1668,20 +1630,24 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin - Configurazione Video %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Sito &Web Dolphin" @@ -1689,39 +1655,39 @@ msgstr "Sito &Web Dolphin" msgid "Dolphin Configuration" msgstr "Configurazione Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote Emulato" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin - Configurazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin non trova nessuna ISO GC/Wii. Doppio click qui per cercare i file..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1729,16 +1695,21 @@ msgstr "" "Dolphin è attualmente impostato per nascondere tutti i giochi. Doppio click " "qui per mostrare tutti i giochi..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Giù" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Scarica Codici (Database WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Codici %lu scaricati. (%lu aggiunti)" @@ -1747,34 +1718,34 @@ msgstr "Codici %lu scaricati. (%lu aggiunti)" msgid "Drums" msgstr "Percussioni/Batteria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Immagazzina Oggetti EFB su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Immagazzina Fotogrammi su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Immagazzina Trame su disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1784,24 +1755,24 @@ msgstr "" "Effettua il trasferimento (dumping) delle trame di gioco in User/Dump/" "Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Olandese" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Esci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "Individua Copie EFB" @@ -1823,11 +1794,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Aggiornamenti di Memoria Preliminari" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Modifica" @@ -1835,7 +1806,7 @@ msgstr "Modifica" msgid "Edit ActionReplay Code" msgstr "Modifica Codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Modifica Configurazione" @@ -1843,12 +1814,12 @@ msgstr "Modifica Configurazione" msgid "Edit Patch" msgstr "Modifica Pacth" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Modifica prospettiva corrente" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Modifica..." @@ -1856,7 +1827,7 @@ msgstr "Modifica..." msgid "Effect" msgstr "Effetto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 #, fuzzy msgid "Embedded Frame Buffer" msgstr "Frame Buffer" @@ -1865,7 +1836,7 @@ msgstr "Frame Buffer" msgid "Emu Thread already running" msgstr "Processo dell'Emulatore già in esecuzione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1874,7 +1845,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1884,19 +1855,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote Emulato" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stato dell'Emulazione: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Attiva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1906,74 +1877,73 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Attiva BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Attiva Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Abilita Trucchi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Attiva Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Attiva Dual Core (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Attiva Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Salta pause dovute a inattività" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Salta pause dovute a inattività (aumenta la velocità)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Attiva MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Attiva WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Attiva Rappres. Vettoriale" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1986,7 +1956,7 @@ msgstr "" "Migliora la qualità visiva delle trame che si trovano sotto un angolo di " "vista obliquo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1994,11 +1964,11 @@ msgstr "" "Attivare l'accesso veloce del disco. Necessario per alcuni giochi. " "(Abilitato = Veloce, Disabilitato = Compatibile)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Attiva pagine" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2006,7 +1976,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2014,7 +1984,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2022,7 +1992,7 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2033,11 +2003,28 @@ msgstr "" "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " "= Compatibile, Disattivato = Veloce)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2045,7 +2032,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2053,7 +2040,7 @@ msgstr "" "Attiva l'Unità di Gestione della Memoria (MMU), necessaria per alcuni " "giochi. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2064,14 +2051,14 @@ msgstr "" msgid "End" msgstr "Fine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglese" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Miglioramenti" @@ -2089,17 +2076,17 @@ msgstr "Voce %d/%d" msgid "Entry 1/%d" msgstr "Voce 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Uguale" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Errore/i" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Errore caricamento della lingua selezionata. Ritorno alla predefinita di " @@ -2140,32 +2127,32 @@ msgstr "" msgid "Execute" msgstr "Esegui" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Esportazione non riuscita" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Esporta File" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Esporta Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Esporta Registrazione..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Esporta tutti i salvataggi" @@ -2181,7 +2168,7 @@ msgstr "Esporta salvataggio come..." msgid "Extension" msgstr "Estensione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "Frame Buffer" @@ -2194,44 +2181,44 @@ msgstr "Parametro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametro Extra utile solo in ''Metroid: Other M''." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Estrai Tutti i File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Estrai Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Estrai DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Estrai Directory..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Estrai File..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Estrai Partizione..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Estrazione %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Estrazione di Tutti i File" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Estrazione Directory" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Estrazione..." @@ -2239,7 +2226,7 @@ msgstr "Estrazione..." msgid "FIFO Byte" msgstr "Byte FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Lettore FIFO" @@ -2247,7 +2234,7 @@ msgstr "Lettore FIFO" msgid "FRANCE" msgstr "FRANCIA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Dimensione FST:" @@ -2255,15 +2242,15 @@ msgstr "Dimensione FST:" msgid "Failed to Connect!" msgstr "Connessione non riuscita!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Impossibile 'rimanere in ascolto'!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Download dei codici non riuscito" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Estrazione in %s non riuscita!" @@ -2385,41 +2372,41 @@ msgstr "Scrittura intestazione per %s non riuscita" msgid "Failed to write header for file %d" msgstr "Scrittura intestazione per il file %d non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Lettore Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Info File" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Il file non conteneva codici." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "File converito in .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2436,7 +2423,7 @@ msgstr "" "Il file possiede l'estensione \"%s\"\n" "le estensioni valide sono (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Il file non è riconosciuto come una memcard" @@ -2449,19 +2436,19 @@ msgstr "File non compresso" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2469,29 +2456,29 @@ msgstr "" msgid "First Block" msgstr "Primo Blocco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Ripara Somme di Controllo (Checksums)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forza 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forza 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Imposta come Console NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Forza Filtro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2504,7 +2491,7 @@ msgstr "" "Migliora la qualità delle trame (specialmente quando si utilizza una\n" "risoluzione interna elevata) ma questo provoca anomalie in alcuni giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2515,7 +2502,7 @@ msgstr "" "Forza l'uscita video del gioco per risoluzioni widescreen.\n" "Questo potrebbe causare difetti grafici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2548,44 +2535,44 @@ msgstr "Fotogramma" msgid "Frame " msgstr "Fotogramma " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Fotogramma per Fotogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "Usa FFV1 per immagazzinare i fotogrammi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Fotogramma " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Intervallo Fotogramma" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Salta &Fotogramma" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limite FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Fotogrammi da Registrare:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Visuale Libera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francese" @@ -2593,16 +2580,16 @@ msgstr "Francese" msgid "Frets" msgstr "Tasti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Da" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Schermo Intero" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Risoluzione video a Schermo Intero:" @@ -2616,7 +2603,7 @@ msgstr "File GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "Controlli GC" @@ -2624,27 +2611,27 @@ msgstr "Controlli GC" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID Gioco:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Il gioco è già in esecuzione!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Il gioco non è avviato" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Gioco non trovato!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Impostazioni di Gioco Specifiche" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configurazione di Gioco" @@ -2652,25 +2639,25 @@ msgstr "Configurazione di Gioco" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Impostazioni Controlli GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Codici Gecko" @@ -2685,21 +2672,21 @@ msgstr "" "Esecuzione Codice Gecko non riuscita (CT%i CST%i) (%s)\n" "(codice corrotto oppure tipo di codice non ancora supportato.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Generale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Tedesco" @@ -2710,19 +2697,19 @@ msgstr "" "GetARCode: Indice troppo grande rispetto alla dimensione dell'elenco dei " "codici AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Impostazioni Video" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maggiore di" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2733,7 +2720,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Greco" @@ -2753,11 +2740,11 @@ msgstr "Verde Destro" msgid "Guitar" msgstr "Chitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Chiamata a HCI_CMD_INQUIRY, per favore segnalare!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2765,7 +2752,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Somma di controllo dell'intestazione non riuscita" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Ebreo" @@ -2777,7 +2764,7 @@ msgstr "Altezza" msgid "Help" msgstr "Aiuto" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2798,11 +2785,11 @@ msgstr "" msgid "Hide" msgstr "Nascondi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Nascondi il Cursore del Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2814,8 +2801,8 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2823,17 +2810,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configurazione Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Tasti di Scelta Rapida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungherese" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Ibrido" @@ -2861,7 +2848,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Impostazioni IPL" @@ -2869,19 +2856,19 @@ msgstr "Impostazioni IPL" msgid "IR" msgstr "Puntamento IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Puntatore a raggi infrarossi (IR)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilità IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Directory ISO" @@ -2893,20 +2880,20 @@ msgstr "ITALIA" msgid "Icon" msgstr "Icona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se il framerate risulta incoerente o incostante, questa opzione potrebbe " "porre rimedio. (Attivo = Compatibile, Disabilitato = Veloce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2917,12 +2904,12 @@ msgstr "" "bisogna disabilitare l'Autoregolazione Audio in DSP per rendere efficace " "l'impostazione." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Emula i Cambiamenti di Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2931,7 +2918,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2940,7 +2927,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Salva Importazione" @@ -2948,7 +2935,7 @@ msgstr "Salva Importazione" msgid "Import failed, try again?" msgstr "Importazione non riuscita, riprovare?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2956,11 +2943,11 @@ msgstr "" "Il file importato possiede l'estensione .gsc\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Il file importato ha una dimensione non valida" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2968,7 +2955,7 @@ msgstr "" "Il file importato possiede l'estensione .sav\n" "ma non una corretta intestazione" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2979,16 +2966,16 @@ msgstr "" "Disabilita nebbia. Migliora le prestazioni ma provoca difetti nei giochi che " "richiedono l'effetto nebbia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -2996,7 +2983,7 @@ msgstr "Info" msgid "Information" msgstr "Informazioni" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Input" @@ -3008,7 +2995,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3016,11 +3003,11 @@ msgstr "Inserisci SD Card" msgid "Insert name here.." msgstr "Inserire il nome qui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3031,35 +3018,35 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Installazione WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3080,16 +3067,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Errore Interno LZO - lzo_init() non riuscita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Risoluzione video a Schermo Intero:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interprete (molto lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3098,11 +3085,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Dimensione non Valida(%x) o Password (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valore non Valido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map o voce directory non valide" @@ -3126,7 +3113,7 @@ msgstr "" "%s\n" " E' possibile che sia necessario il redumping del gioco." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "File di registrazione non valido" @@ -3134,21 +3121,21 @@ msgstr "File di registrazione non valido" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Stato non valido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3156,16 +3143,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "GIAPPONE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Ricompilatore JIT (consigliato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Ricompilatore JITIL sperimentale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Giapponese" @@ -3173,7 +3160,7 @@ msgstr "Giapponese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3181,17 +3168,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Combinaz. Tasti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3209,19 +3196,23 @@ msgstr "Pulsante L" msgid "L-Analog" msgstr "L-Analogico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Ultimo stato di gioco sovrascritto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Ultimo stato di gioco salvato" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3231,8 +3222,8 @@ msgstr "Sinistra" msgid "Left Stick" msgstr "Levetta Sinistra" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3240,7 +3231,7 @@ msgstr "" "Click sinistro del mouse per rilevare l'identità del tasto premuto.\n" "Premi 'spazio' per cancellare." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3250,7 +3241,7 @@ msgstr "" "Click centrale del mouse per cancellare.\n" "Click destro del mouse per altre opzioni." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3258,78 +3249,78 @@ msgstr "" "Click sinistro/destro per altre opzioni.\n" "Click Centrale del mouse per cancellare." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Minore di" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Carica Trame ad Alta Risoluzione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carica Stato di Gioco dall'Ingresso 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carica Stato di Gioco dall'Ingresso 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carica Stato di Gioco dall'Ingresso 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carica Stato di Gioco dall'Ingresso 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carica Stato di Gioco dall'Ingresso 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carica Stato di Gioco dall'Ingresso 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carica Stato di Gioco dall'Ingresso 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carica Stato di Gioco dall'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3343,32 +3334,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carica valori preimpostati dai modelli hack disponibili." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Locale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "Blocca processi ai nuclei" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configurazione Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipi di Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3376,12 +3362,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Destinazione Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Registrazione Eventi" @@ -3402,7 +3388,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3416,24 +3402,24 @@ msgstr "File MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Levetta Principale" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID Produttore:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Produttore:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "La Memcard possiede già un salvataggio per questo titolo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "La Memcard è già aperta" @@ -3442,7 +3428,7 @@ msgid "Memory Byte" msgstr "Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Scheda di Memoria" @@ -3479,21 +3465,21 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3502,7 +3488,7 @@ msgstr "Impostazioni Varie" msgid "Modifier" msgstr "Modificatore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3523,7 +3509,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3538,7 +3524,7 @@ msgstr "" msgid "Multiply" msgstr "*" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3636,16 +3622,16 @@ msgstr "TN Tab" msgid "NP Up" msgstr "TN Su" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome: " @@ -3654,20 +3640,20 @@ msgstr "Nome: " msgid "Native GCI files(*.gci)" msgstr "File GCI nativi(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nuova Ricerca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Pagina Successiva" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Ricerca Successiva" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Pseudonimo:" @@ -3675,7 +3661,7 @@ msgstr "Pseudonimo:" msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Nessun ISO o WAD trovata" @@ -3697,7 +3683,7 @@ msgstr "Nessun aggancio" msgid "No file loaded" msgstr "Nessun file caricato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Nessuna voce di directory libera" @@ -3710,33 +3696,33 @@ msgstr "Nessun file registrato" msgid "No save folder found for title %s" msgstr "Nessuna cartella di salvataggio trovata per il titolo %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nessuno/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norvegese" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Diverso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Non Impostato" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Non collegato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Note" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Note: " @@ -3745,7 +3731,7 @@ msgstr "Note: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Avviso/i" @@ -3753,16 +3739,16 @@ msgstr "Avviso/i" msgid "Num Lock" msgstr "Bloc Num" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Numero Di Codici:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Accelerazione Nunchuk" @@ -3770,11 +3756,11 @@ msgstr "Accelerazione Nunchuk" msgid "Object" msgstr "Oggetto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Intervallo Oggetto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Spento" @@ -3782,53 +3768,53 @@ msgstr "Spento" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Solo %d blocchi disponibili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Apri file..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: impossibile creare il contesto per il dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: impossibile trovare la periferica audio" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: impossibile aprire il dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 #, fuzzy msgid "OpenCL Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" @@ -3841,7 +3827,7 @@ msgstr "Opzioni" msgid "Orange" msgstr "Arancione" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3853,8 +3839,8 @@ msgstr "" "successivamente eseguire l'importazione di questi ultimi in una nuova " "memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3866,19 +3852,19 @@ msgstr "" "Altro client disconnesso a gioco in corso!! La modalità di Gioco-Online " "viene disabilitata. Arrestare manualmente il gioco." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Output" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "&Avvia Riproduzione Registrazione..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3894,7 +3880,7 @@ msgstr "Pag Giù" msgid "Page Up" msgstr "Pag Su" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Abbina" @@ -3906,35 +3892,35 @@ msgstr "Paragrafo" msgid "Parameters" msgstr "Parametri" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partizione %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Illuminazione Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfetto" @@ -3943,36 +3929,36 @@ msgstr "Perfetto" msgid "Perspective %d" msgstr "Prospettiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Gioca" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Avvia Riproduzione Registrazione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Gioca/Pausa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Giocabile" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opzioni di Riproduzione" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -3984,55 +3970,55 @@ msgstr "Si prega di creare un prospettiva prima di salvare" msgid "Plus-Minus" msgstr "Più-Meno" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Porta 4:" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portoghese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4045,11 +4031,11 @@ msgstr "Preimpostazioni: " msgid "Prev Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Pagina Precedente" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valore Precedente" @@ -4057,7 +4043,7 @@ msgstr "Valore Precedente" msgid "Print" msgstr "Stamp" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profilo" @@ -4065,7 +4051,7 @@ msgstr "Profilo" msgid "Properties" msgstr "Proprietà" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Pulisci Cache" @@ -4073,8 +4059,8 @@ msgstr "Pulisci Cache" msgid "Question" msgstr "Conferma" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Esci" @@ -4092,7 +4078,7 @@ msgstr "Pulsante R" msgid "R-Analog" msgstr "R-Analogico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4100,48 +4086,48 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Gamma" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modalità in Sola-lettura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Reale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Reale" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Wiimote Reale" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Conferma Ricollegamento Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Ricollega Wiimote al caricamento di uno Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Registra" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Info di Registrazione" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opzioni di Registrazione" @@ -4157,7 +4143,7 @@ msgstr "Rosso Sinistro" msgid "Red Right" msgstr "Rosso Destro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4171,29 +4157,29 @@ msgstr "" "Questo produce contorni e immagini meno spigolose, ma riduce pesantemente le " "prestazioni." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Aggiorna" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Aggiorna Elenco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Aggiorna elenco giochi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Rimuovi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4203,17 +4189,17 @@ msgstr "" "Renderizza la scena in modalità vettoriale (wireframe).\n" "Utile solo per il debug." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Rendering nella finestra Principale" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Resetta" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Risultati" @@ -4235,29 +4221,25 @@ msgstr "Levetta Destra" msgid "Rumble" msgstr "Vibrazione" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Esegui DSP LLE in un thread dedicato (non raccomandato)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sa&lva Stato di Gioco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Accurata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Frequenza di Campionamento:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Salva" @@ -4265,91 +4247,91 @@ msgstr "Salva" msgid "Save GCI as..." msgstr "Salva GCI come.." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Salva Stato di Gioco nell'Ingresso 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Salva Stato di Gioco nell'Ingresso 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Salva Stato di Gioco nell'Ingresso 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Salva Stato di Gioco nell'Ingresso 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Salva Stato di Gioco nell'Ingresso 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Salva Stato di Gioco nell'Ingresso 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Salva Stato di Gioco nell'Ingresso 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Salva Stato di Gioco nell'Ingresso 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Salva Stato di Gioco..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Istantanea" @@ -4357,24 +4339,24 @@ msgstr "Istantanea" msgid "Scroll Lock" msgstr "Bloc Scroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Cerca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 #, fuzzy msgid "Search for hex Value:" msgstr "&Cerca per un op" @@ -4386,20 +4368,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sezione %s non trovata in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleziona" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4417,23 +4399,23 @@ msgstr "Seleziona un file da importare" msgid "Select floating windows" msgstr "Seleziona finestre libere/mobili" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4451,11 +4433,16 @@ msgstr "" "- Adatta a finestra: Estende l'immagine per adattarsi alle dimensioni della " "finestra." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "il file \"%s\" specificato non esiste" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Carattere selezionato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4465,7 +4452,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4475,11 +4462,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Invia" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posizione della Barra a Sensori: " @@ -4487,26 +4474,26 @@ msgstr "Posizione della Barra a Sensori: " msgid "Separator" msgstr "Separatore" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Porta seriale 1 - Questa è la porta per i dispositivi come l' adattatore/" "scheda di rete" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Imposta %c come Memcard predefinita" @@ -4518,11 +4505,17 @@ msgstr "" "SetARCode_IsActive: Indice troppo grande rispetto alla dimensione " "dell'elenco dei codici AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Impostazioni..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" @@ -4530,7 +4523,7 @@ msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" msgid "Shake" msgstr "Scuoti" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nome breve:" @@ -4539,107 +4532,107 @@ msgstr "Nome breve:" msgid "Shoulder Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostra &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostra Finestra di &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostra Barra di &Stato" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostra Barra degli St&rumenti" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostra Unità a Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Individua Copie EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostra FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostra Francia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostra GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostra Tasti di Input" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostra Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostra JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostra Corea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostra Lingua:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostra &Configurazione Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostra PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostra Piattaforme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostra Regioni" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Statistiche" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostra Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostra USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostra Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostra Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostra una messaggio di conferma prima di arrestare un gioco." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4649,39 +4642,39 @@ msgstr "" "potrà accadere che Dolphin improvvisamente incorra in un crash senza nessuna " "apparente spiegazione." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostra primo blocco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostra blocchi salvati" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostra commento salvato" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostra icona salvata" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostra titolo salvato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4689,11 +4682,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostra sconosciuto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4704,29 +4697,29 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Cinese Semplificato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Disabilita Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4734,7 +4727,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4744,17 +4737,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Ingresso B" @@ -4762,7 +4755,7 @@ msgstr "Ingresso B" msgid "Snapshot" msgstr "Stamp" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4774,11 +4767,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Impostazioni Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "L'interfaccia audio %s non è valida." @@ -4792,17 +4785,17 @@ msgstr "Creazione buffer audio non riuscita: %s" msgid "Space" msgstr "Spazio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spagnolo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume Altoparlante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4814,7 +4807,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumenta la velocità di trasferimento del Disco" @@ -4822,51 +4815,55 @@ msgstr "Aumenta la velocità di trasferimento del Disco" msgid "Square Stick" msgstr "Levetta Quadrata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Controller Standard" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Avvia Gioco-&Online" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Avvia Re&gistrazione" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Avvia Registrazione" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Stato" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Stati di Gioco" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Levetta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Arresta" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4875,7 +4872,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Adatta a Finestra" @@ -4900,8 +4897,8 @@ msgstr "Seleziona il file di salvataggio" msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -4909,7 +4906,7 @@ msgstr "Lingua di Sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4931,31 +4928,31 @@ msgstr "Semipiano sinistro" msgid "Table Right" msgstr "Semipiano destro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Genera un'Istantanea di Gioco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Prova" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Cmd Trama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Formato Trama" @@ -4972,13 +4969,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5000,7 +4997,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Il file %s è già stato aperto, il file di intestazione non verrà scritto." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Il file %s specificato non esiste" @@ -5017,7 +5014,7 @@ msgstr "Il nome non può contenere il carattere ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5025,13 +5022,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Il file di salvataggio che si sta provando a copiare ha una dimensione non " "valida" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5064,14 +5061,11 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "La selezione del Tema non era corretta" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5080,7 +5074,7 @@ msgstr "" "Un punto di ingresso in 00000001/00000002 deve essere presente. Dumping NAND " "probabilmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5096,13 +5090,13 @@ msgid "" msgstr "" "Questo simulatore di action replay non supporta codici automodificanti." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Ciò potrebbe causare rallentamenti all'interno del Menu Wii e in alcuni " "giochi." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5113,7 +5107,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5127,7 +5121,7 @@ msgstr "" "Migliora la velocità sui PC con più di un core,\n" "ma può anche provocare occasionali crash/difetti." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" "Questo vi permetterà di modificare manualmente il file di configurazione INI" @@ -5142,35 +5136,35 @@ msgid "Tilt" msgstr "Inclina" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Titolo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Seleziona/Deseleziona tutti i Tipi di Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Commuta a Schermo Intero" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Sopra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Cinese Tradizionale" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Tentativo di caricamento di un tipo di file sconosciuto." @@ -5190,7 +5184,7 @@ msgstr "" "Tentativo di accesso da una SYSCONF non valida\n" "Gli identificativi Wiimote bt non sono disponibili" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5202,12 +5196,12 @@ msgstr "Giradischi da DJ" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5238,12 +5232,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i non definito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Annulla Caricamento Stato di Gioco" @@ -5251,7 +5245,7 @@ msgstr "Annulla Caricamento Stato di Gioco" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Sconosciuto" @@ -5282,8 +5276,8 @@ msgstr "" msgid "Up" msgstr "Su" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aggiorna" @@ -5291,24 +5285,24 @@ msgstr "Aggiorna" msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Schermo Intero" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usa Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Avvisi di Errore" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5316,7 +5310,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5325,15 +5319,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilità" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valore" @@ -5341,23 +5335,23 @@ msgstr "Valore" msgid "Value:" msgstr "Valore:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valore: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verboso" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volume" @@ -5372,7 +5366,7 @@ msgstr "Installazione WAD non riuscita: errore nella creazione di %s" msgid "WAD installation failed: error creating ticket" msgstr "Installazione WAD non riuscita: errore nella creazione di %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5381,16 +5375,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Allarme/i" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Attenzione - avvio DOL in modalità console errata!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Attenzione - avvio ELF in modalità console errata!" @@ -5424,7 +5418,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5432,7 +5426,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5440,7 +5434,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5460,7 +5454,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaweFileWriter - file non aperto." @@ -5468,7 +5462,7 @@ msgstr "WaweFileWriter - file non aperto." msgid "Whammy" msgstr "Tremolo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack Widescreen" @@ -5476,24 +5470,24 @@ msgstr "Hack Widescreen" msgid "Width" msgstr "Larghezza" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5501,17 +5495,17 @@ msgstr "Salva i file Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Impossibile leggere dal file" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5524,19 +5518,19 @@ msgstr "" " o forse è dovuto ad altri motivi. \n" "Vuoi riconnettersi immediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Collegato" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Vibrazione Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Impostazioni Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5557,27 +5551,27 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Attività in corso..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Scrivi nella Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Scrivi su File" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Scrivi su File" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Scrivi in Finestra" @@ -5614,23 +5608,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Non è possibile chiudere riquadri che hanno pagine al loro interno" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "E' necessario selezionare un gioco!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "E' richiesto l'inserimento di un nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -5654,7 +5648,7 @@ msgstr "" "Dovrebbe essere 0x%04x (invece di 0x%04llx)\n" "Desideri generarne uno nuovo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Hack ZTP" @@ -5667,12 +5661,12 @@ msgstr "Zero 3 codice non supportato" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero codice sconosciuto per dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ attesa ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5684,7 +5678,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizzata]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5695,7 +5689,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5704,11 +5698,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5725,7 +5719,7 @@ msgstr "accesso non riuscito ai dati dal file: %s" msgid "failed to read header" msgstr "accesso all'intestazione non riuscito" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lettura Opcode da %x. Per favore segnalare." @@ -5746,7 +5740,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -5758,7 +5752,7 @@ msgstr "Correzione zFar: " msgid "zNear Correction: " msgstr "Correzione zNear: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" @@ -5774,6 +5768,9 @@ msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Add function" #~ msgstr "&Aggiunge funzione" @@ -6092,6 +6089,21 @@ msgstr "| OR" #~ msgid "Count: %i" #~ msgstr "Totale: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Creata da KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Creata da Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Creata da VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Creata da black_rider e pubblicata su ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList" @@ -6107,6 +6119,10 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "Disabilita Illuminazione" +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Profondità Pixel" + #~ msgid "Disable Textures" #~ msgstr "Disabilita Trame" @@ -6404,6 +6420,10 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Carica il file specificato (DOL, ELF, GCM, ISO, WAD)" +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "Blocca processi ai nuclei" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Audio LLE (a basso livello) o HLE (ad alto livello)" @@ -6531,6 +6551,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Esecuzione script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Frequenza di Campionamento:" + #~ msgid "Save code" #~ msgstr "Salva codice" @@ -6682,6 +6705,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Il file" +#~ msgid "Theme selection went wrong" +#~ msgstr "La selezione del Tema non era corretta" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 99f8a5c7db..1edfb77bfe 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-19 12:29+0900\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: \n" "Language-Team: \n" "Language: Japanese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(該当数ãŒå¤šã™ãŽã¾ã™)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "タイトル：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! (...ã§ç„¡ã„)" @@ -54,14 +54,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$s コピー %1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "接続数 %i 個" @@ -156,147 +149,147 @@ msgstr "%s インãƒãƒ¼ãƒˆ GCI %s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u ブロック空ã | %u エントリ空ã" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& (...ã¨...)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Dolphinã«ã¤ã„ã¦(&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVDドライブã‹ã‚‰èµ·å‹•(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "ブレークãƒã‚¤ãƒ³ãƒˆ(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ISOファイルã®ã‚るフォルダをé¸æŠž(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "エミュレーション(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "ファイル(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Frame Advance(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "全画é¢è¡¨ç¤º(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "グラフィック設定(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "ヘルプ(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "ホットキーã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "ステートロード(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GCメモリーカードマãƒãƒ¼ã‚¸ãƒ£(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memory" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "é–‹ã(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "設定(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "一時åœæ­¢(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "プロパティ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "ゲームリストをå†æ›´æ–°(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "レジスタ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "リセット(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "サウンド(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "ツール(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "æç”»(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "表示(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" @@ -316,7 +309,7 @@ msgstr "補正有効" msgid "(UNKNOWN)" msgstr "(ä¸æ˜Ž)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "オフ" @@ -324,19 +317,19 @@ msgstr "オフ" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ビット" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ビット" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ビット" @@ -344,20 +337,20 @@ msgstr "8 ビット" msgid "" msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<対応ã§ãる解åƒåº¦ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "入力を待機..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "＜システムã®è¨€èªžï¼ž" @@ -365,25 +358,27 @@ msgstr "＜システムã®è¨€èªžï¼ž" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ãƒãƒƒãƒˆãƒ—レイウィンドウã¯ã™ã§ã«é–‹ã‹ã‚Œã¦ã„ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ゲームã¯ç¾åœ¨ã€èµ·å‹•ã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "サãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹Bluetoothデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ\n" "(Microsoft製Bluetoothスタックã®ã¿ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -416,13 +411,13 @@ msgstr "" "\n" "TCPãƒãƒ¼ãƒˆã®é–‹æ”¾ã‚’忘れãšã«ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "Triforce基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "アクションリプレイコード" @@ -430,19 +425,19 @@ msgstr "アクションリプレイコード" msgid "About Dolphin" msgstr "Dolphinã«ã¤ã„ã¦" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "精度：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -455,8 +450,8 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Texture】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "動作" @@ -482,7 +477,7 @@ msgid "" msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Add Code (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -509,15 +504,16 @@ msgstr "" "Action Replay エラー: ä¸æ­£ãªã‚µã‚¤ã‚º (%08x : address = %08x) in Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay エラー: ä¸æ­£ãªå€¤ (%08x) in Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "エラー: マスターコードã€ã¾ãŸã¯ CCXXXXXX ã¸ã®æ›¸ãè¾¼ã¿ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“ (%s)" @@ -526,27 +522,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "エラー: 無効ãªã‚³ãƒ¼ãƒ‰ ライン： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: æ¡ä»¶ä»˜ãコード: ä¸æ­£ãªã‚µã‚¤ã‚º %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: ä¸æ­£ãªç¨®é¡žã®é€šå¸¸ã‚³ãƒ¼ãƒ‰ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: 通常コード %i: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: 通常コード 0: ä¸æ­£ãªã‚µãƒ–タイプ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "ビデオカード：" @@ -555,11 +551,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -567,13 +563,13 @@ msgstr "パッãƒã‚’追加" msgid "Add new pane" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "追加" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "接続先：" @@ -611,48 +607,48 @@ msgstr "" "\n" "補足：å–得値ã¯ãƒ­ã‚°ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ï¼ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã§ç¢ºèªã—ã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "ボタンãŒåå¿œã™ã‚‹æ„Ÿåº¦ã‚’調整ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "高度ãªè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -664,19 +660,19 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "分æž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "異方性フィルタリング：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚¹ï¼š" @@ -689,15 +685,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -707,16 +703,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ã‚ªãƒ•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "アラビア語" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -724,12 +720,12 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -737,12 +733,12 @@ msgstr "アスペクト比：" msgid "At least one pane must remain open." msgstr "At least one pane must remain open." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -750,24 +746,24 @@ msgstr "出力API (Audio Backend)" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Error opening AO device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "自動 (ゲーム解åƒåº¦ã®å€æ•°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "自動 (ウィンドウサイズã«æ‹¡å¤§)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "ウィンドウサイズを自動調整" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -789,12 +785,12 @@ msgstr "" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "出力設定" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "æç”»API：" @@ -812,15 +808,15 @@ msgid "Bad File Header" msgstr "ファイルヘッダã®ä¸è‰¯" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "ãƒãƒŠãƒ¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "ãƒãƒŠãƒ¼ã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" @@ -828,11 +824,11 @@ msgstr "ãƒãƒŠãƒ¼è¡¨ç¤º" msgid "Bar" msgstr "ãƒãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本設定" @@ -860,42 +856,42 @@ msgstr "é’ - å·¦" msgid "Blue Right" msgstr "é’ - å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "下部" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "コマンド数: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "ダメダメ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "ボタン" @@ -916,31 +912,15 @@ msgstr "C-スティック" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPUエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"3Dグラフィックスã®æ·±åº¦å€¤è¨ˆç®—を頂点ã”ã¨ã§ã¯ãªãピクセルã”ã¨ã«è¡Œã„ã¾ã™ã€‚\n" -"Per-Pixel LightingãŒå˜ãªã‚‹ç”»è³ªå‘上機能ã ã£ãŸã®ã¨ã¯å¯¾ç…§çš„ã«ã€\n" -"Per-Pixel Depthã¯ç‰¹å®šã®ã‚²ãƒ¼ãƒ ã‚’æ­£ã—ãエミュレートã™ã‚‹ãŸã‚ã« å¿…è¦ãªæ©Ÿèƒ½ã§" -"ã™ã€‚\n" -"\n" -"よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -954,7 +934,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "キャンセル" @@ -970,7 +950,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -981,7 +961,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -989,12 +969,12 @@ msgstr "" "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“。\n" "両方ã®ã‚¹ãƒ­ãƒƒãƒˆã§åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—よã†ã¨ã—ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Cant find WiiMote by connection handle %02x" @@ -1008,7 +988,7 @@ msgstr "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "カタルーニャ語" @@ -1017,24 +997,24 @@ msgstr "カタルーニャ語" msgid "Center" msgstr "Center" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "変更" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ(&D)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ディスクã®å…¥ã‚Œæ›¿ãˆ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ゲームを変更" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1052,12 +1032,11 @@ msgstr "Changes sign to zFar Parameter (after correction)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Changes sign to zNear Parameter (after correction)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "ã“ã®è¨­å®šã¯æ¬¡å›žã®ã‚²ãƒ¼ãƒ é–‹å§‹æ™‚ã«å映ã•ã‚Œã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "ãƒãƒ£ãƒƒãƒˆæ¬„" @@ -1065,47 +1044,47 @@ msgstr "ãƒãƒ£ãƒƒãƒˆæ¬„" msgid "Cheat Code" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "コードサーãƒ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "パーティションã®æ•´åˆæ€§ã‚’ãƒã‚§ãƒƒã‚¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "ãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1113,7 +1092,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1121,8 +1100,8 @@ msgstr "" "apploaderã¨ã—ã¦ä½¿ç”¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžï¼š(フォルダã‹ã‚‰ã®ã¿æ§‹ç¯‰ã•ã‚ŒãŸãƒ‡ã‚£ã‚¹ã‚¯ã«" "é©ç”¨ã•ã‚Œã¾ã™)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "ä¿å­˜å…ˆã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" @@ -1136,8 +1115,8 @@ msgstr "クラシックコントローラ" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "全消去" @@ -1149,22 +1128,22 @@ msgstr "" "クライアントã¨ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸï¼ãƒãƒƒãƒˆãƒ—レイã¯ç¾åœ¨ç„¡åŠ¹ã§ã™ã€‚ゲームをåœ" "æ­¢ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "é–‰ã˜ã‚‹" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Dolphin本体ã®è¨­å®š(&N)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "コードã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "コード：" @@ -1176,91 +1155,91 @@ msgstr "Command" msgid "Comment" msgstr "コメント" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "本体設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "設定" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "コントロールã®è¨­å®š" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "パッド設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "%iPã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "1Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "2Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "3Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "4Pã®Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "接続中..." @@ -1280,12 +1259,12 @@ msgstr "GCIファイルã«å¤‰æ›" msgid "Copy failed" msgstr "コピーã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "メモリーカード%cã«ã‚³ãƒ”ー" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "コア" @@ -1294,7 +1273,7 @@ msgstr "コア" msgid "Could not create %s" msgstr "%s を作æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Could not initialize backend %s." @@ -1315,12 +1294,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ISOファイル %s ã‚’èªè­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s をセーブã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1341,11 +1320,11 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1353,17 +1332,17 @@ msgstr "" "コアをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" "設定を確èªã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "該当：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "発売国" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "アクションリプレイコードを作æˆ" @@ -1372,25 +1351,7 @@ msgstr "アクションリプレイコードを作æˆ" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Created by KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Created by VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Created by black_rider and published on ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "制作者： " @@ -1398,11 +1359,11 @@ msgstr "制作者： " msgid "Critical" msgstr "致命的ãªã‚¨ãƒ©ãƒ¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "クロッピング" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1417,12 +1378,12 @@ msgstr "" msgid "Crossfade" msgstr "クロスフェーダー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1430,11 +1391,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Custom Projection Hackã®è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" @@ -1446,36 +1407,36 @@ msgstr "D" msgid "D-Pad" msgstr "å字キー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP-HLE エミュレーション (高速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP-LLE リコンパイラ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVDルート" @@ -1487,11 +1448,11 @@ msgstr "DVDLowRead - Fatal Error: failed to read from volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "データサイズ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "発売日" @@ -1508,11 +1469,11 @@ msgstr "Datel MaxDrive/Pro セーブファイル(*.sav)" msgid "Dead Zone" msgstr "'éŠã³'ã®èª¿æ•´" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "デãƒãƒƒã‚°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" @@ -1520,24 +1481,24 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "復元中..." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1546,11 +1507,11 @@ msgid "Default font" msgstr "既定ã®ãƒ•ã‚©ãƒ³ãƒˆ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "削除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" @@ -1559,11 +1520,11 @@ msgstr "ã“ã®ã‚»ãƒ¼ãƒ–データを削除" msgid "Delete the existing file '%s'?" msgstr "既存ファイル '%s' を削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "説明" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "検出" @@ -1577,13 +1538,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1607,20 +1568,16 @@ msgstr "" "ディレクトリã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«å¤±æ•—\n" "ディレクトリãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã«ã‚‚失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "無効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Disable Fog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Disable Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1634,7 +1591,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1649,7 +1606,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "ディスク" @@ -1658,11 +1615,11 @@ msgstr "ディスク" msgid "Disc Read Error" msgstr "ディスク読ã¿å–りエラー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "表示設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1676,20 +1633,24 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s グラフィック設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin Webサイト(&W)" @@ -1697,32 +1658,32 @@ msgstr "Dolphin Webサイト(&W)" msgid "Dolphin Configuration" msgstr "Dolphinã®è¨­å®š" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Wiiリモコンã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状æ³(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1730,7 +1691,7 @@ msgstr "" "ゲームリストã¯ç©ºã§ã™ã€‚ã“ã®æ–‡ç« ã‚’ダブルクリックã—㦠GC/Wii ã®ISO ã¾ãŸã¯ WBFS " "ã‚‚ã—ã㯠WADファイルã®ã‚るフォルダをé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1738,16 +1699,21 @@ msgstr "" "リスト中ã®å…¨ã¦ã®ã‚²ãƒ¼ãƒ ãŒè¨­å®šã«ã‚ˆã‚Šè¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“。ã“ã®æ–‡ç« ã‚’ダブルクリッ" "クã™ã‚‹ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Webã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’入手 (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" @@ -1756,27 +1722,27 @@ msgstr "%lu個ã®ã‚³ãƒ¼ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚( æ–°è¦è¿½åŠ ï¼š %lu個 )" msgid "Drums" msgstr "ドラムコントローラ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFBターゲットをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "フレームをダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "テクスãƒãƒ£ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1787,7 +1753,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1797,7 +1763,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1807,17 +1773,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "オランダ語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "終了" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" @@ -1837,11 +1803,11 @@ msgstr "" msgid "EUROPE" msgstr "欧州" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "編集" @@ -1849,7 +1815,7 @@ msgstr "編集" msgid "Edit ActionReplay Code" msgstr "コードを編集" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "iniを編集" @@ -1857,12 +1823,12 @@ msgstr "iniを編集" msgid "Edit Patch" msgstr "パッãƒã‚’編集" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "編集" @@ -1870,7 +1836,7 @@ msgstr "編集" msgid "Effect" msgstr "エフェクト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" @@ -1878,7 +1844,7 @@ msgstr "Embedded Frame Buffer (内蔵フレームãƒãƒƒãƒ•ã‚¡)" msgid "Emu Thread already running" msgstr "エミュレーションスレッドã¯ã™ã§ã«ç¨¼åƒä¸­ã§ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1892,7 +1858,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Virtual】をé¸æŠžã—ãŸã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1909,19 +1875,19 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wii リモコンをエミュレート" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "動作状æ³ï¼š" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "有効" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1937,72 +1903,71 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Enable BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Enable Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Enable Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Enable Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "デュアルコア動作を行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "ホットキーを使用" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Enable Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "アイドルスキップ処ç†ã‚’行ㆠ(速度å‘上)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Enable MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Enable WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "ワイヤーフレーム有効化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2016,7 +1981,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2024,11 +1989,11 @@ msgstr "" "ディスクã®èª­ã¿å–り速度をå‘上ã•ã›ã¾ã™ã€‚å¿…è¦ã«ãªã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã¯ã‚ãšã‹ã§ã™ [有効ï¼" "ロード時間短縮ï¼ç„¡åŠ¹ï¼äº’æ›æ€§ãƒ»å®‰å®šæ€§é‡è¦–]" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "ページ分ã‘ã—ã¦è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2040,7 +2005,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2051,7 +2016,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2059,7 +2024,7 @@ msgstr "" "トワイライトプリンセスã«ãŠã„ã¦ã€åºƒå¤§ãªã‚¨ãƒªã‚¢ã§ç™ºç”Ÿã™ã‚‹FPS低下を抑ãˆã¾ã™ã€‚ä»–ã®" "タイトルã§ã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2069,11 +2034,28 @@ msgstr "" "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" "速度å‘上]" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2085,7 +2067,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2093,7 +2075,7 @@ msgstr "" "メモリ管ç†æ©Ÿæ§‹ã‚’有効ã«ã—ã¾ã™ã€‚ã„ãã¤ã‹ã®ã‚²ãƒ¼ãƒ ã§å¿…è¦ã§ã™ [有効ï¼äº’æ›æ€§ãƒ»å®‰å®š" "性é‡è¦–ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2107,14 +2089,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "英語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "画質å‘上ã®è¨­å®š" @@ -2132,17 +2114,17 @@ msgstr "エントリ %d/%d" msgid "Entry 1/%d" msgstr "エントリ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "ã«ä¸€è‡´ã™ã‚‹" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "エラー" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "é¸æŠžã—ãŸè¨€èªžã®èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚＜システムã®è¨€èªžï¼žã«è¨­å®šã‚’戻ã—ã¾ã™" @@ -2180,32 +2162,32 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "ファイルを抽出" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "å…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆ" @@ -2221,7 +2203,7 @@ msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" msgid "Extension" msgstr "拡張コントローラ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "External Frame Buffer (外部フレームãƒãƒƒãƒ•ã‚¡)" @@ -2233,44 +2215,44 @@ msgstr "特殊パラメータ" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "『メトロイド Other Mã€ã®ã¿ã«æœ‰ç”¨ãªè¨­å®šã§ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploaderを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOLを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "ã“ã®ãƒ‘ーティションを抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s を抽出" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’エクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "抽出ã—ã¦ã„ã¾ã™..." @@ -2278,7 +2260,7 @@ msgstr "抽出ã—ã¦ã„ã¾ã™..." msgid "FIFO Byte" msgstr "FIFO ãƒã‚¤ãƒˆ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO プレーヤー" @@ -2286,7 +2268,7 @@ msgstr "FIFO プレーヤー" msgid "FRANCE" msgstr "フランス" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FSTサイズ" @@ -2294,15 +2276,15 @@ msgstr "FSTサイズ" msgid "Failed to Connect!" msgstr "接続ã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Listenã«å¤±æ•—ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "コードã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s ã¸ã®æŠ½å‡ºã«å¤±æ•—" @@ -2420,19 +2402,19 @@ msgstr "Failed to write header for %s" msgid "Failed to write header for file %d" msgstr "Failed to write header for file %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "ペルシア語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2440,23 +2422,23 @@ msgstr "" "致命的ãªdesyncãŒç™ºç”Ÿã—ãŸãŸã‚å†ç”Ÿã‚’中止ã—ã¾ã™ã€‚ (Error in PlayWiimote: %u != " "%u, byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "FIFO プレーヤー" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "ファイル情報" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "コードをå«ã¾ãªã„ファイルã§ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "ファイルã¯GCIã¸å¤‰æ›ã•ã‚Œã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2473,7 +2455,7 @@ msgstr "" "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µå­ã¯ \"%s\" ã§ã™\n" "有効ãªæ‹¡å¼µå­ã¯ .raw/.gcp ã§ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ã¨ã—ã¦èªè­˜ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ" @@ -2486,19 +2468,19 @@ msgstr "圧縮ã•ã‚Œã¦ã„ãªã„ファイル" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Unknown open mode : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "次ã¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "å‰ã¸" @@ -2506,27 +2488,27 @@ msgstr "å‰ã¸" msgid "First Block" msgstr "ブロック開始ä½ç½®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã‚’修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "強制的㫠16:9 ã«ã™ã‚‹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "強制的㫠4:3 ã«ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "コンソールを日本å‘ã‘ (NTSC-J) ã«è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Force Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2540,7 +2522,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2552,7 +2534,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2589,42 +2571,42 @@ msgstr "フレーム" msgid "Frame " msgstr "フレーム" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "FFV1を使用ã—ã¦ãƒ•ãƒ¬ãƒ¼ãƒ ã‚’ダンプ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "フレームã®æƒ…å ±" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "フレームã®ç¯„囲" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "フレームスキップ(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "フレームリミット：" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "録画フレーム数設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "フリールック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "フランス語" @@ -2632,16 +2614,16 @@ msgstr "フランス語" msgid "Frets" msgstr "フレットボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "開始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "全画é¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "全画é¢è¡¨ç¤ºæ™‚ã®è§£åƒåº¦ï¼š" @@ -2653,7 +2635,7 @@ msgstr "GCI ファイル (*.gci)" msgid "GCMic Configuration" msgstr "マイクã®è¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "入力(GC)" @@ -2661,27 +2643,27 @@ msgstr "入力(GC)" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ゲームID" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "ã™ã§ã«èµ·å‹•ã—ã¦ã„ã¾ã™ï¼" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "ゲームãŒèµ·å‹•ã—ã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "ゲームãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "固有設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ゲーム設定" @@ -2689,25 +2671,25 @@ msgstr "ゲーム設定" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "GCセーブファイル(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "ゲームキューブã®å…¥åŠ›è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Geckoコード" @@ -2724,20 +2706,20 @@ msgstr "" "ãƒã‚¤ãƒ†ã‚£ãƒ–コードãƒãƒ³ãƒ‰ãƒ©ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„。Sys フォルダ㫠codehandler.bin " "ã‚’ç½®ãã€Dolphinã‚’å†èµ·å‹•ã™ã‚‹ã“ã¨ã§åˆ©ç”¨ã§ãã¾ã™)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "一般" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "一般" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ドイツ語" @@ -2747,19 +2729,19 @@ msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" "GetARCode: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾ã™ %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "ビデオ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "æç”»ã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "より大ãã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2775,7 +2757,7 @@ msgstr "" "動作速度ã¯å°‘々低下ã—ã€ã¾ã‚Œã«æç”»ãƒã‚°ã®åŽŸå› ã«ã‚‚ãªã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "ギリシア語" @@ -2795,11 +2777,11 @@ msgstr "ç·‘ - å³" msgid "Guitar" msgstr "ギターコントローラ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is called, please report!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "高速化(Hacks)" @@ -2807,7 +2789,7 @@ msgstr "高速化(Hacks)" msgid "Header checksum failed" msgstr "Header checksum failed" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "ヘブライ語" @@ -2819,7 +2801,7 @@ msgstr "範囲(縦)" msgid "Help" msgstr "ヘルプ" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2840,11 +2822,11 @@ msgstr "" msgid "Hide" msgstr "éš ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "マウスカーソルを隠ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2859,8 +2841,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "ホスト" @@ -2868,17 +2850,17 @@ msgstr "ホスト" msgid "Hotkey Configuration" msgstr "ホットキーã®è¨­å®š" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "ホットキー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" @@ -2904,7 +2886,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL設定" @@ -2912,19 +2894,19 @@ msgstr "IPL設定" msgid "IR" msgstr "ãƒã‚¤ãƒ³ã‚¿" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR ãƒã‚¤ãƒ³ã‚¿" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "感度" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -2936,20 +2918,20 @@ msgstr "イタリア" msgid "Icon" msgstr "アイコン" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" "主ã«ãƒšãƒ¼ãƒ‘ーマリオシリーズã§ä½¿ã‚れるã€Bounding Boxレジスタをサãƒãƒ¼ãƒˆã—ã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSãŒå®‰å®šã—ãªã„ゲームã§åŠ¹æžœãŒã‚ã‚Šã¾ã™ [有効ï¼äº’æ›æ€§å‘上ï¼ç„¡åŠ¹ï¼å‹•ä½œé€Ÿåº¦å‘上]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2959,11 +2941,11 @@ msgstr "" "実機(NTSC:60ï¼PAL:50)より高ã„FPSã§åˆ¶é™ã‚’ã‹ã‘ã‚‹å ´åˆã€ã‚µã‚¦ãƒ³ãƒ‰è¨­å®šã§ã€ŒAudio " "Throttleã€ã‚’無効ã«ã—ãªã„ã¨åŠ¹æžœãŒç¾ã‚Œã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignore Format Changes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2977,7 +2959,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2991,7 +2973,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "セーブデータをインãƒãƒ¼ãƒˆ" @@ -2999,7 +2981,7 @@ msgstr "セーブデータをインãƒãƒ¼ãƒˆ" msgid "Import failed, try again?" msgstr "インãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚リトライã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3007,11 +2989,11 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'gsc'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "インãƒãƒ¼ãƒˆã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®é•·ã•ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3019,7 +3001,7 @@ msgstr "" "インãƒãƒ¼ãƒˆã•ã‚ŒãŸã®ã¯'sav'ファイルã®ã‚ˆã†ã§ã™\n" "ã—ã‹ã—æ­£ã—ã„ヘッダã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3032,16 +3014,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "ソコソコ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "ゲーム内" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "情報" @@ -3049,7 +3031,7 @@ msgstr "情報" msgid "Information" msgstr "情報" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "入力" @@ -3061,7 +3043,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3069,11 +3051,11 @@ msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" msgid "Insert name here.." msgstr "コードåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Wiiメニューã¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3084,23 +3066,23 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "追加ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "エラーãŒç¢ºèªã•ã‚Œã¾ã—ãŸï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "完了" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "ãƒã‚§ãƒƒã‚¯çµ‚了。整åˆæ€§ã«å•é¡Œã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3109,11 +3091,11 @@ msgstr "" "パーティション %d ã«å•é¡ŒãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ データãŒç ´æã—ã¦ã„ã‚‹ã‹ã€æ­£ã—ãパッ" "ãƒãŒå½“ã¦ã‚‰ã‚Œã¦ã„ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" @@ -3134,15 +3116,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Internal LZO Error - lzo_init() failed" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "内部解åƒåº¦ã®å¤‰æ›´ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "インタプリタ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "イントロ" @@ -3151,11 +3133,11 @@ msgstr "イントロ" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Invalid Size(%x) or Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "無効ãªå€¤ã§ã™ï¼" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Invalid bat.map or dir entry" @@ -3179,7 +3161,7 @@ msgstr "" "%s\n" " ã“ã®ã‚²ãƒ¼ãƒ ã‚’ダンプã—ãªãŠã—ã¦ãã ã•ã„" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" @@ -3187,21 +3169,21 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚¹ãƒ†ãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "イタリア語" @@ -3209,16 +3191,16 @@ msgstr "イタリア語" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT リコンパイラ (推奨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL リコンパイラ (実験的)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "日本語" @@ -3226,7 +3208,7 @@ msgstr "日本語" msgid "KOREA" msgstr "韓国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3237,17 +3219,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "最å‰é¢ã«è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "キー設定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "韓国語" @@ -3265,19 +3247,23 @@ msgstr "Lボタン" msgid "L-Analog" msgstr "L (アナログ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "GUI言語：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最後ã«ä¸Šæ›¸ãã—ãŸã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3287,8 +3273,8 @@ msgstr "å·¦" msgid "Left Stick" msgstr "左スティック" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3296,7 +3282,7 @@ msgstr "" "左クリックã§ã‚­ãƒ¼ã®å…¥åŠ›å¾…ã¡\n" "スペースキーを入力ã§æ¶ˆåŽ»ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3306,7 +3292,7 @@ msgstr "" "中クリックã§æ¶ˆåŽ»\n" "å³ã‚¯ãƒªãƒƒã‚¯ã§è©³ç´°è¨­å®šã«å…¥ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3314,76 +3300,76 @@ msgstr "" "å·¦orå³ã‚¯ãƒªãƒƒã‚¯ã§è¨­å®šç”»é¢ã«å…¥ã‚Šã¾ã™\n" "中クリックã§æ¶ˆåŽ»ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "よりå°ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPSã«ã‚ˆã‚‹åˆ¶é™ã‚’有効化" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "読込" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "カスタムテクスãƒãƒ£ã‚’読ã¿è¾¼ã‚€" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "ステートロード - スロット 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "ステートロード - スロット 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "ステートロード - スロット 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "ステートロード - スロット 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "ステートロード - スロット 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "ステートロード - スロット 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "ステートロード - スロット 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "ステートロード - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3398,31 +3384,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "特定ã®ã‚²ãƒ¼ãƒ å‘ã‘ã®è¨­å®šå€¤ã‚’読ã¿è¾¼ã¿ã¾ã™" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "ローカル" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "ログ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "ログã®è¨­å®š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "FPSã®ãƒ­ã‚°ã‚’ä¿å­˜" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "表示ã™ã‚‹ãƒ­ã‚°æƒ…å ±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3433,12 +3415,12 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "ログ出力先" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "ログ" @@ -3459,7 +3441,7 @@ msgstr "" "MD5ã®ä¸æ•´åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3473,24 +3455,24 @@ msgstr "MadCatz Gameshark セーブファイル(*.gcs)" msgid "Main Stick" msgstr "コントロールスティック" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "メーカーID" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "メーカー" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "最大" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®ã‚»ãƒ¼ãƒ–データã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "ã™ã§ã«é–‹ã„ã¦ã„ã¾ã™" @@ -3499,7 +3481,7 @@ msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "メモリーカード" @@ -3534,20 +3516,20 @@ msgstr "メモリカードã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒã€ãƒ˜ãƒƒãƒ€ã®ã‚µã‚¤ã‚ºã« msgid "Menu" msgstr "メニュー" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "マイク" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "最å°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3556,7 +3538,7 @@ msgstr "ãã®ä»–ã®è¨­å®š" msgid "Modifier" msgstr "感度変更" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3581,7 +3563,7 @@ msgstr "モーションプラス" msgid "Motor" msgstr "モーター" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3603,7 +3585,7 @@ msgstr "" msgid "Multiply" msgstr "Multiply" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3703,16 +3685,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "åå‰" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "åå‰ï¼š " @@ -3721,20 +3703,20 @@ msgstr "åå‰ï¼š " msgid "Native GCI files(*.gci)" msgstr "ãƒã‚¤ãƒ†ã‚£ãƒ– GCI ファイル(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "æ–°è¦æ¤œç´¢" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "次ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "続ã‘ã¦æ¤œç´¢" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "ニックãƒãƒ¼ãƒ ï¼š" @@ -3742,7 +3724,7 @@ msgstr "ニックãƒãƒ¼ãƒ ï¼š" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -3764,7 +3746,7 @@ msgstr "" msgid "No file loaded" msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "空ãエントリãŒã‚ã‚Šã¾ã›ã‚“" @@ -3777,33 +3759,33 @@ msgstr "録画ファイルãªã—" msgid "No save folder found for title %s" msgstr "%s ã®ã‚»ãƒ¼ãƒ–フォルダãŒã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ãªã—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ノルウェー語" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "未確èª" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未接続" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "ノート" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "補足： " @@ -3812,7 +3794,7 @@ msgstr "補足： " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "注æ„" @@ -3820,16 +3802,16 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "行数：" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "ヌンãƒãƒ£ã‚¯" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "ヌンãƒãƒ£ã‚¯ã®åŠ é€Ÿåº¦" @@ -3837,11 +3819,11 @@ msgstr "ヌンãƒãƒ£ã‚¯ã®åŠ é€Ÿåº¦" msgid "Object" msgstr "オブジェクト" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "オブジェクトã®ç¯„囲" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "オフ" @@ -3849,52 +3831,52 @@ msgstr "オフ" msgid "Offset:" msgstr "オフセット値：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "オンスクリーンメッセージを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "èµ·å‹•ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: can't create context for device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: can't find sound devices" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: can't open device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -3907,7 +3889,7 @@ msgstr "設定" msgid "Orange" msgstr "オレンジ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3917,8 +3899,8 @@ msgstr "" "å³ã‚¯ãƒªãƒƒã‚¯ã‹ã‚‰ã€Žå…¨ã¦ã®ã‚»ãƒ¼ãƒ–データをエクスãƒãƒ¼ãƒˆã€ã‚’実行ã—ã¦ã€\n" "æ–°ã—ã„メモリーカードã«ã‚»ãƒ¼ãƒ–データを移行ã—ã¦ãã ã•ã„\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "ãã®ä»–" @@ -3930,19 +3912,19 @@ msgstr "" "ゲーム中ã«ä»–ã®ãƒ—レーヤーãŒåˆ‡æ–­ã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸï¼æ‰‹å‹•ã§ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã•ã›ã¦ã" "ã ã•ã„" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "出力" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "録画ファイルをå†ç”Ÿ(&L)" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "パッド" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3958,7 +3940,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "ペアリング" @@ -3970,34 +3952,34 @@ msgstr "Paragraph" msgid "Parameters" msgstr "パラメータ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "パーティション %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "パッãƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "一時åœæ­¢" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "å†ç”Ÿçµ‚了時ã«ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "カンペキï¼" @@ -4006,36 +3988,36 @@ msgstr "カンペキï¼" msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "開始" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "録画ファイルをå†ç”Ÿ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "開始ï¼ä¸€æ™‚åœæ­¢" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "サクサク" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "å†ç”Ÿã‚ªãƒ—ション" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "確èª" @@ -4047,54 +4029,54 @@ msgstr "" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ãƒãƒ¼ãƒˆ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "ãƒãƒ«ãƒˆã‚¬ãƒ«èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "ブラジル語" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4107,11 +4089,11 @@ msgstr "プリセット：" msgid "Prev Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "å‰ã®ãƒšãƒ¼ã‚¸" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ã“ã“よりå‰" @@ -4119,7 +4101,7 @@ msgstr "ã“ã“よりå‰" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "プロファイル" @@ -4127,7 +4109,7 @@ msgstr "プロファイル" msgid "Properties" msgstr "プロパティ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "キャッシュã®æ•´é “を実行" @@ -4135,8 +4117,8 @@ msgstr "キャッシュã®æ•´é “を実行" msgid "Question" msgstr "確èª" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "終了" @@ -4154,7 +4136,7 @@ msgstr "Rボタン" msgid "R-Analog" msgstr "R (アナログ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4162,46 +4144,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "ロシア" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "範囲ï¼å¼·ã•" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "読ã¿è¾¼ã¿å°‚用 有効ï¼ç„¡åŠ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "実機Wii リモコンを接続" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "実機Wii リモコンã®è¨­å®š" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wii リモコンã®å†æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ステートロード時ã«Wii リモコンをå†æŽ¥ç¶š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "録画" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "録画情報" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "録画オプション" @@ -4217,7 +4199,7 @@ msgstr "赤 - å·¦" msgid "Red Right" msgstr "赤 - å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4232,29 +4214,29 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€ãªã—】ã®ã¾ã¾ã«ã—ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "å†æ›´æ–°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "ゲームリストをå†æ›´æ–°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "削除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4264,17 +4246,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "メインウィンドウ部分ã«æç”»" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "åˆæœŸåŒ–" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "çµæžœè¡¨ç¤ºæ¬„" @@ -4296,29 +4278,25 @@ msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" msgid "Rumble" msgstr "振動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP-LLEã®å‡¦ç†ã‚’別スレッドã«åˆ†é›¢ã—ã¦è¡Œã„ã¾ã™ (éžæŽ¨å¥¨)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "ロシア語" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ステートセーブ(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Safe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "サンプルレート" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ä¿å­˜" @@ -4326,90 +4304,90 @@ msgstr "ä¿å­˜" msgid "Save GCI as..." msgstr "セーブデータã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "ステートセーブ - スロット 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "ステートセーブ - スロット 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "ステートセーブ - スロット 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "ステートセーブ - スロット 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "ステートセーブ - スロット 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "ステートセーブ - スロット 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "ステートセーブ - スロット 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "ステートセーブ - スロット 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "復元ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "確èªã—ã¦ã„ã¾ã™... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ç”»é¢æ’®å½±" @@ -4417,23 +4395,23 @@ msgstr "ç”»é¢æ’®å½±" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "検索" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "サブフォルダも検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "ç¾åœ¨ã®ã‚ªãƒ–ジェクトを検索" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "値を検索" @@ -4444,20 +4422,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4475,23 +4453,23 @@ msgstr "インãƒãƒ¼ãƒˆã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4507,11 +4485,16 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ³ãƒˆ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4527,7 +4510,7 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã®è§£åƒåº¦ã¨åŒã˜ã‚‚ã®ã‚’ã€\n" "ã‚‚ã—ãã¯ã€æ­£å¸¸ã«å‹•ä½œã™ã‚‹ä¸€ç•ªé«˜ã„解åƒåº¦ã‚’é¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4543,11 +4526,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€Direct3D9】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "é€ä¿¡" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "センサーãƒãƒ¼ã®ä½ç½®" @@ -4555,24 +4538,24 @@ msgstr "センサーãƒãƒ¼ã®ä½ç½®" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "セルビア語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ãŒæŽ¥ç¶šã§ãã¾ã™" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "メモリーカード%cを既定ã¨ã—ã¦è¨­å®š" @@ -4584,11 +4567,17 @@ msgstr "" "SetARCode_IsActive: インデックスã®ã‚µã‚¤ã‚ºãŒã‚³ãƒ¼ãƒ‰ãƒªã‚¹ãƒˆã®ã‚µã‚¤ã‚ºã‚’上回ã£ã¦ã„ã¾" "ã™ %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "設定" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Cant find setting file" @@ -4596,7 +4585,7 @@ msgstr "SetupWiiMem: Cant find setting file" msgid "Shake" msgstr "シェイク" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "通称" @@ -4604,105 +4593,105 @@ msgstr "通称" msgid "Shoulder Buttons" msgstr "LRトリガー" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "コンソール(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "ログを表示(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "ステータスãƒãƒ¼(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "ツールãƒãƒ¼(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "DVDドライブ内ã®ã‚½ãƒ•ãƒˆã‚’表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Show EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPSを表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "フランス" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "ゲームキューブ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "キー入力を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "イタリア" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "韓国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "次ã®è¨€èªžã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "ログã®è¨­å®šã‚’表示(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PALè¦æ ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "特定機種ã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "特定リージョンã®ã‚½ãƒ•ãƒˆã ã‘を表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "統計情報を表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "アメリカåˆè¡†å›½" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "WAD(Wiiウェア/VC/ãƒãƒ£ãƒ³ãƒãƒ«)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ゲームåœæ­¢å‰ã«ç¢ºèªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4710,15 +4699,15 @@ msgstr "" "無効ã«ã™ã‚‹ã¨è‡´å‘½çš„ã§ãªã„エラー表示ã«æ‚©ã¾ã•ã‚Œãªããªã‚Šã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥æ™‚ã«ã‚¨" "ラー表示ãªã—ã«çªç„¶å¼·åˆ¶çµ‚了ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "ブロック開始ä½ç½®ã‚’表示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "ラグカウンターを表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4728,23 +4717,23 @@ msgstr "" "メモリーカードã¸ã®æ›¸ãè¾¼ã¿ã€èµ·å‹•æ™‚ã®ã‚·ã‚¹ãƒ†ãƒ æƒ…報〠JIT cacheã®æ¶ˆåŽ»ãªã©ãŒå«ã¾" "ã‚Œã¾ã™ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "ブロック数を表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "コメントを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "アイコンを表示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "タイトルを表示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4756,11 +4745,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4774,27 +4763,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "BIOSをスキップ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Skip EFB Access from CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4806,7 +4795,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4823,17 +4812,17 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "スロットB" @@ -4841,7 +4830,7 @@ msgstr "スロットB" msgid "Snapshot" msgstr "スクリーンショット" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software Renderer" @@ -4856,11 +4845,11 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿æœ‰ç”¨ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "サウンド設定" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Sound backend %s is not valid." @@ -4874,17 +4863,17 @@ msgstr "Sound buffer creation failed: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "スペイン語" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "リモコンスピーカーã®éŸ³é‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4904,7 +4893,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€1x Native】をé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Speed up Disc Transfer Rate" @@ -4912,51 +4901,55 @@ msgstr "Speed up Disc Transfer Rate" msgid "Square Stick" msgstr "丸ã¿" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "標準コントローラ" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "スタート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "ãƒãƒƒãƒˆãƒ—レイを開始(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "録画を開始(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "録画を開始" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "動作率" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4970,7 +4963,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã“ã¡ã‚‰ã‚’é¸æŠžã—ã¦ãŠã„ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "ウィンドウã«åˆã‚ã›ã‚‹" @@ -4995,8 +4988,8 @@ msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" @@ -5004,7 +4997,7 @@ msgstr "システムã®è¨€èªžï¼š" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Input" @@ -5025,30 +5018,30 @@ msgstr "左テーブル" msgid "Table Right" msgstr "å³ãƒ†ãƒ¼ãƒ–ル" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "ç”»é¢æ’®å½±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "タルコンガ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "テスト" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Texture" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Texture Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "テクスãƒãƒ£ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…報表示" @@ -5064,13 +5057,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5094,7 +5087,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "ファイル %s ã¯æ—¢ã«é–‹ã‹ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ãƒ˜ãƒƒãƒ€ãƒ¼ã¯æ›¸ãè¾¼ã¾ã‚Œã¾ã›ã‚“。" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« (%s) ã¯å­˜åœ¨ã—ã¾ã›ã‚“" @@ -5111,7 +5104,7 @@ msgstr "',' ã‚’å«ã‚€åå‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "復å·åŒ–ã—ã¾ã—ãŸãŒã€ã“ã®ã‚³ãƒ¼ãƒ‰ã«ã¯ä¸€ã¤ã‚‚è¡ŒãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5123,11 +5116,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€å³ç«¯ã«åˆã‚ã›ã¦ãŠã„ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "コピーã—よã†ã¨ã—ã¦ã„るセーブファイルã®ã‚µã‚¤ã‚ºãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5160,14 +5153,11 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "テーマ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5175,7 +5165,7 @@ msgid "" msgstr "" "00000001/00000002ã®ãƒã‚±ãƒƒãƒˆãŒå¿…è¦ã§ã™ã€‚ãŠãらãä¸å®Œå…¨ãªNANDダンプã§ã™ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5193,13 +5183,13 @@ msgstr "" "ã“ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイシミュレータã¯ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãƒªãƒ—レイãã®ã‚‚ã®ã‚’変更ã™ã‚‹" "コードã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "有効ã«ã—ã¦ã„ã‚‹ã¨Wiiメニューやã„ãã¤ã‹ã®ã‚¿ã‚¤ãƒˆãƒ«ã§å‹•ä½œé€Ÿåº¦ãŒä½Žä¸‹ã™ã‚‹å ´åˆãŒã‚ã‚Š" "ã¾ã™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5218,7 +5208,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5229,7 +5219,7 @@ msgstr "" "有効ã«ã™ã‚‹ã¨å‹•ä½œé€Ÿåº¦ãŒå¤§ããå‘上ã—ã¾ã™ãŒã€ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãƒã‚°ã®åŽŸå› ã«ãªã‚‹å ´åˆã‚‚" "ã‚ã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" @@ -5243,35 +5233,35 @@ msgid "Tilt" msgstr "傾ã" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "タイトル" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "終了" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "å…¨ã¦ã®ãƒ­ã‚°æƒ…報をé¸æŠžï¼è§£é™¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "フルスクリーン表示切り替ãˆ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "上部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ç¹ä½“字中国語" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—を読ã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸ" @@ -5291,7 +5281,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "トルコ語" @@ -5303,12 +5293,12 @@ msgstr "ターンテーブル" msgid "Type" msgstr "å½¢å¼" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDPãƒãƒ¼ãƒˆ:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" @@ -5344,12 +5334,12 @@ msgstr "" "èªã—ã¦ä¸‹ã•ã„。\n" "ã“ã®è¡Œã‚’無視ã—ã¦è§£æžã‚’続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未定義 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" @@ -5357,7 +5347,7 @@ msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" msgid "Unexpected 0x80 call? Aborting..." msgstr "Unexpected 0x80 call? Aborting..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "フィルタ無ã—" @@ -5386,8 +5376,8 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "å†å–å¾—" @@ -5395,23 +5385,23 @@ msgstr "å†å–å¾—" msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "フルスクリーンã§è¡¨ç¤º" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "16進" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "パニックãƒãƒ³ãƒ‰ãƒ©ã‚’使用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5423,7 +5413,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5438,15 +5428,15 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "ユーティリティ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæœŸ (V-Sync)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "値" @@ -5454,23 +5444,23 @@ msgstr "値" msgid "Value:" msgstr "値：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "値：" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosityモード" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "æç”»" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "音é‡" @@ -5484,7 +5474,7 @@ msgstr "WAD installation failed: error creating %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installation failed: error creating ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5498,16 +5488,16 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" @@ -5540,7 +5530,7 @@ msgstr "" "\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, fuzzy, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5551,7 +5541,7 @@ msgstr "" "> %u)。作業を続行ã™ã‚‹å‰ã«ã€ä»–ã®ã‚»ãƒ¼ãƒ–をロードã€ã¾ãŸã¯èª­ã¿å–り専用モードをオフ" "ã«ã—ã¦ã“ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5563,7 +5553,7 @@ msgstr "" "ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ç¶šã‘ã‚‹ã¨ã€ãŠãらãDesyncã—ã¾" "ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5596,7 +5586,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - file not open." @@ -5604,7 +5594,7 @@ msgstr "WaveFileWriter - file not open." msgid "Whammy" msgstr "ワーミー" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" @@ -5612,23 +5602,23 @@ msgstr "疑似ワイドスクリーン化" msgid "Width" msgstr "範囲(横)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NANDルート" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5636,17 +5626,17 @@ msgstr "Wiiセーブデータ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ファイルã‹ã‚‰ã®èª­ã¿è¾¼ã¿ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "入力(Wii)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wii リモコン %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5659,19 +5649,19 @@ msgstr "" "ã¾ãŸã¯ã—ã°ã‚‰ã入力ãŒãªã‹ã£ãŸãŸã‚çœé›»åŠ›ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“\n" "å†æŽ¥ç¶šã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wii リモコン接続中" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wii リモコンã®æŒ¯å‹•ã‚’有効化" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wii リモコンã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -5691,26 +5681,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "動作中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "コンソールã«å‡ºåŠ›" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "デãƒãƒƒã‚¬ã«æ›¸è¾¼" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "ファイルã«å‡ºåŠ›" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "ウィンドウã«å‡ºåŠ›" @@ -5750,23 +5740,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "ソフトãŒé¸ã°ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "åå‰ãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -5789,7 +5779,7 @@ msgstr "" "æ­£ã—ã㯠0x%04x (ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ 0x%04llx)\n" "æ–°ã—ã作æˆã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5802,12 +5792,12 @@ msgstr "03コードã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 入力を待機... ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5823,7 +5813,7 @@ msgstr "" msgid "[Custom]" msgstr "[ カスタム設定 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5841,7 +5831,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5855,11 +5845,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5876,7 +5866,7 @@ msgstr "failed to read data from file: %s" msgid "failed to read header" msgstr "failed to read header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5895,7 +5885,7 @@ msgstr "　" msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5907,10 +5897,13 @@ msgstr "zFar 補正値：" msgid "zNear Correction: " msgstr "zNear 補正値：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| (...ã‚‚ã—ãã¯)" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Clear JIT cache" #~ msgstr "JITキャッシュを消去(&C)" @@ -6009,6 +6002,21 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Bleach Versus Crusade" #~ msgstr "BLEACH ãƒãƒ¼ã‚µã‚¹ãƒ»ã‚¯ãƒ«ã‚»ã‚¤ãƒ‰ - " +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "3Dグラフィックスã®æ·±åº¦å€¤è¨ˆç®—を頂点ã”ã¨ã§ã¯ãªãピクセルã”ã¨ã«è¡Œã„ã¾ã™ã€‚\n" +#~ "Per-Pixel LightingãŒå˜ãªã‚‹ç”»è³ªå‘上機能ã ã£ãŸã®ã¨ã¯å¯¾ç…§çš„ã«ã€\n" +#~ "Per-Pixel Depthã¯ç‰¹å®šã®ã‚²ãƒ¼ãƒ ã‚’æ­£ã—ãエミュレートã™ã‚‹ãŸã‚ã« å¿…è¦ãªæ©Ÿèƒ½ã§" +#~ "ã™ã€‚\n" +#~ "\n" +#~ "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’外ã•ãªã„ã§ãã ã•ã„。" + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6057,6 +6065,22 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Couldn't find GameConfig/BreakPoints.ini file" #~ msgstr "GameConfig or BreakPoints.ini ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Created by KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Created by VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6069,6 +6093,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Disable Lighting" #~ msgstr "Disable Lighting" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Disable Per-Pixel Depth" + #~ msgid "Disable Textures" #~ msgstr "テクスãƒãƒ£ç„¡åŠ¹åŒ–" @@ -6289,6 +6316,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "è¦å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "スレッドをコア数ã«åˆã‚ã›ã¦å›ºå®š" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Low level (LLE) or high level (HLE) audio" @@ -6368,6 +6398,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Running script...\n" #~ msgstr "スクリプトを実行中..." +#~ msgid "Sample Rate:" +#~ msgstr "サンプルレート" + #~ msgid "Scale:" #~ msgstr "内部解åƒåº¦" @@ -6462,6 +6495,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Take Screenshot\t" #~ msgstr "スクリーンショット\t" +#~ msgid "Theme selection went wrong" +#~ msgstr "テーマã®é¸æŠžã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index aca262ad75..cd13f832e5 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-18 17:21+0900\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Korean\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (í‘œì‹œí•˜ê¸°ì— ë„ˆë¬´ 많ì€)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "게임 :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -55,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$s복사%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i ì—°ê²°ë˜ì—ˆìŠµë‹ˆë‹¤" @@ -156,147 +149,147 @@ msgstr "%sGCI 가져오기%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 빈 블럭; %u 빈 디렉토리 엔트리" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "ëŒí•€ì— 대해(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVD ë“œë¼ì´ë¸Œì—ì„œ 부트(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "브레ì´í¬í¬ì¸íŠ¸(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ISO í´ë”íƒìƒ‰(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "치트 매니저(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "ì—뮬레ì´ì…˜(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "파ì¼(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "프레임 진행(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "전체화면(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "그래픽 설정(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "ë„움(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "단축키 설정(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "ìƒíƒœ 로드(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "메모리 ì¹´ë“œ 매니저(GC) (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "메모리(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "열기(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "옵션(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "ì¼ì‹œì •ì§€(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "ì†ì„±(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "ê²Œìž„ëª©ë¡ ìƒˆë¡œ 고침(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "레지스터들(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "리셋(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "사운드(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "중지(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "ë„구(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "비디오(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "보기(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "위키(&W)" @@ -316,7 +309,7 @@ msgstr "(-)+z근거리" msgid "(UNKNOWN)" msgstr "(알려지지 ì•ŠìŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(ë”)" @@ -324,19 +317,19 @@ msgstr "(ë”)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 비트" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 비트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D 비전" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 비트" @@ -344,20 +337,20 @@ msgstr "8 비트" msgid "" msgstr "<ì—¬ê¸°ì— ì´ë¦„ì„ ë„£ìœ¼ì„¸ìš”>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<ë°œê²¬ëœ í•´ìƒë„ê°€ ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<ì—†ìŒ>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<키를 누르세요>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<시스템>" @@ -365,25 +358,27 @@ msgstr "<시스템>" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "ë„·í”Œë ˆì´ ìœˆë„ìš°ê°€ ì´ë¯¸ 열려있습니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "현재 ê²Œìž„ì´ êµ¬ë™ë˜ê³  있지 않습니다." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "지ì›ë˜ëŠ” 블루투스 장치를 ì°¾ì„ ìˆ˜ 없습니다!\n" "(마ì´í¬ë¡œì†Œí”„트 블루투스 스íƒë§Œ 지ì›ë©ë‹ˆë‹¤.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -417,13 +412,13 @@ msgstr "" "\n" "TCP í¬íŠ¸ë¥¼ í˜¸ìŠ¤íŠ¸ì— ì „ë‹¬í•´ì•¼í•©ë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-기반보드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 코드" @@ -431,19 +426,19 @@ msgstr "AR 코드" msgid "About Dolphin" msgstr "ëŒí•€ì— 대해" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "ê°€ì†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "정확성:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "정확한 VBeam ì—뮬레ì´ì…˜" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -456,8 +451,8 @@ msgstr "" "\n" "확신 없으면, í…ìŠ¤ì²˜ì— EFB를 ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr " [ ì•¡ì…˜ ]" @@ -483,7 +478,7 @@ msgid "" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) 코드 추가 (%s)ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -509,15 +504,16 @@ msgid "" msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x : address = %08x) í¬ì¸í„° (%s)ì— ì“°ê¸°ì—" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x), 메모리 복사 (%s)ì—" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 매스터 코드와 CCXXXXXXì— ì“°ê¸°ê°€ 시행ë˜ì§€ 않습니다 (%s)" @@ -526,27 +522,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© AR 코드 ë¼ì¸: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¡°ê±´ì  ì½”ë“œ: 비ì í•© í¬ê¸° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: 비ì í•© ì¼ë°˜ 코드 타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 %i: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "ì•¡ì…˜ 리플레ì´: ì¼ë°˜ 코드 0: 비ì í•© 서브타입 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "어댑터:" @@ -555,11 +551,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "패치 추가" @@ -567,13 +563,13 @@ msgstr "패치 추가" msgid "Add new pane" msgstr "새로운 ì°½ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "추가..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "주소 :" @@ -613,48 +609,48 @@ msgstr "" "\n" "알아ë‘기: 얻어진 ê°’ë“¤ì— ëŒ€í•´ 로그윈ë„ìš°/ì½˜ì†”ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "버튼들 í™œì„±í™”ì— í•„ìš”í•œ 아날로그 컨트롤 ì••ë ¥ì„ ì¡°ì •í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "고급" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "고급 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -665,19 +661,19 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "위모트 타ì´ë° 대안" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "분ì„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "비등방성 í•„í„°ë§:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "안티-앨리어싱:" @@ -689,15 +685,15 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "앱로ë”:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "ì ìš©" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -707,16 +703,16 @@ msgstr "" "\n" "확신 없으면, (ë„기)를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "ì•„ëžì–´" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -724,12 +720,12 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -737,12 +733,12 @@ msgstr "종횡비:" msgid "At least one pane must remain open." msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -750,24 +746,24 @@ msgstr "오디오 백엔드:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO 장치를 열기 ì—러.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "ìžë™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "ìžë™ (640x528ì˜ ë°°ìˆ˜)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "ìžë™ (윈ë„ìš° í¬ê¸°)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "윈ë„ìš° í¬ê¸° ìžë™ ì¡°ì •" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -789,12 +785,12 @@ msgstr "BP 레지스터" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "백엔드 설정" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "백엔드:" @@ -812,15 +808,15 @@ msgid "Bad File Header" msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr " 배너" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "배너 세부사항" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "배너:" @@ -828,11 +824,11 @@ msgstr "배너:" msgid "Bar" msgstr "ë°”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "기본 설정" @@ -860,42 +856,42 @@ msgstr "파랑 왼쪽" msgid "Blue Right" msgstr "파랑 오른쪽" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "아래" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "바운드 컨트롤들: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "고장남" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "í´ë”íƒìƒ‰" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "버í¼:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "버튼" @@ -916,30 +912,15 @@ msgstr "C-스틱" msgid "CP reg" msgstr "CP 레지" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "화면표시 ëª©ë¡ ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"버í…스단위 ëŒ€ì‹ ì— í”½ì…€ë‹¨ìœ„ë¡œ 3D 그래픽 ê¹Šì´ ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤.\n" -"í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 ë•Œ " -"필요가 있습니다.\n" -"\n" -"모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -953,7 +934,7 @@ msgstr "" "\n" "모르겠으면, ì–¸ì²´í¬ ìƒíƒœë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "취소" @@ -969,7 +950,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -980,7 +961,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -988,12 +969,12 @@ msgstr "" "ê·¸ 파ì¼ì„ 메모리 카드로 사용할 수 ì—†ìŒ.\n" "ë‘˜ë‹¤ì˜ ìŠ¬ë¡¯ë“¤ì— ê°™ì€ íŒŒì¼ì„ 사용하려 합니까?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "bd: %02x:%02x:%02x:%02x:%02x:%02x ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "%02x ì—°ê²°í•¸ë“¤ì— ì˜í•´ 위모트를 ì°¾ì„ ìˆ˜ ì—†ìŒ." @@ -1007,7 +988,7 @@ msgstr "DVD_플러그ì¸ì—ì„œ ì½ì„ 수 ì—†ìŒ - DVD-ì¸í„°íŽ˜ì´ìŠ¤: 치명 msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "카탈로니아어" @@ -1015,24 +996,24 @@ msgstr "카탈로니아어" msgid "Center" msgstr "중앙" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "변경" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ë””ìŠ¤í¬ ë³€ê²½(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ë””ìŠ¤í¬ ë³€ê²½" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "게임 변경" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1048,12 +1029,11 @@ msgstr "표시를 zì›ê±°ë¦¬ 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "표시를 z근거리 파ë¼ë¯¸í„°ë¡œ 변경 (ì •ì • 후ì—)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "ì—뮬레ì´í„°ê°€ ìž‘ë™í•˜ê³  있는 ë™ì•ˆì— ì´ ë³€ê²½ì€ íš¨ê³¼ê°€ ì—†ì„ ê²ë‹ˆë‹¤!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "채팅" @@ -1061,47 +1041,47 @@ msgstr "채팅" msgid "Cheat Code" msgstr "치트 코드" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "치트 찾기" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "치트들 관리ìž" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "파티션 완전성 ì²´í¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "파티션 완전성 ì²´í¬ì¤‘..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "중국어 (간소화)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1109,15 +1089,15 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" "앱로ë”ë¡œ 사용할 파ì¼ì„ ì„ íƒ: (디렉토리들로만 êµ¬ì„±ëœ ë””ìŠ¤í¬ë“¤ì—게만 ì ìš©ë¨)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "압축해제할 í´ë”를 ì„ íƒ" @@ -1131,8 +1111,8 @@ msgstr "í´ëž˜ì‹" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "깨ë—ì´" @@ -1144,22 +1124,22 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— í´ë¼ì´ì–¸íŠ¸ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥. 수ë™ìœ¼ë¡œ 게임" "ì„ ì¤‘ì§€í•´ì•¼í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "닫기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "환경설정(&n)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "코드 ì •ë³´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "코드:" @@ -1171,91 +1151,91 @@ msgstr "명령" msgid "Comment" msgstr "주ì„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "ISO 압축하기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr " 환경 " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "환경설정" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "컨트롤 설정" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "패드들 설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "중지시 확ì¸" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "위모트 %i ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "위모트 1 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "위모트 2 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "위모트 3 ì—°ê²°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "위모트 4 ì—°ê²°" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "연결중..." @@ -1275,12 +1255,12 @@ msgstr "GCI ë¡œ 변환" msgid "Copy failed" msgstr "복사 실패했습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "메모리카드 %c ì— ë³µì‚¬" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "코어" @@ -1289,7 +1269,7 @@ msgstr "코어" msgid "Could not create %s" msgstr "%s 를 ìƒì„±í•  수 없었습니다" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "백엔드 %s 를 초기화할 수 없었습니다" @@ -1310,12 +1290,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "%s ISO 파ì¼ì„ ì¸ì‹í•  수 없었습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s 를 저장할 수 없었습니다" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1335,11 +1315,11 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1347,17 +1327,17 @@ msgstr "" "코어를 초기화할 수 없었습니다\n" "ë‹¹ì‹ ì˜ í™˜ê²½ì„¤ì •ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "카운트:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "êµ­ê°€:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR 코드 ìƒì„±" @@ -1366,27 +1346,7 @@ msgstr "AR 코드 ìƒì„±" msgid "Create new perspective" msgstr "새로운 ê´€ì  ìƒì„±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]ì— ì˜í•´ 만들어" -"ì§" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "만든ì´:" @@ -1394,11 +1354,11 @@ msgstr "만든ì´:" msgid "Critical" msgstr "치명ì " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "ìžë¥´ê¸°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1412,12 +1372,12 @@ msgstr "" msgid "Crossfade" msgstr "í¬ë¡œìŠ¤íŽ˜ì´ë“œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "현재 디렉토리가 %sì—ì„œ wxFileSelectorë’¤ì— %së¡œ 변경ë¨!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" @@ -1425,11 +1385,11 @@ msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵:" msgid "Custom Projection Hack Settings" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "ì²´ì½”" @@ -1441,36 +1401,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-패드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE 리컴파ì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD 루트:" @@ -1482,11 +1442,11 @@ msgstr "DVD저수준ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했 msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVD저수준비암호화ì½ê¸° - ì¹˜ëª…ì  ì—러: 볼륨ì—ì„œ ì½ê¸°ë¥¼ 실패했습니다." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "ë°ì´í„° í¬ê¸°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "날짜:" @@ -1503,11 +1463,11 @@ msgstr "Datel MaxDrive/Pro 파ì¼ë“¤(*.sav)" msgid "Dead Zone" msgstr "ë°ë“œ ì¡´" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "디버그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "디버깅" @@ -1515,24 +1475,24 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1541,11 +1501,11 @@ msgid "Default font" msgstr "기본 í°íŠ¸" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "ì‚­ì œ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "저장 지우기" @@ -1554,11 +1514,11 @@ msgstr "저장 지우기" msgid "Delete the existing file '%s'?" msgstr "기존 '%s'파ì¼ì„ 삭제합니까?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "설명" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "ê°ì§€" @@ -1571,13 +1531,13 @@ msgstr "" "출력 ë²„í¼ ì•ˆì— ì í•©í•œ 것보다 ë” ë§Žì€ ë°ì´í„° ì½ê¸° ì‹œë„ê°€ ê°ì§€ë˜ì—ˆìŠµë‹ˆë‹¤. ê³ ì •" "(Clamp)." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "장비 설정" @@ -1601,20 +1561,16 @@ msgstr "" "디렉토리 ì²´í¬ì„¬ì´ 실패했습니다\n" " 그리고 디렉토리 백업 ì²´í¬ì„¬ì´ 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "비활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "안개 ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1628,7 +1584,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1642,7 +1598,7 @@ msgstr "" "í¬í•˜ë©´ 대단한 ì†ë„í–¥ìƒì„ 가져오지만 ê·¸ê²ƒì€ ê±°ì˜ í•­ìƒ ì´ìŠˆë“¤ë„ 유발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "디스í¬" @@ -1651,11 +1607,11 @@ msgstr "디스í¬" msgid "Disc Read Error" msgstr "ë””ìŠ¤í¬ ì½ê¸° ì—러" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "화면표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1669,20 +1625,24 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "ëŒí•€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ëŒí•€ %s 그래픽 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "ëŒí•€ 웹 사ì´íŠ¸(&W)" @@ -1690,32 +1650,32 @@ msgstr "ëŒí•€ 웹 사ì´íŠ¸(&W)" msgid "Dolphin Configuration" msgstr "ëŒí•€ 환경설정" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "ëŒí•€ 위모트 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "ëŒí•€ 구글 코드(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1723,7 +1683,7 @@ msgstr "" "ëŒí•€ì´ ì–´ëŠ GC/Wii ISOë„ ì°¾ì„ ìˆ˜ 없었습니다. 파ì¼ì„ 둘러보려면 여기를 ë”블í´" "릭하세요..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1731,16 +1691,21 @@ msgstr "" "ëŒí•€ì´ 현재 모든 ê²Œìž„ë“¤ì„ ìˆ¨ê¸°ê²Œ 설정ë¨. 모든 ê²Œìž„ë“¤ì„ ë³´ë ¤ë©´ 여기를 ë”블í´" "릭..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "아래" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "코드(WiiRD ë°ì´í„°ë² ì´ìŠ¤) 다운로드" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" @@ -1749,27 +1714,27 @@ msgstr "%lu ì½”ë“œë“¤ì´ ë‹¤ìš´ë¡œë“œë¨. (ì¶”ê°€ëœ %lu)" msgid "Drums" msgstr "드럼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "오디오 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB 타겟 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "프레임들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "í…스처들 ë¤í”„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1779,7 +1744,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1789,7 +1754,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1799,17 +1764,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "네ëœëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "종료(&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB 복사" @@ -1829,11 +1794,11 @@ msgstr "" msgid "EUROPE" msgstr "유럽" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "빠른 메모리 ì—…ë°ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "편집" @@ -1841,7 +1806,7 @@ msgstr "편집" msgid "Edit ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 편집" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "환경 편집" @@ -1849,12 +1814,12 @@ msgstr "환경 편집" msgid "Edit Patch" msgstr "패치 편집" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "현재 ê´€ì  íŽ¸ì§‘" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "편집..." @@ -1862,7 +1827,7 @@ msgstr "편집..." msgid "Effect" msgstr "효과" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "내장형 프레임 버í¼" @@ -1870,7 +1835,7 @@ msgstr "내장형 프레임 버í¼" msgid "Emu Thread already running" msgstr "ì—뮬 쓰레드가 ì´ë¯¸ 구ë™ì¤‘ìž„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1884,7 +1849,7 @@ msgstr "" "\n" "모르겠으면, ëŒ€ì‹ ì— \"ê°€ìƒ XFB ì—뮬레ì´ì…˜\"ì„ ì²´í¬í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1900,19 +1865,19 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "ì—ë®¬ëœ ìœ„ëª¨íŠ¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "ì—뮬레ì´ì…˜ ìƒíƒœ:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1928,72 +1893,71 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "바운딩 박스 계산 켜기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "ìºì‰¬ 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "치트 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "듀얼 코어 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "듀얼 코어 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "단축키 활성(그래픽 컨트롤)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "ì•„ì´ë“¤ 스킵 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "ì•„ì´ë“¤ 스킵 활성 (ì†ë„ìƒìŠ¹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "와ì´ë“œìŠ¤í¬ë¦° 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "와ì´ì–´í”„레임 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2007,18 +1971,18 @@ msgstr "" "\n" "모르겠으면, 1x를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" "빠른 ë””ìŠ¤í¬ ì—‘ì„¸ìŠ¤ 활성. ì¼ë¶€ 게임들ì—ì„œ 요구ë¨. (켬 = 빠른, ë” = 호환성)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "페ì´ì§€ 활성" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2030,7 +1994,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2042,7 +2006,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2050,7 +2014,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 ì†ë„를 올리려면 켬. 다른 ê²Œìž„ì„ ìœ„í•´" "서는 ë”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2059,11 +2023,28 @@ msgstr "" "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" "만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2075,13 +2056,13 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "ì¼ë¶€ ê²Œìž„ë“¤ì— í•„ìš”í•œ 메모리 관리 유닛 활성. (켬 = 호환성, ë” = 빠름)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2095,14 +2076,14 @@ msgstr "" msgid "End" msgstr "ë" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "ì˜ì–´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "í–¥ìƒ" @@ -2120,17 +2101,17 @@ msgstr "엔트리 %d/%d" msgid "Entry 1/%d" msgstr "엔트리 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "ê°™ìŒ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "ì—러" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "ì„ íƒëœ 언어 로딩 ì—러. 시스템 기본으로 ëŒì•„갑니다." @@ -2169,32 +2150,32 @@ msgstr "예외 핸들러 - 메모리 공간 아래를 ì ‘ê·¼. %08llx%08llx" msgid "Execute" msgstr "실행" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "내보내기 실패했습니다" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "íŒŒì¼ ë‚´ë³´ë‚´ê¸°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "모든 ì €ìž¥ë“¤ì„ ë‚´ë³´ë‚´ê¸°" @@ -2210,7 +2191,7 @@ msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." msgid "Extension" msgstr "확장" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "외부 프레임 버í¼" @@ -2222,44 +2203,44 @@ msgstr "추가 매개변수" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "추가 매개변수는 ''Metroid: Other M''ì—서만 유용합니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "모든 파ì¼ë“¤ 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "ì•±ë¡œë” ì••ì¶•í’€ê¸°..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "디렉토리 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "íŒŒì¼ ì••ì¶• 풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "파티션 압축풀기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "모든 파ì¼ë“¤ 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "디렉토리 압축풀기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "압축풀기..." @@ -2267,7 +2248,7 @@ msgstr "압축풀기..." msgid "FIFO Byte" msgstr "FIFO ë°”ì´íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO 플레ì´ì–´" @@ -2275,7 +2256,7 @@ msgstr "FIFO 플레ì´ì–´" msgid "FRANCE" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST í¬ê¸°:" @@ -2283,15 +2264,15 @@ msgstr "FST í¬ê¸°:" msgid "Failed to Connect!" msgstr "ì—°ê²°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "ë“£ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "코드들 ë‹¤ìš´ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%së¡œ 압축풀기 실패했습니다!" @@ -2409,19 +2390,19 @@ msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" msgid "Failed to write header for file %d" msgstr "%d 파ì¼ì— 대한 í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "페르시아어" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2429,23 +2410,23 @@ msgstr "" "ì¹˜ëª…ì  ë¹„ë™ê¸°. 재ìƒì„ 중단합니다. (PlayWiimoteì—ì„œ ì—러: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "FIFO 플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "íŒŒì¼ ì •ë³´" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "파ì¼ì´ 코드를 지니지 않었습니다." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "파ì¼ì´ .gci ë¡œ 변환ë˜ì—ˆìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2462,7 +2443,7 @@ msgstr "" "파ì¼ì´ í™•ìž¥ìž \"%s\"를 가집니다\n" "ì í•©í•œ 확장ìžë“¤ì€ (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "파ì¼ì´ 메모리카드로 ì¸ì‹ë˜ì§€ 않는다" @@ -2475,19 +2456,19 @@ msgstr "파ì¼ì´ 압축ë˜ì§€ 않었습니다" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "ë‹¤ìŒ ì°¾ê¸°" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "ì´ì „ 찾기" @@ -2495,27 +2476,27 @@ msgstr "ì´ì „ 찾기" msgid "First Block" msgstr "첫번째 블럭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ì²´í¬ì„¬ë“¤ 고침" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "ê°•ì œ 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "ê°•ì œ 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "ì½˜ì†”ì„ NTSC-Jë¡œ 강제시킴" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "ê°•ì œ í…스처 í•„í„°ë§" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2527,7 +2508,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2539,7 +2520,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2575,42 +2556,42 @@ msgstr "프레임" msgid "Frame " msgstr "프레임" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "프레임 진행" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "프레임 ë¤í”„ê°€ FFV1를 사용" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "프레임 ì •ë³´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "프레임 범위" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "프레임 스킵(&k)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "프레임제한:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "녹화할 프레임" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "ìžìœ ë¡œìš´ 보기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "프랑스어" @@ -2618,16 +2599,16 @@ msgstr "프랑스어" msgid "Frets" msgstr "프렛들" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "From" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "전체화면" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "전체화면 í•´ìƒë„:" @@ -2639,7 +2620,7 @@ msgstr "GCI 파ì¼(*.gci)" msgid "GCMic Configuration" msgstr "GCMic 환경설정" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC패드" @@ -2647,27 +2628,27 @@ msgstr "GC패드" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "게임 ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "ê²Œìž„ì´ ì´ë¯¸ 구ë™ì¤‘입니다!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "ê²Œìž„ì´ êµ¬ë™ì¤‘ì´ì§€ 않습니다!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "ê²Œìž„ì´ ì°¾ì„ ìˆ˜ 없습니다!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "게임-ìƒì„¸ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "게임환경" @@ -2675,25 +2656,25 @@ msgstr "게임환경" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "게임í브 게임저장 파ì¼(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "게임í브 패드 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 코드" @@ -2709,20 +2690,20 @@ msgstr "" "(ìž˜ëª»ëœ ì½”ë“œì´ê±°ë‚˜ 코드 íƒ€ìž…ì´ ì•„ì§ ì§€ì›ë˜ì§€ 않습니다. codehandler.bin 파ì¼" "ì„ Sys í´ë”ì— ìœ„ì¹˜ì‹œí‚¤ê³  ëŒí•€ì„ 재시작해서 ì›ë³¸ 코드 핸들러를 사용해보세요.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "ì¼ë°˜" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "ì¼ë°˜ 설정" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "ë…ì¼ì–´" @@ -2731,19 +2712,19 @@ msgstr "ë…ì¼ì–´" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: ì¸ë±ìŠ¤ê°€ ar 코드 리스트 í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤ " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "그래픽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "그래픽 설정" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "보다 í°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2760,7 +2741,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "그리스어" @@ -2780,11 +2761,11 @@ msgstr "ì´ˆë¡ ì˜¤ë¥¸ìª½" msgid "Guitar" msgstr "기타" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRYê°€ 호출ë¨, 보고해주세요!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "핵" @@ -2792,7 +2773,7 @@ msgstr "핵" msgid "Header checksum failed" msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "히브리어" @@ -2804,7 +2785,7 @@ msgstr "높ì´" msgid "Help" msgstr "ë„움" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2825,11 +2806,11 @@ msgstr "" msgid "Hide" msgstr "숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "마우스 커서 숨김" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2843,8 +2824,8 @@ msgstr "" msgid "Home" msgstr "홈" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "호스트" @@ -2852,17 +2833,17 @@ msgstr "호스트" msgid "Hotkey Configuration" msgstr "단축키 설정" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "단축키들" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "í—가리어" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "하ì´ë¸Œë¦¬ë“œ 위모트" @@ -2890,7 +2871,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL 설정" @@ -2898,19 +2879,19 @@ msgstr "IPL 설정" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR í¬ì¸í„°" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR ê°ë„:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -2922,7 +2903,7 @@ msgstr "ì´íƒˆë¦¬ì•„" msgid "Icon" msgstr "ì•„ì´ì½˜" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2930,14 +2911,14 @@ msgstr "" "ì²´í¬í•˜ë©´, 바운딩 박스 ë ˆì§€ìŠ¤í„°ë“¤ì´ ì—…ë°ì´íŠ¸ë  것입니다. Paper Mario 게임들ì—" "ì„œ 사용ë©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "FPSê°€ 불규칙ì ì´ë©´, ì´ ì˜µì…˜ì´ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (켬 = 호환성, ë” = ë¹ " "름)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2947,11 +2928,11 @@ msgstr "" "ì´ìš©í•´ 오디오 ë³‘ëª©ì„ ì‚¬ìš©í•˜ì„¸ìš” (ê²Œìž„ì— ë”°ë¼ì„œëŠ” 소리 ëŠê¹€ë“¤ì„ 고칠지 모르지" "만 ë˜í•œ 지ì†ì ì¸ ìž¡ìŒì„ 유발할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "í¬ë©§ ë³€ê²½ë“¤ì„ ë¬´ì‹œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2965,7 +2946,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2979,7 +2960,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" @@ -2987,7 +2968,7 @@ msgstr "ì €ìž¥ì„ ê°€ì ¸ì˜¤ê¸°" msgid "Import failed, try again?" msgstr "가져오기 실패했습니다, 재시ë„?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2995,11 +2976,11 @@ msgstr "" "가져온 파ì¼ì€ gsc 확장ìžë¥¼ 가진다\n" "하지만 올바른 í—¤ë”를 가지고 있지 않습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "가져온 파ì¼ì´ 비ì í•© 길ì´ë¥¼ 가지고 있습니다" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3007,7 +2988,7 @@ msgstr "" "가져온 파ì¼ì´ sav 확장ìžë¥¼ 지닌다\n" "하지만 올바른 í•´ë”를 지니지 않는다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3018,16 +2999,16 @@ msgstr "" "발합니다.\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "게임안" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "게임-안" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ì •ë³´" @@ -3035,7 +3016,7 @@ msgstr "ì •ë³´" msgid "Information" msgstr "ì •ë³´" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "ìž…ë ¥" @@ -3047,7 +3028,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3055,11 +3036,11 @@ msgstr "SD ì¹´ë“œ 삽입" msgid "Insert name here.." msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3070,23 +3051,23 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "WAD 설치하기..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "완전성 ì²´í¬ ì—러" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "완전성 ì²´í¬ ì™„ë£Œë¨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "완전성 ì²´í¬ê°€ 완료ë˜ì—ˆìŠµë‹ˆë‹¤. ì—러가 발견ë˜ì§€ 않었습니다." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3095,11 +3076,11 @@ msgstr "" "파티션 %d ì— ëŒ€í•œ 완전성 ì²´í¬ê°€ 실패하였습니다. ë‹¹ì‹ ì˜ ë¤í”„ê°€ 오염ë˜ì—ˆê±°ë‚˜ 잘" "못 íŒ¨ì¹˜ëœ ê²ƒ 같습니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" @@ -3120,15 +3101,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "내부 LZO ì—러 - lzo_init() 실패했습니다" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "내부 í•´ìƒë„:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "ì¸í„°í”„리터 (매우 ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "소개화면" @@ -3137,11 +3118,11 @@ msgstr "소개화면" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "비ì í•© í¬ê¸°(%x) í˜¹ì€ ë§ˆë²• ë‚±ë§ (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "비ì í•© ê°’!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "비ì í•© bat.map í˜¹ì€ ë””ë ‰í† ë¦¬ 엔트리" @@ -3165,7 +3146,7 @@ msgstr "" "%s\n" " ë‹¹ì‹ ì€ ì´ ê²Œìž„ì„ ë¦¬ë¤í”„해야할 지ë„." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" @@ -3173,21 +3154,21 @@ msgstr "비ì í•© ê¸°ë¡ íŒŒì¼" msgid "Invalid search parameters (no object selected)" msgstr "비ì í•© 찾기 파ë¼ë¯¸í„° (ì„ íƒëœ 오브ì íŠ¸ ì—†ìŒ)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (숫ìžë¡œ ë³€í™˜ë  ìˆ˜ 없었습니다)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (ì§ìˆ˜ ê¸¸ì´ ìŠ¤íŠ¸ë§ë§Œ 지ì›ë©ë‹ˆë‹¤)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "ì´íƒˆë¦¬ì•„ì–´" @@ -3195,16 +3176,16 @@ msgstr "ì´íƒˆë¦¬ì•„ì–´" msgid "JAPAN" msgstr "ì¼ë³¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT 리컴파ì¼ëŸ¬ (권장)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL ì‹¤í—˜ì  ë¦¬ì»´íŒŒì¼ëŸ¬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "ì¼ë³¸ì–´" @@ -3212,7 +3193,7 @@ msgstr "ì¼ë³¸ì–´" msgid "KOREA" msgstr "한국" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3222,17 +3203,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "윈ë„우를 맨위로 유지" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr " [ 키 ]" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "한국어" @@ -3250,19 +3231,23 @@ msgstr "L 버튼" msgid "L-Analog" msgstr "L-아날로그" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "언어:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "마지막 ë®ì–´ì¨ì§„ ìƒíƒœ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3272,8 +3257,8 @@ msgstr "왼쪽" msgid "Left Stick" msgstr "왼쪽 스틱" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3281,7 +3266,7 @@ msgstr "" "단축키를 ê°ì§€í•˜ë ¤ë©´ 좌 í´ë¦­í•˜ì„¸ìš”.\n" "지우려면 스페ì´ìŠ¤ë¥¼ 입력하세요." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3291,7 +3276,7 @@ msgstr "" "중-í´ë¦­ 지우기.\n" "ìš°-í´ë¦­ 옵션들 ë”." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3299,76 +3284,76 @@ msgstr "" "좌/ìš°-í´ë¦­ 옵션들 ë”.\n" "중-í´ë¦­ 지우기." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "보다 ë” ì ì€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPSë¡œ 제한" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "커스텀 í…스처 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "슬롯1 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "슬롯2 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "슬롯3 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "슬롯4 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "슬롯5 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "슬롯6 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "슬롯7 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "슬롯8 ìƒíƒœ 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3382,31 +3367,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "핵 패턴들로 부터 사용 가능한 사전설정 ê°’ì„ ë¡œë“œí•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "지역" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "로그" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "로그 환경설정" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "FPS를 파ì¼ì— 기ë¡" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "로그 타입" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3418,12 +3399,12 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "로거 출력" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "로깅" @@ -3444,7 +3425,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3458,24 +3439,24 @@ msgstr "MadCatz ê²Œìž„ìƒ¤í¬ íŒŒì¼ë“¤(*.gcs)" msgid "Main Stick" msgstr "ë©”ì¸ ìŠ¤í‹±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "제작사 ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "제작사:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "최대값" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "메모리카드가 ì´ íƒ€ì´í‹€ì— 대해 ì €ìž¥ì„ ì´ë¯¸ ê°€ì§" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "메모리카드가 ì´ë¯¸ ì—´ë ¤ì§" @@ -3484,7 +3465,7 @@ msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "메모리 ì¹´ë“œ" @@ -3521,20 +3502,20 @@ msgstr "메모리카드 파ì¼í¬ê¸°ê°€ í—¤ë” í¬ê¸°ì™€ 불ì¼ì¹˜í•©ë‹ˆë‹¤" msgid "Menu" msgstr "메뉴" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "마ì´í¬" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "최소값" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "기타 설정" @@ -3543,7 +3524,7 @@ msgstr "기타 설정" msgid "Modifier" msgstr "수정ìž" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3568,7 +3549,7 @@ msgstr "모션 플러스" msgid "Motor" msgstr "모터" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3590,7 +3571,7 @@ msgstr "" msgid "Multiply" msgstr "곱하기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3690,16 +3671,16 @@ msgstr "NP 탭" msgid "NP Up" msgstr "NP 위" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "ì´ë¦„:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "ì´ë¦„:" @@ -3708,20 +3689,20 @@ msgstr "ì´ë¦„:" msgid "Native GCI files(*.gci)" msgstr "ì›ë³¸ GCI 파ì¼ë“¤(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "새로운 스캔" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "ë‹¤ìŒ íŽ˜ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "ë‹¤ìŒ ìŠ¤ìº”" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "별명 :" @@ -3729,7 +3710,7 @@ msgstr "별명 :" msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "ISO나 WADSê°€ ì—†ìŒ" @@ -3751,7 +3732,7 @@ msgstr "ë„킹 ì—†ìŒ" msgid "No file loaded" msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "빈 디렉토리 ëª©ë¡ ì—”íŠ¸ë¦¬ë“¤ì´ ì—†ìŒ" @@ -3764,33 +3745,33 @@ msgstr "ë…¹í™”ëœ íŒŒì¼ì´ ì—†ìŒ" msgid "No save folder found for title %s" msgstr "%s 타ì´í‹€ì— 대한 저장 í´ë”ê°€ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "ë…¸ë¥´ì›¨ì´ ë¶ëª°ì–´" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "같지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "설정 안함" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "참고 사항" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "참고:" @@ -3799,7 +3780,7 @@ msgstr "참고:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "알림" @@ -3807,16 +3788,16 @@ msgstr "알림" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "코드 번호:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "눈처í¬" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "ëˆˆì²˜í¬ ê°€ì†" @@ -3824,11 +3805,11 @@ msgstr "ëˆˆì²˜í¬ ê°€ì†" msgid "Object" msgstr "오브ì íŠ¸" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "오브ì íŠ¸ 범위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "ë”" @@ -3836,52 +3817,52 @@ msgstr "ë”" msgid "Offset:" msgstr "오프셋:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "온-스í¬ë¦° 메시지 보여주기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "%d 블럭들만 유용한" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "íŒŒì¼ ì—´ê¸°..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: %s ìž¥ì¹˜ì— ëŒ€í•œ 맥ë½(context)ì„ ë§Œë“¤ 수 ì—†ìŒ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: 사운드 ìž¥ì¹˜ë“¤ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: %s 장치를 ì—´ 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL í…스처 디코ë”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" @@ -3894,15 +3875,15 @@ msgstr "옵션" msgid "Orange" msgstr "주황" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "íŒŒì¼ ë””ë ‰í† ë¦¬ì•ˆì— íŒŒì¼ì˜ 순서가 블럭 순서와 맞지 않습니다\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "다른 것들" @@ -3914,19 +3895,19 @@ msgstr "" "ê²Œìž„ì´ êµ¬ë™ë˜ëŠ” ì¤‘ì— ë‹¤ë¥¸ í´ë¼ì´ì–¸íŠ¸ê°€ ì—°ê²°í•´ì œë¨!! ë„·í”Œë ˆì´ ë¶ˆê°€ëŠ¥ë¨. 수ë™ìœ¼" "ë¡œ ê²Œìž„ì„ ì¤‘ì§€í•˜ë¼." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "출력" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ(&l)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "패드" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "패드" @@ -3942,7 +3923,7 @@ msgstr "페ì´ì§€ 다운" msgid "Page Up" msgstr "페ì´ì§€ ì—…" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "연결하기" @@ -3954,34 +3935,34 @@ msgstr "단ë½" msgid "Parameters" msgstr "매개변수들" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "파티션 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "패치" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "ë¬´ë¹„ì˜ ëì—ì„œ 멈추기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "픽셀단위 ê´‘ì›" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "완벽한" @@ -3990,36 +3971,36 @@ msgstr "완벽한" msgid "Perspective %d" msgstr "ê´€ì  %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr " 실행 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ìž¬ìƒ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "실행/ì¼ì‹œì •ì§€" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "플레ì´ê°€ëŠ¥" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "ìž¬ìƒ ì˜µì…˜" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4031,54 +4012,54 @@ msgstr "ì €ìž¥í•˜ê¸°ì „ì— ê´€ì ì„ ìƒì„±í•´ 주세요." msgid "Plus-Minus" msgstr "플러스-마ì´ë„ˆìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "í¬íŠ¸ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "í¬íŠ¸:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "í¬ë¥´íˆ¬ê°ˆì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4091,11 +4072,11 @@ msgstr "사전설정:" msgid "Prev Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "ì´ì „ 페ì´ì§€" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "ì´ì „ ê°’" @@ -4103,7 +4084,7 @@ msgstr "ì´ì „ ê°’" msgid "Print" msgstr "프린트" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "프로파ì¼" @@ -4111,7 +4092,7 @@ msgstr "프로파ì¼" msgid "Properties" msgstr "ì†ì„±" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ìºì‰¬ 제거(Purge)" @@ -4119,8 +4100,8 @@ msgstr "ìºì‰¬ 제거(Purge)" msgid "Question" msgstr "질문" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "종료" @@ -4138,7 +4119,7 @@ msgstr "R 버튼" msgid "R-Analog" msgstr "R-아날로그" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "램" @@ -4146,46 +4127,46 @@ msgstr "램" msgid "RUSSIA" msgstr "러시아" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "범위" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "ì½ê¸°-ì „ìš© 모드" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "실제" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "실제 위모트" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "리얼 위모트" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "위모트 재연결 확ì¸" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "ìƒíƒœ 로딩시 위모트 재연결" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "녹화" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "녹화 ì •ë³´" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "녹화 옵션" @@ -4201,7 +4182,7 @@ msgstr "빨강 왼쪽" msgid "Red Right" msgstr "빨강 오른쪽" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4215,29 +4196,29 @@ msgstr "" "\n" "모르겠으면, ì—†ìŒì„ ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "갱신" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "제거" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4247,17 +4228,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "ë©”ì¸ ìœˆë„ìš°ì— ë Œë”" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "리셋" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "ê²°ê³¼" @@ -4279,29 +4260,25 @@ msgstr "오른쪽 스틱" msgid "Rumble" msgstr "진ë™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSP LLE를 ì „ìš© 쓰레드ìƒì—ì„œ 구ë™í•˜ê¸° (권장 안함)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "러시아어" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ìƒíƒœ 저장(&v) " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "안전" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "샘플율:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "저장" @@ -4309,90 +4286,90 @@ msgstr "저장" msgid "Save GCI as..." msgstr "다른 ì´ë¦„으로 GCI 저장..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "슬롯1 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "슬롯2 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "슬롯3 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "슬롯4 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "슬롯5 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "슬롯6 ìƒíƒœ 저장 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "슬롯7 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "슬롯8 ìƒíƒœ 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ìƒíƒœ 저장..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "스ìºë‹..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "스í¬ë¦°ìƒ·" @@ -4400,23 +4377,23 @@ msgstr "스í¬ë¦°ìƒ·" msgid "Scroll Lock" msgstr "스í¬ë¡¤ ë½" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "찾기" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "최근 오브ì íŠ¸ 찾기" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "헥스 ê°’ 찾기:" @@ -4427,20 +4404,20 @@ msgid "Section %s not found in SYSCONF" msgstr "섹션 %s를 SYSCONFì—ì„œ ì°¾ì„ ìˆ˜ ì—†ìŒ" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4458,23 +4435,23 @@ msgstr "가져올 저장 파ì¼ì„ ì„ íƒ" msgid "Select floating windows" msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4492,11 +4469,16 @@ msgstr "" "\n" "모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "ì„ íƒëœ í°íŠ¸" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4512,7 +4494,7 @@ msgstr "" "모르겠으면, ë°ìŠ¤í¬íƒ‘ í•´ìƒë„를 사용하세요.\n" "ê·¸ëž˜ë„ ëª¨ë¥´ê² ìœ¼ë©´, ìž‘ë™í•˜ëŠ” 최고 í•´ìƒë„를 사용하세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4528,11 +4510,11 @@ msgstr "" "\n" "모르겠으면, Direct3D 9ì„ ì‚¬ìš©í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "보내기" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "센서 ë°” 위치:" @@ -4540,24 +4522,24 @@ msgstr "센서 ë°” 위치:" msgid "Separator" msgstr "분리ìž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "세르비아어" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사용하는 í¬íŠ¸ì´ë‹¤" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "기본 메모리카드 %c ë¡œ 설정" @@ -4567,11 +4549,17 @@ msgstr "기본 메모리카드 %c ë¡œ 설정" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: 목ë¡ì´ ar 코드 ëª©ë¡ í¬ê¸° %lu 보다 ë” í½ë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "설정..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" @@ -4579,7 +4567,7 @@ msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" msgid "Shake" msgstr "í”들기" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "단축 ì´ë¦„:" @@ -4587,105 +4575,105 @@ msgstr "단축 ì´ë¦„:" msgid "Shoulder Buttons" msgstr "ìˆ„ë” ë²„íŠ¼" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "콘솔 보기(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "로그 보기(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "ìƒíƒœë°” 표시(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "툴바 표시(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "ë“œë¼ì´ë¸Œ 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB 복사 ì˜ì—­" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "FPS 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "프랑스" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "게임í브" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "ìž…ë ¥ 표시 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "ì´íƒˆë¦¬ì•„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP (ì¼ë³¸ ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "한국" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "언어 보기:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "로그 환경설정(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL (유럽 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "í”Œëž«í¼ í‘œì‹œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "지역 표시" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "통계들" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA (미국 ë°©ì‹)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "ê²Œìž„ì„ ë©ˆì¶”ê¸° ì „ì— í™•ì¸ ìƒìž 보여주기." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4693,15 +4681,15 @@ msgstr "" "ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " "ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "첫번째 블럭 보기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "ëž™ 계측기 보여주기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4711,23 +4699,23 @@ msgstr "" "ì´ ë©”ì‹œì§€ë“¤ì€ ë©”ëª¨ë¦¬ ì¹´ë“œ 쓰기, 비디오 백엔드와 CPU ì •ë³´, 그리고 JIT ìºì‹œ 비" "우기를 í¬í•¨í•©ë‹ˆë‹¤." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "저장 블럭들 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "저장 ì£¼ì„ ë³´ê¸°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "저장 ì•„ì´ì½˜ 보기" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "저장 타ì´í‹€ 보기" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4738,11 +4726,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4756,27 +4744,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "간소화 중국어" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "CPUë¡œ 부터 EFB 엑세스를 스킵" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4788,7 +4776,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4804,17 +4792,17 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "슬롯 B" @@ -4822,7 +4810,7 @@ msgstr "슬롯 B" msgid "Snapshot" msgstr "스냅샷" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "소프트웨어 ë Œë”러" @@ -4837,11 +4825,11 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "사운드 설정" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "사운드 백엔드 %s는 ì í•©í•˜ì§€ 않습니다." @@ -4855,17 +4843,17 @@ msgstr "사운드 ë²„í¼ ìƒì„± 실패했습니다: %s" msgid "Space" msgstr "스페ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "스페ì¸ì–´" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "스피커 볼륨:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4885,7 +4873,7 @@ msgstr "" "\n" "모르겠으면, 640x528를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" @@ -4893,51 +4881,55 @@ msgstr "ë””ìŠ¤í¬ ì „ì†¡ìœ¨ ì†ë„ ìƒìŠ¹" msgid "Square Stick" msgstr "스퀘어 스틱" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "표준 컨트롤러" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "시작" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "ë„·í”Œë ˆì´ ì‹œìž‘(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘(&c)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "ìƒíƒœ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "ìƒíƒœ 저장" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "중지" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4950,7 +4942,7 @@ msgstr "" "ê³  \"ëž¨ì— EFB\"를 넘는 대단한 ì†ë„í–¥ìƒì„ ì¤ë‹ˆë‹¤.\n" "모르겠으면, ì´ê²ƒì„ ì²´í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "윈ë„ìš°ë¡œ 늘림" @@ -4975,8 +4967,8 @@ msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "시스템 언어:" @@ -4984,7 +4976,7 @@ msgstr "시스템 언어:" msgid "TAIWAN" msgstr "타ì´ì™„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS ìž…ë ¥" @@ -5005,30 +4997,30 @@ msgstr "í…Œì´ë¸” 왼쪽" msgid "Table Right" msgstr "í…Œì´ë¸” 오른쪽" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "스í¬ë¦°ìƒ· ì°ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "타루콩가 (봉고스)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "테스트" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "í…스처" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "í…스처 ìºì‰¬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "í…스처 í¬ë©§ 오버레ì´" @@ -5044,13 +5036,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5073,7 +5065,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "%s 파ì¼ì´ ì´ë¯¸ ì—´ë ¤ 있었습니다, íŒŒì¼ í—¤ë”는 기ë¡ë˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "ë‹¹ì‹ ì´ ê¸°ìˆ í•œ íŒŒì¼ (%s)는 존재하지 않습니다" @@ -5090,7 +5082,7 @@ msgstr "ì´ë¥¸ì€ ',' 문ìžë¥¼ í¬í•¨í•  수 없습니다" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "í•´ë…ëœ AR 코드 결과가 없습니다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5101,11 +5093,11 @@ msgstr "" "치는 ê²½í–¥ì´ ìžˆìŠµë‹ˆë‹¤.\n" "모르겠으면, 가장 오른쪽 ê°’ì„ ì‚¬ìš©í•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "ë‹¹ì‹ ì´ ë³µì‚¬í•˜ë ¤ëŠ” ì €ìž¥ì€ ë¹„ì í•© íŒŒì¼ í¬ê¸°ìž…니다." -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5138,14 +5130,11 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "테마" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5154,7 +5143,7 @@ msgstr "" "00000001/00000002ì— ëŒ€í•œ í‹°ì¼“ì´ ìžˆì–´ì•¼í•œë‹¤. ë‹¹ì‹ ì˜ NAND ë¤í”„는 ì•„ë§ˆë„ ë¯¸ì™„ì„±" "ì´ë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5170,11 +5159,11 @@ msgstr "" "ì´ ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì‹œë®¬ë ˆì´í„°ëŠ” ì•¡ì…˜ ë¦¬í”Œë ˆì´ ìŠ¤ìŠ¤ë¡œ 수정한 코드를 지ì›í•˜ì§€ ì•Š" "는다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5192,7 +5181,7 @@ msgstr "" "\n" "모르겠으면. ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5204,7 +5193,7 @@ msgstr "" "ë‘ê°œ ì´ìƒì˜ 코어를 가진 PC들 ìƒì—ì„œ 주요 ì†ë„ í–¥ìƒë“¤ì„ 유발한다, 하지만 ê°‘ìž‘" "스런 깨ì§/ê²°í•¨ë“¤ì„ ì¼ìœ¼í‚¬ ìˆ˜ë„ ìžˆë‹¤." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" @@ -5218,35 +5207,35 @@ msgid "Tilt" msgstr "기울기" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr " 제목" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "To" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "모든 로그 타입 토글" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "전체화면 토글" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "위" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "전통 중국어" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "알려지지 ì•Šì€ íŒŒì¼ íƒ€ìž…ì„ ë¡œë“œì‹œë„했다." @@ -5266,7 +5255,7 @@ msgstr "" "효한 SYSCONFì—ì„œ ì½ê¸° ì‹œë„\n" "위모트 bt idë“¤ì€ ìœ ìš©í•˜ì§€ 않습니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "터키어" @@ -5278,12 +5267,12 @@ msgstr "í„´í…Œì´ë¸”" msgid "Type" msgstr "타입" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP í¬íŠ¸:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP 위모트" @@ -5319,12 +5308,12 @@ msgstr "" "니다. 올바로 타ì´í•‘했는지 확ì¸í•˜ì„¸ìš”\n" "ì´ ë¼ì¸ì„ 무시하고 분ì„ì„ ê³„ì†í•˜ê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "ì •ì˜ë˜ì§€ ì•Šì€ %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" @@ -5332,7 +5321,7 @@ msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" msgid "Unexpected 0x80 call? Aborting..." msgstr "예ìƒí•˜ì§€ 못한 0x80 콜? 중단시킴..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "알려지지 ì•Šì€" @@ -5362,8 +5351,8 @@ msgstr "" msgid "Up" msgstr "위" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "ì—…ë°ì´íŠ¸" @@ -5371,23 +5360,23 @@ msgstr "ì—…ë°ì´íŠ¸" msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "전체화면 사용" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "16진수 사용" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "패닉 핸들러 사용" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5399,7 +5388,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5413,15 +5402,15 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "유틸리티" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "수ì§-ë™ê¸°í™”" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "ê°’" @@ -5429,23 +5418,23 @@ msgstr "ê°’" msgid "Value:" msgstr "ê°’:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "ê°’:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "ìƒì„¸ì„¤ëª…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "비디오" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "볼륨" @@ -5459,7 +5448,7 @@ msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD 설치 실패했습니다: ì—러 ìƒì„± 티켓" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5472,16 +5461,16 @@ msgstr "" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "경고" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ DOLì„ ì‹œìž‘!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "경고 - ìž˜ëª»ëœ ì½˜ì†” 모드ì—ì„œ ELF 시작!" @@ -5513,7 +5502,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5524,7 +5513,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5535,7 +5524,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5569,7 +5558,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." @@ -5577,7 +5566,7 @@ msgstr "WaveFileWriter - 파ì¼ì´ 열리지 않습니다." msgid "Whammy" msgstr "훼미" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" @@ -5585,23 +5574,23 @@ msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" msgid "Width" msgstr "너비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5609,17 +5598,17 @@ msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: 파ì¼ë¡œ 부터 ì½ì„ 수 없었습니다" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "위모트" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "위모트 %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5632,19 +5621,19 @@ msgstr "" "í˜¹ì€ ì•„ë§ˆë„ ì•„ì´ë“¤ 타임 아웃ì´ê±°ë‚˜ 다른 ì›ì¸ ë•Œë¬¸ì¸ ê²ƒ 같습니다.\n" "ë‹¹ì‹ ì€ ì¦‰ì‹œ 재연결 하고 싶습니까?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "위모트가 ì—°ê²°ë¨" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "위모트 모터" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "위모트 설정" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "위모트" @@ -5664,26 +5653,26 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "ìž‘ë™ì¤‘..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "ì½˜ì†”ì— ì“°ê¸°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "ë””ë²„ê±°ì— ê¸°ë¡" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "파ì¼ì— 쓰기" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "윈ë„ìš°ì— ì“°ê¸°" @@ -5722,23 +5711,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "ë‹¹ì‹ ì€ íŽ˜ì´ì§€ë“¤ì„ 가진 ì°½ì„ ë‹«ì„ ìˆ˜ 없습니다." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "ê²Œìž„ì„ ì„ íƒí•´ì•¼ 합니다!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -5761,7 +5750,7 @@ msgstr "" "0x%04x ì´ì–´ì•¼í•©ë‹ˆë‹¤ (하지만 0x%04llx ìž„) \n" "새로 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 핵" @@ -5774,12 +5763,12 @@ msgstr "Zero 3 코드는 지ì›ë˜ì§€ 않습니다" msgid "Zero code unknown to dolphin: %08x" msgstr "ëŒí•€ì— 알려지지 ì•Šì€ Zero 코드: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 대기 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5795,7 +5784,7 @@ msgstr "" msgid "[Custom]" msgstr "[ì‚¬ìš©ìž ì§€ì •]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5813,7 +5802,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5827,11 +5816,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -5848,7 +5837,7 @@ msgstr "파ì¼: %s ì—ì„œ ë°ì´í„° ì½ê¸°ì— 실패" msgid "failed to read header" msgstr "í—¤ë” ì½ê¸°ì— 실패했습니다" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." @@ -5867,7 +5856,7 @@ msgstr "들" msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -5879,13 +5868,16 @@ msgstr "zì›ê±°ë¦¬ ì •ì •:" msgid "zNear Correction: " msgstr "z근거리 ì •ì •:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "프레임 스í…(&F)" @@ -5965,6 +5957,20 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "버í…스단위 ëŒ€ì‹ ì— í”½ì…€ë‹¨ìœ„ë¡œ 3D 그래픽 ê¹Šì´ ê°’ì„ ê³„ì‚°í•©ë‹ˆë‹¤.\n" +#~ "í”½ì…€ê´‘ì› ëª…ì•”(í–¥ìƒ)ì—ì„œ, 픽셀단위 ê¹Šì´ ê³„ì‚°ì€ ì†Œìˆ˜ ê²Œìž„ë“¤ì„ ì œëŒ€ë¡œ ì—뮬할 " +#~ "ë•Œ 필요가 있습니다.\n" +#~ "\n" +#~ "모르겠으면, ì´ê²ƒì„ ì²´í¬ìƒíƒœë¡œ ë‘세요." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6018,6 +6024,23 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "í”ŒëŸ¬ê·¸ì¸ %sì— ëŒ€í•œ 정보를 ì–»ì„ ìˆ˜ 없었습니다" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "KDE-Look.orgì— ì˜í•´ 만들어ì§" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]ì— ì˜í•´ 만들" +#~ "ì–´ì§" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VistaIcons.comì— ì˜í•´ 만들어ì§" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "black_riderì— ì˜í•´ 만들어지고 ForumW.org > Web Developmentsì—ì„œ ê²Œì‹œë¨ " + #~ msgid "DList Cache" #~ msgstr "ë°ì´í„°ë¦¬ìŠ¤íŠ¸ ìºì‰¬" @@ -6030,6 +6053,9 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "ê´‘ì› ë”" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "픽셀 ê¹Šì´ ë¹„í™œì„±" + #~ msgid "Disable Textures" #~ msgstr "í…스처들 ë”" @@ -6303,6 +6329,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "ëª…ì‹œëœ íŒŒì¼ (DOL,ELF,WAD,GCM,ISO,WAD) 로드" +#~ msgid "Lock Threads to Cores" +#~ msgstr "ì½”ì–´ì— ì“°ë ˆë“œ 잠그기" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "저수준(LLE) í˜¹ì€ ê³ ìˆ˜ì¤€(HLE)ì—뮬 오디오" @@ -6385,6 +6414,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "스í¬ë¦½íŠ¸ 구ë™ì¤‘...\n" +#~ msgid "Sample Rate:" +#~ msgstr "샘플율:" + #~ msgid "Scale:" #~ msgstr "스케ì¼:" @@ -6486,6 +6518,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "ê·¸ 파ì¼" +#~ msgid "Theme selection went wrong" +#~ msgstr "테마 ì„ íƒì´ 잘못ë˜ì—ˆë‹¤" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 43f03e0bd6..125ac2b920 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-06-06 20:15+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" "Language: Norwegian Bokmaal\n" @@ -19,17 +19,17 @@ msgstr "" "X-Poedit-Country: NORWAY\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,24,-1,-1,-1\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(for mange til til Ã¥ vises)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Spill :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! IKKE" @@ -57,14 +57,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopier%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Frakoblet" @@ -156,147 +149,147 @@ msgstr "%sImporter GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Ledige Blokker; %u Ledige Dir Entries" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& OG" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Om..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Start fra DVD-stasjon..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breakpoints" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Bla etter ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Jukse&kode-manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Bilde Forover" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Fullskjerm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Konfigurer Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Hjelp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Innstillinger for &Hot-tast" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Last &inn Save State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Minnekort Manager (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Minne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Ã…pne..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Les-kun &modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Restart" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Lyd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "S&topp" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Verktøy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "Vi&s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -316,7 +309,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(UKJENT)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(av)" @@ -324,19 +317,19 @@ msgstr "(av)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16-bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32-bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8-bit" @@ -344,20 +337,20 @@ msgstr "8-bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -365,25 +358,27 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Et NetPlay-vindu er allerede oppe!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Det kjøres ingen spill nÃ¥." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Et støttet bluetooh-device ble ikke funnet!\n" "(Kun Microsoft bluetooth stack støttes.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Du mÃ¥ fremme TCP-porten til verten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "" @@ -432,19 +427,19 @@ msgstr "" msgid "About Dolphin" msgstr "Om Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aksellerasjon" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Nøyaktighet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Nøyaktig VBeam-emulering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "Hvis usikker, velg EFB til tekstur isteden." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Aksjon" @@ -487,7 +482,7 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Legg Til " "Kode (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -514,15 +509,16 @@ msgstr "" "Action Replay Feil: Ugyldig størrelse (%08x : addresse = %08x) i Skriv Til " "Peker (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Feil: Ugyldig verdi (%08x) i Minnekopi (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Feil: Master Code og Skriv Til CCXXXXXXikke implementert (%s)" @@ -531,27 +527,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Feil: Ugyldig AR-kode linje: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Kondisjonsbasert Kode: Ugyldig Størrelse %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Ugyldig Normal Kodetype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kode %i: ugyldig Sub-type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kode 0: Ugyldig Sub-type %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -560,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Legg til Patch" @@ -572,13 +568,13 @@ msgstr "Legg til Patch" msgid "Add new pane" msgstr "Legg til ny rute" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Legg til..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresse :" @@ -618,50 +614,50 @@ msgstr "" "\n" "MERKNAD: Sjekk Loggvindu/Konsoll for de oppnÃ¥dde verdier." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Juster analogkontrolltrykket som kreves for Ã¥ aktivere knapper." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avansert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Avanserte Innstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle filer (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -674,20 +670,20 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropisk Filtrering:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Kantutjevning:" @@ -701,15 +697,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Applikasjonslaster:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Bruk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -719,16 +715,16 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabisk" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker pÃ¥ at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,14 +732,14 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -751,12 +747,12 @@ msgstr "Aspektforhold:" msgid "At least one pane must remain open." msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -764,24 +760,24 @@ msgstr "Audio Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Feil ved Ã¥pning av AO-device.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automatisk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Multiplum av 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatisk (Vindusstørrelse):" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Automatisk juster Vindusstørrelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -804,12 +800,12 @@ msgstr "&Registre" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Backend-innstillinger" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" @@ -827,15 +823,15 @@ msgid "Bad File Header" msgstr "DÃ¥rlig Fil-header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Bannerdetaljer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -843,11 +839,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Grunnleggende" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Grunnleggende Innstillinger" @@ -875,42 +871,42 @@ msgstr "BlÃ¥ Venstre" msgid "Blue Right" msgstr "BlÃ¥ Høyre" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Bunn" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Bundede Kontroller: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ødelagt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Bla i" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Bla etter en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Bla etter lagringssted" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Knapper" @@ -932,30 +928,15 @@ msgstr "C-joystick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU-emulatormotor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cacher Display-lister" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Kalkuler dybdeverdier for 3D-grafikk per-piksel istedenfor per punkt.\n" -"I motsetning til pikselbelysning (som er en forbedring), sÃ¥ er per-piksel " -"dybdekalkuleringer nødvendige for Ã¥ nøyaktig emulere en liten mengde spill.\n" -"\n" -"Hvis usikker, la stÃ¥ pÃ¥." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -969,7 +950,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Avbryt" @@ -985,7 +966,7 @@ msgstr "Kan ikke Ã¥pne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -995,7 +976,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1003,12 +984,12 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan ikke finne Wiimote med bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan ikke finne Wiimote med tilkoblingshandler %02x" @@ -1022,7 +1003,7 @@ msgstr "Kan ikke lese fra DVD_Plugin - DVD-Interface: Fatal Feil" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalansk" @@ -1030,24 +1011,24 @@ msgstr "Katalansk" msgid "Center" msgstr "Senter" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Endre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Endre &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Endre Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Endre Spill" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1063,12 +1044,11 @@ msgstr "Endringer signeres til zFar-parameteren (etter korreksjon)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Endringer signeres til zNear-parameteren (etter korreksjon)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Ã… endre dette vil ikke ha noen effekt mens emulatoren kjører!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1076,47 +1056,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Juksekode" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Juksekodesøk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Juksekode Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplifisert)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1124,7 +1104,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1132,8 +1112,8 @@ msgstr "" "Velg fil til Ã¥ bruke som applikasjonslaster: (gjelder kun for disker laget " "fra mapper)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Velg mappen Ã¥ ekstrahere til" @@ -1147,8 +1127,8 @@ msgstr "Klassisk" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Tøm" @@ -1160,22 +1140,22 @@ msgstr "" "Klientfrakobling mens spillet kjørte!! NetPlay er slÃ¥tt av. Du mÃ¥ manuelt " "stoppe spillet." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Lukk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ko&nfigurer..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kodeinfo" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kode:" @@ -1187,91 +1167,91 @@ msgstr "Kommando" msgid "Comment" msgstr "Kommentar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Komprimerer ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfig" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfigurer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Konfigurer Kontroller" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Konfigurer Kontrollere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Bekreft ved Stans" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Koble til Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Koble til Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Koble til Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Koble til Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Koble til Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Kobler til..." @@ -1291,12 +1271,12 @@ msgstr "Konverter til GCI" msgid "Copy failed" msgstr "Kopi feilet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopier til Minnekort %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Kjerne" @@ -1305,7 +1285,7 @@ msgstr "Kjerne" msgid "Could not create %s" msgstr "Kunne ikke lage %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Kunne ikke initialisere backend %s." @@ -1326,12 +1306,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kunne ikke gjennkjenne ISO-fil %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Kunne ikke lagre %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1352,11 +1332,11 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1364,17 +1344,17 @@ msgstr "" "Kunne ikke initialisere kjernen.\n" "Sjekk kofigurasjonen din." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Antall:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Lag AR-kode" @@ -1383,25 +1363,7 @@ msgstr "Lag AR-kode" msgid "Create new perspective" msgstr "Lag nytt perspektiv" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Laget av KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Laget av VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Skaper:" @@ -1409,11 +1371,11 @@ msgstr "Skaper:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Krum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1427,12 +1389,12 @@ msgstr "" msgid "Crossfade" msgstr "Kryssutfase" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "NÃ¥værende mappesti endret fra %s til %s etter wxFilVelger!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Selvdefinert Projeksjons-hack" @@ -1440,11 +1402,11 @@ msgstr "Selvdefinert Projeksjons-hack" msgid "Custom Projection Hack Settings" msgstr "Innstillinger for Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tsjekkisk" @@ -1456,36 +1418,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE-emulering (raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE re-kompilering" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1497,11 +1459,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Datastørrelse" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Dato:" @@ -1518,11 +1480,11 @@ msgstr "Datel MaxDrive/Pro-filer(*.sav)" msgid "Dead Zone" msgstr "Dødsone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1530,24 +1492,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1556,11 +1518,11 @@ msgid "Default font" msgstr "Standard tekst-font" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Slett" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Slett Lagringsfil" @@ -1569,11 +1531,11 @@ msgstr "Slett Lagringsfil" msgid "Delete the existing file '%s'?" msgstr "Slett den eksiterende filen '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Beskrivelse" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Finn automatisk" @@ -1586,13 +1548,13 @@ msgstr "" "Forsøkte Ã¥ lese mer data fra DVD-en enn det som fÃ¥r plass i ut-bufferen. " "Clamp-krasj." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1616,20 +1578,16 @@ msgstr "" "Mappestisjekksum misyktes\n" " og mappesti backup-sjekksummen mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Deaktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Deaktiver tÃ¥ke (fog)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Deaktiver Per-Pikseldybde" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1643,7 +1601,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1659,7 +1617,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1668,11 +1626,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Feil ved lesing av disk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Visning" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1686,20 +1644,24 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafikkinstillinger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Webside" @@ -1707,32 +1669,32 @@ msgstr "Dolphin &Webside" msgid "Dolphin Configuration" msgstr "Konfigurer Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Emulert Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Konfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin pÃ¥ &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1740,7 +1702,7 @@ msgstr "" "Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for Ã¥ bla " "etter filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1748,16 +1710,21 @@ msgstr "" "Dolphin er satt til Ã¥ gjemme alle spill. Dobbeltklikk her for Ã¥ vise alle " "spill..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Ned" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Last ned juksekoder (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Lastet ned %lu koder. (la til %lu)" @@ -1766,27 +1733,27 @@ msgstr "Lastet ned %lu koder. (la til %lu)" msgid "Drums" msgstr "Trommer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Dump Audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Skjermdumping" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump teksturer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1796,7 +1763,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1806,7 +1773,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1816,17 +1783,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Nederlansk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Avslutt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB-kopier" @@ -1846,11 +1813,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Tidlige Minneoppdateringer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Endre" @@ -1858,7 +1825,7 @@ msgstr "Endre" msgid "Edit ActionReplay Code" msgstr "Endre ActionReplay-kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Endre Konfigurasjon" @@ -1866,12 +1833,12 @@ msgstr "Endre Konfigurasjon" msgid "Edit Patch" msgstr "Endre Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Endre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Endre..." @@ -1879,7 +1846,7 @@ msgstr "Endre..." msgid "Effect" msgstr "Effekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer (EFB)" @@ -1887,7 +1854,7 @@ msgstr "Embedded Frame Buffer (EFB)" msgid "Emu Thread already running" msgstr "Emulator-CPU-trÃ¥den kjører allerede" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1901,7 +1868,7 @@ msgstr "" "\n" "Hvis usikker, benytt virtuell XFB isteden." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1917,19 +1884,19 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulert Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulasjonsstatus:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Aktiver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1945,72 +1912,71 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Aktiver BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Aktiver cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Aktiver Juksekoder" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Aktiver Dobbelkjerne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Aktiver Dobbelkjerne (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Aktiver Snarveistaster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Aktiver Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Aktiver Idle Skipping (for bedre ytelse)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Aktiver MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Aktiver Widescreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Aktiver WireFrame" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2023,7 +1989,7 @@ msgstr "" "\n" "Hvis usikker, velg 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2031,11 +1997,11 @@ msgstr "" "Aktiver rask disktilgang. Trengs for noen fÃ¥ spill. (PÃ… = Raskt, AV = " "Kompitabelt)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Aktiver sider" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2047,7 +2013,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2059,7 +2025,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2067,7 +2033,7 @@ msgstr "" "Aktiver dette for Ã¥ bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2077,11 +2043,28 @@ msgstr "" "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " "AV = Raskt)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2094,7 +2077,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2102,7 +2085,7 @@ msgstr "" "Tillater Memory Management Unit (MMU), som trengs for noen spill. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2116,14 +2099,14 @@ msgstr "" msgid "End" msgstr "Slutt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Engelsk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Forbedringer" @@ -2141,17 +2124,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Lik" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Feil" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Feil ved lasting av valgt sprÃ¥k. Faller tilbake til systemstandarden." @@ -2188,32 +2171,32 @@ msgstr "Unntakshandler - tilgang under minneomrÃ¥de. %08llx%08llx" msgid "Execute" msgstr "Kjør" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Eksportering mislyktes" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Eksporter Fil" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Eksporter Opptak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Eksporter Opptak..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Eksporter alle lagringsfiler" @@ -2229,7 +2212,7 @@ msgstr "Eksporter lagringsfil som..." msgid "Extension" msgstr "Utvidelse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Ekstern Bildebuffer (EFB)" @@ -2241,44 +2224,44 @@ msgstr "Ekstra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ekstra Parameter nyttig kun i ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Ekstraher Alle Filer..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Ekstraher Applikasjonslaster..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Ekstraher DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Ekstraher Mappe..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Ekstraher Fil..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Ekstraher Partisjon..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Ekstraherer %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Ekstraherer Alle Filer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Ekstraherer Mappe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Ekstraherer..." @@ -2286,7 +2269,7 @@ msgstr "Ekstraherer..." msgid "FIFO Byte" msgstr "FIFO-Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO-spiller" @@ -2294,7 +2277,7 @@ msgstr "FIFO-spiller" msgid "FRANCE" msgstr "FRANKRIKE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST-størrelse:" @@ -2302,15 +2285,15 @@ msgstr "FST-størrelse:" msgid "Failed to Connect!" msgstr "Tilkobling Mislyktes!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Lytting Mislyktes!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Nedlasting av koder mislyktes." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ekstrahering til %s mislyktes!" @@ -2428,41 +2411,41 @@ msgstr "Kunne ikke skrive header for %s" msgid "Failed to write header for file %d" msgstr "Kunne ikke skrive header for filen %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo-spiller" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Filinformasjon" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Filen inneholder ingen koder." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Fil konvertert til .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2479,7 +2462,7 @@ msgstr "" "Filen har utvidelsen \"%s\"\n" "gyldige utvidelser er (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Filen kjennes ikke igjen som et minnekort" @@ -2492,19 +2475,19 @@ msgstr "Filen ikke komprimert" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2512,27 +2495,27 @@ msgstr "" msgid "First Block" msgstr "Første Blokk" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Fiks Sjekksummer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Tving 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Tving 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Tving Konsoll til NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Tving Teksturfiltrering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2545,7 +2528,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2557,7 +2540,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2593,43 +2576,43 @@ msgstr "Stillbilde" msgid "Frame " msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Bilde-for-bilde Modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Spillopptak bruker FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Bilderekkevidde" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimit:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Bilder Til Opptak" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Fri Utkikk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Fransk" @@ -2637,16 +2620,16 @@ msgstr "Fransk" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Fra" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "FullSkj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Fullskjermsoppløsning:" @@ -2659,7 +2642,7 @@ msgstr "GCI Fil(*.gci)" msgid "GCMic Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC-kontroll" @@ -2667,27 +2650,27 @@ msgstr "GC-kontroll" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spill-ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Spillet kjører allerede!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Et spill kjører ikke!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spill ikke funnet!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spill-spesifikke Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "SpillKonfigurasjon" @@ -2695,25 +2678,25 @@ msgstr "SpillKonfigurasjon" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Innstillinger for GameCube-kontroll" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-juksekoder" @@ -2728,20 +2711,20 @@ msgstr "" "GeckoKode mislyktes i Ã¥ kjøre (CT%i CST%i) (%s)\n" "(Enten en dÃ¥rlig kode, eller sÃ¥ støttes ikke kodeformatet.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Generelt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Generelle Innstillinger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Tysk" @@ -2750,19 +2733,19 @@ msgstr "Tysk" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeksen er større enn AR-kodelistens størrelse %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafikk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Innstillinger for Grafikk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Større Enn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2780,7 +2763,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Gresk" @@ -2800,11 +2783,11 @@ msgstr "Grønn Høyre" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY ble kalt, venligst rapporter!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2812,7 +2795,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Header-sjekksum feilet" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebraisk" @@ -2824,7 +2807,7 @@ msgstr "Høyde" msgid "Help" msgstr "Hjelp" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2844,11 +2827,11 @@ msgstr "" msgid "Hide" msgstr "Gjem" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Gjem Musepeker" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2862,8 +2845,8 @@ msgstr "" msgid "Home" msgstr "Hjem" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Vert" @@ -2871,17 +2854,17 @@ msgstr "Vert" msgid "Hotkey Configuration" msgstr "Konfigurer Snarveistaster" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Snarveistaster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Ungarsk" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrid Wiimote" @@ -2907,7 +2890,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Innstillinger for IPL" @@ -2915,19 +2898,19 @@ msgstr "Innstillinger for IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR-peker" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR-sensitivitet:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO-mapper" @@ -2939,20 +2922,20 @@ msgstr "ITALIA" msgid "Icon" msgstr "Ikon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Hvis bilderatioen er erratisk, kan denne innstillingen hjelpe. (PÃ… = " "Kompitabelt, AV = Raskt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2963,11 +2946,11 @@ msgstr "" "PAL:50), mÃ¥ du ogsÃ¥ deaktivere Audio Throttle i DSP-innstillingene for Ã¥ " "gjøre endringen effektiv." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorer Formatendringer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2981,7 +2964,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2995,7 +2978,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importer Lagringsfil" @@ -3003,7 +2986,7 @@ msgstr "Importer Lagringsfil" msgid "Import failed, try again?" msgstr "Importering mislyktes, prøv igjen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3011,11 +2994,11 @@ msgstr "" "Importert fil har .gsc-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "importert fil har ugyldig lengde" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3023,7 +3006,7 @@ msgstr "" "Importert fil har .sav-utvidelse\n" "men har ikke korrekt header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3034,16 +3017,16 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "I spillet" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3051,7 +3034,7 @@ msgstr "Info" msgid "Information" msgstr "Informasjon" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Inndata" @@ -3063,7 +3046,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3071,11 +3054,11 @@ msgstr "Sett inn SD-kort" msgid "Insert name here.." msgstr "Sett inn navn her..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3084,34 +3067,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Installer WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3132,15 +3115,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Intern LZO-feil - lzo_init() mislyktes" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Intern Oppløsning:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (VELDIG treg)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3149,11 +3132,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Ugyldig størrelse (%x) eller magisk ord (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ugyldig verdi!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Ugyldig bat.map eller mappesti" @@ -3177,7 +3160,7 @@ msgstr "" "%s\n" " Det kan hende du mÃ¥ re-dumpe dette spillet." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ugyldig opptaksfil" @@ -3185,21 +3168,21 @@ msgstr "Ugyldig opptaksfil" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Ugyldig save state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiensk" @@ -3207,16 +3190,16 @@ msgstr "Italiensk" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Rekompilerer (anbefalt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL eksperimentiell rekompilerer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japansk" @@ -3224,7 +3207,7 @@ msgstr "Japansk" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3235,17 +3218,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Tast" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreansk" @@ -3263,19 +3246,23 @@ msgstr "L-Knappen" msgid "L-Analog" msgstr "Venstre-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Siste Overskrevne Save State:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Siste Save State:" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3285,8 +3272,8 @@ msgstr "Venstre" msgid "Left Stick" msgstr "Venstre Joystick" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3294,7 +3281,7 @@ msgstr "" "Venstreklikk for Ã¥ oppdage hot-taster.\n" "Trykk space for Ã¥ klarere." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3304,7 +3291,7 @@ msgstr "" "Middelklikk for Ã¥ tømme.\n" "Høyreklikk for flere alternativer." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3312,76 +3299,76 @@ msgstr "" "Venstre/Høyre-klikk for flere alternativer.\n" "Middelklikk for Ã¥ tømme." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Mindre Enn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Begrens med FPS (bilder-per-sekund)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Last inn" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Last inn Kustomiserte Teksturer" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Last Inn Save State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Last Inn Save State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Last Inn Save State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Last Inn Save State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Last Inn Save State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Last Inn Save State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Last Inn Save State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Last Inn Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3395,31 +3382,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Last in pre-satte verdier fra tilgjengelige hack-mønstre." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Logg" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Konfigurer Logg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Loggtyper" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3431,12 +3414,12 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger utdata" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3457,7 +3440,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3471,24 +3454,24 @@ msgstr "MadCatz Gameshark-filer(*.gcs)" msgid "Main Stick" msgstr "Hoved-joystick" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Skaper-ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Skaper:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Maximum" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Minnekortet har allerede en lagringsfil for denne tittelen." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Minnekort allerede Ã¥pnet" @@ -3497,7 +3480,7 @@ msgid "Memory Byte" msgstr "Memory Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Minnekort" @@ -3534,20 +3517,20 @@ msgstr "" msgid "Menu" msgstr "Meny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Minimum" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3556,7 +3539,7 @@ msgstr "Diverse Innstillinger" msgid "Modifier" msgstr "Modifiserer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3581,7 +3564,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3603,7 +3586,7 @@ msgstr "" msgid "Multiply" msgstr "Multipliser" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3703,16 +3686,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Opp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Navn:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Navn:" @@ -3721,20 +3704,20 @@ msgstr "Navn:" msgid "Native GCI files(*.gci)" msgstr "Maskinvare-innfødte GCI-filer(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nytt Søk" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Neste Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Neste Søk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Brukernavn :" @@ -3742,7 +3725,7 @@ msgstr "Brukernavn :" msgid "No Country (SDK)" msgstr "Intet Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Ingen ISO- eller WAD-filer funnet" @@ -3764,7 +3747,7 @@ msgstr "Ingen dokking" msgid "No file loaded" msgstr "Ingen fil lastet" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Ingen ledige mappestiindeks-entries" @@ -3777,33 +3760,33 @@ msgstr "Ingen opptaksfil" msgid "No save folder found for title %s" msgstr "Ingen lagringsmappe funnet for tittel %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Ingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norsk BokmÃ¥l" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ikke Lik" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Ikke Satt" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Ikke tilkoblet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notater" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notater:" @@ -3812,7 +3795,7 @@ msgstr "Notater:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Merknad" @@ -3820,16 +3803,16 @@ msgstr "Merknad" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Antall koder:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk Aksellerasjon" @@ -3837,11 +3820,11 @@ msgstr "Nunchuk Aksellerasjon" msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Objekt Radius" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Av" @@ -3849,52 +3832,52 @@ msgstr "Av" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Kun %d blokker tilgjengelig" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Ã…pne fil..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kan ikke lage kontekst for device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kan ikke finne lyd-device" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan ikke Ã¥pne device %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Teksturdekoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" @@ -3907,7 +3890,7 @@ msgstr "Alternativer" msgid "Orange" msgstr "Oransje" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3917,8 +3900,8 @@ msgstr "" "Høyreklikk og eksporter all lagringsfilene,\n" "og importer lagringsfilene til et nytt minnekort\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Annet" @@ -3930,19 +3913,19 @@ msgstr "" "Den andre klienten koblet fra mens spillet kjører! NetPlay er frakoblet. Du " "mÃ¥ stoppe spillet manuelt." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Utdata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Spi&llopptak..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Kontroll" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Kontroll" @@ -3958,7 +3941,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Pair Up" @@ -3970,34 +3953,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametere" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partisjon %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patcher" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pikselbelysning" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekt" @@ -4006,36 +3989,36 @@ msgstr "Perfekt" msgid "Perspective %d" msgstr "Perspektiv %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Spill" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Spill Opptak" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Spill/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Spillbar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Avspillingsalterntiver" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4047,54 +4030,54 @@ msgstr "Vennligst lag et persektiv før du lagrer" msgid "Plus-Minus" msgstr "Pluss-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugisisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (Brasilsk)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4107,11 +4090,11 @@ msgstr "ForhÃ¥ndssatte:" msgid "Prev Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Forrige Side" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Forrige Verdi" @@ -4119,7 +4102,7 @@ msgstr "Forrige Verdi" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4127,7 +4110,7 @@ msgstr "Profil" msgid "Properties" msgstr "Egenskaper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Tøm Cache" @@ -4135,8 +4118,8 @@ msgstr "Tøm Cache" msgid "Question" msgstr "SpørsmÃ¥l" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Avslutt" @@ -4154,7 +4137,7 @@ msgstr "R-knappen" msgid "R-Analog" msgstr "Høyre-analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4162,47 +4145,47 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Rekkevidde" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Les-kun-modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Ekte" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Ekte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Ekte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Gjenntilkoble Wiimote bekreftelse" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Opptak" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Opptaksinformasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opptaksinnstillinger" @@ -4218,7 +4201,7 @@ msgstr "Rød Venstre" msgid "Red Right" msgstr "Rød Høyre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4233,29 +4216,29 @@ msgstr "" "\n" "Hvis usikker, velg ingen." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Oppdater" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Oppdater liste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Oppdater spilliste" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Fjern" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4265,17 +4248,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Render til Hovedvindu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Restart" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultater" @@ -4297,29 +4280,25 @@ msgstr "Høyre Joystick" msgid "Rumble" msgstr "Rumble" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Kjør DSP LLE pÃ¥ en dedikert CPU-trÃ¥d (ikke anbefalt)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Lagre Sa&ve State" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Sikker" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Samplingsratio:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Lagre" @@ -4327,90 +4306,90 @@ msgstr "Lagre" msgid "Save GCI as..." msgstr "Lagre GCI som..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Lagre Save State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Lagre Save State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Lagre Save State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Lagre Save State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Lagre Save State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Lagre Save State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Lagre Save State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Lagre Save State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Lagre Save State..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Søker..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "SkjDump" @@ -4418,25 +4397,25 @@ msgstr "SkjDump" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Juksekodesøk" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Søk i Undermapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4447,20 +4426,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Seksjon %s ikke funnet i SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Velg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4478,23 +4457,23 @@ msgstr "Velg en lagringsfil Ã¥ importere" msgid "Select floating windows" msgstr "Velg flytvindu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4512,11 +4491,16 @@ msgstr "" "\n" "Hvis usikker, velg Automatisk." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Valgt font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4532,7 +4516,7 @@ msgstr "" "Hvis usikker, velg skrivebordsoppløsningen din.\n" "Hvis fortsatt usikker, bruk den høyeste oppløsingen som fungerer for deg." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4548,11 +4532,11 @@ msgstr "" "\n" "Hvis usikker, velg Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Send" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensorbarposisjon:" @@ -4560,24 +4544,24 @@ msgstr "Sensorbarposisjon:" msgid "Separator" msgstr "Separatør" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbisk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Sett som standard Minnekort %c" @@ -4587,11 +4571,17 @@ msgstr "Sett som standard Minnekort %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: indeks er større enn AR-kodelistestørrelsen %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Innstillinger..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" @@ -4599,7 +4589,7 @@ msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" msgid "Shake" msgstr "Rist" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kortnavn:" @@ -4608,105 +4598,105 @@ msgstr "Kortnavn:" msgid "Shoulder Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Vis &Konsoll" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Vis &Logg" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Vis &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Vis &Verktøylinje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Vis DVD-stasjoner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Vis Kopieringsregioner for EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Vis Bildefrekvens (FPS)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Vis Frankrike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Vis GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Vis Inndata" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Vis Italia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Vis JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Vis Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Vis SprÃ¥k:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Vis Loggk&onfigurasjon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Vis PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Vis Plattformer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Vis Regioner" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Vis Statistikker" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Vis Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Vis USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Vis WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Vis Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Vis en bekreftelsesboks før spill stoppes." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4715,39 +4705,39 @@ msgstr "" "men det kan ogsÃ¥ forÃ¥rsake\n" "at Dolphin plutselig krasjer uten noen forklaring." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Vis første blokk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Vis lagringsblokker" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Vis lagringskommentar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Vis lagringsikon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Vis lagringstittel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4758,11 +4748,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Vis ukjent" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4776,27 +4766,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Dropp BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Dropp EFB Access fra CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4808,7 +4798,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4824,17 +4814,17 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4842,7 +4832,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Stillbilde" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Software-renderer" @@ -4857,11 +4847,11 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Innstillinger for Audio" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Audio backend %s er ugyldig" @@ -4875,17 +4865,17 @@ msgstr "Laging av lydbuffer mislyktes: %s" msgid "Space" msgstr "Mellomrom" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spansk" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Høytalervolum:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4904,7 +4894,7 @@ msgstr "" "\n" "Hvis usikker, velg 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Øk diskoverføringshatighet" @@ -4912,51 +4902,55 @@ msgstr "Øk diskoverføringshatighet" msgid "Square Stick" msgstr "Kvadrat-joystick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standardkontroller" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Begynn &Opptak" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Begynn Opptak" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Save State" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Save State-lagringsfiler" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stopp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4970,7 +4964,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ pÃ¥." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Strekk til Vindu" @@ -4995,8 +4989,8 @@ msgstr "Importering av lagringsfiler vellykket" msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "SystemsprÃ¥k:" @@ -5004,7 +4998,7 @@ msgstr "SystemsprÃ¥k:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -5026,30 +5020,30 @@ msgstr "Tabell Venstre" msgid "Table Right" msgstr "Tabell Høyre" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Ta Skjermbilde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Tekstur-cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Teksturformat Overlegg" @@ -5065,13 +5059,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5094,7 +5088,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Filen %s er allerede Ã¥pen, fil-headeren vil ikke bli skrevet." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Filen du spesifiserte (%s) eksisterer ikke" @@ -5111,7 +5105,7 @@ msgstr "navnet kan ikke inneholde tegnet ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Den dekrypterte AR-koden inneholder ingen linjer." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5124,11 +5118,11 @@ msgstr "" "\n" "Hvis usikker, bruk den andre-raskeste verdien fra høyre." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Lagringsfilen du forsøker Ã¥ Ã¥pne har en ugyldig filstørrelse" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5160,14 +5154,11 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Velging av tema gikk feil" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5175,7 +5166,7 @@ msgid "" msgstr "" "Det mÃ¥ være en billett for 00000001/00000002. Din NAND-dump er ukomplett." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5191,11 +5182,11 @@ msgstr "" "Denne Action Replay-simulatoren støtter ikke koder som modifiserer selve " "Action Replay." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5213,7 +5204,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5225,7 +5216,7 @@ msgstr "" "Øker ytelsen pÃ¥ datamaskiner med mer enn én kjerne,\n" "men kan ogsÃ¥ føre til feil/krasj." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" @@ -5239,35 +5230,35 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Tittel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Til" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Vipp Alle Loggtyper" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Vipp Mellom Vindu/Fullskjerm" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topp" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Tradisjonell Kinesisk" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Forsøkte Ã¥ laste en ukjent filtype." @@ -5287,7 +5278,7 @@ msgstr "" "Forsøker Ã¥ lese fra ugyldig SYSCONF\n" "Wiimote bt ids er ikke tilgjengelig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Tyrkisk" @@ -5299,12 +5290,12 @@ msgstr "Dreieskive" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5338,12 +5329,12 @@ msgstr "" "kryptert eller dekryptert kode. Sørg for at du tastet den inn korrekt.\n" "Ønsker du Ã¥ ignorere denne linjen og fortsette parsering?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Udefinert %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Angre Lasting av Save State" @@ -5351,7 +5342,7 @@ msgstr "Angre Lasting av Save State" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Ukjent" @@ -5380,8 +5371,8 @@ msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!" msgid "Up" msgstr "Opp" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Oppdater" @@ -5389,23 +5380,23 @@ msgstr "Oppdater" msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Bruk Fullskjerm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Bruk Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Bruk Panikkadvarslere" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5418,7 +5409,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5432,15 +5423,15 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Verktøyet" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Vertikal Synkronisering" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Verdi" @@ -5448,23 +5439,23 @@ msgstr "Verdi" msgid "Value:" msgstr "Verdi:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Verdi:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbøsitet" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volum" @@ -5479,7 +5470,7 @@ msgstr "WAD-installasjon feilet: Skaper feil %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD-installasjon feilet: Skaper feil %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5492,16 +5483,16 @@ msgstr "" "Hvis usikker, la stÃ¥ avslÃ¥tt." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Advarsel" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Advarsel - starter DOL i feil konsollmodus!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Advarsel - starter ELF i feil konsollmodus!" @@ -5533,7 +5524,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5541,7 +5532,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5549,7 +5540,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5569,7 +5560,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - fil ikke Ã¥pen." @@ -5577,7 +5568,7 @@ msgstr "WaveFileWriter - fil ikke Ã¥pen." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5585,23 +5576,23 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Bredde" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5609,17 +5600,17 @@ msgstr "Wii-lagringsfiler (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kunne ikke lese fra fil" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5632,19 +5623,19 @@ msgstr "" "eller kanskje den koblet seg fra pga. inaktivitet.\n" "Vil du koble til igjen øyeblikkelig?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Tilkoblet" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote-motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5665,27 +5656,27 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Arbeider..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Skriv til Konsoll" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Skriv til Fil" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Skriv til Fil" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Skriv til Vindu ->" @@ -5722,23 +5713,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Du kan ikke lukke panelene som har sider/faner i dem." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Du mÃ¥ velge et spill!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Du mÃ¥ skrive inn et navn!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Du mÃ¥ skrive inn en gyldig desimal, hexadesimal eller octal verdi." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Du mÃ¥ skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du mÃ¥ restarte Dolphin for at endringen skal tre i kraft." @@ -5761,7 +5752,7 @@ msgstr "" "Den skal være 0x%04x (men er 0x%04llx)\n" "Ønsker du Ã¥ generere en ny en?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP-hack" @@ -5774,12 +5765,12 @@ msgstr "Zero 3-kode støttes ikke" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero-kode ukjent for Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ venter ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5794,7 +5785,7 @@ msgstr "" msgid "[Custom]" msgstr "[Selvdefinert]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5813,7 +5804,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5827,11 +5818,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -5848,7 +5839,7 @@ msgstr "Kunne ikke lese data fra fil: %s" msgid "failed to read header" msgstr "Kunne ikke lese header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." @@ -5867,7 +5858,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -5879,13 +5870,16 @@ msgstr "zFar Korreksjon: " msgid "zNear Correction: " msgstr "zNear Korreksjon: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ELLER" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Bilde-etter-bilde Modus" @@ -5953,6 +5947,21 @@ msgstr "| ELLER" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Kalkuler dybdeverdier for 3D-grafikk per-piksel istedenfor per punkt.\n" +#~ "I motsetning til pikselbelysning (som er en forbedring), sÃ¥ er per-piksel " +#~ "dybdekalkuleringer nødvendige for Ã¥ nøyaktig emulere en liten mengde " +#~ "spill.\n" +#~ "\n" +#~ "Hvis usikker, la stÃ¥ pÃ¥." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -5989,6 +5998,21 @@ msgstr "| ELLER" #~ msgid "Could not get info about plugin %s" #~ msgstr "Kunne ikke lage %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Laget av KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Laget av Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Laget av VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Laget av black_rider og publisert pÃ¥ ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6002,6 +6026,9 @@ msgstr "| ELLER" #~ msgid "Disable Lighting" #~ msgstr "Deaktiver lyseffekter" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Deaktiver Per-Pikseldybde" + #~ msgid "Disable Textures" #~ msgstr "Deaktiver teksturer" @@ -6231,6 +6258,9 @@ msgstr "| ELLER" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Laster den spesifiserte filen (DOL,ELF,WAD,GCM,ISO)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "LÃ¥s CPU-trÃ¥der til Kjerner" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Lavt level emulert (LLE) eller høyt level (HLE) audio" @@ -6304,6 +6334,9 @@ msgstr "| ELLER" #~ msgid "Running script...\n" #~ msgstr "Kjører skript...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Samplingsratio:" + #~ msgid "Scale:" #~ msgstr "Skala:" @@ -6412,6 +6445,9 @@ msgstr "| ELLER" #~ msgid "The file " #~ msgstr "Filen" +#~ msgid "Theme selection went wrong" +#~ msgstr "Velging av tema gikk feil" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index da4144d917..d30a1d168f 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-08-07 16:43+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" "Language: Dutch\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(te veel om te weergeven)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Spel:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NIET" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopieer%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Verbinding Verbroken" @@ -155,147 +148,147 @@ msgstr "%sImporteer GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Vrije Blokken; %d Vrije Bestands Ingangen" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& EN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Over..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Start van DVD Drive..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breekpunten" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Zoek voor ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Cheats Manager" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulatie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Frame Avanceren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Volledig Scherm" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Grafische Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Help" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Sneltoets Instellingen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Laad staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Geheugenkaart Manager (GC) " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Geheugen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Open..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opties " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Eigenschappen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Lijst Vernieuwen " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Geluid " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Gereedschap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Bekijk " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -315,7 +308,7 @@ msgstr "(-)+zDichtbij" msgid "(UNKNOWN)" msgstr "(ONBEKEND)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(uit) " @@ -323,19 +316,19 @@ msgstr "(uit) " msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -343,20 +336,20 @@ msgstr "8 bit" msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr " " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -364,25 +357,27 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Er is al een NetPlay venster geopend!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Er staat geen spel aan." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Er is geen ondersteund bluetooth apparaat gevonden!\n" "(Alleen de Microsoft bluetooth stack is ondersteund.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Je moet de TCP poort forwarden voor het hosten!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Codes" @@ -432,19 +427,19 @@ msgstr "AR Codes" msgid "About Dolphin" msgstr "Over Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Acceleratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Accurate VBeam emulatie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Actie" @@ -487,7 +482,7 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : address = %08x) in Voeg Code " "Toe (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -514,15 +509,16 @@ msgstr "" "Action Replay Fout: Verkeerde grootte (%08x : adres = %08x) in Schrijf Naar " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Fout: Verkeerde waarde (%08x) in Geheugen Kopie (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Action Replay Fout: Master Code en Schrijf naar CCXXXXXX niet " "geimplementeerd (%s)" @@ -532,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Fout: foutive AR code regel: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditionele Code: Onjuiste Grootte %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Onjuiste Normal Code Type %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Onjuist subtype %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Onjuist Subtype %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -561,11 +557,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -573,13 +569,13 @@ msgstr "Voeg Patch toe" msgid "Add new pane" msgstr "Voeg een nieuwe paneel toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Voeg toe..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -619,50 +615,50 @@ msgstr "" "\n" "NB: Controleer de uiteindelijke waardes in LogWindow/Console." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Stel de vereiste analoge control druk in om de knop te activeren." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Geavanceerd" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Geavanceerde Instellingen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Alle Bestanden (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -675,20 +671,20 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropic Filteren:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -701,15 +697,15 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Applader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Toepassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -719,16 +715,16 @@ msgstr "" "\n" "In geval van twijfel selecteer (uit)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabisch" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,14 +732,14 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -751,12 +747,12 @@ msgstr "Beeldverhouding:" msgid "At least one pane must remain open." msgstr "Er moet tenminste één paneel open blijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -764,24 +760,24 @@ msgstr "Geluid Backend:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Veelvoud van 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Automatisch (Venster Grootte)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Venster grootte automatisch aanpassen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -804,12 +800,12 @@ msgstr "&Registers" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Backend Instellingen" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Geluids backend:" @@ -827,15 +823,15 @@ msgid "Bad File Header" msgstr "Verkeerde bestands header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Banner Details" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -843,11 +839,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Balk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Basis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Basis Instellingen" @@ -875,42 +871,42 @@ msgstr "Blauw Links" msgid "Blue Right" msgstr "Blauw Rechts" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Onder" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Gekoppelde controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Defect" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Zoek" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Knoppen" @@ -931,31 +927,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulatie Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Activeer scherm lijst caching." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Bereken diepte waardes van 3D graphics per-pixel, in plaats van per " -"vertex. \n" -"In tegenstelling tot pixel verlichting (wat enkel een toevoeging is) zijn " -"per-pixel berekeningen nodig om een klein aantal spellen goed te emuleren.\n" -"\n" -"In geval van twijfel leeg laten." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -971,7 +951,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Annuleer" @@ -987,7 +967,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -997,7 +977,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1005,12 +985,12 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Kan WiiMOte niet via bd vinden: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Kan WiiMote met verbinding handle %02x niet vinden" @@ -1024,7 +1004,7 @@ msgstr "Kan niet lezen van DVD_Plugin - DVD-Interface: Fatal Error" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalaans" @@ -1032,24 +1012,24 @@ msgstr "Catalaans" msgid "Center" msgstr "Middelpunt" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Verander" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Verander &Schijf" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Verander Schijf" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Spel veranderen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1065,12 +1045,11 @@ msgstr "Verandert teken van zVer parameter (na correctie)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Verandert teken van zDichtbij parameter (na correctie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Het heeft geen effect als je dit veranderd wanneer de emulator draait!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1078,47 +1057,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Cheat Zoeken" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Cheats Manager" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinees (Vereenvoudigd)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1126,7 +1105,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1134,8 +1113,8 @@ msgstr "" "Kies Bestand te gebruiken als apploader: (geldt voor disks die alleen mappen " "uit mappen zijn opgebouwd)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Kies de folder om naar uit te pakken" @@ -1149,8 +1128,8 @@ msgstr "Klassiek" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Legen" @@ -1162,22 +1141,22 @@ msgstr "" "Client is uitgeschakeld terwijl het spel draait! NetPlay is uitgeschakeld. " "Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Sluit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "In&stellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Code Info" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Code: " @@ -1189,92 +1168,92 @@ msgstr "Commando" msgid "Comment" msgstr "Reactie" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Config" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configureer" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configureer Besturing" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configureer Besturing Pads" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Bevestiging om te stoppen" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Verbind Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Verbind Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Verbind Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Verbind Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Verbind Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Verbinden..." @@ -1294,12 +1273,12 @@ msgstr "Omzetten naar GCI" msgid "Copy failed" msgstr "Kopiëren mislukt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopieer naar MemKaart %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1308,7 +1287,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Het volgende bestanden kon niet gemaakt worden %s " -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Kon de %s backend niet initialiseren." @@ -1329,12 +1308,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kon ISO bestand %s niet herkennen." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Kon %s niet opslaan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1356,11 +1335,11 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1368,17 +1347,17 @@ msgstr "" "Kon de kern niet initialiseren.\n" "Controleer je instellingen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Tel:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Land:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Maak AR Code" @@ -1387,25 +1366,7 @@ msgstr "Maak AR Code" msgid "Create new perspective" msgstr "Maak een nieuwe perspective" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Gemaakt door KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Gemaakt door VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Gemaakt door black_rider and published on ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Auteur:" @@ -1413,11 +1374,11 @@ msgstr "Auteur:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Bijsnijden" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1431,12 +1392,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Huidige map veranderd van %s naar %s na wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Aangepaste Projectie Hack" @@ -1444,11 +1405,11 @@ msgstr "Aangepaste Projectie Hack" msgid "Custom Projection Hack Settings" msgstr "Aangepaste Projectie Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Pas sommige orthogonale projectie parameters aan." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tsjechisch" @@ -1460,36 +1421,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulatie (snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE hercompileerder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD Station:" @@ -1501,11 +1462,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Data grootte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Datum:" @@ -1522,11 +1483,11 @@ msgstr "Datel MaxDrive/Pro bestanden(*.sav)" msgid "Dead Zone" msgstr "Dode Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Debug" @@ -1535,24 +1496,24 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1561,11 +1522,11 @@ msgid "Default font" msgstr "Standaard font" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Verwijder Save" @@ -1574,11 +1535,11 @@ msgstr "Verwijder Save" msgid "Delete the existing file '%s'?" msgstr "Verwijder het bestaande bestand '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Beschrijving" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detect" @@ -1591,13 +1552,13 @@ msgstr "" "Poging gedecteerd om meer data af te lezen van een DVD dan dat er in de " "buffer past. Klem" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1621,21 +1582,17 @@ msgstr "" "Map checksum is mislukt\n" " en map backup checksum is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Schakel Fog uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Schakel Pixel Diepte uit" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1649,7 +1606,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1665,7 +1622,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Schijf" @@ -1674,11 +1631,11 @@ msgstr "Schijf" msgid "Disc Read Error" msgstr "Schijf Lees Fout" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1692,20 +1649,24 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Grafische Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1713,39 +1674,39 @@ msgstr "Dolphin &Web Site" msgid "Dolphin Configuration" msgstr "Dolphin Configuratie" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Geëmuleerde Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin kan geen GC/Wii ISO's vinden. Dubbelklik om bestanden te zoeken..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1753,16 +1714,21 @@ msgstr "" "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle " "spellen te weergeven..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Omlaag" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download Codes (WiiRD Database)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu codes gedownload. (%lu toegevoegd)" @@ -1771,27 +1737,27 @@ msgstr "%lu codes gedownload. (%lu toegevoegd)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Dump Geluid" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Dump EFB Doel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Dump Frames" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dump texturen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1801,7 +1767,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1811,7 +1777,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1821,17 +1787,17 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Nederlands" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Sl&uiten" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Regio kopie" @@ -1851,11 +1817,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Vroege Geheugen Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Wijzig" @@ -1863,7 +1829,7 @@ msgstr "Wijzig" msgid "Edit ActionReplay Code" msgstr "Wijzig ActionReplay Code" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Wijzig Configuratie" @@ -1871,12 +1837,12 @@ msgstr "Wijzig Configuratie" msgid "Edit Patch" msgstr "Wijzig Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Wijzig het huidige perspectief" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Wijzig..." @@ -1884,7 +1850,7 @@ msgstr "Wijzig..." msgid "Effect" msgstr "Effect" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Ingebedde Frame Buffer" @@ -1892,7 +1858,7 @@ msgstr "Ingebedde Frame Buffer" msgid "Emu Thread already running" msgstr "Emu Thread draait al!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1906,7 +1872,7 @@ msgstr "" "\n" "In geval van twijfel selecteer virtuele XFB emulatie." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1922,19 +1888,19 @@ msgstr "" "\n" "In geval van twijfel geselecteerd laten." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Geëmuleerde Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emulatie Staat:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activeer" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1950,73 +1916,72 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activeer BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "Activeer Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activeer Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activeer Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activeer Dual Core (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activeer Sneltoetsen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activeer Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activeer Idle Skipping (verhoogt de snelheid)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activeer MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activeer BreedBeeld" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activeer Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2030,7 +1995,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2038,11 +2003,11 @@ msgstr "" "Activeer snelle schijf toegang. Nodig voor een aantal spelletjes. (AAN = " "Snel, UIT = Compatibel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activeer Pagina's" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2054,7 +2019,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2066,7 +2031,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2074,7 +2039,7 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2084,11 +2049,28 @@ msgstr "" "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " "(AAN = Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2101,7 +2083,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2109,7 +2091,7 @@ msgstr "" "Schakel de Memory Management Unit in, die nodig is voor sommige games. (AAN " "= Compatibel, UIT = Snel)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2123,14 +2105,14 @@ msgstr "" msgid "End" msgstr "Einde" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Engels" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Verbeteringen" @@ -2148,17 +2130,17 @@ msgstr "Toegang %d/%d" msgid "Entry 1/%d" msgstr "Toegang 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Gelijk" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Error (Fout)" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Fout bij het laden van de geselecteerde taal. Dolphin zal terugvallen op de " @@ -2198,32 +2180,32 @@ msgstr "Exception handler - toegang onder geheugen ruimte. %08llx%08llx" msgid "Execute" msgstr "Uitvoeren" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Exporteren Mislukt" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exporteer Bestand" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exporteer Opname..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exporteer alle saves..." @@ -2239,7 +2221,7 @@ msgstr "Exporteer save als..." msgid "Extension" msgstr "Extensie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Externe Frame Buffer" @@ -2251,44 +2233,44 @@ msgstr "Extra Parameter" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Extra parameter, alleen nuttig in \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Map Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Bestand Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Partitie Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Alle Bestanden Uitpakken" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Uitpakken van de map" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Uitpakken..." @@ -2296,7 +2278,7 @@ msgstr "Uitpakken..." msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Speler" @@ -2304,7 +2286,7 @@ msgstr "FIFO Speler" msgid "FRANCE" msgstr "Frankrijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Groote:" @@ -2312,15 +2294,15 @@ msgstr "FST Groote:" msgid "Failed to Connect!" msgstr "Verbinden Mislukt!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Luisteren Mislukt!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Mislukt om de codes te downloaden." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Mislukt om naar %s uit te pakken!" @@ -2439,41 +2421,41 @@ msgstr "Het schrijven van header voor %s is mislukt" msgid "Failed to write header for file %d" msgstr "Het schrijven van header voor bestanden %d is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Speler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Bestand bevat geen codes." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Bestand geconverteerd naar .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2490,7 +2472,7 @@ msgstr "" "Bestand heeft de extensie \"%s\"\n" "juiste extensie zijn (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Bestand is niet herkend als geheugenkaart" @@ -2503,19 +2485,19 @@ msgstr "Bestand niet gecompressed" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Onbekende open mode: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2523,28 +2505,28 @@ msgstr "" msgid "First Block" msgstr "Eerste Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Herstel Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forceer 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forceer 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "Stel Console in als NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forceer Texture Filtering" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2557,7 +2539,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2569,7 +2551,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2606,43 +2588,43 @@ msgstr "" msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Geavanceerd" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Frame Dumps gebruiken FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Bestands Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Frame Bereik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame O&verslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Framelimiet:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Frames om op te nemen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vrije kijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Frans" @@ -2650,16 +2632,16 @@ msgstr "Frans" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Van" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Volledig scherm" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Volledige Scherm Resolutie:" @@ -2673,7 +2655,7 @@ msgstr "GCI Bestand(*.gci)" msgid "GCMic Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" @@ -2681,27 +2663,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Spel ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Het spel draait al!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Het spel draait niet!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Spel niet gevonden!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Spel Specifieke Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Spel Config" @@ -2709,25 +2691,25 @@ msgstr "Spel Config" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube Pad Instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Codes" @@ -2742,20 +2724,20 @@ msgstr "" "GeckoCode kon niet draaien (CT%i CST%i) (%s)\n" "(ofwel een onjuiste code of het type code is nog niet ondersteund.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Algemeen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Algemene Instellingen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Duits" @@ -2764,19 +2746,19 @@ msgstr "Duits" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is groter dan de grootte van de AR code lijst %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafische" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Grafische instellingen" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Grooter dan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2794,7 +2776,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grieks" @@ -2814,11 +2796,11 @@ msgstr "Groen Rechts" msgid "Guitar" msgstr "Gitaar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY is opgeroepen, rapport dit alstubliefst!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2826,7 +2808,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Header checksum is mislukt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreeuws" @@ -2838,7 +2820,7 @@ msgstr "Hoogte" msgid "Help" msgstr "Help" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2858,11 +2840,11 @@ msgstr "" msgid "Hide" msgstr "Verberg" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Verberg Muis Cursor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2876,8 +2858,8 @@ msgstr "" msgid "Home" msgstr "Thuis" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2885,17 +2867,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Sneltoets Configuratie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hongaarse" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybride Wiimote" @@ -2923,7 +2905,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL Instellingen" @@ -2931,19 +2913,19 @@ msgstr "IPL Instellingen" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR Aanwijzer" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR Gevoeligheid:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO Map" @@ -2955,20 +2937,20 @@ msgstr "ITALIË" msgid "Icon" msgstr "Icoon" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Als de FPS onregelmatig is dan kan deze optie helpen. (AAN = Veilig, UIT = " "Snel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2979,11 +2961,11 @@ msgstr "" "50),\n" "dan moet je ook Audio Throttle DSP uitschakelen om het effectief te maken." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Negeer formaat veranderingen." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2997,7 +2979,7 @@ msgstr "" "\n" "In geval van twijfel ingevuld laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3011,7 +2993,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importeer Save" @@ -3019,7 +3001,7 @@ msgstr "Importeer Save" msgid "Import failed, try again?" msgstr "Importeren is mislukt, opnieuw proberen?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3027,11 +3009,11 @@ msgstr "" "Geimporteerd bestand heeft gsc extensie\n" "maar heeft niet de juiste header" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Geimporteerd bestand heeft een onjuiste lengte" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3039,7 +3021,7 @@ msgstr "" "Geimporteerd bestand heeft sav extension\n" "maar heeft geen juiste header" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3051,16 +3033,16 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "In Game" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3068,7 +3050,7 @@ msgstr "Info" msgid "Information" msgstr "Informatie" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Invoer" @@ -3080,7 +3062,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3088,11 +3070,11 @@ msgstr "Schakel SD Card in" msgid "Insert name here.." msgstr "Voeg naam hier toe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3103,35 +3085,35 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "WAD aan het installeren..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3152,15 +3134,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Interne LZO fout - lzo_init() is mislukt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Interne Resolutie:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3169,11 +3151,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Onjuiste grootte (%x) of Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Onjuiste waarde!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Onjuiste bat.map of map vermelding" @@ -3197,7 +3179,7 @@ msgstr "" "%s\n" "Wellicht moet je dit spel opnieuw dumpen" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Onjuist opname bestand" @@ -3205,21 +3187,21 @@ msgstr "Onjuist opname bestand" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Onjuiste staat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italië" @@ -3227,16 +3209,16 @@ msgstr "Italië" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (aanbevolen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL experimentele recompiler" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japans" @@ -3244,7 +3226,7 @@ msgstr "Japans" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3255,17 +3237,17 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Toets" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Koreaans" @@ -3283,19 +3265,23 @@ msgstr "L Knop" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Laatste Overgeschreven Staat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Laatste Opgeslagen Staat" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3305,8 +3291,8 @@ msgstr "Links" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3314,7 +3300,7 @@ msgstr "" "Links-klik om sneltoetsen te detecteren.\n" "Druk op spatie om te legen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3324,7 +3310,7 @@ msgstr "" "Midden-klik om te wissen.\n" "Klik met de rechtermuisknop voor meer opties." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3332,77 +3318,77 @@ msgstr "" "Links / Rechts-klik voor meer opties.\n" "Midden-klik om te wissen." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Minder dan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limiteer met behulp van FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Laad" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Laad Aangepaste Textures" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Laad staat 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Laad staat 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Laad staat 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Laad staat 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Laad staat 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Laad staat 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Laad staat 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Laad staat 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3416,31 +3402,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Laad vooraf ingestelde waardes van de beschikbare hack patronen." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokaal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Vergrendel Threads aan CPU cores" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Logboek" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Logboek configuratie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Log Types" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3453,12 +3435,12 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger Uitvoer" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logboek Bijhouden" @@ -3479,7 +3461,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3493,24 +3475,24 @@ msgstr "MadCatz Gameshark bestanden(*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Maker ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Maker:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "De geheugenkaart heeft al een save voor deze titel" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "De geheugenkaart is al geopend" @@ -3519,7 +3501,7 @@ msgid "Memory Byte" msgstr "Geheugen Byte" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Geheugen Kaart" @@ -3556,20 +3538,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Microfoon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3578,7 +3560,7 @@ msgstr "Overige Instellingen" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3603,7 +3585,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3626,7 +3608,7 @@ msgstr "" msgid "Multiply" msgstr "Vermenigvuldigen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3726,16 +3708,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Omhoog" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Naam:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Naam:" @@ -3744,20 +3726,20 @@ msgstr "Naam:" msgid "Native GCI files(*.gci)" msgstr "Native GCI-bestanden (*. GCI)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nieuwe Scan" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Volgende Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Volgende Scan" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Gebruikersnaam :" @@ -3765,7 +3747,7 @@ msgstr "Gebruikersnaam :" msgid "No Country (SDK)" msgstr "Geen land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Geen ISOs of WADS gevonden." @@ -3787,7 +3769,7 @@ msgstr "Geen docking" msgid "No file loaded" msgstr "Geen bestand geladen" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Geen vrije map indexes" @@ -3800,33 +3782,33 @@ msgstr "Geen opgenomen bestand" msgid "No save folder found for title %s" msgstr "Geen save map gevonden voor titel %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Geen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Noorweegse Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Niet gelijk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Niet ingesteld" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Niet verbonden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Opmerkingen" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Opmerkingen:" @@ -3835,7 +3817,7 @@ msgstr "Opmerkingen:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Opmerkingen" @@ -3843,16 +3825,16 @@ msgstr "Opmerkingen" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Aantal Codes:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk Acceleratie" @@ -3860,11 +3842,11 @@ msgstr "Nunchuk Acceleratie" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Object Bereik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Uit" @@ -3872,52 +3854,52 @@ msgstr "Uit" msgid "Offset:" msgstr "Afstand:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Er zijn maar %d blocks beschikaarr" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Open Wii &save map" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Open Bestand..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Kan geen context aanmaken voor device %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Kan geen geluids devices vinden" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Kan device %s niet openen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decodeerder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" @@ -3930,7 +3912,7 @@ msgstr "Opties" msgid "Orange" msgstr "Oranje" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3941,8 +3923,8 @@ msgstr "" "Rechts-klik en exporteer alle save bestanden,\n" "en importeer de saves naar een nieuwe geheugenkaart\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Overige" @@ -3954,19 +3936,19 @@ msgstr "" "De andere client is losgekoppeld terwijl het spel draait!! NetPlay is " "uitgeschakeld. Je moet het spel handmatig stoppen." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Uitgang" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Opname afspelen" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad" @@ -3982,7 +3964,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Verbinden" @@ -3994,34 +3976,34 @@ msgstr "Paragraaf" msgid "Parameters" msgstr "Parameters" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partitie %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Belichting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfect" @@ -4030,36 +4012,36 @@ msgstr "Perfect" msgid "Perspective %d" msgstr "Perspectief %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Speel" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Speel Opname" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Spel/Pauze" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Speelbaar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Terugspeel Opties" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4071,54 +4053,54 @@ msgstr "Maak een perspectief voor het opslaan" msgid "Plus-Minus" msgstr "Ongeveer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Poort 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Poort :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugees" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4131,11 +4113,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Vorige Pagina" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Vorige waarden" @@ -4143,7 +4125,7 @@ msgstr "Vorige waarden" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profiel" @@ -4151,7 +4133,7 @@ msgstr "Profiel" msgid "Properties" msgstr "Eigenschappen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Cache leegmaken" @@ -4159,8 +4141,8 @@ msgstr "Cache leegmaken" msgid "Question" msgstr "Vraag" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Stoppen" @@ -4178,7 +4160,7 @@ msgstr "R Knop" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4186,48 +4168,48 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSLAND" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Afstand" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Alleen-lezen modus" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Echt" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Echte Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Bevestig herverbinding van Wiimote " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Herverbind Wiimote Bij Staat Laden" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Speel Opnemen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Opname Informatie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opname Opties" @@ -4243,7 +4225,7 @@ msgstr "Rood Links" msgid "Red Right" msgstr "Rood Rechts" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4257,29 +4239,29 @@ msgstr "" "\n" "In geval van twijfel selecteer Geen." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Ververs" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Lijst Verversen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Ververs de speellijst" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Verwijder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4290,17 +4272,17 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Geef weer op hoofdscherm" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Opnieuw" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultaten" @@ -4322,29 +4304,25 @@ msgstr "Rechter Stick" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Zet DSP LLE op een aparte core (niet aanbevolen)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russisch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "S&la Staat Op" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Opslaan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Sample Rate:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Opslaan" @@ -4352,91 +4330,91 @@ msgstr "Opslaan" msgid "Save GCI as..." msgstr "Sla GCI op als..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Sla Staat 1 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Sla Staat 2 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Sla Staat 3 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Sla Staat 4 op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Sla Staat 5 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Sla Staat 6 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Sla Staat 7 Op" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Sla Staat 8 Op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Sla staat op als..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Scannen..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4444,25 +4422,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Slot" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Cheat Zoeken" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Zoeken in submappen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4473,20 +4451,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Sectie %s niet gevonden in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Selecteer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4504,23 +4482,23 @@ msgstr "Selecteer een save file om te importeren" msgid "Select floating windows" msgstr "Selecteer zwevende vensters" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4536,11 +4514,16 @@ msgstr "" "Force 4:3: Strek de afbeelding naar een beeldverhouding van 4:3\n" "Stretch naar het venster: Stretch de afbeelding naar je venster grootte." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Het opgegeven bestand \"%s\" bestaat niet" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Geselecteerde font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4557,7 +4540,7 @@ msgstr "" "In geval van twijfel, gebruik je desktop resolutie. \n" "Als je nog steeds twijfelt, gebruik de hoogste resolutie die voor jou werkt." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4573,11 +4556,11 @@ msgstr "" "\n" "In geval van twijfel gebruik Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Verzend" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensor Bar Positie:" @@ -4585,25 +4568,25 @@ msgstr "Sensor Bar Positie:" msgid "Separator" msgstr "Scheidingsteken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Servisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - Dit is de poort die apparaten zoals de net-adapter gebruiken" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Ingesteld als standaard memcard% c" @@ -4614,11 +4597,17 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: Index is groter dan de grootte van de AR Code lijst %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Instellingen..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" @@ -4626,7 +4615,7 @@ msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" msgid "Shake" msgstr "Schudden" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Korte Naam:" @@ -4634,105 +4623,105 @@ msgstr "Korte Naam:" msgid "Shoulder Buttons" msgstr "Schouder Knoppen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Toon &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Toon &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Toon &Statusbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Toon &Toolbar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Toon Schijven" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Weergeef EFB Kopie Regios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Toon FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Toon Frans" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Toon Gamecube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Toon Input Venster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Toon Italië" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Toon JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Toon Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Toon Taal:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Bekijk Log &Configuratie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Toon PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Toon Platformen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Toon Regio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Weergeef statistieken" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Toon Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Toon USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Toon Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Toon Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Toon een bevestigingsvenster voordat u stopt met een spel." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4740,39 +4729,39 @@ msgstr "" "Als je dit uitschakeld zie je geen irritante berichten, maar het betekend " "ook dat Dolphin spontaan uit kan vallen zonder enige reden." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Toon eerste blok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Toon save blocks" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Toon save commentaar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Toon save icon" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Toon save titel" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4784,11 +4773,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Toon onbekend" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4802,28 +4791,28 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Sla BIOS Over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "Schakel Dest. Alpha Pass uit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Sla EFB toegang van de CPU over" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4835,7 +4824,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4845,17 +4834,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4863,7 +4852,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4879,11 +4868,11 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Geluids Instellingen" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Geluids backend %s is niet juist." @@ -4897,17 +4886,17 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s" msgid "Space" msgstr "Ruimte" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spaans" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4927,7 +4916,7 @@ msgstr "" "\n" "In geval van twijfel selecteer 640x528" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Versnel Disc Transfer Rate" @@ -4935,51 +4924,55 @@ msgstr "Versnel Disc Transfer Rate" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &netplay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Start Op&nemen" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Start Opnemen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Staat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Opgeslage Staten" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4988,7 +4981,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Uitrekken naar Venster" @@ -5013,8 +5006,8 @@ msgstr "Succesvol save games geimporteerd" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Systeem Taal:" @@ -5022,7 +5015,7 @@ msgstr "Systeem Taal:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS Ingang" @@ -5043,31 +5036,31 @@ msgstr "Linker Tabel" msgid "Table Right" msgstr "Rechter Tabel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Neem een Schermafdruk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textuur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Zuiveren van de Cache" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Textuur Formaat Overlay" @@ -5083,13 +5076,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5113,7 +5106,7 @@ msgid "The file %s was already open, the file header will not be written." msgstr "" "Het bestand %s was al open, de bestands header zal niet worden weggeschreven." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Het opgegeven bestand(%s) bestaat niet" @@ -5130,7 +5123,7 @@ msgstr "De naam mag niet het volgende teken bevatten ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "De resulterende gedecodeerde AR code bevat geen regels." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5138,13 +5131,13 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "Het save bestand dat je probeert te kopiëren heeft een onjuiste bestands " "grootte" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5177,14 +5170,11 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Thema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Thema selectie ging fout" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5193,7 +5183,7 @@ msgstr "" "Er moet een ticket zijn voor 00000001/00000002. Je NAND dump is " "waarschijnlijk incompleet." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5209,11 +5199,11 @@ msgstr "" "Deze action replay simulator ondersteund geen codes die de Action Replay " "zelf aanpassen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5231,7 +5221,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5243,7 +5233,7 @@ msgstr "" "Leidt tot grote snelheid verbeteringen op pc's met meer dan een kern, maar " "kan ook leiden tot crashes / glitches zo nu en dan." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" @@ -5257,35 +5247,35 @@ msgid "Tilt" msgstr "Kantelen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Titel" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Naar" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Zet Alle Log Types Aan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Volledig Scherm Inschakelen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Boven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinees (Traditioneel)" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Poging tot het laden van een onbekend bestands type." @@ -5305,7 +5295,7 @@ msgstr "" "Poging tot het inlezen van een ongeldige SYSCONF\n" "Wiimote bt ids zijn niet beschikbaar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turks" @@ -5317,12 +5307,12 @@ msgstr "Draaischijf" msgid "Type" msgstr "Type" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP Port:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote " @@ -5357,12 +5347,12 @@ msgstr "" "manier hebt ingevoerd. \n" "Wil je deze regel negeren en verder gaan met verwerken?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Onbepaalde %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Ongedaan maken van Load staat" @@ -5370,7 +5360,7 @@ msgstr "Ongedaan maken van Load staat" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Onbekend" @@ -5401,8 +5391,8 @@ msgstr "" msgid "Up" msgstr "Omhoog" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Update" @@ -5410,23 +5400,23 @@ msgstr "Update" msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Gebruik &Volledig Scherm" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Gebruik Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Gebruik Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5439,7 +5429,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5453,15 +5443,15 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Hulpprogramma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Waarde" @@ -5469,23 +5459,23 @@ msgstr "Waarde" msgid "Value:" msgstr "Waarde:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Waarde:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Breedsprakigheid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volume" @@ -5500,7 +5490,7 @@ msgstr "WAD installatie mislukt: fout bij het creëren van %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installatie mislukt: fout bij het creëren van %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5513,16 +5503,16 @@ msgstr "" "In geval van twijfel leeg laten." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Waarschuwing" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Waarschuwing - DOL wordt in de verkeerde console mode gestart!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Waarschuwing - ELF wordt in de verkeerde console mode gestart!" @@ -5555,7 +5545,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5563,7 +5553,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5571,7 +5561,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5591,7 +5581,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - bestand niet open." @@ -5599,7 +5589,7 @@ msgstr "WaveFileWriter - bestand niet open." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Breedbeeld Hack" @@ -5607,23 +5597,23 @@ msgstr "Breedbeeld Hack" msgid "Width" msgstr "Breedte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5631,17 +5621,17 @@ msgstr "Wii save bestanden (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Kon het bestand niet lezen" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5654,19 +5644,19 @@ msgstr "" "of misschien is het te wijten aan een time-out of een andere reden.\n" "Wilt u meteen opnieuw verbinden?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Connected" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote instellingen" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5687,27 +5677,27 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Werken..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Schrijf naar Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Schrijf naar Bestand" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Schrijf naar Bestand" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Schrijf naar venster" @@ -5744,23 +5734,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "U kunt geen panelen sluiten die paginas bevatten." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Je moet een spel kiezen!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Je moet een naam invoeren!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -5783,7 +5773,7 @@ msgstr "" "Het zou 0x%04x moet zijn, maar is 0x%04llx \n" "Wil je een nieuwe genereren?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5796,12 +5786,12 @@ msgstr "Zero 3 code niet ondersteund" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code onbekend voor Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ wachten ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5817,7 +5807,7 @@ msgstr "" msgid "[Custom]" msgstr "[Aangepast]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5834,7 +5824,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5848,11 +5838,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "applader (.img)" @@ -5869,7 +5859,7 @@ msgstr "kon geen data lezen van bestand: %s" msgid "failed to read header" msgstr "kon de header niet lezen" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lezen van Opcode vanaf %x. Graag rapporteren." @@ -5889,7 +5879,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -5901,13 +5891,16 @@ msgstr "zVer correctie:" msgid "zNear Correction: " msgstr "zDichtbij correctie:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OF" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Frame Stepping" @@ -5953,6 +5946,22 @@ msgstr "| OF" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Bereken diepte waardes van 3D graphics per-pixel, in plaats van per " +#~ "vertex. \n" +#~ "In tegenstelling tot pixel verlichting (wat enkel een toevoeging is) zijn " +#~ "per-pixel berekeningen nodig om een klein aantal spellen goed te " +#~ "emuleren.\n" +#~ "\n" +#~ "In geval van twijfel leeg laten." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -5990,6 +5999,21 @@ msgstr "| OF" #~ msgid "Could not get info about plugin %s" #~ msgstr "Het volgende bestanden kon niet gemaakt worden %s " +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Gemaakt door KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "Gemaakt door [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Gemaakt door VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Gemaakt door black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Dlijst Cache" @@ -6003,6 +6027,9 @@ msgstr "| OF" #~ msgid "Disable Lighting" #~ msgstr "Schakel Lighting uit" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Schakel Pixel Diepte uit" + #~ msgid "Disable Textures" #~ msgstr "Schakel Textures uit" @@ -6218,6 +6245,9 @@ msgstr "| OF" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Laad het opgegeven bestand (DOL, ELF, GCM, ISO, WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Vergrendel Threads aan CPU cores" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Laag niveau (LLE) of Hoog niveau (HLE) audio" @@ -6279,6 +6309,9 @@ msgstr "| OF" #~ msgid "Running script...\n" #~ msgstr "Draaiend script ...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Sample Rate:" + #~ msgid "Scale:" #~ msgstr "Schaal:" @@ -6365,6 +6398,9 @@ msgstr "| OF" #~ msgid "The file " #~ msgstr "Het bestand" +#~ msgid "Theme selection went wrong" +#~ msgstr "Thema selectie ging fout" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 49c5dd1732..64412a2049 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-16 20:16+0100\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Baszta \n" "Language-Team: Polish \n" "Language: Polish\n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(za dużo do wyÅ›wietlenia)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Gra :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NOT" @@ -55,14 +55,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopiuj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i poÅ‚Ä…czony" @@ -158,147 +151,147 @@ msgstr "%sImportuj GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u wolnych bloków; %u wolnych wejść katalogowych" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&O programie..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&ZaÅ‚aduj z napÄ™du DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Breakpointy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&ZaÅ‚aduj z ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Menadżer cheatów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulacja" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Plik" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&PeÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Ustawienia &hotkey'ów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Wczytaj stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Menadżer karty pamiÄ™ci (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Pamięć" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otwórz..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcje" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Wstrzymaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Tryb &Read-only" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Rejestry" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&DźwiÄ™k" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&NarzÄ™dzia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Wideo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Widok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -318,7 +311,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(Nieznany)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(wyÅ‚Ä…czone)" @@ -326,19 +319,19 @@ msgstr "(wyÅ‚Ä…czone)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bitów" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bity" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bitów" @@ -346,20 +339,20 @@ msgstr "8 bitów" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -367,25 +360,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Okno NetPlay jest już otwarte!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Gra nie jest aktualnie uruchomiona." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Wspierany adapter bluetooth nie zostaÅ‚ znaleziony!\n" "(Tylko Microsoft bluetooth stack jest wspierane)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Wymagane jest przekierowanie portu TCP do hosta!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Kody AR" @@ -432,19 +427,19 @@ msgstr "Kody AR" msgid "About Dolphin" msgstr "O Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Przyspieszenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "DokÅ‚adność:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulacja Accurate VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -457,8 +452,8 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz EFB to Texture." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Akcja" @@ -485,7 +480,7 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -512,15 +507,16 @@ msgstr "" "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwy rozmiar (%08x : address = %08x) w Write To " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "BÅ‚Ä…d Action Replay: NiewÅ‚aÅ›ciwa wartość (%08x) w Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "BÅ‚Ä…d Action Replay: Master Code and Write do CCXXXXXX nie jest " "zaimplementowane (%s)" @@ -530,27 +526,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "BÅ‚Ä…d Action Replay: niewÅ‚aÅ›ciwa linia kodu AR: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Conditional Code: NiewÅ‚aÅ›ciwy rozmiar %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: NiewÅ‚aÅ›ciwy typ Normal Code %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: NiewÅ‚aÅ›ciwy podtyp %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter:" @@ -559,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -571,13 +567,13 @@ msgstr "Dodaj Å‚atkÄ™" msgid "Add new pane" msgstr "Dodaj nowy panel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Dodaj..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -617,48 +613,48 @@ msgstr "" "\n" "Notka: Sprawdź LogWindow/Konsola dla ustwaionych wartoÅ›ci." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Reguluje siÅ‚Ä™ nacisku wymaganego do aktywacji przycisków." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Zaawansowane" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Ustawienia zaawansowane" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -670,19 +666,19 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Alternate Wiimote Timing" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrowanie anizotropowe:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Antyaliasing:" @@ -694,15 +690,15 @@ msgstr "Apploader niewÅ‚aÅ›ciwego rozmiaru... Czy to rzeczywiÅ›cie apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógÅ‚ wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Zastosuj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -712,16 +708,16 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz (wyÅ‚Ä…czone)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arabski" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteÅ› pewny by usunÄ…c \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,12 +725,12 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -742,12 +738,12 @@ msgstr "Proporcje ekranu:" msgid "At least one pane must remain open." msgstr "Przynajmniej jeden manel musi pozostać otwarty." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -755,24 +751,24 @@ msgstr "Audio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: BÅ‚Ä…d otwarcia urzÄ…dzenia AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Wiele z 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (rozmiar okna)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Auto-dopasowanie rozmiaru okna" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -794,12 +790,12 @@ msgstr "BP rejestr" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Ustawienia Backend'u" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend :" @@ -817,15 +813,15 @@ msgid "Bad File Header" msgstr "ZÅ‚y nagłówek pliku" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Szczegóły banera" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Baner:" @@ -833,11 +829,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Wajcha" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Podstawowy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Ustawienia podstawowe" @@ -865,42 +861,42 @@ msgstr "Niebieski lewo" msgid "Blue Right" msgstr "Niebieski prawo" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Dół" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Bound Controls: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Zepsuty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Bufor:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Przyciski" @@ -921,30 +917,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Silnik emulacji CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache Display Lists" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Oblicza wartoÅ›ci gÅ‚Ä™bokoÅ›ci grafiki 3D na pixel zamiast na wierzchoÅ‚ek.\n" -"W kontraÅ›cie do pixel lighting (które ledwo jest ulepszeniem), obliczenia " -"gÅ‚Ä™bokoÅ›ci na pixel sÄ… niezbÄ™dne do wÅ‚aÅ›ciwej emulacji niektórych gier.\n" -"\n" -"W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -957,7 +938,7 @@ msgstr "" "Zazwyczaj bezpieczne ulepszenie, ale czasami może powodować bÅ‚Ä™dy.\\nW razie " "wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Anuluj" @@ -973,7 +954,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeÅ„ podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -984,7 +965,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -992,12 +973,12 @@ msgstr "" "Tego pliku nie można użyć jako karty pamiÄ™ci.\n" "Chcesz użyć tego samego pliku w obu slotach?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Nie można odnaleźć Wiilota po bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Nie można odnaleźć Wiilota przez handle poÅ‚Ä…czenia %02x" @@ -1011,7 +992,7 @@ msgstr "Nie można odczytać z wtyczki DVD - Interfejs DVD: Poważny bÅ‚Ä…d" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "KataloÅ„ski" @@ -1019,24 +1000,24 @@ msgstr "KataloÅ„ski" msgid "Center" msgstr "Åšrodek" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "ZmieÅ„" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "ZmieÅ„ &dysk" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "ZmieÅ„ dysk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "ZmieÅ„ grÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1052,13 +1033,12 @@ msgstr "Zmienia symbol do parametru zFar (po poprawce)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Zmienia symbol do parametru zNear (po poprawce)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Zmiana tego nie bÄ™dzie miaÅ‚a wpÅ‚ywu jeÅ›li emulator jest w trakcie pracy!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1066,47 +1046,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Cheat Code" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Szukaj cheatów" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Menadżer cheatów" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Sprawdź integralność partycji" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Sprawdzanie integralnoÅ›ci..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1114,7 +1094,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1122,8 +1102,8 @@ msgstr "" "Wybierz plik używany jako apploader: (dotyczy dysków stworzonych tylko z " "folderów)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Wypakuj do" @@ -1137,8 +1117,8 @@ msgstr "Classic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Wyczyść" @@ -1150,22 +1130,22 @@ msgstr "" "Klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " "rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zamknij" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Ko&nfiguruj..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1177,91 +1157,91 @@ msgstr "Polecenie" msgid "Comment" msgstr "Komentarz" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Kompresowanie ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Konfig" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Konfiguracja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Konfiguracja sterowania" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Konfiguracja padów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Potwierdź przy zatrzymaniu" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "PoÅ‚Ä…cz Wiilot %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "PoÅ‚Ä…cz Wiilot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "PoÅ‚Ä…cz Wiilot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "PoÅ‚Ä…cz Wiilot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "PoÅ‚Ä…cz Wiilot 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "ÅÄ…czÄ™..." @@ -1281,12 +1261,12 @@ msgstr "Konwertuj do GCI" msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiuj do Memcard %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "RdzeÅ„" @@ -1295,7 +1275,7 @@ msgstr "RdzeÅ„" msgid "Could not create %s" msgstr "Nie można utworzyć %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Beckend %s nie mógÅ‚ zostać zainicjalizowany." @@ -1316,12 +1296,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Nie rozpoznao pliku ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Nie można zapisać %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1342,11 +1322,11 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1354,17 +1334,17 @@ msgstr "" "Nie można zainicjować rdzenia.\n" "Sprawdź konfiguracjÄ™." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Ilość:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Kraj:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Utwórz kod AR" @@ -1373,27 +1353,7 @@ msgstr "Utwórz kod AR" msgid "Create new perspective" msgstr "Utwórz nowÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Utworzone przez KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart." -"com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Utworzone przez VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Utworzone przez black_rider and published on ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Twórca:" @@ -1401,11 +1361,11 @@ msgstr "Twórca:" msgid "Critical" msgstr "Krytyczny" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "ObciÄ™cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1419,12 +1379,12 @@ msgstr "" msgid "Crossfade" msgstr "Suwak" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Actualny folder zmieniono z %s na %s po wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Custom Projection Hack" @@ -1432,11 +1392,11 @@ msgstr "Custom Projection Hack" msgid "Custom Projection Hack Settings" msgstr "Ustawienia Custom Projection Hack" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "WÅ‚asne parametry Orthographic Projection" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Czeski" @@ -1448,36 +1408,36 @@ msgstr "D" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE emulacja (szybkie)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE rekompilator" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" @@ -1489,11 +1449,11 @@ msgstr "DVDLowRead - Fatal Error: bÅ‚Ä…d odczytu dysku" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Fatal Error: bÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Rozmiar danych" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" @@ -1510,11 +1470,11 @@ msgstr "Pliki Datel MaxDrive/Pro(*.sav)" msgid "Dead Zone" msgstr "Dead Zone" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debuguj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugowanie" @@ -1522,24 +1482,24 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" @@ -1548,11 +1508,11 @@ msgid "Default font" msgstr "DomyÅ›lna czcionka" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "UsuÅ„ zapis" @@ -1561,11 +1521,11 @@ msgstr "UsuÅ„ zapis" msgid "Delete the existing file '%s'?" msgstr "Usunąć istniejÄ…cy plik '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Opis" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Wykryj" @@ -1578,13 +1538,13 @@ msgstr "" "Wykryto próbÄ™ odczytu wiÄ™cej danych z DVD niż mieÅ›ci siÄ™ w buforze " "wyjÅ›ciowym. ZapchaÅ‚o siÄ™." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1608,20 +1568,16 @@ msgstr "" "Suma kontrolna folderu oraz \n" "folderu zapasowego nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "WyÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "WyÅ‚Ä…cz mgÅ‚Ä™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "WyÅ‚Ä…cz Per-Pixel Depth" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1635,7 +1591,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1651,7 +1607,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Dysk" @@ -1660,11 +1616,11 @@ msgstr "Dysk" msgid "Disc Read Error" msgstr "DÅ‚Ä…d odczytu dysku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1678,20 +1634,24 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Ustawienia graficzne %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin strona &WWW" @@ -1699,32 +1659,32 @@ msgstr "Dolphin strona &WWW" msgid "Dolphin Configuration" msgstr "Konfiguracja Dolphin'a" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Konfiguracja emulowanego Wiilota" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Konfiguracja Wiilot'a" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1732,7 +1692,7 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1740,16 +1700,21 @@ msgstr "" "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by " "pokazać wszystkie gry..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Dół" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ÅšciÄ…gnij kody (baza WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Pobrano %lu kodów. (dodano %lu)" @@ -1758,27 +1723,27 @@ msgstr "Pobrano %lu kodów. (dodano %lu)" msgid "Drums" msgstr "Perkusja" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Zrzut audio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Zrzut EFB Target" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Zrzut klatek" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Zrzut tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1788,7 +1753,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1798,7 +1763,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1808,17 +1773,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holenderski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&WyjÅ›cie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Copies" @@ -1838,11 +1803,11 @@ msgstr "" msgid "EUROPE" msgstr "Europa" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Early Memory Updates" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Edycja" @@ -1850,7 +1815,7 @@ msgstr "Edycja" msgid "Edit ActionReplay Code" msgstr "Edytuj kody ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Edytuj konfiguracjÄ™" @@ -1858,12 +1823,12 @@ msgstr "Edytuj konfiguracjÄ™" msgid "Edit Patch" msgstr "Edytuj patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Edytuj bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Edytuj..." @@ -1871,7 +1836,7 @@ msgstr "Edytuj..." msgid "Effect" msgstr "Efekt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Embedded Frame Buffer" @@ -1879,7 +1844,7 @@ msgstr "Embedded Frame Buffer" msgid "Emu Thread already running" msgstr "WÄ…tek emulacji jest już uruchomiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1894,7 +1859,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wÅ‚Ä…cz wirtualnÄ… emulacjÄ™ XFB." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1910,19 +1875,19 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emulowany Wiilot" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Stan emulacji:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "WÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1938,72 +1903,71 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "WÅ‚Ä…cz BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "WÅ‚Ä…cz Bounding Box Calculation" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "WÅ‚Ä…cz cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "WÅ‚Ä…cz kody" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "WÅ‚Ä…cz 2 rdzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "WÅ‚Ä…cz 2 rdzenie (przyspieszenie)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "WÅ‚Ä…cz skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "WÅ‚Ä…cz Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "WÅ‚Ä…cz Idle Skipping (przyspieszenie)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "WÅ‚Ä…cz MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "WÅ‚Ä…cz WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "WÅ‚Ä…cz Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2017,7 +1981,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2025,11 +1989,11 @@ msgstr "" "WÅ‚Ä…cz szybki dostÄ™p do dysku. Wymagane dla kilku gier. (ON = szybko, OFF = " "kompatybilne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "WÅ‚Ä…cz strony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2041,7 +2005,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2053,7 +2017,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2061,7 +2025,7 @@ msgstr "" "WÅ‚Ä…cz to by przyspieszyć The Legend of Zelda: Twilight Princess. WyÅ‚Ä…cz dla " "KAÅ»DEJ innej gry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2071,11 +2035,28 @@ msgstr "" "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " "szybko)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2087,7 +2068,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2095,7 +2076,7 @@ msgstr "" "WÅ‚Ä…cza Memory Management Unit, wymagane dla niektórych gier. (ON = " "kompatybilny, OFF = szybko)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2109,14 +2090,14 @@ msgstr "" msgid "End" msgstr "Koniec" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Angielski" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Ulepszenia" @@ -2134,17 +2115,17 @@ msgstr "WejÅ›cie %d/%d" msgid "Entry 1/%d" msgstr "WejÅ›cie 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Równy" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "BÅ‚Ä…d" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "BÅ‚Ä…d wczytywania wybranego jÄ™zyka. Ustawienia domyÅ›lne." @@ -2183,32 +2164,32 @@ msgstr "Handler wyjÄ…tku - dostÄ™p poniżej obszaru pamiÄ™ci. %08llx%08llx" msgid "Execute" msgstr "Wykonaj" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Eksportuj nieudany" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Eksportuj plik" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Eksportuj nagranie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Eksportuj nagranie..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Eksportuj wszystkie zapisy" @@ -2224,7 +2205,7 @@ msgstr "Eksportuj zapis jako..." msgid "Extension" msgstr "Rozszerzenie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "External Frame Buffer" @@ -2236,44 +2217,44 @@ msgstr "Parametr Dodatkowy" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parametr Dodatkowy przydatny tylko w ''Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Wypakuj wszystkie pliki..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Wypakuj Apploader'a..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Wypakuj DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Wypakuj folder..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Wypakuj plik..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Wypakuj partycjÄ™..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Wypakowywanie %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Wypakowywanie wszystkich plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Wypakowywanie folderu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Wypakowywanie..." @@ -2281,7 +2262,7 @@ msgstr "Wypakowywanie..." msgid "FIFO Byte" msgstr "Bajt FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Player" @@ -2289,7 +2270,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "Francja" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Rozmiar FST:" @@ -2297,15 +2278,15 @@ msgstr "Rozmiar FST:" msgid "Failed to Connect!" msgstr "PoÅ‚Ä…czenie nieudane!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "NasÅ‚uchiwanie nieudane!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Pobieranie kodów nieudane!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Wypakowanie do %s nie udaÅ‚o siÄ™!" @@ -2423,19 +2404,19 @@ msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" msgid "Failed to write header for file %d" msgstr "BÅ‚Ä…d zapisu nagłówka do pliku %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Farsi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2443,23 +2424,23 @@ msgstr "" "Fatal desync. Anulowanie playback'u. (BÅ‚Ä…d w PlayWiimote: %u != %u, byte " "%u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informacja o pliku" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Plik nie zawiera kodów." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Plik skonwertowany do .gci." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2476,7 +2457,7 @@ msgstr "" "Plik posiada rozszerzenie \"%s\"\n" "poprawne rozszerzenia to (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Plik nierozpoznany jako karta pamiÄ™ci" @@ -2489,19 +2470,19 @@ msgstr "Plik nie skompresowany" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "NastÄ™pny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Poprzedni" @@ -2509,27 +2490,27 @@ msgstr "Poprzedni" msgid "First Block" msgstr "Blok pierwszy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Napraw sumy kontrolne" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "WymuÅ› 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "WymuÅ› 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "WymuÅ› konsolÄ™ jako NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "WymuÅ› filtrowanie tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2541,7 +2522,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚aczone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2553,7 +2534,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2589,42 +2570,42 @@ msgstr "Klatka" msgid "Frame " msgstr "Klatka" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Zrzuty klatek używajÄ… FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Frame Info" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "ZasiÄ™g klatki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limit klatek:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Klatki do nagrania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Free Look" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francuski" @@ -2632,16 +2613,16 @@ msgstr "Francuski" msgid "Frets" msgstr "Gryfy" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Z" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "FullScr" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Rozdzielczość peÅ‚noekranowa:" @@ -2653,7 +2634,7 @@ msgstr "Plik GCI(*.gci)" msgid "GCMic Configuration" msgstr "Konfiguracja GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" @@ -2661,27 +2642,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID gry:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Gra jest już uruchomiona!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Gra nie jest uruchomiona!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Gry nie odnaleziono!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Specyficzne ustawienia gry" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Konfiguracja gry" @@ -2689,25 +2670,25 @@ msgstr "Konfiguracja gry" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Pliki zapisu GameCube(*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Ustawienia pada GC" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Kody Gecko" @@ -2724,20 +2705,20 @@ msgstr "" "obsÅ‚ugi kodu poprzez wklejenie pliku codehandler.bin w folderze Sys oraz " "zrestartowaniiu programu)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Główne" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Ustawienia ogólne" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Niemiecki" @@ -2746,19 +2727,19 @@ msgstr "Niemiecki" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Indeks jest wiÄ™kszy niż rozmiar listy kodów AR %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafika" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Ustawienia graficzne" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "WiÄ™kszy niż" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2776,7 +2757,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grecki" @@ -2796,11 +2777,11 @@ msgstr "Zielony prawo" msgid "Guitar" msgstr "Gitara" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY wywoÅ‚any, raportuj!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacki" @@ -2808,7 +2789,7 @@ msgstr "Hacki" msgid "Header checksum failed" msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebrajski" @@ -2820,7 +2801,7 @@ msgstr "Wysokość" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2839,11 +2820,11 @@ msgstr "" msgid "Hide" msgstr "Ukryj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Ukryj kursor myszy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2857,8 +2838,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2866,17 +2847,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Konfiguracja skrótów klawiszowych" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "WÄ™gierski" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Hybrydowy Wiilot" @@ -2903,7 +2884,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Ustawienia IPL" @@ -2911,19 +2892,19 @@ msgstr "Ustawienia IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Wskaźnik IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "CzuÅ‚ość IR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Foldery ISO" @@ -2935,7 +2916,7 @@ msgstr "WÅ‚ochy" msgid "Icon" msgstr "Ikona" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2943,14 +2924,14 @@ msgstr "" "JeÅ›li wÅ‚Ä…czone, bounding box registers zostanÄ… zaktualizowane. " "Wykorzystywane przez gry Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "JeÅ›li FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF " "= szybko)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2960,11 +2941,11 @@ msgstr "" "PAL:50), ustaw Audio Throttle w DSP (może naprawić klikania dźwiÄ™ku, ale " "może spowodować trwaÅ‚y szum zależnie od gry)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignoruj zmiany formatu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2978,7 +2959,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2992,7 +2973,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importuj zapis" @@ -3000,7 +2981,7 @@ msgstr "Importuj zapis" msgid "Import failed, try again?" msgstr "Importowanie nie powiodÅ‚o siÄ™, próbować ponownie?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3008,11 +2989,11 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie gsc\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Zaimportowany plik jest niewÅ‚Ä…Å›ciwej wielkoÅ›ci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3020,7 +3001,7 @@ msgstr "" "Zaimportowany plik posiada rozszerzenie sav\n" "lecz nie posiada wÅ‚aÅ›ciwego nagłówka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3032,16 +3013,16 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "W grze" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3049,7 +3030,7 @@ msgstr "Info" msgid "Information" msgstr "Informacja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "WejÅ›cie" @@ -3061,7 +3042,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3069,11 +3050,11 @@ msgstr "Włóż kartÄ™ SD" msgid "Insert name here.." msgstr "Wprowadź nazwÄ™ tutaj..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3083,23 +3064,23 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Instalacja WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "BÅ‚Ä…d sprawdzania integralnoÅ›ci" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Sprawdzanie integralnoÅ›ci zakoÅ„czone. Nie znaleziono bÅ‚Ä™dów." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3108,11 +3089,11 @@ msgstr "" "Sprawdzenie integralnoÅ›ci dla partycji %d nie powiodÅ‚o siÄ™. Twój zrzut jest " "prawdopodobnie uszkodzony lub zostaÅ‚ źle spatchowany." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3133,15 +3114,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "WewnÄ™trzny bÅ‚Ä…d LZO - lzo_init() nie powiodÅ‚o siÄ™" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "WewnÄ™trzna rozdzielczość:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpreter (BARDZO wolny)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3150,11 +3131,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "NiewÅ‚aÅ›ciwy rozmiar (%x) lub Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "NiewÅ‚aÅ›ciwa wartość!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "NiewÅ‚aÅ›ciwe bat.map lub wejÅ›cie folderu" @@ -3178,7 +3159,7 @@ msgstr "" "%s\n" "BÄ™dziesz musiaÅ‚ ponownie zrzucić grÄ™." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "NewÅ‚aÅ›ciwy plik nagrania" @@ -3186,23 +3167,23 @@ msgstr "NewÅ‚aÅ›ciwy plik nagrania" msgid "Invalid search parameters (no object selected)" msgstr "NiewÅ‚aÅ›ciwy parametr przeszukiwania (nie wybrano obiektu)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (nie udaÅ‚o siÄ™ zamienić na liczbÄ™)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (wspierane sÄ… tylko równe dÅ‚ugoÅ›ci " "Å‚aÅ„cucha)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "WÅ‚oski" @@ -3210,16 +3191,16 @@ msgstr "WÅ‚oski" msgid "JAPAN" msgstr "Japonia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Rekompilator JIT (zalecany)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Eksperymentalny rekompilator JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "JapoÅ„ski" @@ -3227,7 +3208,7 @@ msgstr "JapoÅ„ski" msgid "KOREA" msgstr "Korea" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3237,17 +3218,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÄ…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Okno na wierzchu" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Klawisz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "KoreaÅ„ski" @@ -3265,19 +3246,23 @@ msgstr "L Button" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "JÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Ostatni nadpisany stan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Ostatni zapisany stan" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3287,8 +3272,8 @@ msgstr "Lewo" msgid "Left Stick" msgstr "GaÅ‚ka lewa" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3296,7 +3281,7 @@ msgstr "" "LPM by wykryc skróty klawiszowe.\n" "WciÅ›nij spacjÄ™ by wyczyÅ›cic." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3306,7 +3291,7 @@ msgstr "" "ÅšPM by wyczyÅ›cic.\n" "PPM wiÄ™cej opcji." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3314,76 +3299,76 @@ msgstr "" "LPM/PPM wiÄ™cej opcji.\n" "ÅšPM by wyczyÅ›cić." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Mniej niż" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limit FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Wczytaj" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Wczytaj wÅ‚asne tekstury" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Wczytaj stan Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Wczytaj stan Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Wczytaj stan Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Wczytaj stan Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Wczytaj stan Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Wczytaj stan Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Wczytaj stan Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Wczytaj stan Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3397,31 +3382,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Åaduje wartoÅ›ci wczeÅ›niej ustawione z dostÄ™pnych hack patterns" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Lokalny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Przypisz wÄ…tki do rdzeni" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Konfiguracja Logu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "Zapisz FPS do pliku" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Typy logów" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3433,12 +3414,12 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Logger Outputs" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logging" @@ -3459,7 +3440,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3473,24 +3454,24 @@ msgstr "Pliki MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Główna gaÅ‚ka" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID twórcy:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Twórca:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Karta pamiÄ™ci już posiada zapis dla tego tytuÅ‚u" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Karta pamiÄ™ci już otwarta" @@ -3499,7 +3480,7 @@ msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Karta pamiÄ™ci" @@ -3536,20 +3517,20 @@ msgstr "Wielkość pliku karty pamiÄ™ci nie odpowiada wielkoÅ›ci nagłówka" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3558,7 +3539,7 @@ msgstr "Ustawienia różne" msgid "Modifier" msgstr "Zmiennik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3583,7 +3564,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3605,7 +3586,7 @@ msgstr "" msgid "Multiply" msgstr "Pomnóż" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3706,16 +3687,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nazwa:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nazwa:" @@ -3724,20 +3705,20 @@ msgstr "Nazwa:" msgid "Native GCI files(*.gci)" msgstr "Natywne pliki GCI(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nowe skanowanie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "NastÄ™pna strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "NastÄ™pne skanowanie" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ksywa:" @@ -3745,7 +3726,7 @@ msgstr "Ksywa:" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Nie odnaleziono IOS/WAD" @@ -3767,7 +3748,7 @@ msgstr "Brak dokowania" msgid "No file loaded" msgstr "Nie wczytano żadnego pliku" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Brak wolnych wejść folderów" @@ -3780,33 +3761,33 @@ msgstr "Brak nagranego pliku" msgid "No save folder found for title %s" msgstr "Nie odnaleziono folderu zapisu dla tytuÅ‚u %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Å»adne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norweski" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Nie równe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Nie ustawiono" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notatki" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notatki:" @@ -3815,7 +3796,7 @@ msgstr "Notatki:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Uwagi" @@ -3823,16 +3804,16 @@ msgstr "Uwagi" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Liczba kodów:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Acelerator Nunchak'a" @@ -3840,11 +3821,11 @@ msgstr "Acelerator Nunchak'a" msgid "Object" msgstr "Objekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "ZasiÄ™g objektu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "WyÅ‚Ä…czone" @@ -3852,52 +3833,52 @@ msgstr "WyÅ‚Ä…czone" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "On-Screen Display Messages" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "DostÄ™pnych tylko %d bloków" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otwórz plik..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: nie można utworzyć kontekstu dla urzÄ…dzenia %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: nie można odnaleźć urzÄ…dzeÅ„ dźwiÄ™kowych" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: nie można otworzyć urzÄ…dzenia %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Texture Decoder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" @@ -3910,7 +3891,7 @@ msgstr "Opcje" msgid "Orange" msgstr "PomaraÅ„czowy" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3920,8 +3901,8 @@ msgstr "" "PPM i wyeksportuj wszystkie zapisy,\n" "nastÄ™pnie zaimportuj te zapisy do nowej karty pamiÄ™ci\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "PozostaÅ‚e" @@ -3933,19 +3914,19 @@ msgstr "" "Inny klient rozÅ‚Ä…czony podczas uruchomionej gry! NetPlay wyÅ‚Ä…czony. Musisz " "rÄ™cznie zatrzymać grÄ™." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "WyjÅ›cie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Od&twórz nagranie" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Pad" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Pad " @@ -3961,7 +3942,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Parowanie" @@ -3973,34 +3954,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Paramerty" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partycja %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Åšcieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Zatrzymaj na koncu filmu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Per-Pixel Lighting" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfekcyjny" @@ -4009,36 +3990,36 @@ msgstr "Perfekcyjny" msgid "Perspective %d" msgstr "Perspekrtywa %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Play" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Odtwórz nagranie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Play/Pause" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Grywalny" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opcje playback'u" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Potwierdź..." @@ -4050,54 +4031,54 @@ msgstr "ProszÄ™ utworzyć perspektywÄ™ przed zapisem" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugalski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portugalski (Brazylijski)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Premature movie end in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Premature movie end in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Premature movie end in PlayWiimote. %u > %u" @@ -4110,11 +4091,11 @@ msgstr "Presets: " msgid "Prev Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Poprzednia strona" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Poprzednia wartość" @@ -4122,7 +4103,7 @@ msgstr "Poprzednia wartość" msgid "Print" msgstr "Drukuj" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4130,7 +4111,7 @@ msgstr "Profil" msgid "Properties" msgstr "WÅ‚aÅ›ciwoÅ›ci" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Purge Cache" @@ -4138,8 +4119,8 @@ msgstr "Purge Cache" msgid "Question" msgstr "Pytanie" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Zamknij" @@ -4157,7 +4138,7 @@ msgstr "R Button" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4165,46 +4146,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Rosja" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "ZasiÄ™g" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Tryb tylko do odczytu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Prawdziwy" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Prawdziwy Wiilot" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Prawdziwe Wiiloty" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Potwierdzenie ponownego poÅ‚Ä…czenia Wiilota" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "PodÅ‚acz ponownie Wiilota gdy wczytywany jest stan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Nagranie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informacje nagrywania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opcje nagrywania" @@ -4220,7 +4201,7 @@ msgstr "Czerwony lewo" msgid "Red Right" msgstr "Czerwony prawo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4234,29 +4215,29 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Å»adne." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "OdÅ›wież" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "OdÅ›wież listÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "OdÅ›wież listÄ™ gier" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "UsuÅ„" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4266,17 +4247,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Generuj w oknie głównym" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Wynik" @@ -4298,29 +4279,25 @@ msgstr "GaÅ‚ka prawa" msgid "Rumble" msgstr "Wibracje" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Wykonuj DSPLLE na dedykowanym wÄ…tku (niezalecane)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rosyjski" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Zapisz &stan" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Bezpieczny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Wskaźnik próbkowania:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Zapisz" @@ -4328,90 +4305,90 @@ msgstr "Zapisz" msgid "Save GCI as..." msgstr "Zapisz GCI jako..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Slot stanu 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Slot stanu 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Slot stanu 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Slot stanu 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Slot stanu 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Slot stanu 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Slot stanu 8" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Slot stanu 9" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Zapisz stan..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "PrzeszukujÄ™..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4419,23 +4396,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Przeszukaj bieżący obiekt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Szukaj wartoÅ›ci hex:" @@ -4446,20 +4423,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Nie odnaleziono sekcji %s w SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Select" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4477,23 +4454,23 @@ msgstr "Wybierz plik zapisu do importowania" msgid "Select floating windows" msgstr "Select floating windows" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4511,11 +4488,16 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz Auto." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Wskazany plik \"%s\" nie istnieje." + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Wybrana czcionka" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4531,7 +4513,7 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, użyj rozdzielczoÅ›ci komputera.\n" "JeÅ›li nadal masz wÄ…tpliwoÅ›ci, użyj najwyższej dziaÅ‚ajÄ…cej rozdzielczoÅ›ci." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4546,11 +4528,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, użyj Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "WyÅ›lij" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Pozycja Sensor Bar'a" @@ -4558,24 +4540,24 @@ msgstr "Pozycja Sensor Bar'a" msgid "Separator" msgstr "Separator" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" @@ -4585,11 +4567,17 @@ msgstr "Ustaw jako domyÅ›lnÄ… kartÄ™ pamiÄ™ci %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Indeks jest wiÄ™kszy niz rozmiar listy kodu AR %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ustawienia..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" @@ -4597,7 +4585,7 @@ msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" msgid "Shake" msgstr "WstrzÄ…s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Krótka nazwa:" @@ -4605,105 +4593,105 @@ msgstr "Krótka nazwa:" msgid "Shoulder Buttons" msgstr "Przyciski tylnie" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Pokaż &konsolÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Pokaż &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Pokaż pasek &stanu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Pokaż pasek &narzÄ™dzi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Pokaż napÄ™dy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Pokaż EFB Copy Regions" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Pokaż FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Pokaż FrancjÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Pokaż GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Pokaż Input Display" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Pokaż WÅ‚ochy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Pokaż JaponiÄ™" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Pokaż KoreÄ™" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Pokaż jÄ™zyk:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Pokaż &konfiguracjÄ™ logu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Pokaż PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Pokaż platformy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Pokaż regiony" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Pokaż statystyki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Pokaż Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Pokaż USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Pokaż WAD" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Pokaż Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Pokazuje okno potwierdzenia przed zatrzymaniem gry." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4711,15 +4699,15 @@ msgstr "" "WyÅ‚Ä…czenie tego pozwoli uniknąć denerwujÄ…cych i maÅ‚o ważnych wiadomoÅ›ci, ale " "może spowodować zamkniÄ™cie programu bez żadnego ostrzeżenia." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Pokaż pierwszy blok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Pokaż licznik opóźnienia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4729,23 +4717,23 @@ msgstr "" "WiadomoÅ›ci zawierajÄ… informacje o zapisach do karty pamiÄ™ci, video backend, " "informacje o procesorze oraz oczyszczaniu cache'u JIT." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Pokaż bloki zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Pokaż komentarz zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Pokaż ikonÄ™ zapisu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Pokaż tytuÅ‚ zapisu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4756,11 +4744,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Pokaż niewiadome" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4774,27 +4762,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Willot bokiem" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "PomiÅ„ EFB Access z CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4806,7 +4794,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4822,17 +4810,17 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4840,7 +4828,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Snapshot" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderer Programowy" @@ -4856,11 +4844,11 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "NiewÅ‚aÅ›ciwy sound beckend %s." @@ -4874,17 +4862,17 @@ msgstr "Utworzenie bufora dźwiÄ™ku nie powiodÅ‚o siÄ™: %s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "HiszpaÅ„ski" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Poziom gÅ‚oÅ›nika:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4904,7 +4892,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Przyspiesz Disc Transfer Rate" @@ -4912,51 +4900,55 @@ msgstr "Przyspiesz Disc Transfer Rate" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Standardowy kontroler" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Start &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Stan" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Stany zapisu" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "GaÅ‚ka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Stop" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4970,7 +4962,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "RozciÄ…gnij do okna" @@ -4995,8 +4987,8 @@ msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "JÄ™zyk systemu:" @@ -5004,7 +4996,7 @@ msgstr "JÄ™zyk systemu:" msgid "TAIWAN" msgstr "Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "WejÅ›cie TAS" @@ -5025,30 +5017,30 @@ msgstr "Talerz lewo" msgid "Table Right" msgstr "Talerz prawo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Zrób zdjÄ™cie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Test" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Tekstura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache tekstur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Format pokrycia tekstur" @@ -5064,13 +5056,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5093,7 +5085,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Plik %s jest już otwarty, nagłówek pliku nie zostanie zapisany." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Plik, który wybraÅ‚eÅ› (%s) nie istnieje" @@ -5110,7 +5102,7 @@ msgstr "Nazwa nie może zawierać znaku ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Wynikowy odszyfrowany kod AR nie zawiera żadnych linii." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5122,11 +5114,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, wybierz wartość na koÅ„cu po prawej." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Zapis, który chcesz skopiować posiada niewÅ‚aÅ›ciwÄ… wielkość pliku." -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5158,14 +5150,11 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Styl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Wybór stylu nieudany" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5174,7 +5163,7 @@ msgstr "" "Tutaj musi być ticket dla 00000001/00000002. Twój zrzut NAND jes " "prawdopodobnie niekompletny." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5190,11 +5179,11 @@ msgstr "" "Ten symulator action replay nie wspiera kodów, które modyfikujÄ… Action " "Replay'a." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5212,7 +5201,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5223,7 +5212,7 @@ msgstr "" "Znacznie zwiÄ™ksza wydajność na komputerach z wiÄ™cej niż jednym rdzeniem, ale " "powoduje także okazjonalne bÅ‚edy." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Pozwala na rÄ™cznÄ… edycjÄ™ pliku konfiguracyjnego." @@ -5237,35 +5226,35 @@ msgid "Tilt" msgstr "Przechylenie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "TytuÅ‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Do" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "PrzeÅ‚Ä…cz wszystkie typy logów" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "PrzeÅ‚Ä…cz na peÅ‚ny ekran" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Góra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ChiÅ„ski tradycyjny" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Próbowano odczytać nieznany typ pliku." @@ -5285,7 +5274,7 @@ msgstr "" "Próba odczytu z niewÅ‚aÅ›ciwego SYSCONF\n" "bt id Wiilota niedostÄ™pne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turecki" @@ -5297,12 +5286,12 @@ msgstr "DJ Gramofon" msgid "Type" msgstr "Typ" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Port UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiilot" @@ -5338,12 +5327,12 @@ msgstr "" "zaszyfrowanego/odszyfrowanego kodu. Sprawdź poprawność wpisanego kodu.\n" "Czy chcesz pominąć liniÄ™ i kontynuować analizÄ™?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Niezdefiniowane %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Cofnij wczytywanie stanu" @@ -5351,7 +5340,7 @@ msgstr "Cofnij wczytywanie stanu" msgid "Unexpected 0x80 call? Aborting..." msgstr "Nieoczekiwane wywoÅ‚anie 0x80? Przerywanie..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Nieznany" @@ -5380,8 +5369,8 @@ msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!" msgid "Up" msgstr "Góra" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Aktualizuj" @@ -5389,23 +5378,23 @@ msgstr "Aktualizuj" msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Użyj trybu peÅ‚noekranowego" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Użyj HEX" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Użyj Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5417,7 +5406,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5432,15 +5421,15 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "NarzÄ™dzie" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Wartość" @@ -5448,23 +5437,23 @@ msgstr "Wartość" msgid "Value:" msgstr "Wartość:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Wartość:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosity" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Wideo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Poziom" @@ -5478,7 +5467,7 @@ msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalacja WAD nie powiodÅ‚a siÄ™: bÅ‚Ä…d tworzenia biletu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5491,16 +5480,16 @@ msgstr "" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Ostrzeżenie" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie DOL w zÅ‚ym trybie konsoli!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Ostrzeżenie - uruchomienie ELF w zÅ‚ym trybie konsoli!" @@ -5532,7 +5521,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5543,7 +5532,7 @@ msgstr "" "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed " "kontynuacjÄ… lub wczytaj ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5555,7 +5544,7 @@ msgstr "" "ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu. W przeciwnym razie może " "nastÄ…pić desynchronizacja." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5589,7 +5578,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - plik nie jest otwarty." @@ -5597,7 +5586,7 @@ msgstr "WaveFileWriter - plik nie jest otwarty." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Widescreen Hack" @@ -5605,23 +5594,23 @@ msgstr "Widescreen Hack" msgid "Width" msgstr "Szerokość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5629,17 +5618,17 @@ msgstr "Pliki zapisu Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: nie moża odczytać z pliku" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiilot" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiilot %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5652,19 +5641,19 @@ msgstr "" "lub zbyt dÅ‚ugi czas nieobecnoÅ›ci lub coÅ› innego.\n" "PoÅ‚Ä…czyć ponownie?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiilot poÅ‚Ä…czony" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiilot Motor" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiiloty" @@ -5684,26 +5673,26 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "PracujÄ™..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Zapisz do konsoli" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Zapisz do Debugger'a" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Zapisz do pliku" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Wpisz do okna" @@ -5742,24 +5731,24 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Nie możesz zamknąć paneli jeÅ›li sÄ… w nich strony." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Wybierz grÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Musisz wprowadzić nazwÄ™!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" "Musisz wprowadzić poprawnÄ… wartość dziesiÄ™tnÄ…, szestnastkowÄ… lub ósemkowÄ…." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5782,7 +5771,7 @@ msgstr "" "Powinno być 0x%04x (jest 0x%04llx)\n" "Czy chcesz wygenerować nowy?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5795,12 +5784,12 @@ msgstr "Kod 3 zero niewspierany" msgid "Zero code unknown to dolphin: %08x" msgstr "Kod zero nieznany dla programu: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ czekam ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5816,7 +5805,7 @@ msgstr "" msgid "[Custom]" msgstr "[WÅ‚asne]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5835,7 +5824,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5849,11 +5838,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5870,7 +5859,7 @@ msgstr "Odczyt z pliku %s nie powiódÅ‚ siÄ™" msgid "failed to read header" msgstr "Odczyt nagłówka nie powiódÅ‚ siÄ™" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." @@ -5889,7 +5878,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -5901,13 +5890,16 @@ msgstr "zFar Correction: " msgid "zNear Correction: " msgstr "zNear Correction: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Frame Stepping" @@ -5987,6 +5979,20 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Oblicza wartoÅ›ci gÅ‚Ä™bokoÅ›ci grafiki 3D na pixel zamiast na wierzchoÅ‚ek.\n" +#~ "W kontraÅ›cie do pixel lighting (które ledwo jest ulepszeniem), obliczenia " +#~ "gÅ‚Ä™bokoÅ›ci na pixel sÄ… niezbÄ™dne do wÅ‚aÅ›ciwej emulacji niektórych gier.\n" +#~ "\n" +#~ "W razie wÄ…tpliwoÅ›ci, pozostaw wÅ‚Ä…czone." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6040,6 +6046,23 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Nie można odczytać informacji o pluginie %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Utworzone przez KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Utworzone przez Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl." +#~ "deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Utworzone przez VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Utworzone przez black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList Cache" @@ -6052,6 +6075,9 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "WyÅ‚Ä…cz Å›wiatÅ‚a" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "WyÅ‚Ä…cz Per-Pixel Depth" + #~ msgid "Disable Textures" #~ msgstr "WyÅ‚Ä…cz tekstury" @@ -6316,6 +6342,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Wczytuje okreÅ›lony plik (DOL, ELF, GCM, ISO, WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Przypisz wÄ…tki do rdzeni" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Llow level (LLE) lub high level (HLE) audio" @@ -6395,6 +6424,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "WykonujÄ™ skrypt...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Wskaźnik próbkowania:" + #~ msgid "Scale:" #~ msgstr "Skala:" @@ -6495,6 +6527,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "Plik" +#~ msgid "Theme selection went wrong" +#~ msgstr "Wybór stylu nieudany" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 73ca8e58b4..816ae30486 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-07-23 15:53-0000\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" "Language: Portuguese\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(demasiados para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Jogo: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NÃO" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Não conectado" @@ -156,147 +149,147 @@ msgstr "%sImportar GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos livres; %u Entradas de directórios livres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Arrancar através da unidade de DVD ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Pontos de partida" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procurar ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Gestor de Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Ficheiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "&Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Definições Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Definições de Teclas de Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Gestor de Cartão de Memória(GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo só de leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Actualizar lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Vídeo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -316,7 +309,7 @@ msgstr "(-)+zPerto" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(desligado)" @@ -324,19 +317,19 @@ msgstr "(desligado)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -344,20 +337,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -365,25 +358,27 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Uma janela NetPlay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Nenhum jogo actualmente a correr." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nenhum dispositivo bluetooth suportado foi encontrado!\n" "(Apenas o Microsoft bluetooth stack é suportado.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -418,13 +413,13 @@ msgstr "" "\n" "Tem que fazer forward TCP para ser host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -432,19 +427,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Sobre o Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação VBeam precisa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 #, fuzzy msgid "" "Accurately emulate EFB copies.\n" @@ -459,8 +454,8 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Acção" @@ -487,7 +482,7 @@ msgstr "" "Erro Action Replay: Tamanho Inválido (%08x : address = %08x) em Adição de " "Código (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -514,15 +509,16 @@ msgstr "" "Erro Action Replay: Tamanho inválido (%08x : address = %08x) em Escrita para " "Ponteiro (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro Action Replay: Valor inválido (%08x) em cópia de memória (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Erro Action Replay: Códgo Mestre e Escrita para CCXXXXXX não implementado " "(%s)" @@ -532,27 +528,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro Action Replay: linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay:Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de código normal inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Código normal %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Código Normal 0: Subtipo Inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -561,11 +557,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Adicionar Patch" @@ -573,13 +569,13 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Adicionar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Localização :" @@ -619,51 +615,51 @@ msgstr "" "\n" "NOTA: Verifique a Janela de Relatórios/Consola para os valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Ajustar a pressão de controlo analógico necessária para activar os botões." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançadas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Definições avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos os ficheiros (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -676,20 +672,20 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotrópico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Serrilhamento" @@ -701,15 +697,15 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -719,16 +715,16 @@ msgstr "" "\n" "Em caso de dúvida, seleccione (off)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -736,14 +732,14 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -751,12 +747,12 @@ msgstr "Proporção de ecrã:" msgid "At least one pane must remain open." msgstr "Pelo menos um painel deve manter-se aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Ãudio Backend :" @@ -764,24 +760,24 @@ msgstr "Ãudio Backend :" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Automático (Multiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Dimensão da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajuste Automático da Dimensão da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -804,12 +800,12 @@ msgstr "&Registos" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Definições Backend" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" @@ -827,15 +823,15 @@ msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -843,11 +839,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Barra" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Definições Básicas" @@ -875,42 +871,42 @@ msgstr "Azul esquerda" msgid "Blue Right" msgstr "Azul Direita" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Inferior" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controlos agregados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Inactivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botões" @@ -931,32 +927,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Motor de emulador de CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache de listas de Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula valores de profundidade dos gráficos 3D por pixel em vez de por " -"vértice.\n" -"Em contraste com a iluminação por pixel (que é meramente uma melhoria), " -"calculos de profundidade por pixel são necessários para emular correctamente " -"um pequeno número de jogos.\n" -"\n" -"Em caso de dúvida, mantenha esta opção activada." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -972,7 +951,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -988,7 +967,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -998,7 +977,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1006,13 +985,13 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar WiiMote por bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Não foi possível encontrar WiiMote por esta conexão %02x" @@ -1026,7 +1005,7 @@ msgstr "Não foi possível ler através do DVD_Plugin - DVD-Interface: Erro fata msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalão" @@ -1034,24 +1013,24 @@ msgstr "Catalão" msgid "Center" msgstr "Centro" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Mudar &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Mudar Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Mudar de Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1067,13 +1046,12 @@ msgstr "Alterações assinaladas a parâmetro zFar (após correcção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Mudanças assinaladas a parâmetro zNear (após correcção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Alterações não vão surtir efeito enquanto o emulador estiver em execução!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Conversa" @@ -1081,47 +1059,47 @@ msgstr "Conversa" msgid "Cheat Code" msgstr "Código de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Procura de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gestor de Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1129,7 +1107,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1137,8 +1115,8 @@ msgstr "" "Escolha o ficheiro a usar como apploader: (aplica-se a apenas a discos " "construídos através de pastas)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1152,8 +1130,8 @@ msgstr "Clássico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpar" @@ -1165,22 +1143,22 @@ msgstr "" "O Cliente desligou enquanto jogo decorria!! NetPlay está desactivado. Terá " "que parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Info de Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1192,91 +1170,91 @@ msgstr "Comando" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "A comprimir ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configuração" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configuração de Controlos" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configuração de Comandos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar Ao Parar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "A conectar..." @@ -1296,12 +1274,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Cópia Falhou" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para o Cartão de memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Core" @@ -1310,7 +1288,7 @@ msgstr "Core" msgid "Could not create %s" msgstr "Não foi possível criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível iniciar o backend %s." @@ -1331,12 +1309,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer ficheiro ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Não foi possível guardar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1358,11 +1336,11 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1370,17 +1348,17 @@ msgstr "" "Não foi possível iniciar o core.\n" "Verifique a sua configuração." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Contador:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Criar um código AR" @@ -1389,25 +1367,7 @@ msgstr "Criar um código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Criado por KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Criado por VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Criador:" @@ -1415,11 +1375,11 @@ msgstr "Criador:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Recortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1433,12 +1393,12 @@ msgstr "" msgid "Crossfade" msgstr "Desvanecimento cruzado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "A pasta actual mudou de %s para %s depois wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de projecção personalizada" @@ -1446,11 +1406,11 @@ msgstr "Hack de projecção personalizada" msgid "Custom Projection Hack Settings" msgstr "Definições de Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Checo" @@ -1462,36 +1422,36 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulação de DSP HLE (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador de DSP LLE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1503,11 +1463,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Dimensão de Dados" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" @@ -1524,11 +1484,11 @@ msgstr "Datel MaxDrive/Pro files(*.sav)" msgid "Dead Zone" msgstr "Zona morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Depuração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Depuração" @@ -1536,24 +1496,24 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "A descomprimir ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1562,11 +1522,11 @@ msgid "Default font" msgstr "Tipo de letra Padrão" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Apagar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Apagar Jogo Guardado" @@ -1575,11 +1535,11 @@ msgstr "Apagar Jogo Guardado" msgid "Delete the existing file '%s'?" msgstr "Apagar o ficheiro existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descrição" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1592,13 +1552,13 @@ msgstr "" "Detectada tentativa de leitura excessiva de dados do DVD, mais do que pode " "caber dentro do buffer externo." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1622,20 +1582,16 @@ msgstr "" "Verificação de pasta falhou\n" " e verificação da cópia de segurança de pasta falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Desactivar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Desactivar Nevoeiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Desactivar Profundidade por Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1649,7 +1605,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1665,7 +1621,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1674,11 +1630,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro de leitura de disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Visualização" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1692,20 +1648,24 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Configurações Gráficas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Site" @@ -1713,32 +1673,32 @@ msgstr "Dolphin &Web Site" msgid "Dolphin Configuration" msgstr "Configurações Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração da emulação de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuração Dolphin do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1746,7 +1706,7 @@ msgstr "" "O Dolphin não conseguiu encontrar ISOs de GC/Wii. Duplo clique aqui para " "procurar ficheiros..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1754,16 +1714,21 @@ msgstr "" "Dolphin está actualmente definido para esconder todos os jogos. Duplo " "clique aqui para mostrar todos os jogos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Base de dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Descarregados %lu códigos. (adicionados %lu)" @@ -1772,27 +1737,27 @@ msgstr "Descarregados %lu códigos. (adicionados %lu)" msgid "Drums" msgstr "Tambores" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Depositar Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Depositar Alvo EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Depositar Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Depositar Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1803,7 +1768,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1813,7 +1778,7 @@ msgstr "" "\n" "Em caso de dúvida. mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1823,17 +1788,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "S&air" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Cópias EFB" @@ -1854,11 +1819,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Actualizações de Memória Inicial" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1866,7 +1831,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1874,12 +1839,12 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva actual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1887,7 +1852,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" @@ -1895,7 +1860,7 @@ msgstr "Frame Buffer Embutido" msgid "Emu Thread already running" msgstr "Thread de Emulador já em execução" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1909,7 +1874,7 @@ msgstr "" "\n" "Em caso de dúvida, active a opção emulação virtual XFB como alternativa." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1925,19 +1890,19 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Wiimote Emulado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado da Emulação:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Activar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1953,72 +1918,71 @@ msgstr "" "Necessita de ecrã inteiro para funcionar.\n" "Em caso de dúvida mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Activar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Activar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Activar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Activar Dual Core" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Activar Dual Core (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Activar Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Activar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Activar Idle Skipping (aumento de desempenho)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Activar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Activar Ecrã Panorâmico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Activar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2032,7 +1996,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2040,11 +2004,11 @@ msgstr "" "Activar acesso rápido ao disco. Necessário para alguns jogos. (ON = Rápido, " "OFF = Compatível)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Activar Páginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2057,7 +2021,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2069,7 +2033,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2077,7 +2041,7 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2087,11 +2051,28 @@ msgstr "" "Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " "Compatível, OFF = Rápida)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2103,7 +2084,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2111,7 +2092,7 @@ msgstr "" "Activa a Unidade de Gestão de Memória, necessária em alguns jogos. (ON = " "Compatível, OFF = Rápido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2125,14 +2106,14 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Melhorias" @@ -2150,17 +2131,17 @@ msgstr "Entrada %d/%d" msgid "Entry 1/%d" msgstr "Entrada 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" "Erro ao carregar o idioma seleccionado. Será revertido para o idioma padrão " @@ -2200,32 +2181,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "A Exportação Falhou" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar Ficheiro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos os jogos guardados" @@ -2241,7 +2222,7 @@ msgstr "Exportar guardar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Frame Buffer externo" @@ -2253,44 +2234,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra apenas útil em \"Metroid: Other M\"." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrair Todos os Ficheiros..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrair Pasta..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrair Ficheiro..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "A Extrair %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "A Extrair Todos os Ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "A Extrair Pasta" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "A Extrair..." @@ -2298,7 +2279,7 @@ msgstr "A Extrair..." msgid "FIFO Byte" msgstr "FIFO Byte" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "Reprodutor FIFO" @@ -2306,7 +2287,7 @@ msgstr "Reprodutor FIFO" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2314,15 +2295,15 @@ msgstr "Tamanho FST:" msgid "Failed to Connect!" msgstr "A Conexão Falhou!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "A Escuta Falhou!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Falha ao descarregar códigos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair para %s!" @@ -2442,41 +2423,41 @@ msgstr "Falha ao escrever cabeçalho para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever cabeçalho para o ficheiro %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Reprodutor Fifo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informação de Ficheiro" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "O ficheiro não continha códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Ficheiro convertido para .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2493,7 +2474,7 @@ msgstr "" "O ficheiro tem a extensão \"%s\"\n" "as extensões válidas são (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Ficheiros não são reconhecidos como sendo de cartão de memória" @@ -2506,19 +2487,19 @@ msgstr "Ficheiro não comprimido" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo aberto desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2526,27 +2507,27 @@ msgstr "" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Definir a consola como NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2559,7 +2540,7 @@ msgstr "" "jogos.\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2571,7 +2552,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2607,43 +2588,43 @@ msgstr "Quadro" msgid "Frame " msgstr "Quadro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Depósitos de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Alcance de Quadros" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "S&altar Quadros" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limite de Quadros:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Quadros para Gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Vista Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francês" @@ -2651,16 +2632,16 @@ msgstr "Francês" msgid "Frets" msgstr "Trastes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolução em ecrã Inteiro:" @@ -2673,7 +2654,7 @@ msgstr "Ficheiro GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "ComandoGC" @@ -2681,27 +2662,27 @@ msgstr "ComandoGC" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID do Jogo:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "O jogo já está a correr!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "O jogo não está a correr!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jogo não encontrado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Definições específicas por jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Configuração de Jogo" @@ -2709,25 +2690,25 @@ msgstr "Configuração de Jogo" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Definições de Comando Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2742,20 +2723,20 @@ msgstr "" "GeckoCode falhou ao executar (CT%i CST%i) (%s)\n" "(Ou é um código com erros ou o tipo de código não é suportado.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Geral" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Definições Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemão" @@ -2764,19 +2745,19 @@ msgstr "Alemão" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index é maior que o tamanho da lista de código %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Definições Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maior Que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 #, fuzzy msgid "" "Greatly increases quality of textures generated using render to texture " @@ -2793,7 +2774,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grego" @@ -2813,11 +2794,11 @@ msgstr "Verde Direita" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY é chamada, Por favor reporte!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2825,7 +2806,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "Verificação de Cabeçalho falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebraico" @@ -2837,7 +2818,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2857,11 +2838,11 @@ msgstr "" msgid "Hide" msgstr "Esconder" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder o cursor do rato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2875,8 +2856,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2884,17 +2865,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de Teclas de atalho" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Teclas de Atalho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" @@ -2922,7 +2903,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Definições IPL" @@ -2930,19 +2911,19 @@ msgstr "Definições IPL" msgid "IR" msgstr "IV" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Ponteiro Infra Vermelho" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidade de Infra Vermelhos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Pastas ISO" @@ -2954,20 +2935,20 @@ msgstr "Itália" msgid "Icon" msgstr "Ãcone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se os FPS são erráticos, esta opção poderá ajudar. (ON = Compatível, OFF = " "Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2978,11 +2959,11 @@ msgstr "" "(NTSC:60, PAL:50), também terá que desactivar o Regulador Ãudio em DSP para " "torna-lo eficaz." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2996,7 +2977,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3010,7 +2991,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Jogo Guardado" @@ -3018,7 +2999,7 @@ msgstr "Importar Jogo Guardado" msgid "Import failed, try again?" msgstr "Importação falhou, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3026,11 +3007,11 @@ msgstr "" "O ficheiro importado tem a extensão gsc\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "O ficheiro importado tem um tamanho inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3038,7 +3019,7 @@ msgstr "" "O ficheiro importado tem a extensão sav\n" "mas não tem um cabeçalho correcto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3050,16 +3031,16 @@ msgstr "" "\n" "Em caso de dúvida, manteha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Em Jogo" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Em-Jogo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Informação" @@ -3067,7 +3048,7 @@ msgstr "Informação" msgid "Information" msgstr "Informação" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3079,7 +3060,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3087,11 +3068,11 @@ msgstr "Inserir Cartão SD" msgid "Insert name here.." msgstr "Introduza o nome aqui..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3101,34 +3082,34 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "A Instalar WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Definições de interface" @@ -3149,15 +3130,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro interno de LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpretador (Muito lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3166,11 +3147,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra mágica (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor inválido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "bat.map inválido ou entrada de pasta" @@ -3194,7 +3175,7 @@ msgstr "" "%s\n" " Poderá ter que refazer o depósito deste jogo." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ficheiro de Gravação inválido" @@ -3202,21 +3183,21 @@ msgstr "Ficheiro de Gravação inválido" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Estado Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3224,16 +3205,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "Recompilador JIT (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "Recompilador experimental JITIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonês" @@ -3241,7 +3222,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "COREIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3252,17 +3233,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Tecla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3280,19 +3261,23 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último estado Substituído" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último Estado Guardado" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3302,8 +3287,8 @@ msgstr "Esquerda" msgid "Left Stick" msgstr "Stick Esquerdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3311,7 +3296,7 @@ msgstr "" "Clique esquerdo para detectar teclas de atalho. \n" "Prima barra de espaço para limpar." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3321,7 +3306,7 @@ msgstr "" "Clique botão do meio para limpar.\n" "Clique botão direito para mais opções." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3329,76 +3314,76 @@ msgstr "" "Clique Esquerdo/Direito para mais opções.\n" "Botão do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Inferior que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar por FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar Estado Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar Estado Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar Estado Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar Estado Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar Estado Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar Estado Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar Estado Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3412,31 +3397,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar Valores de origem para padrões de hack disponíveis." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Bloqueia as threads aos núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Relatório" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuração de Relatório" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipos de Relatório" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3449,12 +3430,12 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Saídas de Gerador de Relatórios" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Relatório em execução" @@ -3475,7 +3456,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3489,24 +3470,24 @@ msgstr "ficheiros MadCatz Gameshark(*.gcs)" msgid "Main Stick" msgstr "Stick Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID do autor:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Max" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "O cartão de memória já tem um jogo guardado para este título" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "O cartão de memória já abriu" @@ -3515,7 +3496,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Cartão de memória" @@ -3552,20 +3533,20 @@ msgstr "" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Min" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3574,7 +3555,7 @@ msgstr "Configurações Diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3599,7 +3580,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3622,7 +3603,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3722,16 +3703,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome:" @@ -3740,20 +3721,20 @@ msgstr "Nome:" msgid "Native GCI files(*.gci)" msgstr "Ficheiros GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nova procura" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próxima Procura" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Alcunha :" @@ -3761,7 +3742,7 @@ msgstr "Alcunha :" msgid "No Country (SDK)" msgstr "Sem País (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Nenhum ISO ou WAD encontrado" @@ -3783,7 +3764,7 @@ msgstr "Sem colocação" msgid "No file loaded" msgstr "Nenhum ficheiro carregado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Sem entradas de índice para pastas livres" @@ -3796,33 +3777,33 @@ msgstr "Nenhum ficheiro de gravação" msgid "No save folder found for title %s" msgstr "Não foi encontrada a pasta de jogo guardado para o título %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Bokmaal Norueguês" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Não definido" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3831,7 +3812,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Noticia" @@ -3839,16 +3820,16 @@ msgstr "Noticia" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Número De Códigos" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleração Nunchuk" @@ -3856,11 +3837,11 @@ msgstr "Aceleração Nunchuk" msgid "Object" msgstr "Objecto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Alcance de Objecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Desligado" @@ -3868,52 +3849,52 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir ficheiro..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: não foram encontrados dispositivos de som" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Descodificador de Textura OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" @@ -3926,7 +3907,7 @@ msgstr "Opções" msgid "Orange" msgstr "Laranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3936,8 +3917,8 @@ msgstr "" "Botão direito e exporte todos os jogos guardados,\n" "e importe os jogos guardados para um novo cartão de memória\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Outro" @@ -3949,19 +3930,19 @@ msgstr "" "O outro cliente desligou enquanto o jogo corria!! Netplay está desactivado. " "Manualmente parou o jogo." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Destino" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "R&eproduzir Gravação..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Comando" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Comando" @@ -3977,7 +3958,7 @@ msgstr "Página Abaixo" msgid "Page Up" msgstr "Página Acima" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Emparelhar" @@ -3989,34 +3970,34 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminação por Pixel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfeito" @@ -4025,36 +4006,36 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Começar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Tocar Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Começar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4066,54 +4047,54 @@ msgstr "Por favor crie uma perspectiva antes de guardar" msgid "Plus-Minus" msgstr "Mais-Menos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Português (Brasileiro)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4126,11 +4107,11 @@ msgstr "Predefinições:" msgid "Prev Page" msgstr "Pág Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4138,7 +4119,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4146,7 +4127,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpar Cache" @@ -4154,8 +4135,8 @@ msgstr "Limpar Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sair" @@ -4173,7 +4154,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4181,47 +4162,47 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Alcance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modo só de leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de Reconexão de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao Carregar Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informação de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4237,7 +4218,7 @@ msgstr "Vermelho Esquerda" msgid "Red Right" msgstr "Vermelho Direita" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4252,29 +4233,29 @@ msgstr "" "\n" "Em caso de dúvida, seleccione Nenhum." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Actualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Actualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Actualizar lista de Jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4284,17 +4265,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar para a Janela Principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4316,29 +4297,25 @@ msgstr "Stick Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Correr DSP LLE numa thread dedicada (não recomendado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Gua&rdar Estado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Taxa de Amostragem:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Guardar" @@ -4346,90 +4323,90 @@ msgstr "Guardar" msgid "Save GCI as..." msgstr "Guardar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Guardar Estado Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Guardar Estado Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Guardar Estado Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Guardar Estado Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Guardar Estado Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Guardar Estado Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Guardar Estado Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Guardar Estado Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Guardar Estado..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Em Analise..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4437,25 +4414,25 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Procura de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4466,20 +4443,20 @@ msgid "Section %s not found in SYSCONF" msgstr "Selecção %s não encontrada em SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seleccionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4497,23 +4474,23 @@ msgstr "Seleccione um ficheiro de jogo guardado para importar" msgid "Select floating windows" msgstr "Seleccionar janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4531,11 +4508,16 @@ msgstr "" "da sua proporção.\n" "Em caso de dúvida, seleccione Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "O ficheiro especificado \"%s\" não existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Tipo de letra seleccionado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4551,7 +4533,7 @@ msgstr "" "Em caso de dúvida, utilize a resolução do ambiente de trabalho.\n" "Se ainda tiver dúvidas, utilize a resolução mais alta que funcione melhor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4567,11 +4549,11 @@ msgstr "" "\n" "Em caso de dúvida, utilize o Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posição da Barra de Sensor:" @@ -4579,26 +4561,26 @@ msgstr "Posição da Barra de Sensor:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - Esta é a porta em que dispositivos tais como adaptadores de " "rede utilizam" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como cartão de memória padrão %c" @@ -4608,11 +4590,17 @@ msgstr "Definir como cartão de memória padrão %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive:O Index é maior que a lista de códigos ar %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Definições..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" @@ -4620,7 +4608,7 @@ msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" msgid "Shake" msgstr "Abanar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Abreviatura:" @@ -4628,105 +4616,105 @@ msgstr "Abreviatura:" msgid "Shoulder Buttons" msgstr "Botões Shoulder" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Consola" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar &Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar &Barra de estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Mostrar Barra de Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar Unidades" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar visualização de Entradas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar Japão" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Coreia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar Pal" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma caixa de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4734,39 +4722,39 @@ msgstr "" "Desactivar isto poderá evitar mensagens irritantes e não-fatais, mas também " "poderá não explicar o motivo pelo qual o Dolphin crashe de repente." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar primeiro bloco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar blocos de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostrar guardar comentário" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar ícone de guardar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar o título de jogo guardado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4778,11 +4766,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostrar desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4796,27 +4784,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Saltar Bios" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Ignorar o acesso do EFB a partir do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4828,7 +4816,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4845,17 +4833,17 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4863,7 +4851,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de ecrã" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -4880,11 +4868,11 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Definições de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Backend de Som %s não é válido" @@ -4898,17 +4886,17 @@ msgstr "Criação do buffer de som falhou: %s" msgid "Space" msgstr "Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanhol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume do Altifalante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4928,7 +4916,7 @@ msgstr "" "\n" "Em caso de dúvida, seleccione 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumente a taxa de transferência do disco" @@ -4936,51 +4924,55 @@ msgstr "Aumente a taxa de transferência do disco" msgid "Square Stick" msgstr "Stick quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Comando padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Começar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Começar &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "&Começar Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Começar Gravação" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Estado" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados Guardados" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4994,7 +4986,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção activada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Ajustar à janela" @@ -5019,8 +5011,8 @@ msgstr "Sucesso na importação de ficheiros de jogo guardado" msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Idioma do sistema:" @@ -5028,7 +5020,7 @@ msgstr "Idioma do sistema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Entrada TAS" @@ -5049,30 +5041,30 @@ msgstr "Table Esquerda" msgid "Table Right" msgstr "Table Direita" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Tirar Screenshot" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Teste" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Formato da textura" @@ -5088,13 +5080,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5119,7 +5111,7 @@ msgstr "" "O ficheiro %s já estava aberto, o cabeçalho do ficheiro não poderá ser " "escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O ficheiro que especificou (%s) não existe" @@ -5136,7 +5128,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O resultado do código AR desencriptado não contém quaisquer linhas." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 #, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " @@ -5149,12 +5141,12 @@ msgstr "" "\n" "Em caso de dúvida, utilize o segundo valor mais rápido a partir da direita." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Jogo Guardado que está a tentar copiar tem um tamanho de ficheiro inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5187,14 +5179,11 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Selecção de tema correu mal" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5203,7 +5192,7 @@ msgstr "" "Tem que existir um ticket para 00000001/00000002. O seu NAND depositado está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5219,11 +5208,11 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o próprio " "Action Replay" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5243,7 +5232,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5255,7 +5244,7 @@ msgstr "" "Provoca aumentos significativos de velocidade em PCs com mais de um núcleo, " "mas também poderá causar crashes ou falhas." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto permite a edição manual do ficheiro de configuração INI" @@ -5269,35 +5258,35 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Alternar Todos os Tipos de Relatório" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Alternar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Tentou carregar um tipo de ficheiro desconhecido." @@ -5317,7 +5306,7 @@ msgstr "" "Tentativa de leitura inválida de SYSCONF\n" " ids bt de wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5329,12 +5318,12 @@ msgstr "Rotação" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5368,12 +5357,12 @@ msgstr "" "encriptado ou desencriptado válido. Verifique se o escreveu correctamente.\n" "Quer ignorar esta linha e continuar a analisar?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Indefinido %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Retroceder Carregamento de Estado" @@ -5381,7 +5370,7 @@ msgstr "Retroceder Carregamento de Estado" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconhecido" @@ -5412,8 +5401,8 @@ msgstr "" msgid "Up" msgstr "Cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Actualizar" @@ -5421,23 +5410,23 @@ msgstr "Actualizar" msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Utilizar Ecrã Inteiro" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar Manipuladores de Pânico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5450,7 +5439,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5465,15 +5454,15 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilidade" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5481,23 +5470,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volume" @@ -5512,7 +5501,7 @@ msgstr "Instalação WAD falhou: erro ao criar %s" msgid "WAD installation failed: error creating ticket" msgstr "Instalação WAD falhou: erro ao criar %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5526,16 +5515,16 @@ msgstr "" "Em caso de dúvida, mantenha esta opção desactivada." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - a começar DOL em modo errado de consola!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - A iniciar um ELF em modo errado de consola!" @@ -5568,7 +5557,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5576,7 +5565,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5584,7 +5573,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5604,7 +5593,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - ficheiro não aberto." @@ -5612,7 +5601,7 @@ msgstr "WaveFileWriter - ficheiro não aberto." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" @@ -5620,23 +5609,23 @@ msgstr "Hack de Ecrã Panorâmico" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5644,17 +5633,17 @@ msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler do ficheiro" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5668,19 +5657,19 @@ msgstr "" "razão.\n" "Quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor de Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Definições de Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5701,27 +5690,27 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "A trabalhar..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escrever para Consola" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "Escrever para Ficheiro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escrever para Ficheiro" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escrever para a Janela" @@ -5758,23 +5747,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Não pode fechar painéis que contenham páginas." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Tem que escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Tem que introduzir um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -5797,7 +5786,7 @@ msgstr "" "Deveria ser 0x%04x (mas é 0x%04llx)\n" "Pretende gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP hack" @@ -5810,12 +5799,12 @@ msgstr "Código Zero 3 não é suportado" msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido para o Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ em espera ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5831,7 +5820,7 @@ msgstr "" msgid "[Custom]" msgstr "[Costumizar]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5850,7 +5839,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5865,11 +5854,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5886,7 +5875,7 @@ msgstr "falha ao ler dados de ficheiro: %s" msgid "failed to read header" msgstr "falha ao ler cabeçalho" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: A ler Opcode de %x. Por favor reportar." @@ -5906,7 +5895,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -5918,10 +5907,13 @@ msgstr "Correcção zFar: " msgid "zNear Correction: " msgstr "Correcção zNear: " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OU" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "(Default)" #~ msgstr "(Padrão)" @@ -5986,6 +5978,22 @@ msgstr "| OU" #~ msgid "Bad gameini filename" #~ msgstr "nome de ficheiro gameini inválido" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula valores de profundidade dos gráficos 3D por pixel em vez de por " +#~ "vértice.\n" +#~ "Em contraste com a iluminação por pixel (que é meramente uma melhoria), " +#~ "calculos de profundidade por pixel são necessários para emular " +#~ "correctamente um pequeno número de jogos.\n" +#~ "\n" +#~ "Em caso de dúvida, mantenha esta opção activada." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6025,6 +6033,21 @@ msgstr "| OU" #~ msgid "Could not get info about plugin %s" #~ msgstr "Não foi possível obter informação sobre o plugin %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Criado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Criado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Criado por black_rider e publicado em ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache DList " @@ -6034,6 +6057,9 @@ msgstr "| OU" #~ msgid "Disable Lighting" #~ msgstr "Desactivar Luminosidade" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desactivar Profundidade por Pixel" + #~ msgid "Disable Textures" #~ msgstr "Desactivar Texturas" @@ -6251,6 +6277,9 @@ msgstr "| OU" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Carrega o ficheiro especifico (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Bloqueia as threads aos núcleos" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Ãudio em baixo nível (LLE) ou alto nível (HLE)" @@ -6302,6 +6331,9 @@ msgstr "| OU" #~ msgid "Required for using the Japanese ROM font." #~ msgstr "Necessário para usar o ROM com caracteres japoneses" +#~ msgid "Sample Rate:" +#~ msgstr "Taxa de Amostragem:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6397,6 +6429,9 @@ msgstr "| OU" #~ msgid "Start the rendering window in fullscreen mode." #~ msgstr "Começar a janela renderizada em ecrã inteiro" +#~ msgid "Theme selection went wrong" +#~ msgstr "Selecção de tema correu mal" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 74e0736634..2138f685a0 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-12-20 22:53-0300\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (muitos para mostrar)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Jogo : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NÃO" @@ -56,14 +56,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sCopiar%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i conectado" @@ -158,147 +151,147 @@ msgstr "%sImportar GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u Blocos Livres; %u Entradas de Diretórios Livres" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& E" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&Sobre..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Carregar a Partir do Drive de DVD..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "&Pontos de Interrupção" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Procurar por ISOs..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Gerenciador de &Cheats" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Arquivo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Tela Cheia" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "Configurações de &Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Ajuda" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "Configurações de &Atalho" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "&Carregar Estado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "Gerenciador de Cartão de &Memória (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Abrir..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opções" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pausar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "&Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Recarregar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registradores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Som" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Parar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Ferramen&tas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -318,7 +311,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(DESCONHECIDO)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(desligado)" @@ -326,19 +319,19 @@ msgstr "(desligado)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -346,20 +339,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -367,25 +360,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Uma janela de Netplay já está aberta!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Não tem nenhum jogo rodando no momento." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Nenhum dispositivo Bluetooth suportado foi encontrado!\n" "(Apenas o Bluetooth Microsoft é suportado.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -421,13 +416,13 @@ msgstr "" "\n" "Você deve redirecionar as portas TCP para ser o Host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "Códigos AR" @@ -435,19 +430,19 @@ msgstr "Códigos AR" msgid "About Dolphin" msgstr "Sobre o Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Aceleração" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "Precisão:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Emulação correta do VBeam" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -461,8 +456,8 @@ msgstr "" "\n" "Se estiver em dúvida, mude o EFB para Textura." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Ação" @@ -489,7 +484,7 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Add Code " "(%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -516,15 +511,16 @@ msgstr "" "Erro no Action Replay: Tamanho inválido (%08x : address = %08x) em Write to " "Pointer (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " "(%s)" @@ -534,27 +530,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Erro no Action Replay: Linha de código AR inválida: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Código Condicional: Tamanho Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Tipo de Normal Code Inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Code %i: Subtipo inválido %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Code 0: Subtipo inválido %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adaptador:" @@ -563,11 +559,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Adicionar Código de ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Adicionar Patch" @@ -575,13 +571,13 @@ msgstr "Adicionar Patch" msgid "Add new pane" msgstr "Adicionar novo painel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Adicionar..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Endereço:" @@ -621,48 +617,48 @@ msgstr "" "\n" "NOTA: Confira a Janela de Log/Console para ver os valores adquiridos." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "Ajustar o controle de pressão análogo requerido para ativar os botões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "Avançado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "Configurações Avançadas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -674,19 +670,19 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Tempo Alternativo de Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analizar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtragem Anisotrópica" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Anti-Aliasing:" @@ -698,15 +694,15 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Aplicar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -716,16 +712,16 @@ msgstr "" "\n" "Se estiver em dúvida, selecione (desligado)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Ãrabe" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -733,14 +729,14 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -748,12 +744,12 @@ msgstr "Proporção:" msgid "At least one pane must remain open." msgstr "Pelo menos um painél deve permanecer aberto." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -761,24 +757,24 @@ msgstr "Backend de Audio" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Automático" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Auto (Múltiplo de 640x528)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Auto (Tamanho da Janela)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Ajustar Automaticamente o Tamanho da Janela" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -800,12 +796,12 @@ msgstr "Registrador BP" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Configurações do Backend" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Backend:" @@ -823,15 +819,15 @@ msgid "Bad File Header" msgstr "Header de Arquivo Ruim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalhes de Banner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Banner:" @@ -839,11 +835,11 @@ msgstr "Banner:" msgid "Bar" msgstr "Alavanca" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Básico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Configurações Básicas" @@ -871,42 +867,42 @@ msgstr "Azul Esquerdo" msgid "Blue Right" msgstr "Azul Direito" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Embaixo" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "Controles Acoplados: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Quebrado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Procurar por um diretório de output" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Buffer:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Botões" @@ -927,32 +923,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "CP reg" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Engine de Emulação do CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Cache das Listas de Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"Calcula os valores de profundidade dos gráficos 3D por Pixel ao invés de por " -"vetor.\n" -"Ao contrário da Iluminação por Pixels (que é meramente uma melhoria), o " -"cálculo da Profundidade por Pixel é necessário para emular própriamente um " -"pequeno número de jogos.\n" -"\n" -"Se estiver em dúvida, deixe isto desativado." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -966,7 +945,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Cancelar" @@ -982,7 +961,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -993,7 +972,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1001,13 +980,13 @@ msgstr "" "Não é possível usar aquele arquivo como um Memory Card.\n" "Você está tentando usar o mesmo arquivo nos dois slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" "Não foi possível encontrar o Wiimote pelo bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" @@ -1022,7 +1001,7 @@ msgstr "Não é possível ler de DVD_Plugin - DVD-Interface: Erro Fatal" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Catalão" @@ -1030,24 +1009,24 @@ msgstr "Catalão" msgid "Center" msgstr "Centralizar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Mudar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Mudar &Disco..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Mudar o Disco" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Mudar Jogo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1063,12 +1042,11 @@ msgstr "Muda o sinal para o parâmetro do zFar (após a correção)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "Muda o sinal para o parâmetro do zNear (após a correção)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Mudar isso não vai ter efeito enquanto o emulador estiver rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat" @@ -1076,47 +1054,47 @@ msgstr "Chat" msgid "Cheat Code" msgstr "Códigos de Cheat" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Busca de Cheats" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Gerenciador de Cheat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Checar Integridade da Partição" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Checando Integridade..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1124,7 +1102,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1132,8 +1110,8 @@ msgstr "" "Escolher um arquivo para ser usado como apploader: (aplicável somente para " "discos construídos de diretórios)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Escolha a pasta para extrair" @@ -1147,8 +1125,8 @@ msgstr "Clássico" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Limpar" @@ -1160,22 +1138,22 @@ msgstr "" "O Client desconectou-se enquanto o jogo rodava!! O NetPlay foi desativado. " "Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Fechar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Co&nfigurar..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informação do Código" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Código:" @@ -1187,91 +1165,91 @@ msgstr "Comandos" msgid "Comment" msgstr "Comentário" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Comentário:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Comprimindo ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Configurar" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Configurar Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Configurar Controles" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Confirmar ao Parar" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Conectar Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Conectar Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Conectar Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Conectar Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Conectar Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Conectando..." @@ -1291,12 +1269,12 @@ msgstr "Converter para GCI" msgid "Copy failed" msgstr "Falha na Cópia" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Copiar para Cartão de Memória %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Núcleo" @@ -1305,7 +1283,7 @@ msgstr "Núcleo" msgid "Could not create %s" msgstr "Não pôde criar %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Não foi possível inicializar o Backend 5s. %s" @@ -1326,12 +1304,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Não foi possível reconhecer o arquivo ISO %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Não foi possível salvar %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1353,11 +1331,11 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1365,17 +1343,17 @@ msgstr "" "Não foi possível iniciar o Núcleo (core). \n" "Cheque suas configurações" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Contagem:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "País:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Criar Código AR" @@ -1384,25 +1362,7 @@ msgstr "Criar Código AR" msgid "Create new perspective" msgstr "Criar nova perspectiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Criado por KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Criado por VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Criador:" @@ -1410,11 +1370,11 @@ msgstr "Criador:" msgid "Critical" msgstr "Crítico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Cortar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1428,12 +1388,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "O diretório atual mudou de %s para %s depois do wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Hack de Projeção Customizado" @@ -1441,11 +1401,11 @@ msgstr "Hack de Projeção Customizado" msgid "Custom Projection Hack Settings" msgstr "Configurações de Hack de Projeção Customizado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Tcheco" @@ -1457,36 +1417,36 @@ msgstr "D" msgid "D-Pad" msgstr "Direcional Digital" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "Emulação HLE do DSP (rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "Recompilador LLE do DSP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1498,11 +1458,11 @@ msgstr "DVDLowRead - Erro Fatal: falha ao ler do volume" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Erro Fatal: falha ao ler do volume" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Tamanho de Arquivo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Data:" @@ -1519,11 +1479,11 @@ msgstr "Arquivos Datel Maxdrive/Pro (*.sav)" msgid "Dead Zone" msgstr "Zona Morta" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Debug" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Debugging" @@ -1531,24 +1491,24 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1557,11 +1517,11 @@ msgid "Default font" msgstr "Fonte Padrão" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Excluir" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Excluir Save" @@ -1570,11 +1530,11 @@ msgstr "Excluir Save" msgid "Delete the existing file '%s'?" msgstr "Apagar o arquivo existente '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Descrição" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detectar" @@ -1587,13 +1547,13 @@ msgstr "" "Foi detectada a tentativa de ler mais dados do DVD do que cabem no buffer de " "saída. Segurando." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1617,20 +1577,16 @@ msgstr "" "A checagem de diretório falhou\n" " e a checagem de Backup de Diretório falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Desativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Desativar Neblina" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Desativar Profundidade por Pixel" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1644,7 +1600,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1660,7 +1616,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disco" @@ -1669,11 +1625,11 @@ msgstr "Disco" msgid "Disc Read Error" msgstr "Erro na leitura do Disco" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Display" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1687,20 +1643,24 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Configurações %s Gráficas do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Web Site do Dolphin" @@ -1708,32 +1668,32 @@ msgstr "&Web Site do Dolphin" msgid "Dolphin Configuration" msgstr "Configuração do Dolphin" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Configuração de Wiimote Emulado do Dolphin" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Configuração de Wiimote Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1741,7 +1701,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1749,16 +1709,21 @@ msgstr "" "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" "clique aqui para mostrar todos os jogos..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Para Baixo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Download de Códigos (Banco de Dados WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Códigos %lu baixados. (Adicionados %lu)" @@ -1767,27 +1732,27 @@ msgstr "Códigos %lu baixados. (Adicionados %lu)" msgid "Drums" msgstr "Bateria" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Extrair Ãudio" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "Extrair Código EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Extrair Quadros" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Extrair Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1798,7 +1763,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1807,7 +1772,7 @@ msgstr "" "Extrair texturas do jogo para Usuário/Despejo/Texturas//\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1817,17 +1782,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Holandês" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Sair" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "Cópias de EFB" @@ -1848,11 +1813,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Atualizações prévias de Memória" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Editar" @@ -1860,7 +1825,7 @@ msgstr "Editar" msgid "Edit ActionReplay Code" msgstr "Editar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Editar Configuração" @@ -1868,12 +1833,12 @@ msgstr "Editar Configuração" msgid "Edit Patch" msgstr "Editar Patch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Editar perspectiva atual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Editar..." @@ -1881,7 +1846,7 @@ msgstr "Editar..." msgid "Effect" msgstr "Efeito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Frame Buffer Embutido" @@ -1889,7 +1854,7 @@ msgstr "Frame Buffer Embutido" msgid "Emu Thread already running" msgstr "Este Segmento de Emulação já está rodando" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1903,7 +1868,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Virtual." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1919,19 +1884,19 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Emular Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Estado de Emulação" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ativar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1947,72 +1912,71 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Ativar BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Ativar Cálculo de Caixas Limitadoras" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Ativar Cache" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Ativar Cheats" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Ativar Modo de Dois Núcleos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Ativar Modo de Dois Núcleos (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Ativar Hotkeys" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Ativar Idle Skipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Ativar Idle Skipping (Aumento na velocidade)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Ativar MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Ativar WideScreen" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Ativar Wireframe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2027,7 +1991,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 1x." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2035,11 +1999,11 @@ msgstr "" "Ativar acesso rápido de disco. Necessário para alguns jogos.(ON = Rapido, " "OFF = Compativel)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Ativar Paginas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2051,7 +2015,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2063,7 +2027,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2071,7 +2035,7 @@ msgstr "" "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " "Princess. Disative para QUALQUER UM outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2081,11 +2045,28 @@ msgstr "" "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " "emulado (ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2097,7 +2078,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2105,7 +2086,7 @@ msgstr "" "Ativar unidade de gerenciamento de memoria, necessário para alguns jogos. " "(ON = Compativel, OFF = Rapido)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2119,14 +2100,14 @@ msgstr "" msgid "End" msgstr "Fim" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Inglês" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "Improvisos" @@ -2144,17 +2125,17 @@ msgstr "Entry %d/%d" msgid "Entry 1/%d" msgstr "Entry 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Igual" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Erro" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema." @@ -2194,32 +2175,32 @@ msgstr "" msgid "Execute" msgstr "Executar" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Falha na Exportação" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Exportar Arquivo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Exportar Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Exportar Gravação..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Exportar todos os saves" @@ -2235,7 +2216,7 @@ msgstr "Exportar Salvar como..." msgid "Extension" msgstr "Extensão" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Frame Buffer Externo" @@ -2247,44 +2228,44 @@ msgstr "Parâmetro Extra" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Parâmetro Extra útil apenas em \"Metroid Other M\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Extrair Todos os arquivos..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Extrair Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Extrair DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Extrair diretorio..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Extrair Arquivo..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Extrair Partição..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Extraindo %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Extraindo todos os arquivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Extraindo diretorio" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Extraindo..." @@ -2292,7 +2273,7 @@ msgstr "Extraindo..." msgid "FIFO Byte" msgstr "Byte do FIFO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Player" @@ -2300,7 +2281,7 @@ msgstr "FIFO Player" msgid "FRANCE" msgstr "FRANÇA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Tamanho FST:" @@ -2308,15 +2289,15 @@ msgstr "Tamanho FST:" msgid "Failed to Connect!" msgstr "Falha ao Conectar\"" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Não foi possível Ouvir!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Falha ao dazer o download de códigos." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Falha ao extrair %s!" @@ -2434,19 +2415,19 @@ msgstr "Falha ao escrever o header para %s" msgid "Failed to write header for file %d" msgstr "Falha ao escrever o header para o arquivo %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Persa" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2454,23 +2435,23 @@ msgstr "" "Desincronização fatal. Abortando reprodução. (Erro em PlayWiimote: %u != %u, " "byte %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Player" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Informações do Arquivo" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "O arquivo não contém códigos." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Arquivo convertido para .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2487,7 +2468,7 @@ msgstr "" "O arquivo tem a extensão \"%s\"\n" "extensões válidas são (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Arquivo não reconhecido como Memory Card" @@ -2500,19 +2481,19 @@ msgstr "Arquivo não comprimido" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Achar Próximo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Achar Anterior" @@ -2520,27 +2501,27 @@ msgstr "Achar Anterior" msgid "First Block" msgstr "Primeiro Bloco" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "Corrigir Checksums" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "Forçar 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "Forçar 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Forçar Console para NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Forçar Filtro de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2553,7 +2534,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2565,7 +2546,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2601,42 +2582,42 @@ msgstr "Quadro" msgid "Frame " msgstr "Quadro" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Avançar Quadro" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Extração de Quadros usam FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Informação do Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Alcanço do Quadro" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Frame S&kipping" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Limitador de FPS:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "QUadros para Capturar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Olhar Livre" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Francês" @@ -2644,16 +2625,16 @@ msgstr "Francês" msgid "Frets" msgstr "Notas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "De" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Tela Cheia" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Resolução da Tela Cheia:" @@ -2665,7 +2646,7 @@ msgstr "Arquivo GCI(*.gci)" msgid "GCMic Configuration" msgstr "Configuração do GCMic" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GCPad" @@ -2673,27 +2654,27 @@ msgstr "GCPad" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID do jogo:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "O jogo já está rodando!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "O jogo não está rodando!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Jogo não encontrado!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Opções especificas do jogo" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Opçõesdojogo" @@ -2701,25 +2682,25 @@ msgstr "Opçõesdojogo" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "Arquivos de Save do GameCube (*.gci;*.gcs;*.sav)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Configurações do controle de Gamecube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Códigos Gecko" @@ -2736,20 +2717,20 @@ msgstr "" "processador de código nativo colocando o arquivo codehandler.bin no " "diretório Sys e reiniciando o Dolphin.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Geral" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Configurações Gerais" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Alemão" @@ -2758,19 +2739,19 @@ msgstr "Alemão" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Gráficos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Configurações Gráficas" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Maior do que" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2788,7 +2769,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Grego" @@ -2808,11 +2789,11 @@ msgstr "Verde Direito" msgid "Guitar" msgstr "Guitarra" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY foi chamado, favor reportar!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hacks" @@ -2820,7 +2801,7 @@ msgstr "Hacks" msgid "Header checksum failed" msgstr "A checagem do header falhou" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebreu" @@ -2832,7 +2813,7 @@ msgstr "Altura" msgid "Help" msgstr "Ajuda" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2853,11 +2834,11 @@ msgstr "" msgid "Hide" msgstr "Ocultar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Esconder Cursor Do Mouse" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2871,8 +2852,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Host" @@ -2880,17 +2861,17 @@ msgstr "Host" msgid "Hotkey Configuration" msgstr "Configuração de hotkey" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Hotkeys" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Húngaro" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Wiimote Hibrido" @@ -2917,7 +2898,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "Definições de IPL" @@ -2925,19 +2906,19 @@ msgstr "Definições de IPL" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Ponteiro IR" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Sensibilidade IR:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -2949,7 +2930,7 @@ msgstr "ITÃLIA" msgid "Icon" msgstr "Icone" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2957,14 +2938,14 @@ msgstr "" "Se isto for ativado, os registradores das caixas de limite serão " "atualizados. Usado pelos jogos do Paper Mario." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, " "OFF = Rápido)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2975,11 +2956,11 @@ msgstr "" "consertar cortes no áudio mas pode causar ruído constante dependendo do " "jogo)." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Ignorar Mudanças de Formato" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2993,7 +2974,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3007,7 +2988,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Importar Save" @@ -3015,7 +2996,7 @@ msgstr "Importar Save" msgid "Import failed, try again?" msgstr "Falha na Importação, tentar novamente?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3023,11 +3004,11 @@ msgstr "" "O arquivo importado tem a extensão gsc\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "O arquivo importado tem comprimento inválido" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3035,7 +3016,7 @@ msgstr "" "O arquivo importado tem a extensão sav\n" "mas não tem um header correto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3047,16 +3028,16 @@ msgstr "" "\n" "Se estiver em dúvida, deixe esta opção desativada." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Funciona" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "In-Game" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info" @@ -3064,7 +3045,7 @@ msgstr "Info" msgid "Information" msgstr "Informação" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "Entrada" @@ -3076,7 +3057,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3084,11 +3065,11 @@ msgstr "Insira cartão SD" msgid "Insert name here.." msgstr "Insira nome aqui.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3099,23 +3080,23 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "Instalando WAD..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Erro na Checagem de Integridade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Checagem de Integridade completa" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Checagem de Integridade completa. Nenhum erro foi encontrado." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3124,11 +3105,11 @@ msgstr "" "Checagem de Integridade para a partição %d falhou. Sua cópia deve estar " "corrompida ou foi incorretamente corrigido (patch)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Opções de interface" @@ -3149,15 +3130,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "Erro Interno do LZO - lzo_init() falhou" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "Resolução Interna:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Interpretador (MUITO lento)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Intro" @@ -3166,11 +3147,11 @@ msgstr "Intro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Tamanho Inválido(%x) ou palavra Mágica(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Valor Inválido!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Bat.map ou entrada de Diretório inválidas" @@ -3194,7 +3175,7 @@ msgstr "" "%s\n" "Você pode precisar refazer o dump deste jogo." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Arquivo de gravação inválido" @@ -3202,23 +3183,23 @@ msgstr "Arquivo de gravação inválido" msgid "Invalid search parameters (no object selected)" msgstr "Parâmetros de busca inválidos (nenhum objeto selecionado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "String de busca inválida (não foi possível converter para número)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" "String de busca inválida (apenas comprimentos correspondentes de string são " "suportados)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Estado Salvo Inválido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italiano" @@ -3226,16 +3207,16 @@ msgstr "Italiano" msgid "JAPAN" msgstr "JAPÃO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT recompilador (recomendado)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL recompilador experimental" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonês" @@ -3243,7 +3224,7 @@ msgstr "Japonês" msgid "KOREA" msgstr "CORÉIA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3253,17 +3234,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Manter Janela no Topo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Chave" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Coreano" @@ -3281,19 +3262,23 @@ msgstr "Botão L" msgid "L-Analog" msgstr "L-Analógico" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Linguagem:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Último State sobrescrito" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Último State Salvo" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3303,8 +3288,8 @@ msgstr "Esquerda" msgid "Left Stick" msgstr "Analógico Esquerdo" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3312,7 +3297,7 @@ msgstr "" "Clique com o botão esquerdo para detectar atalhos de teclado.\n" "Pressione Enter para deixar vazio." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3322,7 +3307,7 @@ msgstr "" "Clique do meio para limpar.\n" "Clique direito para mais opções." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3330,76 +3315,76 @@ msgstr "" "Clique da Esquerda/Direita para mais opções.\n" "Clique do meio para limpar." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Menor que" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "Limitar por FPS" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Carregar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Carregar Texturas Personalizadas" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Carregar Estado do Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Carregar Estado do Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Carregar Estado do Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Carregar Estado do Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Carregar Estado do Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Carregar Estado do Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Carregar Estado do Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Carregar Estado do Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3414,31 +3399,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Carregar valores predefinidos dos padrões de hacks disponíveis." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Local" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Separar tarefas em núcleos" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Log" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "Configuração do Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "Registrar FPS em arquivo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "Tipo de Log" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3450,12 +3431,12 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "Resposta do Logger" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Logando" @@ -3476,7 +3457,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3490,24 +3471,24 @@ msgstr "Arquivos de Gameshark MadCatz(*.gcs)" msgid "Main Stick" msgstr "Analógico Principal" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID da fabricante:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Fabricante:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "Máximo" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "O Memory Card já tem um arquivo de salva deste título" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "O Memory Card já está aberto" @@ -3516,7 +3497,7 @@ msgid "Memory Byte" msgstr "Byte de Memória" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Cartão de memoria" @@ -3553,20 +3534,20 @@ msgstr "O tamanho do arquivo do Memory Card é diferente do tamanho do header" msgid "Menu" msgstr "Menu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Microfone" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "Mínimo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Opções diversas" @@ -3575,7 +3556,7 @@ msgstr "Opções diversas" msgid "Modifier" msgstr "Modificador" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3601,7 +3582,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3623,7 +3604,7 @@ msgstr "" msgid "Multiply" msgstr "Multiplicar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3723,16 +3704,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Cima" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Nome:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Nome:" @@ -3741,20 +3722,20 @@ msgstr "Nome:" msgid "Native GCI files(*.gci)" msgstr "Arquivos GCI nativos(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Nova Busca" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Próxima Página" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Próxima Busca" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Nick:" @@ -3762,7 +3743,7 @@ msgstr "Nick:" msgid "No Country (SDK)" msgstr "Sem região (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Sem ISOs ou WADs achados" @@ -3784,7 +3765,7 @@ msgstr "Sem colocação" msgid "No file loaded" msgstr "Nenhum arquivo carregado" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "Não há entradas de índice de diretório livres" @@ -3797,33 +3778,33 @@ msgstr "Nenhum arquivo gravado" msgid "No save folder found for title %s" msgstr "Nenhuma pasta de salva encontrada para o título %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Nenhum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norueguês Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Não igual" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Indefinido" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notas" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notas:" @@ -3832,7 +3813,7 @@ msgstr "Notas:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Noticía" @@ -3840,16 +3821,16 @@ msgstr "Noticía" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Números dos códigos:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Aceleração do Nunchuk" @@ -3857,11 +3838,11 @@ msgstr "Aceleração do Nunchuk" msgid "Object" msgstr "Objeto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Alcance do Objeto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Desligado" @@ -3869,52 +3850,52 @@ msgstr "Desligado" msgid "Offset:" msgstr "Offset:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "Mostrar Mensagens na Tela" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Apenas %d blocos disponíveis" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Abrir Arquivo..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Não é possível criar contexto para o dispositivo %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Não foi possível encontrar dispositivos de som" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: não foi possível abrir o dispositivo %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "Decodificador de Texturas OpenCL" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" @@ -3927,7 +3908,7 @@ msgstr "Opções" msgid "Orange" msgstr "Laranja" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3937,8 +3918,8 @@ msgstr "" "Clique com o botão direito e exporte todos os salvas,\n" "e importe-os para um novo Memory Card\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "Outros" @@ -3950,19 +3931,19 @@ msgstr "" "Outro Client desconectou enquanto o jogo rodava!! O Netplay foi " "desabilitado. Você deve parar o jogo manualmente." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Saída" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "R&eproduzir gravação..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Controle" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Controle" @@ -3978,7 +3959,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Parear" @@ -3990,34 +3971,34 @@ msgstr "Parágrafo" msgid "Parameters" msgstr "Parâmetros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Partição %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Patches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "Pausar no fim do vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Iluminação Por Pixels" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfeito" @@ -4026,36 +4007,36 @@ msgstr "Perfeito" msgid "Perspective %d" msgstr "Perspectiva %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Executar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Reproduzir Gravação" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Executar/Pausar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Jogável" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Opções de Reprodução" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4067,54 +4048,54 @@ msgstr "Favor criar uma perspectiva antes de salvar" msgid "Plus-Minus" msgstr "Positivo-Negativo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Porta 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Porta:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Português" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Português (Brasil)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u" @@ -4127,11 +4108,11 @@ msgstr "Predefinidos:" msgid "Prev Page" msgstr "Pág. Anterior" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Página Anterior" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Valor anterior" @@ -4139,7 +4120,7 @@ msgstr "Valor anterior" msgid "Print" msgstr "Imprimir" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Perfil" @@ -4147,7 +4128,7 @@ msgstr "Perfil" msgid "Properties" msgstr "Propriedades" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "Limpar o Cache" @@ -4155,8 +4136,8 @@ msgstr "Limpar o Cache" msgid "Question" msgstr "Questão" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Sair" @@ -4174,7 +4155,7 @@ msgstr "Botão R" msgid "R-Analog" msgstr "R-Analógico" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4182,46 +4163,46 @@ msgstr "RAM" msgid "RUSSIA" msgstr "Russia" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Alcance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Modo Somente Leitura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Wiimote Real" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Wiimotes Reais" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Confirmação de reconexão do Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Reconectar Wiimote ao carregar Estado Salvo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Gravar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Informações de Gravação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Opções de Gravação" @@ -4237,7 +4218,7 @@ msgstr "Vermelho Esquerdo" msgid "Red Right" msgstr "Vermelho Direito" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4251,29 +4232,29 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Atualizar" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Atualizar Lista" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Atualizar a lista de jogos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Remover" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4283,17 +4264,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Renderizar na Janela Principal" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reiniciar" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Resultados" @@ -4315,29 +4296,25 @@ msgstr "Analógico Direito" msgid "Rumble" msgstr "Vibração" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Executar o DSP LLE em um segmento dedicado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Sal&var Instante Atual" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Seguro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Taxa de Amostragem:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Salvar" @@ -4345,90 +4322,90 @@ msgstr "Salvar" msgid "Save GCI as..." msgstr "Salvar GCI como..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Salvar Instante Atual no Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Salvar Instante Atual no Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Salvar Instante Atual no Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Salvar Instante Atual no Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Salvar Instante Atual no Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Salvar Instante Atual no Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Salvar Instante Atual no Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Salvar Instante Atual no Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Salvar Instante Atual..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Escaneando..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "ScrShot" @@ -4436,23 +4413,23 @@ msgstr "ScrShot" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Busca" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Pesquisar Objeto atual" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Buscar valor hexadecimal:" @@ -4463,20 +4440,20 @@ msgid "Section %s not found in SYSCONF" msgstr "A seção %s não foi encontrada no SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Selecionar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4493,23 +4470,23 @@ msgstr "Selecione um arquivo de jogo salvo para importar" msgid "Select floating windows" msgstr "Selecionar Janelas flutuantes" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Selecione um instante para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Selecione um instante para salvar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4527,11 +4504,16 @@ msgstr "" "\n" "Se estiver em dúvida, selecione Automático." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "O arquivo especificado \"%s\" não existe" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Fonte Selecionada" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4547,7 +4529,7 @@ msgstr "" "Se estiver em dúvida, use a resolução da sua Ãrea de Trabalho.\n" "Se ainda estiver em dúvida, use a maior disponível.." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4563,11 +4545,11 @@ msgstr "" "\n" "Se estiver em dúvida, use o Direct3D 9." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Enviar" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Posição da Sensor Bar:" @@ -4575,26 +4557,26 @@ msgstr "Posição da Sensor Bar:" msgid "Separator" msgstr "Separador" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sérvio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Porta Serial 1 - Esta é a porta usada por dispositivos como o adaptador de " "rede" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Definir como Memory Card padrão%c" @@ -4605,11 +4587,17 @@ msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" "SetARCode_IsActive: O índice é maior que a lista de códigos AR de tamanho %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Configurações..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Arquivo de configuração não encontrado" @@ -4617,7 +4605,7 @@ msgstr "SetupWiiMem: Arquivo de configuração não encontrado" msgid "Shake" msgstr "Sacudir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Nome Curto:" @@ -4625,105 +4613,105 @@ msgstr "Nome Curto:" msgid "Shoulder Buttons" msgstr "Botões Superiores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Mostrar &Console" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "Mostrar Janela de &Log" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Mostrar barra de &Status" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Show Barra de &Ferramentas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Mostrar Drives" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "Mostrar Regiões de Cópia do EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Mostrar FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Mostrar França" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "Mostrar GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Mostrar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Mostrar Itália" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Mostrar JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Mostrar Coréia" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Mostrar Idioma:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "Mostrar &Configuração de Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "Mostrar PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Mostrar Plataformas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Mostrar Regiões" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Mostrar Estatísticas" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Mostrar Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Mostrar EUA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "Mostrar Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Mostrar Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Mostrar uma janela de confirmação antes de parar um jogo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4731,15 +4719,15 @@ msgstr "" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Mostrar o primeiro bloco" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "Mostar o contador de lag" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " @@ -4749,23 +4737,23 @@ msgstr "" "Essas mensagens incluem acesso ao Memory Card, informações sobre o backend " "de vídeo e a CPU, e limpeza do cache do JIT." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Mostrar blocos de save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Mostar comentário do save" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Mostrar ícone do salva" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Mostrar título do salva" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4777,11 +4765,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Mostra desconhecido" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4795,27 +4783,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "Pular a BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "Não permite o acesso da CPU ao EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4827,7 +4815,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4844,17 +4832,17 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4862,7 +4850,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Captura de tela" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Renderizador por Software" @@ -4878,11 +4866,11 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Configurações de Som" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "O Backend de Som %s não é válido." @@ -4896,17 +4884,17 @@ msgstr "Falha na criação do buffer de som: %s" msgid "Space" msgstr "Barra de Espaço" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Espanhol" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Volume do Auto-Falante:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4926,7 +4914,7 @@ msgstr "" "\n" "Se estiver em dúvida, selecione 640x528." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Aumentar a velocidade de transferência do disco" @@ -4934,51 +4922,55 @@ msgstr "Aumentar a velocidade de transferência do disco" msgid "Square Stick" msgstr "Analógico Quadrado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Controle Padrão" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Iniciar NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Iniciar Ca&ptura" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Iniciar Captura" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Status" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Estados Salvos" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Analógico" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Parar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4992,7 +4984,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto ativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Redimensionar para a Tela" @@ -5017,8 +5009,8 @@ msgstr "Arquivos de salva importados com sucesso" msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Idioma do Systema:" @@ -5026,7 +5018,7 @@ msgstr "Idioma do Systema:" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "Input do TAS" @@ -5047,30 +5039,30 @@ msgstr "Esquerda da Mesa" msgid "Table Right" msgstr "Direita da Mesa" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Capturar Tela" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Testar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Textura" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Cache de Texturas" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Sobreposição Formato das Texturas" @@ -5086,13 +5078,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5115,7 +5107,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "O Arquivo %s já foi aberto, o header do arquivo não será escrito." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "O arquivo que você especificou (%s) não existe" @@ -5132,7 +5124,7 @@ msgstr "O nome não pode conter o caracter ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "O código AR resultante da derciptação não contém nenhuma linha." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5144,12 +5136,12 @@ msgstr "" "\n" "Se estiver em dúvida, use o o valor mais à direita." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" "O Salva que você está tentando copiar tem um tamanho de arquivo inválido" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5182,14 +5174,11 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "A seleção do tema deu errado" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5198,7 +5187,7 @@ msgstr "" "É necessário um ticket para 00000001/00000002. O seu Dump do NAND está " "provavelmente incompleto." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5214,12 +5203,12 @@ msgstr "" "Este simulador de Action Replay não suporta códigos que modifiquem o Action " "Replay em si." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5238,7 +5227,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5250,7 +5239,7 @@ msgstr "" "Dá um grande aumento de velocidade para PCs com mais de um núcleo, mas " "também pode causar travamentos/erros ocasionais." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .INI" @@ -5264,35 +5253,35 @@ msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Título" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Para" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Ligar/Desligar Todos os Logs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Ir para Tela Cheia" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Topo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Houve a tentativa de carregar um tipo de arquivo desconhecido." @@ -5312,7 +5301,7 @@ msgstr "" "Tentando ler de um SYSCONF inválido\n" "Os Bt IDs do Wiimote não estão disponíveis" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turco" @@ -5324,12 +5313,12 @@ msgstr "Turntable" msgid "Type" msgstr "Tipo" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Porta UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5366,12 +5355,12 @@ msgstr "" "corretamente.\n" "Você gostaria de ignorar esta linha e continuar a análise?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "%i indefinido" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Desfazer carregamento de estado" @@ -5379,7 +5368,7 @@ msgstr "Desfazer carregamento de estado" msgid "Unexpected 0x80 call? Aborting..." msgstr "Chamada 0x80 inesperada? Abortando..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Desconhecido" @@ -5409,8 +5398,8 @@ msgstr "" msgid "Up" msgstr "Para cima" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Atualizar" @@ -5418,23 +5407,23 @@ msgstr "Atualizar" msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Usar Tela Cheia" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "Usar Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Usar Panic Handlers" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5447,7 +5436,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5462,15 +5451,15 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Utilitário" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Valor" @@ -5478,23 +5467,23 @@ msgstr "Valor" msgid "Value:" msgstr "Valor:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "Valor:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Verbosidade" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Vídeo" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Volume" @@ -5508,7 +5497,7 @@ msgstr "Falha na instalação da WAD: Erro na criação de %s" msgid "WAD installation failed: error creating ticket" msgstr "Falha na instalação da WAD: Erro na criação do ticket" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5521,16 +5510,16 @@ msgstr "" "Se estiver em dúvida, deixe isto desativado." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Aviso" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Aviso - Inicializando DOL no modo de console errado!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Aviso - Inicializando ELF no modo de console errado!" @@ -5563,7 +5552,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5574,7 +5563,7 @@ msgstr "" "(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, " "ou carregar este instante com o modo somente-leitura desligado." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5586,7 +5575,7 @@ msgstr "" "este instante com o modo somente-leitura desligado. Caso contrário você " "provavelmente terá uma desincronização." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5621,7 +5610,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - Arquivo não aberto." @@ -5629,7 +5618,7 @@ msgstr "WaveFileWriter - Arquivo não aberto." msgid "Whammy" msgstr "Distorção" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "Hack de Widescreen" @@ -5637,23 +5626,23 @@ msgstr "Hack de Widescreen" msgid "Width" msgstr "Largura" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Save do Wii (*.bin)|*.bin" @@ -5661,17 +5650,17 @@ msgstr "Arquivos de Save do Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Não foi possível ler o arquivo" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5684,19 +5673,19 @@ msgstr "" "ou talvez tenha sido pelo tempo parado ou por outra razão.\n" "Você quer reconectar imediatamente?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote Conectado" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Motor do Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Configurações do Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimotes" @@ -5716,26 +5705,26 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Funcionando..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Escrever no Console" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Escrever no Debugger" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Escrever para o Arquivo" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Escrever na Janela" @@ -5775,23 +5764,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Você não pode fechar painéis que têm páginas neles." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Você deve escolher um jogo!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Você deve digitar um nome!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -5814,7 +5803,7 @@ msgstr "" "Ele deveria ter 0x%04x (mas tem 0x%04llx)\n" "Você gostaria de gerar um novo?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Hack do ZTB" @@ -5827,12 +5816,12 @@ msgstr "Código Zero 3 não é suportado" msgid "Zero code unknown to dolphin: %08x" msgstr "Código Zero desconhecido pelo Dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ Aguardando ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5848,7 +5837,7 @@ msgstr "" msgid "[Custom]" msgstr "[Personalizado]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5867,7 +5856,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5882,11 +5871,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5903,7 +5892,7 @@ msgstr "Falha ao ler dados do arquivo: %s" msgid "failed to read header" msgstr "Falha ao ler o header" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Lendo Opcode de %x. Favor reportar." @@ -5924,7 +5913,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retornou -1 ao rodar o aplicativo!" @@ -5936,13 +5925,16 @@ msgstr "Correção do zFar:" msgid "zNear Correction: " msgstr "Correção do zNear:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "&Quadro a Quadro" @@ -6007,6 +5999,22 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "Calcula os valores de profundidade dos gráficos 3D por Pixel ao invés de " +#~ "por vetor.\n" +#~ "Ao contrário da Iluminação por Pixels (que é meramente uma melhoria), o " +#~ "cálculo da Profundidade por Pixel é necessário para emular própriamente " +#~ "um pequeno número de jogos.\n" +#~ "\n" +#~ "Se estiver em dúvida, deixe isto desativado." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6047,6 +6055,21 @@ msgstr "| OR" #~ msgid "Could not get info about plugin %s" #~ msgstr "Não pôde criar %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Criado por KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Criado por Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Criado por VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "Criado por black_rider e publicado no ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "Cache Dlist" @@ -6056,6 +6079,9 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "Desativar Iluminação" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Desativar Profundidade por Pixel" + #~ msgid "Disable Textures" #~ msgstr "Desativar Texturas" @@ -6279,6 +6305,9 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Carrega o arquivo especificado (DOL,ELF,GCM,ISO,WAD)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Separar tarefas em núcleos" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Emulação do Audio em Low level (LLE) ou high level (HLE)" @@ -6348,6 +6377,9 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "Running script...\n" +#~ msgid "Sample Rate:" +#~ msgstr "Taxa de Amostragem:" + #~ msgid "Scale:" #~ msgstr "Escala:" @@ -6454,6 +6486,9 @@ msgstr "| OR" #~ msgid "The file " #~ msgstr "O arquivo" +#~ msgid "Theme selection went wrong" +#~ msgstr "A seleção do tema deu errado" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index 3418effb66..df1eb461af 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-01-20 14:40+0300\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" "Language: Russian\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(Ñлишком много)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " Игра : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 #, fuzzy msgid "! NOT" msgstr "! NOT" @@ -56,14 +56,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sКопировать%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Гц" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "Отключен" @@ -155,150 +148,150 @@ msgstr "%sИмпортировать GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%d Ñвободных блоков; %d Ñвободных запиÑей каталогов" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 #, fuzzy msgid "&& AND" msgstr "&& AND" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&О программе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&ЗапуÑтить игру Ñ DVD-диÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Выбрать папку Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Менеджер &читов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&ЭмулÑциÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Файл" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 #, fuzzy msgid "&Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Опции видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Помощь" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 #, fuzzy msgid "&Hotkey Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Менеджер карт памÑти (GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Па&мÑÑ‚ÑŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Выбор &файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Опции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Пауза" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&РегиÑтры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&СброÑить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "З&вук" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&ОÑтановить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&ИнÑтрументы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Вид" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -319,7 +312,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(отключен)" @@ -327,19 +320,19 @@ msgstr "(отключен)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 бит" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 бита" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 бит" @@ -347,20 +340,20 @@ msgstr "8 бит" msgid "" msgstr "<Введите название>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<Ðичего>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<Ðажмите кнопку>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<СиÑтемный>" @@ -368,23 +361,24 @@ msgstr "<СиÑтемный>" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Окно Ñетевой игры уже открыто!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Игра не запущена." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -420,13 +414,13 @@ msgstr "" "\n" "Ð”Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸Ð³Ñ€Ñ‹ вам необходимо открыть указанный порт на вашем роутере!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR-коды" @@ -434,19 +428,19 @@ msgstr "AR-коды" msgid "About Dolphin" msgstr "Об ÑмулÑторе Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -455,8 +449,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "ДейÑтвие" @@ -478,7 +472,7 @@ msgstr "" "Ошибка ActionReplay: неверный размер (%08x : Ð°Ð´Ñ€ÐµÑ = %08x) в добавлÑемом " "коде (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -499,7 +493,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -507,7 +501,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -515,27 +510,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Ðдаптер:" @@ -544,11 +539,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Добавление патча" @@ -556,13 +551,13 @@ msgstr "Добавление патча" msgid "Add new pane" msgstr "Добавить панель" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Добавить..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ÐÐ´Ñ€ÐµÑ :" @@ -588,50 +583,50 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "РаÑширенные наÑтройки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Ð’Ñе файлы (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -642,20 +637,20 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "Сглаживание:" @@ -667,31 +662,31 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Загрузчик:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Применить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -699,12 +694,12 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -712,12 +707,12 @@ msgstr "Соотношение Ñторон:" msgid "At least one pane must remain open." msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" @@ -726,26 +721,26 @@ msgstr "СиÑтема вывода" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва вывода звука.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Ðвто" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "Разрешение оконного режима" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -768,13 +763,13 @@ msgstr "&РегиÑтры" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "СиÑтема вывода" @@ -793,15 +788,15 @@ msgid "Bad File Header" msgstr "Ðеверный заголовок файла" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Логотип" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Данные логотипа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Логотип:" @@ -809,11 +804,11 @@ msgstr "Логотип:" msgid "Bar" msgstr "Панель" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "ОÑновные" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "ОÑновные наÑтройки" @@ -841,42 +836,42 @@ msgstr "СинÑÑ Ñлева" msgid "Blue Right" msgstr "СинÑÑ Ñправа" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Ñнизу" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ðе работает" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Обзор" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Буфер:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Кнопки" @@ -897,25 +892,15 @@ msgstr "" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -924,7 +909,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Отмена" @@ -940,7 +925,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -950,7 +935,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -958,12 +943,12 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по адреÑу: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Ðе получаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ WiiMote по деÑкриптору %02x" @@ -977,7 +962,7 @@ msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· DVD_Plugin - DVD-Interface: Критич msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -985,25 +970,25 @@ msgstr "" msgid "Center" msgstr "Центр" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Сменить" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Сменить &диÑк..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 #, fuzzy msgid "Change Disc" msgstr "Сменить &диÑк..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Сменить игру" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1019,13 +1004,12 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции вÑтупÑÑ‚ в Ñилу только поÑле перезапуÑка ÑмулÑтора." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Чат" @@ -1033,49 +1017,49 @@ msgstr "Чат" msgid "Cheat Code" msgstr "Чит-код" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "ПоиÑк кодов" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Менеджер чит-кодов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 #, fuzzy msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1083,14 +1067,14 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Выберите папку Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²" @@ -1104,8 +1088,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "ОчиÑтить" @@ -1117,22 +1101,22 @@ msgstr "" "Клиент отÑоединилÑÑ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹! Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð° оÑтановлена. Ð’Ñ‹ должны " "оÑтановить игру." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Закрыть" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "&ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Код:" @@ -1144,92 +1128,92 @@ msgstr "" msgid "Comment" msgstr "Комментарий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Сжатие образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "ÐаÑтройки" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "ÐаÑтройка" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "ÐаÑтройка управлениÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "ÐаÑтроить контроллеры" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "Потверждение при оÑтановке ÑмулÑции" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Подключить Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Подключить Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Подключить Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Подключить Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Подключить Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Подключение..." @@ -1249,12 +1233,12 @@ msgstr "Конвертировать в GCI" msgid "Copy failed" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Копировать на карту памÑти %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Ядро" @@ -1263,7 +1247,7 @@ msgstr "Ядро" msgid "Could not create %s" msgstr "Ðе удалоÑÑŒ Ñоздать %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1284,12 +1268,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Ðе удалоÑÑŒ определить ISO образ %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "Ðе удалоÑÑŒ Ñохранить %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1307,27 +1291,27 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Счетчик:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Страна:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Создать новый AR-код" @@ -1336,26 +1320,7 @@ msgstr "Создать новый AR-код" msgid "Create new perspective" msgstr "Создать новую точку обозрениÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Стиль от KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Стиль от VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Создатель:" @@ -1363,11 +1328,11 @@ msgstr "Создатель:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "обрезать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1378,12 +1343,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° ÑменилаÑÑŒ Ñ %s на %s поÑле wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 #, fuzzy msgid "Custom Projection Hack" msgstr "Projection-хак: " @@ -1393,11 +1358,11 @@ msgstr "Projection-хак: " msgid "Custom Projection Hack Settings" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" @@ -1409,39 +1374,39 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 #, fuzzy msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD-диÑк:" @@ -1453,11 +1418,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Размер данных" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Дата:" @@ -1474,11 +1439,11 @@ msgstr "Файлы Datel MaxDrive/Pro (*.sav)" msgid "Dead Zone" msgstr "ÐœÐµÑ€Ñ‚Ð²Ð°Ñ Ð·Ð¾Ð½Ð°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Отладка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "Отладка" @@ -1487,24 +1452,24 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1513,11 +1478,11 @@ msgid "Default font" msgstr "Шрифт по умолчанию" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Удалить Ñохранение" @@ -1526,12 +1491,12 @@ msgstr "Удалить Ñохранение" msgid "Delete the existing file '%s'?" msgstr "Удалить ÑущеÑтвующий файл '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "ВопроÑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Определить" @@ -1542,13 +1507,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1570,22 +1535,17 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Отключить туман" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "Глубина пикÑелÑ" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1594,7 +1554,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1604,7 +1564,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "ДиÑк" @@ -1613,11 +1573,11 @@ msgstr "ДиÑк" msgid "Disc Read Error" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð¸Ñка" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Изображение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1628,20 +1588,24 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "ÐаÑтройки графики %s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "&Веб-Ñайт ÑмулÑтора" @@ -1649,33 +1613,33 @@ msgstr "&Веб-Ñайт ÑмулÑтора" msgid "Dolphin Configuration" msgstr "ÐаÑтройки ÑмулÑции" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "ÐаÑтройки Ñмулируемого Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "ÐаÑтройка Wiimote" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1683,7 +1647,7 @@ msgstr "" "Dolphin не нашел образов игр GC/Wii. Щелкните дважды по Ñтой надпиÑи, чтобы " "указать путь..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1691,16 +1655,21 @@ msgstr "" "Dolphin наÑтроен на Ñкрытие вÑех игр. Кликните здеÑÑŒ два раза, чтобы " "показать игры..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "Вниз" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Скачать готовые коды (база WiiRD)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "Скачано %lu кодов. (добавлено %lu)" @@ -1709,34 +1678,34 @@ msgstr "Скачано %lu кодов. (добавлено %lu)" msgid "Drums" msgstr "Барабаны" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1744,25 +1713,25 @@ msgid "" "If unsure, leave this unchecked." msgstr "СохранÑет текÑтуры игры в User/Dump/Textures// " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 #, fuzzy msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "&Закрыть" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "Регионы копии EFB" @@ -1783,11 +1752,11 @@ msgstr "" msgid "EUROPE" msgstr "ЕВРОПÐ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Изменить" @@ -1795,7 +1764,7 @@ msgstr "Изменить" msgid "Edit ActionReplay Code" msgstr "Изменить код ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Править вручную" @@ -1803,12 +1772,12 @@ msgstr "Править вручную" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Изменить точку" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Изменить..." @@ -1816,7 +1785,7 @@ msgstr "Изменить..." msgid "Effect" msgstr "Эффект" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1824,7 +1793,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1833,7 +1802,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1843,19 +1812,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Эмулируемый Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "КачеÑтво ÑмулÑции:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Включить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1865,74 +1834,73 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "Включить BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "кÑшировать" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Включить чит-коды" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Включить DualCore-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Включить DualCore-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Включить горÑчие клавиши" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "Включить IdleSkipping-режим" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "Включить IdleSkipping-режим (уÑкорение)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "Включить MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "Включить широкий Ñкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "Включить ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1945,7 +1913,7 @@ msgstr "" "Повышает визуальное качеÑтво текÑтур, находÑщихÑÑ Ð¿Ð¾Ð´ наклоном\n" "к углу обзора." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -1953,11 +1921,11 @@ msgstr "" "Ðктивирует режим быÑтрого доÑтуп к диÑку, необходим Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(отключите Ð´Ð»Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ ÑовмеÑтимоÑти)." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1965,7 +1933,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1973,7 +1941,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1981,7 +1949,7 @@ msgstr "" "УÑкорÑет игру The Legend of Zelda: Twilight Princess. Ð”Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕÐ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -1990,12 +1958,29 @@ msgstr "" "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " "функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Enables Custom Projection Hack" msgstr "Projection-хак: " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2003,7 +1988,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2011,7 +1996,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2023,15 +2008,15 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 #, fuzzy msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "УлучшениÑ" @@ -2049,17 +2034,17 @@ msgstr "ЗапиÑÑŒ %d/%d" msgid "Entry 1/%d" msgstr "ЗапиÑÑŒ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "Равно" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Ошибки" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Ошибка загрузки выбранного Ñзыка. ВозвращаемÑÑ Ðº Ñтандартному." @@ -2097,34 +2082,34 @@ msgstr "" msgid "Execute" msgstr "Execute" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 #, fuzzy msgid "Export Failed" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "ЭкÑпортирование файла" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 #, fuzzy msgid "Export Recording" msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "ЭкÑпортировать вÑе ÑохранениÑ" @@ -2141,7 +2126,7 @@ msgstr "&ЭкÑпортировать Ñохранение как..." msgid "Extension" msgstr "РаÑширение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2153,44 +2138,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Извлечь вÑе файлы..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Извлечь apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "Извлечь DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "ИзвлеÑÑŒ папку..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Извлечь файл..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Извлечь раздел..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "Извлечение %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Извлечение вÑех файлов" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Извлечение папки" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "Подождите..." @@ -2198,7 +2183,7 @@ msgstr "Подождите..." msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2206,7 +2191,7 @@ msgstr "" msgid "FRANCE" msgstr "ФРÐÐЦИЯ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "Размер ТФС:" @@ -2214,15 +2199,15 @@ msgstr "Размер ТФС:" msgid "Failed to Connect!" msgstr "Ошибка подключаниÑ!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Ошибка ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "Ошибка Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð² %s!" @@ -2320,42 +2305,42 @@ msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" msgid "Failed to write header for file %d" msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ коде" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Файл не Ñодержит кодов." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Файл конвертирован в .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2372,7 +2357,7 @@ msgstr "" "Файл имеет раÑширение \"%s\"\n" "допуÑтимые раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2385,19 +2370,19 @@ msgstr "Файл не Ñжат" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2405,29 +2390,29 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "ИÑправить контрольную Ñумму" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "УÑтановить регион конÑоли как NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "Включить фильтрацию" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2435,7 +2420,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2443,7 +2428,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2478,45 +2463,45 @@ msgstr "Лимит кадров:" msgid "Frame " msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 #, fuzzy msgid "Frame Advance" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "РаÑширенные" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "&ПропуÑк кадров" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Свободный обзор" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 #, fuzzy msgid "French" msgstr "French" @@ -2525,16 +2510,16 @@ msgstr "French" msgid "Frets" msgstr "Лады" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "ПолнЭкран" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Разрешение полноÑкранного режима:" @@ -2548,7 +2533,7 @@ msgstr "Файл GCI(*.gci)" msgid "GCMic Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "ДжойÑтик" @@ -2556,27 +2541,27 @@ msgstr "ДжойÑтик" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "ID игры:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Игра уже запущена!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Игра не запущена!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Игра не найдена!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "ПерÑональные наÑтройки игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "ÐаÑтройки игры" @@ -2584,26 +2569,26 @@ msgstr "ÐаÑтройки игры" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 #, fuzzy msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "ÐаÑтройка контроллера GameCube" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko-коды" @@ -2616,21 +2601,21 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Общие" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 #, fuzzy msgid "German" msgstr "German" @@ -2640,19 +2625,19 @@ msgstr "German" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Видео" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "ÐаÑтройка видео" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Больше чем" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2663,7 +2648,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 #, fuzzy msgid "Greek" msgstr "Greek" @@ -2684,11 +2669,11 @@ msgstr "Ð—ÐµÐ»ÐµÐ½Ð°Ñ Ñправа" msgid "Guitar" msgstr "Гитара" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "Вызван HCI_CMD_INQUIRY, пожалуйÑта Ñообщите!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2696,7 +2681,7 @@ msgstr "" msgid "Header checksum failed" msgstr "Ошибка контрольной Ñуммы заголовка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 #, fuzzy msgid "Hebrew" msgstr "Hebrew" @@ -2709,7 +2694,7 @@ msgstr "Ð’Ñ‹Ñота" msgid "Help" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2730,11 +2715,11 @@ msgstr "" msgid "Hide" msgstr "СпрÑтать" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Скрывать курÑор мыши" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2748,8 +2733,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Создать" @@ -2757,18 +2742,18 @@ msgstr "Создать" msgid "Hotkey Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "Клавиши" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 #, fuzzy msgid "Hungarian" msgstr "Hungarian" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Гибридный Wiimote" @@ -2794,7 +2779,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" @@ -2802,19 +2787,19 @@ msgstr "ÐаÑтройки конÑоли (IPL)" msgid "IR" msgstr "ИК" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "ИК указатель" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" @@ -2826,13 +2811,13 @@ msgstr "ИТÐЛИЯ" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 #, fuzzy msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" @@ -2840,7 +2825,7 @@ msgstr "" "Ðктивирует уÑтройÑтво ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñтью, требуетÑÑ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… игр " "(Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð²Ñ‹ÑˆÐ°ÐµÑ‚ ÑовмеÑтимоÑÑ‚ÑŒ, Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ - ÑкороÑÑ‚ÑŒ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2853,12 +2838,12 @@ msgstr "" "Throttle\n" "в опциÑÑ… аудиоплагина." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "Эмулировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2867,7 +2852,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2876,7 +2861,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Импортировать Ñохранение" @@ -2884,7 +2869,7 @@ msgstr "Импортировать Ñохранение" msgid "Import failed, try again?" msgstr "Ошибка импорта, попробовать еще раз?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2892,11 +2877,11 @@ msgstr "" "Импортированный файл имеет раÑширение gsc\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Импортиванный неверного размера" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2904,7 +2889,7 @@ msgstr "" "Импортированный файл имеет раÑширение sav\n" "но Ñодержит неверный заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2915,16 +2900,16 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Почти играбельна" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ИнформациÑ" @@ -2932,7 +2917,7 @@ msgstr "ИнформациÑ" msgid "Information" msgstr "ИнформациÑ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2944,7 +2929,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -2952,12 +2937,12 @@ msgstr "Ð’Ñтавить SD-карту" msgid "Insert name here.." msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -2967,36 +2952,36 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" @@ -3017,16 +3002,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "ВнутренÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ° LZO - ошибка в lzo_init()" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Разрешение полноÑкранного режима:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "ЗаÑтавка" @@ -3035,11 +3020,11 @@ msgstr "ЗаÑтавка" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Ðеверное значение!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -3063,7 +3048,7 @@ msgstr "" "%s\n" " Лучше Ñделать новую копию игры." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Ðеверный файл запиÑи" @@ -3071,21 +3056,21 @@ msgstr "Ðеверный файл запиÑи" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Ðеверное Ñохранение" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 #, fuzzy msgid "Italian" msgstr "Italian" @@ -3094,16 +3079,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "ЯПОÐИЯ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT-рекомпилÑтор (рекомендуетÑÑ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL-рекомпилÑтор (ÑкÑпериментальный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 #, fuzzy msgid "Japanese" msgstr "Japanese" @@ -3112,7 +3097,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "КОРЕЯ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3122,17 +3107,17 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "КомбинациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 #, fuzzy msgid "Korean" msgstr "Korean" @@ -3152,19 +3137,23 @@ msgstr "" msgid "L-Analog" msgstr "L-Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Язык" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "ПоÑледнее перезапиÑанное Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "ПоÑледнее Ñохранение" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3174,21 +3163,21 @@ msgstr "Влево" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3196,86 +3185,86 @@ msgstr "" "Левый/Правый клик Ð´Ð»Ñ Ð´Ð¾Ð¿. опций\n" "Средний-клик - очиÑтить." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Меньше чем" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Загр." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Load Hi-Res Textures" +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#, fuzzy +msgid "Load State Slot 1" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#, fuzzy +msgid "Load State Slot 2" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#, fuzzy +msgid "Load State Slot 3" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 +#, fuzzy +msgid "Load State Slot 4" +msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 #, fuzzy -msgid "Load State Slot 1" +msgid "Load State Slot 5" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 #, fuzzy -msgid "Load State Slot 2" +msgid "Load State Slot 6" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 #, fuzzy -msgid "Load State Slot 3" +msgid "Load State Slot 7" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 #, fuzzy -msgid "Load State Slot 4" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 -#, fuzzy -msgid "Load State Slot 5" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 -#, fuzzy -msgid "Load State Slot 6" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 -#, fuzzy -msgid "Load State Slot 7" -msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 -#, fuzzy msgid "Load State Slot 8" msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3287,34 +3276,29 @@ msgstr "Загрузить текÑтуры выÑокой четкоÑти из msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "\"ПривÑзать\" потоки данных к Ñдрам" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "Лог" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 #, fuzzy msgid "Log Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 #, fuzzy msgid "Log Types" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3322,12 +3306,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "Окно лога" @@ -3348,7 +3332,7 @@ msgstr "" "MD5 не Ñовпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" @@ -3362,24 +3346,24 @@ msgstr "Файлы Gameshark MadCatz (*.gcs)" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "ID ÑоздателÑ:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Создатель:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Ðа карте памÑти уже еÑÑ‚ÑŒ Ñохранение Ñтой игры" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Карта памÑти уже открыта" @@ -3389,7 +3373,7 @@ msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Карта памÑти" @@ -3418,21 +3402,21 @@ msgstr "" msgid "Menu" msgstr "Меню" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Мик." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Мик." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "Разное" @@ -3441,7 +3425,7 @@ msgstr "Разное" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3462,7 +3446,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3477,7 +3461,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3575,16 +3559,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Вверх" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "ИмÑ:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "ИмÑ:" @@ -3593,20 +3577,20 @@ msgstr "ИмÑ:" msgid "Native GCI files(*.gci)" msgstr "Стандартные CGI-файлы (*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Ðовый поиÑк" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "След. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "ИÑкать далее" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Ðик :" @@ -3614,7 +3598,7 @@ msgstr "Ðик :" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "ISO/WAD-файлов не обнаружено" @@ -3636,7 +3620,7 @@ msgstr "" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3650,34 +3634,34 @@ msgstr "Ðеверный файл запиÑи" msgid "No save folder found for title %s" msgstr "Ðе найдена папка Ñ ÑохранениÑми Ð´Ð»Ñ %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ОтÑутÑтвует" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 #, fuzzy msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "Ðе равно" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "ÐеизвеÑтно" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "Ðе подключено" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "ПримечаниÑ" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "ПримечаниÑ:" @@ -3686,7 +3670,7 @@ msgstr "ПримечаниÑ:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "УведомлениÑ" @@ -3694,16 +3678,16 @@ msgstr "УведомлениÑ" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Кол-во кодов:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" @@ -3711,11 +3695,11 @@ msgstr "" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Выкл" @@ -3723,52 +3707,52 @@ msgstr "Выкл" msgid "Offset:" msgstr "Смещение:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "ДоÑтупно только %d блоков" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Выбор файла Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ¾Ð½Ñ‚ÐµÐºÑта Ð´Ð»Ñ ÑƒÑтройÑтва %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: не найдена аудио-карта" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ ÑƒÑтройÑтва %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3781,15 +3765,15 @@ msgstr "Опции" msgid "Orange" msgstr "Оранжевый" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3799,19 +3783,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3827,7 +3811,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "Объединить" @@ -3839,35 +3823,35 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Раздел %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Патчи" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Пауза" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "ОÑвещение пикÑелÑ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Отлично" @@ -3876,38 +3860,38 @@ msgstr "Отлично" msgid "Perspective %d" msgstr "Точка %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "ЗапуÑк" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 #, fuzzy msgid "Play Recording" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Старт/Пауза" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Играбельна" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Опции" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "" @@ -3919,62 +3903,62 @@ msgstr "ПожалуйÑта, Ñоздайте точку обозрениÑ, п msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 #, fuzzy msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 #, fuzzy msgid "Port 4" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 #, fuzzy msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 #, fuzzy msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3988,11 +3972,11 @@ msgstr "<Ðажмите кнопку>" msgid "Prev Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Пред. Ñтраница" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Предыдущее значение" @@ -4000,7 +3984,7 @@ msgstr "Предыдущее значение" msgid "Print" msgstr "Print" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Профиль" @@ -4008,7 +3992,7 @@ msgstr "Профиль" msgid "Properties" msgstr "СвойÑтва" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ОчиÑтить кÑш" @@ -4016,8 +4000,8 @@ msgstr "ОчиÑтить кÑш" msgid "Question" msgstr "ВопроÑ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Выход" @@ -4036,7 +4020,7 @@ msgstr "" msgid "R-Analog" msgstr "R-Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "ПамÑÑ‚ÑŒ" @@ -4044,50 +4028,50 @@ msgstr "ПамÑÑ‚ÑŒ" msgid "RUSSIA" msgstr "РОССИЯ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "ÐаÑтоÑщий" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Подключить Wiimote 1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Про&играть запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4103,7 +4087,7 @@ msgstr "КраÑÐ½Ð°Ñ Ñлева" msgid "Red Right" msgstr "КраÑÐ½Ð°Ñ Ñправа" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4116,30 +4100,30 @@ msgstr "" "Картинки выглÑдит менее \"блочной\", но Ñто Ñильно Ñнижает " "произврдительноÑÑ‚ÑŒ." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Обновить" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 #, fuzzy msgid "Refresh List" msgstr "&Обновить ÑпиÑок игр" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Обновление ÑпиÑка игр" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Удалить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4149,17 +4133,17 @@ msgstr "" "Показывает только ÐºÐ°Ñ€ÐºÐ°Ñ Ð¼Ð¾Ð´ÐµÐ»ÐµÐ¹.\n" "Полезно только при отладке." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Выводить изображение в главное окно" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Результаты" @@ -4181,30 +4165,25 @@ msgstr "" msgid "Rumble" msgstr "ВидбрациÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "ЗапуÑкает обработку DSP LLE в отдельном потоке (не рекомендуетÑÑ)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "РуÑÑкий" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "безопаÑное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -#, fuzzy -msgid "Sample Rate:" -msgstr "ЧаÑтота" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Сохр." @@ -4212,98 +4191,98 @@ msgstr "Сохр." msgid "Save GCI as..." msgstr "Сохранить CGI-файл как..." +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#, fuzzy +msgid "Save State Slot 1" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#, fuzzy +msgid "Save State Slot 2" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#, fuzzy +msgid "Save State Slot 3" +msgstr "БыÑтрое &Ñохранение" + +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 +#, fuzzy +msgid "Save State Slot 4" +msgstr "БыÑтрое &Ñохранение" + #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 #, fuzzy -msgid "Save State Slot 1" +msgid "Save State Slot 5" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 #, fuzzy -msgid "Save State Slot 2" +msgid "Save State Slot 6" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 #, fuzzy -msgid "Save State Slot 3" +msgid "Save State Slot 7" msgstr "БыÑтрое &Ñохранение" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 #, fuzzy -msgid "Save State Slot 4" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 -#, fuzzy -msgid "Save State Slot 5" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 -#, fuzzy -msgid "Save State Slot 6" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 -#, fuzzy -msgid "Save State Slot 7" -msgstr "БыÑтрое &Ñохранение" - -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 -#, fuzzy msgid "Save State Slot 8" msgstr "БыÑтрое &Ñохранение" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Сохранить игру как..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Скриншот" @@ -4311,25 +4290,25 @@ msgstr "Скриншот" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "ПоиÑк кодов" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4340,21 +4319,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ %s не найдена в SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4372,23 +4351,23 @@ msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4405,11 +4384,16 @@ msgstr "" "4:3: ПодравнÑÑ‚ÑŒ картинку к Ñоотношению 4:3.\n" "РаÑÑ‚Ñнуть по окну: Размер картинки ÑоответÑтвует размеру окна." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Указанный файл \"%s\" не ÑущеÑтвует" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Выбранный шрифт" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4419,7 +4403,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4429,11 +4413,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "МеÑтораÑположение ÑенÑора:" @@ -4441,26 +4425,26 @@ msgstr "МеÑтораÑположение ÑенÑора:" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "ПоÑледовательный порт â„–1 - тип порта, который иÑпользуют такие уÑтройÑтва " "как Ñетевой адаптер." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "УÑтановить картой памÑти по умолчанию %c" @@ -4470,12 +4454,18 @@ msgstr "УÑтановить картой памÑти по умолчанию % msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 #, fuzzy msgid "Settings..." msgstr "ÐаÑтройки конÑоли (IPL)" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Файл наÑтроек не найден" @@ -4483,7 +4473,7 @@ msgstr "SetupWiiMem: Файл наÑтроек не найден" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Короткое имÑ:" @@ -4492,111 +4482,110 @@ msgstr "Короткое имÑ:" msgid "Shoulder Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Отображать &конÑоль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 #, fuzzy msgid "Show &Log" msgstr "Отображать окно &лога" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Отображать панель &ÑтатуÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Отображать панель &инÑтрументов" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Отображать игры на DVD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "Регионы копии EFB" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Показывать FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Франции" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 #, fuzzy msgid "Show Input Display" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Италии" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Кореи" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Отображать Ñзык:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 #, fuzzy msgid "Show Log &Configuration" msgstr "ÐаÑтройка \"горÑчих\" клавиш" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Отображать игры платформ..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Отображать игры регионов..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "Ð Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ ÑтатиÑтика" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "ТайванÑ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "WAD-файлы" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Ðктивирует Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± оÑтановке процеÑÑа ÑмулÑции игры." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 -#, fuzzy +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4606,40 +4595,40 @@ msgstr "" "во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð³Ñ€Ñ‹, однако в Ñлучае вылета ÑмулÑтора вы не увидите никакой " "информации." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 #, fuzzy msgid "Show first block" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Показать блоки" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Показать комментарий" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Показать иконку" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Показать заголовок" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4647,11 +4636,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "ÐеизвеÑтные" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4663,29 +4652,29 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Реальный Wimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 #, fuzzy msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4693,7 +4682,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4703,18 +4692,18 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, fuzzy, c-format msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -4723,7 +4712,7 @@ msgstr "Слот" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4735,11 +4724,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4753,18 +4742,18 @@ msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ð¾-буфера %s." msgid "Space" msgstr "Пробел" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 #, fuzzy msgid "Spanish" msgstr "Spanish" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4776,7 +4765,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" @@ -4784,53 +4773,57 @@ msgstr "УÑкорить чтение Ñ Ð´Ð¸Ñка" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¸Ð³Ñ€Ð°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 #, fuzzy msgid "Start Recording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "СтатуÑ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 #, fuzzy msgid "State Saves" msgstr "Удалить Ñохранение" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Стоп" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4839,7 +4832,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "РаÑÑ‚Ñнуть по окну" @@ -4864,8 +4857,8 @@ msgstr "Сохранение уÑпешно импортировано" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Язык ÑиÑтемы:" @@ -4873,7 +4866,7 @@ msgstr "Язык ÑиÑтемы:" msgid "TAIWAN" msgstr "ТÐЙВÐÐЬ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4894,31 +4887,31 @@ msgstr "Ð›ÐµÐ²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" msgid "Table Right" msgstr "ÐŸÑ€Ð°Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Сделать Ñкриншот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Проверить" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "ТекÑтура" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "ОчиÑтить кÑш" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "Формат текÑтур" @@ -4935,13 +4928,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4964,7 +4957,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Файл %s уже открыт, Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð¿Ð¸Ñать заголовок." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Указанный файл (%s) не ÑущеÑтвует" @@ -4981,7 +4974,7 @@ msgstr "Ð˜Ð¼Ñ Ð½Ðµ может Ñодержать знак ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4989,11 +4982,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Сохранение, которое вы пытаетеÑÑŒ Ñкопировать имеет неверный размер" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5025,14 +5018,11 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Стиль" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Ошибка выбора темы" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5041,7 +5031,7 @@ msgstr "" "Ðе найден билет Ð´Ð»Ñ 00000001/00000002. Ваша ÐºÐ¾Ð¿Ð¸Ñ NAND Ñкорее вÑего не " "полнаÑ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5061,13 +5051,13 @@ msgstr "" "СимулÑтор action replay не поддерживает коды, которые менÑÑŽÑ‚ Ñам Action " "Replay. " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ опции может привеÑти к замедлению ÑмулÑции в Wii-меню и " "некоторых играх." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5078,7 +5068,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 #, fuzzy msgid "" "This splits the Video and CPU threads, so they can be run on separate " @@ -5091,7 +5081,7 @@ msgstr "" "ÑмулÑтора на многоÑдерных ÑиÑтемах. Побочным Ñффектом данной опции\n" "ÑвлÑетÑÑ Ð¿Ð¾ÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… багов и/или ошибок в ÑмулÑции." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "Это позволит вам вручную править INI файл Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÐµÐ¹" @@ -5105,38 +5095,38 @@ msgid "Tilt" msgstr "Ðаклон" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "Ðазвание" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 #, fuzzy msgid "Toggle All Log Types" msgstr "Включить вÑе" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Включение полноÑкранного режима" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Ñверху" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 #, fuzzy msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Попытка загрузить неизвеÑтный тип файла." @@ -5154,7 +5144,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 #, fuzzy msgid "Turkish" msgstr "Turkish" @@ -5167,12 +5157,12 @@ msgstr "" msgid "Type" msgstr "Тип:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "Порт UDP:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -5203,12 +5193,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Отменить загрузку" @@ -5216,7 +5206,7 @@ msgstr "Отменить загрузку" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "ÐеизвеÑтно" @@ -5245,8 +5235,8 @@ msgstr "Получено неизвеÑтное Ñообщение Ñ id : %d о msgid "Up" msgstr "Вверх" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Обновить" @@ -5255,24 +5245,24 @@ msgstr "Обновить" msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&ПолноÑкранный режим" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Показывать panic-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (ошибки)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5280,7 +5270,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5289,15 +5279,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Утилиты" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "V-Sync" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "Значение" @@ -5305,23 +5295,23 @@ msgstr "Значение" msgid "Value:" msgstr "Значение:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Глубина анализа" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Видео" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" @@ -5336,7 +5326,7 @@ msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" msgid "WAD installation failed: error creating ticket" msgstr "Ошибка уÑтановки WAD: ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5345,16 +5335,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Предупреждение" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Предупреждение: запуÑк DOL в неправильном режиме!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Предупреждение: запуÑк ELF в неправильном режиме!" @@ -5385,7 +5375,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5393,7 +5383,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5401,7 +5391,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5421,7 +5411,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - файл не открыт." @@ -5429,7 +5419,7 @@ msgstr "WaveFileWriter - файл не открыт." msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" @@ -5437,24 +5427,24 @@ msgstr "" msgid "Width" msgstr "Ширина" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5462,17 +5452,17 @@ msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ файл" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5481,19 +5471,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote подключен" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Включить поддержку мотора" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "ÐаÑтройка Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5517,27 +5507,27 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Выводить в конÑоль" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "СохранÑÑ‚ÑŒ в файл" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "СохранÑÑ‚ÑŒ в файл" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 #, fuzzy msgid "Write to Window" msgstr "Выводить в окно ->" @@ -5575,23 +5565,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Ð’Ñ‹ не можете закрыть панель, в которой еÑÑ‚ÑŒ Ñтраницы." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Выберите игру!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Введите название!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцатиричное чиÑло." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5612,7 +5602,7 @@ msgid "" msgstr "" "Ваш файл SYSCONF неверного размера (0x%2$04llx), а должен быть 0x%1$04x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "Включить ZTP-хак" @@ -5625,12 +5615,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ жду ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5642,7 +5632,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5653,7 +5643,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5662,12 +5652,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 #, fuzzy msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5684,7 +5674,7 @@ msgstr "Ðевозможно прочеÑÑ‚ÑŒ данные из файла: %s" msgid "failed to read header" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Чтение кода операции из %x. ПожалуйÑта Ñообщите." @@ -5703,7 +5693,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -5715,7 +5705,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 #, fuzzy msgid "| OR" msgstr "| OR" @@ -5726,6 +5716,9 @@ msgstr "| OR" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Гц" + #~ msgid "&Frame Stepping" #~ msgstr "По&кадровый режим" @@ -5832,6 +5825,22 @@ msgstr "| OR" #~ msgid "Count: %i" #~ msgstr "Счетчик: %i" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Стиль от KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Стиль от Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Стиль от VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Стиль Ñоздан black_rider'ом и опубликован на ForumW.org > Web Developments" + #, fuzzy #~ msgid "Danish" #~ msgstr "Danish" @@ -5839,6 +5848,10 @@ msgstr "| OR" #~ msgid "Disable Lighting" #~ msgstr "Отключить оÑвещение" +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Глубина пикÑелÑ" + #~ msgid "Disable Textures" #~ msgstr "Отключить текÑтуры" @@ -5993,6 +6006,10 @@ msgstr "| OR" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Загружает указанный файл (DOL, ELF, WAD, GCM, ISO)" +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "\"ПривÑзать\" потоки данных к Ñдрам" + #~ msgid "Lua Script Console" #~ msgstr "LUA-конÑоль" @@ -6055,6 +6072,10 @@ msgstr "| OR" #~ msgid "Running script...\n" #~ msgstr "ЗапуÑк Ñкрипта...\n" +#, fuzzy +#~ msgid "Sample Rate:" +#~ msgstr "ЧаÑтота" + #~ msgid "Scale:" #~ msgstr "МаÑштаб:" @@ -6119,6 +6140,9 @@ msgstr "| OR" #~ msgid "Take Screenshot\t" #~ msgstr "Сделать Ñкриншот\t" +#~ msgid "Theme selection went wrong" +#~ msgstr "Ошибка выбора темы" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index 7f203c0100..f47f779328 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "&" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Igra" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! NE" @@ -55,14 +55,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$sKopiraj%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "" @@ -147,147 +140,147 @@ msgstr "%sImportuj GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& I" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "&O" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "&Bootuj sa DVD drajvera" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "&Trazi \"ISO\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "&Chit Meneger " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emulacija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "&Fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Graficke Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "&Pomoc" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "&Hotkey Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Loaduj Savestate" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "&Memorijska kartica (Meneger za GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "&Memorija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "&Otvori..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "&Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "&Pauza" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "&Pribor/Opcije" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "&Refresuj listu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "&Registri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "&Reset" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Zvuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "&Stop" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "&Alat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "&Video" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "&Pogledaj" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "" @@ -307,7 +300,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(NEPOZNAT/O)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(iskljucen/o)" @@ -315,19 +308,19 @@ msgstr "(iskljucen/o)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -335,20 +328,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -356,23 +349,24 @@ msgstr "" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Netplay prozor je vec otvoren!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Nijedna igra trenutno nije pokrenuta." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -391,13 +385,13 @@ msgid "" "You must forward TCP port to host!!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodovi" @@ -405,19 +399,19 @@ msgstr "AR Kodovi" msgid "About Dolphin" msgstr "O Dolphin-u" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Ubrzanje" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "Tacna VBeam emulacija" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -426,8 +420,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Akcija" @@ -447,7 +441,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -468,7 +462,7 @@ msgid "" "Pointer (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "" @@ -476,7 +470,8 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -484,27 +479,27 @@ msgstr "" msgid "Action Replay Error: invalid AR code line: %s" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Adapter" @@ -513,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Dodaj Patch " @@ -525,13 +520,13 @@ msgstr "Dodaj Patch " msgid "Add new pane" msgstr "Dodaj nova okna" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Dodaj..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adresa :" @@ -557,48 +552,48 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -608,19 +603,19 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "" @@ -632,31 +627,31 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Primeni " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -664,12 +659,12 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -677,12 +672,12 @@ msgstr "" msgid "At least one pane must remain open." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "" @@ -690,24 +685,24 @@ msgstr "" msgid "AudioCommon: Error opening AO device.\n" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Auto" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -729,12 +724,12 @@ msgstr "&Registri" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "Nazad " @@ -753,15 +748,15 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "Baner" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "Detalji o Baneru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "Baner:" @@ -769,11 +764,11 @@ msgstr "Baner:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Osnovno/ni/ne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Osnovne opcije" @@ -801,42 +796,42 @@ msgstr "Blue left " msgid "Blue Right" msgstr "Blue right " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Donji deo/dno" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Ostecen/a/nje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Trazi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Tasteri" @@ -858,25 +853,15 @@ msgstr "C-Stick" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emulacije \"Engine\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -885,7 +870,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Odustani" @@ -901,7 +886,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -909,18 +894,18 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "" @@ -934,7 +919,7 @@ msgstr "" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -942,24 +927,24 @@ msgstr "" msgid "Center" msgstr "Centar " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "Promeni" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "Promeni &Disk..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Promeni Disk" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Promeni Igru" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -975,12 +960,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Chat/Caskanje" @@ -988,47 +972,47 @@ msgstr "Chat/Caskanje" msgid "Cheat Code" msgstr "Chit kod" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Trazi Chit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Chit Meneger" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Kineski (pojednostavljen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1036,14 +1020,14 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "Biraj folder u kome zelis da ekstraktujes " @@ -1057,8 +1041,8 @@ msgstr "Klasik/a" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Ocisti" @@ -1070,22 +1054,22 @@ msgstr "" "Klient diskonektovao dok je igra pokrenuta!! NetPlay je onesposobljen. Moras " "manualno zaustaviti igru." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Zatvori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1097,91 +1081,91 @@ msgstr "Komanda" msgid "Comment" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Podesi" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "Povezivanje..." @@ -1201,12 +1185,12 @@ msgstr "Konvertuj u GCI" msgid "Copy failed" msgstr "Kopiranje neuspesno " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Kopiraj na memorisku karticu %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "" @@ -1215,7 +1199,7 @@ msgstr "" msgid "Could not create %s" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "" @@ -1233,12 +1217,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1253,27 +1237,27 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Zemlja:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "Kreiraj AR Kod" @@ -1282,24 +1266,7 @@ msgstr "Kreiraj AR Kod" msgid "Create new perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "Kreator " @@ -1307,11 +1274,11 @@ msgstr "Kreator " msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Izseci" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1322,12 +1289,12 @@ msgstr "" msgid "Crossfade" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "" @@ -1335,11 +1302,11 @@ msgstr "" msgid "Custom Projection Hack Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "" @@ -1351,36 +1318,36 @@ msgstr "" msgid "D-Pad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "" @@ -1392,11 +1359,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "" @@ -1413,11 +1380,11 @@ msgstr "" msgid "Dead Zone" msgstr "Mrtva Zona " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "" @@ -1425,24 +1392,24 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "" @@ -1451,11 +1418,11 @@ msgid "Default font" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Obrisi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Obrisi save" @@ -1464,12 +1431,12 @@ msgstr "Obrisi save" msgid "Delete the existing file '%s'?" msgstr "Obrisi postojeci fajl '%s'?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "Pitanje " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Detekuj" @@ -1480,13 +1447,13 @@ msgid "" "buffer. Clamp." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1508,21 +1475,17 @@ msgid "" " and Directory backup checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Onemoguci \"Fog\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1531,7 +1494,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1541,7 +1504,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1550,11 +1513,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Error tokom ucitavanje diska" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1565,20 +1528,24 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Graficka Podesavanja " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sajt" @@ -1586,54 +1553,59 @@ msgstr "Dolphin &Web Sajt" msgid "Dolphin Configuration" msgstr "Dolphin podesavanja/konfiguracija" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "" @@ -1642,58 +1614,58 @@ msgstr "" msgid "Drums" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "" @@ -1710,11 +1682,11 @@ msgstr "" msgid "EUROPE" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "" @@ -1722,7 +1694,7 @@ msgstr "" msgid "Edit ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "" @@ -1730,12 +1702,12 @@ msgstr "" msgid "Edit Patch" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "" @@ -1743,7 +1715,7 @@ msgstr "" msgid "Effect" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1751,7 +1723,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1760,7 +1732,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1770,19 +1742,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1792,72 +1764,71 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -1866,17 +1837,17 @@ msgid "" "If unsure, select 1x." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1884,7 +1855,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1892,24 +1863,41 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1917,13 +1905,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -1934,14 +1922,14 @@ msgstr "" msgid "End" msgstr "Kraj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "" @@ -1959,17 +1947,17 @@ msgstr "" msgid "Entry 1/%d" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Error" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "" @@ -2004,32 +1992,32 @@ msgstr "" msgid "Execute" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "" @@ -2045,7 +2033,7 @@ msgstr "" msgid "Extension" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "" @@ -2057,44 +2045,44 @@ msgstr "" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "" @@ -2102,7 +2090,7 @@ msgstr "" msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "" @@ -2110,7 +2098,7 @@ msgstr "" msgid "FRANCE" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "" @@ -2118,15 +2106,15 @@ msgstr "" msgid "Failed to Connect!" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "" @@ -2223,42 +2211,42 @@ msgstr "" msgid "Failed to write header for file %d" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2271,7 +2259,7 @@ msgid "" "valid extensions are (.raw/.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "" @@ -2284,19 +2272,19 @@ msgstr "" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2304,27 +2292,27 @@ msgstr "" msgid "First Block" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2332,7 +2320,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2340,7 +2328,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2371,43 +2359,43 @@ msgstr "" msgid "Frame " msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Informacija o kodu " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "" @@ -2415,16 +2403,16 @@ msgstr "" msgid "Frets" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "Rezolucija punog ekrana " @@ -2438,7 +2426,7 @@ msgstr "" msgid "GCMic Configuration" msgstr "Dolphin podesavanja/konfiguracija" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "" @@ -2446,27 +2434,27 @@ msgstr "" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Igra je vec pokrenuta!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Igra nije pokrenuta!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Igra nije pronadjena " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "" @@ -2474,25 +2462,25 @@ msgstr "" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "" @@ -2505,21 +2493,21 @@ msgid "" "directory and restarting Dolphin.)" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "Opcije Uredjaja " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Nemacki " @@ -2528,19 +2516,19 @@ msgstr "Nemacki " msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Grafike" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Graficke opcije/podesavanja/konfiguracije..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2551,7 +2539,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "" @@ -2571,11 +2559,11 @@ msgstr "" msgid "Guitar" msgstr "Gitara " -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2583,7 +2571,7 @@ msgstr "" msgid "Header checksum failed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "" @@ -2595,7 +2583,7 @@ msgstr "" msgid "Help" msgstr "Pomoc" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2609,11 +2597,11 @@ msgstr "" msgid "Hide" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2626,8 +2614,8 @@ msgstr "" msgid "Home" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "" @@ -2635,17 +2623,17 @@ msgstr "" msgid "Hotkey Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "" @@ -2667,7 +2655,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "" @@ -2675,19 +2663,19 @@ msgstr "" msgid "IR" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "" @@ -2699,29 +2687,29 @@ msgstr "" msgid "Icon" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " "constant noise depending on the game)." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2730,7 +2718,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2739,7 +2727,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "" @@ -2747,23 +2735,23 @@ msgstr "" msgid "Import failed, try again?" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2773,16 +2761,16 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Info " @@ -2790,7 +2778,7 @@ msgstr "Info " msgid "Information" msgstr "Informacija " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "" @@ -2802,7 +2790,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "" @@ -2810,12 +2798,12 @@ msgstr "" msgid "Insert name here.." msgstr "Ubaci ime ovde..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "" @@ -2824,34 +2812,34 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "" @@ -2870,16 +2858,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "Rezolucija punog ekrana " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Uvod" @@ -2888,11 +2876,11 @@ msgstr "Uvod" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "" @@ -2913,7 +2901,7 @@ msgid "" " You may need to redump this game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "" @@ -2921,21 +2909,21 @@ msgstr "" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italianski " @@ -2943,16 +2931,16 @@ msgstr "Italianski " msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Recompiler (preporucljivo)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanski " @@ -2960,7 +2948,7 @@ msgstr "Japanski " msgid "KOREA" msgstr "KOREA " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -2969,17 +2957,17 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "Taster " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korejski " @@ -2997,19 +2985,23 @@ msgstr "" msgid "L-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3019,98 +3011,98 @@ msgstr "" msgid "Left Stick" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" "Right-click for more options." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Ucitaj " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "Ucitaj Hi-Res Textures " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Ucitaj State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Ucitaj State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Ucitaj State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Ucitaj State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Ucitaj State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Uci State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Ucitaj State Slot 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Ucitaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3121,31 +3113,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3153,12 +3141,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "" @@ -3177,7 +3165,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "" @@ -3191,24 +3179,24 @@ msgstr "" msgid "Main Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "" @@ -3218,7 +3206,7 @@ msgid "Memory Byte" msgstr "&Memorija" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "" @@ -3247,20 +3235,20 @@ msgstr "" msgid "Menu" msgstr "Meni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "" @@ -3269,7 +3257,7 @@ msgstr "" msgid "Modifier" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3290,7 +3278,7 @@ msgstr "" msgid "Motor" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3305,7 +3293,7 @@ msgstr "" msgid "Multiply" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3403,16 +3391,16 @@ msgstr "" msgid "NP Up" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "" @@ -3421,20 +3409,20 @@ msgstr "" msgid "Native GCI files(*.gci)" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "" @@ -3442,7 +3430,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "" @@ -3464,7 +3452,7 @@ msgstr "" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "" @@ -3477,33 +3465,33 @@ msgstr "" msgid "No save folder found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "" @@ -3512,7 +3500,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "" @@ -3520,16 +3508,16 @@ msgstr "" msgid "Num Lock" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "" @@ -3537,11 +3525,11 @@ msgstr "" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Izskljucen/o" @@ -3549,52 +3537,52 @@ msgstr "Izskljucen/o" msgid "Offset:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Otvori fajl..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3607,15 +3595,15 @@ msgstr "Opcije " msgid "Orange" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3625,19 +3613,19 @@ msgid "" "manually stop the game." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "" @@ -3653,7 +3641,7 @@ msgstr "" msgid "Page Up" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "" @@ -3665,35 +3653,35 @@ msgstr "" msgid "Parameters" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauza " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "Onemoguci \"Lighting\"" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Perfektno " @@ -3702,37 +3690,37 @@ msgstr "Perfektno " msgid "Perspective %d" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "Opcije " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "" @@ -3744,54 +3732,54 @@ msgstr "" msgid "Plus-Minus" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "Port 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "Port :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portugalski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3804,11 +3792,11 @@ msgstr "" msgid "Prev Page" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "" @@ -3816,7 +3804,7 @@ msgstr "" msgid "Print" msgstr "Stampaj " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -3824,7 +3812,7 @@ msgstr "Profil" msgid "Properties" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "" @@ -3832,8 +3820,8 @@ msgstr "" msgid "Question" msgstr "Pitanje " -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Izadji " @@ -3851,7 +3839,7 @@ msgstr "" msgid "R-Analog" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM " @@ -3859,48 +3847,48 @@ msgstr "RAM " msgid "RUSSIA" msgstr "Rusija" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "Pokreni snimanje " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -3916,7 +3904,7 @@ msgstr "" msgid "Red Right" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -3925,46 +3913,46 @@ msgid "" "If unsure, select None." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Reset/Restart " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Rezultati " @@ -3986,29 +3974,25 @@ msgstr "" msgid "Rumble" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Siguran " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Snimaj" @@ -4016,90 +4000,90 @@ msgstr "Snimaj" msgid "Save GCI as..." msgstr "Snimaj GCI kao..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Snimaj State Slot 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Snimaj State Slot 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Snimaj State Slot 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Snimaj State Slot 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Snimaj State Slot 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Snimaj State Slot 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Snimaj State Slot 7 " -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Snimaj State Slot 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Snimaj state..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "" @@ -4107,24 +4091,24 @@ msgstr "" msgid "Scroll Lock" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "Trazi Chit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Trazi Subfoldere " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4135,21 +4119,21 @@ msgid "Section %s not found in SYSCONF" msgstr "" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Izaberi " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4167,23 +4151,23 @@ msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " msgid "Select floating windows" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4194,11 +4178,15 @@ msgid "" "If unsure, select Auto." msgstr "" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +msgid "Selected controller profile does not exist" +msgstr "" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Odabrani font" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4208,7 +4196,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4218,11 +4206,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Isprati" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "" @@ -4230,24 +4218,24 @@ msgstr "" msgid "Separator" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "" @@ -4257,11 +4245,17 @@ msgstr "" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "" -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "" @@ -4269,7 +4263,7 @@ msgstr "" msgid "Shake" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "" @@ -4278,141 +4272,141 @@ msgstr "" msgid "Shoulder Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 msgid "Show lag counter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4420,11 +4414,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4435,28 +4429,28 @@ msgstr "" msgid "Sideways Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4464,7 +4458,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4474,17 +4468,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "" @@ -4492,7 +4486,7 @@ msgstr "" msgid "Snapshot" msgstr "" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4504,11 +4498,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "" @@ -4522,17 +4516,17 @@ msgstr "" msgid "Space" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4544,7 +4538,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "" @@ -4552,51 +4546,55 @@ msgstr "" msgid "Square Stick" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Pokreni " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "Pokreni &NetPlay" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Pokreni Sni&manje" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Pokreni Snimanje" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr " Zaustavi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4605,7 +4603,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "" @@ -4630,8 +4628,8 @@ msgstr "" msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "" @@ -4639,7 +4637,7 @@ msgstr "" msgid "TAIWAN" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "" @@ -4660,32 +4658,32 @@ msgstr "" msgid "Table Right" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 #, fuzzy msgid "Texture" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "Tacan \"Texture Cache\"" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "" @@ -4701,13 +4699,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4726,7 +4724,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "" @@ -4743,7 +4741,7 @@ msgstr "" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4751,11 +4749,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4786,12 +4784,8 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" -msgstr "" - -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +msgid "Theme:" msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 @@ -4800,7 +4794,7 @@ msgid "" "incomplete." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4812,11 +4806,11 @@ msgid "" "Replay itself." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -4827,7 +4821,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -4835,7 +4829,7 @@ msgid "" "cause occasional crashes/glitches." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "" @@ -4849,35 +4843,35 @@ msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "" @@ -4895,7 +4889,7 @@ msgid "" "Wiimote bt ids are not available" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "" @@ -4907,12 +4901,12 @@ msgstr "" msgid "Type" msgstr "" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4943,12 +4937,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "" @@ -4956,7 +4950,7 @@ msgstr "" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Nepoznat/o" @@ -4985,8 +4979,8 @@ msgstr "" msgid "Up" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Updejt " @@ -4994,24 +4988,24 @@ msgstr "Updejt " msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "&Pun Ekran" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5019,7 +5013,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5028,15 +5022,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "" @@ -5044,23 +5038,23 @@ msgstr "" msgid "Value:" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Video " -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Jacina zvuka " @@ -5074,7 +5068,7 @@ msgstr "" msgid "WAD installation failed: error creating ticket" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5083,16 +5077,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Upozorenje " -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Upozorenje - pokrece se DOL u pogresan konzol mod!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Upozorenje - pokrece se ELF u pogresan konzol mod!" @@ -5122,7 +5116,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5130,7 +5124,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5138,7 +5132,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5158,7 +5152,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "" @@ -5166,7 +5160,7 @@ msgstr "" msgid "Whammy" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "" @@ -5174,23 +5168,23 @@ msgstr "" msgid "Width" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5198,17 +5192,17 @@ msgstr "" msgid "WiiWAD: Could not read from file" msgstr "" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5217,19 +5211,19 @@ msgid "" "Do you want to reconnect immediately?" msgstr "" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "&Wiimote Opcije" @@ -5250,26 +5244,26 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Radi..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "" @@ -5306,23 +5300,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5340,7 +5334,7 @@ msgid "" "Do you want to generate a new one?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "" @@ -5353,12 +5347,12 @@ msgstr "" msgid "Zero code unknown to dolphin: %08x" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ cekanje ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5370,7 +5364,7 @@ msgstr "" msgid "[Custom]" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5381,7 +5375,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5390,11 +5384,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "" @@ -5411,7 +5405,7 @@ msgstr "" msgid "failed to read header" msgstr "" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "" @@ -5430,7 +5424,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "" @@ -5442,7 +5436,7 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| ILI" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index 6f519194fa..c5246e410b 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2012-06-11 23:41+0200\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" "Language: Turkish\n" @@ -18,17 +18,17 @@ msgstr "" "X-Poedit-Language: Turkish\n" "X-Poedit-Country: TURKEY\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr "(Göstermek için çok fazla)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr "Oyun :" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! YOK" @@ -58,14 +58,7 @@ msgstr "%08X: " msgid "%1$sCopy%1$s" msgstr "%1$sKopyala%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" msgstr "%i baÄŸlandı" @@ -159,147 +152,147 @@ msgstr "%sGCI Al%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u BoÅŸ Blok; %u BoÅŸ Dizin GiriÅŸi" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& VE" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "Hakkında... (&A)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "DVD Sürücüden Önyükle... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "Kesme noktaları (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "Kalıplara Gözat... (&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "Hile Yöneti&cisi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "&Emülasyon" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "Dosya (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "GeliÅŸmiÅŸ Kareleme (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "Tam Ekran (&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "&Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "Yardım (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "TuÅŸ ayarları (&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "Durumu Yük&le" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GC Hafıza Kartı Yönetici (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "Hafıza (&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "Aç...(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "Seçenekler (&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "Duraklat (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "Özellikler (&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "Salt okunu&r mod" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "Listeyi Yenile (&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "Kayıtla&r" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "Sıfı&rla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "&Ses" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "Durdur (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "Araçlar (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "Görüntü (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "Görünüm (&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -319,7 +312,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(BÄ°LÄ°NMEYEN)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(kapalı)" @@ -327,19 +320,19 @@ msgstr "(kapalı)" msgid "0x44" msgstr "0x44" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 bit" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 bit" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "3D Vision" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 bit" @@ -347,20 +340,20 @@ msgstr "8 bit" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<Çözünürlük bulunamadı>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "" @@ -368,25 +361,27 @@ msgstr "" msgid "A" msgstr "A" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "Bir NetPlay penceresi zaten açık!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "Bir oyun ÅŸu anda düzgün çalışmıyor." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Desteklenen bir BlueTooth sürücüsü bulunamadı!\n" "(Sadece Microsoft bluetooth stack desteklenir.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -420,13 +415,13 @@ msgstr "" "\n" "TCP baÄŸlantı noktanızı barındırıcıya yönlendirmelisiniz!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR Kodları" @@ -434,19 +429,19 @@ msgstr "AR Kodları" msgid "About Dolphin" msgstr "Dolphin Hakkında" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "Hızlandırma" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "DoÄŸruluk:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "DoÄŸru VBeam Emülasyonu" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -459,8 +454,8 @@ msgstr "" "\n" "Emin deÄŸilseniz, bunun yerine EFB'den Doku'ya seçeneÄŸini iÅŸaretleyin." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "Eylem" @@ -486,7 +481,7 @@ msgid "" msgstr "" "Action Replay Hatası: Kod eklemede (%08x : adres = %08x) hatalı boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -513,15 +508,16 @@ msgstr "" "Action Replay Hatası: Ä°ÅŸaretleyiciye yazarken (%08x : address = %08x) hatalı " "boyut (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay Hatası: Hafıza kopyalamada (%08x) hatalı deÄŸer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -529,27 +525,27 @@ msgstr "Action Replay Hatası: Ana Kod ve CCXXXXXX kodu uygulanamadı (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay Hatası: Hatalı AR kod satırı: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay: Åžartlı Kod: Hatalı Boyut %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay: Hatalı Normal Kod Türü %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay: Normal Kod %i: Hatalı alt tür %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay: Normal Kod 0: Hatalı alt tür %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "Dönüştürücü:" @@ -558,11 +554,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "Yama Ekle" @@ -570,13 +566,13 @@ msgstr "Yama Ekle" msgid "Add new pane" msgstr "Bölme ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "Ekle..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "Adres :" @@ -616,52 +612,52 @@ msgstr "" "\n" "NOT: Ulaşılan deÄŸerler için GiriÅŸ Penceresi veya Konsolu denetleyin." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "" "Düğmeleri etkinleÅŸtirmek için gerekli olan analog denetim basıncını " "ayarlayın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "GeliÅŸmiÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "GeliÅŸmiÅŸ Ayarlar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "Tüm dosyalar (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -674,19 +670,19 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" msgstr "Alternatif Wiimote Zamanlaması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "Analiz et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtreleme:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "KeskinleÅŸtirme:" @@ -698,15 +694,15 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "Apploader:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "Uygula" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" @@ -716,16 +712,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, kapalı seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "Arapça" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -733,14 +729,14 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -748,12 +744,12 @@ msgstr "En-boy Oranı:" msgid "At least one pane must remain open." msgstr "En az bir bölme açık kalmalıdır." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" @@ -761,24 +757,24 @@ msgstr "Ses Çözücüsü:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: AO sürücüyü açarken hata.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "Otomatik" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "Otomatik (640x528'in katları)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Window Size)" msgstr "Otomatik (Pencere Boyutu)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 msgid "Auto adjust Window Size" msgstr "Pencere Boyutunu Otomatik Ayarla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 msgid "" "Automatically adjusts the window size to your internal resolution.\n" "\n" @@ -800,12 +796,12 @@ msgstr "BP kaydı" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "Çözücü Ayarları" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 msgid "Backend:" msgstr "Çözücü:" @@ -823,15 +819,15 @@ msgid "Bad File Header" msgstr "Kötü Dosya Başı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "AfiÅŸ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "AfiÅŸ Ayrıntıları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "AfiÅŸ:" @@ -839,11 +835,11 @@ msgstr "AfiÅŸ:" msgid "Bar" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "Temel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "Temel Ayarlar" @@ -871,42 +867,42 @@ msgstr "Mavi Sol" msgid "Blue Right" msgstr "Mavi SaÄŸ" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "Alt" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "BaÄŸlı Denetimler: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "Bozuk" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "Gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "Tampon:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "Düğmeler" @@ -927,31 +923,15 @@ msgstr "C ÇubuÄŸu" msgid "CP reg" msgstr "CP kaydı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU Emülatör Motoru" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 msgid "Cache Display Lists" msgstr "Görüntü Listelerini Önbellekle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" -"3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel olarak " -"hesapla. \n" -"Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok azında " -"piksel başına derinlik hesaplaması gereklidir.\n" -"\n" -"Emin deÄŸilseniz, iÅŸaretli bırakın." - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -966,7 +946,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "Ä°ptal" @@ -982,7 +962,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -993,7 +973,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1001,12 +981,12 @@ msgstr "" "Bu dosya bir hafıza kartı olarak kullanılamıyor.\n" "2 slot için de aynı dosyayı deniyor olabilir misiniz?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "BD ile WiiMote bulunamadı: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "Sap baÄŸlantısı ile Wiimote bulunamadı: %02x" @@ -1020,7 +1000,7 @@ msgstr "DVD Eklentisinden okunamıyor - DVD-Arabirimi : Önemli Hata" msgid "Caps Lock" msgstr "Büyük Harf Kilidi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "Katalanca" @@ -1028,24 +1008,24 @@ msgstr "Katalanca" msgid "Center" msgstr "Merkez" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "&Diski DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "Diski DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "Oyunu DeÄŸiÅŸtir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1061,13 +1041,12 @@ msgstr "zFar Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "zNear Parametresinin iÅŸaretini deÄŸiÅŸtirir (düzeltme sonrası)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "" "Emülatör çalışırken deÄŸiÅŸtirirseniz herhangi bir etkisini göremezsiniz!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "Sohbet" @@ -1075,47 +1054,47 @@ msgstr "Sohbet" msgid "Cheat Code" msgstr "Hile Kodu" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "Hile Arama" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "Hile Yöneticisi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "Bölüm Düzgünlüğünü Denetle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "Düzgünlük denetleniyor..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Çince (Basit)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1123,7 +1102,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1131,8 +1110,8 @@ msgstr "" "Apploader olarak bir dosya seçin: (Sadece konumlardan yapılan disklere " "uygulanır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "GeniÅŸletmek için bir klasör seçin" @@ -1146,8 +1125,8 @@ msgstr "Klasik" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "Temizle" @@ -1159,22 +1138,22 @@ msgstr "" "Oyun çalışırken istemci baÄŸlantısı kesildi!! NetPlay iptal edildi. Oyunu " "elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "Kapat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "Yapıla&ndır" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "Kod Bilgisi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "Kod:" @@ -1186,91 +1165,91 @@ msgstr "Komut" msgid "Comment" msgstr "Yorum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "Yapılandırma" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "Yapılandır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "Denetimleri Yapılandır" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "Kolları Yapılandır" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 msgid "Confirm on Stop" msgstr "Durdurma Onayı Ä°ste" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "Wiimote'u BaÄŸla : %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "Wiimote 1'i BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "Wiimote 2'yi BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "Wiimote 3'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "Wiimote 4'ü BaÄŸla" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "BaÄŸlanıyor..." @@ -1290,12 +1269,12 @@ msgstr "GCI'ya dönüştür" msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "Hafıza kartı %c 'ye kopyala" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "Çekirdek" @@ -1304,7 +1283,7 @@ msgstr "Çekirdek" msgid "Could not create %s" msgstr "%s oluÅŸturulamadı." -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "Çözücü %s baÅŸlatılamadı." @@ -1325,12 +1304,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "Kalıp dosyası %s tanınamadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "%s kaydedilemedi." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1350,11 +1329,11 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1362,17 +1341,17 @@ msgstr "" "Çekirdek baÅŸlatılamadı. \n" "Yapılandırmanızı denetleyin." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "Sayı:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "Ãœlke:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "AR Kodu OluÅŸtur" @@ -1381,28 +1360,7 @@ msgstr "AR Kodu OluÅŸtur" msgid "Create new perspective" msgstr "Yeni perspektif oluÅŸtur" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " -"oluÅŸturulmuÅŸtur." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "" -"black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " -"yayınlanmıştır." - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "OluÅŸturan:" @@ -1410,11 +1368,11 @@ msgstr "OluÅŸturan:" msgid "Critical" msgstr "Önemli" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "Kırp" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1428,13 +1386,13 @@ msgstr "" msgid "Crossfade" msgstr "GeçiÅŸli" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "" "wx Dosya Seçiciden sonra ÅŸu anki konum %s 'den %s 'ye deÄŸiÅŸtirilmiÅŸtir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "Özel Görüntüleme Hilesi" @@ -1442,11 +1400,11 @@ msgstr "Özel Görüntüleme Hilesi" msgid "Custom Projection Hack Settings" msgstr "Özel Görüntüleme Hilesi Ayarları" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Çekçe" @@ -1458,36 +1416,36 @@ msgstr "D" msgid "D-Pad" msgstr "Yön TuÅŸları" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE Emülasyonu (Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1499,11 +1457,11 @@ msgstr "DVDLowRead - Kritik Hata: Birimden okuma baÅŸarısız." msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "DVDLowUnencryptedRead - Kritik Hata: Birimden okuma baÅŸarısız." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "Veri Boyutu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "Tarih:" @@ -1520,11 +1478,11 @@ msgstr "Datel MaxDrive/Pro dosyaları (*.sav)" msgid "Dead Zone" msgstr "Ölü Bölge" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "Hata ayıklama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" msgstr "Hata ayıklama" @@ -1532,24 +1490,24 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1558,11 +1516,11 @@ msgid "Default font" msgstr "Varsayılan yazı tipi" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "Sil" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "Kaydı sil" @@ -1571,11 +1529,11 @@ msgstr "Kaydı sil" msgid "Delete the existing file '%s'?" msgstr "'%s' dosyasını silmek istediÄŸinizden emin misiniz?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 msgid "Description" msgstr "Açıklama" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "Belirle" @@ -1587,13 +1545,13 @@ msgid "" msgstr "" "DVD'nin alabileceÄŸi veriden daha fazlasını sığdırma giriÅŸimi algılandı." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1617,20 +1575,16 @@ msgstr "" "Konum doÄŸrulama baÅŸarısız \n" "ve konum yedeÄŸi doÄŸrulama da baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 msgid "Disable" msgstr "Ä°ptal et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "Sisi Ä°ptal Et" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -msgid "Disable Per-Pixel Depth" -msgstr "Piksel DerinliÄŸini Ä°ptal Et" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1644,7 +1598,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1660,7 +1614,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "Disk" @@ -1669,11 +1623,11 @@ msgstr "Disk" msgid "Disc Read Error" msgstr "Disk Okuma Hatası" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 msgid "" "Display the inputs read by the emulator.\n" "\n" @@ -1687,20 +1641,24 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s Görüntü Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin &Web Sitesi" @@ -1708,32 +1666,32 @@ msgstr "Dolphin &Web Sitesi" msgid "Dolphin Configuration" msgstr "Dolphin Yapılandırması" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin Taklit Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1741,7 +1699,7 @@ msgstr "" "Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1749,16 +1707,21 @@ msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " "oyunları görebilirsiniz." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "AÅŸağı" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "Kodları Ä°ndir (WiiRD Veritabanı)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "%lu kod indirildi. (%lu eklendi.)" @@ -1767,27 +1730,27 @@ msgstr "%lu kod indirildi. (%lu eklendi.)" msgid "Drums" msgstr "Davullar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "Sesi Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "EFB Hedef Dökümü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "Kareleri Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "Dokuları Dök" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" @@ -1798,7 +1761,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 msgid "" "Dump decoded game textures to User/Dump/Textures//\n" "\n" @@ -1808,7 +1771,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" @@ -1818,17 +1781,17 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Flemenkçe" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "Çıkış (&x)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 msgid "EFB Copies" msgstr "EFB Kopyaları" @@ -1848,11 +1811,11 @@ msgstr "" msgid "EUROPE" msgstr "AVRUPA" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "Erken Hafıza Güncellemeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "Düzen" @@ -1860,7 +1823,7 @@ msgstr "Düzen" msgid "Edit ActionReplay Code" msgstr "Action Replay Kodunu Düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "Yapılandırmayı Düzenle" @@ -1868,12 +1831,12 @@ msgstr "Yapılandırmayı Düzenle" msgid "Edit Patch" msgstr "Yamayı Düzenle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "Åžu anki perspektifi düzenle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "Düzenle..." @@ -1881,7 +1844,7 @@ msgstr "Düzenle..." msgid "Effect" msgstr "Etki" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "Gömülü Çerçeve Tamponu" @@ -1889,7 +1852,7 @@ msgstr "Gömülü Çerçeve Tamponu" msgid "Emu Thread already running" msgstr "Emülasyon Ä°ÅŸlem Birimi zaten çalışıyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1903,7 +1866,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, bunun yerine sanal XFB emülasyonunu seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1919,19 +1882,19 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "Taklit Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "Emülasyon Durumu:" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "Ä°zin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1947,72 +1910,71 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "BAT'a Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "Sınırlayıcı Kutu Hesaplama'yı EtkinleÅŸtir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 msgid "Enable Cache" msgstr "Ön BelleÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "Hilelere Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "Çift ÇekirdeÄŸe Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "Kısayol TuÅŸlarına Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "BoÅŸta Atlamaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "BoÅŸta Atlamaya Ä°zin Ver (hızı artırır)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "MMU'ya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "GeniÅŸ Ekrana Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "GeniÅŸ Çerçeveye Ä°zin Ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 msgid "" "Enable anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles.\n" @@ -2026,7 +1988,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 1x seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" @@ -2034,11 +1996,11 @@ msgstr "" "Disk eriÅŸimini hızlandırır. Bazı oyunlarda gereklidir. (Açık = Hızlı, Kapalı " "= Uyumlu)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Sayfalara izin ver" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -2052,7 +2014,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -2064,7 +2026,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -2072,7 +2034,7 @@ msgstr "" "The Legend of Zelda: Twilight Princess oyununu hızlandırır. DiÄŸer tüm " "oyunlarda iptal edin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -2082,11 +2044,28 @@ msgstr "" "iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " "Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -2098,7 +2077,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" @@ -2106,7 +2085,7 @@ msgstr "" "Hafıza Yönetim Ãœnitesini etkinleÅŸtirir. Bazı oyunlarda gereklidir. (Açık = " "Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2120,14 +2099,14 @@ msgstr "" msgid "End" msgstr "Son" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "Ä°ngilizce" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "GeliÅŸtirmeler" @@ -2145,17 +2124,17 @@ msgstr "GiriÅŸ %d/%d" msgid "Entry 1/%d" msgstr "GiriÅŸ 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "EÅŸit" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "Hata" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Seçili dili yüklerken hata. Sistem varsayılanlarına geri dönülüyor." @@ -2194,32 +2173,32 @@ msgstr "Özel durum iÅŸleyicisi - bellek alanı altında eriÅŸim. %08llx%08llx" msgid "Execute" msgstr "Yürüt" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "Verme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "Dosya Ver" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "Çekimi Ver" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "Çekimi Ver..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "Tüm Kayıtları Ver" @@ -2235,7 +2214,7 @@ msgstr "Kaydı farklı ver..." msgid "Extension" msgstr "Uzantı" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 msgid "External Frame Buffer" msgstr "Harici Çerçeve Tamponu" @@ -2247,44 +2226,44 @@ msgstr "Ä°lave Parametre" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "Ä°lave Parametre sadece \"Metroid: Other M\" oyununda kullanışlıdır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "Tüm Dosyaları GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "Apploader'i GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "DOL'ü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "Konumu GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "Dosyayı GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "Bölüntüyü GeniÅŸlet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "Tüm Dosyalar GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "Konum GeniÅŸletiliyor" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "GeniÅŸletiliyor..." @@ -2292,7 +2271,7 @@ msgstr "GeniÅŸletiliyor..." msgid "FIFO Byte" msgstr "FIFO Bayt'ı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 msgid "FIFO Player" msgstr "FIFO Oynatıcısı" @@ -2300,7 +2279,7 @@ msgstr "FIFO Oynatıcısı" msgid "FRANCE" msgstr "FRANSA" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST Boyutu:" @@ -2308,15 +2287,15 @@ msgstr "FST Boyutu:" msgid "Failed to Connect!" msgstr "BaÄŸlantı baÅŸarısız!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "Dinleme baÅŸarısız!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "Kod indirme baÅŸarısız." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "%s 'ye geniÅŸletme baÅŸarısız!" @@ -2434,19 +2413,19 @@ msgstr "%s için baÅŸlık yazılamadı." msgid "Failed to write header for file %d" msgstr "%d dosyası için baÅŸlık yazılamadı." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "Farsça" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2454,23 +2433,23 @@ msgstr "" "Kritik karışıklık. Oynatma durduruluyor. (PlayWiimote'da hata: %u != %u, " "bayt %u.)%s" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" msgstr "Fifo Oynatıcısı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 msgid "File Info" msgstr "Dosya Bilgisi" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "Dosya kod içermemektedir." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "Dosya .gci 'ye dönüştürüldü." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2487,7 +2466,7 @@ msgstr "" "Dosya \"%s\" uzantısına sahip \n" "doÄŸru uzantılar .raw ve .gcp 'dir." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "Dosya bir hafıza kartı olarak tanınamadı." @@ -2500,19 +2479,19 @@ msgstr "Dosya sıkıştırılmadı." msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "Sonrakini bul" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "Öncekini bul" @@ -2520,27 +2499,27 @@ msgstr "Öncekini bul" msgid "First Block" msgstr "Ä°lk Blok" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "SaÄŸlamayı Düzelt" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "16:9 'a zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "4:3 'e zorla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 msgid "Force Console as NTSC-J" msgstr "Konsolu NTSC-J Olmaya Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 msgid "Force Texture Filtering" msgstr "Doku Filtrelemesine Zorla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" "Improves texture quality slightly but causes glitches in some games.\n" @@ -2552,7 +2531,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 msgid "" "Force the game to output graphics for widescreen resolutions.\n" "Causes graphical glitches is some games.\n" @@ -2564,7 +2543,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2600,42 +2579,42 @@ msgstr "Çerçeve" msgid "Frame " msgstr "Çerçeve" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "GeliÅŸmiÅŸ Çerçeveleme" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 msgid "Frame Dumps use FFV1" msgstr "Çerçeve dökümünde FFV1 kullan" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 msgid "Frame Info" msgstr "Çerçeve Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" msgstr "Çerçeve Aralığı" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "Çerçeve Atlama(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "Çerçeve Sınırı:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "Çekilecek Çerçeveler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "Serbest Bakış" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "Fransızca" @@ -2643,16 +2622,16 @@ msgstr "Fransızca" msgid "Frets" msgstr "Perdeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "Buradan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "Tam Ekran" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 msgid "Fullscreen resolution:" msgstr "Tam Ekran Çözünürlüğü:" @@ -2664,7 +2643,7 @@ msgstr "GCI Dosyası (*.gci)" msgid "GCMic Configuration" msgstr "GCMic Yapılandırması" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC Kolu" @@ -2672,27 +2651,27 @@ msgstr "GC Kolu" msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "Oyun ID'si:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "Oyun zaten çalışıyor!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "Oyun çalışmıyor!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "Oyun bulunamadı!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "Oyuna Özel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "Oyun Yapılandırması" @@ -2700,25 +2679,25 @@ msgstr "Oyun Yapılandırması" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "GameCube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "GameCube Kolu Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko Kodları" @@ -2735,20 +2714,20 @@ msgstr "" "bin dosyası ekleyerek Dolphin'i yeniden baÅŸlatıp, yerel kod iÅŸleyicini " "kullanmayı deneyebilirsiniz.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "Genel" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 msgid "General Settings" msgstr "Genel Ayarlar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "Almanca" @@ -2757,19 +2736,19 @@ msgstr "Almanca" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Ana sayfa kod liste boyutundan (%lu) daha büyük." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "Görüntü Ayarları" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "Daha Büyük" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2785,7 +2764,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Yunanca" @@ -2805,11 +2784,11 @@ msgstr "YeÅŸil SaÄŸ" msgid "Guitar" msgstr "Gitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY çaÄŸrıldı, lütfen bildirin!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "Hack'ler" @@ -2817,7 +2796,7 @@ msgstr "Hack'ler" msgid "Header checksum failed" msgstr "BaÅŸlık saÄŸlama hatası" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Ä°branice" @@ -2829,7 +2808,7 @@ msgstr "Yükseklik" msgid "Help" msgstr "Yardım" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2849,11 +2828,11 @@ msgstr "" msgid "Hide" msgstr "Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "Fare Ä°ÅŸaretçisini Gizle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" "\n" @@ -2867,8 +2846,8 @@ msgstr "" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "Barındırma" @@ -2876,17 +2855,17 @@ msgstr "Barındırma" msgid "Hotkey Configuration" msgstr "Kısayol TuÅŸu Yapılandırması" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "TuÅŸlar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Macarca" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "Karışık Wiimote" @@ -2912,7 +2891,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL Ayarları" @@ -2920,19 +2899,19 @@ msgstr "IPL Ayarları" msgid "IR" msgstr "Kızılötesi" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "Kızılötesi Ä°ÅŸaretleyici" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "Kızılötesi Hassasiyeti:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -2944,7 +2923,7 @@ msgstr "Ä°TALYA" msgid "Icon" msgstr "Simge" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." @@ -2952,14 +2931,14 @@ msgstr "" "EÄŸer iÅŸaretlenmiÅŸse, sınırlayıcı kutu kayıtları güncellenecektir. Paper " "Mario oyunları tarafından kullanılır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "Saniyedeki çerçeve sayısı düzensizse, bu seçenek size yardım edebilir. (Açık " "= Uyumlu, Kapalı = Hızlı)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2969,11 +2948,11 @@ msgstr "" "ile Ses hızlandırıcısı kullanın. (Ses takılmalarını düzeltebilir, ancak " "(oyuna baÄŸlı olarak) sürekli gürültüye de neden olabilir.)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" msgstr "Birim deÄŸiÅŸimini yoksay" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2987,7 +2966,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -3001,7 +2980,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "Kayıt Al" @@ -3009,7 +2988,7 @@ msgstr "Kayıt Al" msgid "Import failed, try again?" msgstr "Alma baÅŸarısız,tekrar dene?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -3017,11 +2996,11 @@ msgstr "" "Alınan dosya gsc uzantısına sahip\n" "ama baÅŸlığı düzgün deÄŸil." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "Alınan dosyanın uzunluÄŸu hatalı." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -3029,7 +3008,7 @@ msgstr "" "Alınan dosya sav uzantısına sahip\n" "ama baÅŸlığı düzgün deÄŸil." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" "Improves performance but causes glitches in most games which rely on proper " "fog emulation.\n" @@ -3041,16 +3020,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakır." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "Oyun İçi" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "Oyun-İçi" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "Bilgi" @@ -3058,7 +3037,7 @@ msgstr "Bilgi" msgid "Information" msgstr "Bilgilendirme" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "GiriÅŸ" @@ -3070,7 +3049,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3078,11 +3057,11 @@ msgstr "SD Kart Ekle" msgid "Insert name here.." msgstr "Adı buraya yazın..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3093,23 +3072,23 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "WAD kuruluyor..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "Düzgünlük Denetleme Hatası" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "Düzgünlük denetlemesi tamamlandı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "Düzgünlük denetlemesi tamamlandı. Hata bulunmadı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " @@ -3118,11 +3097,11 @@ msgstr "" "Bölüntü %d için düzgünlük denetlemesi baÅŸarısız. Dökümünüz hasar görmüş veya " "yanlış yamanmış olabilir." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3143,15 +3122,15 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "İç LZO Hatası - lzo_init() baÅŸarısız." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 msgid "Internal Resolution:" msgstr "İç Çözünürlük:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "Ä°ntro" @@ -3160,11 +3139,11 @@ msgstr "Ä°ntro" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "Yanlış boyut (%x) veya Sihirli kelime (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "Hatalı DeÄŸer!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "Hatalı bat.map veya konum giriÅŸi" @@ -3188,7 +3167,7 @@ msgstr "" "%s\n" "Oyunu yeniden dökmeniz gerekebilir." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "Hatalı çekim dosyası" @@ -3196,21 +3175,21 @@ msgstr "Hatalı çekim dosyası" msgid "Invalid search parameters (no object selected)" msgstr "Geçersiz arama parametre(ler)i (nesne seçilmedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "Geçersiz arama dizesi (sadece düz dize uzunluÄŸu destekleniyor)" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Hatalı durum" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Ä°talyanca" @@ -3218,16 +3197,16 @@ msgstr "Ä°talyanca" msgid "JAPAN" msgstr "JAPONYA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT Yeniden Derleyici (önerilen)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL Deneysel Yeniden Derleyici" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japonca" @@ -3235,7 +3214,7 @@ msgstr "Japonca" msgid "KOREA" msgstr "KORE" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 msgid "" "Keep the game window on top of all other windows.\n" "\n" @@ -3245,17 +3224,17 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "Pencereyi üstte tut" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "TuÅŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korece" @@ -3273,19 +3252,23 @@ msgstr "L Düğmesi" msgid "L-Analog" msgstr "L Analog" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "Dil:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "Son Ãœzerine Yazılan Durum" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "Son Kayıtlı Durum" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3295,8 +3278,8 @@ msgstr "Sol" msgid "Left Stick" msgstr "Sol Çubuk" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3304,7 +3287,7 @@ msgstr "" "TuÅŸ belirlemek için sol tıklatın. \n" "Temizlemek için space'ye basın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3314,7 +3297,7 @@ msgstr "" "temizlemek için orta, \n" "daha çok seçenek için saÄŸ tıklatın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3322,76 +3305,76 @@ msgstr "" "Daha çok seçenek için sol veya saÄŸ, \n" "temizlemek için orta tıklatın." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "Daha Az" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "FPS Sınırlaması" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "Yükle" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 msgid "Load Custom Textures" msgstr "Özel Dokuları Yükle" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "Durumu Yükle : 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "Durumu Yükle : 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "Durumu Yükle : 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "Durumu Yükle : 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "Durumu Yükle : 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "Durumu Yükle : 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "Durumu Yükle : 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "Durumu Yükle : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 msgid "" "Load custom textures from User/Load/Textures//\n" "\n" @@ -3405,31 +3388,27 @@ msgstr "" msgid "Load preset values from hack patterns available." msgstr "Bu oyun için kullanılabilir önayar varsa buradan seçiniz." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "Yerel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -msgid "Lock Threads to Cores" -msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "GeçmiÅŸ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "GeçmiÅŸ Yapılandırması" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "GeçmiÅŸ Türü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 #, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " @@ -3442,12 +3421,12 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "GeçmiÅŸ Çıkışı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "GeçmiÅŸ" @@ -3468,7 +3447,7 @@ msgstr "" "MD5 eÅŸleÅŸmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3482,24 +3461,24 @@ msgstr "MadCatz Gameshark dosyaları(*.gcs)" msgid "Main Stick" msgstr "Ana Çubuk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "Yapımcı ID'si:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "Yapımcı:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "En fazla" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Hafıza kartı bu baÅŸlık için zaten bir kayda sahip. " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "Hafıza kartı zaten açık" @@ -3508,7 +3487,7 @@ msgid "Memory Byte" msgstr "Hafıza Baytı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "Hafıza Kartı" @@ -3545,20 +3524,20 @@ msgstr "Hafıza kartı dosya boyutu baÅŸlık boyutuyla eÅŸleÅŸmiyor" msgid "Menu" msgstr "Menü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mikrofon" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 msgid "Min" msgstr "En az" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3567,7 +3546,7 @@ msgstr "ÇeÅŸitli Ayarlar" msgid "Modifier" msgstr "DeÄŸiÅŸtirici" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3592,7 +3571,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "Motor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3614,7 +3593,7 @@ msgstr "" msgid "Multiply" msgstr "Çarp" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3714,16 +3693,16 @@ msgstr "NP Sekme" msgid "NP Up" msgstr "NP Yukarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "Ä°sim:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "Ä°sim:" @@ -3732,20 +3711,20 @@ msgstr "Ä°sim:" msgid "Native GCI files(*.gci)" msgstr "DoÄŸal GCI Dosyaları(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "Yeni Tarama" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "Sonraki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "Sonraki Tarama" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "Takma Ad :" @@ -3753,7 +3732,7 @@ msgstr "Takma Ad :" msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "Kalıp bulunamadı" @@ -3775,7 +3754,7 @@ msgstr "YerleÅŸtirme yok" msgid "No file loaded" msgstr "Dosya Yüklenmedi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "BoÅŸ dizin indeks giriÅŸi yok" @@ -3788,33 +3767,33 @@ msgstr "ÇekilmiÅŸ Dosya Yok" msgid "No save folder found for title %s" msgstr "BaÅŸlık %s için kayıt klasörü bulunamadı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "Hiçbiri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norveççe (Bokmaal Lehçesi)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "EÅŸit DeÄŸil" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "Ayarlanmamış" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "BaÄŸlı deÄŸil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "Notlar" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "Notlar:" @@ -3823,7 +3802,7 @@ msgstr "Notlar:" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "Duyuru" @@ -3831,16 +3810,16 @@ msgstr "Duyuru" msgid "Num Lock" msgstr "Sayı Kilidi" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "Kod Sayısı:" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuck" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuck Hızlandırma" @@ -3848,11 +3827,11 @@ msgstr "Nunchuck Hızlandırma" msgid "Object" msgstr "Nesne" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "Nesne Aralığı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "Kapalı" @@ -3860,52 +3839,52 @@ msgstr "Kapalı" msgid "Offset:" msgstr "Uzantı:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "Sadece %d blok kullanılabilir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "Dosya aç..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: Sürücü %s için baÄŸlam oluÅŸturulamıyor" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: Ses sürücüleri bulunamıyor" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: Sürücü %s açılamıyor" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "OpenCL Doku Çözücü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" @@ -3918,7 +3897,7 @@ msgstr "Seçenekler" msgid "Orange" msgstr "Turuncu" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3928,8 +3907,8 @@ msgstr "" "Tüm kayıtları vermek için saÄŸ tıklatın, \n" "ve kayıtları yeni bir hafıza kartına alın.\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "DiÄŸer" @@ -3941,19 +3920,19 @@ msgstr "" "Oyun çalışırken diÄŸer istemcinin baÄŸlantısı kesildi!! NetPlay iptal edildi. " "Oyunu elle durdurmalısınız." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "Çıkış" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "Çekimi Oynat... (&L)" -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "Kol" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "Kol" @@ -3969,7 +3948,7 @@ msgstr "Sayfa AÅŸağı" msgid "Page Up" msgstr "Sayfa Yukarı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "EÅŸleÅŸtir" @@ -3981,34 +3960,34 @@ msgstr "Paragraf" msgid "Parameters" msgstr "Parametreler" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "Bölüntü %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "Yamalar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Duraklat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" msgstr "Piksel Aydınlatması" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "Mükemmel" @@ -4017,36 +3996,36 @@ msgstr "Mükemmel" msgid "Perspective %d" msgstr "Perspektif %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "Oynat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "Çekimi Oynat" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "Oynat/Duraklat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "Oynanabilir" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 msgid "Playback Options" msgstr "Oynatma Seçenekleri" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4058,54 +4037,54 @@ msgstr "Kaydetmeden önce lütfen bir perspektif oluÅŸturun" msgid "Plus-Minus" msgstr "Artı-Eksi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "BaÄŸ. Nok. :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portekizce" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portekizce (Brezilya)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" @@ -4118,11 +4097,11 @@ msgstr "Önayarlar:" msgid "Prev Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "Önceki Sayfa" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "Önceki DeÄŸer" @@ -4130,7 +4109,7 @@ msgstr "Önceki DeÄŸer" msgid "Print" msgstr "Yazdır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "Profil" @@ -4138,7 +4117,7 @@ msgstr "Profil" msgid "Properties" msgstr "Özellikler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "ÖnbelleÄŸi Temizle" @@ -4146,8 +4125,8 @@ msgstr "ÖnbelleÄŸi Temizle" msgid "Question" msgstr "Soru" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "Çık" @@ -4165,7 +4144,7 @@ msgstr "R Düğmesi" msgid "R-Analog" msgstr "R Analog" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "Anabellek" @@ -4173,46 +4152,46 @@ msgstr "Anabellek" msgid "RUSSIA" msgstr "RUSYA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "Aralık" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "Salt Okunur Mod" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "Gerçek" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "Gerçek Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 msgid "Real Wiimotes" msgstr "Gerçek Wiimote'lar" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "Wiimote Tekrar BaÄŸlama Onayı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 msgid "Reconnect Wiimote on State Loading" msgstr "Durum yüklemesinde Wiimote'u yeniden baÄŸla" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 msgid "Record" msgstr "Çek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 msgid "Recording Info" msgstr "Çekim Bilgisi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "Çekim Seçenekleri" @@ -4228,7 +4207,7 @@ msgstr "Kırmızı Sol" msgid "Red Right" msgstr "Kırmızı SaÄŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" "This makes the rendered picture look less blocky.\n" @@ -4242,29 +4221,29 @@ msgstr "" "\n" "Emin deÄŸilseniz, hiçbiri seçin." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "Yenile" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "Listeyi Yenile" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "Oyun Listesini Yenile" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "Kaldır" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 msgid "" "Render the scene as a wireframe.\n" "\n" @@ -4274,17 +4253,17 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "Ana pencerede yorumla" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "Sıfırla" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "Sonuçlar" @@ -4306,29 +4285,25 @@ msgstr "SaÄŸ Çubuk" msgid "Rumble" msgstr "Gümbürtü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "DSPLLE'yi ayrı iÅŸlem biriminde çalıştır (önerilmez)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Rusça" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "Durumu Kaydet (&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "Güvenli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "Örnek Oran:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "Kaydet" @@ -4336,90 +4311,90 @@ msgstr "Kaydet" msgid "Save GCI as..." msgstr "GCI'yı farklı kaydet..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "Durumu Kaydet : 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "Durumu Kaydet : 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "Durumu Kaydet : 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "Durumu Kaydet : 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "Durumu Kaydet : 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "Durumu Kaydet : 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "Durumu Kaydet : 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "Durumu Kaydet : 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "Durumu Kaydet..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "Åžu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "Taranıyor..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "Ekran Görüntüsü" @@ -4427,23 +4402,23 @@ msgstr "Ekran Görüntüsü" msgid "Scroll Lock" msgstr "Kaydırma Kilidi" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 msgid "Search" msgstr "Ara" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 msgid "Search current Object" msgstr "Åžu anki nesneyi ara" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "Hex deÄŸerini ara:" @@ -4454,20 +4429,20 @@ msgid "Section %s not found in SYSCONF" msgstr "SYSCONF içinde %s bölümü bulunamadı" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 msgid "" "Select a hardware adapter to use.\n" "\n" @@ -4485,23 +4460,23 @@ msgstr "Almak için bir kayıt dosyası seçin" msgid "Select floating windows" msgstr "Sabit olmayan pencereyi seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 msgid "" "Select what aspect ratio to use when rendering:\n" "Auto: Use the native aspect ratio\n" @@ -4519,11 +4494,16 @@ msgstr "" "\n" "Emin deÄŸilseniz, otomatik seçin." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "Belirtilen dosya \"%s\" bulunamadı" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "Seçilen yazı tipi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4539,7 +4519,7 @@ msgstr "" "Emin deÄŸilseniz, masaüstü çözünürlüğünüzü seçin.\n" "Hala emin deÄŸilseniz, kullanabildiÄŸiniz en yüksek çözünürlüğü seçin." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4555,11 +4535,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, DirectX 9 seçin." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "Gönder" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "Sensör Çubuk Konumu:" @@ -4567,25 +4547,25 @@ msgstr "Sensör Çubuk Konumu:" msgid "Separator" msgstr "Bölücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Sırpça" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Seri BaÄŸ.Nok. 1 - Bu baÄŸlantı noktasına aÄŸ adaptörü gibi sürücüler baÄŸlanır" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" @@ -4595,11 +4575,17 @@ msgstr "Varsayılan Hafıza Kartı %c olarak ayarla" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Anasayfa, kod listesi boyutu %lu dan daha büyük." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "Ayarlar..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Ayar dosyası bulunamadı" @@ -4607,7 +4593,7 @@ msgstr "SetupWiiMem: Ayar dosyası bulunamadı" msgid "Shake" msgstr "Sallama" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "Kısa Ä°sim:" @@ -4615,105 +4601,105 @@ msgstr "Kısa Ä°sim:" msgid "Shoulder Buttons" msgstr "Shoulder Düğmeleri" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "Konsolu Göster (&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "GeçmiÅŸi Göster (&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "Durum ÇubuÄŸunu Gö&ster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "Araç ÇubuÄŸunu Gös&ter" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "Aygıtları Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 msgid "Show EFB Copy Regions" msgstr "EFB Bölge Kopyalamasını Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "Kare Sayısını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "Fransızları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "GameCube'leri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "Görüntü GiriÅŸini Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "Ä°talyanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "Japonları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "Korelileri Göster" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "Gösterme Dili:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "GeçmiÅŸ Yapılandırmasını Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "PAL'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "Platformları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "Bölgeleri Göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 msgid "Show Statistics" msgstr "Ä°statistikleri Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "Tayvanlıları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "Amerikanları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "WAD'ları Göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "Wii'leri Göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "Oyunu durdurmadan önce onay kutusu görüntüle." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4721,39 +4707,39 @@ msgstr "" "Bunu iptal ederseniz, hata mesajları almazsınız ama Dolphin çöktüğünde " "hiçbir uyarı vermeden aniden kapanır." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "Ä°lk bloÄŸu göster" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "Kayıt bloklarını göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "Kayıt yorumunu göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "Kayıt simgesini göster" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "Kayıt baÅŸlığını göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4765,11 +4751,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "Bilinmeyenleri göster" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4783,27 +4769,27 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Yatay Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 msgid "Skip BIOS" msgstr "BIOS'u Geç" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "CPU'dan EFB'ye eriÅŸimi atla" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4814,7 +4800,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4829,17 +4815,17 @@ msgstr "" "doÄŸruluÄŸunu artırmayı deneyin.\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "Slot B" @@ -4847,7 +4833,7 @@ msgstr "Slot B" msgid "Snapshot" msgstr "Enstantene" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "Yazılımsal Yorumlayıcı" @@ -4863,11 +4849,11 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "Ses Ayarları" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "Ses arkaucu %s geçerli deÄŸil." @@ -4881,17 +4867,17 @@ msgstr "Ses tamponu oluÅŸturulamadı: %s" msgid "Space" msgstr "BoÅŸluk" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Ä°spanyolca" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "Hoparlör Ses Seviyesi:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4911,7 +4897,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, 640x528'i seçin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "Disk Aktarım Oranını Hızlandır" @@ -4919,51 +4905,55 @@ msgstr "Disk Aktarım Oranını Hızlandır" msgid "Square Stick" msgstr "Kare Çubuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "Varsayılan Denetim Aygıtı" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "&NetPlay'i BaÅŸlat" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "Çekimi BaÅŸlat (&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "Çekimi BaÅŸlat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "Durum" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "Durum Kayıtları" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "Çubuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "Durdur" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4977,7 +4967,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretli bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "Pencereye Göre Ayarla" @@ -5002,8 +4992,8 @@ msgstr "Kayıt dosyaları baÅŸarıyla alındı" msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "Sistem Dili:" @@ -5011,7 +5001,7 @@ msgstr "Sistem Dili:" msgid "TAIWAN" msgstr "TAYVAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 msgid "TAS Input" msgstr "TAS GiriÅŸi" @@ -5032,30 +5022,30 @@ msgstr "Tablo Sol" msgid "Table Right" msgstr "Tablo SaÄŸ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "Ekran Görüntüsü Al" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "TaruKonga (Bongos)" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "Sınama" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "Doku" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 msgid "Texture Cache" msgstr "Doku Ön BelleÄŸi" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 msgid "Texture Format Overlay" msgstr "Doku Biçimi Kaplaması" @@ -5071,13 +5061,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "SaÄŸlama baÅŸarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -5100,7 +5090,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "Dosya %s zaten açık, dosya baÅŸlığı yazılmayacaktır." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "Belirtilen dosya (%s) bulunamadı" @@ -5117,7 +5107,7 @@ msgstr "Ä°sim ',' karakterini içeremez" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "Ortaya çıkan ÅŸifresi çözülmüş AR kodu herhangi bir satır içermiyor." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5129,11 +5119,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, en saÄŸdaki deÄŸeri kullanın." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "Kopyalamayı denediÄŸiniz kaydın boyutu hatalı" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -5166,14 +5156,11 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "Tema" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "Tema seçiminde hata" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5182,7 +5169,7 @@ msgstr "" "Burada 00000001/00000002 için bir bilet olmalıdır. NAND dökümünüz " "tamamlanmamış olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5197,11 +5184,11 @@ msgid "" msgstr "" "Bu Action Replay simülatörü, kodların kendisini düzenlemesini desteklemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaÅŸlamaya neden olabilir." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5219,7 +5206,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5231,7 +5218,7 @@ msgstr "" "Bilgisayarınızda çift çekirdek varsa hızınızı büyük oranda artırır,ama bazı " "çökme ve hatalara neden olabilir." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." @@ -5245,35 +5232,35 @@ msgid "Tilt" msgstr "EÄŸim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "BaÅŸlık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 msgid "To" msgstr "Buraya" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "Tüm GeçmiÅŸ Türlerini Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "Tam Ekran Moduna Geç" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "Ãœst" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Geleneksel Çince" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "Bilinmeyen bir dosya türünü yüklemeyi denedi." @@ -5293,7 +5280,7 @@ msgstr "" "Geçersiz SYSCONF'tan okumayı deniyor\n" "Wiimote BT ID'leri mevcut deÄŸil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Türkçe" @@ -5305,12 +5292,12 @@ msgstr "Döner Tabla" msgid "Type" msgstr "Tür" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP BaÄŸ.Nok.:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5346,12 +5333,12 @@ msgstr "" "kod olarak ayrıştırılamadı. Kodu doÄŸru yazdığınızdan emin olun.\n" "Bu satırı yoksayıp ayrıştırmaya devam etmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "Belirsiz %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "Durum Yüklemeyi Geri Al" @@ -5359,7 +5346,7 @@ msgstr "Durum Yüklemeyi Geri Al" msgid "Unexpected 0x80 call? Aborting..." msgstr "Beklenmedik 0x80 çaÄŸrısı? Çıkılıyor..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "Bilinmeyen" @@ -5388,8 +5375,8 @@ msgstr "ID %d ile %d oyuncusundan bilinmeyen mesaj alındı. Oyuncu atılıyor!" msgid "Up" msgstr "Yukarı" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "Güncelle" @@ -5397,23 +5384,23 @@ msgstr "Güncelle" msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 msgid "Use Fullscreen" msgstr "Tam Ekran Kullan" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "HEX Kullan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "Önemli Hataları Bildir" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5425,7 +5412,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5439,15 +5426,15 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "Gereçler" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "Dikey EÅŸitleme" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "DeÄŸer" @@ -5455,23 +5442,23 @@ msgstr "DeÄŸer" msgid "Value:" msgstr "DeÄŸer:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "DeÄŸer:" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "Duyuru/Hata/Uyarı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "Görüntü" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "Ses" @@ -5485,7 +5472,7 @@ msgstr "WAD kurulumu baÅŸarısız: %s oluÅŸturmada hata" msgid "WAD installation failed: error creating ticket" msgstr "WAD kurulumu baÅŸarısız: Ticket oluÅŸturma hatası." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5498,16 +5485,16 @@ msgstr "" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "Uyarı" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Uyarı - DOL yanlış konsol modunda baÅŸlatılıyor!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Uyarı - ELF yanlış konsol modunda baÅŸlatılıyor!" @@ -5540,7 +5527,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5552,7 +5539,7 @@ msgstr "" "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5564,7 +5551,7 @@ msgstr "" "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5599,7 +5586,7 @@ msgstr "" "%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - dosya açılamadı." @@ -5607,7 +5594,7 @@ msgstr "WaveFileWriter - dosya açılamadı." msgid "Whammy" msgstr "Darbe" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" @@ -5615,23 +5602,23 @@ msgstr "GeniÅŸ Ekran Hilesi" msgid "Width" msgstr "GeniÅŸlik" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5639,17 +5626,17 @@ msgstr "Wii kayıt dosyaları (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: Dosyadan okuma baÅŸarısız" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, c-format msgid "Wiimote %i" msgstr "Wiimote %i" -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5662,19 +5649,19 @@ msgstr "" "bir zaman aşımı olabilir veya baÅŸka bir ÅŸey olabilir. \n" "Tekrar baÄŸlamak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote BaÄŸlandı" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote Motoru" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote ayarları" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 msgid "Wiimotes" msgstr "Wiimote'lar" @@ -5694,26 +5681,26 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "Çalışıyor..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "Konsola Yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 msgid "Write to Debugger" msgstr "Hata ayıklayıcıya yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "Dosyaya Yaz" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "Pencereye Yaz" @@ -5752,23 +5739,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "Sayfalı bölmeleri kapatamazsınız." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "Bir oyun seçmelisiniz!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "Bir isim girmelisiniz!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "DoÄŸru bir sekizlik,onluk veya onaltılık deÄŸer girmelisiniz." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "DeÄŸiÅŸikliÄŸin etkili olması için Dolphin'i yeniden baÅŸlatmalısınız." @@ -5791,7 +5778,7 @@ msgstr "" "0x%04x olmalıdır (sizinki: 0x%04llx) \n" "Yenisini oluÅŸturmak ister misiniz?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP Hilesi" @@ -5804,12 +5791,12 @@ msgstr "Sıfır-Üç kodu desteklenmemektedir." msgid "Zero code unknown to dolphin: %08x" msgstr "Dolphin Sıfır kodu bilinmiyor: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ bekleniyor ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5825,7 +5812,7 @@ msgstr "" msgid "[Custom]" msgstr "[Özel]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5843,7 +5830,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5857,11 +5844,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5878,7 +5865,7 @@ msgstr "%s dosyasından veri okunamadı" msgid "failed to read header" msgstr "baÅŸlık okunamadı" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." @@ -5897,7 +5884,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -5909,13 +5896,16 @@ msgstr "zFar Düzeltmesi:" msgid "zNear Correction: " msgstr "zNear Düzeltmesi:" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| VEYA" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "Çerçeve Atlama(&K)" @@ -6001,6 +5991,21 @@ msgstr "| VEYA" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#~ msgid "" +#~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" +#~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " +#~ "depth calculations are necessary to properly emulate a small number of " +#~ "games.\n" +#~ "\n" +#~ "If unsure, leave this checked." +#~ msgstr "" +#~ "3 Boyutlu görüntülerin derinlik deÄŸerlerini vertex yerine piksel olarak " +#~ "hesapla. \n" +#~ "Piksel aydınlatmanın tersine (sadece bir donanım olan), oyunların çok " +#~ "azında piksel başına derinlik hesaplaması gereklidir.\n" +#~ "\n" +#~ "Emin deÄŸilseniz, iÅŸaretli bırakın." + #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " #~ "vertex.\n" @@ -6062,6 +6067,24 @@ msgstr "| VEYA" #~ msgid "Could not get info about plugin %s" #~ msgstr "%s oluÅŸturulamadı." +#~ msgid "Created by KDE-Look.org" +#~ msgstr "KDE-Look.org tarafından oluÅŸturulmuÅŸtur." + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com] tarafından " +#~ "oluÅŸturulmuÅŸtur." + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "VistaIcons.com tarafından oluÅŸturulmuÅŸtur." + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "black_rider tarafından oluÅŸturulup ForumW.org > Web Developments 'da " +#~ "yayınlanmıştır." + #~ msgid "DList Cache" #~ msgstr "D Listesi ÖnbelleÄŸi" @@ -6076,6 +6099,9 @@ msgstr "| VEYA" #~ msgid "Disable Lighting" #~ msgstr "Işıklandırmayı Ä°ptal Et" +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "Piksel DerinliÄŸini Ä°ptal Et" + #~ msgid "Disable Textures" #~ msgstr "Dokuları Ä°ptal Et" @@ -6368,6 +6394,9 @@ msgstr "| VEYA" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "Belirtilen dosyayı yükler (DOL,ELF,WAD,GCM,ISO)" +#~ msgid "Lock Threads to Cores" +#~ msgstr "Ä°ÅŸlem Birimlerini Çekirdeklere Kilitle" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "Düşük düzeyde (LLE) veya Yüksek düzeyde (HLE) ses." @@ -6454,6 +6483,9 @@ msgstr "| VEYA" #~ msgid "Running script...\n" #~ msgstr "Script çalıştırılıyor... \n" +#~ msgid "Sample Rate:" +#~ msgstr "Örnek Oran:" + #~ msgid "Scale:" #~ msgstr "Boyut:" @@ -6562,6 +6594,9 @@ msgstr "| VEYA" #~ msgid "The file " #~ msgstr "Dosya" +#~ msgid "Theme selection went wrong" +#~ msgstr "Tema seçiminde hata" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 1070990f75..71d2206cdb 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-01-09 13:55-0800\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: thegfw \n" "Language-Team: \n" "Language: Simplified Chinese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (è¦æ˜¾ç¤ºçš„项目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " æ¸¸æˆ : " -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! éž" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$så¤åˆ¶%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "未连接" @@ -153,147 +146,147 @@ msgstr "%s导入 GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "%u 空闲区å—; %u 空闲目录项目" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "&& 与" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "关于(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "光驱å¯åŠ¨(&V)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "断点(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "æµè§ˆé•œåƒ(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "作弊ç ç®¡ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "模拟(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "文件(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "帧数步进(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "图形设置(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "帮助(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "热键设置(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "å³æ—¶ç¼–译器(&J)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "载入状æ€(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "内存å¡ç®¡ç†å™¨(&GC)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "内存(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "打开镜åƒ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "选项(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "æš‚åœæ¸¸æˆ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "属性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "åªè¯»æ¨¡å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "刷新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "é‡ç½®æ¸¸æˆ(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "声音(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢æ¸¸æˆ(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "视频(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "视图(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "百科(&W)" @@ -313,7 +306,7 @@ msgstr "" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(å…³)" @@ -321,19 +314,19 @@ msgstr "(å…³)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ä½" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ä½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ä½" @@ -341,20 +334,20 @@ msgstr "8 ä½" msgid "" msgstr "<在这里æ’å…¥å称>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<未找到分辨率>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<æ— >" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<按任æ„é”®>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<系统>" @@ -362,25 +355,27 @@ msgstr "<系统>" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "网上对战窗å£å·²ç»æ‰“å¼€!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ç›®å‰æ²¡æœ‰æ¸¸æˆè¿è¡Œ." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "没有找到支æŒçš„è“牙设备!\n" "(åªæœ‰å¾®è½¯çš„è“牙产å“支æŒ.)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -414,13 +409,13 @@ msgstr "" "\n" "You must forward TCP port to host!!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-基æ¿" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "动作回放代ç " @@ -428,19 +423,19 @@ msgstr "动作回放代ç " msgid "About Dolphin" msgstr "关于 Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精确脉冲染料激光模拟" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -449,8 +444,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "æ“作" @@ -475,7 +470,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 æ·»åŠ ä»£ç  (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,15 +491,16 @@ msgid "" "Pointer (%s)" msgstr "动作回放错误: æ— æ•ˆå¤§å° (%08x : åœ°å€ = %08x) 于 写入到指针 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "动作回放错误: 无效数值 (%08x) 于 内存å¤åˆ¶ (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "动作回放错误: 主代ç å’Œå†™å…¥åˆ° CCXXXXXX ä¸æ”¯æŒ (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -512,27 +508,27 @@ msgstr "动作回放错误: 主代ç å’Œå†™å…¥åˆ° CCXXXXXX ä¸æ”¯æŒ (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "动作回放错误: 无效动作回放代ç è¡Œ: %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "动作回放: æ¡ä»¶ä»£ç : æ— æ•ˆå¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "动作回放: 无效正常代ç ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  %i: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "动作回放: æ­£å¸¸ä»£ç  0: 无效å­ç±»åž‹ %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "适é…器:" @@ -541,11 +537,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "添加补ä¸" @@ -553,13 +549,13 @@ msgstr "添加补ä¸" msgid "Add new pane" msgstr "添加新é¢æ¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "添加..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "åœ°å€ :" @@ -585,50 +581,50 @@ msgid "" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "调整摇æ†æŽ§åˆ¶éœ€è¦æ´»åŠ¨çš„按钮." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "高级" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "高级设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "所有文件 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -637,20 +633,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "抗锯齿:" @@ -662,31 +658,31 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "应用载入器:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "应用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -694,12 +690,12 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -707,12 +703,12 @@ msgstr "高宽比:" msgid "At least one pane must remain open." msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "音频åŽç«¯:" @@ -720,26 +716,26 @@ msgstr "音频åŽç«¯:" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon: 打开 AO 设备错误.\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自动" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "窗å£å¤§å°:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -760,12 +756,12 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "音频åŽç«¯:" @@ -784,15 +780,15 @@ msgid "Bad File Header" msgstr "无效文件头" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "标志" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "标志详细信æ¯" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "标志:" @@ -800,11 +796,11 @@ msgstr "标志:" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本 设置" @@ -832,42 +828,42 @@ msgstr "è“ å·¦" msgid "Blue Right" msgstr "è“ å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "底部" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "绑定控制器: %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "æŸå" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "æµè§ˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "æµè§ˆè¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "缓冲区:" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "按键" @@ -889,26 +885,16 @@ msgstr "C-摇æ†" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU 模拟引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "å¯ç”¨æ˜¾ç¤ºåˆ—表缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -917,7 +903,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -933,7 +919,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -943,7 +929,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -951,12 +937,12 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "ä¸èƒ½æŒ‰ç…§è¿žæŽ¥å¥æŸ„ %02x 找到 WiiMote" @@ -970,7 +956,7 @@ msgstr "ä¸èƒ½ä»Ž DVDæ’件 - DVD接å£è¯»å–æ•°æ®: 严é‡é”™è¯¯" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -978,24 +964,24 @@ msgstr "" msgid "Center" msgstr "Center" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "切æ¢" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "切æ¢å…‰ç›˜(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "切æ¢å…‰ç›˜" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "切æ¢æ¸¸æˆ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1011,12 +997,11 @@ msgstr "" msgid "Changes sign to zNear Parameter (after correction)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "Changing this will have no effect while the emulator is running!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "金手指" @@ -1024,48 +1009,48 @@ msgstr "金手指" msgid "Cheat Code" msgstr "作弊ç " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "作弊ç æœç´¢" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "金手指管ç†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1073,7 +1058,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1081,8 +1066,8 @@ msgstr "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "选择解压缩到的文件夹" @@ -1096,8 +1081,8 @@ msgstr "ç»å…¸" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "清除" @@ -1109,22 +1094,22 @@ msgstr "" "Client disconnect while game is running!! NetPlay is disabled. You must " "manually stop the game." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "关闭" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "程åºè®¾ç½®(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "代ç :" @@ -1136,92 +1121,92 @@ msgstr "命令" msgid "Comment" msgstr "注释" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "设置" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "设置" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "设置é¢æ¿" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "设置手柄" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "åœæ­¢æ—¶ç¡®è®¤" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "连接 Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "连接 Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "连接 Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "连接 Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "连接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "连接中..." @@ -1241,12 +1226,12 @@ msgstr "转æ¢åˆ° GCI" msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "å¤åˆ¶åˆ°å†…å­˜å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "核心" @@ -1255,7 +1240,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "ä¸èƒ½åˆ›å»º %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "ä¸èƒ½åˆå§‹åŒ–åŽç«¯ %s" @@ -1276,12 +1261,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "ä¸èƒ½è¯†åˆ« ISO 文件 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "ä¸èƒ½ä¿å­˜ %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1301,11 +1286,11 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1313,17 +1298,17 @@ msgstr "" "ä¸èƒ½åˆå§‹åŒ–核心.\n" "检查你的é…ç½®." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "æ•°é‡:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "国家:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "创建动作回放代ç " @@ -1332,25 +1317,7 @@ msgstr "创建动作回放代ç " msgid "Create new perspective" msgstr "创建新布局" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "Created by KDE-Look.org" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "Created by VistaIcons.com" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "Created by black_rider and published on ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "创建者:" @@ -1358,11 +1325,11 @@ msgstr "创建者:" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "è£åˆ‡" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1373,12 +1340,12 @@ msgstr "" msgid "Crossfade" msgstr "淡入淡出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "Current dir changed from %s to %s after wxFileSelector!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "自定义投影修正" @@ -1386,11 +1353,11 @@ msgstr "自定义投影修正" msgid "Custom Projection Hack Settings" msgstr "自定义投影修正设置" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "自定义一些正交投影å‚æ•°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "æ·å…‹è¯­" @@ -1402,37 +1369,37 @@ msgstr "" msgid "D-Pad" msgstr "D-Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "音频 HLE 模拟(很快)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "音频 LLE é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1444,11 +1411,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "æ•°æ®å¤§å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "日期:" @@ -1465,11 +1432,11 @@ msgstr "Datel MaxDrive/Pro files(*.sav)" msgid "Dead Zone" msgstr "死区" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "调试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "调试" @@ -1478,24 +1445,24 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "默认镜åƒ:" @@ -1504,11 +1471,11 @@ msgid "Default font" msgstr "默认字体" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "删除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "删除存档" @@ -1517,12 +1484,12 @@ msgstr "删除存档" msgid "Delete the existing file '%s'?" msgstr "删除已ç»å­˜åœ¨çš„文件 '%s' 么?" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "询问" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "检测" @@ -1535,13 +1502,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "设备设置" @@ -1565,22 +1532,17 @@ msgstr "" "目录校检失败\n" "和目录备份校检失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "ç¦ç”¨é›¾åŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "åƒç´ æ·±åº¦" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1589,7 +1551,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1599,7 +1561,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "光盘" @@ -1608,11 +1570,11 @@ msgstr "光盘" msgid "Disc Read Error" msgstr "光盘读å–错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "显示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1624,20 +1586,24 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s 图形设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin 网站(&W)" @@ -1645,54 +1611,59 @@ msgstr "Dolphin 网站(&W)" msgid "Dolphin Configuration" msgstr "Dolphin é…ç½®" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模拟 Wiimote 设置" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote é…ç½®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin 于 &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin ä¸èƒ½æ‰¾åˆ°ä»»ä½• GC/Wii é•œåƒ. åŒå‡»è¿™é‡Œæµè§ˆæ–‡ä»¶..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸æˆ..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "ä¸‹è½½ä»£ç  (WiiRD æ•°æ®åº“)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下载 %lu 代ç (已添加 %lu)" @@ -1701,34 +1672,34 @@ msgstr "已下载 %lu 代ç (已添加 %lu)" msgid "Drums" msgstr "鼓" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "转储音频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "转储 EFB 目标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "转储æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1736,24 +1707,24 @@ msgid "" "If unsure, leave this unchecked." msgstr "转储游æˆæ质到 User/Dump/Textures/<æ¸¸æˆ ID>/" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "è·å…°è¯­" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "退出模拟(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB å¤åˆ¶èŒƒå›´" @@ -1775,11 +1746,11 @@ msgstr "" msgid "EUROPE" msgstr "欧版" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "编辑" @@ -1787,7 +1758,7 @@ msgstr "编辑" msgid "Edit ActionReplay Code" msgstr "编辑动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "编辑设置" @@ -1795,12 +1766,12 @@ msgstr "编辑设置" msgid "Edit Patch" msgstr "编辑补ä¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "编辑当å‰å¤–观" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "编辑..." @@ -1808,7 +1779,7 @@ msgstr "编辑..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1816,7 +1787,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "模拟线程已ç»åœ¨è¿è¡Œ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1825,7 +1796,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1835,19 +1806,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "模拟 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "模拟器状æ€: " -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "å¯ç”¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1857,74 +1828,73 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "å¯ç”¨ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "å¯ç”¨ç¼“å­˜" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "å¯ç”¨ä½œå¼Š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "å¯ç”¨å¤šæ ¸å¤„ç†(加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "å¯ç”¨çƒ­é”®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "å¯ç”¨ç©ºé—²æ­¥è¿›(加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "å¯ç”¨ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "å¯ç”¨å®½å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "å¯ç”¨çº¿æ¡†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1936,17 +1906,17 @@ msgstr "" "Enables anisotropic filtering.\n" "Enhances visual quality of textures that are at oblique viewing angles." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "å¯ç”¨å¿«é€Ÿå…‰ç›˜è®¿é—®. 部分游æˆéœ€è¦. (ON = 快速, OFF = 兼容)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "Enable pages" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1954,7 +1924,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1962,7 +1932,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." @@ -1970,7 +1940,7 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -1980,11 +1950,28 @@ msgstr "" "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " "Fast)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1992,13 +1979,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "å¯ç”¨å†…存管ç†å•å…ƒ,一些游æˆéœ€è¦(ON = 兼容,OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2009,14 +1996,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "英语" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "增强" @@ -2034,17 +2021,17 @@ msgstr "项目 %d/%d" msgid "Entry 1/%d" msgstr "项目 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "等于" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "错误" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "Error loading selected language. Falling back to system default." @@ -2081,32 +2068,32 @@ msgstr "Exception handler - access below memory space. %08llx%08llx" msgid "Execute" msgstr "执行" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "导出失败" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "导出文件" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "导出录制" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "导出录制..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "导出所有存档" @@ -2122,7 +2109,7 @@ msgstr "导出存档为..." msgid "Extension" msgstr "扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "外部å‚æ•°" @@ -2135,44 +2122,44 @@ msgstr "外部å‚æ•°" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "解压缩所有文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "解压缩 Apploader..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "解压缩 DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "解压缩目录..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "解压缩文件..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "解压缩分区..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "解压缩 %s 中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "解压缩所有文件中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "解压缩目录中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "解压缩中..." @@ -2180,7 +2167,7 @@ msgstr "解压缩中..." msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2189,7 +2176,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "法国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST 大å°:" @@ -2197,15 +2184,15 @@ msgstr "FST 大å°:" msgid "Failed to Connect!" msgstr "连接失败!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "监å¬å¤±è´¥!!" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "下载代ç å¤±è´¥." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "解压缩到 %s 失败!" @@ -2316,43 +2303,43 @@ msgstr "写入文件头到 %s 失败" msgid "Failed to write header for file %d" msgstr "写入文件头失败 %d" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "代ç ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "文件未包å«ä»£ç ." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "文件已转æ¢åˆ° .cgi" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2369,7 +2356,7 @@ msgstr "" "File has the extension \"%s\"\n" "valid extensions are (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "文件ä¸èƒ½è¢«è¯†åˆ«æˆå†…å­˜å¡" @@ -2382,19 +2369,19 @@ msgstr "文件ä¸æ˜¯å·²åŽ‹ç¼©æ–‡ä»¶" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2402,29 +2389,29 @@ msgstr "" msgid "First Block" msgstr "第一个区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "修正校检和" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "强制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "强制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "设置终端为 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "å„å‘异性过滤:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2436,7 +2423,7 @@ msgstr "" "Improves texture quality (especially when using a high internal resolution) " "but causes glitches in some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2447,7 +2434,7 @@ msgstr "" "Force the game to output graphics for widescreen resolutions.\n" "Note that this might cause graphical glitches" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2482,45 +2469,45 @@ msgstr "转储框架" msgid "Frame " msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "帧转储使用 FFV1" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "Frame Advance" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "帧数跳跃(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "帧数é™åˆ¶:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "自由视点" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "法语" @@ -2528,16 +2515,16 @@ msgstr "法语" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "å…¨å±" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" @@ -2551,7 +2538,7 @@ msgstr "GCI 文件(*.gci)" msgid "GCMic Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "手柄" @@ -2559,27 +2546,27 @@ msgstr "手柄" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "æ¸¸æˆ ID:" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "游æˆå·²ç»è¿è¡Œ!" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "游æˆæ²¡æœ‰è¿è¡Œ!" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "游æˆæ²¡æ‰¾åˆ°!!" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "游æˆç‰¹æ®Šè®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "游æˆé…ç½®" @@ -2587,25 +2574,25 @@ msgstr "游æˆé…ç½®" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube 手柄设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代ç " @@ -2620,21 +2607,21 @@ msgstr "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported.)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "常规" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "德语" @@ -2643,19 +2630,19 @@ msgstr "德语" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "图形" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "图形设置" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "大于" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2666,7 +2653,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "希腊语" @@ -2686,11 +2673,11 @@ msgstr "绿 å³" msgid "Guitar" msgstr "å‰å®ƒ" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被调用, 请报告bug!" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2698,7 +2685,7 @@ msgstr "" msgid "Header checksum failed" msgstr "头部校检失败" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "希伯æ¥è¯­" @@ -2710,7 +2697,7 @@ msgstr "高度" msgid "Help" msgstr "帮助" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2730,11 +2717,11 @@ msgstr "" msgid "Hide" msgstr "éšè—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "éšè—鼠标光标" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2746,8 +2733,8 @@ msgstr "按模拟器显示输入读å–" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "主机" @@ -2755,17 +2742,17 @@ msgstr "主机" msgid "Hotkey Configuration" msgstr "热键设置" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "热键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "匈牙利语" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" @@ -2791,7 +2778,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL 设置" @@ -2799,19 +2786,19 @@ msgstr "IPL 设置" msgid "IR" msgstr "红外线" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR 指针" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "红外çµæ•åº¦:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" @@ -2823,19 +2810,19 @@ msgstr "æ„大利" msgid "Icon" msgstr "图标" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2845,12 +2832,12 @@ msgstr "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you " "also have to disable Audio Throttle in DSP to make it effective." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "模拟格å¼ä¿®æ”¹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2859,7 +2846,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2868,7 +2855,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "导入存档" @@ -2876,7 +2863,7 @@ msgstr "导入存档" msgid "Import failed, try again?" msgstr "导入失败,è¦é‡è¯•å—?" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2884,11 +2871,11 @@ msgstr "" "导入的文件有一个 gcs 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "导入的文件长度ä¸æ­£ç¡®" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2896,7 +2883,7 @@ msgstr "" "导入的文件有一个 sav 扩展å\n" "但是它没有正确的文件头" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2907,16 +2894,16 @@ msgstr "" "Disable fog. Improves performance but causes glitches in games which rely on " "proper fog emulation." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "进游æˆ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "进游æˆ" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "ä¿¡æ¯" @@ -2924,7 +2911,7 @@ msgstr "ä¿¡æ¯" msgid "Information" msgstr "ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "输入" @@ -2936,7 +2923,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -2944,12 +2931,12 @@ msgstr "æ’å…¥SDå¡" msgid "Insert name here.." msgstr "在这里æ’å…¥å称..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 #, fuzzy msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -2959,36 +2946,36 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" @@ -3009,16 +2996,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "内部 LZO 错误 - lzo_init() 失败" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "å…¨å±åˆ†è¾¨çŽ‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "解释器 (éžå¸¸æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "片头" @@ -3027,11 +3014,11 @@ msgstr "片头" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "无效大å°(%x) 或 魔字(%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "无效值!" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "无效 bat.map 或 目录项目" @@ -3055,7 +3042,7 @@ msgstr "" "%s\n" " You may need to redump this game." -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "无效录制文件" @@ -3063,21 +3050,21 @@ msgstr "无效录制文件" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "Invalid state" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "æ„大利语" @@ -3085,16 +3072,16 @@ msgstr "æ„大利语" msgid "JAPAN" msgstr "日本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç¼–译器 (推è)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL 实验性é‡ç¼–译器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "日语" @@ -3102,7 +3089,7 @@ msgstr "日语" msgid "KOREA" msgstr "韩国" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3110,17 +3097,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "按键" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "韩语" @@ -3138,19 +3125,23 @@ msgstr "L é”®" msgid "L-Analog" msgstr "L-摇æ†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最åŽè¦†ç›–状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最åŽä¿å­˜çŠ¶æ€" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3160,8 +3151,8 @@ msgstr "å·¦" msgid "Left Stick" msgstr "左摇æ†" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3169,7 +3160,7 @@ msgstr "" "左键å•å‡»æ£€æµ‹çƒ­é”®.\n" "按空格清除." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3179,7 +3170,7 @@ msgstr "" "中键å•å‡»æ¸…除.\n" "å³é”®å•å‡»å¾—到更多选项." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3187,78 +3178,78 @@ msgstr "" "å·¦/å³å•å‡»å¾—到更多选项.\n" "中键å•å‡»æ¸…除" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "å°äºŽ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "载入" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "载入精细æè´¨" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "载入存档æ’槽 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "载入存档æ’槽 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "载入存档æ’槽 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "载入存档æ’槽 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "载入存档æ’槽 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "载入存档æ’槽 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "载入存档æ’槽 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "载入存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3270,32 +3261,27 @@ msgstr "Load high-resolution textures from User/Load/Textures//" msgid "Load preset values from hack patterns available." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "é”定线程到核心" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "日志" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "记录设置" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "记录类型" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3303,12 +3289,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "记录输出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "记录中" @@ -3329,7 +3315,7 @@ msgstr "" "MD5 ä¸åŒ¹é…\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3343,24 +3329,24 @@ msgstr "MadCatz Gameshark 文件(*.gcs)" msgid "Main Stick" msgstr "主摇æ†" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "制作者ID:" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "制作者:" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "Memcard already has a save for this title" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "内存å¡å·²ç»æ‰“å¼€" @@ -3370,7 +3356,7 @@ msgid "Memory Byte" msgstr "内存(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "内存å¡" @@ -3405,21 +3391,21 @@ msgstr "" msgid "Menu" msgstr "èœå•" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "Mic" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "Mic" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "其它设置" @@ -3428,7 +3414,7 @@ msgstr "其它设置" msgid "Modifier" msgstr "修改者" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3449,7 +3435,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "马达" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3464,7 +3450,7 @@ msgstr "" msgid "Multiply" msgstr "多人游æˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3562,16 +3548,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "å称:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "å称:" @@ -3580,20 +3566,20 @@ msgstr "å称:" msgid "Native GCI files(*.gci)" msgstr "内部 GCI 文件(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "新建扫æ" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "下一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "下一扫æ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "昵称 :" @@ -3601,7 +3587,7 @@ msgstr "昵称 :" msgid "No Country (SDK)" msgstr "无国家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "未找到镜åƒæˆ–者WAD" @@ -3623,7 +3609,7 @@ msgstr "No docking" msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "没有空闲目录索引项目" @@ -3637,33 +3623,33 @@ msgstr "无效录制文件" msgid "No save folder found for title %s" msgstr "No save folder found for title %s" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "æ— " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "挪å¨è¯­" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "未设置" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未连接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "说明" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "说明: " @@ -3672,7 +3658,7 @@ msgstr "说明: " #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "æ示" @@ -3680,16 +3666,16 @@ msgstr "æ示" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "代ç æ•°é‡: " #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" @@ -3697,11 +3683,11 @@ msgstr "Nunchuk 加速" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "关闭" @@ -3709,52 +3695,52 @@ msgstr "关闭" msgid "Offset:" msgstr "å移é‡:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "åªæœ‰ %d 区å—有效" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "打开文件..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL: ä¸èƒ½åˆ›å»ºè®¾å¤‡ %s 上下文" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL: ä¸èƒ½æ‰¾åˆ°éŸ³é¢‘设备" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL: ä¸èƒ½æ‰“开设备 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3767,7 +3753,7 @@ msgstr "选项" msgid "Orange" msgstr "æ©™" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3777,8 +3763,8 @@ msgstr "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3790,19 +3776,19 @@ msgstr "" "Other client disconnected while game is running!! NetPlay is disabled. You " "manually stop the game." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "输出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "播放录制(&L)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "手柄" @@ -3818,7 +3804,7 @@ msgstr "Page Down" msgid "Page Up" msgstr "Page Up" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "é…对" @@ -3830,35 +3816,35 @@ msgstr "Paragraph" msgid "Parameters" msgstr "å‚æ•°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "分区 %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "è¡¥ä¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš‚åœ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰çº¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "完美" @@ -3867,37 +3853,37 @@ msgstr "完美" msgid "Perspective %d" msgstr "Perspective %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "开始" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "开始/æš‚åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "å¯ä»¥çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "选项" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "请确认..." @@ -3909,55 +3895,55 @@ msgstr "Please create a perspective before saving" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "ç«¯å£ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "ç«¯å£ :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "è‘¡è„牙语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "è‘¡è„牙语(巴西)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3970,11 +3956,11 @@ msgstr "预置: " msgid "Prev Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "上一页" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "上一个值" @@ -3982,7 +3968,7 @@ msgstr "上一个值" msgid "Print" msgstr "打å°" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "é…ç½®" @@ -3990,7 +3976,7 @@ msgstr "é…ç½®" msgid "Properties" msgstr "属性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "清除缓存" @@ -3998,8 +3984,8 @@ msgstr "清除缓存" msgid "Question" msgstr "询问" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "退出" @@ -4017,7 +4003,7 @@ msgstr "R é”®" msgid "R-Analog" msgstr "R-摇æ†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "内存" @@ -4025,50 +4011,50 @@ msgstr "内存" msgid "RUSSIA" msgstr "俄语" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "范围" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "åªè¯»æ¨¡å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "真实" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "真实 Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "真实 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "确认 Wiimote é‡è¿ž" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "Reconnect Wiimote On Load State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "播放录制" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4084,7 +4070,7 @@ msgstr "红 å·¦" msgid "Red Right" msgstr "红 å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4097,29 +4083,29 @@ msgstr "" "This makes the rendered picture look less blocky but also heavily decreases " "performance." -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "刷新" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "刷新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "刷新游æˆåˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4129,17 +4115,17 @@ msgstr "" "Render the scene as a wireframe.\n" "This is only useful for debugging purposes." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "附加到主窗å£" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "结果" @@ -4161,29 +4147,25 @@ msgstr "å³æ‘‡æ†" msgid "Rumble" msgstr "震动" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "Run DSP LLE on a dedicated thread (not recommended)." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "俄语" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "ä¿å­˜çŠ¶æ€(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "采样率:" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "ä¿å­˜" @@ -4191,91 +4173,91 @@ msgstr "ä¿å­˜" msgid "Save GCI as..." msgstr "ä¿å­˜GCI为..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "存档æ’槽 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "存档æ’槽 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "存档æ’槽 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "存档æ’槽 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "存档æ’槽 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "存档æ’槽 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "存档æ’槽 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "存档æ’槽 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "ä¿å­˜çŠ¶æ€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "截图" @@ -4283,25 +4265,25 @@ msgstr "截图" msgid "Scroll Lock" msgstr "Scroll Lock" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "作弊ç æœç´¢" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4312,21 +4294,21 @@ msgid "Section %s not found in SYSCONF" msgstr "Section %s not found in SYSCONF" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "选择" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4344,23 +4326,23 @@ msgstr "选择è¦å¯¼å…¥çš„存档" msgid "Select floating windows" msgstr "选择浮动窗å£" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4377,11 +4359,16 @@ msgstr "" "Force 4:3: Stretch the picture to an aspect ratio of 4:3.\n" "Stretch to window: Stretch the picture to the window size." +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "所选字体" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4391,7 +4378,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4401,11 +4388,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "å‘é€" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "传感器æ ä½ç½®" @@ -4413,25 +4400,25 @@ msgstr "传感器æ ä½ç½®" msgid "Separator" msgstr "分割" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "塞尔维亚语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "" "Serial Port 1 - This is the port which devices such as the net adapter use" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" @@ -4441,11 +4428,17 @@ msgstr "è®¾ç½®ä¸ºé»˜è®¤å†…å­˜å¡ %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive: Index is greater than ar code list size %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "设置..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" @@ -4453,7 +4446,7 @@ msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" msgid "Shake" msgstr "震动" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "短å称:" @@ -4462,107 +4455,107 @@ msgstr "短å称:" msgid "Shoulder Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "显示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "显示日志(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "显示状æ€æ (&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "显示工具æ (&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "显示驱动器" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB å¤åˆ¶èŒƒå›´" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "显示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "显示法国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "显示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "显示输入显示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "显示æ„大利" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "显示日本" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "显示韩国" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "显示语言:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "显示日志设置(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "显示PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "显示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "显示国家" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "å„ç§ç»Ÿè®¡æ•°æ®" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "显示å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "显示美国" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "显示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "显示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "åœæ­¢æ¸¸æˆæ—¶æ˜¾ç¤ºç¡®è®¤å¯¹è¯æ¡†" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4570,39 +4563,39 @@ msgstr "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "显示第一区å—" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "显示存档区å—" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "显示存档注释" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "显示存档图标" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "显示存档标题" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4610,11 +4603,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "显示未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4625,29 +4618,29 @@ msgstr "" msgid "Sideways Wiimote" msgstr "Sideways Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "ç¦ç”¨ç›®æ ‡é€æ˜Žé€šé“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4655,7 +4648,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4665,17 +4658,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "æ’槽 B" @@ -4683,7 +4676,7 @@ msgstr "æ’槽 B" msgid "Snapshot" msgstr "截图" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4695,11 +4688,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "声音设置" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "声音åŽç«¯ %s 无效." @@ -4713,17 +4706,17 @@ msgstr "声音缓冲区创建失败: %s" msgid "Space" msgstr "空格" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "西ç­ç‰™è¯­" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "扬声器音é‡:" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4735,7 +4728,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "æå‡å…‰ç›˜ä¼ è¾“率" @@ -4743,51 +4736,55 @@ msgstr "æå‡å…‰ç›˜ä¼ è¾“率" msgid "Square Stick" msgstr "æ–¹å—é”®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "标准控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "开始" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "开始网络对战(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "开始录制(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "开始录制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "状æ€" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "State Saves" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4796,7 +4793,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "附加到窗å£" @@ -4821,8 +4818,8 @@ msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "系统语言" @@ -4830,7 +4827,7 @@ msgstr "系统语言" msgid "TAIWAN" msgstr "å°æ¹¾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4852,31 +4849,31 @@ msgstr "Table Left" msgid "Table Right" msgstr "Table Right" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "å±å¹•æˆªå›¾(&T)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "测试" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "æè´¨" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "清除缓存" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "æ质格å¼" @@ -4893,13 +4890,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4922,7 +4919,7 @@ msgstr "" msgid "The file %s was already open, the file header will not be written." msgstr "The file %s was already open, the file header will not be written." -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "您指定的文件 %s ä¸å­˜åœ¨" @@ -4939,7 +4936,7 @@ msgstr "å称ä¸èƒ½åŒ…å«å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4947,11 +4944,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "The save you are trying to copy has an invalid file size" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4984,14 +4981,11 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "主题" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "选择主题出现错误" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " @@ -5000,7 +4994,7 @@ msgstr "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -5016,11 +5010,11 @@ msgstr "" "This action replay simulator does not support codes that modify Action " "Replay itself." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "This could cause slow down in Wii Menu and some games." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5031,7 +5025,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5043,7 +5037,7 @@ msgstr "" "Causes major speed improvements on PCs with more than one core, but can also " "cause occasional crashes/glitches." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "This will let you Manually Edit the INI config file" @@ -5057,36 +5051,36 @@ msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "标题" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "顶部" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "切æ¢æ‰€æœ‰æ—¥å¿—类型" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "切æ¢å…¨å±" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "顶部" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "ç¹ä½“中文" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "å·²ç»å°è¯•è½½å…¥æœªçŸ¥æ–‡ä»¶ç±»åž‹." @@ -5106,7 +5100,7 @@ msgstr "" "Trying to read from invalid SYSCONF\n" "Wiimote bt ids are not available" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "土耳其语" @@ -5118,12 +5112,12 @@ msgstr "Turntable" msgid "Type" msgstr "类型" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP 端å£:" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5154,12 +5148,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未定义的 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "撤销载入状æ€" @@ -5167,7 +5161,7 @@ msgstr "撤销载入状æ€" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "未知" @@ -5196,8 +5190,8 @@ msgstr "Unknown message with id:%d received from player:%d Kicking player!" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "æ›´æ–°" @@ -5205,24 +5199,24 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "切æ¢å…¨å±(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "使用å六进制" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "使用警告程åº" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5230,7 +5224,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5239,15 +5233,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "实用扩展" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "值" @@ -5255,23 +5249,23 @@ msgstr "值" msgid "Value:" msgstr "值:" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "值: " -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "详细" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "视频" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "音é‡" @@ -5286,7 +5280,7 @@ msgstr "WAD 安装失败: 创建 %s 错误" msgid "WAD installation failed: error creating ticket" msgstr "WAD 安装失败: 创建 %s 错误" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5295,16 +5289,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "Warning - starting DOL in wrong console mode!" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "Warning - starting ELF in wrong console mode!" @@ -5336,7 +5330,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5344,7 +5338,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5352,7 +5346,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5372,7 +5366,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "波形文件写入器 - 文件未打开." @@ -5380,7 +5374,7 @@ msgstr "波形文件写入器 - 文件未打开." msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" @@ -5388,24 +5382,24 @@ msgstr "宽å±ç ´è§£" msgid "Width" msgstr "宽度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5413,17 +5407,17 @@ msgstr "Wii 存档文件 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD: ä¸èƒ½ä»Žæ–‡ä»¶è¯»å–" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5436,19 +5430,19 @@ msgstr "" "or maybe it is due to idle time out or other reason.\n" "Do you want to reconnect immediately?" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote 已连接" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote 马达" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote 设置" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5469,27 +5463,27 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "工作中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "写入到控制å°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "写入到文件" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "写入到文件" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "写入到窗å£" @@ -5526,23 +5520,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "You can't close panes that have pages in them." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "您必须选择一个游æˆ!!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "您必须输入一个å称!" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必须输入一个å进制或者å六进制值." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5563,7 +5557,7 @@ msgid "" msgstr "" "Your SYSCONF file is the wrong size - should be 0x%04x (but is 0x%04llx)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 破解" @@ -5576,12 +5570,12 @@ msgstr "Zero 3 代ç ä¸æ”¯æŒ" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code unknown to dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 等待中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5593,7 +5587,7 @@ msgstr "" msgid "[Custom]" msgstr "[自定义]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5604,7 +5598,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5613,11 +5607,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -5634,7 +5628,7 @@ msgstr "从 %s 文件读å–æ•°æ®å¤±è´¥." msgid "failed to read header" msgstr "读å–头部失败" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT: Reading Opcode from %x. Please report." @@ -5653,7 +5647,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5665,13 +5659,16 @@ msgstr "" msgid "zNear Correction: " msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| 或" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #, fuzzy #~ msgid "&Frame Stepping" #~ msgstr "帧数跳跃(&K)" @@ -5789,6 +5786,22 @@ msgstr "| 或" #~ msgid "Could not get info about plugin %s" #~ msgstr "ä¸èƒ½åˆ›å»º %s" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "Created by KDE-Look.org" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "Created by VistaIcons.com" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList 缓存" @@ -5802,6 +5815,10 @@ msgstr "| 或" #~ msgid "Disable Lighting" #~ msgstr "ç¦ç”¨å…‰çº¿" +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "åƒç´ æ·±åº¦" + #~ msgid "Disable Textures" #~ msgstr "ç¦ç”¨æè´¨" @@ -6061,6 +6078,10 @@ msgstr "| 或" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "载入指定文件 (DOL,ELF,GCM,ISO,WAD)" +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "é”定线程到核心" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "低级(LLE)或者高级(HLE)音频" @@ -6139,6 +6160,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "è¿è¡Œè„šæœ¬ä¸­...\n" +#~ msgid "Sample Rate:" +#~ msgstr "采样率:" + #~ msgid "Scale:" #~ msgstr "比例:" @@ -6236,6 +6260,9 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "The file " +#~ msgid "Theme selection went wrong" +#~ msgstr "选择主题出现错误" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index 58a6c87044..a052a562a0 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 08:14-0600\n" -"PO-Revision-Date: 2011-03-15 02:51+0800\n" +"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" "Language: Traditional Chinese\n" @@ -16,17 +16,17 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:512 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:510 msgid " (too many to display)" msgstr " (è¦é¡¯ç¤ºçš„項目太多)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:256 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:484 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:523 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:253 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:481 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:520 msgid " Game : " msgstr " éŠæˆ²ï¼š" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 msgid "! NOT" msgstr "! éž" @@ -54,14 +54,7 @@ msgstr "" msgid "%1$sCopy%1$s" msgstr "%1$s複製%1$s" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:366 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:618 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:619 -#, c-format -msgid "%d Hz" -msgstr "%d Hz" - -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, fuzzy, c-format msgid "%i connected" msgstr "已斷開連接" @@ -153,147 +146,147 @@ msgstr "%s匯入 GCI%s" msgid "%u Free Blocks; %u Free Dir Entries" msgstr "剩餘 %u 個å€å¡Šï¼›å‰©é¤˜ %u 個目錄項目" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:510 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:509 msgid "&& AND" msgstr "å’Œ(&&)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:309 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 msgid "&About..." msgstr "關於(&A)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:99 msgid "&Boot from DVD Drive..." msgstr "從 DVD 光碟機啟動(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:245 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 msgid "&Breakpoints" msgstr "中斷點(&B)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:124 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:110 msgid "&Browse for ISOs..." msgstr "ç€è¦½ ISO 檔(&B)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:206 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 msgid "&Cheats Manager" msgstr "作弊檔管ç†å™¨(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:906 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:184 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:170 msgid "&Emulation" msgstr "模擬器(&E)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:113 msgid "&File" msgstr "檔案(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:349 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:335 msgid "&Frame Advance" msgstr "畫格步進(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:366 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:352 msgid "&Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:176 msgid "&Graphics Settings" msgstr "å½±åƒè¨­å®š(&G)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:310 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:296 msgid "&Help" msgstr "說明(&H)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:180 msgid "&Hotkey Settings" msgstr "å¿«æ·éµè¨­å®š(&D)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:247 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:233 msgid "&JIT" msgstr "&JIT" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:162 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:148 msgid "&Load State" msgstr "讀å–進度(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:204 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:190 msgid "&Memcard Manager (GC)" msgstr "GC 記憶å¡ç®¡ç†å™¨(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:246 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:232 msgid "&Memory" msgstr "記憶å¡(&M)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:327 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:313 msgid "&Open..." msgstr "é–‹å•Ÿ(&O)..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:200 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:186 msgid "&Options" msgstr "é¸é …(&O)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:338 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:324 msgid "&Pause" msgstr "æš«åœ(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:340 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:326 msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:888 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 msgid "&Properties" msgstr "屬性(&P)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:348 msgid "&Read-only mode" msgstr "唯讀模å¼(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:333 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:319 msgid "&Refresh List" msgstr "更新列表(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:244 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 msgid "&Registers" msgstr "寄存器(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:346 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:332 msgid "&Reset" msgstr "é‡æ–°å•Ÿå‹•(&R)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:248 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:234 msgid "&Sound" msgstr "è²éŸ³(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:343 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:329 msgid "&Stop" msgstr "åœæ­¢(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:221 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:207 msgid "&Tools" msgstr "工具(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:249 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:235 msgid "&Video" msgstr "å½±åƒ(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:298 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:284 msgid "&View" msgstr "檢視(&V)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:193 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:179 msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:889 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 msgid "&Wiki" msgstr "&Wiki" @@ -313,7 +306,7 @@ msgstr "(-)+zNear" msgid "(UNKNOWN)" msgstr "(未知)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:380 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:377 msgid "(off)" msgstr "(關閉)" @@ -321,19 +314,19 @@ msgstr "(關閉)" msgid "0x44" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:172 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" msgstr "16 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:173 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 msgid "32 bit" msgstr "32 ä½å…ƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 msgid "3D Vision" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:171 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:169 msgid "8 bit" msgstr "8 ä½å…ƒ" @@ -341,20 +334,20 @@ msgstr "8 ä½å…ƒ" msgid "" msgstr "<æ’å…¥å稱>" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:259 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:256 msgid "" msgstr "<無解æžåº¦è¨­å®š>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:78 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:88 msgid "" msgstr "<ç„¡>" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:166 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:166 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:162 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:162 msgid "" msgstr "<按任æ„éµ>" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:291 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 msgid "" msgstr "<系統>" @@ -362,25 +355,27 @@ msgstr "<系統>" msgid "A" msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:221 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:184 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:218 msgid "A NetPlay window is already open!!" msgstr "已經開啟一個網路å°æˆ°è¦–窗ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:366 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:400 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:364 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:398 msgid "A game is not currently running." msgstr "ç›®å‰æ²’有執行éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:210 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 +#, fuzzy msgid "" -"A supported bluetooth device was not found!\n" -"(Only the Microsoft bluetooth stack is supported.)" +"A supported bluetooth device could not be found!\n" +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "找ä¸åˆ°æ”¯æ´çš„è—牙è£ç½®ï¼\n" "(åƒ…æ”¯æ´ Microsoft bluetooth stack 。)" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:92 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" @@ -412,13 +407,13 @@ msgstr "" "\n" "您必須至主機的 TCP 埠å£é€²è¡Œè¨­å®šï¼ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:95 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:100 msgid "AM-Baseboard" msgstr "AM-Baseboard" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:305 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:127 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:304 msgid "AR Codes" msgstr "AR 代碼" @@ -426,19 +421,19 @@ msgstr "AR 代碼" msgid "About Dolphin" msgstr "關於 Dolphin" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" msgstr "加速" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:464 msgid "Accuracy:" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 msgid "Accurate VBeam emulation" msgstr "精確的 VBeam 模擬" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" "Some games depend on this for certain graphical effects or gameplay " @@ -447,8 +442,8 @@ msgid "" "If unsure, check EFB to Texture instead." msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:243 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:243 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:239 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:239 msgid "Action" msgstr "æ“作" @@ -473,7 +468,7 @@ msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" msgstr "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於添加的代碼 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:754 +#: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format msgid "" "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " @@ -496,15 +491,16 @@ msgid "" msgstr "" "Action Replay éŒ¯èª¤ï¼šç„¡æ•ˆçš„å¤§å° (%08x : ä½å€ = %08x) 於寫入至 指示器 (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:801 +#: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay 錯誤：無效的數值 (%08x) 於記憶體複製 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, c-format +#, fuzzy, c-format msgid "" -"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)" +"Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" +"Master codes are not needed. Do not use master codes." msgstr "Action Replay 錯誤：主碼åŠå¯«å…¥è‡³ CCXXXXXX 沒有執行 (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -512,27 +508,27 @@ msgstr "Action Replay 錯誤：主碼åŠå¯«å…¥è‡³ CCXXXXXX 沒有執行 (%s)" msgid "Action Replay Error: invalid AR code line: %s" msgstr "Action Replay 錯誤：無效的 AR 代碼行： %s" -#: Source/Core/Core/Src/ActionReplay.cpp:871 +#: Source/Core/Core/Src/ActionReplay.cpp:872 #, c-format msgid "Action Replay: Conditional Code: Invalid Size %08x (%s)" msgstr "Action Replay：有æ¢ä»¶çš„ä»£ç¢¼ï¼šç„¡æ•ˆçš„å¤§å° %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:944 +#: Source/Core/Core/Src/ActionReplay.cpp:945 #, c-format msgid "Action Replay: Invalid Normal Code Type %08x (%s)" msgstr "Action Replay：無效的一般代碼類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:895 +#: Source/Core/Core/Src/ActionReplay.cpp:896 #, c-format msgid "Action Replay: Normal Code %i: Invalid subtype %08x (%s)" msgstr "Action Replay：一般代碼 %i: 無效的副類型 %08x (%s)" -#: Source/Core/Core/Src/ActionReplay.cpp:837 +#: Source/Core/Core/Src/ActionReplay.cpp:838 #, c-format msgid "Action Replay: Normal Code 0: Invalid Subtype %08x (%s)" msgstr "Action Replay：一般代碼 0: 無效的副類型 %08x (%s)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:246 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:243 msgid "Adapter:" msgstr "é…接器：" @@ -541,11 +537,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1311 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1240 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 msgid "Add Patch" msgstr "新增修正" @@ -553,13 +549,13 @@ msgstr "新增修正" msgid "Add new pane" msgstr "新增é¢ç‰ˆ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:424 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:446 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:749 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Add..." msgstr "新增..." -#: Source/Core/DolphinWX/Src/NetWindow.cpp:73 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:70 msgid "Address :" msgstr "ä½å€..." @@ -598,50 +594,50 @@ msgstr "" "\n" "注æ„：檢查日誌/控制å°è¦–窗檢視å–得的值。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:759 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." msgstr "調整模擬æ–桿控制壓力需è¦æ´»å‹•çš„按鈕。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:513 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" msgstr "進階" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:561 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:566 msgid "Advanced Settings" msgstr "進階設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:667 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:584 #, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:754 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1200 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1502 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1516 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1218 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:109 msgid "All files (*.*)|*.*" msgstr "所有檔案 (*.*)|*.*" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " @@ -650,20 +646,20 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:333 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 #, fuzzy msgid "Alternate Wiimote Timing" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:280 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:371 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘異性éŽæ¿¾ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:354 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:351 msgid "Anti-Aliasing:" msgstr "邊緣抗鋸齒：" @@ -675,31 +671,31 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 msgid "Apploader:" msgstr "程å¼è®€å–器：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:134 msgid "Apply" msgstr "套用" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:122 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 msgid "" "Apply a post-processing effect after finishing a frame.\n" "\n" "If unsure, select (off)." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:292 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:618 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1032 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -707,12 +703,12 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1023 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:727 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:281 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -720,12 +716,12 @@ msgstr "ç•«é¢æ¯”例：" msgid "At least one pane must remain open." msgstr "必須剩餘至少一個é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:241 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:532 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:538 msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -733,26 +729,26 @@ msgstr "è²éŸ³è£ç½®ï¼š" msgid "AudioCommon: Error opening AO device.\n" msgstr "AudioCommon：開啟 AO è£ç½®å‡ºéŒ¯ã€‚\n" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:240 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:250 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Auto" msgstr "自動" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 msgid "Auto (Multiple of 640x528)" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:341 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:338 #, fuzzy msgid "Auto (Window Size)" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:298 #, fuzzy msgid "Auto adjust Window Size" msgstr "視窗尺寸：" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 #, fuzzy msgid "" "Automatically adjusts the window size to your internal resolution.\n" @@ -773,12 +769,12 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" -#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:62 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:210 +#: Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp:60 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:207 #, fuzzy msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -797,15 +793,15 @@ msgid "Bad File Header" msgstr "æ壞的檔頭" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:288 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 msgid "Banner" msgstr "æ©«å¹…" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:539 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:528 msgid "Banner Details" msgstr "圖示明細" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:503 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 msgid "Banner:" msgstr "橫幅：" @@ -813,11 +809,11 @@ msgstr "橫幅：" msgid "Bar" msgstr "Bar" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:312 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:309 msgid "Basic" msgstr "基本" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:555 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:560 msgid "Basic Settings" msgstr "基本設定" @@ -845,42 +841,42 @@ msgstr "è— å·¦" msgid "Blue Right" msgstr "è— å³" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:275 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:277 msgid "Bottom" msgstr "下方" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:242 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:241 #, c-format msgid "Bound Controls: %lu" msgstr "ç¶å®šæŽ§åˆ¶å™¨ï¼š%lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 msgid "Broken" msgstr "ç ´æ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse" msgstr "ç€è¦½" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:239 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 msgid "Browse for a directory to add" msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:436 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:422 msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1098 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:314 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 msgid "Buffer:" msgstr "ç·©è¡ï¼š" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:71 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:21 #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:119 msgid "Buttons" msgstr "按鈕" @@ -902,26 +898,16 @@ msgstr "C-æ–æ¡¿" msgid "CP reg" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" msgstr "CPU 模擬引擎" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:491 #, fuzzy msgid "Cache Display Lists" msgstr "開啟顯示列表快å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 -msgid "" -"Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" -"In contrast to pixel lighting (which is merely an enhancement), per-pixel " -"depth calculations are necessary to properly emulate a small number of " -"games.\n" -"\n" -"If unsure, leave this checked." -msgstr "" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 msgid "" "Calculate lighting of 3D graphics per-pixel rather than per vertex.\n" "Decreases emulation speed by some percent (depending on your GPU).\n" @@ -930,7 +916,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:138 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:136 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:41 msgid "Cancel" msgstr "å–消" @@ -946,7 +932,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1022 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -956,7 +942,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1045 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -964,12 +950,12 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1855 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" msgstr "找ä¸åˆ° WiiMote ä¾ bd： %02x:%02x:%02x:%02x:%02x:%02x" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1869 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format msgid "Cant find WiiMote by connection handle %02x" msgstr "找ä¸åˆ° WiiMote ä¾é€£æŽ¥é … %02x" @@ -983,7 +969,7 @@ msgstr "無法讀å–從 DVD_Plugin - DVD-ç•Œé¢ï¼šåš´é‡éŒ¯èª¤" msgid "Caps Lock" msgstr "Caps Lock" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:293 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" msgstr "" @@ -991,24 +977,24 @@ msgstr "" msgid "Center" msgstr "中心" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:561 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:558 msgid "Change" msgstr "更改" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:330 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:316 msgid "Change &Disc..." msgstr "æ›´æ›å…‰ç¢Ÿ(&D)..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:179 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:179 msgid "Change Disc" msgstr "æ›´æ›å…‰ç¢Ÿ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:549 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:546 msgid "Change Game" msgstr "æ›´æ›éŠæˆ²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 msgid "" "Change the language of the user interface.\n" "Requires restart." @@ -1024,12 +1010,11 @@ msgstr "更改 zFar åƒæ•¸ç¬¦è™Ÿ (在修正後)" msgid "Changes sign to zNear Parameter (after correction)" msgstr "更改 zNear åƒæ•¸çš„符號 (在修正後)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:508 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:504 msgid "Changing this will have no effect while the emulator is running!" msgstr "更改此é¸é …在模擬器執行時沒有效果ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:281 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:278 msgid "Chat" msgstr "èŠå¤©" @@ -1037,48 +1022,48 @@ msgstr "èŠå¤©" msgid "Cheat Code" msgstr "作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:132 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:130 msgid "Cheat Search" msgstr "尋找作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:39 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:37 msgid "Cheats Manager" msgstr "作弊代碼管ç†å™¨" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:643 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:756 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:753 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1171 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1009 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1086,14 +1071,14 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:757 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" msgstr "é¸æ“‡ä½œç‚ºç¨‹å¼è®€å–器的檔案：(åƒ…ç”¨æ–¼ä¾†è®€å– å…‰ç¢Ÿçš„ç›®éŒ„çµæ§‹)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:787 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:826 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 msgid "Choose the folder to extract to" msgstr "é¸æ“‡æå–的資料夾存放ä½ç½®" @@ -1107,8 +1092,8 @@ msgstr "Classic" #: Source/Core/DolphinWX/Src/LogWindow.cpp:160 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:43 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:917 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:490 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 msgid "Clear" msgstr "清除" @@ -1118,22 +1103,22 @@ msgid "" "manually stop the game." msgstr "在éŠæˆ²åŸ·è¡Œæ™‚客戶端斷開連接ï¼ï¼ç¶²è·¯å°æˆ°å·²ç¶“被關閉。您必須手動åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:293 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:572 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:584 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:561 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:579 msgid "Close" msgstr "關閉" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:188 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:174 msgid "Co&nfigure..." msgstr "設定(&N)..." -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:85 msgid "Code Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:569 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:567 msgid "Code: " msgstr "代碼：" @@ -1145,92 +1130,92 @@ msgstr "命令" msgid "Comment" msgstr "註釋" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:501 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:913 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Compressing ISO" msgstr "正在壓縮 ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Config" msgstr "設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:44 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154 msgid "Configure" msgstr "設定" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:115 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:114 msgid "Configure Control" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:292 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:580 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:289 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:577 msgid "Configure Pads" msgstr "設定控制器" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:443 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:429 msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1135 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1163 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1228 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:581 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:582 #, fuzzy msgid "Confirm on Stop" msgstr "確èªåœæ­¢" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:66 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:88 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:63 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:85 msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:721 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:376 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:362 #, c-format msgid "Connect Wiimote %i" msgstr "連接 Wiimote %i" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:199 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:199 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:195 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:195 msgid "Connect Wiimote 1" msgstr "連接 Wiimote 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 msgid "Connect Wiimote 2" msgstr "連接 Wiimote 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 msgid "Connect Wiimote 3" msgstr "連接 Wiimote 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:198 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:198 msgid "Connect Wiimote 4" msgstr "連接 Wiimote 4" -#: Source/Core/DolphinWX/Src/Main.cpp:596 +#: Source/Core/DolphinWX/Src/Main.cpp:629 msgid "Connecting..." msgstr "正在連接..." @@ -1250,12 +1235,12 @@ msgstr "轉æ›ç‚º GCI" msgid "Copy failed" msgstr "複製失敗" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:799 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 #, c-format msgid "Copy to Memcard %c" msgstr "è¤‡è£½è‡³è¨˜æ†¶å¡ %c" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:365 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:363 msgid "Core" msgstr "核心" @@ -1264,7 +1249,7 @@ msgstr "核心" msgid "Could not create %s" msgstr "無法建立 %s" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:69 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:73 #, c-format msgid "Could not initialize backend %s." msgstr "無法åˆå§‹åŒ– backend %s。" @@ -1285,12 +1270,12 @@ msgstr "" msgid "Could not recognize ISO file %s" msgstr "無法識別 ISO 檔案 %s" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:589 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:578 #, c-format msgid "Could not save %s" msgstr "無法儲存 %s" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:544 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:541 msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" @@ -1310,11 +1295,11 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1143 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" -#: Source/Core/Core/Src/BootManager.cpp:144 +#: Source/Core/Core/Src/BootManager.cpp:143 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1322,17 +1307,17 @@ msgstr "" "無法åˆå§‹åŒ–核心。\n" "請檢查您的設定。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:184 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:508 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:182 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:506 msgid "Count:" msgstr "數é‡ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:472 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:461 msgid "Country:" msgstr "國別：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:187 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:563 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:185 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:561 msgid "Create AR Code" msgstr "建立 AR 代碼" @@ -1341,24 +1326,7 @@ msgstr "建立 AR 代碼" msgid "Create new perspective" msgstr "建立一個新的é€æª¢è¦–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:501 -msgid "Created by KDE-Look.org" -msgstr "ç”± KDE-Look.org 製åš" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 -msgid "" -"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" -msgstr "ç”± Milosz Wlazlo è£½åš [miloszwl@miloszwl.com, miloszwl.deviantart.com]" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:499 -msgid "Created by VistaIcons.com" -msgstr "ç”± VistaIcons.com 製åš" - -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:500 -msgid "Created by black_rider and published on ForumW.org > Web Developments" -msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" - -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:28 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 msgid "Creator: " msgstr "作者：" @@ -1366,11 +1334,11 @@ msgstr "作者：" msgid "Critical" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:553 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" msgstr "剪è£" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 msgid "" "Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n" "\n" @@ -1381,12 +1349,12 @@ msgstr "" msgid "Crossfade" msgstr "Crossfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:680 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:597 #, c-format msgid "Current dir changed from %s to %s after wxFileSelector!" msgstr "ç›®å‰çš„目錄在 wxFileSelector 後從 %s 更改至 %s ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:343 msgid "Custom Projection Hack" msgstr "自訂投影修正" @@ -1394,11 +1362,11 @@ msgstr "自訂投影修正" msgid "Custom Projection Hack Settings" msgstr "自訂投影修正設定" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:348 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 msgid "Customize some Orthographic Projection parameters." msgstr "自訂一些直線投影åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" msgstr "Czech" @@ -1410,37 +1378,37 @@ msgstr "" msgid "D-Pad" msgstr "åå­—æ–¹å‘éµ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:606 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:251 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:261 msgid "DSP HLE emulation (fast)" msgstr "DSP HLE 模擬器 (å¿«)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:253 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263 msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:608 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:252 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262 msgid "DSP LLE recompiler" msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:431 msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 msgid "DVD Root:" msgstr "DVD 根：" @@ -1452,11 +1420,11 @@ msgstr "" msgid "DVDLowUnencryptedRead - Fatal Error: failed to read from volume" msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:177 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:175 msgid "Data Size" msgstr "資料大å°" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:469 msgid "Date:" msgstr "日期：" @@ -1473,11 +1441,11 @@ msgstr "Datel MaxDrive/Pro 檔案(*.sav)" msgid "Dead Zone" msgstr "éžä½œç”¨å€" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 msgid "Debug" msgstr "除錯" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:525 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 #, fuzzy msgid "Debugging" msgstr "除錯" @@ -1486,24 +1454,24 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:911 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1104 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1232 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Decompressing ISO" msgstr "ISO 解壓中" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:916 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:915 msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" @@ -1512,11 +1480,11 @@ msgid "Default font" msgstr "é è¨­çš„å­—åž‹" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:32 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:930 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 msgid "Delete" msgstr "刪除" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:800 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 msgid "Delete Save" msgstr "刪除存檔" @@ -1525,12 +1493,12 @@ msgstr "刪除存檔" msgid "Delete the existing file '%s'?" msgstr "刪除已存在的檔案 '%s' ？" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:677 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:672 #, fuzzy msgid "Description" msgstr "å•é¡Œ" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Detect" msgstr "檢測" @@ -1543,13 +1511,13 @@ msgstr "" "Detected attempt to read more data from the DVD than fit inside the out " "buffer. Clamp." -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:131 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:902 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:688 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:736 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1573,22 +1541,17 @@ msgstr "" "目錄校驗失敗\n" " 並且目錄備份校驗失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 #, fuzzy msgid "Disable" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:492 msgid "Disable Fog" msgstr "關閉霧化" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 -#, fuzzy -msgid "Disable Per-Pixel Depth" -msgstr "åƒç´ æ·±åº¦" - -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" "Speeds up emulation a lot but causes heavy glitches in many games which rely " @@ -1597,7 +1560,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" "These are often used for post-processing or render-to-texture effects, so " @@ -1607,7 +1570,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" msgstr "光碟" @@ -1616,11 +1579,11 @@ msgstr "光碟" msgid "Disc Read Error" msgstr "光碟讀å–錯誤" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:316 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:313 msgid "Display" msgstr "顯示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 #, fuzzy msgid "" "Display the inputs read by the emulator.\n" @@ -1632,20 +1595,24 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1100 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:949 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +msgid "Dolby Pro Logic II decoder" +msgstr "" + +#: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:186 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:183 #, c-format msgid "Dolphin %s Graphics Configuration" msgstr "Dolphin %s å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:306 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:292 msgid "Dolphin &Web Site" msgstr "Dolphin 官網(&W)" @@ -1653,54 +1620,59 @@ msgstr "Dolphin 官網(&W)" msgid "Dolphin Configuration" msgstr "Dolphin 模擬器設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:188 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:186 msgid "Dolphin Emulated Wiimote Configuration" msgstr "Dolphin 模擬 Wiimote 設定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:389 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:393 #, fuzzy msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1252 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:764 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:681 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:15 msgid "Dolphin Wiimote Configuration" msgstr "Dolphin Wiimote 設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:307 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:341 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin 找ä¸åˆ°ä»»ä½• GC/Wii ISO。按兩下這裡ç€è¦½æª”案..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:345 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所有éŠæˆ²..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +msgid "Dolphin was unable to complete the requested action." +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 msgid "Down" msgstr "下" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:55 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:53 msgid "Download Codes (WiiRD Database)" msgstr "下載代碼 (WiiRD 數據庫)" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:298 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:296 #, c-format msgid "Downloaded %lu codes. (added %lu)" msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" @@ -1709,34 +1681,34 @@ msgstr "已下載 %lu æ¢ä»£ç¢¼ã€‚ (已添加 %lu æ¢)" msgid "Drums" msgstr "Drums" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:89 msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:609 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 msgid "Dump Audio" msgstr "轉儲è²éŸ³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:533 msgid "Dump EFB Target" msgstr "轉儲 EFB 目標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 msgid "Dump Frames" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:534 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:531 msgid "Dump Textures" msgstr "轉儲紋ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:112 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 msgid "" "Dump all rendered frames to an AVI file in User/Dump/Frames/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:109 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:106 #, fuzzy msgid "" "Dump decoded game textures to User/Dump/Textures//\n" @@ -1744,24 +1716,24 @@ msgid "" "If unsure, leave this unchecked." msgstr "轉儲éŠæˆ²ç´‹ç†è‡³ User/Dump/Textures//" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 msgid "" "Dump the contents of EFB copies to User/Dump/Textures/\n" "\n" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:494 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" msgstr "Dutch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:126 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" msgstr "離開(&X)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:434 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:432 #, fuzzy msgid "EFB Copies" msgstr "EFB 複製範åœ" @@ -1781,11 +1753,11 @@ msgstr "" msgid "EUROPE" msgstr "EUROPE" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:151 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:155 msgid "Early Memory Updates" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit" msgstr "編輯" @@ -1793,7 +1765,7 @@ msgstr "編輯" msgid "Edit ActionReplay Code" msgstr "編輯 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:290 msgid "Edit Config" msgstr "編輯 ini 設定檔" @@ -1801,12 +1773,12 @@ msgstr "編輯 ini 設定檔" msgid "Edit Patch" msgstr "編輯修正" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:461 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 msgid "Edit current perspective" msgstr "編輯目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:423 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:445 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434 msgid "Edit..." msgstr "編輯..." @@ -1814,7 +1786,7 @@ msgstr "編輯..." msgid "Effect" msgstr "效果" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:428 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:426 msgid "Embedded Frame Buffer" msgstr "" @@ -1822,7 +1794,7 @@ msgstr "" msgid "Emu Thread already running" msgstr "模擬器線程已經執行中" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:108 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" "Slows down emulation a lot and prohibits high-resolution rendering but is " @@ -1831,7 +1803,7 @@ msgid "" "If unsure, check virtual XFB emulation instead." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" "Fixes many games which don't work without XFB emulation while not being as " @@ -1841,19 +1813,19 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Emulated Wiimote" msgstr "模擬 Wiimote" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:352 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:350 msgid "Emulation State: " msgstr "模擬狀態：" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:20 msgid "Enable" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" "Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " "supported by your GPU.\n" @@ -1863,74 +1835,73 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:112 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:110 msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "Enable BAT" msgstr "é–‹å•Ÿ BAT" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:327 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:337 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:335 msgid "Enable Bounding Box Calculation" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 #, fuzzy msgid "Enable Cache" msgstr "é–‹å•Ÿå¿«å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 msgid "Enable Cheats" msgstr "開啟作弊" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:314 msgid "Enable Dual Core" msgstr "開啟雙核心" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:545 msgid "Enable Dual Core (speedup)" msgstr "開啟雙核心 (加速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:554 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:551 msgid "Enable Hotkeys" msgstr "é–‹å•Ÿå¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:315 msgid "Enable Idle Skipping" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:546 msgid "Enable Idle Skipping (speedup)" msgstr "é–‹å•Ÿç•¥éŽç©ºé–’ (加速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:316 msgid "Enable MMU" msgstr "é–‹å•Ÿ MMU" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:560 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:555 msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:714 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:330 msgid "Enable WideScreen" msgstr "開啟寬螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:517 msgid "Enable Wireframe" msgstr "開啟線框" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 #, fuzzy msgid "" "Enable anisotropic filtering.\n" @@ -1942,17 +1913,17 @@ msgstr "" "é–‹å•Ÿå„ç•°å‘性éŽæ¿¾ã€‚\n" "通éŽæŸ”化å¯è¦‹çš„多邊形增強紋ç†çš„視覺å“質。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 msgid "" "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " "Compatible)" msgstr "開啟快速光碟存å–。部份éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" msgstr "開啟分é ç€è¦½" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 msgid "" "Enable this if you want the whole screen to be used for rendering.\n" "If this is disabled, a render window will be created instead.\n" @@ -1960,7 +1931,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" "Enable this if you want to use the main Dolphin window for rendering rather " "than a separate render window.\n" @@ -1968,13 +1939,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:341 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." msgstr "é–‹å•Ÿæ­¤é¸é …將加速塞爾é”傳說：曙光公主，請勿在其它éŠæˆ²ä¸­ä½¿ç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "" "Enables Block Address Translation (BAT); a function of the Memory Management " "Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " @@ -1983,11 +1954,28 @@ msgstr "" "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" "速度會變慢。(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:346 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" + +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" "Enables progressive scan if supported by the emulated software.\n" "Most games don't care about this.\n" @@ -1995,13 +1983,13 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" "Enables the Memory Management Unit, needed for some games. (ON = Compatible, " "OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:114 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" "Encode frame dumps using the FFV1 codec.\n" "\n" @@ -2012,14 +2000,14 @@ msgstr "" msgid "End" msgstr "End" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:489 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" msgstr "English" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:333 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:410 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 msgid "Enhancements" msgstr "增強" @@ -2037,17 +2025,17 @@ msgstr "é …ç›® %d/%d" msgid "Entry 1/%d" msgstr "é …ç›® 1/%d" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 msgid "Equal" msgstr "等於" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Error" msgstr "錯誤" -#: Source/Core/DolphinWX/Src/Main.cpp:345 +#: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." msgstr "讀å–é¸æ“‡çš„語系出錯。返回使用系統é è¨­å€¼ã€‚" @@ -2083,32 +2071,32 @@ msgstr "處ç†ç•°å¸¸ - å­˜å–下列記憶體空間。 %08llx%08llx" msgid "Execute" msgstr "執行" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:458 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:457 msgid "Export Failed" msgstr "匯出失敗" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:659 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:648 msgid "Export File" msgstr "匯出檔案" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 msgid "Export Recording" msgstr "匯出錄åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:359 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:345 msgid "Export Recording..." msgstr "匯出錄åƒ..." -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805 msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:895 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806 msgid "Export all saves" msgstr "匯出所有存檔" @@ -2124,7 +2112,7 @@ msgstr "匯出存檔為..." msgid "Extension" msgstr "æ“´å……" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:476 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:474 #, fuzzy msgid "External Frame Buffer" msgstr "é¡å¤–åƒæ•¸" @@ -2137,44 +2125,44 @@ msgstr "é¡å¤–åƒæ•¸" msgid "Extra Parameter useful in ''Metroid: Other M'' only." msgstr "僅在 ''銀河戰士：å¦ä¸€å€‹ M'' 中有效的é¡å¤–åƒæ•¸ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:634 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." msgstr "æå–所有檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:636 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:625 msgid "Extract Apploader..." msgstr "æå–程å¼è®€å–器..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:637 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:626 msgid "Extract DOL..." msgstr "æå– DOL..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:630 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:619 msgid "Extract Directory..." msgstr "æå–資料夾..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:621 msgid "Extract File..." msgstr "æå–檔案..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:628 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:617 msgid "Extract Partition..." msgstr "æå–分割å€..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:744 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:733 #, c-format msgid "Extracting %s" msgstr "%s æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting All Files" msgstr "所有檔案æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:727 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:716 msgid "Extracting Directory" msgstr "資料夾æå–中" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:730 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:719 msgid "Extracting..." msgstr "æå–中..." @@ -2182,7 +2170,7 @@ msgstr "æå–中..." msgid "FIFO Byte" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:40 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:44 #, fuzzy msgid "FIFO Player" msgstr "玩家" @@ -2191,7 +2179,7 @@ msgstr "玩家" msgid "FRANCE" msgstr "FRANCE" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:473 msgid "FST Size:" msgstr "FST 大å°" @@ -2199,15 +2187,15 @@ msgstr "FST 大å°" msgid "Failed to Connect!" msgstr "連接失敗ï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:211 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:208 msgid "Failed to Listen!!" msgstr "監è½å¤±æ•—ï¼ï¼" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:308 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:306 msgid "Failed to download codes." msgstr "下載代碼失敗。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:847 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:836 #, c-format msgid "Failed to extract to %s!" msgstr "æå–至 %s 失敗ï¼" @@ -2318,43 +2306,43 @@ msgstr "檔案 %s 寫入檔頭失敗" msgid "Failed to write header for file %d" msgstr "檔案 %d 寫入檔頭失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:470 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:322 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" -#: Source/Core/Core/Src/Movie.cpp:1039 +#: Source/Core/Core/Src/Movie.cpp:1052 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:213 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:199 #, fuzzy msgid "Fifo Player" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:94 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:98 #, fuzzy msgid "File Info" msgstr "代碼訊æ¯" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:305 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:303 msgid "File contained no codes." msgstr "檔案未å«æœ‰ä»£ç¢¼ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:412 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:411 msgid "File converted to .gci" msgstr "檔案已轉æ›ç‚º .gci" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:427 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:426 msgid "" "File could not be opened\n" "or does not have a valid extension" @@ -2371,7 +2359,7 @@ msgstr "" "檔案有副檔å \"%s\"\n" "有效的副檔å是 (.raw/.gcp)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:424 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:423 msgid "File is not recognized as a memcard" msgstr "檔案未被識別為一張記憶å¡" @@ -2384,19 +2372,19 @@ msgstr "檔案未壓縮" msgid "FileIO: Unknown open mode : 0x%02x" msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:551 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:540 msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1136 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:260 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:261 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" msgstr "" @@ -2404,29 +2392,29 @@ msgstr "" msgid "First Block" msgstr "首數據å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:809 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 msgid "Fix Checksums" msgstr "修正校驗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 16:9" msgstr "強制 16:9" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Force 4:3" msgstr "強制 4:3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:548 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:553 #, fuzzy msgid "Force Console as NTSC-J" msgstr "設定主機為 NTSC-J" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:402 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:399 #, fuzzy msgid "Force Texture Filtering" msgstr "強制éŽæ¿¾" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 #, fuzzy msgid "" "Force texture filtering even if the emulated game explicitly disabled it.\n" @@ -2437,7 +2425,7 @@ msgstr "" "強制雙線型紋ç†éŽæ¿¾ç„¡è«–éŠæˆ²æ˜¯å¦æ˜Žç¢ºè¡¨ç¤ºæ˜¯å¦ç¦ç”¨å®ƒã€‚\n" "改進紋ç†å“質 (特別是使用高解æžåº¦ç´‹ç†æ™‚)但是å¯èƒ½å°Žè‡´æŸäº›éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:79 #, fuzzy msgid "" "Force the game to output graphics for widescreen resolutions.\n" @@ -2448,7 +2436,7 @@ msgstr "" "強制éŠæˆ²è¼¸å‡ºå¯¬èž¢å¹•è§£æžåº¦çš„å½±åƒã€‚\n" "注æ„這å¯èƒ½å°Žè‡´åœ–å½¢å•é¡Œ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" "Left unchecked, dolphin defaults to NTSC-U and automatically enables this " @@ -2483,45 +2471,45 @@ msgstr "轉儲畫格" msgid "Frame " msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:189 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:189 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:185 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:185 msgid "Frame Advance" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:537 #, fuzzy msgid "Frame Dumps use FFV1" msgstr "FFV1 畫格轉儲" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:222 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 #, fuzzy msgid "Frame Info" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:111 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 #, fuzzy msgid "Frame Range" msgstr "畫格步進" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:138 msgid "Frame S&kipping" msgstr "ç•«æ ¼çœç•¥(&K)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:557 msgid "Framelimit:" msgstr "畫格速é™åˆ¶ï¼š" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:199 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:203 msgid "Frames To Record" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:538 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 msgid "Free Look" msgstr "自由視點" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:491 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" msgstr "French" @@ -2529,16 +2517,16 @@ msgstr "French" msgid "Frets" msgstr "Frets" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:113 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:132 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:117 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:136 msgid "From" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 msgid "FullScr" msgstr "全螢幕" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:260 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:257 #, fuzzy msgid "Fullscreen resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" @@ -2552,7 +2540,7 @@ msgstr "GCI 檔案(*.gci)" msgid "GCMic Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "GCPad" msgstr "GC 控制器" @@ -2560,27 +2548,27 @@ msgstr "GC 控制器" msgid "GX_CMD_INVL_VC" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:468 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:457 msgid "Game ID:" msgstr "éŠæˆ² ID ：" -#: Source/Core/Core/Src/NetPlay.cpp:228 +#: Source/Core/Core/Src/NetPlay.cpp:229 msgid "Game is already running!" msgstr "éŠæˆ²æ­£åœ¨åŸ·è¡Œï¼" -#: Source/Core/Core/Src/NetPlay.cpp:258 +#: Source/Core/Core/Src/NetPlay.cpp:259 msgid "Game isn't running!" msgstr "éŠæˆ²æœªåŸ·è¡Œï¼" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:382 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:379 msgid "Game not found!!" msgstr "找ä¸åˆ°éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:405 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:394 msgid "Game-Specific Settings" msgstr "éŠæˆ²è¦æ ¼è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:299 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:298 msgid "GameConfig" msgstr "éŠæˆ²è¨­å®š" @@ -2588,25 +2576,25 @@ msgstr "éŠæˆ²è¨­å®š" msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:533 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" msgstr "Gamecube" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:192 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:178 msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1013 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:432 msgid "Gamecube Pad settings" msgstr "Gamecube 控制器設定" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:307 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:129 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:306 msgid "Gecko Codes" msgstr "Gecko 代碼" @@ -2621,21 +2609,21 @@ msgstr "" "GeckoCode 無法執行 (CT%i CST%i) (%s)\n" "(一個æ毀的代碼或ä¸æ”¯æ´çš„代碼類型。)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:530 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:201 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:198 msgid "General" msgstr "一般" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:144 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:142 #, fuzzy msgid "General Settings" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:490 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" msgstr "German" @@ -2644,19 +2632,19 @@ msgstr "German" msgid "GetARCode: Index is greater than ar code list size %lu" msgstr "GetARCode：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:444 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics settings" msgstr "å½±åƒè¨­å®š" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:219 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 msgid "Greater Than" msgstr "大於" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:85 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" "Greatly increases quality of textures generated using render to texture " "effects.\n" @@ -2667,7 +2655,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" msgstr "Greek" @@ -2687,11 +2675,11 @@ msgstr "綠 å³" msgid "Guitar" msgstr "Guitar" -#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1247 +#: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1248 msgid "HCI_CMD_INQUIRY is called, please report!" msgstr "HCI_CMD_INQUIRY 被調用，請回報ï¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:424 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:422 msgid "Hacks" msgstr "" @@ -2699,7 +2687,7 @@ msgstr "" msgid "Header checksum failed" msgstr "檔頭校驗失敗" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" msgstr "Hebrew" @@ -2711,7 +2699,7 @@ msgstr "高度" msgid "Help" msgstr "說明" -#: Source/Core/DolphinWX/Src/Main.cpp:195 +#: Source/Core/DolphinWX/Src/Main.cpp:207 msgid "" "Hi,\n" "\n" @@ -2731,11 +2719,11 @@ msgstr "" msgid "Hide" msgstr "éš±è—" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:303 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 msgid "Hide Mouse Cursor" msgstr "éš±è—滑鼠游標" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:75 #, fuzzy msgid "" "Hides the mouse cursor if it's on top of the emulation window.\n" @@ -2747,8 +2735,8 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Home" msgstr "Home" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:68 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:121 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:65 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:118 msgid "Host" msgstr "主機" @@ -2756,17 +2744,17 @@ msgstr "主機" msgid "Hotkey Configuration" msgstr "å¿«æ·éµè¨­å®š" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:575 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:272 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:272 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:579 msgid "Hotkeys" msgstr "å¿«æ·éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" msgstr "Hungarian" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" msgstr "æ··åˆ Wiimote" @@ -2791,7 +2779,7 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:686 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 msgid "IPL Settings" msgstr "IPL 設定" @@ -2799,19 +2787,19 @@ msgstr "IPL 設定" msgid "IR" msgstr "IR" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23 msgid "IR Pointer" msgstr "IR 指示器" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:98 msgid "IR Sensitivity:" msgstr "IR éˆæ•åº¦ï¼š" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:522 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:511 msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2823,18 +2811,18 @@ msgstr "ITALY" msgid "Icon" msgstr "圖示" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 msgid "" "If checked, the bounding box registers will be updated. Used by the Paper " "Mario games." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 msgid "" "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" msgstr "開啟記憶體管ç†å–®å…ƒï¼ŒæŸäº›éŠæˆ²éœ€è¦ã€‚(ON = 兼容ã€OFF = 快速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:487 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 #, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " @@ -2844,12 +2832,12 @@ msgstr "" "如果您è¦è¨­å®šç•«æ ¼æ•¸é™åˆ¶å¤§æ–¼éŠæˆ²çš„速度 (NTSC:60, PAL:50)，您就需è¦åŒæ™‚關閉 DSP " "中的è²éŸ³ç¯€æµé–¥æ‰èƒ½ä½¿å…¶ç”Ÿæ•ˆã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:431 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 #, fuzzy msgid "Ignore Format Changes" msgstr "模擬格å¼è®ŠåŒ–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" "Improves performance in many games without any negative effect. Causes " @@ -2858,7 +2846,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" "Improves performance in some games, but might disable some gameplay-related " @@ -2867,7 +2855,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804 msgid "Import Save" msgstr "匯入存檔" @@ -2875,7 +2863,7 @@ msgstr "匯入存檔" msgid "Import failed, try again?" msgstr "匯入失敗，是å¦é‡è©¦ï¼Ÿ" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:453 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:452 msgid "" "Imported file has gsc extension\n" "but does not have a correct header" @@ -2883,11 +2871,11 @@ msgstr "" "匯入的檔案有 gsc 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:441 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:440 msgid "Imported file has invalid length" msgstr "匯入的檔案有無效的長度" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:450 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:449 msgid "" "Imported file has sav extension\n" "but does not have a correct header" @@ -2895,7 +2883,7 @@ msgstr "" "匯入的檔案有 sav 副檔å\n" "但是沒有正確的檔頭" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 #, fuzzy msgid "" "Improves performance but causes glitches in most games which rely on proper " @@ -2904,16 +2892,16 @@ msgid "" "If unsure, leave this unchecked." msgstr "關閉霧化。改善效能，但是å¯èƒ½å°Žè‡´éœ€è¦é©ç•¶éœ§åŒ–模擬的éŠæˆ²å‡ºç¾åœ–形錯誤。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:354 msgid "In Game" msgstr "éŠæˆ²ä¸­" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:591 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:588 msgid "In-Game" msgstr "éŠæˆ²ä¸­" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:49 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:310 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:309 msgid "Info" msgstr "訊æ¯" @@ -2921,7 +2909,7 @@ msgstr "訊æ¯" msgid "Information" msgstr "訊æ¯" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Input" msgstr "輸入" @@ -2933,7 +2921,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -2941,11 +2929,11 @@ msgstr "æ’å…¥ SD å¡" msgid "Insert name here.." msgstr "在這裡æ’å…¥å稱.." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:196 msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:915 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -2954,35 +2942,35 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1410 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:905 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:911 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:910 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:902 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format msgid "" "Integrity check for partition %d failed. Your dump is most likely corrupted " "or has been patched incorrectly." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:531 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 #, fuzzy msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:593 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" @@ -3003,16 +2991,16 @@ msgstr "" msgid "Internal LZO Error - lzo_init() failed" msgstr "內部 LZO 錯誤 - lzo_init() 失敗" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:348 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:345 #, fuzzy msgid "Internal Resolution:" msgstr "全螢幕顯示解æžåº¦ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:246 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:256 msgid "Interpreter (VERY slow)" msgstr "解釋器 (éžå¸¸ç·©æ…¢)" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 msgid "Intro" msgstr "標題" @@ -3021,11 +3009,11 @@ msgstr "標題" msgid "Invalid Size(%x) or Magic word (%x)" msgstr "無效大å°(%x) 或 Magic word (%x)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:613 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:611 msgid "Invalid Value!" msgstr "無效的數值ï¼" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:461 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:460 msgid "Invalid bat.map or dir entry" msgstr "無效的 bat.map 或目錄項目" @@ -3049,7 +3037,7 @@ msgstr "" "%s\n" " å¯èƒ½éœ€è¦é‡æ–°è½‰å„²é€™å€‹éŠæˆ²ã€‚" -#: Source/Core/Core/Src/Movie.cpp:722 +#: Source/Core/Core/Src/Movie.cpp:735 msgid "Invalid recording file" msgstr "無效的錄åƒæª”" @@ -3057,21 +3045,21 @@ msgstr "無效的錄åƒæª”" msgid "Invalid search parameters (no object selected)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:451 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:439 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:528 +#: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" msgstr "無效的狀態" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:493 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" msgstr "Italian" @@ -3079,16 +3067,16 @@ msgstr "Italian" msgid "JAPAN" msgstr "JAPAN" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:247 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:257 msgid "JIT Recompiler (recommended)" msgstr "JIT é‡ç·¨è­¯å™¨ (推薦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:258 msgid "JITIL experimental recompiler" msgstr "JITIL 實驗性é‡ç·¨è­¯å™¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:284 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" msgstr "Japanese" @@ -3096,7 +3084,7 @@ msgstr "Japanese" msgid "KOREA" msgstr "KOREA" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 #, fuzzy msgid "" "Keep the game window on top of all other windows.\n" @@ -3104,17 +3092,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:302 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" msgstr "" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:245 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:245 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 msgid "Key" msgstr "éµ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" msgstr "Korean" @@ -3132,19 +3120,23 @@ msgstr "L 鈕" msgid "L-Analog" msgstr "L-類比" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:589 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:590 msgid "Language:" msgstr "語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:166 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:152 msgid "Last Overwritten State" msgstr "最後覆蓋的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:173 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:175 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:159 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:161 msgid "Last Saved State" msgstr "最後使用的進度" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +msgid "Latency:" +msgstr "" + #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 msgid "Left" @@ -3154,8 +3146,8 @@ msgstr "å·¦" msgid "Left Stick" msgstr "å·¦ æ–æ¡¿" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:261 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:261 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:257 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:257 msgid "" "Left click to detect hotkeys.\n" "Enter space to clear." @@ -3163,7 +3155,7 @@ msgstr "" "按左éµæª¢æ¸¬å¿«æ·éµã€‚\n" "按éµç›¤ç©ºç™½éµç‚ºæ¸…除。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:693 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:692 msgid "" "Left-click to detect input.\n" "Middle-click to clear.\n" @@ -3173,7 +3165,7 @@ msgstr "" "中éµæ¸…除。\n" "å³éµå–得更多é¸é …。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:698 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" "Left/Right-click for more options.\n" "Middle-click to clear." @@ -3181,78 +3173,78 @@ msgstr "" "å·¦/å³éµå–得更多é¸é …。\n" "中éµæ¸…除。" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:220 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:218 msgid "Less Than" msgstr "å°æ–¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:544 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:550 msgid "Limit by FPS" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927 msgid "Load" msgstr "讀å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:535 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:532 #, fuzzy msgid "Load Custom Textures" msgstr "讀å–高解æžåº¦ç´‹ç†" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:200 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:200 msgid "Load State Slot 1" msgstr "讀å–儲存格 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:201 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:201 msgid "Load State Slot 2" msgstr "讀å–儲存格 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:202 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:202 msgid "Load State Slot 3" msgstr "讀å–儲存格 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:203 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:203 msgid "Load State Slot 4" msgstr "讀å–儲存格 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:208 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:208 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:204 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:204 msgid "Load State Slot 5" msgstr "讀å–儲存格 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:205 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:205 msgid "Load State Slot 6" msgstr "讀å–儲存格 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:206 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:206 msgid "Load State Slot 7" msgstr "讀å–儲存格 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:207 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:207 msgid "Load State Slot 8" msgstr "讀å–儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:169 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:155 msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1445 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1440 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:110 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:107 #, fuzzy msgid "" "Load custom textures from User/Load/Textures//\n" @@ -3264,32 +3256,27 @@ msgstr "從 User/Load/Textures// 讀å–高解æžåº¦ç´‹ç†" msgid "Load preset values from hack patterns available." msgstr "讀å–å¯ç”¨çš„修正設定é è¨­æª”" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:589 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" msgstr "本地" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:547 -#, fuzzy -msgid "Lock Threads to Cores" -msgstr "鎖定線程至內核" - #: Source/Core/DolphinWX/Src/LogWindow.h:51 msgid "Log" msgstr "記錄" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:28 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:25 msgid "Log Configuration" msgstr "記錄設定" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:300 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:98 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "記錄類型" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" @@ -3297,12 +3284,12 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:83 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:80 msgid "Logger Outputs" msgstr "記錄輸出" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:133 -#: Source/Core/DolphinWX/Src/Frame.cpp:399 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:131 +#: Source/Core/DolphinWX/Src/Frame.cpp:359 msgid "Logging" msgstr "日誌" @@ -3323,7 +3310,7 @@ msgstr "" "MD5 ä¸ç¬¦åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3337,24 +3324,24 @@ msgstr "MadCatz Gameshark 檔案(*.gcs)" msgid "Main Stick" msgstr "主æ–æ¡¿" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:465 msgid "Maker ID:" msgstr "廠商 ID：" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:499 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 msgid "Maker:" msgstr "廠商：" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 msgid "Max" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:447 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:446 msgid "Memcard already has a save for this title" msgstr "記憶å¡ä¸­å·²ç¶“存在一個此標題的存檔" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:290 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:289 msgid "Memcard already opened" msgstr "記憶å¡å·²ç¶“é–‹å•Ÿ" @@ -3364,7 +3351,7 @@ msgid "Memory Byte" msgstr "記憶å¡(&M)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:223 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:86 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:97 msgid "Memory Card" msgstr "記憶å¡" @@ -3399,21 +3386,21 @@ msgstr "" msgid "Menu" msgstr "é¸å–®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:87 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:98 msgid "Mic" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:102 #, fuzzy msgid "Min" msgstr "麥克風" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:574 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:569 msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 msgid "Misc Settings" msgstr "其它設定" @@ -3422,7 +3409,7 @@ msgstr "其它設定" msgid "Modifier" msgstr "Modifier" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" "Modify textures to show the format they're encoded in. Needs an emulation " "reset in most cases.\n" @@ -3443,7 +3430,7 @@ msgstr "Motion Plus" msgid "Motor" msgstr "馬é”" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:660 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:655 msgid "" "Move the mouse pointer over an option to display a detailed description.\n" "\n" @@ -3458,7 +3445,7 @@ msgstr "" msgid "Multiply" msgstr "多é‡åˆ†æ’" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:334 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 msgid "" "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " "effect on emulated wiimotes." @@ -3556,16 +3543,16 @@ msgstr "NP Tab" msgid "NP Up" msgstr "NP Up" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:464 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:453 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58 #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49 msgid "Name:" msgstr "å稱：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:86 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:296 -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:566 -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:26 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:84 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:294 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:564 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:24 msgid "Name: " msgstr "å稱：" @@ -3574,20 +3561,20 @@ msgstr "å稱：" msgid "Native GCI files(*.gci)" msgstr "原始 GCI 檔案(*.gci)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:162 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:160 msgid "New Scan" msgstr "æ–°çš„æœå°‹" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:204 -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:811 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814 msgid "Next Page" msgstr "下一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:166 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:164 msgid "Next Scan" msgstr "尋找下一個" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:51 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:48 msgid "Nickname :" msgstr "暱稱：" @@ -3595,7 +3582,7 @@ msgstr "暱稱：" msgid "No Country (SDK)" msgstr "無國家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:347 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 msgid "No ISOs or WADS found" msgstr "找ä¸åˆ° ISO 或 WAD" @@ -3617,7 +3604,7 @@ msgstr "ä¸åœé " msgid "No file loaded" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:438 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:437 msgid "No free dir index entries" msgstr "沒有剩餘的目錄索引項目" @@ -3631,33 +3618,33 @@ msgstr "無效的錄åƒæª”" msgid "No save folder found for title %s" msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的存檔資料夾" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:597 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:594 msgid "None" msgstr "ç„¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" msgstr "Norwegian Bokmaal" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:217 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:353 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:825 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 msgid "Not Set" msgstr "未設定" -#: Source/Core/DolphinWX/Src/Main.cpp:595 +#: Source/Core/DolphinWX/Src/Main.cpp:628 msgid "Not connected" msgstr "未連接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:294 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 msgid "Notes" msgstr "註釋" -#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:27 +#: Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp:25 msgid "Notes: " msgstr "注æ„：" @@ -3666,7 +3653,7 @@ msgstr "注æ„：" #: Source/Core/DolphinWX/Src/FrameAui.cpp:579 #: Source/Core/DolphinWX/Src/FrameAui.cpp:620 #: Source/Core/DolphinWX/Src/FrameAui.cpp:628 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:46 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:43 msgid "Notice" msgstr "注æ„" @@ -3674,16 +3661,16 @@ msgstr "注æ„" msgid "Num Lock" msgstr "Num Lock" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:89 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:87 msgid "Number Of Codes: " msgstr "代碼數é‡ï¼š" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp:30 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:26 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:24 msgid "Nunchuk" msgstr "Nunchuk" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:27 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:25 msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" @@ -3691,11 +3678,11 @@ msgstr "Nunchuk 加速" msgid "Object" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:130 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:134 msgid "Object Range" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249 msgid "Off" msgstr "關閉" @@ -3703,52 +3690,52 @@ msgstr "關閉" msgid "Offset:" msgstr "å移：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:586 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:435 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format msgid "Only %d blocks available" msgstr "僅 %d 個å€å¡Šå¯ç”¨" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:178 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:178 msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:897 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:894 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:434 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:420 msgid "Open file..." msgstr "開啟檔案..." -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:53 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:61 #, c-format msgid "OpenAL: can't create context for device %s" msgstr "OpenAL：無法關è¯è‡³è£ç½® %s" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:65 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:72 msgid "OpenAL: can't find sound devices" msgstr "OpenAL：找ä¸åˆ°è²éŸ³è£ç½®" -#: Source/Core/AudioCommon/Src/OpenALStream.cpp:59 +#: Source/Core/AudioCommon/Src/OpenALStream.cpp:66 #, c-format msgid "OpenAL: can't open device %s" msgstr "OpenAL：無法開啟è£ç½® %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:494 msgid "OpenCL Texture Decoder" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:498 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:495 msgid "OpenMP Texture Decoder" msgstr "" @@ -3761,7 +3748,7 @@ msgstr "é¸é …" msgid "Orange" msgstr "橘" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:467 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:466 msgid "" "Order of files in the File Directory do not match the block order\n" "Right click and export all of the saves,\n" @@ -3771,8 +3758,8 @@ msgstr "" "按å³éµåŒ¯å‡ºæ‰€æœ‰å­˜æª”，\n" "並匯入存檔至一張新的記憶å¡ä¸­\n" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:320 -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:500 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:317 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:497 msgid "Other" msgstr "" @@ -3782,19 +3769,19 @@ msgid "" "manually stop the game." msgstr "其它客戶端在éŠæˆ²åŸ·è¡Œæ™‚連接埠å£ï¼ï¼å·²é—œé–‰ç¶²è·¯å°æˆ°ã€‚您需è¦æ‰‹å‹•åœæ­¢éŠæˆ²ã€‚" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:485 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" msgstr "輸出" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:356 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:342 msgid "P&lay Recording..." msgstr "播放錄åƒ(&L)..." -#: Source/Core/Core/Src/HW/GCPad.cpp:29 +#: Source/Core/Core/Src/HW/GCPad.cpp:30 msgid "Pad" msgstr "控制器" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:599 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:596 msgid "Pad " msgstr "控制器" @@ -3810,7 +3797,7 @@ msgstr "下一é " msgid "Page Up" msgstr "上一é " -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:75 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:73 msgid "Pair Up" msgstr "é…å°" @@ -3822,35 +3809,35 @@ msgstr "段è½" msgid "Parameters" msgstr "åƒæ•¸" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:228 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:227 #, c-format msgid "Partition %i" msgstr "åˆ†å‰²å€ %i" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:302 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:301 msgid "Patches" msgstr "修正" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:535 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:541 msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1650 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1651 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš«åœ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:142 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:401 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 #, fuzzy msgid "Per-Pixel Lighting" msgstr "åƒç´ å…‰æº" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:358 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:356 msgid "Perfect" msgstr "完美" @@ -3859,37 +3846,37 @@ msgstr "完美" msgid "Perspective %d" msgstr "ç‰ˆå¼ %d" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:160 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:438 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1659 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1660 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:424 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 msgid "Play" msgstr "執行" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 msgid "Play Recording" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:186 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:186 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182 msgid "Play/Pause" msgstr "執行/æš«åœ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:357 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:355 msgid "Playable" msgstr "å¯çŽ©" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:149 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153 #, fuzzy msgid "Playback Options" msgstr "é¸é …" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:287 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:284 msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1101 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Please confirm..." msgstr "請確èª..." @@ -3901,55 +3888,55 @@ msgstr "請在儲存å‰å»ºç«‹ä¸€å€‹æ–°çš„é€æª¢è¦–" msgid "Plus-Minus" msgstr "Plus-Minus" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:670 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:671 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:672 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 msgid "Port 4" msgstr "åŸ å£ 4" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:80 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:113 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:77 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:110 msgid "Port :" msgstr "埠å£ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" msgstr "Portuguese" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" msgstr "Portuguese (Brazilian)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:395 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 #, fuzzy msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:929 +#: Source/Core/Core/Src/Movie.cpp:942 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1048 +#: Source/Core/Core/Src/Movie.cpp:1061 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1025 +#: Source/Core/Core/Src/Movie.cpp:1038 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3962,11 +3949,11 @@ msgstr "é è¨­ï¼š" msgid "Prev Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:810 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813 msgid "Previous Page" msgstr "上一é " -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:197 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:195 msgid "Previous Value" msgstr "上一個數值" @@ -3974,7 +3961,7 @@ msgstr "上一個數值" msgid "Print" msgstr "列å°" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:898 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:897 msgid "Profile" msgstr "設定檔" @@ -3982,7 +3969,7 @@ msgstr "設定檔" msgid "Properties" msgstr "屬性" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:297 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:283 msgid "Purge Cache" msgstr "清ç†å¿«å–" @@ -3990,8 +3977,8 @@ msgstr "清ç†å¿«å–" msgid "Question" msgstr "å•é¡Œ" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:145 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:302 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:142 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:299 msgid "Quit" msgstr "離開" @@ -4009,7 +3996,7 @@ msgstr "R 鈕" msgid "R-Analog" msgstr "R-類比" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:438 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:436 msgid "RAM" msgstr "RAM" @@ -4017,50 +4004,50 @@ msgstr "RAM" msgid "RUSSIA" msgstr "RUSSIA" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:532 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:531 msgid "Range" msgstr "範åœ" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:194 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:194 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:190 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:190 msgid "Read-only mode" msgstr "唯讀模å¼" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:480 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:478 msgid "Real" msgstr "實體" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Real Wiimote" msgstr "實體 Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:81 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79 #, fuzzy msgid "Real Wiimotes" msgstr "實體 Wiimote" -#: Source/Core/DolphinWX/Src/Frame.cpp:162 +#: Source/Core/DolphinWX/Src/Frame.cpp:124 msgid "Reconnect Wiimote Confirm" msgstr "確èªé‡æ–°é€£æŽ¥ Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:95 #, fuzzy msgid "Reconnect Wiimote on State Loading" msgstr "讀å–進度後é‡æ–°é€£æŽ¥ Wiimote" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:188 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:212 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 #, fuzzy msgid "Record" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:169 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:173 #, fuzzy msgid "Recording Info" msgstr "播放錄åƒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:201 msgid "Recording Options" msgstr "" @@ -4076,7 +4063,7 @@ msgstr "ç´… å·¦" msgid "Red Right" msgstr "ç´… å³" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:84 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 #, fuzzy msgid "" "Reduces the amount of aliasing caused by rasterizing 3D graphics.\n" @@ -4088,29 +4075,29 @@ msgstr "" "減少圖形失真形æˆçš„光柵化 3D 圖形。\n" "é¿å…ç•«é¢çœ‹èµ·ä¾†åƒæ˜¯å¡Šç‹€åœ–形，但也大é‡é™ä½Žæ•ˆèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:71 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:907 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:69 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:906 msgid "Refresh" msgstr "æ›´æ–°" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:180 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:180 msgid "Refresh List" msgstr "更新列表" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:435 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:421 msgid "Refresh game list" msgstr "æ›´æ–°éŠæˆ²åˆ—表" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:425 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:447 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:750 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 msgid "Remove" msgstr "移除" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 #, fuzzy msgid "" "Render the scene as a wireframe.\n" @@ -4120,17 +4107,17 @@ msgstr "" "場景渲染線框。\n" "這個僅用於除錯的目的使用。" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:304 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:301 msgid "Render to Main Window" msgstr "渲染至主視窗" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:184 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:184 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:918 msgid "Reset" msgstr "é‡ç½®" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:191 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:189 msgid "Results" msgstr "çµæžœ" @@ -4152,29 +4139,25 @@ msgstr "å³ æ–æ¡¿" msgid "Rumble" msgstr "震動" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:503 msgid "Run DSP LLE on a dedicated thread (not recommended)." msgstr "在ç¨ç«‹çš„線程中執行 DSP LLE (ä¸æŽ¨è–¦)。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" msgstr "Russian" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" msgstr "儲存進度(&V)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:466 msgid "Safe" msgstr "安全" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:634 -msgid "Sample Rate:" -msgstr "å–樣率：" - -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:191 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:929 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:195 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:928 msgid "Save" msgstr "儲存" @@ -4182,91 +4165,91 @@ msgstr "儲存" msgid "Save GCI as..." msgstr "å¦å­˜ GCI ..." -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:209 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:209 msgid "Save State Slot 1" msgstr "儲存至儲存格 1" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:210 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:210 msgid "Save State Slot 2" msgstr "儲存至儲存格 2" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:211 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:211 msgid "Save State Slot 3" msgstr "儲存至儲存格 3" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:212 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:212 msgid "Save State Slot 4" msgstr "儲存至儲存格 4" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:217 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:217 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:213 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:213 msgid "Save State Slot 5" msgstr "儲存至儲存格 5" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:218 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:218 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:214 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:214 msgid "Save State Slot 6" msgstr "儲存至儲存格 6" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:219 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:219 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:215 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:215 msgid "Save State Slot 7" msgstr "儲存至儲存格 7" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:220 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:220 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:216 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:216 msgid "Save State Slot 8" msgstr "儲存至儲存格 8" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:165 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:151 msgid "Save State..." msgstr "å¦å­˜é€²åº¦..." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:602 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:612 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:591 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:601 msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1214 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:460 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:446 msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:782 +#: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:400 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 #, fuzzy msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:584 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:567 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:568 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 msgid "Scanning..." msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 msgid "ScrShot" msgstr "截圖" @@ -4274,25 +4257,25 @@ msgstr "截圖" msgid "Scroll Lock" msgstr "滾動鎖定" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:259 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 #, fuzzy msgid "Search" msgstr "尋找作弊代碼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:228 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:245 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 #, fuzzy msgid "Search current Object" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" msgstr "" @@ -4303,20 +4286,20 @@ msgid "Section %s not found in SYSCONF" msgstr "é …ç›® %s 在 SYSCONF 中找ä¸åˆ°" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:59 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:494 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:493 msgid "Select" msgstr "é¸æ“‡" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:762 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1190 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:679 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:72 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:70 #, fuzzy msgid "" "Select a hardware adapter to use.\n" @@ -4334,23 +4317,23 @@ msgstr "é¸æ“‡è¦åŒ¯å…¥çš„存檔" msgid "Select floating windows" msgstr "é¸æ“‡æµ®å‹•è¦–窗" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:665 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:582 msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1500 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1514 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:78 #, fuzzy msgid "" "Select what aspect ratio to use when rendering:\n" @@ -4367,11 +4350,16 @@ msgstr "" "強制 4:3：拉伸畫é¢è‡³ 4:3。\n" "拉伸至視窗：拉伸畫é¢å……滿視窗。" +#: Source/Core/InputCommon/Src/InputConfig.cpp:61 +#, fuzzy +msgid "Selected controller profile does not exist" +msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" + #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" msgstr "é¸æ“‡å­—åž‹" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:73 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" "This should always be bigger than or equal to the internal resolution. " @@ -4381,7 +4369,7 @@ msgid "" "If still unsure, use the highest resolution which works for you." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" "Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " @@ -4391,11 +4379,11 @@ msgid "" "If unsure, use Direct3D 9." msgstr "" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:274 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:271 msgid "Send" msgstr "傳é€" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:97 msgid "Sensor Bar Position:" msgstr "傳感器ä½ç½®ï¼š" @@ -4403,24 +4391,24 @@ msgstr "傳感器ä½ç½®ï¼š" msgid "Separator" msgstr "分離器" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" msgstr "Serbian" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:511 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" "Serial Port 1 - This is the port which devices such as the net adapter use" msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:492 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:898 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:812 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815 #, c-format msgid "Set as default Memcard %c" msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" @@ -4430,11 +4418,17 @@ msgstr "設定為é è¨­è¨˜æ†¶å¡ %c" msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" msgstr "SetARCode_IsActive：索引大於 ar ä»£ç¢¼åˆ—è¡¨å¤§å° %lu" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:347 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" + +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." msgstr "設定..." -#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:220 +#: Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp:222 msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem：無法找到設定檔" @@ -4442,7 +4436,7 @@ msgstr "SetupWiiMem：無法找到設定檔" msgid "Shake" msgstr "æ–晃" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:497 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:486 msgid "Short Name:" msgstr "短å：" @@ -4451,107 +4445,107 @@ msgstr "短å：" msgid "Shoulder Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:231 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:217 msgid "Show &Console" msgstr "顯示控制å°(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:229 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:215 msgid "Show &Log" msgstr "顯示日誌視窗(&L)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:226 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:212 msgid "Show &Statusbar" msgstr "顯示狀態欄(&S)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:224 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:210 msgid "Show &Toolbar" msgstr "顯示工具列(&T)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:295 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:281 msgid "Show Drives" msgstr "顯示è£ç½®" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:521 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:518 #, fuzzy msgid "Show EFB Copy Regions" msgstr "EFB 複製範åœ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:296 msgid "Show FPS" msgstr "顯示 FPS" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:285 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 msgid "Show France" msgstr "顯示 France" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:271 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:257 msgid "Show GameCube" msgstr "顯示 GameCube" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:552 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:549 msgid "Show Input Display" msgstr "輸入顯示" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:287 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 msgid "Show Italy" msgstr "顯示 Italy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:278 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:264 msgid "Show JAP" msgstr "顯示 JAP" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:289 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:275 msgid "Show Korea" msgstr "顯示 Korea" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:488 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477 msgid "Show Language:" msgstr "顯示語系：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:230 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:216 msgid "Show Log &Configuration" msgstr "日誌記錄設定(&C)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:280 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:266 msgid "Show PAL" msgstr "顯示 PAL" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:254 msgid "Show Platforms" msgstr "顯示平å°" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:263 msgid "Show Regions" msgstr "顯示å€åŸŸ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:519 #, fuzzy msgid "Show Statistics" msgstr "å„種統計數據" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:291 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:277 msgid "Show Taiwan" msgstr "顯示 Taiwan" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:282 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:268 msgid "Show USA" msgstr "顯示 USA" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:273 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:259 msgid "Show Wad" msgstr "顯示 Wad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:269 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:255 msgid "Show Wii" msgstr "顯示 Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:496 msgid "Show a confirmation box before stopping a game." msgstr "在åœæ­¢éŠæˆ²å¾Œé¡¯ç¤ºä¸€å€‹ç¢ºèªæ¡†ã€‚" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:494 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" -"Show a message box when a potentially serious error has occured.\n" +"Show a message box when a potentially serious error has occurred.\n" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" @@ -4559,39 +4553,39 @@ msgstr "" "關閉此é¸é …å¯ä»¥é˜»æ­¢å…¨éƒ¨éžé—œéµçš„錯誤訊æ¯ï¼Œä½†æ˜¯å®ƒå¯èƒ½å°Žè‡´ Dolphin 在沒有任何徵兆" "的情æ³ä¸‹å´©æ½°ã€‚" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" msgstr "顯示第一個å€å¡Š" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:144 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:130 #, fuzzy msgid "Show lag counter" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" "These messages include memory card writes, video backend and CPU " "information, and JIT cache clearing." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" msgstr "顯示存檔å€å¡Š" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:823 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:826 msgid "Show save comment" msgstr "顯示存檔æè¿°" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:824 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:827 msgid "Show save icon" msgstr "顯示存檔圖示" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:822 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:825 msgid "Show save title" msgstr "顯示存檔標題" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" "Show the number of frames rendered per second as a measure of emulation " "speed.\n" @@ -4599,11 +4593,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:279 msgid "Show unknown" msgstr "顯示 未知" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:100 msgid "" "Show various statistics.\n" "\n" @@ -4614,29 +4608,29 @@ msgstr "" msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:285 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:653 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:496 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" msgstr "關閉 Dest. Alpha 通é“" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:447 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:445 msgid "Skip EFB Access from CPU" msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:99 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" "Skip the destination alpha pass used in many games for various graphical " "effects.\n" @@ -4644,7 +4638,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:123 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" @@ -4654,17 +4648,17 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:388 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:400 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:374 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:386 #, c-format msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:657 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:658 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 msgid "Slot B" msgstr "æ’槽 B" @@ -4672,7 +4666,7 @@ msgstr "æ’槽 B" msgid "Snapshot" msgstr "截圖" -#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:53 +#: Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp:55 msgid "Software Renderer" msgstr "" @@ -4684,11 +4678,11 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:622 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/AudioCommon/Src/AudioCommon.cpp:71 +#: Source/Core/AudioCommon/Src/AudioCommon.cpp:75 #, c-format msgid "Sound backend %s is not valid." msgstr "è²éŸ³ backend %s 是無效的。" @@ -4702,17 +4696,17 @@ msgstr "è²éŸ³ç·©è¡å»ºç«‹å¤±æ•—：%s" msgid "Space" msgstr "Space" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:492 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" msgstr "Spanish" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:103 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" msgstr "æšè²å™¨éŸ³é‡ï¼š" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" "Specifies the resolution used to render at. A high resolution will improve " "visual quality a lot but is also quite heavy on performance and might cause " @@ -4724,7 +4718,7 @@ msgid "" "If unsure, select 640x528." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324 msgid "Speed up Disc Transfer Rate" msgstr "加速光碟傳輸率" @@ -4732,51 +4726,55 @@ msgstr "加速光碟傳輸率" msgid "Square Stick" msgstr "Square Stick" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:81 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:91 msgid "Standard Controller" msgstr "標準控制器" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:50 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:38 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:305 msgid "Start" msgstr "Start" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:208 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:194 msgid "Start &NetPlay" msgstr "開始網路å°æˆ°(&N)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:353 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:339 msgid "Start Re&cording" msgstr "開始錄製(&C)" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:191 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:191 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 msgid "Start Recording" msgstr "開始錄製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 msgid "State" msgstr "狀態" -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:177 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:177 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:173 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:173 msgid "State Saves" msgstr "å³æ™‚存檔" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 +msgid "Steering Wheel" +msgstr "" + #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" msgstr "æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:415 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:439 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187 -#: Source/Core/DolphinWX/Src/NetWindow.cpp:311 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:419 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:425 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:183 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:183 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:308 msgid "Stop" msgstr "åœæ­¢" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:94 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" "This is not so accurate, but it works well enough for most games and gives a " @@ -4785,7 +4783,7 @@ msgid "" "If unsure, leave this checked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:279 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:276 msgid "Stretch to Window" msgstr "拉伸至視窗" @@ -4810,8 +4808,8 @@ msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:730 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 msgid "System Language:" msgstr "系統語系：" @@ -4819,7 +4817,7 @@ msgstr "系統語系：" msgid "TAIWAN" msgstr "TAIWAN" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:141 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:127 #: Source/Core/DolphinWX/Src/TASInputDlg.h:32 #, fuzzy msgid "TAS Input" @@ -4841,31 +4839,31 @@ msgstr "Table å·¦" msgid "Table Right" msgstr "Table å³" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:369 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:441 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:355 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:427 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:193 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:193 msgid "Take Screenshot" msgstr "截å–ç•«é¢" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:82 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:93 msgid "TaruKonga (Bongos)" msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:489 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:488 msgid "Test" msgstr "測試" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:437 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:435 msgid "Texture" msgstr "ç´‹ç†" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:454 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:452 #, fuzzy msgid "Texture Cache" msgstr "清ç†å¿«å–" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:523 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:520 #, fuzzy msgid "Texture Format Overlay" msgstr "ç´‹ç†æ ¼å¼" @@ -4882,13 +4880,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1177 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1133 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1161 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1227 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 #, c-format msgid "" "The file %s already exists.\n" @@ -4909,7 +4907,7 @@ msgstr "檔案 %s 無法開啟進行寫入。請確èªæ˜¯å¦æœ‰åˆ¥çš„程å¼æ­£ msgid "The file %s was already open, the file header will not be written." msgstr "檔案 %s 已經開啟，檔頭無法被寫入。" -#: Source/Core/Core/Src/Boot/Boot.cpp:319 +#: Source/Core/Core/Src/Boot/Boot.cpp:332 #, c-format msgid "The file you specified (%s) does not exist" msgstr "指定的檔案 (%s) ä¸å­˜åœ¨" @@ -4926,7 +4924,7 @@ msgstr "å稱ä¸èƒ½å«æœ‰å­—符 ','" msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -4934,11 +4932,11 @@ msgid "" "If unsure, use the rightmost value." msgstr "" -#: Source/Core/DolphinWX/Src/MemcardManager.cpp:444 +#: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" msgstr "您嘗試複製的檔案有一個無效的檔案大å°" -#: Source/Core/DolphinWX/Src/Main.cpp:352 +#: Source/Core/DolphinWX/Src/Main.cpp:385 msgid "" "The selected language is not supported by your system. Falling back to " "system default." @@ -4969,21 +4967,18 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:578 -msgid "Theme" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#, fuzzy +msgid "Theme:" msgstr "佈景主題" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:603 -msgid "Theme selection went wrong" -msgstr "佈景主題é¸æ“‡éŒ¯èª¤" - #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" "There must be a ticket for 00000001/00000002. Your NAND dump is probably " "incomplete." msgstr "必須有 00000001/00000002 的標簽。這個 NAND dump å¯èƒ½æ˜¯ä¸å®Œæ•´çš„。" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:313 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" "These settings override core Dolphin settings.\n" "Undetermined means the game uses Dolphin's setting." @@ -4997,11 +4992,11 @@ msgid "" "Replay itself." msgstr "Action replay 模擬器ä¸æ”¯æ´è¢« Action Replay 自身修改的代碼。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:514 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" "Hold the right mouse button and move the mouse to pan the camera around. " @@ -5012,7 +5007,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:486 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" "This splits the Video and CPU threads, so they can be run on separate " "cores.\n" @@ -5022,7 +5017,7 @@ msgstr "" "這將分離影åƒå’Œ CPU 線程，所以它們å¯ä»¥åŸ·è¡Œæ–¼ç¨ç«‹çš„內核中。\n" "å¯ä»¥åœ¨å¤šæ ¸å¿ƒçš„ PC 上å–å¾—éžå¸¸å¤§çš„加速，但是也å¯èƒ½å°Žè‡´å¶çˆ¾å´©æ½°æˆ–圖片å•é¡Œã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:292 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" msgstr "這將å…許您手工編輯 INI 設定檔案" @@ -5036,36 +5031,36 @@ msgid "Tilt" msgstr "傾斜" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:289 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 msgid "Title" msgstr "標題" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:120 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:139 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:124 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:143 #, fuzzy msgid "To" msgstr "上方" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:74 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:71 msgid "Toggle All Log Types" msgstr "å…¨é¸/全部å–消" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:440 -#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196 -#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:426 +#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:192 +#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:192 msgid "Toggle Fullscreen" msgstr "切æ›å…¨èž¢å¹•" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:276 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:90 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:278 msgid "Top" msgstr "上方" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" msgstr "Traditional Chinese" -#: Source/Core/Core/Src/Boot/Boot.cpp:413 +#: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." msgstr "已嘗試讀å–從未知的檔案類型。" @@ -5085,7 +5080,7 @@ msgstr "" "嘗試讀å–從無效的 SYSCONF\n" "Wiimote bt ids 是無效的" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" msgstr "Turkish" @@ -5097,12 +5092,12 @@ msgstr "Turntable" msgid "Type" msgstr "é¡žåž‹" -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:28 msgid "UDP Port:" msgstr "UDP 埠å£ï¼š" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:12 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5133,12 +5128,12 @@ msgid "" "Would you like to ignore this line and continue parsing?" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:405 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:391 #, c-format msgid "Undefined %i" msgstr "未指定 %i" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:177 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:163 msgid "Undo Load State" msgstr "å–消讀å–進度" @@ -5146,7 +5141,7 @@ msgstr "å–消讀å–進度" msgid "Unexpected 0x80 call? Aborting..." msgstr "" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:216 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:214 msgid "Unknown" msgstr "未知" @@ -5175,8 +5170,8 @@ msgstr "知訊æ¯å¸¶æœ‰ id:%d 接收於玩家:%d 正在æ出玩家ï¼" msgid "Up" msgstr "上" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:109 -#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:17 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:107 +#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:15 msgid "Update" msgstr "æ›´æ–°" @@ -5184,24 +5179,24 @@ msgstr "æ›´æ–°" msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:715 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:290 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:287 #, fuzzy msgid "Use Fullscreen" msgstr "全螢幕(&F)" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:576 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:574 msgid "Use Hex" msgstr "使用 Hex" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:584 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:585 msgid "Use Panic Handlers" msgstr "顯示錯誤æ示" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:120 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:117 msgid "" "Use multiple threads to decode textures.\n" "Might result in a speedup (especially on CPUs with more than two cores).\n" @@ -5209,7 +5204,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:124 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" "However, one may skip the popups to allow interruption free gameplay by " @@ -5218,15 +5213,15 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:543 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:540 msgid "Utility" msgstr "工具" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:289 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:286 msgid "V-Sync" msgstr "åž‚ç›´åŒæ­¥" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:210 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:208 msgid "Value" msgstr "數值" @@ -5234,23 +5229,23 @@ msgstr "數值" msgid "Value:" msgstr "數值：" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:573 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:571 msgid "Value: " msgstr "數值：" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:53 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:50 msgid "Verbosity" msgstr "事件" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:397 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:386 msgid "Video" msgstr "å½±åƒ" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:479 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:477 msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 msgid "Volume" msgstr "音é‡" @@ -5265,7 +5260,7 @@ msgstr "WAD installation 失敗：錯誤於建立 %s" msgid "WAD installation failed: error creating ticket" msgstr "WAD installation 失敗：錯誤於建立 %s" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:82 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:80 msgid "" "Wait for vertical blanks in order to reduce tearing.\n" "Decreases performance if emulation speed is below 100%.\n" @@ -5274,16 +5269,16 @@ msgid "" msgstr "" #: Source/Core/Common/Src/MsgHandler.cpp:67 -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:48 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:45 #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:84 msgid "Warning" msgstr "警告" -#: Source/Core/Core/Src/Boot/Boot.cpp:278 +#: Source/Core/Core/Src/Boot/Boot.cpp:291 msgid "Warning - starting DOL in wrong console mode!" msgstr "警告 - DOL 啟動於錯誤的主機模å¼ï¼" -#: Source/Core/Core/Src/Boot/Boot.cpp:328 +#: Source/Core/Core/Src/Boot/Boot.cpp:341 msgid "Warning - starting ELF in wrong console mode!" msgstr "警告 - ELF 啟動於錯誤的主機模å¼ï¼" @@ -5315,7 +5310,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:825 +#: Source/Core/Core/Src/Movie.cpp:838 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5323,7 +5318,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:842 +#: Source/Core/Core/Src/Movie.cpp:855 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5331,7 +5326,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:851 +#: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5351,7 +5346,7 @@ msgid "" msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 -#: Source/Core/AudioCommon/Src/WaveFile.cpp:120 +#: Source/Core/AudioCommon/Src/WaveFile.cpp:129 msgid "WaveFileWriter - file not open." msgstr "WaveFileWriter - 檔案無法開啟。" @@ -5359,7 +5354,7 @@ msgstr "WaveFileWriter - 檔案無法開啟。" msgid "Whammy" msgstr "Whammy" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:556 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" msgstr "寬螢幕修正" @@ -5367,24 +5362,24 @@ msgstr "寬螢幕修正" msgid "Width" msgstr "寬度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:534 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540 msgid "Wii" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:377 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:375 msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:205 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:191 msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1357 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5392,17 +5387,17 @@ msgstr "Wii 存檔 (*.bin)|*.bin" msgid "WiiWAD: Could not read from file" msgstr "WiiWAD：無法從檔案中讀å–" -#: Source/Core/Core/Src/HW/Wiimote.cpp:16 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/Core/Src/HW/Wiimote.cpp:17 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote" msgstr "Wiimote" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:30 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28 #, fuzzy, c-format msgid "Wiimote %i" msgstr "Wiimote " -#: Source/Core/DolphinWX/Src/Frame.cpp:161 +#: Source/Core/DolphinWX/Src/Frame.cpp:123 #, c-format msgid "" "Wiimote %i has been disconnected by system.\n" @@ -5415,19 +5410,19 @@ msgstr "" "或閒置的時間太久。\n" "是å¦è¦é‡æ–°é€£æŽ¥ï¼Ÿ" -#: Source/Core/DolphinWX/Src/Main.cpp:597 +#: Source/Core/DolphinWX/Src/Main.cpp:630 msgid "Wiimote Connected" msgstr "Wiimote 已連接" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:96 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:94 msgid "Wiimote Motor" msgstr "Wiimote 馬é”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:447 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:433 msgid "Wiimote settings" msgstr "Wiimote 設定" -#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:57 +#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:55 #, fuzzy msgid "Wiimotes" msgstr "Wiimote" @@ -5448,27 +5443,27 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1411 -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:884 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1105 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1233 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 msgid "Working..." msgstr "執行中..." -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:61 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:58 msgid "Write to Console" msgstr "寫入至控制å°" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:69 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 #, fuzzy msgid "Write to Debugger" msgstr "寫入至檔案" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:59 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" msgstr "寫入至檔案" -#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:63 +#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:60 msgid "Write to Window" msgstr "寫入至視窗" @@ -5505,23 +5500,23 @@ msgstr "" msgid "You can't close panes that have pages in them." msgstr "您ä¸èƒ½é—œé–‰æœ‰é é¢çš„é¢æ¿ã€‚" -#: Source/Core/DolphinWX/Src/NetWindow.cpp:193 +#: Source/Core/DolphinWX/Src/NetWindow.cpp:190 msgid "You must choose a game!!" msgstr "您必須é¸æ“‡ä¸€å€‹éŠæˆ²ï¼ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:606 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:604 msgid "You must enter a name!" msgstr "您必須輸入一個å稱ï¼" -#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:451 +#: Source/Core/DolphinWX/Src/CheatsWindow.cpp:449 msgid "You must enter a valid decimal, hexadecimal or octal value." msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數值。" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:607 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:606 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:884 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5544,7 +5539,7 @@ msgstr "" "應該是 0x%04x (è€Œéž 0x%04llx)\n" "是å¦è¦å»ºç«‹æ–°çš„檔案？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:340 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:338 msgid "ZTP hack" msgstr "ZTP 修正" @@ -5557,12 +5552,12 @@ msgstr "ä¸æ”¯æ´ Zero 3 代碼" msgid "Zero code unknown to dolphin: %08x" msgstr "Zero code 未知於 dolphin: %08x" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:440 -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:464 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:439 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:463 msgid "[ waiting ]" msgstr "[ 等候中 ]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:102 msgid "" "[BROKEN]\n" "Highlight regions the EFB was copied from.\n" @@ -5574,7 +5569,7 @@ msgstr "" msgid "[Custom]" msgstr "[自訂]" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" "Aims to speed up emulation by offloading texture decoding to the GPU using " @@ -5585,7 +5580,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:119 +#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:116 msgid "" "[EXPERIMENTAL]\n" "Speeds up emulation a bit by caching display lists.\n" @@ -5594,11 +5589,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:512 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:511 msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:758 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5615,7 +5610,7 @@ msgstr "無法讀å–資料，從檔案： %s" msgid "failed to read header" msgstr "讀å–檔頭失敗" -#: Source/Core/Core/Src/HW/Memmap.cpp:495 +#: Source/Core/Core/Src/HW/Memmap.cpp:492 #, c-format msgid "iCacheJIT: Reading Opcode from %x. Please report." msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" @@ -5634,7 +5629,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1146 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -5646,13 +5641,16 @@ msgstr "zFar 修正：" msgid "zNear Correction: " msgstr "zNear 修正：" -#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:497 +#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:496 msgid "| OR" msgstr "| 或" #~ msgid "%d %%" #~ msgstr "%d %%" +#~ msgid "%d Hz" +#~ msgstr "%d Hz" + #~ msgid "&Frame Stepping" #~ msgstr "畫格步進(&F)" @@ -5757,6 +5755,21 @@ msgstr "| 或" #~ msgid "Could not get info about plugin %s" #~ msgstr "無法å–得關於æ’件 %s 的訊æ¯" +#~ msgid "Created by KDE-Look.org" +#~ msgstr "ç”± KDE-Look.org 製åš" + +#~ msgid "" +#~ "Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]" +#~ msgstr "" +#~ "ç”± Milosz Wlazlo è£½åš [miloszwl@miloszwl.com, miloszwl.deviantart.com]" + +#~ msgid "Created by VistaIcons.com" +#~ msgstr "ç”± VistaIcons.com 製åš" + +#~ msgid "" +#~ "Created by black_rider and published on ForumW.org > Web Developments" +#~ msgstr "ç”± black_rider 製åšä¸¦ç™¼ä½ˆæ–¼ ForumW.org > Web Developments" + #~ msgid "DList Cache" #~ msgstr "DList å¿«å–" @@ -5766,6 +5779,10 @@ msgstr "| 或" #~ msgid "Disable Lighting" #~ msgstr "關閉光æº" +#, fuzzy +#~ msgid "Disable Per-Pixel Depth" +#~ msgstr "åƒç´ æ·±åº¦" + #~ msgid "Disable Textures" #~ msgstr "關閉紋ç†" @@ -6011,6 +6028,10 @@ msgstr "| 或" #~ msgid "Loads the specified file (DOL,ELF,GCM,ISO,WAD)" #~ msgstr "讀å–指定檔案 (DOL,ELF,GCM,ISO,WAD)" +#, fuzzy +#~ msgid "Lock Threads to Cores" +#~ msgstr "鎖定線程至內核" + #~ msgid "Low level (LLE) or high level (HLE) audio" #~ msgstr "指定低階 (LLE) 或高階 (HLE) è²éŸ³æ¨¡æ“¬å™¨" @@ -6080,6 +6101,9 @@ msgstr "| 或" #~ msgid "Running script...\n" #~ msgstr "執行腳本...\n" +#~ msgid "Sample Rate:" +#~ msgstr "å–樣率：" + #~ msgid "Scale:" #~ msgstr "縮放：" @@ -6175,6 +6199,9 @@ msgstr "| 或" #~ msgid "The file " #~ msgstr "檔案" +#~ msgid "Theme selection went wrong" +#~ msgstr "佈景主題é¸æ“‡éŒ¯èª¤" + #~ msgid "" #~ "This is used to control game speed by sound throttle.\n" #~ "Disabling this could cause abnormal game speed, such as too fast.\n" From e74dc0b41f85595edc4dfee9079831a8161c4564 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 16 Jan 2013 22:52:01 -0500 Subject: [PATCH 452/627] Update title/status bar when pausing emulation. --- Source/Core/Core/Src/Core.cpp | 147 ++++++++++++----------- Source/Core/Core/Src/Core.h | 2 + Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index be75f67550..dadc89d140 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -625,77 +625,7 @@ void VideoThrottle() u32 ElapseTime = (u32)Timer.GetTimeDifference(); if ((ElapseTime >= 1000 && DrawnVideo > 0) || g_requestRefreshInfo) { - g_requestRefreshInfo = false; - SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; - - if (ElapseTime == 0) - ElapseTime = 1; - - u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; - u32 VPS = DrawnVideo * 1000 / ElapseTime; - u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime); - - // Settings are shown the same for both extended and summary info - std::string SSettings = StringFromFormat("%s %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC"); - - // Use extended or summary information. The summary information does not print the ticks data, - // that's more of a debugging interest, it can always be optional of course if someone is interested. - //#define EXTENDED_INFO - #ifdef EXTENDED_INFO - u64 newTicks = CoreTiming::GetTicks(); - u64 newIdleTicks = CoreTiming::GetIdleTicks(); - - u64 diff = (newTicks - ticks) / 1000000; - u64 idleDiff = (newIdleTicks - idleTicks) / 1000000; - - ticks = newTicks; - idleTicks = newIdleTicks; - - float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100; - - std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); - SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)", - _CoreParameter.bSkipIdle ? "~" : "", - (int)(diff), - (int)(diff - idleDiff), - (int)(idleDiff), - SystemTimers::GetTicksPerSecond() / 1000000, - _CoreParameter.bSkipIdle ? "~" : "", - TicksPercentage); - - #else // Summary information - std::string SFPS; - if (Movie::IsPlayingInput()) - SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed); - else if (Movie::IsRecordingInput()) - SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed); - else - SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); - #endif - - // This is our final "frame counter" string - std::string SMessage = StringFromFormat("%s | %s", - SSettings.c_str(), SFPS.c_str()); - std::string TMessage = StringFromFormat("%s | ", scm_rev_str) + - SMessage; - - // Show message - g_video_backend->UpdateFPSDisplay(SMessage.c_str()); - - // Update the audio timestretcher with the current speed - if (soundStream) - { - CMixer* pMixer = soundStream->GetMixer(); - pMixer->UpdateSpeed((float)Speed / 100); - } - - if (_CoreParameter.bRenderToMain && - SConfig::GetInstance().m_InterfaceStatusbar) { - Host_UpdateStatusBar(SMessage.c_str()); - Host_UpdateTitle(scm_rev_str); - } else - Host_UpdateTitle(TMessage.c_str()); - + UpdateTitle(); // Reset counter Timer.Update(); @@ -742,4 +672,79 @@ const char *Callback_ISOName() return ""; } +void UpdateTitle() +{ + u32 ElapseTime = (u32)Timer.GetTimeDifference(); + g_requestRefreshInfo = false; + SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; + + if (ElapseTime == 0) + ElapseTime = 1; + + u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; + u32 VPS = DrawnVideo * 1000 / ElapseTime; + u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime); + + // Settings are shown the same for both extended and summary info + std::string SSettings = StringFromFormat("%s %s", cpu_core_base->GetName(), _CoreParameter.bCPUThread ? "DC" : "SC"); + + // Use extended or summary information. The summary information does not print the ticks data, + // that's more of a debugging interest, it can always be optional of course if someone is interested. + //#define EXTENDED_INFO + #ifdef EXTENDED_INFO + u64 newTicks = CoreTiming::GetTicks(); + u64 newIdleTicks = CoreTiming::GetIdleTicks(); + + u64 diff = (newTicks - ticks) / 1000000; + u64 idleDiff = (newIdleTicks - idleTicks) / 1000000; + + ticks = newTicks; + idleTicks = newIdleTicks; + + float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100; + + std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); + SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)", + _CoreParameter.bSkipIdle ? "~" : "", + (int)(diff), + (int)(diff - idleDiff), + (int)(idleDiff), + SystemTimers::GetTicksPerSecond() / 1000000, + _CoreParameter.bSkipIdle ? "~" : "", + TicksPercentage); + + #else // Summary information + std::string SFPS; + if (Movie::IsPlayingInput()) + SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed); + else if (Movie::IsRecordingInput()) + SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed); + else + SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); + #endif + + // This is our final "frame counter" string + std::string SMessage = StringFromFormat("%s | %s", + SSettings.c_str(), SFPS.c_str()); + std::string TMessage = StringFromFormat("%s | ", scm_rev_str) + + SMessage; + + // Show message + g_video_backend->UpdateFPSDisplay(SMessage.c_str()); + + // Update the audio timestretcher with the current speed + if (soundStream) + { + CMixer* pMixer = soundStream->GetMixer(); + pMixer->UpdateSpeed((float)Speed / 100); + } + + if (_CoreParameter.bRenderToMain && + SConfig::GetInstance().m_InterfaceStatusbar) { + Host_UpdateStatusBar(SMessage.c_str()); + Host_UpdateTitle(scm_rev_str); + } else + Host_UpdateTitle(TMessage.c_str()); + } + } // Core diff --git a/Source/Core/Core/Src/Core.h b/Source/Core/Core/Src/Core.h index 312c446744..ac55419db3 100644 --- a/Source/Core/Core/Src/Core.h +++ b/Source/Core/Core/Src/Core.h @@ -89,6 +89,8 @@ bool ShouldSkipFrame(int skipped); void VideoThrottle(); void RequestRefreshInfo(); +void UpdateTitle(); + // waits until all systems are paused and fully idle, and acquires a lock on that state. // or, if doLock is false, releases a lock on that state and optionally unpauses. // calls must be balanced (once with doLock true, then once with doLock false) but may be recursive. diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index eb139bd5c1..304c5ff0d3 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -951,6 +951,7 @@ void CFrame::DoPause() Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxNullCursor); + Core::UpdateTitle(); } else { From 4dad8ddd834c8165516537300eb22e8b298caf75 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 16 Jan 2013 22:11:02 -0600 Subject: [PATCH 453/627] Actually use the screenshot icon. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 304c5ff0d3..ea68c87890 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -424,7 +424,7 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar) ToolBar->AddTool(IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); ToolBar->AddTool(IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen")); - ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_FullScreen], _("Take Screenshot")); + ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_Screenshot], _("Take Screenshot")); ToolBar->AddSeparator(); ToolBar->AddTool(wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); ToolBar->AddTool(IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); From cae8bb33c334d34afeb84b668b848cce07030103 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 01:24:02 -0600 Subject: [PATCH 454/627] Fix initial theme selection. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index fbc2a18346..423885e0f2 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -611,13 +611,12 @@ void CConfigMain::CreateGUIControls() name += ext; if (-1 == theme_selection->FindString(name)) theme_selection->Append(name); - - if (SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name == name) - theme_selection->SetSelection(theme_selection->GetCount() - 1); }); + + theme_selection->SetStringSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name); // std::function = avoid error on msvc - theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([this,theme_selection](wxEvent&) + theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function([theme_selection](wxEvent&) { SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); main_frame->InitBitmaps(); From 592395bc6791e869da06912cd104c25e1221381a Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 17 Jan 2013 14:30:47 -0500 Subject: [PATCH 455/627] Copypaste fail. --- Source/Core/Core/Src/ConfigManager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 9cd768992f..317e770868 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -412,18 +412,18 @@ void SConfig::LoadSettings() ini.Get("Movie", "Author", &m_strMovieAuthor, ""); // DSP - ini.Get("Config", "EnableJIT", &m_EnableJIT, true); - ini.Get("Config", "DumpAudio", &m_DumpAudio, false); + ini.Get("DSP", "EnableJIT", &m_EnableJIT, true); + ini.Get("DSP", "DumpAudio", &m_DumpAudio, false); #if defined __linux__ && HAVE_ALSA - ini.Get("Config", "Backend", &sBackend, BACKEND_ALSA); + ini.Get("DSP", "Backend", &sBackend, BACKEND_ALSA); #elif defined __APPLE__ - ini.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO); + ini.Get("DSP", "Backend", &sBackend, BACKEND_COREAUDIO); #elif defined _WIN32 - ini.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); + ini.Get("DSP", "Backend", &sBackend, BACKEND_DIRECTSOUND); #else - ini.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); + ini.Get("DSP", "Backend", &sBackend, BACKEND_NULLSOUND); #endif - ini.Get("Config", "Volume", &m_Volume, 100); + ini.Get("DSP", "Volume", &m_Volume, 100); } m_SYSCONF = new SysConf(); From 38b01d176a266ac67e2473f16c645760a991fb66 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 15:40:44 -0600 Subject: [PATCH 456/627] Start to make possible use of "full analog surface". (useful for triggers on some silly physical gamepads) --- .../ControllerInterface.cpp | 4 +-- .../ControllerInterface/ControllerInterface.h | 32 ++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 82cfe2469e..e6877f5731 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -461,7 +461,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec i = device->Inputs().begin(), e = device->Inputs().end(); for (std::vector::iterator state = states.begin(); i != e; ++i) - *state++ = ((*i)->GetState() > INPUT_DETECT_THRESHOLD); + *state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD)); while (time < ms) { @@ -477,7 +477,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec if (false == *state) return *i; } - else + else if ((*i)->GetState() < (1 - INPUT_DETECT_THRESHOLD)) *state = false; } Common::SleepCurrentThread(10); time += 10; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 7c5a236d75..b846bb56e8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -87,7 +87,7 @@ public: Input* ToInput() { return this; } }; - + // // Output // @@ -122,6 +122,36 @@ public: protected: void AddInput(Input* const i); void AddOutput(Output* const o); + + class FullAnalogSurface : public Input + { + public: + FullAnalogSurface(Input* low, Input* high) + : m_low(*low), m_high(*high) + {} + + ControlState GetState() const + { + return (1 + m_high.GetState() - m_low.GetState()) / 2; + } + + std::string GetName() const + { + return m_low.GetName() + *m_high.GetName().rbegin(); + } + + private: + Input& m_low; + Input& m_high; + }; + + void AddAnalogInputs(Input* low, Input* high) + { + AddInput(low); + AddInput(high); + AddInput(new FullAnalogSurface(low, high)); + AddInput(new FullAnalogSurface(high, low)); + } private: std::vector m_inputs; From f97d2a93c4167a4b6aec0ae69536395380d427e3 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 15:41:18 -0600 Subject: [PATCH 457/627] Add "full analog surface" support in DInput,OSX,SDL backends. (should not be needed for XInput) --- .../Src/ControllerInterface/DInput/DInputJoystick.cpp | 4 ++-- .../InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm | 4 ++-- Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index af6ee7e77c..9bc5364e76 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -267,8 +267,8 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI const LONG& ax = (&m_state_in.lX)[offset]; // each axis gets a negative and a positive input instance associated with it - AddInput(new Axis(offset, ax, base, range.lMin-base)); - AddInput(new Axis(offset, ax, base, range.lMax-base)); + AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base), + new Axis(offset, ax, base, range.lMax-base)); } } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm index 129a5f38e0..60c0cc8c50 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm @@ -64,8 +64,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index) AddInput(new Hat(e, m_device, Hat::down)); AddInput(new Hat(e, m_device, Hat::left)); } else { - AddInput(new Axis(e, m_device, Axis::negative)); - AddInput(new Axis(e, m_device, Axis::positive)); + AddAnalogInputs(new Axis(e, m_device, Axis::negative), + new Axis(e, m_device, Axis::positive)); } } CFRelease(axes); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index c7c6898ecd..5473f7bcb3 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -86,8 +86,8 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i) { // each axis gets a negative and a positive input instance associated with it - AddInput(new Axis(i, m_joystick, -32768)); - AddInput(new Axis(i, m_joystick, 32767)); + AddAnalogInputs(new Axis(i, m_joystick, -32768), + new Axis(i, m_joystick, 32767)); } #ifdef USE_SDL_HAPTIC From 2180c933473cac320443763dd0b2fd34c5972621 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 19:38:01 -0600 Subject: [PATCH 458/627] Mention middle mouse button in "Free Look" description. Fixes issue 5581. --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 71c4c1ac93..04d79ae9cf 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -110,7 +110,7 @@ wxString dump_frames_desc = wxTRANSLATE("Dump all rendered frames to an AVI file #if !defined WIN32 && defined HAVE_LIBAV wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nHold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); +wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the midde button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); wxString opencl_desc = wxTRANSLATE("[EXPERIMENTAL]\nAims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\nHowever, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n\nIf unsure, leave this unchecked."); wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked."); From ba1a31248b64e42c67360ca54644e5f44212eea5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 19:42:56 -0600 Subject: [PATCH 459/627] Fix typo. --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 04d79ae9cf..5603a57c27 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -110,7 +110,7 @@ wxString dump_frames_desc = wxTRANSLATE("Dump all rendered frames to an AVI file #if !defined WIN32 && defined HAVE_LIBAV wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the midde button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); +wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); wxString opencl_desc = wxTRANSLATE("[EXPERIMENTAL]\nAims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\nHowever, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n\nIf unsure, leave this unchecked."); wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked."); From d05d10d2a193fa7e047d6fd7932b8e1546066a1a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 17 Jan 2013 19:53:44 -0600 Subject: [PATCH 460/627] Improve "Enable Hotkeys" description. Fixes issue 4607. --- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 5603a57c27..0ca4715c3d 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -115,7 +115,7 @@ wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 wxString opencl_desc = wxTRANSLATE("[EXPERIMENTAL]\nAims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\nHowever, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n\nIf unsure, leave this unchecked."); wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked."); wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked."); -wxString hotkeys_desc = wxTRANSLATE("Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n\nIf unsure, leave this unchecked."); +wxString hotkeys_desc = wxTRANSLATE("Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 (Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n\nIf unsure, leave this unchecked."); wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off)."); wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked."); wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, an error message is displayed.\nHowever, one may skip the popups to allow interruption free gameplay by checking this option.\n\nIf unsure, leave this unchecked."); From 69b1da915f276eab89a0b4ef1a5aaf0eff6c2e5a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 18 Jan 2013 00:06:39 -0600 Subject: [PATCH 461/627] Fix emulated wiimote shaking in Wario Land: Shake It, and probably others. Fixes issue 5295. (probably issue 5017 and issue 5578 too) --- .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 23 ++++++++++++++----- .../Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h | 7 +++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index b7652e973a..61996d8e7c 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -15,6 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include + #include "Attachment/Classic.h" #include "Attachment/Nunchuk.h" #include "Attachment/Guitar.h" @@ -89,23 +91,32 @@ const ReportFeatures reporting_mode_features[] = { 0, 0, 0, 0, 23 }, }; -void EmulateShake( AccelData* const accel +void EmulateShake(AccelData* const accel , ControllerEmu::Buttons* const buttons_group , u8* const shake_step ) { - static const double shake_data[] = { -2.5f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 2.5f, 0.0f }; + // frame count of one up/down shake + // < 9 no shake detection in "Wario Land: Shake It" + auto const shake_step_max = 15; + + // peak G-force + auto const shake_intensity = 3.f; + + // shake is a bitfield of X,Y,Z shake button states static const unsigned int btns[] = { 0x01, 0x02, 0x04 }; unsigned int shake = 0; - buttons_group->GetState( &shake, btns ); - for ( unsigned int i=0; i<3; ++i ) + + for (int i = 0; i != 3; ++i) + { if (shake & (1 << i)) { - (&(accel->x))[i] = shake_data[shake_step[i]++]; - shake_step[i] %= sizeof(shake_data)/sizeof(double); + (&(accel->x))[i] = std::sin(TAU * shake_step[i] / shake_step_max) * shake_intensity; + shake_step[i] = (shake_step[i] + 1) % shake_step_max; } else shake_step[i] = 0; + } } void EmulateTilt(AccelData* const accel diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index 17a3a2adfc..2a773d8978 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -30,7 +30,12 @@ #include #include -#define PI 3.14159265358979323846 +namespace +{ +// :) +auto const TAU = 6.28318530717958647692; +auto const PI = TAU / 2.0; +} // Registry sizes #define WIIMOTE_EEPROM_SIZE (16*1024) From 2f28d938cf640390cd8979c6104f3dbe8795e1e6 Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Thu, 17 Jan 2013 23:32:07 -0800 Subject: [PATCH 462/627] Add support for the mouse cursor and mouse clicking events on OS X. --- .gitignore | 1 + Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++ .../ControllerInterface.cpp | 2 +- .../Src/ControllerInterface/OSX/OSX.h | 2 +- .../Src/ControllerInterface/OSX/OSX.mm | 8 ++- .../Src/ControllerInterface/OSX/OSXKeyboard.h | 32 ++++++++- .../ControllerInterface/OSX/OSXKeyboard.mm | 67 ++++++++++++++++++- 7 files changed, 110 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3cc8a1d8a4..e8dac890f7 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ Source/Core/Common/Src/scmrev.h *.ipch .sconsign.dblite Externals/scons-local/* +.DS_Store diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index ea68c87890..4d66d82b18 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1129,6 +1129,8 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event)) #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); Pad::Initialize((void *)win); +#elif defined(__APPLE__) + Pad::Initialize((void *)this); #else Pad::Initialize(GetHandle()); #endif @@ -1153,6 +1155,8 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event)) #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); Wiimote::Initialize((void *)win); +#elif defined(__APPLE__) + Wiimote::Initialize((void *)this); #else Wiimote::Initialize(GetHandle()); #endif diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index e6877f5731..8e96231674 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -45,7 +45,7 @@ void ControllerInterface::Initialize() ciface::Xlib::Init(m_devices, m_hwnd); #endif #ifdef CIFACE_USE_OSX - ciface::OSX::Init(m_devices); + ciface::OSX::Init(m_devices, m_hwnd); #endif #ifdef CIFACE_USE_SDL ciface::SDL::Init(m_devices); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h index 0458d87e1d..225906c35d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h @@ -7,7 +7,7 @@ namespace ciface namespace OSX { -void Init(std::vector& devices); +void Init(std::vector& devices, void *window); void DeInit(); void DeviceElementDebugPrint(const void *, void *); diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm index bf4f49bac6..aef8f283c1 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm @@ -1,5 +1,6 @@ #include #include +#include #include "../ControllerInterface.h" #include "OSX.h" @@ -131,6 +132,7 @@ void DeviceDebugPrint(IOHIDDeviceRef device) #endif } +static void *g_window; static void DeviceMatching_callback(void* inContext, IOReturn inResult, @@ -150,7 +152,7 @@ static void DeviceMatching_callback(void* inContext, if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) devices->push_back(new Keyboard(inIOHIDDeviceRef, - name, kbd_name_counts[name]++)); + name, kbd_name_counts[name]++, g_window)); #if 0 else if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Mouse)) @@ -162,13 +164,15 @@ static void DeviceMatching_callback(void* inContext, name, joy_name_counts[name]++)); } -void Init(std::vector& devices) +void Init(std::vector& devices, void *window) { HIDManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); if (!HIDManager) NSLog(@"Failed to create HID Manager reference"); + g_window = window; + IOHIDManagerSetDeviceMatching(HIDManager, NULL); // Callbacks for acquisition or loss of a matching device diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h index 1a7fcd045b..d59651c98a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h @@ -21,21 +21,51 @@ private: const IOHIDDeviceRef m_device; std::string m_name; }; + class Cursor : public Input + { + public: + std::string GetName() const; + bool IsDetectable() { return false; } + Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {} + ControlState GetState() const; + private: + const float& m_axis; + const u8 m_index; + const bool m_positive; + }; + class Button : public Input + { + public: + std::string GetName() const; + Button(u8 index, const unsigned char& button) : m_index(index), m_button(button) {} + ControlState GetState() const; + private: + const unsigned char& m_button; + const u8 m_index; + }; public: bool UpdateInput(); bool UpdateOutput(); - Keyboard(IOHIDDeviceRef device, std::string name, int index); + Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window); std::string GetName() const; std::string GetSource() const; int GetId() const; private: + struct + { + float x, y; + } m_cursor; + const IOHIDDeviceRef m_device; const std::string m_device_name; int m_index; + void *m_window; + uint32_t m_windowid; + unsigned char m_mousebuttons[3]; }; } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm index 7543d507dd..56e360019a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm @@ -1,5 +1,7 @@ #include #include +#include +#include // wxWidgets #include "../ControllerInterface.h" #include "OSXKeyboard.h" @@ -9,10 +11,11 @@ namespace ciface namespace OSX { -Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index) +Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window) : m_device(device) , m_device_name(name) , m_index(index) + , m_window(window) { // This class should only recieve Keyboard or Keypad devices // Now, filter on just the buttons we can handle sanely @@ -39,10 +42,48 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index) } CFRelease(elements); } + + m_windowid = [[(NSView *)(((wxWindow *)window)->GetHandle()) window] windowNumber]; + + // cursor, with a hax for-loop + for (unsigned int i=0; i<4; ++i) + AddInput(new Cursor(!!(i&2), (&m_cursor.x)[i/2], !!(i&1))); + + for (u8 i = 0; i < sizeof(m_mousebuttons) / sizeof(m_mousebuttons[0]); ++i) + AddInput(new Button(i, m_mousebuttons[i])); } bool Keyboard::UpdateInput() { + CGRect bounds = CGRectZero; + uint32_t windowid[1] = { m_windowid }; + CFArrayRef windowArray = CFArrayCreate(NULL, (const void **) windowid, 1, NULL); + CFArrayRef windowDescriptions = CGWindowListCreateDescriptionFromArray(windowArray); + CFDictionaryRef windowDescription = (CFDictionaryRef) CFArrayGetValueAtIndex((CFArrayRef) windowDescriptions, 0); + + if (CFDictionaryContainsKey(windowDescription, kCGWindowBounds)) + { + CFDictionaryRef boundsDictionary = (CFDictionaryRef) CFDictionaryGetValue(windowDescription, kCGWindowBounds); + + if (boundsDictionary != NULL) + CGRectMakeWithDictionaryRepresentation(boundsDictionary, &bounds); + } + + CFRelease(windowArray); + + CGEventRef event = CGEventCreate(nil); + CGPoint loc = CGEventGetLocation(event); + CFRelease(event); + + loc.x -= bounds.origin.x; + loc.y -= bounds.origin.y; + m_cursor.x = loc.x / bounds.size.width * 2 - 1.0; + m_cursor.y = loc.y / bounds.size.height * 2 - 1.0; + + m_mousebuttons[0] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonLeft); + m_mousebuttons[1] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonRight); + m_mousebuttons[2] = CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, kCGMouseButtonCenter); + return true; } @@ -201,10 +242,34 @@ ControlState Keyboard::Key::GetState() const return 0; } +ControlState Keyboard::Cursor::GetState() const +{ + return std::max(0.0f, ControlState(m_axis) / (m_positive ? 1.0f : -1.0f)); +} + +ControlState Keyboard::Button::GetState() const +{ + return (m_button != 0); +} + +std::string Keyboard::Cursor::GetName() const +{ + static char tmpstr[] = "Cursor .."; + tmpstr[7] = (char)('X' + m_index); + tmpstr[8] = (m_positive ? '+' : '-'); + return tmpstr; +} + +std::string Keyboard::Button::GetName() const +{ + return std::string("Click ") + char('0' + m_index); +} + std::string Keyboard::Key::GetName() const { return m_name; } + } } From 5ff77f9c882acdec1bd673d883dded9d219b8fa0 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 18 Jan 2013 13:40:54 -0600 Subject: [PATCH 463/627] Fix emulated turntable crossfade slider. (DJ Hero controller) Fixes issue 4504. --- Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp index 292d9c5a86..182170f501 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -97,8 +97,9 @@ void Turntable::GetState(u8* const data, const bool focus) // crossfade slider { - u8 cfs = 0; - m_crossfade->GetState(&cfs, 8, 7); + s8 cfs = 0; + m_crossfade->GetState(&cfs, focus ? 7 : 0); + cfs += 8; ttdata->slider = cfs; } From c4bd6329c003686fd43002fc4f78f735166b6cbd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 Jan 2013 23:42:37 -0500 Subject: [PATCH 464/627] Fully fix that clear bug in aldlist.cpp. Seems I missed part. Corrected it. --- Source/Core/AudioCommon/Src/aldlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp index 5e2e072f7b..fa11fe3282 100644 --- a/Source/Core/AudioCommon/Src/aldlist.cpp +++ b/Source/Core/AudioCommon/Src/aldlist.cpp @@ -146,7 +146,7 @@ ALDeviceList::~ALDeviceList() { for (u32 i = 0; i < vDeviceInfo.size(); i++) { if (vDeviceInfo[i].pvstrExtensions) { - vDeviceInfo[i].pvstrExtensions->empty(); + vDeviceInfo[i].pvstrExtensions->clear(); delete vDeviceInfo[i].pvstrExtensions; } } From ff9ba6777327d07291bd8682e38931b77fea463d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 19 Jan 2013 00:51:00 -0600 Subject: [PATCH 465/627] Remove the dependency on rectangle textures in the software rasterizer. Also make it the be used by default in the software renderer like it was before. --- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 68 ++++++++----------- .../Src/SWVideoConfig.cpp | 2 +- 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 49739b7f6e..16ac1c3cd0 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -52,10 +52,10 @@ void CreateShaders() { static const char *fragShaderText = "varying " PREC " vec2 TexCoordOut;\n" - "uniform " TEXTYPE " Texture;\n" + "uniform sampler2D Texture;\n" "void main() {\n" " " PREC " vec4 tmpcolor;\n" - " tmpcolor = " TEXFUNC "(Texture, TexCoordOut);\n" + " tmpcolor = texture2D(Texture, TexCoordOut);\n" " gl_FragColor = tmpcolor;\n" "}\n"; static const char *vertShaderText = @@ -63,7 +63,7 @@ void CreateShaders() "attribute vec2 TexCoordIn;\n " "varying vec2 TexCoordOut;\n " "void main() {\n" - " gl_Position = pos;\n" + " gl_Position = pos;\n" " TexCoordOut = TexCoordIn;\n" "}\n"; @@ -74,6 +74,23 @@ void CreateShaders() uni_tex = glGetUniformLocation(program, "Texture"); attr_pos = glGetAttribLocation(program, "pos"); attr_tex = glGetAttribLocation(program, "TexCoordIn"); + + static const GLfloat verts[4][2] = { + { -1, -1}, // Left top + { -1, 1}, // left bottom + { 1, 1}, // right bottom + { 1, -1} // right top + }; + static const GLfloat texverts[4][2] = { + {0, 1}, + {0, 0}, + {1, 0}, + {1, 1} + }; + + glUniform1i(uni_tex, 0); + glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); } void SWRenderer::Prepare() @@ -86,7 +103,7 @@ void SWRenderer::Prepare() // TODO: Enable for GLES once RasterFont supports GLES #ifndef USE_GLES s_pfont = new RasterFont(); - glEnable(GL_TEXTURE_RECTANGLE_ARB); + glEnable(GL_TEXTURE_2D); #endif GL_REPORT_ERRORD(); } @@ -142,48 +159,20 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) glViewport(0, 0, glWidth, glHeight); glScissor(0, 0, glWidth, glHeight); - glBindTexture(TEX2D, s_RenderTarget); + glBindTexture(GL_TEXTURE_2D, s_RenderTarget); - glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); - glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - static const GLfloat verts[4][2] = { - { -1, -1}, // Left top - { -1, 1}, // left bottom - { 1, 1}, // right bottom - { 1, -1} // right top - }; - //Texture rectangle uses pixel coordinates -#ifndef USE_GLES - GLfloat u_max = (GLfloat)width; - GLfloat v_max = (GLfloat)height; - - static const GLfloat texverts[4][2] = { - {0, v_max}, - {0, 0}, - {u_max, 0}, - {u_max, v_max} - }; -#else - static const GLfloat texverts[4][2] = { - {0, 1}, - {0, 0}, - {1, 0}, - {1, 1} - }; -#endif - glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); - glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); glEnableVertexAttribArray(attr_pos); glEnableVertexAttribArray(attr_tex); glActiveTexture(GL_TEXTURE0); - glUniform1i(uni_tex, 0); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDisableVertexAttribArray(attr_pos); glDisableVertexAttribArray(attr_tex); - glBindTexture(TEX2D, 0); + glBindTexture(GL_TEXTURE_2D, 0); GL_REPORT_ERRORD(); } @@ -195,11 +184,8 @@ void SWRenderer::SwapBuffer() GLInterface->Swap(); - swstats.ResetFrame(); + swstats.ResetFrame(); -#ifndef USE_GLES - glClearDepth(1.0f); -#endif glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); GL_REPORT_ERRORD(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp index 7f7ef6b0f8..05a6cdddf2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp @@ -51,7 +51,7 @@ void SWVideoConfig::Load(const char* ini_file) iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); - iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, true); + iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); iniFile.Get("Info", "ShowStats", &bShowStats, false); From 621204f3e86212de77e10285b9cfd70b95c8fd8d Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 19 Jan 2013 02:18:39 -0600 Subject: [PATCH 466/627] Fix switching from the different rasterizers --- .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 34 +++++++------- .../Plugin_VideoSoftware/Src/SWmain.cpp | 44 ++++++++----------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 16ac1c3cd0..fb472cfdba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -75,22 +75,7 @@ void CreateShaders() attr_pos = glGetAttribLocation(program, "pos"); attr_tex = glGetAttribLocation(program, "TexCoordIn"); - static const GLfloat verts[4][2] = { - { -1, -1}, // Left top - { -1, 1}, // left bottom - { 1, 1}, // right bottom - { 1, -1} // right top - }; - static const GLfloat texverts[4][2] = { - {0, 1}, - {0, 0}, - {1, 0}, - {1, 1} - }; - - glUniform1i(uni_tex, 0); - glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); - glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); + } void SWRenderer::Prepare() @@ -165,8 +150,25 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glUseProgram(program); + static const GLfloat verts[4][2] = { + { -1, -1}, // Left top + { -1, 1}, // left bottom + { 1, 1}, // right bottom + { 1, -1} // right top + }; + static const GLfloat texverts[4][2] = { + {0, 1}, + {0, 0}, + {1, 0}, + {1, 1} + }; + + glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, verts); + glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); glEnableVertexAttribArray(attr_pos); glEnableVertexAttribArray(attr_tex); + glUniform1i(uni_tex, 0); glActiveTexture(GL_TEXTURE0); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDisableVertexAttribArray(attr_pos); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index ae2a4db3f5..4c88a89ab6 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -70,7 +70,7 @@ void VideoSoftware::ShowConfig(void *_hParent) bool VideoSoftware::Initialize(void *&window_handle) { - g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); + g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); InitInterface(); if (!GLInterface->Create(window_handle)) @@ -79,18 +79,16 @@ bool VideoSoftware::Initialize(void *&window_handle) return false; } - InitBPMemory(); - InitXFMemory(); - SWCommandProcessor::Init(); - SWPixelEngine::Init(); - OpcodeDecoder::Init(); - Clipper::Init(); - Rasterizer::Init(); - if (g_SWVideoConfig.bHwRasterizer) - HwRasterizer::Init(); - else - SWRenderer::Init(); - DebugUtil::Init(); + InitBPMemory(); + InitXFMemory(); + SWCommandProcessor::Init(); + SWPixelEngine::Init(); + OpcodeDecoder::Init(); + Clipper::Init(); + Rasterizer::Init(); + HwRasterizer::Init(); + SWRenderer::Init(); + DebugUtil::Init(); return true; } @@ -134,10 +132,8 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState) void VideoSoftware::Shutdown() { - if (g_SWVideoConfig.bHwRasterizer) - HwRasterizer::Shutdown(); - else - SWRenderer::Shutdown(); + HwRasterizer::Shutdown(); + SWRenderer::Shutdown(); GLInterface->Shutdown(); } @@ -149,9 +145,9 @@ void VideoSoftware::Video_Prepare() { #ifndef USE_GLES if (glewInit() != GLEW_OK) { - ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); - return; - } + ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); + return; + } // Handle VSync on/off #ifdef _WIN32 @@ -168,12 +164,10 @@ void VideoSoftware::Video_Prepare() #endif } - if (g_SWVideoConfig.bHwRasterizer) - HwRasterizer::Prepare(); - else - SWRenderer::Prepare(); + HwRasterizer::Prepare(); + SWRenderer::Prepare(); - INFO_LOG(VIDEO, "Video backend initialized."); + INFO_LOG(VIDEO, "Video backend initialized."); } // Run from the CPU thread (from VideoInterface.cpp) From c553c42d63daad7aafbd2996da1f05ce2a911635 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 19 Jan 2013 05:09:00 +0100 Subject: [PATCH 467/627] Implement backpatch support for 16 bit loads --- Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp | 7 +++++-- Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index 9337f87b77..e2d9b50d42 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -90,6 +90,10 @@ const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info) case 4: CALL(thunks.ProtectFunction((void *)&Memory::Read_U32, 1)); break; + case 2: + CALL(thunks.ProtectFunction((void *)&Memory::Read_U16, 1)); + SHL(32, R(EAX), Imm8(16)); + break; } ABI_PopAllCallerSavedRegsAndAdjustStack(); if (dataReg != EAX) { @@ -176,7 +180,7 @@ const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *c codePtr, emAddress); }*/ - if (info.operandSize != 4) { + if (info.operandSize == 1) { BackPatchError(StringFromFormat("BackPatch - no support for operand size %i", info.operandSize), codePtr, emAddress); } @@ -188,7 +192,6 @@ const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *c PanicAlert("BackPatch : Currently only supporting reads." "\n\nAttempted to write to %08x.", emAddress); - // In the first iteration, we assume that all accesses are 32-bit. We also only deal with reads. if (accessType == 0) { XEmitter emitter(codePtr); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index 4cfc3ab934..f43604fa9b 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -120,12 +120,13 @@ void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s { #if defined(_M_X64) #ifdef ENABLE_MEM_CHECK - if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) + if (accessSize != 8 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) #else - if (accessSize == 32 && !Core::g_CoreStartupParameter.bMMU) + if (accessSize != 8 && !Core::g_CoreStartupParameter.bMMU) #endif { - // BackPatch only supports 32-bits accesses + // We don't support 8 bit loads backpatching at the moment, but they + // are very rare. UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend); } else From 905d38827e70ea438b7c744addd46f75e89d87b0 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 19 Jan 2013 16:52:13 +0100 Subject: [PATCH 468/627] Implement 8 bit loads backpatching --- .../Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp | 7 +++---- Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 12 +++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index e2d9b50d42..3042cfedba 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -94,6 +94,9 @@ const u8 *TrampolineCache::GetReadTrampoline(const InstructionInfo &info) CALL(thunks.ProtectFunction((void *)&Memory::Read_U16, 1)); SHL(32, R(EAX), Imm8(16)); break; + case 1: + CALL(thunks.ProtectFunction((void *)&Memory::Read_U8, 1)); + break; } ABI_PopAllCallerSavedRegsAndAdjustStack(); if (dataReg != EAX) { @@ -180,10 +183,6 @@ const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *c codePtr, emAddress); }*/ - if (info.operandSize == 1) { - BackPatchError(StringFromFormat("BackPatch - no support for operand size %i", info.operandSize), codePtr, emAddress); - } - if (info.otherReg != RBX) PanicAlert("BackPatch : Base reg not RBX." "\n\nAttempted to access %08x.", emAddress); diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index f43604fa9b..cc1327c695 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -96,7 +96,11 @@ void EmuCodeBlock::UnsafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, MOVZX(32, accessSize, EAX, MDisp(EAX, (u32)Memory::base + offset)); } #endif - + + // Add a 2 bytes NOP to have some space for the backpatching + if (accessSize == 8) + NOP(2); + if (accessSize == 32) { BSWAP(32, EAX); @@ -120,13 +124,11 @@ void EmuCodeBlock::SafeLoadToEAX(const Gen::OpArg & opAddress, int accessSize, s { #if defined(_M_X64) #ifdef ENABLE_MEM_CHECK - if (accessSize != 8 && !Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) + if (!Core::g_CoreStartupParameter.bMMU && !Core::g_CoreStartupParameter.bEnableDebugging) #else - if (accessSize != 8 && !Core::g_CoreStartupParameter.bMMU) + if (!Core::g_CoreStartupParameter.bMMU) #endif { - // We don't support 8 bit loads backpatching at the moment, but they - // are very rare. UnsafeLoadToEAX(opAddress, accessSize, offset, signExtend); } else From ed1a9480b0233e424ae3c266467b6d821c801793 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 19 Jan 2013 15:02:02 -0500 Subject: [PATCH 469/627] Misc movie fixes. Fix setting memory cards on playback. Fix saving revision to header. Herpa derp lets open a file while it's still open in another function, and not even check if it fails to load. Fix an assumption that wii games are using a wiimote. --- Source/Core/Core/Src/HW/EXI.cpp | 8 ++++- Source/Core/Core/Src/Movie.cpp | 52 ++++++++++++++++----------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp index 8800ea6095..1e86bd1b90 100644 --- a/Source/Core/Core/Src/HW/EXI.cpp +++ b/Source/Core/Core/Src/HW/EXI.cpp @@ -25,6 +25,7 @@ #include "EXI.h" #include "Sram.h" +#include "../Movie.h" SRAM g_SRAM; namespace ExpansionInterface @@ -44,7 +45,12 @@ void Init() for (u32 i = 0; i < NUM_CHANNELS; i++) g_Channels[i] = new CEXIChannel(i); - g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA + if (Movie::IsPlayingInput() && Movie::IsUsingMemcard() && Movie::IsConfigSaved()) + g_Channels[0]->AddDevice(EXIDEVICE_MEMORYCARD, 0); // SlotA + else if(Movie::IsPlayingInput() && !Movie::IsUsingMemcard() && Movie::IsConfigSaved()) + g_Channels[0]->AddDevice(EXIDEVICE_NONE, 0); // SlotA + else + g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[0], 0); // SlotA g_Channels[0]->AddDevice(EXIDEVICE_MASKROM, 1); g_Channels[0]->AddDevice(SConfig::GetInstance().m_EXIDevice[2], 2); // Serial Port 1 g_Channels[1]->AddDevice(SConfig::GetInstance().m_EXIDevice[1], 0); // SlotB diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 316181d449..752e367431 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -736,16 +736,6 @@ bool PlayInput(const char *filename) goto cleanup; } - // Load savestate (and skip to frame data) - if(tmpHeader.bFromSaveState) - { - const std::string stateFilename = std::string(filename) + ".sav"; - if(File::Exists(stateFilename)) - Core::SetStateFileName(stateFilename); - g_bRecordingFromSaveState = true; - Movie::LoadInput(filename); - } - ReadHeader(); g_totalFrames = tmpHeader.frameCount; g_totalLagCount = tmpHeader.lagCount; @@ -762,6 +752,16 @@ bool PlayInput(const char *filename) g_currentByte = 0; g_recordfd.Close(); + // Load savestate (and skip to frame data) + if(tmpHeader.bFromSaveState) + { + const std::string stateFilename = std::string(filename) + ".sav"; + if(File::Exists(stateFilename)) + Core::SetStateFileName(stateFilename); + g_bRecordingFromSaveState = true; + Movie::LoadInput(filename); + } + return true; cleanup: @@ -786,7 +786,13 @@ void DoState(PointerWrap &p) void LoadInput(const char *filename) { - File::IOFile t_record(filename, "r+b"); + File::IOFile t_record; + if (!t_record.Open(filename, "r+b")) + { + PanicAlertT("Failed to read %s", filename); + EndPlayInput(false); + return; + } t_record.ReadArray(&tmpHeader, 1); @@ -849,7 +855,7 @@ void LoadInput(const char *filename) { // this is a "you did something wrong" alert for the user's benefit. // we'll try to say what's going on in excruciating detail, otherwise the user might not believe us. - if(Core::g_CoreStartupParameter.bWii) + if(IsUsingWiimote(1)) { // TODO: more detail PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256); @@ -925,18 +931,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) return; - if (g_currentFrame == 1) - { - if (tmpHeader.bMemcard) - { - ExpansionInterface::ChangeDevice(0, EXIDEVICE_MEMORYCARD, 0); - } - else if (!tmpHeader.bMemcard) - { - ExpansionInterface::ChangeDevice(0, EXIDEVICE_NONE, 0); - } - } - if (g_currentByte + 8 > g_totalBytes) { PanicAlertT("Premature movie end in PlayController. %u + 8 > %u", (u32)g_currentByte, (u32)g_totalBytes); @@ -1194,9 +1188,13 @@ void GetSettings() g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; - std::stringstream ss; - ss << std::hex << SCM_REV_STR; - ss >> revision; + int temp; + + for(int i = 0; i < 4; ++i ) + { + sscanf(SCM_REV_STR + 2 * i, "%2x", &temp ); + revision[i] = temp; + } } void CheckMD5() From d6cee44be03e0320935e4c5480dac1e1357d87ef Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 19 Jan 2013 15:08:29 -0500 Subject: [PATCH 470/627] Typo fix. --- Source/Core/Core/Src/Movie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 752e367431..6c646f6870 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -855,7 +855,7 @@ void LoadInput(const char *filename) { // this is a "you did something wrong" alert for the user's benefit. // we'll try to say what's going on in excruciating detail, otherwise the user might not believe us. - if(IsUsingWiimote(1)) + if(IsUsingWiimote(0)) { // TODO: more detail PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256); From 01d393ed6cb823abe623e8c71a971368c94a6157 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 19 Jan 2013 15:21:00 -0500 Subject: [PATCH 471/627] Actually remove lttc. --- Source/Core/Core/Src/Core.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 797c3e1be6..a6c07eeaaa 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -310,8 +310,6 @@ void CpuThread() g_video_backend->Video_Prepare(); } - Common::SetCurrentThreadAffinity(1); // Force to first core - #if defined(_M_X64) EMM::InstallExceptionHandler(); // Let's run under memory watch #endif @@ -343,8 +341,6 @@ void FifoPlayerThread() Common::SetCurrentThreadName("FIFO-GPU thread"); } - Common::SetCurrentThreadAffinity(1); // Force to first core - g_bStarted = true; // Enter CPU run loop. When we leave it - we are done. @@ -369,13 +365,6 @@ void EmuThread() Common::SetCurrentThreadName("Emuthread - Starting"); - { - if (cpu_info.num_cores > 3) // Force to third, non-HT core - Common::SetCurrentThreadAffinity(4); - else // Force to second core - Common::SetCurrentThreadAffinity(2); - } - DisplayMessage(cpu_info.brand_string, 8000); DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); From 37af25e03dd132c691aa2ff9709e439b4eb9e0ad Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 13 Jan 2013 10:49:33 +0100 Subject: [PATCH 472/627] Revert my dual-core fix for FifoPlayer. Apparently it breaks more than it fixes. This reverts commit bab9b5d3ce14c5b9cb55bd34da4851672e287467. --- .../Core/Core/Src/FifoPlayer/FifoPlayer.cpp | 42 +------------------ Source/Core/Core/Src/FifoPlayer/FifoPlayer.h | 1 - 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp index 1873a91574..ff90736fec 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.cpp @@ -20,7 +20,6 @@ #include "Common.h" #include "CoreTiming.h" -#include "Thread.h" #include "HW/GPFifo.h" #include "HW/Memmap.h" @@ -28,7 +27,6 @@ #include "PowerPC/PowerPC.h" #include "BPMemory.h" -#include "CommandProcessor.h" FifoPlayer::~FifoPlayer() { @@ -96,40 +94,7 @@ bool FifoPlayer::Play() if (m_EarlyMemoryUpdates && m_CurrentFrame == m_FrameRangeStart) WriteAllMemoryUpdates(); - // Stop Fifo processing until we've written the new frame - WriteCP(CommandProcessor::CTRL_REGISTER, 0x10); // disable read & breakpoints, enable GP link - - // Write frame data - WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); - - // Enable frame processing and break when done - u16 write_ptr_lo = ReadCP(CommandProcessor::FIFO_WRITE_POINTER_LO); - u16 write_ptr_hi = ReadCP(CommandProcessor::FIFO_WRITE_POINTER_HI); - WriteCP(CommandProcessor::FIFO_BP_LO, write_ptr_lo); - WriteCP(CommandProcessor::FIFO_BP_HI, write_ptr_hi); - WriteCP(CommandProcessor::CTRL_REGISTER, 0x13); // enable read, breakpoints & GP link - - // If necessary, wait until GP has reached the breakpoint to prevent fifo overflows - // TODO: Can this be done any better? Dual core mode is slower than single core mode even with these conditions.. - if (m_CurrentFrame < m_FrameRangeEnd) - { - // Check if FIFO would be overflown when writing the next frame - u32 CPRWDistance = (ReadCP(CommandProcessor::FIFO_RW_DISTANCE_HI)<<16) | ReadCP(CommandProcessor::FIFO_RW_DISTANCE_LO); - CPRWDistance += m_File->GetFrame(m_CurrentFrame+1).fifoDataSize + CommandProcessor::GATHER_PIPE_SIZE; - u32 CPFifoBase = (ReadCP(CommandProcessor::FIFO_BASE_HI)<<16) | ReadCP(CommandProcessor::FIFO_BASE_LO); - u32 CPFifoEnd = (ReadCP(CommandProcessor::FIFO_END_HI)<<16) | ReadCP(CommandProcessor::FIFO_END_LO); - - bool bWait = (CPRWDistance > CPFifoEnd - CPFifoBase); - while (bWait && (ReadCP(CommandProcessor::FIFO_READ_POINTER_LO) != write_ptr_lo || - ReadCP(CommandProcessor::FIFO_READ_POINTER_HI) != write_ptr_hi)) - { - Common::YieldCPU(); - CoreTiming::Advance(); // Process scheduled events (esp. PixelEngine::SetFinish!) - - if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) - break; - } - } + WriteFrame(m_File->GetFrame(m_CurrentFrame), m_FrameInfo[m_CurrentFrame]); ++m_CurrentFrame; } @@ -422,11 +387,6 @@ void FifoPlayer::LoadMemory() FlushWGP(); } -u16 FifoPlayer::ReadCP(u32 address) -{ - return Memory::Read_U16(0xCC000000 | address); -} - void FifoPlayer::WriteCP(u32 address, u16 value) { Memory::Write_U16(value, 0xCC000000 | address); diff --git a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h index 838ac13f18..9db6c0d980 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoPlayer.h @@ -87,7 +87,6 @@ private: void LoadMemory(); - u16 ReadCP(u32 address); void WriteCP(u32 address, u16 value); void WritePI(u32 address, u32 value); From 6c0f6ffecff631344fe52972e267753e19e8d121 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 19 Jan 2013 22:34:07 +0100 Subject: [PATCH 473/627] Fix a dumb regression from revision 4925a28f94d8. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index c1ebdbcc89..448501aad0 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -158,10 +158,11 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo if (dstAlphaMode != DSTALPHA_ALPHA_PASS) { + ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 13; // 3 if (bpmem.fog.c_proj_fsel.fsel != 0) { - ptr[0] |= bpmem.fog.c_proj_fsel.proj << 13; // 1 - ptr[0] |= bpmem.fogRange.Base.Enabled << 14; // 1 + ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1 + ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1 } } From 7f8341825b559277a1031c076b1a89604ccc94d8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 19 Jan 2013 17:17:18 -0500 Subject: [PATCH 474/627] Remove lttc for lle on thread too. --- Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 0d2b375268..92053053de 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -104,26 +104,6 @@ void DSPLLE::dsp_thread(DSPLLE *dsp_lle) { Common::SetCurrentThreadName("DSP thread"); - { - if (cpu_info.num_cores > 3) - { - // HACK (delroth): there is no way to know where hyperthreads are in - // the current Dolphin version. - bool windows = false; -#ifdef _WIN32 - windows = true; -#endif - - u8 core_id; - if (windows && cpu_info.num_cores > 4) // Probably HT - core_id = 5; // 3rd non HT core - else - core_id = 3; // 3rd core - - Common::SetCurrentThreadAffinity(1 << (core_id - 1)); - } - } - while (dsp_lle->m_bIsRunning) { int cycles = (int)dsp_lle->m_cycle_count; From 6ec95d30af4ce33090d896414107844bea18c612 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 19 Jan 2013 19:16:01 -0600 Subject: [PATCH 475/627] Allow emulated wiimote to be tilted 180 degrees in each direction. (was 90) Fixes issue 3492. --- Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 9 +++++---- Source/Core/InputCommon/Src/ControllerEmu.cpp | 1 + Source/Core/InputCommon/Src/ControllerEmu.h | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 61996d8e7c..485a5e7e52 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -124,7 +124,8 @@ void EmulateTilt(AccelData* const accel , const bool focus, const bool sideways, const bool upright) { float roll, pitch; - tilt_group->GetState( &roll, &pitch, 0, focus ? (PI / 2) : 0 ); // 90 degrees + // 180 degrees + tilt_group->GetState(&roll, &pitch, 0, focus ? PI : 0); unsigned int ud = 0, lr = 0, fb = 0; @@ -267,6 +268,9 @@ Wiimote::Wiimote( const unsigned int index ) for (unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons); ++i) m_buttons->controls.push_back(new ControlGroup::Input( named_buttons[i])); + // udp + groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote"))); + // ir groups.push_back(m_ir = new Cursor(_trans("IR"))); @@ -276,9 +280,6 @@ Wiimote::Wiimote( const unsigned int index ) // tilt groups.push_back(m_tilt = new Tilt(_trans("Tilt"))); - // udp - groups.push_back(m_udp = new UDPWrapper(m_index, _trans("UDP Wiimote"))); - // shake groups.push_back(m_shake = new Buttons(_trans("Shake"))); m_shake->controls.push_back(new ControlGroup::Input("X")); diff --git a/Source/Core/InputCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp index 9065888d7d..2e6ad10617 100644 --- a/Source/Core/InputCommon/Src/ControllerEmu.cpp +++ b/Source/Core/InputCommon/Src/ControllerEmu.cpp @@ -295,6 +295,7 @@ ControllerEmu::Tilt::Tilt(const char* const _name) settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50)); settings.push_back(new Setting(_trans("Circle Stick"), 0)); + settings.push_back(new Setting(_trans("Angle"), 0.9f, 0, 180)); } ControllerEmu::Cursor::Cursor(const char* const _name) diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h index 888e0c7fa9..6084a610a1 100644 --- a/Source/Core/InputCommon/Src/ControllerEmu.h +++ b/Source/Core/InputCommon/Src/ControllerEmu.h @@ -307,6 +307,7 @@ public: ControlState deadzone = settings[0]->value; ControlState circle = settings[1]->value; + auto const angle = settings[2]->value / 1.8f; ControlState m = controls[4]->control_ref->State(); // modifier code @@ -363,8 +364,8 @@ public: m_tilt[1] = std::max(m_tilt[1] - 0.1f, yy); } - *y = C(m_tilt[1] * range + base); - *x = C(m_tilt[0] * range + base); + *y = C(m_tilt[1] * angle * range + base); + *x = C(m_tilt[0] * angle * range + base); } private: float m_tilt[2]; From 0a5f479250a3f596dd8757b6d28bdc29de92c32c Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 20 Jan 2013 13:09:38 +1100 Subject: [PATCH 476/627] Added a game property to disable the clearing of the data cache. This is needed by one known game, "Rubik's Puzzle Galaxy: Rush". Fixes Violin Paradise. --- Data/User/GameConfig/WZIPTW.ini | 1 + Source/Core/Core/Src/BootManager.cpp | 8 +++--- Source/Core/Core/Src/ConfigManager.cpp | 2 +- Source/Core/Core/Src/CoreParameter.cpp | 4 +-- Source/Core/Core/Src/CoreParameter.h | 2 +- Source/Core/Core/Src/HW/MemmapFunctions.cpp | 2 +- .../Interpreter/Interpreter_LoadStore.cpp | 2 +- Source/Core/DolphinWX/Src/ISOProperties.cpp | 26 +++++++++---------- Source/Core/DolphinWX/Src/ISOProperties.h | 4 +-- 9 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Data/User/GameConfig/WZIPTW.ini b/Data/User/GameConfig/WZIPTW.ini index 5fb4a23c18..6e7cce2648 100644 --- a/Data/User/GameConfig/WZIPTW.ini +++ b/Data/User/GameConfig/WZIPTW.ini @@ -1,5 +1,6 @@ # WZIPTW - Rubik's: Rush [Core] Values set here will override the main dolphin settings. +DCBZ = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 1 EmulationIssues = Requires data cache emulation diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 50c5756178..b867052381 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -54,7 +54,7 @@ namespace BootManager // Apply fire liberally struct ConfigCache { - bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bMMUBAT, + bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker, bHLE_BS2; int iTLBHack, iCPUCore; std::string strBackend; @@ -92,7 +92,7 @@ bool BootCore(const std::string& _rFilename) config_cache.iCPUCore = StartUp.iCPUCore; config_cache.bEnableFPRF = StartUp.bEnableFPRF; config_cache.bMMU = StartUp.bMMU; - config_cache.bMMUBAT = StartUp.bMMUBAT; + config_cache.bDCBZOFF = StartUp.bDCBZOFF; config_cache.iTLBHack = StartUp.iTLBHack; config_cache.bVBeam = StartUp.bVBeam; config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; @@ -107,8 +107,8 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle); game_ini.Get("Core", "EnableFPRF", &StartUp.bEnableFPRF, StartUp.bEnableFPRF); game_ini.Get("Core", "MMU", &StartUp.bMMU, StartUp.bMMU); - game_ini.Get("Core", "BAT", &StartUp.bMMUBAT, StartUp.bMMUBAT); game_ini.Get("Core", "TLBHack", &StartUp.iTLBHack, StartUp.iTLBHack); + game_ini.Get("Core", "DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); game_ini.Get("Core", "VBeam", &StartUp.bVBeam, StartUp.bVBeam); game_ini.Get("Core", "FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); @@ -167,7 +167,7 @@ void Stop() StartUp.iCPUCore = config_cache.iCPUCore; StartUp.bEnableFPRF = config_cache.bEnableFPRF; StartUp.bMMU = config_cache.bMMU; - StartUp.bMMUBAT = config_cache.bMMUBAT; + StartUp.bDCBZOFF = config_cache.bDCBZOFF; StartUp.iTLBHack = config_cache.iTLBHack; StartUp.bVBeam = config_cache.bVBeam; StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 317e770868..f6194c1bb7 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -400,7 +400,7 @@ void SConfig::LoadSettings() ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0); ini.Get("Core", "VBeam", &m_LocalCoreStartupParameter.bVBeam, false); ini.Get("Core", "FastDiscSpeed", &m_LocalCoreStartupParameter.bFastDiscSpeed, false); - ini.Get("Core", "BAT", &m_LocalCoreStartupParameter.bMMUBAT, false); + ini.Get("Core", "DCBZ", &m_LocalCoreStartupParameter.bDCBZOFF, false); ini.Get("Core", "FrameLimit", &m_Framelimit, 1); // auto frame limit by default ini.Get("Core", "UseFPS", &b_UseFPS, false); // use vps as default diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 16615f5805..9fc451c807 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -49,7 +49,7 @@ SCoreStartupParameter::SCoreStartupParameter() bMergeBlocks(false), bDPL2Decoder(false), iLatency(14), bRunCompareServer(false), bRunCompareClient(false), - bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), + bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), bConfirmStop(false), bHideCursor(false), @@ -75,7 +75,7 @@ void SCoreStartupParameter::LoadDefaults() bDSPThread = true; bEnableFPRF = false; bMMU = false; - bMMUBAT = false; + bDCBZOFF = false; iTLBHack = 0; bVBeam = false; bFastDiscSpeed = false; diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index 4c7c33cdfb..e2e5eb6f1b 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -113,7 +113,7 @@ struct SCoreStartupParameter bool bRunCompareClient; bool bMMU; - bool bMMUBAT; + bool bDCBZOFF; int iTLBHack; bool bVBeam; bool bFastDiscSpeed; diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp index b391eea975..e01eedaaab 100644 --- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp @@ -956,7 +956,7 @@ u32 TranslateAddress(const u32 _Address, const XCheckTLBFlag _Flag) // Check MSR[DR] bit before translating data addresses //if (((_Flag == FLAG_READ) || (_Flag == FLAG_WRITE)) && !(MSR & (1 << (31 - 27)))) return _Address; - u32 tlb_addr = Core::g_CoreStartupParameter.bMMUBAT?TranslateBlockAddress(_Address, _Flag):0; + u32 tlb_addr = TranslateBlockAddress(_Address, _Flag); if (tlb_addr == 0) { tlb_addr = TranslatePageAddress(_Address, _Flag); diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index bc5cfc10e6..5e665eb38e 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -407,7 +407,7 @@ void Interpreter::dcbtst(UGeckoInstruction _inst) void Interpreter::dcbz(UGeckoInstruction _inst) { // HACK but works... we think - if (HID2.WPE || !HID0.DCFA) + if (!Core::g_CoreStartupParameter.bDCBZOFF) Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); if (!jit) PowerPC::CheckExceptions(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index f06b3daa8a..2083c39201 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -315,10 +315,10 @@ void CISOProperties::CreateGUIControls(bool IsWad) SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - MMUBAT = new wxCheckBox(m_GameConfig, ID_MMUBAT, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - MMUBAT->SetToolTip(_("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)")); TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game.")); + DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); + DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("Accurate VBeam emulation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); VBeam->SetToolTip(_("If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)")); FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); @@ -364,7 +364,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5); sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5); sbCoreOverrides->Add(MMU, 0, wxLEFT, 5); - sbCoreOverrides->Add(MMUBAT, 0, wxLEFT, 5); + sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5); sbCoreOverrides->Add(TLBHack, 0, wxLEFT, 5); sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5); @@ -930,16 +930,16 @@ void CISOProperties::LoadGameConfig() else MMU->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Core", "BAT", &bTemp)) - MMUBAT->Set3StateValue((wxCheckBoxState)bTemp); - else - MMUBAT->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Core", "TLBHack", &bTemp)) TLBHack->Set3StateValue((wxCheckBoxState)bTemp); else TLBHack->Set3StateValue(wxCHK_UNDETERMINED); + if (GameIni.Get("Core", "DCBZ", &bTemp)) + DCBZOFF->Set3StateValue((wxCheckBoxState)bTemp); + else + DCBZOFF->Set3StateValue(wxCHK_UNDETERMINED); + if (GameIni.Get("Core", "VBeam", &bTemp)) VBeam->Set3StateValue((wxCheckBoxState)bTemp); else @@ -1025,16 +1025,16 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Core", "MMU", MMU->Get3StateValue()); - if (MMUBAT->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Core", "BAT"); - else - GameIni.Set("Core", "BAT", MMUBAT->Get3StateValue()); - if (TLBHack->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Core", "TLBHack"); else GameIni.Set("Core", "TLBHack", TLBHack->Get3StateValue()); + if (DCBZOFF->Get3StateValue() == wxCHK_UNDETERMINED) + GameIni.DeleteKey("Core", "DCBZ"); + else + GameIni.Set("Core", "DCBZ", DCBZOFF->Get3StateValue()); + if (VBeam->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Core", "VBeam"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 9d71e675e2..4f03130ba7 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -69,7 +69,7 @@ private: DECLARE_EVENT_TABLE(); // Core - wxCheckBox *CPUThread, *SkipIdle, *MMU, *MMUBAT, *TLBHack; + wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *TLBHack; wxCheckBox *VBeam, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii wxCheckBox *EnableWideScreen, *DisableWiimoteSpeaker; @@ -127,7 +127,7 @@ private: ID_USEDUALCORE, ID_IDLESKIP, ID_MMU, - ID_MMUBAT, + ID_DCBZOFF, ID_TLBHACK, ID_VBEAM, ID_DISCSPEED, From 4cc4abfe25747b6ade6c60c47258a1b6622a64f1 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 20 Jan 2013 16:11:15 +1100 Subject: [PATCH 477/627] Preset the HBeam and VBeam to 0 on boot. Fixes Densha de Go Shinkansen EX. Fixes issue 4882. --- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index cc2ce18ce0..95c06d1f88 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -144,8 +144,8 @@ void Preset(bool _bNTSC) m_HorizontalStepping.FbSteps = 40; m_HorizontalStepping.FieldSteps = 40; - m_HBeamPos = 1; - m_VBeamPos = 1; + m_HBeamPos = 0; + m_VBeamPos = 0; // 54MHz, capable of progressive scan m_Clock = Core::g_CoreStartupParameter.bProgressive; From 83237a36e03dc53545dab51f6a54c70bfc7b2b66 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 20 Jan 2013 18:47:59 -0500 Subject: [PATCH 478/627] Save memory card paths relative to exe directory. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 423885e0f2..4daf263b63 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -1064,6 +1064,13 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) return; } } + #ifdef _WIN32 + if (!strncmp(File::GetExeDirectory().c_str(), filename.c_str(), File::GetExeDirectory().size())) + { + filename.erase(0, File::GetExeDirectory().size() +1); + filename = "./" + filename; + } + #endif // also check that the path isn't used for the other memcard... if (filename.compare(isSlotA ? SConfig::GetInstance().m_strMemoryCardB From 45a7fa293bebd520d86f5068dc866a35793d7af8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sun, 20 Jan 2013 19:15:48 -0500 Subject: [PATCH 479/627] Set the default memory card path as relative too. --- Source/Core/Core/Src/CoreParameter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 9fc451c807..7f019bcf59 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -348,7 +348,11 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri { // Use default memcard path if there is no user defined name std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB; - memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; + #ifdef _WIN32 + memcardPath = "." + File::GetUserPath(D_GCUSER_IDX).substr(File::GetExeDirectory().size()) + defaultFilename + ext; + #else + memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext; + #endif } else { From 0c1ea605d5008fabc8b23feeeac9708fef18fadf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 20 Jan 2013 23:24:56 -0500 Subject: [PATCH 480/627] Ctrl+A support in the action replay code editing menu. Makes adding/editing codes less of a pain in the ass. You don't need to manually highlight everything anymore. --- Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp | 24 +++++++++++++++++++++ Source/Core/DolphinWX/Src/ARCodeAddEdit.h | 1 + 2 files changed, 25 insertions(+) diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp index c3ed12bbea..03cf7f47b4 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp @@ -48,11 +48,13 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, wxStaticText* EditCheatNameText = new wxStaticText(this, ID_EDITCHEAT_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize); EditCheatName = new wxTextCtrl(this, ID_EDITCHEAT_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + EditCheatName->Bind(wxEVT_KEY_DOWN, &CARCodeAddEdit::OnKey, this); EditCheatName->SetValue(currentName); EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL); EntrySelection->SetRange(1, ((int)arCodes.size()) > 0 ? (int)arCodes.size() : 1); EntrySelection->SetValue((int)(arCodes.size() - selection)); EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); + EditCheatCode->Bind(wxEVT_KEY_DOWN, &CARCodeAddEdit::OnKey, this); UpdateTextCtrl(tempEntries); sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5); @@ -174,3 +176,25 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode) else EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here...")); } + +void CARCodeAddEdit::OnKey(wxKeyEvent& event) +{ + // Technically you can extend this to whatever bindings you want. + switch (event.GetKeyCode()) + { + case 'a': + case 'A': + { + if (event.ControlDown() && FindFocus() == EditCheatCode) + { + EditCheatCode->SetSelection(0, EditCheatCode->GetValue().Length()); + } + + if (event.ControlDown() && FindFocus() == EditCheatName) + { + EditCheatName->SetSelection(0, EditCheatName->GetValue().Length()); + } + } + break; + } +} diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h index 2702dfb888..c3e5f72f58 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h @@ -49,6 +49,7 @@ class CARCodeAddEdit : public wxDialog void SaveCheatData(wxCommandEvent& event); void ChangeEntry(wxSpinEvent& event); void UpdateTextCtrl(ActionReplay::ARCode arCode); + void OnKey(wxKeyEvent& event); int selection; From 2bae4345c58c3684b6375ad4de847876e5e77357 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 21 Jan 2013 00:11:53 -0500 Subject: [PATCH 481/627] Revert "Ctrl+A support in the action replay code editing menu." Guess it wasnt much of a solution as I'd hoped. (considering it seems to work on linux without this). This reverts commit 0c1ea605d5008fabc8b23feeeac9708fef18fadf. --- Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp | 24 --------------------- Source/Core/DolphinWX/Src/ARCodeAddEdit.h | 1 - 2 files changed, 25 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp index 03cf7f47b4..c3ed12bbea 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp @@ -48,13 +48,11 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, wxStaticText* EditCheatNameText = new wxStaticText(this, ID_EDITCHEAT_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize); EditCheatName = new wxTextCtrl(this, ID_EDITCHEAT_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - EditCheatName->Bind(wxEVT_KEY_DOWN, &CARCodeAddEdit::OnKey, this); EditCheatName->SetValue(currentName); EntrySelection = new wxSpinButton(this, ID_ENTRY_SELECT, wxDefaultPosition, wxDefaultSize, wxVERTICAL); EntrySelection->SetRange(1, ((int)arCodes.size()) > 0 ? (int)arCodes.size() : 1); EntrySelection->SetValue((int)(arCodes.size() - selection)); EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); - EditCheatCode->Bind(wxEVT_KEY_DOWN, &CARCodeAddEdit::OnKey, this); UpdateTextCtrl(tempEntries); sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5); @@ -176,25 +174,3 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode) else EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here...")); } - -void CARCodeAddEdit::OnKey(wxKeyEvent& event) -{ - // Technically you can extend this to whatever bindings you want. - switch (event.GetKeyCode()) - { - case 'a': - case 'A': - { - if (event.ControlDown() && FindFocus() == EditCheatCode) - { - EditCheatCode->SetSelection(0, EditCheatCode->GetValue().Length()); - } - - if (event.ControlDown() && FindFocus() == EditCheatName) - { - EditCheatName->SetSelection(0, EditCheatName->GetValue().Length()); - } - } - break; - } -} diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h index c3e5f72f58..2702dfb888 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h @@ -49,7 +49,6 @@ class CARCodeAddEdit : public wxDialog void SaveCheatData(wxCommandEvent& event); void ChangeEntry(wxSpinEvent& event); void UpdateTextCtrl(ActionReplay::ARCode arCode); - void OnKey(wxKeyEvent& event); int selection; From 0ba1794df3ee479ade6520ac46860610774ffdff Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Mon, 21 Jan 2013 21:48:02 +0000 Subject: [PATCH 482/627] Fix AGL.cpp --- Source/Core/DolphinWX/Src/GLInterface/AGL.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp index 30ff4a31cf..cf68c0baa4 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp @@ -18,6 +18,7 @@ #include "VideoConfig.h" #include "Host.h" #include "RenderBase.h" +#include "ConfigManager.h" #include "VertexShaderManager.h" #include "../GLInterface.h" @@ -90,13 +91,6 @@ bool cInterfaceAGL::Create(void *&window_handle) } bool cInterfaceAGL::MakeCurrent() -{ - [GLWin.cocoaCtx makeCurrentContext]; - return true; -} - -// Update window width, size and etc. Called from Render.cpp -void cInterfaceAGL::Update() { int width, height; @@ -110,6 +104,7 @@ void cInterfaceAGL::Update() [GLWin.cocoaCtx makeCurrentContext]; s_backbuffer_width = width; s_backbuffer_height = height; + return true; } // Close backend From 9f896b203c55976e9dd1ace988e281de3451c197 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 21 Jan 2013 19:32:02 -0600 Subject: [PATCH 483/627] Update Spanish, French, Korean, and Brazilian Portuguese translations. --- Languages/po/es.po | 106 +++--- Languages/po/fr.po | 799 +++++++++++++----------------------------- Languages/po/ko.po | 43 ++- Languages/po/pt_BR.po | 36 +- 4 files changed, 337 insertions(+), 647 deletions(-) diff --git a/Languages/po/es.po b/Languages/po/es.po index f5749b6927..8069d9aa0a 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:40-0600\n" +"PO-Revision-Date: 2013-01-21 23:41+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" "Language: Spanish\n" @@ -58,7 +58,7 @@ msgstr "%1$sCopiar%1$s" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:10 #, c-format msgid "%i connected" -msgstr "%i conectado." +msgstr "%i conectado" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:128 #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:296 @@ -372,14 +372,14 @@ msgid "A game is not currently running." msgstr "Ningún juego está emulándose actualmente." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" "If you are not using Microsoft's bluetooth stack you must manually pair your " "wiimotes and use only the \"Refresh\" button." msgstr "" "¡No se ha podido encontrar un dispositivo de Bluetooth soportado!\n" -"(Solo se soporta el stack de Bluetooth de Microsoft)." +"Si no estás usando el stack de Microsoft tendrás que emparejarlos " +"manualmente y usar solo el botón \"Refrescar\"." #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" @@ -518,13 +518,14 @@ msgstr "" "Error de Action Replay: Valor no válido (%08x) en copia de la memoria (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, fuzzy, c-format +#, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"Error de Action Replay: Código maestro y Escribir a CCXXXXXX no han sido " -"implementados (%s)" +"Error de Action Replay: Código Maestro y Escribir a CCXXXXXX no han sido " +"implementados (%s)\n" +"Los códigos maestros no son necesarios. No los uses." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -661,7 +662,6 @@ msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" @@ -671,7 +671,7 @@ msgstr "" "Permite alternar algunas opciones a través de las teclas de acceso rápido 3, " "4, 5, 6 y 7 en la ventana de emulación.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:331 msgid "Alternate Wiimote Timing" @@ -752,7 +752,7 @@ msgstr "Audio" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 msgid "Audio Backend:" -msgstr "Motor de Audio:" +msgstr "Motor de audio:" #: Source/Core/AudioCommon/Src/AOSoundStream.cpp:41 msgid "AudioCommon: Error opening AO device.\n" @@ -783,7 +783,7 @@ msgid "" msgstr "" "Ajusta automáticamente el tamaño de la ventana a tu resolución interna.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" @@ -1337,7 +1337,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" -msgstr "No se pudo hallar el comando para abrir la extension 'ini'!" +msgstr "No se pudo encontrar el comando para abrir la extension 'ini'!" #: Source/Core/Core/Src/BootManager.cpp:143 msgid "" @@ -1372,7 +1372,7 @@ msgstr "Creador:" #: Source/Core/Common/Src/MsgHandler.cpp:68 msgid "Critical" -msgstr "Critico" +msgstr "Crítico" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:550 msgid "Crop" @@ -1384,9 +1384,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Recortar la imagen de 4:3 a 5:4 o desde 16:9 a 16:10.\n" +"Recorta la imagen de 4:3 a 5:4 o desde 16:9 a 16:10.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:48 msgid "Crossfade" @@ -1489,7 +1489,7 @@ msgstr "Depurar" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:522 msgid "Debugging" -msgstr "Depurarando" +msgstr "Depuración" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:79 msgid "Decimal" @@ -1501,7 +1501,7 @@ msgstr "Descomprimir ISO..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 msgid "Decompress selected ISOs..." -msgstr "Descomprimir ISOs seleccionadas..." +msgstr "Descomprimir ISO seleccionadas..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 @@ -1614,12 +1614,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Desactivar emulación de copias EFB.\n" +"Desactiva la emulación de copias EFB.\n" "Se usan a menudo para el posprocesado o efectos de renderización a textura, " "así que activando esta opción se obtiene una gran mejora, pero casi siempre " "causará problemas.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:552 msgid "Disc" @@ -1640,9 +1640,9 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Mostrar las entradas que lee el emulador.\n" +"Muestra las entradas que lee el emulador.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:80 msgid "Divide" @@ -1654,7 +1654,7 @@ msgstr "¿Quieres detener la emulación actual?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "Decodificador Dolby Pro Logic II" #: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" @@ -1717,7 +1717,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "Dolphin no ha podido completar la acción solicitada." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -2015,11 +2015,11 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Habilitar esta opción si desea que se use la pantalla completa para la " +"Habilita esta opción si deseas que se use la pantalla completa para la " "representación.\n" "Si esto es desactivado, una ventana de renderizado se creará en su lugar.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" @@ -2028,10 +2028,10 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Active esto si quiere usar la ventana principal de Dolphin para renderizar " +"Activa esto si quieres usar la ventana principal de Dolphin para renderizar " "en vez de una ventana aparte.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 msgid "" @@ -2060,17 +2060,21 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" +"Activa la emulación de Dolby Pro Logic II usando 5.1 surround. No disponible " +"en OSX." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." -msgstr "" +msgstr "Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." msgstr "" +"Activa la emulación de Dolby Pro Logic II. Solo para el motor OpenAL. " +"Requiere que renombres soft_oal.dll a OpenAl32.dll para que funcione." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -2082,7 +2086,7 @@ msgstr "" "Activa el escaneo progresivo si es soportado por el software emulado.\n" "A muchos juegos no les afecta esto.\n" "\n" -"Si no estás seguro, déjalo sin marcar." +"Si no estás seguro, déjala sin marcar." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 msgid "" @@ -2233,7 +2237,7 @@ msgstr "Parámetro extra" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:61 msgid "Extra Parameter useful in ''Metroid: Other M'' only." -msgstr "Parámetro extra solo útil en ''Metroid: Other M''." +msgstr "Parámetro extra útil en «Metroid: Other M» exclusivamente." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:623 msgid "Extract All Files..." @@ -3191,9 +3195,8 @@ msgid "Invalid recording file" msgstr "Archivo de grabación no válido" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 -#, fuzzy msgid "Invalid search parameters (no object selected)" -msgstr "Parametros de búsqueda inválidos (ningún objeto seleccionado)" +msgstr "Parámetros de búsqueda inválidos (ningún objeto seleccionado)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" @@ -3287,7 +3290,7 @@ msgstr "Último estado guardado" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Latency:" -msgstr "" +msgstr "Latencia:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -3603,7 +3606,7 @@ msgid "" "\n" "\n" msgstr "" -"Mueva el puntero del ratón sobre una opción para obtener una descripción " +"Mueve el puntero del ratón sobre una opción para obtener una descripción " "detallada.\n" "\n" "\n" @@ -4447,7 +4450,7 @@ msgstr "Buscar objeto actual" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "Busdar valor hexadecimal:" +msgstr "Buscar valor hexadecimal:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4522,9 +4525,8 @@ msgstr "" "Si no estás seguro, elige Automático." #: Source/Core/InputCommon/Src/InputConfig.cpp:61 -#, fuzzy msgid "Selected controller profile does not exist" -msgstr "El archivo especificado \"%s\" no existe" +msgstr "El perfil del controlador escogido no existe" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4611,6 +4613,8 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"Ajusta la latencia (en ms). Valores más altos pueden recir el petardeo del " +"audio. Solo para el motor OpenAL." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4734,8 +4738,8 @@ msgid "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"Mostrar un mensaje cuando un posible error severo ha ocurrido.\n" -"Deshabilitar esto puede evitar ver mensajes que no son fatales, y molestos, " +"Muestra una alerta cuando un posible error crítico haya ocurrido.\n" +"Deshabilitando esto puedes evitar ver mensajes molestos que no son fatales, " "pero también significa que Dolphin puede cerrarse ante un error sin ninguna " "explicación." @@ -4976,7 +4980,7 @@ msgstr "Estados guardados" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "Volante" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -5170,8 +5174,8 @@ msgid "" "The selected language is not supported by your system. Falling back to " "system default." msgstr "" -"El idioma seleccionado no lo soporta su sistema. Volviendo al predeterminado " -"del sistema." +"El idioma seleccionado no es soportado por tu sistema. Volviendo al " +"predeterminado del sistema." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5199,9 +5203,8 @@ msgid "The value is invalid" msgstr "El valor no es válido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "Tema visual" +msgstr "Tema:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" @@ -5242,12 +5245,12 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Esta característica le permite manejar la cámara del juego. \n" +"Esta característica te permite manejar la cámara del juego. \n" "\n" -"Mantenga pulsado el botón derecho del ratón y mueva el ratón para mover la " -"cámara alrededor. Mantenga pulsado SHIFT y pulse una de las teclas WASD para " +"Mantén pulsado el botón derecho del ratón y mueve el ratón para mover la " +"cámara alrededor. Mantén pulsado SHIFT y pulsa una de las teclas WASD para " "mover la cámara por una distancia determinada de pasos (SHIFT + 0 multiplica " -"(x2) y SHIFT+ 9 divide la misma (x0.5)). Presione SHIFT + R para reiniciar " +"(x2) y SHIFT+ 9 divide la misma (x0.5)). Presiona SHIFT + R para reiniciar " "la cámara. \n" "\n" "Si no estás seguro, deja esta casilla sin marcar." @@ -5553,7 +5556,7 @@ msgid "Warning - starting ISO in wrong console mode!" msgstr "Advertencia - arrancando un ISO en un modo de consola incorrecto!" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:519 -#, fuzzy, c-format +#, c-format msgid "" "Warning! it is advised to backup all files in the folder:\n" "%s\n" @@ -6043,6 +6046,7 @@ msgstr "| OR" #~ msgid "Bleach Versus Crusade" #~ msgstr "Bleach Versus Crusade" +#, fuzzy #~ msgid "" #~ "Calculate depth values of 3D graphics per-pixel rather than per vertex.\n" #~ "In contrast to pixel lighting (which is merely an enhancement), per-pixel " @@ -6051,13 +6055,13 @@ msgstr "| OR" #~ "\n" #~ "If unsure, leave this checked." #~ msgstr "" -#~ "Calcular los valores de profundidad de los gráficos 3D por píxel en lugar " +#~ "Calcula los valores de profundidad de los gráficos 3D por píxel en lugar " #~ "de por vértice.\n" #~ "En contraste con la iluminación de píxeles (que no es más que una " #~ "mejora), los cálculos por profundidad de píxel son necesarios para emular " #~ "correctamente un pequeño número de juegos.\n" #~ "\n" -#~ "Si no estás seguro, deja esta marcada." +#~ "Si no estás seguro, déjala marcada." #~ msgid "" #~ "Calculates lighting of 3D graphics on a per-pixel basis rather than per " diff --git a/Languages/po/fr.po b/Languages/po/fr.po index 4bd54dafd1..b955029b61 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:39-0600\n" +"PO-Revision-Date: 2013-01-21 11:57+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" "Language: French\n" @@ -42,8 +42,7 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "" -"\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format @@ -96,8 +95,7 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire " -"valide (0x%x octets)" +"Le fichier n'est pas assez grand pour être un fichier de carte mémoire valide (0x%x octets)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -370,26 +368,22 @@ msgid "A game is not currently running." msgstr "Il n'y a pas de jeu en cours d'émulation." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" -"If you are not using Microsoft's bluetooth stack you must manually pair your " -"wiimotes and use only the \"Refresh\" button." +"If you are not using Microsoft's bluetooth stack you must manually pair your wiimotes and use only the \"Refresh\" button." msgstr "" "Aucun périphérique Bluetooth prise en charge n'a été détecté !\n" -"(Seule la pile Bluetooth de Microsoft est prise en charge)." +"Si vous n'utilisez pas la pile Bluetooth de Microsoft, vous pouvez jumeler manuellement vos Wiimotes et utiliser uniquement le bouton \"Rafraîchir\"." #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following " -"settings:\n" +"NetPlay will currently only work properly when using the following settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to " -"[Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -403,13 +397,10 @@ msgstr "" " - Dual Core désactivé\n" " - Audio Throttle désactivé\n" " - DSP-HLE avec \"Null Audio\" ou le DSL-LLE\n" -" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " -"[Contrôleur standard]\n" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans [Contrôleur standard]\n" "\n" -"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et " -"les mêmes paramètres.\n" -"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les " -"joueurs avant de démarrer.\n" +"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et les mêmes paramètres.\n" +"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les joueurs avant de démarrer.\n" "La prise en charge de la Wiimote n'est pas encore implémentée.\n" "\n" "Vous devez indiquer le port TCP à l'hôte !!" @@ -443,14 +434,12 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay " -"functionality.\n" +"Some games depend on this for certain graphical effects or gameplay functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou " -"fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" "\n" "Dans le doute, cochez plutôt EFB vers texture." @@ -476,52 +465,37 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Ajout (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " -"(%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " -"code Remplir et déplacer (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " -"Fill (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " -"l'écriture de la RAM et Remplir (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format -msgid "" -"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " -"Pointer (%s)" -msgstr "" -"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " -"vers Pointeur (%s)" +msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" +msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "" -"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, fuzzy, c-format +#, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)\n" +"Les Master codes ne sont pas requis. Ne les utilisez pas." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -583,16 +557,14 @@ msgstr "Adresse :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -601,24 +573,21 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " -"the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " -"la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "" -"Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" @@ -659,13 +628,11 @@ msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 " -"dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -707,8 +674,7 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une " -"image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" "\n" "Dans le doute, sélectionnez (aucun)." @@ -731,9 +697,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "" -"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " -"définitivement !" +msgstr "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé définitivement !" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 @@ -849,9 +813,7 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "" -"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " -"Blocs" +msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" @@ -942,10 +904,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " -"GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " -"pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -963,8 +923,7 @@ msgstr "Impossible d'ouvrir %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "" -"Impossible de désenregistrer des évènements alors qu'il y en a en attente." +msgstr "Impossible de désenregistrer des évènements alors qu'il y en a en attente." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 #, c-format @@ -988,8 +947,7 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "" -"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format @@ -999,8 +957,7 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:679 #: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "" -"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" @@ -1108,12 +1065,8 @@ msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 -msgid "" -"Choose file to use as apploader: (applies to discs constructed from " -"directories only)" -msgstr "" -"Choisir un fichier comme apploader : (uniquement pour les disques créés à " -"partir de dossiers)" +msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" +msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1136,12 +1089,8 @@ msgid "Clear" msgstr "Effacer" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "" -"Client disconnect while game is running!! NetPlay is disabled. You must " -"manually stop the game." -msgstr "" -"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " -"désactivé. Vous devez arrêter le jeu manuellement." +msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." +msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 @@ -1295,15 +1244,8 @@ msgstr "Impossible d'initialiser le moteur %s." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format -msgid "" -"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " -"backup. Please note that original Gamecube and Wii discs cannot be read by " -"most PC DVD drives." -msgstr "" -"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " -"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " -"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " -"PC." +msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." +msgstr "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1320,23 +1262,19 @@ msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est " -"en cours d'exécution !\n" -"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " -"pris en charge)" +"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est en cours d'exécution !\n" +"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore pris en charge)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write " -"protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" msgstr "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " -"peut-être protégé contré l'écriture ?" +"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est peut-être protégé contré l'écriture ?" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 msgid "Couldn't find open command for extension 'ini'!" @@ -1547,12 +1485,8 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 -msgid "" -"Detected attempt to read more data from the DVD than fit inside the out " -"buffer. Clamp." -msgstr "" -"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " -"le buffer de sortie." +msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." +msgstr "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 @@ -1596,30 +1530,24 @@ msgstr "Désactiver la fumée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely " -"on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " -"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so " -"while checking this setting gives a great speedup it almost always also " -"causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " -"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " -"aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1656,7 +1584,7 @@ msgstr "Voulez-vous arrêter l'émulation en cours ?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "Décodeur Dolby Pro Logic II" #: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" @@ -1701,25 +1629,17 @@ msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 -msgid "" -"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " -"files..." -msgstr "" -"Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " -"fichiers..." +msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." +msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 -msgid "" -"Dolphin is currently set to hide all games. Doubleclick here to show all " -"games..." -msgstr "" -"Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " -"afficher tous les jeux..." +msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." +msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "Dolphin n'a pas pu exécuter l'action demandée." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -1765,8 +1685,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" -"Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1806,16 +1725,8 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format -msgid "" -"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " -"version %d.%d -- If you recently upgraded your Dolphin distribution, a " -"reboot is probably required at this point to get Windows to see the new " -"driver." -msgstr "" -"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " -"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " -"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " -"Windows charge le nouveau pilote." +msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." +msgstr "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -1865,31 +1776,24 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is " -"necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Emule précisément les XFB.\n" -"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " -"est nécessaire pour émuler certains jeux correctement.\n" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as " -"slow as real XFB emulation. However, it may still fail for a lot of other " -"games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emule les XFB en utilisant les objets de texture du GPU.\n" -"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans " -"être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne " -"pas fonctionner pour beaucoup d'autres jeux (particulièrement les " -"applications homebrew).\n" +"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne pas fonctionner pour beaucoup d'autres jeux (particulièrement les applications homebrew).\n" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 @@ -1906,15 +1810,13 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " -"supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " -"3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -1993,19 +1895,14 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue " -"obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "" -"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " -"Compatible)" -msgstr "" -"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " -"ARRÊT = Compatible)" +msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" +msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" @@ -2018,62 +1915,44 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " -"de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather " -"than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " -"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 -msgid "" -"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " -"ANY other game." -msgstr "" -"Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " -"Désactiver pour TOUS les autres jeux." +msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." +msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité " -"de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. " -"(ON = Compatible, OFF = Rapide)" +msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" +msgstr "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. (ON = Compatible, OFF = Rapide)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " -"OSX." -msgstr "" +msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX." +msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non disponible sur OS X." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." -msgstr "" +msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Uniquement avec le moteur OpenAL." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 -msgid "" -"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " -"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "" +msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -2088,12 +1967,8 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "" -"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " -"OFF = Fast)" -msgstr "" -"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " -"pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" +msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" @@ -2146,27 +2021,17 @@ msgstr "Erreur" #: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." -msgstr "" -"Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " -"défaut du système." +msgstr "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par défaut du système." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format -msgid "" -"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " -"Aborting savestate load..." -msgstr "" -"Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde " -"%d (0x%X). Abandon du chargement de la sauvegarde d'état." +msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." +msgstr "Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format -msgid "" -"Error: Trying to access %s fonts but they are not loaded. Games may not show " -"fonts correctly, or crash." -msgstr "" -"Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " -"jeux peuvent ne pas afficher les polices correctement, ou planter." +msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." +msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2179,8 +2044,7 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "" -"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" @@ -2331,8 +2195,7 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "Utilisez DSPSpy pour extraire le fichier de votre console.\n" "\n" -"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " -"d'extration de ROM.\n" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2365,8 +2228,7 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des " -"blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:142 @@ -2442,11 +2304,8 @@ msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." #: Source/Core/Core/Src/Movie.cpp:1052 #, c-format -msgid "" -"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" -msgstr "" -"Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " -"%u, byte %u.)%s" +msgid "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != %u, byte %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" @@ -2542,8 +2401,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " -"dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2554,8 +2412,7 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " -"16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2563,12 +2420,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " -"setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." msgstr "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " -"automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" @@ -2722,14 +2577,10 @@ msgstr "Codes Gecko" #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported. Try using the " -"native code handler by placing the codehandler.bin file into the Sys " -"directory and restarting Dolphin.)" +"(either a bad code or the code type is not yet supported. Try using the native code handler by placing the codehandler.bin file into the Sys directory and restarting Dolphin.)" msgstr "" "Echec de l'exécution du GeckoCode (CT%i CST%i) (%s)\n" -"(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez " -"avec le code natif en plaçant le fichier codehandler.bin dans le répertoire " -"Sys, puis redémarrez Dolphin.)" +"(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez avec le code natif en plaçant le fichier codehandler.bin dans le répertoire Sys, puis redémarrez Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 @@ -2751,8 +2602,7 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "" -"GetARCode : l'index est plus grand que la taille de la liste de codes %lu" +msgstr "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" @@ -2768,20 +2618,15 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" -"Greatly increases quality of textures generated using render to texture " -"effects.\n" +"Greatly increases quality of textures generated using render to texture effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although " -"unlikely).\n" +"Slightly decreases performance and possibly causes issues (although unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Améliore significativement la qualité des textures générées en utilisant les " -"effets de rendu vers texture.\n" -"Le fait d'augmenter la résolution interne améliore l'impact de cette " -"option.\n" -"Baisse légèrement les performances et peut provoquer quelques pépins (mais " -"peu probable).\n" +"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" +"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" +"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" "\n" "Dans le doute, cochez cette case." @@ -2840,10 +2685,8 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions " -"SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " -"s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" "\n" "Sayonara !\n" @@ -2861,8 +2704,7 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " -"d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -2896,20 +2738,16 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "" -"IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " -"inconnu : %08x/%08x" +msgstr "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket inconnu : %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " -"in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas " -"disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -2950,30 +2788,16 @@ msgid "Icon" msgstr "Icône" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 -msgid "" -"If checked, the bounding box registers will be updated. Used by the Paper " -"Mario games." -msgstr "" -"Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les " -"jeux Paper Mario." +msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." +msgstr "Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les jeux Paper Mario." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 -msgid "" -"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "" -"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " -"Compatible, OFF = Vitesse)" +msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 -msgid "" -"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " -"Audio to throttle using the DSP (might fix audio clicks but can also cause " -"constant noise depending on the game)." -msgstr "" -"Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " -"élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio " -"pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " -"selon les jeux)." +msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)." +msgstr "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio pour DSP (peut éliminer les clics audio mais peut causer un bruit constant selon les jeux)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" @@ -2982,28 +2806,24 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes " -"graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. " -"Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related " -"features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines " -"fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -3037,13 +2857,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" -"Improves performance but causes glitches in most games which rely on proper " -"fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances mais peut causer de petits pépins dans les jeux " -"s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -3093,11 +2911,8 @@ msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "" -"InstallExceptionHandler called, but this platform does not yet support it." -msgstr "" -"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " -"encore en charge." +msgid "InstallExceptionHandler called, but this platform does not yet support it." +msgstr "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas encore en charge." #: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 msgid "Installing WAD..." @@ -3117,12 +2932,8 @@ msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format -msgid "" -"Integrity check for partition %d failed. Your dump is most likely corrupted " -"or has been patched incorrectly." -msgstr "" -"Echec de la vérification de l'intégrité pour la partition %d. Votre copie " -"est certainement corrompue ou a été incorrectement patchée." +msgid "Integrity check for partition %d failed. Your dump is most likely corrupted or has been patched incorrectly." +msgstr "Echec de la vérification de l'intégrité pour la partition %d. Votre copie est certainement corrompue ou a été incorrectement patchée." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" @@ -3208,9 +3019,7 @@ msgstr "Texte de recherche non valide (impossible à convertir en nombre)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" -msgstr "" -"Texte de recherche non valide (seules les longueurs de chaînes de caractères " -"sont prises en charge)" +msgstr "Texte de recherche non valide (seules les longueurs de chaînes de caractères sont prises en charge)" #: Source/Core/Core/Src/Core.cpp:525 msgid "Invalid state" @@ -3296,7 +3105,7 @@ msgstr "Dernier état sauvegardé" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Latency:" -msgstr "" +msgstr "Latence :" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -3415,9 +3224,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "" -"Charger les valeurs de pré-réglage à partir de la palette de hack " -"disponibles." +msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." #: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" @@ -3441,14 +3248,11 @@ msgstr "Types de journaux" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " -"feature when you want to measure the performance of Dolphin.\n" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/" -"fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de " -"Dolphin.\n" +"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de Dolphin.\n" "\n" "Dans le doute, décochez cette case." @@ -3523,12 +3327,8 @@ msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "" -"Memory Card Manager WARNING-Make backups before using, should be fixed but " -"could mangle stuff!" -msgstr "" -"Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " -"utilisation, devrait être OK mais corruption possible de données !" +msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" +msgstr "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant utilisation, devrait être OK mais corruption possible de données !" #: Source/Core/Core/Src/CoreParameter.cpp:369 #, c-format @@ -3549,9 +3349,7 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "" -"La taille du fichier de la carte mémoire ne correspond pas à la taille de " -"l'entête." +msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" @@ -3581,14 +3379,11 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation " -"reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Modifie les textures pour afficher le format dans lequel elles sont " -"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " -"cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3628,12 +3423,8 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "" -"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " -"effect on emulated wiimotes." -msgstr "" -"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " -"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." +msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" @@ -3641,8 +3432,7 @@ msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" -"Note : La taille du flux est différente de la longueur actuelle des données\n" +msgstr "Note : La taille du flux est différente de la longueur actuelle des données\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3938,8 +3728,7 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " -"des blocs\n" +"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre des blocs\n" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" @@ -3949,12 +3738,8 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "" -"Other client disconnected while game is running!! NetPlay is disabled. You " -"manually stop the game." -msgstr "" -"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " -"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." +msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" @@ -4253,8 +4038,7 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des " -"pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4412,9 +4196,7 @@ msgstr "Sauvegarder le fichier GCM/ISO décompressé" #: Source/Core/Core/Src/Movie.cpp:795 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "" -"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " -"film..." +msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" @@ -4461,8 +4243,10 @@ msgstr "Rechercher l'objet actuel" msgid "Search for hex Value:" msgstr "Rechercher une valeur Hexadécimale :" -#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 -#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 +#: Source/Core/Common/Src/SysConf.h:103 +#: Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 +#: Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4528,16 +4312,14 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " -"4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." #: Source/Core/InputCommon/Src/InputConfig.cpp:61 -#, fuzzy msgid "Selected controller profile does not exist" -msgstr "Le fichier spécifié \"%s\" n'existe pas" +msgstr "Le profil de controleur sélectionné n'existe pas" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4546,32 +4328,27 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. " -"Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. " -"L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " -"affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " -"Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " -"précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4593,11 +4370,8 @@ msgid "Serbian" msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -msgid "" -"Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "" -"Port série 1 - C'est le port que les périphériques tels que l'adaptateur " -"ethernet utilisent" +msgid "Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" @@ -4615,15 +4389,11 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "" -"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " -"codes AR %lu" +msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 -msgid "" -"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " -"backend only." -msgstr "" +msgid "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only." +msgstr "Configure la latence (en ms). Des valeurs plus élevées peuvent réduire le craquement audio. Uniquement avec le moteur OpenAL." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4744,13 +4514,10 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Show a message box when a potentially serious error has occurred.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also " -"mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, " -"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " -"explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" @@ -4763,12 +4530,10 @@ msgstr "Afficher le compteur de lag" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" -"These messages include memory card writes, video backend and CPU " -"information, and JIT cache clearing." +"These messages include memory card writes, video backend and CPU information, and JIT cache clearing." msgstr "" "Affiche les messages par-dessus la zone d'émulation.\n" -"Ces messages incluent les écritures de carte mémoire, la moteur de rendu " -"vidéo et les infos du processeur, et l'effacement du cache JIT." +"Ces messages incluent les écritures de carte mémoire, la moteur de rendu vidéo et les infos du processeur, et l'effacement du cache JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" @@ -4788,13 +4553,11 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" -"Show the number of frames rendered per second as a measure of emulation " -"speed.\n" +"Show the number of frames rendered per second as a measure of emulation speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " -"d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4838,13 +4601,11 @@ msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" -"Skip the destination alpha pass used in many games for various graphical " -"effects.\n" +"Skip the destination alpha pass used in many games for various graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " -"divers effets graphiques.\n" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -4852,16 +4613,13 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or " -"disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " -"de l'émulation.\n" +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " -"ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -4889,16 +4647,13 @@ msgstr "Rendu logiciel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other " -"backends.\n" +"Software rendering is an order of magnitude slower than using the other backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " -"l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " -"'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 msgid "Sound Settings" @@ -4930,21 +4685,13 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Specifies the resolution used to render at. A high resolution will improve " -"visual quality a lot but is also quite heavy on performance and might cause " -"glitches in certain games.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " -"issues. Generally speaking, the lower the internal resolution is, the better " -"your performance will be.\n" +"Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " -"qualité visuelle mais impacte beaucoup les performances et peut provoquer " -"quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " -"mais provoque moins de problèmes. En général, plus la résolution interne est " -"petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -4990,7 +4737,7 @@ msgstr "Etats" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "Volant" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -5007,14 +4754,12 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a " -"great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " -"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -5129,12 +4874,8 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "" -"The file %s could not be opened for writing. Please check if it's already " -"opened by another program." -msgstr "" -"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " -"été ouvert par un autre programme." +msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." +msgstr "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -5160,28 +4901,21 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any " -"texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" "\n" "If unsure, use the rightmost value." msgstr "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " -"texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la position la plus à droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" -msgstr "" -"La sauvegarde que vous essayez de copier a une taille de fichier non valide" +msgstr "La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:385 -msgid "" -"The selected language is not supported by your system. Falling back to " -"system default." -msgstr "" -"La langue sélectionnée n'est pas prise en charge par votre système. Retour à " -"la langue par défaut du système." +msgid "The selected language is not supported by your system. Falling back to system default." +msgstr "La langue sélectionnée n'est pas prise en charge par votre système. Retour à la langue par défaut du système." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -5209,17 +4943,12 @@ msgid "The value is invalid" msgstr "La valeur n'est pas valide" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "Thème" +msgstr "Thème :" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 -msgid "" -"There must be a ticket for 00000001/00000002. Your NAND dump is probably " -"incomplete." -msgstr "" -"Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " -"probablement incomplète." +msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." +msgstr "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est probablement incomplète." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" @@ -5230,12 +4959,8 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:355 -msgid "" -"This action replay simulator does not support codes that modify Action " -"Replay itself." -msgstr "" -"Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " -"l'Action Replay lui-même." +msgid "This action replay simulator does not support codes that modify Action Replay itself." +msgstr "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient l'Action Replay lui-même." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." @@ -5244,39 +4969,26 @@ msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " -"Hold SHIFT and press one of the WASD keys to move the camera by a certain " -"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " -"SHIFT+R to reset the camera.\n" +"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la " -"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " -"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " -"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " -"position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" -"This splits the Video and CPU threads, so they can be run on separate " -"cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also " -"cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." msgstr "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " -"puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " -"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " -"des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" -msgstr "" -"Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 @@ -5324,7 +5036,8 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 +#: Source/Core/Common/Src/SysConf.h:91 +#: Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5381,12 +5094,10 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or " -"decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " -"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:391 @@ -5424,8 +5135,7 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "" -"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 @@ -5465,23 +5175,19 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " -"plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by " -"checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"En cas d'échec de compilation de shader, un message est habituellement " -"affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " -"interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5568,8 +5274,7 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " -"dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5581,69 +5286,43 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " -"dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" #: Source/Core/Core/Src/Movie.cpp:838 #, c-format -msgid "" -"Warning: You loaded a save that's after the end of the current movie. (byte " -"%u > %u) (frame %u > %u). You should load another save before continuing, or " -"load this state with read-only mode off." -msgstr "" -"Attention : Vous avez chargé une sauvegarde qui se situe après la fin du " -"film en cours (octet %u > %u) (image %u > %u). Vous devriez charger une " -"autre sauvegarde avant de continuer, ou charger cette sauvegarde en " -"désactivant le mode Lecture seule." +msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." +msgstr "Attention : Vous avez chargé une sauvegarde qui se situe après la fin du film en cours (octet %u > %u) (image %u > %u). Vous devriez charger une autre sauvegarde avant de continuer, ou charger cette sauvegarde en désactivant le mode Lecture seule." #: Source/Core/Core/Src/Movie.cpp:855 #, c-format -msgid "" -"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " -"should load another save before continuing, or load this state with read-" -"only mode off. Otherwise you'll probably get a desync." -msgstr "" -"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'octet " -"%d (0x%X). Vous devriez charger une autre sauvegarde avant de continuer, ou " -"charger cet état en désactivant le mode Lecture seule. Dans le cas " -"contraire, il y aura probablement une désynchronisation." +msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." +msgstr "Attention : Vous avez chargé une sauvegarde dont le film diffère de l'octet %d (0x%X). Vous devriez charger une autre sauvegarde avant de continuer, ou charger cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y aura probablement une désynchronisation." #: Source/Core/Core/Src/Movie.cpp:864 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should " -"load another save before continuing, or load this state with read-only mode " -"off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's " -"movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "On frame %d, the savestate's movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" -"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'image " -"%d. Vous devriez charger une autre sauvegarde avant de continuer, ou charger " -"cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y " -"aura probablement une désynchronisation.\n" +"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'image %d. Vous devriez charger une autre sauvegarde avant de continuer, ou charger cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y aura probablement une désynchronisation.\n" "\n" -"Infos complémentaires : Le film actuel fait %d image de long et le film de " -"la sauvegarde en fait %d.\n" +"Infos complémentaires : Le film actuel fait %d image de long et le film de la sauvegarde en fait %d.\n" "\n" "A l'image %d, le film appuie sur :\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " -"DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "A l'image %d, la sauvegarde du film appuie sur :\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, " -"DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:129 @@ -5793,8 +5472,7 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " -"avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5876,19 +5554,14 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using " -"the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. " -"Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " -"GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures " -"dans divers jeux. De plus, il est généralement plus lent qu'un classique " -"décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -5935,9 +5608,7 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "" -"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " -"l'entête du fichier %x" +msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 msgid "s" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index cd13f832e5..4634c2b8d6 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:40-0600\n" +"PO-Revision-Date: 2013-01-22 03:47+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Korean\n" @@ -369,14 +369,14 @@ msgid "A game is not currently running." msgstr "현재 ê²Œìž„ì´ êµ¬ë™ë˜ê³  있지 않습니다." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" "If you are not using Microsoft's bluetooth stack you must manually pair your " "wiimotes and use only the \"Refresh\" button." msgstr "" "지ì›ë˜ëŠ” 블루투스 장치를 ì°¾ì„ ìˆ˜ 없습니다!\n" -"(마ì´í¬ë¡œì†Œí”„트 블루투스 스íƒë§Œ 지ì›ë©ë‹ˆë‹¤.)" +"마ì´í¬ë¡œì†Œí”„트 블루투스 스íƒì„ 사용하고 있지 않다면 위모트들과 수ë™ìœ¼ë¡œ ì§ì„ " +"지으셔야하고 \"갱신\" 버튼 ë§Œì„ ì´ìš©í•˜ì„¸ìš”." #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" @@ -510,12 +510,14 @@ msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 비ì í•© í¬ê¸° (%08x), 메모리 복사 (%s)ì—" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, fuzzy, c-format +#, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 매스터 코드와 CCXXXXXXì— ì“°ê¸°ê°€ 시행ë˜ì§€ 않습니다 (%s)" +"ì•¡ì…˜ ë¦¬í”Œë ˆì´ ì—러: 마스터 코드와 CCXXXXXXì— ì“°ê¸°ê°€ 실행ë˜ì§€ 않었습니다. " +"(%s)\n" +"마스터 코드가 필요하지 않습니다. 마스터 코드를 사용하지 마세요." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -1631,7 +1633,7 @@ msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "ëŒë¹„ 프로 ë¡œì§ II 디코ë”" #: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" @@ -1694,7 +1696,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "ëŒí•€ì´ ìš”ì²­ëœ ì•¡ì…˜ì„ ì™„ìˆ˜í•  수 없었습니다." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -2032,17 +2034,22 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OSXì—서는 ì•Šë¨." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OpenAL 백엔드 ì „" +"ìš©." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." msgstr "" +"5.1 ì„œë¼ìš´ë“œë¥¼ ì´ìš©í•œ ëŒë¹„ 프로 ë¡œì§ II ì—뮬레ì´ì…˜ì„ 켭니다. OpenAL 백엔드 ì „" +"ìš©. ìž‘ë™ì‹œí‚¤ë ¤ë©´ soft_oal.dll ì„ OpenAL32.dll ë¡œ ì´ë¦„바꾸기가 필요할 지ë„." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -3246,7 +3253,7 @@ msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Latency:" -msgstr "" +msgstr "지연:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -3274,7 +3281,7 @@ msgid "" msgstr "" "좌-í´ë¦­ ìž…ë ¥ ê°ì§€.\n" "중-í´ë¦­ 지우기.\n" -"ìš°-í´ë¦­ 옵션들 ë”." +"ìš°-í´ë¦­ ë” ë§Žì€ ì˜µì…˜ë“¤." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:697 msgid "" @@ -4470,9 +4477,8 @@ msgstr "" "모르겠으면, ìžë™ì„ ì„ íƒí•˜ì„¸ìš”." #: Source/Core/InputCommon/Src/InputConfig.cpp:61 -#, fuzzy msgid "Selected controller profile does not exist" -msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" +msgstr "ì„ íƒëœ 컨트롤러 프로파ì¼ì´ 존재하지 않습니다" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4554,6 +4560,8 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"지연(ms 단위로)ì„ ì„¤ì •í•©ë‹ˆë‹¤. ë” ë†’ì€ ê°’ì€ ì˜¤ë””ì˜¤ íŠì„ ì¤„ì¼ ì§€ë„ ëª¨ë¦…ë‹ˆë‹¤. " +"OpenAL 백엔드 ì „ìš©." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4677,9 +4685,9 @@ msgid "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"잠재ì ìœ¼ë¡œ 심ê°í•œ ì—러가 ë°œìƒí–ˆì„ ë•Œ 메시지 박스를 보여준다.\n" -"ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆë‹¤, 하지만 ê·¸ê²ƒì€ " -"ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 깨진다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆë‹¤." +"잠재ì ìœ¼ë¡œ 심ê°í•œ ì—러가 ë°œìƒí–ˆì„ ë•Œ 메시지 박스를 ë³´ì—¬ì¤ë‹ˆë‹¤.\n" +"ì´ê²ƒì„ ë„ë©´ 짜ì¦ë‚˜ê³  심ê°í•˜ì§€ ì•Šì€ ë©”ì‹œì§€ë“¤ì„ í”¼í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤, 하지만 그것" +"ì€ ëŒí•€ì´ 전혀 설명 ì—†ì´ ê°‘ìžê¸° 고장난다는 ê²ƒì„ ì˜ë¯¸í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" @@ -4915,7 +4923,7 @@ msgstr "ìƒíƒœ 저장" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "운전대" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -5131,9 +5139,8 @@ msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "테마" +msgstr "테마:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" @@ -5693,7 +5700,7 @@ msgstr "XAudio2 매스터 ë³´ì´ìŠ¤ ìƒì„± 실패: %#X" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "XF reg" +msgstr "XF 레지" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 2138f685a0..4cf96c1ed7 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:41-0600\n" +"PO-Revision-Date: 2013-01-17 02:48-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" "Language: \n" @@ -371,14 +371,14 @@ msgid "A game is not currently running." msgstr "Não tem nenhum jogo rodando no momento." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" "If you are not using Microsoft's bluetooth stack you must manually pair your " "wiimotes and use only the \"Refresh\" button." msgstr "" "Nenhum dispositivo Bluetooth suportado foi encontrado!\n" -"(Apenas o Bluetooth Microsoft é suportado.)" +"(Se você não está usando o dispositivo Bluetooth da Microsoft você deve " +"parear seus wiimotes manualmente e usar apenas o botão \"Atualizar\"." #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" @@ -517,13 +517,14 @@ msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Erro no Action Replay: Valor inválido (%08x) na Cópia de Memória (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, fuzzy, c-format +#, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" "Erro no Action Replay: Master Code e Write To CCXXXXXX não está implementado " -"(%s)" +"(%s)\n" +"Master codes não são necessários. Não use master codes." #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -1649,7 +1650,7 @@ msgstr "Você quer parar a emulação atual?" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "Decoder Dolby Pro Logic II" #: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" @@ -1712,7 +1713,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "O Dolphin não conseguiu completar a ação requisitada." #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -2054,17 +2055,24 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Não disponível " +"no OSX." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " +"apenas no backend OpenAL." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." msgstr "" +"Habilita emulação do Dolby Pro Logic II usando surround 5.1. Disponível " +"apenas no backend OpenAL. Talvez seja necessário renomear o soft_oal.dll " +"para OpenAL32.dll para que funcione." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -3277,7 +3285,7 @@ msgstr "Último State Salvo" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Latency:" -msgstr "" +msgstr "Latência:" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -4505,9 +4513,8 @@ msgstr "" "Se estiver em dúvida, selecione Automático." #: Source/Core/InputCommon/Src/InputConfig.cpp:61 -#, fuzzy msgid "Selected controller profile does not exist" -msgstr "O arquivo especificado \"%s\" não existe" +msgstr "O perfil de controle especificado não existe" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4592,6 +4599,8 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"Configura a latência (em ms). Valores mais altos podem reduzir problemas de " +"corte no áudio. Disponível apenas no backend OpenAL." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4715,7 +4724,7 @@ msgid "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"Mostra uma menssagem quando erros potencialmente sérios ocorreram. \n" +"Mostra uma mensagem quando erros potencialmente sérios ocorreram. \n" "Desabilitar isso pode evitar menssagens irritantes e não-fatais, mas também " "pode fazer com que o Dolphin trave sem nenhuma explicação." @@ -4956,7 +4965,7 @@ msgstr "Estados Salvos" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "Volante" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -5175,9 +5184,8 @@ msgid "The value is invalid" msgstr "O valor é inválido" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "Tema" +msgstr "Tema:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" From cff8fe8f77cda18cda80b95364d59dc45a9c6830 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 22 Jan 2013 21:17:29 +1100 Subject: [PATCH 484/627] Revert the fix for the random static audio that would sometimes occur in DSP HLE and DSP LLE. The fix caused the music in Fast - Racing League to play random sounds. This reverts commit r7bf72a6c8476798ecbb9cdb13ec3a8f0b9858da6. Fixes issue 5910. --- Source/Core/Core/Src/DSP/DSPAccelerator.cpp | 5 +++-- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index 2058a92f9d..dcb79b7ac5 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -165,10 +165,11 @@ u16 dsp_read_accelerator() // Somehow, YN1 and YN2 must be initialized with their "loop" values, // so yeah, it seems likely that we should raise an exception to let // the DSP program do that, at least if DSP_FORMAT == 0x0A. - if ((Address & ~0x1f) == (EndAddress & ~0x1f)) + if (Address >= EndAddress) { // Set address back to start address. - Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; + if ((Address & ~0x1f) == (EndAddress & ~0x1f)) + Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; DSPCore_SetException(EXP_ACCOV); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index e39b38b100..349dc7e03b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -203,10 +203,12 @@ u16 AcceleratorGetSample() // // On real hardware, this would raise an interrupt that is handled by the // UCode. We simulate what this interrupt does here. - if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) + if (*acc_cur_addr >= acc_end_addr) { - // If we are really at the end, loop back to loop_addr. - *acc_cur_addr = acc_loop_addr; + // If we are really at the end (and we don't simply have cur_addr > + // end_addr all the time), loop back to loop_addr. + if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) + *acc_cur_addr = acc_loop_addr; if (acc_pb->audio_addr.looping) { From 8a76b4a85108f8e338ec370cdcc52b73d6de27b8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 22 Jan 2013 15:33:47 -0600 Subject: [PATCH 485/627] Update Arabic translations. --- Languages/po/ar.po | 178 +++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 97 deletions(-) diff --git a/Languages/po/ar.po b/Languages/po/ar.po index 0324afea2b..ce89e73485 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:39-0600\n" -"Last-Translator: mansoor\n" +"PO-Revision-Date: 2013-01-22 15:32-0600\n" +"Last-Translator: \n" "Language-Team: \n" -"Language: \n" +"Language: Arabic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +47,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 #, c-format msgid "%08X: " -msgstr "" +msgstr "%08X: " #: Source/Core/DolphinWX/Src/MemcardManager.cpp:194 #, c-format @@ -290,7 +290,7 @@ msgstr "&معلومات عن اللعبة" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -310,7 +310,7 @@ msgstr "(ايقاÙ)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 msgid "0x44" -msgstr "" +msgstr "0x44" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:170 msgid "16 bit" @@ -351,7 +351,7 @@ msgstr "<النظام>" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "A" -msgstr "" +msgstr "A" #: Source/Core/DolphinWX/Src/NetWindow.cpp:184 #: Source/Core/DolphinWX/Src/NetWindow.cpp:218 @@ -364,7 +364,6 @@ msgid "A game is not currently running." msgstr "اللعبة ليست قيد التشغيل حاليا." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" "If you are not using Microsoft's bluetooth stack you must manually pair your " @@ -417,7 +416,7 @@ msgstr "اسرار" #: Source/Core/DolphinWX/Src/AboutDolphin.h:33 msgid "About Dolphin" -msgstr "ترجمة البرنامج بواسطة الررائع" +msgstr "ترجمة البرنامج بواسطة منصور العسيري" #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22 msgid "Acceleration" @@ -589,14 +588,12 @@ msgid "Advanced Settings" msgstr "إعدادات متقدمة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:584 -#, fuzzy msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -msgstr "All GC/Wii files (elf, dol, gcm, iso, ciso, gcz, wad)" +msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 -#, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -msgstr "All GC/Wii images (gcm, iso, ciso, gcz)" +msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 msgid "All Gamecube GCM files (gcm)" @@ -620,15 +617,13 @@ msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 -#, fuzzy msgid "" "Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " "emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"يسمح تبديل خيارات معينة عبر Ù…Ùاتيح الاختصار 3ØŒ 4ØŒ 5ØŒ 6 Ùˆ 7 ضمن ناÙذة " -"المضاهاة.\n" +"يسمح تبديل خيارات معينة عبر Ù…Ùاتيح الاختصار 3ØŒ 4ØŒ 5ØŒ 6 ضمن ناÙذة المضاهاة.\n" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." @@ -638,7 +633,7 @@ msgstr "بديل ويموت" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:284 msgid "Analyze" -msgstr "" +msgstr "تحليل" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" @@ -676,7 +671,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:294 msgid "Arabic" -msgstr "Arabic" +msgstr "العربية" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:617 #, c-format @@ -744,12 +739,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "B" -msgstr "" +msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 -#, fuzzy msgid "BP register " -msgstr "&تسجل" +msgstr "BP تسجل" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -868,7 +862,7 @@ msgstr "أزرار" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "C" -msgstr "" +msgstr "C" #: Source/Core/DolphinWX/Src/TASInputDlg.cpp:77 msgid "C Stick" @@ -880,7 +874,7 @@ msgstr "العصا الأيمن " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 msgid "CP reg" -msgstr "" +msgstr "CP reg" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:552 msgid "CPU Emulator Engine" @@ -960,7 +954,7 @@ msgstr "Caps Lock" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:295 msgid "Catalan" -msgstr "Catalan" +msgstr "الكاتالونية" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 msgid "Center" @@ -1021,19 +1015,19 @@ msgstr "قائمة الاسرار" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:632 msgid "Check Partition Integrity" -msgstr "" +msgstr "تحقق سلامة التقسيم" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 msgid "Checking integrity..." -msgstr "" +msgstr "التحقق من سلامة ..." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:296 msgid "Chinese (Simplified)" -msgstr "Chinese (Simplified)" +msgstr "الصينية المبسطة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:297 msgid "Chinese (Traditional)" -msgstr "Chinese (Traditional)" +msgstr "الصينية التقليدية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "Choose a DVD root directory:" @@ -1362,11 +1356,11 @@ msgstr "تخصيص بعض المعلمات العرض على إملائي." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:298 msgid "Czech" -msgstr "Czech" +msgstr "التشيكية" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 msgid "D" -msgstr "" +msgstr "D" #: Source/Core/Core/Src/HW/GCPadEmu.cpp:89 msgid "D-Pad" @@ -1737,7 +1731,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:272 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:299 msgid "Dutch" -msgstr "Dutch" +msgstr "الهولندية" #: Source/Core/DolphinWX/Src/FrameTools.cpp:112 msgid "E&xit" @@ -2039,7 +2033,7 @@ msgstr "نهاية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:267 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:300 msgid "English" -msgstr "English" +msgstr "الإنجليزية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:330 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:408 @@ -2262,15 +2256,15 @@ msgid "Failed to read banner.bin" msgstr "Ùشل ÙÙŠ قراءة banner.bin" #: Source/Core/Core/Src/HW/GCMemcard.cpp:223 -#, fuzzy, c-format +#, c-format msgid "" "Failed to read block %d of the save data\n" "Memcard may be truncated\n" "FilePosition:%llx" msgstr "" -"Ùشل ÙÙŠ قراءة بيانات الحÙظ\n" -"(0xA000-)\n" -"قد يتم اقتطاع بطاقة ذاكرة" +"Failed to read block %d of the save data\n" +"Memcard may be truncated\n" +"FilePosition:%llx" #: Source/Core/Core/Src/HW/GCMemcard.cpp:148 msgid "" @@ -2331,7 +2325,7 @@ msgstr "Ùشل لكتابة عنوان لمل٠%d" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:301 msgid "Farsi" -msgstr "" +msgstr "الÙارسية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:468 msgid "Fast" @@ -2403,11 +2397,11 @@ msgstr "نوع المل٠غير معروÙ! لن تÙتح!" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:264 msgid "Find next" -msgstr "" +msgstr "بحث عن التالي" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:265 msgid "Find previous" -msgstr "" +msgstr "البحث السابقة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:630 msgid "First Block" @@ -2501,9 +2495,8 @@ msgid "Frame Dumps use FFV1" msgstr "Frame Dumps use FFV1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:226 -#, fuzzy msgid "Frame Info" -msgstr "الإطار" +msgstr "معلومات الإطار " #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:115 msgid "Frame Range" @@ -2529,7 +2522,7 @@ msgstr "تحكم بكاميرا اللعبة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:269 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:302 msgid "French" -msgstr "French" +msgstr "الÙرنسية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:38 msgid "Frets" @@ -2590,7 +2583,7 @@ msgstr "إعدادات اللعبة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:523 msgid "GameCube Savegame files(*.gci;*.gcs;*.sav)" -msgstr "" +msgstr "ملÙات Ø­Ùظ لعبة جيم كيوب(*.gci;*.gcs;*.sav)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:539 msgid "Gamecube" @@ -2615,7 +2608,7 @@ msgid "Gecko Codes" msgstr "تحميل اسرار" #: Source/Core/Core/Src/GeckoCode.cpp:222 -#, fuzzy, c-format +#, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" "(either a bad code or the code type is not yet supported. Try using the " @@ -2640,7 +2633,7 @@ msgstr "الإعدادات العامة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:268 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:303 msgid "German" -msgstr "German" +msgstr "الألمانية" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format @@ -2677,7 +2670,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:304 msgid "Greek" -msgstr "Greek" +msgstr "اليونانية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:22 msgid "Green" @@ -2709,7 +2702,7 @@ msgstr "عنوان اختباري Ùشل" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:305 msgid "Hebrew" -msgstr "Hebrew" +msgstr "العبرية" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Height" @@ -2775,7 +2768,7 @@ msgstr "الاختصارات" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:306 msgid "Hungarian" -msgstr "Hungarian" +msgstr "الهنغارية" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 msgid "Hybrid Wiimote" @@ -2845,7 +2838,6 @@ msgid "" msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 -#, fuzzy msgid "" "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " "Audio to throttle using the DSP (might fix audio clicks but can also cause " @@ -2978,15 +2970,15 @@ msgstr "wad تثبيت" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:894 msgid "Integrity Check Error" -msgstr "" +msgstr "تحقق من سلامة الخطأ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:900 msgid "Integrity check completed" -msgstr "" +msgstr "التحقق من سلامة الانتهاء" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:899 msgid "Integrity check completed. No errors have been found." -msgstr "" +msgstr "انتهاء التدقيق من سلامة لم يتم العثور على أخطاء" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format @@ -3086,7 +3078,7 @@ msgstr "غير صالح حالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:271 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:307 msgid "Italian" -msgstr "Italian" +msgstr "الإيطالية" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:188 msgid "JAPAN" @@ -3103,26 +3095,25 @@ msgstr "JITIL recompiler (تجريبي )" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:286 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:308 msgid "Japanese" -msgstr "Japanese" +msgstr "اليابانية" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:193 msgid "KOREA" msgstr "كوريا" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:74 -#, fuzzy msgid "" "Keep the game window on top of all other windows.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"إخÙاء مؤشر الماوس اذا كان على أعلى ناÙذة المحاكاة.\n" +"الحÙاظ على إطار اللعبة على أعلى من غيرها من جميع النواÙØ°.\n" "\n" "إذا لم تكن متأكدا ترك هذا التحقق." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:299 msgid "Keep window on top" -msgstr "" +msgstr "إبقاء الناÙذة على أعلى" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:241 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:241 @@ -3132,7 +3123,7 @@ msgstr "المÙتاح" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:289 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:309 msgid "Korean" -msgstr "Korean" +msgstr "الكورية" #. i18n: Left #: Source/Core/Core/Src/HW/GCPadEmu.cpp:57 @@ -3293,21 +3284,21 @@ msgstr "سجل الإعدادات" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:297 msgid "Log FPS to file" -msgstr "" +msgstr "تسجيل عدد الاطارات ÙÙŠ ملÙ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:95 msgid "Log Types" msgstr "نوع السجل" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 -#, fuzzy msgid "" "Log the number of frames rendered per second to User/Logs/fps.txt. Use this " "feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"عرض عدد الإطارات ÙÙŠ الثانية المقدمة كمقياس لسرعة المضاهاة.\n" +"استخدام هذه الميزة عندما تريد قياس أداء المحاكي User/Logs/fps.txt تسجيل عدد " +"من الإطارات ÙÙŠ الثانية المقدمة إلى.\n" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." @@ -3489,11 +3480,11 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 msgid "NOP" -msgstr "" +msgstr "NOP" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "" +msgstr "ملاحظة: حجم التدÙÙ‚ لا يطابق مدة البيانات الÙعلية\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3630,7 +3621,7 @@ msgstr "لم يتم العثور على مل٠البنر %s" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 msgid "No description available" -msgstr "" +msgstr "لا يوجد وص٠متاح" #: Source/Core/DolphinWX/Src/FrameAui.cpp:513 msgid "No docking" @@ -3660,7 +3651,7 @@ msgstr "لا شيء" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:310 msgid "Norwegian Bokmaal" -msgstr "Norwegian Bokmaal" +msgstr "النرويجية" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:215 msgid "Not Equal" @@ -3727,7 +3718,7 @@ msgstr "تعويض :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:587 msgid "On-Screen Display Messages" -msgstr "" +msgstr "عرض الرسائل التي تظهر على الشاشة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:434 #, c-format @@ -3867,7 +3858,7 @@ msgstr "وقÙØ©" #: Source/Core/DolphinWX/Src/FrameTools.cpp:128 msgid "Pause at end of movie" -msgstr "" +msgstr "توق٠ÙÙŠ نهاية الÙيلم" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:398 msgid "Per-Pixel Lighting" @@ -3925,7 +3916,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:311 msgid "Polish" -msgstr "Polish" +msgstr "البولندية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 1" @@ -3950,11 +3941,11 @@ msgstr "المنÙØ° :" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:312 msgid "Portuguese" -msgstr "Portuguese" +msgstr "البرتغالية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:313 msgid "Portuguese (Brazilian)" -msgstr "Portuguese (Brazilian)" +msgstr "البرتغالية البرازيلية" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:392 msgid "Post-Processing Effect:" @@ -4177,7 +4168,7 @@ msgstr "Run DSP LLE on a dedicated thread (غير مستحسن)." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:314 msgid "Russian" -msgstr "Russian" +msgstr "الروسية" #: Source/Core/DolphinWX/Src/FrameTools.cpp:149 msgid "Sa&ve State" @@ -4289,9 +4280,8 @@ msgid "Scroll Lock" msgstr "انتقل تأمين" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:263 -#, fuzzy msgid "Search" -msgstr "بحث عن اسرار" +msgstr "بحث" #: Source/Core/DolphinWX/Src/CheatsWindow.cpp:226 msgid "Search Filter" @@ -4302,13 +4292,12 @@ msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:249 -#, fuzzy msgid "Search current Object" -msgstr "Ø­Ùظ المنظور الحالي" +msgstr "البحث عن الكائن الحالي" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:253 msgid "Search for hex Value:" -msgstr "" +msgstr "البحث عن قيمة هيكس:" #: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 #: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 @@ -4384,7 +4373,7 @@ msgstr "" #: Source/Core/InputCommon/Src/InputConfig.cpp:61 msgid "Selected controller profile does not exist" -msgstr "" +msgstr "اختيار المل٠التحكم الشخصي غير موجود " #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4436,7 +4425,7 @@ msgstr "الÙاصل" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:315 msgid "Serbian" -msgstr "Serbian" +msgstr "الصربية" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 msgid "" @@ -4589,7 +4578,7 @@ msgid "" "Disabling this may avoid annoying and non-fatal messages, but it may also " "mean that Dolphin suddenly crashes without any explanation at all." msgstr "" -"تظهر رسالة خطأ حين خطر قد يحدث.\n" +"إظهار رسالة خطأ عند حدث خطاء محتمل .\n" "يمكن تجنب تعطيل هذه الرسائل المزعجة ØŒ ولكنه يمكن تعني أيضا أن دولÙين يتعطل " "Ùجأة دون أي تÙسير على الإطلاق." @@ -4598,9 +4587,8 @@ msgid "Show first block" msgstr "إظهار اول كتلة" #: Source/Core/DolphinWX/Src/FrameTools.cpp:130 -#, fuzzy msgid "Show lag counter" -msgstr "إظهار Ø­Ùظ التعليقات" +msgstr "إظهار عداد التأخر" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" @@ -4656,7 +4644,7 @@ msgstr "ويموت جانبي" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:287 msgid "Simplified Chinese" -msgstr "Simplified Chinese" +msgstr "الصينية المبسطة" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Size" @@ -4756,7 +4744,7 @@ msgstr "مجال" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:270 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:316 msgid "Spanish" -msgstr "Spanish" +msgstr "الأسبانية" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:101 msgid "Speaker Volume:" @@ -4824,7 +4812,7 @@ msgstr "Ø­Ùظ الحالة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "عجلة القيادة" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -4875,7 +4863,7 @@ msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" #: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 msgid "Swing" -msgstr "" +msgstr "هز" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 @@ -4992,7 +4980,6 @@ msgid "The resulting decrypted AR code doesn't contain any lines." msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 -#, fuzzy msgid "" "The safer you adjust this, the less likely the emulator will be missing any " "texture updates from RAM.\n" @@ -5041,9 +5028,8 @@ msgid "The value is invalid" msgstr "قيمة غير صالحة" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "ثيم" +msgstr "ثيم:" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" @@ -5134,7 +5120,7 @@ msgstr "أعلى" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:288 msgid "Traditional Chinese" -msgstr "Traditional Chinese" +msgstr "الصينية التقليدية" #: Source/Core/Core/Src/Boot/Boot.cpp:426 msgid "Tried to load an unknown file type." @@ -5156,7 +5142,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:317 msgid "Turkish" -msgstr "Turkish" +msgstr "التركية" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Turntable.cpp:29 msgid "Turntable" @@ -5180,9 +5166,9 @@ msgid "UNKNOWN" msgstr "غير معروÙ" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 -#, fuzzy, c-format +#, c-format msgid "UNKNOWN_%02X" -msgstr "غير معروÙ" +msgstr "غير معروÙ_%02X" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:183 msgid "USA" @@ -5344,7 +5330,6 @@ msgid "WAD installation failed: error creating %s" msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" #: Source/Core/DiscIO/Src/NANDContentLoader.cpp:547 -#, fuzzy msgid "WAD installation failed: error creating ticket" msgstr "خطأ ÙÙŠ إنشاء wad: Ùشل التثبيت %s" @@ -5444,7 +5429,7 @@ msgstr "" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:56 msgid "Whammy" -msgstr "" +msgstr "الضربة" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:405 msgid "Widescreen Hack" @@ -5545,9 +5530,8 @@ msgid "Write to Console" msgstr "الكتابة إلى وحدة التحكم" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:66 -#, fuzzy msgid "Write to Debugger" -msgstr "الكتابة على الملÙ" +msgstr "كتابة إلى مصحح الأخطاء" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:56 msgid "Write to File" @@ -5574,7 +5558,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 msgid "XF reg" -msgstr "" +msgstr "XF reg" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Drums.cpp:21 msgid "Yellow" From ec5fc54b5b4cb45c2eeaa7edc179d5f94275e94e Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 22 Jan 2013 21:40:48 -0600 Subject: [PATCH 486/627] Update Japanese language. --- Languages/po/ja.po | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 1edfb77bfe..269ef2cf6d 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-16 21:37-0600\n" -"PO-Revision-Date: 2013-01-16 21:40-0600\n" +"PO-Revision-Date: 2013-01-23 10:06+0900\n" "Last-Translator: \n" "Language-Team: \n" "Language: Japanese\n" @@ -295,7 +295,7 @@ msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 msgid "'" -msgstr "" +msgstr "'" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:58 msgid "(-)+zFar" @@ -369,14 +369,14 @@ msgid "A game is not currently running." msgstr "ゲームã¯ç¾åœ¨ã€èµ·å‹•ã•ã‚Œã¦ã„ã¾ã›ã‚“" #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 -#, fuzzy msgid "" "A supported bluetooth device could not be found!\n" "If you are not using Microsoft's bluetooth stack you must manually pair your " "wiimotes and use only the \"Refresh\" button." msgstr "" "サãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹Bluetoothデãƒã‚¤ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ\n" -"(Microsoft製Bluetoothスタックã®ã¿ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™)" +"Microsoft製以外ã®Bluetoothスタックを使ã£ã¦ã„ã‚‹å ´åˆã¯ã€æ‰‹å‹•ã§ãƒšã‚¢ãƒªãƒ³ã‚°ã‚’è¡Œ" +"ã„ã€ã€Žæ›´æ–°ã€ãƒœã‚¿ãƒ³ã®ã¿ä½¿ç”¨ã—ã¦ãã ã•ã„。" #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" @@ -510,12 +510,14 @@ msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" msgstr "Action Replay エラー: ä¸æ­£ãªå€¤ (%08x) in Memory Copy (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 -#, fuzzy, c-format +#, c-format msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"エラー: マスターコードã€ã¾ãŸã¯ CCXXXXXX ã¸ã®æ›¸ãè¾¼ã¿ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“ (%s)" +"エラー: マスターコードã€ã¾ãŸã¯ CCXXXXXX ã¸ã®æ›¸ãè¾¼ã¿ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“ " +"(%s)\n" +"マスターコードã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。使用ã—ãªã„ã§ãã ã•ã„。" #: Source/Core/Core/Src/ActionReplay.cpp:196 #, c-format @@ -779,7 +781,7 @@ msgstr "B" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 msgid "BP register " -msgstr "" +msgstr "BP register " #: Source/Core/DolphinWX/Src/WXInputBase.cpp:27 msgid "Back" @@ -993,7 +995,6 @@ msgid "Catalan" msgstr "カタルーニャ語" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 -#, fuzzy msgid "Center" msgstr "Center" @@ -1639,7 +1640,7 @@ msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 msgid "Dolby Pro Logic II decoder" -msgstr "" +msgstr "Dolby Pro Logic II decoder" #: Source/Core/DolphinWX/Src/FrameTools.cpp:866 msgid "Dolphin" @@ -1702,7 +1703,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 #: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 msgid "Dolphin was unable to complete the requested action." -msgstr "" +msgstr "è¦æ±‚ã•ã‚ŒãŸæ“作を完了ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:275 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:58 @@ -2043,17 +2044,24 @@ msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " "OSX." msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚OSX " +"ã«ã¯ç¾åœ¨æœªå¯¾å¿œã§ã™" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚" +"OpenALã®ã¿å¯¾å¿œ" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 msgid "" "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " "only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." msgstr "" +"Dolby Pro Logic II を使用ã—ãŸ5.1サラウンドã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã„ã¾ã™ã€‚" +"OpenALã®ã¿å¯¾å¿œã€‚『soft_oal.dllã€ã‚’『OenAL32.dllã€ã«ãƒªãƒãƒ¼ãƒ ã™ã‚‹ã“ã¨ã§å‹•ä½œã—ã¾" +"ã™" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -2560,7 +2568,7 @@ msgstr "å‰æ–¹" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 #, c-format msgid "Found %d results for '" -msgstr "" +msgstr "検索çµæžœï¼š%d 件 '" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 @@ -3167,7 +3175,7 @@ msgstr "ä¸æ­£ãªéŒ²ç”»ãƒ•ã‚¡ã‚¤ãƒ«" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:472 msgid "Invalid search parameters (no object selected)" -msgstr "" +msgstr "エラー：オブジェクトをé¸æŠžã—ã¦ãã ã•ã„" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:455 msgid "Invalid search string (couldn't convert to number)" @@ -3262,7 +3270,7 @@ msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 msgid "Latency:" -msgstr "" +msgstr "レイテンシー：" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:276 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:55 @@ -4486,9 +4494,8 @@ msgstr "" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ã€è‡ªå‹•ã€‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。" #: Source/Core/InputCommon/Src/InputConfig.cpp:61 -#, fuzzy msgid "Selected controller profile does not exist" -msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" +msgstr "é¸æŠžã•ã‚ŒãŸãƒ—ロファイルã¯å­˜åœ¨ã—ã¾ã›ã‚“" #: Source/Core/DolphinWX/Src/LogWindow.cpp:132 msgid "Selected font" @@ -4572,6 +4579,8 @@ msgid "" "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " "backend only." msgstr "" +"レイテンシーを調整ã—ã¾ã™ï¼ˆå˜ä½ï¼šms）。高ãã™ã‚‹ã“ã¨ã§éŸ³ã®å•é¡Œã‚’軽減ã§ãã¾ã™ã€‚" +"OpenALã®ã¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4935,7 +4944,7 @@ msgstr "ステートセーブï¼ãƒ­ãƒ¼ãƒ‰" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:92 msgid "Steering Wheel" -msgstr "" +msgstr "SPEED FORCE" #: Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Guitar.cpp:53 msgid "Stick" @@ -5154,9 +5163,8 @@ msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 -#, fuzzy msgid "Theme:" -msgstr "テーマ" +msgstr "テーマ：" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 msgid "" From b7d32b0a3d810736b2e1151d6d8b9da85ebfbcf3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 23 Jan 2013 23:29:50 -0500 Subject: [PATCH 487/627] mem_fun -> mem_fn. mem_fun is deprecated in C++11. Also it does everything mem_fun can do, but more conveniently. --- Source/Core/AudioCommon/Src/AOSoundStream.cpp | 2 +- Source/Core/AudioCommon/Src/DSoundStream.cpp | 2 +- Source/Core/AudioCommon/Src/OpenALStream.cpp | 6 ++++-- Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp | 2 +- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 2 +- Source/Core/Core/Src/NetPlayClient.cpp | 2 +- Source/Core/Core/Src/NetPlayServer.cpp | 2 +- Source/Core/InputCommon/Src/UDPWiimote.cpp | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp index 99ae2e661c..276938c3e2 100644 --- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp @@ -63,7 +63,7 @@ bool AOSound::Start() { memset(realtimeBuffer, 0, sizeof(realtimeBuffer)); - thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this); + thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp index b252dc90c5..c0c54e00f5 100644 --- a/Source/Core/AudioCommon/Src/DSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp @@ -135,7 +135,7 @@ bool DSound::Start() dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER); memset(p1, 0, num1); dsBuffer->Unlock(p1, num1, 0, 0); - thread = std::thread(std::mem_fun(&DSound::SoundLoop), this); + thread = std::thread(std::mem_fn(&DSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index cfe6a40630..814f720e6e 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -15,6 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include + #include "aldlist.h" #include "OpenALStream.h" #include "DPL2Decoder.h" @@ -52,7 +54,7 @@ bool OpenALStream::Start() //period_size_in_millisec = 1000 / refresh; alcMakeContextCurrent(pContext); - thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this); + thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this); bReturn = true; } else @@ -72,7 +74,7 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } - // Initialise DPL2 parameters + // Initialize DPL2 parameters dpl2reset(); soundTouch.clear(); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index 93b7cd5d09..ce416af7e2 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -101,7 +101,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill) recv_fifo = std::queue(); send_fifo = std::queue(); } - clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this); + clientThread = std::thread(std::mem_fn(&GeckoSockServer::ClientThread), this); client_count++; waiting_socks.pop(); sock_filled = true; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index cc05bc10e1..30054b274c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -264,7 +264,7 @@ bool Wiimote::Connect() // Set LEDs SetLEDs(WIIMOTE_LED_1 << index); - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); + m_wiimote_thread = std::thread(std::mem_fn(&Wiimote::ThreadFunc), this); // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index ef1edeeb7f..7293b615b3 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -70,7 +70,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay is_connected = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this); + m_thread = std::thread(std::mem_fn(&NetPlayClient::ThreadFunc), this); } } else diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 61a61d00ae..80e00c4656 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -38,7 +38,7 @@ NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* is_connected = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this); + m_thread = std::thread(std::mem_fn(&NetPlayServer::ThreadFunc), this); } else is_connected = false; diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp index f14f9ed7e2..83799f2a43 100644 --- a/Source/Core/InputCommon/Src/UDPWiimote.cpp +++ b/Source/Core/InputCommon/Src/UDPWiimote.cpp @@ -134,7 +134,7 @@ UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) : initBroadcastIPv6(); std::lock_guard lk(d->termLock); - d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this); + d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this); return; } From fe7e691d77550195f71ae2b7af67c6395493908d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 23 Jan 2013 23:38:49 -0500 Subject: [PATCH 488/627] Revert "mem_fun -> mem_fn." This reverts commit b7d32b0a3d810736b2e1151d6d8b9da85ebfbcf3. OSX C++ std library in charge of holding back progress (as usual). --- Source/Core/AudioCommon/Src/AOSoundStream.cpp | 2 +- Source/Core/AudioCommon/Src/DSoundStream.cpp | 2 +- Source/Core/AudioCommon/Src/OpenALStream.cpp | 6 ++---- Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp | 2 +- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 2 +- Source/Core/Core/Src/NetPlayClient.cpp | 2 +- Source/Core/Core/Src/NetPlayServer.cpp | 2 +- Source/Core/InputCommon/Src/UDPWiimote.cpp | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp index 276938c3e2..99ae2e661c 100644 --- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp @@ -63,7 +63,7 @@ bool AOSound::Start() { memset(realtimeBuffer, 0, sizeof(realtimeBuffer)); - thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this); + thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp index c0c54e00f5..b252dc90c5 100644 --- a/Source/Core/AudioCommon/Src/DSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp @@ -135,7 +135,7 @@ bool DSound::Start() dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER); memset(p1, 0, num1); dsBuffer->Unlock(p1, num1, 0, 0); - thread = std::thread(std::mem_fn(&DSound::SoundLoop), this); + thread = std::thread(std::mem_fun(&DSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 814f720e6e..cfe6a40630 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -15,8 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include - #include "aldlist.h" #include "OpenALStream.h" #include "DPL2Decoder.h" @@ -54,7 +52,7 @@ bool OpenALStream::Start() //period_size_in_millisec = 1000 / refresh; alcMakeContextCurrent(pContext); - thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this); + thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this); bReturn = true; } else @@ -74,7 +72,7 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } - // Initialize DPL2 parameters + // Initialise DPL2 parameters dpl2reset(); soundTouch.clear(); diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index ce416af7e2..93b7cd5d09 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -101,7 +101,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill) recv_fifo = std::queue(); send_fifo = std::queue(); } - clientThread = std::thread(std::mem_fn(&GeckoSockServer::ClientThread), this); + clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this); client_count++; waiting_socks.pop(); sock_filled = true; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 30054b274c..cc05bc10e1 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -264,7 +264,7 @@ bool Wiimote::Connect() // Set LEDs SetLEDs(WIIMOTE_LED_1 << index); - m_wiimote_thread = std::thread(std::mem_fn(&Wiimote::ThreadFunc), this); + m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index 7293b615b3..ef1edeeb7f 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -70,7 +70,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay is_connected = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fn(&NetPlayClient::ThreadFunc), this); + m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this); } } else diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index 80e00c4656..61a61d00ae 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -38,7 +38,7 @@ NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* is_connected = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fn(&NetPlayServer::ThreadFunc), this); + m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this); } else is_connected = false; diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp index 83799f2a43..f14f9ed7e2 100644 --- a/Source/Core/InputCommon/Src/UDPWiimote.cpp +++ b/Source/Core/InputCommon/Src/UDPWiimote.cpp @@ -134,7 +134,7 @@ UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) : initBroadcastIPv6(); std::lock_guard lk(d->termLock); - d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this); + d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this); return; } From f69b6b595ef80acf5ce776a80b1df27033bc7fdf Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 24 Jan 2013 13:10:13 +0100 Subject: [PATCH 489/627] change projection_type to u32 Fix issue 5740 thx @ erwan_taf for debuging all the week --- Source/Core/VideoCommon/Src/Statistics.h | 2 +- .../VideoCommon/Src/VertexShaderManager.cpp | 61 ++++++++++--------- Source/Core/VideoCommon/Src/XFMemory.h | 15 ++++- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/Source/Core/VideoCommon/Src/Statistics.h b/Source/Core/VideoCommon/Src/Statistics.h index 7238398b42..e173bfc682 100644 --- a/Source/Core/VideoCommon/Src/Statistics.h +++ b/Source/Core/VideoCommon/Src/Statistics.h @@ -43,7 +43,7 @@ struct Statistics int numUniquePixelShaders; - float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5, proj_6; + float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5; float gproj_0, gproj_1, gproj_2, gproj_3, gproj_4, gproj_5; float gproj_6, gproj_7, gproj_8, gproj_9, gproj_10, gproj_11, gproj_12, gproj_13, gproj_14, gproj_15; diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index 84340c6b98..1dce567b0d 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -350,26 +350,28 @@ void VertexShaderManager::SetConstants() if (bProjectionChanged) { bProjectionChanged = false; + + float *rawProjection = xfregs.projection.rawProjection; - if (xfregs.rawProjection[6] == 0) + switch(xfregs.projection.type) { - // Perspective + case GX_PERSPECTIVE: - g_fProjectionMatrix[0] = xfregs.rawProjection[0] * g_ActiveConfig.fAspectRatioHackW; + g_fProjectionMatrix[0] = rawProjection[0] * g_ActiveConfig.fAspectRatioHackW; g_fProjectionMatrix[1] = 0.0f; - g_fProjectionMatrix[2] = xfregs.rawProjection[1]; + g_fProjectionMatrix[2] = rawProjection[1]; g_fProjectionMatrix[3] = 0.0f; g_fProjectionMatrix[4] = 0.0f; - g_fProjectionMatrix[5] = xfregs.rawProjection[2] * g_ActiveConfig.fAspectRatioHackH; - g_fProjectionMatrix[6] = xfregs.rawProjection[3]; + g_fProjectionMatrix[5] = rawProjection[2] * g_ActiveConfig.fAspectRatioHackH; + g_fProjectionMatrix[6] = rawProjection[3]; g_fProjectionMatrix[7] = 0.0f; g_fProjectionMatrix[8] = 0.0f; g_fProjectionMatrix[9] = 0.0f; - g_fProjectionMatrix[10] = xfregs.rawProjection[4]; + g_fProjectionMatrix[10] = rawProjection[4]; - g_fProjectionMatrix[11] = xfregs.rawProjection[5]; + g_fProjectionMatrix[11] = rawProjection[5]; g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; @@ -394,24 +396,24 @@ void VertexShaderManager::SetConstants() SETSTAT_FT(stats.gproj_13, g_fProjectionMatrix[13]); SETSTAT_FT(stats.gproj_14, g_fProjectionMatrix[14]); SETSTAT_FT(stats.gproj_15, g_fProjectionMatrix[15]); - } - else - { - // Orthographic Projection - g_fProjectionMatrix[0] = xfregs.rawProjection[0]; + break; + + case GX_ORTHOGRAPHIC: + + g_fProjectionMatrix[0] = rawProjection[0]; g_fProjectionMatrix[1] = 0.0f; g_fProjectionMatrix[2] = 0.0f; - g_fProjectionMatrix[3] = xfregs.rawProjection[1]; + g_fProjectionMatrix[3] = rawProjection[1]; g_fProjectionMatrix[4] = 0.0f; - g_fProjectionMatrix[5] = xfregs.rawProjection[2]; + g_fProjectionMatrix[5] = rawProjection[2]; g_fProjectionMatrix[6] = 0.0f; - g_fProjectionMatrix[7] = xfregs.rawProjection[3]; + g_fProjectionMatrix[7] = rawProjection[3]; g_fProjectionMatrix[8] = 0.0f; g_fProjectionMatrix[9] = 0.0f; - g_fProjectionMatrix[10] = (g_ProjHack1.value + xfregs.rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign); - g_fProjectionMatrix[11] = (g_ProjHack2.value + xfregs.rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign); + g_fProjectionMatrix[10] = (g_ProjHack1.value + rawProjection[4]) * ((g_ProjHack1.sign == 0) ? 1.0f : g_ProjHack1.sign); + g_fProjectionMatrix[11] = (g_ProjHack2.value + rawProjection[5]) * ((g_ProjHack2.sign == 0) ? 1.0f : g_ProjHack2.sign); g_fProjectionMatrix[12] = 0.0f; g_fProjectionMatrix[13] = 0.0f; @@ -424,7 +426,7 @@ void VertexShaderManager::SetConstants() */ g_fProjectionMatrix[14] = 0.0f; - g_fProjectionMatrix[15] = (g_ProjHack3 && xfregs.rawProjection[0] == 2.0f ? 0.0f : 1.0f); //causes either the efb copy or bloom layer not to show if proj hack enabled + g_fProjectionMatrix[15] = (g_ProjHack3 && rawProjection[0] == 2.0f ? 0.0f : 1.0f); //causes either the efb copy or bloom layer not to show if proj hack enabled SETSTAT_FT(stats.g2proj_0, g_fProjectionMatrix[0]); SETSTAT_FT(stats.g2proj_1, g_fProjectionMatrix[1]); @@ -442,18 +444,21 @@ void VertexShaderManager::SetConstants() SETSTAT_FT(stats.g2proj_13, g_fProjectionMatrix[13]); SETSTAT_FT(stats.g2proj_14, g_fProjectionMatrix[14]); SETSTAT_FT(stats.g2proj_15, g_fProjectionMatrix[15]); - SETSTAT_FT(stats.proj_0, xfregs.rawProjection[0]); - SETSTAT_FT(stats.proj_1, xfregs.rawProjection[1]); - SETSTAT_FT(stats.proj_2, xfregs.rawProjection[2]); - SETSTAT_FT(stats.proj_3, xfregs.rawProjection[3]); - SETSTAT_FT(stats.proj_4, xfregs.rawProjection[4]); - SETSTAT_FT(stats.proj_5, xfregs.rawProjection[5]); - SETSTAT_FT(stats.proj_6, xfregs.rawProjection[6]); + SETSTAT_FT(stats.proj_0, rawProjection[0]); + SETSTAT_FT(stats.proj_1, rawProjection[1]); + SETSTAT_FT(stats.proj_2, rawProjection[2]); + SETSTAT_FT(stats.proj_3, rawProjection[3]); + SETSTAT_FT(stats.proj_4, rawProjection[4]); + SETSTAT_FT(stats.proj_5, rawProjection[5]); + break; + + default: + ERROR_LOG(VIDEO, "unknown projection type: %d", xfregs.projection.type); } - PRIM_LOG("Projection: %f %f %f %f %f %f\n", xfregs.rawProjection[0], xfregs.rawProjection[1], xfregs.rawProjection[2], xfregs.rawProjection[3], xfregs.rawProjection[4], xfregs.rawProjection[5]); + PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]); - if ((g_ActiveConfig.bFreeLook || g_ActiveConfig.bAnaglyphStereo ) && xfregs.rawProjection[6] == 0) + if ((g_ActiveConfig.bFreeLook || g_ActiveConfig.bAnaglyphStereo ) && xfregs.projection.type == GX_PERSPECTIVE) { Matrix44 mtxA; Matrix44 mtxB; diff --git a/Source/Core/VideoCommon/Src/XFMemory.h b/Source/Core/VideoCommon/Src/XFMemory.h index ee3c3b0fdc..fc199b8c32 100644 --- a/Source/Core/VideoCommon/Src/XFMemory.h +++ b/Source/Core/VideoCommon/Src/XFMemory.h @@ -61,6 +61,9 @@ #define LIGHTATTN_NONE 2 #define LIGHTATTN_DIR 3 +#define GX_PERSPECTIVE 0 +#define GX_ORTHOGRAPHIC 1 + #define XFMEM_SIZE 0x8000 #define XFMEM_POSMATRICES 0x000 #define XFMEM_POSMATRICES_END 0x100 @@ -235,6 +238,12 @@ struct Viewport float farZ; }; +struct Projection +{ + float rawProjection[6]; + u32 type; // only GX_PERSPECTIVE or GX_ORTHOGRAPHIC are allowed +}; + struct XFRegisters { u32 error; // 0x1000 @@ -257,10 +266,10 @@ struct XFRegisters u32 unk5; // 0x1015 u32 unk6; // 0x1016 u32 unk7; // 0x1017 - u32 MatrixIndexA; // 0x1018 - u32 MatrixIndexB; // 0x1019 + u32 MatrixIndexA; // 0x1018 + u32 MatrixIndexB; // 0x1019 Viewport viewport; // 0x101a - 0x101f - float rawProjection[7]; // 0x1020 - 0x1026 + Projection projection; // 0x1020 - 0x1026 u32 unk8[24]; // 0x1027 - 0x103e NumTexGen numTexGen; // 0x103f TexMtxInfo texMtxInfo[8]; // 0x1040 - 0x1047 From 2db0c4270eda2e652bb39e394aa8a576785a2354 Mon Sep 17 00:00:00 2001 From: lioncash Date: Thu, 24 Jan 2013 08:21:08 -0500 Subject: [PATCH 490/627] Fix a potential memory leak on non-windows systems. Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp --- Source/Core/Common/Src/FileUtil.cpp | 12 ++++++++++++ Source/Core/VideoCommon/Src/BPStructs.cpp | 1 + .../Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp | 1 + 3 files changed, 14 insertions(+) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index d7b248a722..d74c99b7a2 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -512,12 +512,24 @@ bool DeleteDirRecursively(const std::string &directory) if (IsDirectory(newPath)) { if (!DeleteDirRecursively(newPath)) + { + #ifndef _WIN32 + closedir(dirp); + #endif + return false; + } } else { if (!File::Delete(newPath)) + { + #ifndef _WIN32 + closedir(dirp); + #endif + return false; + } } #ifdef _WIN32 diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 9ba2afbbd1..add40d99c3 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -519,6 +519,7 @@ void BPWritten(const BPCmd& bp) for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { + // FIXME: Duplicate conditions. if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) break; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index 6a17a40eb1..f0674a96cc 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -137,6 +137,7 @@ void SWBPWritten(int address, int newvalue) for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { + // FIXME: Duplicate conditions if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) break; From 73eb98ed8e85e2c3fdeca440e7aed50117bac8f8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 24 Jan 2013 10:31:08 -0600 Subject: [PATCH 491/627] Move swap control to the host specific GLInterface files. --- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 6 ++++++ Source/Core/DolphinWX/Src/GLInterface/EGL.h | 1 + Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 9 +++++++++ Source/Core/DolphinWX/Src/GLInterface/GLX.h | 1 + .../DolphinWX/Src/GLInterface/InterfaceBase.h | 1 + Source/Core/DolphinWX/Src/GLInterface/WGL.cpp | 7 +++++++ Source/Core/DolphinWX/Src/GLInterface/WGL.h | 1 + Source/Core/DolphinWX/Src/GLInterface/WX.cpp | 13 ++++++++++++ Source/Core/DolphinWX/Src/GLInterface/WX.h | 1 + Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 19 +----------------- .../Plugin_VideoSoftware/Src/SWmain.cpp | 20 ++++--------------- 11 files changed, 45 insertions(+), 34 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index b8716ab467..942b60fc1e 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -26,6 +26,12 @@ void cInterfaceEGL::UpdateFPSDisplay(const char *text) { XStoreName(GLWin.dpy, GLWin.win, text); } + +void cInterfaceEGL::SwapInterval(int Interval) +{ + eglSwapInterval(GLWin.egl_dpy, Interval); +} + void cInterfaceEGL::Swap() { eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf); diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index c4b6a00b6c..fe127fe0ba 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -34,6 +34,7 @@ private: cX11Window XWindow; public: friend class cX11Window; + void SwapInterval(int Interval); void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index ef60873531..5745823cbf 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -27,6 +27,15 @@ void cInterfaceGLX::UpdateFPSDisplay(const char *text) { XStoreName(GLWin.dpy, GLWin.win, text); } + +void cInterfaceGLX::SwapInterval(int Interval) +{ + if (glXSwapIntervalSGI) + glXSwapIntervalSGI(Interval); + else + ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); +} + void cInterfaceGLX::Swap() { glXSwapBuffers(GLWin.dpy, GLWin.win); diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h index 73a6690ec5..83bb14a507 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h @@ -31,6 +31,7 @@ private: cX11Window XWindow; public: friend class cX11Window; + void SwapInterval(int Interval); void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h index 3e4f10fcd4..c2d1ffc54b 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -29,6 +29,7 @@ public: virtual bool MakeCurrent() = 0; virtual void Shutdown() = 0; + virtual void SwapInterval(int Interval) { } virtual u32 GetBackBufferWidth() { return s_backbuffer_width; } virtual u32 GetBackBufferHeight() { return s_backbuffer_height; } virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; } diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp index c97cb48bdf..ce1bb3d946 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -27,6 +27,13 @@ static HDC hDC = NULL; // Private GDI Device Context static HGLRC hRC = NULL; // Permanent Rendering Context +void cInterfaceWGL::SwapInterval(int Interval) +{ + if (WGLEW_EXT_swap_control) + wglSwapIntervalEXT(Interval); + else + ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); +} void cInterfaceWGL::Swap() { SwapBuffers(hDC); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h index 184ddd475f..18b8b2afb0 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h @@ -28,6 +28,7 @@ class cInterfaceWGL : public cInterfaceBase { public: + void SwapInterval(int Interval); void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp index d5415c8ed9..16de6369a7 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp @@ -23,6 +23,19 @@ #include "../GLInterface.h" #include "WX.h" +void cInterfaceWX::SwapInterval(int Interval) +{ + // WX interface only used on Apple +#ifdef __APPLE__ +#if defined USE_WX && USE_WX + NSOpenGLContext *ctx = GLWin.glCtxt->GetWXGLContext(); +#else + NSOpenGLContext *ctx = GLWin.cocoaCtx; +#endif + [ctx setValues: &Interval forParameter: NSOpenGLCPSwapInterval]; +#endif +} + void cInterfaceWX::Swap() { GLWin.glCanvas->SwapBuffers(); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h index 7772f864e5..82304942ea 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WX.h +++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h @@ -35,6 +35,7 @@ class cInterfaceWX : public cInterfaceBase { public: + void SwapInterval(int Interval); void Swap(); void UpdateFPSDisplay(const char *Text); bool Create(void *&window_handle); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index e3c35a6511..cd924acd8a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -327,25 +327,8 @@ Renderer::Renderer() s_backbuffer_height = (int)GLInterface->GetBackBufferHeight(); // Handle VSync on/off -#ifdef __APPLE__ int swapInterval = g_ActiveConfig.bVSync ? 1 : 0; -#if defined USE_WX && USE_WX - NSOpenGLContext *ctx = GLWin.glCtxt->GetWXGLContext(); -#else - NSOpenGLContext *ctx = GLWin.cocoaCtx; -#endif - [ctx setValues: &swapInterval forParameter: NSOpenGLCPSwapInterval]; -#elif defined _WIN32 - if (WGLEW_EXT_swap_control) - wglSwapIntervalEXT(g_ActiveConfig.bVSync ? 1 : 0); - else - ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); -#elif defined(HAVE_X11) && HAVE_X11 - if (glXSwapIntervalSGI) - glXSwapIntervalSGI(g_ActiveConfig.bVSync ? 1 : 0); - else - ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate)."); -#endif + GLInterface->SwapInterval(swapInterval); // check the max texture width and height GLint max_texture_size; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 4c88a89ab6..332e83d0e8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -141,28 +141,16 @@ void VideoSoftware::Shutdown() void VideoSoftware::Video_Prepare() { GLInterface->MakeCurrent(); - // Init extension support. - { + // Init extension support. + // Required for WGL SwapInterval #ifndef USE_GLES if (glewInit() != GLEW_OK) { ERROR_LOG(VIDEO, "glewInit() failed!Does your video card support OpenGL 2.x?"); return; } - - // Handle VSync on/off -#ifdef _WIN32 - if (WGLEW_EXT_swap_control) - wglSwapIntervalEXT(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)Does your video card support OpenGL 2.x?"); -#elif defined(HAVE_X11) && HAVE_X11 - if (glXSwapIntervalSGI) - glXSwapIntervalSGI(VSYNC_ENABLED); - else - ERROR_LOG(VIDEO, "no support for SwapInterval (framerate clamped to monitor refresh rate)"); -#endif #endif - } + // Handle VSync on/off + GLInterface->SwapInterval(VSYNC_ENABLED); HwRasterizer::Prepare(); SWRenderer::Prepare(); From 52ead255342796ea3be71aa1666dd2447f96e204 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 24 Jan 2013 10:39:38 -0600 Subject: [PATCH 492/627] Cleans up EGL. Removes printf output with INFO_LOG and ERROR_LOG --- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 126 +++++++++--------- 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index 942b60fc1e..a00df0cffa 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -49,37 +49,37 @@ bool cInterfaceEGL::Create(void *&window_handle) s_backbuffer_height = _theight; const char *s; - EGLint egl_major, egl_minor; + EGLint egl_major, egl_minor; - GLWin.dpy = XOpenDisplay(NULL); + GLWin.dpy = XOpenDisplay(NULL); - if (!GLWin.dpy) { - printf("Error: couldn't open display\n"); - return false; - } + if (!GLWin.dpy) { + ERROR_LOG(VIDEO, "Error: couldn't open display\n"); + return false; + } - GLWin.egl_dpy = eglGetDisplay(GLWin.dpy); - if (!GLWin.egl_dpy) { - printf("Error: eglGetDisplay() failed\n"); - return false; - } + GLWin.egl_dpy = eglGetDisplay(GLWin.dpy); + if (!GLWin.egl_dpy) { + ERROR_LOG(VIDEO, "Error: eglGetDisplay() failed\n"); + return false; + } - if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) { - printf("Error: eglInitialize() failed\n"); - return false; - } + if (!eglInitialize(GLWin.egl_dpy, &egl_major, &egl_minor)) { + ERROR_LOG(VIDEO, "Error: eglInitialize() failed\n"); + return false; + } - s = eglQueryString(GLWin.egl_dpy, EGL_VERSION); - printf("EGL_VERSION = %s\n", s); + s = eglQueryString(GLWin.egl_dpy, EGL_VERSION); + INFO_LOG(VIDEO, "EGL_VERSION = %s\n", s); - s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR); - printf("EGL_VENDOR = %s\n", s); + s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR); + INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", s); - s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS); - printf("EGL_EXTENSIONS = %s\n", s); + s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS); + INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", s); - s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS); - printf("EGL_CLIENT_APIS = %s\n", s); + s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS); + INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s); // attributes for a visual in RGBA format with at least // 8 bits per color and a 24 bit depth buffer @@ -108,29 +108,29 @@ bool cInterfaceEGL::Create(void *&window_handle) if (GLWin.parent == 0) GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen); - XVisualInfo visTemplate; - int num_visuals; - EGLConfig config; - EGLint num_configs; - EGLint vid; + XVisualInfo visTemplate; + int num_visuals; + EGLConfig config; + EGLint num_configs; + EGLint vid; - if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) { - printf("Error: couldn't get an EGL visual config\n"); - exit(1); - } + if (!eglChooseConfig( GLWin.egl_dpy, attribs, &config, 1, &num_configs)) { + ERROR_LOG(VIDEO, "Error: couldn't get an EGL visual config\n"); + return false; + } - if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { - printf("Error: eglGetConfigAttrib() failed\n"); - exit(1); - } + if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { + ERROG_LOG(VIDEO, "Error: eglGetConfigAttrib() failed\n"); + return false; + } - /* The X window visual must match the EGL config */ - visTemplate.visualid = vid; - GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals); - if (!GLWin.vi) { - printf("Error: couldn't get X visual\n"); - exit(1); - } + /* The X window visual must match the EGL config */ + visTemplate.visualid = vid; + GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals); + if (!GLWin.vi) { + ERROR_LOG(VIDEO, "Error: couldn't get X visual\n"); + return false; + } GLWin.x = _tx; GLWin.y = _ty; @@ -144,33 +144,27 @@ bool cInterfaceEGL::Create(void *&window_handle) eglBindAPI(EGL_OPENGL_API); #endif GLWin.egl_ctx = eglCreateContext(GLWin.egl_dpy, config, EGL_NO_CONTEXT, ctx_attribs ); - if (!GLWin.egl_ctx) { - printf("Error: eglCreateContext failed\n"); - exit(1); - } + if (!GLWin.egl_ctx) { + ERROR_LOG(VIDEO, "Error: eglCreateContext failed\n"); + return false; + } - GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL); - if (!GLWin.egl_surf) { - printf("Error: eglCreateWindowSurface failed\n"); - exit(1); - } + GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL); + if (!GLWin.egl_surf) { + ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n"); + return false; + } - if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) { - - printf("Error: eglMakeCurrent() failed\n"); - return false; - } + if (!eglMakeCurrent(GLWin.egl_dpy, GLWin.egl_surf, GLWin.egl_surf, GLWin.egl_ctx)) { + ERROR_LOG(VIDEO, "Error: eglMakeCurrent() failed\n"); + return false; + } - printf("GL_VENDOR: %s\n", glGetString(GL_VENDOR)); - printf("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); - printf("GL_VERSION: %s\n", glGetString(GL_VERSION)); - printf("GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS)); - /* Set initial projection/viewing transformation. - * We can't be sure we'll get a ConfigureNotify event when the window - * first appears. - */ - glViewport(0, 0, (GLint) _twidth, (GLint) _theight); + INFO_LOG(VIDEO, "GL_VENDOR: %s\n", glGetString(GL_VENDOR)); + INFO_LOG(VIDEO, "GL_RENDERER: %s\n", glGetString(GL_RENDERER)); + INFO_LOG(VIDEO, "GL_VERSION: %s\n", glGetString(GL_VERSION)); + INFO_LOG(VIDEO, "GL_EXTENSIONS: %s\n", glGetString(GL_EXTENSIONS)); window_handle = (void *)GLWin.win; return true; } From 10418d449fc1d04bb39fcc28afda0e19f14441da Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 24 Jan 2013 10:53:37 -0600 Subject: [PATCH 493/627] Removed the need for this temporary variable. --- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index a00df0cffa..304eb92059 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -48,7 +48,6 @@ bool cInterfaceEGL::Create(void *&window_handle) s_backbuffer_width = _twidth; s_backbuffer_height = _theight; - const char *s; EGLint egl_major, egl_minor; GLWin.dpy = XOpenDisplay(NULL); @@ -69,17 +68,10 @@ bool cInterfaceEGL::Create(void *&window_handle) return false; } - s = eglQueryString(GLWin.egl_dpy, EGL_VERSION); - INFO_LOG(VIDEO, "EGL_VERSION = %s\n", s); - - s = eglQueryString(GLWin.egl_dpy, EGL_VENDOR); - INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", s); - - s = eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS); - INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", s); - - s = eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS); - INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", s); + INFO_LOG(VIDEO, "EGL_VERSION = %s\n", eglQueryString(GLWin.egl_dpy, EGL_VERSION)); + INFO_LOG(VIDEO, "EGL_VENDOR = %s\n", eglQueryString(GLWin.egl_dpy, EGL_VENDOR)); + INFO_LOG(VIDEO, "EGL_EXTENSIONS = %s\n", eglQueryString(GLWin.egl_dpy, EGL_EXTENSIONS)); + INFO_LOG(VIDEO, "EGL_CLIENT_APIS = %s\n", eglQueryString(GLWin.egl_dpy, EGL_CLIENT_APIS)); // attributes for a visual in RGBA format with at least // 8 bits per color and a 24 bit depth buffer @@ -120,7 +112,7 @@ bool cInterfaceEGL::Create(void *&window_handle) } if (!eglGetConfigAttrib(GLWin.egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { - ERROG_LOG(VIDEO, "Error: eglGetConfigAttrib() failed\n"); + ERROR_LOG(VIDEO, "Error: eglGetConfigAttrib() failed\n"); return false; } @@ -160,7 +152,6 @@ bool cInterfaceEGL::Create(void *&window_handle) return false; } - INFO_LOG(VIDEO, "GL_VENDOR: %s\n", glGetString(GL_VENDOR)); INFO_LOG(VIDEO, "GL_RENDERER: %s\n", glGetString(GL_RENDERER)); INFO_LOG(VIDEO, "GL_VERSION: %s\n", glGetString(GL_VERSION)); From 2cc1a97a66c2d96357e777cd507acaaac888116f Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 25 Jan 2013 03:07:50 -0500 Subject: [PATCH 494/627] Properly sort multi-disc games by title. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 2312d6afa3..3d6f82b4c5 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -94,6 +94,18 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is switch(sortData) { case CGameListCtrl::COLUMN_TITLE: + if (!strcasecmp(iso1->GetName(indexOne).c_str(),iso2->GetName(indexOther).c_str())) + { + File::IOFile file(iso1->GetFileName(),"rb"); + u8 discNum; + file.Seek(6,0); + file.ReadBytes(&discNum, 1); + file.Close(); + if (discNum == 1) + return 1 * t; + else + return -1 * t; + } return strcasecmp(iso1->GetName(indexOne).c_str(), iso2->GetName(indexOther).c_str()) * t; case CGameListCtrl::COLUMN_NOTES: From 74a5ad542b44a18751acc19e4d1229d640cc4c0f Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 25 Jan 2013 13:00:53 -0500 Subject: [PATCH 495/627] Do not automatically refresh the game list for games that have "Emulation issues" written in their gameini after we open/close the iso properties. Fixes issue 5932. --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 2083c39201..6a673b95d1 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -999,7 +999,6 @@ void CISOProperties::LoadGameConfig() if (!sTemp.empty()) { EmuIssues->SetValue(wxString(sTemp.c_str(), *wxConvCurrent)); - bRefreshList = true; } EmuIssues->Enable(EmuState->GetSelection() != 0); @@ -1085,6 +1084,11 @@ bool CISOProperties::SaveGameConfig() GameIni.Set("Video", "PH_ZFar", PHack_Data.PHZFar); GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection()); + + std::string sTemp; + GameIni.Get("EmuState","EmulationIssues", &sTemp); + if (EmuIssues->GetValue() != sTemp) + bRefreshList = true; GameIni.Set("EmuState", "EmulationIssues", (const char*)EmuIssues->GetValue().mb_str(*wxConvCurrent)); PatchList_Save(); From eb07c005e39433a514fbd648fc39f5dc28a2f9db Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 25 Jan 2013 13:55:05 -0600 Subject: [PATCH 496/627] Move the cmake option lines to the top of the Cmake file for easy viewing in vim. --- CMakeLists.txt | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 255e3c95eb..8efd8c495d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,19 @@ # cmake_minimum_required(VERSION 2.6) +option(USE_GLES "Enables GLES, disables OGL" OFF) +option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) + +option(FASTLOG "Enable all logs" OFF) +option(OPROFILING "Enable profiling" OFF) +option(OPENMP "Enable OpenMP parallelization" ON) +option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) +######################################## +# Optional Targets +# TODO: Add DSPSpy and TestSuite. +option(DSPTOOL "Build dsptool" OFF) +option(UNITTESTS "Build unitests" OFF) + # Update compiler before calling project() if (APPLE) # Use clang compiler @@ -217,14 +230,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Release) add_definitions(-fomit-frame-pointer) endif(CMAKE_BUILD_TYPE STREQUAL Release) -option(FASTLOG "Enable all logs" OFF) if(FASTLOG) add_definitions(-DDEBUGFAST) endif() # For now GLES and EGL are tied to each other. # Enabling GLES also disables the OpenGL plugin. -option(USE_GLES "Enables GLES, disables OGL" OFF) if(USE_GLES) message("GLES rendering enabled") add_definitions(-DUSE_GLES) @@ -248,7 +259,6 @@ if(NOT OPENGL_GLU_FOUND) message(FATAL_ERROR "GLU is required but not found") endif() -option(OPENMP "Enable OpenMP parallelization" ON) if(OPENMP) include(FindOpenMP OPTIONAL) if(OPENMP_FOUND) @@ -331,7 +341,6 @@ else() add_definitions(-DHAVE_XRANDR=0) endif(XRANDR_FOUND) -option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) if(ENCODE_FRAMEDUMPS) check_libav() endif() @@ -353,7 +362,6 @@ else() set(PORTAUDIO_FOUND FALSE) endif(PORTAUDIO) -option(OPROFILING "Enable profiling" OFF) if(OPROFILING) check_lib(OPROFILE opagent opagent.h) check_lib(BFD bfd bfd.h) @@ -511,7 +519,6 @@ else() add_subdirectory(Externals/CLRun) endif() -option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) if(NOT DISABLE_WX) include(FindwxWidgets OPTIONAL) FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) @@ -607,12 +614,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h ) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") -######################################## -# Optional Targets -# TODO: Add DSPSpy and TestSuite. -option(DSPTOOL "Build dsptool" OFF) -option(UNITTESTS "Build unitests" OFF) - ######################################## # Start compiling our code # From f660077d06fb8bc37d20de4a7ad7f70738a0242a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 25 Jan 2013 20:11:17 -0600 Subject: [PATCH 497/627] Remove deprecated method for accessing a gtk widgets window. Fix a debug build compiler warning. --- Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 7 +++++++ Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h | 7 ------- Source/Core/DolphinWX/Src/X11Utils.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp index 485a5e7e52..6fe6b81613 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp @@ -41,6 +41,13 @@ inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); } #include "../../Movie.h" +namespace +{ +// :) +auto const TAU = 6.28318530717958647692; +auto const PI = TAU / 2.0; +} + namespace WiimoteEmu { diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h index 2a773d8978..36f0da406b 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h @@ -30,13 +30,6 @@ #include #include -namespace -{ -// :) -auto const TAU = 6.28318530717958647692; -auto const PI = TAU / 2.0; -} - // Registry sizes #define WIIMOTE_EEPROM_SIZE (16*1024) #define WIIMOTE_EEPROM_FREE_SIZE 0x1700 diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp index da21c41cb2..f032f81e96 100644 --- a/Source/Core/DolphinWX/Src/X11Utils.cpp +++ b/Source/Core/DolphinWX/Src/X11Utils.cpp @@ -124,12 +124,12 @@ void EWMH_Fullscreen(Display *dpy, int action) #if defined(HAVE_WX) && HAVE_WX Window XWindowFromHandle(void *Handle) { - return GDK_WINDOW_XID(GTK_WIDGET(Handle)->window); + return GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(Handle))); } Display *XDisplayFromHandle(void *Handle) { - return GDK_WINDOW_XDISPLAY(GTK_WIDGET(Handle)->window); + return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(GTK_WIDGET(Handle))); } #endif From 1e006b5b99cc520798988dc9b810d9b1ecae384d Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 25 Jan 2013 21:28:04 -0500 Subject: [PATCH 498/627] Better implementation of revision 2cc1a97a66c2. Works with .gcz files now. --- Source/Core/DiscIO/Src/Volume.h | 1 + Source/Core/DiscIO/Src/VolumeGC.cpp | 7 +++++++ Source/Core/DiscIO/Src/VolumeGC.h | 1 + Source/Core/DolphinWX/Src/GameListCtrl.cpp | 9 ++------- Source/Core/DolphinWX/Src/ISOFile.cpp | 4 +++- Source/Core/DolphinWX/Src/ISOFile.h | 2 ++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index c90ee4a381..557c71c31f 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -43,6 +43,7 @@ public: virtual std::string GetApploaderDate() const = 0; virtual bool SupportsIntegrityCheck() const { return false; } virtual bool CheckIntegrity() const { return false; } + virtual bool IsDiscTwo() const { return false; } enum ECountry { diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp index 51fac285fc..09e2c5eaa9 100644 --- a/Source/Core/DiscIO/Src/VolumeGC.cpp +++ b/Source/Core/DiscIO/Src/VolumeGC.cpp @@ -137,4 +137,11 @@ u64 CVolumeGC::GetSize() const return 0; } +bool CVolumeGC::IsDiscTwo() const +{ + bool discTwo; + Read(6,1, (u8*) &discTwo); + return discTwo; +} + } // namespace diff --git a/Source/Core/DiscIO/Src/VolumeGC.h b/Source/Core/DiscIO/Src/VolumeGC.h index 5fd18ea96a..4221df9493 100644 --- a/Source/Core/DiscIO/Src/VolumeGC.h +++ b/Source/Core/DiscIO/Src/VolumeGC.h @@ -39,6 +39,7 @@ public: std::string GetApploaderDate() const; ECountry GetCountry() const; u64 GetSize() const; + bool IsDiscTwo() const; private: IBlobReader* m_pReader; diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 3d6f82b4c5..51b5bb2554 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -96,14 +96,9 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is case CGameListCtrl::COLUMN_TITLE: if (!strcasecmp(iso1->GetName(indexOne).c_str(),iso2->GetName(indexOther).c_str())) { - File::IOFile file(iso1->GetFileName(),"rb"); - u8 discNum; - file.Seek(6,0); - file.ReadBytes(&discNum, 1); - file.Close(); - if (discNum == 1) + if (iso1->IsDiscTwo()) return 1 * t; - else + else if (iso2->IsDiscTwo()) return -1 * t; } return strcasecmp(iso1->GetName(indexOne).c_str(), diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 2d4b202272..1e4164b7aa 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -36,7 +36,7 @@ #include "ChunkFile.h" #include "../resources/no_banner.cpp" -#define CACHE_REVISION 0x10E +#define CACHE_REVISION 0x10F #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 @@ -91,6 +91,7 @@ GameListItem::GameListItem(const std::string& _rFileName) m_UniqueID = pVolume->GetUniqueID(); m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName.c_str()); + m_IsDiscTwo = pVolume->IsDiscTwo(); // check if we can get some infos from the banner file too DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume); @@ -235,6 +236,7 @@ void GameListItem::DoState(PointerWrap &p) p.Do(m_BlobCompressed); p.Do(m_pImage); p.Do(m_Platform); + p.Do(m_IsDiscTwo); } std::string GameListItem::CreateCacheFilename() diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h index fe7d3d6c6c..e58dcf7713 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.h +++ b/Source/Core/DolphinWX/Src/ISOFile.h @@ -48,6 +48,7 @@ public: bool IsCompressed() const {return m_BlobCompressed;} u64 GetFileSize() const {return m_FileSize;} u64 GetVolumeSize() const {return m_VolumeSize;} + bool IsDiscTwo() const {return m_IsDiscTwo;} #if defined(HAVE_WX) && HAVE_WX const wxImage& GetImage() const {return m_Image;} #endif @@ -87,6 +88,7 @@ private: bool m_BlobCompressed; std::vector m_pImage; u32 m_ImageSize; + bool m_IsDiscTwo; bool LoadFromCache(); void SaveToCache(); From efe8c754249a9d43a6093655f265a912b30a0f09 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 25 Jan 2013 21:30:29 -0500 Subject: [PATCH 499/627] Duplicate condition fix. Thanks j4ck.fr0st --- Source/Core/VideoCommon/Src/BPStructs.cpp | 3 +-- Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index add40d99c3..af263235cd 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -519,9 +519,8 @@ void BPWritten(const BPCmd& bp) for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { - // FIXME: Duplicate conditions. if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || - tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) + tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) break; memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index f0674a96cc..f05f9f8b57 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -135,11 +135,10 @@ void SWBPWritten(int address, int newvalue) // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; - for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + for (unsigned int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { - // FIXME: Duplicate conditions if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || - tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) + tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) break; memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); From a8d4c78cec87e864cfa5410f14687d13308e38d7 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Sat, 26 Jan 2013 12:12:47 +0200 Subject: [PATCH 500/627] Gameini database update. Fixes issue 5135. --- Data/User/GameConfig/G2TE52.ini | 13 +++++++++++-- Data/User/GameConfig/G3AP69.ini | 2 +- Data/User/GameConfig/GAZD69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZE69.ini | 13 +++++++++++-- Data/User/GameConfig/GAZF69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZH69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZI69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZJ69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZM69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GAZS69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4D69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4E69.ini | 15 ++++++++++++--- Data/User/GameConfig/GH4F69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4H69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4I69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4J69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4M69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4P69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GH4S69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHLE69.ini | 11 ++++++++++- Data/User/GameConfig/GHLJ69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHLP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHLX69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHLY69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHLZ69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GHSE69.ini | 2 +- Data/User/GameConfig/GHSJ69.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GHSP69.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GHSX69.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GHSY69.ini | 2 +- Data/User/GameConfig/GKYE01.ini | 9 ++++++++- Data/User/GameConfig/GKYJ01.ini | 17 +++++++++++++++++ Data/User/GameConfig/GKYP01.ini | 13 ++++++++++++- Data/User/GameConfig/GM8E01.ini | 2 -- Data/User/GameConfig/GQWE69.ini | 13 +++++++++++-- Data/User/GameConfig/GQWJ69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GQWP69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GQWX69.ini | 16 ++++++++++++++++ Data/User/GameConfig/GUME52.ini | 4 ++-- Data/User/GameConfig/GUMP52.ini | 4 ++-- Data/User/GameConfig/R2GEXJ.ini | 3 ++- Data/User/GameConfig/R2GJAF.ini | 4 ++-- Data/User/GameConfig/R2GP99.ini | 4 ++-- Data/User/GameConfig/R3ME01.ini | 14 ++++++++++++-- Data/User/GameConfig/R3MP01.ini | 20 ++++++++++++++++++++ Data/User/GameConfig/RBWE01.ini | 2 ++ Data/User/GameConfig/RBWJ01.ini | 2 ++ Data/User/GameConfig/RBWP01.ini | 2 ++ Data/User/GameConfig/RHDE8P.ini | 4 ++-- Data/User/GameConfig/RHDJ8P.ini | 4 ++-- Data/User/GameConfig/RHDP8P.ini | 4 ++-- Data/User/GameConfig/SX3J01.ini | 2 ++ Data/User/GameConfig/SX3P01.ini | 2 ++ 54 files changed, 591 insertions(+), 34 deletions(-) create mode 100644 Data/User/GameConfig/GAZD69.ini create mode 100644 Data/User/GameConfig/GAZF69.ini create mode 100644 Data/User/GameConfig/GAZH69.ini create mode 100644 Data/User/GameConfig/GAZI69.ini create mode 100644 Data/User/GameConfig/GAZJ69.ini create mode 100644 Data/User/GameConfig/GAZM69.ini create mode 100644 Data/User/GameConfig/GAZP69.ini create mode 100644 Data/User/GameConfig/GAZS69.ini create mode 100644 Data/User/GameConfig/GH4D69.ini create mode 100644 Data/User/GameConfig/GH4F69.ini create mode 100644 Data/User/GameConfig/GH4H69.ini create mode 100644 Data/User/GameConfig/GH4I69.ini create mode 100644 Data/User/GameConfig/GH4J69.ini create mode 100644 Data/User/GameConfig/GH4M69.ini create mode 100644 Data/User/GameConfig/GH4P69.ini create mode 100644 Data/User/GameConfig/GH4S69.ini create mode 100644 Data/User/GameConfig/GHLJ69.ini create mode 100644 Data/User/GameConfig/GHLP69.ini create mode 100644 Data/User/GameConfig/GHLX69.ini create mode 100644 Data/User/GameConfig/GHLY69.ini create mode 100644 Data/User/GameConfig/GHLZ69.ini create mode 100644 Data/User/GameConfig/GHSJ69.ini create mode 100644 Data/User/GameConfig/GHSP69.ini create mode 100644 Data/User/GameConfig/GHSX69.ini create mode 100644 Data/User/GameConfig/GKYJ01.ini create mode 100644 Data/User/GameConfig/GQWJ69.ini create mode 100644 Data/User/GameConfig/GQWP69.ini create mode 100644 Data/User/GameConfig/GQWX69.ini create mode 100644 Data/User/GameConfig/R3MP01.ini diff --git a/Data/User/GameConfig/G2TE52.ini b/Data/User/GameConfig/G2TE52.ini index 506768e485..b90db9f401 100644 --- a/Data/User/GameConfig/G2TE52.ini +++ b/Data/User/GameConfig/G2TE52.ini @@ -1,7 +1,16 @@ # G2TE52 - Tony Hawk's Underground 2 [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/User/GameConfig/G3AP69.ini index ed15e3bbba..04ea1cba46 100644 --- a/Data/User/GameConfig/G3AP69.ini +++ b/Data/User/GameConfig/G3AP69.ini @@ -1,4 +1,4 @@ -# G3AE69 - The Lord of the Rings, The Third Age +# G3AP69 - The Lord of the Rings, The Third Age [Core] Values set here will override the main dolphin settings. TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/User/GameConfig/GAZD69.ini b/Data/User/GameConfig/GAZD69.ini new file mode 100644 index 0000000000..c8516a71ea --- /dev/null +++ b/Data/User/GameConfig/GAZD69.ini @@ -0,0 +1,16 @@ +# GAZD69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZE69.ini b/Data/User/GameConfig/GAZE69.ini index 5168f7c0a0..0e84a9479a 100644 --- a/Data/User/GameConfig/GAZE69.ini +++ b/Data/User/GameConfig/GAZE69.ini @@ -1,7 +1,16 @@ # GAZE69 - Harry Potter : POA [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZF69.ini b/Data/User/GameConfig/GAZF69.ini new file mode 100644 index 0000000000..e933511c09 --- /dev/null +++ b/Data/User/GameConfig/GAZF69.ini @@ -0,0 +1,16 @@ +# GAZF69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZH69.ini b/Data/User/GameConfig/GAZH69.ini new file mode 100644 index 0000000000..f00c317941 --- /dev/null +++ b/Data/User/GameConfig/GAZH69.ini @@ -0,0 +1,16 @@ +# GAZH69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZI69.ini b/Data/User/GameConfig/GAZI69.ini new file mode 100644 index 0000000000..2e56ee50ec --- /dev/null +++ b/Data/User/GameConfig/GAZI69.ini @@ -0,0 +1,16 @@ +# GAZI69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZJ69.ini b/Data/User/GameConfig/GAZJ69.ini new file mode 100644 index 0000000000..91a6e20741 --- /dev/null +++ b/Data/User/GameConfig/GAZJ69.ini @@ -0,0 +1,16 @@ +# GAZJ69 - Harry Potter to Azkaban no Shuujin +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZM69.ini b/Data/User/GameConfig/GAZM69.ini new file mode 100644 index 0000000000..edcde989b1 --- /dev/null +++ b/Data/User/GameConfig/GAZM69.ini @@ -0,0 +1,16 @@ +# GAZM69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZP69.ini b/Data/User/GameConfig/GAZP69.ini new file mode 100644 index 0000000000..62e235c67b --- /dev/null +++ b/Data/User/GameConfig/GAZP69.ini @@ -0,0 +1,16 @@ +# GAZP69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GAZS69.ini b/Data/User/GameConfig/GAZS69.ini new file mode 100644 index 0000000000..493976126f --- /dev/null +++ b/Data/User/GameConfig/GAZS69.ini @@ -0,0 +1,16 @@ +# GAZS69 - Harry Potter : POA +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4D69.ini b/Data/User/GameConfig/GH4D69.ini new file mode 100644 index 0000000000..aa043328ab --- /dev/null +++ b/Data/User/GameConfig/GH4D69.ini @@ -0,0 +1,16 @@ +# GH4D69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4E69.ini b/Data/User/GameConfig/GH4E69.ini index 717593cf73..53f2bf092e 100644 --- a/Data/User/GameConfig/GH4E69.ini +++ b/Data/User/GameConfig/GH4E69.ini @@ -1,7 +1,16 @@ -# GH4E69 - Goblet Of Fire +# GH4E69 - Harry Potter and the Goblet of Fire [Core] Values set here will override the main dolphin settings. -TLBHack=1 +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4F69.ini b/Data/User/GameConfig/GH4F69.ini new file mode 100644 index 0000000000..162bbcd94d --- /dev/null +++ b/Data/User/GameConfig/GH4F69.ini @@ -0,0 +1,16 @@ +# GH4F69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4H69.ini b/Data/User/GameConfig/GH4H69.ini new file mode 100644 index 0000000000..f348f1f777 --- /dev/null +++ b/Data/User/GameConfig/GH4H69.ini @@ -0,0 +1,16 @@ +# GH4H69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4I69.ini b/Data/User/GameConfig/GH4I69.ini new file mode 100644 index 0000000000..b3bb4acb13 --- /dev/null +++ b/Data/User/GameConfig/GH4I69.ini @@ -0,0 +1,16 @@ +# GH4I69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4J69.ini b/Data/User/GameConfig/GH4J69.ini new file mode 100644 index 0000000000..8427cb7a75 --- /dev/null +++ b/Data/User/GameConfig/GH4J69.ini @@ -0,0 +1,16 @@ +# GH4J69 - Harry Potter to Honoo no Goblet +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4M69.ini b/Data/User/GameConfig/GH4M69.ini new file mode 100644 index 0000000000..d26c2c8bf7 --- /dev/null +++ b/Data/User/GameConfig/GH4M69.ini @@ -0,0 +1,16 @@ +# GH4M69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4P69.ini b/Data/User/GameConfig/GH4P69.ini new file mode 100644 index 0000000000..7f59479c96 --- /dev/null +++ b/Data/User/GameConfig/GH4P69.ini @@ -0,0 +1,16 @@ +# GH4P69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GH4S69.ini b/Data/User/GameConfig/GH4S69.ini new file mode 100644 index 0000000000..277c978f4a --- /dev/null +++ b/Data/User/GameConfig/GH4S69.ini @@ -0,0 +1,16 @@ +# GH4S69 - Harry Potter and the Goblet of Fire +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLE69.ini b/Data/User/GameConfig/GHLE69.ini index 2b8afab705..907ea760cb 100644 --- a/Data/User/GameConfig/GHLE69.ini +++ b/Data/User/GameConfig/GHLE69.ini @@ -1,7 +1,16 @@ # GHLE69 - Harry Potter and the Sorcerer's Stone [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Missing text sometimes +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLJ69.ini b/Data/User/GameConfig/GHLJ69.ini new file mode 100644 index 0000000000..5f9ecffaaa --- /dev/null +++ b/Data/User/GameConfig/GHLJ69.ini @@ -0,0 +1,16 @@ +# GHLJ69 - Harry Potter to Kenja no Ishi +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLP69.ini b/Data/User/GameConfig/GHLP69.ini new file mode 100644 index 0000000000..9cc3ba9db2 --- /dev/null +++ b/Data/User/GameConfig/GHLP69.ini @@ -0,0 +1,16 @@ +# GHLP69 - Harry Potter and the Philosopher's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLX69.ini b/Data/User/GameConfig/GHLX69.ini new file mode 100644 index 0000000000..5bf5d65db3 --- /dev/null +++ b/Data/User/GameConfig/GHLX69.ini @@ -0,0 +1,16 @@ +# GHLX69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLY69.ini b/Data/User/GameConfig/GHLY69.ini new file mode 100644 index 0000000000..b6ecff05dc --- /dev/null +++ b/Data/User/GameConfig/GHLY69.ini @@ -0,0 +1,16 @@ +# GHLY69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHLZ69.ini b/Data/User/GameConfig/GHLZ69.ini new file mode 100644 index 0000000000..a84cd6a874 --- /dev/null +++ b/Data/User/GameConfig/GHLZ69.ini @@ -0,0 +1,16 @@ +# GHLZ69 - Harry Potter and the Sorcerer's Stone +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GHSE69.ini b/Data/User/GameConfig/GHSE69.ini index 8640caac26..ca829d891b 100644 --- a/Data/User/GameConfig/GHSE69.ini +++ b/Data/User/GameConfig/GHSE69.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE sound glitches, videos require real XFB +EmulationIssues = Needs Real Xfb for videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GHSJ69.ini b/Data/User/GameConfig/GHSJ69.ini new file mode 100644 index 0000000000..44b9d741fd --- /dev/null +++ b/Data/User/GameConfig/GHSJ69.ini @@ -0,0 +1,18 @@ +# GHSJ69 - Harry Potter to Himitsu no Heya +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSP69.ini b/Data/User/GameConfig/GHSP69.ini new file mode 100644 index 0000000000..06ea951767 --- /dev/null +++ b/Data/User/GameConfig/GHSP69.ini @@ -0,0 +1,18 @@ +# GHSP69 - Harry Potter: Chamber Of Secrets +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSX69.ini b/Data/User/GameConfig/GHSX69.ini new file mode 100644 index 0000000000..b030198aff --- /dev/null +++ b/Data/User/GameConfig/GHSX69.ini @@ -0,0 +1,18 @@ +# GHSX69 - Harry Potter: Chamber Of Secrets +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs Real Xfb for videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GHSY69.ini b/Data/User/GameConfig/GHSY69.ini index 7fc51c7467..1d484a2598 100644 --- a/Data/User/GameConfig/GHSY69.ini +++ b/Data/User/GameConfig/GHSY69.ini @@ -2,7 +2,7 @@ [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = HLE sound glitches, videos require real XFB +EmulationIssues = Needs Real Xfb for videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GKYE01.ini b/Data/User/GameConfig/GKYE01.ini index 36e4128b6c..bb79983dd3 100644 --- a/Data/User/GameConfig/GKYE01.ini +++ b/Data/User/GameConfig/GKYE01.ini @@ -6,5 +6,12 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] - +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GKYJ01.ini b/Data/User/GameConfig/GKYJ01.ini new file mode 100644 index 0000000000..623a0be1e3 --- /dev/null +++ b/Data/User/GameConfig/GKYJ01.ini @@ -0,0 +1,17 @@ +# GKYJ01 - Kirby Air Ride +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GKYP01.ini b/Data/User/GameConfig/GKYP01.ini index f3bf060e4f..f5366146a0 100644 --- a/Data/User/GameConfig/GKYP01.ini +++ b/Data/User/GameConfig/GKYP01.ini @@ -1,6 +1,17 @@ # GKYP01 - Kirby Air Ride [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 +EmulationStateId = 5 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/User/GameConfig/GM8E01.ini index 122e83ccfe..0cc96edc53 100644 --- a/Data/User/GameConfig/GM8E01.ini +++ b/Data/User/GameConfig/GM8E01.ini @@ -38,7 +38,6 @@ $Have Wave Beam $Have Plasma Beam 4200183C 00230001 $Have Phazon Beam -01165C8D 08000000 70458245 00000080 087A55A9 000000C5 00458245 0000007C @@ -100,4 +99,3 @@ SafeTextureCacheColorSamples = 512 EFBCopyEnable = True EFBToTextureEnable = False [Video_Enhancements] - diff --git a/Data/User/GameConfig/GQWE69.ini b/Data/User/GameConfig/GQWE69.ini index 4bcef05b38..6fe5409d4f 100644 --- a/Data/User/GameConfig/GQWE69.ini +++ b/Data/User/GameConfig/GQWE69.ini @@ -1,7 +1,16 @@ # GQWE69 - Quidditch World Cup [Core] Values set here will override the main dolphin settings. +TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Black screen -EmulationStateId = 1 +EmulationIssues = +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWJ69.ini b/Data/User/GameConfig/GQWJ69.ini new file mode 100644 index 0000000000..5ab51bb3b7 --- /dev/null +++ b/Data/User/GameConfig/GQWJ69.ini @@ -0,0 +1,16 @@ +# GQWJ69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWP69.ini b/Data/User/GameConfig/GQWP69.ini new file mode 100644 index 0000000000..b380c45e79 --- /dev/null +++ b/Data/User/GameConfig/GQWP69.ini @@ -0,0 +1,16 @@ +# GQWP69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GQWX69.ini b/Data/User/GameConfig/GQWX69.ini new file mode 100644 index 0000000000..64692b9bc1 --- /dev/null +++ b/Data/User/GameConfig/GQWX69.ini @@ -0,0 +1,16 @@ +# GQWX69 - Quidditch World Cup +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GUME52.ini b/Data/User/GameConfig/GUME52.ini index 396010c826..f53bfb3282 100644 --- a/Data/User/GameConfig/GUME52.ini +++ b/Data/User/GameConfig/GUME52.ini @@ -2,8 +2,8 @@ [Core] Values set here will override the main dolphin settings. MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. -EmulationStateId = 2 +EmulationIssues = Needs MMU to run, and it runs slow. +EmulationStateId = 3 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GUMP52.ini b/Data/User/GameConfig/GUMP52.ini index 4265749160..fc0867e23f 100644 --- a/Data/User/GameConfig/GUMP52.ini +++ b/Data/User/GameConfig/GUMP52.ini @@ -2,8 +2,8 @@ [Core] Values set here will override the main dolphin settings. MMU = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though. -EmulationStateId = 2 +EmulationIssues = Needs MMU to run, and it runs slow. +EmulationStateId = 3 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/R2GEXJ.ini b/Data/User/GameConfig/R2GEXJ.ini index e23427e158..40208d8153 100644 --- a/Data/User/GameConfig/R2GEXJ.ini +++ b/Data/User/GameConfig/R2GEXJ.ini @@ -1,7 +1,7 @@ # R2GEXJ - FRAGILE DREAMS [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -18,3 +18,4 @@ UseXFB = True UseRealXFB = False [Video_Hacks] DlistCachingEnable = False +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R2GJAF.ini b/Data/User/GameConfig/R2GJAF.ini index d93e14ce7a..ff4a1885cd 100644 --- a/Data/User/GameConfig/R2GJAF.ini +++ b/Data/User/GameConfig/R2GJAF.ini @@ -1,7 +1,7 @@ # R2GJAF - FRAGILE [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -16,6 +16,6 @@ PH_ZFar = [Video_Settings] UseXFB = True UseRealXFB = False -[Video_Enhancements] [Video_Hacks] DlistCachingEnable = False +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R2GP99.ini b/Data/User/GameConfig/R2GP99.ini index 6f2140a5c2..a35a2d475c 100644 --- a/Data/User/GameConfig/R2GP99.ini +++ b/Data/User/GameConfig/R2GP99.ini @@ -1,7 +1,7 @@ # R2GP99 - FRAGILE DREAMS [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Minimap needs emulate format changes to work. EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. @@ -18,4 +18,4 @@ UseXFB = True UseRealXFB = False [Video_Hacks] DlistCachingEnable = False - +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/User/GameConfig/R3ME01.ini index 28547c72d7..312d6a15f1 100644 --- a/Data/User/GameConfig/R3ME01.ini +++ b/Data/User/GameConfig/R3ME01.ini @@ -1,10 +1,20 @@ # R3ME01 - Metroid Prime Trilogy [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 1 -EmulationIssues = +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = [Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/User/GameConfig/R3MP01.ini new file mode 100644 index 0000000000..291ac8df38 --- /dev/null +++ b/Data/User/GameConfig/R3MP01.ini @@ -0,0 +1,20 @@ +# R3MP01 - Metroid Prime Trilogy +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 60b08e73c4..9e8d586cf4 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -14,3 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini index 8efad9729f..bf95ff65c8 100644 --- a/Data/User/GameConfig/RBWJ01.ini +++ b/Data/User/GameConfig/RBWJ01.ini @@ -14,3 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini index 36b0b3bc98..f6282130a5 100644 --- a/Data/User/GameConfig/RBWP01.ini +++ b/Data/User/GameConfig/RBWP01.ini @@ -14,3 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Enhancements] +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/User/GameConfig/RHDE8P.ini index 4a2fd1499c..b49ec93cb8 100644 --- a/Data/User/GameConfig/RHDE8P.ini +++ b/Data/User/GameConfig/RHDE8P.ini @@ -1,8 +1,8 @@ # RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Only Hotd 3 works. XFB is needed for dx9. +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/User/GameConfig/RHDJ8P.ini index 784933d971..63e818f737 100644 --- a/Data/User/GameConfig/RHDJ8P.ini +++ b/Data/User/GameConfig/RHDJ8P.ini @@ -1,8 +1,8 @@ # RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Only Hotd 3 works. XFB is needed for dx9. +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/User/GameConfig/RHDP8P.ini index f6a1f98430..e932c173fb 100644 --- a/Data/User/GameConfig/RHDP8P.ini +++ b/Data/User/GameConfig/RHDP8P.ini @@ -1,8 +1,8 @@ # RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 3 -EmulationIssues = Only Hotd 3 works. XFB is needed for dx9. +EmulationStateId = 4 +EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/User/GameConfig/SX3J01.ini index c9a05a2493..276118af1a 100644 --- a/Data/User/GameConfig/SX3J01.ini +++ b/Data/User/GameConfig/SX3J01.ini @@ -15,3 +15,5 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 +[Wii] +DisableWiimoteSpeaker = 1 diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/User/GameConfig/SX3P01.ini index f75f762001..94b5c6ef16 100644 --- a/Data/User/GameConfig/SX3P01.ini +++ b/Data/User/GameConfig/SX3P01.ini @@ -15,3 +15,5 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 +[Wii] +DisableWiimoteSpeaker = 1 From 8ab2332854fbace5f8bf90f7b543527367bf29d8 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 28 Jan 2013 20:50:22 -0600 Subject: [PATCH 501/627] Enabled more warnings. Get to work! --- CMakeLists.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8efd8c495d..990ee60a1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,21 @@ add_definitions(-msse2) # Enabling all warnings in MSVC spams too much if(NOT MSVC) - add_definitions(-Wall) + add_definitions(-Wall +# TODO: would like these but they produce overwhelming amounts of warnings +# -Wextra +# -Wmissing-field-initializers +# -Wswitch-default +# -Wfloat-equal +# -Wconversion +# -Wzero-as-null-pointer-constant + -Wtype-limits + -Wsign-compare + -Wignored-qualifiers + -Wuninitialized + -Wlogical-op + -Wshadow + -Winit-self) endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag From 2ab1cccbe476f8e6a4fef8c7ebdf883ff1f043f8 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 29 Jan 2013 22:43:56 +1100 Subject: [PATCH 502/627] Preset HBeamPos to -1. Fixes NTSC-U N64 VC games. Fixes issue 5950. --- Source/Core/Core/Src/HW/VideoInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 95c06d1f88..bf9f7f8b84 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -144,8 +144,8 @@ void Preset(bool _bNTSC) m_HorizontalStepping.FbSteps = 40; m_HorizontalStepping.FieldSteps = 40; - m_HBeamPos = 0; - m_VBeamPos = 0; + m_HBeamPos = -1; // NTSC-U N64 VC games check for a non-zero HBeamPos + m_VBeamPos = 0; // RG4JC0 checks for a zero VBeamPos // 54MHz, capable of progressive scan m_Clock = Core::g_CoreStartupParameter.bProgressive; From 570997e6a11424bcd274fe08ef6e6fe0439e9e85 Mon Sep 17 00:00:00 2001 From: parlane Date: Tue, 29 Jan 2013 19:47:58 +0000 Subject: [PATCH 503/627] 4000 warnings about not supporting a warning... --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 990ee60a1f..cfab6b224b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,9 @@ if(NOT MSVC) -Wsign-compare -Wignored-qualifiers -Wuninitialized +if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang++") -Wlogical-op +endif(NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang++") -Wshadow -Winit-self) endif(NOT MSVC) From 4efbe1725f7030a552d40e05feab58b5f87c7283 Mon Sep 17 00:00:00 2001 From: parlane Date: Tue, 29 Jan 2013 19:52:44 +0000 Subject: [PATCH 504/627] Fix for the fix that didn't fix. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfab6b224b..a71b3f1b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,9 +123,9 @@ if(NOT MSVC) -Wsign-compare -Wignored-qualifiers -Wuninitialized -if (NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang++") +if (NOT ${CMAKE_CXX_COMPILER} MATCHES "clang++") -Wlogical-op -endif(NOT "${CMAKE_CXX_COMPILER}" MATCHES "clang++") +endif() -Wshadow -Winit-self) endif(NOT MSVC) From 65dea7da367259ef392482312c50947025ef9126 Mon Sep 17 00:00:00 2001 From: parlane Date: Tue, 29 Jan 2013 19:54:10 +0000 Subject: [PATCH 505/627] I blame Billiard. --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a71b3f1b5f..634709dbb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,9 +123,6 @@ if(NOT MSVC) -Wsign-compare -Wignored-qualifiers -Wuninitialized -if (NOT ${CMAKE_CXX_COMPILER} MATCHES "clang++") - -Wlogical-op -endif() -Wshadow -Winit-self) endif(NOT MSVC) From 75f2ba14b4cb165dc313caeb3845692d1e91b258 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 29 Jan 2013 13:59:03 -0600 Subject: [PATCH 506/627] Hey Parlane. Fixed it. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 634709dbb3..77c4d5b114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,9 @@ if(NOT MSVC) -Wuninitialized -Wshadow -Winit-self) + if (NOT (${CMAKE_C_COMPILER} MATCHES "clang")) + -Wlogical-op + endif() endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag From d2528615fa549d4ca467c65975adcebd7ba1696e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 29 Jan 2013 14:06:43 -0600 Subject: [PATCH 507/627] hah, woops. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77c4d5b114..ed233c03d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if(NOT MSVC) -Wshadow -Winit-self) if (NOT (${CMAKE_C_COMPILER} MATCHES "clang")) - -Wlogical-op + add_definitions(-Wlogical-op) endif() endif(NOT MSVC) From f13a07fb82eb979953183d3a5c4eff873a5d9605 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Tue, 29 Jan 2013 21:05:42 +0000 Subject: [PATCH 508/627] Remove this double flush in the idleskipping code. --- Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index 1dae2ec17e..a6f2dfb29f 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -140,13 +140,12 @@ void Jit64::lXXx(UGeckoInstruction inst) gpr.UnlockAll(); gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); // if it's still 0, we can wait until the next event TEST(32, R(EAX), R(EAX)); FixupBranch noIdle = J_CC(CC_NZ); - - gpr.Flush(FLUSH_ALL); - fpr.Flush(FLUSH_ALL); + ABI_CallFunctionC((void *)&PowerPC::OnIdle, PowerPC::ppcState.gpr[a] + (s32)(s16)inst.SIMM_16); // ! we must continue executing of the loop after exception handling, maybe there is still 0 in r0 From 0e04e0c305a4ba2519a9d7466374793ae9ff7e13 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 29 Jan 2013 16:40:15 -0600 Subject: [PATCH 509/627] Fix some shadowing warnings. --- .../Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 4 +-- .../Core/VideoCommon/Src/TextureCacheBase.h | 26 +++++++++---------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 +++--- .../Plugin_VideoOGL/Src/TextureCache.cpp | 6 ++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index a6f2dfb29f..04e4d09cc9 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -139,8 +139,8 @@ void Jit64::lXXx(UGeckoInstruction inst) MOV(32, gpr.R(d), R(EAX)); gpr.UnlockAll(); - gpr.Flush(FLUSH_ALL); - fpr.Flush(FLUSH_ALL); + gpr.Flush(FLUSH_ALL); + fpr.Flush(FLUSH_ALL); // if it's still 0, we can wait until the next event TEST(32, R(EAX), R(EAX)); diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h index 4ef3b8a985..1f8d9ebbd9 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.h +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h @@ -60,26 +60,26 @@ public: int frameCount; - void SetGeneralParameters(u32 addr, u32 size, u32 format, unsigned int num_mipmaps) + void SetGeneralParameters(u32 _addr, u32 _size, u32 _format, unsigned int _num_mipmaps) { - this->addr = addr; - this->size_in_bytes = size; - this->format = format; - this->num_mipmaps = num_mipmaps; + addr = _addr; + size_in_bytes = _size; + format = _format; + num_mipmaps = _num_mipmaps; } - void SetDimensions(unsigned int native_width, unsigned int native_height, unsigned int virtual_width, unsigned int virtual_height) + void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _virtual_width, unsigned int _virtual_height) { - this->native_width = native_width; - this->native_height = native_height; - this->virtual_width = virtual_width; - this->virtual_height = virtual_height; + native_width = _native_width; + native_height = _native_height; + virtual_width = _virtual_width; + virtual_height = _virtual_height; } - void SetHashes(u64 hash/*, u32 pal_hash*/) + void SetHashes(u64 _hash/*, u32 _pal_hash*/) { - this->hash = hash; - //this->pal_hash = pal_hash; + hash = _hash; + //pal_hash = _pal_hash; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index cd924acd8a..a10aaf7204 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1289,10 +1289,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; - unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; - FramebufferManagerBase::SetLastXfbWidth(w); - FramebufferManagerBase::SetLastXfbHeight(h); + unsigned int const last_w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth; + unsigned int const last_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(last_w); + FramebufferManagerBase::SetLastXfbHeight(last_h); } bool WindowResized = false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 7a62131f90..1c43ed1d59 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -330,15 +330,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo srcRect); u8* dst = Memory::GetPointer(addr); - u64 hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples); + u64 const new_hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples); // Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date if (!g_ActiveConfig.bEFBCopyCacheEnable) TextureCache::MakeRangeDynamic(addr,encoded_size); - else if (!TextureCache::Find(addr, hash)) + else if (!TextureCache::Find(addr, new_hash)) TextureCache::MakeRangeDynamic(addr,encoded_size); - this->hash = hash; + hash = new_hash; } FramebufferManager::SetFramebuffer(0); From 7676c4d43b1763c03e1fdfeb11f2ecfa48403ec8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 29 Jan 2013 21:28:55 -0600 Subject: [PATCH 510/627] For each of the recently added warning flags check to see if the compiler supports the flag before adding it. --- CMakeLists.txt | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed233c03d6..e72468854b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,32 +109,37 @@ endif() # Various compile flags add_definitions(-msse2) +include(CheckCXXCompilerFlag) +macro(check_and_add_flag var flag) + CHECK_CXX_COMPILER_FLAG(${flag} FLAG_${var}) + if(FLAG_${var}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + endif() +endmacro() + # Enabling all warnings in MSVC spams too much if(NOT MSVC) - add_definitions(-Wall -# TODO: would like these but they produce overwhelming amounts of warnings -# -Wextra -# -Wmissing-field-initializers -# -Wswitch-default -# -Wfloat-equal -# -Wconversion -# -Wzero-as-null-pointer-constant - -Wtype-limits - -Wsign-compare - -Wignored-qualifiers - -Wuninitialized - -Wshadow - -Winit-self) - if (NOT (${CMAKE_C_COMPILER} MATCHES "clang")) - add_definitions(-Wlogical-op) - endif() + add_definitions(-Wall) + + # TODO: would like these but they produce overwhelming amounts of warnings + #check_and_add_flag(EXTRA -Wextra) + #check_and_add_flag(MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers) + #check_and_add_flag(SWITCH_DEFAULT -Wswitch-default) + #check_and_add_flag(FLOAT_EQUAL -Wfloat-equal) + #check_and_add_flag(CONVERSION -Wconversion) + #check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant) + check_and_add_flag(TYPE_LIMITS -Wtype-limits) + check_and_add_flag(SIGN_COMPARE -Wsign-compare) + check_and_add_flag(IGNORED_QUALIFIERS -Wignored-qualifiers) + check_and_add_flag(UNINITIALIZED -Wuninitialized) + check_and_add_flag(LOGICAL_OP -Wlogical-op) + check_and_add_flag(SHADOW -Wshadow) + check_and_add_flag(INIT_SELF -Winit-self) endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi) -include(CheckCXXCompilerFlag) - # We call fread numerous times without checking return values. Hide the # corresponding compiler warnings if the compiler supports doing so. CHECK_CXX_COMPILER_FLAG(-Wunused-result NO_UNUSED_RESULT) @@ -142,16 +147,10 @@ if(NO_UNUSED_RESULT) add_definitions(-Wno-unused-result) endif(NO_UNUSED_RESULT) -CHECK_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden VISIBILITY_INLINES_HIDDEN) -if(VISIBILITY_INLINES_HIDDEN) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") -endif(VISIBILITY_INLINES_HIDDEN) +check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden) if(UNIX AND NOT APPLE) - CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden VISIBILITY_HIDDEN) - if(VISIBILITY_HIDDEN) - add_definitions(-fvisibility=hidden) - endif(VISIBILITY_HIDDEN) + check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden) endif() if(APPLE) From 18e69acc15ccdd5b63e76c0bc4c2e2d4397861c3 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 29 Jan 2013 21:48:26 -0600 Subject: [PATCH 511/627] Re-enable a few more warnings. --- CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e72468854b..647a84cb6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,14 +138,7 @@ if(NOT MSVC) endif(NOT MSVC) # gcc uses some optimizations which might break stuff without this flag -add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi) - -# We call fread numerous times without checking return values. Hide the -# corresponding compiler warnings if the compiler supports doing so. -CHECK_CXX_COMPILER_FLAG(-Wunused-result NO_UNUSED_RESULT) -if(NO_UNUSED_RESULT) - add_definitions(-Wno-unused-result) -endif(NO_UNUSED_RESULT) +add_definitions(-fno-strict-aliasing -fno-exceptions) check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden) From 0ffdd2607f4ce56e4a35e959d1f5adcc07959320 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 29 Jan 2013 23:24:51 -0600 Subject: [PATCH 512/627] Fix the majority of the compiler warnings unearthed by the addition of the new warning flags. --- Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 70 +++++++++---------- Source/Core/AudioCommon/Src/Mixer.h | 2 +- Source/Core/AudioCommon/Src/OpenALStream.cpp | 4 +- Source/Core/Core/Src/GeckoCode.cpp | 4 +- Source/Core/Core/Src/HW/EXI_DeviceIPL.h | 2 +- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 10 +-- .../Core/Src/PowerPC/Jit64IL/JitILAsm.cpp | 4 +- Source/Core/DiscIO/Src/VolumeWad.cpp | 6 +- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 13 ++-- Source/Core/DolphinWX/Src/TASInputDlg.cpp | 6 +- .../Plugin_VideoSoftware/Src/HwRasterizer.cpp | 32 ++++----- 11 files changed, 76 insertions(+), 77 deletions(-) diff --git a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp index a5d2720878..6a63f696de 100644 --- a/Source/Core/AudioCommon/Src/DPL2Decoder.cpp +++ b/Source/Core/AudioCommon/Src/DPL2Decoder.cpp @@ -232,70 +232,70 @@ float passive_lock(float x) void matrix_decode(const float *in, const int k, const int il, const int ir, bool decode_rear, - const int dlbuflen, - float l_fwr, float r_fwr, - float lpr_fwr, float lmr_fwr, - float *adapt_l_gain, float *adapt_r_gain, - float *adapt_lpr_gain, float *adapt_lmr_gain, - float *lf, float *rf, float *lr, - float *rr, float *cf) + const int _dlbuflen, + float _l_fwr, float _r_fwr, + float _lpr_fwr, float _lmr_fwr, + float *_adapt_l_gain, float *_adapt_r_gain, + float *_adapt_lpr_gain, float *_adapt_lmr_gain, + float *_lf, float *_rf, float *_lr, + float *_rr, float *_cf) { static const float M9_03DB = 0.3535533906f; static const float MATAGCTRIG = 8.0f; /* (Fuzzy) AGC trigger */ static const float MATAGCDECAY = 1.0f; /* AGC baseline decay rate (1/samp.) */ static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain, 0.50 - 0.55 is full cancellation. */ - const int kr = (k + olddelay) % dlbuflen; - float l_gain = (l_fwr + r_fwr) / (1 + l_fwr + l_fwr); - float r_gain = (l_fwr + r_fwr) / (1 + r_fwr + r_fwr); + const int kr = (k + olddelay) % _dlbuflen; + float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr); + float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr); /* The 2nd axis has strong gain fluctuations, and therefore require limits. The factor corresponds to the 1 / amplification of (Lt - Rt) when (Lt, Rt) is strongly correlated. (e.g. during dialogues). It should be bigger than -12 dB to prevent distortion. */ - float lmr_lim_fwr = lmr_fwr > M9_03DB * lpr_fwr ? lmr_fwr : M9_03DB * lpr_fwr; - float lpr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lpr_fwr + lpr_fwr); - float lmr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); - float lmr_unlim_gain = (lpr_fwr + lmr_fwr) / (1 + lmr_fwr + lmr_fwr); + float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr; + float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr); + float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr); + float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr); float lpr, lmr; float l_agc, r_agc, lpr_agc, lmr_agc; float f, d_gain, c_gain, c_agc_cfk; /*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/ /* AGC adaption */ - d_gain = (fabs(l_gain - *adapt_l_gain) + fabs(r_gain - *adapt_r_gain)) * 0.5f; + d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f; f = d_gain * (1.0f / MATAGCTRIG); f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); - *adapt_l_gain = (1 - f) * *adapt_l_gain + f * l_gain; - *adapt_r_gain = (1 - f) * *adapt_r_gain + f * r_gain; + *_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain; + *_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain; /* Matrix */ - l_agc = in[il] * passive_lock(*adapt_l_gain); - r_agc = in[ir] * passive_lock(*adapt_r_gain); - cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; + l_agc = in[il] * passive_lock(*_adapt_l_gain); + r_agc = in[ir] * passive_lock(*_adapt_r_gain); + _cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2; if (decode_rear) { - lr[kr] = rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; + _lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2; /* Stereo rear channel is steered with the same AGC steering as the decoding matrix. Note this requires a fast updating AGC at the order of 20 ms (which is the case here). */ - lr[kr] *= (l_fwr + l_fwr) / (1 + l_fwr + r_fwr); - rr[kr] *= (r_fwr + r_fwr) / (1 + l_fwr + r_fwr); + _lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr); + _rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr); } /*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/ lpr = (in[il] + in[ir]) * (float)M_SQRT1_2; lmr = (in[il] - in[ir]) * (float)M_SQRT1_2; /* AGC adaption */ - d_gain = fabs(lmr_unlim_gain - *adapt_lmr_gain); + d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain); f = d_gain * (1.0f / MATAGCTRIG); f = MATAGCDECAY - MATAGCDECAY / (1 + f * f); - *adapt_lpr_gain = (1 - f) * *adapt_lpr_gain + f * lpr_gain; - *adapt_lmr_gain = (1 - f) * *adapt_lmr_gain + f * lmr_gain; + *_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain; + *_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain; /* Matrix */ - lpr_agc = lpr * passive_lock(*adapt_lpr_gain); - lmr_agc = lmr * passive_lock(*adapt_lmr_gain); - lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; - rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; + lpr_agc = lpr * passive_lock(*_adapt_lpr_gain); + lmr_agc = lmr * passive_lock(*_adapt_lmr_gain); + _lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2; + _rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2; /*** CENTER FRONT CANCELLATION ***/ /* A heuristic approach exploits that Lt + Rt gain contains the @@ -303,16 +303,16 @@ void matrix_decode(const float *in, const int k, const int il, the front and rear "cones" to concentrate Lt + Rt to C and introduce Lt - Rt in L, R. */ /* 0.67677 is the empirical lower bound for lpr_gain. */ - c_gain = 8 * (*adapt_lpr_gain - 0.67677f); + c_gain = 8 * (*_adapt_lpr_gain - 0.67677f); c_gain = c_gain > 0 ? c_gain : 0; /* c_gain should not be too high, not even reaching full cancellation (~ 0.50 - 0.55 at current AGC implementation), or the center will sound too narrow. */ c_gain = MATCOMPGAIN / (1 + c_gain * c_gain); - c_agc_cfk = c_gain * cf[k]; - lf[k] -= c_agc_cfk; - rf[k] -= c_agc_cfk; - cf[k] += c_agc_cfk + c_agc_cfk; + c_agc_cfk = c_gain * _cf[k]; + _lf[k] -= c_agc_cfk; + _rf[k] -= c_agc_cfk; + _cf[k] += c_agc_cfk + c_agc_cfk; } void dpl2decode(float *samples, int numsamples, float *out) diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h index c1a387cf49..a9de2cee72 100644 --- a/Source/Core/AudioCommon/Src/Mixer.h +++ b/Source/Core/AudioCommon/Src/Mixer.h @@ -92,7 +92,7 @@ public: std::mutex& MixerCritical() { return m_csMixing; } - volatile float GetCurrentSpeed() const { return m_speed; } + float GetCurrentSpeed() const { return m_speed; } void UpdateSpeed(volatile float val) { m_speed = val; } protected: diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index cfe6a40630..6b239a584c 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -316,7 +316,7 @@ void OpenALStream::SoundLoop() if (iBuffersFilled == numBuffers) { alSourcePlay(uiSource); - ALenum err = alGetError(); + err = alGetError(); if (err != 0) { ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err); @@ -328,7 +328,7 @@ void OpenALStream::SoundLoop() { // Buffer underrun occurred, resume playback alSourcePlay(uiSource); - ALenum err = alGetError(); + err = alGetError(); if (err != 0) { ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err); diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp index 2d5f694ded..a42f6629ad 100644 --- a/Source/Core/Core/Src/GeckoCode.cpp +++ b/Source/Core/Core/Src/GeckoCode.cpp @@ -171,9 +171,9 @@ bool InstallCodeHandler() Memory::Write_U8(1, 0x80001807); // Invalidate the icache - for (unsigned int i = 0; i < data.length(); i += 32) + for (unsigned int j = 0; j < data.length(); j += 32) { - PowerPC::ppcState.iCache.Invalidate(0x80001800 + i); + PowerPC::ppcState.iCache.Invalidate(0x80001800 + j); } return true; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h index ed5cf0c922..bce8fee9ed 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.h @@ -78,7 +78,7 @@ private: virtual void TransferByte(u8 &_uByte); bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); } - const u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } + u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; } void LoadFileToIPL(std::string filename, u32 offset); }; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index c5ea6fcb06..64d1dc79ba 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -382,18 +382,18 @@ void ExecuteCommand(u32 _Address) } else { - IWII_IPC_HLE_Device* pDevice = CreateFileIO(DeviceID, DeviceName); - CmdSuccess = pDevice->Open(_Address, Mode); + IWII_IPC_HLE_Device* _pDevice = CreateFileIO(DeviceID, DeviceName); + CmdSuccess = _pDevice->Open(_Address, Mode); INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", - pDevice->GetDeviceName().c_str(), DeviceID, Mode); + _pDevice->GetDeviceName().c_str(), DeviceID, Mode); if (Memory::Read_U32(_Address + 4) == (u32)DeviceID) { - g_FdMap[DeviceID] = pDevice; + g_FdMap[DeviceID] = _pDevice; } else { - delete pDevice; + delete _pDevice; } } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index d04c58b143..74c290aa9c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -71,7 +71,7 @@ void JitILAsmRoutineManager::Generate() #endif // INT3(); - const u8 *outerLoop = GetCodePtr(); + const u8 *outer_loop = GetCodePtr(); ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); FixupBranch skipToRealDispatch = J(); //skip the sync and compare first time @@ -220,7 +220,7 @@ void JitILAsmRoutineManager::Generate() MOV(32, M(&PC), R(EAX)); TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); - J_CC(CC_Z, outerLoop, true); + J_CC(CC_Z, outer_loop, true); //Landing pad for drec space ABI_PopAllCalleeSavedRegsAndAdjustStack(); RET(); diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp index 0cdfc85925..2f9f0ef961 100644 --- a/Source/Core/DiscIO/Src/VolumeWad.cpp +++ b/Source/Core/DiscIO/Src/VolumeWad.cpp @@ -129,10 +129,10 @@ bool CVolumeWAD::GetWName(std::vector& _rwNames) const _rwNames.push_back(L""); continue; } - for (int i = 0; i < 42; ++i) + for (int j = 0; j < 42; ++j) { - u16 t = Common::swap16(temp[i]); - if (t == 0 && i > 0) + u16 t = Common::swap16(temp[j]); + if (t == 0 && j > 0) { if (out_temp.at(out_temp.size()-1) != ' ') out_temp.push_back(' '); diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index d33f507282..254b1a6bc7 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -483,8 +483,7 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) SearchResult result; result.frame_idx = frame_idx; - int obj_idx = m_objectsList->GetSelection(); - result.obj_idx = obj_idx; + result.obj_idx = m_objectsList->GetSelection(); result.cmd_idx = 0; for (unsigned int cmd_idx = 1; cmd_idx < m_objectCmdOffsets.size(); ++cmd_idx) { @@ -642,8 +641,8 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) { m_objectCmdOffsets.push_back(objectdata - objectdata_start); int new_offset = objectdata - &fifo_frame.fifoData[frame.objectStarts[0]]; - int cmd = *objectdata++; - switch (cmd) + int command = *objectdata++; + switch (command) { case GX_NOP: newLabel = _("NOP"); @@ -691,9 +690,9 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) case GX_LOAD_INDX_C: case GX_LOAD_INDX_D: objectdata += 4; - newLabel = wxString::Format(wxT("LOAD INDX %s"), (cmd == GX_LOAD_INDX_A) ? _("A") : - (cmd == GX_LOAD_INDX_B) ? _("B") : - (cmd == GX_LOAD_INDX_C) ? _("C") : _("D")); + newLabel = wxString::Format(wxT("LOAD INDX %s"), (command == GX_LOAD_INDX_A) ? _("A") : + (command == GX_LOAD_INDX_B) ? _("B") : + (command == GX_LOAD_INDX_C) ? _("C") : _("D")); break; case GX_CMD_CALL_DL: diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp index 51b340c55a..493fade776 100644 --- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp @@ -1099,8 +1099,8 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y) y = y/2; wxMemoryDC memDC; - wxBitmap bitmap(127, 127); - memDC.SelectObject(bitmap); + wxBitmap stick_bitmap(127, 127); + memDC.SelectObject(stick_bitmap); memDC.SetBackground(*wxLIGHT_GREY_BRUSH); memDC.Clear(); memDC.SetBrush(*wxWHITE_BRUSH); @@ -1116,5 +1116,5 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y) memDC.SetBrush(*wxBLUE_BRUSH); memDC.DrawCircle(x,y,5); memDC.SelectObject(wxNullBitmap); - return bitmap; + return stick_bitmap; } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index a5609f51b2..a1fd7c4733 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -33,7 +33,7 @@ namespace HwRasterizer float efbHalfHeight; bool hasTexture; - u8 *temp; + u8 *temp; // Programs static GLuint colProg, texProg, clearProg; @@ -61,7 +61,7 @@ namespace HwRasterizer " gl_FragColor = " TEXFUNC "(Texture, TexCoordOut.xy);\n" "}\n"; // Clear shader - static const char *fragclearText = + static const char *fragclearText = "uniform " PREC " vec4 Color;\n" "void main() {\n" " gl_FragColor = Color;\n" @@ -75,7 +75,7 @@ namespace HwRasterizer " gl_Position = pos;\n" " TexCoordOut = TexCoordIn;\n" "}\n"; - static const char *vertclearText = + static const char *vertclearText = "attribute vec4 pos;\n" "void main() {\n" " gl_Position = pos;\n" @@ -92,11 +92,11 @@ namespace HwRasterizer // Color attributes col_apos = glGetAttribLocation(colProg, "pos"); - col_atex = glGetAttribLocation(colProg, "TexCoordIn"); + col_atex = glGetAttribLocation(colProg, "TexCoordIn"); // Texture attributes tex_apos = glGetAttribLocation(texProg, "pos"); - tex_atex = glGetAttribLocation(texProg, "TexCoordIn"); - tex_utex = glGetUniformLocation(texProg, "Texture"); + tex_atex = glGetAttribLocation(texProg, "TexCoordIn"); + tex_utex = glGetUniformLocation(texProg, "Texture"); // Clear attributes clear_apos = glGetAttribLocation(clearProg, "pos"); clear_ucol = glGetUniformLocation(clearProg, "Color"); @@ -131,7 +131,7 @@ namespace HwRasterizer glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glClientActiveTexture(GL_TEXTURE0); + glClientActiveTexture(GL_TEXTURE0); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glEnable(GL_TEXTURE_RECTANGLE_ARB); @@ -179,7 +179,7 @@ namespace HwRasterizer hasTexture = bpmem.tevorders[0].enable0; if (hasTexture) - LoadTexture(); + LoadTexture(); } void EndTriangles() @@ -204,15 +204,15 @@ namespace HwRasterizer float z2 = v2->screenPosition.z / (float)0x00ffffff; float r0 = v0->color[0][OutputVertexData::RED_C] / 255.0f; - float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f; + float g0 = v0->color[0][OutputVertexData::GRN_C] / 255.0f; float b0 = v0->color[0][OutputVertexData::BLU_C] / 255.0f; float r1 = v1->color[0][OutputVertexData::RED_C] / 255.0f; - float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f; + float g1 = v1->color[0][OutputVertexData::GRN_C] / 255.0f; float b1 = v1->color[0][OutputVertexData::BLU_C] / 255.0f; float r2 = v2->color[0][OutputVertexData::RED_C] / 255.0f; - float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f; + float g2 = v2->color[0][OutputVertexData::GRN_C] / 255.0f; float b2 = v2->color[0][OutputVertexData::BLU_C] / 255.0f; static const GLfloat verts[3][3] = { @@ -339,17 +339,17 @@ namespace HwRasterizer texImage3.hex = texUnit.texImage3[0].hex; texTlut.hex = texUnit.texTlut[0].hex; - int width = texImage0.width; - int height = texImage0.height; + int image_width = texImage0.width; + int image_height = texImage0.height; - DebugUtil::GetTextureBGRA(temp, 0, 0, width, height); + DebugUtil::GetTextureBGRA(temp, 0, 0, image_width, image_height); glGenTextures(1, (GLuint *)&texture); glBindTexture(TEX2D, texture); #ifdef USE_GLES - glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); + glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)image_width, (GLsizei)image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, temp); #else - glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)width, (GLsizei)height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); + glTexImage2D(TEX2D, 0, GL_RGBA8, (GLsizei)image_width, (GLsizei)image_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, temp); #endif GL_REPORT_ERRORD(); } From de27f0bea9ff541fddfea8a875b15372d6420f8d Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 31 Jan 2013 03:51:29 -0500 Subject: [PATCH 513/627] Toggle full screen when double clicking the render window. --- Source/Core/DolphinWX/Src/Frame.cpp | 2 ++ Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index d390b8afcd..c26b28b1a7 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -1004,6 +1004,8 @@ void CFrame::OnMouse(wxMouseEvent& event) event.GetPosition().x, event.GetPosition().y, event.ButtonDown()); } #endif + if (event.LeftDClick()) + DoFullscreen(!RendererIsFullscreen()); event.Skip(); } diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 4d66d82b18..567c614304 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -913,6 +913,7 @@ void CFrame::StartGame(const std::string& filename) wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); + m_RenderParent->Bind(wxEVT_LEFT_DCLICK, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); } From e199d21513de1555b8e597fa9155a88cd9e2e3ce Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 31 Jan 2013 03:54:18 -0500 Subject: [PATCH 514/627] Revert "Toggle full screen when double clicking the render window." This reverts commit de27f0bea9ff541fddfea8a875b15372d6420f8d. --- Source/Core/DolphinWX/Src/Frame.cpp | 2 -- Source/Core/DolphinWX/Src/FrameTools.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index c26b28b1a7..d390b8afcd 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -1004,8 +1004,6 @@ void CFrame::OnMouse(wxMouseEvent& event) event.GetPosition().x, event.GetPosition().y, event.ButtonDown()); } #endif - if (event.LeftDClick()) - DoFullscreen(!RendererIsFullscreen()); event.Skip(); } diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 567c614304..4d66d82b18 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -913,7 +913,6 @@ void CFrame::StartGame(const std::string& filename) wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MIDDLE_UP, &CFrame::OnMouse, this); - m_RenderParent->Bind(wxEVT_LEFT_DCLICK, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MOTION, &CFrame::OnMouse, this); m_RenderParent->Bind(wxEVT_SIZE, &CFrame::OnRenderParentResize, this); } From f7fa33f2d618206e6388cc023d17ceb6a04d6af2 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 31 Jan 2013 15:29:29 -0600 Subject: [PATCH 515/627] Fix remaining compiler warnings. --- Source/Core/Common/Src/MemArena.cpp | 3 ++- Source/Core/Common/Src/MemoryUtil.cpp | 3 ++- Source/Core/Common/Src/StringUtil.cpp | 3 ++- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 10 +++++----- Source/Core/DiscIO/Src/CompressedBlob.cpp | 2 +- Source/Core/DiscIO/Src/DiscScrubber.cpp | 6 +++--- Source/Core/DiscIO/Src/DiscScrubber.h | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 26a332f161..1dcdef6672 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -43,7 +43,8 @@ void MemArena::GrabLowMemSpace(size_t size) mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; fd = open(ram_temp_file, O_RDWR | O_CREAT, mode); unlink(ram_temp_file); - ftruncate(fd, size); + if (ftruncate(fd, size) < 0) + ERROR_LOG(MEMMAP, "Failed to allocate low memory space"); return; #endif } diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index ebfa380be4..0888746d42 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -117,7 +117,8 @@ void* AllocateAlignedMemory(size_t size,size_t alignment) void* ptr = _aligned_malloc(size,alignment); #else void* ptr = NULL; - posix_memalign(&ptr, alignment, size); + if (posix_memalign(&ptr, alignment, size) != 0) + ERROR_LOG(MEMMAP, "Failed to allocate aligned memory"); ; #endif diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 664987d350..e5c70b2c6b 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -69,7 +69,8 @@ std::string StringFromFormat(const char* format, ...) delete[] buf; #else va_start(args, format); - vasprintf(&buf, format, args); + if (vasprintf(&buf, format, args) < 0) + ERROR_LOG(COMMON, "Unable to allocate memory for string"); va_end(args); std::string temp = buf; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 64d1dc79ba..bb939f4a06 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -382,18 +382,18 @@ void ExecuteCommand(u32 _Address) } else { - IWII_IPC_HLE_Device* _pDevice = CreateFileIO(DeviceID, DeviceName); - CmdSuccess = _pDevice->Open(_Address, Mode); + pDevice = CreateFileIO(DeviceID, DeviceName); + CmdSuccess = pDevice->Open(_Address, Mode); INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", - _pDevice->GetDeviceName().c_str(), DeviceID, Mode); + pDevice->GetDeviceName().c_str(), DeviceID, Mode); if (Memory::Read_U32(_Address + 4) == (u32)DeviceID) { - g_FdMap[DeviceID] = _pDevice; + g_FdMap[DeviceID] = pDevice; } else { - delete _pDevice; + delete pDevice; } } diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index 48ce8f10f3..c4b1aa1385 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -222,7 +222,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type, // u64 size = header.block_size; std::fill(in_buf, in_buf + header.block_size, 0); if (scrubbing) - DiscScrubber::GetNextBlock(inf.GetHandle(), in_buf); + DiscScrubber::GetNextBlock(inf, in_buf); else inf.ReadBytes(in_buf, header.block_size); z_stream z; diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp index 841c8283cc..9ea4a1911d 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.cpp +++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp @@ -127,7 +127,7 @@ bool SetupScrub(const char* filename, int block_size) return success; } -void GetNextBlock(FILE* in, u8* buffer) +void GetNextBlock(File::IOFile& in, u8* buffer) { u64 CurrentOffset = m_BlockCount * m_BlockSize; u64 i = CurrentOffset / CLUSTER_SIZE; @@ -136,12 +136,12 @@ void GetNextBlock(FILE* in, u8* buffer) { DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); std::fill(buffer, buffer + m_BlockSize, 0xFF); - fseeko(in, m_BlockSize, SEEK_CUR); + in.Seek(m_BlockSize, SEEK_CUR); } else { DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); - fread(buffer, m_BlockSize, 1, in); + in.ReadBytes(buffer, m_BlockSize); } m_BlockCount++; diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h index 2b17c7b2f4..d1d053f734 100644 --- a/Source/Core/DiscIO/Src/DiscScrubber.h +++ b/Source/Core/DiscIO/Src/DiscScrubber.h @@ -38,7 +38,7 @@ namespace DiscScrubber { bool SetupScrub(const char* filename, int block_size); -void GetNextBlock(FILE* in, u8* buffer); +void GetNextBlock(File::IOFile& in, u8* buffer); void Cleanup(); } // namespace DiscScrubber diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index b10f5a2676..7813c0b245 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -431,7 +431,7 @@ static bool AlphaCompare(int alpha, int ref, int comp) return true; } -static bool AlphaTest(int alpha) +static bool TevAlphaTest(int alpha) { bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0); bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1); @@ -700,7 +700,7 @@ void Tev::Draw() // convert to 8 bits per component u8 output[4] = {(u8)Reg[0][ALP_C], (u8)Reg[0][BLU_C], (u8)Reg[0][GRN_C], (u8)Reg[0][RED_C]}; - if (!AlphaTest(output[ALP_C])) + if (!TevAlphaTest(output[ALP_C])) return; // z texture From 147b500d2de12cbcd4d0e535dfb90e2809686cb6 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Fri, 1 Feb 2013 21:20:56 +0200 Subject: [PATCH 516/627] Gameini database update/additions of Sega Soccer Slam, Tomb Raider Underworld, Zapper, SAMURAI WARRIORS KATANA and Tales of Symphonia projection hack. For Tales of Symphonia the preset projection hack values eliminate double image on characters and unlike the previous ones they don't cause any issues and they work with all graphic backends (the main menu text was missing previously and it didn't work with d3d11). It is not enabled by default though, you will have to manually select it like before. --- Data/User/GameConfig/GSSE8P.ini | 15 +++++++++++++-- Data/User/GameConfig/GSSJ8P.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GSSP70.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GSSP8P.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GZPE70.ini | 18 ++++++++++++++++++ Data/User/GameConfig/GZPP70.ini | 18 ++++++++++++++++++ Data/User/GameConfig/PH_PRESETS.ini | 3 +-- Data/User/GameConfig/RH8E4F.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RH8JEL.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RH8P4F.ini | 13 +++++++++++-- Data/User/GameConfig/RH8X4F.ini | 18 ++++++++++++++++++ Data/User/GameConfig/RS5EC8.ini | 17 +++++++++++++++++ Data/User/GameConfig/RS5JC8.ini | 17 +++++++++++++++++ Data/User/GameConfig/RS5PC8.ini | 17 +++++++++++++++++ 14 files changed, 220 insertions(+), 6 deletions(-) create mode 100644 Data/User/GameConfig/GSSJ8P.ini create mode 100644 Data/User/GameConfig/GSSP70.ini create mode 100644 Data/User/GameConfig/GSSP8P.ini create mode 100644 Data/User/GameConfig/GZPE70.ini create mode 100644 Data/User/GameConfig/GZPP70.ini create mode 100644 Data/User/GameConfig/RH8E4F.ini create mode 100644 Data/User/GameConfig/RH8JEL.ini create mode 100644 Data/User/GameConfig/RH8X4F.ini create mode 100644 Data/User/GameConfig/RS5EC8.ini create mode 100644 Data/User/GameConfig/RS5JC8.ini create mode 100644 Data/User/GameConfig/RS5PC8.ini diff --git a/Data/User/GameConfig/GSSE8P.ini b/Data/User/GameConfig/GSSE8P.ini index f45b8c0ae8..91802d2e33 100644 --- a/Data/User/GameConfig/GSSE8P.ini +++ b/Data/User/GameConfig/GSSE8P.ini @@ -1,8 +1,8 @@ # GSSE8P - Sega Soccer Slam [Core] Values set here will override the main dolphin settings. -TLBHack = 0 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code @@ -19,3 +19,14 @@ $SubZero Have Tons Of Cash 0423C204 05F5E0FF $Volta Have Tons Of Cash 0423CEA8 05F5E0FF +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSJ8P.ini b/Data/User/GameConfig/GSSJ8P.ini new file mode 100644 index 0000000000..4a335940ce --- /dev/null +++ b/Data/User/GameConfig/GSSJ8P.ini @@ -0,0 +1,18 @@ +# GSSJ8P - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSP70.ini b/Data/User/GameConfig/GSSP70.ini new file mode 100644 index 0000000000..80830290cf --- /dev/null +++ b/Data/User/GameConfig/GSSP70.ini @@ -0,0 +1,18 @@ +# GSSP70 - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GSSP8P.ini b/Data/User/GameConfig/GSSP8P.ini new file mode 100644 index 0000000000..233ab70ade --- /dev/null +++ b/Data/User/GameConfig/GSSP8P.ini @@ -0,0 +1,18 @@ +# GSSP8P - Sega Soccer Slam +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = Needs real xfb for the videos to display. +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GZPE70.ini b/Data/User/GameConfig/GZPE70.ini new file mode 100644 index 0000000000..4218ea3b89 --- /dev/null +++ b/Data/User/GameConfig/GZPE70.ini @@ -0,0 +1,18 @@ +# GZPE70 - Zapper +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/GZPP70.ini b/Data/User/GameConfig/GZPP70.ini new file mode 100644 index 0000000000..08bb058920 --- /dev/null +++ b/Data/User/GameConfig/GZPP70.ini @@ -0,0 +1,18 @@ +# GZPP70 - Zapper +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/User/GameConfig/PH_PRESETS.ini index 007e18ce07..8d82d00790 100644 --- a/Data/User/GameConfig/PH_PRESETS.ini +++ b/Data/User/GameConfig/PH_PRESETS.ini @@ -33,8 +33,7 @@ PH_ExtraParam = 1 [5] Title = Tales of Symphonia GC -PH_ZNear = 0.5 -PH_ZFar = 1 +PH_ZNear = 0.0002 # --------------------------------------------------- diff --git a/Data/User/GameConfig/RH8E4F.ini b/Data/User/GameConfig/RH8E4F.ini new file mode 100644 index 0000000000..a6e799cbc6 --- /dev/null +++ b/Data/User/GameConfig/RH8E4F.ini @@ -0,0 +1,18 @@ +# RH8E4F - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8JEL.ini b/Data/User/GameConfig/RH8JEL.ini new file mode 100644 index 0000000000..36659d8842 --- /dev/null +++ b/Data/User/GameConfig/RH8JEL.ini @@ -0,0 +1,18 @@ +# RH8JEL - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8P4F.ini b/Data/User/GameConfig/RH8P4F.ini index f8247434b5..a3c1ea611f 100644 --- a/Data/User/GameConfig/RH8P4F.ini +++ b/Data/User/GameConfig/RH8P4F.ini @@ -1,9 +1,18 @@ -# RH8P4F - Tomb Raider Eight +# RH8P4F - Tomb Raider Underworld [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = Needs real Xfb for the videos to display. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RH8X4F.ini b/Data/User/GameConfig/RH8X4F.ini new file mode 100644 index 0000000000..4a945f5269 --- /dev/null +++ b/Data/User/GameConfig/RH8X4F.ini @@ -0,0 +1,18 @@ +# RH8X4F - Tomb Raider Underworld +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real Xfb for the videos to display. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = True diff --git a/Data/User/GameConfig/RS5EC8.ini b/Data/User/GameConfig/RS5EC8.ini new file mode 100644 index 0000000000..cdba3b671b --- /dev/null +++ b/Data/User/GameConfig/RS5EC8.ini @@ -0,0 +1,17 @@ +# RS5EC8 - SAMURAI WARRIORS KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RS5JC8.ini b/Data/User/GameConfig/RS5JC8.ini new file mode 100644 index 0000000000..0ddda2536e --- /dev/null +++ b/Data/User/GameConfig/RS5JC8.ini @@ -0,0 +1,17 @@ +# RS5JC8 - Sengoku Musou KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RS5PC8.ini b/Data/User/GameConfig/RS5PC8.ini new file mode 100644 index 0000000000..7ddeb980d1 --- /dev/null +++ b/Data/User/GameConfig/RS5PC8.ini @@ -0,0 +1,17 @@ +# RS5PC8 - SAMURAI WARRIORS KATANA +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True From e4588e2dfc2e14bcf95a58c499eade0f61179f76 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 19:00:10 -0600 Subject: [PATCH 517/627] Workaround ACL overflow issues by not dropping packets until buffer reaches size of 100. It seems to work without causing input delays or anything bad. --- .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 53 ++++++++++++----- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h | 59 ++++--------------- 2 files changed, 51 insertions(+), 61 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 33474af8c7..050cfe66eb 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -336,23 +336,23 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendToDevice(u16 _ConnectionHandle, u8 pWiiMote->ExecuteL2capCmd(_pData, _Size); } -// Here we send ACL packets to CPU. They will consist of header + data. -// The header is for example 07 00 41 00 which means size 0x0007 and channel 0x0041. -// --------------------------------------------------- -// AyuanX: Basically, our WII_IPC_HLE is efficient enough to send the packet immediately -// rather than enqueue it to some other memory -// But...the only exception comes from the Wiimote_Plugin void CWII_IPC_HLE_Device_usb_oh1_57e_305::IncDataPacket(u16 _ConnectionHandle) { m_PacketCount[_ConnectionHandle & 0xff]++; + // I don't think this makes sense or should be necessary + // m_PacketCount refers to "completed" packets and is not related to some buffer size, yes? +#if 0 if (m_PacketCount[_ConnectionHandle & 0xff] > (unsigned int)m_acl_pkts_num) { DEBUG_LOG(WII_IPC_WIIMOTE, "ACL buffer overflow"); m_PacketCount[_ConnectionHandle & 0xff] = m_acl_pkts_num; } +#endif } +// Here we send ACL packets to CPU. They will consist of header + data. +// The header is for example 07 00 41 00 which means size 0x0007 and channel 0x0041. void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size) { DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet from %x ready to send to stack...", _ConnectionHandle); @@ -374,8 +374,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u } else { - DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, " - "queueing(%d)...", m_acl_pool.GetWritePos()); + DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, queueing..."); m_acl_pool.Store(_pData, _Size, _ConnectionHandle); } } @@ -518,25 +517,51 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() return packet_transferred; } +void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle) +{ + if (m_queue.size() >= 100) + { + // Many simultaneous exchanges of ACL packets tend to cause the + // queue to fill up. Typically, this occurs when + // many emulated Wiimotes are requesting connections at once. + // See issue 4608 for more info. + ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be " + "dropped! (Hopefully you never see this.)"); + return; + } + + _dbg_assert_msg_(WII_IPC_WIIMOTE, + size < m_acl_pkt_size, "acl packet too large for pool"); + + m_queue.push_back(Packet()); + auto& packet = m_queue.back(); + + std::copy_n(data, size, packet.data); + packet.size = size; + packet.conn_handle = conn_handle; +} + void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& endpoint) { - const u8 *data = m_pool + m_acl_pkt_size * m_read_ptr; - const u16 size = m_info[m_read_ptr].size; - const u16 conn_handle = m_info[m_read_ptr].conn_handle; + auto& packet = m_queue.front(); + + const u8* const data = packet.data; + const u16 size = packet.size; + const u16 conn_handle = packet.conn_handle; DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet being written from " - "queue(%d) to %08x", GetReadPos(), endpoint.m_address); + "queue to %08x", endpoint.m_address); hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.m_buffer); pHeader->con_handle = HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT); pHeader->length = size; // Write the packet to the buffer - memcpy((u8*)pHeader + sizeof(hci_acldata_hdr_t), data, pHeader->length); + std::copy_n(data, pHeader->length, (u8*)pHeader + sizeof(hci_acldata_hdr_t)); endpoint.SetRetVal(sizeof(hci_acldata_hdr_t) + size); - m_read_ptr = (m_read_ptr + 1) % m_acl_pkts_num; + m_queue.pop_front(); WII_IPC_HLE_Interface::EnqReply(endpoint.m_address); endpoint.Invalidate(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h index 61c439a7ec..eb091b1ff9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h @@ -17,9 +17,11 @@ #pragma once -#include "hci.h" +#include #include #include + +#include "hci.h" #include "WII_IPC_HLE.h" #include "WII_IPC_HLE_Device.h" #include "WII_IPC_HLE_WiiMote.h" @@ -168,70 +170,33 @@ private: class ACLPool { - u8 m_pool[m_acl_pkt_size * m_acl_pkts_num]; - int m_read_ptr; - int m_write_ptr; - - struct + struct Packet { + u8 data[m_acl_pkt_size]; u16 size; u16 conn_handle; - } m_info[m_acl_pkts_num]; + }; + + std::deque m_queue; public: ACLPool() - : m_read_ptr(0) - , m_write_ptr(0) + : m_queue() {} - void Store(const u8* data, const u16 size, const u16 conn_handle) - { - _dbg_assert_msg_(WII_IPC_WIIMOTE, - size < m_acl_pkt_size, "acl packet too large for pool"); - - const int next_write_ptr = (m_write_ptr + 1) % m_acl_pkts_num; - if (next_write_ptr == m_read_ptr) - { - // Many simultaneous exchanges of ACL packets tend to cause the - // 10-packet limit to be exceeded. Typically, this occurs when - // many emulated Wiimotes are requesting connections at once. - // See issue 4608 for more info. - ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue is full - current packet will be " - "dropped! (m_write_ptr(%d) was about to overlap m_read_ptr(%d))", - m_write_ptr, m_read_ptr); - return; - } - - memcpy(m_pool + m_acl_pkt_size * m_write_ptr, data, size); - m_info[m_write_ptr].size = size; - m_info[m_write_ptr].conn_handle = conn_handle; - m_write_ptr = next_write_ptr; - } + void Store(const u8* data, const u16 size, const u16 conn_handle); void WriteToEndpoint(CtrlBuffer& endpoint); bool IsEmpty() const { - return m_write_ptr == m_read_ptr; - } - - int GetWritePos() const - { - return m_write_ptr; - } - - int GetReadPos() const - { - return m_read_ptr; + return m_queue.empty(); } // For SaveStates void DoState(PointerWrap &p) { - p.Do(m_write_ptr); - p.Do(m_read_ptr); - p.DoArray((u8 *)m_pool, sizeof(m_pool)); - p.DoArray((u8 *)m_info, sizeof(m_info)); + p.Do(m_queue); } } m_acl_pool; From 039bf277672d5eae1c4256db0728b9fbdc02db95 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 19:01:47 -0600 Subject: [PATCH 518/627] Allow Rhythm Heaven Fever's "Remix 1" to work by disallowing a simultaneous "Ack" and "Reply". --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 64d1dc79ba..6aae2fe4e5 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -535,12 +535,9 @@ void EnqReply(u32 _Address) // Takes care of routing ipc <-> ipc HLE void Update() { - if (!WII_IPCInterface::IsReady()) - return; - UpdateDevices(); - if (request_queue.size()) + if (WII_IPCInterface::IsReady() && request_queue.size()) { WII_IPCInterface::GenerateAck(request_queue.front()); INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front()); @@ -553,7 +550,8 @@ void Update() #endif } - if (reply_queue.size()) + // Avoiding a "Reply" and "Ack" on the same interrupt allowed Rhythm Heaven Fever's "Remix 1" to work. + if (WII_IPCInterface::IsReady() && reply_queue.size()) { WII_IPCInterface::GenerateReply(reply_queue.front()); INFO_LOG(WII_IPC_HLE, "<<-- Reply to IPC Request @ 0x%08x", reply_queue.front()); From 00a1f351e92ceceb153e072f548cfff6cea19dc8 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 20:53:05 -0600 Subject: [PATCH 519/627] Delay IPC replies directly caused by requests by 150th of a second. Fixes everything. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 17 ++++++++++++++--- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 6aae2fe4e5..7dca728f0f 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -58,6 +58,8 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC #include "../HW/WII_IPC.h" #include "../Debugger/Debugger_SymbolMap.h" #include "../PowerPC/PowerPC.h" +#include "../HW/SystemTimers.h" +#include "CoreTiming.h" namespace WII_IPC_HLE_Interface @@ -80,8 +82,17 @@ typedef std::deque ipc_msg_queue; static ipc_msg_queue request_queue; // ppc -> arm static ipc_msg_queue reply_queue; // arm -> ppc +static int enque_reply; + +void EnqueReplyCallback(u64 userdata, int) +{ + reply_queue.push_back(userdata); +} + void Init() { + enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback); + _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); CWII_IPC_HLE_Device_es::m_ContentFile = ""; u32 i; @@ -504,7 +515,7 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { // Generate a reply to the IPC command - EnqReply(_Address); + EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 150); } else { @@ -526,9 +537,9 @@ void EnqRequest(u32 _Address) } // Called when IOS module has some reply -void EnqReply(u32 _Address) +void EnqReply(u32 _Address, int cycles_in_future) { - reply_queue.push_back(_Address); + CoreTiming::ScheduleEvent(cycles_in_future, enque_reply, _Address); } // This is called every IPC_HLE_PERIOD from SystemTimers.cpp diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h index 2e056b5bec..65244836cc 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h @@ -62,7 +62,7 @@ void UpdateDevices(); void ExecuteCommand(u32 _Address); void EnqRequest(u32 _Address); -void EnqReply(u32 _Address); +void EnqReply(u32 _Address, int cycles_in_future = 0); enum ECommandType { From 11a4c92325d54fa2ae45d134d51e7c72d2d329a7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 21:36:16 -0600 Subject: [PATCH 520/627] Remove "Alternate Wiimote Timing" option. It's no longer needed. Also kill some irrelevant comments. --- Source/Core/Core/Src/BootManager.cpp | 5 +---- Source/Core/Core/Src/CoreParameter.cpp | 6 ++---- Source/Core/Core/Src/CoreParameter.h | 1 - Source/Core/Core/Src/HW/SystemTimers.cpp | 6 ++---- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 14 ++------------ Source/Core/DolphinWX/Src/ISOProperties.cpp | 14 -------------- Source/Core/DolphinWX/Src/ISOProperties.h | 3 +-- 7 files changed, 8 insertions(+), 41 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index b867052381..1e9e612fe0 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -55,7 +55,7 @@ namespace BootManager struct ConfigCache { bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, - bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bDisableWiimoteSpeaker, bHLE_BS2; + bVBeam, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2; int iTLBHack, iCPUCore; std::string strBackend; }; @@ -98,7 +98,6 @@ bool BootCore(const std::string& _rFilename) config_cache.bFastDiscSpeed = StartUp.bFastDiscSpeed; config_cache.bMergeBlocks = StartUp.bMergeBlocks; config_cache.bDSPHLE = StartUp.bDSPHLE; - config_cache.bDisableWiimoteSpeaker = StartUp.bDisableWiimoteSpeaker; config_cache.strBackend = StartUp.m_strVideoBackend; config_cache.bHLE_BS2 = StartUp.bHLE_BS2; @@ -113,7 +112,6 @@ bool BootCore(const std::string& _rFilename) game_ini.Get("Core", "FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); game_ini.Get("Core", "BlockMerging", &StartUp.bMergeBlocks, StartUp.bMergeBlocks); game_ini.Get("Core", "DSPHLE", &StartUp.bDSPHLE, StartUp.bDSPHLE); - game_ini.Get("Wii", "DisableWiimoteSpeaker",&StartUp.bDisableWiimoteSpeaker, StartUp.bDisableWiimoteSpeaker); game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str()); game_ini.Get("Core", "CPUCore", &StartUp.iCPUCore, StartUp.iCPUCore); game_ini.Get("Core", "HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); @@ -173,7 +171,6 @@ void Stop() StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed; StartUp.bMergeBlocks = config_cache.bMergeBlocks; StartUp.bDSPHLE = config_cache.bDSPHLE; - StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); StartUp.bHLE_BS2 = config_cache.bHLE_BS2; diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 7f019bcf59..a7a44be5ea 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -51,8 +51,8 @@ SCoreStartupParameter::SCoreStartupParameter() bRunCompareServer(false), bRunCompareClient(false), bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeam(false), bFastDiscSpeed(false), - SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false), - bConfirmStop(false), bHideCursor(false), + SelectedLanguage(0), bWii(false), + bConfirmStop(false), bHideCursor(false), bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true), iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640), iRenderWindowHeight(480), @@ -99,8 +99,6 @@ void SCoreStartupParameter::LoadDefaults() bJITPairedOff = false; bJITSystemRegistersOff = false; - bDisableWiimoteSpeaker = false; - m_strName = "NONE"; m_strUniqueID = "00000000"; } diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index e2e5eb6f1b..55d20b7b1b 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -121,7 +121,6 @@ struct SCoreStartupParameter int SelectedLanguage; bool bWii; - bool bDisableWiimoteSpeaker; // Interface settings bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index b9f9fe0107..bfeeb36b51 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -251,12 +251,10 @@ void Init() // Now the 1500 is a pure assumption // We need to figure out the real frequency though - // FIXME: does Wiimote Speaker support really require a different interval? (issue 4608) - const int interval = SConfig::GetInstance().m_LocalCoreStartupParameter. - bDisableWiimoteSpeaker ? 15000 : 4000; + const int freq = 4000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; - IPC_HLE_PERIOD = GetTicksPerSecond() / (interval * fields); + IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); } else { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 050cfe66eb..0391026023 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -485,18 +485,8 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() } } - // The Real Wiimote sends report every ~6.66ms (150 Hz). - // However, we don't actually reach here at dependable intervals, so we - // instead just timeslice in such a way that makes the stack think we have - // perfect "radio quality" (WPADGetRadioSensitivity) and yet still have some - // idle time. - // Somehow, Dolphin's Wiimote Speaker support requires using an update interval - // of 5ms (200 Hz) for its output to work. This increased frequency tends to - // fill the ACL queue (even) quicker than it can be processed by Dolphin, - // especially during simultaneous requests involving many (emulated) Wiimotes... - // Thus, we only use that interval when the option is enabled. See issue 4608. - const u64 interval = SystemTimers::GetTicksPerSecond() / (SConfig::GetInstance(). - m_LocalCoreStartupParameter.bDisableWiimoteSpeaker ? 150 : 200); + // The Real Wiimote sends report every ~5ms (200 Hz). + const u64 interval = SystemTimers::GetTicksPerSecond() / 200; const u64 each_wiimote_interval = interval / m_WiiMotes.size(); const u64 now = CoreTiming::GetTicks(); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 6a673b95d1..c44aad5d5b 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -328,8 +328,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Wii Console EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker = new wxCheckBox(m_GameConfig, ID_DISABLEWIIMOTESPEAKER, _("Alternate Wiimote Timing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DisableWiimoteSpeaker->SetToolTip(_("Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes.")); // Video UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER); @@ -377,10 +375,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) { sbWiiOverrides->ShowItems(false); EnableWideScreen->Hide(); - DisableWiimoteSpeaker->Hide(); } sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); - sbWiiOverrides->Add(DisableWiimoteSpeaker, 0, wxLEFT, 5); wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); @@ -966,11 +962,6 @@ void CISOProperties::LoadGameConfig() else EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Wii", "DisableWiimoteSpeaker", &bTemp)) - DisableWiimoteSpeaker->Set3StateValue((wxCheckBoxState)bTemp); - else - DisableWiimoteSpeaker->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "UseBBox", &bTemp)) UseBBox->Set3StateValue((wxCheckBoxState)bTemp); else @@ -1059,11 +1050,6 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - if (DisableWiimoteSpeaker->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Wii", "DisableWiimoteSpeaker"); - else - GameIni.Set("Wii", "DisableWiimoteSpeaker", DisableWiimoteSpeaker->Get3StateValue()); - if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "UseBBox"); else diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index 4f03130ba7..499b242516 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -72,7 +72,7 @@ private: wxCheckBox *CPUThread, *SkipIdle, *MMU, *DCBZOFF, *TLBHack; wxCheckBox *VBeam, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii - wxCheckBox *EnableWideScreen, *DisableWiimoteSpeaker; + wxCheckBox *EnableWideScreen; // Video wxCheckBox *UseZTPSpeedupHack, *PHackEnable, *UseBBox; wxButton *PHSettings; @@ -139,7 +139,6 @@ private: ID_PHSETTINGS, ID_ENABLEPROGRESSIVESCAN, ID_ENABLEWIDESCREEN, - ID_DISABLEWIIMOTESPEAKER, ID_EDITCONFIG, ID_EMUSTATE, ID_EMU_ISSUES, From c8c75dc9a3a9746989dc345838a0f04299154fc8 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 1 Feb 2013 21:44:35 -0600 Subject: [PATCH 521/627] Modify the gettextize script to add the header and dolphin license to the dolphin-emu.pot file. Also update the pot file once more. --- Languages/gettextize | 6 +- Languages/po/ar.po | 410 ++++++------ Languages/po/ca.po | 421 ++++++------ Languages/po/cs.po | 422 ++++++------ Languages/po/de.po | 420 ++++++------ Languages/po/dolphin-emu.pot | 413 ++++++------ Languages/po/el.po | 422 ++++++------ Languages/po/en.po | 405 ++++++------ Languages/po/es.po | 422 ++++++------ Languages/po/fa.po | 420 ++++++------ Languages/po/fr.po | 1198 ++++++++++++++++++++++------------ Languages/po/he.po | 405 ++++++------ Languages/po/hu.po | 421 ++++++------ Languages/po/it.po | 422 ++++++------ Languages/po/ja.po | 422 ++++++------ Languages/po/ko.po | 420 ++++++------ Languages/po/nb.po | 421 ++++++------ Languages/po/nl.po | 421 ++++++------ Languages/po/pl.po | 422 ++++++------ Languages/po/pt.po | 421 ++++++------ Languages/po/pt_BR.po | 422 ++++++------ Languages/po/ru.po | 418 ++++++------ Languages/po/sr.po | 405 ++++++------ Languages/po/tr.po | 421 ++++++------ Languages/po/zh_CN.po | 420 ++++++------ Languages/po/zh_TW.po | 418 ++++++------ 26 files changed, 6007 insertions(+), 5231 deletions(-) diff --git a/Languages/gettextize b/Languages/gettextize index 949c46f8df..d245544eda 100755 --- a/Languages/gettextize +++ b/Languages/gettextize @@ -7,7 +7,11 @@ CPP_FILE_LIST=$(find $SRCDIR \( -name '*.cpp' -o -name '*.h' -o -name '*.c' \) \ xgettext -d dolphin-emu -s --keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT \ --keyword=PanicAlertT --keyword=PanicYesNoT --keyword=AskYesNoT --keyword=_trans \ --keyword=CriticalAlertT --add-comments=i18n -p ./Languages/po -o dolphin-emu.pot \ - $CPP_FILE_LIST --package-name="Dolphin Emu" + $CPP_FILE_LIST --package-name="Dolphin Emulator" + +sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/" Languages/po/dolphin-emu.pot +sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2003-2013/" Languages/po/dolphin-emu.pot +sed -i "s/license as the PACKAGE package/license as the dolphin-emu package/" Languages/po/dolphin-emu.pot POTFILE=./Languages/po/dolphin-emu.pot PO_FILES=$(find ./Languages/po -name '*.po') diff --git a/Languages/po/ar.po b/Languages/po/ar.po index ce89e73485..b2f93ecf21 100644 --- a/Languages/po/ar.po +++ b/Languages/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-22 15:32-0600\n" "Last-Translator: \n" "Language-Team: \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -172,11 +172,11 @@ msgstr "&مدير الاسرار" msgid "&DSP Settings" msgstr "&إعدادات الصوت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&مسح ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&حذ٠تحديد ايزو" @@ -240,7 +240,7 @@ msgstr "&وقÙØ©" msgid "&Play" msgstr "&ابداء اللعبه" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&خصائص" @@ -284,11 +284,11 @@ msgstr "&القائمة" msgid "&Wiimote Settings" msgstr "&إعدادات تحكم الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&معلومات عن اللعبة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -308,7 +308,7 @@ msgstr "(معروÙ)" msgid "(off)" msgstr "(ايقاÙ)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -349,7 +349,7 @@ msgstr "<اضغط على Ù…Ùتاح>" msgid "" msgstr "<النظام>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -531,11 +531,11 @@ msgstr "كرت الشاشه :" msgid "Add" msgstr "أضÙ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "إضاÙØ© رمز ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "أض٠باتش" @@ -545,7 +545,7 @@ msgstr "إضاÙØ© جزء جديد" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "أضÙ" @@ -591,24 +591,24 @@ msgstr "إعدادات متقدمة" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "جميع ملÙات الجيم كيوب (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Ø­Ùظ جميع الحالات (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "جميع ملÙات ايزو الوي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "جميع مضغوط GC/Wii ISO files (gcz)" @@ -617,9 +617,10 @@ msgid "All files (*.*)|*.*" msgstr "جميع الملÙات (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -635,6 +636,10 @@ msgstr "بديل ويموت" msgid "Analyze" msgstr "تحليل" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "تصÙية متباينة الخواص :" @@ -651,7 +656,7 @@ msgstr "محمل التطبيق هو حجم الخطأ... هل حقا محمل msgid "Apploader unable to load from file" msgstr "Apploader غير قادر على تحميل مل٠من" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -678,17 +683,17 @@ msgstr "العربية" msgid "Are you sure you want to delete \"%s\"?" msgstr "هل أنت متأكد أنك تريد حذ٠\"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙØŸ " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "هل أنت متأكد أنك تريد حذ٠هذه الملÙات؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "نسبة العرض :" @@ -702,7 +707,7 @@ msgstr "يجب أن لا يقل عن جزء واحد لا تزال Ù…Ùتوحة. msgid "Audio" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "صوت الخلÙية :" @@ -737,11 +742,11 @@ msgstr "" "\n" "إذا لم تكن متأكدا اترك هذا غير محددة." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP تسجل" @@ -749,7 +754,7 @@ msgstr "BP تسجل" msgid "Back" msgstr "رجوع" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "إعدادات الخلÙية" @@ -758,7 +763,7 @@ msgstr "إعدادات الخلÙية" msgid "Backend:" msgstr "الخلÙية:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "خلÙية الإدخال" @@ -772,7 +777,7 @@ msgid "Bad File Header" msgstr "سيء بداية المل٠" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "بنر" @@ -838,7 +843,7 @@ msgstr "معطلة" msgid "Browse" msgstr "أستعرض" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "لتصÙØ­ دليل لإضاÙØ©" @@ -846,7 +851,7 @@ msgstr "لتصÙØ­ دليل لإضاÙØ©" msgid "Browse for an ISO directory..." msgstr "لاستعراض الدليل ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "لاستعراض الدليل الإخراج" @@ -860,7 +865,13 @@ msgstr "العازلة :" msgid "Buttons" msgstr "أزرار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -872,7 +883,7 @@ msgstr "العصا الأيمن " msgid "C-Stick" msgstr "العصا الأيمن " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -914,7 +925,7 @@ msgstr "لا يمكن Ùتح %s" msgid "Cannot unregister events with events pending" msgstr "لا يمكن إلغاء تسجيل الأحداث مع الأحداث المعلقة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -925,7 +936,7 @@ msgstr "" "%s\n" "ليست ذاكرة جيم كيوب مل٠بطاقة صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -956,7 +967,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "الكاتالونية" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "مركز" @@ -1029,23 +1040,23 @@ msgstr "الصينية المبسطة" msgid "Chinese (Traditional)" msgstr "الصينية التقليدية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD اختيار الدليل أصل :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Choose a NAND root directory:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "اختيار ايزو الاÙتراضية :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "اختيار دليل لإضاÙØ©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "اختيار مل٠لÙتح" @@ -1053,7 +1064,7 @@ msgstr "اختيار مل٠لÙتح" msgid "Choose a memory card:" msgstr "اختيار بطاقة الذاكرة :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1119,16 +1130,16 @@ msgstr "التعليق" msgid "Comment:" msgstr "التعليق:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "اختيار ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ضغط ايزو" @@ -1155,9 +1166,9 @@ msgstr "تكوين منصات" msgid "Configure..." msgstr "إعدادات" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "تأكيد الكتابة Ùوق ملÙ" @@ -1170,7 +1181,7 @@ msgstr "تأكيد على التوقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "ربط كيبورد يو اس بي" @@ -1215,7 +1226,7 @@ msgstr "عصا تحكم" msgid "Convert to GCI" msgstr "GCIتحويل إلى " -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Ùشل نسخ" @@ -1280,11 +1291,11 @@ msgstr "" "Are you running Dolphin from a CD/DVD, or is the save file maybe write " "protected?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "لا يمكن العثور Ùتح الأوامر للتمديد 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1358,7 +1369,7 @@ msgstr "تخصيص بعض المعلمات العرض على إملائي." msgid "Czech" msgstr "التشيكية" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1370,7 +1381,7 @@ msgstr "الاسهم" msgid "DSP" msgstr "الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "محرك محاكي الصوت" @@ -1383,7 +1394,7 @@ msgstr "DSP HLE emulation (سريع)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (بطيء)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE on Thread" @@ -1395,7 +1406,7 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "إعدادات الصوت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Root:" @@ -1440,16 +1451,16 @@ msgstr "التصحيح" msgid "Decimal" msgstr "عشري" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ضغط ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "اختيار إلغاء ضغط ايزو " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ÙÙƒ ايزو" @@ -1457,7 +1468,7 @@ msgstr "ÙÙƒ ايزو" msgid "Default" msgstr "الاÙتراضي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ايزو الاÙتراضية :" @@ -1499,8 +1510,8 @@ msgstr "" msgid "Device" msgstr "أداة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "إعدادات الجهاز" @@ -1590,11 +1601,11 @@ msgstr "" msgid "Divide" msgstr "انقسام" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "هل تريد اغلق اللعبة الحالية؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1623,12 +1634,12 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin FIFO" msgstr "دولÙين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "إعدادات تحكم الجيم كيوب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1640,22 +1651,22 @@ msgstr "إعدادات تحكم الوي" msgid "Dolphin at &Google Code" msgstr "دولÙين على مدونة قوقل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "لايمكن العثور على اي لعبه جيم كيوب او وي . دبل كيك هنا لاستعراض الملÙات " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" "تم تعيين دولÙين حاليا إخÙاء جميع الألعاب. دبل كليك هنا لإظهار جميع الألعاب..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1681,7 +1692,7 @@ msgstr "الطبول" msgid "Dummy" msgstr "وهمي " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Audio" @@ -1853,10 +1864,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "BAT تمكين" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "تمكين منع الدمج" @@ -1901,7 +1908,7 @@ msgstr "MMU تمكين" msgid "Enable Progressive Scan" msgstr "تمكين المسح التقدمي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "تمكين شاشة التوقÙ" @@ -1969,13 +1976,6 @@ msgid "" "ANY other game." msgstr "تمكين هذا لتسريع أسطورة زيلدا : الشÙÙ‚ الاميرة. لتعطيل أي لعبة أخرى." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "يمكن توقعات مخصص هاك" @@ -2060,7 +2060,7 @@ msgstr "المساواة" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "خطأ" @@ -2122,7 +2122,7 @@ msgstr "تصدير تسجيل" msgid "Export Save" msgstr "تصدير Ø­Ùظ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "تصدير Ø­Ùظ الوي" @@ -2138,7 +2138,7 @@ msgstr "Ùشل تصدير، حاول مرة أخرى؟" msgid "Export save as..." msgstr "تصدير Ø­Ùظ باسم" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "تمديد" @@ -2195,7 +2195,7 @@ msgstr "استخراج دليل" msgid "Extracting..." msgstr "استخراج" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "بايت" @@ -2251,6 +2251,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "Ùشل تحميل hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Ùشل ÙÙŠ قراءة عنوان" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Ùشل ÙÙŠ قراءة banner.bin" @@ -2331,11 +2336,11 @@ msgstr "الÙارسية" msgid "Fast" msgstr "سريع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr " لا يعمل ÙÙŠ كل لعبة MMU إصدار سريع من." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2391,7 +2396,7 @@ msgstr "" msgid "Filesystem" msgstr "الملÙات" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع المل٠غير معروÙ! لن تÙتح!" @@ -2471,17 +2476,17 @@ msgstr "" msgid "Forward" msgstr "إلى الأمام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "الإطار" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "الإطار" @@ -2553,7 +2558,7 @@ msgstr "GCMic اعدادات" msgid "GCPad" msgstr "تحكم الجيم كيوب" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2594,7 +2599,7 @@ msgid "Gamecube &Pad Settings" msgstr "إعدادات تحكم جيم كيوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "بطاقه ذاكره الجيم كيوب (*.raw,*.gcp) " @@ -2704,7 +2709,7 @@ msgstr "عنوان اختباري Ùشل" msgid "Hebrew" msgstr "العبرية" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "ارتÙاع" @@ -2729,7 +2734,7 @@ msgstr "" "\n" "الوداع!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "إخÙاء" @@ -2792,11 +2797,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL إعدادات" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2812,7 +2817,7 @@ msgstr "IR حساسية:" msgid "ISO Details" msgstr "تÙاصيل ايزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "مجلد الايزو" @@ -2943,7 +2948,7 @@ msgstr "إدراج" msgid "Insert Encrypted or Decrypted code here..." msgstr "إدراج رمز المشÙرة أو ÙÙƒ Ø´Ùرة هنا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD Card ادرج " @@ -2955,7 +2960,7 @@ msgstr "أدخل اسم هنا" msgid "Install WAD" msgstr "wad تثبيت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "تثبيت إلى قائمة الوي" @@ -2964,7 +2969,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "wad تثبيت" @@ -2991,7 +2996,7 @@ msgstr "" msgid "Interface" msgstr "الواجهة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "واجهة الإعدادات" @@ -3070,7 +3075,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "غير صالح حالة" @@ -3152,7 +3157,7 @@ msgstr "الكتابة Ùوق آخر حالة" msgid "Last Saved State" msgstr "آخر حالة محÙوظة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3247,11 +3252,11 @@ msgstr "8 تحميل حالة" msgid "Load State..." msgstr "تحميل حالة" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "تحميل قائمة نظام الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "تحميل قائمة نظام الوي %d%c" @@ -3326,7 +3331,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU سرعة هاك" @@ -3361,7 +3366,7 @@ msgstr "بطاقة الذاكرة لديه بالÙعل باستثناء هذا msgid "Memcard already opened" msgstr "بطاقة الذاكرة Ùتحت بالÙعل" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "ذاكرة بايت" @@ -3376,7 +3381,7 @@ msgid "" "could mangle stuff!" msgstr "إدارة بطاقة الذاكرة تنبية قم بعمل نسخة احتياطية قبل الاستخدام" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3414,7 +3419,7 @@ msgstr "منخÙض" msgid "Misc" msgstr "متÙرقات" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "إعدادات منوعة" @@ -3439,11 +3444,11 @@ msgstr "" msgid "Monospaced font" msgstr "الخط أحادي المساÙØ©" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "موشن بلس" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "محرك" @@ -3478,11 +3483,11 @@ msgstr "" "كتم صوت الويموت بإصلاح الانقطاع العشوائي على الويموت الحقيقي. أي تأثير على " "الويموت يحتذى به." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "ملاحظة: حجم التدÙÙ‚ لا يطابق مدة البيانات الÙعلية\n" @@ -3609,7 +3614,7 @@ msgstr "اسمك :" msgid "No Country (SDK)" msgstr "لا يوجد بلد (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "لم يتم العثور على الايزو " @@ -3618,8 +3623,8 @@ msgstr "لم يتم العثور على الايزو " msgid "No banner file found for title %s" msgstr "لم يتم العثور على مل٠البنر %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "لا يوجد وص٠متاح" @@ -3627,7 +3632,7 @@ msgstr "لا يوجد وص٠متاح" msgid "No docking" msgstr "لا الالتحام" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "لا يوجد مل٠تحميل" @@ -3635,7 +3640,7 @@ msgstr "لا يوجد مل٠تحميل" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "لا مل٠مسجل" @@ -3658,7 +3663,7 @@ msgid "Not Equal" msgstr "لا يساوي" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "غير مجموعة" @@ -3666,7 +3671,7 @@ msgstr "غير مجموعة" msgid "Not connected" msgstr "غير متصل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ملاحظات" @@ -3700,7 +3705,7 @@ msgstr "ننشوك" msgid "Nunchuk Acceleration" msgstr "تسريع ننشوك" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "الهدÙ" @@ -3731,11 +3736,11 @@ msgstr "Ùقط %d كتل متاحة" msgid "Open" msgstr "Ùتح" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ùتح المجلد المتضمن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "اÙتح مجلد Ø­Ùظ الوي" @@ -3765,7 +3770,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "خيارات" @@ -3850,8 +3855,8 @@ msgstr "باتش" msgid "Paths" msgstr "مسارات" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "وقÙØ©" @@ -3875,8 +3880,8 @@ msgstr "مشهد %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "بدأ اللعبه" @@ -3902,7 +3907,7 @@ msgstr "خيارات التشغيل" msgid "Players" msgstr "لاعبين" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "يرجى تأكيد" @@ -3918,19 +3923,19 @@ msgstr "" msgid "Polish" msgstr "البولندية" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "تحكم 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "تحكم 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "تحكم 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "تحكم 4" @@ -3951,17 +3956,17 @@ msgstr "البرتغالية البرازيلية" msgid "Post-Processing Effect:" msgstr "بعد معالجة تأثير:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4060,7 +4065,7 @@ msgstr "إعادة تحميل حالة ويموت" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "تسجيل" @@ -4116,7 +4121,7 @@ msgstr "تحديث القائمة" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "إزالة" @@ -4157,7 +4162,7 @@ msgstr "اليمين" msgid "Right Stick" msgstr "العصا الايمن" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "هزاز" @@ -4237,7 +4242,7 @@ msgstr "Ø­Ùظ حالة" msgid "Save as..." msgstr "Ø­Ùظ باسم" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Ø­Ùظ مضغوط GCM/ISO" @@ -4245,11 +4250,11 @@ msgstr "Ø­Ùظ مضغوط GCM/ISO" msgid "Save current perspective" msgstr "Ø­Ùظ المنظور الحالي" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Ø­Ùظ الضغط GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4258,16 +4263,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Ùحص %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "بحث ايزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ùحص" @@ -4287,7 +4292,7 @@ msgstr "بحث" msgid "Search Filter" msgstr "بحث Ùلتر" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "البحث ÙÙŠ المجلدات الÙرعية" @@ -4311,11 +4316,11 @@ msgid "Select" msgstr "حدد" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "اختر مل٠تسجيل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "لتثبيت wad حدد ملÙ" @@ -4341,15 +4346,15 @@ msgstr "اختر النواÙØ° العائمة" msgid "Select the file to load" msgstr "حدد المل٠لتحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "حدد Ø­Ùظ الملÙ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "حدد حالة التحميل" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "حدد حالة الحÙظ" @@ -4436,7 +4441,7 @@ msgstr "المنÙØ° التسلسلي 1 -- وهذا هو المنÙØ° الذي msgid "Set" msgstr "ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "تعيين كاÙتراضي ايزو" @@ -4464,7 +4469,7 @@ msgstr "إعدادات" msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: الإعداد غير قادر على إيجاد ملÙ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "هزة" @@ -4638,7 +4643,7 @@ msgstr "" "\n" "إذا لم تكن متأكدا ترك هذا غير محددة." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "ويموت جانبي" @@ -4646,14 +4651,18 @@ msgstr "ويموت جانبي" msgid "Simplified Chinese" msgstr "الصينية المبسطة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "الحجم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "تخطي البيوس" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4695,11 +4704,11 @@ msgstr "" msgid "Slot %i" msgstr "Ùتحة %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "A خانة " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "B خانة " @@ -4722,7 +4731,7 @@ msgstr "" "انها Ù…Ùيدة Ùقط لأغراض التصحيح.\n" "هل حقا تريد تمكين تقديم البرامج؟ إذا لم تكن متأكدا، اختر 'لا'.." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "إعدادات الصوت" @@ -4801,7 +4810,7 @@ msgstr "بدء التسجيل" msgid "Start Recording" msgstr "بدء التسجيل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "الحالة" @@ -4861,12 +4870,12 @@ msgstr "بنجاح تصدير المل٠إلى %s" msgid "Successfully imported save files" msgstr "استيرادها بنجاح Ø­Ùظ الملÙات" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "هز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "نظام اللغة :" @@ -4934,13 +4943,13 @@ msgstr "عنوان غير صالح" msgid "The checksum was successfully fixed" msgstr "تم إصلاح بنجاح الاختباري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "الدليل المختار هو بالÙعل ÙÙŠ قائمة" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5027,7 +5036,7 @@ msgstr "" msgid "The value is invalid" msgstr "قيمة غير صالحة" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "ثيم:" @@ -5054,9 +5063,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "هذا يمكن أن يسبب بطء ÙÙŠ القائمة لوى وبعض الألعاب." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5089,12 +5100,12 @@ msgstr "هذا تسمح لك التعديل اليدوي رسائل كتبها msgid "Threshold" msgstr "بداية" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "إمالة" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "العنوان" @@ -5156,7 +5167,7 @@ msgstr "نوع" msgid "UDP Port:" msgstr "UDP منÙØ° :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5165,7 +5176,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "غير معروÙ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "غير معروÙ_%02X" @@ -5202,7 +5213,7 @@ msgstr "غير محدود %i" msgid "Undo Load State" msgstr "التراجع عن تحميل الحالة" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5240,11 +5251,11 @@ msgstr "أعلى" msgid "Update" msgstr "التحديث" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ويموت مستقيم" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "(PAL60) استخدم وضع " @@ -5319,7 +5330,7 @@ msgstr "Ùديو" msgid "Virtual" msgstr "الظاهري" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "الصوت" @@ -5387,7 +5398,7 @@ msgstr "" "ولها Ù†Ùس اسم المل٠على بطاقة ذاكرة الخاصة بك\n" "تستمر?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5395,7 +5406,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5403,7 +5414,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5435,7 +5446,7 @@ msgstr "الضربة" msgid "Widescreen Hack" msgstr "شاشة واسعة هاك" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "عرض" @@ -5447,7 +5458,7 @@ msgstr "الوي" msgid "Wii Console" msgstr "جهاز الوي" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Root:" @@ -5455,7 +5466,7 @@ msgstr "Wii NAND Root:" msgid "Wii Save Import" msgstr "استيراد Ø­Ùظ الوي" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "ملÙات Ø­Ùظ الوي (*.bin)|*.bin" @@ -5518,10 +5529,10 @@ msgstr "نواÙØ° اليمين" msgid "Word Wrap" msgstr "كلمة ختامية" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "العمل" @@ -5556,7 +5567,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5590,7 +5601,7 @@ msgstr "يجب إدخال صالح العشري، أو الست عشرية قي msgid "You must enter a valid profile name." msgstr "يجب إدخال اسم المل٠صالح." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "يجب إعادة تشغيل دولÙين من أجل التغيير ناÙØ° المÙعول." @@ -5681,7 +5692,7 @@ msgstr "" msgid "^ ADD" msgstr "^أض٠" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5708,7 +5719,7 @@ msgstr "iCacheJIT: قراءة Ø´Ùرة تشغيل من %x. الرجاء التق msgid "not a wii save or read failure for file header size %x" msgstr "ليس Ø­Ùظ الوي أو قراءة Ùشلة لحجم عنوان المل٠%x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5717,7 +5728,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "أمر غير معرو٠0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6003,6 +6014,9 @@ msgstr "أو" #~ msgid "Enable Audio Throttle" #~ msgstr "Enable Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "BAT تمكين" + #~ msgid "Enable CPU Access" #~ msgstr "CPU Access تمكين" diff --git a/Languages/po/ca.po b/Languages/po/ca.po index a004e7fe5f..decddde50c 100644 --- a/Languages/po/ca.po +++ b/Languages/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Jordi Coma \n" "Language-Team: Catalan \n" @@ -50,7 +50,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no és un fitxer GCM/ISO valid, o no és una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -185,11 +185,11 @@ msgstr "Gestor de &Trucs" msgid "&DSP Settings" msgstr "Configuració de &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&EliminarISOs seleccionades ..." @@ -253,7 +253,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Executar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propietats" @@ -297,11 +297,11 @@ msgstr "&Visualitza" msgid "&Wiimote Settings" msgstr "Configuració «&Wiimote»" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -321,7 +321,7 @@ msgstr "(DESCONEGUT)" msgid "(off)" msgstr "(Deshabilitat)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -362,7 +362,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -565,11 +565,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Afegeix" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Afegeix codi ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Afegeix Pegat" @@ -579,7 +579,7 @@ msgstr "Afegeix un nou panell" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Afegir ..." @@ -640,25 +640,25 @@ msgstr "Configuració avançada" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tots els arxius GC / Wii (elf, dol, gcm, iso, ciso, GCZ, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tots els fitxers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tots els Estats (savi, s##\")" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tots els fitxers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tots els fitxers ISO comprimits de GC o Wii (gcz)" @@ -669,8 +669,8 @@ msgstr "Tots els fitxers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -688,6 +688,10 @@ msgstr "Wiimote emulat" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrat anisotròpic:" @@ -704,7 +708,7 @@ msgstr "«Apploader» té una mida dolenta ...realment és un «apploader»?" msgid "Apploader unable to load from file" msgstr "«Apploader» no ha pogut carregar des de l'arxiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -731,7 +735,7 @@ msgstr "Àrab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Esteu segur que voleu suprimir \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -739,12 +743,12 @@ msgstr "" "Esteu segur que voleu eliminar aquests arxius? \n" "No es podran recuperar mai més!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relació d'aspecte:" @@ -758,7 +762,7 @@ msgstr "Almenys un panell ha de romandre obert." msgid "Audio" msgstr "Àudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Suport d'àudio:" @@ -793,11 +797,11 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desactivat." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registres" @@ -806,7 +810,7 @@ msgstr "&Registres" msgid "Back" msgstr "Tornar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configuració del Suport" @@ -815,7 +819,7 @@ msgstr "Configuració del Suport" msgid "Backend:" msgstr "Suport:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Suport d'entrada" @@ -829,7 +833,7 @@ msgid "Bad File Header" msgstr "Mala capçalera a l'arxiu" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Imatge" @@ -895,7 +899,7 @@ msgstr "Trencat" msgid "Browse" msgstr "Examinar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Examineu un directori per afegir" @@ -903,7 +907,7 @@ msgstr "Examineu un directori per afegir" msgid "Browse for an ISO directory..." msgstr "Examineu un directori ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Examineu el directori de sortida" @@ -917,7 +921,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -929,7 +939,7 @@ msgstr "Palanca-C" msgid "C-Stick" msgstr "Palanca-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -978,7 +988,7 @@ msgstr "No es pot obrir% s" msgid "Cannot unregister events with events pending" msgstr "No es pot des-registrar esdeveniments amb esdeveniments pendents" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -989,7 +999,7 @@ msgstr "" "%s\n" "No és un arxiu de targeta de memòria gamecube vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1020,7 +1030,7 @@ msgstr "Bloc Maj." msgid "Catalan" msgstr "Català" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centre" @@ -1093,23 +1103,23 @@ msgstr "Xinès (simplificat)" msgid "Chinese (Traditional)" msgstr "Xinès (tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Tria un directori arrel del DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Tria el directori arrel del NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Triar una ISO per defecte:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Trieu un directori per afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Trieu un arxiu per obrir" @@ -1117,7 +1127,7 @@ msgstr "Trieu un arxiu per obrir" msgid "Choose a memory card:" msgstr "Triar una targeta de memòria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1184,16 +1194,16 @@ msgstr "Comentari" msgid "Comment:" msgstr "Comentari:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionades ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimeix ISO" @@ -1220,9 +1230,9 @@ msgstr "Configurar Control" msgid "Configure..." msgstr "Configuració..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar contraescriptura del fitxer" @@ -1235,7 +1245,7 @@ msgstr "Confirmar a l'aturar" msgid "Connect" msgstr "Connectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Connectar el teclat USB" @@ -1280,7 +1290,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Copia fallada" @@ -1346,11 +1356,11 @@ msgstr "" "Esteu executant Dolphin des d'un CD / DVD, o l'arxiu de targeta de memòria " "està protegit contra escriptura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "No s'ha trobat la comanda d'obertura per l'extensió 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1424,7 +1434,7 @@ msgstr "Configuració d'alguns paràmetres de projecció Ortogràfica." msgid "Czech" msgstr "Txec" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1436,7 +1446,7 @@ msgstr "Direcció digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor d'emulació DSP" @@ -1449,7 +1459,7 @@ msgstr "Emulació DSP HLE (ràpid)" msgid "DSP LLE interpreter (slow)" msgstr "Intèrpret DSP LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE al fil d'execució" @@ -1461,7 +1471,7 @@ msgstr "Recompilador DSP LLE " msgid "DSP settings" msgstr "Configuració DSP " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Arrel del DVD:" @@ -1506,16 +1516,16 @@ msgstr "Depuració" msgid "Decimal" msgstr "Decimals" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionades..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimint ISO" @@ -1523,7 +1533,7 @@ msgstr "Descomprimint ISO" msgid "Default" msgstr "Per defecte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO per defecte:" @@ -1566,8 +1576,8 @@ msgstr "" msgid "Device" msgstr "Dispositiu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configuració del dispositiu" @@ -1658,11 +1668,11 @@ msgstr "" msgid "Divide" msgstr "Divideix" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Voleu aturar l'emulació actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1691,12 +1701,12 @@ msgstr "Configuració de Wiimote emulat" msgid "Dolphin FIFO" msgstr "FIFO Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuració del control GC Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin Pel·lícules TAS (*.dtm)" @@ -1708,7 +1718,7 @@ msgstr "Configuració Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin a &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1716,7 +1726,7 @@ msgstr "" "Dolphin no ha pogut trobar cap ISO GC/Wii. Feu doble clic aquí per buscar-" "les ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1724,8 +1734,8 @@ msgstr "" "Dolphin està actualment configurat per ocultar tots els jocs. Feu doble clic " "aquí per mostrar tots-los ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1751,7 +1761,7 @@ msgstr "Tambors" msgid "Dummy" msgstr "Maniquí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Bolcat d'àudio" @@ -1933,10 +1943,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar el registre de logs d'AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Habilitar les millors tècniques disponibles" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar fusió de Bloc" @@ -1981,7 +1987,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar exploració &Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Habilitar el protector de pantalla" @@ -2049,16 +2055,6 @@ msgstr "" "Activi aquesta opció per accelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar per a qualsevol altre joc." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Permet la traducció d'adreces de bloc (BAT), en funció de la Unitat de " -"Gestió de memòria. Precisa en el maquinari, però lent per emular. " -"(Activat=compatible, Desactivat = ràpid)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Activa la modificació personalitzada de projecció" @@ -2145,7 +2141,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" @@ -2210,7 +2206,7 @@ msgstr "Exportar gravació ..." msgid "Export Save" msgstr "Exportar partida desada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar partida desada Wii (Experimental)" @@ -2226,7 +2222,7 @@ msgstr "Exportació fallada, intenteu de nou?" msgid "Export save as..." msgstr "Desar exportació com a..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensió" @@ -2283,7 +2279,7 @@ msgstr "Extraient Directori" msgid "Extracting..." msgstr "Extraient ..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte FIFO" @@ -2347,6 +2343,11 @@ msgstr "No s'ha pogut carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "No s'ha pogut carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "No s'ha pogut escriure la capçalera per %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "No s'ha pogut llegir Imatge.bin" @@ -2437,11 +2438,11 @@ msgstr "" msgid "Fast" msgstr "Ràpid" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versió ràpida de la MMU. No funciona per a tots els jocs." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2497,7 +2498,7 @@ msgstr "FileIO: Mode d'obertura desconegut: 0x% 02x " msgid "Filesystem" msgstr "Sistema d'arxius" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini' Tipus de fitxer és desconegut! no s'obre!" @@ -2580,17 +2581,17 @@ msgstr "" msgid "Forward" msgstr "Endavant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Imatge" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Imatge" @@ -2664,7 +2665,7 @@ msgstr "Configuració de gràfics" msgid "GCPad" msgstr "Control GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2705,7 +2706,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configuració control «&Gamecube»" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)" @@ -2819,7 +2820,7 @@ msgstr "Comprovació de la checksum de capçalera ha fallat" msgid "Hebrew" msgstr "Hebreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Alçada" @@ -2844,7 +2845,7 @@ msgstr "" "\n" "Sayonara! \n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Oculta" @@ -2913,11 +2914,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinació dolenta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Configuració de IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2933,7 +2934,7 @@ msgstr "Sensibilitat d'IR:" msgid "ISO Details" msgstr "Detalls d'ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directoris ISO:" @@ -3070,7 +3071,7 @@ msgstr "Insereix" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inseriu el codi xifrat o desxifrat aquí ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserir la targeta SD" @@ -3082,7 +3083,7 @@ msgstr "Introduïu un nom aquí .." msgid "Install WAD" msgstr "Instal·lar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instal·lar al Menú de Wii" @@ -3093,7 +3094,7 @@ msgstr "" "InstallExceptionHandler cridat, però aquesta plataforma no està suportada " "encara." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instal·lant WAD ..." @@ -3120,7 +3121,7 @@ msgstr "" msgid "Interface" msgstr "Interfície" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Configuració d'interfície" @@ -3202,7 +3203,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estat invàlid" @@ -3285,7 +3286,7 @@ msgstr "Últim estat sobreescrit" msgid "Last Saved State" msgstr "Últim estat desat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3385,11 +3386,11 @@ msgstr "Carregar ranura d'estat 8" msgid "Load State..." msgstr "Carregar Estat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar el menú del sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar menú del sistema Wii %d%c" @@ -3467,7 +3468,7 @@ msgstr "" "desajust MD5 \n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Modificació de velocitat MMU" @@ -3502,7 +3503,7 @@ msgstr "La targeta de memòria ja té una entrada amb aquest títol." msgid "Memcard already opened" msgstr "Targeta de memòria ja oberta." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de memòria" @@ -3519,7 +3520,7 @@ msgstr "" "Targeta de memòria Administrador ADVERTÈNCIA-Feu còpies de seguretat abans " "d'usar, hauria d'estar arreglat, però pots perdre dades!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3558,7 +3559,7 @@ msgstr "Mínim" msgid "Misc" msgstr "Altres" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Altres Configuracions" @@ -3583,11 +3584,11 @@ msgstr "" msgid "Monospaced font" msgstr "Fonts d'espiat simple" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus®" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3623,11 +3624,11 @@ msgstr "" "Silencia l'altaveu del «Wiimote». Arregla desconnexions aleatòries en " "«wiimotes» reals. No afecta els «wiimotes» emulats." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3754,7 +3755,7 @@ msgstr "Sobrenom:" msgid "No Country (SDK)" msgstr "No país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "No s'han trobat ISOs o WADs" @@ -3763,8 +3764,8 @@ msgstr "No s'han trobat ISOs o WADs" msgid "No banner file found for title %s" msgstr "No s'ha trobat l'arxiu «banner» per el joc %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3772,7 +3773,7 @@ msgstr "" msgid "No docking" msgstr "No acoblament" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "No s'ha carregat cap fitxer" @@ -3780,7 +3781,7 @@ msgstr "No s'ha carregat cap fitxer" msgid "No free dir index entries" msgstr "No hi ha entrades lliures a l'índex de directoris" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Arxiu no enregistrat" @@ -3803,7 +3804,7 @@ msgid "Not Equal" msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Sense establir" @@ -3811,7 +3812,7 @@ msgstr "Sense establir" msgid "Not connected" msgstr "No està connectat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notes" @@ -3845,7 +3846,7 @@ msgstr "Nunchukâ„¢" msgid "Nunchuk Acceleration" msgstr "Acceleració del Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objecte" @@ -3876,11 +3877,11 @@ msgstr "Només queden %d blocs disponibles" msgid "Open" msgstr "Obrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Obrir directori &contingut" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Obrir la carpeta de partide&s desades" @@ -3910,7 +3911,7 @@ msgstr "Descodificador de textura OpenCL" msgid "OpenMP Texture Decoder" msgstr "Activar descodificador de textura OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcions" @@ -3995,8 +3996,8 @@ msgstr "Pegats" msgid "Paths" msgstr "Camins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" @@ -4020,8 +4021,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Executar" @@ -4047,7 +4048,7 @@ msgstr "Opcions de reproducció" msgid "Players" msgstr "Jugadors" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Confirmeu ..." @@ -4063,19 +4064,19 @@ msgstr "Més-Menys" msgid "Polish" msgstr "Polonès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4096,17 +4097,17 @@ msgstr "Portuguès (Brasil)" msgid "Post-Processing Effect:" msgstr "Efectes de post-procés:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4205,7 +4206,7 @@ msgstr "Tornar a connectar el Wiimote al carregar l'estat" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Enregistrar" @@ -4262,7 +4263,7 @@ msgstr "Actualitza la llista de jocs" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Treure" @@ -4303,7 +4304,7 @@ msgstr "Dreta" msgid "Right Stick" msgstr "Palanca dreta" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibració" @@ -4383,7 +4384,7 @@ msgstr "Desar Estat ..." msgid "Save as..." msgstr "Desar com ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Desar GCM/ISO comprimit" @@ -4391,11 +4392,11 @@ msgstr "Desar GCM/ISO comprimit" msgid "Save current perspective" msgstr "Desar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Desar GCM/ISO descomprimit" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." @@ -4404,16 +4405,16 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..." msgid "Scaled EFB Copy" msgstr "Copia EFB escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escanejant %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Cercant ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Cercant ..." @@ -4434,7 +4435,7 @@ msgstr "Cerca trucs" msgid "Search Filter" msgstr "Filtre de cerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Cercar en subcarpetes" @@ -4459,11 +4460,11 @@ msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccionar el fitxer de gravació" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleccionar un fitxer WAD de Wii per instal·lar" @@ -4488,15 +4489,15 @@ msgstr "Seleccioneu finestres flotants" msgid "Select the file to load" msgstr "Seleccioneu el fitxer a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleccioneu el fitxer de partida desada" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleccioneu l'estat a carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleccioneu l'estat a desar" @@ -4586,7 +4587,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir la imatge ISO per &defecte" @@ -4616,7 +4617,7 @@ msgstr "Configuració ..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No es troba el fitxer de configuració" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacsejar" @@ -4792,7 +4793,7 @@ msgstr "" "\n" "Si no n'esteu segurs, deixeu-ho desmarcat." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote horitzontal" @@ -4800,14 +4801,18 @@ msgstr "Wiimote horitzontal" msgid "Simplified Chinese" msgstr "Xinès simplificat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Mida" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Salta pas Dest. Alpha" @@ -4851,11 +4856,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ranura B" @@ -4880,7 +4885,7 @@ msgstr "" "Realment voleu activar el renderitzat per software? Si no n'esteu segurs, " "seleccioneu 'No'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configuració de so" @@ -4960,7 +4965,7 @@ msgstr "Iniciar grava&ció" msgid "Start Recording" msgstr "Iniciar gravació" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estat" @@ -5020,12 +5025,12 @@ msgstr "Arxiu exportat amb èxit a %s" msgid "Successfully imported save files" msgstr "Arxius de partides desades importats correctament" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Oscil·lació" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5093,13 +5098,13 @@ msgstr "L'adreça és invàlida" msgid "The checksum was successfully fixed" msgstr "La suma de comprovació s'ha fixat amb èxit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "El directori triat ja és a la llista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5190,7 +5195,7 @@ msgstr "L'arxiu especificat \"%s\" no existeix" msgid "The value is invalid" msgstr "El valor és invàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Tema visual" @@ -5224,9 +5229,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Pot causar alentiment al Menú Wii i alguns jocs." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5262,12 +5269,12 @@ msgstr "Li permetrà editar manualment el fitxer de configuració INI" msgid "Threshold" msgstr "Llindar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinació" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Títol" @@ -5331,7 +5338,7 @@ msgstr "Tipus" msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5340,7 +5347,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONEGUT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONEGUT" @@ -5377,7 +5384,7 @@ msgstr "%i Indefinit" msgid "Undo Load State" msgstr "Desfer la càrrega de l'estat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5416,11 +5423,11 @@ msgstr "Amunt" msgid "Update" msgstr "Actualitzar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilitzar mode EuRGB60 (PAL60)" @@ -5496,7 +5503,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volum" @@ -5567,7 +5574,7 @@ msgstr "" "i que tenen el mateix nom que un arxiu a la targeta de memòria\n" "Voleu continuar?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5575,7 +5582,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5583,7 +5590,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5615,7 +5622,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Modificació de pantalla panoràmica" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ample" @@ -5627,7 +5634,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Arrel de la NAND:" @@ -5635,7 +5642,7 @@ msgstr "Arrel de la NAND:" msgid "Wii Save Import" msgstr "Importar partida guardada Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Arxius de partida guardada Wii (*.bin)|*.bin" @@ -5698,10 +5705,10 @@ msgstr "Finestra dreta" msgid "Word Wrap" msgstr "Envoltant de paraula" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Treballant ..." @@ -5737,7 +5744,7 @@ msgstr "XAudio2 init ha fallat:%#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "La creació de la veu principal XAudio2 ha fallat:%#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5773,7 +5780,7 @@ msgstr "Heu d'entrar un decimal, hexadecimal o octal vàlid." msgid "You must enter a valid profile name." msgstr "Heu d'introduir un nom de perfil vàlid." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ha de reiniciar Dolphin perquè el canvi tingui efecte." @@ -5868,7 +5875,7 @@ msgstr "" msgid "^ ADD" msgstr "^ Afegir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5897,7 +5904,7 @@ msgstr "" "No és una partida guardada Wii o hi ha hagut un error de lectura de la mida " "de la capçalera del fitxer %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5906,7 +5913,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Comanda desconeguda 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute Ha retornat -1 en l'execució de l'aplicació!" @@ -6126,6 +6133,9 @@ msgstr "| O" #~ msgid "Enable Audio Throttle" #~ msgstr "Habilitar la regulació de so" +#~ msgid "Enable BAT" +#~ msgstr "Habilitar les millors tècniques disponibles" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar l'accés a CPU" @@ -6138,6 +6148,15 @@ msgstr "| O" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activar el protector de pantalla (reducció de desgast)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Permet la traducció d'adreces de bloc (BAT), en funció de la Unitat de " +#~ "Gestió de memòria. Precisa en el maquinari, però lent per emular. " +#~ "(Activat=compatible, Desactivat = ràpid)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" diff --git a/Languages/po/cs.po b/Languages/po/cs.po index 7b4eba10fa..d4f0d79f87 100644 --- a/Languages/po/cs.po +++ b/Languages/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: ZbynÄ›k Schwarz \n" "Language-Team: \n" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" je neplatný soubor GCM/ISO, nebo není GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -179,11 +179,11 @@ msgstr "Správce &Cheatů" msgid "&DSP Settings" msgstr "&DSP Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Smazat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Smazat vybraná ISO..." @@ -247,7 +247,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&PÅ™ehrát" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Vlastnosti" @@ -291,11 +291,11 @@ msgstr "&Zobrazit" msgid "&Wiimote Settings" msgstr "&Wiimote Nastavení" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -315,7 +315,7 @@ msgstr "(NEZNÃMÃ)" msgid "(off)" msgstr "(vypnuto)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -356,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -555,11 +555,11 @@ msgstr "Adaptér:" msgid "Add" msgstr "PÅ™idat" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "PÅ™idat kód ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "PÅ™idat Záplatu" @@ -569,7 +569,7 @@ msgstr "PÅ™idat nový panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "PÅ™idat..." @@ -629,24 +629,24 @@ msgstr "PokroÄilá Nastavení" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "VÅ¡echny soubory GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "VÅ¡echny obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "VÅ¡echny soubory Gamecube GCM )gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "VÅ¡echny Uložené Stavy (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "VÅ¡echny soubory Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "VÅ¡echny komprimované soubory GC/WII ISO (gcz)" @@ -655,9 +655,10 @@ msgid "All files (*.*)|*.*" msgstr "VÅ¡echny soubory (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -674,6 +675,10 @@ msgstr "Střídat Äasování Wiimote" msgid "Analyze" msgstr "Analyzovat" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotropní Filtrování:" @@ -690,7 +695,7 @@ msgstr "ZavadÄ›Ä aplikace má Å¡patnou velikost... je to vážnÄ› zavadÄ›Ä?" msgid "Apploader unable to load from file" msgstr "ZavadÄ›Ä aplikace nemohl naÄíst soubor" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "ZavadÄ›Ä aplikace:" @@ -717,7 +722,7 @@ msgstr "ArabÅ¡tina" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jste si jisti, že chcete smazat \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -725,11 +730,11 @@ msgstr "" "Jste si jisti, že chcete tyto soubory smazat?\n" "Budou navždy ztraceny!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "PomÄ›r Stran:" @@ -743,7 +748,7 @@ msgstr "Alespoň jeden panel musí být otevÅ™en." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Podpůrná vrstva zvuku:" @@ -778,11 +783,11 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registr BP" @@ -790,7 +795,7 @@ msgstr "Registr BP" msgid "Back" msgstr "ZpÄ›t" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Nastavení podpůrné vrstvy" @@ -799,7 +804,7 @@ msgstr "Nastavení podpůrné vrstvy" msgid "Backend:" msgstr "Podpůrná vrstva:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Zadní Vstup" @@ -813,7 +818,7 @@ msgid "Bad File Header" msgstr "Å patná hlaviÄka souboru" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Plakát" @@ -879,7 +884,7 @@ msgstr "Rozbité" msgid "Browse" msgstr "Procházet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procházet pro pÅ™idání adresáře" @@ -887,7 +892,7 @@ msgstr "Procházet pro pÅ™idání adresáře" msgid "Browse for an ISO directory..." msgstr "Procházet pro adresář ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procházet pro výstupní adresář" @@ -901,7 +906,13 @@ msgstr "Vyrovnávací paměť:" msgid "Buttons" msgstr "TlaÄítka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -913,7 +924,7 @@ msgstr "Kr Stick" msgid "C-Stick" msgstr "Kr-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -956,7 +967,7 @@ msgstr "Nelze otevřít %s" msgid "Cannot unregister events with events pending" msgstr "Nelze odhlásit události, když jsou oÄekávány" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -967,7 +978,7 @@ msgstr "" "%s\n" "není platný soubor paměťové karty gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -998,7 +1009,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "KatalánÅ¡tina" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "StÅ™ed" @@ -1071,23 +1082,23 @@ msgstr "ČínÅ¡tina (ZjednoduÅ¡ená)" msgid "Chinese (Traditional)" msgstr "ČínÅ¡tina (TradiÄní)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Zvolte koÅ™enový adresář DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Zvolte koÅ™enový adresář NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Zvolte výchozí ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Zvolte adresář k pÅ™idání" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Zvolte soubor k otevÅ™ení" @@ -1095,7 +1106,7 @@ msgstr "Zvolte soubor k otevÅ™ení" msgid "Choose a memory card:" msgstr "Zvolte paměťovou kartu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,16 +1172,16 @@ msgstr "Komentář" msgid "Comment:" msgstr "Komentář:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Komprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Komprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimuji ISO" @@ -1197,9 +1208,9 @@ msgstr "Nastavit Pady" msgid "Configure..." msgstr "Nastavit..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Potvrdit PÅ™epsání Souboru" @@ -1212,7 +1223,7 @@ msgstr "PÅ™i zastavení Potvrdit" msgid "Connect" msgstr "PÅ™ipojit" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "PÅ™ipojit USB Klávesnici" @@ -1257,7 +1268,7 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "PÅ™evést na GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopírování selhalo" @@ -1322,11 +1333,11 @@ msgstr "" "SpouÅ¡títe Dolphina z CD/DVD, nebo je snad soubor s uložením chránÄ›ný proti " "zápisu?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nelze najít příkaz pro otevÅ™ení přípony 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1400,7 +1411,7 @@ msgstr "PÅ™izpůsobte nÄ›které Ortografické parametry Projekce" msgid "Czech" msgstr "ÄŒeÅ¡tina" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1412,7 +1423,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Jádro Emulátoru DSP" @@ -1425,7 +1436,7 @@ msgstr "DSP HLE emulace (rychlé)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE pÅ™evadÄ›Ä (pomalé)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE ve VláknÄ›" @@ -1437,7 +1448,7 @@ msgstr "DSP LLE rekompilátor" msgid "DSP settings" msgstr "Nastavení DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "KoÅ™en DVD:" @@ -1482,16 +1493,16 @@ msgstr "LadÄ›ní" msgid "Decimal" msgstr "Desetinné" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Dekomprimovat ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Dekomprimovat vybraná ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimuji ISO" @@ -1499,7 +1510,7 @@ msgstr "Dekomprimuji ISO" msgid "Default" msgstr "Výchozí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Výchozí ISO:" @@ -1543,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "Zařízení" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Nastavení Zařízení" @@ -1634,11 +1645,11 @@ msgstr "" msgid "Divide" msgstr "RozdÄ›lit" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Chcete souÄasnou emulaci zastavit?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1667,12 +1678,12 @@ msgstr "Nastavení Emulovaného Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Nastavení" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Doplhin Filmy TAS (*.dtm)" @@ -1684,7 +1695,7 @@ msgstr "Dolphin Wiimote Nastavení" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1692,7 +1703,7 @@ msgstr "" "Dolphin nemohl nalézt žádná GX/Wii ISO. KliknÄ›te zde dvakrát k prohledání " "souborů..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1700,8 +1711,8 @@ msgstr "" "Dolphin je v souÄasnosti nastaven na skrytí vÅ¡ech her. KliknÄ›te zde dvakrát " "pro zobrazení vÅ¡ech her..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1727,7 +1738,7 @@ msgstr "Bubny" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Vypsat Zvuk" @@ -1906,10 +1917,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Povolit protokolování AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Zapnout BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Zapnout SluÄování Bloků" @@ -1954,7 +1961,7 @@ msgstr "Zapnout MMU" msgid "Enable Progressive Scan" msgstr "Povolit Progresivní Skenování" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Povolit SpoÅ™iÄ Obrazovky" @@ -2025,16 +2032,6 @@ msgstr "" "Povolte toto pro zrychlení The Legend of Zelda: Twilight Princess. Zakažte " "pro VÅ ECHNY ostatní hry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› " -"napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " -"VYPNUTO = Rychlé)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Povolit Vlastní Hack Projekce" @@ -2121,7 +2118,7 @@ msgstr "Rovná se" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Chyba" @@ -2186,7 +2183,7 @@ msgstr "Exportovat Nahrávku..." msgid "Export Save" msgstr "Exportovat Uloženou hru" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportovat uloženou hru Wii (Experimentální)" @@ -2202,7 +2199,7 @@ msgstr "Exportování selhalo, zkusit znovu?" msgid "Export save as..." msgstr "Exportovat Uloženou hru jako..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Rozšíření" @@ -2259,7 +2256,7 @@ msgstr "Extrahuji Adresář" msgid "Extracting..." msgstr "Extrahuji..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Bajt" @@ -2324,6 +2321,11 @@ msgstr "Nelze nahrát bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Nelze nahrát hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Zápis hlaviÄky selhal pro %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Nelze Äíst z banner.bin" @@ -2414,11 +2416,11 @@ msgstr "PerÅ¡tina" msgid "Fast" msgstr "Rychlá" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rychlá verze MMU. Nefunguje v každé hÅ™e." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2476,7 +2478,7 @@ msgstr "FileIO: Neznámý režim otevÅ™ení : 0x%02x" msgid "Filesystem" msgstr "Souborový systém" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Typ souboru 'ini' je neznámý! Nelze otevřít!" @@ -2558,17 +2560,17 @@ msgstr "" msgid "Forward" msgstr "DopÅ™edu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Nalezeno %d výsledků pro '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Snímek" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Snímek" @@ -2640,7 +2642,7 @@ msgstr "Nastavení GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2681,7 +2683,7 @@ msgid "Gamecube &Pad Settings" msgstr "Nastavení Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Paměťové karty Gamecube (*.raw,*.gcp)" @@ -2792,7 +2794,7 @@ msgstr "Kontrolní souÄet hlaviÄky selhal" msgid "Hebrew" msgstr "HebrejÅ¡tina" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Výška" @@ -2816,7 +2818,7 @@ msgstr "" "\n" "Sajonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Skrýt" @@ -2883,11 +2885,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Å¡patný cíl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Nastavení IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "InfrÄ." @@ -2903,7 +2905,7 @@ msgstr "Citlivost InfraÄer.:" msgid "ISO Details" msgstr "Detaily ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Adresáře ISO" @@ -3041,7 +3043,7 @@ msgstr "Vložit" msgid "Insert Encrypted or Decrypted code here..." msgstr "Zde vložte ZaÅ¡ifrovaný nebo RozÅ¡ifrovaný kód..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Vložit SD Kartu" @@ -3053,7 +3055,7 @@ msgstr "Zde vložte jméno..." msgid "Install WAD" msgstr "Instalovat WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalovat do Wii Menu" @@ -3064,7 +3066,7 @@ msgstr "" "Byl zavolán InstallExceptionHandler, ale tato platforma toto jeÅ¡tÄ› " "nepodporuje." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instaluji WAD..." @@ -3093,7 +3095,7 @@ msgstr "" msgid "Interface" msgstr "Rozhraní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Nastavení Rozhraní" @@ -3175,7 +3177,7 @@ msgstr "Neplatný Å™etÄ›zec hledání (nelze pÅ™evést na Äíslo)" msgid "Invalid search string (only even string lengths supported)" msgstr "Neplatný Å™etÄ›zec hledání (jsou podporovány pouze sudé délky Å™etÄ›zce)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Neplatný stav" @@ -3257,7 +3259,7 @@ msgstr "Poslední PÅ™epsaný Stav" msgid "Last Saved State" msgstr "Poslední Uložený Stav" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3357,11 +3359,11 @@ msgstr "Nahrát Slot Stavu 8" msgid "Load State..." msgstr "Nahrát Stav..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Nahrát Systémové Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Nahrát Systémové Menu Wii %d%c" @@ -3438,7 +3440,7 @@ msgstr "" "MD5 se neshoduje\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hack Rychlosti" @@ -3473,7 +3475,7 @@ msgstr "Pam. karta už má uložení pro tento název" msgid "Memcard already opened" msgstr "Pam. karta již otevÅ™ena" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Bajt PamÄ›ti" @@ -3490,7 +3492,7 @@ msgstr "" "Správce Paměťových karet Varování-PÅ™ed použitím zálohujte, mÄ›l by být " "spravený, ale mohl by vÄ›ci poÅ¡kodit!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3528,7 +3530,7 @@ msgstr "Min" msgid "Misc" msgstr "Ostatní" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Ostatní Nastavení" @@ -3553,11 +3555,11 @@ msgstr "" msgid "Monospaced font" msgstr "Písmo se stejnou rozteÄí" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3592,11 +3594,11 @@ msgstr "" "Ztlumí reproduktor Wiimote. Spravuje náhodná odpojování u opravdových " "Wiimote. Žádný efekt na emulovaná Wiimote." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "POZNÃMKA: Velikost proudu se neshoduje se\n" @@ -3725,7 +3727,7 @@ msgstr "PÅ™ezdívka :" msgid "No Country (SDK)" msgstr "Žádná ZemÄ› (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nenalezena žádná ISO nebo WADS" @@ -3734,8 +3736,8 @@ msgstr "Nenalezena žádná ISO nebo WADS" msgid "No banner file found for title %s" msgstr "Nebyl nalezen žádný plakát s názvem %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Žádný popis není dostupný" @@ -3743,7 +3745,7 @@ msgstr "Žádný popis není dostupný" msgid "No docking" msgstr "Žádné pÅ™ipínání" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Není naÄten žádný soubor" @@ -3751,7 +3753,7 @@ msgstr "Není naÄten žádný soubor" msgid "No free dir index entries" msgstr "Žádné volné záznamy indexu adresáře" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Žádný soubor s nahrávkou" @@ -3774,7 +3776,7 @@ msgid "Not Equal" msgstr "Nerovná se" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nenastaven" @@ -3782,7 +3784,7 @@ msgstr "Nenastaven" msgid "Not connected" msgstr "NepÅ™ipojen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Poznámky" @@ -3816,7 +3818,7 @@ msgstr "NunÄak" msgid "Nunchuk Acceleration" msgstr "Zrychlení NunÄaku" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" @@ -3847,11 +3849,11 @@ msgstr "Pouze bloky %d jsou dostupné" msgid "Open" msgstr "Otevřít" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Otevřít &adresář umístÄ›ní" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Otevřít Wii adre&sář uložení" @@ -3881,7 +3883,7 @@ msgstr "OpenCL Dekodér Textury" msgid "OpenMP Texture Decoder" msgstr "OpenMP Dekodér Textury" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Volby" @@ -3965,8 +3967,8 @@ msgstr "Záplaty" msgid "Paths" msgstr "Cesty" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pozastavit" @@ -3990,8 +3992,8 @@ msgstr "Perspektiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Spustit" @@ -4017,7 +4019,7 @@ msgstr "Možnosti PÅ™ehrávání" msgid "Players" msgstr "HráÄi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Prosím potvrÄte..." @@ -4033,19 +4035,19 @@ msgstr "Plus-Mínus" msgid "Polish" msgstr "PolÅ¡tina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4066,17 +4068,17 @@ msgstr "PortugalÅ¡tina (Brazilská)" msgid "Post-Processing Effect:" msgstr "Efekt Následného Zpracování:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PÅ™edÄasný konec filmu v PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PÅ™edÄasný konec filmu v PlayWiimote. %u > %u" @@ -4175,7 +4177,7 @@ msgstr "Znovu pÅ™ipojit Wiimote pÅ™i Nahrání Stavu" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Nahrávat" @@ -4231,7 +4233,7 @@ msgstr "Obnovit seznam her" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Odstranit" @@ -4272,7 +4274,7 @@ msgstr "Vpravo" msgid "Right Stick" msgstr "Pravý Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrace" @@ -4352,7 +4354,7 @@ msgstr "Uložit Stav..." msgid "Save as..." msgstr "Uložit jako" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Uložit komprimované GCM/ISO" @@ -4360,11 +4362,11 @@ msgstr "Uložit komprimované GCM/ISO" msgid "Save current perspective" msgstr "Uložit souÄasnou perspektivu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Uložit dekomprimované GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno..." @@ -4373,16 +4375,16 @@ msgstr "Uložený stav filmu %s je poÅ¡kozen, nahrávání filmu je zastaveno... msgid "Scaled EFB Copy" msgstr "EFB Kopie ZmÄ›nÄ›né Velikosti" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Skenuji %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Skenuji pro ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Skenuji..." @@ -4402,7 +4404,7 @@ msgstr "Hledat" msgid "Search Filter" msgstr "Hledat Filtr" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Hledat Podadresáře" @@ -4426,11 +4428,11 @@ msgid "Select" msgstr "Vybrat" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Vyberte Soubor s Nahrávkou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Vyberte soubor Wii WAD k instalování" @@ -4456,15 +4458,15 @@ msgstr "Vybrat plovoucí okna" msgid "Select the file to load" msgstr "Vyberte soubor k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Vyberte soubor s uloženou hrou" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Vyberte stav k nahrání" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Vyberte stav k uložení" @@ -4553,7 +4555,7 @@ msgstr "" msgid "Set" msgstr "Nastavit" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Nastavit jako &výchozí ISO" @@ -4581,7 +4583,7 @@ msgstr "Nastavení..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nelze najít soubor s nastavením" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "TÅ™es" @@ -4759,7 +4761,7 @@ msgstr "" "\n" "Pokud si nejste jisti, nechejte toto odÅ¡krtnuté." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Å ikmý Wiimote" @@ -4767,14 +4769,18 @@ msgstr "Å ikmý Wiimote" msgid "Simplified Chinese" msgstr "ZjednoduÅ¡ená ÄínÅ¡tina" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Velikost" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "PÅ™eskoÄit BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Vypnout Průchod Cíl. Průhl." @@ -4817,11 +4823,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4846,7 +4852,7 @@ msgstr "" "Opravdu chcete zapnout softwarové vykreslování? Pokud si nejste jisti, " "zvolte 'Ne'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Nastavení Zvuku" @@ -4925,7 +4931,7 @@ msgstr "ZaÄít na&hrávat" msgid "Start Recording" msgstr "ZaÄít Nahrávat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stav" @@ -4985,12 +4991,12 @@ msgstr "Soubor úspěšnÄ› exportován do %s" msgid "Successfully imported save files" msgstr "Uložení byly úspěšnÄ› importovány" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Å vihnutí" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Jazyk Systému:" @@ -5058,13 +5064,13 @@ msgstr "Adresa je neplatná" msgid "The checksum was successfully fixed" msgstr "Kontrolní souÄet byl úspěšnÄ› opraven" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Zvolený adresář je už v seznamu" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5153,7 +5159,7 @@ msgstr "Zadaný soubor \"%s\" neexistuje" msgid "The value is invalid" msgstr "Hodnota je neplatná" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Vzhled" @@ -5187,9 +5193,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Toto může způsobit zpomalení ve Wii Menu a v nÄ›kterých hrách." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5224,12 +5232,12 @@ msgstr "Tohle Vám umožní RuÄnÄ› Upravovat konfiguraÄní soubory INI" msgid "Threshold" msgstr "Práh" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "NaklánÄ›ní" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Název" @@ -5293,7 +5301,7 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5302,7 +5310,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "NEZNÃMÃ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "NEZNÃMÉ_%02X" @@ -5339,7 +5347,7 @@ msgstr "Nedefinován %i" msgid "Undo Load State" msgstr "Vrátit zpÄ›t Nahrání Stavu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "NeoÄekávané volání 0x80? UkonÄování..." @@ -5377,11 +5385,11 @@ msgstr "Nahoru" msgid "Update" msgstr "Aktualizovat" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Svislý Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Použít režim EuRGB60 (PAL60)" @@ -5456,7 +5464,7 @@ msgstr "Obraz" msgid "Virtual" msgstr "Virtuální" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Hlasitost" @@ -5524,7 +5532,7 @@ msgstr "" "a mají stejný název jako soubor na VaÅ¡i paměťové kartÄ›\n" "PokraÄovat?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5536,7 +5544,7 @@ msgstr "" "mÄ›li naÄíst jinou pozici, nebo tento stav naÄíst bez zapnutého režimu pouze " "pro Ätení." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5548,7 +5556,7 @@ msgstr "" "naÄíst bez zapnutého režimu pouze pro Ätení. Jinak pravdÄ›podobnÄ› dojde k " "desynchronizaci." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5594,7 +5602,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Hack Å irokoúhlého obrazu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Šířka" @@ -5606,7 +5614,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Konzole Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii KoÅ™en NAND:" @@ -5614,7 +5622,7 @@ msgstr "Wii KoÅ™en NAND:" msgid "Wii Save Import" msgstr "Import uložených pozic Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii soubory s uložením (*.bin)|*.bin" @@ -5677,10 +5685,10 @@ msgstr "Klávesa Windows Vpravo" msgid "Word Wrap" msgstr "Zalamování textu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Pracuji..." @@ -5715,7 +5723,7 @@ msgstr "XAudio2 spuÅ¡tÄ›ní selhalo: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 vytvoÅ™ení hlavního hlasu selhalo: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5753,7 +5761,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musíte zadat platné jméno profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Pro uplatnÄ›ní zmÄ›n musíte Dolphin restartovat." @@ -5848,7 +5856,7 @@ msgstr "" msgid "^ ADD" msgstr "^ PŘIDAT" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "zavadÄ›Ä aplikace (.img)" @@ -5875,7 +5883,7 @@ msgstr "iCacheJIT: PÅ™eÄten Opcode z %x. Prosím nahlaste." msgid "not a wii save or read failure for file header size %x" msgstr "není uložená hra wii nebo nelze Äíst z hlaviÄky souboru o velikosti %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5884,7 +5892,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "neznámý příkaz 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute pÅ™i bÄ›hu aplikace vrátil -1!" @@ -6116,6 +6124,9 @@ msgstr "| NEBO" #~ msgid "Enable Audio Throttle" #~ msgstr "Zapnout PÅ™iÅ¡krcení Zvuku" +#~ msgid "Enable BAT" +#~ msgstr "Zapnout BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Povolit Přístup k Procesoru" @@ -6134,6 +6145,15 @@ msgstr "| NEBO" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Povolit SpoÅ™iÄ Obrazovky (zmírnÄ›ní vypálení)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Povolit PÅ™eklad Adres Bloků (BAT); funkce Jednotky Správy PamÄ›ti. PÅ™esnÄ› " +#~ "napodobuje hardware, ale je emulován pomalu. (ZAPNUTO = Kompatibilní, " +#~ "VYPNUTO = Rychlé)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" diff --git a/Languages/po/de.po b/Languages/po/de.po index 28831cdf4a..fcc41b11d4 100644 --- a/Languages/po/de.po +++ b/Languages/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: LucasX \n" "Language-Team: \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ist ein ungültiges GC/Wii-Image, oder kein GC/Wii-Image." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -177,11 +177,11 @@ msgstr "&Cheat Manager" msgid "&DSP Settings" msgstr "&DSP Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ISO &löschen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "Ausgewählte ISOs &löschen" @@ -245,7 +245,7 @@ msgstr "Pau&se" msgid "&Play" msgstr "&Start" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Eigenschaften" @@ -289,11 +289,11 @@ msgstr "&Ansicht" msgid "&Wiimote Settings" msgstr "&Wiimote Einstellungen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -313,7 +313,7 @@ msgstr "(UNBEKANNT)" msgid "(off)" msgstr "(aus)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -552,11 +552,11 @@ msgstr "Grafikkarte:" msgid "Add" msgstr "Hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ActionReplay Code hinzufügen" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Patch hinzufügen" @@ -566,7 +566,7 @@ msgstr "Neue Palette hinzufügen" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Hinzufügen..." @@ -627,25 +627,25 @@ msgstr "Erweiterte Einstellungen" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii Dateien (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM Dateien (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Speicherstände (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Dateien (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimierten GC/Wii ISO Dateien (gcz)" @@ -656,8 +656,8 @@ msgstr "Alle Dateien (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -673,6 +673,10 @@ msgstr "Emulierte Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropische Filterung:" @@ -690,7 +694,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Kann Apploader aus dieser Datei nicht laden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -714,7 +718,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -722,12 +726,12 @@ msgstr "" "Sollen diese Dateien wirklich gelöscht werden?\n" "Löschen kann nicht rückgängig gemacht werden!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Seitenverhältnis:" @@ -741,7 +745,7 @@ msgstr "Mindestens eine Palette muss geöffnet bleiben." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -778,11 +782,11 @@ msgstr "" "Nebel Deaktivieren. Verbessert die Performance aber verursacht Fehler in " "Spielen, die richtige Nebel-Emulation benötigen." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "Register" @@ -791,7 +795,7 @@ msgstr "Register" msgid "Back" msgstr "Zurück" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Einstellungen" @@ -801,7 +805,7 @@ msgstr "Backend Einstellungen" msgid "Backend:" msgstr "Audio Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Hintergrund-Eingabe" @@ -815,7 +819,7 @@ msgid "Bad File Header" msgstr "Ungültige Header-Datei" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -881,7 +885,7 @@ msgstr "Defekt" msgid "Browse" msgstr "Durchsuchen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Ordner suchen und hinzufügen" @@ -889,7 +893,7 @@ msgstr "Ordner suchen und hinzufügen" msgid "Browse for an ISO directory..." msgstr "ISO-Verzeichnis hinzufügen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Ausgabeverzeichnis auswählen" @@ -903,7 +907,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Tasten" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -916,7 +926,7 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -955,7 +965,7 @@ msgstr "Kann %s nicht öffnen" msgid "Cannot unregister events with events pending" msgstr "Kann Ereignisse mit Ereignis-_Pending_ nicht unregistrieren." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -965,7 +975,7 @@ msgstr "" "Diese Datei kann nicht als Memorycard verwendet werden.\n" "Versuchen Sie die gleiche Datei zugleich in _both_ Slots zu verwenden?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 #, fuzzy msgid "" "Cannot use that file as a memory card.\n" @@ -997,7 +1007,7 @@ msgstr "Feststellen" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Mitte" @@ -1073,24 +1083,24 @@ msgstr "Chinesisch (Vereinfacht)" msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Wähle ein Standard DVD-Verzeichnis:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Standard ISO auswählen:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Ordner zum Hinzufügen auswählen." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Datei zum Öffnen auswählen" @@ -1098,7 +1108,7 @@ msgstr "Datei zum Öffnen auswählen" msgid "Choose a memory card:" msgstr "Wähle eine Memory Card:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1164,16 +1174,16 @@ msgstr "Kommentar" msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Ausgewählte ISOs komprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimiere ISO" @@ -1200,9 +1210,9 @@ msgstr "Pads konfigurieren" msgid "Configure..." msgstr "Konfigurieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Ãœberschreiben Bestätigen" @@ -1216,7 +1226,7 @@ msgstr "Bestätigung beim Beenden" msgid "Connect" msgstr "Verbinden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB-Keyboard anschließen" @@ -1261,7 +1271,7 @@ msgstr "Strg" msgid "Convert to GCI" msgstr "Zu GCI konvertieren" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopieren fehlgeschlagen" @@ -1328,11 +1338,11 @@ msgstr "" "Führen Sie Dolphin von einer CD/DVD aus, oder ist die Speicherdatei " "vielleicht schreibgeschützt?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Konnte denn Befehl zum öffnen der Dateierweiterung 'ini' nicht finden!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 #, fuzzy msgid "" "Couldn't init the core.\n" @@ -1405,7 +1415,7 @@ msgstr "Einige orthographische Projection Parameter anpassen." msgid "Czech" msgstr "Tschechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1417,7 +1427,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" @@ -1430,7 +1440,7 @@ msgstr "DSP HLE Emulation (schnell)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreter (langsam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE in eigenem Thread ausführen" @@ -1443,7 +1453,7 @@ msgstr "DSP LLE Recompiler" msgid "DSP settings" msgstr "DSP Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Laufwerk:" @@ -1489,16 +1499,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Dezimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Ausgewählte ISOs dekomprimieren..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimiere ISO" @@ -1506,7 +1516,7 @@ msgstr "Dekomprimiere ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standard ISO:" @@ -1549,8 +1559,8 @@ msgstr "" msgid "Device" msgstr "Gerät" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Geräteeinstellungen" @@ -1627,11 +1637,11 @@ msgstr "" msgid "Divide" msgstr "Dividieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Laufende Emulation stoppen?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1661,12 +1671,12 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Konfiguration" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filme (*.dtm)" @@ -1678,7 +1688,7 @@ msgstr "Dolphin Wiimote Einstellungen" msgid "Dolphin at &Google Code" msgstr "Dolphin auf &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1686,7 +1696,7 @@ msgstr "" "Dolphin konnte keine GC oder Wii ISOs finden. Hier doppelklicken um nach " "ISOs zu suchen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1694,8 +1704,8 @@ msgstr "" "Dolphin ist so eingestellt, dass alle Spiele versteckt werden. Hier " "doppelklicken um alle Spiele anzuzeigen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1721,7 +1731,7 @@ msgstr "Trommeln" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Audio dumpen" @@ -1877,10 +1887,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR Logging aktivieren" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "BAT aktivieren" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blockvereinigung aktivieren" @@ -1926,7 +1932,7 @@ msgstr "MMU aktivieren" msgid "Enable Progressive Scan" msgstr "Vollbildverfahren aktivieren" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Breitbildmodus" @@ -1987,16 +1993,6 @@ msgstr "" "Dies aktivieren, um \"The Legend of Zelda: Twilight Princess\" zu " "beschleunigen. Dies für JEDES andere Spiel deaktivieren." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Ermöglicht Ãœbersetzung von Blockadressen (BAT), eine Funktion der " -"Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " -"Emulieren. (ON = Kompatibel, OFF = Schnell)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Benutzerdefinierten Projection-Hack aktivieren" @@ -2076,7 +2072,7 @@ msgstr "Gleich" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Fehler" @@ -2142,7 +2138,7 @@ msgstr "Aufnahme exportieren..." msgid "Export Save" msgstr "Spielstand exportieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii Spielstand exportieren (Experimentell)..." @@ -2158,7 +2154,7 @@ msgstr "Exportieren fehlgeschlagen, ein weiteres mal versuchen?" msgid "Export save as..." msgstr "Spielstand exportieren als..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Erweiterung" @@ -2216,7 +2212,7 @@ msgstr "Ordner extrahieren" msgid "Extracting..." msgstr "Extrahieren..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2275,6 +2271,11 @@ msgstr "Fehler beim Laden von hid.dll" msgid "Failed to load hid.dll" msgstr "Fehler beim Laden von hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fehler beim Schreiben eines Header für %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Fehler beim Lesen von banner.bin" @@ -2365,11 +2366,11 @@ msgstr "" msgid "Fast" msgstr "Schnell" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Schnellere Version der MMU. Funktioniert nicht mit allen Spielen." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2427,7 +2428,7 @@ msgstr "FileIO: Unbekanter Open-Modus : 0x%02x" msgid "Filesystem" msgstr "Dateisystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Der Datentyp 'ini' ist unbekannt! Wird nicht geöffnet!" @@ -2508,18 +2509,18 @@ msgstr "" msgid "Forward" msgstr "Vorwärts" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "Nächster Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "Einzelbildwiedergabe" @@ -2597,7 +2598,7 @@ msgstr "Tastenkürzel Einstellungen" msgid "GCPad" msgstr "GC-Pad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2639,7 +2640,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube-&Pad Einstellungen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Cards (*.raw,*.gcp)" @@ -2746,7 +2747,7 @@ msgstr "Header-Prüfsumme fehlerhaft" msgid "Hebrew" msgstr "Hebräisch" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Höhe" @@ -2771,7 +2772,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Verbergen" @@ -2840,11 +2841,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Fehlerhafte Beschreibung" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Einstellungen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2860,7 +2861,7 @@ msgstr "IR-Empfindlichkeit" msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO Verzeichnisse" @@ -2987,7 +2988,7 @@ msgstr "Einfügen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Verschlüsselten oder unverschlüsselten Code hier eingeben..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD-Karte einlegen" @@ -3000,7 +3001,7 @@ msgstr "Namen hier eingeben.." msgid "Install WAD" msgstr "Wii-Menü installieren" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Zum Wii-Menü hinzufügen" @@ -3011,7 +3012,7 @@ msgstr "" "InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn " "noch nicht." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "WAD ins Wii-Menü installieren..." @@ -3040,7 +3041,7 @@ msgstr "" msgid "Interface" msgstr "Interface Einstellungen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Interface Einstellungen" @@ -3124,7 +3125,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ungültiger Status" @@ -3206,7 +3207,7 @@ msgstr "Letzter überschriebener Status" msgid "Last Saved State" msgstr "Letzter gespeicherter Status" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3307,12 +3308,12 @@ msgstr "Status aus Slot 8 laden" msgid "Load State..." msgstr "Status laden..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Wii-Menü laden (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii-Menü laden (%d %c)" @@ -3387,7 +3388,7 @@ msgstr "" "MD5 Konflikt\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3422,7 +3423,7 @@ msgstr "Memorycard hat bereits eine Spielstand für diesen Tittel" msgid "Memcard already opened" msgstr "Memorycard ist bereits geöffnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "Speicher" @@ -3440,7 +3441,7 @@ msgstr "" "Memory-Card Manager WARNUNG - Erstelle Backups bevor der Benutzung. Dies " "sollte zwar gefixt sein, aber könnte dennoch Probleme machen (mangle stuff)!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3479,7 +3480,7 @@ msgstr "Mikrofon" msgid "Misc" msgstr "Sonstiges" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Sonstige Einstellungen" @@ -3500,11 +3501,11 @@ msgstr "" msgid "Monospaced font" msgstr "Monospaced Schriftart" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3530,11 +3531,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3662,7 +3663,7 @@ msgstr "Nickname:" msgid "No Country (SDK)" msgstr "Kein Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Keine ISOs oder WADs gefunden" @@ -3671,8 +3672,8 @@ msgstr "Keine ISOs oder WADs gefunden" msgid "No banner file found for title %s" msgstr "Keine Banner-Datei für Tittel %s gefunden." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3680,7 +3681,7 @@ msgstr "" msgid "No docking" msgstr "Nicht Andocken" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3688,7 +3689,7 @@ msgstr "" msgid "No free dir index entries" msgstr "Keine freien Verzeichnis-Indexeinträge." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "Ungültige Aufnahmedatei" @@ -3712,7 +3713,7 @@ msgid "Not Equal" msgstr "Ungleich" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nicht Festgelegt" @@ -3720,7 +3721,7 @@ msgstr "Nicht Festgelegt" msgid "Not connected" msgstr "Nicht Verbunden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notizen" @@ -3754,7 +3755,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuck Beschleunigung" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3785,11 +3786,11 @@ msgstr "Nur %d Blöcke verfügbar" msgid "Open" msgstr "Öffnen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Beinhaltenden &Ordner öffnen..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "&Wii Spielstand-Ordner öffnen..." @@ -3819,7 +3820,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Optionen" @@ -3905,8 +3906,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pfade" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" @@ -3931,8 +3932,8 @@ msgstr "Perspektive %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Start" @@ -3959,7 +3960,7 @@ msgstr "Optionen" msgid "Players" msgstr "Spieler" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Bitte Bestätigen..." @@ -3975,19 +3976,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "Polnisch" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4009,17 +4010,17 @@ msgstr "Portugiesisch (Brasilianisch)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4120,7 +4121,7 @@ msgstr "Wiimote wiederverbinden, beim laden eines State" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Aufnahme abspielen" @@ -4178,7 +4179,7 @@ msgstr "Spieleliste aktualisieren" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Entfernen" @@ -4219,7 +4220,7 @@ msgstr "Rechts" msgid "Right Stick" msgstr "Stick rechts" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4299,7 +4300,7 @@ msgstr "Status speichern..." msgid "Save as..." msgstr "Speichern unter..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Komprimierte GCM/ISO speichern" @@ -4307,11 +4308,11 @@ msgstr "Komprimierte GCM/ISO speichern" msgid "Save current perspective" msgstr "Aktuelle Perspektive speichern" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Dekomprimierte GCM/ISO speichern" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." @@ -4321,16 +4322,16 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..." msgid "Scaled EFB Copy" msgstr "EFB Scaled Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Suche..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Suche nach ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Suche..." @@ -4350,7 +4351,7 @@ msgstr "Suche" msgid "Search Filter" msgstr "Suchfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Unterordner durchsuchen" @@ -4375,11 +4376,11 @@ msgid "Select" msgstr "Auswählen" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Aufnahmedatei auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Speicherdatei zum Importieren auswählen" @@ -4406,15 +4407,15 @@ msgstr "Wähle unverankerte Fenster" msgid "Select the file to load" msgstr "Datei zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Wii-Spielstand auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Status zum Laden auswählen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Status zum Speichern auswählen" @@ -4491,7 +4492,7 @@ msgstr "" msgid "Set" msgstr "Zuweisen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Als &Standard-ISO festlegen" @@ -4520,7 +4521,7 @@ msgstr "Einstellungen..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kann die Einstellungsdatei nicht finden" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Schütteln" @@ -4696,7 +4697,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 #, fuzzy msgid "Sideways Wiimote" msgstr "_Seitwärts_ Wiimote" @@ -4705,15 +4706,19 @@ msgstr "_Seitwärts_ Wiimote" msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Größe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "GC-BIOS überspringen" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" @@ -4747,11 +4752,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4771,7 +4776,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Sound Einstelungen" @@ -4842,7 +4847,7 @@ msgstr "&Aufnahme starten" msgid "Start Recording" msgstr "Aufnahme starten" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Status" @@ -4897,12 +4902,12 @@ msgstr "Die Datei wurde erfolgreich nach %s exportiert" msgid "Successfully imported save files" msgstr "Die gespeicherte Datei wurde erfolgreich importiert" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Schwenken" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Systemsprache:" @@ -4973,13 +4978,13 @@ msgstr "Die Adresse ist ungültig" msgid "The checksum was successfully fixed" msgstr "Die Prüfsumme wurde erfolgreich korrigiert" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Der ausgewählte Ordner befindet sich bereits in der Liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5069,7 +5074,7 @@ msgstr "Die ausgewählte Datei \"%s\" existiert nicht" msgid "The value is invalid" msgstr "Dieser Wert ist ungültig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Theme" @@ -5106,7 +5111,8 @@ msgstr "Dies könnte zu Verlangsamung im Wii-Menü und einigen Spielen führen." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5136,12 +5142,12 @@ msgstr "Erlaubt manuelles editieren der INI Konfigurationsdatei" msgid "Threshold" msgstr "Schwelle" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Neigung" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titel" @@ -5207,7 +5213,7 @@ msgstr "Typ" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5216,7 +5222,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UNBEKANNT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UNBEKANNT" @@ -5248,7 +5254,7 @@ msgstr "Undefiniert %i" msgid "Undo Load State" msgstr "Status laden rückgängig machen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5287,11 +5293,11 @@ msgstr "Hoch" msgid "Update" msgstr "Update" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modus (PAL60) verwenden" @@ -5357,7 +5363,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Lautstärke" @@ -5422,7 +5428,7 @@ msgstr "" "und hat den gleichen Namen wie die Datei auf Ihrer Memory-Card\n" "Fortfahren?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5430,7 +5436,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5438,7 +5444,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5470,7 +5476,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "Breitbild Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Weite" @@ -5482,7 +5488,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Konsole" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD Laufwerk:" @@ -5491,7 +5497,7 @@ msgstr "DVD Laufwerk:" msgid "Wii Save Import" msgstr "Wii Spielstand importieren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii Speicherdateien (*.bin)|*.bin" @@ -5555,10 +5561,10 @@ msgstr "Windows Rechts" msgid "Word Wrap" msgstr "Zeilenumbruch" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Arbeite..." @@ -5595,7 +5601,7 @@ msgstr "XAudio2 _init_ fehlgeschlagen: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 _Master-Stimmenerstellung_ fehlgeschlagen: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5630,7 +5636,7 @@ msgstr "Sie müssen eine gültige Dezimalzahl oder gültigen Hex-Wert eingeben!" msgid "You must enter a valid profile name." msgstr "Sie müssen einen gültigen Profilamen eingeben!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Sie müssen Dolphin neu starten, damit die Änderungen wirksam werden." @@ -5705,7 +5711,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HINZUF." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "Apploader (.img)" @@ -5732,7 +5738,7 @@ msgstr "iCacheJIT: Lesen des Opcode aus %x. Bitte berichten." msgid "not a wii save or read failure for file header size %x" msgstr "Dies ist kein Wii-Spielstand oder Lesefehler in Datei-Header-Größe %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5741,7 +5747,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "Unbekanter CMD 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute meldet -1 beim Start der Anwendung!" @@ -6061,6 +6067,9 @@ msgstr "| ODER" #~ msgid "Enable Audio Throttle" #~ msgstr "Audio-Throttle aktivieren" +#~ msgid "Enable BAT" +#~ msgstr "BAT aktivieren" + #~ msgid "Enable CPU Access" #~ msgstr "CPU-Zugriff aktivieren" @@ -6085,6 +6094,15 @@ msgstr "| ODER" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Bildschirmschoner erlauben" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ermöglicht Ãœbersetzung von Blockadressen (BAT), eine Funktion der " +#~ "Speicherverwaltungs-Einheit. Präzise für die Hardware, aber langsamer zu " +#~ "Emulieren. (ON = Kompatibel, OFF = Schnell)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/dolphin-emu.pot b/Languages/po/dolphin-emu.pot index b94a5f384c..fb0fc614f4 100644 --- a/Languages/po/dolphin-emu.pot +++ b/Languages/po/dolphin-emu.pot @@ -1,14 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translation of dolphin-emu.pot to LANGUAGE +# Copyright (C) 2003-2013 +# This file is distributed under the same license as the dolphin-emu package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Dolphin Emu\n" +"Project-Id-Version: Dolphin Emulator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,7 +43,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -166,11 +166,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" @@ -234,7 +234,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" @@ -278,11 +278,11 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -343,7 +343,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -506,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -520,7 +520,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" @@ -566,24 +566,24 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -593,8 +593,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -607,6 +607,10 @@ msgstr "" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" @@ -623,7 +627,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" @@ -647,17 +651,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,7 +675,7 @@ msgstr "" msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -703,11 +707,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -715,7 +719,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" @@ -724,7 +728,7 @@ msgstr "" msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -738,7 +742,7 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" @@ -804,7 +808,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" @@ -812,7 +816,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" @@ -826,7 +830,13 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -838,7 +848,7 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -875,7 +885,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -883,7 +893,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -912,7 +922,7 @@ msgstr "" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" @@ -983,23 +993,23 @@ msgstr "" msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1007,7 +1017,7 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1070,16 +1080,16 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" @@ -1106,9 +1116,9 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" @@ -1121,7 +1131,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" @@ -1166,7 +1176,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" @@ -1222,11 +1232,11 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1295,7 +1305,7 @@ msgstr "" msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1307,7 +1317,7 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" @@ -1320,7 +1330,7 @@ msgstr "" msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" @@ -1332,7 +1342,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1377,16 +1387,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" @@ -1394,7 +1404,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1436,8 +1446,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1511,11 +1521,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1544,12 +1554,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1561,20 +1571,20 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1600,7 +1610,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" @@ -1750,10 +1760,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" @@ -1798,7 +1804,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" @@ -1851,13 +1857,6 @@ msgid "" "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" @@ -1935,7 +1934,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" @@ -1995,7 +1994,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" @@ -2011,7 +2010,7 @@ msgstr "" msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" @@ -2068,7 +2067,7 @@ msgstr "" msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2124,6 +2123,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2201,11 +2205,11 @@ msgstr "" msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2257,7 +2261,7 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2326,17 +2330,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" @@ -2408,7 +2412,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2449,7 +2453,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2552,7 +2556,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2570,7 +2574,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" @@ -2630,11 +2634,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" @@ -2650,7 +2654,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2763,7 +2767,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2775,7 +2779,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2784,7 +2788,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" @@ -2811,7 +2815,7 @@ msgstr "" msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" @@ -2888,7 +2892,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" @@ -2967,7 +2971,7 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3060,11 +3064,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3132,7 +3136,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" @@ -3167,7 +3171,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" @@ -3182,7 +3186,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3214,7 +3218,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3235,11 +3239,11 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3265,11 +3269,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3396,7 +3400,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3405,8 +3409,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3414,7 +3418,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3422,7 +3426,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3445,7 +3449,7 @@ msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" @@ -3453,7 +3457,7 @@ msgstr "" msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" @@ -3487,7 +3491,7 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3518,11 +3522,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" @@ -3552,7 +3556,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3632,8 +3636,8 @@ msgstr "" msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" @@ -3657,8 +3661,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" @@ -3684,7 +3688,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3700,19 +3704,19 @@ msgstr "" msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" @@ -3733,17 +3737,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3842,7 +3846,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" @@ -3893,7 +3897,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" @@ -3931,7 +3935,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4011,7 +4015,7 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" @@ -4019,11 +4023,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4032,16 +4036,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" @@ -4061,7 +4065,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" @@ -4085,11 +4089,11 @@ msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" @@ -4112,15 +4116,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" @@ -4188,7 +4192,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" @@ -4216,7 +4220,7 @@ msgstr "" msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" @@ -4381,7 +4385,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" @@ -4389,14 +4393,18 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4429,11 +4437,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4453,7 +4461,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" @@ -4524,7 +4532,7 @@ msgstr "" msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" @@ -4579,12 +4587,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4652,13 +4660,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4737,7 +4745,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "" @@ -4766,7 +4774,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4791,12 +4800,12 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" @@ -4858,7 +4867,7 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4867,7 +4876,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4899,7 +4908,7 @@ msgstr "" msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -4937,11 +4946,11 @@ msgstr "" msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5006,7 +5015,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5063,7 +5072,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5071,7 +5080,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5079,7 +5088,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5111,7 +5120,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" @@ -5123,7 +5132,7 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" @@ -5131,7 +5140,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5190,10 +5199,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" @@ -5228,7 +5237,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5262,7 +5271,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5334,7 +5343,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5361,7 +5370,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5370,7 +5379,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/el.po b/Languages/po/el.po index 782563be9f..c8a0daac37 100644 --- a/Languages/po/el.po +++ b/Languages/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:39-0600\n" "Last-Translator: Linktothepast \n" "Language-Team: Gpower2 \n" @@ -47,7 +47,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "Το \"%s\" είναι ένα μη έγκυÏο αÏχείο GCM/ISO, ή δεν είναι ένα ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -183,11 +183,11 @@ msgstr "&ΔιαχειÏιστής Cheat" msgid "&DSP Settings" msgstr "&Ρυθμίσεις DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&ΔιαγÏαφή ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&ΔιαγÏαφή επιλεγμένων ISO..." @@ -251,7 +251,7 @@ msgstr "&ΠαÏση" msgid "&Play" msgstr "&ΑναπαÏαγωγή" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Ιδιότητες" @@ -295,11 +295,11 @@ msgstr "&ΠÏοβολή" msgid "&Wiimote Settings" msgstr "&Ρυθμίσεις Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -319,7 +319,7 @@ msgstr "(ΑΓÎΩΣΤΟ)" msgid "(off)" msgstr "(ανενεÏγό)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -360,7 +360,7 @@ msgstr "<Πατήστε ΠλήκτÏο>" msgid "" msgstr "<Συστήματος>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -561,11 +561,11 @@ msgstr "ΠÏοσαÏμογέας:" msgid "Add" msgstr "ΠÏοσθήκη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ΠÏοσθήκη ÎšÏ‰Î´Î¹ÎºÎ¿Ï ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "ΠÏοσθήκη Patch" @@ -575,7 +575,7 @@ msgstr "ΠÏοσθήκη νέου pane" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "ΠÏοσθήκη..." @@ -623,24 +623,24 @@ msgstr "Ρυθμίσεις για ΠÏοχωÏημένους" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Όλα τα αÏχεία GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Όλες οι εικόνες GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Όλα τα αÏχεία Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Όλα τα Σημεία Αποθήκευσης(sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Όλα τα αÏχεία Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Όλα τα συμπιεσμένα αÏχεία GC/Wii ISO (gcz)" @@ -649,9 +649,10 @@ msgid "All files (*.*)|*.*" msgstr "Όλα τα αÏχεία (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -668,6 +669,10 @@ msgstr "Εναλλακτικός ΧÏονισμός Wiimote" msgid "Analyze" msgstr "Ανάλυση" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ΑνισοτÏοπικό ΦιλτÏάÏισμα:" @@ -684,7 +689,7 @@ msgstr "Ο Apploader έχει λάθος μέγεθος... είναι Ï€Ïάγμ msgid "Apploader unable to load from file" msgstr "Ο Apploader απέτυχε να φοÏτωθεί από αÏχείο" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -711,7 +716,7 @@ msgstr "ΑÏαβικά" msgid "Are you sure you want to delete \"%s\"?" msgstr "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε το \"%s\";" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -719,13 +724,13 @@ msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτά τα αÏχεία;\n" "Θα εξαφανιστοÏν για πάντα!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Είστε σίγουÏοι ότι θέλετε να διαγÏάψετε αυτό το αÏχείο; Θα εξαφανιστεί για " "πάντα!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Αναλογία Οθόνης:" @@ -739,7 +744,7 @@ msgstr "Τουλάχιστον ένα pane Ï€Ïέπει να μένει ανοι msgid "Audio" msgstr "Ήχος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Backend Ήχου:" @@ -775,11 +780,11 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP ΚαταχωÏητές" @@ -787,7 +792,7 @@ msgstr "BP ΚαταχωÏητές" msgid "Back" msgstr "Πίσω" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Ρυθμίσεις" @@ -796,7 +801,7 @@ msgstr "Backend Ρυθμίσεις" msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ΧειÏισμός με Ανεστίαστο ΠαÏαθ." @@ -810,7 +815,7 @@ msgid "Bad File Header" msgstr "Μη ΈγκυÏη Κεφαλίδα ΑÏχείου" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Εικονίδιο" @@ -876,7 +881,7 @@ msgstr "Χαλασμένο" msgid "Browse" msgstr "ΕÏÏεση" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" @@ -884,7 +889,7 @@ msgstr "ΕÏÏεση φακέλου για Ï€Ïοσθήκη" msgid "Browse for an ISO directory..." msgstr "ΕÏÏεση φακέλου ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "ΕÏÏεση φακέλου Ï€ÏοοÏισμοÏ" @@ -898,7 +903,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Κουμπιά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -910,7 +921,7 @@ msgstr "Stick ΚάμεÏας " msgid "C-Stick" msgstr "Stick ΚάμεÏας" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -954,7 +965,7 @@ msgid "Cannot unregister events with events pending" msgstr "" "Δεν μποÏεί να γίνει κατάÏγηση καταχώÏησης συμβάντων όταν οÏισμένα εκκÏεμοÏν." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -965,7 +976,7 @@ msgstr "" "%s\n" "δεν είναι έγκυÏο αÏχείο κάÏτας μνήμης gamecube" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,7 +1007,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Καταλανικά" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "ΚέντÏο" @@ -1069,23 +1080,23 @@ msgstr "Κινέζικα (Απλοποιημένα)" msgid "Chinese (Traditional)" msgstr "Κινέζικα (ΠαÏαδοσιακά)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Επιλέξτε έναν φάκελο Ïίζας NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Επιλέξτε ένα Ï€Ïοεπιλεγμένο ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Επιλέξτε έναν φάκελο για Ï€Ïοσθήκη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" @@ -1093,7 +1104,7 @@ msgstr "Επιλέξτε ένα αÏχείο για άνοιγμα" msgid "Choose a memory card:" msgstr "Επιλέξτε μια κάÏτα μνήμης:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1160,16 +1171,16 @@ msgstr "Σχόλιο" msgid "Comment:" msgstr "Σχόλιο:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Συμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Συμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Συμπίεση ISO" @@ -1196,9 +1207,9 @@ msgstr "Ρυθμίσεις ΧειÏιστηÏίων" msgid "Configure..." msgstr "Γενικές Ρυθμίσεις..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Επιβεβαίωση Αντικατάστασης ΑÏχείου" @@ -1211,7 +1222,7 @@ msgstr "Επιβεβαίωση Διακοπής" msgid "Connect" msgstr "ΣÏνδεση" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "ΣÏνδεση ΠληκτÏολογίου USB" @@ -1256,7 +1267,7 @@ msgstr "ΧειÏιστήÏιο" msgid "Convert to GCI" msgstr "ΜετατÏοπή σε GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Η αντιγÏαφή απέτυχε" @@ -1324,11 +1335,11 @@ msgstr "" "Μήπως εκτελείτε το Dolphin από CD/DVD, ή το αποθηκευόμενο αÏχείο έχει " "Ï€Ïοστασία εγγÏαφής;" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Αδυναμία εÏÏεσης εντολής ανοίγματος για την επέκταση 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1402,7 +1413,7 @@ msgstr "" msgid "Czech" msgstr "Τσέχικα" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1414,7 +1425,7 @@ msgstr "Ψηφιακό Pad" msgid "DSP" msgstr "Ήχος (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Μηχανή Εξομοίωσης DSP" @@ -1427,7 +1438,7 @@ msgstr "DSP HLE εξομοίωση (γÏήγοÏη)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (αÏγή)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE σε ΞεχωÏιστό Îήμα" @@ -1439,7 +1450,7 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Ρυθμίσεις ήχου (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Ρίζα DVD:" @@ -1485,16 +1496,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Δεκαδικός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Αποσυμπίεση ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Αποσυμπίεση επιλεγμένων ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Γίνεται αποσυμπίεση ISO" @@ -1502,7 +1513,7 @@ msgstr "Γίνεται αποσυμπίεση ISO" msgid "Default" msgstr "ΠÏοεπιλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ΠÏοεπιλεγμένο ISO:" @@ -1546,8 +1557,8 @@ msgstr "" msgid "Device" msgstr "Συσκευή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Ρυθμίσεις Συσκευής" @@ -1637,11 +1648,11 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Θέλετε να σταματήσετε την Ï„Ïέχουσα εξομοίωση;" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1670,12 +1681,12 @@ msgstr "Ρυθμίσεις Εξοιμοιωμένου Dolphin Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Ρυθμίσεις Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Ταινίες (*.dtm)" @@ -1687,7 +1698,7 @@ msgstr "Ρυθμίσεις Dolphin Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin στο &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1695,7 +1706,7 @@ msgstr "" "Το Dolphin δεν μπόÏεσε να βÏει GC/Wii ISO. Κάντε διπλό κλίκ εδώ για εÏÏεση " "αÏχείων..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1703,8 +1714,8 @@ msgstr "" "Το Dolphin είναι Ïυθμισμένο να αποκÏÏπτει όλα τα παιχνίδια. Κάντε διπλό κλίκ " "εδώ για να εμφανιστοÏν όλα τα παιχνίδια..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1730,7 +1741,7 @@ msgstr "ΤÏμπανα" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Εξαγωγή Ήχου" @@ -1913,10 +1924,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "ΕνεÏγοποίηση ΚαταγÏαφής AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "ΕνεÏγοποίηση BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ΕνεÏγοποίηση Block Merging" @@ -1961,7 +1968,7 @@ msgstr "ΕνεÏγοποίηση MMU" msgid "Enable Progressive Scan" msgstr "ΕνεÏγοποίηση ΠÏοοδευτικής ΣάÏωσης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "ΕνεÏγοποίηση ΠÏοφÏλαξης Οθόνης" @@ -2033,16 +2040,6 @@ msgstr "" "ΕνεÏγοποιήστε το για να επιταχÏνετε το The Legend of Zelda: Twilight " "Princess. ΑπενεÏγοποιήστε το για τα υπόλοιπα παιχνίδια." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της Μονάδας " -"ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην εξομοίωση. " -"(ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ΕνεÏγοποιεί το ΠÏοσαÏμοζόμενο Projection Hack" @@ -2129,7 +2126,7 @@ msgstr "Ίσο" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Σφάλμα" @@ -2197,7 +2194,7 @@ msgstr "Εξαγωγή ΕγγÏαφής..." msgid "Export Save" msgstr "Εξαγωγή Αποθήκευσης" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Εξαγωγή Αποθήκευσης Wii (ΠειÏαματικό)" @@ -2213,7 +2210,7 @@ msgstr "Αποτυχία εξαγωγής, Ï€Ïοσπάθεια ξανά;" msgid "Export save as..." msgstr "Εξαγωγή αποθήκευσης ως..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Επέκταση" @@ -2270,7 +2267,7 @@ msgstr "Γίνεται εξαγωγή φακέλου" msgid "Extracting..." msgstr "Γίνεται εξαγωγή..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" @@ -2336,6 +2333,11 @@ msgstr "Αποτυχία φόÏτωσης bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Αποτυχία φόÏτωσης hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Αποτυχία εγγÏαφής της κεφαλίδας για το %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Αποτυχία ανάγνωσης banner.bin" @@ -2426,11 +2428,11 @@ msgstr "ΠεÏσικά" msgid "Fast" msgstr "ΓÏήγοÏη" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "ΓÏήγοÏη έκδοση του MMU. Δε δουλεÏει για όλα τα παιχνίδια." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2488,7 +2490,7 @@ msgstr "FileIO: Άγνωστη λειτουÏγία ανοίγματος : 0x%02 msgid "Filesystem" msgstr "ΑÏχεία δίσκου" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Ο Ï„Ïπος αÏχείου 'ini' είναι άγνωστος! Δε θα γίνει άνοιγμα!" @@ -2572,17 +2574,17 @@ msgstr "" msgid "Forward" msgstr "ΜπÏοστά" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Î’Ïέθηκαν %d αποτελέσματα για '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "ΚαÏέ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "ΚαÏέ" @@ -2654,7 +2656,7 @@ msgstr "Ρυθμίσεις ΜικÏοφώνου GC" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2695,7 +2697,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ρυθμίσεις Gamecube &Pad" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "ΚάÏτες Μνήμης Gamecube (*.raw,*.gcp)" @@ -2811,7 +2813,7 @@ msgstr "Αποτυχία ελέγχου κεφαλίδας" msgid "Hebrew" msgstr "ΕβÏαϊκά" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Ύψος" @@ -2835,7 +2837,7 @@ msgstr "" "\n" "Αντίο!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "ΑπόκÏυψη" @@ -2905,11 +2907,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - μη έγκυÏος Ï€ÏοοÏισμός" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Ρυθμίσεις IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2925,7 +2927,7 @@ msgstr "Ευαισθησία IR:" msgid "ISO Details" msgstr "ΛεπτομέÏειες ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Φάκελοι ISO" @@ -3065,7 +3067,7 @@ msgstr "Εισάγετε" msgid "Insert Encrypted or Decrypted code here..." msgstr "Εισάγετε Κωδικοποιημένο ή μη Κωδικό εδώ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Εισαγωγή ΚάÏτας SD" @@ -3077,7 +3079,7 @@ msgstr "Εισάγετε όνομα εδώ..." msgid "Install WAD" msgstr "Εγκατάσταση WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Εγκατάσταση στο ÎœÎµÎ½Î¿Ï Wii" @@ -3088,7 +3090,7 @@ msgstr "" "InstallExceptionHandler καλέστηκε, αλλά αυτή η πλατφόÏμα δεν το υποστηÏίζει " "ακόμα." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Γίνεται εγκατάσταση WAD..." @@ -3117,7 +3119,7 @@ msgstr "" msgid "Interface" msgstr "Διεπαφή" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Ρυθμίσεις Διεπαφής" @@ -3199,7 +3201,7 @@ msgstr "Μη έγκυÏο string αναζήτησης (δεν μποÏεί να msgid "Invalid search string (only even string lengths supported)" msgstr "Μη έγκυÏο string αναζήτησης (μόνο ζυγά μήκη string υποστηÏίζονται)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Μη έγκυÏο κατάσταση" @@ -3281,7 +3283,7 @@ msgstr "Τελευταίο ΕπαναγÏαμμένο Σημείο Αποθ." msgid "Last Saved State" msgstr "Τελευταίο Αποθηκευμένο Σημείο Αποθ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3381,11 +3383,11 @@ msgstr "ΦόÏτωση Σημείου Αποθήκευσης 8" msgid "Load State..." msgstr "ΦόÏτωση Σημείου Αποθήκευσης..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "ΦόÏτωση ÎœÎµÎ½Î¿Ï Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Wii %d%c" @@ -3463,7 +3465,7 @@ msgstr "" "Ασυμφωνία MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3498,7 +3500,7 @@ msgstr "Η κάÏτα μνήμης έχει ήδη αποθηκευμένα δε msgid "Memcard already opened" msgstr "Η κάÏτα μνήμης είναι ήδη ανοιχτή" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memory Byte" @@ -3515,7 +3517,7 @@ msgstr "" "ΔιαχειÏιστής ΚαÏτών Μνήμης ΠΡΟΕΙΔΟΠΟΙΗΣΗ-Κάντε αντίγÏαφα ασφαλείας Ï€Ïιν την " "χÏήση, αν και διοÏθωμένος μποÏεί να χαλάσει Ï€Ïάγματα!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3555,7 +3557,7 @@ msgstr "Ελάχιστη" msgid "Misc" msgstr "ΔιάφοÏα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ΔιάφοÏες Ρυθμίσεις" @@ -3581,11 +3583,11 @@ msgstr "" msgid "Monospaced font" msgstr "Ισοπλατής γÏαμματοσειÏά" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "ΜοτέÏ" @@ -3619,11 +3621,11 @@ msgstr "" "ΑπενεÏγοποιεί το ηχείο του Wiimote. ΔιοÏθώνει τυχαίες αποσυνδέσεις σε " "Ï€Ïαγματικά wiimotes. Δεν έχει καμία επίδÏαση σε εξομοιωμένα wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "ΣΗΜΕΙΩΣΗ: Το μέγεθος της Ïοής δεν ταιÏιάζει με το Ï€Ïαγματικό μήκος των " @@ -3752,7 +3754,7 @@ msgstr "Ψευδώνυμο :" msgid "No Country (SDK)" msgstr "Καμία ΧώÏα (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Δε βÏέθηκαν ISO ή WAD" @@ -3761,8 +3763,8 @@ msgstr "Δε βÏέθηκαν ISO ή WAD" msgid "No banner file found for title %s" msgstr "Δε βÏέθηκε αÏχείο εικονιδίου για τον τίτλο %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Μη διαθέσιμη πεÏιγÏαφή" @@ -3770,7 +3772,7 @@ msgstr "Μη διαθέσιμη πεÏιγÏαφή" msgid "No docking" msgstr "ΑπενεÏγοποίηση του docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Δεν φοÏτώθηκε αÏχείο" @@ -3778,7 +3780,7 @@ msgstr "Δεν φοÏτώθηκε αÏχείο" msgid "No free dir index entries" msgstr "Δεν υπάÏχουν ελεÏθεÏες εγγÏαφές φακέλων" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Κανένα εγγεγÏαμένο αÏχείο" @@ -3801,7 +3803,7 @@ msgid "Not Equal" msgstr "Όχι ίσο" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Μη ΟÏισμένο" @@ -3809,7 +3811,7 @@ msgstr "Μη ΟÏισμένο" msgid "Not connected" msgstr "Μη Συνδεδεμένο" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Σημειώσεις" @@ -3843,7 +3845,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Επιτάχυνση Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Αντικείμενο" @@ -3874,11 +3876,11 @@ msgstr "Διαθέσιμα μόνο %d μπλοκ" msgid "Open" msgstr "Άνοιγμα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Άνοιγμα &τοποθεσίας αÏχείου" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Άνοιγμα φακέλου αποθήκευσης Wii" @@ -3908,7 +3910,7 @@ msgstr "OpenCL Αποκωδικοποιητής Υφών" msgid "OpenMP Texture Decoder" msgstr "OpenMP Αποκωδικοποιητής Υφών" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Ρυθμίσεις" @@ -3994,8 +3996,8 @@ msgstr "Patches" msgid "Paths" msgstr "Φάκελοι" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ΠαÏση" @@ -4019,8 +4021,8 @@ msgstr "Οπτική %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "ΑναπαÏαγωγή" @@ -4046,7 +4048,7 @@ msgstr "Ρυθμίσεις ΑναπαÏαγωγής" msgid "Players" msgstr "Παίχτες" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "ΠαÏακαλώ επιβεβαιώστε..." @@ -4062,19 +4064,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "Πολωνέζικα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ΘÏÏα 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ΘÏÏα 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ΘÏÏα 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ΘÏÏα 4" @@ -4095,17 +4097,17 @@ msgstr "ΠοÏτογαλικά (Î’Ïαζιλιάνικα)" msgid "Post-Processing Effect:" msgstr "Post-Processing Εφέ:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "ΠÏόωÏος τεÏματισμός της ταινίας σε PlayWiimote. %u > %u" @@ -4204,7 +4206,7 @@ msgstr "ΕπανασÏνδεση Wiimote Κατά Την ΦόÏτωση Σημε #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "ΕγγÏαφή" @@ -4260,7 +4262,7 @@ msgstr "Ανανέωση λίστας παιχνιδιών" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "ΑφαίÏεση" @@ -4301,7 +4303,7 @@ msgstr "Δεξιά" msgid "Right Stick" msgstr "Δεξί Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Δόνηση" @@ -4381,7 +4383,7 @@ msgstr "Αποθήκευση Σημείου..." msgid "Save as..." msgstr "Αποθήκευση ως..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" @@ -4389,11 +4391,11 @@ msgstr "Αποθήκευση συμπιεσμένου GCM/ISO" msgid "Save current perspective" msgstr "Αποθήκευση Ï„Ïέχουσας οπτικής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Αποθήκευση αποσυμπιεσμένου GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4404,16 +4406,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "ΚλιμακοÏμενα EFB ΑντίγÏαφα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Ανίχνευση %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Αναζήτηση για ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ανίχνευση..." @@ -4433,7 +4435,7 @@ msgstr "Αναζήτηση" msgid "Search Filter" msgstr "ΦίλτÏο Αναζήτησης" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Αναζήτηση σε Υποφακέλους" @@ -4457,11 +4459,11 @@ msgid "Select" msgstr "Επιλογή" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Επιλέξτε το ΑÏχείο ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Επιλέξτε ένα Wii WAD αÏχείο για εγκατάσταση" @@ -4487,15 +4489,15 @@ msgstr "Επιλέξτε αιωÏοÏμενα παÏάθυÏα" msgid "Select the file to load" msgstr "Επιλέξτε το αÏχείο για φόÏτωση" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Επιλέξτε αÏχείο αποθήκευσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Επιλέξτε το σημείο φόÏτωσης" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Επιλέξτε το σημείο αποθήκευσης" @@ -4587,7 +4589,7 @@ msgstr "" msgid "Set" msgstr "ΟÏισμός" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "ΟÏισμός ως Ï€Ïοεπιλεγμένο &ISO" @@ -4617,7 +4619,7 @@ msgstr "Ρυθμίσεις..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem:Αδυναμία εÏÏεσης αÏχείου Ïυθμίσεων" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "ΚοÏνημα" @@ -4797,7 +4799,7 @@ msgstr "" "\n" "Αν δεν είστε σίγουÏοι, αφήστε το αποεπιλεγμένο." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "ΟÏιζόντια Θέση Wiimote" @@ -4805,14 +4807,18 @@ msgstr "ΟÏιζόντια Θέση Wiimote" msgid "Simplified Chinese" msgstr "Κινέζικα Απλοποιημένα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Μέγεθος" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "ΠαÏάλειψη BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "ΠαÏάλειψη Dest. Alpha Pass" @@ -4856,11 +4862,11 @@ msgstr "" msgid "Slot %i" msgstr "Θέση %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Θέση Α" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Θέση Î’" @@ -4885,7 +4891,7 @@ msgstr "" "Θέλετε όντως να χÏησιμοποιήσετε την απεικόνιση λογισμικοÏ; Αν δεν είστε " "σίγουÏοι, επιλέξτε 'Όχι'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ρυθμίσεις Ήχου" @@ -4965,7 +4971,7 @@ msgstr "Εκκίνηση Ε&γγÏαφής" msgid "Start Recording" msgstr "Εκκίνηση ΕγγÏαφής" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Λειτ." @@ -5025,12 +5031,12 @@ msgstr "Επιτυχής εξαγωγή αÏχείου στο %s" msgid "Successfully imported save files" msgstr "Επιτυχής εισαγωγή σημείων αποθήκευσης" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Γλώσσα Συστήματος:" @@ -5098,13 +5104,13 @@ msgstr "Η διεÏθυνση είναι άκυÏη" msgid "The checksum was successfully fixed" msgstr "Το checksum διοÏθώθηκε με επιτυχία" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Ο επιλεγμένος φάκελος βÏίσκεται ήδη στη λίστα" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5195,7 +5201,7 @@ msgstr "Το επιλεγμένο αÏχείο \"%s\" δεν υπάÏχει" msgid "The value is invalid" msgstr "Η τιμή είναι άκυÏη" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Θέμα" @@ -5232,9 +5238,11 @@ msgstr "" "παιχνίδια." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5273,12 +5281,12 @@ msgstr "" msgid "Threshold" msgstr "Κατώφλι" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Πλάγιασμα" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Τίτλος" @@ -5342,7 +5350,7 @@ msgstr "ΤÏπος" msgid "UDP Port:" msgstr "ΠόÏτα UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5351,7 +5359,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ΑΓÎΩΣΤΟ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "ΑΓÎΩΣΤΟ_%02X" @@ -5389,7 +5397,7 @@ msgstr "Μη οÏισμένο %i" msgid "Undo Load State" msgstr "ΑναίÏεση ΦόÏτωσης Σημείου Αποθ. " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Αναπάντεχη 0x80 κλήση; Ματαίωση..." @@ -5427,11 +5435,11 @@ msgstr "Πάνω" msgid "Update" msgstr "ΕνημέÏωση" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Κάθετη Θέση Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ΧÏήση ΛειτουÏγίας EuRGB60 (PAL60)" @@ -5507,7 +5515,7 @@ msgstr "Βίντεο" msgid "Virtual" msgstr "Εικονικό" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Ένταση" @@ -5578,7 +5586,7 @@ msgstr "" "και έχουν το ίδιο όνομα με αÏχεία στη memcard\n" "Συνέχεια;" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5590,7 +5598,7 @@ msgstr "" "φοÏτώσετε άλλο σημείο αποθήκευσης Ï€ÏÏ‰Ï„Î¿Ï ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ ή να φοÏτώσετε το Ï„Ïέχων " "με απενεÏγοποιημένη την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής)." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5603,7 +5611,7 @@ msgstr "" "την λειτουÏγία Μόνο Για Ανάγνωση (ΕγγÏαφής). Ειδάλλως πιθανώς θα εμφανιστεί " "ασυγχÏονισμός." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5651,7 +5659,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Hack ΕυÏείας Οθόνης" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Πλάτος" @@ -5663,7 +5671,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Κονσόλα" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Ρίζα:" @@ -5671,7 +5679,7 @@ msgstr "Wii NAND Ρίζα:" msgid "Wii Save Import" msgstr "Εισαγωγή Αποθήκευσης Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "ΑÏχεία αποθήκευσης Wii (*.bin)|*.bin" @@ -5734,10 +5742,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Αναδίπλωση Λέξεων" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Σε εÏγασία..." @@ -5772,7 +5780,7 @@ msgstr "Αποτυχία αÏχικοποίησης XAudio2: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Αποτυχία δημιουÏγίας κεντÏικής φωνής XAudio2: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5808,7 +5816,7 @@ msgstr "ΠÏέπει να εισάγετε μία έγκυÏη οκταδική msgid "You must enter a valid profile name." msgstr "ΠÏέπει να εισάγετε ένα έγκυÏο όνομα Ï€Ïοφίλ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "ΠÏέπει να κάνετε επανεκκίνηση του Dolphin για να έχει επίπτωση αυτή η αλλαγή." @@ -5903,7 +5911,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5932,7 +5940,7 @@ msgstr "" "δεν είναι σημείο αποθήκευσης wii ή αποτυχία ανάγνωσης κεφαλίδας αÏχείου " "μεγέθους %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "." @@ -5941,7 +5949,7 @@ msgstr "." msgid "unknown cmd 0x%08x" msgstr "άγνωστη εντολή 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "Το wxExecute επέστÏεψε -1 κατά την εκκίνηση της εφαÏμογής!" @@ -6033,9 +6041,21 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "ΕνεÏγοποίηση Throttle Ήχου" +#~ msgid "Enable BAT" +#~ msgstr "ΕνεÏγοποίηση BAT" + #~ msgid "Enable DTK Music" #~ msgstr "ΕνεÏγοποίηση Μουσικής DTK" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "ΕνεÏγοποιεί την Block Address Translation (BAT), μία λειτουÏγία της " +#~ "Μονάδας ΔιαχείÏισης Μνήμης. ΑκÏιβές ως Ï€Ïος το υλικό, αλλά αÏγό στην " +#~ "εξομοίωση. (ΕνεÏγό = Συμβατό, ΑνενεÏγό = ΓÏήγοÏο)" + #~ msgid "Exit Dolphin with emulator" #~ msgstr "Έξοδος από το Dolphin με τον εξομοιωτή" diff --git a/Languages/po/en.po b/Languages/po/en.po index b8e26d4bd2..3eee66bee4 100644 --- a/Languages/po/en.po +++ b/Languages/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-01-06 14:53+0100\n" "Last-Translator: BhaaL \n" "Language-Team: \n" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -165,11 +165,11 @@ msgstr "" msgid "&DSP Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" @@ -233,7 +233,7 @@ msgstr "" msgid "&Play" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" @@ -277,11 +277,11 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -301,7 +301,7 @@ msgstr "" msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -342,7 +342,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -505,11 +505,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -519,7 +519,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" @@ -565,24 +565,24 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -592,8 +592,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -606,6 +606,10 @@ msgstr "" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" @@ -622,7 +626,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" @@ -646,17 +650,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -670,7 +674,7 @@ msgstr "" msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -702,11 +706,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -714,7 +718,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" @@ -723,7 +727,7 @@ msgstr "" msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -737,7 +741,7 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" @@ -803,7 +807,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" @@ -811,7 +815,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" @@ -825,7 +829,13 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -837,7 +847,7 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -874,7 +884,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -882,7 +892,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -911,7 +921,7 @@ msgstr "" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" @@ -982,23 +992,23 @@ msgstr "" msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1006,7 +1016,7 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1069,16 +1079,16 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" @@ -1105,9 +1115,9 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" @@ -1120,7 +1130,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" @@ -1165,7 +1175,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" @@ -1221,11 +1231,11 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1294,7 +1304,7 @@ msgstr "" msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1306,7 +1316,7 @@ msgstr "" msgid "DSP" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" @@ -1319,7 +1329,7 @@ msgstr "" msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" @@ -1331,7 +1341,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1376,16 +1386,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" @@ -1393,7 +1403,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1435,8 +1445,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1510,11 +1520,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1543,12 +1553,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1560,20 +1570,20 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1599,7 +1609,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" @@ -1749,10 +1759,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" @@ -1797,7 +1803,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" @@ -1850,13 +1856,6 @@ msgid "" "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" @@ -1934,7 +1933,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" @@ -1994,7 +1993,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" @@ -2010,7 +2009,7 @@ msgstr "" msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" @@ -2067,7 +2066,7 @@ msgstr "" msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2123,6 +2122,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2200,11 +2204,11 @@ msgstr "" msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2256,7 +2260,7 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2325,17 +2329,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" @@ -2407,7 +2411,7 @@ msgstr "" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2448,7 +2452,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2551,7 +2555,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2569,7 +2573,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" @@ -2629,11 +2633,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" @@ -2649,7 +2653,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2762,7 +2766,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2774,7 +2778,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2783,7 +2787,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" @@ -2810,7 +2814,7 @@ msgstr "" msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" @@ -2887,7 +2891,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" @@ -2966,7 +2970,7 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3059,11 +3063,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3131,7 +3135,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" @@ -3166,7 +3170,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" @@ -3181,7 +3185,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3213,7 +3217,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3234,11 +3238,11 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3264,11 +3268,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3395,7 +3399,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3404,8 +3408,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3413,7 +3417,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3421,7 +3425,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3444,7 +3448,7 @@ msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" @@ -3452,7 +3456,7 @@ msgstr "" msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" @@ -3486,7 +3490,7 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3517,11 +3521,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" @@ -3551,7 +3555,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3631,8 +3635,8 @@ msgstr "" msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" @@ -3656,8 +3660,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" @@ -3683,7 +3687,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3699,19 +3703,19 @@ msgstr "" msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" @@ -3732,17 +3736,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3841,7 +3845,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" @@ -3892,7 +3896,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" @@ -3930,7 +3934,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4010,7 +4014,7 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" @@ -4018,11 +4022,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4031,16 +4035,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" @@ -4060,7 +4064,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" @@ -4084,11 +4088,11 @@ msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" @@ -4111,15 +4115,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" @@ -4187,7 +4191,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" @@ -4215,7 +4219,7 @@ msgstr "" msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" @@ -4380,7 +4384,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" @@ -4388,14 +4392,18 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4428,11 +4436,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4452,7 +4460,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" @@ -4523,7 +4531,7 @@ msgstr "" msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" @@ -4578,12 +4586,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4651,13 +4659,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4736,7 +4744,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "" @@ -4765,7 +4773,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4790,12 +4799,12 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" @@ -4857,7 +4866,7 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4866,7 +4875,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4898,7 +4907,7 @@ msgstr "" msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -4936,11 +4945,11 @@ msgstr "" msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5005,7 +5014,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5062,7 +5071,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5070,7 +5079,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5078,7 +5087,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5110,7 +5119,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" @@ -5122,7 +5131,7 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" @@ -5130,7 +5139,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5189,10 +5198,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" @@ -5227,7 +5236,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5261,7 +5270,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5333,7 +5342,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5360,7 +5369,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5369,7 +5378,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/es.po b/Languages/po/es.po index 8069d9aa0a..caf94af502 100644 --- a/Languages/po/es.po +++ b/Languages/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-21 23:41+0100\n" "Last-Translator: Petiso Carambanal \n" "Language-Team: DARIO_FF \n" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" no es un archivo GCM/ISO válido, o no es una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -180,11 +180,11 @@ msgstr "Administrador de &trucos" msgid "&DSP Settings" msgstr "&Configuración DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Borrar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Borrar ISO seleccionadas..." @@ -248,7 +248,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Jugar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propiedades" @@ -292,11 +292,11 @@ msgstr "&Vista" msgid "&Wiimote Settings" msgstr "&Configuración de wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -316,7 +316,7 @@ msgstr "(DESCONOCIDO)" msgid "(off)" msgstr "(off)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -357,7 +357,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -561,11 +561,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Añadir" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Añadir código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Añadir parche" @@ -575,7 +575,7 @@ msgstr "Añadir nueva ventana" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Añadir..." @@ -636,24 +636,24 @@ msgstr "Configuración avanzada" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos los archivos de GC/Wii (elf, dol, gcm, iso, wbfs, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas las imágenes de GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos los archivos Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos los estados guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos los archivos ISO de Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos los archivos ISO comprimidos de GC/Wii (gcz)" @@ -662,9 +662,10 @@ msgid "All files (*.*)|*.*" msgstr "Todos los archivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -681,6 +682,10 @@ msgstr "Sincronización alternativa del Wiimote" msgid "Analyze" msgstr "Analizar" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro anisotrópico:" @@ -697,7 +702,7 @@ msgstr "Apploader tiene tamaño incorrecto... ¿Es realmente un apploader?" msgid "Apploader unable to load from file" msgstr "Apploader no puede cargar desde el archivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -724,7 +729,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "¿Estás seguro de que quieres borrar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,11 +737,11 @@ msgstr "" "¿Seguro que quieres borrar estos archivos?\n" "¡Desaparecerán para siempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "¿Seguro que quieres borrar este archivo? ¡Desaparecerá para siempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Relación de aspecto:" @@ -750,7 +755,7 @@ msgstr "Al menos una ventana debe permancer abierta." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Motor de audio:" @@ -785,11 +790,11 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registro BP" @@ -797,7 +802,7 @@ msgstr "Registro BP" msgid "Back" msgstr "Atrás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configuración del motor" @@ -806,7 +811,7 @@ msgstr "Configuración del motor" msgid "Backend:" msgstr "Motor:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Detectar entrada sin foco" @@ -820,7 +825,7 @@ msgid "Bad File Header" msgstr "Cabecera de archivo incorrecta" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Imagen" @@ -886,7 +891,7 @@ msgstr "Quebrado" msgid "Browse" msgstr "Buscar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Busca un directorio para añadir" @@ -894,7 +899,7 @@ msgstr "Busca un directorio para añadir" msgid "Browse for an ISO directory..." msgstr "Buscar un directorio de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Busca un directorio de salida" @@ -908,7 +913,13 @@ msgstr "Búfer" msgid "Buttons" msgstr "Botones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -920,7 +931,7 @@ msgstr "Stick C" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "Registro CP" @@ -965,7 +976,7 @@ msgstr "No se puede abrir %s" msgid "Cannot unregister events with events pending" msgstr "No se puede cancelar el registro de eventos con eventos pendientes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -976,7 +987,7 @@ msgstr "" "%s\n" "no es un fichero válido de tarjeta de memoria de Gamecube." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1007,7 +1018,7 @@ msgstr "Bloq Mayús" msgid "Catalan" msgstr "Catalán" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centro" @@ -1081,23 +1092,23 @@ msgstr "Chino Simplificado" msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escoge un directorio raíz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escoge un directorio raíz para la NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escoge una ISO por defecto:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escoge un directorio para añadir" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escoge un archivo a abrir" @@ -1105,7 +1116,7 @@ msgstr "Escoge un archivo a abrir" msgid "Choose a memory card:" msgstr "Escoge una tarjeta de memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1172,16 +1183,16 @@ msgstr "Comentario" msgid "Comment:" msgstr "Comentario:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimiendo ISO" @@ -1208,9 +1219,9 @@ msgstr "Configurar mandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescritura de archivo" @@ -1223,7 +1234,7 @@ msgstr "Confirmar al detenerse" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar teclado USB" @@ -1268,7 +1279,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Convertir a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Fallo al copiar" @@ -1335,11 +1346,11 @@ msgstr "" "¿Estás ejecutando Dolphin desde un CD/DVD, o el archivo de guardado está " "protegido contra escritura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "No se pudo encontrar el comando para abrir la extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1413,7 +1424,7 @@ msgstr "Personalizar algunos párametros de la proyección ortográfica." msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1425,7 +1436,7 @@ msgstr "Pad direccional" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor de emulación DSP" @@ -1438,7 +1449,7 @@ msgstr "Emulación DSP HLE (rápido)" msgid "DSP LLE interpreter (slow)" msgstr "Intérprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE en un proceso" @@ -1450,7 +1461,7 @@ msgstr "Recompilador DSP LLE" msgid "DSP settings" msgstr "Configuración DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raíz DVD:" @@ -1495,16 +1506,16 @@ msgstr "Depuración" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISO seleccionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimir ISO" @@ -1512,7 +1523,7 @@ msgstr "Descomprimir ISO" msgid "Default" msgstr "Predeterminado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO por defecto:" @@ -1556,8 +1567,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configuración del dispositivo" @@ -1648,11 +1659,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "¿Quieres detener la emulación actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "Decodificador Dolby Pro Logic II" @@ -1681,12 +1692,12 @@ msgstr "Configuración de wiimote emulado de Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuración de GCPad Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Películas TAS de Dolphin (*.dtm)" @@ -1698,7 +1709,7 @@ msgstr "Configuración de wiimote de Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin en &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1706,7 +1717,7 @@ msgstr "" "Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para " "buscar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1714,8 +1725,8 @@ msgstr "" "Dolphin está configurado actualmente para esconder todos los juegos. Haz " "doble clic aquí para mostrarlos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin no ha podido completar la acción solicitada." @@ -1741,7 +1752,7 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Depósito de audio" @@ -1922,10 +1933,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Habilitar Registro de AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Habilitar BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Habilitar asociación de bloques" @@ -1970,7 +1977,7 @@ msgstr "Habilitar MMU" msgid "Enable Progressive Scan" msgstr "Habilitar escaneado progresivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Habilitar salvapantallas" @@ -2041,16 +2048,6 @@ msgstr "" "Habilitar esto para acelerar The Legend of Zelda: Twilight Princess. " "Deshabilitar para CUALQUIER OTRO juego." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Habilitar la traducción de dirección de bloques (BAT); una función de la " -"unidad de administración de memoria (MMU). Es preciso al hardware original, " -"pero es lento para emular. (ON = compatible, OFF = rápido)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Habilta un hack de proyección personalizado" @@ -2141,7 +2138,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" @@ -2207,7 +2204,7 @@ msgstr "Exportar grabación..." msgid "Export Save" msgstr "Exportar guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar guardado a uno de Wii (experimental)" @@ -2223,7 +2220,7 @@ msgstr "Fallo al exportar. ¿Intentar de nuevo?" msgid "Export save as..." msgstr "Exportar guardado como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensión" @@ -2280,7 +2277,7 @@ msgstr "Extrayendo directorio" msgid "Extracting..." msgstr "Extrayendo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte de FIFO" @@ -2344,6 +2341,11 @@ msgstr "Fallo al cargar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Fallo al cargar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fallo al escribir la cabecera para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Fallo al leer banner.bin" @@ -2434,11 +2436,11 @@ msgstr "Iraní" msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versión rápida del MMU. No funciona para todos los juegos." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2496,7 +2498,7 @@ msgstr "FileIO: Modo desconocido de apertura : 0x%02x" msgid "Filesystem" msgstr "Sistema de archivos" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "¡Tipo de archivo INI desconocido: no se abrirá!" @@ -2581,17 +2583,17 @@ msgstr "" msgid "Forward" msgstr "Adelante" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "%d coincidencias para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Frame" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Frame " @@ -2663,7 +2665,7 @@ msgstr "Configuración del micro de GC" msgid "GCPad" msgstr "Pad GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2704,7 +2706,7 @@ msgid "Gamecube &Pad Settings" msgstr "&Configuración del mando Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Tarjetas de memoria de Gamecube (*.raw,*.gcp)" @@ -2819,7 +2821,7 @@ msgstr "Falló la suma de verificación de cabecera" msgid "Hebrew" msgstr "Hebreo" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2843,7 +2845,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Esconder" @@ -2913,11 +2915,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino incorrecto" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Configuración IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2933,7 +2935,7 @@ msgstr "Sensibilidad IR:" msgid "ISO Details" msgstr "Detalles del ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directorios de ISO" @@ -3072,7 +3074,7 @@ msgstr "Insertar" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insertar código encriptado o desencriptado aquí..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insertar tarjeta SD" @@ -3084,7 +3086,7 @@ msgstr "Insertar un nombre aquí.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar al menú de la Wii" @@ -3095,7 +3097,7 @@ msgstr "" "Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta " "todavía." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3124,7 +3126,7 @@ msgstr "" msgid "Interface" msgstr "Interfaz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Configuración de la interfaz" @@ -3206,7 +3208,7 @@ msgstr "Cadena de búsqueda incorrecta (no se pudo convertir en un número)" msgid "Invalid search string (only even string lengths supported)" msgstr "Búsqueda de cadena incorrecta (solo se soportan algunas longitudes)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado no válido" @@ -3288,7 +3290,7 @@ msgstr "Último estado sobrescrito" msgid "Last Saved State" msgstr "Último estado guardado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "Latencia:" @@ -3388,11 +3390,11 @@ msgstr "&Cargar estado 8" msgid "Load State..." msgstr "Cargar estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Cargar Menú de sistema Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Cargar Menú de sistema Wii %d %c" @@ -3470,7 +3472,7 @@ msgstr "" "MD5 no coinciden\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de velocidad MMU" @@ -3505,7 +3507,7 @@ msgstr "La tarjeta de memoria ya tiene un guardado para este juego" msgid "Memcard already opened" msgstr "La tarjeta de memoria ya está abierta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de memoria" @@ -3522,7 +3524,7 @@ msgstr "" "Administrador de tarjetas de memoria. ADVERTENCIA: Haga copias antes de " "usarlo; debería estar arreglado, ¡pero puede que estropee cosas!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3562,7 +3564,7 @@ msgstr "Mín." msgid "Misc" msgstr "Varios" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Configuraciones varias" @@ -3587,11 +3589,11 @@ msgstr "" msgid "Monospaced font" msgstr "Fuente monoespaciada" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3627,11 +3629,11 @@ msgstr "" "Silencia el altavoz del Wiimote. Arregla las desconexiones aleatorias en " "wiimotes reales. No tiene ningún efecto en wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "NOTA: El tamaño del flujo no coincide con la longitud actual de los datos\n" @@ -3759,7 +3761,7 @@ msgstr "Apodo:" msgid "No Country (SDK)" msgstr "Ningún país (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Ninguna ISO o WAD ha sido encontrada." @@ -3768,8 +3770,8 @@ msgstr "Ninguna ISO o WAD ha sido encontrada." msgid "No banner file found for title %s" msgstr "No se encontró un archivo de banner para el juego %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Sin descripción" @@ -3777,7 +3779,7 @@ msgstr "Sin descripción" msgid "No docking" msgstr "Sin uniones" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "No se ha cargado ningún fichero" @@ -3785,7 +3787,7 @@ msgstr "No se ha cargado ningún fichero" msgid "No free dir index entries" msgstr "No hay entradas de índice de directorio libres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "No hay grabaciones guardadas" @@ -3808,7 +3810,7 @@ msgid "Not Equal" msgstr "No igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "No definido" @@ -3816,7 +3818,7 @@ msgstr "No definido" msgid "Not connected" msgstr "Sin conectar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" @@ -3850,7 +3852,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleración del nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objeto" @@ -3881,11 +3883,11 @@ msgstr "Solo %d bloques disponibles" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir directorio &contenedor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir carpeta de guardado&s de Wii" @@ -3915,7 +3917,7 @@ msgstr "Descodificador de texturas OpenCL" msgid "OpenMP Texture Decoder" msgstr "Descodificador de texturas OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opciones" @@ -4001,8 +4003,8 @@ msgstr "Parches" msgid "Paths" msgstr "Directorios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" @@ -4026,8 +4028,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Reproducir" @@ -4053,7 +4055,7 @@ msgstr "Opciones de reproducción" msgid "Players" msgstr "Jugadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Confirma, por favor..." @@ -4069,19 +4071,19 @@ msgstr "Más-menos" msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Puerto 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Puerto 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Puerto 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Puerto 4" @@ -4102,17 +4104,17 @@ msgstr "Portugués (Brasil)" msgid "Post-Processing Effect:" msgstr "Efecto de posprocesado:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Final prematuro de la película en PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Final prematuro de la película en PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Final prematuro de la película en PlayWiimote. %u > %u" @@ -4211,7 +4213,7 @@ msgstr "Reconectar Wiimote al cargar estado" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Grabar" @@ -4267,7 +4269,7 @@ msgstr "Actualizar lista de juegos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Eliminar" @@ -4308,7 +4310,7 @@ msgstr "Derecha" msgid "Right Stick" msgstr "Stick Derecho" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibración" @@ -4388,7 +4390,7 @@ msgstr "Guardar estado..." msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4396,11 +4398,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Guardar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4411,16 +4413,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "EFB Copia a escala" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Buscando ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Escaneando..." @@ -4440,7 +4442,7 @@ msgstr "Buscar" msgid "Search Filter" msgstr "Filtro de búsqueda" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Buscar en subcarpetas" @@ -4464,11 +4466,11 @@ msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccionar archivo de grabación" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Elige un WAD de Wii para instalar" @@ -4494,15 +4496,15 @@ msgstr "Selecciona las ventanas flotantes" msgid "Select the file to load" msgstr "Selecciona el archivo para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecciona el archivo de guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecciona el estado para cargar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecciona el estado para guardar" @@ -4592,7 +4594,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO por &defecto" @@ -4624,7 +4626,7 @@ msgstr "Configuración..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: No se puede encontrar el archivo de configuración" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacudir" @@ -4803,7 +4805,7 @@ msgstr "" "\n" "Si no estás seguro, déjala sin marcar." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote de costado" @@ -4811,14 +4813,18 @@ msgstr "Wiimote de costado" msgid "Simplified Chinese" msgstr "Chino simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Tamaño" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar pase de alpha en dest." @@ -4862,11 +4868,11 @@ msgstr "" msgid "Slot %i" msgstr "Ranura %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ranura A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ranura B" @@ -4890,7 +4896,7 @@ msgstr "" "¿Realmente quieres activar renderizado por software? Si no estás seguro, " "elige No." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configuración de sonido" @@ -4969,7 +4975,7 @@ msgstr "Comenzar graba&ción" msgid "Start Recording" msgstr "Comenzar grabación" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estado" @@ -5032,12 +5038,12 @@ msgstr "Se exportó correctamente al archivo %s" msgid "Successfully imported save files" msgstr "Los archivos de guardado se han importado con éxito." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Oscilar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma del sistema:" @@ -5105,13 +5111,13 @@ msgstr "La dirección no es válida" msgid "The checksum was successfully fixed" msgstr "La suma de verificación fue reparada con éxito." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "El directorio escogido ya se encuentra en la lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5202,7 +5208,7 @@ msgstr "El archivo especificado \"%s\" no existe" msgid "The value is invalid" msgstr "El valor no es válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "Tema:" @@ -5236,9 +5242,11 @@ msgstr "" "Esto podría provocar peor rendimiento en el Menú de Wii y algunos juegos." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5276,12 +5284,12 @@ msgstr "Esto te permitirá editar manualmente el archivo de configuración INI" msgid "Threshold" msgstr "Límite" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" @@ -5345,7 +5353,7 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Puerto UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5354,7 +5362,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONOCIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONOCIDO_%02X" @@ -5391,7 +5399,7 @@ msgstr "Indefinido %i" msgid "Undo Load State" msgstr "Deshacer cargar estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "¿Llamada inesperada a 0x80? Cancelando..." @@ -5430,11 +5438,11 @@ msgstr "Arriba" msgid "Update" msgstr "Actualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote parado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar Modo EuRGB60 (PAL60)" @@ -5510,7 +5518,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volumen" @@ -5581,7 +5589,7 @@ msgstr "" "y tienen el mismo nombre que el archivo en tu memcard\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5592,7 +5600,7 @@ msgstr "" "actual.(Byte %u > %u) (frame %u > %u). Deberías cargar otor guardado antes " "de continuar, o cargar éste sin el modo de solo lectura." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5604,7 +5612,7 @@ msgstr "" "con el modo de solo lectura desactivado. De lo contrario probablemente " "obtenga una desincronización." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5651,7 +5659,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Hack de pantalla ancha (widescreen)" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ancho" @@ -5663,7 +5671,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raíz de la NAND de Wii:" @@ -5671,7 +5679,7 @@ msgstr "Raíz de la NAND de Wii:" msgid "Wii Save Import" msgstr "Importar guardado de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Archivos de guardado Wii (*.bin)|*.bin" @@ -5734,10 +5742,10 @@ msgstr "Windows Derecha" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Trabajando..." @@ -5772,7 +5780,7 @@ msgstr "XAudio2 init falló: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 creación de voz maestra falló: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "Registro XF" @@ -5808,7 +5816,7 @@ msgstr "Debes introducir un valor decimal o hexadecimal válido." msgid "You must enter a valid profile name." msgstr "Debes introducir un nombre de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Debes reiniciar Dolphin para que el cambio tenga efecto." @@ -5904,7 +5912,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5933,7 +5941,7 @@ msgstr "" "no es un guardado de Wii o fallo de lectura para la cabecera de archivo de " "tamaño %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5942,7 +5950,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x desconocido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "¡wxExecute dio un -1 al iniciar la aplicación!" @@ -6223,6 +6231,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Habilitar aceleración de audio" +#~ msgid "Enable BAT" +#~ msgstr "Habilitar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Habilitar acceso a la CPU" @@ -6247,6 +6258,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Habilitar salvapantallas (reducción del burn-in)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Habilitar la traducción de dirección de bloques (BAT); una función de la " +#~ "unidad de administración de memoria (MMU). Es preciso al hardware " +#~ "original, pero es lento para emular. (ON = compatible, OFF = rápido)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/fa.po b/Languages/po/fa.po index d1ed36f150..f8bb93f256 100644 --- a/Languages/po/fa.po +++ b/Languages/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: H.Khakbiz\n" "Language-Team: H.Khakbiz\n" @@ -46,7 +46,7 @@ msgstr "" "\"%s\" این یک Ùایل گیم کیوب/ÙˆÛŒ Ùاقد اعتبار است، یا این Ùایل آیزو گیم کیوب/ÙˆÛŒ " "نیست." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -178,11 +178,11 @@ msgstr "مدیریت کدهای &تقلب" msgid "&DSP Settings" msgstr "تنظیمات پردازشگر &صدای دلÙین" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&حذ٠آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&حذ٠آیزو های انتخاب شده..." @@ -246,7 +246,7 @@ msgstr "Ù…Ú©Ø«" msgid "&Play" msgstr "&شروع بازی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "خواص" @@ -290,11 +290,11 @@ msgstr "&دیدگاه" msgid "&Wiimote Settings" msgstr "تنظیمات &ویموت" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&ویکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -314,7 +314,7 @@ msgstr "(ناشناخته)" msgid "(off)" msgstr "(خاموش)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "Û°xÛ´Û´" @@ -355,7 +355,7 @@ msgstr "<تکمه Ùشارى>" msgid "" msgstr "<سیستم>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -552,11 +552,11 @@ msgstr "آداپتور:" msgid "Add" msgstr "اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "اضاÙÙ‡ کردن کد اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "اضاÙÙ‡ کردن وصله" @@ -566,7 +566,7 @@ msgstr "اضاÙÙ‡ کردن تکه جدید" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "اضاÙÙ‡ کردن..." @@ -626,24 +626,24 @@ msgstr "تنظیمات پیشرÙته" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "همه Ùایل های گیم کیوب/ÙˆÛŒ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "همه ایمیجهای گیم کیوب/ÙˆÛŒ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "همه Ùایل های گیم کیوب جی سی ام (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "همه وضعیت های ذخیره (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "همه Ùایل های آیزو ÙˆÛŒ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "همه Ùایل های آیزو Ùشرده شده گیم کیوب/ÙˆÛŒ (gcz)" @@ -652,9 +652,10 @@ msgid "All files (*.*)|*.*" msgstr "همه Ùایل ها (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -671,6 +672,10 @@ msgstr "زمان بندی جایگزین برای ویموت" msgid "Analyze" msgstr "تحلیل کردن" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Ùیلتر ناهمسانگر:" @@ -687,7 +692,7 @@ msgstr "سایز بارگذار برنامه اشتباه است...آیا این msgid "Apploader unable to load from file" msgstr "بارگذار برنامه ناتوان در بارگذاری از Ùایل" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "بار گذار برنامه:" @@ -714,7 +719,7 @@ msgstr "عربی" msgid "Are you sure you want to delete \"%s\"?" msgstr "آیا شما مطمئن هستید Ú©Ù‡ میخواهید \"%s\" را حذ٠کنید؟" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -722,13 +727,13 @@ msgstr "" "آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایلها را حذ٠کنید؟\n" "این Ùایل ها برای همیشه از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "آیا شما مطمئن هستید Ú©Ù‡ میخواهید این Ùایل را حذ٠کنید؟ این Ùایل برای همیشه " "از بین خواهند رÙت!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "نسبت طول به عرض تصویر:" @@ -742,7 +747,7 @@ msgstr "حداقل یک قطه Ù…ÛŒ بایست باز بماند." msgid "Audio" msgstr "صدا" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "پشتوانه صدا:" @@ -777,11 +782,11 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "ثبت اشاره گر پایه" @@ -789,7 +794,7 @@ msgstr "ثبت اشاره گر پایه" msgid "Back" msgstr "برگشت" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "تنظیمات پشتوانه" @@ -798,7 +803,7 @@ msgstr "تنظیمات پشتوانه" msgid "Backend:" msgstr "پشتوانه:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ورودی پس زمینه" @@ -812,7 +817,7 @@ msgid "Bad File Header" msgstr "سرخط ناصحیح Ùایل" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "نشان" @@ -878,7 +883,7 @@ msgstr "خراب" msgid "Browse" msgstr "مرور" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "مرور برای پوشه جهت اضاÙÙ‡ کردن" @@ -886,7 +891,7 @@ msgstr "مرور برای پوشه جهت اضاÙÙ‡ کردن" msgid "Browse for an ISO directory..." msgstr "مرور برای پوشه آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "مرور برای پوشه خروجی" @@ -900,7 +905,13 @@ msgstr "حاÙظه موقت:" msgid "Buttons" msgstr "دکمه ها" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -912,7 +923,7 @@ msgstr "استیک سی" msgid "C-Stick" msgstr "استیک سی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "ثبت سی Ù¾ÛŒ" @@ -954,7 +965,7 @@ msgstr "قادر به باز گشایی نیست %s" msgid "Cannot unregister events with events pending" msgstr "رویدادهایی را Ú©Ù‡ معوق اند نمی تواند از ثبت درآورد." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -965,7 +976,7 @@ msgstr "" "%s\n" "این یک Ùایل کارت حاÙظه معتبر گیم کیوب نیست" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -997,7 +1008,7 @@ msgstr "کپس لاک" msgid "Catalan" msgstr "کاتالان" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "مرکز" @@ -1071,23 +1082,23 @@ msgstr "چینی (ساده شده)" msgid "Chinese (Traditional)" msgstr "چینی (سنتی)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "انتخاب یک پوشه ریشه برای دی ÙˆÛŒ دی:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "انتخاب یک پوشه ریشه برای نند:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "انتخاب آیزو پیش Ùرض:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "انتخاب پوشه برای اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "انتخاب Ùایل برای باز کردن" @@ -1095,7 +1106,7 @@ msgstr "انتخاب Ùایل برای باز کردن" msgid "Choose a memory card:" msgstr "انتخاب کارت حاÙظه:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1162,16 +1173,16 @@ msgstr "توضیح" msgid "Comment:" msgstr "توضیح:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Ùشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Ùشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "در حال Ùشرده کردن آیزو" @@ -1198,9 +1209,9 @@ msgstr "پیکربندی گیم پدها" msgid "Configure..." msgstr "پیکربندی..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "تائید بازنویسی Ùایل" @@ -1213,7 +1224,7 @@ msgstr "تائید برای توقÙ" msgid "Connect" msgstr "اتصال" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "اتصال کیبورد USB" @@ -1258,7 +1269,7 @@ msgstr "کنترل" msgid "Convert to GCI" msgstr "تبدیل به جی سی Ø¢ÛŒ" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Ú©Ù¾ÛŒ با شکست مواجه شد" @@ -1324,11 +1335,11 @@ msgstr "" "آیا شما بازی را از روی یک سی دی Ùˆ یا دی ÙˆÛŒ دی اجرا کرده اید، Ùˆ یا شاید Ùایل " "ذخیره محاÙظت شده (Write Protect) است." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "قادر به یاÙتن دستور باز برای پسوند 'ini' نیست!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1402,7 +1413,7 @@ msgstr "دستکاری برخی از پارامتر های خطوط عمودی msgid "Czech" msgstr "چکوسلواکی" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1414,7 +1425,7 @@ msgstr "پد هدایتی" msgid "DSP" msgstr "پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "موتور برابرساز پردازشگر صدای دلÙین" @@ -1427,7 +1438,7 @@ msgstr "برابرسازی سطح بالای پردازشگر صدای دلÙÛŒ msgid "DSP LLE interpreter (slow)" msgstr "Ù…Ùسر سطح پائین پردازشگر صدای دلÙین (کند)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "قرار دادن برابرساز سطح پائین پردازشگر صدای دلÙین بر روی ریسمان جداگانه" @@ -1439,7 +1450,7 @@ msgstr "ری کامپایلر سطح پائین پردازشگر صدای دل٠msgid "DSP settings" msgstr "تنظیمات پردازشگر صدای دلÙین" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "ریشه دی ÙˆÛŒ دی:" @@ -1487,16 +1498,16 @@ msgstr "اشکال زدائی کردن" msgid "Decimal" msgstr "دسیمال" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ناهمÙشرده کردن آیزو..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "ناهمÙشرده کردن آیزو های انتخاب شده..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "در حال ناهمÙشرده کردن آیزو" @@ -1504,7 +1515,7 @@ msgstr "در حال ناهمÙشرده کردن آیزو" msgid "Default" msgstr "پیش Ùرز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "آیزو پیش Ùرز:" @@ -1548,8 +1559,8 @@ msgstr "" msgid "Device" msgstr "دستگاه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "تنظیمات دستگاه" @@ -1640,11 +1651,11 @@ msgstr "" msgid "Divide" msgstr "تقسیم" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "آیا Ù…ÛŒ خواهید برابرسازی Ùعلی را متوق٠کنید؟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1673,12 +1684,12 @@ msgstr "پیکربندی ویمیوت برابرسازی شده دلÙین" msgid "Dolphin FIFO" msgstr "دلÙین ÙÛŒÙÙˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "پیکربندی گیم پد گیم کیوب دلÙین" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Ùیلم های تاس دلÙین (*.dtm)" @@ -1690,7 +1701,7 @@ msgstr "پیکربندی ویموت دلÙین" msgid "Dolphin at &Google Code" msgstr "دلÙین در &Ú¯ÙˆÚ¯Ù„ کد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1698,7 +1709,7 @@ msgstr "" "دلÙین قادر به پیدا کردن آیزو های گیم کیوب/ÙˆÛŒ نیست. برای مرور Ùایل ها دو بار " "اینجا کلیک کنید..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1706,8 +1717,8 @@ msgstr "" "دلÙین در حال حاضر ست شده است Ú©Ù‡ همه بازی ها را مخÙÛŒ کند. برای نمایش بازی ها " "دو بار اینجا کلیک کنید..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1733,7 +1744,7 @@ msgstr "طبل ها" msgid "Dummy" msgstr "مصنوعی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "نسخه برداری صدا" @@ -1917,10 +1928,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ùعال کردن واقعه نگاری اکشن ریپلی" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Ùعال کردن انتقال آدرس بلوک" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ùعال کردن ادغام بلوک" @@ -1965,7 +1972,7 @@ msgstr "Ùعال کردن واحد مدیریت حاÙظه" msgid "Enable Progressive Scan" msgstr "Ùعال کردن پويش تصاعدی (Progressive Scan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Ùعال کردن اسکیرین سیور" @@ -2035,15 +2042,6 @@ msgstr "" "برای بالا بردن سرعت بازی اÙسانه زلدا: شاهدخت سپیده دم این گزینه را Ùعال " "کنید. غیرÙعال برای هر بازی دیگر." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"انتقال آدرس بلوک را Ùعال Ù…ÛŒ کند; کارایی واحد مدیریت حاÙظه. بالا بردن دقت سخت " -"اÙزار، اما سبب کند شدن برابرسازی میگردد. (روشن = سازگار، خاموش = سریع)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Ùعال کردن پروژه Ù‡Ú© دستی" @@ -2130,7 +2128,7 @@ msgstr "همگن" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "خطا" @@ -2195,7 +2193,7 @@ msgstr "صادر کردن ضبط..." msgid "Export Save" msgstr "صادر کردن ذخیره" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "صادر کردن Ùایل ذخیره ÙˆÛŒ (آزمایشی)" @@ -2211,7 +2209,7 @@ msgstr "صادر کردن با شکست مواجه شد، کوشش دوباره msgid "Export save as..." msgstr "صادر کردن ذخیره بعنوان..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "پسوند" @@ -2268,7 +2266,7 @@ msgstr "استخراج کردن پوشه" msgid "Extracting..." msgstr "استخراج کردن..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "بایت ÙÛŒÙÙˆ" @@ -2333,6 +2331,11 @@ msgstr "بارگذاری bthprops.cpl با شکست مواجه شد" msgid "Failed to load hid.dll" msgstr "بارگذاری hid.dll با شکست مواجه شد" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "نوشتن سرخط برای %s با شکست مواجه شد" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "خواندن banner.bin با شکست مواجه شد" @@ -2423,11 +2426,11 @@ msgstr "پارسی" msgid "Fast" msgstr "سریع" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "نسخه سریع واحد مدیریت حاÙظه. برای همه بازی ها عمل نمی کند." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2484,7 +2487,7 @@ msgstr "ورودی/خروجی Ùایل: حالت گشودن ناشناس : 0x%02 msgid "Filesystem" msgstr "Ùایل سیستم" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "نوع Ùایل 'ini' ناشناس است! باز نخواهد شد!" @@ -2567,17 +2570,17 @@ msgstr "" msgid "Forward" msgstr "جلو" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "پیدا کردن نتایج %d برای '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Ùریم" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Ùریم" @@ -2649,7 +2652,7 @@ msgstr "پیکربندی میکروÙÙ† گیم کیوب" msgid "GCPad" msgstr "گیم پد گیم کیوب" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2690,7 +2693,7 @@ msgid "Gamecube &Pad Settings" msgstr "تنظیمات &دسته گیم کیوب" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "کارت های حاÙظه گیم کیوب (*.raw.*.gcp)" @@ -2803,7 +2806,7 @@ msgstr "Ú†Ú© کردن سر خط برای یاÙتن خطا با شکست موا msgid "Hebrew" msgstr "عبری" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "ارتÙاع" @@ -2829,7 +2832,7 @@ msgstr "" "\n" "سایونارا!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "مخÙÛŒ" @@ -2897,11 +2900,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - مقصد ناصحیح" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "تنظیمات Ø¢ÛŒ Ù¾ÛŒ ال" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "Ùروسرخ" @@ -2917,7 +2920,7 @@ msgstr "میزان حساسیت Ùروسرخ" msgid "ISO Details" msgstr "جزئیات آیزو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "پوشه های آیزو" @@ -3056,7 +3059,7 @@ msgstr "درج" msgid "Insert Encrypted or Decrypted code here..." msgstr "درج کد رمز شده Ùˆ یا کش٠شده..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "درج کارت اس دی" @@ -3068,7 +3071,7 @@ msgstr "درج اسم..." msgid "Install WAD" msgstr "نصب واد" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "نصب به Ùهرست انتخاب ÙˆÛŒ" @@ -3079,7 +3082,7 @@ msgstr "" "نصب دستگذار استثناء Ùراخوانده شد، اما این پلتÙورم هنوز از این امکان پشتیبانی " "نمی کند." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "در حال نصب واد..." @@ -3108,7 +3111,7 @@ msgstr "" msgid "Interface" msgstr "واسط گراÙیک" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "تنظیمات واسط گراÙیک" @@ -3190,7 +3193,7 @@ msgstr "رشته جستجوی نامعتبر (قادر به تبدیل به عد msgid "Invalid search string (only even string lengths supported)" msgstr "رشته جستجوی نامعتبر (Ùقط رشته های با طول زوج پشتیبانی Ù…ÛŒ شود)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "وضعیت نامعتبر" @@ -3272,7 +3275,7 @@ msgstr "آخرین وضعیت بازنویسی شده" msgid "Last Saved State" msgstr "آخرین وضعیت ذخیره شده" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3372,11 +3375,11 @@ msgstr "بارگذاری وضعیت - شکا٠۸" msgid "Load State..." msgstr "بارگذاری وضعیت..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "بارگذاری منوی سیستم ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "بارگذاری منوی سیستم ÙˆÛŒ %d%c" @@ -3453,7 +3456,7 @@ msgstr "" "Ú†Ú© سام MD5 ناهمسان است\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Ù‡Ú© کردن سرعت واحد مدیریت حاÙظه" @@ -3488,7 +3491,7 @@ msgstr "کارت حاÙظه Ùایل ذخیره برای این عنوان را msgid "Memcard already opened" msgstr "کارت حاÙظه قبلا باز شده است" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "بایت حاÙظه" @@ -3505,7 +3508,7 @@ msgstr "" "اخطار: قبل از استÙاده از کارت حاÙظه بک آپ بگیرید، شاید درست شود اما اطلاعات " "از بین خواهد رÙت!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3543,7 +3546,7 @@ msgstr "حداقل" msgid "Misc" msgstr "متÙرقه" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "تنظیمات متÙرقه" @@ -3568,11 +3571,11 @@ msgstr "" msgid "Monospaced font" msgstr "Ùونت هم عرض" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "موشن پلاس" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "موتور" @@ -3608,11 +3611,11 @@ msgstr "" "Ø®ÙÙ‡ کردن اسپیکر ویموت. درست کردن قطعی های تصادÙÛŒ ویموت های واقعی. هیچ تاثیری " "بر ویموت های برابرسازی شده ندارد." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "ناپ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "توجه: سایز مسیل با طول حقیقی داده برابر نیست\n" @@ -3739,7 +3742,7 @@ msgstr "اسم مستعار :" msgid "No Country (SDK)" msgstr "بدون کشور (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "هیچ آیزو یا وادی پیدا نشد" @@ -3748,8 +3751,8 @@ msgstr "هیچ آیزو یا وادی پیدا نشد" msgid "No banner file found for title %s" msgstr "Ùایل نشان برای عنوان %s پیدا نشد" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "تشریحی دردسترس نیست" @@ -3757,7 +3760,7 @@ msgstr "تشریحی دردسترس نیست" msgid "No docking" msgstr "بدون جاخالی کردن" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "هیچ Ùایلی بارگذاری نشده" @@ -3765,7 +3768,7 @@ msgstr "هیچ Ùایلی بارگذاری نشده" msgid "No free dir index entries" msgstr "بدون مقادیر اطلاعاتی Ùهرست پوشه آزاد" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "بدون Ùایل ضبط شده" @@ -3788,7 +3791,7 @@ msgid "Not Equal" msgstr "برابر نیست" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "ست نشده است" @@ -3796,7 +3799,7 @@ msgstr "ست نشده است" msgid "Not connected" msgstr "متصل نشده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "یادداشت ها" @@ -3830,7 +3833,7 @@ msgstr "ننچاک" msgid "Nunchuk Acceleration" msgstr "شتاب دهنده ننچاک" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "شیی" @@ -3861,11 +3864,11 @@ msgstr "Ùقط بلوک های %d موجود است" msgid "Open" msgstr "گشودن" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "باز کردن پوشه &شامل" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "باز کردن پوشه &ذخیره ÙˆÛŒ" @@ -3895,7 +3898,7 @@ msgstr "کدبرداری باÙت اشیاء توسط OpenCL" msgid "OpenMP Texture Decoder" msgstr "کدبرداری باÙت اشیاء توسط OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "گزینه ها" @@ -3980,8 +3983,8 @@ msgstr "وصله ها" msgid "Paths" msgstr "مسیرها" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Ù…Ú©Ø«" @@ -4005,8 +4008,8 @@ msgstr "چشم انداز %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "شروع بازی" @@ -4032,7 +4035,7 @@ msgstr "گزینه های بازنواخت" msgid "Players" msgstr "بازی کنان" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "لطÙا تایید کنید..." @@ -4048,19 +4051,19 @@ msgstr "مینوس پلاس" msgid "Polish" msgstr "لهستانی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "درگاه Û±" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "درگاه Û²" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "درگاه Û³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "درگاه Û´" @@ -4081,17 +4084,17 @@ msgstr "پرتقالی (برزیلی)" msgid "Post-Processing Effect:" msgstr "اÙکت ها:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "پایان نابهنگام Ùیلم در کنترل کننده پخش. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "پایان نابهنگام Ùیلم در ویموت پخش. %u > %u" @@ -4190,7 +4193,7 @@ msgstr "برقراری ارتباط مجدد ویموت در بارگذاری Ùˆ #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "ضبط" @@ -4247,7 +4250,7 @@ msgstr "به روز کردن لیست بازی" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "پاک کردن" @@ -4288,7 +4291,7 @@ msgstr "راست" msgid "Right Stick" msgstr "استیک راست" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "شوک" @@ -4370,7 +4373,7 @@ msgstr "ذخیره وضعیت..." msgid "Save as..." msgstr "ذخیره بعنوان..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو Ùشرده شده" @@ -4378,11 +4381,11 @@ msgstr "ذخیره جی سی ام/آیزو Ùشرده شده" msgid "Save current perspective" msgstr "دخیره چشم انداز Ùعلی" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "ذخیره جی سی ام/آیزو ناهمÙشرده شده" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "ذخیره وضعیت Ùیلم %s خراب است، ضبط Ùیلم میایستد..." @@ -4391,16 +4394,16 @@ msgstr "ذخیره وضعیت Ùیلم %s خراب است، ضبط Ùیلم Ù…ÛŒ msgid "Scaled EFB Copy" msgstr "Ú©Ù¾ÛŒ حاÙظه میانجی Ùریم جاساز شده (EFB) تغییر سایز یاÙته" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "در حال پویش %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "پویش برای Ùایل های آیزو" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "در حال پویش..." @@ -4420,7 +4423,7 @@ msgstr "جستجو" msgid "Search Filter" msgstr "Ùیلتر جستجو" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "جستجوی پوشه های Ùرعی" @@ -4444,11 +4447,11 @@ msgid "Select" msgstr "انتخاب" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "انتخاب Ùایل ضبط شده" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "انتخاب Ùایل ÙˆÛŒ واد برای نصب" @@ -4474,15 +4477,15 @@ msgstr "انتخاب پنجره های شناور" msgid "Select the file to load" msgstr "انتخاب Ùایل برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "انتخاب Ùایل ذخیره" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "انتخاب وضعیت برای بارگذاری" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "انتخاب وضعیت برای ذخیره" @@ -4575,7 +4578,7 @@ msgstr "" msgid "Set" msgstr "ست" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "ست کردن بعنوان آیزو &پیش Ùرض" @@ -4605,7 +4608,7 @@ msgstr "تنظیمات..." msgid "SetupWiiMem: Cant find setting file" msgstr "برپاکردن حاÙظه ÙˆÛŒ: ناتوان در پیدا کردن Ùایل تنظیم" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "لرزش" @@ -4783,7 +4786,7 @@ msgstr "" "\n" "اگر در این مورد اطمینان ندارید، این گزینه را Ùعال نکنید." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "ویموت Ùرعی" @@ -4791,14 +4794,18 @@ msgstr "ویموت Ùرعی" msgid "Simplified Chinese" msgstr "چینی ساده شده" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "سایز" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "جهش از روی بایوس" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "از قلم انداختن مقصد آلÙا پاس" @@ -4842,11 +4849,11 @@ msgstr "" msgid "Slot %i" msgstr "شکا٠%i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "شکا٠ای" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "شکا٠بی" @@ -4871,7 +4878,7 @@ msgstr "" "آیا شما واقعا قصد Ùعال کردن این گزینه را دارید؟ اگر در این مورد اطمینان " "ندارید، 'نه' را انتخاب کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "تنظیمات صدا" @@ -4949,7 +4956,7 @@ msgstr "شروع &ضبط" msgid "Start Recording" msgstr "شروع ضبط" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "وضعیت" @@ -5009,12 +5016,12 @@ msgstr "صادر کردن Ùایل به %s با موÙقیت انجام شد" msgid "Successfully imported save files" msgstr "Ùایل های ذخیره با موÙقیت وارد شدند" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "نوسان" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "زبان سیستم:" @@ -5082,13 +5089,13 @@ msgstr "آدرس بی اعتبار است" msgid "The checksum was successfully fixed" msgstr "Ú†Ú© سام با موÙقیت درست شد" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "پوشه برگزیده قبلا در لیست بوده است" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5176,7 +5183,7 @@ msgstr "Ùایل مشخص شده \"%s\" وجود ندارد" msgid "The value is invalid" msgstr "مقدار بی اعتبار است" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "تم" @@ -5210,9 +5217,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "این مورد میتواند سبب کند شدن منوی ÙˆÛŒ Ùˆ تعدادی از بازی ها شود." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5248,12 +5257,12 @@ msgstr "این مورد به شما اجازه خواهد داد تا Ùایل msgid "Threshold" msgstr "سرحد" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "لرزیدن" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "عنوان" @@ -5317,7 +5326,7 @@ msgstr "نوع" msgid "UDP Port:" msgstr "درگاه UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "ویموت UDP" @@ -5326,7 +5335,7 @@ msgstr "ویموت UDP" msgid "UNKNOWN" msgstr "ناشناخته" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "ناشناخته_%02X" @@ -5363,7 +5372,7 @@ msgstr "تعری٠نشده %i" msgid "Undo Load State" msgstr "خنثی کردن وضعیت بارگذاری" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Ùرمان 0x80 غیرمنتظره؟ برنامه در حال اجرا متوق٠می شود..." @@ -5401,11 +5410,11 @@ msgstr "بالا" msgid "Update" msgstr "به روز کردن" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ویموت عمودی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "استÙاده از حالت پال Û¶Û° هرتز (PAL60)" @@ -5480,7 +5489,7 @@ msgstr "ویدیو" msgid "Virtual" msgstr "مجازی" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "حجم صدا" @@ -5547,7 +5556,7 @@ msgstr "" "Ùˆ داشتن اسم یکسان مانند یک Ùایل در کارت حاÙظه شما\n" "ادامه Ù…ÛŒ دهید؟" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5559,7 +5568,7 @@ msgstr "" "دیگری را بارگذاری کنید، یا این وضعیت را با حالت Ùقط خواندنی خاموش بارگذاری " "کنید." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5570,7 +5579,7 @@ msgstr "" "ندارد. قبل از ادامه شما باید ذخیره دیگری را بارگذاری کنید، یا این وضعیت را " "با حالت Ùقط خواندنی خاموش بارگذاری کنید. وگرنه شاید شما دچار نا همزمانی شوید." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5616,7 +5625,7 @@ msgstr "بد شانسی" msgid "Widescreen Hack" msgstr "Ù‡Ú© کردن صÙحه عریض" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "عرض" @@ -5628,7 +5637,7 @@ msgstr "ÙˆÛŒ" msgid "Wii Console" msgstr "میز Ùرمان ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "ریشه ÙˆÛŒ نند:" @@ -5636,7 +5645,7 @@ msgstr "ریشه ÙˆÛŒ نند:" msgid "Wii Save Import" msgstr "وارد کردن Ùایل ذخیره ÙˆÛŒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Ùایل های ذخیره ÙˆÛŒ (*.bin)|*.bin" @@ -5699,10 +5708,10 @@ msgstr "پنجره ها راست" msgid "Word Wrap" msgstr "پیچیدن کلمه" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "در حال کار..." @@ -5737,7 +5746,7 @@ msgstr "صدای اکس Û² (XAdudio2) - اينيت با شکست مواجه شد msgid "XAudio2 master voice creation failed: %#X" msgstr "صدای اکس Û² (XAdudio2) - ساخت آوای مستر منبع با شکست مواجه شد: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "ثبت اکس اÙ" @@ -5774,7 +5783,7 @@ msgstr "شما باید یک مقدار صحیح برای دسیمال، هگز msgid "You must enter a valid profile name." msgstr "شما باید یک اسم معتبر برای پروÙایل وارد کنید." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "برای اعمال تغییرات شما باید دلÙین را از نو اجرا کنید." @@ -5868,7 +5877,7 @@ msgstr "" msgid "^ ADD" msgstr "^ اضاÙÙ‡ کردن" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "بارگذار برنامه (.img)" @@ -5895,7 +5904,7 @@ msgstr "خطای iCacheJIT: خواندن شناسنده از %x. لطÙا گزا msgid "not a wii save or read failure for file header size %x" msgstr "یک ذخیره ÙˆÛŒ نیست یا شکست برای خواندن سایز سرخط Ùایل %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5904,7 +5913,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Ùرمان ناشناخته 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "خطای 1- wxExecute در اجرای برنامه!" @@ -6002,9 +6011,20 @@ msgstr "| یا" #~ msgid "Enable Audio Throttle" #~ msgstr "Ùعال کردن دریچه صدا" +#~ msgid "Enable BAT" +#~ msgstr "Ùعال کردن انتقال آدرس بلوک" + #~ msgid "Enable DTK Music" #~ msgstr "Ùعال کردن موزیک دی تی Ú©ÛŒ" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "انتقال آدرس بلوک را Ùعال Ù…ÛŒ کند; کارایی واحد مدیریت حاÙظه. بالا بردن دقت " +#~ "سخت اÙزار، اما سبب کند شدن برابرسازی میگردد. (روشن = سازگار، خاموش = سریع)" + #~ msgid "" #~ "Error in PlayWiimote. %u != %u, byte %d.\n" #~ "Sorry, Wii recording is temporarily broken." diff --git a/Languages/po/fr.po b/Languages/po/fr.po index b955029b61..61f6c4e660 100644 --- a/Languages/po/fr.po +++ b/Languages/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-21 11:57+0100\n" "Last-Translator: Pascal\n" "Language-Team: \n" @@ -42,9 +42,10 @@ msgstr "" #: Source/Core/Core/Src/CoreParameter.cpp:144 #, c-format msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." -msgstr "\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." +msgstr "" +"\"%s\" n'est pas un fichier GCM/ISO valide, ou n'est pas une ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -95,7 +96,8 @@ msgid "" "file is not large enough to be a valid memory card file (0x%x bytes)" msgstr "" "%s n'a pas pu être chargé en tant que carte mémoire.\n" -"Le fichier n'est pas assez grand pour être un fichier de carte mémoire valide (0x%x octets)" +"Le fichier n'est pas assez grand pour être un fichier de carte mémoire " +"valide (0x%x octets)" #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:367 #, c-format @@ -176,11 +178,11 @@ msgstr "Gestionnaire de &cheats" msgid "&DSP Settings" msgstr "Paramètres &DSP (audio)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Supprimer l'ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Supprimer les ISO sélectionnés" @@ -244,7 +246,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Démarrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriétés" @@ -288,11 +290,11 @@ msgstr "&Affichage" msgid "&Wiimote Settings" msgstr "Paramètres de la &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -312,7 +314,7 @@ msgstr "Inconnu" msgid "(off)" msgstr "(aucun)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -353,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -370,20 +372,24 @@ msgstr "Il n'y a pas de jeu en cours d'émulation." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:208 msgid "" "A supported bluetooth device could not be found!\n" -"If you are not using Microsoft's bluetooth stack you must manually pair your wiimotes and use only the \"Refresh\" button." +"If you are not using Microsoft's bluetooth stack you must manually pair your " +"wiimotes and use only the \"Refresh\" button." msgstr "" "Aucun périphérique Bluetooth prise en charge n'a été détecté !\n" -"Si vous n'utilisez pas la pile Bluetooth de Microsoft, vous pouvez jumeler manuellement vos Wiimotes et utiliser uniquement le bouton \"Rafraîchir\"." +"Si vous n'utilisez pas la pile Bluetooth de Microsoft, vous pouvez jumeler " +"manuellement vos Wiimotes et utiliser uniquement le bouton \"Rafraîchir\"." #: Source/Core/DolphinWX/Src/NetWindow.cpp:89 msgid "" "ALERT:\n" "\n" -"NetPlay will currently only work properly when using the following settings:\n" +"NetPlay will currently only work properly when using the following " +"settings:\n" " - Dual Core [OFF]\n" " - Audio Throttle [OFF]\n" " - DSP-HLE with \"Null Audio\" or DSP-LLE\n" -" - Manually set the exact number of controllers that will be used to [Standard Controller]\n" +" - Manually set the exact number of controllers that will be used to " +"[Standard Controller]\n" "\n" "All players should try to use the same Dolphin version and settings.\n" "Disable all memory cards or send them to all players before starting.\n" @@ -397,10 +403,13 @@ msgstr "" " - Dual Core désactivé\n" " - Audio Throttle désactivé\n" " - DSP-HLE avec \"Null Audio\" ou le DSL-LLE\n" -" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans [Contrôleur standard]\n" +" - Spécifier manuellement le nombre de contôleurs qui seront utilisés dans " +"[Contrôleur standard]\n" "\n" -"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et les mêmes paramètres.\n" -"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les joueurs avant de démarrer.\n" +"Tous les joueurs devraient essayer d'utiliser la même version de Dolphin et " +"les mêmes paramètres.\n" +"Désactiver toutes les cartes mémoires, ou sinon les envoyer à tous les " +"joueurs avant de démarrer.\n" "La prise en charge de la Wiimote n'est pas encore implémentée.\n" "\n" "Vous devez indiquer le port TCP à l'hôte !!" @@ -434,12 +443,14 @@ msgstr "Emulation fidèle VBeam" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:92 msgid "" "Accurately emulate EFB copies.\n" -"Some games depend on this for certain graphical effects or gameplay functionality.\n" +"Some games depend on this for certain graphical effects or gameplay " +"functionality.\n" "\n" "If unsure, check EFB to Texture instead." msgstr "" "Emule fidèlement les copies d'EFB.\n" -"Certains jeux requièrent ceci pour certains effets graphiques ou fonctionnalités dans le jeu.\n" +"Certains jeux requièrent ceci pour certains effets graphiques ou " +"fonctionnalités dans le jeu.\n" "\n" "Dans le doute, cochez plutôt EFB vers texture." @@ -465,28 +476,44 @@ msgstr "" #: Source/Core/Core/Src/ActionReplay.cpp:667 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Ajout (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Add Code (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Ajout (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:755 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le code Remplir et déplacer (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Fill and Slide " +"(%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans le " +"code Remplir et déplacer (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:547 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans l'écriture de la RAM et Remplir (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And " +"Fill (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans " +"l'écriture de la RAM et Remplir (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:607 #, c-format -msgid "Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)" -msgstr "Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire vers Pointeur (%s)" +msgid "" +"Action Replay Error: Invalid size (%08x : address = %08x) in Write To " +"Pointer (%s)" +msgstr "" +"Erreur Action Replay : Taille non valide (%08x : adresse = %08x) dans Ecrire " +"vers Pointeur (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:802 #, c-format msgid "Action Replay Error: Invalid value (%08x) in Memory Copy (%s)" -msgstr "Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" +msgstr "" +"Erreur Action Replay : Valeur non valide (%08x) dans la Copie de mémoire (%s)" #: Source/Core/Core/Src/ActionReplay.cpp:682 #, c-format @@ -494,7 +521,8 @@ msgid "" "Action Replay Error: Master Code and Write To CCXXXXXX not implemented (%s)\n" "Master codes are not needed. Do not use master codes." msgstr "" -"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés (%s)\n" +"Erreur Action Replay : Master Code et Write To CCXXXXXX non implémentés " +"(%s)\n" "Les Master codes ne sont pas requis. Ne les utilisez pas." #: Source/Core/Core/Src/ActionReplay.cpp:196 @@ -531,11 +559,11 @@ msgstr "Carte :" msgid "Add" msgstr "Ajouter" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Ajouter un code ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Ajouter un patch" @@ -545,7 +573,7 @@ msgstr "Ajouter un nouveau panneau" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Ajouter..." @@ -557,14 +585,16 @@ msgstr "Adresse :" msgid "" "Adds the specified value to zFar Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zFar.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." @@ -573,21 +603,24 @@ msgstr "" msgid "" "Adds the specified value to zNear Parameter.\n" "Two ways to express the floating point values.\n" -"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, the acquired value will be ''0.0002''.\n" +"Example: entering ''200'' or ''0.0002'' directly, it produces equal effects, " +"the acquired value will be ''0.0002''.\n" "Values: (0->+/-Integer) or (0->+/-FP[6 digits of precision])\n" "\n" "NOTE: Check LogWindow/Console for the acquired values." msgstr "" "Ajoute la valeur spécifiée au paramètre zNear.\n" "Il y a 2 façons d'indiquer les valeurs en virgule flottante.\n" -"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, la valeur retenue sera \"0.0002\".\n" +"Exemple : entrer \"'200\" ou \"0.0002\" directement produit le même effet, " +"la valeur retenue sera \"0.0002\".\n" "Valeurs : (0->+/- Integer) ou (0->+/-FP[précision à 6 chiffres])\n" "\n" "NOTE: Consultez LogWindow/Console pour les valeurs acquises." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:758 msgid "Adjust the analog control pressure required to activate buttons." -msgstr "Ajuste le contrôle analogique de pression requise pour activer les boutons." +msgstr "" +"Ajuste le contrôle analogique de pression requise pour activer les boutons." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:510 msgid "Advanced" @@ -601,24 +634,24 @@ msgstr "Paramètres avancés" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tous les fichiers GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Toutes les images GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tous les fichiers GameCube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tous les états sauvegardés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tous les fichiers ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tous les fichiers ISO compressés GC/Wii (gcz)" @@ -627,12 +660,15 @@ msgid "All files (*.*)|*.*" msgstr "Tous les fichiers (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 dans la fenêtre d'émulation.\n" +"Permet d'activer certaines options via les raccourcis clavier 3, 4, 5, et 6 " +"dans la fenêtre d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -644,6 +680,10 @@ msgstr "Délai alternatif de communication avec la Wiimote" msgid "Analyze" msgstr "Analyser" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrage anisotropique :" @@ -660,7 +700,7 @@ msgstr "L'apploader n'a pas la bonne taille... est-ce vraiment un apploader ?" msgid "Apploader unable to load from file" msgstr "L'apploader ne peut charger depuis ce fichier" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader :" @@ -674,7 +714,8 @@ msgid "" "\n" "If unsure, select (off)." msgstr "" -"Appliquer un effet de post-processing après avoir fini le rendu d'une image.\n" +"Appliquer un effet de post-processing après avoir fini le rendu d'une " +"image.\n" "\n" "Dans le doute, sélectionnez (aucun)." @@ -687,7 +728,7 @@ msgstr "Arabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Êtes-vous sûr de vouloir supprimer \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -695,11 +736,13 @@ msgstr "" "Êtes-vous sûr de vouloir supprimer ces fichiers ?\n" "Ils seront définitivement supprimés !" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" -msgstr "Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé définitivement !" +msgstr "" +"Êtes-vous sûr de vouloir supprimer ce fichier ? Il sera supprimé " +"définitivement !" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Format d'écran :" @@ -713,7 +756,7 @@ msgstr "Au moins un panneau doit rester ouvert." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Moteur audio :" @@ -748,11 +791,11 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registres BP" @@ -760,7 +803,7 @@ msgstr "Registres BP" msgid "Back" msgstr "Retour" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Paramètres de l'interface audio" @@ -769,7 +812,7 @@ msgstr "Paramètres de l'interface audio" msgid "Backend:" msgstr "Moteur :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Entrée en arrière-plan" @@ -783,7 +826,7 @@ msgid "Bad File Header" msgstr "Mauvaise entête de fichier" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Bannière" @@ -813,7 +856,9 @@ msgstr "Basse" #: Source/Core/Core/Src/HW/GCMemcard.cpp:186 msgid "Block Allocation Table checksum failed" -msgstr "Echec de la vérification de la somme de contrôle de la Table d'Allocation de Blocs" +msgstr "" +"Echec de la vérification de la somme de contrôle de la Table d'Allocation de " +"Blocs" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:629 msgid "Blocks" @@ -849,7 +894,7 @@ msgstr "Corrompu" msgid "Browse" msgstr "Parcourir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Choisir un dossier à ajouter" @@ -857,7 +902,7 @@ msgstr "Choisir un dossier à ajouter" msgid "Browse for an ISO directory..." msgstr "Rechercher un dossier contenant des ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Parcourir un dossier de destination" @@ -871,7 +916,13 @@ msgstr "Buffer :" msgid "Buttons" msgstr "Boutons" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -883,7 +934,7 @@ msgstr "Stick-C" msgid "C-Stick" msgstr "Stick-C" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -904,8 +955,10 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Calcule la lumière des graphiques 3D par pixel et non par vertex.\n" -"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre GPU).\n" -"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques pépins.\n" +"Diminue la vitesse d'émulation de quelques pourcents (en fonction de votre " +"GPU).\n" +"Cette amélioration est plutôt sûre, mais peut parfois provoquer quelques " +"pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -923,9 +976,10 @@ msgstr "Impossible d'ouvrir %s" #: Source/Core/Core/Src/CoreTiming.cpp:141 msgid "Cannot unregister events with events pending" -msgstr "Impossible de désenregistrer des évènements alors qu'il y en a en attente." +msgstr "" +"Impossible de désenregistrer des évènements alors qu'il y en a en attente." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -936,7 +990,7 @@ msgstr "" "%s\n" "n'est pas un fichier de carte mémoire GameCube valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -947,7 +1001,8 @@ msgstr "" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1856 #, c-format msgid "Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x" -msgstr "Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" +msgstr "" +"Impossible de trouver la Wiimote par bd : %02x:%02x:%02x:%02x:%02x:%02x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870 #, c-format @@ -957,7 +1012,8 @@ msgstr "Impossible de trouver la Wiimote par le gestionnaire de connexion %02x" #: Source/Core/Core/Src/HW/DVDInterface.cpp:679 #: Source/Core/Core/Src/HW/DVDInterface.cpp:689 msgid "Cant read from DVD_Plugin - DVD-Interface: Fatal Error" -msgstr "Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" +msgstr "" +"Impossible de lire à partir de DVD_Plugin - DVD-Interface : Erreur fatale" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:52 msgid "Caps Lock" @@ -967,7 +1023,7 @@ msgstr "Verr Maj" msgid "Catalan" msgstr "Catalan" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centre" @@ -1040,23 +1096,23 @@ msgstr "Chinois (simplifié)" msgid "Chinese (Traditional)" msgstr "Chinois (traditionnel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Choisir un dossier racine pour le DVD :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Choisir un dossier racine pour la NAND :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Choisir un ISO par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Choisir un dossier à ajouter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Choisir un fichier à ouvrir" @@ -1064,9 +1120,13 @@ msgstr "Choisir un fichier à ouvrir" msgid "Choose a memory card:" msgstr "Choisir une carte mémoire :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 -msgid "Choose file to use as apploader: (applies to discs constructed from directories only)" -msgstr "Choisir un fichier comme apploader : (uniquement pour les disques créés à partir de dossiers)" +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +msgid "" +"Choose file to use as apploader: (applies to discs constructed from " +"directories only)" +msgstr "" +"Choisir un fichier comme apploader : (uniquement pour les disques créés à " +"partir de dossiers)" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:776 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:815 @@ -1089,8 +1149,12 @@ msgid "Clear" msgstr "Effacer" #: Source/Core/Core/Src/NetPlayServer.cpp:259 -msgid "Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game." -msgstr "Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Client disconnect while game is running!! NetPlay is disabled. You must " +"manually stop the game." +msgstr "" +"Le client s'est déconnecté alors que le jeu est en cours !! NetPlay est " +"désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:297 #: Source/Core/DolphinWX/Src/MemcardManager.cpp:245 @@ -1123,16 +1187,16 @@ msgstr "Commentaire" msgid "Comment:" msgstr "Commentaire :" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Compresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Compresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Compression de l'ISO" @@ -1159,9 +1223,9 @@ msgstr "Configurer les manettes" msgid "Configure..." msgstr "Configurer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmer l'écrasement du fichier" @@ -1174,7 +1238,7 @@ msgstr "Confirmer l'arrêt de l'émulation" msgid "Connect" msgstr "Connecter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Connecter le clavier USB" @@ -1219,7 +1283,7 @@ msgstr "Contrôle" msgid "Convert to GCI" msgstr "Convertir en GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Echec de la copie" @@ -1244,8 +1308,15 @@ msgstr "Impossible d'initialiser le moteur %s." #: Source/Core/Core/Src/CoreParameter.cpp:139 #, c-format -msgid "Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." -msgstr "Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur PC." +msgid "" +"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii " +"backup. Please note that original Gamecube and Wii discs cannot be read by " +"most PC DVD drives." +msgstr "" +"Impossible de lire \"%s\". Il n'y a pas de disque dans le lecteur, ou ce " +"n'est pas un backup GC/Wii. Veuillez noter que les disques originaux de " +"GameCube et Wii ne peuvent pas être plus par la plupart des lecteurs DVD sur " +"PC." #: Source/Core/Core/Src/CoreParameter.cpp:294 #, c-format @@ -1262,25 +1333,29 @@ msgid "" "Could not set pads. The player left or the game is currently running!\n" "(setting pads while the game is running is not yet supported)" msgstr "" -"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est en cours d'exécution !\n" -"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore pris en charge)" +"Impossible de définir les manettes. Le joueur a quitté le jeu ou le jeu est " +"en cours d'exécution !\n" +"(le paramétrage des manettes pendant l'émulation du jeu n'est pas encore " +"pris en charge)" #: Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp:123 #, c-format msgid "" "Could not write memory card file %s.\n" "\n" -"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?" +"Are you running Dolphin from a CD/DVD, or is the save file maybe write " +"protected?" msgstr "" "Impossible d'écrire le fichier de carte mémoire %s.\n" "\n" -"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est peut-être protégé contré l'écriture ?" +"Exécutez-vous Dolpin à partir d'un CD/DVD, ou le fichier de sauvegarde est " +"peut-être protégé contré l'écriture ?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossible de trouver la commande d'ouverture pour l'extension 'ini' !" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1354,7 +1429,7 @@ msgstr "Personnalise certains paramètres de projection orthographique." msgid "Czech" msgstr "Tchèque" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1366,7 +1441,7 @@ msgstr "Pad numérique" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Moteur d'émulation du DSP (Audio)" @@ -1379,7 +1454,7 @@ msgstr "Emulation du DSP en HLE (rapide)" msgid "DSP LLE interpreter (slow)" msgstr "Interpréteur du DSP en LLE (lent)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE sur thread" @@ -1391,7 +1466,7 @@ msgstr "Recompilateur du DSP en LLE" msgid "DSP settings" msgstr "Paramètres DSP (audio)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Racine du DVD :" @@ -1436,16 +1511,16 @@ msgstr "Débug" msgid "Decimal" msgstr "Décimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Décompresser l'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Décompresser les ISO sélectionnés..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Décompression de l'ISO" @@ -1453,7 +1528,7 @@ msgstr "Décompression de l'ISO" msgid "Default" msgstr "Par défaut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO par défaut :" @@ -1485,16 +1560,20 @@ msgstr "Détecter" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:232 #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp:327 -msgid "Detected attempt to read more data from the DVD than fit inside the out buffer. Clamp." -msgstr "Détecté que le DVD a essayé de lire plus de données que ce que peut contenir le buffer de sortie." +msgid "" +"Detected attempt to read more data from the DVD than fit inside the out " +"buffer. Clamp." +msgstr "" +"Détecté que le DVD a essayé de lire plus de données que ce que peut contenir " +"le buffer de sortie." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:130 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:901 msgid "Device" msgstr "Appareil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Paramètres de la console virtuelle" @@ -1530,24 +1609,30 @@ msgstr "Désactiver la fumée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103 msgid "" "Disable any XFB emulation.\n" -"Speeds up emulation a lot but causes heavy glitches in many games which rely on them (especially homebrew applications).\n" +"Speeds up emulation a lot but causes heavy glitches in many games which rely " +"on them (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Désactive l'émulation des XFB.\n" -"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux jeux s'appuyant dessus (particulièrement les applications homebrew).\n" +"Accélère beaucoup l'émulation mais provoque de gros pépins dans les nombreux " +"jeux s'appuyant dessus (particulièrement les applications homebrew).\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:90 msgid "" "Disable emulation of EFB copies.\n" -"These are often used for post-processing or render-to-texture effects, so while checking this setting gives a great speedup it almost always also causes issues.\n" +"These are often used for post-processing or render-to-texture effects, so " +"while checking this setting gives a great speedup it almost always also " +"causes issues.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Désactive l'émulation de copies d'EFB.\n" -"Elles sont souvent utilisées pour du post-processing ou des effets de rendu sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais aussi provoquer des pépins.\n" +"Elles sont souvent utilisées pour du post-processing ou des effets de rendu " +"sur texture, donc cocher cette case va beaucoup accélérer l'émulation mais " +"aussi provoquer des pépins.\n" "\n" "Dans le doute, décochez cette case." @@ -1578,11 +1663,11 @@ msgstr "" msgid "Divide" msgstr "Diviser" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Voulez-vous arrêter l'émulation en cours ?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "Décodeur Dolby Pro Logic II" @@ -1611,12 +1696,12 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuration de la manette GC pour Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Films TAS Dolphin (*.dtm)" @@ -1628,16 +1713,24 @@ msgstr "Configuration de la Wiimote pour Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin dans &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 -msgid "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..." -msgstr "Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des fichiers..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 +msgid "" +"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " +"files..." +msgstr "" +"Dolphin n'a pas trouvé d'ISO GC/Wii. Double-cliquez ici pour chercher des " +"fichiers..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 -msgid "Dolphin is currently set to hide all games. Doubleclick here to show all games..." -msgstr "Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour afficher tous les jeux..." +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 +msgid "" +"Dolphin is currently set to hide all games. Doubleclick here to show all " +"games..." +msgstr "" +"Dolphin est paramétré pour cacher tous les jeux. Double-cliquez ici pour " +"afficher tous les jeux..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "Dolphin n'a pas pu exécuter l'action demandée." @@ -1663,7 +1756,7 @@ msgstr "Percussions" msgid "Dummy" msgstr "Factice" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Enregistrer le son" @@ -1685,7 +1778,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/Dump/Frames/\n" +"Copier toutes les images rendues (calculées) dans un fichier AVI dans User/" +"Dump/Frames/\n" "\n" "Dans le doute, décochez cette case." @@ -1725,8 +1819,16 @@ msgstr "Copies de l'EFB" #: Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp:227 #, c-format -msgid "ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your Dolphin distribution, a reboot is probably required at this point to get Windows to see the new driver." -msgstr "ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au moins la version %d.%d -- Si vous avez récemment mis à niveau votre distribution de Dolphin, un redémarrage est probablement nécessaire pour que Windows charge le nouveau pilote." +msgid "" +"ERROR: This version of Dolphin requires a TAP-Win32 driver that is at least " +"version %d.%d -- If you recently upgraded your Dolphin distribution, a " +"reboot is probably required at this point to get Windows to see the new " +"driver." +msgstr "" +"ERREUR : cette version de Dolphin requiert un pilote TAP-Win32 qui ait au " +"moins la version %d.%d -- Si vous avez récemment mis à niveau votre " +"distribution de Dolphin, un redémarrage est probablement nécessaire pour que " +"Windows charge le nouveau pilote." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:171 msgid "EUROPE" @@ -1776,24 +1878,31 @@ msgstr "Thread d'émulation déjà en cours d'exécution" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:105 msgid "" "Emulate XFBs accurately.\n" -"Slows down emulation a lot and prohibits high-resolution rendering but is necessary to emulate a number of games properly.\n" +"Slows down emulation a lot and prohibits high-resolution rendering but is " +"necessary to emulate a number of games properly.\n" "\n" "If unsure, check virtual XFB emulation instead." msgstr "" "Emule précisément les XFB.\n" -"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais est nécessaire pour émuler certains jeux correctement.\n" +"Ralentit beaucoup l'émulation et empêche le rendu en haute résolution, mais " +"est nécessaire pour émuler certains jeux correctement.\n" "\n" "Dans le doute, sélectionnez plutôt Virtuel." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:104 msgid "" "Emulate XFBs using GPU texture objects.\n" -"Fixes many games which don't work without XFB emulation while not being as slow as real XFB emulation. However, it may still fail for a lot of other games (especially homebrew applications).\n" +"Fixes many games which don't work without XFB emulation while not being as " +"slow as real XFB emulation. However, it may still fail for a lot of other " +"games (especially homebrew applications).\n" "\n" "If unsure, leave this checked." msgstr "" "Emule les XFB en utilisant les objets de texture du GPU.\n" -"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne pas fonctionner pour beaucoup d'autres jeux (particulièrement les applications homebrew).\n" +"Corrige beaucoup de jeux qui ne fonctionnent pas sans émulation de XFB, sans " +"être aussi lent qu'une réelle émulation de l'XFB. Cependant, cela peut ne " +"pas fonctionner pour beaucoup d'autres jeux (particulièrement les " +"applications homebrew).\n" "Dans le doute, sélectionnez cette case." #: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31 @@ -1810,13 +1919,15 @@ msgstr "Activer" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:86 msgid "" -"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\n" +"Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's " +"supported by your GPU.\n" "Possibly causes issues.\n" "Requires fullscreen to work.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia 3D Vision, si elle est prise en charge par votre GPU.\n" +"Active les effets 3D via la stéréoscopie en utilisant la technologie nVidia " +"3D Vision, si elle est prise en charge par votre GPU.\n" "Peut provoquer des pépins.\n" "Ne fonctionne qu'en plein écran.\n" "\n" @@ -1826,10 +1937,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activer la journalisation AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Activer BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activer l'assemblage de blocs" @@ -1874,7 +1981,7 @@ msgstr "Activer le MMU" msgid "Enable Progressive Scan" msgstr "Activer le Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activer l'économiseur d'écran" @@ -1895,14 +2002,19 @@ msgid "" "If unsure, select 1x." msgstr "" "Active le filtrage anisotropique.\n" -"Améliore la qualité visuelle des textures qui ont des angles de vue obliques.\n" +"Améliore la qualité visuelle des textures qui ont des angles de vue " +"obliques.\n" "Peut provoquer des soucis pour un petit nombre de jeux.\n" "\n" "Dans le doute, sélectionnez 1x." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:325 -msgid "Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)" -msgstr "Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, ARRÊT = Compatible)" +msgid "" +"Enable fast disc access. Needed for a few games. (ON = Fast, OFF = " +"Compatible)" +msgstr "" +"Activer l'accès disque rapide. Requis pour certains jeux. (MARCHE = Rapide, " +"ARRÊT = Compatible)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:816 msgid "Enable pages" @@ -1915,44 +2027,59 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité de l'écran.\n" +"Sélectionnez ceci si vous souhaitez que le rendu se fasse sur l'intégralité " +"de l'écran.\n" "Si cette case est décochée, une fenêtre de rendu sera créée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:76 msgid "" -"Enable this if you want to use the main Dolphin window for rendering rather than a separate render window.\n" +"Enable this if you want to use the main Dolphin window for rendering rather " +"than a separate render window.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" +"Cochez cette case si vous souhaitez que la fenêtre principale de Dolphin " +"soit utilisée pour le rendu, plutôt qu'une fenêtre séparée.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:339 -msgid "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game." -msgstr "Activer ceci pour accélérer La légende de Zelda : Twilight Princess. Désactiver pour TOUS les autres jeux." - -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)" -msgstr "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais lent à émuler. (ON = Compatible, OFF = Rapide)" +msgid "" +"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " +"ANY other game." +msgstr "" +"Activer ceci pour accélérer La légende de Zelda : Twilight Princess. " +"Désactiver pour TOUS les autres jeux." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Active un hack de projection personnalisé" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:513 -msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX." -msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non disponible sur OS X." +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on " +"OSX." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Non " +"disponible sur OS X." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:515 -msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." -msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Uniquement avec le moteur OpenAL." +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " +"Uniquement avec le moteur OpenAL." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:517 -msgid "Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." -msgstr "Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." +msgid "" +"Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend " +"only. May need to rename soft_oal.dll to OpenAL32.dll to make it work." +msgstr "" +"Active l'émulation Dolby Pro Logic II en utilisant le son surround 5.1. " +"Uniquement avec le moteur OpenAL. Il peut être nécessaire de renommer le " +"fichier soft_oal.dll en OpenAL32.dll pour que cela fonctionne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:77 msgid "" @@ -1967,8 +2094,12 @@ msgstr "" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:317 -msgid "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)" -msgstr "Activer le Memory Management Unit (unité de gestion de la mémoire), requis pour certains jeux. (ON = Compatible, OFF = Vitesse)" +msgid "" +"Enables the Memory Management Unit, needed for some games. (ON = Compatible, " +"OFF = Fast)" +msgstr "" +"Activer le Memory Management Unit (unité de gestion de la mémoire), requis " +"pour certains jeux. (ON = Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:111 msgid "" @@ -2015,23 +2146,33 @@ msgstr "Egal" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erreur" #: Source/Core/DolphinWX/Src/Main.cpp:378 msgid "Error loading selected language. Falling back to system default." -msgstr "Erreur lors du chargement de la langue sélectionnée. Retour à la langue par défaut du système." +msgstr "" +"Erreur lors du chargement de la langue sélectionnée. Retour à la langue par " +"défaut du système." #: Source/Core/Common/Src/ChunkFile.h:251 #, c-format -msgid "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load..." -msgstr "Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde %d (0x%X). Abandon du chargement de la sauvegarde d'état." +msgid "" +"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " +"Aborting savestate load..." +msgstr "" +"Erreur : Après \"%s\", trouvé %d (0x%X) au lieu d'un marqueur de sauvegarde " +"%d (0x%X). Abandon du chargement de la sauvegarde d'état." #: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:342 #, c-format -msgid "Error: Trying to access %s fonts but they are not loaded. Games may not show fonts correctly, or crash." -msgstr "Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les jeux peuvent ne pas afficher les polices correctement, ou planter." +msgid "" +"Error: Trying to access %s fonts but they are not loaded. Games may not show " +"fonts correctly, or crash." +msgstr "" +"Erreur : essai d'accès aux polices %s mais elles ne sont pas chargées. Les " +"jeux peuvent ne pas afficher les polices correctement, ou planter." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:30 msgid "Escape" @@ -2044,7 +2185,8 @@ msgstr "Euphorie" #: Source/Core/Core/Src/MemTools.cpp:214 #, c-format msgid "Exception handler - access below memory space. %08llx%08llx" -msgstr "Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" +msgstr "" +"Erreur d'exception : accès à un espace en-dessous de la mémoire. %08llx%08llx" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:61 msgid "Execute" @@ -2071,7 +2213,7 @@ msgstr "Exporter l'enregistrement..." msgid "Export Save" msgstr "Exporter une sauvegarde" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exporter une sauvegarde Wii (expérimental)" @@ -2087,7 +2229,7 @@ msgstr "L'exportation a échoué. Essayer de nouveau ?" msgid "Export save as..." msgstr "Exporter l'enregistrement sous..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extension" @@ -2144,7 +2286,7 @@ msgstr "Extraction du dossier" msgid "Extracting..." msgstr "Extraction..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Octet FIFO" @@ -2195,7 +2337,8 @@ msgstr "" "Il n'est pas fourni avec Dolphin pour des raisons de copyright.\n" "Utilisez DSPSpy pour extraire le fichier de votre console.\n" "\n" -"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas d'extration de ROM.\n" +"Vous pouvez utiliser le moteur DSP HLE à la place, celui-ci ne requiert pas " +"d'extration de ROM.\n" "(Sélectionnez-le depuis l'onglet \"Audio\" dans la fenêtre de configuration.)" #: Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp:99 @@ -2208,6 +2351,11 @@ msgstr "Impossible de charger bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Impossible de charger hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Impossible d'écrire l'entête de %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Impossible de lire banner.bin" @@ -2228,7 +2376,8 @@ msgid "" "Failed to read block allocation table backup correctly\n" "(0x8000-0x9FFF)" msgstr "" -"Impossible de lire correctement la sauvegarde de la table d'allocation des blocs\n" +"Impossible de lire correctement la sauvegarde de la table d'allocation des " +"blocs\n" "(0x8000-0x9FFF)" #: Source/Core/Core/Src/HW/GCMemcard.cpp:142 @@ -2298,14 +2447,17 @@ msgstr "Perse" msgid "Fast" msgstr "Rapide" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Version rapide de la MMU. Ne fonctionne pas avec tous les jeux." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format -msgid "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" -msgstr "Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != %u, byte %u.)%s" +msgid "" +"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" +msgstr "" +"Désynchro fatale. Abandon de la lecure. (Erreur dans Play Wiimote : %u != " +"%u, byte %u.)%s" #: Source/Core/DolphinWX/Src/FrameTools.cpp:199 msgid "Fifo Player" @@ -2357,7 +2509,7 @@ msgstr "FileIO : mode d'ouverture inconnu : 0x%02x" msgid "Filesystem" msgstr "Système de fichiers" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Type de fichier 'ini' est inconnu ! Ne sera pas ouvert !" @@ -2401,7 +2553,8 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Force le filtrage de texture, même si le jeu l'a explicitement désactivé.\n" -"Améliore légèrement la qualité des textures, mais peut provoquer des pépins dans certains jeux.\n" +"Améliore légèrement la qualité des textures, mais peut provoquer des pépins " +"dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2412,7 +2565,8 @@ msgid "" "\n" "If unsure, leave this unchecked." msgstr "" -"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, 16/10è).\n" +"Force le jeu à sortir des graphiques pour les écrans larges (16/9è, " +"16/10è).\n" "Provoque des pépins graphiques dans certains jeux.\n" "\n" "Dans le doute, décochez cette case." @@ -2420,10 +2574,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:493 msgid "" "Forces NTSC-J mode for using the Japanese ROM font.\n" -"Left unchecked, dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games." +"Left unchecked, dolphin defaults to NTSC-U and automatically enables this " +"setting when playing Japanese games." msgstr "" "Force le mode NTSC-J pour utiliser la police de la ROM japonaise.\n" -"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera automatiquement cette option lorsque des jeux japonais seront lancés." +"Si cette case est décochée, Dolphin sera par défaut en NTSC-U et activera " +"automatiquement cette option lorsque des jeux japonais seront lancés." #: Source/Core/Core/Src/HW/GCMemcard.cpp:74 msgid "" @@ -2437,17 +2593,17 @@ msgstr "" msgid "Forward" msgstr "Avant" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Trouvé %d résultats pour '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Image" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Image " @@ -2519,7 +2675,7 @@ msgstr "Configuration du micro GC" msgid "GCPad" msgstr "Manette GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2560,7 +2716,7 @@ msgid "Gamecube &Pad Settings" msgstr "Paramètres de la &manette GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Carte mémoires de GameCube (*.raw,*.gcp)" @@ -2577,10 +2733,14 @@ msgstr "Codes Gecko" #, c-format msgid "" "GeckoCode failed to run (CT%i CST%i) (%s)\n" -"(either a bad code or the code type is not yet supported. Try using the native code handler by placing the codehandler.bin file into the Sys directory and restarting Dolphin.)" +"(either a bad code or the code type is not yet supported. Try using the " +"native code handler by placing the codehandler.bin file into the Sys " +"directory and restarting Dolphin.)" msgstr "" "Echec de l'exécution du GeckoCode (CT%i CST%i) (%s)\n" -"(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez avec le code natif en plaçant le fichier codehandler.bin dans le répertoire Sys, puis redémarrez Dolphin.)" +"(ou c'est un mauvais code, ou il n'est pas encore pris en charge. Essayez " +"avec le code natif en plaçant le fichier codehandler.bin dans le répertoire " +"Sys, puis redémarrez Dolphin.)" #: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:172 #: Source/Core/DolphinWX/Src/GCMicDlg.cpp:172 @@ -2602,7 +2762,8 @@ msgstr "Allemand" #: Source/Core/Core/Src/ActionReplay.cpp:449 #, c-format msgid "GetARCode: Index is greater than ar code list size %lu" -msgstr "GetARCode : l'index est plus grand que la taille de la liste de codes %lu" +msgstr "" +"GetARCode : l'index est plus grand que la taille de la liste de codes %lu" #: Source/Core/DolphinWX/Src/FrameTools.cpp:430 msgid "Graphics" @@ -2618,15 +2779,20 @@ msgstr "Plus grand que" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:83 msgid "" -"Greatly increases quality of textures generated using render to texture effects.\n" +"Greatly increases quality of textures generated using render to texture " +"effects.\n" "Raising the internal resolution will improve the effect of this setting.\n" -"Slightly decreases performance and possibly causes issues (although unlikely).\n" +"Slightly decreases performance and possibly causes issues (although " +"unlikely).\n" "\n" "If unsure, leave this checked." msgstr "" -"Améliore significativement la qualité des textures générées en utilisant les effets de rendu vers texture.\n" -"Le fait d'augmenter la résolution interne améliore l'impact de cette option.\n" -"Baisse légèrement les performances et peut provoquer quelques pépins (mais peu probable).\n" +"Améliore significativement la qualité des textures générées en utilisant les " +"effets de rendu vers texture.\n" +"Le fait d'augmenter la résolution interne améliore l'impact de cette " +"option.\n" +"Baisse légèrement les performances et peut provoquer quelques pépins (mais " +"peu probable).\n" "\n" "Dans le doute, cochez cette case." @@ -2666,7 +2832,7 @@ msgstr "Echec de la vérification de la somme de contrôle de l'entête" msgid "Hebrew" msgstr "Hébreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Hauteur" @@ -2685,12 +2851,14 @@ msgid "" msgstr "" "Bonjour,\n" "\n" -"Dolphin requiert que votre processeur prenne en charge les instructions SSE2.\n" -"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne s'exécutera pas.\n" +"Dolphin requiert que votre processeur prenne en charge les instructions " +"SSE2.\n" +"Malheureusement, votre processeur ne les a pas, et donc Dolphin ne " +"s'exécutera pas.\n" "\n" "Sayonara !\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Cacher" @@ -2704,7 +2872,8 @@ msgid "" "\n" "If unsure, leave this checked." msgstr "" -"Masquer le curseur de la souris s'il est au-dessus de la fenêtre d'émulation.\n" +"Masquer le curseur de la souris s'il est au-dessus de la fenêtre " +"d'émulation.\n" "\n" "Dans le doute, cochez cette case." @@ -2738,16 +2907,20 @@ msgstr "Wiimote hybride" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:531 #, c-format msgid "IOCTL_ES_GETVIEWS: Tried to get data from an unknown ticket: %08x/%08x" -msgstr "IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket inconnu : %08x/%08x" +msgstr "" +"IOCTL_ES_GETVIEWS : Impossible d'obtenir des données à partir d'un ticket " +"inconnu : %08x/%08x" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:785 #, c-format msgid "" -"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" +"IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available " +"in your nand dump\n" "TitleID %016llx.\n" " Dolphin will likely hang now" msgstr "" -"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas disponible dans votre copie de la NAND\n" +"IOCTL_ES_LAUNCH : Le jeu a essayé de recharger ios ou un titre qui n'est pas " +"disponible dans votre copie de la NAND\n" "ID du titre : %016llx.\n" " Dolphin va probablement figer maintenant" @@ -2755,11 +2928,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - mauvaise destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Paramètres IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2775,7 +2948,7 @@ msgstr "Sensibilité de l'IR" msgid "ISO Details" msgstr "Détails de l'ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Dossiers des ISO" @@ -2788,16 +2961,30 @@ msgid "Icon" msgstr "Icône" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:336 -msgid "If checked, the bounding box registers will be updated. Used by the Paper Mario games." -msgstr "Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les jeux Paper Mario." +msgid "" +"If checked, the bounding box registers will be updated. Used by the Paper " +"Mario games." +msgstr "" +"Si coché, les registres de la boîte liée seront mis à jour. Utilisé par les " +"jeux Paper Mario." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:323 -msgid "If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" -msgstr "Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = Compatible, OFF = Vitesse)" +msgid "" +"If the FPS is erratic, this option may help. (ON = Compatible, OFF = Fast)" +msgstr "" +"Si les FPS ne sont pas corrects, cette option peut résoudre le souci. (ON = " +"Compatible, OFF = Vitesse)" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:490 -msgid "If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use Audio to throttle using the DSP (might fix audio clicks but can also cause constant noise depending on the game)." -msgstr "Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio pour DSP (peut éliminer les clics audio mais peut causer un bruit constant selon les jeux)." +msgid "" +"If you set Framelimit higher than game full speed (NTSC:60, PAL:50). Use " +"Audio to throttle using the DSP (might fix audio clicks but can also cause " +"constant noise depending on the game)." +msgstr "" +"Si vous définissez le limitateur de vitesse (Image /s max) à une valeur plus " +"élevée que la vitesse du jeu (NTSC:60, PAL:50), activer le contrôle audio " +"pour DSP (peut éliminer les clics audio mais peut causer un bruit constant " +"selon les jeux)." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:429 msgid "Ignore Format Changes" @@ -2806,24 +2993,28 @@ msgstr "Ignorer les changements de formats" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:89 msgid "" "Ignore any changes to the EFB format.\n" -"Improves performance in many games without any negative effect. Causes graphical defects in a small number of other games though.\n" +"Improves performance in many games without any negative effect. Causes " +"graphical defects in a small number of other games though.\n" "\n" "If unsure, leave this checked." msgstr "" "Ignore tous les changements du format d'EFB.\n" -"Améliore les performances dans la plupart des jeux sans effet négatif. Provoque des défauts graphiques dans un petit nombre de jeux.\n" +"Améliore les performances dans la plupart des jeux sans effet négatif. " +"Provoque des défauts graphiques dans un petit nombre de jeux.\n" "\n" "Dans le doute, cochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:88 msgid "" "Ignore any requests of the CPU to read from or write to the EFB.\n" -"Improves performance in some games, but might disable some gameplay-related features or graphical effects.\n" +"Improves performance in some games, but might disable some gameplay-related " +"features or graphical effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Ignore les requêtes de lecture ou d'écriture vers l'EFB du CPU.\n" -"Améliore les performances dans certains jeux, mais peut désactiver certaines fonctionnalités de gameplay ou effets graphiques.\n" +"Améliore les performances dans certains jeux, mais peut désactiver certaines " +"fonctionnalités de gameplay ou effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -2857,11 +3048,13 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:95 msgid "" -"Improves performance but causes glitches in most games which rely on proper fog emulation.\n" +"Improves performance but causes glitches in most games which rely on proper " +"fog emulation.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Améliore les performances mais peut causer de petits pépins dans les jeux s'appuyant sur une émulation de brouillard/fumée correcte.\n" +"Améliore les performances mais peut causer de petits pépins dans les jeux " +"s'appuyant sur une émulation de brouillard/fumée correcte.\n" "\n" "Dans le doute, décochez cette case." @@ -2894,7 +3087,7 @@ msgstr "Insérer" msgid "Insert Encrypted or Decrypted code here..." msgstr "Indiquer un code crypté ou décrypté ici..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insérer une carte SD" @@ -2906,15 +3099,18 @@ msgstr "Indiquer un nom ici..." msgid "Install WAD" msgstr "Installer un WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installer dans le menu Wii" #: Source/Core/Core/Src/MemTools.cpp:248 -msgid "InstallExceptionHandler called, but this platform does not yet support it." -msgstr "InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas encore en charge." +msgid "" +"InstallExceptionHandler called, but this platform does not yet support it." +msgstr "" +"InstallExceptionHandler a été appelé, mais cette plateforme ne le prend pas " +"encore en charge." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installation du WAD..." @@ -2932,14 +3128,18 @@ msgstr "Vérification de l'intégrité terminée. Aucune erreur trouvée." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:891 #, c-format -msgid "Integrity check for partition %d failed. Your dump is most likely corrupted or has been patched incorrectly." -msgstr "Echec de la vérification de l'intégrité pour la partition %d. Votre copie est certainement corrompue ou a été incorrectement patchée." +msgid "" +"Integrity check for partition %d failed. Your dump is most likely corrupted " +"or has been patched incorrectly." +msgstr "" +"Echec de la vérification de l'intégrité pour la partition %d. Votre copie " +"est certainement corrompue ou a été incorrectement patchée." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:537 msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Paramètres de l'interface" @@ -3019,9 +3219,11 @@ msgstr "Texte de recherche non valide (impossible à convertir en nombre)" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:443 msgid "Invalid search string (only even string lengths supported)" -msgstr "Texte de recherche non valide (seules les longueurs de chaînes de caractères sont prises en charge)" +msgstr "" +"Texte de recherche non valide (seules les longueurs de chaînes de caractères " +"sont prises en charge)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Etat non valide" @@ -3103,7 +3305,7 @@ msgstr "Dernier état écrasé" msgid "Last Saved State" msgstr "Dernier état sauvegardé" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "Latence :" @@ -3203,11 +3405,11 @@ msgstr "Charger l'état du Slot 8" msgid "Load State..." msgstr "Charger un état..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Charger le Menu Système Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Charger le Menu Système Wii %d%c" @@ -3224,7 +3426,9 @@ msgstr "" #: Source/Core/DolphinWX/Src/PHackSettings.cpp:49 msgid "Load preset values from hack patterns available." -msgstr "Charger les valeurs de pré-réglage à partir de la palette de hack disponibles." +msgstr "" +"Charger les valeurs de pré-réglage à partir de la palette de hack " +"disponibles." #: Source/Core/DolphinWX/Src/NetWindow.cpp:586 msgid "Local" @@ -3248,11 +3452,14 @@ msgstr "Types de journaux" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:98 msgid "" -"Log the number of frames rendered per second to User/Logs/fps.txt. Use this feature when you want to measure the performance of Dolphin.\n" +"Log the number of frames rendered per second to User/Logs/fps.txt. Use this " +"feature when you want to measure the performance of Dolphin.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de Dolphin.\n" +"Enregistre le nombre d'images rendues par seconde vers le fichier User/Logs/" +"fps.txt. Utilisez cette fonctionnalité pour mesurer les performances de " +"Dolphin.\n" "\n" "Dans le doute, décochez cette case." @@ -3282,7 +3489,7 @@ msgstr "" "MD5 non concordant\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de vitesse pour le MMU" @@ -3317,7 +3524,7 @@ msgstr "La carte mémoire contient déjà une sauvegarde pour ce titre" msgid "Memcard already opened" msgstr "Carte mémoire déjà chargée" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Octet mémoire" @@ -3327,10 +3534,14 @@ msgid "Memory Card" msgstr "Carte mémoire" #: Source/Core/DolphinWX/Src/MemcardManager.h:36 -msgid "Memory Card Manager WARNING-Make backups before using, should be fixed but could mangle stuff!" -msgstr "Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant utilisation, devrait être OK mais corruption possible de données !" +msgid "" +"Memory Card Manager WARNING-Make backups before using, should be fixed but " +"could mangle stuff!" +msgstr "" +"Gestionnaire de cartes mémoires | ATTENTION : Faites des sauvegardes avant " +"utilisation, devrait être OK mais corruption possible de données !" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3349,7 +3560,9 @@ msgstr "" #: Source/Core/Core/Src/HW/GCMemcard.cpp:124 msgid "Memorycard filesize does not match the header size" -msgstr "La taille du fichier de la carte mémoire ne correspond pas à la taille de l'entête." +msgstr "" +"La taille du fichier de la carte mémoire ne correspond pas à la taille de " +"l'entête." #: Source/Core/DolphinWX/Src/WXInputBase.cpp:50 msgid "Menu" @@ -3368,7 +3581,7 @@ msgstr "Min" msgid "Misc" msgstr "Divers" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Paramètres divers" @@ -3379,11 +3592,14 @@ msgstr "Modif." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:101 msgid "" -"Modify textures to show the format they're encoded in. Needs an emulation reset in most cases.\n" +"Modify textures to show the format they're encoded in. Needs an emulation " +"reset in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Modifie les textures pour afficher le format dans lequel elles sont encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que cela prenne effet.\n" +"Modifie les textures pour afficher le format dans lequel elles sont " +"encodées. Il faudra redémarrer l'émulation dans la plupart des cas pour que " +"cela prenne effet.\n" "\n" "Dans le doute, décochez cette case." @@ -3391,11 +3607,11 @@ msgstr "" msgid "Monospaced font" msgstr "Police mono-espacée." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Vibreur" @@ -3423,16 +3639,21 @@ msgid "Multiply" msgstr "Multiplier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:332 -msgid "Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No effect on emulated wiimotes." -msgstr "Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." +msgid "" +"Mutes the Wiimote speaker. Fixes random disconnections on real wiimotes. No " +"effect on emulated wiimotes." +msgstr "" +"Supprime le son du haut-parleur de la Wiimote. Corrige les déconnexions " +"aléatoires sur les Wiimotes physiques. N'affecte pas les Wiimotes émulées." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" -msgstr "Note : La taille du flux est différente de la longueur actuelle des données\n" +msgstr "" +"Note : La taille du flux est différente de la longueur actuelle des données\n" #: Source/Core/DolphinWX/Src/WXInputBase.cpp:129 msgid "NP Add" @@ -3557,7 +3778,7 @@ msgstr "Pseudo :" msgid "No Country (SDK)" msgstr "Pas de pays (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Aucun ISO ou WAD trouvé" @@ -3566,8 +3787,8 @@ msgstr "Aucun ISO ou WAD trouvé" msgid "No banner file found for title %s" msgstr "Aucune bannière trouvée pour le titre %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Aucune description disponible" @@ -3575,7 +3796,7 @@ msgstr "Aucune description disponible" msgid "No docking" msgstr "Pas d'attachement" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Aucun fichier chargé" @@ -3583,7 +3804,7 @@ msgstr "Aucun fichier chargé" msgid "No free dir index entries" msgstr "Aucune entrée de dossier d'index libre" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Aucun fichier enregistré" @@ -3606,7 +3827,7 @@ msgid "Not Equal" msgstr "Différent" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Non défini" @@ -3614,7 +3835,7 @@ msgstr "Non défini" msgid "Not connected" msgstr "Non connectée" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notes" @@ -3648,7 +3869,7 @@ msgstr "Nunchuck" msgid "Nunchuk Acceleration" msgstr "Accéleration du Nunchuck" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objet" @@ -3679,11 +3900,11 @@ msgstr "%d blocs disponibles seulement" msgid "Open" msgstr "Ouvrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ouvrir l'emplacement du fichier" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Ouvrir le dossier de &sauvegarde Wii" @@ -3713,7 +3934,7 @@ msgstr "Décodeur de texture OpenCL" msgid "OpenMP Texture Decoder" msgstr "Décodeur de texture OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Options" @@ -3728,7 +3949,8 @@ msgid "" "Right click and export all of the saves,\n" "and import the the saves to a new memcard\n" msgstr "" -"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre des blocs\n" +"L'ordre des fichiers dans le Dossier de fichiers ne correspond pas à l'ordre " +"des blocs\n" "Faites un clic droit et exportez toutes les sauvegardes,\n" "et importez les sauvegardes vers une nouvelle carte mémoire\n" @@ -3738,8 +3960,12 @@ msgid "Other" msgstr "Autres" #: Source/Core/Core/Src/NetPlayClient.cpp:206 -msgid "Other client disconnected while game is running!! NetPlay is disabled. You manually stop the game." -msgstr "Autre client déconnecté pendant que le jeu est en cours d'exécution !! NetPlay est désactivé. Vous devez arrêter le jeu manuellement." +msgid "" +"Other client disconnected while game is running!! NetPlay is disabled. You " +"manually stop the game." +msgstr "" +"Autre client déconnecté pendant que le jeu est en cours d'exécution !! " +"NetPlay est désactivé. Vous devez arrêter le jeu manuellement." #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:484 msgid "Output" @@ -3794,8 +4020,8 @@ msgstr "Patchs" msgid "Paths" msgstr "Chemins" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" @@ -3819,8 +4045,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Démarrer" @@ -3846,7 +4072,7 @@ msgstr "Options de lecture" msgid "Players" msgstr "Joueurs" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Veuillez confirmer..." @@ -3862,19 +4088,19 @@ msgstr "Plus-Moins" msgid "Polish" msgstr "Polonais" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -3895,17 +4121,17 @@ msgstr "Portugais (brésilien)" msgid "Post-Processing Effect:" msgstr "Effet de Post-processing :" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fin de film prématurée dans Play Controller (%u + 8 > %u)" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u + %d > %u)" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fin de film prématurée dans Play Wiimote (%u > %u)" @@ -4004,7 +4230,7 @@ msgstr "Reconnecter la Wiimote lors du chargement d'un état" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Enregistrer" @@ -4038,7 +4264,8 @@ msgid "" msgstr "" "Réduit la quantité d'aliasing causée par des graphiques 3D rasterisés.\n" "Ceci permet d'avoir une image moins carrée, avec moins d'effets d'escalier.\n" -"Impacte négativement les performances de l'émulation et peut provoquer des pépins.\n" +"Impacte négativement les performances de l'émulation et peut provoquer des " +"pépins.\n" "\n" "Dans le doute, sélectionnez Aucune." @@ -4060,7 +4287,7 @@ msgstr "Rafraîchir la liste des jeux" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Retirer" @@ -4101,7 +4328,7 @@ msgstr "Droite" msgid "Right Stick" msgstr "Stick Droit" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4181,7 +4408,7 @@ msgstr "Enregistrer l'état" msgid "Save as..." msgstr "Enregistrer sous..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sauver le fichier compressé GCM/ISO" @@ -4189,29 +4416,31 @@ msgstr "Sauver le fichier compressé GCM/ISO" msgid "Save current perspective" msgstr "Sauvegarder la perspective actuelle" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Sauvegarder le fichier GCM/ISO décompressé" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." -msgstr "Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du film..." +msgstr "" +"Le film de sauvegarde d'état %s est corrompu, arrêt de l'enregistrement du " +"film..." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:397 msgid "Scaled EFB Copy" msgstr "Copie à l'échelle de l'EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Analyse de %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Recherche d'ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Recherche..." @@ -4231,7 +4460,7 @@ msgstr "Rechercher" msgid "Search Filter" msgstr "Fitre de recherche" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Chercher dans sous-dossiers" @@ -4243,10 +4472,8 @@ msgstr "Rechercher l'objet actuel" msgid "Search for hex Value:" msgstr "Rechercher une valeur Hexadécimale :" -#: Source/Core/Common/Src/SysConf.h:103 -#: Source/Core/Common/Src/SysConf.h:126 -#: Source/Core/Common/Src/SysConf.h:146 -#: Source/Core/Common/Src/SysConf.h:167 +#: Source/Core/Common/Src/SysConf.h:103 Source/Core/Common/Src/SysConf.h:126 +#: Source/Core/Common/Src/SysConf.h:146 Source/Core/Common/Src/SysConf.h:167 #, c-format msgid "Section %s not found in SYSCONF" msgstr "La section %s n'a pas été trouvée dans SYSCONF" @@ -4257,11 +4484,11 @@ msgid "Select" msgstr "Select" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Sélectionner le fichier d'enregistrement" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Sélectionner un fichier WAD de Wii à installer" @@ -4287,15 +4514,15 @@ msgstr "Sélectionner les fenêtres flottantes" msgid "Select the file to load" msgstr "Sélectionner le fichier à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Sélectionner le fichier à enregistrer" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Sélectionner l'état à charger" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Sélectionner l'état à enregistrer" @@ -4312,7 +4539,8 @@ msgstr "" "Sélectionner le format d'écran lors du rendu :\n" "Auto : Utiliser le format d'écran natif\n" "Forcer 16/9è : Dimensionner l'image pour un format d'écran 16/9è.\n" -"Forcer 4/3 : Dimensionner l'image pour un format d'écran de 4/3.\n" +"Forcer 4/3 : Dimensionner l'image pour un format d'écran de " +"4/3.\n" "Etirer à la fenêtre : Adapter l'image à la fenêtre.\n" "\n" "Dans le doute, choisissez Auto." @@ -4328,27 +4556,32 @@ msgstr "Police sélectionnée" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:71 msgid "" "Selects the display resolution used in fullscreen mode.\n" -"This should always be bigger than or equal to the internal resolution. Performance impact is negligible.\n" +"This should always be bigger than or equal to the internal resolution. " +"Performance impact is negligible.\n" "\n" "If unsure, use your desktop resolution.\n" "If still unsure, use the highest resolution which works for you." msgstr "" "Sélectionne la résolution d'affichage utilisée en mode Plein écran.\n" -"Elle devrait toujours être supérieure ou égale à la résolution interne. L'impact sur les performances est négligeable.\n" +"Elle devrait toujours être supérieure ou égale à la résolution interne. " +"L'impact sur les performances est négligeable.\n" "\n" "Dans le doute, utilisez la résolution de votre Bureau.\n" -"Si vous ne savez toujours pas, sélectionnez la plus haute résolution affichée." +"Si vous ne savez toujours pas, sélectionnez la plus haute résolution " +"affichée." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:69 msgid "" "Selects what graphics API to use internally.\n" -"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. Direct3D 11 is somewhere between the two.\n" +"Direct3D 9 usually is the fastest one. OpenGL is more accurate though. " +"Direct3D 11 is somewhere between the two.\n" "Note that the Direct3D backends are only available on Windows.\n" "\n" "If unsure, use Direct3D 9." msgstr "" "Sélectionne l'API graphique à utiliser.\n" -"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus précis. Direct3D 11 est quelque part entre les deux.\n" +"Direct3D 9 est généralement le plus rapide. OpenGL est cependant le plus " +"précis. Direct3D 11 est quelque part entre les deux.\n" "Les moteurs Direct3D ne sont disponibles que pour Windows.\n" "\n" "Dans le doute, sélectionnez Direct3D 9." @@ -4370,14 +4603,17 @@ msgid "Serbian" msgstr "Serbe" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:507 -msgid "Serial Port 1 - This is the port which devices such as the net adapter use" -msgstr "Port série 1 - C'est le port que les périphériques tels que l'adaptateur ethernet utilisent" +msgid "" +"Serial Port 1 - This is the port which devices such as the net adapter use" +msgstr "" +"Port série 1 - C'est le port que les périphériques tels que l'adaptateur " +"ethernet utilisent" #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:491 msgid "Set" msgstr "Paramétrer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Définir comme l'ISO par &défaut" @@ -4389,11 +4625,17 @@ msgstr "Définir comme carte mémoire par défaut : %c" #: Source/Core/Core/Src/ActionReplay.cpp:460 #, c-format msgid "SetARCode_IsActive: Index is greater than ar code list size %lu" -msgstr "SetARCode_IsActive : L'index est plus grand que la taille de la liste des codes AR %lu" +msgstr "" +"SetARCode_IsActive : L'index est plus grand que la taille de la liste des " +"codes AR %lu" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:520 -msgid "Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only." -msgstr "Configure la latence (en ms). Des valeurs plus élevées peuvent réduire le craquement audio. Uniquement avec le moteur OpenAL." +msgid "" +"Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL " +"backend only." +msgstr "" +"Configure la latence (en ms). Des valeurs plus élevées peuvent réduire le " +"craquement audio. Uniquement avec le moteur OpenAL." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:345 msgid "Settings..." @@ -4403,7 +4645,7 @@ msgstr "Configurer..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible de trouver le fichier des paramètres" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Secouement" @@ -4514,10 +4756,13 @@ msgstr "Demande confirmation avant d'arrêter le jeu." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:497 msgid "" "Show a message box when a potentially serious error has occurred.\n" -"Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all." +"Disabling this may avoid annoying and non-fatal messages, but it may also " +"mean that Dolphin suddenly crashes without any explanation at all." msgstr "" "Affiche un message lorsqu'une erreur sérieuse potentielle est arrivée.\n" -"Le désactiver évitera les messages embêtants et les messages non-fatals, mais cela peut aussi signifier que Dolphin plante soudainement sans aucune explication." +"Le désactiver évitera les messages embêtants et les messages non-fatals, " +"mais cela peut aussi signifier que Dolphin plante soudainement sans aucune " +"explication." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:829 msgid "Show first block" @@ -4530,10 +4775,12 @@ msgstr "Afficher le compteur de lag" #: Source/Core/DolphinWX/Src/ConfigMain.cpp:498 msgid "" "Show messages on the emulation screen area.\n" -"These messages include memory card writes, video backend and CPU information, and JIT cache clearing." +"These messages include memory card writes, video backend and CPU " +"information, and JIT cache clearing." msgstr "" "Affiche les messages par-dessus la zone d'émulation.\n" -"Ces messages incluent les écritures de carte mémoire, la moteur de rendu vidéo et les infos du processeur, et l'effacement du cache JIT." +"Ces messages incluent les écritures de carte mémoire, la moteur de rendu " +"vidéo et les infos du processeur, et l'effacement du cache JIT." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:828 msgid "Show save blocks" @@ -4553,11 +4800,13 @@ msgstr "Afficher le titre de sauvegarde" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97 msgid "" -"Show the number of frames rendered per second as a measure of emulation speed.\n" +"Show the number of frames rendered per second as a measure of emulation " +"speed.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse d'émulation.\n" +"Affiche le nombre d'images rendues par seconde, afin de mesurer la vitesse " +"d'émulation.\n" "\n" "Dans le doute, décochez cette case." @@ -4575,7 +4824,7 @@ msgstr "" "\n" "Dans le doute, décochez cette case." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote à l'horizontale" @@ -4583,14 +4832,18 @@ msgstr "Wiimote à l'horizontale" msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Taille" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Ne pas exécuter le BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Ignorer Passe Alpha de dest." @@ -4601,11 +4854,13 @@ msgstr "Ignorer l'accès à l'EFB depuis le CPU" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:96 msgid "" -"Skip the destination alpha pass used in many games for various graphical effects.\n" +"Skip the destination alpha pass used in many games for various graphical " +"effects.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour divers effets graphiques.\n" +"Saute la passe alpha de destination, utilisée dans beaucoup de jeux pour " +"divers effets graphiques.\n" "\n" "Dans le doute, décochez cette case." @@ -4613,13 +4868,16 @@ msgstr "" msgid "" "Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n" "Sometimes also increases visual quality.\n" -"If you're experiencing any issues, try raising texture cache accuracy or disable this option.\n" +"If you're experiencing any issues, try raising texture cache accuracy or " +"disable this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision de l'émulation.\n" +"Accélère légèrement les copies d'EFB vers la RAM en sacrifiant la précision " +"de l'émulation.\n" "Améliore parfois la qualité visuelle.\n" -"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache ou désactivez cette option.\n" +"Si vous rencontrez des problèmes, essayez d'augmenter la précision du cache " +"ou désactivez cette option.\n" "\n" "Dans le doute, décochez cette case." @@ -4629,11 +4887,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4647,15 +4905,18 @@ msgstr "Rendu logiciel" #: Source/Core/DolphinWX/Src/VideoConfigDiag.h:83 msgid "" -"Software rendering is an order of magnitude slower than using the other backends.\n" +"Software rendering is an order of magnitude slower than using the other " +"backends.\n" "It's only useful for debugging purposes.\n" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas l'accélération de votre carte graphique.\n" +"Le rendu logiciel est le plus lent de tous les moteurs, et n'utilise pas " +"l'accélération de votre carte graphique.\n" "Il n'est utile qu'à des fins de débogage.\n" -"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez 'Non'." +"Êtes-vous certain d'activer le rendu logiciel ? Dans le doute, choisissez " +"'Non'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Paramètres audio" @@ -4685,13 +4946,21 @@ msgstr "Volume du haut-parleur :" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87 msgid "" -"Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n" -"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n" +"Specifies the resolution used to render at. A high resolution will improve " +"visual quality a lot but is also quite heavy on performance and might cause " +"glitches in certain games.\n" +"\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less " +"issues. Generally speaking, the lower the internal resolution is, the better " +"your performance will be.\n" "\n" "If unsure, select 640x528." msgstr "" -"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la qualité visuelle mais impacte beaucoup les performances et peut provoquer quelques pépins dans certains jeux.\n" -"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" mais provoque moins de problèmes. En général, plus la résolution interne est petite, meilleures seront les performances.\n" +"Spécifie la résolution de rendu. Une haute résolution améliore beaucoup la " +"qualité visuelle mais impacte beaucoup les performances et peut provoquer " +"quelques pépins dans certains jeux.\n" +"\"Multiple de 640x528\" est un peu plus lent que \"Taille de la fenêtre\" " +"mais provoque moins de problèmes. En général, plus la résolution interne est " +"petite, meilleures seront les performances.\n" "\n" "Dans le doute, sélectionnez 640x528." @@ -4726,7 +4995,7 @@ msgstr "Commencer l'enregistrement" msgid "Start Recording" msgstr "Commencer l'enregistrement" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Etat" @@ -4754,12 +5023,14 @@ msgstr "Arrêter" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:91 msgid "" "Store EFB copies in GPU texture objects.\n" -"This is not so accurate, but it works well enough for most games and gives a great speedup over EFB to RAM.\n" +"This is not so accurate, but it works well enough for most games and gives a " +"great speedup over EFB to RAM.\n" "\n" "If unsure, leave this checked." msgstr "" "Enregistre les copies d'EFB dans les objets de texture du GPU.\n" -"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" +"Ce n'est pas précis, mais fonctionne suffisamment bien pour la plupart des " +"jeux et améliore sensiblement la vitesse comparé à l'EFB vers la RAM.\n" "\n" "Dans le doute, sélectionnez cette case." @@ -4784,12 +5055,12 @@ msgstr "Fichier exporté avec succès vers %s" msgid "Successfully imported save files" msgstr "Fichiers de sauvegarde importés avec succès" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balancement" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Langue du système :" @@ -4857,13 +5128,13 @@ msgstr "L'adresse n'est pas valide" msgid "The checksum was successfully fixed" msgstr "La somme de contrôle a été corrigée avec succès" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Le dossier sélectionné est déjà dans la liste" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4874,8 +5145,12 @@ msgstr "" #: Source/Core/AudioCommon/Src/WaveFile.cpp:51 #, c-format -msgid "The file %s could not be opened for writing. Please check if it's already opened by another program." -msgstr "Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas été ouvert par un autre programme." +msgid "" +"The file %s could not be opened for writing. Please check if it's already " +"opened by another program." +msgstr "" +"Le fichier %s n'a pas pu être ouvert pour l'écriture. Vérifiez qu'il n'a pas " +"été ouvert par un autre programme." #: Source/Core/AudioCommon/Src/WaveFile.cpp:44 #, c-format @@ -4901,21 +5176,28 @@ msgstr "Le code AR décrypté ne contient aucune ligne." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:93 msgid "" -"The safer you adjust this, the less likely the emulator will be missing any texture updates from RAM.\n" +"The safer you adjust this, the less likely the emulator will be missing any " +"texture updates from RAM.\n" "\n" "If unsure, use the rightmost value." msgstr "" -"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de texture depuis la RAM.\n" +"Plus vous allez vers Sûr, moins l'émulateur manquera les mises à jour de " +"texture depuis la RAM.\n" "\n" "Dans le doute, utilisez la position la plus à droite." #: Source/Core/DolphinWX/Src/MemcardManager.cpp:443 msgid "The save you are trying to copy has an invalid file size" -msgstr "La sauvegarde que vous essayez de copier a une taille de fichier non valide" +msgstr "" +"La sauvegarde que vous essayez de copier a une taille de fichier non valide" #: Source/Core/DolphinWX/Src/Main.cpp:385 -msgid "The selected language is not supported by your system. Falling back to system default." -msgstr "La langue sélectionnée n'est pas prise en charge par votre système. Retour à la langue par défaut du système." +msgid "" +"The selected language is not supported by your system. Falling back to " +"system default." +msgstr "" +"La langue sélectionnée n'est pas prise en charge par votre système. Retour à " +"la langue par défaut du système." #: Source/Core/Core/Src/NetPlayClient.cpp:43 msgid "The server and client's NetPlay versions are incompatible!" @@ -4942,13 +5224,17 @@ msgstr "Le fichier spécifié \"%s\" n'existe pas" msgid "The value is invalid" msgstr "La valeur n'est pas valide" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "Thème :" #: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp:475 -msgid "There must be a ticket for 00000001/00000002. Your NAND dump is probably incomplete." -msgstr "Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est probablement incomplète." +msgid "" +"There must be a ticket for 00000001/00000002. Your NAND dump is probably " +"incomplete." +msgstr "" +"Il doit y avoir un ticket pour 00000001/00000002. Votre copie de la NAND est " +"probablement incomplète." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:312 msgid "" @@ -4959,48 +5245,67 @@ msgstr "" "Indéterminé signifie que les paramètres de Dolphin sont appliqués." #: Source/Core/Core/Src/ActionReplay.cpp:355 -msgid "This action replay simulator does not support codes that modify Action Replay itself." -msgstr "Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient l'Action Replay lui-même." +msgid "" +"This action replay simulator does not support codes that modify Action " +"Replay itself." +msgstr "" +"Ce simulateur d'Action Replay ne prend pas en charge les codes qui modifient " +"l'Action Replay lui-même." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:510 msgid "This could cause slow down in Wii Menu and some games." msgstr "Ceci peut ralentir le Menu Wii et quelques jeux." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. Hold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n" +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" +"Hold SHIFT and press one of the WASD keys to move the camera by a certain " +"step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " +"SHIFT+R to reset the camera.\n" "\n" "If unsure, leave this unchecked." msgstr "" "Cette fonctionnalité vous permet de vous amuser avec la caméra du jeu.\n" -"Faites un clic droit et déplacez la souris pour changer l'orientation de la caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la position de la caméra.\n" +"Faites un clic droit et déplacez la souris pour changer l'orientation de la " +"caméra. Appuyez sur SHIFT et sur W, A, S ou D pour modifier pas à pas la " +"distance de la caméra (SHIFT et 0 déplace la caméra plus vite, SHIFT et 9 " +"la déplace plus lentement). Appuyez sur SHIFT et R pour réinitiliser la " +"position de la caméra.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/ConfigMain.cpp:489 msgid "" -"This splits the Video and CPU threads, so they can be run on separate cores.\n" -"Causes major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches." +"This splits the Video and CPU threads, so they can be run on separate " +"cores.\n" +"Causes major speed improvements on PCs with more than one core, but can also " +"cause occasional crashes/glitches." msgstr "" -"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils puissent être exécutés sur des coeurs séparés.\n" -"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou des plantages." +"Ceci sépare les threads du processeur et de l'affichage, pour qu'ils " +"puissent être exécutés sur des coeurs séparés.\n" +"Cela a pour conséquence d'accélérer considérablement l'émulation sur les PC " +"qui plus d'un coeur, mais peut occasionnellement causer des petits pépins ou " +"des plantages." #: Source/Core/DolphinWX/Src/ISOProperties.cpp:291 msgid "This will let you Manually Edit the INI config file" -msgstr "Ceci vous permettra de modifier manuellement le fichier de configuration INI" +msgstr "" +"Ceci vous permettra de modifier manuellement le fichier de configuration INI" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:249 #: Source/Core/InputCommon/Src/ControllerEmu.cpp:254 msgid "Threshold" msgstr "Seuil" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titre" @@ -5036,8 +5341,7 @@ msgstr "Echec de chargement d'un type de fichier inconnu." msgid "Triggers" msgstr "Déclencheurs" -#: Source/Core/Common/Src/SysConf.h:91 -#: Source/Core/Common/Src/SysConf.h:114 +#: Source/Core/Common/Src/SysConf.h:91 Source/Core/Common/Src/SysConf.h:114 msgid "Trying to read from invalid SYSCONF" msgstr "Essai de lecture d'un fichier SYSCONF non valide" @@ -5065,7 +5369,7 @@ msgstr "Type" msgid "UDP Port:" msgstr "Port UDP :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP :" @@ -5074,7 +5378,7 @@ msgstr "Wiimote UDP :" msgid "UNKNOWN" msgstr "Inconnu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "Inconnu_%02X" @@ -5094,10 +5398,12 @@ msgstr "" #: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:123 #, c-format msgid "" -"Unable to parse line %lu of the entered AR code as a valid encrypted or decrypted code. Make sure you typed it correctly.\n" +"Unable to parse line %lu of the entered AR code as a valid encrypted or " +"decrypted code. Make sure you typed it correctly.\n" "Would you like to ignore this line and continue parsing?" msgstr "" -"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" +"Impossible d'analyser la ligne %lu du code AR entré comme un code crypté ou " +"décrypté valide. Veuillez vérifier que vous l'avez correctement tapé.\n" "Voulez-vous ignorer cette ligne et continuer l'analyse ?" #: Source/Core/DolphinWX/Src/FrameTools.cpp:391 @@ -5109,7 +5415,7 @@ msgstr "%i non défini" msgid "Undo Load State" msgstr "&Annuler le lancement d'état" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Appel 0x80 inattendu. Abandon..." @@ -5135,7 +5441,8 @@ msgstr "Reception d'un message inconnu avec l'ID : %d" #: Source/Core/Core/Src/NetPlayServer.cpp:504 #, c-format msgid "Unknown message with id:%d received from player:%d Kicking player!" -msgstr "Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" +msgstr "" +"Message inconnu avec l'ID %d reçue du lecteur %d. Banissement du lecteur !" #: Source/Core/InputCommon/Src/ControllerEmu.cpp:274 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:56 @@ -5147,11 +5454,11 @@ msgstr "Haut" msgid "Update" msgstr "Mettre à jour" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote debout" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utiliser le mode EuRGB60 (PAL60)" @@ -5175,19 +5482,23 @@ msgid "" "If unsure, leave this unchecked." msgstr "" "Utilise plusieurs threads pour décoder les textures.\n" -"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont plus de 2 coeurs.\n" +"Peut accélérer l'émulation, particulièrement avec des processeurs qui ont " +"plus de 2 coeurs.\n" "\n" "Dans le doute, décochez cette case." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:121 msgid "" "Usually if shader compilation fails, an error message is displayed.\n" -"However, one may skip the popups to allow interruption free gameplay by checking this option.\n" +"However, one may skip the popups to allow interruption free gameplay by " +"checking this option.\n" "\n" "If unsure, leave this unchecked." msgstr "" -"En cas d'échec de compilation de shader, un message est habituellement affiché.\n" -"Cependant, certains préfèrent ne pas afficher ce message pour ne pas interrompre le jeu en cochant cette case.\n" +"En cas d'échec de compilation de shader, un message est habituellement " +"affiché.\n" +"Cependant, certains préfèrent ne pas afficher ce message pour ne pas " +"interrompre le jeu en cochant cette case.\n" "\n" "Dans le doute, décochez cette case." @@ -5223,7 +5534,7 @@ msgstr "Vidéo" msgid "Virtual" msgstr "Virtuel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5274,7 +5585,8 @@ msgid "" "%s\n" "Do you wish to continue?" msgstr "" -"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le dossier :\n" +"Attention ! Il est conseillé de sauvegarder tous les fichiers dans le " +"dossier :\n" "%s\n" "Voulez-vous continuer ?" @@ -5286,43 +5598,69 @@ msgid "" "and have the same name as a file on your memcard\n" "Continue?" msgstr "" -"Attention : ceci va écraser toutes les sauvegardes existantes dans ce dossier :\n" +"Attention : ceci va écraser toutes les sauvegardes existantes dans ce " +"dossier :\n" "%s\n" "et vont avoir le même nom que le fichier sur votre carte mémoire\n" "Continuer ?" -#: Source/Core/Core/Src/Movie.cpp:838 -#, c-format -msgid "Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off." -msgstr "Attention : Vous avez chargé une sauvegarde qui se situe après la fin du film en cours (octet %u > %u) (image %u > %u). Vous devriez charger une autre sauvegarde avant de continuer, ou charger cette sauvegarde en désactivant le mode Lecture seule." - -#: Source/Core/Core/Src/Movie.cpp:855 -#, c-format -msgid "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync." -msgstr "Attention : Vous avez chargé une sauvegarde dont le film diffère de l'octet %d (0x%X). Vous devriez charger une autre sauvegarde avant de continuer, ou charger cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y aura probablement une désynchronisation." - -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" -"Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.\n" +"Warning: You loaded a save that's after the end of the current movie. (byte " +"%u > %u) (frame %u > %u). You should load another save before continuing, or " +"load this state with read-only mode off." +msgstr "" +"Attention : Vous avez chargé une sauvegarde qui se situe après la fin du " +"film en cours (octet %u > %u) (image %u > %u). Vous devriez charger une " +"autre sauvegarde avant de continuer, ou charger cette sauvegarde en " +"désactivant le mode Lecture seule." + +#: Source/Core/Core/Src/Movie.cpp:861 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " +"should load another save before continuing, or load this state with read-" +"only mode off. Otherwise you'll probably get a desync." +msgstr "" +"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'octet " +"%d (0x%X). Vous devriez charger une autre sauvegarde avant de continuer, ou " +"charger cet état en désactivant le mode Lecture seule. Dans le cas " +"contraire, il y aura probablement une désynchronisation." + +#: Source/Core/Core/Src/Movie.cpp:870 +#, c-format +msgid "" +"Warning: You loaded a save whose movie mismatches on frame %d. You should " +"load another save before continuing, or load this state with read-only mode " +"off. Otherwise you'll probably get a desync.\n" "\n" -"More information: The current movie is %d frames long and the savestate's movie is %d frames long.\n" +"More information: The current movie is %d frames long and the savestate's " +"movie is %d frames long.\n" "\n" "On frame %d, the current movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "On frame %d, the savestate's movie presses:\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DUp=%d, DDown=%d, DLeft=%d, DRight=" +"%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" msgstr "" -"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'image %d. Vous devriez charger une autre sauvegarde avant de continuer, ou charger cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y aura probablement une désynchronisation.\n" +"Attention : Vous avez chargé une sauvegarde dont le film diffère de l'image " +"%d. Vous devriez charger une autre sauvegarde avant de continuer, ou charger " +"cet état en désactivant le mode Lecture seule. Dans le cas contraire, il y " +"aura probablement une désynchronisation.\n" "\n" -"Infos complémentaires : Le film actuel fait %d image de long et le film de la sauvegarde en fait %d.\n" +"Infos complémentaires : Le film actuel fait %d image de long et le film de " +"la sauvegarde en fait %d.\n" "\n" "A l'image %d, le film appuie sur :\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d, DHaut=%d, DBas=%d, DGauche=%d, " +"DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d\n" "\n" "A l'image %d, la sauvegarde du film appuie sur :\n" -"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" +"Start=%d, A=%d, B=%d, X=%d, Y=%d, Z=%d,DHaut=%d, DBas=%d, DGauche=%d, " +"DDroite=%d, L=%d, R=%d, LT=%d, RT=%d, AnalogX=%d, AnalogY=%d, CX=%d, CY=%d" #: Source/Core/AudioCommon/Src/WaveFile.cpp:106 #: Source/Core/AudioCommon/Src/WaveFile.cpp:129 @@ -5337,7 +5675,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Hack écran large (16/9è)" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largeur" @@ -5349,7 +5687,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Racine de la NAND (Wii) :" @@ -5357,7 +5695,7 @@ msgstr "Racine de la NAND (Wii) :" msgid "Wii Save Import" msgstr "Importer une sauvegarde Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Fichiers de sauvegarde Wii (*.bin)|*.bin" @@ -5420,10 +5758,10 @@ msgstr "Windows Droit" msgid "Word Wrap" msgstr "Casse" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Travail..." @@ -5458,7 +5796,7 @@ msgstr "Echec de l'initialisation de XAudio2 : %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Echec de la création de la voix principale dans XAudio2 : %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5472,7 +5810,8 @@ msgid "" "Only Zelda ucode games will work correctly with them.\n" msgstr "" "Vous utilisez des ROM de DSP gratuits créés par l'équipe de Dolphin.\n" -"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement avec ces ROM.\n" +"Seuls les jeux basés sur les ucodes de Zelda fonctionneront correctement " +"avec ces ROM.\n" #: Source/Core/DolphinWX/Src/FrameAui.cpp:72 msgid "You can't close panes that have pages in them." @@ -5494,7 +5833,7 @@ msgstr "Vous devez entrer une valeur décimale, hexadécimale ou octale valide." msgid "You must enter a valid profile name." msgstr "Vous devez entrer un profil de nom valide." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Vous devez redémarrer Dolphin pour que ce changement prenne effet." @@ -5554,14 +5893,19 @@ msgstr "[Personnalisé]" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:115 msgid "" "[EXPERIMENTAL]\n" -"Aims to speed up emulation by offloading texture decoding to the GPU using the OpenCL framework.\n" -"However, right now it's known to cause texture defects in various games. Also it's slower than regular CPU texture decoding in most cases.\n" +"Aims to speed up emulation by offloading texture decoding to the GPU using " +"the OpenCL framework.\n" +"However, right now it's known to cause texture defects in various games. " +"Also it's slower than regular CPU texture decoding in most cases.\n" "\n" "If unsure, leave this unchecked." msgstr "" "[EXPERIMENTAL]\n" -"Tente d'accélérer l'émulation en déportant le décodage de texture vers le GPU en utilisant le framework OpenCL.\n" -"Cependant, il est actuellement connu pour provoquer des défauts de textures dans divers jeux. De plus, il est généralement plus lent qu'un classique décodage par le CPU.\n" +"Tente d'accélérer l'émulation en déportant le décodage de texture vers le " +"GPU en utilisant le framework OpenCL.\n" +"Cependant, il est actuellement connu pour provoquer des défauts de textures " +"dans divers jeux. De plus, il est généralement plus lent qu'un classique " +"décodage par le CPU.\n" "\n" "Dans le doute, décochez cette case." @@ -5583,7 +5927,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5608,9 +5952,11 @@ msgstr "iCacheJIT : Lecture de l'Opcode depuis %x. Merci de nous le signaler." #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:108 #, c-format msgid "not a wii save or read failure for file header size %x" -msgstr "Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de l'entête du fichier %x" +msgstr "" +"Ceci n'est pas une sauvegarde Wii, ou erreur de lecture de la taille de " +"l'entête du fichier %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5619,7 +5965,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Commande inconnue 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute a retourné -1 sur l'exécution de l'application !" @@ -5904,6 +6250,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Activer le contrôle audio" +#~ msgid "Enable BAT" +#~ msgstr "Activer BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activer l'accès CPU" @@ -5928,6 +6277,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activer l'économiseur d'écran" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Activer la traduction de bloc d'adresse (BAT), une fonctionnalité de " +#~ "l'unité de gesiton de mémoire. Fidèle au matériel de la console, mais " +#~ "lent à émuler. (ON = Compatible, OFF = Rapide)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/he.po b/Languages/po/he.po index 0c2dbeb7f0..e0c1f0b7e8 100644 --- a/Languages/po/he.po +++ b/Languages/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-01-08 20:50+0200\n" "Last-Translator: Ely \n" "Language-Team: \n" @@ -42,7 +42,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -165,11 +165,11 @@ msgstr "" msgid "&DSP Settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "" @@ -234,7 +234,7 @@ msgstr "" msgid "&Play" msgstr "&שחק" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "" @@ -278,11 +278,11 @@ msgstr "" msgid "&Wiimote Settings" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "(off)" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -343,7 +343,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -506,11 +506,11 @@ msgstr "" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "" @@ -520,7 +520,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "" @@ -566,24 +566,24 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -593,8 +593,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -607,6 +607,10 @@ msgstr "" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" @@ -623,7 +627,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" @@ -647,17 +651,17 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -671,7 +675,7 @@ msgstr "" msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -703,11 +707,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "" @@ -715,7 +719,7 @@ msgstr "" msgid "Back" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 #, fuzzy msgid "Backend Settings" msgstr "הגדרות קול" @@ -725,7 +729,7 @@ msgstr "הגדרות קול" msgid "Backend:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -739,7 +743,7 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "" @@ -805,7 +809,7 @@ msgstr "" msgid "Browse" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" @@ -813,7 +817,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" @@ -827,7 +831,13 @@ msgstr "" msgid "Buttons" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -839,7 +849,7 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -876,7 +886,7 @@ msgstr "" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -884,7 +894,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -913,7 +923,7 @@ msgstr "" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "" @@ -984,23 +994,23 @@ msgstr "" msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "" @@ -1008,7 +1018,7 @@ msgstr "" msgid "Choose a memory card:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1071,16 +1081,16 @@ msgstr "" msgid "Comment:" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "" @@ -1107,9 +1117,9 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" @@ -1122,7 +1132,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" @@ -1167,7 +1177,7 @@ msgstr "" msgid "Convert to GCI" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" @@ -1223,11 +1233,11 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1296,7 +1306,7 @@ msgstr "" msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1308,7 +1318,7 @@ msgstr "" msgid "DSP" msgstr "קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" @@ -1321,7 +1331,7 @@ msgstr "" msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" @@ -1333,7 +1343,7 @@ msgstr "" msgid "DSP settings" msgstr "הגדרות קול" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1378,16 +1388,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" @@ -1395,7 +1405,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1437,8 +1447,8 @@ msgstr "" msgid "Device" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "" @@ -1512,11 +1522,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1545,13 +1555,13 @@ msgstr "" msgid "Dolphin FIFO" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 #, fuzzy msgid "Dolphin GCPad Configuration" msgstr "הגדרות גרפיקה" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1563,20 +1573,20 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1602,7 +1612,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" @@ -1752,10 +1762,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" @@ -1800,7 +1806,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" @@ -1853,13 +1859,6 @@ msgid "" "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" @@ -1937,7 +1936,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "" @@ -1997,7 +1996,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" @@ -2013,7 +2012,7 @@ msgstr "" msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" @@ -2070,7 +2069,7 @@ msgstr "" msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2126,6 +2125,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2203,11 +2207,11 @@ msgstr "" msgid "Fast" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2259,7 +2263,7 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2328,17 +2332,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" @@ -2412,7 +2416,7 @@ msgstr "הגדרות גרפיקה" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2454,7 +2458,7 @@ msgid "Gamecube &Pad Settings" msgstr "הגדרות קול" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2558,7 +2562,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2576,7 +2580,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" @@ -2636,11 +2640,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" @@ -2656,7 +2660,7 @@ msgstr "" msgid "ISO Details" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2769,7 +2773,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2781,7 +2785,7 @@ msgstr "" msgid "Install WAD" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2790,7 +2794,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" @@ -2817,7 +2821,7 @@ msgstr "" msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" @@ -2894,7 +2898,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" @@ -2973,7 +2977,7 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3066,11 +3070,11 @@ msgstr "" msgid "Load State..." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "" @@ -3139,7 +3143,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" @@ -3174,7 +3178,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "" @@ -3189,7 +3193,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3221,7 +3225,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3242,11 +3246,11 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3272,11 +3276,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3403,7 +3407,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3412,8 +3416,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3421,7 +3425,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3429,7 +3433,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3452,7 +3456,7 @@ msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" @@ -3460,7 +3464,7 @@ msgstr "" msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" @@ -3494,7 +3498,7 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3525,11 +3529,11 @@ msgstr "" msgid "Open" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" @@ -3559,7 +3563,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "" @@ -3639,8 +3643,8 @@ msgstr "" msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "" @@ -3664,8 +3668,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "" @@ -3691,7 +3695,7 @@ msgstr "" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3707,19 +3711,19 @@ msgstr "" msgid "Polish" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "" @@ -3740,17 +3744,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3849,7 +3853,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "" @@ -3900,7 +3904,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" @@ -3938,7 +3942,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4018,7 +4022,7 @@ msgstr "" msgid "Save as..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "" @@ -4026,11 +4030,11 @@ msgstr "" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4039,16 +4043,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "" @@ -4068,7 +4072,7 @@ msgstr "" msgid "Search Filter" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "" @@ -4092,11 +4096,11 @@ msgid "Select" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "" @@ -4119,15 +4123,15 @@ msgstr "" msgid "Select the file to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "" @@ -4195,7 +4199,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" @@ -4224,7 +4228,7 @@ msgstr "הגדרות קול" msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" @@ -4390,7 +4394,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" @@ -4398,14 +4402,18 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4438,11 +4446,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4462,7 +4470,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" @@ -4533,7 +4541,7 @@ msgstr "" msgid "Start Recording" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" @@ -4588,12 +4596,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4661,13 +4669,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -4746,7 +4754,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "" @@ -4775,7 +4783,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4800,12 +4809,12 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" @@ -4867,7 +4876,7 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4876,7 +4885,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "" @@ -4908,7 +4917,7 @@ msgstr "" msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -4946,11 +4955,11 @@ msgstr "" msgid "Update" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5016,7 +5025,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "" @@ -5073,7 +5082,7 @@ msgid "" "Continue?" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5081,7 +5090,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5089,7 +5098,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5121,7 +5130,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" @@ -5133,7 +5142,7 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" @@ -5141,7 +5150,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5200,10 +5209,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "" @@ -5238,7 +5247,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5272,7 +5281,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5344,7 +5353,7 @@ msgstr "" msgid "^ ADD" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5371,7 +5380,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5380,7 +5389,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/hu.po b/Languages/po/hu.po index afbfe65b93..ecd7361ad3 100644 --- a/Languages/po/hu.po +++ b/Languages/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Delirious \n" "Language-Team: Delirious \n" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" egy érvénytelen GCM/ISO fájl, vagy nem GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -178,11 +178,11 @@ msgstr "&Csalás kezelÅ‘" msgid "&DSP Settings" msgstr "&Hang beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&ISO törlése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&A kiválasztott ISO fájlok törlése..." @@ -246,7 +246,7 @@ msgstr "&Szünet" msgid "&Play" msgstr "&Indítás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Tulajdonságok" @@ -290,11 +290,11 @@ msgstr "&Nézet" msgid "&Wiimote Settings" msgstr "&Wiimote beállítások" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -314,7 +314,7 @@ msgstr "(ISMERETLEN)" msgid "(off)" msgstr "(ki)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -355,7 +355,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -555,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Hozzáadás" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ActionReplay kód hozzáadása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Patch hozzáadása" @@ -569,7 +569,7 @@ msgstr "Új mezÅ‘ hozzáadása" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Hozzáadás..." @@ -632,25 +632,25 @@ msgstr "Haladó beállítások" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Minden GC/Wii fájl (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Minden GC/Wii képfájl (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Minden Gamecube GCM fájl (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Minden állásmentés (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Minden Wii ISO fájl (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Minden tömörített GC/Wii ISO fájl (gcz)" @@ -661,8 +661,8 @@ msgstr "Minden fájl (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -679,6 +679,10 @@ msgstr "Változtatható Wiimote idÅ‘zítés" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anizotrópikus szűrés:" @@ -696,7 +700,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "A betöltÅ‘ program nem képes fájlból betölteni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "BetöltÅ‘ program:" @@ -723,7 +727,7 @@ msgstr "Arab" msgid "Are you sure you want to delete \"%s\"?" msgstr "Biztos törlöd ezt: \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -731,11 +735,11 @@ msgstr "" "Biztos törlöd ezeket a fájlokat?\n" "Végleg el fognak veszni!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Biztos törlöd ezt a fájlt? Végleg el fog veszni!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Képarány:" @@ -749,7 +753,7 @@ msgstr "Legalább egy mezÅ‘nek megnyitva kell maradnia." msgid "Audio" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Hang feldolgozó:" @@ -784,11 +788,11 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Regiszterek" @@ -797,7 +801,7 @@ msgstr "&Regiszterek" msgid "Back" msgstr "Hátra" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Hang feldolgozó beállításai" @@ -806,7 +810,7 @@ msgstr "Hang feldolgozó beállításai" msgid "Backend:" msgstr "Feldolgozó:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Háttér bemenet" @@ -820,7 +824,7 @@ msgid "Bad File Header" msgstr "Rossz fájl fejléc" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Játék kép" @@ -886,7 +890,7 @@ msgstr "Hibás" msgid "Browse" msgstr "Tallózás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Hozzáadandó könyvtár tallózása" @@ -894,7 +898,7 @@ msgstr "Hozzáadandó könyvtár tallózása" msgid "Browse for an ISO directory..." msgstr "Egy ISO könyvtár tallózása..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Kimeneti könyvtár tallózása" @@ -908,7 +912,13 @@ msgstr "Puffer:" msgid "Buttons" msgstr "Gombok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -920,7 +930,7 @@ msgstr "C kar" msgid "C-Stick" msgstr "C-kar" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -963,7 +973,7 @@ msgstr "%s nem nyitható meg" msgid "Cannot unregister events with events pending" msgstr "Nem lehet esemény bejegyzéseket törölni függÅ‘ben lévÅ‘ eseményekkel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -974,7 +984,7 @@ msgstr "" "%s\n" "fájl nem megfelelÅ‘ GameCube memóriakártya fájl" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1005,7 +1015,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Katalán" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Közép" @@ -1078,23 +1088,23 @@ msgstr "Kínai (egyszerűsített)" msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Válassz DVD gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Válassz NAND gyökér könyvtárat:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Válassz alapértelmezett ISO fájlt:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Válassz hozzáadandó könyvtárat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Válasz megnyitandó fájl" @@ -1102,7 +1112,7 @@ msgstr "Válasz megnyitandó fájl" msgid "Choose a memory card:" msgstr "Válassz memóriakártyát:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1169,16 +1179,16 @@ msgstr "Megjegyzés" msgid "Comment:" msgstr "Megjegyzés:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kiválasztott ISO tömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO tömörítése" @@ -1205,9 +1215,9 @@ msgstr "Irányítók beállítása" msgid "Configure..." msgstr "Beállítások..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Fájl felülírás jóváhagyása" @@ -1220,7 +1230,7 @@ msgstr "Kilépéskor megerÅ‘sítés" msgid "Connect" msgstr "Csatlakozás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB billentyűzet csatlakoztatása" @@ -1265,7 +1275,7 @@ msgstr "Irányítás" msgid "Convert to GCI" msgstr "Konvertálás: GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Másolás sikertelen" @@ -1329,11 +1339,11 @@ msgstr "" "\n" "CD/DVD lemezrÅ‘l futtatod a Dolphin emulátort, vagy a mentési fájl írásvédett?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Az 'ini' kiterjesztéshez nem található nyitott parancs!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1407,7 +1417,7 @@ msgstr "Néhány ortografikus megjelenítési paraméter egyedi beállítása." msgid "Czech" msgstr "Cseh" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1419,7 +1429,7 @@ msgstr "Digitális irányok" msgid "DSP" msgstr "Hang" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP emulátor motor" @@ -1432,7 +1442,7 @@ msgstr "DSP HLE emuláció (gyors)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (lassú)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE folyamatágon" @@ -1444,7 +1454,7 @@ msgstr "DSP LLE recompiler" msgid "DSP settings" msgstr "Hang (DSP) beállítások" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD gyökér könyvtár:" @@ -1489,16 +1499,16 @@ msgstr "Hibakeresés" msgid "Decimal" msgstr "Decimális" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "A kiválasztott ISO fájlok kitömörítése..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO kitömörítés" @@ -1506,7 +1516,7 @@ msgstr "ISO kitömörítés" msgid "Default" msgstr "Alap" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Alapértelmezett ISO:" @@ -1550,8 +1560,8 @@ msgstr "" msgid "Device" msgstr "Eszköz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Eszköz beállítások" @@ -1643,11 +1653,11 @@ msgstr "" msgid "Divide" msgstr "Megosztás" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Le akarod állítani az éppen működÅ‘ emulációt?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1676,12 +1686,12 @@ msgstr "Dolphin emulált Wiimote beállítások" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad beállítások" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS videók (*.dtm)" @@ -1693,7 +1703,7 @@ msgstr "Dolphin Wiimote beállítások" msgid "Dolphin at &Google Code" msgstr "Dolphin &Google Code oldal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1701,7 +1711,7 @@ msgstr "" "Dolphin nem talált egyetlen GC/Wii ISO fájlt sem. Fájlok tallózásához dupla " "kattintás ide..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1709,8 +1719,8 @@ msgstr "" "A Dolphin beállításai végett jelenleg a játékok rejtve vannak. Dupla " "kattintás ide a játékok megjelenítéséhez..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1736,7 +1746,7 @@ msgstr "Dobok" msgid "Dummy" msgstr "Utánzat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Hang mentése" @@ -1917,10 +1927,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR naplózás bekapcsolása" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "BAT használata" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blokk csatlakozás használata" @@ -1965,7 +1971,7 @@ msgstr "MMU használata" msgid "Enable Progressive Scan" msgstr "Progresszív pásztázás használata" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "KépernyÅ‘védÅ‘ bekapcsolása" @@ -2035,16 +2041,6 @@ msgstr "" "Használatával The Legend of Zelda: Twilight Princess játék sebessége " "növekedik. A TÖBBI játéknál legyen kikapcsolva." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik " -"funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE = " -"kompatibilis, KI = gyors)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Egyedi megjelenítési hack használata" @@ -2132,7 +2128,7 @@ msgstr "EgyenlÅ‘" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Hiba" @@ -2199,7 +2195,7 @@ msgstr "Felvétel exportálása..." msgid "Export Save" msgstr "Mentés exportálása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii mentés exportálása (kísérleti)" @@ -2215,7 +2211,7 @@ msgstr "Exportálás sikertelen. Újra megpróbálod?" msgid "Export save as..." msgstr "Exportálás mentése másként..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "KiegészítÅ‘" @@ -2272,7 +2268,7 @@ msgstr "Könyvtár kitömörítése" msgid "Extracting..." msgstr "Kitömörítés..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO bájt" @@ -2336,6 +2332,11 @@ msgstr "A bthprops.cpl betöltése sikertelen" msgid "Failed to load hid.dll" msgstr "A hid.dll betöltése sikertelen" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Fejléc írása sikertelen a(z) %s számára" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "A banner.bin beolvasása sikertelen" @@ -2427,11 +2428,11 @@ msgstr "" msgid "Fast" msgstr "Gyors" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU gyors verziója. Nem működik minden játéknál." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2487,7 +2488,7 @@ msgstr "FileIO: Ismeretlen megnyitási mód : 0x%02x" msgid "Filesystem" msgstr "Fájlrendszer" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Az 'ini' fájltípus ismeretlen! Nem lesz megnyitva!" @@ -2570,17 +2571,17 @@ msgstr "" msgid "Forward" msgstr "ElÅ‘re" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Képkocka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Képkocka" @@ -2653,7 +2654,7 @@ msgstr "GCMic beállítások" msgid "GCPad" msgstr "GC irányító" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2694,7 +2695,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &irányító beállítások" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube memóriakártyák (*.raw,*.gcp)" @@ -2806,7 +2807,7 @@ msgstr "A fejléc ellenÅ‘rzÅ‘ összege hibás" msgid "Hebrew" msgstr "Héber" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Magasság" @@ -2831,7 +2832,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Elrejtés" @@ -2900,11 +2901,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - rossz cél" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL beállítások" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2920,7 +2921,7 @@ msgstr "IR érzékenysége:" msgid "ISO Details" msgstr "ISO részletek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO könyvtárak" @@ -3060,7 +3061,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Lekódolt vagy kódolatlan kód beszúrása ide..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD kártya behelyezése" @@ -3072,7 +3073,7 @@ msgstr "Ãrj be ide nevet..." msgid "Install WAD" msgstr "WAD telepítése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Telepítés a Wii menübe" @@ -3082,7 +3083,7 @@ msgid "" msgstr "" "InstallExceptionHandler elÅ‘idézve, de ez a platform még nem támogatja azt." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD telepítése..." @@ -3109,7 +3110,7 @@ msgstr "" msgid "Interface" msgstr "Felhasználói felület" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Felület beállítások" @@ -3191,7 +3192,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Nem megfelelÅ‘ mentés" @@ -3274,7 +3275,7 @@ msgstr "Az utolsó felülírt mentés" msgid "Last Saved State" msgstr "Utolsó mentett állás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3374,11 +3375,11 @@ msgstr "Ãllás betöltése a 8. helyrÅ‘l" msgid "Load State..." msgstr "Ãllás betöltése..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii rendszer menü betöltése" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii rendszer menü betöltése %d%c" @@ -3456,7 +3457,7 @@ msgstr "" "MD5 eltérés\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU sebesség növelÅ‘ hack" @@ -3491,7 +3492,7 @@ msgstr "A memóriakártyán már van mentés ehhez a játékhoz" msgid "Memcard already opened" msgstr "A memóriakártya már meg van nyitva" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memória bájt" @@ -3508,7 +3509,7 @@ msgstr "" "Memóriakártya kezelÅ‘ FIGYELMEZTETÉS - Készíts biztonsági mentést a " "használata elÅ‘tt, helyreállítható de a meglévÅ‘ adatok sérülhetnek!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3546,7 +3547,7 @@ msgstr "Min" msgid "Misc" msgstr "Egyebek" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Egyéb beállítások" @@ -3571,11 +3572,11 @@ msgstr "" msgid "Monospaced font" msgstr "Azonos szélességű betűtípus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3610,11 +3611,11 @@ msgstr "" "Lenémítja a Wiimote hangszórót. Javítja a valódi Wiimote irányítók " "véletlenszerű lekapcsolódási hibáját. Nincs hatással az emulált irányítókra." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3741,7 +3742,7 @@ msgstr "Becenév:" msgid "No Country (SDK)" msgstr "Nincs ország (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nem találhatók sem ISO sem WAD fájlok" @@ -3750,8 +3751,8 @@ msgstr "Nem találhatók sem ISO sem WAD fájlok" msgid "No banner file found for title %s" msgstr "Nem található játék kép fájl a(z) %s játékhoz" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3759,7 +3760,7 @@ msgstr "" msgid "No docking" msgstr "Nincs dokkolás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nincs fájl betöltve" @@ -3767,7 +3768,7 @@ msgstr "Nincs fájl betöltve" msgid "No free dir index entries" msgstr "Nincs üres könyvtári jelzÅ‘szám bejegyzés" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nincs rögzített fájl" @@ -3790,7 +3791,7 @@ msgid "Not Equal" msgstr "Nem egyenlÅ‘" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nincs beállítva" @@ -3798,7 +3799,7 @@ msgstr "Nincs beállítva" msgid "Not connected" msgstr "Nincs csatlakoztatva" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Megjegyzés" @@ -3832,7 +3833,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk gyorsítás" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Elem" @@ -3863,11 +3864,11 @@ msgstr "Csak %d blokk szabad" msgid "Open" msgstr "Megnyitás" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "A játékot &tartalmazó mappa megnyitása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii &mentések mappa megnyitása" @@ -3897,7 +3898,7 @@ msgstr "OpenCL textúra dekódoló" msgid "OpenMP Texture Decoder" msgstr "OpenMP textúra dekódoló" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "LehetÅ‘ségek" @@ -3982,8 +3983,8 @@ msgstr "Javítások" msgid "Paths" msgstr "Mappák" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Szünet" @@ -4007,8 +4008,8 @@ msgstr "%d perspektíva" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Indítás" @@ -4034,7 +4035,7 @@ msgstr "Visszajátszási lehetÅ‘ségek" msgid "Players" msgstr "Játékosok" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Változtatás jóváhagyása..." @@ -4050,19 +4051,19 @@ msgstr "Plusz - minusz" msgid "Polish" msgstr "Lengyel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "1. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "2. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "3. port" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "4. port" @@ -4083,17 +4084,17 @@ msgstr "Portugál (brazil)" msgid "Post-Processing Effect:" msgstr "Utófeldolgozási effektus:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Túl korai PlayController videó befejezés. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Túl korai PlayWiimote videó befejezés. %u > %u" @@ -4192,7 +4193,7 @@ msgstr "Wiimote újracsatlakoztatása állás betöltéskor" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Rögzítés" @@ -4248,7 +4249,7 @@ msgstr "Játéklista frissítése" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Törlés" @@ -4289,7 +4290,7 @@ msgstr "Jobbra" msgid "Right Stick" msgstr "Jobb kar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble funkció" @@ -4369,7 +4370,7 @@ msgstr "Ãllás mentése..." msgid "Save as..." msgstr "Mentés másként..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Tömörített GCM/ISO mentése" @@ -4377,11 +4378,11 @@ msgstr "Tömörített GCM/ISO mentése" msgid "Save current perspective" msgstr "Jelenlegi perspektíva mentése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Kitömörített GCM/ISO mentése" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." @@ -4390,16 +4391,16 @@ msgstr "%s állásmentés videója sérült, videó rögzítése leáll..." msgid "Scaled EFB Copy" msgstr "Méretezett EFB másolat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Keresés %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ISO fájlok keresése" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Keresés..." @@ -4420,7 +4421,7 @@ msgstr "Csalás keresés" msgid "Search Filter" msgstr "Keresési szűrÅ‘" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Keresés az almappákban" @@ -4445,11 +4446,11 @@ msgid "Select" msgstr "Választás" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Válassz rögzítendÅ‘ fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Válassz telepítendÅ‘ Wii WAD fájlt" @@ -4475,15 +4476,15 @@ msgstr "Válassz lebegÅ‘ ablakokat" msgid "Select the file to load" msgstr "BetöltendÅ‘ fájl kiválasztása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Válassz mentési fájlt" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Válassz betöltendÅ‘ állásmentést" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Válassz mentendÅ‘ állást" @@ -4573,7 +4574,7 @@ msgstr "" msgid "Set" msgstr "Beáll." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Beállítás &alapértelmezett ISO fájlként" @@ -4602,7 +4603,7 @@ msgstr "Beállítások..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nem található a beállítási fájl" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Rázás" @@ -4779,7 +4780,7 @@ msgstr "" "\n" "Ha bizonytalan vagy, hagyd kijelöletlenül." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Oldalt tartott Wiimote" @@ -4787,14 +4788,18 @@ msgstr "Oldalt tartott Wiimote" msgid "Simplified Chinese" msgstr "Egyszerűsített kínai" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Méret" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOS kihagyása" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dest. Alpha Pass kihagyása" @@ -4837,11 +4842,11 @@ msgstr "" msgid "Slot %i" msgstr "%i hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "A hely" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "B hely" @@ -4866,7 +4871,7 @@ msgstr "" "Biztosan be kívánod kapcsolni a szoftveres képalkotót? Ha bizonytalan vagy, " "válaszd ezt: 'Nem'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Hang beállítások" @@ -4945,7 +4950,7 @@ msgstr "Felvétel in&dítása" msgid "Start Recording" msgstr "Felvétel indítása" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Ãllap." @@ -5006,12 +5011,12 @@ msgstr "Fájl sikeresen exportálva a(z) %s helyre" msgid "Successfully imported save files" msgstr "Mentés fájlok sikeresen importálva" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Lengetés" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Rendszer nyelv:" @@ -5079,13 +5084,13 @@ msgstr "A cím érvénytelen" msgid "The checksum was successfully fixed" msgstr "Az ellenÅ‘rzÅ‘ összeg sikeresen javítva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "A választott könyvtár már szerepel a listán" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5175,7 +5180,7 @@ msgstr "A megadott \"%s\" fájl nem létezik" msgid "The value is invalid" msgstr "Az érték érvénytelen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Kinézet" @@ -5209,9 +5214,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Ez lassulást okozhat a Wii menüben és néhány játékban." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5248,12 +5255,12 @@ msgstr "Ez által kézileg szerkesztheted az INI konfigurációs fájlt" msgid "Threshold" msgstr "Küszöbérték" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Billentés" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Cím" @@ -5317,7 +5324,7 @@ msgstr "Típus" msgid "UDP Port:" msgstr "UDP port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5326,7 +5333,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "ISMERETLEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ISMERETLEN" @@ -5363,7 +5370,7 @@ msgstr "Meghatározatlan %i" msgid "Undo Load State" msgstr "Ãllás betöltés törlése" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5403,11 +5410,11 @@ msgstr "Fel" msgid "Update" msgstr "Frissítés" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ElÅ‘re tartott Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 mód (PAL60) használata" @@ -5483,7 +5490,7 @@ msgstr "Kép" msgid "Virtual" msgstr "Virtuális" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "HangerÅ‘" @@ -5552,7 +5559,7 @@ msgstr "" "és azonos néven fog szerepelni a memóriakártyán lévÅ‘kkel\n" "Folytatod?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5564,7 +5571,7 @@ msgstr "" "másik mentést, vagy betöltheted ezt a mentést az írásvédett mód kikapcsolása " "után." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5576,7 +5583,7 @@ msgstr "" "betöltheted ezt a mentést az írásvédett mód kikapcsolása után. EllenkezÅ‘ " "esetben szinkronizációs hibák jelentkezhetnek." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5623,7 +5630,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Szélesvásznú hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Szélesség" @@ -5635,7 +5642,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii konzol" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND gyökér könyvtár:" @@ -5643,7 +5650,7 @@ msgstr "Wii NAND gyökér könyvtár:" msgid "Wii Save Import" msgstr "Wii mentés importálása" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii mentés fájlok (*.bin)|*.bin" @@ -5706,10 +5713,10 @@ msgstr "Jobb Windows" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Folyamatban..." @@ -5745,7 +5752,7 @@ msgstr "XAudio2 iniciálási hiba: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 fÅ‘ hang létrehozási hiba: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5782,7 +5789,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Meg kell adnod egy érvényes profil nevet." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "Újra kell indítanod a Dolphin emulátort a változtatások érvényesítéséhez." @@ -5877,7 +5884,7 @@ msgstr "" msgid "^ ADD" msgstr "^ HOZZÃADÃS" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "betöltÅ‘ program (.img)" @@ -5904,7 +5911,7 @@ msgstr "iCacheJIT: Opcode olvasása innen %x. Kérlek jelentsd." msgid "not a wii save or read failure for file header size %x" msgstr "nem Wii mentés vagy a fájl fejléc méretének kiolvasása sikertelen %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5913,7 +5920,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ismeretlen parancs 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute visszatért -1 alkalmazás fut!" @@ -6198,6 +6205,9 @@ msgstr "| VAGY" #~ msgid "Enable Audio Throttle" #~ msgstr "Hang szabályozás használata" +#~ msgid "Enable BAT" +#~ msgstr "BAT használata" + #~ msgid "Enable CPU Access" #~ msgstr "Processzor hozzáférés engedélyezése" @@ -6222,6 +6232,15 @@ msgstr "| VAGY" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "KépernyÅ‘védÅ‘ használata (besülés elleni védelem)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Bekapcsolja a Blokk cím átvitelt (BAT); a memória vezérlÅ‘ egység egyik " +#~ "funkcióját. A hardverhez viszonyítva pontos, de az emulációhoz lassú. (BE " +#~ "= kompatibilis, KI = gyors)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/it.po b/Languages/po/it.po index fc10326f88..90df8c131e 100644 --- a/Languages/po/it.po +++ b/Languages/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: RebuMan, Dolphin Team\n" "Language-Team: \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" è un file GCM/ISO non valido, oppure non è una ISO GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -176,11 +176,11 @@ msgstr "Gestore &Trucchi" msgid "&DSP Settings" msgstr "&Impostazioni DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Elimina ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Elimina ISO selezionate..." @@ -244,7 +244,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Gioca" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Proprietà" @@ -288,11 +288,11 @@ msgstr "&Visualizza" msgid "&Wiimote Settings" msgstr "Impostazioni &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -312,7 +312,7 @@ msgstr "(SCONOSCIUTO)" msgid "(off)" msgstr "(nessuno)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -553,11 +553,11 @@ msgstr "Adattatore:" msgid "Add" msgstr "Aggiungi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Aggiungi codice ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Aggiungi Patch" @@ -567,7 +567,7 @@ msgstr "Aggiungi nuovo riquadro" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Aggiungi..." @@ -632,25 +632,25 @@ msgstr "Impostazioni Avanzate" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tutti i file GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tutti i file GCM GameCube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tutti i file ISO Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tutti i file compressi GC/Wii (gcz)" @@ -661,8 +661,8 @@ msgstr "Tutti i file (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." @@ -676,6 +676,10 @@ msgstr "Wiimote Emulato" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotropico:" @@ -694,7 +698,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Impossibile caricare l'Apploader dal file" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Programma di Caricamento (Apploader):" @@ -718,7 +722,7 @@ msgstr "Arabo" msgid "Are you sure you want to delete \"%s\"?" msgstr "Sei sicuro di voler eliminare \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -726,12 +730,12 @@ msgstr "" "Sei sicuro di voler eliminare questi file?\n" "Andranno persi definitivamente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspetto:" @@ -745,7 +749,7 @@ msgstr "Almeno un riquadro deve rimanere aperto." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Interfaccia Audio:" @@ -780,11 +784,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "Visualizza i tasti di input letti dall'emulatore." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "Registri" @@ -793,7 +797,7 @@ msgstr "Registri" msgid "Back" msgstr "Indietro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Impostazioni Interfaccia" @@ -803,7 +807,7 @@ msgstr "Impostazioni Interfaccia" msgid "Backend:" msgstr "Interfaccia Audio:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input in Background" @@ -817,7 +821,7 @@ msgid "Bad File Header" msgstr "File di Intestazione (Header) difettoso" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -884,7 +888,7 @@ msgstr "Corrotto" msgid "Browse" msgstr "Sfoglia" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Cerca una directory da aggiungere" @@ -892,7 +896,7 @@ msgstr "Cerca una directory da aggiungere" msgid "Browse for an ISO directory..." msgstr "Cerca una directory per le ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Cerca una directory di destinazione" @@ -906,7 +910,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Pulsanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -919,7 +929,7 @@ msgstr "Levetta di Controllo" msgid "C-Stick" msgstr "Levetta di Controllo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -957,7 +967,7 @@ msgstr "Impossibile aprire %s" msgid "Cannot unregister events with events pending" msgstr "Impossibile non registrare gli eventi in sospeso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -967,7 +977,7 @@ msgstr "" "Impossibile utilizzare il file come una scheda di memoria.\n" "Stai tentando di utilizzare lo stesso file su ambedue gli ingressi (slots)?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -999,7 +1009,7 @@ msgstr "Bloc Maiusc" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Area Centrale" @@ -1074,24 +1084,24 @@ msgstr "Cinese (Semplificato)" msgid "Chinese (Traditional)" msgstr "Cinese (Tradizionale)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Scegli una directory principale per i DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Scegli una ISO predefinita:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Scegli una directory da aggiungere" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Scegli un file da aprire" @@ -1099,7 +1109,7 @@ msgstr "Scegli un file da aprire" msgid "Choose a memory card:" msgstr "Scegli una scheda di memoria:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1166,16 +1176,16 @@ msgstr "Note" msgid "Comment:" msgstr "Note:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimi le ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Compressione ISO" @@ -1202,9 +1212,9 @@ msgstr "Configura Pads" msgid "Configure..." msgstr "Configura..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Conferma la Sovrascrittura del File" @@ -1218,7 +1228,7 @@ msgstr "Conferma alla Chiusura" msgid "Connect" msgstr "Connetti" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Collega Tastiera USB" @@ -1263,7 +1273,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "Converti a GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Copia non riuscita" @@ -1330,11 +1340,11 @@ msgstr "" "Stai eseguendo Dolphin da CD/DVD, o il file di salvataggio è protetto in " "scrittura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Impossibile trovare il comando di apertura per l'estensione 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1405,7 +1415,7 @@ msgstr "Personalizza alcuni parametri di Proiezione Ortografica" msgid "Czech" msgstr "Ceco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1417,7 +1427,7 @@ msgstr "Croce Direzionale" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motore di Emulazione DSP" @@ -1430,7 +1440,7 @@ msgstr "Emulazione DSP HLE (veloce)" msgid "DSP LLE interpreter (slow)" msgstr "Interprete DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "Esegui DSP LLE in un processo dedicato" @@ -1443,7 +1453,7 @@ msgstr "Ricompilatore DSP LLE" msgid "DSP settings" msgstr "Impostazioni DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Origine DVD:" @@ -1489,16 +1499,16 @@ msgstr "Debug" msgid "Decimal" msgstr "." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Decomprimi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Decomprimi ISO selezionate..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Decompressione ISO" @@ -1506,7 +1516,7 @@ msgstr "Decompressione ISO" msgid "Default" msgstr "Predef." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Predefinita:" @@ -1551,8 +1561,8 @@ msgstr "" msgid "Device" msgstr "Periferica" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Impostazioni Periferica" @@ -1630,11 +1640,11 @@ msgstr "Visualizza i tasti di input letti dall'emulatore." msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Vuoi interrompere l'emulazione in corso?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1663,12 +1673,12 @@ msgstr "Dolphin - Configurazione Wiimote Emulato" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin - Configurazione Controlli GC" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmati TAS Dolphin (*.dtm)" @@ -1680,14 +1690,14 @@ msgstr "Dolphin - Configurazione Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin in &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin non trova nessuna ISO GC/Wii. Doppio click qui per cercare i file..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1695,8 +1705,8 @@ msgstr "" "Dolphin è attualmente impostato per nascondere tutti i giochi. Doppio click " "qui per mostrare tutti i giochi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1722,7 +1732,7 @@ msgstr "Percussioni/Batteria" msgid "Dummy" msgstr "Fittizio/a" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Immagazzina Audio su disco" @@ -1881,10 +1891,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Attiva Registrazione Eventi AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Attiva BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Attiva Unione Blocchi" @@ -1930,7 +1936,7 @@ msgstr "Attiva MMU" msgid "Enable Progressive Scan" msgstr "Attiva Scansione Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Attiva WideScreen" @@ -1992,17 +1998,6 @@ msgstr "" "Se attivato velocizza The Legend of Zelda: Twilight Princess. Disattiva per " "qualsiasi altro gioco" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Attiva Traduzione Indirizzi dei Blocchi in Memoria (BAT), una funzione " -"dell'Unita di Gestione della Memoria.\n" -"Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire (Attivo " -"= Compatibile, Disattivato = Veloce)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Abilita Hack Proiezione Personalizzato" @@ -2082,7 +2077,7 @@ msgstr "Uguale" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Errore/i" @@ -2148,7 +2143,7 @@ msgstr "Esporta Registrazione..." msgid "Export Save" msgstr "Esporta Salvataggio" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Esporta salvataggi Wii (sperimentale)" @@ -2164,7 +2159,7 @@ msgstr "Esportazione non riuscita, riprovare?" msgid "Export save as..." msgstr "Esporta salvataggio come..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Estensione" @@ -2222,7 +2217,7 @@ msgstr "Estrazione Directory" msgid "Extracting..." msgstr "Estrazione..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte FIFO" @@ -2289,6 +2284,11 @@ msgstr "Caricamento hid.dll non riuscito" msgid "Failed to load hid.dll" msgstr "Caricamento hid.dll non riuscito" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Scrittura intestazione per %s non riuscita" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Accesso al banner.bin non riuscito" @@ -2380,11 +2380,11 @@ msgstr "" msgid "Fast" msgstr "Veloce" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versione veloce della MMU. Non funziona con qualsiasi gioco." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2440,7 +2440,7 @@ msgstr "File I/O: Modalità di apertura sconosciuta : 0x%02x" msgid "Filesystem" msgstr "Filesystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Il tipo 'ini' è sconosciuto! Il file non verrà aperto!" @@ -2521,17 +2521,17 @@ msgstr "" msgid "Forward" msgstr "in Avanti" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Fotogramma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Fotogramma " @@ -2607,7 +2607,7 @@ msgstr "Configurazione Log" msgid "GCPad" msgstr "Controlli GC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2648,7 +2648,7 @@ msgid "Gamecube &Pad Settings" msgstr "Impostazioni &Controlli GameCube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Schede di Memoria GameCube (*.raw,*.gcp)" @@ -2756,7 +2756,7 @@ msgstr "Somma di controllo dell'intestazione non riuscita" msgid "Hebrew" msgstr "Ebreo" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altezza" @@ -2781,7 +2781,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Nascondi" @@ -2848,11 +2848,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destinazione corrotta" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Impostazioni IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "Puntamento IR" @@ -2868,7 +2868,7 @@ msgstr "Sensibilità IR:" msgid "ISO Details" msgstr "Dettagli ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Directory ISO" @@ -2995,7 +2995,7 @@ msgstr "Ins" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserisci il codice criptato o decriptato qui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserisci SD Card" @@ -3007,7 +3007,7 @@ msgstr "Inserire il nome qui..." msgid "Install WAD" msgstr "Installa WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installa in Menu Wii" @@ -3018,7 +3018,7 @@ msgstr "" "E' stata sollevata un'Eccezione all'Installazione, tuttavia questa " "piattaforma non la supporta ancora." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installazione WAD..." @@ -3046,7 +3046,7 @@ msgstr "" msgid "Interface" msgstr "Impostazioni Interfaccia" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Impostazioni Interfaccia" @@ -3129,7 +3129,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Stato non valido" @@ -3209,7 +3209,7 @@ msgstr "Ultimo stato di gioco sovrascritto" msgid "Last Saved State" msgstr "Ultimo stato di gioco salvato" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3310,12 +3310,12 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8" msgid "Load State..." msgstr "Carica Stato di Gioco..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Carica il Menu di Sistema Wii %d%c" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carica il Menu di Sistema Wii %d%c" @@ -3388,7 +3388,7 @@ msgstr "" "L'MD5 non corrisponde\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack Velocità MMU" @@ -3423,7 +3423,7 @@ msgstr "La Memcard possiede già un salvataggio per questo titolo" msgid "Memcard already opened" msgstr "La Memcard è già aperta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte" @@ -3440,7 +3440,7 @@ msgstr "" "Gestore Scheda di Memoria - AVVISO: Eseguire una copia di sicurezza prima " "dell'uso!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3479,7 +3479,7 @@ msgstr "Mic" msgid "Misc" msgstr "Varie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Impostazioni Varie" @@ -3500,11 +3500,11 @@ msgstr "" msgid "Monospaced font" msgstr "Carattere a spaziatura fissa" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motore" @@ -3530,11 +3530,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3661,7 +3661,7 @@ msgstr "Pseudonimo:" msgid "No Country (SDK)" msgstr "Nessun Paese (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nessun ISO o WAD trovata" @@ -3670,8 +3670,8 @@ msgstr "Nessun ISO o WAD trovata" msgid "No banner file found for title %s" msgstr "Nessun file di banner trovato per il titolo %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3679,7 +3679,7 @@ msgstr "" msgid "No docking" msgstr "Nessun aggancio" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nessun file caricato" @@ -3687,7 +3687,7 @@ msgstr "Nessun file caricato" msgid "No free dir index entries" msgstr "Nessuna voce di directory libera" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nessun file registrato" @@ -3710,7 +3710,7 @@ msgid "Not Equal" msgstr "Diverso" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Non Impostato" @@ -3718,7 +3718,7 @@ msgstr "Non Impostato" msgid "Not connected" msgstr "Non collegato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Note" @@ -3752,7 +3752,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Accelerazione Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Oggetto" @@ -3783,11 +3783,11 @@ msgstr "Solo %d blocchi disponibili" msgid "Open" msgstr "Apri" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Apri &percorso file" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Apri cartella &salvataggi Wii" @@ -3818,7 +3818,7 @@ msgstr "Decodificatore Trama OpenMP" msgid "OpenMP Texture Decoder" msgstr "Decodificatore Trama OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opzioni" @@ -3905,8 +3905,8 @@ msgstr "Patches" msgid "Paths" msgstr "Percorsi" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" @@ -3931,8 +3931,8 @@ msgstr "Prospettiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Gioca" @@ -3958,7 +3958,7 @@ msgstr "Opzioni di Riproduzione" msgid "Players" msgstr "Giocatori" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Per favore confermare..." @@ -3974,19 +3974,19 @@ msgstr "Più-Meno" msgid "Polish" msgstr "Polacco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Porta 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Porta 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Porta 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Porta 4:" @@ -4008,17 +4008,17 @@ msgstr "Portoghese (Brasiliano)" msgid "Post-Processing Effect:" msgstr "Effetti di Post-Processing:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4119,7 +4119,7 @@ msgstr "Ricollega Wiimote al caricamento di uno Stato di Gioco" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Registra" @@ -4175,7 +4175,7 @@ msgstr "Aggiorna elenco giochi" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Rimuovi" @@ -4216,7 +4216,7 @@ msgstr "Destra" msgid "Right Stick" msgstr "Levetta Destra" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibrazione" @@ -4296,7 +4296,7 @@ msgstr "Salva Stato di Gioco..." msgid "Save as..." msgstr "Salva come..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Salva GCM/ISO compressi" @@ -4304,11 +4304,11 @@ msgstr "Salva GCM/ISO compressi" msgid "Save current perspective" msgstr "Salva prospettiva corrente" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Salva GCM/ISO decompressi" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." @@ -4318,16 +4318,16 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..." msgid "Scaled EFB Copy" msgstr "Scala Copie EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Ricerca..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Ricerca ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Ricerca..." @@ -4347,7 +4347,7 @@ msgstr "Cerca" msgid "Search Filter" msgstr "Filtro di Ricerca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Cerca nelle Sottocartelle" @@ -4373,11 +4373,11 @@ msgid "Select" msgstr "Seleziona" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleziona il File di Registrazione" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleziona un file WAD Wii da installare" @@ -4403,15 +4403,15 @@ msgstr "Seleziona finestre libere/mobili" msgid "Select the file to load" msgstr "Seleziona il file da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleziona il file di salvataggio" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleziona lo stato di gioco da caricare" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleziona lo stato di gioco da salvare" @@ -4489,7 +4489,7 @@ msgstr "" msgid "Set" msgstr "Imposta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Imposta come ISO &predefinita" @@ -4519,7 +4519,7 @@ msgstr "Impostazioni..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Impossible trovare il file per le impostazioni" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Scuoti" @@ -4693,7 +4693,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote in posizione di traverso" @@ -4701,15 +4701,19 @@ msgstr "Wiimote in posizione di traverso" msgid "Simplified Chinese" msgstr "Cinese Semplificato" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Dimensioni" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Salta Caricamento BIOS GC" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" @@ -4743,11 +4747,11 @@ msgstr "" msgid "Slot %i" msgstr "Ingresso %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Ingresso A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Ingresso B" @@ -4767,7 +4771,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Impostazioni Audio" @@ -4838,7 +4842,7 @@ msgstr "Avvia Re&gistrazione" msgid "Start Recording" msgstr "Avvia Registrazione" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stato" @@ -4893,12 +4897,12 @@ msgstr "Esportazione file in %s riuscita" msgid "Successfully imported save files" msgstr "Seleziona il file di salvataggio" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Ruota/Oscilla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Lingua di Sistema:" @@ -4969,13 +4973,13 @@ msgstr "L'indirizzo non è valido" msgid "The checksum was successfully fixed" msgstr "Tentativo di ripristino della somma di controllo riuscito" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "La directory scelta è già in lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5061,7 +5065,7 @@ msgstr "il file \"%s\" specificato non esiste" msgid "The value is invalid" msgstr "Il valore non è valido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Tema" @@ -5099,7 +5103,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5131,12 +5136,12 @@ msgstr "" msgid "Threshold" msgstr "Sensibilità" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclina" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titolo" @@ -5200,7 +5205,7 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5209,7 +5214,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "SCONOSCIUTO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "SCONOSCIUTO" @@ -5241,7 +5246,7 @@ msgstr "%i non definito" msgid "Undo Load State" msgstr "Annulla Caricamento Stato di Gioco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5281,11 +5286,11 @@ msgstr "Su" msgid "Update" msgstr "Aggiorna" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote in posizione verticale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Utilizza Modalità EuRGB60 (PAL60)" @@ -5351,7 +5356,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuale" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5418,7 +5423,7 @@ msgstr "" "la quale presenta un nome uguale ai file sulla tua memcard\n" "Continuare?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5426,7 +5431,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5434,7 +5439,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5466,7 +5471,7 @@ msgstr "Tremolo" msgid "Widescreen Hack" msgstr "Hack Widescreen" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Larghezza" @@ -5478,7 +5483,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "Origine DVD:" @@ -5487,7 +5492,7 @@ msgstr "Origine DVD:" msgid "Wii Save Import" msgstr "Importa Salvataggi Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Salva i file Wii (*.bin)|*.bin" @@ -5551,10 +5556,10 @@ msgstr "Windows Destro" msgid "Word Wrap" msgstr "Adatta Testo" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Attività in corso..." @@ -5590,7 +5595,7 @@ msgstr "Inizializzazione XAudio2 non riuscita: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Creazione voce principale XAudio2 non riuscita: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5624,7 +5629,7 @@ msgstr "E' necessario inserire un valore decimale, esadecimale o ottale." msgid "You must enter a valid profile name." msgstr "E' necessario inserie un nome valido per il profilo." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" "E' necessario il riavvio di Dolphin affinché le modifiche abbiano effetto." @@ -5702,7 +5707,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5731,7 +5736,7 @@ msgstr "" "non un salvataggio wii oppure accesso non riuscito al file con dimensione " "intestazione %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5740,7 +5745,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd 0x%08x sconosciuto" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "valore wxExecute ritornato -1 su applicazione in esecuzione!" @@ -6201,6 +6206,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Abilita Autoregolazione Audio" +#~ msgid "Enable BAT" +#~ msgstr "Attiva BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Attiva Accesso alla CPU" @@ -6225,6 +6233,16 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Attiva Salvaschermo (riduzione bruciature nei pixel)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Attiva Traduzione Indirizzi dei Blocchi in Memoria (BAT), una funzione " +#~ "dell'Unita di Gestione della Memoria.\n" +#~ "Accresce l'accuratezza dell'hardware emulato, ma è lento da eseguire " +#~ "(Attivo = Compatibile, Disattivato = Veloce)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/ja.po b/Languages/po/ja.po index 269ef2cf6d..a8e92b2187 100644 --- a/Languages/po/ja.po +++ b/Languages/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-23 10:06+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«ã€ã¾ãŸã¯ã‚²ãƒ¼ãƒ ã‚­ãƒ¥ãƒ¼ãƒ–ï¼Wii ã®ISOã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -177,11 +177,11 @@ msgstr "ãƒãƒ¼ãƒˆã‚³ãƒ¼ãƒ‰ç·¨é›†ãƒ„ール(&C)" msgid "&DSP Settings" msgstr "サウンド設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“を削除(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "é¸æŠžã—ãŸã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ã‚’å…¨ã¦å‰Šé™¤(&D)" @@ -245,7 +245,7 @@ msgstr "一時åœæ­¢(&P)" msgid "&Play" msgstr "開始(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "プロパティ(&P)" @@ -289,11 +289,11 @@ msgstr "表示(&V)" msgid "&Wiimote Settings" msgstr "Wii入力設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "å…¬å¼Wiki(英語)ã§å‹•ä½œçŠ¶æ³ã‚’確èª(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -313,7 +313,7 @@ msgstr "(ä¸æ˜Ž)" msgid "(off)" msgstr "オフ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -354,7 +354,7 @@ msgstr "入力を待機..." msgid "" msgstr "＜システムã®è¨€èªžï¼ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -553,11 +553,11 @@ msgstr "ビデオカード：" msgid "Add" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "コードを追加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "パッãƒã‚’追加" @@ -567,7 +567,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "追加" @@ -625,24 +625,24 @@ msgstr "高度ãªè¨­å®š" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "å…¨ã¦ã® GC/Wii ファイル (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "å…¨ã¦ã® GC/Wii イメージ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "GC GCMファイル (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "å…¨ã¦ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイル (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Wii ISOファイル (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "圧縮ã•ã‚ŒãŸGC/Wii ISOファイル (gcz)" @@ -651,9 +651,10 @@ msgid "All files (*.*)|*.*" msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -670,6 +671,10 @@ msgstr "Wii リモコンã®åŒæœŸèª¿æ•´" msgid "Analyze" msgstr "分æž" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "異方性フィルタリング：" @@ -687,7 +692,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Apploader ファイルã‹ã‚‰èª­ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader" @@ -714,7 +719,7 @@ msgstr "アラビア語" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" ã“ã®ãƒ—ロファイルを削除ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -722,11 +727,11 @@ msgstr "" "ã“れら複数ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿ\n" "å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®å®Ÿä½“ファイルを削除ã—ã¾ã™ã‹ï¼Ÿå…ƒã«æˆ»ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "アスペクト比：" @@ -740,7 +745,7 @@ msgstr "At least one pane must remain open." msgid "Audio" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "出力API (Audio Backend)" @@ -775,11 +780,11 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP register " @@ -787,7 +792,7 @@ msgstr "BP register " msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "出力設定" @@ -796,7 +801,7 @@ msgstr "出力設定" msgid "Backend:" msgstr "æç”»API：" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å…¥åŠ›ã‚’許å¯" @@ -810,7 +815,7 @@ msgid "Bad File Header" msgstr "ファイルヘッダã®ä¸è‰¯" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "ãƒãƒŠãƒ¼" @@ -876,7 +881,7 @@ msgstr "ダメダメ" msgid "Browse" msgstr "é¸æŠž" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„" @@ -884,7 +889,7 @@ msgstr "ゲームリストã«è¿½åŠ ã™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é¸æŠžã—ã¦ãã ã•ã„ msgid "Browse for an ISO directory..." msgstr "ISOã®ã‚るフォルダをブラウズ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "出力先をé¸æŠž" @@ -898,7 +903,13 @@ msgstr "ãƒãƒƒãƒ•ã‚¡ï¼š" msgid "Buttons" msgstr "ボタン" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -910,7 +921,7 @@ msgstr "C-スティック" msgid "C-Stick" msgstr "C-スティック" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -952,7 +963,7 @@ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“" msgid "Cannot unregister events with events pending" msgstr "Cannot unregister events with events pending" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -963,7 +974,7 @@ msgstr "" "%s\n" "ã“ã‚Œã¯ä¸æ­£ãªãƒ¡ãƒ¢ãƒªãƒ¼ã‚«ãƒ¼ãƒ‰ãƒ‡ãƒ¼ã‚¿ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -994,7 +1005,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "カタルーニャ語" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Center" @@ -1069,23 +1080,23 @@ msgstr "簡体字中国語" msgid "Chinese (Traditional)" msgstr "ç¹ä½“字中国語" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVDルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "NANDã®ã‚るルートフォルダをé¸æŠžã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "ディスクãƒãƒ£ãƒ³ãƒãƒ«ã«è¡¨ç¤ºã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "追加ã—ãŸã„フォルダをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "メモリーカードをé¸æŠž" @@ -1093,7 +1104,7 @@ msgstr "メモリーカードをé¸æŠž" msgid "Choose a memory card:" msgstr "メモリーカードをé¸æŠž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1160,16 +1171,16 @@ msgstr "コメント" msgid "Comment:" msgstr "ゲーム紹介" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’圧縮" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "é¸æŠžã—ãŸISOファイルを全ã¦åœ§ç¸®" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "圧縮ã—ã¦ã„ã¾ã™..." @@ -1196,9 +1207,9 @@ msgstr "パッド設定" msgid "Configure..." msgstr "Dolphin本体ã®è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "ファイルã®ä¸Šæ›¸ãを確èª" @@ -1211,7 +1222,7 @@ msgstr "動作åœæ­¢æ™‚ã«ç¢ºèª" msgid "Connect" msgstr "接続" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USBキーボードã®æŽ¥ç¶šã‚’エミュレート" @@ -1256,7 +1267,7 @@ msgstr "Control" msgid "Convert to GCI" msgstr "GCIファイルã«å¤‰æ›" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "コピーã«å¤±æ•—" @@ -1321,11 +1332,11 @@ msgstr "" "Dolphinã‚’CD/DVDã‹ã‚‰èµ·å‹•ã—ã¦ã„ã‚‹ã‹ã€ã‚»ãƒ¼ãƒ–ファイルãŒèª­ã¿å–り専用ã«ãªã£ã¦ã„ã¾ã›" "ã‚“ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "æ‹¡å¼µå­'ini'ã«å¯¾ã—ã¦é–¢é€£ä»˜ã‘られã¦ã„るプログラムãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1400,7 +1411,7 @@ msgstr "設定画é¢ã«å…¥ã‚Šã¾ã™" msgid "Czech" msgstr "ãƒã‚§ã‚³èªž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1412,7 +1423,7 @@ msgstr "å字キー" msgid "DSP" msgstr "サウンド" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSPエミュレーション方å¼" @@ -1425,7 +1436,7 @@ msgstr "DSP-HLE エミュレーション (高速)" msgid "DSP LLE interpreter (slow)" msgstr "DSP-LLE インタプリタ (低速)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP-LLEを別スレッドã§å®Ÿè¡Œ" @@ -1437,7 +1448,7 @@ msgstr "DSP-LLE リコンパイラ" msgid "DSP settings" msgstr "サウンドã«é–¢ã™ã‚‹è¨­å®šã‚’è¡Œã„ã¾ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVDルート" @@ -1482,16 +1493,16 @@ msgstr "デãƒãƒƒã‚°ç”¨é …ç›®" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦ISOファイルã¸å¾©å…ƒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "復元中..." @@ -1499,7 +1510,7 @@ msgstr "復元中..." msgid "Default" msgstr "既定" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "デフォルトISO" @@ -1544,8 +1555,8 @@ msgstr "" msgid "Device" msgstr "デãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "デãƒã‚¤ã‚¹è¨­å®š" @@ -1634,11 +1645,11 @@ msgstr "" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "動作中ã®ã‚²ãƒ¼ãƒ ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "Dolby Pro Logic II decoder" @@ -1667,12 +1678,12 @@ msgstr "Wii リモコンã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³è¨­å®š" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "GCコントローラ設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS ムービー (*.dtm)" @@ -1684,7 +1695,7 @@ msgstr "Wiiリモコンã®è¨­å®š" msgid "Dolphin at &Google Code" msgstr "Dolphin 開発状æ³(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1692,7 +1703,7 @@ msgstr "" "ゲームリストã¯ç©ºã§ã™ã€‚ã“ã®æ–‡ç« ã‚’ダブルクリックã—㦠GC/Wii ã®ISO ã¾ãŸã¯ WBFS " "ã‚‚ã—ã㯠WADファイルã®ã‚るフォルダをé¸æŠžã—ã¦ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1700,8 +1711,8 @@ msgstr "" "リスト中ã®å…¨ã¦ã®ã‚²ãƒ¼ãƒ ãŒè¨­å®šã«ã‚ˆã‚Šè¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“。ã“ã®æ–‡ç« ã‚’ダブルクリッ" "クã™ã‚‹ã¨è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "è¦æ±‚ã•ã‚ŒãŸæ“作を完了ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" @@ -1727,7 +1738,7 @@ msgstr "ドラムコントローラ" msgid "Dummy" msgstr "ダミーデãƒã‚¤ã‚¹" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "サウンドã®ãƒ€ãƒ³ãƒ—" @@ -1908,10 +1919,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "アクションリプレイコードã®ãƒ­ã‚°ã‚’å–å¾—ã™ã‚‹" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Enable BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Enable Block Merging" @@ -1956,7 +1963,7 @@ msgstr "Enable MMU" msgid "Enable Progressive Scan" msgstr "プログレッシブ表示を有効化" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "スクリーンセーãƒãƒ¼ã‚’有効化" @@ -2025,16 +2032,6 @@ msgstr "" "トワイライトプリンセスã«ãŠã„ã¦ã€åºƒå¤§ãªã‚¨ãƒªã‚¢ã§ç™ºç”Ÿã™ã‚‹FPS低下を抑ãˆã¾ã™ã€‚ä»–ã®" "タイトルã§ã¯ç„¡åŠ¹ã«ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Block Address Translation (BAT)：メモリ管ç†æ©Ÿæ§‹ã®æ©Ÿèƒ½ã®ä¸€ã¤ã§ã€æœ‰åŠ¹ã«ã™ã‚‹ã¨" -"ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼å‹•ä½œ" -"速度å‘上]" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Enables Custom Projection Hack" @@ -2128,7 +2125,7 @@ msgstr "ã«ä¸€è‡´ã™ã‚‹" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "エラー" @@ -2191,7 +2188,7 @@ msgstr "録画ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" msgid "Export Save" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "セーブデータをエクスãƒãƒ¼ãƒˆ (実験的)" @@ -2207,7 +2204,7 @@ msgstr "エクスãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚リトライã—ã¾ã™ã‹ï¼Ÿ" msgid "Export save as..." msgstr "セーブデータã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "拡張コントローラ" @@ -2264,7 +2261,7 @@ msgstr "フォルダをエクスãƒãƒ¼ãƒˆ" msgid "Extracting..." msgstr "抽出ã—ã¦ã„ã¾ã™..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO ãƒã‚¤ãƒˆ" @@ -2328,6 +2325,11 @@ msgstr "Failed to load bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Failed to load hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Failed to write header for %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Failed to read banner.bin" @@ -2418,11 +2420,11 @@ msgstr "ペルシア語" msgid "Fast" msgstr "Fast" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "高速ãªMMUを使用ã—ã¾ã™ã€‚å…¨ã¦ã®ã‚²ãƒ¼ãƒ ã§ã†ã¾ãå‹•ãã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2480,7 +2482,7 @@ msgstr "FileIO: Unknown open mode : 0x%02x" msgid "Filesystem" msgstr "構造" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr " 'ini' ã¯ä¸æ˜Žãªæ‹¡å¼µå­ã§ã™ã€‚é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“ï¼" @@ -2565,17 +2567,17 @@ msgstr "" msgid "Forward" msgstr "å‰æ–¹" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "検索çµæžœï¼š%d 件 '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "フレーム" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "フレーム" @@ -2647,7 +2649,7 @@ msgstr "マイクã®è¨­å®š" msgid "GCPad" msgstr "入力(GC)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2688,7 +2690,7 @@ msgid "Gamecube &Pad Settings" msgstr "ゲームキューブ入力設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "メモリーカードファイル (*.raw,*.gcp)" @@ -2801,7 +2803,7 @@ msgstr "Header checksum failed" msgid "Hebrew" msgstr "ヘブライ語" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "範囲(縦)" @@ -2826,7 +2828,7 @@ msgstr "" "\n" "ã•ã‚ˆãªã‚‰ï¼\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éš ã™" @@ -2894,11 +2896,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL設定" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "ãƒã‚¤ãƒ³ã‚¿" @@ -2914,7 +2916,7 @@ msgstr "感度" msgid "ISO Details" msgstr "ゲームã®è©³ç´°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "フォルダ一覧" @@ -3051,7 +3053,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "ã“ã“ã«æš—å·åŒ–or復å·åŒ–ã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’貼り付ã‘ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SDカードã®æŒ¿å…¥ã‚’エミュレート" @@ -3063,7 +3065,7 @@ msgstr "コードåを入力ã—ã¦ãã ã•ã„" msgid "Install WAD" msgstr "Wiiメニューã«WADファイルを追加" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Wiiメニューã¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«" @@ -3074,7 +3076,7 @@ msgstr "" "InstallExceptionHandler ãŒå‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸãŒã€ã“ã®ãƒ—ラットフォームã¯ã¾ã ã‚µ" "ãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "追加ã—ã¦ã„ã¾ã™..." @@ -3103,7 +3105,7 @@ msgstr "" msgid "Interface" msgstr "表示" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Dolphinã®è¡¨ç¤ºã«é–¢ã™ã‚‹è¨­å®š" @@ -3185,7 +3187,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "ä¸æ­£ãªã‚¹ãƒ†ãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«" @@ -3268,7 +3270,7 @@ msgstr "最後ã«ä¸Šæ›¸ãã—ãŸã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" msgid "Last Saved State" msgstr "最新ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "レイテンシー：" @@ -3368,11 +3370,11 @@ msgstr "ステートロード - スロット 8" msgid "Load State..." msgstr "ファイルã‹ã‚‰ãƒ­ãƒ¼ãƒ‰" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wiiメニューを起動" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wiiメニューを起動 ( ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š%d %c )" @@ -3449,7 +3451,7 @@ msgstr "" "MD5ã®ä¸æ•´åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3484,7 +3486,7 @@ msgstr "ã“ã®ã‚¿ã‚¤ãƒˆãƒ«ã®ã‚»ãƒ¼ãƒ–データã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™" msgid "Memcard already opened" msgstr "ã™ã§ã«é–‹ã„ã¦ã„ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "メモリãƒã‚¤ãƒˆ" @@ -3499,7 +3501,7 @@ msgid "" "could mangle stuff!" msgstr "メモリーカードマãƒãƒ¼ã‚¸ãƒ£ã€€ï½žä½¿ç”¨å‰ã«ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‚’ï¼" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3537,7 +3539,7 @@ msgstr "最å°" msgid "Misc" msgstr "ãã®ä»–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ãã®ä»–ã®è¨­å®š" @@ -3562,11 +3564,11 @@ msgstr "" msgid "Monospaced font" msgstr "等幅フォント" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "モーションプラス" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "モーター" @@ -3601,11 +3603,11 @@ msgstr "" "Wii リモコン内蔵ã®ã‚¹ãƒ”ーカーを無効化ã—ã¾ã™ã€‚実機Wii リモコン使用中ランダムã«" "切断ã•ã‚Œã‚‹å•é¡Œã‚’解消ã—ã¾ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3732,7 +3734,7 @@ msgstr "ニックãƒãƒ¼ãƒ ï¼š" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -3741,8 +3743,8 @@ msgstr "リストã«é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“ï¼" msgid "No banner file found for title %s" msgstr "%s ã®ãƒãƒŠãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "説明ãªã—" @@ -3750,7 +3752,7 @@ msgstr "説明ãªã—" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" @@ -3758,7 +3760,7 @@ msgstr "読ã¿è¾¼ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãªã—" msgid "No free dir index entries" msgstr "空ãエントリãŒã‚ã‚Šã¾ã›ã‚“" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "録画ファイルãªã—" @@ -3781,7 +3783,7 @@ msgid "Not Equal" msgstr "ã«ä¸€è‡´ã—ãªã„" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未確èª" @@ -3789,7 +3791,7 @@ msgstr "未確èª" msgid "Not connected" msgstr "未接続" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ノート" @@ -3823,7 +3825,7 @@ msgstr "ヌンãƒãƒ£ã‚¯" msgid "Nunchuk Acceleration" msgstr "ヌンãƒãƒ£ã‚¯ã®åŠ é€Ÿåº¦" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "オブジェクト" @@ -3854,11 +3856,11 @@ msgstr "残り %d ブロックã—ã‹ã‚ã‚Šã¾ã›ã‚“ï¼" msgid "Open" msgstr "é–‹ã" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "実体ã®ã‚るフォルダを開ã(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "セーブデータã®ã‚るフォルダを開ã(&S)" @@ -3888,7 +3890,7 @@ msgstr "OpenCL Texture Decoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "設定" @@ -3973,8 +3975,8 @@ msgstr "パッãƒ" msgid "Paths" msgstr "フォルダ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "一時åœæ­¢" @@ -3998,8 +4000,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "開始" @@ -4025,7 +4027,7 @@ msgstr "å†ç”Ÿã‚ªãƒ—ション" msgid "Players" msgstr "プレイヤー一覧" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "確èª" @@ -4041,19 +4043,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ãƒãƒ¼ãƒˆ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ãƒãƒ¼ãƒˆ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ãƒãƒ¼ãƒˆ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ãƒãƒ¼ãƒˆ 4" @@ -4074,17 +4076,17 @@ msgstr "ブラジル語" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4183,7 +4185,7 @@ msgstr "ステートロード時ã«Wii リモコンをå†æŽ¥ç¶š" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "録画" @@ -4240,7 +4242,7 @@ msgstr "ゲームリストをå†æ›´æ–°ã—ã¾ã™" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "削除" @@ -4281,7 +4283,7 @@ msgstr "å³" msgid "Right Stick" msgstr "å³ã‚¹ãƒ†ã‚£ãƒƒã‚¯" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "振動" @@ -4361,7 +4363,7 @@ msgstr "ファイルã¨ã—ã¦ä¿å­˜" msgid "Save as..." msgstr "ファイルã¨ã—ã¦ä¿å­˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4369,11 +4371,11 @@ msgstr "圧縮ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "復元ã™ã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã®ä¿å­˜å…ˆã‚’é¸æŠž" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止ã—ã¦ã„ã¾ã™..." @@ -4382,16 +4384,16 @@ msgstr "Savestate movie %s ã®ç ´æを確èªã—ã¾ã—ãŸã€‚録画を中止㗠msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "確èªã—ã¦ã„ã¾ã™... .%s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "確èªä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "確èªä¸­..." @@ -4411,7 +4413,7 @@ msgstr "検索" msgid "Search Filter" msgstr "フィルタリング" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "サブフォルダも検索" @@ -4435,11 +4437,11 @@ msgid "Select" msgstr "é¸æŠž" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "録画ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "追加ã™ã‚‹WADファイルをé¸æŠž" @@ -4465,15 +4467,15 @@ msgstr "" msgid "Select the file to load" msgstr "ロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "セーブファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "ロードã™ã‚‹ã‚¹ãƒ†ãƒ¼ãƒˆã‚»ãƒ¼ãƒ–ファイルをé¸æŠž" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "ステートセーブã®ä¿å­˜å…ˆã‚’é¸æŠž" @@ -4558,7 +4560,7 @@ msgstr "シリアルãƒãƒ¼ãƒˆï¼šãƒ–ロードãƒãƒ³ãƒ‰ã‚¢ãƒ€ãƒ—ã‚¿ãªã©ã®ãƒ‡ãƒ msgid "Set" msgstr "é©ç”¨" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Wiiメニュー(ディスクãƒãƒ£ãƒ³ãƒãƒ«)ã«è¡¨ç¤º(&D)" @@ -4590,7 +4592,7 @@ msgstr "設定" msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Cant find setting file" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "シェイク" @@ -4768,7 +4770,7 @@ msgstr "" "\n" "よã分ã‹ã‚‰ãªã‘ã‚Œã°ã€ãƒã‚§ãƒƒã‚¯ã‚’入れãªã„ã§ãã ã•ã„。" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" @@ -4776,14 +4778,18 @@ msgstr "横æŒã¡(Sideways)ã§ä½¿ç”¨" msgid "Simplified Chinese" msgstr "簡体字中国語" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "サイズ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOSをスキップ" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Skip Dest. Alpha Pass" @@ -4827,11 +4833,11 @@ msgstr "" msgid "Slot %i" msgstr "スロット %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "スロットA" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "スロットB" @@ -4854,7 +4860,7 @@ msgstr "" "デãƒãƒƒã‚°ç”¨é€”ã¨ã—ã¦ã®ã¿æœ‰ç”¨ãªã‚‚ã®ã§ã™ã€‚\n" "ãã‚Œã§ã‚‚使用ã—ã¾ã™ã‹ï¼Ÿã‚ˆã分ã‹ã‚‰ãªã‘ã‚Œã°ã€é¸æŠžã—ãªã„ã§ãã ã•ã„。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "サウンド設定" @@ -4933,7 +4939,7 @@ msgstr "録画を開始(&C)" msgid "Start Recording" msgstr "録画を開始" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "動作率" @@ -4993,12 +4999,12 @@ msgstr "%s ã¸ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«æˆåŠŸã—ã¾ã—ãŸ" msgid "Successfully imported save files" msgstr "セーブファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«æˆåŠŸ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "å‹•ã" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "システムã®è¨€èªžï¼š" @@ -5066,13 +5072,13 @@ msgstr "無効ãªã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã™" msgid "The checksum was successfully fixed" msgstr "ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ä¿®æ­£ã«æˆåŠŸã—ã¾ã—ãŸ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã¯ã™ã§ã«ãƒªã‚¹ãƒˆã«å­˜åœ¨ã—ã¾ã™ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5162,7 +5168,7 @@ msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ã¯å­˜åœ¨ã—ã¾ã›ã‚“" msgid "The value is invalid" msgstr "無効ãªå€¤ã§ã™" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "テーマ：" @@ -5198,9 +5204,11 @@ msgstr "" "ã¾ã™" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5236,12 +5244,12 @@ msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã®è¨­å®šã‚’テキストã§ç·¨é›†ã—ã¾ã™" msgid "Threshold" msgstr "ã—ãã„値" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "傾ã" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "タイトル" @@ -5305,7 +5313,7 @@ msgstr "å½¢å¼" msgid "UDP Port:" msgstr "UDPãƒãƒ¼ãƒˆ:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDPã§æŽ¥ç¶š" @@ -5314,7 +5322,7 @@ msgstr "UDPã§æŽ¥ç¶š" msgid "UNKNOWN" msgstr "ä¸æ˜Ž" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "UNKNOWN_%02X" @@ -5351,7 +5359,7 @@ msgstr "未定義 %i" msgid "Undo Load State" msgstr "ステートロードå‰ã®çŠ¶æ…‹ã«æˆ»ã™" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Unexpected 0x80 call? Aborting..." @@ -5389,11 +5397,11 @@ msgstr "上" msgid "Update" msgstr "å†å–å¾—" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "直立状態(Upright)ã§ä½¿ç”¨" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 (PAL60) モードを使用" @@ -5468,7 +5476,7 @@ msgstr "æç”»" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5538,7 +5546,7 @@ msgstr "" "\n" "続ã‘ã¾ã™ã‹ï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, fuzzy, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5549,7 +5557,7 @@ msgstr "" "> %u)。作業を続行ã™ã‚‹å‰ã«ã€ä»–ã®ã‚»ãƒ¼ãƒ–をロードã€ã¾ãŸã¯èª­ã¿å–り専用モードをオフ" "ã«ã—ã¦ã“ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5561,7 +5569,7 @@ msgstr "" "ã®ã‚¹ãƒ†ãƒ¼ãƒˆã‚’ロードã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ç¶šã‘ã‚‹ã¨ã€ãŠãらãDesyncã—ã¾" "ã™ã€‚" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, fuzzy, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5606,7 +5614,7 @@ msgstr "ワーミー" msgid "Widescreen Hack" msgstr "疑似ワイドスクリーン化" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "範囲(横)" @@ -5618,7 +5626,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii コンソール" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NANDルート" @@ -5626,7 +5634,7 @@ msgstr "Wii NANDルート" msgid "Wii Save Import" msgstr "Wiiã®ã‚»ãƒ¼ãƒ–データをインãƒãƒ¼ãƒˆ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wiiセーブデータ (*.bin)|*.bin" @@ -5689,10 +5697,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ワードラップ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "動作中..." @@ -5727,7 +5735,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5764,7 +5772,7 @@ msgstr "10進数・16進数・8進数ã„ãšã‚Œã‹ã®æœ‰åŠ¹ãªå€¤ã‚’入力ã—㦠msgid "You must enter a valid profile name." msgstr "有効ãªãƒ—ロファイルåを入力ã—ã¦ãã ã•ã„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "変更を有効ã«ã™ã‚‹ã«ã¯Dolphinã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„" @@ -5857,7 +5865,7 @@ msgstr "" msgid "^ ADD" msgstr "^ (...ã«åŠ ãˆã¦)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5884,7 +5892,7 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "not a wii save or read failure for file header size %x" msgstr "not a wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "　" @@ -5893,7 +5901,7 @@ msgstr "　" msgid "unknown cmd 0x%08x" msgstr "unknown cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -6178,6 +6186,9 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Enable Audio Throttle" #~ msgstr "Enable Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Enable BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Enable CPU Access" @@ -6202,6 +6213,15 @@ msgstr "| (...ã‚‚ã—ãã¯)" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "スクリーンセーãƒãƒ¼ã‚’使用 （画é¢ç„¼ã‘軽減）" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Block Address Translation (BAT)：メモリ管ç†æ©Ÿæ§‹ã®æ©Ÿèƒ½ã®ä¸€ã¤ã§ã€æœ‰åŠ¹ã«ã™ã‚‹" +#~ "ã¨ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç²¾åº¦ãŒå‘上ã—ã¾ã™[有効ï¼äº’æ›æ€§é‡è¦–,ï¼ç„¡åŠ¹ï¼" +#~ "動作速度å‘上]" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" diff --git a/Languages/po/ko.po b/Languages/po/ko.po index 4634c2b8d6..6d243c8a63 100644 --- a/Languages/po/ko.po +++ b/Languages/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-22 03:47+0900\n" "Last-Translator: \n" "Language-Team: \n" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"는 비ì í•© GCM/ISO 파ì¼ìž„, í˜¹ì€ GC/Wii ISOê°€ 아님." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -177,11 +177,11 @@ msgstr "치트 매니저(&C)" msgid "&DSP Settings" msgstr "오디오 설정(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "ISO ì‚­ì œ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "ì„ íƒëœ ISO들 ì‚­ì œ(&D)..." @@ -245,7 +245,7 @@ msgstr "ì¼ì‹œì •ì§€(&P)" msgid "&Play" msgstr "실행(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "ì†ì„±(&P)" @@ -289,11 +289,11 @@ msgstr "보기(&V)" msgid "&Wiimote Settings" msgstr "위모트 설정(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "위키(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -313,7 +313,7 @@ msgstr "(알려지지 ì•ŠìŒ)" msgid "(off)" msgstr "(ë”)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -354,7 +354,7 @@ msgstr "<키를 누르세요>" msgid "" msgstr "<시스템>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -553,11 +553,11 @@ msgstr "어댑터:" msgid "Add" msgstr "추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "ì•¡ì…˜ë¦¬í”Œë ˆì´ ì½”ë“œ 추가" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "패치 추가" @@ -567,7 +567,7 @@ msgstr "새로운 ì°½ 추가" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "추가..." @@ -627,24 +627,24 @@ msgstr "고급 설정" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "모든 GC/Wii 파ì¼ë“¤ (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "모든 GC/Wii ì´ë¯¸ì§€ë“¤ (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "모든 게임í브 GCM 파ì¼ë“¤ (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "모든 ìƒíƒœë“¤ 저장 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "모든 Wii ISO 파ì¼ë“¤ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "모든 ì••ì¶•ëœ GC/Wii ISO 파ì¼ë“¤ (gcz)" @@ -653,9 +653,10 @@ msgid "All files (*.*)|*.*" msgstr "모든 íŒŒì¼ (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -671,6 +672,10 @@ msgstr "위모트 타ì´ë° 대안" msgid "Analyze" msgstr "분ì„" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "비등방성 í•„í„°ë§:" @@ -687,7 +692,7 @@ msgstr "앱로ë”ê°€ ìž˜ëª»ëœ í¬ê¸°ìž„... ì •ë§ ì•±ë¡œë”입니까?" msgid "Apploader unable to load from file" msgstr "앱로ë”ê°€ 파ì¼ë¡œ 부터 로드할 수 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "앱로ë”:" @@ -714,7 +719,7 @@ msgstr "ì•„ëžì–´" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" 를 ì •ë§ë¡œ 지우고 싶습니까?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -722,11 +727,11 @@ msgstr "" "ì´ íŒŒì¼ë“¤ì„ ì •ë§ë¡œ 지우고 싶습니까?\n" "ê·¸ê²ƒë“¤ì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "ì´ íŒŒì¼ì„ ì •ë§ë¡œ 지우고 싶습니까? ê·¸ê²ƒì€ ì˜ì›ížˆ 사ë¼ì§‘니다!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "종횡비:" @@ -740,7 +745,7 @@ msgstr "ì ì–´ë„ í•˜ë‚˜ì˜ ì°½ì´ ì—´ë ¤ 있어야합니다." msgid "Audio" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "오디오 백엔드:" @@ -775,11 +780,11 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP 레지스터" @@ -787,7 +792,7 @@ msgstr "BP 레지스터" msgid "Back" msgstr "뒤로" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "백엔드 설정" @@ -796,7 +801,7 @@ msgstr "백엔드 설정" msgid "Backend:" msgstr "백엔드:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "백그ë¼ìš´ë“œ ìž…ë ¥" @@ -810,7 +815,7 @@ msgid "Bad File Header" msgstr "ë°°ë“œ íŒŒì¼ í—¤ë”" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr " 배너" @@ -876,7 +881,7 @@ msgstr "고장남" msgid "Browse" msgstr "í´ë”íƒìƒ‰" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "추가할 디렉토리 둘러보기" @@ -884,7 +889,7 @@ msgstr "추가할 디렉토리 둘러보기" msgid "Browse for an ISO directory..." msgstr "ISO 디렉토리 불러오기..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "출력 디렉토리 둘러보기" @@ -898,7 +903,13 @@ msgstr "버í¼:" msgid "Buttons" msgstr "버튼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -910,7 +921,7 @@ msgstr "C 스틱" msgid "C-Stick" msgstr "C-스틱" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP 레지" @@ -952,7 +963,7 @@ msgstr "%s를 열수 ì—†ìŒ" msgid "Cannot unregister events with events pending" msgstr "ì´ë²¤íŠ¸ë“¤ ë¯¸í•´ê²°ì„ ì§€ë‹Œ ì´ë²¤íŠ¸ë“¤ì„ 등ë¡í•˜ì§€ ì•Šì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -963,7 +974,7 @@ msgstr "" "%s\n" "는 유효한 게임í브 메모리 ì¹´ë“œ 파ì¼ì´ 아닙니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -994,7 +1005,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "카탈로니아어" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "중앙" @@ -1067,23 +1078,23 @@ msgstr "중국어 (간소화)" msgid "Chinese (Traditional)" msgstr "중국어 (전통)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "NAND 루트 디렉토리 ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "ë””í´íŠ¸ ISO ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "추가할 디렉토리 ì„ íƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "열려는 íŒŒì¼ ì„ íƒ" @@ -1091,7 +1102,7 @@ msgstr "열려는 íŒŒì¼ ì„ íƒ" msgid "Choose a memory card:" msgstr "메모리 ì¹´ë“œ ì„ íƒ:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1157,16 +1168,16 @@ msgstr "주ì„" msgid "Comment:" msgstr "주ì„:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "ISO 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO 압축하기" @@ -1193,9 +1204,9 @@ msgstr "패드들 설정" msgid "Configure..." msgstr "환경설정..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "íŒŒì¼ ë®ì–´ì“°ê¸° 확정" @@ -1208,7 +1219,7 @@ msgstr "중지시 확ì¸" msgid "Connect" msgstr "ì—°ê²°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB 키보드 ì—°ê²°" @@ -1253,7 +1264,7 @@ msgstr "컨트롤" msgid "Convert to GCI" msgstr "GCI ë¡œ 변환" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "복사 실패했습니다" @@ -1317,11 +1328,11 @@ msgstr "" "\n" "CD/DVDì—ì„œ ëŒí•€ì„ 구ë™í•˜ë‚˜ìš”, 아니면 저장 파ì¼ì´ 쓰기 보호ì¼ì§€ë„?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "í™•ìž¥ìž 'ini'ì— ëŒ€í•œ 열린 ëª…ë ¹ì„ ë°œê²¬í•  수 없었습니다!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1395,7 +1406,7 @@ msgstr "ì¼ë¶€ ì • íˆ¬ì˜ íŒŒë¼ë¯¸í„°ë“¤ì„ 커스터마ì´ì¦ˆ." msgid "Czech" msgstr "ì²´ì½”" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1407,7 +1418,7 @@ msgstr "D-패드" msgid "DSP" msgstr "오디오" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP ì—뮬레ì´í„° 엔진" @@ -1420,7 +1431,7 @@ msgstr "DSP HLE ì—뮬레ì´ì…˜ (빠름)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE ì¸í„°í”„리터 (ëŠë¦¼)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE를 쓰레드ìƒì—" @@ -1432,7 +1443,7 @@ msgstr "DSP LLE 리컴파ì¼ëŸ¬" msgid "DSP settings" msgstr "DSP 설정" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD 루트:" @@ -1477,16 +1488,16 @@ msgstr "디버깅" msgid "Decimal" msgstr "10진수ì˜" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "ISO 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "ì„ íƒëœ ISO들 압축해제..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO 압축해제하기" @@ -1494,7 +1505,7 @@ msgstr "ISO 압축해제하기" msgid "Default" msgstr "기본" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "기본 ISO:" @@ -1538,8 +1549,8 @@ msgstr "" msgid "Device" msgstr "장비" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "장비 설정" @@ -1627,11 +1638,11 @@ msgstr "" msgid "Divide" msgstr "나누기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "현재 ì—뮬레ì´ì…˜ì„ 중단하고 싶습니까?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "ëŒë¹„ 프로 ë¡œì§ II 디코ë”" @@ -1660,12 +1671,12 @@ msgstr "ëŒí•€ ì—ë®¬ëœ ìœ„ëª¨íŠ¸ 환경설정" msgid "Dolphin FIFO" msgstr "ëŒí•€ FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "ëŒí•€ GC패드 환경설정" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "ëŒí•€ TAS ë™ì˜ìƒ (*.dtm)" @@ -1677,7 +1688,7 @@ msgstr "ëŒí•€ 위모트 환경설정" msgid "Dolphin at &Google Code" msgstr "ëŒí•€ 구글 코드(&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1685,7 +1696,7 @@ msgstr "" "ëŒí•€ì´ ì–´ëŠ GC/Wii ISOë„ ì°¾ì„ ìˆ˜ 없었습니다. 파ì¼ì„ 둘러보려면 여기를 ë”블í´" "릭하세요..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1693,8 +1704,8 @@ msgstr "" "ëŒí•€ì´ 현재 모든 ê²Œìž„ë“¤ì„ ìˆ¨ê¸°ê²Œ 설정ë¨. 모든 ê²Œìž„ë“¤ì„ ë³´ë ¤ë©´ 여기를 ë”블í´" "릭..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "ëŒí•€ì´ ìš”ì²­ëœ ì•¡ì…˜ì„ ì™„ìˆ˜í•  수 없었습니다." @@ -1720,7 +1731,7 @@ msgstr "드럼" msgid "Dummy" msgstr "ë”미" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "오디오 ë¤í”„" @@ -1899,10 +1910,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR 로깅 활성" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "BAT 활성" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "ë¸”ë¡ í•©ì¹˜ê¸° 활성" @@ -1947,7 +1954,7 @@ msgstr "MMU 활성" msgid "Enable Progressive Scan" msgstr "프로그레시브 스캔 활성" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "스í¬ë¦° 세ì´ë²„ 활성" @@ -2016,15 +2023,6 @@ msgstr "" "The Legend of Zelda: Twilight Princess를 ì†ë„를 올리려면 켬. 다른 ê²Œìž„ì„ ìœ„í•´" "서는 ë”." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, 하지" -"만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "ì‚¬ìš©ìž ì§€ì • 프로ì ì…˜ 핵 활성화" @@ -2114,7 +2112,7 @@ msgstr "ê°™ìŒ" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "ì—러" @@ -2178,7 +2176,7 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ë‚´ë³´ë‚´ê¸°..." msgid "Export Save" msgstr "저장 내보내기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii 저장 내보내기 (실험ì )" @@ -2194,7 +2192,7 @@ msgstr "내보내기 실패했습니다, 다시 ì‹œë„?" msgid "Export save as..." msgstr "ì €ìž¥ì„ ë‹¤ë¥¸ ì´ë¦„으로 내보내기..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "확장" @@ -2251,7 +2249,7 @@ msgstr "디렉토리 압축풀기" msgid "Extracting..." msgstr "압축풀기..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO ë°”ì´íŠ¸" @@ -2315,6 +2313,11 @@ msgstr "bthprops.cpl ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." msgid "Failed to load hid.dll" msgstr "hid.dll ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "%s ì— ëŒ€í•œ í—¤ë” ì“°ê¸°ì— ì‹¤íŒ¨" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "banner.bin ì½ê¸°ì— 실패했습니다" @@ -2405,11 +2408,11 @@ msgstr "페르시아어" msgid "Fast" msgstr "빠름" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMUì˜ ë¹ ë¥¸ 버전. 모든 ê²Œìž„ì— ëŒ€í•´ ìž‘ë™í•˜ì§€ëŠ” 않는다." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2467,7 +2470,7 @@ msgstr "FileIO: 알려지지 ì•Šì€ ì—´ê¸° 모드: 0x%02x" msgid "Filesystem" msgstr "파ì¼ì‹œìŠ¤í…œ" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "'ini'파ì¼íƒ€ìž…ì€ ì•Œë ¤ì§€ì§€ ì•ŠìŒ! 열지 않겠습니다!" @@ -2549,17 +2552,17 @@ msgstr "" msgid "Forward" msgstr "앞으로" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "%d ê°œ 찾았습니다 '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "프레임" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "프레임" @@ -2631,7 +2634,7 @@ msgstr "GCMic 환경설정" msgid "GCPad" msgstr "GC패드" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2672,7 +2675,7 @@ msgid "Gamecube &Pad Settings" msgstr "게임í브 패드 설정(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "게임í브 메모리 카드들 (*.raw,*.gcp)" @@ -2784,7 +2787,7 @@ msgstr "í—¤ë” ì²´í¬ì„¬ 실패했습니다" msgid "Hebrew" msgstr "히브리어" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "높ì´" @@ -2809,7 +2812,7 @@ msgstr "" "\n" "사요나ë¼!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "숨김" @@ -2878,11 +2881,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - ìž˜ëª»ëœ ëŒ€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 설정" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2898,7 +2901,7 @@ msgstr "IR ê°ë„:" msgid "ISO Details" msgstr "ISO 세부사항" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO 디렉토리들" @@ -3035,7 +3038,7 @@ msgstr "삽입" msgid "Insert Encrypted or Decrypted code here..." msgstr "암호화ë˜ê±°ë‚˜ 암호해ë…ëœ ì½”ë“œë¥¼ ì—¬ê¸°ì— ì‚½ìž…í•˜ì„¸ìš”..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD ì¹´ë“œ 삽입" @@ -3047,7 +3050,7 @@ msgstr "ì´ë¦„ì„ ì—¬ê¸°ì— ë„£ìœ¼ì‹œì˜¤..." msgid "Install WAD" msgstr "WAD 설치" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Wii ë©”ë‰´ì— ì„¤ì¹˜" @@ -3058,7 +3061,7 @@ msgstr "" "InstallExceptionHandler 호출ë¨, 하지만 ì´ í”Œëž«í¼ì€ ì•„ì§ ê·¸ê²ƒì„ ì§€ì›í•˜ì§€ 않습" "니다." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD 설치하기..." @@ -3087,7 +3090,7 @@ msgstr "" msgid "Interface" msgstr "ì¸í„°íŽ˜ì´ìŠ¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ì¸í„°íŽ˜ì´ìŠ¤ 설정" @@ -3169,7 +3172,7 @@ msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (숫ìžë¡œ ë³€í™˜ë  ìˆ˜ 없었습니다)" msgid "Invalid search string (only even string lengths supported)" msgstr "비ì í•© 찾기 ìŠ¤íŠ¸ë§ (ì§ìˆ˜ ê¸¸ì´ ìŠ¤íŠ¸ë§ë§Œ 지ì›ë©ë‹ˆë‹¤)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "비ì í•© ìƒíƒœ" @@ -3251,7 +3254,7 @@ msgstr "마지막 ë®ì–´ì¨ì§„ ìƒíƒœ" msgid "Last Saved State" msgstr "마지막 ì €ìž¥ëœ ìƒíƒœ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "지연:" @@ -3351,11 +3354,11 @@ msgstr "슬롯8 ìƒíƒœ 로드" msgid "Load State..." msgstr "ìƒíƒœ 로드..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii 시스템 메뉴 로드" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii 시스템 메뉴 %d %c 로드" @@ -3432,7 +3435,7 @@ msgstr "" "MD5 미스매치\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 스피드 핵" @@ -3467,7 +3470,7 @@ msgstr "메모리카드가 ì´ íƒ€ì´í‹€ì— 대해 ì €ìž¥ì„ ì´ë¯¸ ê°€ì§" msgid "Memcard already opened" msgstr "메모리카드가 ì´ë¯¸ ì—´ë ¤ì§" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "메모리 ë°”ì´íŠ¸" @@ -3484,7 +3487,7 @@ msgstr "" "메모리 ì¹´ë“œ 메니저 경고-사용하기 ì „ì— ë°±ì—…ì„ ë§Œë“œì„¸ìš”, ê³ ì³ì ¸ì•¼ 겠지만 훼ì†" "ë  ìˆ˜ 있습니다." -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3522,7 +3525,7 @@ msgstr "최소값" msgid "Misc" msgstr "기타" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "기타 설정" @@ -3547,11 +3550,11 @@ msgstr "" msgid "Monospaced font" msgstr "단ì¼ë„어쓰기 í°íŠ¸" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "모션 플러스" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "모터" @@ -3586,11 +3589,11 @@ msgstr "" "위모트 스피커를 ìŒì†Œê±°í•©ë‹ˆë‹¤. 실제 위모트 ìƒì—ì„œ ëžœë¤ ì—°ê²°í•´ì œë“¤ì„ ê³ ì¹©ë‹ˆë‹¤. " "ì—ë®¬ëœ ìœ„ëª¨íŠ¸ ìƒì—서는 효과 ì—†ìŒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "알림: 스트림 사ì´ì¦ˆê°€ 실제 ë°ì´í„° 길ì´ì™€ 매치ë˜ì§€ 않습니다\n" @@ -3717,7 +3720,7 @@ msgstr "별명 :" msgid "No Country (SDK)" msgstr "êµ­ê°€ ì—†ìŒ (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "ISO나 WADSê°€ ì—†ìŒ" @@ -3726,8 +3729,8 @@ msgstr "ISO나 WADSê°€ ì—†ìŒ" msgid "No banner file found for title %s" msgstr "%s 타ì´í‹€ì— 대한 배너 파ì¼ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "ì í•©í•œ ìƒì„¸ì„¤ëª… ì—†ìŒ" @@ -3735,7 +3738,7 @@ msgstr "ì í•©í•œ ìƒì„¸ì„¤ëª… ì—†ìŒ" msgid "No docking" msgstr "ë„킹 ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" @@ -3743,7 +3746,7 @@ msgstr "ë¡œë“œëœ íŒŒì¼ì´ ì—†ìŒ" msgid "No free dir index entries" msgstr "빈 디렉토리 ëª©ë¡ ì—”íŠ¸ë¦¬ë“¤ì´ ì—†ìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "ë…¹í™”ëœ íŒŒì¼ì´ ì—†ìŒ" @@ -3766,7 +3769,7 @@ msgid "Not Equal" msgstr "같지 ì•ŠìŒ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "설정 안함" @@ -3774,7 +3777,7 @@ msgstr "설정 안함" msgid "Not connected" msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "참고 사항" @@ -3808,7 +3811,7 @@ msgstr "눈처í¬" msgid "Nunchuk Acceleration" msgstr "ëˆˆì²˜í¬ ê°€ì†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "오브ì íŠ¸" @@ -3839,11 +3842,11 @@ msgstr "%d 블럭들만 유용한" msgid "Open" msgstr "열기" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "ë‹´ê³  있는 í´ë” 열기(&c)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii 저장 í´ë” 열기(&s)" @@ -3873,7 +3876,7 @@ msgstr "OpenCL í…스처 디코ë”" msgid "OpenMP Texture Decoder" msgstr "OpenMP í…스처 디코ë”" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "옵션" @@ -3955,8 +3958,8 @@ msgstr "패치" msgid "Paths" msgstr "경로" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "ì¼ì‹œì •ì§€" @@ -3980,8 +3983,8 @@ msgstr "ê´€ì  %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr " 실행 " @@ -4007,7 +4010,7 @@ msgstr "ìž¬ìƒ ì˜µì…˜" msgid "Players" msgstr "플레ì´ì–´" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "확ì¸í•´ì£¼ì„¸ìš”..." @@ -4023,19 +4026,19 @@ msgstr "플러스-마ì´ë„ˆìŠ¤" msgid "Polish" msgstr "í´ëž€ë“œì–´" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "í¬íŠ¸ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "í¬íŠ¸ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "í¬íŠ¸ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "í¬íŠ¸ 4" @@ -4056,17 +4059,17 @@ msgstr "í¬ë¥´íˆ¬ê°ˆì–´ (브ë¼ì§ˆ)" msgid "Post-Processing Effect:" msgstr "후-처리 효과:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayControllerì— ì˜ìƒë§ˆë¬´ë¦¬ê°€ 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimoteì— ì˜ìƒ 마무리가 미완성ë˜ì—ˆìŠµë‹ˆë‹¤. %u > %u" @@ -4165,7 +4168,7 @@ msgstr "ìƒíƒœ 로딩시 위모트 재연결" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "녹화" @@ -4221,7 +4224,7 @@ msgstr "게임 ëª©ë¡ ìƒˆë¡œ 고침" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "제거" @@ -4262,7 +4265,7 @@ msgstr "오른쪽" msgid "Right Stick" msgstr "오른쪽 스틱" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "진ë™" @@ -4342,7 +4345,7 @@ msgstr "ìƒíƒœ 저장..." msgid "Save as..." msgstr "다른 ì´ë¦„으로 저장..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "ì••ì¶•ëœ GCM/ISO를 저장" @@ -4350,11 +4353,11 @@ msgstr "ì••ì¶•ëœ GCM/ISO를 저장" msgid "Save current perspective" msgstr "현재 ê´€ì ì„ 저장" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "압축풀린 GCM/ISO를 저장" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€..." @@ -4363,16 +4366,16 @@ msgstr "%s ì˜ìƒ ìƒíƒœì €ìž¥ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤, ì˜ìƒ ê¸°ë¡ ì¤‘ì§€... msgid "Scaled EFB Copy" msgstr "스케ì¼ëœ EFB 복사" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "스ìºë‹ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ISOë“¤ì„ ê²€ì‚¬í•˜ê¸°" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "스ìºë‹..." @@ -4392,7 +4395,7 @@ msgstr "찾기" msgid "Search Filter" msgstr "í•„í„° 찾기" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "하위í´ë”들 찾기" @@ -4416,11 +4419,11 @@ msgid "Select" msgstr "ì„ íƒ" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "ê¸°ë¡ íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "설치할 Wii WAD íŒŒì¼ ì„ íƒ" @@ -4446,15 +4449,15 @@ msgstr "유ë™ì ì¸ 윈ë„우즈 ì„ íƒ" msgid "Select the file to load" msgstr "로드할 íŒŒì¼ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "저장 파ì¼ì„ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "로드할 ìƒíƒœ ì„ íƒ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "저장할 ìƒíƒœ ì„ íƒ" @@ -4541,7 +4544,7 @@ msgstr "시리얼 í¬íŠ¸ 1 - ì´ê²ƒì€ ë„· ì–´ëŒ‘í„°ê°™ì€ ë””ë°”ì´ìŠ¤ê°€ 사 msgid "Set" msgstr "설정" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "ë””í´íŠ¸ ISOë¡œ 설정(&d)" @@ -4571,7 +4574,7 @@ msgstr "설정..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: 설정 파ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "í”들기" @@ -4748,7 +4751,7 @@ msgstr "" "\n" "모르겠으면, ì´ê²ƒì„ 언체í¬ë¡œ ë‘세요." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "사ì´ë“œì›¨ì´ 위모트" @@ -4756,14 +4759,18 @@ msgstr "사ì´ë“œì›¨ì´ 위모트" msgid "Simplified Chinese" msgstr "간소화 중국어" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "í¬ê¸°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "ë°”ì´ì˜¤ìŠ¤ 스킵" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "목ì ì§€. 알파 패스 스킵" @@ -4806,11 +4813,11 @@ msgstr "" msgid "Slot %i" msgstr "슬롯 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "슬롯 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "슬롯 B" @@ -4833,7 +4840,7 @@ msgstr "" "디버깅 목ì ìœ¼ë¡œë§Œ 유용합니다.\n" "소프트웨어 ë Œë”ë§ì„ í™œì„±ì„ ì •ë§ ì›í•©ë‹ˆê¹Œ? 모르겠으면, '아니오'를 ì„ íƒí•˜ì„¸ìš”." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "사운드 설정" @@ -4912,7 +4919,7 @@ msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘(&c)" msgid "Start Recording" msgstr "(ìž…ë ¥) ê¸°ë¡ ì‹œìž‘" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "ìƒíƒœ" @@ -4971,12 +4978,12 @@ msgstr "성공ì ìœ¼ë¡œ 파ì¼ì„ %së¡œ 내보냈ìŒ" msgid "Successfully imported save files" msgstr "세ì´ë¸Œ 파ì¼ë“¤ì„ 성공ì ìœ¼ë¡œ 가져왔ìŒ" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "스윙" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "시스템 언어:" @@ -5044,13 +5051,13 @@ msgstr "ê·¸ 주소는 비ì í•© 입니다" msgid "The checksum was successfully fixed" msgstr "ì²´í¬ì„¬ì´ 성공ì ìœ¼ë¡œ ê³ ì³ì¡ŒìŠµë‹ˆë‹¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "ì„ íƒëœ 디렉토리는 ì´ë¯¸ ë¦¬ìŠ¤íŠ¸ì— ìžˆë‹¤" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5138,7 +5145,7 @@ msgstr "ê¸°ìˆ ëœ \"%s\" 파ì¼ì€ 존재하지 않는다" msgid "The value is invalid" msgstr "ê°’ì´ ë¹„ì í•© 합니다" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "테마:" @@ -5171,9 +5178,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "ì´ê²ƒì€ Wii 메뉴와 ì¼ë¶€ 게임들ì—ì„œ ëŠë ¤ì§ì„ 유발할 수 있다." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5209,12 +5218,12 @@ msgstr "ì´ê²ƒì€ 수ë™ìœ¼ë¡œ INI 환경파ì¼ì„ 수정하게 해줄ê²ë‹ˆë‹¤" msgid "Threshold" msgstr "한계ì " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "기울기" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr " 제목" @@ -5278,7 +5287,7 @@ msgstr "타입" msgid "UDP Port:" msgstr "UDP í¬íŠ¸:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP 위모트" @@ -5287,7 +5296,7 @@ msgstr "UDP 위모트" msgid "UNKNOWN" msgstr "알려지지 ì•ŠìŒ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "알려지지않ì€_%02X" @@ -5324,7 +5333,7 @@ msgstr "ì •ì˜ë˜ì§€ ì•Šì€ %i" msgid "Undo Load State" msgstr "ìƒíƒœ 로드 ë˜ëŒë¦¼" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "예ìƒí•˜ì§€ 못한 0x80 콜? 중단시킴..." @@ -5363,11 +5372,11 @@ msgstr "위" msgid "Update" msgstr "ì—…ë°ì´íŠ¸" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ì—…ë¼ì´íŠ¸ 위모트" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 모드 (PAL60) 사용" @@ -5441,7 +5450,7 @@ msgstr "비디오" msgid "Virtual" msgstr "ê°€ìƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "볼륨" @@ -5509,7 +5518,7 @@ msgstr "" "그리고 ë‹¹ì‹ ì˜ ë©”ëª¨ë¦¬ì¹´ë“œì— íŒŒì¼ë¡œ ê°™ì€ ì´ë¦„ì„ ê°€ì§‘ë‹ˆë‹¤\n" "계ì†í•©ë‹ˆê¹Œ?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5520,7 +5529,7 @@ msgstr "" "%u > %u). You should load another save before continuing, or load this state " "with read-only mode off." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5531,7 +5540,7 @@ msgstr "" "ì „ì— ë‹¤ë¥¸ 세ì´ë¸Œë¥¼ 로드해야합니다, í˜¹ì€ ì½ê¸°-ì „ìš© 모드를 ë„ê³  로드하세요. ê·¸" "렇지 않으면 ì•„ë§ˆë„ ì‹±í¬ ì–´ê¸‹ë‚¨ì´ ìƒê¸¸ê²ë‹ˆë‹¤." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5577,7 +5586,7 @@ msgstr "훼미" msgid "Widescreen Hack" msgstr "와ì´ë“œìŠ¤í¬ë¦° 핵" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "너비" @@ -5589,7 +5598,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii 콘솔" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND 루트:" @@ -5597,7 +5606,7 @@ msgstr "Wii NAND 루트:" msgid "Wii Save Import" msgstr "Wii 저장 가져오기" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 저장 파ì¼ë“¤ (*.bin)|*.bin" @@ -5660,10 +5669,10 @@ msgstr "윈ë„우즈 오른쪽" msgid "Word Wrap" msgstr "ìžë™ 줄바꿈" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "ìž‘ë™ì¤‘..." @@ -5698,7 +5707,7 @@ msgstr "XAudio2 초기화 실패: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 매스터 ë³´ì´ìŠ¤ ìƒì„± 실패: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF 레지" @@ -5734,7 +5743,7 @@ msgstr "ì í•©í•œ 10진수나 16진수나 8진수 ê°’ì„ ë„£ì–´ì•¼ 합니다." msgid "You must enter a valid profile name." msgstr "ì í•©í•œ í”„ë¡œíŒŒì¼ ì´ë¦„ì„ ë„£ì–´ì•¼ 합니다." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "ë³€ê²½ì´ ì ìš©ë˜ë ¤ë©´ ëŒí•€ì„ 재시작 해야 합니다." @@ -5827,7 +5836,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "ì•±ë¡œë” (.img)" @@ -5854,7 +5863,7 @@ msgstr "iCacheJIT: %x ì—ì„œ 옵코드 ì½ê¸°. 보고해주세요." msgid "not a wii save or read failure for file header size %x" msgstr "wii ì €ìž¥ì´ ì•„ë‹ˆê±°ë‚˜ íŒŒì¼ í—¤ë” í¬ê¸° %xì— ëŒ€í•œ ì½ê¸° 실패 " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "들" @@ -5863,7 +5872,7 @@ msgstr "들" msgid "unknown cmd 0x%08x" msgstr "알려지지 ì•Šì€ ëª…ë ¹ 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "애플리케ì´ì…˜ 구ë™ìƒì—ì„œ wxExecuteê°€ -1ì„ ë°˜í™˜í–ˆìŠµë‹ˆë‹¤!" @@ -6141,6 +6150,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "오디오 병목 활성" +#~ msgid "Enable BAT" +#~ msgstr "BAT 활성" + #~ msgid "Enable CPU Access" #~ msgstr "CPU 엑세스 활성" @@ -6165,6 +6177,14 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "스í¬ë¦° 세ì´ë²„ (ì—´í™” 줄임) 활성" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "블럭 주소 í•´ì„ (BAT); 메모리 관리 유닛 함수 활성. í•˜ë“œì›¨ì–´ì— ì •í™•í•´ì§„ë‹¤, " +#~ "하지만 ì—뮬레ì´íŠ¸ëŠ” ëŠë ¤ì§„다.(켬 = 호환성, ë” = 빠름)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/nb.po b/Languages/po/nb.po index 125ac2b920..286075ddca 100644 --- a/Languages/po/nb.po +++ b/Languages/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:40-0600\n" "Last-Translator: Knut \n" "Language-Team: Norwegian \n" @@ -47,7 +47,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" er en ugyldig GCM/ISO-fil, eller ikke en GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -177,11 +177,11 @@ msgstr "Jukse&kode-manager" msgid "&DSP Settings" msgstr "Innstillinger for &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Slett ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Slett valgte ISO-filer..." @@ -245,7 +245,7 @@ msgstr "&Pause" msgid "&Play" msgstr "&Spill" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Egenskaper" @@ -289,11 +289,11 @@ msgstr "Vi&s" msgid "&Wiimote Settings" msgstr "Innstillinger for Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -313,7 +313,7 @@ msgstr "(UKJENT)" msgid "(off)" msgstr "(av)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -556,11 +556,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Legg Til" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Legg til Action Replay Kode" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Legg til Patch" @@ -570,7 +570,7 @@ msgstr "Legg til ny rute" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Legg til..." @@ -631,25 +631,25 @@ msgstr "Avanserte Innstillinger" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii-filer (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle GameCube GCM-filer (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Save States (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO-filer (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle komprimerte GC/Wii-filer (gcz)" @@ -660,8 +660,8 @@ msgstr "Alle filer (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -679,6 +679,10 @@ msgstr "Emulert Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropisk Filtrering:" @@ -697,7 +701,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applikasjonlaster klarte ikke Ã¥ laste fra fil" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Applikasjonslaster:" @@ -724,7 +728,7 @@ msgstr "Arabisk" msgid "Are you sure you want to delete \"%s\"?" msgstr "Er du sikker pÃ¥ at du vil slette \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,13 +736,13 @@ msgstr "" "Er du sikker pÃ¥ at du vil slette disse filene?\n" "De vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Er du sikker pÃ¥ at du vil slette denne filen?\n" "Den vil bli borte for alltid!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Aspektforhold:" @@ -752,7 +756,7 @@ msgstr "Minst en rute mÃ¥ stÃ¥ Ã¥pen." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend:" @@ -787,11 +791,11 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registre" @@ -800,7 +804,7 @@ msgstr "&Registre" msgid "Back" msgstr "Tilbake" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend-innstillinger" @@ -809,7 +813,7 @@ msgstr "Backend-innstillinger" msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Bakgrunnsinndata" @@ -823,7 +827,7 @@ msgid "Bad File Header" msgstr "DÃ¥rlig Fil-header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -889,7 +893,7 @@ msgstr "Ødelagt" msgid "Browse" msgstr "Bla i" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Bla etter en mappe Ã¥ legge til" @@ -897,7 +901,7 @@ msgstr "Bla etter en mappe Ã¥ legge til" msgid "Browse for an ISO directory..." msgstr "Bla etter en ISO-mappe..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Bla etter lagringssted" @@ -911,7 +915,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knapper" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -924,7 +934,7 @@ msgstr "C-joystick" msgid "C-Stick" msgstr "C-joystick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -966,7 +976,7 @@ msgstr "Kan ikke Ã¥pne %s" msgid "Cannot unregister events with events pending" msgstr "Kan ikke avregistrere events med events under behandling" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -976,7 +986,7 @@ msgstr "" "Kan ikke bruke den filen som et minnekort.\n" "Prøver du Ã¥ bruke samme fil i begge slotter?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1007,7 +1017,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Katalansk" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Senter" @@ -1080,23 +1090,23 @@ msgstr "Kinesisk (Simplifisert)" msgid "Chinese (Traditional)" msgstr "Kinesisk (Tradisjonell)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Velg en DVD-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Velg en NAND-rotmappe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Velg en standard-ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Velg en mappe Ã¥ legge til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Velg en fil Ã¥ Ã¥pne" @@ -1104,7 +1114,7 @@ msgstr "Velg en fil Ã¥ Ã¥pne" msgid "Choose a memory card:" msgstr "Velg et minnekort:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1171,16 +1181,16 @@ msgstr "Kommentar" msgid "Comment:" msgstr "Kommentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Komprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Komprimer valgte ISO-er..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Komprimerer ISO" @@ -1207,9 +1217,9 @@ msgstr "Konfigurer Kontrollere" msgid "Configure..." msgstr "Konfigurer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Bekreft filoverskriving" @@ -1222,7 +1232,7 @@ msgstr "Bekreft ved Stans" msgid "Connect" msgstr "Koble til" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Koble til USB-tastatur" @@ -1267,7 +1277,7 @@ msgstr "Kontroll" msgid "Convert to GCI" msgstr "Konverter til GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopi feilet" @@ -1332,11 +1342,11 @@ msgstr "" "\n" "Kjører du Dolphin fra en CD/DVD, eller er lagringsfilen kanskje beskyttet?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kunne ikke finne Ã¥pningskommandoen for utvidelsen 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1410,7 +1420,7 @@ msgstr "Selvdefiner noen Ortografisk Projeksjons-parametere." msgid "Czech" msgstr "Tsjekkisk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1422,7 +1432,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "CPU Emulatormotor" @@ -1435,7 +1445,7 @@ msgstr "DSP HLE-emulering (raskt)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (tregt)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE pÃ¥ CPU-trÃ¥d" @@ -1447,7 +1457,7 @@ msgstr "DSP LLE re-kompilering" msgid "DSP settings" msgstr "Innstillinger for DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD-rot:" @@ -1492,16 +1502,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Desimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Dekomprimer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Dekomprimer valgte ISO-filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Dekomprimerer ISO" @@ -1509,7 +1519,7 @@ msgstr "Dekomprimerer ISO" msgid "Default" msgstr "Standard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standard-ISO:" @@ -1553,8 +1563,8 @@ msgstr "" msgid "Device" msgstr "Device" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Innstillinger for device" @@ -1644,11 +1654,11 @@ msgstr "" msgid "Divide" msgstr "Del" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Vil du stoppe pÃ¥gÃ¥ende emulering?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1677,12 +1687,12 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC-kontroll konfigurasjon" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS-Filmer (*.dtm)" @@ -1694,7 +1704,7 @@ msgstr "Dolphin Wiimote Konfigurasjon" msgid "Dolphin at &Google Code" msgstr "Dolphin pÃ¥ &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1702,7 +1712,7 @@ msgstr "" "Dolphin kunne ikke finne noen GC/Wii ISO-filer. Dobbeltklikk her for Ã¥ bla " "etter filer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1710,8 +1720,8 @@ msgstr "" "Dolphin er satt til Ã¥ gjemme alle spill. Dobbeltklikk her for Ã¥ vise alle " "spill..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1737,7 +1747,7 @@ msgstr "Trommer" msgid "Dummy" msgstr "Juksedukke" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Audio" @@ -1916,10 +1926,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Aktiver AR-logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Aktiver BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Aktiver Block Merging" @@ -1964,7 +1970,7 @@ msgstr "Aktiver MMU" msgid "Enable Progressive Scan" msgstr "Aktiver Progressiv Skanning" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Aktiver Skjermsparer" @@ -2033,16 +2039,6 @@ msgstr "" "Aktiver dette for Ã¥ bedre ytelsen i The Legend Of Zelda: Twillight Princess. " "Deaktiver for andre spill." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Tillater Block Adress Translation (BAT); en funksjon av Memory Management " -"Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = Kompitabelt, " -"AV = Raskt)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Tillater Selvdefinerte Projeksjons-hack" @@ -2130,7 +2126,7 @@ msgstr "Lik" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Feil" @@ -2192,7 +2188,7 @@ msgstr "Eksporter Opptak..." msgid "Export Save" msgstr "Eksporter Lagringsfil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Eksporter Wii-lagringsfil (Eksperimentiell)" @@ -2208,7 +2204,7 @@ msgstr "Eksportering mislyktes, prøv igjen?" msgid "Export save as..." msgstr "Eksporter lagringsfil som..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Utvidelse" @@ -2265,7 +2261,7 @@ msgstr "Ekstraherer Mappe" msgid "Extracting..." msgstr "Ekstraherer..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO-Byte" @@ -2329,6 +2325,11 @@ msgstr "Kunne ikke laste bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Kunne ikke laste hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Kunne ikke skrive header for %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Kunne ikke lese banner.bin" @@ -2419,11 +2420,11 @@ msgstr "" msgid "Fast" msgstr "Rask" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rask versjon av MMU. Fungerer ikke for alle spill." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2479,7 +2480,7 @@ msgstr "FileIO: Ukjent Ã¥penmodus: 0x%02x" msgid "Filesystem" msgstr "Filsystem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Filtypen 'ini' er ukjent! kan ikke Ã¥pnes!" @@ -2562,17 +2563,17 @@ msgstr "" msgid "Forward" msgstr "Send frem" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Stillbilde" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Stillbilde" @@ -2646,7 +2647,7 @@ msgstr "Konfigurer Logg" msgid "GCPad" msgstr "GC-kontroll" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2687,7 +2688,7 @@ msgid "Gamecube &Pad Settings" msgstr "Innstillinger for &GameCube-kontroll" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube-minnekort (*.raw,*.gcp)" @@ -2799,7 +2800,7 @@ msgstr "Header-sjekksum feilet" msgid "Hebrew" msgstr "Hebraisk" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Høyde" @@ -2823,7 +2824,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Gjem" @@ -2890,11 +2891,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - dÃ¥rlig destinasjon" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Innstillinger for IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2910,7 +2911,7 @@ msgstr "IR-sensitivitet:" msgid "ISO Details" msgstr "ISO-detaljer" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO-mapper" @@ -3046,7 +3047,7 @@ msgstr "Sett Inn" msgid "Insert Encrypted or Decrypted code here..." msgstr "Sett Inn Kryptert eller Dekryptert kode her..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Sett inn SD-kort" @@ -3058,7 +3059,7 @@ msgstr "Sett inn navn her..." msgid "Install WAD" msgstr "Installer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installer til Wii Meny" @@ -3067,7 +3068,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Installer WAD..." @@ -3094,7 +3095,7 @@ msgstr "" msgid "Interface" msgstr "Kontrollpanel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Innstillinger for kontrollpanel" @@ -3176,7 +3177,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ugyldig save state" @@ -3259,7 +3260,7 @@ msgstr "Siste Overskrevne Save State:" msgid "Last Saved State" msgstr "Siste Save State:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3359,11 +3360,11 @@ msgstr "Last Inn Save State Slot 8" msgid "Load State..." msgstr "Last Inn Save State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Last inn Wii System Meny" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Last inn Wii System Meny %d %c" @@ -3440,7 +3441,7 @@ msgstr "" "MD5 mismatch\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Ytelses-hack for MMU" @@ -3475,7 +3476,7 @@ msgstr "Minnekortet har allerede en lagringsfil for denne tittelen." msgid "Memcard already opened" msgstr "Minnekort allerede Ã¥pnet" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Memory Byte" @@ -3492,7 +3493,7 @@ msgstr "" "Minnekort Manager ADVARSEL - Lag backup før du benytter, det skal bli " "fikset, men den kan tukle med lagringsfilene dine!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3530,7 +3531,7 @@ msgstr "Minimum" msgid "Misc" msgstr "Diverse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Diverse Innstillinger" @@ -3555,11 +3556,11 @@ msgstr "" msgid "Monospaced font" msgstr "Mono-mellomrom tekst-font" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3594,11 +3595,11 @@ msgstr "" "Deaktiver Wiimote-høytaleren. Fikser tilfeldige avkoblinger pÃ¥ ekte Wiimote-" "er. Har ingen effekt pÃ¥ emulert Wii-kontroll." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3725,7 +3726,7 @@ msgstr "Brukernavn :" msgid "No Country (SDK)" msgstr "Intet Land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Ingen ISO- eller WAD-filer funnet" @@ -3734,8 +3735,8 @@ msgstr "Ingen ISO- eller WAD-filer funnet" msgid "No banner file found for title %s" msgstr "Inngen banner-fil funnet for tittelen %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3743,7 +3744,7 @@ msgstr "" msgid "No docking" msgstr "Ingen dokking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Ingen fil lastet" @@ -3751,7 +3752,7 @@ msgstr "Ingen fil lastet" msgid "No free dir index entries" msgstr "Ingen ledige mappestiindeks-entries" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Ingen opptaksfil" @@ -3774,7 +3775,7 @@ msgid "Not Equal" msgstr "Ikke Lik" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Ikke Satt" @@ -3782,7 +3783,7 @@ msgstr "Ikke Satt" msgid "Not connected" msgstr "Ikke tilkoblet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notater" @@ -3816,7 +3817,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk Aksellerasjon" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" @@ -3847,11 +3848,11 @@ msgstr "Kun %d blokker tilgjengelig" msgid "Open" msgstr "Ã…pne" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Ã…pne &tilholdsmappe" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Ã…pne Wii-&lagringsfil-mappe" @@ -3881,7 +3882,7 @@ msgstr "OpenCL Teksturdekoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Teksturdekoder" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Alternativer" @@ -3966,8 +3967,8 @@ msgstr "Patcher" msgid "Paths" msgstr "Mappestier" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" @@ -3991,8 +3992,8 @@ msgstr "Perspektiv %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Spill" @@ -4018,7 +4019,7 @@ msgstr "Avspillingsalterntiver" msgid "Players" msgstr "Spillere" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Vennligst bekreft..." @@ -4034,19 +4035,19 @@ msgstr "Pluss-Minus" msgid "Polish" msgstr "Polsk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4067,17 +4068,17 @@ msgstr "Portugisisk (Brasilsk)" msgid "Post-Processing Effect:" msgstr "postprosesseringseffekt:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4177,7 +4178,7 @@ msgstr "Gjenntilkoble Wiimote ved Lasting av Save State" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Opptak" @@ -4234,7 +4235,7 @@ msgstr "Oppdater spilliste" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Fjern" @@ -4275,7 +4276,7 @@ msgstr "Høyre" msgid "Right Stick" msgstr "Høyre Joystick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Rumble" @@ -4355,7 +4356,7 @@ msgstr "Lagre Save State..." msgid "Save as..." msgstr "Lagre som..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Lagre komprimert GCM/ISO" @@ -4363,11 +4364,11 @@ msgstr "Lagre komprimert GCM/ISO" msgid "Save current perspective" msgstr "Lagre nÃ¥værende perspektiv" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Lagre dekomprimert GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save State-film %s er korrupt, opptak avsluttes..." @@ -4376,16 +4377,16 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..." msgid "Scaled EFB Copy" msgstr "Skalert EFB-kopi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Søker i %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Søker etter ISO-filer" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Søker..." @@ -4406,7 +4407,7 @@ msgstr "Juksekodesøk" msgid "Search Filter" msgstr "Søkefilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Søk i Undermapper" @@ -4431,11 +4432,11 @@ msgid "Select" msgstr "Velg" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Velg Opptaksfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Velg en Wii WAD-fil Ã¥ innstallere" @@ -4461,15 +4462,15 @@ msgstr "Velg flytvindu" msgid "Select the file to load" msgstr "Velg fil Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Velg lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Velg en save state Ã¥ laste" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Velg en save state Ã¥ lagre" @@ -4557,7 +4558,7 @@ msgstr "Serieport 1 - Dette er porten enheter som nettadapter bruker" msgid "Set" msgstr "Sett" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Sett som &standard-ISO" @@ -4585,7 +4586,7 @@ msgstr "Innstillinger..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan ikke finne konfigurasjonsfilen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Rist" @@ -4762,7 +4763,7 @@ msgstr "" "\n" "Hvis usikker, la stÃ¥ avslÃ¥tt." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Sideveis-pekende Wiimote" @@ -4770,14 +4771,18 @@ msgstr "Sideveis-pekende Wiimote" msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Størrelse" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Dropp BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Dropp Dest. Alpha Pass" @@ -4820,11 +4825,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4847,7 +4852,7 @@ msgstr "" "Det er kun nyttig for Ã¥ debugge.\n" "Vil du virkelig benytte programvarerendering? Hvis usikker, velg 'nei'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Innstillinger for Audio" @@ -4925,7 +4930,7 @@ msgstr "Begynn &Opptak" msgid "Start Recording" msgstr "Begynn Opptak" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Save State" @@ -4985,12 +4990,12 @@ msgstr "Eksportering av fil til %s vellykket" msgid "Successfully imported save files" msgstr "Importering av lagringsfiler vellykket" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Sving" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "SystemsprÃ¥k:" @@ -5059,13 +5064,13 @@ msgstr "Adressen er ugyldig" msgid "The checksum was successfully fixed" msgstr "Fiksing av sjekksummen var vellykket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Den valgte mappen finnes allerede i listen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5154,7 +5159,7 @@ msgstr "Den spesifiserte filen \"%s\" eksisterer ikke" msgid "The value is invalid" msgstr "Verdien er ugyldig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Tema" @@ -5187,9 +5192,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Dette kan føre til ytelsesreduksjon i Wii Meny og noen spill." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5225,12 +5232,12 @@ msgstr "Dette lar deg manuelt endre INI-konfigurasjonsfilen" msgid "Threshold" msgstr "Terskel" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Tittel" @@ -5294,7 +5301,7 @@ msgstr "Type" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5303,7 +5310,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "UKJENT" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "UKJENT" @@ -5338,7 +5345,7 @@ msgstr "Udefinert %i" msgid "Undo Load State" msgstr "Angre Lasting av Save State" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5376,11 +5383,11 @@ msgstr "Opp" msgid "Update" msgstr "Oppdater" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Mot-skjerm-pekende Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Bruk EuRGB60-modus (PAL60)" @@ -5455,7 +5462,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtuell" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volum" @@ -5524,7 +5531,7 @@ msgstr "" "og har samme navn som en fil pÃ¥ ditt minnekort\n" "Fortsette?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5532,7 +5539,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5540,7 +5547,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5572,7 +5579,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "Widescreen Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Bredde" @@ -5584,7 +5591,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii-konsoll" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND-rot:" @@ -5592,7 +5599,7 @@ msgstr "Wii NAND-rot:" msgid "Wii Save Import" msgstr "Importer Wii-lagringsfil" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii-lagringsfiler (*.bin)|*.bin" @@ -5656,10 +5663,10 @@ msgstr "Windows Høyre" msgid "Word Wrap" msgstr "Ordkrumning" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Arbeider..." @@ -5695,7 +5702,7 @@ msgstr "XAudio2-initialisering mislyktes: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice-laging mislyktes: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5729,7 +5736,7 @@ msgstr "Du mÃ¥ skrive inn en gyldig desimal, hexadesimal eller octal verdi." msgid "You must enter a valid profile name." msgstr "Du mÃ¥ skrive inn et gyldig profilnavn." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Du mÃ¥ restarte Dolphin for at endringen skal tre i kraft." @@ -5822,7 +5829,7 @@ msgstr "" msgid "^ ADD" msgstr "^ LEGG TIL" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "applikasjonslaster (.img)" @@ -5849,7 +5856,7 @@ msgstr "iCacheJIT: Leser Opcode fra %x. Vennligst rapporter." msgid "not a wii save or read failure for file header size %x" msgstr "ikke en Wii-lagringsfil eller lesefeil for fil-header-størrelse %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5858,7 +5865,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "ukjent cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returnerte -1 pÃ¥ applikasjonskjøring!" @@ -6090,6 +6097,9 @@ msgstr "| ELLER" #~ msgid "Enable Audio Throttle" #~ msgstr "Aktiver Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Aktiver BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Aktiver CPU Access" @@ -6114,6 +6124,15 @@ msgstr "| ELLER" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Aktiver Skjermsparer (reduserer bildeinnbrenning)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Tillater Block Adress Translation (BAT); en funksjon av Memory Management " +#~ "Unit (MMU). Nøyaktig for maskinvaren, men treg Ã¥ emulere. (PÃ… = " +#~ "Kompitabelt, AV = Raskt)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/nl.po b/Languages/po/nl.po index d30a1d168f..97aa1e2d0b 100644 --- a/Languages/po/nl.po +++ b/Languages/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Goost \n" "Language-Team: DevPro Team. \n" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" is een onjuist GCM/ISO bestand of het is geen GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -176,11 +176,11 @@ msgstr "&Cheats Manager" msgid "&DSP Settings" msgstr "&DSP Instellingen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Verwijder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Verwijder geselecteerde ISOs ..." @@ -244,7 +244,7 @@ msgstr "&Pauze" msgid "&Play" msgstr "&Speel " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Eigenschappen " @@ -288,11 +288,11 @@ msgstr "&Bekijk " msgid "&Wiimote Settings" msgstr "&Wiimote Instellingen " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -312,7 +312,7 @@ msgstr "(ONBEKEND)" msgid "(off)" msgstr "(uit) " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -557,11 +557,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Voeg toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Voeg ActionReplay Code toe" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Voeg Patch toe" @@ -571,7 +571,7 @@ msgstr "Voeg een nieuwe paneel toe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Voeg toe..." @@ -632,25 +632,25 @@ msgstr "Geavanceerde Instellingen" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Alle GC/Wii bestanden (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Alle Gamecube GCM bestanden (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Alle Opgeslagen Staten (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Alle Wii ISO Bestanden (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Alle gecomprimeerde GC/Wii ISO-bestanden (GCZ)" @@ -661,8 +661,8 @@ msgstr "Alle Bestanden (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -680,6 +680,10 @@ msgstr "Geëmuleerde Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Anisotropic Filteren:" @@ -697,7 +701,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "Applader is niet in staat om van bestand te laden" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Applader:" @@ -724,7 +728,7 @@ msgstr "Arabisch" msgid "Are you sure you want to delete \"%s\"?" msgstr "Weet je zeker dat je \"%s\"? wilt verwijderen?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,13 +736,13 @@ msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen?\n" "Deze gegevens zijn niet terug te halen!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet " "terug te halen!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Beeldverhouding:" @@ -752,7 +756,7 @@ msgstr "Er moet tenminste één paneel open blijven." msgid "Audio" msgstr "Geluid" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Geluid Backend:" @@ -787,11 +791,11 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registers" @@ -800,7 +804,7 @@ msgstr "&Registers" msgid "Back" msgstr "Terug" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Backend Instellingen" @@ -809,7 +813,7 @@ msgstr "Backend Instellingen" msgid "Backend:" msgstr "Geluids backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Achtergrond invoer" @@ -823,7 +827,7 @@ msgid "Bad File Header" msgstr "Verkeerde bestands header" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -889,7 +893,7 @@ msgstr "Defect" msgid "Browse" msgstr "Zoek" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Zoek een folder om toe te voegen" @@ -897,7 +901,7 @@ msgstr "Zoek een folder om toe te voegen" msgid "Browse for an ISO directory..." msgstr "Zoek een ISO folder" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Zoek een uitvoer folder" @@ -911,7 +915,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Knoppen" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -923,7 +933,7 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -967,7 +977,7 @@ msgstr "Kan %s niet openen" msgid "Cannot unregister events with events pending" msgstr "Kan geen events afmelden als er events in afwachting zijn" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -977,7 +987,7 @@ msgstr "" "Kan dat bestand niet als geheugenkaart gebruiken. \n" "Probeer je hetzelfde bestand in beide slots te gebruiken?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1008,7 +1018,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Catalaans" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Middelpunt" @@ -1081,23 +1091,23 @@ msgstr "Chinees (Vereenvoudigd)" msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Kies een DVD Station:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Kies een NAND basismap:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Kies een standaard ISO:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Kies een folder om toe te voegen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Kies een bestand om te openen" @@ -1105,7 +1115,7 @@ msgstr "Kies een bestand om te openen" msgid "Choose a memory card:" msgstr "Kies een geheugen kaart:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1172,16 +1182,16 @@ msgstr "Reactie" msgid "Comment:" msgstr "Reactie:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimeer ISO ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimeer geselecteerde ISO's ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "ISO wordt gecomprimeerd" @@ -1208,9 +1218,9 @@ msgstr "Configureer Besturing Pads" msgid "Configure..." msgstr "Configureer..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Bevestig om bestand over te schrijven." @@ -1224,7 +1234,7 @@ msgstr "Bevestiging om te stoppen" msgid "Connect" msgstr "Verbind" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Verbind USB Toetsenbord" @@ -1269,7 +1279,7 @@ msgstr "Bestuur" msgid "Convert to GCI" msgstr "Omzetten naar GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiëren mislukt" @@ -1335,11 +1345,11 @@ msgstr "" "Draai je Dolphin vanaf een CD/DVD, of is het bestand misschien beveiligd " "tegen schrijven?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Kon geen open commando vinden voor extensie 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1413,7 +1423,7 @@ msgstr "Pas sommige orthogonale projectie parameters aan." msgid "Czech" msgstr "Tsjechisch" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1425,7 +1435,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Motor" @@ -1438,7 +1448,7 @@ msgstr "DSP HLE emulatie (snel)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Interpreteer (Behoorlijk langzaam)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE op Thread" @@ -1450,7 +1460,7 @@ msgstr "DSP LLE hercompileerder" msgid "DSP settings" msgstr "DSP Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Station:" @@ -1496,16 +1506,16 @@ msgstr "Debug" msgid "Decimal" msgstr "Decimaal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Decomprimeer ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Decomprimeer geselecteerde ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Decomprimeer ISO" @@ -1513,7 +1523,7 @@ msgstr "Decomprimeer ISO" msgid "Default" msgstr "Standaard" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Standaard ISO:" @@ -1557,8 +1567,8 @@ msgstr "" msgid "Device" msgstr "Apparaat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Apparaat Instellingen" @@ -1649,11 +1659,11 @@ msgstr "" msgid "Divide" msgstr "Verdelen" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Wil je de emulatie stoppen?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1682,12 +1692,12 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GCPad Configuratie" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Film (*.dtm)" @@ -1699,14 +1709,14 @@ msgstr "Dolphin Wiimote configuratie" msgid "Dolphin at &Google Code" msgstr "Dolphin op &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" "Dolphin kan geen GC/Wii ISO's vinden. Dubbelklik om bestanden te zoeken..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1714,8 +1724,8 @@ msgstr "" "Dolphin is ingesteld om alle spellen te verbergen. Dubbelklik hier om alle " "spellen te weergeven..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1741,7 +1751,7 @@ msgstr "Drums" msgid "Dummy" msgstr "Pop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Dump Geluid" @@ -1920,10 +1930,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activeer AR Logging" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Activeer BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activeer Block Merging" @@ -1969,7 +1975,7 @@ msgstr "Activeer MMU" msgid "Enable Progressive Scan" msgstr "Activeer Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activeer Schermbeveiliger" @@ -2039,16 +2045,6 @@ msgstr "" "Activeer dit om The Legend of Zelda: Twilight Princess te versnellen. " "Uitschakelen voor elk ander spel." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Schakel Block Address Translation (BAT) in, een functie van de Memory " -"Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " -"(AAN = Compatibel, UIT = Snel)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Schakelt aangepaste projectie hack in" @@ -2136,7 +2132,7 @@ msgstr "Gelijk" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error (Fout)" @@ -2201,7 +2197,7 @@ msgstr "Exporteer Opname..." msgid "Export Save" msgstr "Exporteer Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exporteer Wii save (Experimenteel)" @@ -2217,7 +2213,7 @@ msgstr "Uitpakken is mislukt, opnieuw proberen?" msgid "Export save as..." msgstr "Exporteer save als..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensie" @@ -2274,7 +2270,7 @@ msgstr "Uitpakken van de map" msgid "Extracting..." msgstr "Uitpakken..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" @@ -2339,6 +2335,11 @@ msgstr "Kon bthprops.cpl niet laden" msgid "Failed to load hid.dll" msgstr "Mislukt om hid.dll te laden" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Het schrijven van header voor %s is mislukt" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Mislukt om banner.bin te lezen" @@ -2429,11 +2430,11 @@ msgstr "" msgid "Fast" msgstr "Snel" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Snelle versie van de MMU. Werkt niet voor elk spel." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2489,7 +2490,7 @@ msgstr "FileIO: Onbekende open mode: 0x%02x" msgid "Filesystem" msgstr "Bestand systeem" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Bestandstype 'ini' is onbekend! Kan niet openen!" @@ -2574,17 +2575,17 @@ msgstr "" msgid "Forward" msgstr "Vooruit" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" @@ -2659,7 +2660,7 @@ msgstr "Logboek configuratie" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2700,7 +2701,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube &Pad Instellingen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)" @@ -2812,7 +2813,7 @@ msgstr "Header checksum is mislukt" msgid "Hebrew" msgstr "Hebreeuws" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Hoogte" @@ -2836,7 +2837,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Verberg" @@ -2905,11 +2906,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - onjuiste bestemming" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Instellingen" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2925,7 +2926,7 @@ msgstr "IR Gevoeligheid:" msgid "ISO Details" msgstr "ISO Details" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO Map" @@ -3062,7 +3063,7 @@ msgstr "Toevoegen" msgid "Insert Encrypted or Decrypted code here..." msgstr "Voer Gecodeerde of Gedecodeerde code hier in..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Schakel SD Card in" @@ -3074,7 +3075,7 @@ msgstr "Voeg naam hier toe" msgid "Install WAD" msgstr "Installeer WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Installeren in Wii-menu" @@ -3085,7 +3086,7 @@ msgstr "" "InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog " "niet." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD aan het installeren..." @@ -3113,7 +3114,7 @@ msgstr "" msgid "Interface" msgstr "Interface Instellingen" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Interface Instellingen" @@ -3195,7 +3196,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Onjuiste staat" @@ -3278,7 +3279,7 @@ msgstr "Laatste Overgeschreven Staat" msgid "Last Saved State" msgstr "Laatste Opgeslagen Staat" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3378,12 +3379,12 @@ msgstr "Laad staat 8" msgid "Load State..." msgstr "Laad staat..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Laad Wii System Menu(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Laad Wii System Menu(%d %c)" @@ -3461,7 +3462,7 @@ msgstr "" "Verkeerde MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Snelheids Hack" @@ -3496,7 +3497,7 @@ msgstr "De geheugenkaart heeft al een save voor deze titel" msgid "Memcard already opened" msgstr "De geheugenkaart is al geopend" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Geheugen Byte" @@ -3513,7 +3514,7 @@ msgstr "" "Geheugenkaart Manager Waarschuwing - Maak backups voor gebruik, het zou " "moeten werken" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3551,7 +3552,7 @@ msgstr "Min" msgid "Misc" msgstr "Overig" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Overige Instellingen" @@ -3576,11 +3577,11 @@ msgstr "" msgid "Monospaced font" msgstr "Niet-proportioneel (monospace) lettertype" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3616,11 +3617,11 @@ msgstr "" "Dempt de Wiimote speaker. Fixt willekeurige loskoppelingen van echte " "wiimotes. Heeft geen effect op geëmuleerde wiimotes." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3747,7 +3748,7 @@ msgstr "Gebruikersnaam :" msgid "No Country (SDK)" msgstr "Geen land (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Geen ISOs of WADS gevonden." @@ -3756,8 +3757,8 @@ msgstr "Geen ISOs of WADS gevonden." msgid "No banner file found for title %s" msgstr "Geen banner gevonden voor titel %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3765,7 +3766,7 @@ msgstr "" msgid "No docking" msgstr "Geen docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Geen bestand geladen" @@ -3773,7 +3774,7 @@ msgstr "Geen bestand geladen" msgid "No free dir index entries" msgstr "Geen vrije map indexes" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Geen opgenomen bestand" @@ -3796,7 +3797,7 @@ msgid "Not Equal" msgstr "Niet gelijk" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Niet ingesteld" @@ -3804,7 +3805,7 @@ msgstr "Niet ingesteld" msgid "Not connected" msgstr "Niet verbonden" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Opmerkingen" @@ -3838,7 +3839,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk Acceleratie" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3869,11 +3870,11 @@ msgstr "Er zijn maar %d blocks beschikaarr" msgid "Open" msgstr "Open" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Open &bevattende map" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Open Wii &save map" @@ -3903,7 +3904,7 @@ msgstr "OpenCL Texture Decodeerder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decodeerder" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opties" @@ -3989,8 +3990,8 @@ msgstr "Patches" msgid "Paths" msgstr "Pad" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauze" @@ -4014,8 +4015,8 @@ msgstr "Perspectief %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Speel" @@ -4041,7 +4042,7 @@ msgstr "Terugspeel Opties" msgid "Players" msgstr "Spelers" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Bevestig alsjeblieft..." @@ -4057,19 +4058,19 @@ msgstr "Ongeveer" msgid "Polish" msgstr "Pools" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Poort 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Poort 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Poort 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Poort 4" @@ -4090,17 +4091,17 @@ msgstr "Portugees (Braziliaans)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4201,7 +4202,7 @@ msgstr "Herverbind Wiimote Bij Staat Laden" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Speel Opnemen" @@ -4257,7 +4258,7 @@ msgstr "Ververs de speellijst" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Verwijder" @@ -4299,7 +4300,7 @@ msgstr "Rechts" msgid "Right Stick" msgstr "Rechter Stick" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4379,7 +4380,7 @@ msgstr "Sla staat op als..." msgid "Save as..." msgstr "Opslaan als..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sla gecomprimeerde GCM / ISO op" @@ -4387,11 +4388,11 @@ msgstr "Sla gecomprimeerde GCM / ISO op" msgid "Save current perspective" msgstr "Sla huidige perspectief op" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Sla gedecomprimeerd GCM / ISO op" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." @@ -4401,16 +4402,16 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..." msgid "Scaled EFB Copy" msgstr "EFB Verkleinde Kopie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Scannen van %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Scannen voor ISO's" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Scannen..." @@ -4431,7 +4432,7 @@ msgstr "Cheat Zoeken" msgid "Search Filter" msgstr "Zoekfilter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Zoeken in submappen" @@ -4456,11 +4457,11 @@ msgid "Select" msgstr "Selecteer" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Selecteer de opname Bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Selecteer een Wii WAD bestand om te installeren" @@ -4486,15 +4487,15 @@ msgstr "Selecteer zwevende vensters" msgid "Select the file to load" msgstr "Selecteer het bestand om het te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecteer het save - bestand" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecteer de Staat om te laden" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecteer de Staat om op te slaan" @@ -4582,7 +4583,7 @@ msgstr "" msgid "Set" msgstr "Stel" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Ingesteld als &standaard ISO" @@ -4611,7 +4612,7 @@ msgstr "Instellingen..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Kan het instellingen bestand niet vinden" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Schudden" @@ -4787,7 +4788,7 @@ msgstr "" "\n" "In geval van twijfel leeg laten." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Zijdelings Wiimote" @@ -4795,14 +4796,18 @@ msgstr "Zijdelings Wiimote" msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Grootte" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Sla BIOS Over" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" @@ -4840,11 +4845,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4868,7 +4873,7 @@ msgstr "" "Weet je zeker dat je software rendering aan wil zetten? In geval van " "twijfel, selecteer 'Nee'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Geluids Instellingen" @@ -4947,7 +4952,7 @@ msgstr "Start Op&nemen" msgid "Start Recording" msgstr "Start Opnemen" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Staat" @@ -5002,12 +5007,12 @@ msgstr "Bestand succesvol gexporteerd naar %s" msgid "Successfully imported save files" msgstr "Succesvol save games geimporteerd" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Systeem Taal:" @@ -5076,13 +5081,13 @@ msgstr "Het adres is onjuist" msgid "The checksum was successfully fixed" msgstr "De checksum was met succes gefixt" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "De gekozen map is al in de lijst" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5170,7 +5175,7 @@ msgstr "Het opgegeven bestand \"%s\" bestaat niet" msgid "The value is invalid" msgstr "De waarde is onjuist" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Thema" @@ -5204,9 +5209,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Dit kan leiden tot vertraging van het Wii-menu en een aantal games." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5242,12 +5249,12 @@ msgstr "Dit laat je handmatig het INI configuratie bestand wijzigen" msgid "Threshold" msgstr "Drempelwaarde" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Kantelen" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Titel" @@ -5311,7 +5318,7 @@ msgstr "Type" msgid "UDP Port:" msgstr "UDP Port:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote " @@ -5320,7 +5327,7 @@ msgstr "UDP Wiimote " msgid "UNKNOWN" msgstr "ONBEKEND" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ONBEKEND" @@ -5356,7 +5363,7 @@ msgstr "Onbepaalde %i" msgid "Undo Load State" msgstr "Ongedaan maken van Load staat" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5396,11 +5403,11 @@ msgstr "Omhoog" msgid "Update" msgstr "Update" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote rechtop" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Gebruik EuRGB60 Mode (PAL60)" @@ -5475,7 +5482,7 @@ msgstr "Video" msgid "Virtual" msgstr "Virtueel" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5545,7 +5552,7 @@ msgstr "" "en heeft dezelfde naam als een bestand op je geheugenkaart\n" "Doorgaan?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5553,7 +5560,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5561,7 +5568,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5593,7 +5600,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "Breedbeeld Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Breedte" @@ -5605,7 +5612,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Console " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND basismap:" @@ -5613,7 +5620,7 @@ msgstr "Wii NAND basismap:" msgid "Wii Save Import" msgstr "Wii Save Importeren" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii save bestanden (*.bin)|*.bin" @@ -5677,10 +5684,10 @@ msgstr "Venster Rechts" msgid "Word Wrap" msgstr "Regelafbreking" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Werken..." @@ -5716,7 +5723,7 @@ msgstr "XAudio2 initialisatie mislukt: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creatie mislukt: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5750,7 +5757,7 @@ msgstr "Je moet een juiste decimale, hexadecimale of octale waarde opgeven" msgid "You must enter a valid profile name." msgstr "Je moet een geldige profiel naam invoeren!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Je moet Dolphin herstarten voordat deze optie effect zal hebben." @@ -5842,7 +5849,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ERBIJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "applader (.img)" @@ -5870,7 +5877,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "geen wii save of het lezen van de grootte van bestandsheader %x is mislukt" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5879,7 +5886,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "onbekend commando 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retourneerde -1 bij het draaien van de applicatie!" @@ -6084,6 +6091,9 @@ msgstr "| OF" #~ msgid "Enable Audio Throttle" #~ msgstr "Activeer Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "Activeer BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activeer CPU Toegang" @@ -6108,6 +6118,15 @@ msgstr "| OF" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activeer Screen Saver (burn-in reduction)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Schakel Block Address Translation (BAT) in, een functie van de Memory " +#~ "Management Unit. Nauwkeurig voor de hardware, maar langzaam te emuleren. " +#~ "(AAN = Compatibel, UIT = Snel)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/pl.po b/Languages/po/pl.po index 64412a2049..41be3b5604 100644 --- a/Languages/po/pl.po +++ b/Languages/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Baszta \n" "Language-Team: Polish \n" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" jest niewÅ‚aÅ›ciwym plikiem GMC/ISO lub to nie jest GC/Wii ISO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -179,11 +179,11 @@ msgstr "&Menadżer cheatów" msgid "&DSP Settings" msgstr "&Ustawienia DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&UsuÅ„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&UsuÅ„ wybrane ISO..." @@ -247,7 +247,7 @@ msgstr "&Wstrzymaj" msgid "&Play" msgstr "&Play" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&WÅ‚aÅ›ciwoÅ›ci" @@ -291,11 +291,11 @@ msgstr "&Widok" msgid "&Wiimote Settings" msgstr "&Ustawienia Wiilota" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -315,7 +315,7 @@ msgstr "(Nieznany)" msgid "(off)" msgstr "(wyÅ‚Ä…czone)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -356,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -555,11 +555,11 @@ msgstr "Adapter:" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Dodaj kod ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Dodaj Å‚atkÄ™" @@ -569,7 +569,7 @@ msgstr "Dodaj nowy panel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Dodaj..." @@ -629,24 +629,24 @@ msgstr "Ustawienia zaawansowane" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Wszystkie pliki GC/Wii (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Wszystkie obrazy GC/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Pliki GCM" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Stany zapisu (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Wszystkie obrazy Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Spakowane obrazy GC/Wii (gcz)" @@ -655,9 +655,10 @@ msgid "All files (*.*)|*.*" msgstr "Wszystkie pliki (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -674,6 +675,10 @@ msgstr "Alternate Wiimote Timing" msgid "Analyze" msgstr "Analizuj" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtrowanie anizotropowe:" @@ -690,7 +695,7 @@ msgstr "Apploader niewÅ‚aÅ›ciwego rozmiaru... Czy to rzeczywiÅ›cie apploader?" msgid "Apploader unable to load from file" msgstr "Apploader nie mógÅ‚ wczytać z pliku" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -717,7 +722,7 @@ msgstr "Arabski" msgid "Are you sure you want to delete \"%s\"?" msgstr "Czy jesteÅ› pewny by usunÄ…c \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -725,11 +730,11 @@ msgstr "" "Czy jesteÅ› pewny by usunÄ…c te pliki?\n" "PrzepadnÄ… na zawsze!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Czy jesteÅ› pewny by usunÄ…c ten plik? Przepadnie na zawsze!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporcje ekranu:" @@ -743,7 +748,7 @@ msgstr "Przynajmniej jeden manel musi pozostać otwarty." msgid "Audio" msgstr "Audio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Audio Backend :" @@ -778,11 +783,11 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP rejestr" @@ -790,7 +795,7 @@ msgstr "BP rejestr" msgid "Back" msgstr "Wstecz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Ustawienia Backend'u" @@ -799,7 +804,7 @@ msgstr "Ustawienia Backend'u" msgid "Backend:" msgstr "Backend :" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "WejÅ›cie w tle" @@ -813,7 +818,7 @@ msgid "Bad File Header" msgstr "ZÅ‚y nagłówek pliku" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Baner" @@ -879,7 +884,7 @@ msgstr "Zepsuty" msgid "Browse" msgstr "Szukaj" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Szukaj folder do dodania" @@ -887,7 +892,7 @@ msgstr "Szukaj folder do dodania" msgid "Browse for an ISO directory..." msgstr "Szukaj folder ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Szukaj folderu wyjÅ›ciowego" @@ -901,7 +906,13 @@ msgstr "Bufor:" msgid "Buttons" msgstr "Przyciski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -913,7 +924,7 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -954,7 +965,7 @@ msgstr "Nie moża otworzyć %s" msgid "Cannot unregister events with events pending" msgstr "Nie można wyrejestrować zdarzeÅ„ podczas ich wykonywania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -965,7 +976,7 @@ msgstr "" "%s\n" "nie jest wÅ‚aÅ›ciwym plikiem karty pamiÄ™ci GC" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -996,7 +1007,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "KataloÅ„ski" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Åšrodek" @@ -1070,23 +1081,23 @@ msgstr "ChiÅ„ski uproszczony" msgid "Chinese (Traditional)" msgstr "Chinski (Tradycyjny)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Wybierz folder źródÅ‚owy DVD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Wybierz folder źródÅ‚owy NAND" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Wybierz domyÅ›lne ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Wybierz folder do dodania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Wybierz plik do otwarcia" @@ -1094,7 +1105,7 @@ msgstr "Wybierz plik do otwarcia" msgid "Choose a memory card:" msgstr "Wybierz kartÄ™ pamiÄ™ci:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1161,16 +1172,16 @@ msgstr "Komentarz" msgid "Comment:" msgstr "Komentarz:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kompresuj ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kompresuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kompresowanie ISO" @@ -1197,9 +1208,9 @@ msgstr "Konfiguracja padów" msgid "Configure..." msgstr "Konfiguruj..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Potwierdź nadpis pliku" @@ -1212,7 +1223,7 @@ msgstr "Potwierdź przy zatrzymaniu" msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "PodÅ‚Ä…cz klawiaturÄ™ USB" @@ -1257,7 +1268,7 @@ msgstr "Sterowanie" msgid "Convert to GCI" msgstr "Konwertuj do GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiowanie nie powiodÅ‚o siÄ™" @@ -1322,11 +1333,11 @@ msgstr "" "Uruchamiasz program z CD/DVD albo plik zapisu jest zabezpieczony przed " "zapisem?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Nie odnaleziono polecenia otwarcia dla rozszerzenia 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1400,7 +1411,7 @@ msgstr "WÅ‚asne parametry Orthographic Projection" msgid "Czech" msgstr "Czeski" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1412,7 +1423,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP Emulator Engine" @@ -1425,7 +1436,7 @@ msgstr "DSP HLE emulacja (szybkie)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE interpreter (wolne)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "WÄ…tek dla DSPLLE" @@ -1437,7 +1448,7 @@ msgstr "DSP LLE rekompilator" msgid "DSP settings" msgstr "Ustawienia DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "ŹródÅ‚o DVD:" @@ -1482,16 +1493,16 @@ msgstr "Debugowanie" msgid "Decimal" msgstr "DziesiÄ™tnie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Wypakuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Wypakuj wybrane ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Wypakowywanie ISO" @@ -1499,7 +1510,7 @@ msgstr "Wypakowywanie ISO" msgid "Default" msgstr "DomyÅ›lne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "DomyÅ›lne ISO:" @@ -1543,8 +1554,8 @@ msgstr "" msgid "Device" msgstr "UrzÄ…dzenie" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Ustawienia urzÄ…dzenia" @@ -1634,11 +1645,11 @@ msgstr "" msgid "Divide" msgstr "Podziel" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Zatrzymać aktualnÄ… emulacjÄ™?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1667,12 +1678,12 @@ msgstr "Konfiguracja emulowanego Wiilota" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Konfiguracja GCPad'a" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmy TAS (*.dtm)" @@ -1684,7 +1695,7 @@ msgstr "Konfiguracja Wiilot'a" msgid "Dolphin at &Google Code" msgstr "Dolphin na &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1692,7 +1703,7 @@ msgstr "" "Program nie mógÅ‚ znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by " "przeglÄ…dać pliki..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1700,8 +1711,8 @@ msgstr "" "Program jest obecnie ustawiony by ukrywać wszystkie gry. Kliknij tutaj by " "pokazać wszystkie gry..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1727,7 +1738,7 @@ msgstr "Perkusja" msgid "Dummy" msgstr "Atrapa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Zrzut audio" @@ -1907,10 +1918,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "WÅ‚Ä…cz log AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "WÅ‚Ä…cz BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "WÅ‚Ä…cz Å‚Ä…czenie bloków" @@ -1955,7 +1962,7 @@ msgstr "WÅ‚Ä…cz MMU" msgid "Enable Progressive Scan" msgstr "WÅ‚Ä…cz Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "WÅ‚Ä…cz wygaszacz ekranu" @@ -2025,16 +2032,6 @@ msgstr "" "WÅ‚Ä…cz to by przyspieszyć The Legend of Zelda: Twilight Princess. WyÅ‚Ä…cz dla " "KAÅ»DEJ innej gry." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"WÅ‚Ä…cza Block Address Translation (BAT); funkcja Memory Management Unit. " -"DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " -"szybko)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "WÅ‚Ä…cza Custom Projection Hack" @@ -2121,7 +2118,7 @@ msgstr "Równy" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "BÅ‚Ä…d" @@ -2185,7 +2182,7 @@ msgstr "Eksportuj nagranie..." msgid "Export Save" msgstr "Eksportuj zapis" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Eksportuj zapis Wii (eksperymentalne)" @@ -2201,7 +2198,7 @@ msgstr "Eksport nieudany, ponowić?" msgid "Export save as..." msgstr "Eksportuj zapis jako..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Rozszerzenie" @@ -2258,7 +2255,7 @@ msgstr "Wypakowywanie folderu" msgid "Extracting..." msgstr "Wypakowywanie..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Bajt FIFO" @@ -2322,6 +2319,11 @@ msgstr "Åadowanie bthprops.cpl nie udaÅ‚o siÄ™" msgid "Failed to load hid.dll" msgstr "Åadowanie hid.dll nie udaÅ‚o siÄ™" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Zapis nagłówka do %s nie powiódÅ‚ siÄ™" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "BÅ‚Ä…d odczytu banner.bin" @@ -2412,11 +2414,11 @@ msgstr "Farsi" msgid "Fast" msgstr "Szybki" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Szybka wersja MMU. Nie funkcjonuje dla każdej gry." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2474,7 +2476,7 @@ msgstr "FileIO: Nieznany tryb otwarcia: 0x%02x" msgid "Filesystem" msgstr "System plików" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Nieznany plik typu 'ini'! Nie otworzy siÄ™!" @@ -2556,17 +2558,17 @@ msgstr "" msgid "Forward" msgstr "W przód" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Znaleziono %d dla '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Klatka" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Klatka" @@ -2638,7 +2640,7 @@ msgstr "Konfiguracja GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2679,7 +2681,7 @@ msgid "Gamecube &Pad Settings" msgstr "Ustawienia &pada GC" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Karty pamiÄ™ci GC (*.raw,*.gcp)" @@ -2793,7 +2795,7 @@ msgstr "Suma kontrolna nagłówka nie powiodÅ‚a siÄ™" msgid "Hebrew" msgstr "Hebrajski" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Wysokość" @@ -2816,7 +2818,7 @@ msgstr "" "\n" "Pozdro i poćwicz!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Ukryj" @@ -2884,11 +2886,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - zÅ‚a Å›cieżka" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Ustawienia IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2904,7 +2906,7 @@ msgstr "CzuÅ‚ość IR" msgid "ISO Details" msgstr "Szczegóły ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Foldery ISO" @@ -3042,7 +3044,7 @@ msgstr "Wstaw" msgid "Insert Encrypted or Decrypted code here..." msgstr "Wprowadź zaszyfrowany/zdeszyfrowany kod tutaj..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Włóż kartÄ™ SD" @@ -3054,7 +3056,7 @@ msgstr "Wprowadź nazwÄ™ tutaj..." msgid "Install WAD" msgstr "Zainstaluj WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Zainstaluj do Wii Menu" @@ -3064,7 +3066,7 @@ msgid "" msgstr "" "InstallExceptionHandler wywoÅ‚any, ale ta platforma nie wspiera go jeszcze." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalacja WAD..." @@ -3093,7 +3095,7 @@ msgstr "" msgid "Interface" msgstr "Interfejs" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Ustawienia interfejsu" @@ -3177,7 +3179,7 @@ msgstr "" "NiewÅ‚aÅ›ciwy Å‚aÅ„cuch przeszukiwania (wspierane sÄ… tylko równe dÅ‚ugoÅ›ci " "Å‚aÅ„cucha)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "NiewÅ‚aÅ›ciwy stan" @@ -3259,7 +3261,7 @@ msgstr "Ostatni nadpisany stan" msgid "Last Saved State" msgstr "Ostatni zapisany stan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3359,11 +3361,11 @@ msgstr "Wczytaj stan Slot 8" msgid "Load State..." msgstr "Wczytaj stan..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wczytaj Wii System Menu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wczytaj Wii System Menu %d %c" @@ -3440,7 +3442,7 @@ msgstr "" "MD5 niepoprawne\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Speed Hack" @@ -3475,7 +3477,7 @@ msgstr "Karta pamiÄ™ci już posiada zapis dla tego tytuÅ‚u" msgid "Memcard already opened" msgstr "Karta pamiÄ™ci już otwarta" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Bajt pamiÄ™ci" @@ -3492,7 +3494,7 @@ msgstr "" "Memory Card Manager OSTRZEÅ»ENIE - Twórz kopie zapasowe przed użyciem, " "powinno zostać naprawione, ale może namieszać!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3530,7 +3532,7 @@ msgstr "Min" msgid "Misc" msgstr "Różne" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Ustawienia różne" @@ -3555,11 +3557,11 @@ msgstr "" msgid "Monospaced font" msgstr "Nieproporcjonalna czcionka" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3594,11 +3596,11 @@ msgstr "" " Wycisza gÅ‚oÅ›nik Wiilota. Naprawia losowe rozÅ‚Ä…czenia z prawdziwymi " "Wiilotami. Brak efektu na emulowanych Wiilotach." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" "Notka: Wielkość strumienia nie zgadza siÄ™ z wÅ‚aÅ›ciwÄ… dÅ‚ugoÅ›ciÄ… danych\n" @@ -3726,7 +3728,7 @@ msgstr "Ksywa:" msgid "No Country (SDK)" msgstr "No Country (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nie odnaleziono IOS/WAD" @@ -3735,8 +3737,8 @@ msgstr "Nie odnaleziono IOS/WAD" msgid "No banner file found for title %s" msgstr "Nie odnaleziono pliku banera dla tytuÅ‚u %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Brak opisu" @@ -3744,7 +3746,7 @@ msgstr "Brak opisu" msgid "No docking" msgstr "Brak dokowania" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nie wczytano żadnego pliku" @@ -3752,7 +3754,7 @@ msgstr "Nie wczytano żadnego pliku" msgid "No free dir index entries" msgstr "Brak wolnych wejść folderów" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Brak nagranego pliku" @@ -3775,7 +3777,7 @@ msgid "Not Equal" msgstr "Nie równe" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Nie ustawiono" @@ -3783,7 +3785,7 @@ msgstr "Nie ustawiono" msgid "Not connected" msgstr "Nie poÅ‚Ä…czono" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notatki" @@ -3817,7 +3819,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Acelerator Nunchak'a" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objekt" @@ -3848,11 +3850,11 @@ msgstr "DostÄ™pnych tylko %d bloków" msgid "Open" msgstr "Otwórz" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Otwórz &folder zawartoÅ›ci" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Otwórz folder &zapisów Wii" @@ -3882,7 +3884,7 @@ msgstr "OpenCL Texture Decoder" msgid "OpenMP Texture Decoder" msgstr "OpenMP Texture Decoder" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcje" @@ -3967,8 +3969,8 @@ msgstr "Patche" msgid "Paths" msgstr "Åšcieżki" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pause" @@ -3992,8 +3994,8 @@ msgstr "Perspekrtywa %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Play" @@ -4019,7 +4021,7 @@ msgstr "Opcje playback'u" msgid "Players" msgstr "Gracze" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Potwierdź..." @@ -4035,19 +4037,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "Polski" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4068,17 +4070,17 @@ msgstr "Portugalski (Brazylijski)" msgid "Post-Processing Effect:" msgstr "Post-Processing Effect:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Premature movie end in PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Premature movie end in PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Premature movie end in PlayWiimote. %u > %u" @@ -4177,7 +4179,7 @@ msgstr "PodÅ‚acz ponownie Wiilota gdy wczytywany jest stan" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Nagranie" @@ -4233,7 +4235,7 @@ msgstr "OdÅ›wież listÄ™ gier" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "UsuÅ„" @@ -4274,7 +4276,7 @@ msgstr "Prawo" msgid "Right Stick" msgstr "GaÅ‚ka prawa" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Wibracje" @@ -4354,7 +4356,7 @@ msgstr "Zapisz stan..." msgid "Save as..." msgstr "Zapisz jako..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Zapisz spakowany GCM/ISO" @@ -4362,11 +4364,11 @@ msgstr "Zapisz spakowany GCM/ISO" msgid "Save current perspective" msgstr "Zapisz bierzÄ…cÄ… perspektywÄ™" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Zapisz wypakowany GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." @@ -4375,16 +4377,16 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..." msgid "Scaled EFB Copy" msgstr "Scaled EFB Copy" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "SknaujÄ™ %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "PrzeszukujÄ™ obrazy ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "PrzeszukujÄ™..." @@ -4404,7 +4406,7 @@ msgstr "Szukaj" msgid "Search Filter" msgstr "Filtr wyszukiwania" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Przeszukuj podfoldery" @@ -4428,11 +4430,11 @@ msgid "Select" msgstr "Select" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Wybierz plik nagrania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Wybierz plik Wii WAD do zainstalowania" @@ -4458,15 +4460,15 @@ msgstr "Select floating windows" msgid "Select the file to load" msgstr "Wybierz plik do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Wybierz plik do zapisu" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Wybierz stan do wczytania" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Wybierz stan do zapisu" @@ -4553,7 +4555,7 @@ msgstr "Serial Port 1 - Port używany przez urzÄ…dzenia takie jak net adapter" msgid "Set" msgstr "Ustaw" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Ustaw jako domyÅ›lne ISO" @@ -4581,7 +4583,7 @@ msgstr "Ustawienia..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Nie można odnaleźć pliku konfiguracyjnego" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "WstrzÄ…s" @@ -4758,7 +4760,7 @@ msgstr "" "\n" "W razie wÄ…tpliwoÅ›ci, pozostaw wyÅ‚Ä…czone." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Willot bokiem" @@ -4766,14 +4768,18 @@ msgstr "Willot bokiem" msgid "Simplified Chinese" msgstr "ChiÅ„ski uproszczony" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Rozmiar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "PomiÅ„ BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "PomiÅ„ Dest. Alpha Pass" @@ -4816,11 +4822,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4844,7 +4850,7 @@ msgstr "" "Czy na pewno chcesz wÅ‚Ä…czyć renderowanie programowe? W razie wÄ…tpliwoÅ›ci, " "wybierz 'Nie'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ustawienia dźwiÄ™ku" @@ -4923,7 +4929,7 @@ msgstr "&Rozpocznij nagrywanie" msgid "Start Recording" msgstr "Rozpocznij nagrywanie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Stan" @@ -4983,12 +4989,12 @@ msgstr "Sukcesywnie wyeksportowano plik do %s" msgid "Successfully imported save files" msgstr "Importowanie zapisów zakoÅ„czone powodzeniem" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Zamach" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "JÄ™zyk systemu:" @@ -5056,13 +5062,13 @@ msgstr "NieprawidÅ‚owy adres" msgid "The checksum was successfully fixed" msgstr "Suma kontrolna poprawnie naprawiona" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Wybrany folder jest już na liÅ›cie" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5150,7 +5156,7 @@ msgstr "Wskazany plik \"%s\" nie istnieje." msgid "The value is invalid" msgstr "NiewÅ‚aÅ›ciwa wartość" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Styl" @@ -5184,9 +5190,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Może powodować spowolnienie w Wii Menu i niektórych grach." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5221,12 +5229,12 @@ msgstr "Pozwala na rÄ™cznÄ… edycjÄ™ pliku konfiguracyjnego." msgid "Threshold" msgstr "Threshold" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Przechylenie" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "TytuÅ‚" @@ -5290,7 +5298,7 @@ msgstr "Typ" msgid "UDP Port:" msgstr "Port UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiilot" @@ -5299,7 +5307,7 @@ msgstr "UDP Wiilot" msgid "UNKNOWN" msgstr "Nieznany" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "Nieznany_%X" @@ -5336,7 +5344,7 @@ msgstr "Niezdefiniowane %i" msgid "Undo Load State" msgstr "Cofnij wczytywanie stanu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Nieoczekiwane wywoÅ‚anie 0x80? Przerywanie..." @@ -5374,11 +5382,11 @@ msgstr "Góra" msgid "Update" msgstr "Aktualizuj" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Willot pionowo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Użyj trybu EuRGB60 (PAL60)" @@ -5453,7 +5461,7 @@ msgstr "Wideo" msgid "Virtual" msgstr "Wirtualny" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Poziom" @@ -5521,7 +5529,7 @@ msgstr "" "i majÄ… takÄ… samÄ… nazwÄ™ jak plik na Twojej karcie pamiÄ™ci\n" "Kontynuować?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5532,7 +5540,7 @@ msgstr "" "> %u) (klatka %u > %u). Powinien zostać wczytany inny zapis przed " "kontynuacjÄ… lub wczytaj ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5544,7 +5552,7 @@ msgstr "" "ten stan z wyÅ‚Ä…czonym trybem tylko do odczytu. W przeciwnym razie może " "nastÄ…pić desynchronizacja." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5590,7 +5598,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Widescreen Hack" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Szerokość" @@ -5602,7 +5610,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Konsola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "ŹródÅ‚o Wii NAND:" @@ -5610,7 +5618,7 @@ msgstr "ŹródÅ‚o Wii NAND:" msgid "Wii Save Import" msgstr "Import zapisów Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Pliki zapisu Wii (*.bin)|*.bin" @@ -5673,10 +5681,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "Zawijanie wierszy" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "PracujÄ™..." @@ -5711,7 +5719,7 @@ msgstr "Inicjalizacja XAudio2 nie powiodÅ‚a siÄ™: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Utworzenie XAudio2 master voice nie powiodÅ‚o siÄ™: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5748,7 +5756,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "Musisz wprowadzić poprawnÄ… nazwÄ™ profilu." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Musisz ponownie uruchomić program w celu zaaplikowania zmian." @@ -5842,7 +5850,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5869,7 +5877,7 @@ msgstr "iCacheJIT: Odczyt Opcode z %x. Raportuj." msgid "not a wii save or read failure for file header size %x" msgstr "to nie jest zapis Wii lub bÅ‚Ä…d odczytu rozmiaru nagłówka pliku %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5878,7 +5886,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "nieznane polecenie 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute zwróciÅ‚ -1 przy uruchamianiu programu!" @@ -6156,6 +6164,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "WÅ‚Ä…cz Audio Throttle" +#~ msgid "Enable BAT" +#~ msgstr "WÅ‚Ä…cz BAT" + #~ msgid "Enable CPU Access" #~ msgstr "WÅ‚Ä…cz dostÄ™p CPU" @@ -6180,6 +6191,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "WÅ‚Ä…cz wygaszacz ekranu (burn-in reduction)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "WÅ‚Ä…cza Block Address Translation (BAT); funkcja Memory Management Unit. " +#~ "DokÅ‚adne dla sprzetu, lecz powolne do emulacji. (ON = kompatybilne, OFF = " +#~ "szybko)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/pt.po b/Languages/po/pt.po index 816ae30486..1db99bd424 100644 --- a/Languages/po/pt.po +++ b/Languages/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: Zilaan \n" "Language-Team: Zilaan \n" @@ -46,7 +46,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" Ficheiro GCM/ISO inválido, ou não é um ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -177,11 +177,11 @@ msgstr "&Gestor de Cheats" msgid "&DSP Settings" msgstr "&Definições de DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Eliminar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Eliminar ISOs seleccionados..." @@ -245,7 +245,7 @@ msgstr "&Pausa" msgid "&Play" msgstr "&Começar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriedades" @@ -289,11 +289,11 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "&Definições Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -313,7 +313,7 @@ msgstr "(DESCONHECIDO)" msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -557,11 +557,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Adicionar Código ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Adicionar Patch" @@ -571,7 +571,7 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Adicionar..." @@ -633,25 +633,25 @@ msgstr "Definições avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os ficheiros GC/Wii (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os ficheiros Gamecube GCM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos os Estados Guardados (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos os ficheiros Wii ISO (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os ficheiros GC/Wii ISO comprimidos (gcz)" @@ -662,8 +662,8 @@ msgstr "Todos os ficheiros (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -681,6 +681,10 @@ msgstr "Wiimote Emulado" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtro Anisotrópico" @@ -697,7 +701,7 @@ msgstr "Apploader é do tamanho errado...é mesmo uma apploader?" msgid "Apploader unable to load from file" msgstr "Apploader impossibilitada de carregar através do ficheiro" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -724,7 +728,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Tem a certeza que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -732,13 +736,13 @@ msgstr "" "Tem a certeza que quer apagar estes ficheiros?\n" "Serão eliminados permanentemente!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Tem a certeza que quer eliminar este ficheiro? Será eliminado " "permanentemente!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção de ecrã:" @@ -752,7 +756,7 @@ msgstr "Pelo menos um painel deve manter-se aberto." msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Ãudio Backend :" @@ -787,11 +791,11 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registos" @@ -800,7 +804,7 @@ msgstr "&Registos" msgid "Back" msgstr "Trás" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Definições Backend" @@ -809,7 +813,7 @@ msgstr "Definições Backend" msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Introdução em segundo plano" @@ -823,7 +827,7 @@ msgid "Bad File Header" msgstr "Cabeçalho de ficheiro inválido" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -889,7 +893,7 @@ msgstr "Inactivo" msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procurar por uma pasta para adicionar" @@ -897,7 +901,7 @@ msgstr "Procurar por uma pasta para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por uma pasta de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procurar por pasta de destino" @@ -911,7 +915,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -923,7 +933,7 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -967,7 +977,7 @@ msgstr "Impossível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Impossível retirar registo de eventos quando há eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -977,7 +987,7 @@ msgstr "" "Não é possível utilizar o ficheiro como cartão de memória.\n" "Está a tentar utilizar o mesmo ficheiro nas duas slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1009,7 +1019,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Catalão" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centro" @@ -1083,23 +1093,23 @@ msgstr "Chinês (Simplificado)" msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escolha uma pasta de raiz do DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escolha uma pasta de raiz NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escolha um ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escolha uma pasta para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escolha um ficheiro para abrir" @@ -1107,7 +1117,7 @@ msgstr "Escolha um ficheiro para abrir" msgid "Choose a memory card:" msgstr "Escolha um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1174,16 +1184,16 @@ msgstr "Comentário" msgid "Comment:" msgstr "Comentar:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "A comprimir ISO" @@ -1210,9 +1220,9 @@ msgstr "Configuração de Comandos" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar Substituição de Ficheiro" @@ -1225,7 +1235,7 @@ msgstr "Confirmar Ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1270,7 +1280,7 @@ msgstr "Controlo" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Cópia Falhou" @@ -1336,11 +1346,11 @@ msgstr "" "Está a correr o Dolphin através de CD/DVD, ou o ficheiro de jogo guardado " "está com protecção contra escrita?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando aberto para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1414,7 +1424,7 @@ msgstr "Personalizar alguns parâmetros de Projecção Ortogonal." msgid "Czech" msgstr "Checo" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1426,7 +1436,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Motor de Emulador DSP" @@ -1439,7 +1449,7 @@ msgstr "Emulação de DSP HLE (rápido)" msgid "DSP LLE interpreter (slow)" msgstr "Interpretador DSP LLE (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE em thread" @@ -1451,7 +1461,7 @@ msgstr "Recompilador de DSP LLE" msgid "DSP settings" msgstr "Definições de DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raiz de DVD:" @@ -1496,16 +1506,16 @@ msgstr "Depuração" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs seleccionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "A descomprimir ISO" @@ -1513,7 +1523,7 @@ msgstr "A descomprimir ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1557,8 +1567,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Definições de Dispositivo" @@ -1648,11 +1658,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Deseja parar a emulação actual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1681,12 +1691,12 @@ msgstr "Configuração da emulação de Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuração de GCPad " #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS filmes (*.dtm)" @@ -1698,7 +1708,7 @@ msgstr "Configuração Dolphin do Wiimote" msgid "Dolphin at &Google Code" msgstr "Dolphin em &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1706,7 +1716,7 @@ msgstr "" "O Dolphin não conseguiu encontrar ISOs de GC/Wii. Duplo clique aqui para " "procurar ficheiros..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1714,8 +1724,8 @@ msgstr "" "Dolphin está actualmente definido para esconder todos os jogos. Duplo " "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1741,7 +1751,7 @@ msgstr "Tambores" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Depositar Ãudio" @@ -1922,10 +1932,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Activar Execução de relatórios AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Activar BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Activar Fusão de blocos" @@ -1970,7 +1976,7 @@ msgstr "Activar MMU" msgid "Enable Progressive Scan" msgstr "Activar Progressive Scan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Activar Protector de Ecrã" @@ -2041,16 +2047,6 @@ msgstr "" "Activar isto para aumentar desempenho no The Legend of Zelda: Twilight " "Princess. Desactive para qualquer outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Permite a Localização de Bloco Traduzida (LBT); uma função da Unidade de " -"Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " -"Compatível, OFF = Rápida)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Hack de projecção customizada" @@ -2137,7 +2133,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erro" @@ -2202,7 +2198,7 @@ msgstr "Exportar Gravação..." msgid "Export Save" msgstr "Exportar Jogo Guardado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar jogo guardado Wii (Experimental)" @@ -2218,7 +2214,7 @@ msgstr "Exportação falhou, tentar novamente?" msgid "Export save as..." msgstr "Exportar guardar como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensão" @@ -2275,7 +2271,7 @@ msgstr "A Extrair Pasta" msgid "Extracting..." msgstr "A Extrair..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Byte" @@ -2340,6 +2336,11 @@ msgstr "Falha ao carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Falha ao carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Falha ao escrever cabeçalho para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" @@ -2431,11 +2432,11 @@ msgstr "" msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Versão rápida do MMU. Não funciona em todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2491,7 +2492,7 @@ msgstr "FileIO: Modo aberto desconhecido : 0x%02x" msgid "Filesystem" msgstr "Sistema de ficheiros" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo de ficheiro 'ini' é desconhecido! Não será aberto!" @@ -2574,17 +2575,17 @@ msgstr "" msgid "Forward" msgstr "Frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Quadro" @@ -2658,7 +2659,7 @@ msgstr "Configuração de Relatório" msgid "GCPad" msgstr "ComandoGC" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2699,7 +2700,7 @@ msgid "Gamecube &Pad Settings" msgstr "Definições de Comando &Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Cartões de memória Gamecube (*.raw,*.gcp)" @@ -2810,7 +2811,7 @@ msgstr "Verificação de Cabeçalho falhou" msgid "Hebrew" msgstr "Hebraico" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2834,7 +2835,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Esconder" @@ -2903,11 +2904,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - destino inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Definições IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IV" @@ -2923,7 +2924,7 @@ msgstr "Sensibilidade de Infra Vermelhos" msgid "ISO Details" msgstr "Detalhes ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Pastas ISO" @@ -3060,7 +3061,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Insira o código criptográfado ou \"descriptografado\" aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Inserir Cartão SD" @@ -3072,7 +3073,7 @@ msgstr "Introduza o nome aqui..." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar para o Menu Wii" @@ -3082,7 +3083,7 @@ msgid "" msgstr "" "InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "A Instalar WAD..." @@ -3109,7 +3110,7 @@ msgstr "" msgid "Interface" msgstr "Iinterface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Definições de interface" @@ -3191,7 +3192,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado Inválido" @@ -3274,7 +3275,7 @@ msgstr "Último estado Substituído" msgid "Last Saved State" msgstr "Último Estado Guardado" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3374,11 +3375,11 @@ msgstr "Carregar Estado Slot 8" msgid "Load State..." msgstr "Carregar Estado..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar Sistema de Menu Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Sistema de Menu Wii %d%c" @@ -3456,7 +3457,7 @@ msgstr "" "MD5 não combina\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hack de velocidade" @@ -3491,7 +3492,7 @@ msgstr "O cartão de memória já tem um jogo guardado para este título" msgid "Memcard already opened" msgstr "O cartão de memória já abriu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de Memória" @@ -3508,7 +3509,7 @@ msgstr "" "Gestor de Cartões de memória AVISO-Faça cópias de segurança antes de " "utilizar, deve estar corrigido mas também pode danificar!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3546,7 +3547,7 @@ msgstr "Min" msgid "Misc" msgstr "Diversos" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Configurações Diversas" @@ -3571,11 +3572,11 @@ msgstr "" msgid "Monospaced font" msgstr "Tipo de letra monoespaçada" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3611,11 +3612,11 @@ msgstr "" "Silencía o altifalante Wiimote. Corrige desconexões aleatórias em wiimotes " "reais. Sem efeito em wiimotes emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3742,7 +3743,7 @@ msgstr "Alcunha :" msgid "No Country (SDK)" msgstr "Sem País (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Nenhum ISO ou WAD encontrado" @@ -3751,8 +3752,8 @@ msgstr "Nenhum ISO ou WAD encontrado" msgid "No banner file found for title %s" msgstr "Nenhum ficheiro banner foi encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3760,7 +3761,7 @@ msgstr "" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nenhum ficheiro carregado" @@ -3768,7 +3769,7 @@ msgstr "Nenhum ficheiro carregado" msgid "No free dir index entries" msgstr "Sem entradas de índice para pastas livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nenhum ficheiro de gravação" @@ -3791,7 +3792,7 @@ msgid "Not Equal" msgstr "Não igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Não definido" @@ -3799,7 +3800,7 @@ msgstr "Não definido" msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" @@ -3833,7 +3834,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleração Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objecto" @@ -3864,11 +3865,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir &Pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir Pasta de &Jogo guardado Wii " @@ -3898,7 +3899,7 @@ msgstr "Descodificador de Textura OpenCL" msgid "OpenMP Texture Decoder" msgstr "Descodificador de Textura OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3983,8 +3984,8 @@ msgstr "Patches" msgid "Paths" msgstr "Caminhos" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausa" @@ -4008,8 +4009,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Começar" @@ -4035,7 +4036,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Por favor confirme..." @@ -4051,19 +4052,19 @@ msgstr "Mais-Menos" msgid "Polish" msgstr "Polaco" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -4084,17 +4085,17 @@ msgstr "Português (Brasileiro)" msgid "Post-Processing Effect:" msgstr "Efeito de Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4194,7 +4195,7 @@ msgstr "Reconectar Wiimote ao Carregar Estado" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Gravar" @@ -4251,7 +4252,7 @@ msgstr "Actualizar lista de Jogos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Remover" @@ -4292,7 +4293,7 @@ msgstr "Direita" msgid "Right Stick" msgstr "Stick Direito" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" @@ -4372,7 +4373,7 @@ msgstr "Guardar Estado..." msgid "Save as..." msgstr "Guardar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Guardar GCM/ISO comprimido" @@ -4380,11 +4381,11 @@ msgstr "Guardar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Guardar perspectiva actual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Jogo guardado descomprimido GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." @@ -4393,16 +4394,16 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..." msgid "Scaled EFB Copy" msgstr "Cópia EFB Escalada" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "A procurar %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "A procurar ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Em Analise..." @@ -4423,7 +4424,7 @@ msgstr "Procura de Cheats" msgid "Search Filter" msgstr "Filtro de Pesquisa" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Procurar em Sub-Pastas" @@ -4448,11 +4449,11 @@ msgid "Select" msgstr "Seleccionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Seleccione o Ficheiro de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Seleccione um ficheiro Wii WAD para instalar" @@ -4478,15 +4479,15 @@ msgstr "Seleccionar janelas flutuantes" msgid "Select the file to load" msgstr "Seleccione o ficheiro para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Seleccione o ficheiro de jogo guardado" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Seleccione o estado para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Seleccione o estado para gravar" @@ -4576,7 +4577,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" @@ -4604,7 +4605,7 @@ msgstr "Definições..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Não consegue encontrar o ficheiro de definições" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Abanar" @@ -4780,7 +4781,7 @@ msgstr "" "\n" "Em caso de dúvida, mantenha esta opção desactivada." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote na horizontal" @@ -4788,14 +4789,18 @@ msgstr "Wiimote na horizontal" msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Dimensão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Saltar Bios" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Saltar Dest. Alpha Pass" @@ -4839,11 +4844,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4868,7 +4873,7 @@ msgstr "" "Tem a certeza que quer activar a renderização por software? Em caso de " "dúvida, seleccione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Definições de Som" @@ -4947,7 +4952,7 @@ msgstr "&Começar Gravação" msgid "Start Recording" msgstr "Começar Gravação" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Estado" @@ -5007,12 +5012,12 @@ msgstr "Ficheiros extraídos com sucesso para %s" msgid "Successfully imported save files" msgstr "Sucesso na importação de ficheiros de jogo guardado" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balanço" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma do sistema:" @@ -5080,13 +5085,13 @@ msgstr "O caminho é inválido" msgid "The checksum was successfully fixed" msgstr "A checksum foi reparada com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "A pasta escolhida já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5179,7 +5184,7 @@ msgstr "O ficheiro especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Tema" @@ -5213,9 +5218,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Isto poderá causar lentidão no menu Wii e em alguns jogos." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5253,12 +5260,12 @@ msgstr "Isto permite a edição manual do ficheiro de configuração INI" msgid "Threshold" msgstr "Limite" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" @@ -5322,7 +5329,7 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5331,7 +5338,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO" @@ -5366,7 +5373,7 @@ msgstr "Indefinido %i" msgid "Undo Load State" msgstr "Retroceder Carregamento de Estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5406,11 +5413,11 @@ msgstr "Cima" msgid "Update" msgstr "Actualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote na vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5486,7 +5493,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5557,7 +5564,7 @@ msgstr "" "e tem o mesmo nome que um ficheiro no seu cartão de memória\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5565,7 +5572,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5573,7 +5580,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5605,7 +5612,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "Hack de Ecrã Panorâmico" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largura" @@ -5617,7 +5624,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Consola Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raiz de NAND Wii:" @@ -5625,7 +5632,7 @@ msgstr "Raiz de NAND Wii:" msgid "Wii Save Import" msgstr "Importação de Jogo Guardado Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin" @@ -5690,10 +5697,10 @@ msgstr "Janelas Direita" msgid "Word Wrap" msgstr "Moldar o texto" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "A trabalhar..." @@ -5729,7 +5736,7 @@ msgstr "Inicialização do XAudio2 falhou: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "Criação de master voice do XAudio2 falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5763,7 +5770,7 @@ msgstr "Tem que introduzir um valor decimal, hexadecimal ou octal válido." msgid "You must enter a valid profile name." msgstr "Tem que introduzir um nome de perfil válido." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Tem que reiniciar o Dolphin para que as alterações sejam efectuadas" @@ -5858,7 +5865,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5886,7 +5893,7 @@ msgid "not a wii save or read failure for file header size %x" msgstr "" "não é uma falha de gravação ou de leitura Wii para o cabeçalho do ficheiro %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5895,7 +5902,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "cmd desconhecido 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute devolveu -1 quando a aplicação executou!" @@ -6120,6 +6127,9 @@ msgstr "| OU" #~ msgid "Enable Audio Throttle" #~ msgstr "Activar Regulador Ãudio" +#~ msgid "Enable BAT" +#~ msgstr "Activar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Activar acesso ao CPU" @@ -6138,6 +6148,15 @@ msgstr "| OU" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Activar Protecção de ecrã (redução de ecrã queimado)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Permite a Localização de Bloco Traduzida (LBT); uma função da Unidade de " +#~ "Gestão de Memória. Precisa para o hardware, mas lenta para emular. (ON = " +#~ "Compatível, OFF = Rápida)" + #~ msgid "" #~ "Enables emulation of Embedded Frame Buffer copies, if the game uses " #~ "them.\n" diff --git a/Languages/po/pt_BR.po b/Languages/po/pt_BR.po index 4cf96c1ed7..c141b932c2 100644 --- a/Languages/po/pt_BR.po +++ b/Languages/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-17 02:48-0300\n" "Last-Translator: Runo \n" "Language-Team: Portuguese (BR) \n" @@ -46,7 +46,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" é um arquivo GCM/ISO inválido, ou não é um arquivo ISO de GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -179,11 +179,11 @@ msgstr "Gerenciador de &Cheats" msgid "&DSP Settings" msgstr "Configurações do &DSP" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Deletar ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Deletar ISOs selecionadas..." @@ -247,7 +247,7 @@ msgstr "&Pausar" msgid "&Play" msgstr "&Jogar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Propriedades" @@ -291,11 +291,11 @@ msgstr "&Ver" msgid "&Wiimote Settings" msgstr "Configurações de &Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -315,7 +315,7 @@ msgstr "(DESCONHECIDO)" msgid "(off)" msgstr "(desligado)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -356,7 +356,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -560,11 +560,11 @@ msgstr "Adaptador:" msgid "Add" msgstr "Adicionar" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Adicionar Código de ActionReplay" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Adicionar Patch" @@ -574,7 +574,7 @@ msgstr "Adicionar novo painel" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Adicionar..." @@ -634,24 +634,24 @@ msgstr "Configurações Avançadas" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Todos os arquivos de GC/WII (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Todas as imagens CG/Wii (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Todos os arquivos Gamecube CGM (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Todos os Pontos de Jogo Salvos (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Todos os Arquivos ISO Wii" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Todos os arquivos ISO GC/Wii comprimidos" @@ -660,9 +660,10 @@ msgid "All files (*.*)|*.*" msgstr "Todos os arquivos (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 +#, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -679,6 +680,10 @@ msgstr "Tempo Alternativo de Wiimote" msgid "Analyze" msgstr "Analizar" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtragem Anisotrópica" @@ -695,7 +700,7 @@ msgstr "O Apploader é do tamanho errado... Isso é mesmo um Apploader?" msgid "Apploader unable to load from file" msgstr "O Apploader não pôde carregar do arquivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -722,7 +727,7 @@ msgstr "Ãrabe" msgid "Are you sure you want to delete \"%s\"?" msgstr "Você tem certeza de que quer apagar \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -730,13 +735,13 @@ msgstr "" "Você tem certeza que deseja apagar estes arquivos?\n" "Eles estarão perdidos para sempre!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Você tem certeza que quer deletar este arquivo? Ele ficará perdido para " "sempre!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Proporção:" @@ -750,7 +755,7 @@ msgstr "Pelo menos um painél deve permanecer aberto." msgid "Audio" msgstr "Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Backend de Audio" @@ -785,11 +790,11 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "Registrador BP" @@ -797,7 +802,7 @@ msgstr "Registrador BP" msgid "Back" msgstr "Voltar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Configurações do Backend" @@ -806,7 +811,7 @@ msgstr "Configurações do Backend" msgid "Backend:" msgstr "Backend:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Input em Background" @@ -820,7 +825,7 @@ msgid "Bad File Header" msgstr "Header de Arquivo Ruim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Banner" @@ -886,7 +891,7 @@ msgstr "Quebrado" msgid "Browse" msgstr "Procurar" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Procurar por um diretório para adicionar" @@ -894,7 +899,7 @@ msgstr "Procurar por um diretório para adicionar" msgid "Browse for an ISO directory..." msgstr "Procurar por um diretório de ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Procurar por um diretório de output" @@ -908,7 +913,13 @@ msgstr "Buffer:" msgid "Buttons" msgstr "Botões" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -920,7 +931,7 @@ msgstr "C Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP reg" @@ -962,7 +973,7 @@ msgstr "Não é possível abrir %s" msgid "Cannot unregister events with events pending" msgstr "Não é possível cancelar o registro de evnetos com eventos pendentes" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -973,7 +984,7 @@ msgstr "" "%s\n" "não é um arquivo de Memory Card válido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1006,7 +1017,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "Catalão" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centralizar" @@ -1079,23 +1090,23 @@ msgstr "Chinês (Simplificado)" msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Escolher um diretório raiz de DVD:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "Escolha um diretório raíz para o NAND:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Escolher uma ISO padrão:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Escolher um diretório para adicionar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Escolher um arquivo para abrir" @@ -1103,7 +1114,7 @@ msgstr "Escolher um arquivo para abrir" msgid "Choose a memory card:" msgstr "Escolher um cartão de memória:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1170,16 +1181,16 @@ msgstr "Comentário" msgid "Comment:" msgstr "Comentário:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Comprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Comprimir ISOs selecionadas..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Comprimindo ISO" @@ -1206,9 +1217,9 @@ msgstr "Configurar Controles" msgid "Configure..." msgstr "Configurar..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Confirmar sobrescrição de arquivo" @@ -1221,7 +1232,7 @@ msgstr "Confirmar ao Parar" msgid "Connect" msgstr "Conectar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Conectar Teclado USB" @@ -1266,7 +1277,7 @@ msgstr "Controle" msgid "Convert to GCI" msgstr "Converter para GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Falha na Cópia" @@ -1332,11 +1343,11 @@ msgstr "" "Você está executando o Dolphin de um CD/DVD, ou talvez o arquivo de salva " "seja somente-leitura?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Não foi possível encontrar comando de abertura para a extensão 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1410,7 +1421,7 @@ msgstr "Cuztomize alguns parâmetros de Projeção Ortográfica." msgid "Czech" msgstr "Tcheco" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1422,7 +1433,7 @@ msgstr "Direcional Digital" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Engine de Emulação do DSP" @@ -1435,7 +1446,7 @@ msgstr "Emulação HLE do DSP (rápido)" msgid "DSP LLE interpreter (slow)" msgstr "Interpretador LLE do DSP (lento)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "DSP LLE em Segmento" @@ -1447,7 +1458,7 @@ msgstr "Recompilador LLE do DSP" msgid "DSP settings" msgstr "Configurações de Ãudio" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "Raiz do DVD:" @@ -1492,16 +1503,16 @@ msgstr "Debugging" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Descomprimir ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Descomprimir ISOs selecionados..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Descomprimindo ISO" @@ -1509,7 +1520,7 @@ msgstr "Descomprimindo ISO" msgid "Default" msgstr "Padrão" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "ISO Padrão:" @@ -1553,8 +1564,8 @@ msgstr "" msgid "Device" msgstr "Dispositivo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Configurações de Dispositivo" @@ -1644,11 +1655,11 @@ msgstr "" msgid "Divide" msgstr "Dividir" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Você quer parar a emulação atual?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "Decoder Dolby Pro Logic II" @@ -1677,12 +1688,12 @@ msgstr "Configuração de Wiimote Emulado do Dolphin" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Configuração do GCPad do Dolphin" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Filmes TAS Dolphin (*.dtm)" @@ -1694,7 +1705,7 @@ msgstr "Configuração de Wiimote Dolphin" msgid "Dolphin at &Google Code" msgstr "Dolphin no &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1702,7 +1713,7 @@ msgstr "" "Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por " "arquivos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1710,8 +1721,8 @@ msgstr "" "Dolphin atualmente está configurado para esconder todos os jogos. Duplo-" "clique aqui para mostrar todos os jogos..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "O Dolphin não conseguiu completar a ação requisitada." @@ -1737,7 +1748,7 @@ msgstr "Bateria" msgid "Dummy" msgstr "Dummy" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Extrair Ãudio" @@ -1917,10 +1928,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Ativar Registro AR" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Ativar BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Ativar Block Merging" @@ -1965,7 +1972,7 @@ msgstr "Ativar MMU" msgid "Enable Progressive Scan" msgstr "Ativar Varredura Progressiva" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Ativar Salva-Tela" @@ -2036,16 +2043,6 @@ msgstr "" "Ative isso para ter ganho de velocidade em The legend of Zelda: Twilight " "Princess. Disative para QUALQUER UM outro jogo." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Ativar Block Address Translation (BAT); uma função da unidade de " -"gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " -"emulado (ON = Compativel, OFF = Rapido)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Ativa Hack de Projeção Personalizado" @@ -2139,7 +2136,7 @@ msgstr "Igual" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Erro" @@ -2204,7 +2201,7 @@ msgstr "Exportar Gravação..." msgid "Export Save" msgstr "Exportar Save" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Exportar save do Wii (Experimental)" @@ -2220,7 +2217,7 @@ msgstr "Falha na exportação, tentar novamente?" msgid "Export save as..." msgstr "Exportar Salvar como..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Extensão" @@ -2277,7 +2274,7 @@ msgstr "Extraindo diretorio" msgid "Extracting..." msgstr "Extraindo..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "Byte do FIFO" @@ -2341,6 +2338,11 @@ msgstr "Falha ao carregar bthprops.cpl" msgid "Failed to load hid.dll" msgstr "Falha ao carregar hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Falha ao escrever o header para %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Falha ao ler banner.bin" @@ -2431,11 +2433,11 @@ msgstr "Persa" msgid "Fast" msgstr "Rápido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Rápida versão do MMU. Não funciona para todos os jogos." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2493,7 +2495,7 @@ msgstr "FileIO: Modo de abertura desconhecido : 0x%02x" msgid "Filesystem" msgstr "Arquivo de sistema" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Tipo do arquivo 'ini' desconhecido! Não vai abrir!" @@ -2576,17 +2578,17 @@ msgstr "" msgid "Forward" msgstr "Para frente" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "%d resultados encontrados para '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Quadro" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Quadro" @@ -2658,7 +2660,7 @@ msgstr "Configuração do GCMic" msgid "GCPad" msgstr "GCPad" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2699,7 +2701,7 @@ msgid "Gamecube &Pad Settings" msgstr "Configurações de &Controle de Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Memory Cards do Gamecube (*.raw,*.gcp)" @@ -2813,7 +2815,7 @@ msgstr "A checagem do header falhou" msgid "Hebrew" msgstr "Hebreu" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Altura" @@ -2838,7 +2840,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Ocultar" @@ -2906,11 +2908,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - Destino ruim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "Definições de IPL" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2926,7 +2928,7 @@ msgstr "Sensibilidade IR:" msgid "ISO Details" msgstr "Detalhes da ISO" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Diretórios de ISO" @@ -3065,7 +3067,7 @@ msgstr "Inserir" msgid "Insert Encrypted or Decrypted code here..." msgstr "Inserir Código Encryptado ou Decriptado aqui..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Insira cartão SD" @@ -3077,7 +3079,7 @@ msgstr "Insira nome aqui.." msgid "Install WAD" msgstr "Instalar WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Instalar para o menu do WII" @@ -3088,7 +3090,7 @@ msgstr "" "InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem " "suporte a ele." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "Instalando WAD..." @@ -3117,7 +3119,7 @@ msgstr "" msgid "Interface" msgstr "Interface" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Opções de interface" @@ -3201,7 +3203,7 @@ msgstr "" "String de busca inválida (apenas comprimentos correspondentes de string são " "suportados)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Estado Salvo Inválido" @@ -3283,7 +3285,7 @@ msgstr "Último State sobrescrito" msgid "Last Saved State" msgstr "Último State Salvo" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "Latência:" @@ -3383,11 +3385,11 @@ msgstr "Carregar Estado do Slot 8" msgid "Load State..." msgstr "Carregar State..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Carregar Menu de Sistema do Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Carregar Menu de Sistema do Wii %d %c" @@ -3465,7 +3467,7 @@ msgstr "" "Incompatibilidade do MD5\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "Hack de velocidade MMU" @@ -3500,7 +3502,7 @@ msgstr "O Memory Card já tem um arquivo de salva deste título" msgid "Memcard already opened" msgstr "O Memory Card já está aberto" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Byte de Memória" @@ -3517,7 +3519,7 @@ msgstr "" "AVISO do Gerenciador de- Memory Card - Faça backupsantes de usar, deve estar " "funcionando mas pode corromper coisas!" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3555,7 +3557,7 @@ msgstr "Mínimo" msgid "Misc" msgstr "Diversas" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Opções diversas" @@ -3581,11 +3583,11 @@ msgstr "" msgid "Monospaced font" msgstr "Fonte Monospaced" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3620,11 +3622,11 @@ msgstr "" "Desliga o som que sai do Wiimote. Corrige desconexões imprevisíveis em " "Wiimotes Reais. Não faz efeito em Wiimotes Emulados." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOTA: O tamanho do stream não corresponde ao comprimento dos dados\n" @@ -3751,7 +3753,7 @@ msgstr "Nick:" msgid "No Country (SDK)" msgstr "Sem região (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Sem ISOs ou WADs achados" @@ -3760,8 +3762,8 @@ msgstr "Sem ISOs ou WADs achados" msgid "No banner file found for title %s" msgstr "Nenhum arquivo de banner encontrado para o título %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Descrição indisponível" @@ -3769,7 +3771,7 @@ msgstr "Descrição indisponível" msgid "No docking" msgstr "Sem colocação" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Nenhum arquivo carregado" @@ -3777,7 +3779,7 @@ msgstr "Nenhum arquivo carregado" msgid "No free dir index entries" msgstr "Não há entradas de índice de diretório livres" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "Nenhum arquivo gravado" @@ -3800,7 +3802,7 @@ msgid "Not Equal" msgstr "Não igual" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Indefinido" @@ -3808,7 +3810,7 @@ msgstr "Indefinido" msgid "Not connected" msgstr "Não conectado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notas" @@ -3842,7 +3844,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Aceleração do Nunchuk" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Objeto" @@ -3873,11 +3875,11 @@ msgstr "Apenas %d blocos disponíveis" msgid "Open" msgstr "Abrir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Abrir &conteúdo da pasta" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Abrir pasta do &save do WII" @@ -3907,7 +3909,7 @@ msgstr "Decodificador de Texturas OpenCL" msgid "OpenMP Texture Decoder" msgstr "Decodificador de Texturas OpenMP" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opções" @@ -3992,8 +3994,8 @@ msgstr "Patches" msgid "Paths" msgstr "Diretórios" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pausar" @@ -4017,8 +4019,8 @@ msgstr "Perspectiva %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Executar" @@ -4044,7 +4046,7 @@ msgstr "Opções de Reprodução" msgid "Players" msgstr "Jogadores" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Favor confirmar..." @@ -4060,19 +4062,19 @@ msgstr "Positivo-Negativo" msgid "Polish" msgstr "Polonês" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Porta 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Porta 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Porta 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Porta 4" @@ -4093,17 +4095,17 @@ msgstr "Português (Brasil)" msgid "Post-Processing Effect:" msgstr "Efeito Pós-Processamento" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "Fim prematuro do vídeo no PlayController. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "Fim prematuro do vídeo no PlayWiimote. %u > %u" @@ -4202,7 +4204,7 @@ msgstr "Reconectar Wiimote ao carregar Estado Salvo" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Gravar" @@ -4258,7 +4260,7 @@ msgstr "Atualizar a lista de jogos" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Remover" @@ -4299,7 +4301,7 @@ msgstr "Direita" msgid "Right Stick" msgstr "Analógico Direito" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Vibração" @@ -4379,7 +4381,7 @@ msgstr "Salvar Instante Atual..." msgid "Save as..." msgstr "Salvar como..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Salvar GCM/ISO comprimido" @@ -4387,11 +4389,11 @@ msgstr "Salvar GCM/ISO comprimido" msgid "Save current perspective" msgstr "Salvar perspectiva atual" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Salvar GCM/ISO descomprimido" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." @@ -4400,16 +4402,16 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..." msgid "Scaled EFB Copy" msgstr "Cópia Escalada do EFB" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Escaneando %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Procurando por ISOs" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Escaneando..." @@ -4429,7 +4431,7 @@ msgstr "Busca" msgid "Search Filter" msgstr "Filtro de Busca" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Procurar em sub-pastas" @@ -4453,11 +4455,11 @@ msgid "Select" msgstr "Selecionar" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Selecione o arquivo de Gravação" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Selecione um arquivo WAD de Wii para instalar" @@ -4482,15 +4484,15 @@ msgstr "Selecionar Janelas flutuantes" msgid "Select the file to load" msgstr "Selecione um arquivo para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Selecione o arquivo de salva" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Selecione um instante para carregar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Selecione um instante para salvar" @@ -4579,7 +4581,7 @@ msgstr "" msgid "Set" msgstr "Definir" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Definir como ISO &padrão" @@ -4610,7 +4612,7 @@ msgstr "Configurações..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Arquivo de configuração não encontrado" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sacudir" @@ -4788,7 +4790,7 @@ msgstr "" "\n" "Se estiver em dúvida, deixe isto desativado." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Wiimote na Horizontal" @@ -4796,14 +4798,18 @@ msgstr "Wiimote na Horizontal" msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Tamanho" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "Pular a BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Não fazer o Dest. Alpha Pass" @@ -4847,11 +4853,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4875,7 +4881,7 @@ msgstr "" "Você realmente quer utilizar o Renderizador por Software? Se estiver em " "dúvida, pressione 'Não'." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Configurações de Som" @@ -4954,7 +4960,7 @@ msgstr "Iniciar Ca&ptura" msgid "Start Recording" msgstr "Iniciar Captura" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Status" @@ -5014,12 +5020,12 @@ msgstr "Arquivo exportado com sucesso para %s" msgid "Successfully imported save files" msgstr "Arquivos de salva importados com sucesso" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Balançar" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Idioma do Systema:" @@ -5087,13 +5093,13 @@ msgstr "O endereço é inválido" msgid "The checksum was successfully fixed" msgstr "O Checksum foi corrigido com sucesso" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "O diretório escolhido já está na lista" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5183,7 +5189,7 @@ msgstr "O arquivo especificado \"%s\" não existe" msgid "The value is invalid" msgstr "O valor é inválido" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "Tema:" @@ -5217,9 +5223,11 @@ msgstr "" "Isto pode causar diminuição da performance no Wii Menu e em alguns jogos." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5256,12 +5264,12 @@ msgstr "Isto vai deixar você editar manualmente o arquivo de configuração .IN msgid "Threshold" msgstr "Threshold" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Inclinar" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Título" @@ -5325,7 +5333,7 @@ msgstr "Tipo" msgid "UDP Port:" msgstr "Porta UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "Wiimote UDP" @@ -5334,7 +5342,7 @@ msgstr "Wiimote UDP" msgid "UNKNOWN" msgstr "DESCONHECIDO" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "DESCONHECIDO_%02X" @@ -5372,7 +5380,7 @@ msgstr "%i indefinido" msgid "Undo Load State" msgstr "Desfazer carregamento de estado" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Chamada 0x80 inesperada? Abortando..." @@ -5411,11 +5419,11 @@ msgstr "Para cima" msgid "Update" msgstr "Atualizar" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Wiimote na Vertical" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "Usar modo EuRGB60 (PAL60)" @@ -5491,7 +5499,7 @@ msgstr "Vídeo" msgid "Virtual" msgstr "Virtual" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Volume" @@ -5560,7 +5568,7 @@ msgstr "" "que tenham o mesmo nome de um arquivo do Memory Card\n" "Continuar?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5571,7 +5579,7 @@ msgstr "" "(byte %u > %u) (frame %u > %u). Você deveria carregar outro instante salvo, " "ou carregar este instante com o modo somente-leitura desligado." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5583,7 +5591,7 @@ msgstr "" "este instante com o modo somente-leitura desligado. Caso contrário você " "provavelmente terá uma desincronização." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5630,7 +5638,7 @@ msgstr "Distorção" msgid "Widescreen Hack" msgstr "Hack de Widescreen" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Largura" @@ -5642,7 +5650,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Console do Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Raiz do Wii NAND" @@ -5650,7 +5658,7 @@ msgstr "Raiz do Wii NAND" msgid "Wii Save Import" msgstr "Importar Save de Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Arquivos de Save do Wii (*.bin)|*.bin" @@ -5713,10 +5721,10 @@ msgstr "Janelas da Direita" msgid "Word Wrap" msgstr "Word Wrap" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Funcionando..." @@ -5751,7 +5759,7 @@ msgstr "XAudio2 Falha na inicialização: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 Criação de Master Voice falhou: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF reg" @@ -5788,7 +5796,7 @@ msgstr "Você deve digitar um valor válido decimal, hexadecimal ou octal." msgid "You must enter a valid profile name." msgstr "Você deve digitar um nome válido para o perfil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Você deve reiniciar o Dolphin para que as modificações tenham efeito." @@ -5883,7 +5891,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5912,7 +5920,7 @@ msgstr "" "Não é um save de Wii ou houve erro de leitura no tamanho do header do " "arquivo %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5921,7 +5929,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Cmd 0x%08x desconhecido" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute retornou -1 ao rodar o aplicativo!" @@ -6151,6 +6159,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Ativar Throttle de Ãudio" +#~ msgid "Enable BAT" +#~ msgstr "Ativar BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Ativar Acesso da CPU" @@ -6175,6 +6186,15 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Ativar Proteção de tela (redução de \"burn-in\")" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ativar Block Address Translation (BAT); uma função da unidade de " +#~ "gerenciamento de memoria. Precisão para o hardware, mas devagar para ser " +#~ "emulado (ON = Compativel, OFF = Rapido)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/ru.po b/Languages/po/ru.po index df1eb461af..7c6149eb30 100644 --- a/Languages/po/ru.po +++ b/Languages/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: firnis \n" "Language-Team: Russian <>\n" @@ -46,7 +46,7 @@ msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "" "\"%s\" неверный образ GCM/ISO, или не ÑвлÑетÑÑ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼ игры Ð´Ð»Ñ GC/Wii." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -177,11 +177,11 @@ msgstr "Менеджер &читов" msgid "&DSP Settings" msgstr "&Опции аудио" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Удалить ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Удалить выбранные ISO-файлы..." @@ -247,7 +247,7 @@ msgstr "&Пауза" msgid "&Play" msgstr "&ЗапуÑтить" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&СвойÑтва" @@ -291,11 +291,11 @@ msgstr "&Вид" msgid "&Wiimote Settings" msgstr "Опц&ии Wiimote" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -316,7 +316,7 @@ msgstr "ÐЕИЗВЕСТÐО" msgid "(off)" msgstr "(отключен)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -357,7 +357,7 @@ msgstr "<Ðажмите кнопку>" msgid "" msgstr "<СиÑтемный>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -539,11 +539,11 @@ msgstr "Ðдаптер:" msgid "Add" msgstr "Добавить" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Добавление ActionReplay-кода" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Добавление патча" @@ -553,7 +553,7 @@ msgstr "Добавить панель" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Добавить..." @@ -600,25 +600,25 @@ msgstr "РаÑширенные наÑтройки" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Ð’Ñе GC/Wii-файлы (elf, dol, gcm, iso, ciso, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Ð’Ñе образа от GC/Wii (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Ð’Ñе GCM-файлы Gamecube (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Файлы быÑтрых Ñохранений (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Файлы образов Wii (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Сжатые образа диÑков GC/Wii (gcz)" @@ -629,8 +629,8 @@ msgstr "Ð’Ñе файлы (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -646,6 +646,10 @@ msgstr "Эмулируемый Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "ÐÐ½Ð¸Ð·Ð¾Ñ‚Ñ€Ð¾Ð¿Ð½Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ" @@ -662,7 +666,7 @@ msgstr "Загрузчик неверноего размера... Ñто точ msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Загрузчик:" @@ -686,7 +690,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Ð’Ñ‹ уверены, что хотите удалить \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -694,11 +698,11 @@ msgstr "" "Ð’Ñ‹ уверены, что хотите удалить Ñти файлы?\n" "Они иÑчезнут навÑегда!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñтот файл? Он иÑчезнет навÑегда!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "Соотношение Ñторон:" @@ -712,7 +716,7 @@ msgstr "Ð¥Ð¾Ñ‚Ñ Ð±Ñ‹ одна панель должна быть открыта msgid "Audio" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 #, fuzzy msgid "Audio Backend:" msgstr "СиÑтема вывода" @@ -750,11 +754,11 @@ msgstr "" "Отключение тумана улучшает производительноÑÑ‚ÑŒ, но влечет за Ñобой глюки в " "играх, которые завиÑÑÑ‚ от его правильной ÑмулÑции." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&РегиÑтры" @@ -763,7 +767,7 @@ msgstr "&РегиÑтры" msgid "Back" msgstr "Ðазад" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 #, fuzzy msgid "Backend Settings" msgstr "ОÑновные наÑтройки" @@ -774,7 +778,7 @@ msgstr "ОÑновные наÑтройки" msgid "Backend:" msgstr "СиÑтема вывода" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -788,7 +792,7 @@ msgid "Bad File Header" msgstr "Ðеверный заголовок файла" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Логотип" @@ -854,7 +858,7 @@ msgstr "Ðе работает" msgid "Browse" msgstr "Обзор" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" @@ -862,7 +866,7 @@ msgstr "Выберите папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ игр" msgid "Browse for an ISO directory..." msgstr "Выбор папки Ñ ISO-файлами..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Укажите папку Ð´Ð»Ñ ÑохранениÑ" @@ -876,7 +880,13 @@ msgstr "Буфер:" msgid "Buttons" msgstr "Кнопки" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -888,7 +898,7 @@ msgstr "" msgid "C-Stick" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -925,7 +935,7 @@ msgstr "Ðе удалоÑÑŒ открыть %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -935,7 +945,7 @@ msgstr "" "ÐÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñтот файл, как карту памÑти\n" "Ð’Ñ‹ пытаетеÑÑŒ иÑпользовать один файл в обоих Ñлотах?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -966,7 +976,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Центр" @@ -1042,24 +1052,24 @@ msgstr "Chinese (Simplified)" msgid "Chinese (Traditional)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "Выберите оÑновной DVD-диÑк:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Выберите файл образа:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Выберите папку Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑпиÑок" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Выберите файл карты памÑти" @@ -1067,7 +1077,7 @@ msgstr "Выберите файл карты памÑти" msgid "Choose a memory card:" msgstr "Выберите карту памÑти:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1132,16 +1142,16 @@ msgstr "Комментарий" msgid "Comment:" msgstr "Комментарий:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Сжать ISO-файл..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Сжать выбранные ISO-файлы..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Сжатие образа" @@ -1168,9 +1178,9 @@ msgstr "ÐаÑтроить контроллеры" msgid "Configure..." msgstr "ÐаÑтройка ÑмулÑтора..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" @@ -1184,7 +1194,7 @@ msgstr "Потверждение при оÑтановке ÑмулÑции" msgid "Connect" msgstr "ПодключитьÑÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "Подключить USB-клавиатуру" @@ -1229,7 +1239,7 @@ msgstr "Ctrl" msgid "Convert to GCI" msgstr "Конвертировать в GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "" @@ -1291,11 +1301,11 @@ msgstr "" "\n" "Ð’Ñ‹ запуÑтили Dolphin Ñ CD/DVD, или файл защищен от запиÑи?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1366,7 +1376,7 @@ msgstr "" msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1378,7 +1388,7 @@ msgstr "" msgid "DSP" msgstr "Ðудио" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 #, fuzzy msgid "DSP Emulator Engine" msgstr "Режим ÑмулÑции CPU" @@ -1393,7 +1403,7 @@ msgstr "" msgid "DSP LLE interpreter (slow)" msgstr "Интерпретатор (ОЧЕÐЬ медленный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "Обрабатывать DSP LLE отдельным потоком" @@ -1406,7 +1416,7 @@ msgstr "" msgid "DSP settings" msgstr "ÐаÑтройка аудио (DSP)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD-диÑк:" @@ -1452,16 +1462,16 @@ msgstr "Отладка" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "СнÑÑ‚ÑŒ Ñжатие Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ISO-файлов..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" @@ -1469,7 +1479,7 @@ msgstr "" msgid "Default" msgstr "СброÑ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Образ по умолчанию:" @@ -1512,8 +1522,8 @@ msgstr "" msgid "Device" msgstr "УÑтройÑтво" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "ÐаÑтройки уÑтройÑтв" @@ -1588,11 +1598,11 @@ msgstr "" msgid "Divide" msgstr "/" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Ð’Ñ‹ хотите оÑтановить ÑмулÑцию?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1622,12 +1632,12 @@ msgstr "ÐаÑтройки Ñмулируемого Wiimote" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "ÐаÑтройки Dolphin GCPad" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1639,7 +1649,7 @@ msgstr "ÐаÑтройка Wiimote" msgid "Dolphin at &Google Code" msgstr "&Репозиторий на Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1647,7 +1657,7 @@ msgstr "" "Dolphin не нашел образов игр GC/Wii. Щелкните дважды по Ñтой надпиÑи, чтобы " "указать путь..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1655,8 +1665,8 @@ msgstr "" "Dolphin наÑтроен на Ñкрытие вÑех игр. Кликните здеÑÑŒ два раза, чтобы " "показать игры..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1682,7 +1692,7 @@ msgstr "Барабаны" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" @@ -1838,10 +1848,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "Включить логирование AR-Ñобытий" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "Включить BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Включить Ñовмещение блоков" @@ -1887,7 +1893,7 @@ msgstr "Включить MMU" msgid "Enable Progressive Scan" msgstr "Включить прогреÑÑивную развертку" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "Включить широкий Ñкран" @@ -1949,15 +1955,6 @@ msgstr "" "УÑкорÑет игру The Legend of Zelda: Twilight Princess. Ð”Ð»Ñ Ð»ÑŽÐ±Ð¾Ð¹ ДРУГОЙ игры " "данный хак должен быть ОТКЛЮЧЕÐ." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну из " -"функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 #, fuzzy msgid "Enables Custom Projection Hack" @@ -2040,7 +2037,7 @@ msgstr "Равно" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Ошибки" @@ -2105,7 +2102,7 @@ msgstr "&ЭкÑпортировать запиÑÑŒ процеÑÑа" msgid "Export Save" msgstr "ЭкÑпортировать Ñохранение" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "ЭкÑпортировать Ñохранение Wii (ÑкÑперемент)" @@ -2122,7 +2119,7 @@ msgstr "ЭкÑпортирование файла" msgid "Export save as..." msgstr "&ЭкÑпортировать Ñохранение как..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "РаÑширение" @@ -2179,7 +2176,7 @@ msgstr "Извлечение папки" msgid "Extracting..." msgstr "Подождите..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2236,6 +2233,11 @@ msgstr "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ hid.dll" msgid "Failed to load hid.dll" msgstr "Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "Ошибка запиÑи заголовка Ð´Ð»Ñ %s" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ banner.bin" @@ -2313,11 +2315,11 @@ msgstr "" msgid "Fast" msgstr "быÑтрое" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "Более быÑÑ‚Ñ€Ð°Ñ Ð²ÐµÑ€Ñи MMU (работает не Ñо вÑеми играми)." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2374,7 +2376,7 @@ msgstr "FileIO: неизвеÑтный режим Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ : 0x%02x" msgid "Filesystem" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2447,18 +2449,18 @@ msgstr "" msgid "Forward" msgstr "Вперед" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "Лимит кадров:" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "РаÑширенные" @@ -2537,7 +2539,7 @@ msgstr "ÐаÑтройка \"горÑчих\" клавиш" msgid "GCPad" msgstr "ДжойÑтик" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2579,7 +2581,7 @@ msgid "Gamecube &Pad Settings" msgstr "Опции &контроллера Gamecube" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Файлы карт памÑти Gamecube (*.raw,*.gcp)" @@ -2686,7 +2688,7 @@ msgstr "Ошибка контрольной Ñуммы заголовка" msgid "Hebrew" msgstr "Hebrew" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Ð’Ñ‹Ñота" @@ -2711,7 +2713,7 @@ msgstr "" "\n" "Sayonara!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "СпрÑтать" @@ -2779,11 +2781,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "ÐаÑтройки конÑоли (IPL)" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "ИК" @@ -2799,7 +2801,7 @@ msgstr "ЧувÑтвительноÑÑ‚ÑŒ IR-Ñигнала:" msgid "ISO Details" msgstr "Данные образа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Папки Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ образов" @@ -2929,7 +2931,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "Ð’Ñтавьте Ñюда Ñам код (шифрованный или нешифрованный)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "Ð’Ñтавить SD-карту" @@ -2942,7 +2944,7 @@ msgstr "Введите Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð°..." msgid "Install WAD" msgstr "УÑтановка Wii-меню" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "УÑтановить в меню Wii" @@ -2952,7 +2954,7 @@ msgid "" msgstr "" "Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "УÑтанавливаетÑÑ WAD в меню Wii..." @@ -2981,7 +2983,7 @@ msgstr "" msgid "Interface" msgstr "ÐаÑтройки интерфейÑа" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ÐаÑтройки интерфейÑа" @@ -3064,7 +3066,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Ðеверное Ñохранение" @@ -3150,7 +3152,7 @@ msgstr "ПоÑледнее перезапиÑанное Ñохранение" msgid "Last Saved State" msgstr "ПоÑледнее Ñохранение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3254,12 +3256,12 @@ msgstr "БыÑÑ‚Ñ€Ð°Ñ &загрузка" msgid "Load State..." msgstr "Загрузить игру..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Загрузить Wii System Menu (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Загрузить Wii System Menu (%d %c)" @@ -3332,7 +3334,7 @@ msgstr "" "MD5 не Ñовпадает\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "УÑкорить MMU (Ñпидхак)" @@ -3367,7 +3369,7 @@ msgstr "Ðа карте памÑти уже еÑÑ‚ÑŒ Ñохранение Ñто msgid "Memcard already opened" msgstr "Карта памÑти уже открыта" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "Па&мÑÑ‚ÑŒ" @@ -3383,7 +3385,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3416,7 +3418,7 @@ msgstr "Мик." msgid "Misc" msgstr "Разное" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "Разное" @@ -3437,11 +3439,11 @@ msgstr "" msgid "Monospaced font" msgstr "Моноширный шрифт" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3467,11 +3469,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3598,7 +3600,7 @@ msgstr "Ðик :" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "ISO/WAD-файлов не обнаружено" @@ -3607,8 +3609,8 @@ msgstr "ISO/WAD-файлов не обнаружено" msgid "No banner file found for title %s" msgstr "Ðе найден баннер Ð´Ð»Ñ %s" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3616,7 +3618,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3624,7 +3626,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "Ðеверный файл запиÑи" @@ -3649,7 +3651,7 @@ msgid "Not Equal" msgstr "Ðе равно" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "ÐеизвеÑтно" @@ -3657,7 +3659,7 @@ msgstr "ÐеизвеÑтно" msgid "Not connected" msgstr "Ðе подключено" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "ПримечаниÑ" @@ -3691,7 +3693,7 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3722,11 +3724,11 @@ msgstr "ДоÑтупно только %d блоков" msgid "Open" msgstr "Открыть" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Открыть &папку Ñ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Открыть папку Ñ &ÑохранениÑми Wii" @@ -3756,7 +3758,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Опции" @@ -3836,8 +3838,8 @@ msgstr "Патчи" msgid "Paths" msgstr "Папки" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Пауза" @@ -3862,8 +3864,8 @@ msgstr "Точка %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "ЗапуÑк" @@ -3891,7 +3893,7 @@ msgstr "Опции" msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3908,22 +3910,22 @@ msgstr "" msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 #, fuzzy msgid "Port 1" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 #, fuzzy msgid "Port 2" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 #, fuzzy msgid "Port 3" msgstr "Порт :" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 #, fuzzy msgid "Port 4" msgstr "Порт :" @@ -3948,17 +3950,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "Шейдер поÑÑ‚-обработки:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4061,7 +4063,7 @@ msgstr "Подключить Wiimote 1" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Про&играть запиÑÑŒ процеÑÑа" @@ -4119,7 +4121,7 @@ msgstr "Обновление ÑпиÑка игр" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Удалить" @@ -4160,7 +4162,7 @@ msgstr "Вправо" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "ВидбрациÑ" @@ -4248,7 +4250,7 @@ msgstr "Сохранить игру как..." msgid "Save as..." msgstr "Сохранить как..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого GCM/ISO-образа" @@ -4256,11 +4258,11 @@ msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñжатого G msgid "Save current perspective" msgstr "Сохранить точку" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "Выберите меÑто Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÑжатого GCM/ISO-образа" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4269,16 +4271,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "ПоиÑк..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "ПоиÑк образов диÑков" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "ПоиÑк..." @@ -4299,7 +4301,7 @@ msgstr "ПоиÑк кодов" msgid "Search Filter" msgstr "Фильтр поиÑка" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "ИÑкать в подпапках" @@ -4324,11 +4326,11 @@ msgid "Select" msgstr "Выбрать" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи игрового процеÑÑа" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°" @@ -4355,15 +4357,15 @@ msgstr "" msgid "Select the file to load" msgstr "Выберите файл Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Выберите файл Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Выберите файл ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Выберите или укажите файл Ð´Ð»Ñ Ð±Ñ‹Ñтрого ÑохранениÑ" @@ -4440,7 +4442,7 @@ msgstr "" msgid "Set" msgstr "Выбрать" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Сделать &игрой по умолчанию" @@ -4469,7 +4471,7 @@ msgstr "ÐаÑтройки конÑоли (IPL)" msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Файл наÑтроек не найден" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" @@ -4647,7 +4649,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 #, fuzzy msgid "Sideways Wiimote" msgstr "Реальный Wimote" @@ -4657,15 +4659,19 @@ msgstr "Реальный Wimote" msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Размер" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Пропуcтить загрузку BIOS'а GC" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4698,12 +4704,12 @@ msgstr "" msgid "Slot %i" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 #, fuzzy msgid "Slot A" msgstr "Слот" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 #, fuzzy msgid "Slot B" msgstr "Слот" @@ -4724,7 +4730,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "ÐаÑтройки ÑмулÑции звука" @@ -4797,7 +4803,7 @@ msgstr "Ðачать &запиÑÑŒ процеÑÑа" msgid "Start Recording" msgstr "Ðачать &запиÑÑŒ процеÑÑа" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "СтатуÑ" @@ -4853,12 +4859,12 @@ msgstr "Файл уÑпешно ÑкÑпортирован в %s" msgid "Successfully imported save files" msgstr "Сохранение уÑпешно импортировано" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Язык ÑиÑтемы:" @@ -4928,13 +4934,13 @@ msgstr "Ðеверный адреÑ" msgid "The checksum was successfully fixed" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма уÑпешно иÑправлена" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Ð’Ñ‹Ð±Ð¿Ð²Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° уже в ÑпиÑке" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, fuzzy, c-format msgid "" "The file %s already exists.\n" @@ -5018,7 +5024,7 @@ msgstr "Указанный файл \"%s\" не ÑущеÑтвует" msgid "The value is invalid" msgstr "Ðеверное значение" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Стиль" @@ -5060,7 +5066,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5090,12 +5097,12 @@ msgstr "Это позволит вам вручную править INI фай msgid "Threshold" msgstr "Порог" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Ðаклон" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "Ðазвание" @@ -5161,7 +5168,7 @@ msgstr "Тип:" msgid "UDP Port:" msgstr "Порт UDP:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -5170,7 +5177,7 @@ msgstr "" msgid "UNKNOWN" msgstr "ÐЕИЗВЕСТÐО" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "ÐЕИЗВЕСТÐО" @@ -5202,7 +5209,7 @@ msgstr "" msgid "Undo Load State" msgstr "Отменить загрузку" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5240,12 +5247,12 @@ msgstr "Вверх" msgid "Update" msgstr "Обновить" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 #, fuzzy msgid "Upright Wiimote" msgstr "Гибридный Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "ИÑпользовать EuRGB60-режим (PAL60)" @@ -5311,7 +5318,7 @@ msgstr "Видео" msgid "Virtual" msgstr "Виртуальный" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "ГромкоÑÑ‚ÑŒ" @@ -5375,7 +5382,7 @@ msgstr "" "Ñ Ñовпадающими именами будут перепиÑаны\n" "Продолжить?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5383,7 +5390,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5391,7 +5398,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5423,7 +5430,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "Ширина" @@ -5435,7 +5442,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD-диÑк:" @@ -5444,7 +5451,7 @@ msgstr "DVD-диÑк:" msgid "Wii Save Import" msgstr "Импорт Ñохранений Wii" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Файлы Ñохранений Wii (*.bin)|*.bin" @@ -5507,10 +5514,10 @@ msgstr "Windows Right" msgid "Word Wrap" msgstr "ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñтрок" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Подождите..." @@ -5547,7 +5554,7 @@ msgstr "XAudio2 ошибка инициализации: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ master voice: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5581,7 +5588,7 @@ msgstr "Ðужно ввеÑти деÑÑтичное или шеÑтнадцат msgid "You must enter a valid profile name." msgstr "Введите правильное Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "Ðеобходимо перезапуÑтить Dolphin, чтобы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу." @@ -5657,7 +5664,7 @@ msgstr "" msgid "^ ADD" msgstr "^ ADD" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "загрузчик (.img)" @@ -5684,7 +5691,7 @@ msgstr "iCacheJIT: Чтение кода операции из %x. Пожалу msgid "not a wii save or read failure for file header size %x" msgstr "Ñто Ñохранение не от Wii или ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° размером %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5693,7 +5700,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute вернул -1 при запуÑке приложениÑ!" @@ -5895,6 +5902,9 @@ msgstr "| OR" #~ msgid "Enable Audio Throttle" #~ msgstr "Включить аудиотроттлинг" +#~ msgid "Enable BAT" +#~ msgstr "Включить BAT" + #~ msgid "Enable CPU Access" #~ msgstr "Включить доÑтуп CPU к EFB" @@ -5919,6 +5929,14 @@ msgstr "| OR" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Включить хранитель Ñкрана" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Ðктивирует Ñмещение адреÑа блока (Block Address Translation, BAT), одну " +#~ "из функций MMU. Повышает точноÑÑ‚ÑŒ ÑмулÑции ценой ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ ÑкороÑти." + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" diff --git a/Languages/po/sr.po b/Languages/po/sr.po index f47f779328..b5d3a61487 100644 --- a/Languages/po/sr.po +++ b/Languages/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2011-03-02 21:58+0100\n" "Last-Translator: nikolassj\n" "Language-Team: \n" @@ -45,7 +45,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\"je GCM/ISO fajl, ili nije GC/Wii ISO." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -168,11 +168,11 @@ msgstr "&Chit Meneger " msgid "&DSP Settings" msgstr "&DSP Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "&Obrisi ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "&Obrisi oznacene ISO fajlove..." @@ -236,7 +236,7 @@ msgstr "&Pauza" msgid "&Play" msgstr "&Pokreni" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "&Pribor/Opcije" @@ -280,11 +280,11 @@ msgstr "&Pogledaj" msgid "&Wiimote Settings" msgstr "&Wiimote Opcije" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -304,7 +304,7 @@ msgstr "(NEPOZNAT/O)" msgid "(off)" msgstr "(iskljucen/o)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -345,7 +345,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -508,11 +508,11 @@ msgstr "Adapter" msgid "Add" msgstr "Dodaj" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Dodaj ActionReplay kod" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Dodaj Patch " @@ -522,7 +522,7 @@ msgstr "Dodaj nova okna" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Dodaj..." @@ -568,24 +568,24 @@ msgstr "" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "" @@ -596,8 +596,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -611,6 +611,10 @@ msgstr "" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "" @@ -627,7 +631,7 @@ msgstr "" msgid "Apploader unable to load from file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "" @@ -651,7 +655,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "Jeste li sigurni da zelite da obrisete \"%s\"?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -659,11 +663,11 @@ msgstr "" "Jeste li sigurni da zelite da obrisete ove fajlove?\n" "Nestace zauvek!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "" @@ -677,7 +681,7 @@ msgstr "" msgid "Audio" msgstr "Zvuk" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "" @@ -711,11 +715,11 @@ msgid "" msgstr "" "Onemoguci \"fog\". Poboljsava performans/brzinu ali uzrokuje bagove ..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "&Registri" @@ -724,7 +728,7 @@ msgstr "&Registri" msgid "Back" msgstr "Nazad " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "" @@ -734,7 +738,7 @@ msgstr "" msgid "Backend:" msgstr "Nazad " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "" @@ -748,7 +752,7 @@ msgid "Bad File Header" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "Baner" @@ -814,7 +818,7 @@ msgstr "Ostecen/a/nje..." msgid "Browse" msgstr "Trazi" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "" @@ -822,7 +826,7 @@ msgstr "" msgid "Browse for an ISO directory..." msgstr "Trazi ISO direktoriju" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "" @@ -836,7 +840,13 @@ msgstr "" msgid "Buttons" msgstr "Tasteri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -849,7 +859,7 @@ msgstr "C-Stick" msgid "C-Stick" msgstr "C-Stick" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -886,7 +896,7 @@ msgstr "Nemoze otvoriti %s" msgid "Cannot unregister events with events pending" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -894,7 +904,7 @@ msgid "" "is not a valid gamecube memory card file" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -923,7 +933,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Centar " @@ -996,23 +1006,23 @@ msgstr "Kineski (pojednostavljen)" msgid "Chinese (Traditional)" msgstr "Kineski (tradicionalan)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Biraj fajl da otvoris " @@ -1020,7 +1030,7 @@ msgstr "Biraj fajl da otvoris " msgid "Choose a memory card:" msgstr "Biraj memorisku karticu:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1085,16 +1095,16 @@ msgstr "" msgid "Comment:" msgstr "Koment:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kompresuj ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Kompresuj oznaceni ISO fajlovi..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kompresivanje ISO fajla u toku" @@ -1121,9 +1131,9 @@ msgstr "" msgid "Configure..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "" @@ -1136,7 +1146,7 @@ msgstr "" msgid "Connect" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "" @@ -1181,7 +1191,7 @@ msgstr "Kontrola" msgid "Convert to GCI" msgstr "Konvertuj u GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopiranje neuspesno " @@ -1237,11 +1247,11 @@ msgid "" "protected?" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1310,7 +1320,7 @@ msgstr "" msgid "Czech" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1322,7 +1332,7 @@ msgstr "" msgid "DSP" msgstr "DSP" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "" @@ -1335,7 +1345,7 @@ msgstr "" msgid "DSP LLE interpreter (slow)" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "" @@ -1347,7 +1357,7 @@ msgstr "" msgid "DSP settings" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "" @@ -1392,16 +1402,16 @@ msgstr "" msgid "Decimal" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "" @@ -1409,7 +1419,7 @@ msgstr "" msgid "Default" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "" @@ -1452,8 +1462,8 @@ msgstr "" msgid "Device" msgstr "Uredjaj " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Opcije Uredjaja " @@ -1528,11 +1538,11 @@ msgstr "" msgid "Divide" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1562,12 +1572,12 @@ msgstr "" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "" @@ -1579,20 +1589,20 @@ msgstr "" msgid "Dolphin at &Google Code" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1618,7 +1628,7 @@ msgstr "" msgid "Dummy" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "" @@ -1768,10 +1778,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "" @@ -1816,7 +1822,7 @@ msgstr "" msgid "Enable Progressive Scan" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "" @@ -1869,13 +1875,6 @@ msgid "" "ANY other game." msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "" @@ -1953,7 +1952,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Error" @@ -2013,7 +2012,7 @@ msgstr "" msgid "Export Save" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "" @@ -2029,7 +2028,7 @@ msgstr "" msgid "Export save as..." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "" @@ -2086,7 +2085,7 @@ msgstr "" msgid "Extracting..." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2142,6 +2141,11 @@ msgstr "" msgid "Failed to load hid.dll" msgstr "" +#: Source/Core/Core/Src/Movie.cpp:792 +#, c-format +msgid "Failed to read %s" +msgstr "" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "" @@ -2219,11 +2223,11 @@ msgstr "" msgid "Fast" msgstr "Brzo " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2276,7 +2280,7 @@ msgstr "" msgid "Filesystem" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "" @@ -2345,17 +2349,17 @@ msgstr "" msgid "Forward" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "" @@ -2430,7 +2434,7 @@ msgstr "Dolphin podesavanja/konfiguracija" msgid "GCPad" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2471,7 +2475,7 @@ msgid "Gamecube &Pad Settings" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "" @@ -2575,7 +2579,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "" @@ -2593,7 +2597,7 @@ msgid "" "Sayonara!\n" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "" @@ -2655,11 +2659,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "" @@ -2675,7 +2679,7 @@ msgstr "" msgid "ISO Details" msgstr "ISO Detalji " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "" @@ -2790,7 +2794,7 @@ msgstr "" msgid "Insert Encrypted or Decrypted code here..." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "" @@ -2803,7 +2807,7 @@ msgstr "Ubaci ime ovde..." msgid "Install WAD" msgstr "Instaliraj Wii Meni " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "" @@ -2812,7 +2816,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "" @@ -2839,7 +2843,7 @@ msgstr "" msgid "Interface" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "" @@ -2917,7 +2921,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "" @@ -2998,7 +3002,7 @@ msgstr "" msgid "Last Saved State" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3092,12 +3096,12 @@ msgstr "Ucitaj State Slot 8" msgid "Load State..." msgstr "Ucitaj State" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "Ucitaj Wii Sistem Meni (%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "Ucitaj Wii Sistem Meni (%d %c)" @@ -3165,7 +3169,7 @@ msgid "" " %016llx%016llx != %016llx%016llx" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "" @@ -3200,7 +3204,7 @@ msgstr "" msgid "Memcard already opened" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "&Memorija" @@ -3216,7 +3220,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3248,7 +3252,7 @@ msgstr "" msgid "Misc" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "" @@ -3269,11 +3273,11 @@ msgstr "" msgid "Monospaced font" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "" @@ -3299,11 +3303,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3430,7 +3434,7 @@ msgstr "" msgid "No Country (SDK)" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "" @@ -3439,8 +3443,8 @@ msgstr "" msgid "No banner file found for title %s" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3448,7 +3452,7 @@ msgstr "" msgid "No docking" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3456,7 +3460,7 @@ msgstr "" msgid "No free dir index entries" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "" @@ -3479,7 +3483,7 @@ msgid "Not Equal" msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "" @@ -3487,7 +3491,7 @@ msgstr "" msgid "Not connected" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "" @@ -3521,7 +3525,7 @@ msgstr "" msgid "Nunchuk Acceleration" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3552,11 +3556,11 @@ msgstr "" msgid "Open" msgstr "Otvori " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "" @@ -3586,7 +3590,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Opcije " @@ -3666,8 +3670,8 @@ msgstr "" msgid "Paths" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Pauza " @@ -3692,8 +3696,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Pokreni " @@ -3720,7 +3724,7 @@ msgstr "Opcije " msgid "Players" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "" @@ -3736,19 +3740,19 @@ msgstr "" msgid "Polish" msgstr "Polski " -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "Port 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "Port 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "Port 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "Port 4" @@ -3769,17 +3773,17 @@ msgstr "" msgid "Post-Processing Effect:" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -3878,7 +3882,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "Pokreni snimanje " @@ -3931,7 +3935,7 @@ msgstr "" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "" @@ -3969,7 +3973,7 @@ msgstr "" msgid "Right Stick" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "" @@ -4049,7 +4053,7 @@ msgstr "Snimaj state..." msgid "Save as..." msgstr "Snimaj kao..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Snimaj kompresovani GCM/ISO" @@ -4057,11 +4061,11 @@ msgstr "Snimaj kompresovani GCM/ISO" msgid "Save current perspective" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "" @@ -4070,16 +4074,16 @@ msgstr "" msgid "Scaled EFB Copy" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "Skeniranje..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Skeniranje za ISO fajlove " -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Skeniranje..." @@ -4100,7 +4104,7 @@ msgstr "Trazi Chit" msgid "Search Filter" msgstr "Trazi Filter" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Trazi Subfoldere " @@ -4124,11 +4128,11 @@ msgid "Select" msgstr "Izaberi " #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Izaberi Snimani fajl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje " @@ -4155,15 +4159,15 @@ msgstr "" msgid "Select the file to load" msgstr "Izaberi fajl za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Izaberi \"snimani fajl/the save state\"" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Izaberi state za ucitavanje " -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Izaberi state za snimanje/save" @@ -4231,7 +4235,7 @@ msgstr "" msgid "Set" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "" @@ -4259,7 +4263,7 @@ msgstr "" msgid "SetupWiiMem: Cant find setting file" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "" @@ -4425,7 +4429,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "" @@ -4433,15 +4437,19 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Velicina" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "Preskoci GC BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "" @@ -4474,11 +4482,11 @@ msgstr "" msgid "Slot %i" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "" @@ -4498,7 +4506,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "" @@ -4569,7 +4577,7 @@ msgstr "Pokreni Sni&manje" msgid "Start Recording" msgstr "Pokreni Snimanje" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "" @@ -4624,12 +4632,12 @@ msgstr "" msgid "Successfully imported save files" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "" @@ -4699,13 +4707,13 @@ msgstr "" msgid "The checksum was successfully fixed" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4784,7 +4792,7 @@ msgstr "" msgid "The value is invalid" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 msgid "Theme:" msgstr "" @@ -4813,7 +4821,8 @@ msgstr "" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -4838,12 +4847,12 @@ msgstr "" msgid "Threshold" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "" @@ -4905,7 +4914,7 @@ msgstr "" msgid "UDP Port:" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "" @@ -4914,7 +4923,7 @@ msgstr "" msgid "UNKNOWN" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "(NEPOZNAT/O)" @@ -4946,7 +4955,7 @@ msgstr "" msgid "Undo Load State" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -4984,11 +4993,11 @@ msgstr "" msgid "Update" msgstr "Updejt " -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "" @@ -5054,7 +5063,7 @@ msgstr "Video " msgid "Virtual" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Jacina zvuka " @@ -5116,7 +5125,7 @@ msgstr "" "koji imaju isto ime kao i fajlovi na vasoj memoriskoj kartici\n" " Nastavi?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5124,7 +5133,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5132,7 +5141,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5164,7 +5173,7 @@ msgstr "" msgid "Widescreen Hack" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "" @@ -5176,7 +5185,7 @@ msgstr "" msgid "Wii Console" msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "" @@ -5184,7 +5193,7 @@ msgstr "" msgid "Wii Save Import" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "" @@ -5244,10 +5253,10 @@ msgstr "" msgid "Word Wrap" msgstr "" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Radi..." @@ -5282,7 +5291,7 @@ msgstr "" msgid "XAudio2 master voice creation failed: %#X" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5316,7 +5325,7 @@ msgstr "" msgid "You must enter a valid profile name." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "" @@ -5388,7 +5397,7 @@ msgstr "" msgid "^ ADD" msgstr "^ DODAJ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "" @@ -5415,7 +5424,7 @@ msgstr "" msgid "not a wii save or read failure for file header size %x" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5424,7 +5433,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "" diff --git a/Languages/po/tr.po b/Languages/po/tr.po index c5246e410b..15643f38d3 100644 --- a/Languages/po/tr.po +++ b/Languages/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: nlgzrgn \n" "Language-Team: nlgzrgn \n" @@ -48,7 +48,7 @@ msgstr "" "\"%s\" hatalı bir GCM veya ISO dosyası, veya herhangi bir GC veya Wii kalıbı " "deÄŸil." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "%08X: " @@ -180,11 +180,11 @@ msgstr "Hile Yöneti&cisi" msgid "&DSP Settings" msgstr "Ses Ayarları (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "Kalıbı Sil... (&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "Seçilen Kalıpları Sil... (&D)" @@ -248,7 +248,7 @@ msgstr "Duraklat (&P)" msgid "&Play" msgstr "Oynat (&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "Özellikler (&P)" @@ -292,11 +292,11 @@ msgstr "Görünüm (&V)" msgid "&Wiimote Settings" msgstr "&Wiimote Ayarları" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "'" @@ -316,7 +316,7 @@ msgstr "(BÄ°LÄ°NMEYEN)" msgid "(off)" msgstr "(kapalı)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "0x44" @@ -357,7 +357,7 @@ msgstr "" msgid "" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "A" @@ -554,11 +554,11 @@ msgstr "Dönüştürücü:" msgid "Add" msgstr "Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "Action Replay Kodu Ekle" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "Yama Ekle" @@ -568,7 +568,7 @@ msgstr "Bölme ekle" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "Ekle..." @@ -631,25 +631,25 @@ msgstr "GeliÅŸmiÅŸ Ayarlar" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "Tüm GC/Wii dosyaları (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "Tüm GC/Wii kalıpları (gcm, iso, wbfs, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "Tüm GameCube GCM Dosyaları (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "Tüm Kayıtlı Oyunlar (sav,s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "Tüm Wii kalıpları (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "Tüm sıkıştırılan GC/Wii kalıpları (gcz)" @@ -660,8 +660,8 @@ msgstr "Tüm dosyalar (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "" @@ -678,6 +678,10 @@ msgstr "Alternatif Wiimote Zamanlaması" msgid "Analyze" msgstr "Analiz et" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "Filtreleme:" @@ -694,7 +698,7 @@ msgstr "Apploader boyutu yanlış. Bu gerçekten bir apploader mı?" msgid "Apploader unable to load from file" msgstr "Apploader dosyadan yüklenemiyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "Apploader:" @@ -721,7 +725,7 @@ msgstr "Arapça" msgid "Are you sure you want to delete \"%s\"?" msgstr "\"%s\" dosyasını silmek istiyor musunuz?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -729,13 +733,13 @@ msgstr "" "Bu dosyaları gerçekten silmek istiyor musunuz?\n" "Silindikten sonra bu dosyaları geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "" "Bu dosyayı gerçekten silmek istiyor musunuz? Silindikten sonra bu dosyaları " "geri döndüremezsiniz!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "En-boy Oranı:" @@ -749,7 +753,7 @@ msgstr "En az bir bölme açık kalmalıdır." msgid "Audio" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "Ses Çözücüsü:" @@ -784,11 +788,11 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "B" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 msgid "BP register " msgstr "BP kaydı" @@ -796,7 +800,7 @@ msgstr "BP kaydı" msgid "Back" msgstr "Geri" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "Çözücü Ayarları" @@ -805,7 +809,7 @@ msgstr "Çözücü Ayarları" msgid "Backend:" msgstr "Çözücü:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "Arkaplanda GiriÅŸ" @@ -819,7 +823,7 @@ msgid "Bad File Header" msgstr "Kötü Dosya Başı" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "AfiÅŸ" @@ -885,7 +889,7 @@ msgstr "Bozuk" msgid "Browse" msgstr "Gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "Eklemek için bir klasöre gözat" @@ -893,7 +897,7 @@ msgstr "Eklemek için bir klasöre gözat" msgid "Browse for an ISO directory..." msgstr "Bir kalıp konumu için gözat..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "Çıkış klasörü için gözat" @@ -907,7 +911,13 @@ msgstr "Tampon:" msgid "Buttons" msgstr "Düğmeler" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "C" @@ -919,7 +929,7 @@ msgstr "C ÇubuÄŸu" msgid "C-Stick" msgstr "C ÇubuÄŸu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "CP kaydı" @@ -962,7 +972,7 @@ msgstr "%s açılamadı." msgid "Cannot unregister events with events pending" msgstr "Bekleyen olaylardan dolayı olaylar kayıttan kaldırılamıyor." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -973,7 +983,7 @@ msgstr "" "%s\n" "Geçerli bir Gamecube hafıza kartı dosyası deÄŸil." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -1004,7 +1014,7 @@ msgstr "Büyük Harf Kilidi" msgid "Catalan" msgstr "Katalanca" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Merkez" @@ -1078,23 +1088,23 @@ msgstr "Çince (Basit)" msgid "Chinese (Traditional)" msgstr "Çince (Geleneksel)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "DVD kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 msgid "Choose a NAND root directory:" msgstr "NAND kök dizinini seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "Varsayılan kalıbı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "Eklemek için bir konum seçin" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "Açmak için bir dosya seçin" @@ -1102,7 +1112,7 @@ msgstr "Açmak için bir dosya seçin" msgid "Choose a memory card:" msgstr "Bir hafıza kartı seçin:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1169,16 +1179,16 @@ msgstr "Yorum" msgid "Comment:" msgstr "Yorum:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "Kalıbı sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "Seçili kalıpları sıkıştır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "Kalıp sıkıştırılıyor..." @@ -1205,9 +1215,9 @@ msgstr "Kolları Yapılandır" msgid "Configure..." msgstr "Yapılandır..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "Dosyanın Ãœzerine Yazmaya Ä°zin Ver" @@ -1220,7 +1230,7 @@ msgstr "Durdurma Onayı Ä°ste" msgid "Connect" msgstr "BaÄŸlan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "USB Klavye BaÄŸla" @@ -1265,7 +1275,7 @@ msgstr "Denetim" msgid "Convert to GCI" msgstr "GCI'ya dönüştür" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "Kopyalama baÅŸarısız." @@ -1329,11 +1339,11 @@ msgstr "" "\n" "Dolphin'i bir CD/DVD'den çalıştırıyorsunuz veya kayıt dosyası yazma korumalı." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Uzantı 'ini' için açma komutu bulunamadı." -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1408,7 +1418,7 @@ msgstr "Bazı ortografik projeksiyon parametrelerini özelleÅŸtir." msgid "Czech" msgstr "Çekçe" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "D" @@ -1420,7 +1430,7 @@ msgstr "Yön TuÅŸları" msgid "DSP" msgstr "Ses" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "Ses Emülatörü Motoru" @@ -1433,7 +1443,7 @@ msgstr "DSP HLE Emülasyonu (Hızlı)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE Yorumlayıcı (Çok YavaÅŸ)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 msgid "DSP LLE on Thread" msgstr "Ä°ÅŸlem Birimi Ãœzerinde DSP LLE" @@ -1445,7 +1455,7 @@ msgstr "DSP LLE Yeniden Derleyici" msgid "DSP settings" msgstr "Ses ayarları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD Kök Dizini:" @@ -1490,16 +1500,16 @@ msgstr "Hata ayıklama" msgid "Decimal" msgstr "Onluk taban" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "Kalıbı geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "Seçili kalıpları geniÅŸlet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "Kalıp geniÅŸletiliyor..." @@ -1507,7 +1517,7 @@ msgstr "Kalıp geniÅŸletiliyor..." msgid "Default" msgstr "Varsayılan" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "Varsayılan kalıp:" @@ -1550,8 +1560,8 @@ msgstr "" msgid "Device" msgstr "Sürücü" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "Sürücü Ayarları" @@ -1641,11 +1651,11 @@ msgstr "" msgid "Divide" msgstr "Böl" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "Emülasyonu durdurmak istiyor musunuz?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1674,12 +1684,12 @@ msgstr "Dolphin Taklit Wiimote Yapılandırması" msgid "Dolphin FIFO" msgstr "Dolphin FIFO" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC Kolu Yapılandırması" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS Filmleri (*.dtm)" @@ -1691,7 +1701,7 @@ msgstr "Dolphin Wiimote Yapılandırması" msgid "Dolphin at &Google Code" msgstr "&Google Code'da Dolphin" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." @@ -1699,7 +1709,7 @@ msgstr "" "Dolphin herhangi bir GC veya Wii kalıbı bulamadı. Buraya çift tıklatarak " "dosyalara göz atabilirsiniz..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." @@ -1707,8 +1717,8 @@ msgstr "" "Dolphin ÅŸu anda oyunları gizlemeye ayarlıdır. Buraya çift tıklatarak tüm " "oyunları görebilirsiniz." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1734,7 +1744,7 @@ msgstr "Davullar" msgid "Dummy" msgstr "Kukla" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "Sesi Dök" @@ -1914,10 +1924,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "AR GeçmiÅŸine Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "BAT'a Ä°zin Ver" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "Blok BirleÅŸimine Ä°zin Ver" @@ -1962,7 +1968,7 @@ msgstr "MMU'ya Ä°zin Ver" msgid "Enable Progressive Scan" msgstr "Progresif Taramaya Ä°zin Ver" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 msgid "Enable Screen Saver" msgstr "Ekran Koruyucusuna Ä°zin Ver" @@ -2034,16 +2040,6 @@ msgstr "" "The Legend of Zelda: Twilight Princess oyununu hızlandırır. DiÄŸer tüm " "oyunlarda iptal edin." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ãœnitesi " -"iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " -"Kapalı = Hızlı)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "Özel Gösterim Hilesini EtkinleÅŸtirir" @@ -2130,7 +2126,7 @@ msgstr "EÅŸit" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "Hata" @@ -2194,7 +2190,7 @@ msgstr "Çekimi Ver..." msgid "Export Save" msgstr "Kaydı Ver" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "Wii Kayıtlı Oyununu Ver (Deneme Amaçlı)" @@ -2210,7 +2206,7 @@ msgstr "Verme baÅŸarısız, tekrar dene?" msgid "Export save as..." msgstr "Kaydı farklı ver..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "Uzantı" @@ -2267,7 +2263,7 @@ msgstr "Konum GeniÅŸletiliyor" msgid "Extracting..." msgstr "GeniÅŸletiliyor..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "FIFO Bayt'ı" @@ -2331,6 +2327,11 @@ msgstr "bthprops.cpl yüklenemedi." msgid "Failed to load hid.dll" msgstr "hid.dll yükleme baÅŸarısız." +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "%s için baÅŸlık yazılamadı." + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "banner.bin okunamadı." @@ -2421,11 +2422,11 @@ msgstr "Farsça" msgid "Fast" msgstr "Hızlı" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU'nun hızlı sürümü. Her oyunda çalışmaz." -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2483,7 +2484,7 @@ msgstr "FileIO: Bilinmeyen açma modu : 0x%02x" msgid "Filesystem" msgstr "Dosya sistemi" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "Dosya türü 'ini' bilinmiyor! Açılmayacaktır!" @@ -2565,17 +2566,17 @@ msgstr "" msgid "Forward" msgstr "Ä°leri" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "Bunun için %d sonuçlarını bul: '" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 msgid "Frame" msgstr "Çerçeve" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 msgid "Frame " msgstr "Çerçeve" @@ -2647,7 +2648,7 @@ msgstr "GCMic Yapılandırması" msgid "GCPad" msgstr "GC Kolu" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "GX_CMD_INVL_VC" @@ -2688,7 +2689,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube Kolu Ayarları (&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "GameCube Hafıza Kartları (*.raw,*.gcp)" @@ -2800,7 +2801,7 @@ msgstr "BaÅŸlık saÄŸlama hatası" msgid "Hebrew" msgstr "Ä°branice" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "Yükseklik" @@ -2824,7 +2825,7 @@ msgstr "" "\n" "Sayanora!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "Gizle" @@ -2891,11 +2892,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - kötü durak" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL Ayarları" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "Kızılötesi" @@ -2911,7 +2912,7 @@ msgstr "Kızılötesi Hassasiyeti:" msgid "ISO Details" msgstr "Kalıp Ayrıntıları" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "Kalıp Konumları" @@ -3049,7 +3050,7 @@ msgstr "Ekle" msgid "Insert Encrypted or Decrypted code here..." msgstr "Åžifreli veya ÅŸifresiz kodu buraya ekleyin..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "SD Kart Ekle" @@ -3061,7 +3062,7 @@ msgstr "Adı buraya yazın..." msgid "Install WAD" msgstr "WAD Kur" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "Wii Menüsüne kur" @@ -3072,7 +3073,7 @@ msgstr "" "Kurulum Özel Durum Ä°ÅŸleyici çaÄŸrıldı, ama bu platform henüz bunu " "desteklemiyor." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "WAD kuruluyor..." @@ -3101,7 +3102,7 @@ msgstr "" msgid "Interface" msgstr "Arabirim" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "Arabirim Ayarları" @@ -3183,7 +3184,7 @@ msgstr "Geçersiz arama dizesi (sayıya dönüştürülemedi)" msgid "Invalid search string (only even string lengths supported)" msgstr "Geçersiz arama dizesi (sadece düz dize uzunluÄŸu destekleniyor)" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Hatalı durum" @@ -3265,7 +3266,7 @@ msgstr "Son Ãœzerine Yazılan Durum" msgid "Last Saved State" msgstr "Son Kayıtlı Durum" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3365,11 +3366,11 @@ msgstr "Durumu Yükle : 8" msgid "Load State..." msgstr "Durumu Yükle..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 msgid "Load Wii System Menu" msgstr "Wii Sistem Menüsünü Yükle" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "Wii Sistem Menüsünü Yükle %d%c" @@ -3447,7 +3448,7 @@ msgstr "" "MD5 eÅŸleÅŸmiyor\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU Hız Hilesi" @@ -3482,7 +3483,7 @@ msgstr "Hafıza kartı bu baÅŸlık için zaten bir kayda sahip. " msgid "Memcard already opened" msgstr "Hafıza kartı zaten açık" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 msgid "Memory Byte" msgstr "Hafıza Baytı" @@ -3499,7 +3500,7 @@ msgstr "" "Hafıza Kartı Yöneticisi Uyarısı-Kullanmadan önce yedekleme yapın, " "düzeltilmiÅŸ olması gerekiyor ama bozuk ÅŸeyler olabilir." -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3537,7 +3538,7 @@ msgstr "En az" msgid "Misc" msgstr "ÇeÅŸitli" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "ÇeÅŸitli Ayarlar" @@ -3562,11 +3563,11 @@ msgstr "" msgid "Monospaced font" msgstr "BoÅŸluklu yazı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "Motor" @@ -3601,11 +3602,11 @@ msgstr "" "WiiMote hoparlörünün sesini kapatır. Gerçek WiiMote'lardaki rastgele " "baÄŸlantı kesilmelerini önler. Taklit WiiMote'ları etkilemez." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "NOP" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "NOT: Yayın boyutu asıl veri boyutuyla eÅŸleÅŸmiyor.\n" @@ -3732,7 +3733,7 @@ msgstr "Takma Ad :" msgid "No Country (SDK)" msgstr "Ãœlke Yok (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "Kalıp bulunamadı" @@ -3741,8 +3742,8 @@ msgstr "Kalıp bulunamadı" msgid "No banner file found for title %s" msgstr "BaÅŸlık %s için afiÅŸ dosyası bulunamadı" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "Açıklama yok" @@ -3750,7 +3751,7 @@ msgstr "Açıklama yok" msgid "No docking" msgstr "YerleÅŸtirme yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "Dosya Yüklenmedi" @@ -3758,7 +3759,7 @@ msgstr "Dosya Yüklenmedi" msgid "No free dir index entries" msgstr "BoÅŸ dizin indeks giriÅŸi yok" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 msgid "No recorded file" msgstr "ÇekilmiÅŸ Dosya Yok" @@ -3781,7 +3782,7 @@ msgid "Not Equal" msgstr "EÅŸit DeÄŸil" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "Ayarlanmamış" @@ -3789,7 +3790,7 @@ msgstr "Ayarlanmamış" msgid "Not connected" msgstr "BaÄŸlı deÄŸil" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "Notlar" @@ -3823,7 +3824,7 @@ msgstr "Nunchuck" msgid "Nunchuk Acceleration" msgstr "Nunchuck Hızlandırma" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "Nesne" @@ -3854,11 +3855,11 @@ msgstr "Sadece %d blok kullanılabilir" msgid "Open" msgstr "Aç" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "Dosya konumunu aç (&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "Wii kayıt kla&sörünü aç" @@ -3888,7 +3889,7 @@ msgstr "OpenCL Doku Çözücü" msgid "OpenMP Texture Decoder" msgstr "OpenMP Doku Çözücü" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "Seçenekler" @@ -3973,8 +3974,8 @@ msgstr "Yamalar" msgid "Paths" msgstr "Yollar" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "Duraklat" @@ -3998,8 +3999,8 @@ msgstr "Perspektif %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "Oynat" @@ -4025,7 +4026,7 @@ msgstr "Oynatma Seçenekleri" msgid "Players" msgstr "Oyuncular" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "Lütfen onaylayın..." @@ -4041,19 +4042,19 @@ msgstr "Artı-Eksi" msgid "Polish" msgstr "Lehçe" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "BaÄŸ. Nok. 1:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "BaÄŸ. Nok. 2:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "BaÄŸ. Nok. 3:" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "BaÄŸ. Nok. 4:" @@ -4074,17 +4075,17 @@ msgstr "Portekizce (Brezilya)" msgid "Post-Processing Effect:" msgstr "Geç Ä°ÅŸleme Etkisi:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "PlayController'da erken kayıt bitiÅŸi. %u + 8 > %u" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u + %d > %u" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "PlayWiimote'da erken kayıt bitiÅŸi. %u > %u" @@ -4183,7 +4184,7 @@ msgstr "Durum yüklemesinde Wiimote'u yeniden baÄŸla" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 msgid "Record" msgstr "Çek" @@ -4239,7 +4240,7 @@ msgstr "Oyun Listesini Yenile" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "Kaldır" @@ -4280,7 +4281,7 @@ msgstr "SaÄŸ" msgid "Right Stick" msgstr "SaÄŸ Çubuk" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "Gümbürtü" @@ -4360,7 +4361,7 @@ msgstr "Durumu Kaydet..." msgid "Save as..." msgstr "Farklı kaydet..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "Sıkıştırılan GCM/ISO'yu kaydet" @@ -4368,11 +4369,11 @@ msgstr "Sıkıştırılan GCM/ISO'yu kaydet" msgid "Save current perspective" msgstr "Åžu anki perspektifi kaydet" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "GeniÅŸletilen GCM/ISO'yu kaydet" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." @@ -4381,16 +4382,16 @@ msgstr "Kayıtlı durum filmi %s bozuk, film çekimi duruyor..." msgid "Scaled EFB Copy" msgstr "Boyutlandırılmış EFB Kopyası" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, c-format msgid "Scanning %s" msgstr "Taranıyor %s" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "Kalıplar taranıyor" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "Taranıyor..." @@ -4410,7 +4411,7 @@ msgstr "Ara" msgid "Search Filter" msgstr "Arama Filtresi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "Alt Klasörleri Ara" @@ -4434,11 +4435,11 @@ msgid "Select" msgstr "Seç" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "Çekim Dosyasını Seç" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "Kurmak için bir Wii WAD dosyası seçin" @@ -4464,15 +4465,15 @@ msgstr "Sabit olmayan pencereyi seçin" msgid "Select the file to load" msgstr "Yüklemek için dosyayı seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "Kayıt dosyasını seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "Yüklemek için durum seçin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "Kaydetmek için durum seçin" @@ -4561,7 +4562,7 @@ msgstr "" msgid "Set" msgstr "Ayarla" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "Varsayılan Kalıp Olarak Ayarla (&D)" @@ -4589,7 +4590,7 @@ msgstr "Ayarlar..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem: Ayar dosyası bulunamadı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "Sallama" @@ -4765,7 +4766,7 @@ msgstr "" "\n" "Emin deÄŸilseniz, iÅŸaretsiz bırakın." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Yatay Wiimote" @@ -4773,14 +4774,18 @@ msgstr "Yatay Wiimote" msgid "Simplified Chinese" msgstr "BasitleÅŸtirilmiÅŸ Çince" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "Boyut" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 msgid "Skip BIOS" msgstr "BIOS'u Geç" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 msgid "Skip Dest. Alpha Pass" msgstr "Hedef Alpha GeçiÅŸini Atla" @@ -4821,11 +4826,11 @@ msgstr "" msgid "Slot %i" msgstr "Slot %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "Slot A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "Slot B" @@ -4849,7 +4854,7 @@ msgstr "" "Yazılım yorumlamasını açmayı gerçekten istiyor musunuz? Emin deÄŸilseniz, " "'Hayır' seçin." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "Ses Ayarları" @@ -4928,7 +4933,7 @@ msgstr "Çekimi BaÅŸlat (&C)" msgid "Start Recording" msgstr "Çekimi BaÅŸlat" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "Durum" @@ -4988,12 +4993,12 @@ msgstr "Dosya %s 'ye baÅŸarıyla verildi" msgid "Successfully imported save files" msgstr "Kayıt dosyaları baÅŸarıyla alındı" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Hareket" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "Sistem Dili:" @@ -5061,13 +5066,13 @@ msgstr "Adres geçersiz" msgid "The checksum was successfully fixed" msgstr "SaÄŸlama baÅŸarıyla düzeltildi" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "Seçilen konum zaten listede" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -5156,7 +5161,7 @@ msgstr "Belirtilen dosya \"%s\" bulunamadı" msgid "The value is invalid" msgstr "DeÄŸer hatalı" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "Tema" @@ -5189,9 +5194,11 @@ msgid "This could cause slow down in Wii Menu and some games." msgstr "Bu Wii Menüsünde ve bazı oyunlarda yavaÅŸlamaya neden olabilir." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 +#, fuzzy msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5227,12 +5234,12 @@ msgstr "INI Yapılandırma dosyasını elle düzenlemeye izin verir." msgid "Threshold" msgstr "EÅŸik" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "EÄŸim" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "BaÅŸlık" @@ -5296,7 +5303,7 @@ msgstr "Tür" msgid "UDP Port:" msgstr "UDP BaÄŸ.Nok.:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5305,7 +5312,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "BÄ°LÄ°NMEYEN" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, c-format msgid "UNKNOWN_%02X" msgstr "BÄ°LÄ°NMEYEN_%02X" @@ -5342,7 +5349,7 @@ msgstr "Belirsiz %i" msgid "Undo Load State" msgstr "Durum Yüklemeyi Geri Al" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "Beklenmedik 0x80 çaÄŸrısı? Çıkılıyor..." @@ -5380,11 +5387,11 @@ msgstr "Yukarı" msgid "Update" msgstr "Güncelle" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "Dik Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "EuRGB60 Modunu Kullan (PAL60)" @@ -5458,7 +5465,7 @@ msgstr "Görüntü" msgid "Virtual" msgstr "Sanal" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "Ses" @@ -5527,7 +5534,7 @@ msgstr "" "ve hafıza kartınızdaki dosyayla aynı adda olacak.\n" "Devam?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5539,7 +5546,7 @@ msgstr "" "veya bu kaydı Salt Okunur mod kapalıyken yüklemeniz daha iyi olacaktır. Aksi " "taktirde, büyük bir ihtimalle, senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5551,7 +5558,7 @@ msgstr "" "yüklemeniz daha iyi olacaktır. Aksi taktirde, büyük bir ihtimalle, " "senkronizasyon sorunu yaÅŸayacaksınız." -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5598,7 +5605,7 @@ msgstr "Darbe" msgid "Widescreen Hack" msgstr "GeniÅŸ Ekran Hilesi" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "GeniÅŸlik" @@ -5610,7 +5617,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii Konsolu" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 msgid "Wii NAND Root:" msgstr "Wii NAND Kök Dizini:" @@ -5618,7 +5625,7 @@ msgstr "Wii NAND Kök Dizini:" msgid "Wii Save Import" msgstr "Wii Kaydı Al" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii kayıt dosyaları (*.bin)|*.bin" @@ -5681,10 +5688,10 @@ msgstr "Pencereleri SaÄŸa Döşe" msgid "Word Wrap" msgstr "Heceleme" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "Çalışıyor..." @@ -5719,7 +5726,7 @@ msgstr "XAudio2 baÅŸlatılamadı: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 ana ses oluÅŸturulamadı: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "XF kaydı" @@ -5755,7 +5762,7 @@ msgstr "DoÄŸru bir sekizlik,onluk veya onaltılık deÄŸer girmelisiniz." msgid "You must enter a valid profile name." msgstr "Geçerli bir profil ismi girmelisiniz." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "DeÄŸiÅŸikliÄŸin etkili olması için Dolphin'i yeniden baÅŸlatmalısınız." @@ -5848,7 +5855,7 @@ msgstr "" msgid "^ ADD" msgstr "^ EKLE" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "apploader (.img)" @@ -5875,7 +5882,7 @@ msgstr "iCacheJIT: %x 'den iÅŸlem kodu okunuyor. Lütfen bildirin." msgid "not a wii save or read failure for file header size %x" msgstr "Bir Wii kaydı deÄŸil veya bu baÅŸlık boyutu için okuma hatası: %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "s" @@ -5884,7 +5891,7 @@ msgstr "s" msgid "unknown cmd 0x%08x" msgstr "Bilinmeyen komut 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute uygulama çalışırken -1'e düştü!" @@ -6183,6 +6190,9 @@ msgstr "| VEYA" #~ msgid "Enable Audio Throttle" #~ msgstr "Ses Hızlandırmasına Ä°zin Ver" +#~ msgid "Enable BAT" +#~ msgstr "BAT'a Ä°zin Ver" + #, fuzzy #~ msgid "Enable CPU Access" #~ msgstr "Ön BelleÄŸe Ä°zin Ver" @@ -6213,6 +6223,15 @@ msgstr "| VEYA" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "Ekran Koruyucusuna Ä°zin Ver" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Blok Adresi Çevirisi'ne (BAT) izin verir. Bu bir Hafıza Yönetim Ãœnitesi " +#~ "iÅŸlevidir. GerçekçiliÄŸi artırır ama performansı düşürür. (Açık = Uyumlu, " +#~ "Kapalı = Hızlı)" + #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" diff --git a/Languages/po/zh_CN.po b/Languages/po/zh_CN.po index 71d2206cdb..1bc46e4231 100644 --- a/Languages/po/zh_CN.po +++ b/Languages/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: thegfw \n" "Language-Team: \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ GCM/ISO 文件, 或者ä¸æ˜¯ä¸€ä¸ª GC/Wii é•œåƒ." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -174,11 +174,11 @@ msgstr "作弊ç ç®¡ç†å™¨(&C)" msgid "&DSP Settings" msgstr "音频设置(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "删除镜åƒ(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "删除所选镜åƒ(&D)" @@ -242,7 +242,7 @@ msgstr "æš‚åœæ¸¸æˆ(&P)" msgid "&Play" msgstr "开始游æˆ(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "属性(&P)" @@ -286,11 +286,11 @@ msgstr "视图(&V)" msgid "&Wiimote Settings" msgstr "&Wiimote 设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "百科(&W)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -310,7 +310,7 @@ msgstr "(未知)" msgid "(off)" msgstr "(å…³)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -351,7 +351,7 @@ msgstr "<按任æ„é”®>" msgid "" msgstr "<系统>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -537,11 +537,11 @@ msgstr "适é…器:" msgid "Add" msgstr "添加" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "添加动作回放代ç " -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "添加补ä¸" @@ -551,7 +551,7 @@ msgstr "添加新é¢æ¿" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "添加..." @@ -598,25 +598,25 @@ msgstr "高级设置" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 文件 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii é•œåƒ (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 文件 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "æ‰€æœ‰å­˜æ¡£çŠ¶æ€ (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "所有 Wii é•œåƒæ–‡ä»¶ (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有压缩的 GC/Wii é•œåƒæ–‡ä»¶ (gcz)" @@ -627,8 +627,8 @@ msgstr "所有文件 (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" @@ -642,6 +642,10 @@ msgstr "模拟 Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘异性过滤:" @@ -658,7 +662,7 @@ msgstr "应用程åºè½½å…¥å™¨å¤§å°é”™è¯¯...这真是一个应用程åºè½½å…¥å™¨ msgid "Apploader unable to load from file" msgstr "应用程åºè½½å…¥å™¨ä¸èƒ½ä»Žæ–‡ä»¶è½½å…¥" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "应用载入器:" @@ -682,7 +686,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "您确定è¦åˆ é™¤ \"%s\" ?" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -690,11 +694,11 @@ msgstr "" "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?\n" "这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "请确认真的è¦åˆ é™¤è¿™äº›æ–‡ä»¶?这将是永久性的删除!" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "高宽比:" @@ -708,7 +712,7 @@ msgstr "必须有一个窗å£ä¿æŒæ‰“å¼€" msgid "Audio" msgstr "音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "音频åŽç«¯:" @@ -743,11 +747,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "按模拟器显示输入读å–" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -756,7 +760,7 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "Back" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "åŽç«¯è®¾ç½®" @@ -766,7 +770,7 @@ msgstr "åŽç«¯è®¾ç½®" msgid "Backend:" msgstr "音频åŽç«¯:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "åŽå°è¾“å…¥" @@ -780,7 +784,7 @@ msgid "Bad File Header" msgstr "无效文件头" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "标志" @@ -846,7 +850,7 @@ msgstr "æŸå" msgid "Browse" msgstr "æµè§ˆ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "æµè§ˆè¦æ·»åŠ çš„目录" @@ -854,7 +858,7 @@ msgstr "æµè§ˆè¦æ·»åŠ çš„目录" msgid "Browse for an ISO directory..." msgstr "æµè§ˆé•œåƒç›®å½•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "æµè§ˆè¾“出目录" @@ -868,7 +872,13 @@ msgstr "缓冲区:" msgid "Buttons" msgstr "按键" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -881,7 +891,7 @@ msgstr "C-摇æ†" msgid "C-Stick" msgstr "C-摇æ†" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -919,7 +929,7 @@ msgstr "ä¸èƒ½æ‰“å¼€ %s" msgid "Cannot unregister events with events pending" msgstr "事件未决时ä¸èƒ½å注册事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -929,7 +939,7 @@ msgstr "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -960,7 +970,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "Center" @@ -1033,24 +1043,24 @@ msgstr "简体中文" msgid "Chinese (Traditional)" msgstr "ç¹ä½“中文" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "选择一个DVD根目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "选择一个默认镜åƒ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "选择一个è¦æ·»åŠ çš„目录" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "选择è¦æ‰“开的文件" @@ -1058,7 +1068,7 @@ msgstr "选择è¦æ‰“开的文件" msgid "Choose a memory card:" msgstr "选择一个内存å¡" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1125,16 +1135,16 @@ msgstr "注释" msgid "Comment:" msgstr "注释:" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "压缩镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "压缩镜åƒä¸­" @@ -1161,9 +1171,9 @@ msgstr "设置手柄" msgid "Configure..." msgstr "设置..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "确认文件覆盖" @@ -1177,7 +1187,7 @@ msgstr "åœæ­¢æ—¶ç¡®è®¤" msgid "Connect" msgstr "连接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "连接 USB 键盘" @@ -1222,7 +1232,7 @@ msgstr "控制" msgid "Convert to GCI" msgstr "转æ¢åˆ° GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "å¤åˆ¶å¤±è´¥" @@ -1286,11 +1296,11 @@ msgstr "" "\n" "您是ä¸æ˜¯åœ¨CD/DVD上è¿è¡Œçš„Dolphin?或者存档文件带有写入ä¿æŠ¤?" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "Couldn't find open command for extension 'ini'!" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1361,7 +1371,7 @@ msgstr "自定义一些正交投影å‚æ•°" msgid "Czech" msgstr "æ·å…‹è¯­" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1373,7 +1383,7 @@ msgstr "D-Pad" msgid "DSP" msgstr "DSP音频" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "音频模拟引擎" @@ -1386,7 +1396,7 @@ msgstr "音频 HLE 模拟(很快)" msgid "DSP LLE interpreter (slow)" msgstr "音频 LLE 解释(很慢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE 于线程" @@ -1399,7 +1409,7 @@ msgstr "音频 LLE é‡ç¼–译器" msgid "DSP settings" msgstr "音频设置" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD 根目录:" @@ -1445,16 +1455,16 @@ msgstr "调试" msgid "Decimal" msgstr "å进制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "解压缩镜åƒä¸­..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "解压缩所选镜åƒ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "解压缩镜åƒä¸­" @@ -1462,7 +1472,7 @@ msgstr "解压缩镜åƒä¸­" msgid "Default" msgstr "默认" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "默认镜åƒ:" @@ -1507,8 +1517,8 @@ msgstr "" msgid "Device" msgstr "设备" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "设备设置" @@ -1586,11 +1596,11 @@ msgstr "按模拟器显示输入读å–" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "您确定是å¦åœæ­¢å½“å‰æ¨¡æ‹Ÿ?" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1620,12 +1630,12 @@ msgstr "Dolphin 模拟 Wiimote 设置" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 手柄设置" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 电影 (*.dtm)" @@ -1637,20 +1647,20 @@ msgstr "Dolphin Wiimote é…ç½®" msgid "Dolphin at &Google Code" msgstr "Dolphin 于 &Google Code" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin ä¸èƒ½æ‰¾åˆ°ä»»ä½• GC/Wii é•œåƒ. åŒå‡»è¿™é‡Œæµè§ˆæ–‡ä»¶..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin 当å‰è®¾ç½®äº†éšè—所有游æˆ. åŒå‡»è¿™é‡Œæ˜¾ç¤ºæ‰€æœ‰æ¸¸æˆ..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1676,7 +1686,7 @@ msgstr "鼓" msgid "Dummy" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "转储音频" @@ -1832,10 +1842,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "å¯ç”¨åŠ¨ä½œå›žæ”¾è®°å½•" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "å¯ç”¨ BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "å¯ç”¨åŒºå—åˆå¹¶" @@ -1881,7 +1887,7 @@ msgstr "å¯ç”¨ MMU" msgid "Enable Progressive Scan" msgstr "å¯ç”¨é€è¡Œæ‰«æ" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "å¯ç”¨å®½å±" @@ -1940,16 +1946,6 @@ msgstr "" "Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for " "ANY other game." -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "å¯ç”¨è‡ªå®šä¹‰æŠ•å½±ä¿®æ­£" @@ -2027,7 +2023,7 @@ msgstr "等于" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "错误" @@ -2089,7 +2085,7 @@ msgstr "导出录制..." msgid "Export Save" msgstr "导出存档" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "导出 Wii 存档 (实验性)" @@ -2105,7 +2101,7 @@ msgstr "导出失败,需è¦é‡è¯•å—?" msgid "Export save as..." msgstr "导出存档为..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "扩展" @@ -2163,7 +2159,7 @@ msgstr "解压缩目录中" msgid "Extracting..." msgstr "解压缩中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2221,6 +2217,11 @@ msgstr "ä¸èƒ½è½½å…¥ hid.dll" msgid "Failed to load hid.dll" msgstr "ä¸èƒ½è½½å…¥ hid.dll" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "写入文件头到 %s 失败" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "è¯»å– banner.bin 失败" @@ -2311,11 +2312,11 @@ msgstr "" msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "MMU 快速版本. 任何游æˆéƒ½ä¸èƒ½å·¥ä½œ" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2373,7 +2374,7 @@ msgstr "FileIO: æœªçŸ¥æ‰“å¼€æ¨¡å¼ : 0x%02x" msgid "Filesystem" msgstr "文件系统" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "文件类型 'ini' 未知! ä¸èƒ½æ‰“å¼€!" @@ -2453,18 +2454,18 @@ msgstr "" msgid "Forward" msgstr "Forward" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "转储框架" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "Frame Advance" @@ -2542,7 +2543,7 @@ msgstr "记录设置" msgid "GCPad" msgstr "手柄" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2583,7 +2584,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 手柄设置(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube å†…å­˜å¡ (*.raw,*.gcp)" @@ -2689,7 +2690,7 @@ msgstr "头部校检失败" msgid "Hebrew" msgstr "希伯æ¥è¯­" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "高度" @@ -2713,7 +2714,7 @@ msgstr "" "\n" "æ€å‘¦å•¦å•¦(å†è§)!\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éšè—" @@ -2778,11 +2779,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - bad destination" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 设置" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "红外线" @@ -2798,7 +2799,7 @@ msgstr "红外çµæ•åº¦:" msgid "ISO Details" msgstr "é•œåƒè¯¦ç»†ä¿¡æ¯" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "é•œåƒç›®å½•" @@ -2923,7 +2924,7 @@ msgstr "æ’å…¥" msgid "Insert Encrypted or Decrypted code here..." msgstr "在这里æ’入加密的或者解密的代ç ..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "æ’å…¥SDå¡" @@ -2936,7 +2937,7 @@ msgstr "在这里æ’å…¥å称..." msgid "Install WAD" msgstr "安装 Wii èœå•" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "安装到Wiièœå•" @@ -2946,7 +2947,7 @@ msgid "" msgstr "" "InstallExceptionHandler called, but this platform does not yet support it." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 #, fuzzy msgid "Installing WAD..." msgstr "安装 WAD 到 Wii èœå•ä¸­..." @@ -2975,7 +2976,7 @@ msgstr "" msgid "Interface" msgstr "ç•Œé¢è®¾ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ç•Œé¢è®¾ç½®" @@ -3058,7 +3059,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "Invalid state" @@ -3138,7 +3139,7 @@ msgstr "最åŽè¦†ç›–状æ€" msgid "Last Saved State" msgstr "最åŽä¿å­˜çŠ¶æ€" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3239,12 +3240,12 @@ msgstr "载入存档æ’槽 8" msgid "Load State..." msgstr "载入状æ€..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "载入 Wii 系统èœå•(%d %c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, fuzzy, c-format msgid "Load Wii System Menu %d%c" msgstr "载入 Wii 系统èœå•(%d %c)" @@ -3315,7 +3316,7 @@ msgstr "" "MD5 ä¸åŒ¹é…\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 速度破解" @@ -3350,7 +3351,7 @@ msgstr "Memcard already has a save for this title" msgid "Memcard already opened" msgstr "内存å¡å·²ç»æ‰“å¼€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "内存(&M)" @@ -3366,7 +3367,7 @@ msgid "" "could mangle stuff!" msgstr "" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3405,7 +3406,7 @@ msgstr "Mic" msgid "Misc" msgstr "其它" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "其它设置" @@ -3426,11 +3427,11 @@ msgstr "" msgid "Monospaced font" msgstr "等宽字体" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "马达" @@ -3456,11 +3457,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3587,7 +3588,7 @@ msgstr "昵称 :" msgid "No Country (SDK)" msgstr "无国家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "未找到镜åƒæˆ–者WAD" @@ -3596,8 +3597,8 @@ msgstr "未找到镜åƒæˆ–者WAD" msgid "No banner file found for title %s" msgstr "没有找到标题为 %s 的标志文件" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3605,7 +3606,7 @@ msgstr "" msgid "No docking" msgstr "No docking" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3613,7 +3614,7 @@ msgstr "" msgid "No free dir index entries" msgstr "没有空闲目录索引项目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "无效录制文件" @@ -3637,7 +3638,7 @@ msgid "Not Equal" msgstr "ä¸ç­‰äºŽ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未设置" @@ -3645,7 +3646,7 @@ msgstr "未设置" msgid "Not connected" msgstr "未连接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "说明" @@ -3679,7 +3680,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3710,11 +3711,11 @@ msgstr "åªæœ‰ %d 区å—有效" msgid "Open" msgstr "打开" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "打开包å«æ–‡ä»¶å¤¹(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "打开 Wii 存档目录(&S)" @@ -3744,7 +3745,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "选项" @@ -3829,8 +3830,8 @@ msgstr "è¡¥ä¸" msgid "Paths" msgstr "路径" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš‚åœ" @@ -3855,8 +3856,8 @@ msgstr "Perspective %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "开始" @@ -3883,7 +3884,7 @@ msgstr "选项" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "请确认..." @@ -3899,19 +3900,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "波兰语" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "ç«¯å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "ç«¯å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "ç«¯å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "ç«¯å£ 4" @@ -3933,17 +3934,17 @@ msgstr "è‘¡è„牙语(巴西)" msgid "Post-Processing Effect:" msgstr "Post-Processing Shader:" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4044,7 +4045,7 @@ msgstr "Reconnect Wiimote On Load State" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "播放录制" @@ -4101,7 +4102,7 @@ msgstr "刷新游æˆåˆ—表" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "移除" @@ -4142,7 +4143,7 @@ msgstr "å³" msgid "Right Stick" msgstr "å³æ‘‡æ†" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震动" @@ -4222,7 +4223,7 @@ msgstr "ä¿å­˜çŠ¶æ€..." msgid "Save as..." msgstr "å¦å­˜ä¸º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" @@ -4230,11 +4231,11 @@ msgstr "ä¿å­˜åŽ‹ç¼©çš„GCM/é•œåƒ" msgid "Save current perspective" msgstr "ä¿å­˜å½“å‰è§†è§’" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "ä¿å­˜è§£åŽ‹ç¼©çš„GCM/é•œåƒ" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "Savestate movie %s is corrupted, movie recording stopping..." @@ -4244,16 +4245,16 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..." msgid "Scaled EFB Copy" msgstr "EFB 比例å¤åˆ¶" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "扫æ中..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "扫æé•œåƒä¸­" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "扫æ中..." @@ -4274,7 +4275,7 @@ msgstr "作弊ç æœç´¢" msgid "Search Filter" msgstr "æœç´¢è¿‡æ»¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "æœç´¢å­ç›®å½•" @@ -4299,11 +4300,11 @@ msgid "Select" msgstr "选择" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "选择录制文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 #, fuzzy msgid "Select a Wii WAD file to install" msgstr "选择è¦å¯¼å…¥çš„存档" @@ -4330,15 +4331,15 @@ msgstr "选择浮动窗å£" msgid "Select the file to load" msgstr "选择è¦è½½å…¥çš„文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "选择一个存档文件" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "选择è¦è½½å…¥çš„状æ€" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "选择è¦ä¿å­˜çš„状æ€" @@ -4414,7 +4415,7 @@ msgstr "" msgid "Set" msgstr "设置" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "设置为默认镜åƒ(&D)" @@ -4442,7 +4443,7 @@ msgstr "设置..." msgid "SetupWiiMem: Cant find setting file" msgstr "安装Wii内存: ä¸èƒ½æ‰¾åˆ°è®¾ç½®æ–‡ä»¶" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "震动" @@ -4614,7 +4615,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "Sideways Wiimote" @@ -4622,15 +4623,19 @@ msgstr "Sideways Wiimote" msgid "Simplified Chinese" msgstr "简体中文" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "跳过 GC BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" @@ -4664,11 +4669,11 @@ msgstr "" msgid "Slot %i" msgstr "æ’槽 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "æ’槽 B" @@ -4688,7 +4693,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "声音设置" @@ -4759,7 +4764,7 @@ msgstr "开始录制(&C)" msgid "Start Recording" msgstr "开始录制" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "状æ€" @@ -4814,12 +4819,12 @@ msgstr "æˆåŠŸå¯¼å‡ºæ–‡ä»¶åˆ° %s" msgid "Successfully imported save files" msgstr "æˆåŠŸå¯¼å…¥å­˜æ¡£æ–‡ä»¶" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "Swing" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "系统语言" @@ -4890,13 +4895,13 @@ msgstr "地å€æ— æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校检和æˆåŠŸä¿®å¤" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "选择的目录已ç»å­˜åœ¨äºŽåˆ—表" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4981,7 +4986,7 @@ msgstr "指定的文件 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "这个值无效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "主题" @@ -5017,7 +5022,8 @@ msgstr "This could cause slow down in Wii Menu and some games." #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5046,12 +5052,12 @@ msgstr "This will let you Manually Edit the INI config file" msgid "Threshold" msgstr "闸值" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "Tilt" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "标题" @@ -5116,7 +5122,7 @@ msgstr "类型" msgid "UDP Port:" msgstr "UDP 端å£:" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5125,7 +5131,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5157,7 +5163,7 @@ msgstr "未定义的 %i" msgid "Undo Load State" msgstr "撤销载入状æ€" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5195,11 +5201,11 @@ msgstr "上" msgid "Update" msgstr "æ›´æ–°" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5265,7 +5271,7 @@ msgstr "视频" msgid "Virtual" msgstr "虚拟" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5330,7 +5336,7 @@ msgstr "" "and have the same name as a file on your memcard\n" "Continue?" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5338,7 +5344,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5346,7 +5352,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5378,7 +5384,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "宽å±ç ´è§£" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "宽度" @@ -5390,7 +5396,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii控制å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根目录:" @@ -5399,7 +5405,7 @@ msgstr "DVD 根目录:" msgid "Wii Save Import" msgstr "导入 Wii 存档" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存档文件 (*.bin)|*.bin" @@ -5463,10 +5469,10 @@ msgstr "窗å£å³ä¾§" msgid "Word Wrap" msgstr "自动æ¢è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "工作中..." @@ -5502,7 +5508,7 @@ msgstr "XAudio2 init failed: %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 master voice creation failed: %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5536,7 +5542,7 @@ msgstr "您必须输入一个å进制或者å六进制值." msgid "You must enter a valid profile name." msgstr "您必须输入一个有效的é…置文件å称." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5611,7 +5617,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 加" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "应用程åºè½½å…¥å™¨ (.img)" @@ -5638,7 +5644,7 @@ msgstr "iCacheJIT: Reading Opcode from %x. Please report." msgid "not a wii save or read failure for file header size %x" msgstr "not a wii save or read failure for file header size %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5647,7 +5653,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知命令 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute returned -1 on application run!" @@ -5881,6 +5887,9 @@ msgstr "| 或" #~ msgid "Enable Audio Throttle" #~ msgstr "å¯ç”¨éŸ³é¢‘调节" +#~ msgid "Enable BAT" +#~ msgstr "å¯ç”¨ BAT" + #~ msgid "Enable CPU Access" #~ msgstr "å¯ç”¨CPU访问" @@ -5908,6 +5917,15 @@ msgstr "| 或" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "å¯ç”¨å±å¹•ä¿æŠ¤(内部é™åˆ¶)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" + #, fuzzy #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" diff --git a/Languages/po/zh_TW.po b/Languages/po/zh_TW.po index a052a562a0..9e1f1bb04f 100644 --- a/Languages/po/zh_TW.po +++ b/Languages/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Dolphin Emu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-16 21:37-0600\n" +"POT-Creation-Date: 2013-02-01 21:43-0600\n" "PO-Revision-Date: 2013-01-16 21:41-0600\n" "Last-Translator: khiav \n" "Language-Team: khiav&yrbn \n" @@ -44,7 +44,7 @@ msgstr "" msgid "\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO." msgstr "\"%s\" 為無效的 GCM/ISO æª”æ¡ˆï¼Œæˆ–éž GC/Wii ISO。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:720 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:719 #, c-format msgid "%08X: " msgstr "" @@ -174,11 +174,11 @@ msgstr "作弊檔管ç†å™¨(&C)" msgid "&DSP Settings" msgstr "DSP 設定(&D)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:935 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:942 msgid "&Delete ISO..." msgstr "刪除 ISO 檔(&D)..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:953 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:960 msgid "&Delete selected ISOs..." msgstr "刪除已é¸å–çš„ ISO 檔(&D)..." @@ -242,7 +242,7 @@ msgstr "æš«åœ(&P)" msgid "&Play" msgstr "執行(&P)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:917 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 msgid "&Properties" msgstr "屬性(&P)" @@ -286,11 +286,11 @@ msgstr "檢視(&V)" msgid "&Wiimote Settings" msgstr "Wiimote 設定(&W)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:918 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:925 msgid "&Wiki" msgstr "&Wiki" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 msgid "'" msgstr "" @@ -310,7 +310,7 @@ msgstr "(未知)" msgid "(off)" msgstr "(關閉)" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:653 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:652 msgid "0x44" msgstr "" @@ -351,7 +351,7 @@ msgstr "<按任æ„éµ>" msgid "" msgstr "<系統>" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:693 msgid "A" msgstr "" @@ -537,11 +537,11 @@ msgstr "é…接器：" msgid "Add" msgstr "新增" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1290 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1294 msgid "Add ActionReplay Code" msgstr "新增 ActionReplay 代碼" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1219 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1223 msgid "Add Patch" msgstr "新增修正" @@ -551,7 +551,7 @@ msgstr "新增é¢ç‰ˆ" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:413 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:435 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 msgid "Add..." msgstr "新增..." @@ -611,25 +611,25 @@ msgstr "進階設定" msgid "All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)" msgstr "所有 GC/Wii 檔案 (elf, dol, gcm, iso, ciso, gcz, wad)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:801 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 #, fuzzy msgid "All GC/Wii images (gcm, iso, wbfs, ciso, gcz)" msgstr "所有 GC/Wii 映åƒæª” (gcm, iso, ciso, gcz)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1240 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1247 msgid "All Gamecube GCM files (gcm)" msgstr "所有 Gamecube GCM 檔案 (gcm)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1390 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1404 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1395 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1409 msgid "All Save States (sav, s##)" msgstr "所有å³æ™‚存檔 (sav, s##)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1238 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1245 msgid "All Wii ISO files (iso)" msgstr "所有 Wii ISO 檔案 (iso)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1258 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1265 msgid "All compressed GC/Wii ISO files (gcz)" msgstr "所有已壓縮的 GC/Wii ISO 檔案 (gcz)" @@ -640,8 +640,8 @@ msgstr "所有檔案 (*.*)|*.*" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:118 #, fuzzy msgid "" -"Allows toggling certain options via the hotkeys 3, 4, 5 and 6 within the " -"emulation window.\n" +"Allows toggling certain options via the hotkeys 3 (Internal Resolution), 4 " +"(Aspect Ratio), 5 (Copy EFB) and 6 (Fog) within the emulation window.\n" "\n" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" @@ -655,6 +655,10 @@ msgstr "模擬 Wiimote" msgid "Analyze" msgstr "" +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:298 +msgid "Angle" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:368 msgid "Anisotropic Filtering:" msgstr "å„å‘異性éŽæ¿¾ï¼š" @@ -671,7 +675,7 @@ msgstr "程å¼è®€å–器為錯誤的大å°...它是程å¼è®€å–器嗎？" msgid "Apploader unable to load from file" msgstr "程å¼è®€å–器無法從檔案中讀å–" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:826 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:825 msgid "Apploader:" msgstr "程å¼è®€å–器：" @@ -695,7 +699,7 @@ msgstr "" msgid "Are you sure you want to delete \"%s\"?" msgstr "是å¦ç¢ºèªåˆªé™¤ \"%s\" ？" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1064 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1071 msgid "" "Are you sure you want to delete these files?\n" "They will be gone forever!" @@ -703,11 +707,11 @@ msgstr "" "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？\n" "刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1055 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1062 msgid "Are you sure you want to delete this file? It will be gone forever!" msgstr "是å¦çœŸçš„è¦åˆªé™¤é€™äº›æª”案？刪了之後就回ä¸ä¾†äº†å“¦ï¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:774 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:773 #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278 msgid "Aspect Ratio:" msgstr "ç•«é¢æ¯”例：" @@ -721,7 +725,7 @@ msgstr "必須剩餘至少一個é¢æ¿ã€‚" msgid "Audio" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:679 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:678 msgid "Audio Backend:" msgstr "è²éŸ³è£ç½®ï¼š" @@ -756,11 +760,11 @@ msgid "" "If unsure, leave this unchecked." msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:694 msgid "B" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:752 #, fuzzy msgid "BP register " msgstr "寄存器(&R)" @@ -769,7 +773,7 @@ msgstr "寄存器(&R)" msgid "Back" msgstr "返回" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:683 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:682 msgid "Backend Settings" msgstr "è£ç½®è¨­å®š" @@ -779,7 +783,7 @@ msgstr "è£ç½®è¨­å®š" msgid "Backend:" msgstr "è²éŸ³è£ç½®ï¼š" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:299 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:318 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:95 msgid "Background Input" msgstr "背景輸入" @@ -793,7 +797,7 @@ msgid "Bad File Header" msgstr "æ壞的檔頭" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:625 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:297 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:304 msgid "Banner" msgstr "æ©«å¹…" @@ -859,7 +863,7 @@ msgstr "ç ´æ" msgid "Browse" msgstr "ç€è¦½" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:246 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:253 msgid "Browse for a directory to add" msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" @@ -867,7 +871,7 @@ msgstr "ç€è¦½è¦æ–°å¢žçš„資料夾" msgid "Browse for an ISO directory..." msgstr "ç€è¦½ ISO 資料夾..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1130 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1137 msgid "Browse for output directory" msgstr "ç€è¦½è¼¸å‡ºçš„資料夾" @@ -881,7 +885,13 @@ msgstr "ç·©è¡ï¼š" msgid "Buttons" msgstr "按鈕" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +msgid "" +"Bypass the clearing of the data cache by the DCBZ instruction. Usually leave " +"this option disabled." +msgstr "" + +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "C" msgstr "" @@ -894,7 +904,7 @@ msgstr "C-æ–æ¡¿" msgid "C-Stick" msgstr "C-æ–æ¡¿" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:762 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:761 msgid "CP reg" msgstr "" @@ -932,7 +942,7 @@ msgstr "無法開啟 %s" msgid "Cannot unregister events with events pending" msgstr "事件未決定時無法註銷事件" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1063 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1062 #, fuzzy, c-format msgid "" "Cannot use that file as a memory card.\n" @@ -942,7 +952,7 @@ msgstr "" "無法使用此檔案作為記憶å¡ã€‚\n" "您è¦åœ¨ç›¸åŒçš„æ’槽中使用相åŒçš„檔案嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1086 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1092 msgid "" "Cannot use that file as a memory card.\n" "Are you trying to use the same file in both slots?" @@ -973,7 +983,7 @@ msgstr "Caps Lock" msgid "Catalan" msgstr "" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:310 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 msgid "Center" msgstr "中心" @@ -1046,24 +1056,24 @@ msgstr "Chinese (Simplified)" msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:802 msgid "Choose a DVD root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:807 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:806 #, fuzzy msgid "Choose a NAND root directory:" msgstr "é¸æ“‡ä¸€å€‹ DVD 根目錄：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:800 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:799 msgid "Choose a default ISO:" msgstr "é¸æ“‡ä¸€å€‹é è¨­ ISO：" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1214 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 msgid "Choose a directory to add" msgstr "é¸æ“‡ä¸€å€‹è¦æ·»åŠ çš„資料夾" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1050 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1049 msgid "Choose a file to open" msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" @@ -1071,7 +1081,7 @@ msgstr "é¸æ“‡ä¸€å€‹è¦é–‹å•Ÿçš„檔案" msgid "Choose a memory card:" msgstr "é¸æ“‡ä¸€å€‹è¨˜æ†¶å¡ï¼š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:803 msgid "" "Choose file to use as apploader: (applies to discs constructed from " "directories only)" @@ -1134,16 +1144,16 @@ msgstr "註釋" msgid "Comment:" msgstr "註釋：" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:943 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:950 msgid "Compress ISO..." msgstr "壓縮 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:955 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:962 msgid "Compress selected ISOs..." msgstr "壓縮é¸æ“‡çš„ ISO 檔..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Compressing ISO" msgstr "正在壓縮 ISO" @@ -1170,9 +1180,9 @@ msgstr "設定控制器" msgid "Configure..." msgstr "模擬器設定..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1170 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1198 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1268 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1177 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1205 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 msgid "Confirm File Overwrite" msgstr "確èªæª”案覆蓋" @@ -1186,7 +1196,7 @@ msgstr "確èªåœæ­¢" msgid "Connect" msgstr "連接" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:768 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 msgid "Connect USB Keyboard" msgstr "連接 USB éµç›¤" @@ -1231,7 +1241,7 @@ msgstr "控制器" msgid "Convert to GCI" msgstr "轉æ›ç‚º GCI" -#: Source/Core/Core/Src/CoreParameter.cpp:377 +#: Source/Core/Core/Src/CoreParameter.cpp:381 msgid "Copy failed" msgstr "複製失敗" @@ -1295,11 +1305,11 @@ msgstr "" "\n" "請確èªæ˜¯å¦ç¶“ç”± CD/DVD 執行 Dolphin，或者是檔案具有唯讀的屬性？" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1122 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1126 msgid "Couldn't find open command for extension 'ini'!" msgstr "找ä¸åˆ°å‰¯æª”å 'ini' 的開啟命令ï¼" -#: Source/Core/Core/Src/BootManager.cpp:143 +#: Source/Core/Core/Src/BootManager.cpp:148 msgid "" "Couldn't init the core.\n" "Check your configuration." @@ -1370,7 +1380,7 @@ msgstr "自訂一些直線投影åƒæ•¸ã€‚" msgid "Czech" msgstr "Czech" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:696 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:695 msgid "D" msgstr "" @@ -1382,7 +1392,7 @@ msgstr "åå­—æ–¹å‘éµ" msgid "DSP" msgstr "è²éŸ³" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:643 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:642 msgid "DSP Emulator Engine" msgstr "DSP 模擬引擎" @@ -1395,7 +1405,7 @@ msgstr "DSP HLE 模擬器 (å¿«)" msgid "DSP LLE interpreter (slow)" msgstr "DSP LLE 解釋器 (æ…¢)" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:644 #, fuzzy msgid "DSP LLE on Thread" msgstr "DSP LLE å–®ç¨ç·šç¨‹" @@ -1408,7 +1418,7 @@ msgstr "DSP LLE é‡ç·¨è­¯å™¨ (æ…¢)" msgid "DSP settings" msgstr "è²éŸ³è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:823 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:822 msgid "DVD Root:" msgstr "DVD 根：" @@ -1454,16 +1464,16 @@ msgstr "除錯" msgid "Decimal" msgstr "Decimal" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:940 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:947 msgid "Decompress ISO..." msgstr "解壓 ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:956 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:963 msgid "Decompress selected ISOs..." msgstr "解壓é¸æ“‡çš„ ISO..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1139 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1275 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1146 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282 msgid "Decompressing ISO" msgstr "ISO 解壓中" @@ -1471,7 +1481,7 @@ msgstr "ISO 解壓中" msgid "Default" msgstr "é è¨­å€¼" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:820 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:819 msgid "Default ISO:" msgstr "é è¨­çš„ ISO：" @@ -1516,8 +1526,8 @@ msgstr "" msgid "Device" msgstr "è£ç½®" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:735 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:783 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:734 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:782 msgid "Device Settings" msgstr "è£ç½®è¨­å®š" @@ -1595,11 +1605,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。" msgid "Divide" msgstr "Divide" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:988 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 msgid "Do you want to stop the current emulation?" msgstr "您è¦åœæ­¢ç›®å‰çš„模擬嗎？" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:648 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:647 msgid "Dolby Pro Logic II decoder" msgstr "" @@ -1629,12 +1639,12 @@ msgstr "Dolphin 模擬 Wiimote 設定" msgid "Dolphin FIFO" msgstr "Dolphin" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1135 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1138 msgid "Dolphin GCPad Configuration" msgstr "Dolphin GC 控制器設定" #: Source/Core/DolphinWX/Src/FrameTools.cpp:681 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1075 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1076 msgid "Dolphin TAS Movies (*.dtm)" msgstr "Dolphin TAS 影片 (*.dtm)" @@ -1646,20 +1656,20 @@ msgstr "Dolphin Wiimote 設定" msgid "Dolphin at &Google Code" msgstr "Dolphin SVN (&G)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:358 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:365 msgid "" "Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for " "files..." msgstr "Dolphin 找ä¸åˆ°ä»»ä½• GC/Wii ISO。按兩下這裡ç€è¦½æª”案..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:362 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:369 msgid "" "Dolphin is currently set to hide all games. Doubleclick here to show all " "games..." msgstr "Dolphin ç›®å‰è¢«è¨­å®šç‚ºéš±è—所有éŠæˆ²ã€‚按兩下這裡顯示所有éŠæˆ²..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1210 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1296 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1217 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1303 msgid "Dolphin was unable to complete the requested action." msgstr "" @@ -1685,7 +1695,7 @@ msgstr "Drums" msgid "Dummy" msgstr "空" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:646 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:645 msgid "Dump Audio" msgstr "轉儲è²éŸ³" @@ -1839,10 +1849,6 @@ msgstr "" msgid "Enable AR Logging" msgstr "é–‹å•Ÿ AR 日誌" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 -msgid "Enable BAT" -msgstr "é–‹å•Ÿ BAT" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:326 msgid "Enable Block Merging" msgstr "é–‹å•Ÿå¡Šåˆä½µ" @@ -1888,7 +1894,7 @@ msgstr "é–‹å•Ÿ MMU" msgid "Enable Progressive Scan" msgstr "é–‹å•Ÿé€è¡ŒæŽƒçž„" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:760 #, fuzzy msgid "Enable Screen Saver" msgstr "開啟寬螢幕" @@ -1945,15 +1951,6 @@ msgid "" "ANY other game." msgstr "é–‹å•Ÿæ­¤é¸é …將加速塞爾é”傳說：曙光公主，請勿在其它éŠæˆ²ä¸­ä½¿ç”¨ã€‚" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 -msgid "" -"Enables Block Address Translation (BAT); a function of the Memory Management " -"Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = " -"Fast)" -msgstr "" -"é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模擬" -"速度會變慢。(ON = 兼容ã€OFF = 快速)" - #: Source/Core/DolphinWX/Src/ISOProperties.cpp:344 msgid "Enables Custom Projection Hack" msgstr "開啟自訂投影修正" @@ -2031,7 +2028,7 @@ msgstr "等於" #: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:44 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:154 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "Error" msgstr "錯誤" @@ -2092,7 +2089,7 @@ msgstr "匯出錄åƒ..." msgid "Export Save" msgstr "匯出存檔" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:924 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:931 msgid "Export Wii save (Experimental)" msgstr "匯出 Wii 存檔 (實驗性)" @@ -2108,7 +2105,7 @@ msgstr "匯出失敗，è¦é‡è©¦å—Žï¼Ÿ" msgid "Export save as..." msgstr "匯出存檔為..." -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:278 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:297 msgid "Extension" msgstr "æ“´å……" @@ -2166,7 +2163,7 @@ msgstr "資料夾æå–中" msgid "Extracting..." msgstr "æå–中..." -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:890 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:889 msgid "FIFO Byte" msgstr "" @@ -2224,6 +2221,11 @@ msgstr "è®€å– hid.dll 失敗" msgid "Failed to load hid.dll" msgstr "è®€å– hid.dll 失敗" +#: Source/Core/Core/Src/Movie.cpp:792 +#, fuzzy, c-format +msgid "Failed to read %s" +msgstr "檔案 %s 寫入檔頭失敗" + #: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp:151 msgid "Failed to read banner.bin" msgstr "è®€å– banner.bin 失敗" @@ -2314,11 +2316,11 @@ msgstr "" msgid "Fast" msgstr "快速" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:321 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319 msgid "Fast version of the MMU. Does not work for every game." msgstr "快速版本的 MMU。å¯èƒ½ç„¡æ³•åœ¨æ‰€æœ‰éŠæˆ²ä¸ŠåŸ·è¡Œã€‚" -#: Source/Core/Core/Src/Movie.cpp:1052 +#: Source/Core/Core/Src/Movie.cpp:1046 #, c-format msgid "" "Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s" @@ -2376,7 +2378,7 @@ msgstr "FileIO：未知開啟模å¼ï¼š 0x%02x" msgid "Filesystem" msgstr "檔案系統" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1115 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1119 msgid "Filetype 'ini' is unknown! Will not open!" msgstr "檔案類型 'ini' æœªçŸ¥ï¼ ç„¡æ³•é–‹å•Ÿï¼" @@ -2455,18 +2457,18 @@ msgstr "" msgid "Forward" msgstr "å‘å‰" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:505 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:504 #, c-format msgid "Found %d results for '" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:855 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:923 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:854 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:922 #, fuzzy msgid "Frame" msgstr "轉儲畫格" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:865 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:864 #, fuzzy msgid "Frame " msgstr "畫格步進" @@ -2544,7 +2546,7 @@ msgstr "記錄設定" msgid "GCPad" msgstr "GC 控制器" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:657 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:656 msgid "GX_CMD_INVL_VC" msgstr "" @@ -2585,7 +2587,7 @@ msgid "Gamecube &Pad Settings" msgstr "Gamecube 控制器設定(&P)" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:216 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1054 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1053 msgid "Gamecube Memory Cards (*.raw,*.gcp)" msgstr "Gamecube è¨˜æ†¶å¡ (*.raw,*.gcp)" @@ -2691,7 +2693,7 @@ msgstr "檔頭校驗失敗" msgid "Hebrew" msgstr "Hebrew" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:313 msgid "Height" msgstr "高度" @@ -2715,7 +2717,7 @@ msgstr "" "\n" "å†è¦‹ï¼\n" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:308 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:309 msgid "Hide" msgstr "éš±è—" @@ -2779,11 +2781,11 @@ msgstr "" msgid "IOCTL_ES_READCONTENT - bad destination" msgstr "IOCTL_ES_READCONTENT - æ毀的目標" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:733 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:732 msgid "IPL Settings" msgstr "IPL 設定" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:260 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:282 msgid "IR" msgstr "IR" @@ -2799,7 +2801,7 @@ msgstr "IR éˆæ•åº¦ï¼š" msgid "ISO Details" msgstr "ISO 明細" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:815 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:814 msgid "ISO Directories" msgstr "ISO 資料夾" @@ -2921,7 +2923,7 @@ msgstr "Insert" msgid "Insert Encrypted or Decrypted code here..." msgstr "在這裡æ’入被加密或已解密的代碼..." -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:767 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:766 msgid "Insert SD Card" msgstr "æ’å…¥ SD å¡" @@ -2933,7 +2935,7 @@ msgstr "在這裡æ’å…¥å稱.." msgid "Install WAD" msgstr "å®‰è£ WAD" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:945 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:952 msgid "Install to Wii Menu" msgstr "安è£è‡³ Wii é¸å–®" @@ -2942,7 +2944,7 @@ msgid "" "InstallExceptionHandler called, but this platform does not yet support it." msgstr "調用 InstallExceptionHandler，但是這個平å°å°šæœªæ”¯æ´æ­¤åŠŸèƒ½ã€‚" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1293 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1298 msgid "Installing WAD..." msgstr "æ­£åœ¨å®‰è£ WAD 至 Wii é¸å–®..." @@ -2970,7 +2972,7 @@ msgstr "" msgid "Interface" msgstr "ç•Œé¢è¨­å®š" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:631 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:630 msgid "Interface Settings" msgstr "ç•Œé¢è¨­å®š" @@ -3053,7 +3055,7 @@ msgstr "" msgid "Invalid search string (only even string lengths supported)" msgstr "" -#: Source/Core/Core/Src/Core.cpp:525 +#: Source/Core/Core/Src/Core.cpp:514 msgid "Invalid state" msgstr "無效的狀態" @@ -3133,7 +3135,7 @@ msgstr "最後覆蓋的進度" msgid "Last Saved State" msgstr "最後使用的進度" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:681 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:680 msgid "Latency:" msgstr "" @@ -3234,12 +3236,12 @@ msgstr "讀å–儲存格 8" msgid "Load State..." msgstr "讀å–進度檔..." -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1333 #, fuzzy msgid "Load Wii System Menu" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1323 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1328 #, c-format msgid "Load Wii System Menu %d%c" msgstr "è®€å– Wii 系統é¸å–® (%d%c)" @@ -3310,7 +3312,7 @@ msgstr "" "MD5 ä¸ç¬¦åˆ\n" " %016llx%016llx != %016llx%016llx" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:318 msgid "MMU Speed Hack" msgstr "MMU 速度修正" @@ -3345,7 +3347,7 @@ msgstr "記憶å¡ä¸­å·²ç¶“存在一個此標題的存檔" msgid "Memcard already opened" msgstr "記憶å¡å·²ç¶“é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:910 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:909 #, fuzzy msgid "Memory Byte" msgstr "記憶å¡(&M)" @@ -3361,7 +3363,7 @@ msgid "" "could mangle stuff!" msgstr "記憶å¡ç®¡ç†å™¨è­¦å‘Š-在使用å‰è«‹å…ˆå‚™ä»½ï¼Œä»¥é˜²æ­¢å‡ºç¾æ毀時無法復原ï¼" -#: Source/Core/Core/Src/CoreParameter.cpp:369 +#: Source/Core/Core/Src/CoreParameter.cpp:373 #, c-format msgid "" "Memory Card filename in Slot %c is incorrect\n" @@ -3400,7 +3402,7 @@ msgstr "麥克風" msgid "Misc" msgstr "雜項" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:780 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:779 msgid "Misc Settings" msgstr "其它設定" @@ -3421,11 +3423,11 @@ msgstr "" msgid "Monospaced font" msgstr "等寬字型" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:286 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:305 msgid "Motion Plus" msgstr "Motion Plus" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:290 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:309 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:86 msgid "Motor" msgstr "馬é”" @@ -3451,11 +3453,11 @@ msgid "" "effect on emulated wiimotes." msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:649 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:648 msgid "NOP" msgstr "" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:628 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:627 msgid "NOTE: Stream size doesn't match actual data length\n" msgstr "" @@ -3582,7 +3584,7 @@ msgstr "暱稱：" msgid "No Country (SDK)" msgstr "無國家 (SDK)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:364 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:371 msgid "No ISOs or WADS found" msgstr "找ä¸åˆ° ISO 或 WAD" @@ -3591,8 +3593,8 @@ msgstr "找ä¸åˆ° ISO 或 WAD" msgid "No banner file found for title %s" msgstr "找ä¸åˆ°æ¨™é¡Œ %s 的圖示檔案" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:759 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:766 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:758 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:765 msgid "No description available" msgstr "" @@ -3600,7 +3602,7 @@ msgstr "" msgid "No docking" msgstr "ä¸åœé " -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:857 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:856 msgid "No file loaded" msgstr "" @@ -3608,7 +3610,7 @@ msgstr "" msgid "No free dir index entries" msgstr "沒有剩餘的目錄索引項目" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:893 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:892 #, fuzzy msgid "No recorded file" msgstr "無效的錄åƒæª”" @@ -3632,7 +3634,7 @@ msgid "Not Equal" msgstr "ä¸ç›¸ç­‰" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:351 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:854 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:861 msgid "Not Set" msgstr "未設定" @@ -3640,7 +3642,7 @@ msgstr "未設定" msgid "Not connected" msgstr "未連接" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:310 msgid "Notes" msgstr "註釋" @@ -3674,7 +3676,7 @@ msgstr "Nunchuk" msgid "Nunchuk Acceleration" msgstr "Nunchuk 加速" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:875 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:874 msgid "Object" msgstr "" @@ -3705,11 +3707,11 @@ msgstr "僅 %d 個å€å¡Šå¯ç”¨" msgid "Open" msgstr "é–‹å•Ÿ" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:926 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:933 msgid "Open &containing folder" msgstr "開啟內容資料夾(&C)" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:923 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:930 msgid "Open Wii &save folder" msgstr "é–‹å•Ÿ Wii 存檔資料夾(&S)" @@ -3739,7 +3741,7 @@ msgstr "" msgid "OpenMP Texture Decoder" msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:298 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:317 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:94 msgid "Options" msgstr "é¸é …" @@ -3822,8 +3824,8 @@ msgstr "修正" msgid "Paths" msgstr "路徑" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1538 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1539 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1543 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1544 #: Source/Core/DolphinWX/Src/WXInputBase.cpp:51 msgid "Pause" msgstr "æš«åœ" @@ -3848,8 +3850,8 @@ msgstr "ç‰ˆå¼ %d" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:164 #: Source/Core/DolphinWX/Src/FrameTools.cpp:424 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1547 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1548 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1552 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1553 msgid "Play" msgstr "執行" @@ -3876,7 +3878,7 @@ msgstr "é¸é …" msgid "Players" msgstr "玩家" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:989 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:990 msgid "Please confirm..." msgstr "請確èª..." @@ -3892,19 +3894,19 @@ msgstr "Plus-Minus" msgid "Polish" msgstr "Polish" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:716 msgid "Port 1" msgstr "åŸ å£ 1" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:717 msgid "Port 2" msgstr "åŸ å£ 2" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:718 msgid "Port 3" msgstr "åŸ å£ 3" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:720 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:719 msgid "Port 4" msgstr "åŸ å£ 4" @@ -3926,17 +3928,17 @@ msgstr "Portuguese (Brazilian)" msgid "Post-Processing Effect:" msgstr "後期處ç†è‘—色器：" -#: Source/Core/Core/Src/Movie.cpp:942 +#: Source/Core/Core/Src/Movie.cpp:936 #, c-format msgid "Premature movie end in PlayController. %u + 8 > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1061 +#: Source/Core/Core/Src/Movie.cpp:1055 #, c-format msgid "Premature movie end in PlayWiimote. %u + %d > %u" msgstr "" -#: Source/Core/Core/Src/Movie.cpp:1038 +#: Source/Core/Core/Src/Movie.cpp:1032 #, c-format msgid "Premature movie end in PlayWiimote. %u > %u" msgstr "" @@ -4037,7 +4039,7 @@ msgstr "讀å–進度後é‡æ–°é€£æŽ¥ Wiimote" #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:192 #: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:216 -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:789 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:788 #, fuzzy msgid "Record" msgstr "播放錄åƒ" @@ -4093,7 +4095,7 @@ msgstr "æ›´æ–°éŠæˆ²åˆ—表" #: Source/Core/DolphinWX/Src/ISOProperties.cpp:414 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:436 #: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:797 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:796 msgid "Remove" msgstr "移除" @@ -4134,7 +4136,7 @@ msgstr "å³" msgid "Right Stick" msgstr "å³ æ–æ¡¿" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:289 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:308 #: Source/Core/Core/Src/HW/GCPadEmu.cpp:85 msgid "Rumble" msgstr "震動" @@ -4214,7 +4216,7 @@ msgstr "å¦å­˜é€²åº¦..." msgid "Save as..." msgstr "å¦å­˜ç‚º..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1254 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1261 msgid "Save compressed GCM/ISO" msgstr "儲存已壓縮的 GCM/ISO" @@ -4222,11 +4224,11 @@ msgstr "儲存已壓縮的 GCM/ISO" msgid "Save current perspective" msgstr "儲存目å‰ç‰ˆå¼" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1243 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1250 msgid "Save decompressed GCM/ISO" msgstr "儲存已解壓縮的 GCM/ISO" -#: Source/Core/Core/Src/Movie.cpp:795 +#: Source/Core/Core/Src/Movie.cpp:801 #, c-format msgid "Savestate movie %s is corrupted, movie recording stopping..." msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." @@ -4236,16 +4238,16 @@ msgstr "儲存的影片 %s 是æ毀的，影片錄製åœæ­¢..." msgid "Scaled EFB Copy" msgstr "EFB 縮放複製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:606 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:613 #, fuzzy, c-format msgid "Scanning %s" msgstr "正在掃瞄..." -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:589 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:596 msgid "Scanning for ISOs" msgstr "正在掃瞄 ISO" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:590 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:597 msgid "Scanning..." msgstr "正在掃瞄..." @@ -4266,7 +4268,7 @@ msgstr "尋找作弊代碼" msgid "Search Filter" msgstr "æœç´¢ç¯©é¸" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:795 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:794 msgid "Search Subfolders" msgstr "æœå°‹å­è³‡æ–™å¤¾" @@ -4291,11 +4293,11 @@ msgid "Select" msgstr "é¸æ“‡" #: Source/Core/DolphinWX/Src/FrameTools.cpp:679 -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1073 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1074 msgid "Select The Recording File" msgstr "é¸æ“‡å·²éŒ„製的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1281 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1286 msgid "Select a Wii WAD file to install" msgstr "é¸æ“‡è¦å®‰è£çš„ Wii WAD" @@ -4321,15 +4323,15 @@ msgstr "é¸æ“‡æµ®å‹•è¦–窗" msgid "Select the file to load" msgstr "é¸æ“‡è¦è®€å–的檔案" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1238 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243 msgid "Select the save file" msgstr "é¸æ“‡å­˜æª”" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393 msgid "Select the state to load" msgstr "é¸æ“‡è¦è®€å–的進度" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1407 msgid "Select the state to save" msgstr "é¸æ“‡è¦å„²å­˜çš„進度" @@ -4404,7 +4406,7 @@ msgstr "åŸ å£ 1 - 這是類似於網å¡ç­‰è£ç½®ä½¿ç”¨çš„埠å£ã€‚" msgid "Set" msgstr "設定" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:927 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:934 msgid "Set as &default ISO" msgstr "設為é è¨­ ISO (&D)" @@ -4432,7 +4434,7 @@ msgstr "設定..." msgid "SetupWiiMem: Cant find setting file" msgstr "SetupWiiMem：無法找到設定檔" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:272 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:291 msgid "Shake" msgstr "æ–晃" @@ -4604,7 +4606,7 @@ msgid "" "If unsure, leave this unchecked." msgstr "" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:300 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:319 msgid "Sideways Wiimote" msgstr "æ©«æ¡ Wiimote" @@ -4612,15 +4614,19 @@ msgstr "æ©«æ¡ Wiimote" msgid "Simplified Chinese" msgstr "Simplified Chinese" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:312 msgid "Size" msgstr "大å°" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:700 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:699 #, fuzzy msgid "Skip BIOS" msgstr "ç•¥éŽ GC BIOS" +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:320 +msgid "Skip DCBZ clearing" +msgstr "" + #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:493 #, fuzzy msgid "Skip Dest. Alpha Pass" @@ -4654,11 +4660,11 @@ msgstr "" msgid "Slot %i" msgstr "儲存格 %i" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:703 msgid "Slot A" msgstr "æ’槽 A" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:705 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:704 msgid "Slot B" msgstr "æ’槽 B" @@ -4678,7 +4684,7 @@ msgid "" "Do you really want to enable software rendering? If unsure, select 'No'." msgstr "" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:668 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:667 msgid "Sound Settings" msgstr "è²éŸ³è¨­å®š" @@ -4749,7 +4755,7 @@ msgstr "開始錄製(&C)" msgid "Start Recording" msgstr "開始錄製" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:306 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:313 msgid "State" msgstr "狀態" @@ -4804,12 +4810,12 @@ msgstr "æˆåŠŸåŒ¯å‡ºæª”案至 %s" msgid "Successfully imported save files" msgstr "æˆåŠŸåŒ¯å…¥å­˜æª”" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:263 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:285 msgid "Swing" msgstr "æ®èˆž" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729 -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:777 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:728 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:776 msgid "System Language:" msgstr "系統語系：" @@ -4880,13 +4886,13 @@ msgstr "ä½å€ç„¡æ•ˆ" msgid "The checksum was successfully fixed" msgstr "校驗已經被æˆåŠŸä¿®å¾©" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1220 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1226 msgid "The chosen directory is already in the list" msgstr "é¸å–的資料夾已經在列表中" -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1168 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1196 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1267 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1175 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1203 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1274 #, c-format msgid "" "The file %s already exists.\n" @@ -4967,7 +4973,7 @@ msgstr "指定的檔案 \"%s\" ä¸å­˜åœ¨" msgid "The value is invalid" msgstr "這個數值無效" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:627 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:626 #, fuzzy msgid "Theme:" msgstr "佈景主題" @@ -4999,7 +5005,8 @@ msgstr "這å¯èƒ½æœƒä½¿ Wii Menu 和部分éŠæˆ²é™é€Ÿã€‚" #: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:113 msgid "" "This feature allows you to change the game's camera.\n" -"Hold the right mouse button and move the mouse to pan the camera around. " +"Move the mouse while holding the right mouse button to pan and while holding " +"the middle button to move.\n" "Hold SHIFT and press one of the WASD keys to move the camera by a certain " "step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press " "SHIFT+R to reset the camera.\n" @@ -5026,12 +5033,12 @@ msgstr "這將å…許您手工編輯 INI 設定檔案" msgid "Threshold" msgstr "閾值" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:266 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:288 msgid "Tilt" msgstr "傾斜" #: Source/Core/DolphinWX/Src/MemcardManager.cpp:626 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:298 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:305 msgid "Title" msgstr "標題" @@ -5096,7 +5103,7 @@ msgstr "é¡žåž‹" msgid "UDP Port:" msgstr "UDP 埠å£ï¼š" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:269 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:279 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:10 msgid "UDP Wiimote" msgstr "UDP Wiimote" @@ -5105,7 +5112,7 @@ msgstr "UDP Wiimote" msgid "UNKNOWN" msgstr "未知" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:754 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:753 #, fuzzy, c-format msgid "UNKNOWN_%02X" msgstr "未知" @@ -5137,7 +5144,7 @@ msgstr "未指定 %i" msgid "Undo Load State" msgstr "å–消讀å–進度" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:716 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:715 msgid "Unexpected 0x80 call? Aborting..." msgstr "" @@ -5175,11 +5182,11 @@ msgstr "上" msgid "Update" msgstr "æ›´æ–°" -#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:301 +#: Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp:320 msgid "Upright Wiimote" msgstr "ç›´æ¡ Wiimote" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:762 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:761 msgid "Use EuRGB60 Mode (PAL60)" msgstr "使用 EuRGB60 æ¨¡å¼ (PAL60)" @@ -5245,7 +5252,7 @@ msgstr "å½±åƒ" msgid "Virtual" msgstr "虛擬" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:674 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:673 msgid "Volume" msgstr "音é‡" @@ -5310,7 +5317,7 @@ msgstr "" "以åŠåœ¨æ‚¨è¨˜æ†¶å¡ä¸­ 相åŒæª”案å的檔案\n" "è¦ç¹¼çºŒå—Žï¼Ÿ" -#: Source/Core/Core/Src/Movie.cpp:838 +#: Source/Core/Core/Src/Movie.cpp:844 #, c-format msgid "" "Warning: You loaded a save that's after the end of the current movie. (byte " @@ -5318,7 +5325,7 @@ msgid "" "load this state with read-only mode off." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:855 +#: Source/Core/Core/Src/Movie.cpp:861 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You " @@ -5326,7 +5333,7 @@ msgid "" "only mode off. Otherwise you'll probably get a desync." msgstr "" -#: Source/Core/Core/Src/Movie.cpp:864 +#: Source/Core/Core/Src/Movie.cpp:870 #, c-format msgid "" "Warning: You loaded a save whose movie mismatches on frame %d. You should " @@ -5358,7 +5365,7 @@ msgstr "Whammy" msgid "Widescreen Hack" msgstr "寬螢幕修正" -#: Source/Core/InputCommon/Src/ControllerEmu.cpp:311 +#: Source/Core/InputCommon/Src/ControllerEmu.cpp:312 msgid "Width" msgstr "寬度" @@ -5370,7 +5377,7 @@ msgstr "Wii" msgid "Wii Console" msgstr "Wii 主機" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:829 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:828 #, fuzzy msgid "Wii NAND Root:" msgstr "DVD 根：" @@ -5379,7 +5386,7 @@ msgstr "DVD 根：" msgid "Wii Save Import" msgstr "匯入 Wii 存檔" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1240 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245 msgid "Wii save files (*.bin)|*.bin" msgstr "Wii 存檔 (*.bin)|*.bin" @@ -5443,10 +5450,10 @@ msgstr "視窗 å³" msgid "Word Wrap" msgstr "自動æ›è¡Œ" -#: Source/Core/DolphinWX/Src/FrameTools.cpp:1294 +#: Source/Core/DolphinWX/Src/FrameTools.cpp:1299 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:873 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1140 -#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1276 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1147 +#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1283 msgid "Working..." msgstr "執行中..." @@ -5482,7 +5489,7 @@ msgstr "XAudio2 åˆå§‹åŒ–失敗： %#X" msgid "XAudio2 master voice creation failed: %#X" msgstr "XAudio2 主è²éŸ³å»ºç«‹å¤±æ•—： %#X" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:764 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:763 msgid "XF reg" msgstr "" @@ -5516,7 +5523,7 @@ msgstr "您必須輸入一個有效的å進制，å六進制或八進制的數 msgid "You must enter a valid profile name." msgstr "您必須輸入一個有效的設定檔å稱。" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:921 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:920 msgid "You must restart Dolphin in order for the change to take effect." msgstr "You must restart Dolphin in order for the change to take effect." @@ -5593,7 +5600,7 @@ msgstr "" msgid "^ ADD" msgstr "^ 新增" -#: Source/Core/DolphinWX/Src/ConfigMain.cpp:805 +#: Source/Core/DolphinWX/Src/ConfigMain.cpp:804 msgid "apploader (.img)" msgstr "程å¼è®€å–器 (.img)" @@ -5620,7 +5627,7 @@ msgstr "iCacheJIT：從 %x ä¸­è®€å– Opcode 。請回報。" msgid "not a wii save or read failure for file header size %x" msgstr "ä¸æ˜¯ä¸€å€‹ wii 存檔或讀å–檔案頭部大å°å¤±æ•— %x" -#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:933 +#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:932 msgid "s" msgstr "" @@ -5629,7 +5636,7 @@ msgstr "" msgid "unknown cmd 0x%08x" msgstr "未知的 cmd 0x%08x" -#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1125 +#: Source/Core/DolphinWX/Src/ISOProperties.cpp:1129 msgid "wxExecute returned -1 on application run!" msgstr "wxExecute 返回 -1 在應用程å¼åŸ·è¡Œæ™‚ï¼" @@ -5848,6 +5855,9 @@ msgstr "| 或" #~ msgid "Enable Audio Throttle" #~ msgstr "é–‹å•Ÿè²éŸ³ç¯€æµé–¥" +#~ msgid "Enable BAT" +#~ msgstr "é–‹å•Ÿ BAT" + #~ msgid "Enable CPU Access" #~ msgstr "é–‹å•Ÿ CPU å­˜å–" @@ -5872,6 +5882,14 @@ msgstr "| 或" #~ msgid "Enable Screen Saver (burn-in reduction)" #~ msgstr "開啟螢幕ä¿è­· (內部é™åˆ¶)" +#~ msgid "" +#~ "Enables Block Address Translation (BAT); a function of the Memory " +#~ "Management Unit. Accurate to the hardware, but slow to emulate. (ON = " +#~ "Compatible, OFF = Fast)" +#~ msgstr "" +#~ "é–‹å•Ÿå¡Šä½å€è½‰æ› (BAT)：一個記憶體管ç†å–®å…ƒçš„函數。用來更精確的執行，相å°çš„模" +#~ "擬速度會變慢。(ON = 兼容ã€OFF = 快速)" + #~ msgid "" #~ "Enables dynamic recompilation of DSP code.\n" #~ "Changing this will have no effect while the emulator is running!" From 15936cb99532b13a254296d443cdd5db5f3ccfea Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 23:27:49 -0600 Subject: [PATCH 522/627] Change copy_n to copy and update the save state version because I forgot. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 4 ++-- Source/Core/Core/Src/State.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 0391026023..66a772a504 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -526,7 +526,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u m_queue.push_back(Packet()); auto& packet = m_queue.back(); - std::copy_n(data, size, packet.data); + std::copy(data, data + size, packet.data); packet.size = size; packet.conn_handle = conn_handle; } @@ -547,7 +547,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& e pHeader->length = size; // Write the packet to the buffer - std::copy_n(data, pHeader->length, (u8*)pHeader + sizeof(hci_acldata_hdr_t)); + std::copy(data, data + size, (u8*)pHeader + sizeof(hci_acldata_hdr_t)); endpoint.SetRetVal(sizeof(hci_acldata_hdr_t) + size); diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index a532ace217..a9d56cc16a 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -70,8 +70,8 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; -// Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 10; +// Don't forget to increase this after doing changes on the savestate system +static const u32 STATE_VERSION = 11; struct StateHeader { From 286392af9d4166c2e376a9667249101a12313255 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 1 Feb 2013 23:44:17 -0600 Subject: [PATCH 523/627] Reduce ACL max queue size back to 10. Increase IPC_HLE freq to 8 KHz to compensate. --- Source/Core/Core/Src/HW/SystemTimers.cpp | 4 ++-- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index bfeeb36b51..318b1213af 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -248,10 +248,10 @@ void Init() DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f); // AyuanX: TO BE TWEAKED - // Now the 1500 is a pure assumption + // Now the 1500 is (was) a pure assumption // We need to figure out the real frequency though - const int freq = 4000; + const int freq = 8000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 66a772a504..c28b75bea7 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -509,13 +509,13 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle) { - if (m_queue.size() >= 100) + if (m_queue.size() >= 10) { // Many simultaneous exchanges of ACL packets tend to cause the // queue to fill up. Typically, this occurs when // many emulated Wiimotes are requesting connections at once. // See issue 4608 for more info. - ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be " + ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 10 - current packet will be " "dropped! (Hopefully you never see this.)"); return; } From 5c08df00b205639dc829d3490de775fdeccefe9c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 2 Feb 2013 03:53:00 -0600 Subject: [PATCH 524/627] Re-increase max ACL queue size to 100. Better than possibly dropping a packet. Reduced IPC update freq some. Removed some other nonsense. --- Source/Core/Core/Src/HW/SystemTimers.cpp | 2 +- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 8 +++++--- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 10 +++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index 318b1213af..12f0e286b1 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -251,7 +251,7 @@ void Init() // Now the 1500 is (was) a pure assumption // We need to figure out the real frequency though - const int freq = 8000; + const int freq = 5000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 7dca728f0f..7fc6bd073b 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -546,9 +546,12 @@ void EnqReply(u32 _Address, int cycles_in_future) // Takes care of routing ipc <-> ipc HLE void Update() { + if (!WII_IPCInterface::IsReady()) + return; + UpdateDevices(); - if (WII_IPCInterface::IsReady() && request_queue.size()) + if (request_queue.size()) { WII_IPCInterface::GenerateAck(request_queue.front()); INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front()); @@ -561,8 +564,7 @@ void Update() #endif } - // Avoiding a "Reply" and "Ack" on the same interrupt allowed Rhythm Heaven Fever's "Remix 1" to work. - if (WII_IPCInterface::IsReady() && reply_queue.size()) + if (reply_queue.size()) { WII_IPCInterface::GenerateReply(reply_queue.front()); INFO_LOG(WII_IPC_HLE, "<<-- Reply to IPC Request @ 0x%08x", reply_queue.front()); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index c28b75bea7..e3c0247b46 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -509,14 +509,10 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update() void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u16 size, const u16 conn_handle) { - if (m_queue.size() >= 10) + if (m_queue.size() >= 100) { - // Many simultaneous exchanges of ACL packets tend to cause the - // queue to fill up. Typically, this occurs when - // many emulated Wiimotes are requesting connections at once. - // See issue 4608 for more info. - ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 10 - current packet will be " - "dropped! (Hopefully you never see this.)"); + // Many simultaneous exchanges of ACL packets tend to cause the queue to fill up. + ERROR_LOG(WII_IPC_WIIMOTE, "ACL queue size reached 100 - current packet will be dropped!"); return; } From e3c6c6dd693d82ec3b4cae55c0cf1c2c43ecfe8d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 2 Feb 2013 12:52:12 -0600 Subject: [PATCH 525/627] Increase IPC HLE freq a bit for DKCR. --- Source/Core/Core/Src/HW/SystemTimers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index 12f0e286b1..318b1213af 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -251,7 +251,7 @@ void Init() // Now the 1500 is (was) a pure assumption // We need to figure out the real frequency though - const int freq = 5000; + const int freq = 8000; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); From 03d9cca2fee67da0ca73e93bc2e867a02bb1a2bd Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 3 Feb 2013 19:02:46 +1100 Subject: [PATCH 526/627] Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds. --- Source/Core/DolphinWX/Dolphin.vcxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 0d80b1fa5b..cde306855b 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -137,6 +137,7 @@ xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -151,6 +152,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -167,6 +169,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -181,6 +184,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -197,6 +201,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -213,6 +218,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d +xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) From 2ad30958d622bb304e2d6ef36e5fdc3d8d7c0f4c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 4 Feb 2013 16:00:11 -0600 Subject: [PATCH 527/627] Stuck an IPC HLE Update call in WII_IPCInterface::Write32. While hacky, this seems to fix various problems without increasing IPC HLE freq to infinity. Thanks to Aristar for helping test. Increase IPC command reply delay to 1/100th of a second. (fixes DKCR hanging) --- Source/Core/Core/Src/HW/SystemTimers.cpp | 5 +++-- Source/Core/Core/Src/HW/WII_IPC.cpp | 1 + Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index 318b1213af..a041a3b0ad 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -248,10 +248,11 @@ void Init() DSP_PERIOD = (int)(GetTicksPerSecond() * 0.003f); // AyuanX: TO BE TWEAKED - // Now the 1500 is (was) a pure assumption + // Now the 1500 is a pure assumption // We need to figure out the real frequency though - const int freq = 8000; + // FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32 + const int freq = 1500; const int fields = SConfig::GetInstance().m_LocalCoreStartupParameter. bVBeam ? 2 : 1; IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * fields); diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp index 74af1ecdea..3651eef8ab 100644 --- a/Source/Core/Core/Src/HW/WII_IPC.cpp +++ b/Source/Core/Core/Src/HW/WII_IPC.cpp @@ -221,6 +221,7 @@ void Write32(const u32 _Value, const u32 _Address) break; } + WII_IPC_HLE_Interface::Update(); UpdateInterrupts(); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 4aee5cb045..620d6c7052 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -515,7 +515,8 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { // Generate a reply to the IPC command - EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 150); + // TODO: should probably figure out which commands need delayed replies and which don't + EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100); } else { From fb5b5e8b63cb3484753c75d3e44205b0b8f33a00 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 4 Feb 2013 19:39:31 -0600 Subject: [PATCH 528/627] Only delay DI command replies. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 8 ++++++-- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 2 ++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 6 ++++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 620d6c7052..4149931353 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -405,6 +405,7 @@ void ExecuteCommand(u32 _Address) else { delete pDevice; + pDevice = NULL; } } @@ -435,7 +436,10 @@ void ExecuteCommand(u32 _Address) // Don't delete hardware if (!pDevice->IsHardware()) + { delete pDevice; + pDevice = NULL; + } } else { @@ -515,8 +519,8 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { // Generate a reply to the IPC command - // TODO: should probably figure out which commands need delayed replies and which don't - EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100); + int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; + EnqReply(_Address, reply_delay); } else { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index d2907d7ee9..d52bd4f1e3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -95,6 +95,8 @@ public: virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) } #undef UNIMPLEMENTED_CMD + virtual int GetCmdDelay(u32) { return 0; } + virtual u32 Update() { return 0; } virtual bool IsHardware() { return m_Hardware; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 05b365ef01..18ddc56c88 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -28,6 +28,7 @@ #include "VolumeCreator.h" #include "Filesystem.h" #include "LogManager.h" +#include "../HW/SystemTimers.h" #include "../../DiscIO/Src/FileMonitor.h" @@ -460,3 +461,8 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // i dunno but prolly 1 is okay all the time :) return 1; } + +int CWII_IPC_HLE_Device_di::GetCmdDelay(u32) +{ + return SystemTimers::GetTicksPerSecond() / 100; +} \ No newline at end of file diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h index 36e9f89067..0b62daefa3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -38,6 +38,8 @@ public: bool IOCtl(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress); + + int GetCmdDelay(u32); private: From d5ec631337c7dbcf5ceecdb2ec6fac9fdbdc644b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 4 Feb 2013 20:57:08 -0600 Subject: [PATCH 529/627] Make real wiimote speaker not cause massive input delays. Fixes issue 5966. --- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 25 ++++++++----------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 3 +++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 2381793f30..ce08c7d0da 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -181,23 +181,23 @@ bool Wiimote::Read() bool Wiimote::Write() { Report rpt; - bool audio_written = false; - if (m_audio_reports.Pop(rpt)) + if (last_audio_report.GetTimeDifference() > 6 && m_audio_reports.Pop(rpt)) { + last_audio_report.Update(); + IOWrite(rpt.first, rpt.second); delete[] rpt.first; - audio_written = true; + return true; } - - if (m_write_reports.Pop(rpt)) + else if (m_write_reports.Pop(rpt)) { IOWrite(rpt.first, rpt.second); delete[] rpt.first; return true; - } + } - return audio_written; + return false; } // Returns the next report that should be sent @@ -319,14 +319,9 @@ void Wiimote::ThreadFunc() while (Write()) {} Common::SleepCurrentThread(1); #else - bool read = false; - while (Write() || (read = true, IsOpen() && Read())) - { - if (m_audio_reports.Size() && !read) - Read(); - Common::SleepCurrentThread(m_audio_reports.Size() ? 5 : 2); - read = false; - } + bool const did_something = Write() || Read(); + if (!did_something) + Common::SleepCurrentThread(1); #endif } } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 9fdb305a56..24fcea53e6 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -25,6 +25,7 @@ #include "ChunkFile.h" #include "Thread.h" #include "FifoQueue.h" +#include "Timer.h" #include "../Wiimote.h" #include "../WiimoteEmu/WiimoteEmu.h" @@ -103,6 +104,8 @@ private: Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; Common::FifoQueue m_audio_reports; + + Common::Timer last_audio_report; }; extern std::mutex g_refresh_lock; From bc35764ec216749c8cebd3c8e95df066ae46a841 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 4 Feb 2013 21:25:14 -0600 Subject: [PATCH 530/627] Fixed issue 5973. (probably) --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 6 +++--- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index cc05bc10e1..529a48d15d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -184,7 +184,7 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) bool found = false; for(int i = 0; i < MAX_WIIMOTES; i++) { - if(wm[i] && strcmp(wm[i]->devicepath, detail_data->DevicePath) == 0) + if(wm[i] && (wm[i]->devicepath == detail_data->DevicePath)) { found = true; break; @@ -210,7 +210,7 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) for (; k < MAX_WIIMOTES && !(WIIMOTE_SRC_REAL & g_wiimote_sources[k] && !wm[k]); ++k); wm[k] = new Wiimote(k); wm[k]->dev_handle = dev; - memcpy(wm[k]->devicepath, detail_data->DevicePath, 197); + wm[k]->devicepath = detail_data->DevicePath; if (!wm[k]->Connect()) { @@ -240,7 +240,7 @@ bool Wiimote::Connect() if (!dev_handle) { - dev_handle = CreateFile(devicepath, + dev_handle = CreateFile(devicepath.c_str(), (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 24fcea53e6..edd4b4f71b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -78,7 +78,7 @@ public: void Close(); #elif defined(_WIN32) - char devicepath[255]; // Unique wiimote reference + std::string devicepath; // Unique wiimote reference //ULONGLONG btaddr; // Bluetooth address HANDLE dev_handle; // HID handle OVERLAPPED hid_overlap; // Overlap handle From d0190fadeddfdef465133de2140487019ebbbe39 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 4 Feb 2013 22:11:13 -0600 Subject: [PATCH 531/627] Hopefully make wiimote speaker less crappy. --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index ce08c7d0da..c726a836d9 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -182,11 +182,11 @@ bool Wiimote::Write() { Report rpt; - if (last_audio_report.GetTimeDifference() > 6 && m_audio_reports.Pop(rpt)) + if (last_audio_report.GetTimeDifference() > 5 && m_audio_reports.Pop(rpt)) { + IOWrite(rpt.first, rpt.second); last_audio_report.Update(); - IOWrite(rpt.first, rpt.second); delete[] rpt.first; return true; } From 937d9e900717db5e5497eb4c15fda122e4502cdf Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 5 Feb 2013 02:51:34 -0600 Subject: [PATCH 532/627] Revert "Only delay DI command replies." Fix "Wii Party" again. This reverts commit fb5b5e8b63cb3484753c75d3e44205b0b8f33a00. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 8 ++------ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 2 -- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 6 ------ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 4149931353..620d6c7052 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -405,7 +405,6 @@ void ExecuteCommand(u32 _Address) else { delete pDevice; - pDevice = NULL; } } @@ -436,10 +435,7 @@ void ExecuteCommand(u32 _Address) // Don't delete hardware if (!pDevice->IsHardware()) - { delete pDevice; - pDevice = NULL; - } } else { @@ -519,8 +515,8 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { // Generate a reply to the IPC command - int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; - EnqReply(_Address, reply_delay); + // TODO: should probably figure out which commands need delayed replies and which don't + EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100); } else { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index d52bd4f1e3..d2907d7ee9 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -95,8 +95,6 @@ public: virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) } #undef UNIMPLEMENTED_CMD - virtual int GetCmdDelay(u32) { return 0; } - virtual u32 Update() { return 0; } virtual bool IsHardware() { return m_Hardware; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 18ddc56c88..05b365ef01 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -28,7 +28,6 @@ #include "VolumeCreator.h" #include "Filesystem.h" #include "LogManager.h" -#include "../HW/SystemTimers.h" #include "../../DiscIO/Src/FileMonitor.h" @@ -461,8 +460,3 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // i dunno but prolly 1 is okay all the time :) return 1; } - -int CWII_IPC_HLE_Device_di::GetCmdDelay(u32) -{ - return SystemTimers::GetTicksPerSecond() / 100; -} \ No newline at end of file diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h index 0b62daefa3..36e9f89067 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -38,8 +38,6 @@ public: bool IOCtl(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress); - - int GetCmdDelay(u32); private: From f506783c37b2bd7b50bf86015a030d7e0a74ff29 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 5 Feb 2013 13:51:08 -0600 Subject: [PATCH 533/627] Number "unknown" axes in OSX rather than call them all "unk". --- .../Src/ControllerInterface/OSX/OSXJoystick.mm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm index 60c0cc8c50..0d89c2e393 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm @@ -121,7 +121,9 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d // Need to parse the element a bit first std::string description("unk"); - switch (IOHIDElementGetUsage(m_element)) { + int const usage = IOHIDElementGetUsage(m_element); + switch (usage) + { case kHIDUsage_GD_X: description = "X"; break; @@ -146,6 +148,13 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d case kHIDUsage_Csmr_ACPan: description = "Pan"; break; + default: + { + std::ostringstream s; + s << usage; + description = s.str(); + break; + } } m_name = std::string("Axis ") + description; From 708fed92c851ada9dbe191b20eafa14c378ca664 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 5 Feb 2013 15:32:13 -0600 Subject: [PATCH 534/627] Clean up SDL includes a bit. Maybe fix an SDL2 problem. --- .../InputCommon/Src/ControllerInterface/SDL/SDL.cpp | 8 +++++++- .../InputCommon/Src/ControllerInterface/SDL/SDL.h | 12 ++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index 5473f7bcb3..b521032e9c 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -325,7 +325,13 @@ bool Joystick::UpdateOutput() std::string Joystick::GetName() const { - return StripSpaces(SDL_JoystickName(m_sdl_index)); + return StripSpaces( +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_JoystickNameForIndex(m_sdl_index) +#else + SDL_JoystickName(m_sdl_index) +#endif + ); } std::string Joystick::GetSource() const diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h index 139e9f232d..fa770c403d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h @@ -5,22 +5,14 @@ #include -#ifdef _WIN32 - #include -#else - #include -#endif +#include #if SDL_VERSION_ATLEAST(1, 3, 0) #define USE_SDL_HAPTIC #endif #ifdef USE_SDL_HAPTIC - #ifdef _WIN32 - #include - #else - #include - #endif + #include #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC #else #define SDL_INIT_FLAGS SDL_INIT_JOYSTICK From af9b9c8f4583372afe441e7a87ee3a0a4d49db41 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 5 Feb 2013 16:29:52 -0600 Subject: [PATCH 535/627] "Fix" using SDL from externals. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 647a84cb6c..843c140408 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ else(SDL2_FOUND) else(SDL_FOUND) # TODO: Use the prebuilt one on Windows message("Using static SDL from Externals") - include_directories(Externals/SDL Externals/SDL/include) + include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include) add_subdirectory(Externals/SDL) endif(SDL_FOUND) endif(SDL2_FOUND) From ef9d7fb789ec88b249c33a9119fb40069e68619e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 5 Feb 2013 21:07:09 -0600 Subject: [PATCH 536/627] Fix compilation with SDL2. (based on a patch from matthewharveys) Fixes issue 5971. --- .../Src/ControllerInterface/SDL/SDL.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index b521032e9c..c5ee3af23f 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -17,6 +17,15 @@ namespace ciface { namespace SDL { + +std::string GetJoystickName(int index) +{ +#if SDL_VERSION_ATLEAST(2, 0, 0) + return SDL_JoystickNameForIndex(index); +#else + return SDL_JoystickName(index); +#endif +} void Init( std::vector& devices ) { @@ -32,7 +41,7 @@ void Init( std::vector& devices ) SDL_Joystick* dev = SDL_JoystickOpen(i); if (dev) { - Joystick* js = new Joystick(dev, i, name_counts[SDL_JoystickName(i)]++); + Joystick* js = new Joystick(dev, i, name_counts[GetJoystickName(i)]++); // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) devices.push_back( js ); @@ -325,13 +334,7 @@ bool Joystick::UpdateOutput() std::string Joystick::GetName() const { - return StripSpaces( -#if SDL_VERSION_ATLEAST(2, 0, 0) - SDL_JoystickNameForIndex(m_sdl_index) -#else - SDL_JoystickName(m_sdl_index) -#endif - ); + return StripSpaces(GetJoystickName(m_sdl_index)); } std::string Joystick::GetSource() const From 9cbfddd7883b5b69ac741cc3c5a49a735ff8ea67 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 6 Feb 2013 16:52:51 -0600 Subject: [PATCH 537/627] Only delay DI and fs IPC replies. Fixes issue 5982. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 8 ++++++-- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h | 2 ++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 7 +++++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h | 2 ++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 8 ++++++++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h | 2 ++ 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 620d6c7052..4149931353 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -405,6 +405,7 @@ void ExecuteCommand(u32 _Address) else { delete pDevice; + pDevice = NULL; } } @@ -435,7 +436,10 @@ void ExecuteCommand(u32 _Address) // Don't delete hardware if (!pDevice->IsHardware()) + { delete pDevice; + pDevice = NULL; + } } else { @@ -515,8 +519,8 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { // Generate a reply to the IPC command - // TODO: should probably figure out which commands need delayed replies and which don't - EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100); + int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; + EnqReply(_Address, reply_delay); } else { diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h index d2907d7ee9..d52bd4f1e3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h @@ -95,6 +95,8 @@ public: virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) } #undef UNIMPLEMENTED_CMD + virtual int GetCmdDelay(u32) { return 0; } + virtual u32 Update() { return 0; } virtual bool IsHardware() { return m_Hardware; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 05b365ef01..0d610edb8c 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -28,6 +28,7 @@ #include "VolumeCreator.h" #include "Filesystem.h" #include "LogManager.h" +#include "../HW/SystemTimers.h" #include "../../DiscIO/Src/FileMonitor.h" @@ -460,3 +461,9 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // i dunno but prolly 1 is okay all the time :) return 1; } + +int CWII_IPC_HLE_Device_di::GetCmdDelay(u32) +{ + // Less than ~1/150th of a second hangs Oregon Trail at "loading wheel". + return SystemTimers::GetTicksPerSecond() / 100; +} \ No newline at end of file diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h index 36e9f89067..0b62daefa3 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -38,6 +38,8 @@ public: bool IOCtl(u32 _CommandAddress); bool IOCtlV(u32 _CommandAddress); + + int GetCmdDelay(u32); private: diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index cc123ddf52..ecc4be0cb0 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -26,6 +26,7 @@ #include "FileUtil.h" #include "NandPaths.h" #include "ChunkFile.h" +#include "../HW/SystemTimers.h" #include "../VolumeHandler.h" @@ -499,6 +500,13 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B return FS_RESULT_FATAL; } +int CWII_IPC_HLE_Device_fs::GetCmdDelay(u32) +{ + // ~1/1000th of a second is too short and causes hangs in Wii Party + // Play it safe at 1/500th + return SystemTimers::GetTicksPerSecond() / 500; +} + void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p) { DoStateShared(p); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h index c98338e39d..17a574da64 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -55,6 +55,8 @@ public: virtual bool IOCtl(u32 _CommandAddress); virtual bool IOCtlV(u32 _CommandAddress); + + virtual int GetCmdDelay(u32); private: From 6bc9e7579c0db6c855caf47912fdc79a6e1a90dc Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 6 Feb 2013 20:56:07 -0500 Subject: [PATCH 538/627] Disable start/play recording buttons when no iso is selected. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 4d66d82b18..56dde8e2ce 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1566,6 +1566,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() @@ -1574,6 +1576,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } else { @@ -1581,6 +1585,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, false); GetMenuBar()->FindItem(IDM_PLAY)->Enable(false); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(false); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(false); } } @@ -1596,6 +1602,8 @@ void CFrame::UpdateGUI() if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(true); } } else if (Initialized) From 0ebe35e0effae7df14fd9fa16611e990df678d41 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 7 Feb 2013 00:31:57 -0500 Subject: [PATCH 539/627] Disable play and record buttons if an iso was selected, but is later deselected. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 51b5bb2554..6fd298ad81 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -57,6 +57,8 @@ size_t CGameListCtrl::m_numberItem = 0; std::string CGameListCtrl::m_currentFilename; bool sorted = false; +extern CFrame* main_frame; + static int CompareGameListItems(const GameListItem* iso1, const GameListItem* iso2, long sortData = CGameListCtrl::COLUMN_TITLE) { @@ -373,7 +375,8 @@ void CGameListCtrl::Update() SetItemFont(index, *wxITALIC_FONT); SetColumnWidth(0, wxLIST_AUTOSIZE); } - + if (GetSelectedISO() == NULL) + main_frame->UpdateGUI(); Show(); AutomaticColumnWidth(); @@ -975,7 +978,7 @@ const GameListItem * CGameListCtrl::GetSelectedISO() { long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (item == wxNOT_FOUND) - return new GameListItem(""); // TODO: wtf is this + return NULL; else { // Here is a little workaround for multiselections: From 6870c1fdd55c497f91fa9338b87d82edf971b071 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 13 Jan 2013 23:35:07 +0100 Subject: [PATCH 540/627] Fix some potential issues when blending on EFB formats without alpha. Clean up state transition tables. --- Source/Core/VideoCommon/Src/BPStructs.cpp | 1 + .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 302 +++++++++--------- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 294 +++++++++-------- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 118 +++---- .../Plugin_VideoOGL/Src/TextureCache.cpp | 63 ++-- 5 files changed, 378 insertions(+), 400 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index af263235cd..0d7d741a92 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -456,6 +456,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel + g_renderer->SetBlendMode(true); OnPixelFormatChange(); break; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 44eaaf5dcf..57812aa067 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -54,8 +54,6 @@ static int s_fps = 0; static u32 s_LastAA = 0; -static u32 s_blendMode; - static Television s_television; ID3D11Buffer* access_efb_cbuf = NULL; @@ -76,151 +74,6 @@ struct D3D11_RASTERIZER_DESC rastdc; } gx_state; -// State translation lookup tables -static const D3D11_BLEND d3dSrcFactors[8] = -{ - D3D11_BLEND_ZERO, - D3D11_BLEND_ONE, - D3D11_BLEND_DEST_COLOR, - D3D11_BLEND_INV_DEST_COLOR, - D3D11_BLEND_SRC_ALPHA, - D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! - D3D11_BLEND_DEST_ALPHA, - D3D11_BLEND_INV_DEST_ALPHA -}; - -static const D3D11_BLEND d3dDestFactors[8] = -{ - D3D11_BLEND_ZERO, - D3D11_BLEND_ONE, - D3D11_BLEND_SRC_COLOR, - D3D11_BLEND_INV_SRC_COLOR, - D3D11_BLEND_SRC_ALPHA, - D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! - D3D11_BLEND_DEST_ALPHA, - D3D11_BLEND_INV_DEST_ALPHA -}; - -// 0 0x00 -// 1 Source & destination -// 2 Source & ~destination -// 3 Source -// 4 ~Source & destination -// 5 Destination -// 6 Source ^ destination = Source & ~destination | ~Source & destination -// 7 Source | destination - -// 8 ~(Source | destination) -// 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination -// 10 ~Destination -// 11 Source | ~destination -// 12 ~Source -// 13 ~Source | destination -// 14 ~(Source & destination) -// 15 0xff - -static const D3D11_BLEND_OP d3dLogicOps[16] = -{ - D3D11_BLEND_OP_ADD,//0 - D3D11_BLEND_OP_ADD,//1 - D3D11_BLEND_OP_SUBTRACT,//2 - D3D11_BLEND_OP_ADD,//3 - D3D11_BLEND_OP_REV_SUBTRACT,//4 - D3D11_BLEND_OP_ADD,//5 - D3D11_BLEND_OP_MAX,//6 - D3D11_BLEND_OP_ADD,//7 - - D3D11_BLEND_OP_MAX,//8 - D3D11_BLEND_OP_MAX,//9 - D3D11_BLEND_OP_ADD,//10 - D3D11_BLEND_OP_ADD,//11 - D3D11_BLEND_OP_ADD,//12 - D3D11_BLEND_OP_ADD,//13 - D3D11_BLEND_OP_ADD,//14 - D3D11_BLEND_OP_ADD//15 -}; - -static const D3D11_BLEND d3dLogicOpSrcFactors[16] = -{ - D3D11_BLEND_ZERO,//0 - D3D11_BLEND_DEST_COLOR,//1 - D3D11_BLEND_ONE,//2 - D3D11_BLEND_ONE,//3 - D3D11_BLEND_DEST_COLOR,//4 - D3D11_BLEND_ZERO,//5 - D3D11_BLEND_INV_DEST_COLOR,//6 - D3D11_BLEND_INV_DEST_COLOR,//7 - - D3D11_BLEND_INV_SRC_COLOR,//8 - D3D11_BLEND_INV_SRC_COLOR,//9 - D3D11_BLEND_INV_DEST_COLOR,//10 - D3D11_BLEND_ONE,//11 - D3D11_BLEND_INV_SRC_COLOR,//12 - D3D11_BLEND_INV_SRC_COLOR,//13 - D3D11_BLEND_INV_DEST_COLOR,//14 - D3D11_BLEND_ONE//15 -}; - -static const D3D11_BLEND d3dLogicOpDestFactors[16] = -{ - D3D11_BLEND_ZERO,//0 - D3D11_BLEND_ZERO,//1 - D3D11_BLEND_INV_SRC_COLOR,//2 - D3D11_BLEND_ZERO,//3 - D3D11_BLEND_ONE,//4 - D3D11_BLEND_ONE,//5 - D3D11_BLEND_INV_SRC_COLOR,//6 - D3D11_BLEND_ONE,//7 - - D3D11_BLEND_INV_DEST_COLOR,//8 - D3D11_BLEND_SRC_COLOR,//9 - D3D11_BLEND_INV_DEST_COLOR,//10 - D3D11_BLEND_INV_DEST_COLOR,//11 - D3D11_BLEND_INV_SRC_COLOR,//12 - D3D11_BLEND_ONE,//13 - D3D11_BLEND_INV_SRC_COLOR,//14 - D3D11_BLEND_ONE//15 -}; - -static const D3D11_CULL_MODE d3dCullModes[4] = -{ - D3D11_CULL_NONE, - D3D11_CULL_BACK, - D3D11_CULL_FRONT, - D3D11_CULL_BACK -}; - -static const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] = -{ - D3D11_COMPARISON_NEVER, - D3D11_COMPARISON_LESS, - D3D11_COMPARISON_EQUAL, - D3D11_COMPARISON_LESS_EQUAL, - D3D11_COMPARISON_GREATER, - D3D11_COMPARISON_NOT_EQUAL, - D3D11_COMPARISON_GREATER_EQUAL, - D3D11_COMPARISON_ALWAYS -}; - -#define TEXF_NONE 0 -#define TEXF_POINT 1 -#define TEXF_LINEAR 2 -static const unsigned int d3dMipFilters[4] = -{ - TEXF_NONE, - TEXF_POINT, - TEXF_LINEAR, - TEXF_NONE, //reserved -}; - -static const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] = -{ - D3D11_TEXTURE_ADDRESS_CLAMP, - D3D11_TEXTURE_ADDRESS_WRAP, - D3D11_TEXTURE_ADDRESS_MIRROR, - D3D11_TEXTURE_ADDRESS_WRAP //reserved -}; - void SetupDeviceObjects() { @@ -338,7 +191,6 @@ void CreateScreenshotTexture() Renderer::Renderer() { int x, y, w_temp, h_temp; - s_blendMode = 0; InitFPSCounter(); @@ -833,6 +685,32 @@ void SetBlendOp(D3D11_BLEND_OP val) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const D3D11_BLEND d3dSrcFactors[8] = + { + D3D11_BLEND_ZERO, + D3D11_BLEND_ONE, + D3D11_BLEND_DEST_COLOR, + D3D11_BLEND_INV_DEST_COLOR, + D3D11_BLEND_SRC_ALPHA, + D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! + (target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE, + (target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO + }; + const D3D11_BLEND d3dDestFactors[8] = + { + D3D11_BLEND_ZERO, + D3D11_BLEND_ONE, + D3D11_BLEND_SRC_COLOR, + D3D11_BLEND_INV_SRC_COLOR, + D3D11_BLEND_SRC_ALPHA, + D3D11_BLEND_INV_SRC_ALPHA, // NOTE: Use SRC1_ALPHA if dst alpha is enabled! + (target_has_alpha) ? D3D11_BLEND_DEST_ALPHA : D3D11_BLEND_ONE, + (target_has_alpha) ? D3D11_BLEND_INV_DEST_ALPHA : D3D11_BLEND_ZERO + }; + if (bpmem.blendmode.logicopenable && !forceUpdate) return; @@ -845,8 +723,8 @@ void Renderer::SetBlendMode(bool forceUpdate) } else { - gx_state.blenddc.RenderTarget[0].BlendEnable = bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0)); - if (bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))) + gx_state.blenddc.RenderTarget[0].BlendEnable = bpmem.blendmode.blendenable; + if (bpmem.blendmode.blendenable) { SetBlendOp(D3D11_BLEND_OP_ADD); SetSrcBlend(d3dSrcFactors[bpmem.blendmode.srcfactor]); @@ -1331,12 +1209,32 @@ void Renderer::RestoreCull() void Renderer::SetGenerationMode() { + const D3D11_CULL_MODE d3dCullModes[4] = + { + D3D11_CULL_NONE, + D3D11_CULL_BACK, + D3D11_CULL_FRONT, + D3D11_CULL_BACK + }; + // rastdc.FrontCounterClockwise must be false for this to work gx_state.rastdc.CullMode = d3dCullModes[bpmem.genMode.cullmode]; } void Renderer::SetDepthMode() { + const D3D11_COMPARISON_FUNC d3dCmpFuncs[8] = + { + D3D11_COMPARISON_NEVER, + D3D11_COMPARISON_LESS, + D3D11_COMPARISON_EQUAL, + D3D11_COMPARISON_LESS_EQUAL, + D3D11_COMPARISON_GREATER, + D3D11_COMPARISON_NOT_EQUAL, + D3D11_COMPARISON_GREATER_EQUAL, + D3D11_COMPARISON_ALWAYS + }; + if (bpmem.zmode.testenable) { gx_state.depthdc.DepthEnable = TRUE; @@ -1353,9 +1251,85 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + // D3D11 doesn't support logic blending, so this is a huge hack + // TODO: Make use of D3D11.1's logic blending support + + // 0 0x00 + // 1 Source & destination + // 2 Source & ~destination + // 3 Source + // 4 ~Source & destination + // 5 Destination + // 6 Source ^ destination = Source & ~destination | ~Source & destination + // 7 Source | destination + // 8 ~(Source | destination) + // 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination + // 10 ~Destination + // 11 Source | ~destination + // 12 ~Source + // 13 ~Source | destination + // 14 ~(Source & destination) + // 15 0xff + const D3D11_BLEND_OP d3dLogicOps[16] = + { + D3D11_BLEND_OP_ADD,//0 + D3D11_BLEND_OP_ADD,//1 + D3D11_BLEND_OP_SUBTRACT,//2 + D3D11_BLEND_OP_ADD,//3 + D3D11_BLEND_OP_REV_SUBTRACT,//4 + D3D11_BLEND_OP_ADD,//5 + D3D11_BLEND_OP_MAX,//6 + D3D11_BLEND_OP_ADD,//7 + D3D11_BLEND_OP_MAX,//8 + D3D11_BLEND_OP_MAX,//9 + D3D11_BLEND_OP_ADD,//10 + D3D11_BLEND_OP_ADD,//11 + D3D11_BLEND_OP_ADD,//12 + D3D11_BLEND_OP_ADD,//13 + D3D11_BLEND_OP_ADD,//14 + D3D11_BLEND_OP_ADD//15 + }; + const D3D11_BLEND d3dLogicOpSrcFactors[16] = + { + D3D11_BLEND_ZERO,//0 + D3D11_BLEND_DEST_COLOR,//1 + D3D11_BLEND_ONE,//2 + D3D11_BLEND_ONE,//3 + D3D11_BLEND_DEST_COLOR,//4 + D3D11_BLEND_ZERO,//5 + D3D11_BLEND_INV_DEST_COLOR,//6 + D3D11_BLEND_INV_DEST_COLOR,//7 + D3D11_BLEND_INV_SRC_COLOR,//8 + D3D11_BLEND_INV_SRC_COLOR,//9 + D3D11_BLEND_INV_DEST_COLOR,//10 + D3D11_BLEND_ONE,//11 + D3D11_BLEND_INV_SRC_COLOR,//12 + D3D11_BLEND_INV_SRC_COLOR,//13 + D3D11_BLEND_INV_DEST_COLOR,//14 + D3D11_BLEND_ONE//15 + }; + const D3D11_BLEND d3dLogicOpDestFactors[16] = + { + D3D11_BLEND_ZERO,//0 + D3D11_BLEND_ZERO,//1 + D3D11_BLEND_INV_SRC_COLOR,//2 + D3D11_BLEND_ZERO,//3 + D3D11_BLEND_ONE,//4 + D3D11_BLEND_ONE,//5 + D3D11_BLEND_INV_SRC_COLOR,//6 + D3D11_BLEND_ONE,//7 + D3D11_BLEND_INV_DEST_COLOR,//8 + D3D11_BLEND_SRC_COLOR,//9 + D3D11_BLEND_INV_DEST_COLOR,//10 + D3D11_BLEND_INV_DEST_COLOR,//11 + D3D11_BLEND_INV_SRC_COLOR,//12 + D3D11_BLEND_ONE,//13 + D3D11_BLEND_INV_SRC_COLOR,//14 + D3D11_BLEND_ONE//15 + }; + + if (bpmem.blendmode.logicopenable) { - s_blendMode = 0; gx_state.blenddc.RenderTarget[0].BlendEnable = true; SetBlendOp(d3dLogicOps[bpmem.blendmode.logicmode]); SetSrcBlend(d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]); @@ -1379,18 +1353,32 @@ void Renderer::SetLineWidth() void Renderer::SetSamplerState(int stage, int texindex) { +#define TEXF_NONE 0 +#define TEXF_POINT 1 +#define TEXF_LINEAR 2 + const unsigned int d3dMipFilters[4] = + { + TEXF_NONE, + TEXF_POINT, + TEXF_LINEAR, + TEXF_NONE, //reserved + }; + const D3D11_TEXTURE_ADDRESS_MODE d3dClamps[4] = + { + D3D11_TEXTURE_ADDRESS_CLAMP, + D3D11_TEXTURE_ADDRESS_WRAP, + D3D11_TEXTURE_ADDRESS_MIRROR, + D3D11_TEXTURE_ADDRESS_WRAP //reserved + }; + const FourTexUnits &tex = bpmem.tex[texindex]; const TexMode0 &tm0 = tex.texMode0[stage]; const TexMode1 &tm1 = tex.texMode1[stage]; - unsigned int mip; - mip = (tm0.min_filter == 8) ? TEXF_NONE:d3dMipFilters[tm0.min_filter & 3]; - if ((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) mip = TEXF_NONE; + unsigned int mip = d3dMipFilters[tm0.min_filter & 3]; if (texindex) stage += 4; - // TODO: Clarify whether these values are correct - // NOTE: since there's no "no filter" in DX11 we're using point filters in these cases if (g_ActiveConfig.bForceFiltering) { gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index f750313642..0ff4f4f99a 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -73,148 +73,6 @@ static char *st; static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL; -// State translation lookup tables -static const D3DBLEND d3dSrcFactors[8] = -{ - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_DESTCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_SRCALPHA, - D3DBLEND_INVSRCALPHA, - D3DBLEND_DESTALPHA, - D3DBLEND_INVDESTALPHA -}; - -static const D3DBLEND d3dDestFactors[8] = -{ - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_SRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_SRCALPHA, - D3DBLEND_INVSRCALPHA, - D3DBLEND_DESTALPHA, - D3DBLEND_INVDESTALPHA -}; - -// 0 0x00 -// 1 Source & destination -// 2 Source & ~destination -// 3 Source -// 4 ~Source & destination -// 5 Destination -// 6 Source ^ destination = Source & ~destination | ~Source & destination -// 7 Source | destination - -// 8 ~(Source | destination) -// 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination -// 10 ~Destination -// 11 Source | ~destination -// 12 ~Source -// 13 ~Source | destination -// 14 ~(Source & destination) -// 15 0xff - -static const D3DBLENDOP d3dLogicOpop[16] = -{ - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_SUBTRACT, - D3DBLENDOP_ADD, - D3DBLENDOP_REVSUBTRACT, - D3DBLENDOP_ADD, - D3DBLENDOP_MAX, - D3DBLENDOP_ADD, - - D3DBLENDOP_MAX, - D3DBLENDOP_MAX, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD, - D3DBLENDOP_ADD -}; - -static const D3DBLEND d3dLogicOpSrcFactors[16] = -{ - D3DBLEND_ZERO, - D3DBLEND_DESTCOLOR, - D3DBLEND_ONE, - D3DBLEND_ONE, - D3DBLEND_DESTCOLOR, - D3DBLEND_ZERO, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVDESTCOLOR, - - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_ONE -}; - -static const D3DBLEND d3dLogicOpDestFactors[16] = -{ - D3DBLEND_ZERO, - D3DBLEND_ZERO, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ZERO, - D3DBLEND_ONE, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE, - - D3DBLEND_INVDESTCOLOR, - D3DBLEND_SRCCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVDESTCOLOR, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE, - D3DBLEND_INVSRCCOLOR, - D3DBLEND_ONE -}; - -static const D3DCULL d3dCullModes[4] = -{ - D3DCULL_NONE, - D3DCULL_CCW, - D3DCULL_CW, - D3DCULL_CCW -}; - -static const D3DCMPFUNC d3dCmpFuncs[8] = -{ - D3DCMP_NEVER, - D3DCMP_LESS, - D3DCMP_EQUAL, - D3DCMP_LESSEQUAL, - D3DCMP_GREATER, - D3DCMP_NOTEQUAL, - D3DCMP_GREATEREQUAL, - D3DCMP_ALWAYS -}; - -static const D3DTEXTUREFILTERTYPE d3dMipFilters[4] = -{ - D3DTEXF_NONE, - D3DTEXF_POINT, - D3DTEXF_LINEAR, - D3DTEXF_NONE, //reserved -}; - -static const D3DTEXTUREADDRESS d3dClamps[4] = -{ - D3DTADDRESS_CLAMP, - D3DTADDRESS_WRAP, - D3DTADDRESS_MIRROR, - D3DTADDRESS_WRAP //reserved -}; - void SetupDeviceObjects() { D3D::font.Init(); @@ -796,6 +654,32 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const D3DBLEND d3dSrcFactors[8] = + { + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_DESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_SRCALPHA, + D3DBLEND_INVSRCALPHA, + (target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE, + (target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO + }; + const D3DBLEND d3dDestFactors[8] = + { + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_SRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_SRCALPHA, + D3DBLEND_INVSRCALPHA, + (target_has_alpha) ? D3DBLEND_DESTALPHA : D3DBLEND_ONE, + (target_has_alpha) ? D3DBLEND_INVDESTALPHA : D3DBLEND_ZERO + }; + if (bpmem.blendmode.logicopenable && !forceUpdate) return; @@ -808,8 +692,8 @@ void Renderer::SetBlendMode(bool forceUpdate) } else { - D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))); - if (bpmem.blendmode.blendenable && (!( bpmem.blendmode.srcfactor == 1 && bpmem.blendmode.dstfactor == 0))) + D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, bpmem.blendmode.blendenable); + if (bpmem.blendmode.blendenable) { D3D::SetRenderState(D3DRS_BLENDOP, D3DBLENDOP_ADD); D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[bpmem.blendmode.srcfactor]); @@ -1261,11 +1145,31 @@ void Renderer::RestoreAPIState() void Renderer::SetGenerationMode() { + const D3DCULL d3dCullModes[4] = + { + D3DCULL_NONE, + D3DCULL_CCW, + D3DCULL_CW, + D3DCULL_CCW + }; + D3D::SetRenderState(D3DRS_CULLMODE, d3dCullModes[bpmem.genMode.cullmode]); } void Renderer::SetDepthMode() { + const D3DCMPFUNC d3dCmpFuncs[8] = + { + D3DCMP_NEVER, + D3DCMP_LESS, + D3DCMP_EQUAL, + D3DCMP_LESSEQUAL, + D3DCMP_GREATER, + D3DCMP_NOTEQUAL, + D3DCMP_GREATEREQUAL, + D3DCMP_ALWAYS + }; + if (bpmem.zmode.testenable) { D3D::SetRenderState(D3DRS_ZENABLE, TRUE); @@ -1282,7 +1186,83 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + // D3D9 doesn't support logic blending, so this is a huge hack + + // 0 0x00 + // 1 Source & destination + // 2 Source & ~destination + // 3 Source + // 4 ~Source & destination + // 5 Destination + // 6 Source ^ destination = Source & ~destination | ~Source & destination + // 7 Source | destination + // 8 ~(Source | destination) + // 9 ~(Source ^ destination) = ~Source & ~destination | Source & destination + // 10 ~Destination + // 11 Source | ~destination + // 12 ~Source + // 13 ~Source | destination + // 14 ~(Source & destination) + // 15 0xff + const D3DBLENDOP d3dLogicOpop[16] = + { + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_SUBTRACT, + D3DBLENDOP_ADD, + D3DBLENDOP_REVSUBTRACT, + D3DBLENDOP_ADD, + D3DBLENDOP_MAX, + D3DBLENDOP_ADD, + D3DBLENDOP_MAX, + D3DBLENDOP_MAX, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD, + D3DBLENDOP_ADD + }; + const D3DBLEND d3dLogicOpSrcFactors[16] = + { + D3DBLEND_ZERO, + D3DBLEND_DESTCOLOR, + D3DBLEND_ONE, + D3DBLEND_ONE, + D3DBLEND_DESTCOLOR, + D3DBLEND_ZERO, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_ONE + }; + const D3DBLEND d3dLogicOpDestFactors[16] = + { + D3DBLEND_ZERO, + D3DBLEND_ZERO, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ZERO, + D3DBLEND_ONE, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_SRCCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVDESTCOLOR, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE, + D3DBLEND_INVSRCCOLOR, + D3DBLEND_ONE + }; + + if (bpmem.blendmode.logicopenable) { D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, true); D3D::SetRenderState(D3DRS_BLENDOP, d3dLogicOpop[bpmem.blendmode.logicmode]); @@ -1310,6 +1290,21 @@ void Renderer::SetLineWidth() void Renderer::SetSamplerState(int stage, int texindex) { + const D3DTEXTUREFILTERTYPE d3dMipFilters[4] = + { + D3DTEXF_NONE, + D3DTEXF_POINT, + D3DTEXF_LINEAR, + D3DTEXF_NONE, //reserved + }; + const D3DTEXTUREADDRESS d3dClamps[4] = + { + D3DTADDRESS_CLAMP, + D3DTADDRESS_WRAP, + D3DTADDRESS_MIRROR, + D3DTADDRESS_WRAP //reserved + }; + const FourTexUnits &tex = bpmem.tex[texindex]; const TexMode0 &tm0 = tex.texMode0[stage]; const TexMode1 &tm1 = tex.texMode1[stage]; @@ -1323,13 +1318,11 @@ void Renderer::SetSamplerState(int stage, int texindex) { min = (tm0.min_filter & 4) ? D3DTEXF_LINEAR : D3DTEXF_POINT; mag = tm0.mag_filter ? D3DTEXF_LINEAR : D3DTEXF_POINT; - mip = (tm0.min_filter == 8) ? D3DTEXF_NONE : d3dMipFilters[tm0.min_filter & 3]; - if((tm0.min_filter & 3) && (tm0.min_filter != 8) && ((tm1.max_lod >> 4) == 0)) - mip = D3DTEXF_NONE; + mip = d3dMipFilters[tm0.min_filter & 3]; } if (texindex) stage += 4; - + if (mag == D3DTEXF_LINEAR && min == D3DTEXF_LINEAR && g_ActiveConfig.iMaxAnisotropy) { min = D3DTEXF_ANISOTROPIC; @@ -1340,8 +1333,7 @@ void Renderer::SetSamplerState(int stage, int texindex) D3D::SetSamplerState(stage, D3DSAMP_ADDRESSU, d3dClamps[tm0.wrap_s]); D3D::SetSamplerState(stage, D3DSAMP_ADDRESSV, d3dClamps[tm0.wrap_t]); - //float SuperSampleCoeficient = (s_LastAA < 3)? s_LastAA + 1 : s_LastAA - 1;// uncoment this changes to conserve detail when incresing ssaa level - float lodbias = (tm0.lod_bias / 32.0f);// + (s_LastAA)?(log(SuperSampleCoeficient) / log(2.0f)):0; + float lodbias = tm0.lod_bias / 32.0f; D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a10aaf7204..3ff8b834ce 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -132,58 +132,6 @@ const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_ static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; static std::vector s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR -static const GLenum glSrcFactors[8] = -{ - GL_ZERO, - GL_ONE, - GL_DST_COLOR, - GL_ONE_MINUS_DST_COLOR, - GL_SRC_ALPHA, - GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA -}; - -static const GLenum glDestFactors[8] = { - GL_ZERO, - GL_ONE, - GL_SRC_COLOR, - GL_ONE_MINUS_SRC_COLOR, - GL_SRC_ALPHA, - GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA - GL_DST_ALPHA, - GL_ONE_MINUS_DST_ALPHA -}; - -static const GLenum glCmpFuncs[8] = { - GL_NEVER, - GL_LESS, - GL_EQUAL, - GL_LEQUAL, - GL_GREATER, - GL_NOTEQUAL, - GL_GEQUAL, - GL_ALWAYS -}; - -static const GLenum glLogicOpCodes[16] = { - GL_CLEAR, - GL_AND, - GL_AND_REVERSE, - GL_COPY, - GL_AND_INVERTED, - GL_NOOP, - GL_XOR, - GL_OR, - GL_NOR, - GL_EQUIV, - GL_INVERT, - GL_OR_REVERSE, - GL_COPY_INVERTED, - GL_OR_INVERTED, - GL_NAND, - GL_SET -}; #if defined HAVE_CG && HAVE_CG void HandleCgError(CGcontext ctx, CGerror err, void* appdata) @@ -908,6 +856,32 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) void Renderer::SetBlendMode(bool forceUpdate) { + // Our render target always uses an alpha channel, so we need to override the blend functions to assume a destination alpha of 1 if the render target isn't supposed to have an alpha channel + // Example: D3DBLEND_DESTALPHA needs to be D3DBLEND_ONE since the result without an alpha channel is assumed to always be 1. + bool target_has_alpha = bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + const GLenum glSrcFactors[8] = + { + GL_ZERO, + GL_ONE, + GL_DST_COLOR, + GL_ONE_MINUS_DST_COLOR, + GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA + (target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE, + (target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO + }; + const GLenum glDestFactors[8] = + { + GL_ZERO, + GL_ONE, + GL_SRC_COLOR, + GL_ONE_MINUS_SRC_COLOR, + GL_SRC_ALPHA, + GL_ONE_MINUS_SRC_ALPHA, // NOTE: If dual-source blending is enabled, use SRC1_ALPHA + (target_has_alpha) ? GL_DST_ALPHA : (GLenum)GL_ONE, + (target_has_alpha) ? GL_ONE_MINUS_DST_ALPHA : (GLenum)GL_ZERO + }; + // blend mode bit mask // 0 - blend enable // 2 - reverse subtract enable (else add) @@ -951,10 +925,10 @@ void Renderer::SetBlendMode(bool forceUpdate) if (changes & 0x1F8) { -#ifdef USE_DUAL_SOURCE_BLEND GLenum srcFactor = glSrcFactors[(newval >> 3) & 7]; - GLenum srcFactorAlpha = srcFactor; GLenum dstFactor = glDestFactors[(newval >> 6) & 7]; +#ifdef USE_DUAL_SOURCE_BLEND + GLenum srcFactorAlpha = srcFactor; GLenum dstFactorAlpha = dstFactor; if (useDualSource) { @@ -975,7 +949,7 @@ void Renderer::SetBlendMode(bool forceUpdate) // blend RGB change glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha); #else - glBlendFunc(glSrcFactors[(newval >> 3) & 7], glDestFactors[(newval >> 6) & 7]); + glBlendFunc(srcFactor, dstFactor); #endif } @@ -1438,6 +1412,18 @@ void Renderer::SetGenerationMode() void Renderer::SetDepthMode() { + const GLenum glCmpFuncs[8] = + { + GL_NEVER, + GL_LESS, + GL_EQUAL, + GL_LEQUAL, + GL_GREATER, + GL_NOTEQUAL, + GL_GEQUAL, + GL_ALWAYS + }; + if (bpmem.zmode.testenable) { glEnable(GL_DEPTH_TEST); @@ -1454,7 +1440,27 @@ void Renderer::SetDepthMode() void Renderer::SetLogicOpMode() { - if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) + const GLenum glLogicOpCodes[16] = + { + GL_CLEAR, + GL_AND, + GL_AND_REVERSE, + GL_COPY, + GL_AND_INVERTED, + GL_NOOP, + GL_XOR, + GL_OR, + GL_NOR, + GL_EQUIV, + GL_INVERT, + GL_OR_REVERSE, + GL_COPY_INVERTED, + GL_OR_INVERTED, + GL_NAND, + GL_SET + }; + + if (bpmem.blendmode.logicopenable) { glEnable(GL_COLOR_LOGIC_OP); glLogicOp(glLogicOpCodes[bpmem.blendmode.logicmode]); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index 1c43ed1d59..a21333e534 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -58,24 +58,6 @@ namespace OGL static u32 s_TempFramebuffer = 0; -static const GLint c_MinLinearFilter[8] = { - GL_NEAREST, - GL_NEAREST_MIPMAP_NEAREST, - GL_NEAREST_MIPMAP_LINEAR, - GL_NEAREST, - GL_LINEAR, - GL_LINEAR_MIPMAP_NEAREST, - GL_LINEAR_MIPMAP_LINEAR, - GL_LINEAR, -}; - -static const GLint c_WrapSettings[4] = { - GL_CLAMP_TO_EDGE, - GL_REPEAT, - GL_MIRRORED_REPEAT, - GL_REPEAT, -}; - bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level) { int width = std::max(virtual_width >> level, 1); @@ -357,32 +339,41 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1) { - // TODO: not used anywhere - TexMode0 mode = newmode; - //mode1 = newmode1; + const GLint c_MinLinearFilter[8] = + { + GL_NEAREST, + GL_NEAREST_MIPMAP_NEAREST, + GL_NEAREST_MIPMAP_LINEAR, + GL_NEAREST, + GL_LINEAR, + GL_LINEAR_MIPMAP_NEAREST, + GL_LINEAR_MIPMAP_LINEAR, + GL_LINEAR, + }; + const GLint c_WrapSettings[4] = + { + GL_CLAMP_TO_EDGE, + GL_REPEAT, + GL_MIRRORED_REPEAT, + GL_REPEAT, + }; glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, - (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); + (newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST); - if (bHaveMipMaps) - { - // TODO: not used anywhere - if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4) - mode.min_filter += 4; // take equivalent forced linear + int filt = newmode.min_filter; + if (g_ActiveConfig.bForceFiltering && filt < 4) + filt += 4; // take equivalent forced linear - int filt = newmode.min_filter; - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod >> 4); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod >> 4); - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, (newmode.lod_bias / 32.0f)); - } - else - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, - (g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt]); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, newmode1.min_lod / 16.f); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, newmode1.max_lod / 16.f); + glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, newmode.lod_bias / 32.0f); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]); + // TODO: Reset anisotrop when changed to 1 if (g_Config.iMaxAnisotropy >= 1) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy)); From 8f5fb7e6f98b3283b5f3688e15cdab30fe842eef Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 14:15:47 -0600 Subject: [PATCH 541/627] Hopefully buildfix Windows. (thanks for the patch, RachelB) --- Source/Core/Core/Src/HW/Wiimote.h | 5 ---- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 13 -------- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 30 +++++++++++-------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 13 ++++++++ Source/Core/DolphinWX/Src/Main.cpp | 4 --- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 2 +- 6 files changed, 32 insertions(+), 35 deletions(-) diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h index d514cf9909..dd0e6df389 100644 --- a/Source/Core/Core/Src/HW/Wiimote.h +++ b/Source/Core/Core/Src/HW/Wiimote.h @@ -44,11 +44,6 @@ void Refresh(); void LoadSettings(); -#ifdef _WIN32 -int PairUp(bool unpair = false); -int UnPair(); -#endif - } #endif diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 24e25e9a2b..2d3ed01e6d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -164,19 +164,6 @@ bool Wiimote::Connect() return true; } -void Wiimote::StartThread() -{ - m_run_thread = true; - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); -} - -void Wiimote::StopThread() -{ - m_run_thread = false; - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); -} - void Wiimote::Disconnect() { close(cmd_sock); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index e285a33729..77555bae86 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -73,6 +73,8 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; +int PairUp(bool unpair); + inline void init_lib() { if (!initialized) @@ -132,6 +134,9 @@ WiimoteScanner::WiimoteScanner() init_lib(); } +WiimoteScanner::~WiimoteScanner() +{} + // Find and connect wiimotes. // Does not replace already found wiimotes even if they are disconnected. // wm is an array of max_wiimotes wiimotes @@ -198,7 +203,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) wm->dev_handle = dev; memcpy(wm->devicepath, detail_data->DevicePath, 197); - found_wiimotes.push_back(wm); + wiimotes.push_back(wm); } if (detail_data) @@ -206,7 +211,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) SetupDiDestroyDeviceInfoList(device_info); - return found_wiimotes; + return wiimotes; } bool WiimoteScanner::IsReady() const @@ -262,15 +267,15 @@ bool Wiimote::IsConnected() const int Wiimote::IORead(unsigned char* buf) { - //*buf = 0; + DWORD b; if (!ReadFile(dev_handle, buf, MAX_PAYLOAD, &b, &hid_overlap)) { // Partial read - auto const b = GetLastError(); + b = GetLastError(); if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) { // Remote disconnect - RealDisconnect(); + Disconnect(); return 0; } @@ -308,14 +313,15 @@ int Wiimote::IORead(unsigned char* buf) return MAX_PAYLOAD; // XXX } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::IOWrite(const u8* buf, int len) { + DWORD bytes = 0; switch (stack) { case MSBT_STACK_UNKNOWN: { // Try to auto-detect the stack type - DWORD bytes = 0; + auto i = WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); if (i) { @@ -324,7 +330,7 @@ int Wiimote::IOWrite(unsigned char* buf, int len) return i; } - i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); + i = HidD_SetOutputReport(dev_handle, (unsigned char*) buf + 1, len - 1); if (i) { stack = MSBT_STACK_MS; @@ -343,20 +349,20 @@ int Wiimote::IOWrite(unsigned char* buf, int len) { ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); // Correct? - return -1 + return -1; } break; } case MSBT_STACK_MS: { - i = HidD_SetOutputReport(dev_handle, buf + 1, len - 1); - dw = GetLastError(); + auto i = HidD_SetOutputReport(dev_handle, (unsigned char*) buf + 1, len - 1); + auto dw = GetLastError(); if (dw == 121) { // Semaphore timeout NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); - RealDisconnect(); + Disconnect(); return 0; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 516fa3a51e..eb4856d2f9 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -357,6 +357,19 @@ void WiimoteScanner::ThreadFunc() } } +void Wiimote::StartThread() +{ + m_run_thread = true; + m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); +} + +void Wiimote::StopThread() +{ + m_run_thread = false; + if (m_wiimote_thread.joinable()) + m_wiimote_thread.join(); +} + void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 338ed59547..d9d1908de3 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -390,10 +390,6 @@ void DolphinApp::InitLanguageSupport() int DolphinApp::OnExit() { WiimoteReal::Shutdown(); -#ifdef _WIN32 - if (SConfig::GetInstance().m_WiiAutoUnpair) - WiimoteReal::UnPair(); -#endif VideoBackend::ClearList(); SConfig::Shutdown(); LogManager::Shutdown(); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index d38eadb0e1..b50ec9bc5d 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -81,7 +81,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin wxFlexGridSizer* const real_wiimotes_sizer = new wxFlexGridSizer(3, 5, 5); real_wiimotes_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER_VERTICAL); #ifdef _WIN32 - real_wiimotes_sizer->Add(pairup_btn); + //real_wiimotes_sizer->Add(pairup_btn); #endif real_wiimotes_sizer->Add(refresh_btn); real_wiimotes_group->Add(real_wiimotes_sizer, 1, wxALL, 5); From 85f25ded4c210b633411fd373a775de5f1792a1f Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 14:22:21 -0600 Subject: [PATCH 542/627] Buildfix! Programming for Windows on Linux is hard, OK? --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 77555bae86..1d82a19e1a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -73,7 +73,7 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; -int PairUp(bool unpair); +int PairUp(bool unpair = false); inline void init_lib() { From 9ecfb5e75d5f636a1c29c38bf67700dba6090d53 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 14:42:50 -0600 Subject: [PATCH 543/627] Buildfix for real! --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 13 ++++++++----- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index b22f1c7795..114feebeb7 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -26,9 +26,12 @@ WiimoteScanner::WiimoteScanner() return; } +WiimoteScanner::~WiimoteScanner() +{} + std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { - return std::vector() + return std::vector(); } bool WiimoteScanner::IsReady() const @@ -46,17 +49,17 @@ void Wiimote::Disconnect() return; } -bool Wiimote::IsOpen() const +bool Wiimote::IsConnected() const { - return IsConnected(); + return false; } -int Wiimote::IORead(unsigned char* buf) +int Wiimote::Read(const u8* buf) { return 0; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::Write(const u8* buf, int len) { return 0; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 1d82a19e1a..407e3b6f4f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -73,8 +73,6 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; -int PairUp(bool unpair = false); - inline void init_lib() { if (!initialized) @@ -129,6 +127,8 @@ inline void init_lib() namespace WiimoteReal { +int PairUp(bool unpair = false); + WiimoteScanner::WiimoteScanner() { init_lib(); From 95d08db46fd54b37cb375980f97e1c0e11676419 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 7 Feb 2013 21:44:51 +0100 Subject: [PATCH 544/627] Revert "[bugfix] DX9::TextureCache: Use max_lod instead of min_lod where necessary." This reverts commit 6c8a22de24e1e374c4357ca653ac584c8a6adfac. --- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 0f0432e96b..0657309801 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1336,7 +1336,7 @@ void Renderer::SetSamplerState(int stage, int texindex) float lodbias = (s32)tm0.lod_bias / 32.0f; D3D::SetSamplerState(stage, D3DSAMP_MIPMAPLODBIAS, *(DWORD*)&lodbias); - D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.max_lod >> 4); + D3D::SetSamplerState(stage, D3DSAMP_MAXMIPLEVEL, tm1.min_lod >> 4); } void Renderer::SetInterlacingMode() From 57ea09dcc2b2d51193e7f3c07cbd38ea9a7f85bd Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 14:46:01 -0600 Subject: [PATCH 545/627] Fix BT-less! --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 114feebeb7..c696cc8012 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -54,12 +54,12 @@ bool Wiimote::IsConnected() const return false; } -int Wiimote::Read(const u8* buf) +int Wiimote::IORead(const u8* buf) { return 0; } -int Wiimote::Write(const u8* buf, int len) +int Wiimote::IOWrite(const u8* buf, int len) { return 0; } From a2ca76ebd9c3300735c438b5ddc7bc726001b41a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 15:16:41 -0600 Subject: [PATCH 546/627] Buildfix. --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index c696cc8012..6af169f5ee 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -54,7 +54,7 @@ bool Wiimote::IsConnected() const return false; } -int Wiimote::IORead(const u8* buf) +int Wiimote::IORead(u8* buf) { return 0; } From 3063942dd05d432fe0b750770e5159252b4ae199 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 21:53:09 -0600 Subject: [PATCH 547/627] some cleanup --- .../Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 5 +- .../Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h | 4 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 128 +++++------------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 6 +- 4 files changed, 41 insertions(+), 102 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index cfb81bb768..5c2a28b57a 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -252,9 +252,8 @@ void Wiimote::RequestStatus(const wm_request_status* const rs) if (g_wiimotes[m_index]) { - wm_request_status rpt; - rpt.rumble = 0; - g_wiimotes[m_index]->SendPacket(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); + wm_request_status rpt = {}; + g_wiimotes[m_index]->QueueReport(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); } return; diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h index fd7c549e8d..9d1a2092a0 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h +++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteHid.h @@ -201,6 +201,7 @@ struct wm_report #define WM_LEDS 0x11 struct wm_leds { u8 rumble : 1; + // real wii also sets bit 0x2 (unknown purpose) u8 : 3; u8 leds : 4; }; @@ -208,8 +209,9 @@ struct wm_leds { #define WM_REPORT_MODE 0x12 struct wm_report_mode { u8 rumble : 1; - u8 continuous : 1; // these 2 seem to be named wrong + // unsure what "all_the_time" actually is, the real wii does set it (bit 0x2) u8 all_the_time : 1; + u8 continuous : 1; u8 : 5; u8 mode; }; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index a7963ec4e0..dda9e32b5f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -61,13 +61,11 @@ Wiimote::Wiimote() #if defined(__linux__) && HAVE_BLUEZ bdaddr = (bdaddr_t){{0, 0, 0, 0, 0, 0}}; #endif - - DisableDataReporting(); } Wiimote::~Wiimote() { - StopThread(); + StopThread(); if (IsConnected()) Disconnect(); @@ -80,26 +78,28 @@ Wiimote::~Wiimote() delete[] rpt.first; } -// Silly, copying data n stuff, o well, don't use this too often -void Wiimote::SendPacket(const u8 rpt_id, const void* const data, const unsigned int size) +// to be called from CPU thread +void Wiimote::QueueReport(u8 rpt_id, const void* _data, unsigned int size) { + auto const data = static_cast(_data); + Report rpt; rpt.second = size + 2; rpt.first = new u8[rpt.second]; - rpt.first[0] = 0xA1; + rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT; rpt.first[1] = rpt_id; - memcpy(rpt.first + 2, data, size); + std::copy(data, data + size, rpt.first + 2); m_write_reports.Push(rpt); } void Wiimote::DisableDataReporting() { - wm_report_mode rpt; + wm_report_mode rpt = {}; rpt.mode = WM_REPORT_CORE; rpt.all_the_time = 0; rpt.continuous = 0; rpt.rumble = 0; - SendPacket(WM_REPORT_MODE, &rpt, sizeof(rpt)); + QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt)); } void Wiimote::ClearReadQueue() @@ -133,24 +133,24 @@ void Wiimote::ControlChannel(const u16 channel, const void* const data, const u3 } } -void Wiimote::InterruptChannel(const u16 channel, const void* const data, const u32 size) +void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const u32 size) { - if (0 == m_channel) // first interrupt/control channel sent + // first interrupt/control channel sent + if (channel != m_channel) { + m_channel = channel; + ClearReadQueue(); - // request status - wm_request_status rpt; - rpt.rumble = 0; - SendPacket(WM_REQUEST_STATUS, &rpt, sizeof(rpt)); + EmuStart(); } - - m_channel = channel; // this right? + + auto const data = static_cast(_data); Report rpt; rpt.first = new u8[size]; rpt.second = (u8)size; - memcpy(rpt.first, (u8*)data, size); + std::copy(data, data + size, rpt.first); // Convert output DATA packets to SET_REPORT packets. // Nintendo Wiimotes work without this translation, but 3rd @@ -173,7 +173,8 @@ bool Wiimote::Read() if (0 == rpt.second) Disconnect(); - if (rpt.second > 0 && m_channel > 0) { + if (rpt.second > 0 && m_channel > 0) + { // Add it to queue m_read_reports.Push(rpt); return true; @@ -241,27 +242,18 @@ void Wiimote::Update() delete[] rpt.first; } -void Wiimote::EmuStop() -{ - m_channel = 0; - - DisableDataReporting(); - - NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting"); -} - // Rumble briefly -void Wiimote::Rumble() +void Wiimote::RumbleBriefly() { unsigned char buffer = 0x01; DEBUG_LOG(WIIMOTE, "Starting rumble..."); - SendRequest(WM_CMD_RUMBLE, &buffer, 1); + QueueReport(WM_CMD_RUMBLE, &buffer, sizeof(buffer)); SLEEP(200); DEBUG_LOG(WIIMOTE, "Stopping rumble..."); buffer = 0x00; - SendRequest(WM_CMD_RUMBLE, &buffer, 1); + QueueReport(WM_CMD_RUMBLE, &buffer, sizeof(buffer)); } // Set the active LEDs. @@ -270,30 +262,21 @@ void Wiimote::SetLEDs(int new_leds) { // Remove the lower 4 bits because they control rumble u8 const buffer = (new_leds & 0xF0); - SendRequest(WM_CMD_LED, &buffer, 1); + QueueReport(WM_CMD_LED, &buffer, sizeof(buffer)); } bool Wiimote::EmuStart() { - // Send a handshake - - // Set buffer[0] to 0x04 for continuous reporting - u8 const buffer[2] = {0x04, 0x30}; - - NOTICE_LOG(WIIMOTE, "Sending handshake to wiimote"); - - return SendRequest(WM_CMD_REPORT_TYPE, buffer, 2); + DisableDataReporting(); } -// Send a packet to the wiimote. -// report_type should be one of WIIMOTE_CMD_LED, WIIMOTE_CMD_RUMBLE, etc. -bool Wiimote::SendRequest(u8 report_type, u8 const* data, int length) +void Wiimote::EmuStop() { - unsigned char buffer[32] = {WM_SET_REPORT | WM_BT_OUTPUT, report_type}; + m_channel = 0; - memcpy(buffer + 2, data, length); + DisableDataReporting(); - return (IOWrite(buffer, length + 2) != 0); + NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting"); } unsigned int CalculateWantedWiimotes() @@ -369,9 +352,6 @@ void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); - // rumble briefly - Rumble(); - // main loop while (m_run_thread && IsConnected()) { @@ -464,7 +444,10 @@ void HandleWiimoteConnect(Wiimote* wm) wm->index = i; wm->StartThread(); + + wm->DisableDataReporting(); wm->SetLEDs(WIIMOTE_LED_1 << i); + wm->RumbleBriefly(); Host_ConnectWiimote(i, true); @@ -516,52 +499,7 @@ void Refresh() { std::lock_guard lk(g_refresh_lock); -#ifdef _WIN32 - Shutdown(); - Initialize(); -#else -/* - // Make sure real wiimotes have been initialized - if (!g_real_wiimotes_initialized) - { - Initialize(); - return; - } - - // Find the number of slots configured for real wiimotes - unsigned int wanted_wiimotes = 0; - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]) - ++wanted_wiimotes; - - // Remove wiimotes that are paired with slots no longer configured for a - // real wiimote or that are disconnected - for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) - if (g_wiimotes[i] && (!(WIIMOTE_SRC_REAL & g_wiimote_sources[i]) || - !g_wiimotes[i]->IsConnected())) - { - delete g_wiimotes[i]; - g_wiimotes[i] = NULL; - --g_wiimotes_found; - } - - // Scan for wiimotes if we want more - if (wanted_wiimotes > g_wiimotes_found) - { - // Scan for wiimotes - unsigned int num_wiimotes = FindWiimotes(g_wiimotes, wanted_wiimotes); - - DEBUG_LOG(WIIMOTE, "Found %i Real Wiimotes, %i wanted", num_wiimotes, wanted_wiimotes); - - // Connect newly found wiimotes. - int num_new_wiimotes = ConnectWiimotes(g_wiimotes); - - DEBUG_LOG(WIIMOTE, "Connected to %i additional Real Wiimotes", num_new_wiimotes); - - g_wiimotes_found = num_wiimotes; - } -*/ -#endif + // TODO: stuff, maybe } void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index d61967b4f1..0dee443597 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -70,10 +70,11 @@ public: bool IsConnected() const; void SetLEDs(int leds); + void RumbleBriefly(); void DisableDataReporting(); - void Rumble(); - void SendPacket(const u8 rpt_id, const void* const data, const unsigned int size); + + void QueueReport(u8 rpt_id, const void* data, unsigned int size); int index; @@ -102,7 +103,6 @@ protected: private: void ClearReadQueue(); - bool SendRequest(u8 report_type, u8 const* data, int length); int IORead(u8* buf); int IOWrite(u8 const* buf, int len); From 026793fa4abfd7e2d1b6f443022e621b81bddac9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 23:17:51 -0600 Subject: [PATCH 548/627] Fixup real wiimote GUI. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 42 +++++++------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 29 +++++++--- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 3 +- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 57 +++---------------- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 6 -- 5 files changed, 50 insertions(+), 87 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 1ac7ed03f4..25a83531dc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -135,7 +135,10 @@ WiimoteScanner::WiimoteScanner() } WiimoteScanner::~WiimoteScanner() -{} +{ + // TODO: what do we want here? + //PairUp(true); +} // Find and connect wiimotes. // Does not replace already found wiimotes even if they are disconnected. @@ -216,8 +219,21 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) bool WiimoteScanner::IsReady() const { - // TODO: impl - return true; + BLUETOOTH_FIND_RADIO_PARAMS radioParam; + radioParam.dwSize = sizeof(radioParam); + + HANDLE hRadio; + HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); + + if (NULL != hFindRadio) + { + Bth_BluetoothFindRadioClose(hFindRadio); + return true; + } + else + { + return false; + } } // Connect to a wiimote with a known device path. @@ -377,26 +393,6 @@ int Wiimote::IOWrite(const u8* buf, int len) return 0; } -// return true if a device using MS BT stack is available -bool CanPairUp() -{ - BLUETOOTH_FIND_RADIO_PARAMS radioParam; - radioParam.dwSize = sizeof(radioParam); - - HANDLE hRadio; - HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); - - if (NULL != hFindRadio) - { - Bth_BluetoothFindRadioClose(hFindRadio); - return true; - } - else - { - return false; - } -} - // WiiMote Pair-Up, function will return amount of either new paired or unpaired devices // negative number on failure int PairUp(bool unpair) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index dda9e32b5f..5b8ee72f16 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -265,7 +265,7 @@ void Wiimote::SetLEDs(int new_leds) QueueReport(WM_CMD_LED, &buffer, sizeof(buffer)); } -bool Wiimote::EmuStart() +void Wiimote::EmuStart() { DisableDataReporting(); } @@ -298,7 +298,10 @@ void WiimoteScanner::WantWiimotes(size_t count) void WiimoteScanner::StartScanning() { run_thread = true; - scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); + if (IsReady()) + { + scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); + } } void WiimoteScanner::StopScanning() @@ -307,7 +310,6 @@ void WiimoteScanner::StopScanning() if (scan_thread.joinable()) { scan_thread.join(); - NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped"); } } @@ -333,6 +335,8 @@ void WiimoteScanner::ThreadFunc() //std::this_thread::yield(); Common::SleepCurrentThread(500); } + + NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped"); } void Wiimote::StartThread() @@ -395,8 +399,7 @@ void Initialize() auto const wanted_wiimotes = CalculateWantedWiimotes(); g_wiimote_scanner.WantWiimotes(wanted_wiimotes); - //if (wanted_wiimotes > 0) - g_wiimote_scanner.StartScanning(); + g_wiimote_scanner.StartScanning(); g_real_wiimotes_initialized = true; } @@ -497,9 +500,21 @@ void HandleFoundWiimotes(const std::vector& wiimotes) // This is called from the GUI thread void Refresh() { + g_wiimote_scanner.StopScanning(); + + { std::lock_guard lk(g_refresh_lock); - - // TODO: stuff, maybe + + auto wanted_wiimotes = CalculateWantedWiimotes(); + auto const found_wiimotes = g_wiimote_scanner.FindWiimotes(wanted_wiimotes); + + HandleFoundWiimotes(found_wiimotes); + + wanted_wiimotes = CalculateWantedWiimotes(); + g_wiimote_scanner.WantWiimotes(wanted_wiimotes); + } + + g_wiimote_scanner.StartScanning(); } void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 0dee443597..23631765ed 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -59,7 +59,7 @@ public: void StopThread(); // "handshake" / stop packets - bool EmuStart(); + void EmuStart(); void EmuStop(); // connecting and disconnecting from physical devices @@ -153,6 +153,7 @@ private: }; extern std::recursive_mutex g_refresh_lock; +extern WiimoteScanner g_wiimote_scanner; extern Wiimote *g_wiimotes[4]; void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index b50ec9bc5d..a4af2d5d9a 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -4,14 +4,6 @@ #include "HW/WiimoteReal/WiimoteReal.h" #include "Frame.h" -wxString ConnectedWiimotesString() -{ - //static wxString str; - //str.Printf(_("%i connected"), WiimoteReal::Initialize()); - //return str; - return "TODO: this text"; -} - WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) , m_plugin(plugin) @@ -65,27 +57,17 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin // "Real wiimotes" controls - connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString()); - wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition); refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); -#ifdef _WIN32 - //wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition); - //pairup_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::PairUpRealWiimotes, this); - // TODO: text if can't Pair -#endif - // "Real wiimotes" layout - wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Real Wiimotes")); - wxFlexGridSizer* const real_wiimotes_sizer = new wxFlexGridSizer(3, 5, 5); - real_wiimotes_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER_VERTICAL); -#ifdef _WIN32 - //real_wiimotes_sizer->Add(pairup_btn); -#endif - real_wiimotes_sizer->Add(refresh_btn); - real_wiimotes_group->Add(real_wiimotes_sizer, 1, wxALL, 5); - + wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes")); + + if (!WiimoteReal::g_wiimote_scanner.IsReady()) + real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n" + "You must manually pair your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5); + + real_wiimotes_group->Add(refresh_btn, 0, wxALIGN_CENTER); // "General Settings" controls const wxString str[] = { _("Bottom"), _("Top") }; @@ -189,15 +171,9 @@ void WiimoteConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev) m_emu_config_diag->Destroy(); } -void WiimoteConfigDiag::UpdateGUI() -{ - connected_wiimotes_txt->SetLabel(ConnectedWiimotesString()); -} - void WiimoteConfigDiag::RefreshRealWiimotes(wxCommandEvent&) { WiimoteReal::Refresh(); - UpdateGUI(); } void WiimoteConfigDiag::SelectSource(wxCommandEvent& event) @@ -214,24 +190,6 @@ void WiimoteConfigDiag::SelectSource(wxCommandEvent& event) wiimote_configure_bt[index]->Enable(); } -// TODO: race conditiions -void WiimoteConfigDiag::UpdateWiimoteStatus() -{ - for (int index = 0; index < 4; ++index) - { - if (m_orig_wiimote_sources[index] != g_wiimote_sources[index]) - { - // Disconnect first, otherwise the new source doesn't seem to work - CFrame::ConnectWiimote(index, false); - // Connect wiimotes - if (WIIMOTE_SRC_EMU & g_wiimote_sources[index]) - CFrame::ConnectWiimote(index, true); - else if (WIIMOTE_SRC_REAL & g_wiimote_sources[index] && WiimoteReal::g_wiimotes[index]) - CFrame::ConnectWiimote(index, WiimoteReal::g_wiimotes[index]->IsConnected()); - } - } -} - void WiimoteConfigDiag::RevertSource() { for (int i = 0; i < 4; ++i) @@ -253,7 +211,6 @@ void WiimoteConfigDiag::Save(wxCommandEvent& event) sec.Set("Source", (int)g_wiimote_sources[i]); } - UpdateWiimoteStatus(); inifile.Save(ini_filename); diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index fbd715bd40..316d0d48bf 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -26,15 +26,11 @@ public: void RefreshRealWiimotes(wxCommandEvent& event); - void SelectSource(wxCommandEvent& event); - void UpdateWiimoteStatus(); void RevertSource(); - void ConfigEmulatedWiimote(wxCommandEvent& event); void Save(wxCommandEvent& event); - void UpdateGUI(); void OnSensorBarPos(wxCommandEvent& event) { @@ -73,8 +69,6 @@ private: wxButton* wiimote_configure_bt[4]; std::map m_wiimote_index_from_conf_bt_id; - - wxStaticText* connected_wiimotes_txt; }; From 87bbdbf5428b94520b44a97df53a5f7ee1e9945d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 23:23:32 -0600 Subject: [PATCH 549/627] Remove settings stuff that was not actually used anywhere. --- Source/Core/Core/Src/ConfigManager.cpp | 20 +------------------- Source/Core/Core/Src/ConfigManager.h | 5 ----- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index f6194c1bb7..978eadace1 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -100,9 +100,6 @@ SConfig::SConfig() { // Make sure we have log manager LoadSettings(); - //Make sure we load any extra settings - LoadSettingsWii(); - } void SConfig::Init() @@ -427,19 +424,4 @@ void SConfig::LoadSettings() } m_SYSCONF = new SysConf(); -} -void SConfig::LoadSettingsWii() -{ - IniFile ini; - //Wiimote configs - ini.Load((File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini")); - for (int i = 0; i < 4; i++) - { - char SectionName[32]; - sprintf(SectionName, "Wiimote%i", i + 1); - ini.Get(SectionName, "AutoReconnectRealWiimote", &m_WiiAutoReconnect[i], false); - } - ini.Load((File::GetUserPath(D_CONFIG_IDX) + "wiimote.ini")); - ini.Get("Real", "Unpair", &m_WiiAutoUnpair, false); - -} +} \ No newline at end of file diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index e92d29ee65..e3ad7b42a9 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -41,8 +41,6 @@ struct SConfig : NonCopyable // Wii Devices bool m_WiiSDCard; bool m_WiiKeyboard; - bool m_WiiAutoReconnect[4]; - bool m_WiiAutoUnpair; bool m_WiimoteReconnectOnLoad; // name of the last used filename @@ -107,9 +105,6 @@ struct SConfig : NonCopyable // load settings void LoadSettings(); - //Special load settings - void LoadSettingsWii(); - // Return the permanent and somewhat globally used instance of this struct static SConfig& GetInstance() {return(*m_Instance);} From 8ce58759e33202342b79a611f4ebdd0a5b1a2bf5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 23:52:50 -0600 Subject: [PATCH 550/627] Remove some old nonsense. --- Source/Core/Common/Src/Common.h | 1 - .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 3 +- Source/Core/DolphinWX/Src/Frame.cpp | 31 ------------------- Source/Core/VideoCommon/Src/EmuWindow.cpp | 4 --- 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index c3cab37dd8..0132915a5c 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -155,7 +155,6 @@ enum HOST_COMM WM_USER_CREATE, WM_USER_SETCURSOR, WM_USER_KEYDOWN, - WIIMOTE_DISCONNECT // Disconnect Wiimote }; // Used for notification on emulation state diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 6e06f60dd6..b3449ec059 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -211,8 +211,7 @@ void CWII_IPC_HLE_WiiMote::EventConnectionAccepted() void CWII_IPC_HLE_WiiMote::EventDisconnect() { // Send disconnect message to plugin - u8 Message = WIIMOTE_DISCONNECT; - Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, &Message, 0); + Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, NULL, 0); m_ConnectionState = CONN_INACTIVE; // Clear channel flags diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index d390b8afcd..46b3a1e8e5 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -100,37 +100,6 @@ CPanel::CPanel( else SetCursor(wxNullCursor); break; - - case WIIMOTE_DISCONNECT: - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) - { - const int wiimote_idx = lParam; - const int wiimote_num = wiimote_idx + 1; - - //Auto reconnect if option is turned on. - //TODO: Make this only auto reconnect wiimotes that have the option activated. - SConfig::GetInstance().LoadSettingsWii();//Make sure we are using the newest settings. - if (SConfig::GetInstance().m_WiiAutoReconnect[wiimote_idx]) - { - GetUsbPointer()->AccessWiiMote(wiimote_idx | 0x100)->Activate(true); - NOTICE_LOG(WIIMOTE, "Wiimote %i has been auto-reconnected...", wiimote_num); - } - else - { - // The Wiimote has been disconnected, we offer reconnect here. - wxMessageDialog *dlg = new wxMessageDialog( - this, - wxString::Format(_("Wiimote %i has been disconnected by system.\nMaybe this game doesn't support multi-wiimote,\nor maybe it is due to idle time out or other reason.\nDo you want to reconnect immediately?"), wiimote_num), - _("Reconnect Wiimote Confirm"), - wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, - wxDefaultPosition); - - if (dlg->ShowModal() == wxID_YES) - GetUsbPointer()->AccessWiiMote(wiimote_idx | 0x100)->Activate(true); - - dlg->Destroy(); - } - } } break; diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp index cbb0bc31ac..81227ba0ca 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.cpp +++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp @@ -205,10 +205,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) OnKeyDown(lParam); FreeLookInput((u32)wParam, lParam); } - else if (wParam == WIIMOTE_DISCONNECT) - { - PostMessage(m_hParent, WM_USER, wParam, lParam); - } break; // Called when a screensaver wants to show up while this window is active From 1998da867b57a7f6cee3320059e9c259abee64bd Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 8 Feb 2013 12:14:45 -0600 Subject: [PATCH 551/627] OSX fix maybe. (based on jchadwick's patch) --- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 87 ++++++++----------- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 1 + 2 files changed, 38 insertions(+), 50 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 95068fe650..2e53daca36 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -10,19 +10,6 @@ } @end -WiimoteScanner::WiimoteScanner() -{} - -std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) -{ - return std::vector(); -} - -bool WiimoteScanner::IsReady() const -{ - return false; -} - @implementation SearchBT - (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender error: (IOReturn) error @@ -112,34 +99,35 @@ bool WiimoteScanner::IsReady() const namespace WiimoteReal { -// Find wiimotes. -// wm is an array of max_wiimotes wiimotes -// Returns the total number of found wiimotes. -int FindWiimotes(Wiimote **wm, int max_wiimotes) +WiimoteScanner::WiimoteScanner() +{} + +WiimoteScanner::~WiimoteScanner() +{} + +std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { + // TODO: find the device in the constructor and save it for later + + std::vector wiimotes; IOBluetoothHostController *bth; IOBluetoothDeviceInquiry *bti; SearchBT *sbt; NSEnumerator *en; - int found_devices = 0, found_wiimotes = 0; - - // Count the number of already found wiimotes - for (int i = 0; i < MAX_WIIMOTES; ++i) - if (wm[i]) - found_wiimotes++; bth = [[IOBluetoothHostController alloc] init]; - if ([bth addressAsString] == nil) { + if ([bth addressAsString] == nil) + { WARN_LOG(WIIMOTE, "No bluetooth host controller"); [bth release]; - return found_wiimotes; + return wiimotes; } sbt = [[SearchBT alloc] init]; - sbt->maxDevices = max_wiimotes - found_wiimotes; + sbt->maxDevices = max_wiimotes; bti = [[IOBluetoothDeviceInquiry alloc] init]; [bti setDelegate: sbt]; - [bti setInquiryLength: 5]; + [bti setInquiryLength: 2]; if ([bti start] == kIOReturnSuccess) [bti retain]; @@ -149,10 +137,9 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes) CFRunLoopRun(); [bti stop]; - found_devices = [[bti foundDevices] count]; + int found_devices = [[bti foundDevices] count]; - NOTICE_LOG(WIIMOTE, "Found %i bluetooth device%c", found_devices, - found_devices == 1 ? '\0' : 's'); + NOTICE_LOG(WIIMOTE, "Found %i bluetooth devices", found_devices); en = [[bti foundDevices] objectEnumerator]; for (int i = 0; i < found_devices; i++) @@ -160,24 +147,26 @@ int FindWiimotes(Wiimote **wm, int max_wiimotes) IOBluetoothDevice *dev = [en nextObject]; if (!IsValidBluetoothName([[dev name] UTF8String])) continue; - // Find an unused slot - for (int k = 0; k < MAX_WIIMOTES; k++) { - if (wm[k] != NULL || - !(g_wiimote_sources[k] & WIIMOTE_SRC_REAL)) - continue; - wm[k] = new Wiimote(k); - wm[k]->btd = dev; - found_wiimotes++; + Wiimote *wm = new Wiimote(); + wm->btd = dev; + wiimotes.push_back(wm); + + if(wiimotes.size() >= max_wiimotes) break; - } } [bth release]; [bti release]; [sbt release]; - return found_wiimotes; + return wiimotes; +} + +bool WiimoteScanner::IsReady() const +{ + // TODO: only return true when a BT device is present + return true; } // Connect to a wiimote with a known address. @@ -192,7 +181,8 @@ bool Wiimote::Connect() withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; [btd openL2CAPChannelSync: &ichan withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt]; - if (ichan == NULL || cchan == NULL) { + if (ichan == NULL || cchan == NULL) + { ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); Disconnect(); @@ -209,11 +199,6 @@ bool Wiimote::Connect() m_connected = true; - Handshake(); - SetLEDs(WIIMOTE_LED_1 << index); - - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); - [cbt release]; return true; @@ -240,9 +225,9 @@ void Wiimote::Disconnect() ichan = NULL; } -bool Wiimote::IsOpen() const +bool Wiimote::IsConnected() const { - return IsConnected(); + return m_connected; } int Wiimote::IORead(unsigned char *buf) @@ -251,6 +236,8 @@ int Wiimote::IORead(unsigned char *buf) if (!IsConnected()) return 0; + + // TODO: race conditions here, yo bytes = inputlen; memcpy(buf, input, bytes); @@ -259,14 +246,14 @@ int Wiimote::IORead(unsigned char *buf) return bytes; } -int Wiimote::IOWrite(unsigned char *buf, int len) +int Wiimote::IOWrite(const unsigned char *buf, int len) { IOReturn ret; if (!IsConnected()) return 0; - ret = [ichan writeAsync: buf length: len refcon: nil]; + ret = [ichan writeAsync: const_cast((void *)buf) length: len refcon: nil]; if (ret == kIOReturnSuccess) return len; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 23631765ed..139d59ce99 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -84,6 +84,7 @@ public: IOBluetoothL2CAPChannel *cchan; char input[MAX_PAYLOAD]; int inputlen; + bool m_connected; #elif defined(__linux__) && HAVE_BLUEZ bdaddr_t bdaddr; // Bluetooth address int cmd_sock; // Command socket From a11827cdf0ccc55b9a3f6259a27a9324e24cd018 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 8 Feb 2013 16:20:15 -0600 Subject: [PATCH 552/627] Use different reply delays for various DI commands. Fixes issue 5983. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 16 ++++++- .../Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 43 +++++++++++++++++-- Source/Core/Core/Src/State.cpp | 2 +- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 4149931353..1fe6986179 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -84,6 +84,8 @@ static ipc_msg_queue reply_queue; // arm -> ppc static int enque_reply; +static u64 last_reply_time; + void EnqueReplyCallback(u64 userdata, int) { reply_queue.push_back(userdata); @@ -163,6 +165,7 @@ void Reset(bool _bHard) } request_queue.clear(); reply_queue.clear(); + last_reply_time = 0; } void Shutdown() @@ -246,6 +249,7 @@ void DoState(PointerWrap &p) { p.Do(request_queue); p.Do(reply_queue); + p.Do(last_reply_time); TDeviceMap::const_iterator itr; @@ -518,8 +522,18 @@ void ExecuteCommand(u32 _Address) if (CmdSuccess) { + // Ensure replies happen in order, fairly ugly + // Without this, tons of games fail now that DI commads have different reply delays + int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; + + const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks(); + + if (ticks_til_last_reply > 0) + reply_delay = ticks_til_last_reply; + + last_reply_time = CoreTiming::GetTicks() + reply_delay; + // Generate a reply to the IPC command - int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; EnqReply(_Address, reply_delay); } else diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index 0d610edb8c..b6e3254d98 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -462,8 +462,43 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 return 1; } -int CWII_IPC_HLE_Device_di::GetCmdDelay(u32) +int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) { - // Less than ~1/150th of a second hangs Oregon Trail at "loading wheel". - return SystemTimers::GetTicksPerSecond() / 100; -} \ No newline at end of file + u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10); + u32 Command = Memory::Read_U32(BufferIn) >> 24; + + // Hacks below + + switch (Command) + { + case DVDLowRead: + case DVDLowUnencryptedRead: + { + u32 const Size = Memory::Read_U32(BufferIn + 0x04); + // Delay depends on size of read, that makes sense, right? + // More than ~1150K "bytes / sec" hangs NSMBWii on boot. + // Less than ~800K "bytes / sec" hangs DKCR randomly. + return SystemTimers::GetTicksPerSecond() / 975000 * Size; + break; + } + + case DVDLowClearCoverInterrupt: + // Less than ~1/155th of a second hangs Oregon Trail at "loading wheel". + // More than ~1/140th of a second hangs Resident Evil Archives: Resident Evil Zero. + return SystemTimers::GetTicksPerSecond() / 146; + break; + +// case DVDLowAudioBufferConfig: +// case DVDLowInquiry: +// case DVDLowReadDiskID: +// case DVDLowWaitForCoverClose: +// case DVDLowGetCoverReg: +// case DVDLowGetCoverStatus: +// case DVDLowReset: +// case DVDLowClosePartition: + default: + // ranom numbers here! + return SystemTimers::GetTicksPerSecond() / 1500; + break; + } +} diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index a9d56cc16a..200642eccb 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 11; +static const u32 STATE_VERSION = 12; struct StateHeader { From 1f1b4a6992553d132de3fc8b097fdfbba78ff556 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 8 Feb 2013 16:54:48 -0600 Subject: [PATCH 553/627] Hopefully make real wiimotes on OSX less crashy. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 12 ++++++++---- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 2e53daca36..030daa0973 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -40,8 +40,11 @@ { IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; + + std::lock_guard lk(g_refresh_lock); - for (int i = 0; i < MAX_WIIMOTES; i++) { + for (int i = 0; i < MAX_WIIMOTES; i++) + { if (WiimoteReal::g_wiimotes[i] == NULL) continue; if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE) @@ -77,8 +80,11 @@ { IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; + + std::lock_guard lk(g_refresh_lock); - for (int i = 0; i < MAX_WIIMOTES; i++) { + for (int i = 0; i < MAX_WIIMOTES; i++) + { if (WiimoteReal::g_wiimotes[i] == NULL) continue; if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE) @@ -236,8 +242,6 @@ int Wiimote::IORead(unsigned char *buf) if (!IsConnected()) return 0; - - // TODO: race conditions here, yo bytes = inputlen; memcpy(buf, input, bytes); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 5b8ee72f16..7ae1a9a961 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -360,13 +360,13 @@ void Wiimote::ThreadFunc() while (m_run_thread && IsConnected()) { #ifdef __APPLE__ - while (Write()) {} - Common::SleepCurrentThread(1); + // Reading happens elsewhere on OSX + bool const did_something = Write(); #else bool const did_something = Write() || Read(); +#endif if (!did_something) Common::SleepCurrentThread(1); -#endif } } From 9bb9286cd3b1dca212d9e5ebd95960f102ea79bc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 8 Feb 2013 16:59:59 -0600 Subject: [PATCH 554/627] OSX buildfix! --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 030daa0973..02f3941fc8 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -41,7 +41,7 @@ IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(WiimoteReal::g_refresh_lock); for (int i = 0; i < MAX_WIIMOTES; i++) { @@ -81,7 +81,7 @@ IOBluetoothDevice *device = [l2capChannel getDevice]; WiimoteReal::Wiimote *wm = NULL; - std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(WiimoteReal::g_refresh_lock); for (int i = 0; i < MAX_WIIMOTES; i++) { From 50c83d614cba54f2720b889be3dd3bd8fea4840c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 8 Feb 2013 21:20:54 -0600 Subject: [PATCH 555/627] More attempts at fixing Windows and OS X. --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 3 ++ Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 45 ++++++++++--------- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 6 --- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 2d3ed01e6d..e926d44ec0 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -178,6 +178,9 @@ bool Wiimote::IsConnected() const return cmd_sock != -1;// && int_sock != -1; } +// positive = read packet +// negative = didn't read packet +// zero = error int Wiimote::IORead(u8* buf) { // Block select for 1/2000th of a second diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 25a83531dc..8226c784e8 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -148,12 +148,9 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { PairUp(); - std::vector wiimotes; - GUID device_id; HANDLE dev; HDEVINFO device_info; - int found_wiimotes = 0; DWORD len; SP_DEVICE_INTERFACE_DATA device_data; PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; @@ -167,13 +164,11 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) // Get all hid devices connected device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); - for (int index = 0; found_wiimotes < max_wiimotes; ++index) + std::vector wiimotes; + for (int index = 0; wiimotes.size() < max_wiimotes; ++index) { - if (detail_data) - { - free(detail_data); - detail_data = NULL; - } + free(detail_data); + detail_data = NULL; // Query the next hid device info if (!SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data)) @@ -188,7 +183,10 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) if (!SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) continue; + auto const wm = new Wiimote; + // Open new device +#if 0 dev = CreateFile(detail_data->DevicePath, (GENERIC_READ | GENERIC_WRITE), (FILE_SHARE_READ | FILE_SHARE_WRITE), @@ -199,18 +197,15 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) // Get device attributes attr.Size = sizeof(attr); HidD_GetAttributes(dev, &attr); - - // Find an unused slot - unsigned int k = 0; - auto const wm = new Wiimote; + wm->dev_handle = dev; +#endif wm->devicepath = detail_data->DevicePath; wiimotes.push_back(wm); } - if (detail_data) - free(detail_data); + free(detail_data); SetupDiDestroyDeviceInfoList(device_info); @@ -219,6 +214,8 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) bool WiimoteScanner::IsReady() const { + // TODO: don't search for a radio each time + BLUETOOTH_FIND_RADIO_PARAMS radioParam; radioParam.dwSize = sizeof(radioParam); @@ -241,7 +238,7 @@ bool Wiimote::Connect() { dev_handle = CreateFile(devicepath.c_str(), (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE), + /*(FILE_SHARE_READ | FILE_SHARE_WRITE)*/ 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); if (dev_handle == INVALID_HANDLE_VALUE) @@ -281,8 +278,13 @@ bool Wiimote::IsConnected() const return dev_handle != 0; } +// positive = read packet +// negative = didn't read packet +// zero = error int Wiimote::IORead(unsigned char* buf) { + *buf = 0; + DWORD b; if (!ReadFile(dev_handle, buf, MAX_PAYLOAD, &b, &hid_overlap)) { @@ -291,7 +293,6 @@ int Wiimote::IORead(unsigned char* buf) if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) { // Remote disconnect - Disconnect(); return 0; } @@ -299,24 +300,23 @@ int Wiimote::IORead(unsigned char* buf) if (r == WAIT_TIMEOUT) { // Timeout - cancel and continue - if (*buf) WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", WIIMOTE_DEFAULT_TIMEOUT); CancelIo(dev_handle); ResetEvent(hid_overlap.hEvent); - return 0; + return -1; } else if (r == WAIT_FAILED) { WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); - return 0; + return -1; } if (!GetOverlappedResult(dev_handle, &hid_overlap, &b, 0)) { - return 0; + return -1; } } @@ -378,7 +378,6 @@ int Wiimote::IOWrite(const u8* buf, int len) { // Semaphore timeout NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); - Disconnect(); return 0; } @@ -418,6 +417,8 @@ int PairUp(bool unpair) radioParam.dwSize = sizeof(radioParam); HANDLE hRadio; + + // TODO: save radio(s) in the WiimoteScanner constructor // Enumerate BT radios HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 02f3941fc8..f3c90d810d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -213,16 +213,10 @@ bool Wiimote::Connect() // Disconnect a wiimote. void Wiimote::Disconnect() { - if (!IsConnected()) - return; - NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1); m_connected = false; - if (m_wiimote_thread.joinable()) - m_wiimote_thread.join(); - [btd closeConnection]; [ichan release]; [cchan release]; From 6645bd6fc685fed5894e4bbb8c323ed4835e1efc Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 9 Feb 2013 12:38:20 +0100 Subject: [PATCH 556/627] Fix a crash in the FifoPlayer dialog. --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 254b1a6bc7..81268e3467 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -624,7 +624,9 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event) int stream_size = Common::swap16(objectdata); objectdata += 2; wxString newLabel = wxString::Format(wxT("%08X: %02X %04X "), obj_offset, cmd, stream_size); - if ((objectdata_end - objectdata) % stream_size) newLabel += _("NOTE: Stream size doesn't match actual data length\n"); + if (stream_size && ((objectdata_end - objectdata) % stream_size)) + newLabel += _("NOTE: Stream size doesn't match actual data length\n"); + while (objectdata < objectdata_end) { newLabel += wxString::Format(wxT("%02X"), *objectdata++); From 1c64b1993de02405e563c5fa13d5b4cb7818c520 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 9 Feb 2013 17:02:22 -0600 Subject: [PATCH 557/627] Change the ugly "no banner" banner to the sexy "X" from the website. --- Source/Core/DolphinWX/resources/no_banner.cpp | 303 ++---------------- 1 file changed, 26 insertions(+), 277 deletions(-) diff --git a/Source/Core/DolphinWX/resources/no_banner.cpp b/Source/Core/DolphinWX/resources/no_banner.cpp index 2b84caa430..df8d51d737 100644 --- a/Source/Core/DolphinWX/resources/no_banner.cpp +++ b/Source/Core/DolphinWX/resources/no_banner.cpp @@ -1,279 +1,28 @@ static const unsigned char no_banner_png[] = { -0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, -0x08, 0x06, 0x00, 0x00, 0x00, 0xed, 0xc0, 0x7d, 0x54, 0x00, 0x00, 0x00, -0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, -0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x0a, 0x4f, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, -0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x00, -0x00, 0x78, 0xda, 0x9d, 0x53, 0x67, 0x54, 0x53, 0xe9, 0x16, 0x3d, 0xf7, -0xde, 0xf4, 0x42, 0x4b, 0x88, 0x80, 0x94, 0x4b, 0x6f, 0x52, 0x15, 0x08, -0x20, 0x52, 0x42, 0x8b, 0x80, 0x14, 0x91, 0x26, 0x2a, 0x21, 0x09, 0x10, -0x4a, 0x88, 0x21, 0xa1, 0xd9, 0x15, 0x51, 0xc1, 0x11, 0x45, 0x45, 0x04, -0x1b, 0xc8, 0xa0, 0x88, 0x03, 0x8e, 0x8e, 0x80, 0x8c, 0x15, 0x51, 0x2c, -0x0c, 0x8a, 0x0a, 0xd8, 0x07, 0xe4, 0x21, 0xa2, 0x8e, 0x83, 0xa3, 0x88, -0x8a, 0xca, 0xfb, 0xe1, 0x7b, 0xa3, 0x6b, 0xd6, 0xbc, 0xf7, 0xe6, 0xcd, -0xfe, 0xb5, 0xd7, 0x3e, 0xe7, 0xac, 0xf3, 0x9d, 0xb3, 0xcf, 0x07, 0xc0, -0x08, 0x0c, 0x96, 0x48, 0x33, 0x51, 0x35, 0x80, 0x0c, 0xa9, 0x42, 0x1e, -0x11, 0xe0, 0x83, 0xc7, 0xc4, 0xc6, 0xe1, 0xe4, 0x2e, 0x40, 0x81, 0x0a, -0x24, 0x70, 0x00, 0x10, 0x08, 0xb3, 0x64, 0x21, 0x73, 0xfd, 0x23, 0x01, -0x00, 0xf8, 0x7e, 0x3c, 0x3c, 0x2b, 0x22, 0xc0, 0x07, 0xbe, 0x00, 0x01, -0x78, 0xd3, 0x0b, 0x08, 0x00, 0xc0, 0x4d, 0x9b, 0xc0, 0x30, 0x1c, 0x87, -0xff, 0x0f, 0xea, 0x42, 0x99, 0x5c, 0x01, 0x80, 0x84, 0x01, 0xc0, 0x74, -0x91, 0x38, 0x4b, 0x08, 0x80, 0x14, 0x00, 0x40, 0x7a, 0x8e, 0x42, 0xa6, -0x00, 0x40, 0x46, 0x01, 0x80, 0x9d, 0x98, 0x26, 0x53, 0x00, 0xa0, 0x04, -0x00, 0x60, 0xcb, 0x63, 0x62, 0xe3, 0x00, 0x50, 0x2d, 0x00, 0x60, 0x27, -0x7f, 0xe6, 0xd3, 0x00, 0x80, 0x9d, 0xf8, 0x99, 0x7b, 0x01, 0x00, 0x5b, -0x94, 0x21, 0x15, 0x01, 0xa0, 0x91, 0x00, 0x20, 0x13, 0x65, 0x88, 0x44, -0x00, 0x68, 0x3b, 0x00, 0xac, 0xcf, 0x56, 0x8a, 0x45, 0x00, 0x58, 0x30, -0x00, 0x14, 0x66, 0x4b, 0xc4, 0x39, 0x00, 0xd8, 0x2d, 0x00, 0x30, 0x49, -0x57, 0x66, 0x48, 0x00, 0xb0, 0xb7, 0x00, 0xc0, 0xce, 0x10, 0x0b, 0xb2, -0x00, 0x08, 0x0c, 0x00, 0x30, 0x51, 0x88, 0x85, 0x29, 0x00, 0x04, 0x7b, -0x00, 0x60, 0xc8, 0x23, 0x23, 0x78, 0x00, 0x84, 0x99, 0x00, 0x14, 0x46, -0xf2, 0x57, 0x3c, 0xf1, 0x2b, 0xae, 0x10, 0xe7, 0x2a, 0x00, 0x00, 0x78, -0x99, 0xb2, 0x3c, 0xb9, 0x24, 0x39, 0x45, 0x81, 0x5b, 0x08, 0x2d, 0x71, -0x07, 0x57, 0x57, 0x2e, 0x1e, 0x28, 0xce, 0x49, 0x17, 0x2b, 0x14, 0x36, -0x61, 0x02, 0x61, 0x9a, 0x40, 0x2e, 0xc2, 0x79, 0x99, 0x19, 0x32, 0x81, -0x34, 0x0f, 0xe0, 0xf3, 0xcc, 0x00, 0x00, 0xa0, 0x91, 0x15, 0x11, 0xe0, -0x83, 0xf3, 0xfd, 0x78, 0xce, 0x0e, 0xae, 0xce, 0xce, 0x36, 0x8e, 0xb6, -0x0e, 0x5f, 0x2d, 0xea, 0xbf, 0x06, 0xff, 0x22, 0x62, 0x62, 0xe3, 0xfe, -0xe5, 0xcf, 0xab, 0x70, 0x40, 0x00, 0x00, 0xe1, 0x74, 0x7e, 0xd1, 0xfe, -0x2c, 0x2f, 0xb3, 0x1a, 0x80, 0x3b, 0x06, 0x80, 0x6d, 0xfe, 0xa2, 0x25, -0xee, 0x04, 0x68, 0x5e, 0x0b, 0xa0, 0x75, 0xf7, 0x8b, 0x66, 0xb2, 0x0f, -0x40, 0xb5, 0x00, 0xa0, 0xe9, 0xda, 0x57, 0xf3, 0x70, 0xf8, 0x7e, 0x3c, -0x3c, 0x45, 0xa1, 0x90, 0xb9, 0xd9, 0xd9, 0xe5, 0xe4, 0xe4, 0xd8, 0x4a, -0xc4, 0x42, 0x5b, 0x61, 0xca, 0x57, 0x7d, 0xfe, 0x67, 0xc2, 0x5f, 0xc0, -0x57, 0xfd, 0x6c, 0xf9, 0x7e, 0x3c, 0xfc, 0xf7, 0xf5, 0xe0, 0xbe, 0xe2, -0x24, 0x81, 0x32, 0x5d, 0x81, 0x47, 0x04, 0xf8, 0xe0, 0xc2, 0xcc, 0xf4, -0x4c, 0xa5, 0x1c, 0xcf, 0x92, 0x09, 0x84, 0x62, 0xdc, 0xe6, 0x8f, 0x47, -0xfc, 0xb7, 0x0b, 0xff, 0xfc, 0x1d, 0xd3, 0x22, 0xc4, 0x49, 0x62, 0xb9, -0x58, 0x2a, 0x14, 0xe3, 0x51, 0x12, 0x71, 0x8e, 0x44, 0x9a, 0x8c, 0xf3, -0x32, 0xa5, 0x22, 0x89, 0x42, 0x92, 0x29, 0xc5, 0x25, 0xd2, 0xff, 0x64, -0xe2, 0xdf, 0x2c, 0xfb, 0x03, 0x3e, 0xdf, 0x35, 0x00, 0xb0, 0x6a, 0x3e, -0x01, 0x7b, 0x91, 0x2d, 0xa8, 0x5d, 0x63, 0x03, 0xf6, 0x4b, 0x27, 0x10, -0x58, 0x74, 0xc0, 0xe2, 0xf7, 0x00, 0x00, 0xf2, 0xbb, 0x6f, 0xc1, 0xd4, -0x28, 0x08, 0x03, 0x80, 0x68, 0x83, 0xe1, 0xcf, 0x77, 0xff, 0xef, 0x3f, -0xfd, 0x47, 0xa0, 0x25, 0x00, 0x80, 0x66, 0x49, 0x92, 0x71, 0x00, 0x00, -0x5e, 0x44, 0x24, 0x2e, 0x54, 0xca, 0xb3, 0x3f, 0xc7, 0x08, 0x00, 0x00, -0x44, 0xa0, 0x81, 0x2a, 0xb0, 0x41, 0x1b, 0xf4, 0xc1, 0x18, 0x2c, 0xc0, -0x06, 0x1c, 0xc1, 0x05, 0xdc, 0xc1, 0x0b, 0xfc, 0x60, 0x36, 0x84, 0x42, -0x24, 0xc4, 0xc2, 0x42, 0x10, 0x42, 0x0a, 0x64, 0x80, 0x1c, 0x72, 0x60, -0x29, 0xac, 0x82, 0x42, 0x28, 0x86, 0xcd, 0xb0, 0x1d, 0x2a, 0x60, 0x2f, -0xd4, 0x40, 0x1d, 0x34, 0xc0, 0x51, 0x68, 0x86, 0x93, 0x70, 0x0e, 0x2e, -0xc2, 0x55, 0xb8, 0x0e, 0x3d, 0x70, 0x0f, 0xfa, 0x61, 0x08, 0x9e, 0xc1, -0x28, 0xbc, 0x81, 0x09, 0x04, 0x41, 0xc8, 0x08, 0x13, 0x61, 0x21, 0xda, -0x88, 0x01, 0x62, 0x8a, 0x58, 0x23, 0x8e, 0x08, 0x17, 0x99, 0x85, 0xf8, -0x21, 0xc1, 0x48, 0x04, 0x12, 0x8b, 0x24, 0x20, 0xc9, 0x88, 0x14, 0x51, -0x22, 0x4b, 0x91, 0x35, 0x48, 0x31, 0x52, 0x8a, 0x54, 0x20, 0x55, 0x48, -0x1d, 0xf2, 0x3d, 0x72, 0x02, 0x39, 0x87, 0x5c, 0x46, 0xba, 0x91, 0x3b, -0xc8, 0x00, 0x32, 0x82, 0xfc, 0x86, 0xbc, 0x47, 0x31, 0x94, 0x81, 0xb2, -0x51, 0x3d, 0xd4, 0x0c, 0xb5, 0x43, 0xb9, 0xa8, 0x37, 0x1a, 0x84, 0x46, -0xa2, 0x0b, 0xd0, 0x64, 0x74, 0x31, 0x9a, 0x8f, 0x16, 0xa0, 0x9b, 0xd0, -0x72, 0xb4, 0x1a, 0x3d, 0x8c, 0x36, 0xa1, 0xe7, 0xd0, 0xab, 0x68, 0x0f, -0xda, 0x8f, 0x3e, 0x43, 0xc7, 0x30, 0xc0, 0xe8, 0x18, 0x07, 0x33, 0xc4, -0x6c, 0x30, 0x2e, 0xc6, 0xc3, 0x42, 0xb1, 0x38, 0x2c, 0x09, 0x93, 0x63, -0xcb, 0xb1, 0x22, 0xac, 0x0c, 0xab, 0xc6, 0x1a, 0xb0, 0x56, 0xac, 0x03, -0xbb, 0x89, 0xf5, 0x63, 0xcf, 0xb1, 0x77, 0x04, 0x12, 0x81, 0x45, 0xc0, -0x09, 0x36, 0x04, 0x77, 0x42, 0x20, 0x61, 0x1e, 0x41, 0x48, 0x58, 0x4c, -0x58, 0x4e, 0xd8, 0x48, 0xa8, 0x20, 0x1c, 0x24, 0x34, 0x11, 0xda, 0x09, -0x37, 0x09, 0x03, 0x84, 0x51, 0xc2, 0x27, 0x22, 0x93, 0xa8, 0x4b, 0xb4, -0x26, 0xba, 0x11, 0xf9, 0xc4, 0x18, 0x62, 0x32, 0x31, 0x87, 0x58, 0x48, -0x2c, 0x23, 0xd6, 0x12, 0x8f, 0x13, 0x2f, 0x10, 0x7b, 0x88, 0x43, 0xc4, -0x37, 0x24, 0x12, 0x89, 0x43, 0x32, 0x27, 0xb9, 0x90, 0x02, 0x49, 0xb1, -0xa4, 0x54, 0xd2, 0x12, 0xd2, 0x46, 0xd2, 0x6e, 0x52, 0x23, 0xe9, 0x2c, -0xa9, 0x9b, 0x34, 0x48, 0x1a, 0x23, 0x93, 0xc9, 0xda, 0x64, 0x6b, 0xb2, -0x07, 0x39, 0x94, 0x2c, 0x20, 0x2b, 0xc8, 0x85, 0xe4, 0x9d, 0xe4, 0xc3, -0xe4, 0x33, 0xe4, 0x1b, 0xe4, 0x21, 0xf2, 0x5b, 0x0a, 0x9d, 0x62, 0x40, -0x71, 0xa4, 0xf8, 0x53, 0xe2, 0x28, 0x52, 0xca, 0x6a, 0x4a, 0x19, 0xe5, -0x10, 0xe5, 0x34, 0xe5, 0x06, 0x65, 0x98, 0x32, 0x41, 0x55, 0xa3, 0x9a, -0x52, 0xdd, 0xa8, 0xa1, 0x54, 0x11, 0x35, 0x8f, 0x5a, 0x42, 0xad, 0xa1, -0xb6, 0x52, 0xaf, 0x51, 0x87, 0xa8, 0x13, 0x34, 0x75, 0x9a, 0x39, 0xcd, -0x83, 0x16, 0x49, 0x4b, 0xa5, 0xad, 0xa2, 0x95, 0xd3, 0x1a, 0x68, 0x17, -0x68, 0xf7, 0x69, 0xaf, 0xe8, 0x74, 0xba, 0x11, 0xdd, 0x95, 0x1e, 0x4e, -0x97, 0xd0, 0x57, 0xd2, 0xcb, 0xe9, 0x47, 0xe8, 0x97, 0xe8, 0x03, 0xf4, -0x77, 0x0c, 0x0d, 0x86, 0x15, 0x83, 0xc7, 0x88, 0x67, 0x28, 0x19, 0x9b, -0x18, 0x07, 0x18, 0x67, 0x19, 0x77, 0x18, 0xaf, 0x98, 0x4c, 0xa6, 0x19, -0xd3, 0x8b, 0x19, 0xc7, 0x54, 0x30, 0x37, 0x31, 0xeb, 0x98, 0xe7, 0x99, -0x0f, 0x99, 0x6f, 0x55, 0x58, 0x2a, 0xb6, 0x2a, 0x7c, 0x15, 0x91, 0xca, -0x0a, 0x95, 0x4a, 0x95, 0x26, 0x95, 0x1b, 0x2a, 0x2f, 0x54, 0xa9, 0xaa, -0xa6, 0xaa, 0xde, 0xaa, 0x0b, 0x55, 0xf3, 0x55, 0xcb, 0x54, 0x8f, 0xa9, -0x5e, 0x53, 0x7d, 0xae, 0x46, 0x55, 0x33, 0x53, 0xe3, 0xa9, 0x09, 0xd4, -0x96, 0xab, 0x55, 0xaa, 0x9d, 0x50, 0xeb, 0x53, 0x1b, 0x53, 0x67, 0xa9, -0x3b, 0xa8, 0x87, 0xaa, 0x67, 0xa8, 0x6f, 0x54, 0x3f, 0xa4, 0x7e, 0x59, -0xfd, 0x89, 0x06, 0x59, 0xc3, 0x4c, 0xc3, 0x4f, 0x43, 0xa4, 0x51, 0xa0, -0xb1, 0x5f, 0xe3, 0xbc, 0xc6, 0x20, 0x0b, 0x63, 0x19, 0xb3, 0x78, 0x2c, -0x21, 0x6b, 0x0d, 0xab, 0x86, 0x75, 0x81, 0x35, 0xc4, 0x26, 0xb1, 0xcd, -0xd9, 0x7c, 0x76, 0x2a, 0xbb, 0x98, 0xfd, 0x1d, 0xbb, 0x8b, 0x3d, 0xaa, -0xa9, 0xa1, 0x39, 0x43, 0x33, 0x4a, 0x33, 0x57, 0xb3, 0x52, 0xf3, 0x94, -0x66, 0x3f, 0x07, 0xe3, 0x98, 0x71, 0xf8, 0x9c, 0x74, 0x4e, 0x09, 0xe7, -0x28, 0xa7, 0x97, 0xf3, 0x7e, 0x8a, 0xde, 0x14, 0xef, 0x29, 0xe2, 0x29, -0x1b, 0xa6, 0x34, 0x4c, 0xb9, 0x31, 0x65, 0x5c, 0x6b, 0xaa, 0x96, 0x97, -0x96, 0x58, 0xab, 0x48, 0xab, 0x51, 0xab, 0x47, 0xeb, 0xbd, 0x36, 0xae, -0xed, 0xa7, 0x9d, 0xa6, 0xbd, 0x45, 0xbb, 0x59, 0xfb, 0x81, 0x0e, 0x41, -0xc7, 0x4a, 0x27, 0x5c, 0x27, 0x47, 0x67, 0x8f, 0xce, 0x05, 0x9d, 0xe7, -0x53, 0xd9, 0x53, 0xdd, 0xa7, 0x0a, 0xa7, 0x16, 0x4d, 0x3d, 0x3a, 0xf5, -0xae, 0x2e, 0xaa, 0x6b, 0xa5, 0x1b, 0xa1, 0xbb, 0x44, 0x77, 0xbf, 0x6e, -0xa7, 0xee, 0x98, 0x9e, 0xbe, 0x5e, 0x80, 0x9e, 0x4c, 0x6f, 0xa7, 0xde, -0x79, 0xbd, 0xe7, 0xfa, 0x1c, 0x7d, 0x2f, 0xfd, 0x54, 0xfd, 0x6d, 0xfa, -0xa7, 0xf5, 0x47, 0x0c, 0x58, 0x06, 0xb3, 0x0c, 0x24, 0x06, 0xdb, 0x0c, -0xce, 0x18, 0x3c, 0xc5, 0x35, 0x71, 0x6f, 0x3c, 0x1d, 0x2f, 0xc7, 0xdb, -0xf1, 0x51, 0x43, 0x5d, 0xc3, 0x40, 0x43, 0xa5, 0x61, 0x95, 0x61, 0x97, -0xe1, 0x84, 0x91, 0xb9, 0xd1, 0x3c, 0xa3, 0xd5, 0x46, 0x8d, 0x46, 0x0f, -0x8c, 0x69, 0xc6, 0x5c, 0xe3, 0x24, 0xe3, 0x6d, 0xc6, 0x6d, 0xc6, 0xa3, -0x26, 0x06, 0x26, 0x21, 0x26, 0x4b, 0x4d, 0xea, 0x4d, 0xee, 0x9a, 0x52, -0x4d, 0xb9, 0xa6, 0x29, 0xa6, 0x3b, 0x4c, 0x3b, 0x4c, 0xc7, 0xcd, 0xcc, -0xcd, 0xa2, 0xcd, 0xd6, 0x99, 0x35, 0x9b, 0x3d, 0x31, 0xd7, 0x32, 0xe7, -0x9b, 0xe7, 0x9b, 0xd7, 0x9b, 0xdf, 0xb7, 0x60, 0x5a, 0x78, 0x5a, 0x2c, -0xb6, 0xa8, 0xb6, 0xb8, 0x65, 0x49, 0xb2, 0xe4, 0x5a, 0xa6, 0x59, 0xee, -0xb6, 0xbc, 0x6e, 0x85, 0x5a, 0x39, 0x59, 0xa5, 0x58, 0x55, 0x5a, 0x5d, -0xb3, 0x46, 0xad, 0x9d, 0xad, 0x25, 0xd6, 0xbb, 0xad, 0xbb, 0xa7, 0x11, -0xa7, 0xb9, 0x4e, 0x93, 0x4e, 0xab, 0x9e, 0xd6, 0x67, 0xc3, 0xb0, 0xf1, -0xb6, 0xc9, 0xb6, 0xa9, 0xb7, 0x19, 0xb0, 0xe5, 0xd8, 0x06, 0xdb, 0xae, -0xb6, 0x6d, 0xb6, 0x7d, 0x61, 0x67, 0x62, 0x17, 0x67, 0xb7, 0xc5, 0xae, -0xc3, 0xee, 0x93, 0xbd, 0x93, 0x7d, 0xba, 0x7d, 0x8d, 0xfd, 0x3d, 0x07, -0x0d, 0x87, 0xd9, 0x0e, 0xab, 0x1d, 0x5a, 0x1d, 0x7e, 0x73, 0xb4, 0x72, -0x14, 0x3a, 0x56, 0x3a, 0xde, 0x9a, 0xce, 0x9c, 0xee, 0x3f, 0x7d, 0xc5, -0xf4, 0x96, 0xe9, 0x2f, 0x67, 0x58, 0xcf, 0x10, 0xcf, 0xd8, 0x33, 0xe3, -0xb6, 0x13, 0xcb, 0x29, 0xc4, 0x69, 0x9d, 0x53, 0x9b, 0xd3, 0x47, 0x67, -0x17, 0x67, 0xb9, 0x73, 0x83, 0xf3, 0x88, 0x8b, 0x89, 0x4b, 0x82, 0xcb, -0x2e, 0x97, 0x3e, 0x2e, 0x9b, 0x1b, 0xc6, 0xdd, 0xc8, 0xbd, 0xe4, 0x4a, -0x74, 0xf5, 0x71, 0x5d, 0xe1, 0x7a, 0xd2, 0xf5, 0x9d, 0x9b, 0xb3, 0x9b, -0xc2, 0xed, 0xa8, 0xdb, 0xaf, 0xee, 0x36, 0xee, 0x69, 0xee, 0x87, 0xdc, -0x9f, 0xcc, 0x34, 0x9f, 0x29, 0x9e, 0x59, 0x33, 0x73, 0xd0, 0xc3, 0xc8, -0x43, 0xe0, 0x51, 0xe5, 0xd1, 0x3f, 0x0b, 0x9f, 0x95, 0x30, 0x6b, 0xdf, -0xac, 0x7e, 0x4f, 0x43, 0x4f, 0x81, 0x67, 0xb5, 0xe7, 0x23, 0x2f, 0x63, -0x2f, 0x91, 0x57, 0xad, 0xd7, 0xb0, 0xb7, 0xa5, 0x77, 0xaa, 0xf7, 0x61, -0xef, 0x17, 0x3e, 0xf6, 0x3e, 0x72, 0x9f, 0xe3, 0x3e, 0xe3, 0x3c, 0x37, -0xde, 0x32, 0xde, 0x59, 0x5f, 0xcc, 0x37, 0xc0, 0xb7, 0xc8, 0xb7, 0xcb, -0x4f, 0xc3, 0x6f, 0x9e, 0x5f, 0x85, 0xdf, 0x43, 0x7f, 0x23, 0xff, 0x64, -0xff, 0x7a, 0xff, 0xd1, 0x00, 0xa7, 0x80, 0x25, 0x01, 0x67, 0x03, 0x89, -0x81, 0x41, 0x81, 0x5b, 0x02, 0xfb, 0xf8, 0x7a, 0x7c, 0x21, 0xbf, 0x8e, -0x3f, 0x3a, 0xdb, 0x65, 0xf6, 0xb2, 0xd9, 0xed, 0x41, 0x8c, 0xa0, 0xb9, -0x41, 0x15, 0x41, 0x8f, 0x82, 0xad, 0x82, 0xe5, 0xc1, 0xad, 0x21, 0x68, -0xc8, 0xec, 0x90, 0xad, 0x21, 0xf7, 0xe7, 0x98, 0xce, 0x91, 0xce, 0x69, -0x0e, 0x85, 0x50, 0x7e, 0xe8, 0xd6, 0xd0, 0x07, 0x61, 0xe6, 0x61, 0x8b, -0xc3, 0x7e, 0x0c, 0x27, 0x85, 0x87, 0x85, 0x57, 0x86, 0x3f, 0x8e, 0x70, -0x88, 0x58, 0x1a, 0xd1, 0x31, 0x97, 0x35, 0x77, 0xd1, 0xdc, 0x43, 0x73, -0xdf, 0x44, 0xfa, 0x44, 0x96, 0x44, 0xde, 0x9b, 0x67, 0x31, 0x4f, 0x39, -0xaf, 0x2d, 0x4a, 0x35, 0x2a, 0x3e, 0xaa, 0x2e, 0x6a, 0x3c, 0xda, 0x37, -0xba, 0x34, 0xba, 0x3f, 0xc6, 0x2e, 0x66, 0x59, 0xcc, 0xd5, 0x58, 0x9d, -0x58, 0x49, 0x6c, 0x4b, 0x1c, 0x39, 0x2e, 0x2a, 0xae, 0x36, 0x6e, 0x6c, -0xbe, 0xdf, 0xfc, 0xed, 0xf3, 0x87, 0xe2, 0x9d, 0xe2, 0x0b, 0xe3, 0x7b, -0x17, 0x98, 0x2f, 0xc8, 0x5d, 0x70, 0x79, 0xa1, 0xce, 0xc2, 0xf4, 0x85, -0xa7, 0x16, 0xa9, 0x2e, 0x12, 0x2c, 0x3a, 0x96, 0x40, 0x4c, 0x88, 0x4e, -0x38, 0x94, 0xf0, 0x41, 0x10, 0x2a, 0xa8, 0x16, 0x8c, 0x25, 0xf2, 0x13, -0x77, 0x25, 0x8e, 0x0a, 0x79, 0xc2, 0x1d, 0xc2, 0x67, 0x22, 0x2f, 0xd1, -0x36, 0xd1, 0x88, 0xd8, 0x43, 0x5c, 0x2a, 0x1e, 0x4e, 0xf2, 0x48, 0x2a, -0x4d, 0x7a, 0x92, 0xec, 0x91, 0xbc, 0x35, 0x79, 0x24, 0xc5, 0x33, 0xa5, -0x2c, 0xe5, 0xb9, 0x84, 0x27, 0xa9, 0x90, 0xbc, 0x4c, 0x0d, 0x4c, 0xdd, -0x9b, 0x3a, 0x9e, 0x16, 0x9a, 0x76, 0x20, 0x6d, 0x32, 0x3d, 0x3a, 0xbd, -0x31, 0x83, 0x92, 0x91, 0x90, 0x71, 0x42, 0xaa, 0x21, 0x4d, 0x93, 0xb6, -0x67, 0xea, 0x67, 0xe6, 0x66, 0x76, 0xcb, 0xac, 0x65, 0x85, 0xb2, 0xfe, -0xc5, 0x6e, 0x8b, 0xb7, 0x2f, 0x1e, 0x95, 0x07, 0xc9, 0x6b, 0xb3, 0x90, -0xac, 0x05, 0x59, 0x2d, 0x0a, 0xb6, 0x42, 0xa6, 0xe8, 0x54, 0x5a, 0x28, -0xd7, 0x2a, 0x07, 0xb2, 0x67, 0x65, 0x57, 0x66, 0xbf, 0xcd, 0x89, 0xca, -0x39, 0x96, 0xab, 0x9e, 0x2b, 0xcd, 0xed, 0xcc, 0xb3, 0xca, 0xdb, 0x90, -0x37, 0x9c, 0xef, 0x9f, 0xff, 0xed, 0x12, 0xc2, 0x12, 0xe1, 0x92, 0xb6, -0xa5, 0x86, 0x4b, 0x57, 0x2d, 0x1d, 0x58, 0xe6, 0xbd, 0xac, 0x6a, 0x39, -0xb2, 0x3c, 0x71, 0x79, 0xdb, 0x0a, 0xe3, 0x15, 0x05, 0x2b, 0x86, 0x56, -0x06, 0xac, 0x3c, 0xb8, 0x8a, 0xb6, 0x2a, 0x6d, 0xd5, 0x4f, 0xab, 0xed, -0x57, 0x97, 0xae, 0x7e, 0xbd, 0x26, 0x7a, 0x4d, 0x6b, 0x81, 0x5e, 0xc1, -0xca, 0x82, 0xc1, 0xb5, 0x01, 0x6b, 0xeb, 0x0b, 0x55, 0x0a, 0xe5, 0x85, -0x7d, 0xeb, 0xdc, 0xd7, 0xed, 0x5d, 0x4f, 0x58, 0x2f, 0x59, 0xdf, 0xb5, -0x61, 0xfa, 0x86, 0x9d, 0x1b, 0x3e, 0x15, 0x89, 0x8a, 0xae, 0x14, 0xdb, -0x17, 0x97, 0x15, 0x7f, 0xd8, 0x28, 0xdc, 0x78, 0xe5, 0x1b, 0x87, 0x6f, -0xca, 0xbf, 0x99, 0xdc, 0x94, 0xb4, 0xa9, 0xab, 0xc4, 0xb9, 0x64, 0xcf, -0x66, 0xd2, 0x66, 0xe9, 0xe6, 0xde, 0x2d, 0x9e, 0x5b, 0x0e, 0x96, 0xaa, -0x97, 0xe6, 0x97, 0x0e, 0x6e, 0x0d, 0xd9, 0xda, 0xb4, 0x0d, 0xdf, 0x56, -0xb4, 0xed, 0xf5, 0xf6, 0x45, 0xdb, 0x2f, 0x97, 0xcd, 0x28, 0xdb, 0xbb, -0x83, 0xb6, 0x43, 0xb9, 0xa3, 0xbf, 0x3c, 0xb8, 0xbc, 0x65, 0xa7, 0xc9, -0xce, 0xcd, 0x3b, 0x3f, 0x54, 0xa4, 0x54, 0xf4, 0x54, 0xfa, 0x54, 0x36, -0xee, 0xd2, 0xdd, 0xb5, 0x61, 0xd7, 0xf8, 0x6e, 0xd1, 0xee, 0x1b, 0x7b, -0xbc, 0xf6, 0x34, 0xec, 0xd5, 0xdb, 0x5b, 0xbc, 0xf7, 0xfd, 0x3e, 0xc9, -0xbe, 0xdb, 0x55, 0x01, 0x55, 0x4d, 0xd5, 0x66, 0xd5, 0x65, 0xfb, 0x49, -0xfb, 0xb3, 0xf7, 0x3f, 0xae, 0x89, 0xaa, 0xe9, 0xf8, 0x96, 0xfb, 0x6d, -0x5d, 0xad, 0x4e, 0x6d, 0x71, 0xed, 0xc7, 0x03, 0xd2, 0x03, 0xfd, 0x07, -0x23, 0x0e, 0xb6, 0xd7, 0xb9, 0xd4, 0xd5, 0x1d, 0xd2, 0x3d, 0x54, 0x52, -0x8f, 0xd6, 0x2b, 0xeb, 0x47, 0x0e, 0xc7, 0x1f, 0xbe, 0xfe, 0x9d, 0xef, -0x77, 0x2d, 0x0d, 0x36, 0x0d, 0x55, 0x8d, 0x9c, 0xc6, 0xe2, 0x23, 0x70, -0x44, 0x79, 0xe4, 0xe9, 0xf7, 0x09, 0xdf, 0xf7, 0x1e, 0x0d, 0x3a, 0xda, -0x76, 0x8c, 0x7b, 0xac, 0xe1, 0x07, 0xd3, 0x1f, 0x76, 0x1d, 0x67, 0x1d, -0x2f, 0x6a, 0x42, 0x9a, 0xf2, 0x9a, 0x46, 0x9b, 0x53, 0x9a, 0xfb, 0x5b, -0x62, 0x5b, 0xba, 0x4f, 0xcc, 0x3e, 0xd1, 0xd6, 0xea, 0xde, 0x7a, 0xfc, -0x47, 0xdb, 0x1f, 0x0f, 0x9c, 0x34, 0x3c, 0x59, 0x79, 0x4a, 0xf3, 0x54, -0xc9, 0x69, 0xda, 0xe9, 0x82, 0xd3, 0x93, 0x67, 0xf2, 0xcf, 0x8c, 0x9d, -0x95, 0x9d, 0x7d, 0x7e, 0x2e, 0xf9, 0xdc, 0x60, 0xdb, 0xa2, 0xb6, 0x7b, -0xe7, 0x63, 0xce, 0xdf, 0x6a, 0x0f, 0x6f, 0xef, 0xba, 0x10, 0x74, 0xe1, -0xd2, 0x45, 0xff, 0x8b, 0xe7, 0x3b, 0xbc, 0x3b, 0xce, 0x5c, 0xf2, 0xb8, -0x74, 0xf2, 0xb2, 0xdb, 0xe5, 0x13, 0x57, 0xb8, 0x57, 0x9a, 0xaf, 0x3a, -0x5f, 0x6d, 0xea, 0x74, 0xea, 0x3c, 0xfe, 0x93, 0xd3, 0x4f, 0xc7, 0xbb, -0x9c, 0xbb, 0x9a, 0xae, 0xb9, 0x5c, 0x6b, 0xb9, 0xee, 0x7a, 0xbd, 0xb5, -0x7b, 0x66, 0xf7, 0xe9, 0x1b, 0x9e, 0x37, 0xce, 0xdd, 0xf4, 0xbd, 0x79, -0xf1, 0x16, 0xff, 0xd6, 0xd5, 0x9e, 0x39, 0x3d, 0xdd, 0xbd, 0xf3, 0x7a, -0x6f, 0xf7, 0xc5, 0xf7, 0xf5, 0xdf, 0x16, 0xdd, 0x7e, 0x72, 0x27, 0xfd, -0xce, 0xcb, 0xbb, 0xd9, 0x77, 0x27, 0xee, 0xad, 0xbc, 0x4f, 0xbc, 0x5f, -0xf4, 0x40, 0xed, 0x41, 0xd9, 0x43, 0xdd, 0x87, 0xd5, 0x3f, 0x5b, 0xfe, -0xdc, 0xd8, 0xef, 0xdc, 0x7f, 0x6a, 0xc0, 0x77, 0xa0, 0xf3, 0xd1, 0xdc, -0x47, 0xf7, 0x06, 0x85, 0x83, 0xcf, 0xfe, 0x91, 0xf5, 0x8f, 0x0f, 0x43, -0x05, 0x8f, 0x99, 0x8f, 0xcb, 0x86, 0x0d, 0x86, 0xeb, 0x9e, 0x38, 0x3e, -0x39, 0x39, 0xe2, 0x3f, 0x72, 0xfd, 0xe9, 0xfc, 0xa7, 0x43, 0xcf, 0x64, -0xcf, 0x26, 0x9e, 0x17, 0xfe, 0xa2, 0xfe, 0xcb, 0xae, 0x17, 0x16, 0x2f, -0x7e, 0xf8, 0xd5, 0xeb, 0xd7, 0xce, 0xd1, 0x98, 0xd1, 0xa1, 0x97, 0xf2, -0x97, 0x93, 0xbf, 0x6d, 0x7c, 0xa5, 0xfd, 0xea, 0xc0, 0xeb, 0x19, 0xaf, -0xdb, 0xc6, 0xc2, 0xc6, 0x1e, 0xbe, 0xc9, 0x78, 0x33, 0x31, 0x5e, 0xf4, -0x56, 0xfb, 0xed, 0xc1, 0x77, 0xdc, 0x77, 0x1d, 0xef, 0xa3, 0xdf, 0x0f, -0x4f, 0xe4, 0x7c, 0x20, 0x7f, 0x28, 0xff, 0x68, 0xf9, 0xb1, 0xf5, 0x53, -0xd0, 0xa7, 0xfb, 0x93, 0x19, 0x93, 0x93, 0xff, 0x04, 0x03, 0x98, 0xf3, -0xfc, 0x63, 0x33, 0x2d, 0xdb, 0x00, 0x00, 0x00, 0x20, 0x63, 0x48, 0x52, -0x4d, 0x00, 0x00, 0x7a, 0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xf9, -0xff, 0x00, 0x00, 0x80, 0xe9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xea, -0x60, 0x00, 0x00, 0x3a, 0x98, 0x00, 0x00, 0x17, 0x6f, 0x92, 0x5f, 0xc5, -0x46, 0x00, 0x00, 0x02, 0x1c, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, 0xec, -0x98, 0x4d, 0x4e, 0x02, 0x41, 0x10, 0x85, 0x3f, 0x8d, 0xdb, 0xb9, 0x80, -0x73, 0x01, 0x70, 0x2f, 0xee, 0x41, 0xf7, 0x72, 0x00, 0x0d, 0x7b, 0xc2, -0xde, 0xc4, 0xb5, 0x09, 0x7b, 0xc2, 0xde, 0xe0, 0x01, 0xd0, 0xbd, 0x5c, -0x00, 0x2e, 0xc0, 0x05, 0xe4, 0x00, 0xce, 0x01, 0x74, 0x53, 0x9d, 0x54, -0xda, 0xea, 0x99, 0x46, 0x51, 0x8c, 0xd6, 0x4b, 0x3a, 0x0c, 0xdd, 0x3d, -0x5d, 0x5d, 0xf5, 0xea, 0x2f, 0x73, 0x00, 0xbc, 0xe1, 0xd8, 0x1b, 0x0e, -0xdd, 0x04, 0x4e, 0x80, 0x13, 0xe0, 0x70, 0x02, 0x9c, 0x00, 0x87, 0x13, -0xe0, 0x04, 0x38, 0x9c, 0x00, 0x27, 0xc0, 0xe1, 0x04, 0x38, 0x01, 0x0e, -0x27, 0xe0, 0xdf, 0xe0, 0xc8, 0x9a, 0x6c, 0x01, 0x13, 0xa0, 0x34, 0xd6, -0x66, 0xc0, 0x58, 0x9e, 0xfb, 0xc0, 0x0d, 0x50, 0x18, 0xfb, 0x5e, 0x80, -0x11, 0xb0, 0xce, 0xb8, 0x44, 0x07, 0xb8, 0x4f, 0xac, 0x55, 0x22, 0x73, -0x9a, 0x71, 0xce, 0x50, 0x86, 0x96, 0x9d, 0xba, 0x63, 0x25, 0x7a, 0xcc, -0xe5, 0xff, 0x0d, 0x70, 0xdd, 0xa0, 0x47, 0x21, 0x76, 0xe9, 0x18, 0xfb, -0x96, 0xc0, 0x4a, 0xe4, 0x93, 0x38, 0x67, 0x0c, 0x2c, 0xa2, 0xf9, 0x03, -0xa2, 0xaf, 0xa1, 0x05, 0xf0, 0x9c, 0x30, 0x6a, 0xc0, 0x54, 0x84, 0xdd, -0x37, 0x18, 0xa4, 0x02, 0xce, 0xe5, 0xf7, 0xb3, 0x04, 0x04, 0xdc, 0x2a, -0x63, 0x59, 0xb8, 0x13, 0x63, 0x07, 0x2c, 0x80, 0x87, 0x8c, 0x73, 0x07, -0xc0, 0x69, 0x8d, 0xe1, 0xb4, 0x1e, 0x29, 0xe3, 0xe7, 0x10, 0x10, 0x70, -0x21, 0x64, 0x24, 0x53, 0x50, 0x5b, 0x8c, 0xbf, 0x06, 0x4e, 0xa2, 0x31, -0x92, 0x3d, 0xa7, 0x32, 0x42, 0x44, 0x9c, 0x18, 0x23, 0x78, 0x4c, 0x7b, -0x8b, 0x70, 0x5c, 0xd6, 0xc8, 0x3c, 0xce, 0x34, 0xfe, 0x42, 0x39, 0x52, -0xdd, 0x1d, 0x67, 0x86, 0x2e, 0xa3, 0x06, 0x3d, 0x82, 0xf1, 0xcf, 0x8c, -0x7d, 0x83, 0xc8, 0x41, 0x53, 0xf2, 0xca, 0x9c, 0x14, 0x04, 0xf0, 0x9a, -0xf0, 0x84, 0x9c, 0xb9, 0xd4, 0xfb, 0x4d, 0x68, 0x1b, 0x1e, 0x5b, 0x36, -0xc8, 0xd1, 0xc6, 0xaf, 0x12, 0x69, 0xb3, 0xfa, 0xc2, 0x9c, 0xa5, 0xc7, -0xc4, 0x98, 0x7b, 0x52, 0xcf, 0x97, 0x8a, 0x54, 0xad, 0x9b, 0x75, 0xde, -0xd1, 0x6f, 0x2a, 0x48, 0x45, 0x4d, 0x88, 0x57, 0x89, 0x9c, 0xdf, 0x8f, -0xde, 0x6f, 0xfd, 0xc0, 0x3d, 0xad, 0x3b, 0xae, 0x22, 0xa7, 0x29, 0x33, -0xf5, 0xf8, 0x55, 0x04, 0xac, 0x55, 0x81, 0x47, 0xa5, 0x88, 0x21, 0xd0, -0x8d, 0x6a, 0x40, 0x5f, 0xe5, 0xdb, 0xb1, 0x2a, 0xf6, 0x2d, 0x29, 0xa8, -0xdf, 0x89, 0x41, 0xa2, 0xc8, 0x5e, 0xca, 0xf3, 0x3c, 0x8a, 0x08, 0x80, -0x2b, 0xa0, 0x27, 0x7b, 0xa6, 0xbb, 0x20, 0x20, 0x30, 0xd9, 0xab, 0x49, -0x27, 0xdb, 0xa6, 0xa2, 0xc2, 0x08, 0x5d, 0xcb, 0xa3, 0xfb, 0x92, 0x7a, -0x72, 0x8a, 0xf3, 0x2e, 0x51, 0xc9, 0x1d, 0xbb, 0x86, 0x27, 0x6b, 0x8f, -0xdf, 0x48, 0x3d, 0x8b, 0x1d, 0xa9, 0x97, 0xdb, 0x86, 0xe6, 0x60, 0x2e, -0x6c, 0xb6, 0x6a, 0xc2, 0x7e, 0x9e, 0xd9, 0x86, 0x6a, 0x25, 0x86, 0x09, -0xc5, 0xa7, 0x7b, 0x36, 0x7e, 0x88, 0xb4, 0xbb, 0x44, 0xbb, 0xba, 0x8c, -0xd2, 0x50, 0x2e, 0x3e, 0xb4, 0xa1, 0xa5, 0x18, 0x76, 0x63, 0x28, 0x17, -0xaf, 0x15, 0x62, 0x10, 0xab, 0x65, 0xdd, 0x6c, 0x61, 0x9c, 0x52, 0x85, -0xaf, 0x85, 0x47, 0x09, 0x71, 0xbd, 0x6f, 0x6d, 0xf4, 0xd4, 0xf1, 0x1d, -0x5f, 0xc4, 0xf3, 0x56, 0x86, 0x47, 0x76, 0xd4, 0x5a, 0x29, 0x5d, 0xd6, -0x63, 0xd4, 0x22, 0x06, 0xc2, 0xf5, 0x5a, 0xc7, 0x88, 0x52, 0xb6, 0x94, -0xb7, 0xac, 0x23, 0xc0, 0xe1, 0x9f, 0x22, 0x9c, 0x00, 0x87, 0x13, 0xe0, -0x04, 0x38, 0x9c, 0x00, 0x27, 0xc0, 0xe1, 0x04, 0x38, 0x01, 0x0e, 0x27, -0xe0, 0x4f, 0xe3, 0x7d, 0x00, 0x51, 0xbe, 0x83, 0xcd, 0x57, 0x34, 0x65, -0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, -0x82, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x04, 0x03, + 0x00, 0x00, 0x00, 0x1f, 0xee, 0x60, 0x67, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, + 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, + 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xdd, 0x02, + 0x09, 0x16, 0x39, 0x17, 0xf0, 0x40, 0x6e, 0x04, 0x00, 0x00, 0x00, 0x15, 0x50, + 0x4c, 0x54, 0x45, 0x66, 0x66, 0x66, 0x6a, 0x6a, 0x6a, 0x6b, 0x6b, 0x6b, 0x6d, + 0x6d, 0x6d, 0x70, 0x70, 0x70, 0x73, 0x73, 0x73, 0x80, 0x80, 0x80, 0xd1, 0x7d, + 0x40, 0x35, 0x00, 0x00, 0x00, 0xc6, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x8d, + 0xd4, 0x31, 0x0e, 0xc3, 0x20, 0x10, 0x44, 0xd1, 0x51, 0x64, 0xfa, 0x1c, 0x25, + 0x47, 0x48, 0x45, 0xed, 0xca, 0x07, 0xb0, 0x80, 0xfb, 0x1f, 0x21, 0x05, 0x60, + 0xd6, 0x30, 0xe3, 0xac, 0xbb, 0x95, 0xf8, 0x7a, 0xb2, 0x01, 0xa3, 0x98, 0x27, + 0x01, 0x00, 0x10, 0xfa, 0x9c, 0xeb, 0xbc, 0xd9, 0x35, 0xb0, 0x43, 0xf9, 0xd6, + 0x15, 0x47, 0x1b, 0xf7, 0x3a, 0x46, 0x1d, 0xdc, 0x09, 0x06, 0x4c, 0xc1, 0x9d, + 0x60, 0xc0, 0x1c, 0x58, 0x82, 0x02, 0x73, 0x60, 0x09, 0x0a, 0x2c, 0xc1, 0x20, + 0x38, 0xb0, 0x04, 0x83, 0xe0, 0xc0, 0x1a, 0x74, 0x42, 0x00, 0x6b, 0xd0, 0x89, + 0x0f, 0x07, 0x48, 0xd0, 0x08, 0x01, 0x90, 0xa0, 0x13, 0x1c, 0x60, 0x41, 0x7a, + 0x02, 0x58, 0x60, 0x88, 0xe8, 0x0b, 0xd2, 0x03, 0x40, 0x83, 0x8b, 0x88, 0xde, + 0xe0, 0xac, 0xeb, 0x5f, 0xc5, 0x1b, 0xb4, 0x4d, 0xbe, 0xee, 0xc5, 0xbf, 0x20, + 0xf7, 0x77, 0x08, 0xce, 0x60, 0xbf, 0xbe, 0xd2, 0xe1, 0x0a, 0xf2, 0xd8, 0x87, + 0xe0, 0x0a, 0x76, 0xb3, 0xd3, 0x87, 0x23, 0xc8, 0xf6, 0x2c, 0x05, 0x47, 0xd0, + 0x80, 0xb7, 0x20, 0x20, 0x80, 0x2d, 0x09, 0x02, 0x02, 0x88, 0xf3, 0x3f, 0x4a, + 0x05, 0xe3, 0xa2, 0x09, 0x02, 0x0a, 0x28, 0x82, 0x80, 0x02, 0x14, 0x01, 0x09, + 0x08, 0x02, 0x12, 0x10, 0x04, 0x34, 0xc0, 0x89, 0x1f, 0xe2, 0x9a, 0xca, 0x1c, + 0x5f, 0x12, 0x62, 0x57, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82 }; From 05ec90488b3951d5af29e41bec47955dc36baaec Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 03:39:09 -0600 Subject: [PATCH 558/627] Make real wiimotes not so crappy on Windows hopefully. --- .../Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 5 +- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 11 +- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 262 +++++++++++------- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 10 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 140 +++++----- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 23 +- .../Core/Src/HW/WiimoteReal/WiimoteRealBase.h | 5 +- 7 files changed, 259 insertions(+), 197 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 6af169f5ee..3a017354eb 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -29,7 +29,10 @@ WiimoteScanner::WiimoteScanner() WiimoteScanner::~WiimoteScanner() {} -std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() { return std::vector(); } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index e926d44ec0..62fd2e4ac5 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -60,11 +60,10 @@ WiimoteScanner::~WiimoteScanner() close(device_sock); } -// Find wiimotes. -// Does not replace already found wiimotes even if they are disconnected. -// wm is an array of max_wiimotes wiimotes -// Returns the total number of found wiimotes. -std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() { std::vector found_wiimotes; @@ -86,7 +85,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices); // Display discovered devices - for (int i = 0; (i < found_devices) && (found_wiimotes.size() < max_wiimotes); ++i) + for (int i = 0; i < found_devices; ++i) { ERROR_LOG(WIIMOTE, "found a device..."); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 8226c784e8..c88cdebdbc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -73,6 +74,8 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; +static std::unordered_set g_connected_devices; + inline void init_lib() { if (!initialized) @@ -127,7 +130,12 @@ inline void init_lib() namespace WiimoteReal { -int PairUp(bool unpair = false); +template +void ProcessWiimotes(bool new_scan, T& callback); + +bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); +void RemoveWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); +bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); WiimoteScanner::WiimoteScanner() { @@ -137,24 +145,47 @@ WiimoteScanner::WiimoteScanner() WiimoteScanner::~WiimoteScanner() { // TODO: what do we want here? - //PairUp(true); + ProcessWiimotes(false, RemoveWiimote); +} + +void WiimoteScanner::Update() +{ + bool forgot_some = false; + + ProcessWiimotes(false, [&](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + { + forgot_some |= ForgetWiimote(hRadio, btdi); + }); + + // Some hacks that allows disconnects to be detected before connections are handled + // workaround for wiimote 1 moving to slot 2 on temporary disconnect + if (forgot_some) + SLEEP(100); } // Find and connect wiimotes. // Does not replace already found wiimotes even if they are disconnected. // wm is an array of max_wiimotes wiimotes // Returns the total number of found and connected wiimotes. -std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +std::vector WiimoteScanner::FindWiimotes() { - PairUp(); + bool attached_some; + + ProcessWiimotes(true, [&](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + { + ForgetWiimote(hRadio, btdi); + attached_some |= AttachWiimote(hRadio, btdi); + }); + + // Hacks... + if (attached_some) + SLEEP(1000); GUID device_id; - HANDLE dev; HDEVINFO device_info; DWORD len; SP_DEVICE_INTERFACE_DATA device_data; PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; - HIDD_ATTRIBUTES attr; device_data.cbSize = sizeof(device_data); @@ -165,7 +196,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); std::vector wiimotes; - for (int index = 0; wiimotes.size() < max_wiimotes; ++index) + for (int index = 0; true; ++index) { free(detail_data); detail_data = NULL; @@ -184,24 +215,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) continue; auto const wm = new Wiimote; - - // Open new device -#if 0 - dev = CreateFile(detail_data->DevicePath, - (GENERIC_READ | GENERIC_WRITE), - (FILE_SHARE_READ | FILE_SHARE_WRITE), - NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); - if (dev == INVALID_HANDLE_VALUE) - continue; - - // Get device attributes - attr.Size = sizeof(attr); - HidD_GetAttributes(dev, &attr); - - wm->dev_handle = dev; -#endif wm->devicepath = detail_data->DevicePath; - wiimotes.push_back(wm); } @@ -236,9 +250,15 @@ bool WiimoteScanner::IsReady() const // Connect to a wiimote with a known device path. bool Wiimote::Connect() { + // This is where we disallow connecting to the same device twice + if (g_connected_devices.count(devicepath)) + return false; + dev_handle = CreateFile(devicepath.c_str(), (GENERIC_READ | GENERIC_WRITE), - /*(FILE_SHARE_READ | FILE_SHARE_WRITE)*/ 0, + // TODO: Just do FILE_SHARE_READ and remove "g_connected_devices"? + // That is what "WiiYourself" does. + (FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); if (dev_handle == INVALID_HANDLE_VALUE) @@ -247,11 +267,12 @@ bool Wiimote::Connect() return false; } + hid_overlap = OVERLAPPED(); hid_overlap.hEvent = CreateEvent(NULL, 1, 1, _T("")); hid_overlap.Offset = 0; hid_overlap.OffsetHigh = 0; - // TODO: do this elsewhere + // TODO: thread isn't started here now, do this elsewhere // This isn't as drastic as it sounds, since the process in which the threads // reside is normal priority. Needed for keeping audio reports at a decent rate /* @@ -261,15 +282,17 @@ bool Wiimote::Connect() } */ + g_connected_devices.insert(devicepath); return true; } void Wiimote::Disconnect() { + g_connected_devices.erase(devicepath); + CloseHandle(dev_handle); dev_handle = 0; - //ResetEvent(&hid_overlap); CloseHandle(hid_overlap.hEvent); } @@ -283,50 +306,73 @@ bool Wiimote::IsConnected() const // zero = error int Wiimote::IORead(unsigned char* buf) { + // used below for a warning *buf = 0; - DWORD b; - if (!ReadFile(dev_handle, buf, MAX_PAYLOAD, &b, &hid_overlap)) + DWORD bytes; + ResetEvent(hid_overlap.hEvent); + if (!ReadFile(dev_handle, buf, MAX_PAYLOAD - 1, &bytes, &hid_overlap)) { - // Partial read - b = GetLastError(); - if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) + auto const err = GetLastError(); + + if (ERROR_IO_PENDING == err) + { + auto const r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); + if (WAIT_TIMEOUT == r) + { + // Timeout - cancel and continue + if (*buf) + WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", + WIIMOTE_DEFAULT_TIMEOUT); + + CancelIo(dev_handle); + bytes = -1; + } + else if (WAIT_FAILED == r) + { + WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); + bytes = 0; + } + else if (WAIT_OBJECT_0 == r) + { + if (!GetOverlappedResult(dev_handle, &hid_overlap, &bytes, TRUE)) + { + WARN_LOG(WIIMOTE, "GetOverlappedResult failed on wiimote %i.", index + 1); + bytes = 0; + } + } + else + { + bytes = 0; + } + } + else if (ERROR_HANDLE_EOF == err) { // Remote disconnect - return 0; + bytes = 0; } - - auto const r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); - if (r == WAIT_TIMEOUT) + else if (ERROR_DEVICE_NOT_CONNECTED == err) { - // Timeout - cancel and continue - if (*buf) - WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", - WIIMOTE_DEFAULT_TIMEOUT); - - CancelIo(dev_handle); - ResetEvent(hid_overlap.hEvent); - return -1; + // Remote disconnect + bytes = 0; } - else if (r == WAIT_FAILED) + else { - WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); - return -1; - } - - if (!GetOverlappedResult(dev_handle, &hid_overlap, &b, 0)) - { - return -1; + bytes = 0; } } - // This needs to be done even if ReadFile fails, essential during init - // Move the data over one, so we can add back in data report indicator byte (here, 0xa1) - memmove(buf + 1, buf, MAX_PAYLOAD - 1); - buf[0] = 0xa1; + if (bytes > 0) + { + // Move the data over one, so we can add back in data report indicator byte (here, 0xa1) + memmove(buf + 1, buf, MAX_PAYLOAD - 1); + buf[0] = 0xa1; - ResetEvent(hid_overlap.hEvent); - return MAX_PAYLOAD; // XXX + // TODO: is this really needed? + bytes = MAX_PAYLOAD; + } + + return bytes; } int Wiimote::IOWrite(const u8* buf, int len) @@ -392,14 +438,12 @@ int Wiimote::IOWrite(const u8* buf, int len) return 0; } -// WiiMote Pair-Up, function will return amount of either new paired or unpaired devices -// negative number on failure -int PairUp(bool unpair) +// invokes callback for each found wiimote bluetooth device +template +void ProcessWiimotes(bool new_scan, T& callback) { // match strings like "Nintendo RVL-WBC-01", "Nintendo RVL-CNT-01", "Nintendo RVL-CNT-01-TR" - const std::wregex wiimote_device_name(L"Nintendo RVL-\\w{3}-\\d{2}(-\\w{2})?"); - - int nPaired = 0; + const std::wregex wiimote_device_name(L"Nintendo RVL-.*"); BLUETOOTH_DEVICE_SEARCH_PARAMS srch; srch.dwSize = sizeof(srch); @@ -409,7 +453,7 @@ int PairUp(bool unpair) // fConnected BT Devices srch.fReturnConnected = true; srch.fReturnUnknown = true; - srch.fIssueInquiry = true; + srch.fIssueInquiry = new_scan; // multiple of 1.28 seconds srch.cTimeoutMultiplier = 1; @@ -418,14 +462,10 @@ int PairUp(bool unpair) HANDLE hRadio; - // TODO: save radio(s) in the WiimoteScanner constructor + // TODO: save radio(s) in the WiimoteScanner constructor? // Enumerate BT radios HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio); - - if (NULL == hFindRadio) - return -1; - while (hFindRadio) { BLUETOOTH_RADIO_INFO radioInfo; @@ -449,40 +489,7 @@ int PairUp(bool unpair) if (std::regex_match(btdi.szName, wiimote_device_name)) { - if (unpair) - { - if (SUCCEEDED(Bth_BluetoothRemoveDevice(&btdi.Address))) - { - NOTICE_LOG(WIIMOTE, - "Pair-Up: Automatically removed BT Device on shutdown: %08x", - GetLastError()); - ++nPaired; - } - } - else - { - if (false == btdi.fConnected) - { - // TODO: improve the read of the BT driver, esp. when batteries - // of the wiimote are removed while being fConnected - if (btdi.fRemembered) - { - // Make Windows forget old expired pairing. We can pretty - // much ignore the return value here. It either worked - // (ERROR_SUCCESS), or the device did not exist - // (ERROR_NOT_FOUND). In both cases, there is nothing left. - Bth_BluetoothRemoveDevice(&btdi.Address); - } - - // Activate service - const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, - &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); - if (SUCCEEDED(hr)) - ++nPaired; - else - ERROR_LOG(WIIMOTE, "Pair-Up: BluetoothSetServiceState() returned %08x", hr); - } - } + callback(hRadio, btdi); } if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi)) @@ -498,8 +505,53 @@ int PairUp(bool unpair) hFindRadio = NULL; } } +} - return nPaired; +void RemoveWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + //if (btdi.fConnected) + { + if (SUCCEEDED(Bth_BluetoothRemoveDevice(&btdi.Address))) + { + NOTICE_LOG(WIIMOTE, "Removed BT Device", GetLastError()); + } + } +} + +bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + if (!btdi.fConnected && !btdi.fRemembered) + { + NOTICE_LOG(WIIMOTE, "Found wiimote. Enabling HID service."); + + // Activate service + const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, + &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); + + if (FAILED(hr)) + ERROR_LOG(WIIMOTE, "Pair-Up: BluetoothSetServiceState() returned %08x", hr); + else + return true; + } + + return false; +} + +// Removes remembered non-connected devices +bool ForgetWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +{ + if (!btdi.fConnected && btdi.fRemembered) + { + // We don't want "remembered" devices. + // SetServiceState seems to just fail with them. + // Make Windows forget about them. + NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); + Bth_BluetoothRemoveDevice(&btdi.Address); + + return true; + } + + return false; } }; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index f3c90d810d..9ed78800cc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -111,7 +111,10 @@ WiimoteScanner::WiimoteScanner() WiimoteScanner::~WiimoteScanner() {} -std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) +void WiimoteScanner::Update() +{} + +std::vector WiimoteScanner::FindWiimotes() { // TODO: find the device in the constructor and save it for later @@ -130,7 +133,7 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) } sbt = [[SearchBT alloc] init]; - sbt->maxDevices = max_wiimotes; + sbt->maxDevices = 32; bti = [[IOBluetoothDeviceInquiry alloc] init]; [bti setDelegate: sbt]; [bti setInquiryLength: 2]; @@ -157,9 +160,6 @@ std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) Wiimote *wm = new Wiimote(); wm->btd = dev; wiimotes.push_back(wm); - - if(wiimotes.size() >= max_wiimotes) - break; } [bth release]; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 7ae1a9a961..6a5d91fa00 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -35,7 +35,7 @@ namespace WiimoteReal { void HandleFoundWiimotes(const std::vector&); -void HandleWiimoteConnect(Wiimote*); +void TryToConnectWiimote(Wiimote*); void HandleWiimoteDisconnect(int index); bool g_real_wiimotes_initialized = false; @@ -171,7 +171,10 @@ bool Wiimote::Read() rpt.second = IORead(rpt.first); if (0 == rpt.second) + { + WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting wiimote %d.", index + 1); Disconnect(); + } if (rpt.second > 0 && m_channel > 0) { @@ -192,12 +195,12 @@ bool Wiimote::Write() bool const is_speaker_data = rpt.first[1] == WM_WRITE_SPEAKER_DATA; - if (!is_speaker_data || last_audio_report.GetTimeDifference() > 5) + if (!is_speaker_data || m_last_audio_report.GetTimeDifference() > 5) { IOWrite(rpt.first, rpt.second); if (is_speaker_data) - last_audio_report.Update(); + m_last_audio_report.Update(); delete[] rpt.first; m_write_reports.Pop(); @@ -242,27 +245,24 @@ void Wiimote::Update() delete[] rpt.first; } -// Rumble briefly -void Wiimote::RumbleBriefly() +bool Wiimote::Prepare(int _index) { - unsigned char buffer = 0x01; - DEBUG_LOG(WIIMOTE, "Starting rumble..."); - QueueReport(WM_CMD_RUMBLE, &buffer, sizeof(buffer)); + index = _index; - SLEEP(200); + // Set the active LEDs. + u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, WIIMOTE_LED_1 << index}; - DEBUG_LOG(WIIMOTE, "Stopping rumble..."); - buffer = 0x00; - QueueReport(WM_CMD_RUMBLE, &buffer, sizeof(buffer)); -} + // Rumble briefly + u8 rumble_report[] = {HID_TYPE_SET_REPORT, WM_CMD_RUMBLE, 1}; -// Set the active LEDs. -// leds is a bitwise OR of WIIMOTE_LED_1 through WIIMOTE_LED_4. -void Wiimote::SetLEDs(int new_leds) -{ - // Remove the lower 4 bits because they control rumble - u8 const buffer = (new_leds & 0xF0); - QueueReport(WM_CMD_LED, &buffer, sizeof(buffer)); + // don't really care what is read, just that reading works + u8 input_buf[MAX_PAYLOAD]; + + // TODO: request status and check for sane response? + + return (IOWrite(led_report, sizeof(led_report)) + && IOWrite(rumble_report, sizeof(rumble_report)) + && (rumble_report[2] = 0, SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))); } void Wiimote::EmuStart() @@ -290,48 +290,66 @@ unsigned int CalculateWantedWiimotes() return wanted_wiimotes; } -void WiimoteScanner::WantWiimotes(size_t count) +void WiimoteScanner::WantWiimotes(bool do_want) { - want_wiimotes = count; + m_want_wiimotes = do_want; } void WiimoteScanner::StartScanning() { - run_thread = true; + m_run_thread = true; if (IsReady()) { - scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); + m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); } } void WiimoteScanner::StopScanning() { - run_thread = false; - if (scan_thread.joinable()) + m_run_thread = false; + if (m_scan_thread.joinable()) { - scan_thread.join(); + m_scan_thread.join(); } } + +void CheckForDisconnectedWiimotes() +{ + std::lock_guard lk(g_refresh_lock); + + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + if (g_wiimotes[i] && !g_wiimotes[i]->IsConnected()) + HandleWiimoteDisconnect(i); +} + void WiimoteScanner::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Scanning Thread"); NOTICE_LOG(WIIMOTE, "Wiimote scanning has started"); - while (run_thread) + while (m_run_thread) { - auto const found_wiimotes = FindWiimotes(want_wiimotes); - HandleFoundWiimotes(found_wiimotes); -#if 1 + std::vector found_wiimotes; + + //NOTICE_LOG(WIIMOTE, "in loop"); + + if (m_want_wiimotes) + found_wiimotes = FindWiimotes(); + else { - // TODO: this code here is ugly - std::lock_guard lk(g_refresh_lock); - for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) - if (g_wiimotes[i] && !g_wiimotes[i]->IsConnected()) - HandleWiimoteDisconnect(i); + // Does stuff needed to detect disconnects on Windows + Update(); } -#endif + + //NOTICE_LOG(WIIMOTE, "after update"); + + // TODO: this is a fairly lame place for this + CheckForDisconnectedWiimotes(); + + HandleFoundWiimotes(found_wiimotes); + //std::this_thread::yield(); Common::SleepCurrentThread(500); } @@ -396,8 +414,7 @@ void Initialize() if (g_real_wiimotes_initialized) return; - auto const wanted_wiimotes = CalculateWantedWiimotes(); - g_wiimote_scanner.WantWiimotes(wanted_wiimotes); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); g_wiimote_scanner.StartScanning(); @@ -431,26 +448,23 @@ void ChangeWiimoteSource(unsigned int index, int source) if (!(WIIMOTE_SRC_REAL & g_wiimote_sources[index])) HandleWiimoteDisconnect(index); - auto const wanted_wiimotes = CalculateWantedWiimotes(); - g_wiimote_scanner.WantWiimotes(wanted_wiimotes); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); } -void HandleWiimoteConnect(Wiimote* wm) +void TryToConnectWiimote(Wiimote* wm) { std::lock_guard lk(g_refresh_lock); for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) { - if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i]) + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] + && !g_wiimotes[i] + && wm->Connect() + && wm->Prepare(i)) { g_wiimotes[i] = wm; - wm->index = i; wm->StartThread(); - - wm->DisableDataReporting(); - wm->SetLEDs(WIIMOTE_LED_1 << i); - wm->RumbleBriefly(); Host_ConnectWiimote(i, true); @@ -463,14 +477,12 @@ void HandleWiimoteConnect(Wiimote* wm) delete wm; - auto const want_wiimotes = CalculateWantedWiimotes(); - g_wiimote_scanner.WantWiimotes(want_wiimotes); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); } void HandleWiimoteDisconnect(int index) { - // locked above - //std::lock_guard lk(g_refresh_lock); + std::lock_guard lk(g_refresh_lock); Host_ConnectWiimote(index, false); @@ -482,19 +494,12 @@ void HandleWiimoteDisconnect(int index) NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); } - auto const want_wiimotes = CalculateWantedWiimotes(); - g_wiimote_scanner.WantWiimotes(want_wiimotes); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); } void HandleFoundWiimotes(const std::vector& wiimotes) { - std::for_each(wiimotes.begin(), wiimotes.end(), [](Wiimote* const wm) - { - if (wm->Connect()) - HandleWiimoteConnect(wm); - else - delete wm; - }); + std::for_each(wiimotes.begin(), wiimotes.end(), TryToConnectWiimote); } // This is called from the GUI thread @@ -504,14 +509,13 @@ void Refresh() { std::lock_guard lk(g_refresh_lock); + + CheckForDisconnectedWiimotes(); - auto wanted_wiimotes = CalculateWantedWiimotes(); - auto const found_wiimotes = g_wiimote_scanner.FindWiimotes(wanted_wiimotes); - - HandleFoundWiimotes(found_wiimotes); - - wanted_wiimotes = CalculateWantedWiimotes(); - g_wiimote_scanner.WantWiimotes(wanted_wiimotes); + if (0 != CalculateWantedWiimotes()) + { + HandleFoundWiimotes(g_wiimote_scanner.FindWiimotes()); + } } g_wiimote_scanner.StartScanning(); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 139d59ce99..4b8f4365d3 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -63,14 +63,16 @@ public: void EmuStop(); // connecting and disconnecting from physical devices + // (using address inserted by FindWiimotes) + + // FYI, Connect/Disconnect are not thread safe even between unique objects (on windows) bool Connect(); void Disconnect(); // TODO: change to something like IsRelevant bool IsConnected() const; - void SetLEDs(int leds); - void RumbleBriefly(); + bool Prepare(int index); void DisableDataReporting(); @@ -116,7 +118,7 @@ private: Common::FifoQueue m_read_reports; Common::FifoQueue m_write_reports; - Common::Timer last_audio_report; + Common::Timer m_last_audio_report; }; class WiimoteScanner @@ -127,22 +129,23 @@ public: bool IsReady() const; - void WantWiimotes(size_t count); + void WantWiimotes(bool do_want); void StartScanning(); void StopScanning(); - std::vector FindWiimotes(size_t max_wiimotes); + std::vector FindWiimotes(); + + // function called when not looking for more wiimotes + void Update(); private: void ThreadFunc(); - std::thread scan_thread; + std::thread m_scan_thread; - volatile bool run_thread; - - // TODO: this should probably be atomic - volatile size_t want_wiimotes; + volatile bool m_run_thread; + volatile bool m_want_wiimotes; #if defined(_WIN32) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h index 75a6d3e6a3..15bbc2917f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h @@ -66,8 +66,9 @@ // End Wiimote internal codes -#define MAX_PAYLOAD 32 -#define WIIMOTE_DEFAULT_TIMEOUT 30 +// It's 23. NOT 32! +#define MAX_PAYLOAD 23 +#define WIIMOTE_DEFAULT_TIMEOUT 1000 #ifdef _WIN32 // Available bluetooth stacks for Windows. From 7a053d0f0715a5308300a9ee05928433a8250953 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 03:50:54 -0600 Subject: [PATCH 559/627] buildfix! --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 4 ++-- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 2 ++ Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 2 ++ Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 5 +---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 62fd2e4ac5..87ddc5086b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -27,8 +27,8 @@ namespace WiimoteReal { WiimoteScanner::WiimoteScanner() - : run_thread() - , want_wiimotes() + : m_run_thread() + , m_want_wiimotes() , device_id(-1) , device_sock(-1) { diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index c88cdebdbc..1920577de4 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -138,6 +138,8 @@ void RemoveWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); WiimoteScanner::WiimoteScanner() + : m_run_thread() + , m_want_wiimotes() { init_lib(); } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 9ed78800cc..51dcd17785 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -106,6 +106,8 @@ namespace WiimoteReal { WiimoteScanner::WiimoteScanner() + : m_run_thread() + , m_want_wiimotes() {} WiimoteScanner::~WiimoteScanner() diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 6a5d91fa00..821eccea0c 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -250,14 +250,11 @@ bool Wiimote::Prepare(int _index) index = _index; // Set the active LEDs. - u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, WIIMOTE_LED_1 << index}; + u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index)}; // Rumble briefly u8 rumble_report[] = {HID_TYPE_SET_REPORT, WM_CMD_RUMBLE, 1}; - // don't really care what is read, just that reading works - u8 input_buf[MAX_PAYLOAD]; - // TODO: request status and check for sane response? return (IOWrite(led_report, sizeof(led_report)) From c267be2682cd6d6fbcf163893a1361aa49511c8f Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 05:30:51 -0600 Subject: [PATCH 560/627] Hopefully fix windows! --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 13 +++++++++++-- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 10 +++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 1920577de4..7c6f6f20d0 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -379,6 +380,14 @@ int Wiimote::IORead(unsigned char* buf) int Wiimote::IOWrite(const u8* buf, int len) { + u8 big_buf[MAX_PAYLOAD]; + if (len < MAX_PAYLOAD) + { + std::copy(buf, buf + len, big_buf); + std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0); + buf = big_buf; + } + DWORD bytes = 0; switch (stack) { @@ -386,7 +395,7 @@ int Wiimote::IOWrite(const u8* buf, int len) { // Try to auto-detect the stack type - auto i = WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + auto i = WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap); if (i) { // Bluesoleil will always return 1 here, even if it's not connected @@ -433,7 +442,7 @@ int Wiimote::IOWrite(const u8* buf, int len) break; } case MSBT_STACK_BLUESOLEIL: - return WriteFile(dev_handle, buf + 1, 22, &bytes, &hid_overlap); + return WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap); break; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 821eccea0c..e006ec1f69 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -249,15 +249,19 @@ bool Wiimote::Prepare(int _index) { index = _index; + // core buttons, no continuous reporting + u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_REPORT_TYPE, 0, 0x30}; + // Set the active LEDs. - u8 const led_report[] = {HID_TYPE_SET_REPORT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index)}; + u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index)}; // Rumble briefly - u8 rumble_report[] = {HID_TYPE_SET_REPORT, WM_CMD_RUMBLE, 1}; + u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 1}; // TODO: request status and check for sane response? - return (IOWrite(led_report, sizeof(led_report)) + return (IOWrite(mode_report, sizeof(mode_report)) + && IOWrite(led_report, sizeof(led_report)) && IOWrite(rumble_report, sizeof(rumble_report)) && (rumble_report[2] = 0, SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))); } From b8fd5c0c307aa45f846b4ec412e05608d0e93e41 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 05:57:55 -0600 Subject: [PATCH 561/627] Fix Windows for real! --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 7c6f6f20d0..d9b6a665ef 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -421,8 +421,7 @@ int Wiimote::IOWrite(const u8* buf, int len) else { ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); - // Correct? - return -1; + return 0; } break; } From 095513529094de471ef552619f2497e556aa01bd Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 11 Feb 2013 13:08:41 -0600 Subject: [PATCH 562/627] Add the option to turn on only the EGL interface to use desktop OpenGL with it. --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 843c140408..8f8face486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,8 @@ # cmake_minimum_required(VERSION 2.6) -option(USE_GLES "Enables GLES, disables OGL" OFF) +option(USE_GLES "Enables GLES And EGL, disables OGL" OFF) +option(USE_EGL "Enables EGL OpenGL Interface" OFF) option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) option(FASTLOG "Enable all logs" OFF) @@ -250,6 +251,11 @@ if(USE_GLES) add_definitions(-DUSE_EGL) set(USE_EGL True) endif() + +if(USE_EGL) + message("EGL OpenGL interface enabled") + add_definitions(-DUSE_EGL) +endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) ######################################## From 8923f0e13befa07df1638d0154d1b96ebae74fa2 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 11 Feb 2013 15:06:40 -0600 Subject: [PATCH 563/627] Fix header guard and definitions not being set to 1 --- CMakeLists.txt | 6 +++--- Source/Core/DolphinWX/Src/GLInterface/EGL.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f8face486..4598eaa9e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,14 +247,14 @@ endif() # Enabling GLES also disables the OpenGL plugin. if(USE_GLES) message("GLES rendering enabled") - add_definitions(-DUSE_GLES) - add_definitions(-DUSE_EGL) + add_definitions(-DUSE_GLES=1) + add_definitions(-DUSE_EGL=1) set(USE_EGL True) endif() if(USE_EGL) message("EGL OpenGL interface enabled") - add_definitions(-DUSE_EGL) + add_definitions(-DUSE_EGL=1) endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h index fe127fe0ba..513fb2ce4a 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h @@ -14,8 +14,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _INTERFACEGLX_H_ -#define _INTERFACEGLX_H_ +#ifndef _INTERFACEEGL_H_ +#define _INTERFACEEGL_H_ #include #ifdef USE_GLES From c2d2fb8c7c84ab2abf439f1ccdafd44d71b41b64 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 15:21:58 -0600 Subject: [PATCH 564/627] Try to improve real wiimotes on Windows. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 126 ++++++++++-------- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 56 +++++--- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 +- 3 files changed, 112 insertions(+), 72 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index d9b6a665ef..d6bc5dd28b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -270,10 +270,22 @@ bool Wiimote::Connect() return false; } - hid_overlap = OVERLAPPED(); - hid_overlap.hEvent = CreateEvent(NULL, 1, 1, _T("")); - hid_overlap.Offset = 0; - hid_overlap.OffsetHigh = 0; +#if 0 + HIDD_ATTRIBUTES attr; + attr.Size = sizeof(attr); + if (!HidD_GetAttributes(dev_handle, &attr)) + { + CloseHandle(dev_handle); + dev_handle = 0; + return false; + } +#endif + + hid_overlap_read = OVERLAPPED(); + hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL); + + hid_overlap_write = OVERLAPPED(); + hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL); // TODO: thread isn't started here now, do this elsewhere // This isn't as drastic as it sounds, since the process in which the threads @@ -296,7 +308,8 @@ void Wiimote::Disconnect() CloseHandle(dev_handle); dev_handle = 0; - CloseHandle(hid_overlap.hEvent); + CloseHandle(hid_overlap_read.hEvent); + CloseHandle(hid_overlap_write.hEvent); } bool Wiimote::IsConnected() const @@ -307,20 +320,20 @@ bool Wiimote::IsConnected() const // positive = read packet // negative = didn't read packet // zero = error -int Wiimote::IORead(unsigned char* buf) +int Wiimote::IORead(u8* buf) { // used below for a warning *buf = 0; DWORD bytes; - ResetEvent(hid_overlap.hEvent); - if (!ReadFile(dev_handle, buf, MAX_PAYLOAD - 1, &bytes, &hid_overlap)) + ResetEvent(hid_overlap_read.hEvent); + if (!ReadFile(dev_handle, buf, MAX_PAYLOAD - 1, &bytes, &hid_overlap_read)) { auto const err = GetLastError(); if (ERROR_IO_PENDING == err) { - auto const r = WaitForSingleObject(hid_overlap.hEvent, WIIMOTE_DEFAULT_TIMEOUT); + auto const r = WaitForSingleObject(hid_overlap_read.hEvent, WIIMOTE_DEFAULT_TIMEOUT); if (WAIT_TIMEOUT == r) { // Timeout - cancel and continue @@ -338,7 +351,7 @@ int Wiimote::IORead(unsigned char* buf) } else if (WAIT_OBJECT_0 == r) { - if (!GetOverlappedResult(dev_handle, &hid_overlap, &bytes, TRUE)) + if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE)) { WARN_LOG(WIIMOTE, "GetOverlappedResult failed on wiimote %i.", index + 1); bytes = 0; @@ -380,70 +393,76 @@ int Wiimote::IORead(unsigned char* buf) int Wiimote::IOWrite(const u8* buf, int len) { - u8 big_buf[MAX_PAYLOAD]; - if (len < MAX_PAYLOAD) - { - std::copy(buf, buf + len, big_buf); - std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0); - buf = big_buf; - } - - DWORD bytes = 0; switch (stack) { case MSBT_STACK_UNKNOWN: { // Try to auto-detect the stack type - - auto i = WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap); - if (i) + stack = MSBT_STACK_BLUESOLEIL; + if (IOWrite(buf, len)) + return 1; + + stack = MSBT_STACK_MS; + if (IOWrite(buf, len)) { - // Bluesoleil will always return 1 here, even if it's not connected - stack = MSBT_STACK_BLUESOLEIL; - return i; + // Don't mind me, just a random sleep to fix stuff on Windows + SLEEP(1000); + return 1; } - i = HidD_SetOutputReport(dev_handle, (unsigned char*) buf + 1, len - 1); - if (i) - { - stack = MSBT_STACK_MS; - return i; - } - - auto const dw = GetLastError(); - // Checking for 121 = timeout on semaphore/device off/disconnected to - // avoid trouble with other stacks toshiba/widcomm - if (dw == 121) - { - NOTICE_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: Timeout"); - return 0; - } - else - { - ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_UNKNOWN]: ERROR: %08x", dw); - return 0; - } + stack = MSBT_STACK_UNKNOWN; break; } case MSBT_STACK_MS: { - auto i = HidD_SetOutputReport(dev_handle, (unsigned char*) buf + 1, len - 1); - auto dw = GetLastError(); + auto result = HidD_SetOutputReport(dev_handle, const_cast(buf) + 1, len - 1); + //FlushFileBuffers(dev_handle); - if (dw == 121) + if (!result) { - // Semaphore timeout - NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); - return 0; + auto err = GetLastError(); + if (err == 121) + { + // Semaphore timeout + NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); + } + else + { + ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err); + } } - return i; + return result; break; } case MSBT_STACK_BLUESOLEIL: - return WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap); + { + u8 big_buf[MAX_PAYLOAD]; + if (len < MAX_PAYLOAD) + { + std::copy(buf, buf + len, big_buf); + std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0); + buf = big_buf; + } + + ResetEvent(hid_overlap_write.hEvent); + DWORD bytes = 0; + if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write)) + { + // WriteFile always returns true with bluesoleil. + return 1; + } + else + { + auto const err = GetLastError(); + if (ERROR_IO_PENDING == err) + { + CancelIo(dev_handle); + } + } break; } + } return 0; } @@ -555,6 +574,7 @@ bool ForgetWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) // We don't want "remembered" devices. // SetServiceState seems to just fail with them. // Make Windows forget about them. + // This is also required to detect a disconnect for some reason.. NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); Bth_BluetoothRemoveDevice(&btdi.Address); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index e006ec1f69..6e9a72eb00 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -232,6 +232,12 @@ Report Wiimote::ProcessReadQueue() void Wiimote::Update() { + if (!IsConnected()) + { + HandleWiimoteDisconnect(index); + return; + } + // Pop through the queued reports Report const rpt = ProcessReadQueue(); @@ -252,18 +258,17 @@ bool Wiimote::Prepare(int _index) // core buttons, no continuous reporting u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_REPORT_TYPE, 0, 0x30}; - // Set the active LEDs. - u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index)}; + // Set the active LEDs and turn on rumble. + u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index) | 0x1}; - // Rumble briefly - u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 1}; + // Turn off rumble + u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 0}; // TODO: request status and check for sane response? return (IOWrite(mode_report, sizeof(mode_report)) && IOWrite(led_report, sizeof(led_report)) - && IOWrite(rumble_report, sizeof(rumble_report)) - && (rumble_report[2] = 0, SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))); + && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))); } void Wiimote::EmuStart() @@ -375,6 +380,8 @@ void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); + Host_ConnectWiimote(index, true); + // main loop while (m_run_thread && IsConnected()) { @@ -408,13 +415,13 @@ void LoadSettings() void Initialize() { - NOTICE_LOG(WIIMOTE, "WiimoteReal::Initialize"); - std::lock_guard lk(g_refresh_lock); if (g_real_wiimotes_initialized) return; + NOTICE_LOG(WIIMOTE, "WiimoteReal::Initialize"); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); g_wiimote_scanner.StartScanning(); @@ -423,9 +430,7 @@ void Initialize() } void Shutdown(void) -{ - NOTICE_LOG(WIIMOTE, "WiimoteReal::Shutdown"); - +{ g_wiimote_scanner.StopScanning(); std::lock_guard lk(g_refresh_lock); @@ -433,6 +438,8 @@ void Shutdown(void) if (!g_real_wiimotes_initialized) return; + NOTICE_LOG(WIIMOTE, "WiimoteReal::Shutdown"); + g_real_wiimotes_initialized = false; for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) @@ -466,8 +473,6 @@ void TryToConnectWiimote(Wiimote* wm) g_wiimotes[i] = wm; wm->StartThread(); - - Host_ConnectWiimote(i, true); NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1); @@ -485,8 +490,6 @@ void HandleWiimoteDisconnect(int index) { std::lock_guard lk(g_refresh_lock); - Host_ConnectWiimote(index, false); - if (g_wiimotes[index]) { delete g_wiimotes[index]; @@ -511,12 +514,24 @@ void Refresh() { std::lock_guard lk(g_refresh_lock); - CheckForDisconnectedWiimotes(); + std::vector found_wiimotes; if (0 != CalculateWantedWiimotes()) { - HandleFoundWiimotes(g_wiimote_scanner.FindWiimotes()); + found_wiimotes = g_wiimote_scanner.FindWiimotes(); } + + CheckForDisconnectedWiimotes(); + + // Brief rumble for already connected wiimotes. + for (int i = 0; i != MAX_WIIMOTES; ++i) + { + // kinda sloppy + if (g_wiimotes[i]) + g_wiimotes[i]->Prepare(i); + } + + HandleFoundWiimotes(found_wiimotes); } g_wiimote_scanner.StartScanning(); @@ -546,8 +561,13 @@ void Update(int _WiimoteNumber) if (g_wiimotes[_WiimoteNumber]) g_wiimotes[_WiimoteNumber]->Update(); - else + + // Wiimote::Update() may remove the wiimote if it was disconnected. + if (!g_wiimotes[_WiimoteNumber]) + { + NOTICE_LOG(WIIMOTE, "Emulating disconnect of wiimote %d.", _WiimoteNumber + 1); Host_ConnectWiimote(_WiimoteNumber, false); + } } void StateChange(EMUSTATE_CHANGE newState) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 4b8f4365d3..55fc552abd 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -96,7 +96,7 @@ public: std::string devicepath; // Unique wiimote reference //ULONGLONG btaddr; // Bluetooth address HANDLE dev_handle; // HID handle - OVERLAPPED hid_overlap; // Overlap handle + OVERLAPPED hid_overlap_read, hid_overlap_write; // Overlap handle enum win_bt_stack_t stack; // Type of bluetooth stack to use #endif From 0fb7f65e04f966f9eef1b8dfcb7d8d8ebec834ae Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 15:58:23 -0600 Subject: [PATCH 565/627] Problems on Windows? Just SLEEP twice as long! --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 6 +++++- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index d6bc5dd28b..3052f4b737 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -75,6 +75,7 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; +std::mutex g_connected_devices_lock; static std::unordered_set g_connected_devices; inline void init_lib() @@ -182,7 +183,7 @@ std::vector WiimoteScanner::FindWiimotes() // Hacks... if (attached_some) - SLEEP(1000); + SLEEP(2000); GUID device_id; HDEVINFO device_info; @@ -253,6 +254,8 @@ bool WiimoteScanner::IsReady() const // Connect to a wiimote with a known device path. bool Wiimote::Connect() { + std::lock_guard lk(g_connected_devices_lock); + // This is where we disallow connecting to the same device twice if (g_connected_devices.count(devicepath)) return false; @@ -303,6 +306,7 @@ bool Wiimote::Connect() void Wiimote::Disconnect() { + std::lock_guard lk(g_connected_devices_lock); g_connected_devices.erase(devicepath); CloseHandle(dev_handle); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 55fc552abd..793a13ceb0 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -64,8 +64,6 @@ public: // connecting and disconnecting from physical devices // (using address inserted by FindWiimotes) - - // FYI, Connect/Disconnect are not thread safe even between unique objects (on windows) bool Connect(); void Disconnect(); From f3d25f2cb04002b0ede883f0c482acfd5de978a9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 16:07:01 -0600 Subject: [PATCH 566/627] OSX buildfix! --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 6e9a72eb00..7647698c63 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -259,7 +259,7 @@ bool Wiimote::Prepare(int _index) u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_REPORT_TYPE, 0, 0x30}; // Set the active LEDs and turn on rumble. - u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index) | 0x1}; + u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_LED, u8(WIIMOTE_LED_1 << index | 0x1)}; // Turn off rumble u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 0}; From fa10335c55520ec674e26835e1e0d0fc9d5dfb37 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 17:58:56 -0600 Subject: [PATCH 567/627] Make continuous scanning optional. --- Source/Core/Core/Src/ConfigManager.cpp | 4 +++- Source/Core/Core/Src/ConfigManager.h | 1 + .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 19 ++++++++++++------- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 12 ++++++++++-- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 6 ++++++ 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 978eadace1..282c369161 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -241,6 +241,7 @@ void SConfig::SaveSettings() ini.Set("Core", "WiiSDCard", m_WiiSDCard); ini.Set("Core", "WiiKeyboard", m_WiiKeyboard); ini.Set("Core", "WiimoteReconnectOnLoad", m_WiimoteReconnectOnLoad); + ini.Set("Core", "WiimoteContinuousScanning", m_WiimoteContinuousScanning); ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); ini.Set("Core", "FrameLimit", m_Framelimit); @@ -390,7 +391,8 @@ void SConfig::LoadSettings() ini.Get("Core", "WiiSDCard", &m_WiiSDCard, false); ini.Get("Core", "WiiKeyboard", &m_WiiKeyboard, false); - ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); + ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); + ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning, true); ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "MMU", &m_LocalCoreStartupParameter.bMMU, false); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index e3ad7b42a9..a633bded5c 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -42,6 +42,7 @@ struct SConfig : NonCopyable bool m_WiiSDCard; bool m_WiiKeyboard; bool m_WiimoteReconnectOnLoad; + bool m_WiimoteContinuousScanning; // name of the last used filename std::string m_LastFilename; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 7647698c63..4b3b737d36 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -24,6 +24,7 @@ #include "StringUtil.h" #include "Timer.h" #include "Host.h" +#include "ConfigManager.h" #include "WiimoteReal.h" @@ -303,9 +304,9 @@ void WiimoteScanner::WantWiimotes(bool do_want) void WiimoteScanner::StartScanning() { - m_run_thread = true; - if (IsReady()) + if (!m_run_thread && IsReady()) { + m_run_thread = true; m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); } } @@ -413,19 +414,23 @@ void LoadSettings() } } +// config dialog calls this when some settings change void Initialize() { + if (SConfig::GetInstance().m_WiimoteContinuousScanning) + g_wiimote_scanner.StartScanning(); + else + g_wiimote_scanner.StopScanning(); + std::lock_guard lk(g_refresh_lock); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + if (g_real_wiimotes_initialized) return; NOTICE_LOG(WIIMOTE, "WiimoteReal::Initialize"); - g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); - - g_wiimote_scanner.StartScanning(); - g_real_wiimotes_initialized = true; } @@ -534,7 +539,7 @@ void Refresh() HandleFoundWiimotes(found_wiimotes); } - g_wiimote_scanner.StartScanning(); + Initialize(); } void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size) diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index a4af2d5d9a..56b75531cf 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -60,14 +60,22 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition); refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this); - // "Real wiimotes" layout wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes")); + wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL); + if (!WiimoteReal::g_wiimote_scanner.IsReady()) real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n" "You must manually pair your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5); + + wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning")); + continuous_scanning->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnContinuousScanning, this); + continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning); - real_wiimotes_group->Add(refresh_btn, 0, wxALIGN_CENTER); + real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL); + real_wiimotes_sizer->AddStretchSpacer(1); + real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5); + real_wiimotes_group->Add(real_wiimotes_sizer, 1, wxEXPAND); // "General Settings" controls const wxString str[] = { _("Bottom"), _("Top") }; diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index 316d0d48bf..26d6660ee2 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -57,6 +57,12 @@ public: SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.IsChecked(); event.Skip(); } + void OnContinuousScanning(wxCommandEvent& event) + { + SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked(); + WiimoteReal::Initialize(); + event.Skip(); + } private: void Cancel(wxCommandEvent& event); From a6461ca186c67592c1bd6bb4f6cd175c03ddcde3 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 11 Feb 2013 20:50:09 -0600 Subject: [PATCH 568/627] Improve wiimote reconnection on changing wiimote sources. --- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 48 +++++++++++++++---- .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 2 +- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 4b3b737d36..34fc7e92f5 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -38,6 +38,7 @@ namespace WiimoteReal void HandleFoundWiimotes(const std::vector&); void TryToConnectWiimote(Wiimote*); void HandleWiimoteDisconnect(int index); +void DoneWithWiimote(int index); bool g_real_wiimotes_initialized = false; @@ -382,6 +383,7 @@ void Wiimote::ThreadFunc() Common::SetCurrentThreadName("Wiimote Device Thread"); Host_ConnectWiimote(index, true); + NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); // main loop while (m_run_thread && IsConnected()) @@ -453,15 +455,20 @@ void Shutdown(void) void ChangeWiimoteSource(unsigned int index, int source) { + { std::lock_guard lk(g_refresh_lock); - + g_wiimote_sources[index] = source; - - // source is emulated, kill any real connection - if (!(WIIMOTE_SRC_REAL & g_wiimote_sources[index])) - HandleWiimoteDisconnect(index); - g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + + // kill real connection (or swap to different slot) + DoneWithWiimote(index); + } + + // reconnect to emu + Host_ConnectWiimote(index, false); + if (WIIMOTE_SRC_EMU & source) + Host_ConnectWiimote(index, true); } void TryToConnectWiimote(Wiimote* wm) @@ -478,8 +485,6 @@ void TryToConnectWiimote(Wiimote* wm) g_wiimotes[i] = wm; wm->StartThread(); - - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1); wm = NULL; break; @@ -491,6 +496,32 @@ void TryToConnectWiimote(Wiimote* wm) g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); } +void DoneWithWiimote(int index) +{ + std::lock_guard lk(g_refresh_lock); + + if (g_wiimotes[index]) + { + g_wiimotes[index]->StopThread(); + + // First see if we can use this real wiimote in another slot. + for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) + { + if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] + && !g_wiimotes[i] + && g_wiimotes[index]->Prepare(i)) + { + std::swap(g_wiimotes[i], g_wiimotes[index]); + g_wiimotes[i]->StartThread(); + break; + } + } + } + + // else, just disconnect the wiimote + HandleWiimoteDisconnect(index); +} + void HandleWiimoteDisconnect(int index) { std::lock_guard lk(g_refresh_lock); @@ -570,7 +601,6 @@ void Update(int _WiimoteNumber) // Wiimote::Update() may remove the wiimote if it was disconnected. if (!g_wiimotes[_WiimoteNumber]) { - NOTICE_LOG(WIIMOTE, "Emulating disconnect of wiimote %d.", _WiimoteNumber + 1); Host_ConnectWiimote(_WiimoteNumber, false); } } diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index 56b75531cf..3cd050a293 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -66,7 +66,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin if (!WiimoteReal::g_wiimote_scanner.IsReady()) real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n" - "You must manually pair your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5); + "You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5); wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning")); continuous_scanning->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnContinuousScanning, this); From da53ca8ee3127ff898f557212523b43d09207564 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 12 Feb 2013 00:19:27 -0600 Subject: [PATCH 569/627] "Wait for the wiimote to connect"? I think that's a horrible idea. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 56dde8e2ce..cb2750ade4 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1355,10 +1355,6 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1, connect ? wxT("Connected") : wxT("Disconnected"))); Core::DisplayMessage(msg.ToAscii(), 3000); - - // Wait for the wiimote to connect - while (GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->IsConnected() != connect) - {} Host_UpdateMainFrame(); } } From 12674b3164f809814c6059b4bfdf9e800819da0c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 12 Feb 2013 17:01:51 -0600 Subject: [PATCH 570/627] Possibly improve real wiimotes on Windows. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 3052f4b737..0f00d3fa5f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -432,7 +432,7 @@ int Wiimote::IOWrite(const u8* buf, int len) } else { - ERROR_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err); + WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err); } } @@ -488,7 +488,7 @@ void ProcessWiimotes(bool new_scan, T& callback) srch.fReturnUnknown = true; srch.fIssueInquiry = new_scan; // multiple of 1.28 seconds - srch.cTimeoutMultiplier = 1; + srch.cTimeoutMultiplier = 2; BLUETOOTH_FIND_RADIO_PARAMS radioParam; radioParam.dwSize = sizeof(radioParam); From 7f305ba82288fa86fbe200036b26fd2cb219a293 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 12 Feb 2013 18:56:36 -0600 Subject: [PATCH 571/627] Fix sloppy connection logic. --- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 34fc7e92f5..ee685aae9b 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -478,15 +478,14 @@ void TryToConnectWiimote(Wiimote* wm) for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) { if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] - && !g_wiimotes[i] - && wm->Connect() - && wm->Prepare(i)) + && !g_wiimotes[i]) { - g_wiimotes[i] = wm; - - wm->StartThread(); - - wm = NULL; + if (wm->Connect() && wm->Prepare(i)) + { + g_wiimotes[i] = wm; + wm->StartThread(); + wm = NULL; + } break; } } @@ -508,11 +507,13 @@ void DoneWithWiimote(int index) for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) { if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] - && !g_wiimotes[i] - && g_wiimotes[index]->Prepare(i)) + && !g_wiimotes[i]) { - std::swap(g_wiimotes[i], g_wiimotes[index]); - g_wiimotes[i]->StartThread(); + if (g_wiimotes[index]->Prepare(i)) + { + std::swap(g_wiimotes[i], g_wiimotes[index]); + g_wiimotes[i]->StartThread(); + } break; } } From 77381a1af2d59b799afeb326bba122fbefff7287 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 12 Feb 2013 21:37:47 -0600 Subject: [PATCH 572/627] Futile attempts at fixing OS X. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 51dcd17785..8c3a0f10b2 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -150,7 +150,8 @@ std::vector WiimoteScanner::FindWiimotes() [bti stop]; int found_devices = [[bti foundDevices] count]; - NOTICE_LOG(WIIMOTE, "Found %i bluetooth devices", found_devices); + if (found_devices) + NOTICE_LOG(WIIMOTE, "Found %i bluetooth devices", found_devices); en = [[bti foundDevices] objectEnumerator]; for (int i = 0; i < found_devices; i++) @@ -180,11 +181,11 @@ bool WiimoteScanner::IsReady() const // Connect to a wiimote with a known address. bool Wiimote::Connect() { - ConnectBT *cbt = [[ConnectBT alloc] init]; - if (IsConnected()) return false; + ConnectBT *cbt = [[ConnectBT alloc] init]; + [btd openL2CAPChannelSync: &cchan withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt]; [btd openL2CAPChannelSync: &ichan @@ -215,6 +216,9 @@ bool Wiimote::Connect() // Disconnect a wiimote. void Wiimote::Disconnect() { + if (!IsConnected()) + return; + NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1); m_connected = false; From e57ff0613082c47a936ffef1c40a12780c489995 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 13 Feb 2013 14:00:15 -0600 Subject: [PATCH 573/627] Futile attempts at fixing Windows. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 109 ++++++++---------- 1 file changed, 50 insertions(+), 59 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 0f00d3fa5f..61abeffa2d 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -19,7 +19,8 @@ #include #include #include -#include +#include +#include #include #include @@ -75,8 +76,7 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; -std::mutex g_connected_devices_lock; -static std::unordered_set g_connected_devices; +std::unordered_map g_connect_times; inline void init_lib() { @@ -173,60 +173,50 @@ void WiimoteScanner::Update() // Returns the total number of found and connected wiimotes. std::vector WiimoteScanner::FindWiimotes() { - bool attached_some; - - ProcessWiimotes(true, [&](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + ProcessWiimotes(true, [](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { ForgetWiimote(hRadio, btdi); - attached_some |= AttachWiimote(hRadio, btdi); + AttachWiimote(hRadio, btdi); }); - // Hacks... - if (attached_some) - SLEEP(2000); - - GUID device_id; - HDEVINFO device_info; - DWORD len; - SP_DEVICE_INTERFACE_DATA device_data; - PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; - - device_data.cbSize = sizeof(device_data); - // Get the device id + GUID device_id; HidD_GetHidGuid(&device_id); // Get all hid devices connected - device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); + HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT)); std::vector wiimotes; - for (int index = 0; true; ++index) + + SP_DEVICE_INTERFACE_DATA device_data; + device_data.cbSize = sizeof(device_data); + PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL; + + for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data); ++index) { - free(detail_data); - detail_data = NULL; - - // Query the next hid device info - if (!SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data)) - break; - // Get the size of the data block required + DWORD len; SetupDiGetDeviceInterfaceDetail(device_info, &device_data, NULL, 0, &len, NULL); detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len); detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); // Query the data for this device - if (!SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) - continue; + if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL)) + { + auto const wm = new Wiimote; + wm->devicepath = detail_data->DevicePath; + wiimotes.push_back(wm); + } - auto const wm = new Wiimote; - wm->devicepath = detail_data->DevicePath; - wiimotes.push_back(wm); + free(detail_data); } - free(detail_data); - SetupDiDestroyDeviceInfoList(device_info); + // Don't mind me, just a random sleep to fix stuff on Windows + //if (!wiimotes.empty()) + // SLEEP(2000); + return wiimotes; } @@ -254,17 +244,14 @@ bool WiimoteScanner::IsReady() const // Connect to a wiimote with a known device path. bool Wiimote::Connect() { - std::lock_guard lk(g_connected_devices_lock); - - // This is where we disallow connecting to the same device twice - if (g_connected_devices.count(devicepath)) + if (IsConnected()) return false; dev_handle = CreateFile(devicepath.c_str(), - (GENERIC_READ | GENERIC_WRITE), - // TODO: Just do FILE_SHARE_READ and remove "g_connected_devices"? - // That is what "WiiYourself" does. - (FILE_SHARE_READ | FILE_SHARE_WRITE), + GENERIC_READ | GENERIC_WRITE, + // Having no FILE_SHARE_WRITE disallows us from connecting to the same wiimote twice. + // This is what "WiiYourself" does. + FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); if (dev_handle == INVALID_HANDLE_VALUE) @@ -299,15 +286,13 @@ bool Wiimote::Connect() ERROR_LOG(WIIMOTE, "Failed to set wiimote thread priority"); } */ - - g_connected_devices.insert(devicepath); return true; } void Wiimote::Disconnect() { - std::lock_guard lk(g_connected_devices_lock); - g_connected_devices.erase(devicepath); + if (!IsConnected()) + return; CloseHandle(dev_handle); dev_handle = 0; @@ -385,7 +370,7 @@ int Wiimote::IORead(u8* buf) if (bytes > 0) { // Move the data over one, so we can add back in data report indicator byte (here, 0xa1) - memmove(buf + 1, buf, MAX_PAYLOAD - 1); + std::copy_n(buf, MAX_PAYLOAD - 1, buf + 1); buf[0] = 0xa1; // TODO: is this really needed? @@ -408,11 +393,7 @@ int Wiimote::IOWrite(const u8* buf, int len) stack = MSBT_STACK_MS; if (IOWrite(buf, len)) - { - // Don't mind me, just a random sleep to fix stuff on Windows - SLEEP(1000); return 1; - } stack = MSBT_STACK_UNKNOWN; break; @@ -553,6 +534,8 @@ void RemoveWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { + // We don't want "remembered" devices. + // SetServiceState will just fail with them.. if (!btdi.fConnected && !btdi.fRemembered) { NOTICE_LOG(WIIMOTE, "Found wiimote. Enabling HID service."); @@ -561,6 +544,8 @@ bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); + g_connect_times[btdi.Address.ullLong] = std::time(nullptr); + if (FAILED(hr)) ERROR_LOG(WIIMOTE, "Pair-Up: BluetoothSetServiceState() returned %08x", hr); else @@ -575,14 +560,20 @@ bool ForgetWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { if (!btdi.fConnected && btdi.fRemembered) { - // We don't want "remembered" devices. - // SetServiceState seems to just fail with them. - // Make Windows forget about them. - // This is also required to detect a disconnect for some reason.. - NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); - Bth_BluetoothRemoveDevice(&btdi.Address); + // Time to avoid RemoveDevice after SetServiceState. + // Sometimes SetServiceState takes a while.. + auto const avoid_forget_seconds = 5.0; - return true; + auto pair_time = g_connect_times.find(btdi.Address.ullLong); + if (pair_time == g_connect_times.end() + || std::difftime(time(nullptr), pair_time->second) >= avoid_forget_seconds) + { + // Make Windows forget about device so it will re-find it if visible. + // This is also required to detect a disconnect for some reason.. + NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); + Bth_BluetoothRemoveDevice(&btdi.Address); + return true; + } } return false; From 306e6b1d80c0426092001bb4653f93f217af152d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 14 Feb 2013 14:02:51 -0600 Subject: [PATCH 574/627] Turn off continuous scanning by default. --- Source/Core/Core/Src/ConfigManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 282c369161..44a7591577 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -392,7 +392,7 @@ void SConfig::LoadSettings() ini.Get("Core", "WiiSDCard", &m_WiiSDCard, false); ini.Get("Core", "WiiKeyboard", &m_WiiKeyboard, false); ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); - ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning, true); + ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning, false); ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "MMU", &m_LocalCoreStartupParameter.bMMU, false); @@ -426,4 +426,4 @@ void SConfig::LoadSettings() } m_SYSCONF = new SysConf(); -} \ No newline at end of file +} From cda88a8c1ee3ac1b407b09e8e392262fd606f6ab Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 14 Feb 2013 18:41:31 -0600 Subject: [PATCH 575/627] Random improvements. --- .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 20 +++++++---- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 33 +++++++++++++++---- .../Core/Src/HW/WiimoteReal/WiimoteRealBase.h | 1 + 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 8c3a0f10b2..fda1d99462 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -216,19 +216,25 @@ bool Wiimote::Connect() // Disconnect a wiimote. void Wiimote::Disconnect() { + if (btd != NULL) + [btd closeConnection]; + + if (ichan != NULL) + [ichan release]; + + if (cchan != NULL) + [cchan release]; + + btd = NULL; + cchan = NULL; + ichan = NULL; + if (!IsConnected()) return; NOTICE_LOG(WIIMOTE, "Disconnecting wiimote %i", index + 1); m_connected = false; - - [btd closeConnection]; - [ichan release]; - [cchan release]; - btd = NULL; - cchan = NULL; - ichan = NULL; } bool Wiimote::IsConnected() const diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index ee685aae9b..311bf11de2 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -161,6 +161,18 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const { rpt.first[0] = WM_SET_REPORT | WM_BT_OUTPUT; } + + // Disallow games from turning off all of the LEDs. + // It makes wiimote connection status confusing. + if (rpt.first[1] == WM_LEDS) + { + auto& leds_rpt = *reinterpret_cast(&rpt.first[2]); + if (0 == leds_rpt.leds) + { + // Turn on ALL of the LEDs. + leds_rpt.leds = 0xf; + } + } m_write_reports.Push(rpt); } @@ -265,12 +277,15 @@ bool Wiimote::Prepare(int _index) // Turn off rumble u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_CMD_RUMBLE, 0}; - - // TODO: request status and check for sane response? + + // Request status report + u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0}; + // TODO: check for sane response? return (IOWrite(mode_report, sizeof(mode_report)) && IOWrite(led_report, sizeof(led_report)) - && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report)))); + && (SLEEP(200), IOWrite(rumble_report, sizeof(rumble_report))) + && IOWrite(req_status_report, sizeof(req_status_report))); } void Wiimote::EmuStart() @@ -382,9 +397,6 @@ void Wiimote::ThreadFunc() { Common::SetCurrentThreadName("Wiimote Device Thread"); - Host_ConnectWiimote(index, true); - NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", index + 1); - // main loop while (m_run_thread && IsConnected()) { @@ -485,6 +497,8 @@ void TryToConnectWiimote(Wiimote* wm) g_wiimotes[i] = wm; wm->StartThread(); wm = NULL; + + Host_ConnectWiimote(i, true); } break; } @@ -513,6 +527,8 @@ void DoneWithWiimote(int index) { std::swap(g_wiimotes[i], g_wiimotes[index]); g_wiimotes[i]->StartThread(); + + Host_ConnectWiimote(i, true); } break; } @@ -563,9 +579,12 @@ void Refresh() // Brief rumble for already connected wiimotes. for (int i = 0; i != MAX_WIIMOTES; ++i) { - // kinda sloppy if (g_wiimotes[i]) + { + g_wiimotes[i]->StopThread(); g_wiimotes[i]->Prepare(i); + g_wiimotes[i]->StartThread(); + } } HandleFoundWiimotes(found_wiimotes); diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h index 15bbc2917f..1a1f6676cf 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h @@ -41,6 +41,7 @@ #define WM_SET_REPORT 0xA0 #endif +// TODO: duplicated in WiimoteHid.h // Commands #define WM_CMD_RUMBLE 0x10 #define WM_CMD_LED 0x11 From 891de527690a24a4e5c48ce04e85547905a694b9 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 14 Feb 2013 19:04:34 -0600 Subject: [PATCH 576/627] Don't need to hang dolphin when searching for wiimote with the refresh button. This code is getting pretty ugly. :/ --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 311bf11de2..b628cf61fc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -565,13 +565,15 @@ void Refresh() g_wiimote_scanner.StopScanning(); { - std::lock_guard lk(g_refresh_lock); - + std::unique_lock lk(g_refresh_lock); std::vector found_wiimotes; if (0 != CalculateWantedWiimotes()) { + // Don't hang dolphin when searching + lk.unlock(); found_wiimotes = g_wiimote_scanner.FindWiimotes(); + lk.lock(); } CheckForDisconnectedWiimotes(); From 1f20a24a04558d06f8584f0fcb35368c2a9c0f60 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 14 Feb 2013 21:02:41 -0600 Subject: [PATCH 577/627] Minor changes. --- .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index b628cf61fc..751b24ac38 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -336,7 +336,6 @@ void WiimoteScanner::StopScanning() } } - void CheckForDisconnectedWiimotes() { std::lock_guard lk(g_refresh_lock); @@ -485,7 +484,7 @@ void ChangeWiimoteSource(unsigned int index, int source) void TryToConnectWiimote(Wiimote* wm) { - std::lock_guard lk(g_refresh_lock); + std::unique_lock lk(g_refresh_lock); for (unsigned int i = 0; i != MAX_WIIMOTES; ++i) { @@ -494,9 +493,10 @@ void TryToConnectWiimote(Wiimote* wm) { if (wm->Connect() && wm->Prepare(i)) { - g_wiimotes[i] = wm; - wm->StartThread(); - wm = NULL; + NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1); + + std::swap(g_wiimotes[i], wm); + g_wiimotes[i]->StartThread(); Host_ConnectWiimote(i, true); } @@ -504,9 +504,11 @@ void TryToConnectWiimote(Wiimote* wm) } } - delete wm; - g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + + lk.unlock(); + + delete wm; } void DoneWithWiimote(int index) @@ -541,17 +543,19 @@ void DoneWithWiimote(int index) void HandleWiimoteDisconnect(int index) { - std::lock_guard lk(g_refresh_lock); - - if (g_wiimotes[index]) - { - delete g_wiimotes[index]; - g_wiimotes[index] = NULL; + Wiimote* wm = NULL; - NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); + { + std::lock_guard lk(g_refresh_lock); + std::swap(wm, g_wiimotes[index]); + g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); } - g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes()); + if (wm) + { + delete wm; + NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); + } } void HandleFoundWiimotes(const std::vector& wiimotes) From ef90b15f3ed032acd6b32b67b0a55e7a0df6a5b7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 15 Feb 2013 03:00:31 -0600 Subject: [PATCH 578/627] Provide an option to not send speaker data. It can cause rumble lag even when the speaker is muted. --- Source/Core/Core/Src/ConfigManager.cpp | 2 ++ Source/Core/Core/Src/ConfigManager.h | 1 + Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 9 +++++++++ Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp | 8 +++++++- Source/Core/DolphinWX/Src/WiimoteConfigDiag.h | 5 +++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 44a7591577..85ecc7143f 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -242,6 +242,7 @@ void SConfig::SaveSettings() ini.Set("Core", "WiiKeyboard", m_WiiKeyboard); ini.Set("Core", "WiimoteReconnectOnLoad", m_WiimoteReconnectOnLoad); ini.Set("Core", "WiimoteContinuousScanning", m_WiimoteContinuousScanning); + ini.Set("Core", "WiimoteEnableSpeaker", m_WiimoteEnableSpeaker); ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); ini.Set("Core", "FrameLimit", m_Framelimit); @@ -393,6 +394,7 @@ void SConfig::LoadSettings() ini.Get("Core", "WiiKeyboard", &m_WiiKeyboard, false); ini.Get("Core", "WiimoteReconnectOnLoad", &m_WiimoteReconnectOnLoad, true); ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning, false); + ini.Get("Core", "WiimoteEnableSpeaker", &m_WiimoteEnableSpeaker, true); ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "MMU", &m_LocalCoreStartupParameter.bMMU, false); diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index a633bded5c..0c4ceffa9f 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -43,6 +43,7 @@ struct SConfig : NonCopyable bool m_WiiKeyboard; bool m_WiimoteReconnectOnLoad; bool m_WiimoteContinuousScanning; + bool m_WiimoteEnableSpeaker; // name of the last used filename std::string m_LastFilename; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 751b24ac38..b5a1703527 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -173,6 +173,15 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const leds_rpt.leds = 0xf; } } + else if (rpt.first[1] == WM_WRITE_SPEAKER_DATA + && !SConfig::GetInstance().m_WiimoteEnableSpeaker) + { + // Translate speaker data reports into rumble reports. + rpt.first[1] = WM_CMD_RUMBLE; + // Keep only the rumble bit. + rpt.first[2] &= 0x1; + rpt.second = 3; + } m_write_reports.Push(rpt); } diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp index 3cd050a293..475718ed2e 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp @@ -71,11 +71,17 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning")); continuous_scanning->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnContinuousScanning, this); continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning); + + auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data")); + wiimote_speaker->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnEnableSpeaker, this); + wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker); real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL); real_wiimotes_sizer->AddStretchSpacer(1); real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5); - real_wiimotes_group->Add(real_wiimotes_sizer, 1, wxEXPAND); + + real_wiimotes_group->Add(wiimote_speaker, 0); + real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND); // "General Settings" controls const wxString str[] = { _("Bottom"), _("Top") }; diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h index 26d6660ee2..4c33661ca2 100644 --- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h @@ -63,6 +63,11 @@ public: WiimoteReal::Initialize(); event.Skip(); } + void OnEnableSpeaker(wxCommandEvent& event) + { + SConfig::GetInstance().m_WiimoteEnableSpeaker = event.IsChecked(); + event.Skip(); + } private: void Cancel(wxCommandEvent& event); From 183ad0c628c4e019d1a7af1a4a0492345209db84 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 15 Feb 2013 17:44:56 +0100 Subject: [PATCH 579/627] Video_Software: Toggable zfreeze and early_z support for testing. --- .../Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp | 2 +- .../Plugin_VideoSoftware/Src/SWVideoConfig.cpp | 7 +++++++ .../Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h | 4 ++++ Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 11 ++++++----- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index 45c744ee81..3324f4bb09 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -125,7 +125,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi) if (z < 0 || z > 0x00ffffff) return; - if (bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) + if (bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && g_SWVideoConfig.bZComploc) { // early z if (!EfbInterface::ZCompare(x, y, z)) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp index 05a6cdddf2..07947e0ee7 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp @@ -35,6 +35,9 @@ SWVideoConfig::SWVideoConfig() bDumpObjects = false; bDumpFrames = false; + bZComploc = true; + bZFreeze = true; + bDumpTevStages = false; bDumpTevTextureFetches = false; @@ -52,6 +55,8 @@ void SWVideoConfig::Load(const char* ini_file) iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); + iniFile.Get("Rendering", "ZComploc", &bZComploc, true); + iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true); iniFile.Get("Info", "ShowStats", &bShowStats, false); @@ -74,6 +79,8 @@ void SWVideoConfig::Save(const char* ini_file) iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); + iniFile.Set("Rendering", "ZComploc", &bZComploc); + iniFile.Set("Rendering", "ZFreeze", &bZFreeze); iniFile.Set("Info", "ShowStats", bShowStats); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h index 14eae78b51..c042ae8cc5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h @@ -36,6 +36,10 @@ struct SWVideoConfig : NonCopyable bool bHwRasterizer; + // Emulation features + bool bZComploc; + bool bZFreeze; + bool bShowStats; bool bDumpTextures; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index 7813c0b245..bc5f978dd8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -784,11 +784,12 @@ void Tev::Draw() output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8; } - if (!bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) - { - if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) - return; - } + bool late_ztest = !bpmem.zcontrol.early_ztest || g_SWVideoConfig.bZComploc; + if (late_ztest && bpmem.zmode.testenable) + { + if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) + return; + } #if ALLOW_TEV_DUMPS if (g_SWVideoConfig.bDumpTevStages) From fb0102d4417279c1e89e8f13379d2a2490677ef8 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 15 Feb 2013 17:47:07 +0100 Subject: [PATCH 580/627] Video_Software: Fix the ZFreeze option doing nothing. --- Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index 3324f4bb09..225400e08b 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -369,7 +369,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer float w[3] = { 1.0f / v0->projectedPosition.w, 1.0f / v1->projectedPosition.w, 1.0f / v2->projectedPosition.w }; InitSlope(&WSlope, w[0], w[1], w[2], fltdx31, fltdx12, fltdy12, fltdy31); - if (!bpmem.genMode.zfreeze) + if (!bpmem.genMode.zfreeze || !g_SWVideoConfig.bZFreeze) InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) From 6fd96a162f7369f5ceb6c722c33f120877a21354 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 15 Feb 2013 17:54:52 +0100 Subject: [PATCH 581/627] Video_Software: Fix ZComploc option breaking stuff. --- Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index bc5f978dd8..927f8931e9 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -784,7 +784,7 @@ void Tev::Draw() output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8; } - bool late_ztest = !bpmem.zcontrol.early_ztest || g_SWVideoConfig.bZComploc; + bool late_ztest = !bpmem.zcontrol.early_ztest || !g_SWVideoConfig.bZComploc; if (late_ztest && bpmem.zmode.testenable) { if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) From 5a3435255be0271023371eb524d8955703a7b503 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 15 Feb 2013 16:02:38 -0600 Subject: [PATCH 582/627] Reduce some DI command delays. Fix DKCR hanging with DSP HLE. My other games continue to work. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index b6e3254d98..5d49f34488 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -477,7 +477,7 @@ int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) u32 const Size = Memory::Read_U32(BufferIn + 0x04); // Delay depends on size of read, that makes sense, right? // More than ~1150K "bytes / sec" hangs NSMBWii on boot. - // Less than ~800K "bytes / sec" hangs DKCR randomly. + // Less than ~800K "bytes / sec" hangs DKCR randomly (ok, probably not true) return SystemTimers::GetTicksPerSecond() / 975000 * Size; break; } @@ -498,7 +498,8 @@ int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) // case DVDLowClosePartition: default: // ranom numbers here! - return SystemTimers::GetTicksPerSecond() / 1500; + // More than ~1/2000th of a second hangs DKCR with DSP HLE, maybe. + return SystemTimers::GetTicksPerSecond() / 15000; break; } } From d994e56b60aa0f6fc2f1da333d0b320fcfbda018 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 15 Feb 2013 20:46:03 -0600 Subject: [PATCH 583/627] Changes/cleanup to TextureCache::Load and other mipmap related code. The significant change is what is now line 520 of TextureCacheBase.cpp: ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1) to TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat); Fixes issue 5328. Fixes issue 5461. --- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 217 +++++++++--------- .../Plugin_VideoDX11/Src/VertexManager.cpp | 2 +- .../Plugin_VideoDX9/Src/VertexManager.cpp | 2 +- .../Plugin_VideoOGL/Src/VertexManager.cpp | 2 +- 4 files changed, 114 insertions(+), 109 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index f6e6911c12..d77caa94b3 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -84,35 +84,34 @@ TextureCache::~TextureCache() void TextureCache::OnConfigChanged(VideoConfig& config) { - if (!g_texture_cache) - goto skip_checks; - - // TODO: Invalidating texcache is really stupid in some of these cases - if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples || - config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay || - config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center || - config.bHiresTextures != backup_config.s_hires_textures) + if (g_texture_cache) { - g_texture_cache->Invalidate(); + // TODO: Invalidating texcache is really stupid in some of these cases + if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples || + config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay || + config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center || + config.bHiresTextures != backup_config.s_hires_textures) + { + g_texture_cache->Invalidate(); - if(g_ActiveConfig.bHiresTextures) - HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); + if(g_ActiveConfig.bHiresTextures) + HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str()); - SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); - TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); + SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); + TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); + } + + // TODO: Probably shouldn't clear all render targets here, just mark them dirty or something. + if (config.bEFBCopyCacheEnable != backup_config.s_copy_cache_enable || // TODO: not sure if this is needed? + config.bCopyEFBToTexture != backup_config.s_copy_efb_to_texture || + config.bCopyEFBScaled != backup_config.s_copy_efb_scaled || + config.bEFBCopyEnable != backup_config.s_copy_efb || + config.iEFBScale != backup_config.s_efb_scale) + { + g_texture_cache->ClearRenderTargets(); + } } - - // TODO: Probably shouldn't clear all render targets here, just mark them dirty or something. - if (config.bEFBCopyCacheEnable != backup_config.s_copy_cache_enable || // TODO: not sure if this is needed? - config.bCopyEFBToTexture != backup_config.s_copy_efb_to_texture || - config.bCopyEFBScaled != backup_config.s_copy_efb_scaled || - config.bEFBCopyEnable != backup_config.s_copy_efb || - config.iEFBScale != backup_config.s_efb_scale) - { - g_texture_cache->ClearRenderTargets(); - } - -skip_checks: + backup_config.s_colorsamples = config.iSafeTextureCache_ColorSamples; backup_config.s_copy_efb_to_texture = config.bCopyEFBToTexture; backup_config.s_copy_efb_scaled = config.bCopyEFBScaled; @@ -301,14 +300,30 @@ void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level) entry->Save(szTemp, level); } -TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, - u32 address, unsigned int width, unsigned int height, int texformat, - unsigned int tlutaddr, int tlutfmt, bool use_mipmaps, unsigned int maxlevel, bool from_tmem) +static u32 CalculateLevelSize(u32 level_0_size, u32 level) +{ + return (level_0_size + ((1 << level) - 1)) >> level; +} + +// Used by TextureCache::Load +static TextureCache::TCacheEntryBase* ReturnEntry(unsigned int stage, TextureCache::TCacheEntryBase* entry) +{ + entry->frameCount = frameCount; + entry->Bind(stage); + + GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true); + + return entry; +} + +TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, + u32 const address, unsigned int width, unsigned int height, int const texformat, + unsigned int const tlutaddr, int const tlutfmt, bool const use_mipmaps, unsigned int const maxlevel, bool const from_tmem) { if (0 == address) return NULL; - // TexelSizeInNibbles(format)*width*height/16; + // TexelSizeInNibbles(format) * width * height / 16; const unsigned int bsw = TexDecoder_GetBlockWidthInTexels(texformat) - 1; const unsigned int bsh = TexDecoder_GetBlockHeightInTexels(texformat) - 1; @@ -317,11 +332,9 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, const unsigned int nativeW = width; const unsigned int nativeH = height; - bool using_custom_texture = false; - bool using_custom_lods = false; - u32 texID = address; - u64 tex_hash = TEXHASH_INVALID; // Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup) + // Hash assigned to texcache entry (also used to generate filenames used for texture dumping and custom texture lookup) + u64 tex_hash = TEXHASH_INVALID; u64 tlut_hash = TEXHASH_INVALID; u32 full_format = texformat; @@ -332,9 +345,12 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, full_format = texformat | (tlutfmt << 16); const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - u8* src_data; - if (from_tmem) src_data = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE]; - else src_data = Memory::GetPointer(address); + + const u8* src_data; + if (from_tmem) + src_data = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE]; + else + src_data = Memory::GetPointer(address); // TODO: This doesn't hash GB tiles for preloaded RGBA8 textures (instead, it's hashing more data from the low tmem bank than it should) tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); @@ -369,15 +385,17 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, { entry->type = TCET_EC_VRAM; - // TODO: Print a warning if the format changes! In this case, we could reinterpret the internal texture object data to the new pixel format (similiar to what is already being done in Renderer::ReinterpretPixelFormat()) - goto return_entry; + // TODO: Print a warning if the format changes! In this case, + // we could reinterpret the internal texture object data to the new pixel format + // (similiar to what is already being done in Renderer::ReinterpretPixelFormat()) + return ReturnEntry(stage, entry); } // 2. b) For normal textures, all texture parameters need to match if (address == entry->addr && tex_hash == entry->hash && full_format == entry->format && entry->num_mipmaps > maxlevel && entry->native_width == nativeW && entry->native_height == nativeH) { - goto return_entry; + return ReturnEntry(stage, entry); } // 3. If we reach this line, we'll have to upload the new texture data to VRAM. @@ -385,7 +403,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, // // TODO: Don't we need to force texture decoding to RGBA8 for dynamic EFB copies? // TODO: Actually, it should be enough if the internal texture format matches... - if ((entry->type == TCET_NORMAL && width == entry->virtual_width && height == entry->virtual_height && full_format == entry->format && entry->num_mipmaps > maxlevel) + if ((entry->type == TCET_NORMAL && width == entry->virtual_width && height == entry->virtual_height + && full_format == entry->format && entry->num_mipmaps > maxlevel) || (entry->type == TCET_EC_DYNAMIC && entry->native_width == width && entry->native_height == height)) { // reuse the texture @@ -398,9 +417,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } + bool using_custom_texture = false; if (g_ActiveConfig.bHiresTextures) { + // This function may modify width/height. pcfmt = LoadCustomTexture(tex_hash, texformat, 0, width, height); if (pcfmt != PC_TEX_FMT_NONE) { @@ -431,21 +452,25 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } - unsigned int texLevels; - bool use_native_mips; - texLevels = use_mipmaps ? (maxlevel + 1) : 1; - using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); - use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH); // Only load native mips if their dimensions fit to our virtual texture dimensions + u32 texLevels = use_mipmaps ? (maxlevel + 1) : 1; + const bool using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); + // Only load native mips if their dimensions fit to our virtual texture dimensions + const bool use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH); texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // create the entry/texture - if (NULL == entry) { + if (NULL == entry) + { textures[texID] = entry = g_texture_cache->CreateTexture(width, height, expandedWidth, texLevels, pcfmt); // Sometimes, we can get around recreating a texture if only the number of mip levels changes // e.g. if our texture cache entry got too many mipmap levels we can limit the number of used levels by setting the appropriate render states // Thus, we don't update this member for every Load, but just whenever the texture gets recreated // TODO: D3D9 doesn't support min_lod. We should add a workaround for that here! + + // TODO: This is the wrong value. We should be storing the number of levels our actual texture has. + // But that will currently make the above "existing entry" tests fail as "texLevels" is not calculated until after. + // Currently, we might try to reuse a texture which appears to have more levels than actual, maybe.. entry->num_mipmaps = maxlevel + 1; entry->type = TCET_NORMAL; @@ -464,78 +489,58 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (g_ActiveConfig.bDumpTextures && !using_custom_texture) DumpTexture(entry, 0); + u32 level = 1; // load mips - TODO: Loading mipmaps from tmem is untested! - if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && use_native_mips) + if (pcfmt != PC_TEX_FMT_NONE) { - const unsigned int bsdepth = TexDecoder_GetTexelSizeInNibbles(texformat); - - unsigned int level = 1; - unsigned int mipWidth = (width + 1) >> 1; - unsigned int mipHeight = (height + 1) >> 1; - - u8* ptr_even = NULL, *ptr_odd = NULL; - if (from_tmem) + if (use_native_mips) { - ptr_even = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE + texture_size]; - ptr_odd = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + src_data += texture_size; + + const u8* ptr_even = NULL; + const u8* ptr_odd = NULL; + if (from_tmem) + { + ptr_even = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE + texture_size]; + ptr_odd = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + } + + for (; level != texLevels; ++level) + { + const u32 mip_width = CalculateLevelSize(width, level); + const u32 mip_height = CalculateLevelSize(height, level); + const u32 expanded_mip_width = (mip_width + bsw) & (~bsw); + const u32 expanded_mip_height = (mip_height + bsh) & (~bsh); + + const u8*& mip_src_data = from_tmem + ? ((level % 2) ? ptr_odd : ptr_even) + : src_data; + TexDecoder_Decode(temp, mip_src_data, expanded_mip_width, expanded_mip_height, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + mip_src_data += TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat); + + entry->Load(mip_width, mip_height, expanded_mip_width, level); + + if (g_ActiveConfig.bDumpTextures) + DumpTexture(entry, level); + } } - src_data += texture_size; - - while ((mipHeight || mipWidth) && (level < texLevels)) + else if (using_custom_lods) { - u8** ptr; - if (from_tmem) ptr = (level % 2) ? &ptr_odd : &ptr_even; - else ptr = &src_data; + for (; level != texLevels; ++level) + { + unsigned int mip_width = CalculateLevelSize(width, level); + unsigned int mip_height = CalculateLevelSize(height, level); - const unsigned int currentWidth = (mipWidth > 0) ? mipWidth : 1; - const unsigned int currentHeight = (mipHeight > 0) ? mipHeight : 1; - - expandedWidth = (currentWidth + bsw) & (~bsw); - expandedHeight = (currentHeight + bsh) & (~bsh); - - TexDecoder_Decode(temp, *ptr, expandedWidth, expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); - entry->Load(currentWidth, currentHeight, expandedWidth, level); - - if (g_ActiveConfig.bDumpTextures) - DumpTexture(entry, level); - - *ptr += ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1); - mipWidth >>= 1; - mipHeight >>= 1; - ++level; - } - } - else if (texLevels > 1 && pcfmt != PC_TEX_FMT_NONE && using_custom_lods) - { - unsigned int level = 1; - unsigned int mipWidth = (width + 1) >> 1; - unsigned int mipHeight = (height + 1) >> 1; - - while ((mipHeight || mipWidth) && (level < texLevels)) - { - unsigned int currentWidth = (mipWidth > 0) ? mipWidth : 1; - unsigned int currentHeight = (mipHeight > 0) ? mipHeight : 1; - - LoadCustomTexture(tex_hash, texformat, level, currentWidth, currentHeight); - entry->Load(currentWidth, currentHeight, currentWidth, level); - - mipWidth >>= 1; - mipHeight >>= 1; - ++level; + LoadCustomTexture(tex_hash, texformat, level, mip_width, mip_height); + entry->Load(mip_width, mip_height, mip_width, level); + } } } INCSTAT(stats.numTexturesCreated); SETSTAT(stats.numTexturesAlive, textures.size()); -return_entry: - - entry->frameCount = frameCount; - entry->Bind(stage); - - GFX_DEBUGGER_PAUSE_AT(NEXT_TEXTURE_CHANGE, true); - - return entry; + return ReturnEntry(stage, entry); } void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp index 4bcb4befb8..ab8ed68654 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp @@ -238,7 +238,7 @@ void VertexManager::vFlush() tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, (tex.texMode0[i&3].min_filter & 3), - ceil(tex.texMode1[i&3].max_lod / 16.f), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp index d8e2462f51..661cf36e76 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp @@ -334,7 +334,7 @@ void VertexManager::vFlush() tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, (tex.texMode0[i&3].min_filter & 3), - ceil(tex.texMode1[i&3].max_lod / 16.f), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 8e9feb2c39..6ea10fc077 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -165,7 +165,7 @@ void VertexManager::vFlush() tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, tex.texTlut[i&3].tlut_format, (tex.texMode0[i&3].min_filter & 3), - ceil(tex.texMode1[i&3].max_lod / 16.f), + (tex.texMode1[i&3].max_lod + 0xf) / 0x10, tex.texImage1[i&3].image_type); if (tentry) From 1792a9d27b0f34c7fa599882140e13596249d7f4 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 17 Feb 2013 15:03:10 +1100 Subject: [PATCH 584/627] Added the ability to reverse the direction of the force feedback by allowing negative range values. Fixes issue 5981. --- Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp index 8cdd2e16cb..1efcf98af6 100644 --- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp @@ -519,7 +519,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) button_sizer->Add(add_button, 1, 0, 5); } - range_slider = new wxSlider(this, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); + range_slider = new wxSlider(this, -1, SLIDER_TICK_COUNT, -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT)); From 123035a192d83e171e6775812dc38e5fbe75257d Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 17 Feb 2013 15:27:15 +1100 Subject: [PATCH 585/627] Bulk send TCP data to the client with the emulated USB Gecko. Fixes issue 6006. --- Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index 93b7cd5d09..2a051ad14a 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -134,10 +134,16 @@ void GeckoSockServer::ClientThread() if (send_fifo.size()) { - if (client.Send((char*)&send_fifo.front(), sizeof(u8)) + char* packet = new char[send_fifo.size()]; + int i = 0; + while(send_fifo.size()) + { + packet[i++] = send_fifo.front(); + send_fifo.pop(); + } + if (client.Send(packet, sizeof(u8)*i) == sf::Socket::Disconnected) client_running = false; - send_fifo.pop(); } } // unlock transfer From 537d5ea9429390f5924f4e2cc3adeef4260370f0 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 16 Feb 2013 23:42:00 -0600 Subject: [PATCH 586/627] Use omp_get_num_procs to set the number of OpenMP threads rather than our core count detection. --- Source/Core/VideoCommon/Src/TextureDecoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index 44efcf8bae..30df817902 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -692,7 +692,7 @@ inline void SetOpenMPThreadCount(int width, int height) if (g_ActiveConfig.bOMPDecoder && width > 127 && height > 127) { // don't span to many threads they will kill the rest of the emu :) - omp_set_num_threads((cpu_info.num_cores + 2) / 3); + omp_set_num_threads((omp_get_num_procs() + 2) / 3); } else { From 206fdde9332859b53a22d415d3db304d997e8540 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 16 Feb 2013 23:44:50 -0600 Subject: [PATCH 587/627] Remove the core count from the cpu info OSD message. It was often wrong and not rather important. --- Source/Core/Common/Src/CPUDetect.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp index 65cd6dbd0b..282929e7b2 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/CPUDetect.cpp @@ -205,14 +205,7 @@ void CPUInfo::Detect() // Turn the cpu info into a string we can show std::string CPUInfo::Summarize() { - std::string sum; - if (num_cores == 1) - sum = StringFromFormat("%s, %i core", cpu_string, num_cores); - else - { - sum = StringFromFormat("%s, %i cores", cpu_string, num_cores); - if (HTT) sum += StringFromFormat(" (%i logical threads per physical core)", logical_cpu_count); - } + std::string sum(cpu_string); if (bSSE) sum += ", SSE"; if (bSSE2) sum += ", SSE2"; if (bSSE3) sum += ", SSE3"; From 9ac2fbb0a5f0af21a2a539a7655cfa7e15801ab1 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 00:19:42 -0600 Subject: [PATCH 588/627] Fix a memleak. Probably/maybe improve USBGecko performance. --- Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp | 49 ++++++++++++--------- Source/Core/Core/Src/HW/EXI_DeviceGecko.h | 6 ++- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp index 2a051ad14a..26e220d7cf 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp @@ -98,8 +98,8 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill) client_running = false; clientThread.join(); - recv_fifo = std::queue(); - send_fifo = std::queue(); + recv_fifo = std::deque(); + send_fifo = std::deque(); } clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this); client_count++; @@ -120,34 +120,39 @@ void GeckoSockServer::ClientThread() while (client_running) { - u8 data; - std::size_t got = 0; + bool did_nothing = true; { std::lock_guard lk(transfer_lock); - if (client.Receive((char*)&data, sizeof(data), got) - == sf::Socket::Disconnected) + // what's an ideal buffer size? + char data[128]; + std::size_t got = 0; + + if (client.Receive(&data[0], ARRAYSIZE(data), got) == sf::Socket::Disconnected) client_running = false; - if (got) - recv_fifo.push(data); - - if (send_fifo.size()) + + if (got != 0) { - char* packet = new char[send_fifo.size()]; - int i = 0; - while(send_fifo.size()) - { - packet[i++] = send_fifo.front(); - send_fifo.pop(); - } - if (client.Send(packet, sizeof(u8)*i) - == sf::Socket::Disconnected) + did_nothing = false; + + recv_fifo.insert(recv_fifo.end(), &data[0], &data[got]); + } + + if (!send_fifo.empty()) + { + did_nothing = false; + + std::vector packet(send_fifo.begin(), send_fifo.end()); + send_fifo.clear(); + + if (client.Send(&packet[0], packet.size()) == sf::Socket::Disconnected) client_running = false; } } // unlock transfer - SLEEP(1); + if (did_nothing) + Common::YieldCPU(); } client.Close(); @@ -186,7 +191,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize) if (!recv_fifo.empty()) { _uData = 0x08000000 | (recv_fifo.front() << 16); - recv_fifo.pop(); + recv_fifo.pop_front(); } break; } @@ -196,7 +201,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize) case CMD_SEND: { std::lock_guard lk(transfer_lock); - send_fifo.push(_uData >> 20); + send_fifo.push_back(_uData >> 20); _uData = 0x04000000; break; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h index 9b427e21c8..da055b3c8a 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.h @@ -20,6 +20,8 @@ #include "SFML/Network.hpp" #include "Thread.h" + +#include #include class GeckoSockServer @@ -36,8 +38,8 @@ public: std::thread clientThread; std::mutex transfer_lock; - std::queue send_fifo; - std::queue recv_fifo; + std::deque send_fifo; + std::deque recv_fifo; private: static int client_count; From 333084250591d0cd2e88ebdb722a36003c2ae213 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 01:33:22 -0600 Subject: [PATCH 589/627] Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time. --- Source/Core/Common/Src/FileUtil.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index d74c99b7a2..8e1bec2809 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -196,8 +196,9 @@ bool CreateFullPath(const std::string &fullPath) // we're done, yay! if (position == fullPath.npos) return true; - - std::string subPath = fullPath.substr(0, position); + + // Include the '/' so the first call is CreateDir("/") rather than CreateDir("") + std::string const subPath(fullPath.substr(0, position + 1)); if (!File::IsDirectory(subPath)) File::CreateDir(subPath); From bf4be1d8d1f6d4d8d7b240aa4aa5288e6b6e83c8 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 01:57:25 -0600 Subject: [PATCH 590/627] Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin. --- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index dc1f44739b..3c00d66be5 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -215,7 +215,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) { std::string TMDFileName(m_Path); - if (File::IsDirectory(TMDFileName)) + if ('/' == *TMDFileName.rbegin()) TMDFileName += "title.tmd"; else m_Path = TMDFileName.substr(0, TMDFileName.find("title.tmd")); From 0cdd4434b9ce7f6b34d32f79c5fe23eb61602b52 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 12:51:12 -0600 Subject: [PATCH 591/627] Removing destination on rename when source isn't present doesn't make sense. IOCTL_RENAME_FILE still might not be totally correct. Fixes issue 5440. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 2 +- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 1fe6986179..2d5c86f800 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -353,7 +353,7 @@ void ExecuteCommand(u32 _Address) Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); - WARN_LOG(WII_IPC_HLE, "Tried to open %s as %d", DeviceName.c_str(), DeviceID); + WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID); if (DeviceID >= 0) { if (DeviceName.find("/dev/es") == 0) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index ecc4be0cb0..38100e5d7a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -428,7 +428,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B File::CreateFullPath(FilenameRename); // if there is already a file, delete it - if (File::Exists(FilenameRename)) + if (File::Exists(Filename) && File::Exists(FilenameRename)) { File::Delete(FilenameRename); } From fa9aafeed8753b0fd8f039d3d740b97c1bfad4dd Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 13:30:04 -0600 Subject: [PATCH 592/627] Some cleanup of CWII_IPC_HLE_Device_FileIO: The real file was never kept open for longer than a single operation so there was no point in dealing with it in DoState. Saving the real path in the savestate was also probably a bad idea. Savestates should be a bit more portable now. --- Source/Core/Common/Src/FileUtil.cpp | 19 +++ Source/Core/Common/Src/FileUtil.h | 8 +- .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 115 ++++++------------ .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 9 +- Source/Core/Core/Src/State.cpp | 2 +- 5 files changed, 63 insertions(+), 90 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 8e1bec2809..d6ab33962a 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -42,6 +42,7 @@ #endif #include +#include #include #ifndef S_ISDIR @@ -774,6 +775,24 @@ IOFile::~IOFile() Close(); } +IOFile::IOFile(IOFile&& other) + : m_file(NULL), m_good(true) +{ + Swap(other); +} + +IOFile& IOFile::operator=(IOFile other) +{ + Swap(other); + return *this; +} + +void IOFile::Swap(IOFile& other) +{ + std::swap(m_file, other.m_file); + std::swap(m_good, other.m_good); +} + bool IOFile::Open(const std::string& filename, const char openmode[]) { Close(); diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 451b1b6929..2c8bf8f64b 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -150,7 +150,7 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str); // simple wrapper for cstdlib file functions to // hopefully will make error checking easier // and make forgetting an fclose() harder -class IOFile : NonCopyable +class IOFile { public: IOFile(); @@ -158,6 +158,11 @@ public: IOFile(const std::string& filename, const char openmode[]); ~IOFile(); + + IOFile(IOFile&& other); + IOFile& operator=(IOFile other); + + void Swap(IOFile& other); bool Open(const std::string& filename, const char openmode[]); bool Close(); @@ -212,6 +217,7 @@ public: void Clear() { m_good = true; std::clearerr(m_file); } private: + IOFile(const IOFile&) /*= delete*/; IOFile& operator=(const IOFile&) /*= delete*/; std::FILE* m_file; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 2061a106e0..d65a009a2a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -28,17 +28,16 @@ static Common::replace_v replacements; -// This is used by several of the FileIO and /dev/fs functions -std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size) +// This is used by several of the FileIO and /dev/fs functions +std::string HLE_IPC_BuildFilename(std::string path_wii, int _size) { std::string path_full = File::GetUserPath(D_WIIROOT_IDX); - std::string path_wii(_pFilename); if ((path_wii.length() > 0) && (path_wii[1] == '0')) path_full += std::string("/title"); // this looks and feel like a hack... // Replaces chars that FAT32 can't support with strings defined in /sys/replace - for (Common::replace_v::const_iterator i = replacements.begin(); i != replacements.end(); ++i) + for (auto i = replacements.begin(); i != replacements.end(); ++i) { for (size_t j = 0; (j = path_wii.find(i->first, j)) != path_wii.npos; ++j) path_wii.replace(j, 1, i->second); @@ -82,9 +81,8 @@ void HLE_IPC_CreateVirtualFATFilesystem() } } -CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) +CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName, false) // not a real hardware - , m_pFileHandle(NULL) , m_Mode(0) , m_SeekPos(0) { @@ -108,12 +106,9 @@ bool CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress, bool _bForce) } bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) -{ +{ m_Mode = _Mode; u32 ReturnValue = 0; - - // close the file handle if we get a reopen - //m_pFileHandle.Close(); static const char* const Modes[] = { @@ -122,20 +117,18 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) "Write only", "Read and Write" }; - - m_Filename = std::string(HLE_IPC_BuildFilename(m_Name.c_str(), 64)); - // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here - if (File::Exists(m_Filename)) + auto const filename = HLE_IPC_BuildFilename(m_Name, 64); + if (File::Exists(filename)) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); ReturnValue = m_DeviceID; } else { - WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], m_Filename.c_str()); + WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], filename.c_str()); ReturnValue = FS_FILE_NOT_EXIST; } @@ -145,55 +138,43 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) return true; } - - -bool CWII_IPC_HLE_Device_FileIO::OpenFile() +File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() { + const char* open_mode = ""; + switch (m_Mode) { case ISFS_OPEN_READ: - { - m_pFileHandle.Open(m_Filename, "rb"); + open_mode = "rb"; break; - } + case ISFS_OPEN_WRITE: - { - m_pFileHandle.Open(m_Filename, "r+b"); - break; - } case ISFS_OPEN_RW: - { - m_pFileHandle.Open(m_Filename, "r+b"); + open_mode = "r+b"; break; - } + default: - { PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); break; } - } - return m_pFileHandle.IsOpen(); + + return File::IOFile(HLE_IPC_BuildFilename(m_Name, 64), open_mode); } -void CWII_IPC_HLE_Device_FileIO::CloseFile() -{ - m_pFileHandle.Close(); -} - -bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) +bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) { u32 ReturnValue = FS_RESULT_FATAL; const u32 SeekPosition = Memory::Read_U32(_CommandAddress + 0xC); const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10); - - if (OpenFile()) + if (auto file = OpenFile()) { ReturnValue = FS_RESULT_FATAL; - const u64 fileSize = m_pFileHandle.GetSize(); + const u64 fileSize = file.GetSize(); INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekPosition, Mode, m_Name.c_str(), fileSize); - switch (Mode){ + switch (Mode) + { case 0: { if (SeekPosition <= fileSize) @@ -230,7 +211,6 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) break; } } - CloseFile(); } else { @@ -248,18 +228,18 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (OpenFile()) + if (auto file = OpenFile()) { - if (m_Mode == ISFS_OPEN_WRITE) + if (m_Mode == ISFS_OPEN_WRITE) { WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to read 0x%x bytes to 0x%08x on write-only file %s", Size, Address, m_Name.c_str()); } - else + else { INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str()); - m_pFileHandle.Seek(m_SeekPos, SEEK_SET); - ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, m_pFileHandle.GetHandle()); - if (ReturnValue != Size && ferror(m_pFileHandle.GetHandle())) + file.Seek(m_SeekPos, SEEK_SET); + ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, file.GetHandle()); + if (ReturnValue != Size && ferror(file.GetHandle())) { ReturnValue = FS_EACCESS; } @@ -269,7 +249,6 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress) } } - CloseFile(); } else { @@ -288,23 +267,22 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress) const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); - if (OpenFile()) + if (auto file = OpenFile()) { - if (m_Mode == ISFS_OPEN_READ) + if (m_Mode == ISFS_OPEN_READ) { WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to write 0x%x bytes from 0x%08x to read-only file %s", Size, Address, m_Name.c_str()); } else { INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); - m_pFileHandle.Seek(m_SeekPos, SEEK_SET); - if (m_pFileHandle.WriteBytes(Memory::GetPointer(Address), Size)) + file.Seek(m_SeekPos, SEEK_SET); + if (file.WriteBytes(Memory::GetPointer(Address), Size)) { ReturnValue = Size; m_SeekPos += Size; } } - CloseFile(); } else { @@ -329,9 +307,9 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) { case ISFS_IOCTL_GETFILESTATS: { - if (OpenFile()) + if (auto file = OpenFile()) { - u32 m_FileLength = (u32)m_pFileHandle.GetSize(); + u32 m_FileLength = (u32)file.GetSize(); const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); @@ -339,7 +317,6 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) Memory::Write_U32(m_FileLength, BufferOut); Memory::Write_U32(m_SeekPos, BufferOut+4); - CloseFile(); } else { @@ -365,30 +342,6 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) { DoStateShared(p); - bool have_file_handle = (m_pFileHandle != 0); - s32 seek = (have_file_handle) ? (s32)m_pFileHandle.Tell() : 0; - - p.Do(have_file_handle); p.Do(m_Mode); - p.Do(seek); p.Do(m_SeekPos); - p.Do(m_Filename); - - if (p.GetMode() == PointerWrap::MODE_READ) - { - int mode = m_Mode; - bool active = m_Active; - if (have_file_handle) - { - Open(0, m_Mode); - _dbg_assert_msg_(WII_IPC_HLE, m_pFileHandle, "bad filehandle"); - } - else - Close(0, true); - m_Mode = mode; - m_Active = active; - } - - if (have_file_handle) - m_pFileHandle.Seek(seek, SEEK_SET); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index ff34a43a20..1ac839e70d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -21,7 +21,7 @@ #include "WII_IPC_HLE_Device.h" #include "FileUtil.h" -std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size); +std::string HLE_IPC_BuildFilename(std::string _pFilename, int _size); void HLE_IPC_CreateVirtualFATFilesystem(); class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device @@ -39,8 +39,7 @@ public: bool IOCtl(u32 _CommandAddress); void DoState(PointerWrap &p); - bool OpenFile(); - void CloseFile(); + File::IOFile OpenFile(); private: enum @@ -76,12 +75,8 @@ private: ISFS_IOCTL_SHUTDOWN }; - File::IOFile m_pFileHandle; u32 m_Mode; - u32 m_SeekPos; - - std::string m_Filename; }; #endif diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 200642eccb..084a94e5f6 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 12; +static const u32 STATE_VERSION = 13; struct StateHeader { From d0ea94a2aaa1909a4b53b158a4a8250ee7578ae4 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 17 Feb 2013 13:52:04 -0600 Subject: [PATCH 593/627] WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation. --- .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 11 +++++++---- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index d65a009a2a..711d360874 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -118,17 +118,18 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode) "Read and Write" }; + m_filepath = HLE_IPC_BuildFilename(m_Name, 64); + // The file must exist before we can open it // It should be created by ISFS_CreateFile, not here - auto const filename = HLE_IPC_BuildFilename(m_Name, 64); - if (File::Exists(filename)) + if (File::Exists(m_filepath)) { INFO_LOG(WII_IPC_FILEIO, "FileIO: Open %s (%s == %08X)", m_Name.c_str(), Modes[_Mode], _Mode); ReturnValue = m_DeviceID; } else { - WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], filename.c_str()); + WARN_LOG(WII_IPC_FILEIO, "FileIO: Open (%s) failed - File doesn't exist %s", Modes[_Mode], m_filepath.c_str()); ReturnValue = FS_FILE_NOT_EXIST; } @@ -158,7 +159,7 @@ File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() break; } - return File::IOFile(HLE_IPC_BuildFilename(m_Name, 64), open_mode); + return File::IOFile(m_filepath, open_mode); } bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) @@ -344,4 +345,6 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p) p.Do(m_Mode); p.Do(m_SeekPos); + + m_filepath = HLE_IPC_BuildFilename(m_Name, 64); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index 1ac839e70d..3698d05c9f 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -77,6 +77,8 @@ private: u32 m_Mode; u32 m_SeekPos; + + std::string m_filepath; }; #endif From 19ab5bf50d511f9e73a896c9c610e8521fe7b583 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 18 Feb 2013 17:14:56 +0100 Subject: [PATCH 594/627] TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 11 ++++++++--- Source/Core/VideoCommon/Src/VideoConfig.cpp | 1 + Source/Core/VideoCommon/Src/VideoConfig.h | 1 + Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 1 + 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index d77caa94b3..fd935de342 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -318,7 +318,7 @@ static TextureCache::TCacheEntryBase* ReturnEntry(unsigned int stage, TextureCac TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, u32 const address, unsigned int width, unsigned int height, int const texformat, - unsigned int const tlutaddr, int const tlutfmt, bool const use_mipmaps, unsigned int const maxlevel, bool const from_tmem) + unsigned int const tlutaddr, int const tlutfmt, bool const use_mipmaps, unsigned int maxlevel, bool const from_tmem) { if (0 == address) return NULL; @@ -345,7 +345,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, full_format = texformat | (tlutfmt << 16); const u32 texture_size = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, texformat); - + const u8* src_data; if (from_tmem) src_data = &texMem[bpmem.tex[stage / 4].texImage1[stage % 4].tmem_even * TMEM_LINE_SIZE]; @@ -372,6 +372,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, tex_hash ^= tlut_hash; } + // D3D doesn't like when the specified mipmap count would require more than one 1x1-sized LOD in the mipmap chain + // e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,1x1, so we limit the mipmap count to 6 there + while (g_ActiveConfig.backend_info.bUseMinimalMipCount && max(expandedWidth, expandedHeight) >> maxlevel == 0) + --maxlevel; + TCacheEntryBase *entry = textures[texID]; if (entry) { @@ -456,7 +461,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, const bool using_custom_lods = using_custom_texture && CheckForCustomTextureLODs(tex_hash, texformat, texLevels); // Only load native mips if their dimensions fit to our virtual texture dimensions const bool use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH); - texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; + texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // TODO: Should be forced to 1 for non-pow2 textures (e.g. efb copies with automatically adjusted IR) // create the entry/texture if (NULL == entry) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 7418d60741..a76514a10c 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -42,6 +42,7 @@ VideoConfig::VideoConfig() // disable all features by default backend_info.APIType = API_NONE; backend_info.bUseRGBATextures = false; + backend_info.bUseMinimalMipCount = false; backend_info.bSupports3DVision = false; } diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 4364bea6ea..183fcf784c 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -157,6 +157,7 @@ struct VideoConfig std::vector PPShaders; // post-processing shaders bool bUseRGBATextures; // used for D3D11 in TextureCache + bool bUseMinimalMipCount; bool bSupports3DVision; bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL bool bSupportsFormatReinterpretation; diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index cb348b8684..b7dd9101d3 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -90,6 +90,7 @@ void InitBackendInfo() g_Config.backend_info.APIType = API_D3D11; g_Config.backend_info.bUseRGBATextures = true; // the GX formats barely match any D3D11 formats + g_Config.backend_info.bUseMinimalMipCount = true; g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bSupportsDualSourceBlend = true; g_Config.backend_info.bSupportsFormatReinterpretation = true; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 5a80100a08..3c00e1d619 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -93,6 +93,7 @@ void InitBackendInfo() const int maxConstants = (shaderModel < 3) ? 32 : ((shaderModel < 4) ? 224 : 65536); g_Config.backend_info.APIType = shaderModel < 3 ? API_D3D9_SM20 :API_D3D9_SM30; g_Config.backend_info.bUseRGBATextures = false; + g_Config.backend_info.bUseMinimalMipCount = true; g_Config.backend_info.bSupports3DVision = true; g_Config.backend_info.bSupportsDualSourceBlend = false; g_Config.backend_info.bSupportsFormatReinterpretation = true; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index e57e3e210a..05f21beed1 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -130,6 +130,7 @@ void InitBackendInfo() { g_Config.backend_info.APIType = API_OPENGL; g_Config.backend_info.bUseRGBATextures = false; + g_Config.backend_info.bUseMinimalMipCount = false; g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bSupportsDualSourceBlend = false; // supported, but broken g_Config.backend_info.bSupportsFormatReinterpretation = false; From 718a1b5dedd7e2d3c9905b72a40080addd14b16e Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 19 Feb 2013 23:18:13 +1100 Subject: [PATCH 595/627] Fixed a buffer overflow in the OpenAL buffer. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 6b239a584c..7d1c45175b 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -200,6 +200,7 @@ void OpenALStream::SoundLoop() u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); unsigned int numSamples = (unsigned int)num_samples_to_render; + unsigned int minSamples = surround_capable ? 240 : 0; // DPL2 accepts 240 samples minimum (FWRDURATION) numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; numSamples = m_mixer->Mix(realtimeBuffer, numSamples); @@ -236,9 +237,15 @@ void OpenALStream::SoundLoop() // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); soundTouch.setTempo(rate); + if (rate > 10) + { + soundTouch.clear(); + } } - unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS); - if (nSamples > 0) + + unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * OAL_MAX_BUFFERS); + + if (nSamples > minSamples) { // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) if (iBuffersFilled == 0) From 294cb165ba3449cc4fd96eabb5272e2984a58eb8 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 19 Feb 2013 22:39:28 -0600 Subject: [PATCH 596/627] Don't load level 0 twice for 1-level textures in DX11. --- Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 844cf24b47..ba05dc83d2 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -70,24 +70,19 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, { D3D11_USAGE usage = D3D11_USAGE_DEFAULT; D3D11_CPU_ACCESS_FLAG cpu_access = (D3D11_CPU_ACCESS_FLAG)0; - D3D11_SUBRESOURCE_DATA srdata, *data = NULL; + // This is just an optimization apparently? if (tex_levels == 1) { usage = D3D11_USAGE_DYNAMIC; cpu_access = D3D11_CPU_ACCESS_WRITE; - - srdata.pSysMem = TextureCache::temp; - srdata.SysMemPitch = 4 * expanded_width; - - data = &srdata; } const D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, width, height, 1, tex_levels, D3D11_BIND_SHADER_RESOURCE, usage, cpu_access); ID3D11Texture2D *pTexture; - const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, data, &pTexture); + const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, NULL, &pTexture); CHECK(SUCCEEDED(hr), "Create texture of the TextureCache"); TCacheEntry* const entry = new TCacheEntry(new D3DTexture2D(pTexture, D3D11_BIND_SHADER_RESOURCE)); From 6e6d8af6ddaddeeaf89be2f8b6920b913488f0c6 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 20 Feb 2013 05:37:01 -0600 Subject: [PATCH 597/627] Revert "Don't load level 0 twice for 1-level textures in DX11." and fix it properly. All backend TextureCaches now load level 0 in CreateTexture. This reverts commit 294cb165ba3449cc4fd96eabb5272e2984a58eb8. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 15 ++++++++++----- .../Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | 9 +++++++-- .../Plugins/Plugin_VideoDX9/Src/TextureCache.cpp | 2 ++ .../Plugins/Plugin_VideoOGL/Src/TextureCache.cpp | 2 ++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index fd935de342..fda4f21a7e 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -481,15 +481,20 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage, GFX_DEBUGGER_PAUSE_AT(NEXT_NEW_TEXTURE, true); } + else + { + // load texture (CreateTexture also loads level 0) + entry->Load(width, height, expandedWidth, 0); + } entry->SetGeneralParameters(address, texture_size, full_format, entry->num_mipmaps); entry->SetDimensions(nativeW, nativeH, width, height); entry->hash = tex_hash; - if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture) entry->type = TCET_EC_DYNAMIC; - else entry->type = TCET_NORMAL; - - // load texture - entry->Load(width, height, expandedWidth, 0); + + if (entry->IsEfbCopy() && !g_ActiveConfig.bCopyEFBToTexture) + entry->type = TCET_EC_DYNAMIC; + else + entry->type = TCET_NORMAL; if (g_ActiveConfig.bDumpTextures && !using_custom_texture) DumpTexture(entry, 0); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index ba05dc83d2..844cf24b47 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -70,19 +70,24 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, { D3D11_USAGE usage = D3D11_USAGE_DEFAULT; D3D11_CPU_ACCESS_FLAG cpu_access = (D3D11_CPU_ACCESS_FLAG)0; + D3D11_SUBRESOURCE_DATA srdata, *data = NULL; - // This is just an optimization apparently? if (tex_levels == 1) { usage = D3D11_USAGE_DYNAMIC; cpu_access = D3D11_CPU_ACCESS_WRITE; + + srdata.pSysMem = TextureCache::temp; + srdata.SysMemPitch = 4 * expanded_width; + + data = &srdata; } const D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, width, height, 1, tex_levels, D3D11_BIND_SHADER_RESOURCE, usage, cpu_access); ID3D11Texture2D *pTexture; - const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, NULL, &pTexture); + const HRESULT hr = D3D::device->CreateTexture2D(&texdesc, data, &pTexture); CHECK(SUCCEEDED(hr), "Create texture of the TextureCache"); TCacheEntry* const entry = new TCacheEntry(new D3DTexture2D(pTexture, D3D11_BIND_SHADER_RESOURCE)); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp index 660fad7379..f105d0f774 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp @@ -226,6 +226,8 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, u TCacheEntry* entry = new TCacheEntry(D3D::CreateTexture2D(temp, width, height, expanded_width, d3d_fmt, swap_r_b, tex_levels)); entry->swap_r_b = swap_r_b; entry->d3d_fmt = d3d_fmt; + + entry->Load(width, height, expanded_width, 0); return entry; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index bf6f6d1ef2..ee918ee6c0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -178,6 +178,8 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, entry.pcfmt = pcfmt; entry.bHaveMipMaps = tex_levels != 1; + + entry.Load(width, height, expanded_width, 0); return &entry; } From b7fae1febb77629032122c710ac3a882c309ffdf Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 20 Feb 2013 14:18:21 -0600 Subject: [PATCH 598/627] Fix my DX11 texture-related failure.. Fixes issue 6026. (probably) --- Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 844cf24b47..c0474e5c67 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -98,6 +98,9 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetSRV(), "shader resource view of a texture of the TextureCache"); SAFE_RELEASE(pTexture); + + if (tex_levels != 1) + entry->Load(width, height, expanded_width, 0); return entry; } From f3e91bc10de42648f5f8c515b013f22218e14cd4 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 20 Feb 2013 17:30:34 -0600 Subject: [PATCH 599/627] Hopefully kill a stupid warning on Windows. --- Source/Core/Common/Src/FileUtil.cpp | 4 ++-- Source/Core/Common/Src/FileUtil.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index d6ab33962a..a2bd694438 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -781,9 +781,9 @@ IOFile::IOFile(IOFile&& other) Swap(other); } -IOFile& IOFile::operator=(IOFile other) +IOFile& IOFile::operator=(IOFile&& other) { - Swap(other); + IOFile(std::move(other)).Swap(*this); return *this; } diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h index 2c8bf8f64b..b8e8d9c17c 100644 --- a/Source/Core/Common/Src/FileUtil.h +++ b/Source/Core/Common/Src/FileUtil.h @@ -160,7 +160,7 @@ public: ~IOFile(); IOFile(IOFile&& other); - IOFile& operator=(IOFile other); + IOFile& operator=(IOFile&& other); void Swap(IOFile& other); From e9232280c43174b4349eef8f7abbb551c120ac53 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 20 Feb 2013 17:35:01 -0600 Subject: [PATCH 600/627] Fix OSX! --- Source/Core/Common/Src/FileUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index a2bd694438..491db88e41 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -783,7 +783,7 @@ IOFile::IOFile(IOFile&& other) IOFile& IOFile::operator=(IOFile&& other) { - IOFile(std::move(other)).Swap(*this); + IOFile((IOFile&&)other).Swap(*this); return *this; } From 29d43ef897275bd200cee0ec4492b1c2052902f3 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Thu, 21 Feb 2013 20:34:45 +0200 Subject: [PATCH 601/627] Gameini database update. Update/additions of Fifa Street and Open Season (fixes issue 5438). Cleanup of DisableWiimoteSpeaker = 1 (aka Alternate wiimote timing) from the database since it is no longer used. Edit the tales of symphonia projection hack. --- Data/User/GameConfig/GF8E69.ini | 8 +- Data/User/GameConfig/GF8P69.ini | 16 ++++ Data/User/GameConfig/GOSE41.ini | 8 +- Data/User/GameConfig/GOSP41.ini | 8 +- Data/User/GameConfig/GOSX41.ini | 8 +- Data/User/GameConfig/PH_PRESETS.ini | 2 +- Data/User/GameConfig/R22E01.ini | 3 +- Data/User/GameConfig/R22J01.ini | 3 +- Data/User/GameConfig/R22P01.ini | 3 +- Data/User/GameConfig/R3ME01.ini | 39 ++++---- Data/User/GameConfig/R3MP01.ini | 39 ++++---- Data/User/GameConfig/R4QE01.ini | 39 ++++---- Data/User/GameConfig/R4QJ01.ini | 39 ++++---- Data/User/GameConfig/R4QK01.ini | 39 ++++---- Data/User/GameConfig/R4QP01.ini | 39 ++++---- Data/User/GameConfig/R5WEA4.ini | 3 +- Data/User/GameConfig/R5WJA4.ini | 3 +- Data/User/GameConfig/R7PE01.ini | 37 ++++---- Data/User/GameConfig/R7PP01.ini | 25 +++-- Data/User/GameConfig/RBWE01.ini | 35 ++++--- Data/User/GameConfig/RBWJ01.ini | 35 ++++--- Data/User/GameConfig/RBWP01.ini | 35 ++++--- Data/User/GameConfig/RCJE8P.ini | 1 - Data/User/GameConfig/RCJP8P.ini | 1 - Data/User/GameConfig/RD2E41.ini | 33 ++++--- Data/User/GameConfig/RD2J41.ini | 33 ++++--- Data/User/GameConfig/RD2K41.ini | 33 ++++--- Data/User/GameConfig/RD2P41.ini | 33 ++++--- Data/User/GameConfig/RD2X41.ini | 33 ++++--- Data/User/GameConfig/RHDE8P.ini | 39 ++++---- Data/User/GameConfig/RHDJ8P.ini | 39 ++++---- Data/User/GameConfig/RHDP8P.ini | 39 ++++---- Data/User/GameConfig/RHOE8P.ini | 77 ++++++++------- Data/User/GameConfig/RHOJ8P.ini | 23 +++-- Data/User/GameConfig/RHOP8P.ini | 23 +++-- Data/User/GameConfig/RLGE64.ini | 1 - Data/User/GameConfig/RLGJ52.ini | 1 - Data/User/GameConfig/RLGP64.ini | 1 - Data/User/GameConfig/RM3E01.ini | 1 - Data/User/GameConfig/RM3J01.ini | 1 - Data/User/GameConfig/RM3P01.ini | 1 - Data/User/GameConfig/RQREXJ.ini | 3 +- Data/User/GameConfig/RQRJAF.ini | 3 +- Data/User/GameConfig/RQRPAF.ini | 3 +- Data/User/GameConfig/RRKE70.ini | 3 +- Data/User/GameConfig/RRKP70.ini | 3 +- Data/User/GameConfig/RTZE08.ini | 39 ++++---- Data/User/GameConfig/RTZJ08.ini | 39 ++++---- Data/User/GameConfig/RTZK08.ini | 39 ++++---- Data/User/GameConfig/RTZP08.ini | 39 ++++---- Data/User/GameConfig/RZJD69.ini | 3 +- Data/User/GameConfig/RZJE69.ini | 3 +- Data/User/GameConfig/RZJJ13.ini | 3 +- Data/User/GameConfig/RZJP69.ini | 3 +- Data/User/GameConfig/RZZE8P.ini | 33 ++++--- Data/User/GameConfig/RZZJEL.ini | 33 ++++--- Data/User/GameConfig/RZZP8P.ini | 33 ++++--- Data/User/GameConfig/SC2E8P.ini | 41 ++++---- Data/User/GameConfig/SC2P8P.ini | 139 ++++++++++++++-------------- Data/User/GameConfig/SD2E41.ini | 3 +- Data/User/GameConfig/SD2J01.ini | 3 +- Data/User/GameConfig/SD2P41.ini | 3 +- Data/User/GameConfig/SD2Y41.ini | 3 +- Data/User/GameConfig/SEME4Q.ini | 3 +- Data/User/GameConfig/SEMJ01.ini | 3 +- Data/User/GameConfig/SEMP4Q.ini | 3 +- Data/User/GameConfig/SEMX4Q.ini | 3 +- Data/User/GameConfig/SEMY4Q.ini | 3 +- Data/User/GameConfig/SEMZ4Q.ini | 3 +- Data/User/GameConfig/SERE4Q.ini | 3 +- Data/User/GameConfig/SERF4Q.ini | 3 +- Data/User/GameConfig/SERP4Q.ini | 3 +- Data/User/GameConfig/SF8E01.ini | 3 +- Data/User/GameConfig/SF8J01.ini | 3 +- Data/User/GameConfig/SF8P01.ini | 3 +- Data/User/GameConfig/SFIE01.ini | 1 - Data/User/GameConfig/SFIP01.ini | 1 - Data/User/GameConfig/SHLPA4.ini | 3 +- Data/User/GameConfig/SJDE41.ini | 1 - Data/User/GameConfig/SJDP41.ini | 1 - Data/User/GameConfig/SJDY41.ini | 1 - Data/User/GameConfig/SJDZ41.ini | 1 - Data/User/GameConfig/SMOE41.ini | 41 ++++---- Data/User/GameConfig/SMOP41.ini | 41 ++++---- Data/User/GameConfig/SMOX41.ini | 41 ++++---- Data/User/GameConfig/SO3EE9.ini | 1 - Data/User/GameConfig/SO3J99.ini | 1 - Data/User/GameConfig/SOJE41.ini | 33 ++++--- Data/User/GameConfig/SOJP41.ini | 33 ++++--- Data/User/GameConfig/SOUE01.ini | 1 - Data/User/GameConfig/SOUJ01.ini | 1 - Data/User/GameConfig/SOUK01.ini | 1 - Data/User/GameConfig/SOUP01.ini | 1 - Data/User/GameConfig/SRQE41.ini | 1 - Data/User/GameConfig/SRQP41.ini | 1 - Data/User/GameConfig/SX3J01.ini | 3 +- Data/User/GameConfig/SX3P01.ini | 3 +- 97 files changed, 769 insertions(+), 832 deletions(-) create mode 100644 Data/User/GameConfig/GF8P69.ini diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/User/GameConfig/GF8E69.ini index 858a62d3d8..5fa4328270 100644 --- a/Data/User/GameConfig/GF8E69.ini +++ b/Data/User/GameConfig/GF8E69.ini @@ -3,7 +3,7 @@ TLBHack = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = +EmulationIssues = The videos are messed up, skip them. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. $Master Code @@ -40,3 +40,9 @@ $Away Team Never Scores 00416F8C 00000000 [Video] ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GF8P69.ini b/Data/User/GameConfig/GF8P69.ini new file mode 100644 index 0000000000..3d6f730434 --- /dev/null +++ b/Data/User/GameConfig/GF8P69.ini @@ -0,0 +1,16 @@ +# GF8P69 - FIFA Street +[Core] Values set here will override the main dolphin settings. +TLBHack = 1 +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = The videos are messed up, skip them. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] diff --git a/Data/User/GameConfig/GOSE41.ini b/Data/User/GameConfig/GOSE41.ini index 4682f2275c..adc124119f 100644 --- a/Data/User/GameConfig/GOSE41.ini +++ b/Data/User/GameConfig/GOSE41.ini @@ -1,9 +1,11 @@ # GOSE41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GOSP41.ini b/Data/User/GameConfig/GOSP41.ini index 40fc6ad1f1..cb12055384 100644 --- a/Data/User/GameConfig/GOSP41.ini +++ b/Data/User/GameConfig/GOSP41.ini @@ -1,9 +1,11 @@ # GOSP41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/GOSX41.ini b/Data/User/GameConfig/GOSX41.ini index 92662f0a4c..8790cdfd8c 100644 --- a/Data/User/GameConfig/GOSX41.ini +++ b/Data/User/GameConfig/GOSX41.ini @@ -1,9 +1,11 @@ # GOSX41 - Open Season [Core] Values set here will override the main dolphin settings. -TLBHack = 1 +MMU = 1 +FastDiscSpeed = 1 +BlockMerging = 1 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 2 -EmulationIssues = Severe graphic issues. +EmulationStateId = 4 +EmulationIssues = Needs MMU (Slow). [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Video] diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/User/GameConfig/PH_PRESETS.ini index 8d82d00790..f5e7a4aacf 100644 --- a/Data/User/GameConfig/PH_PRESETS.ini +++ b/Data/User/GameConfig/PH_PRESETS.ini @@ -33,7 +33,7 @@ PH_ExtraParam = 1 [5] Title = Tales of Symphonia GC -PH_ZNear = 0.0002 +PH_ZNear = 0.00026 # --------------------------------------------------- diff --git a/Data/User/GameConfig/R22E01.ini b/Data/User/GameConfig/R22E01.ini index dfe3542671..c494ee5e12 100644 --- a/Data/User/GameConfig/R22E01.ini +++ b/Data/User/GameConfig/R22E01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R22J01.ini b/Data/User/GameConfig/R22J01.ini index c38ff20966..94aeac02f3 100644 --- a/Data/User/GameConfig/R22J01.ini +++ b/Data/User/GameConfig/R22J01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R22P01.ini b/Data/User/GameConfig/R22P01.ini index 6153cb0d06..8fb637216f 100644 --- a/Data/User/GameConfig/R22P01.ini +++ b/Data/User/GameConfig/R22P01.ini @@ -17,5 +17,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/User/GameConfig/R3ME01.ini index 312d6a15f1..4c891c14b1 100644 --- a/Data/User/GameConfig/R3ME01.ini +++ b/Data/User/GameConfig/R3ME01.ini @@ -1,20 +1,19 @@ -# R3ME01 - Metroid Prime Trilogy -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -[Wii] -DisableWiimoteSpeaker = 1 +# R3ME01 - Metroid Prime Trilogy +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/User/GameConfig/R3MP01.ini index 291ac8df38..71938b821a 100644 --- a/Data/User/GameConfig/R3MP01.ini +++ b/Data/User/GameConfig/R3MP01.ini @@ -1,20 +1,19 @@ -# R3MP01 - Metroid Prime Trilogy -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBToTextureEnable = False -EFBCopyEnable = True -[Wii] -DisableWiimoteSpeaker = 1 +# R3MP01 - Metroid Prime Trilogy +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True +[Wii] diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/User/GameConfig/R4QE01.ini index 3ae6cb283a..e822d53161 100644 --- a/Data/User/GameConfig/R4QE01.ini +++ b/Data/User/GameConfig/R4QE01.ini @@ -1,20 +1,19 @@ -# R4QE01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QE01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/User/GameConfig/R4QJ01.ini index d97cc37c84..14bef2a3e5 100644 --- a/Data/User/GameConfig/R4QJ01.ini +++ b/Data/User/GameConfig/R4QJ01.ini @@ -1,20 +1,19 @@ -# R4QJ01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QJ01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/User/GameConfig/R4QK01.ini index 2c45a961a0..2fb7675fd4 100644 --- a/Data/User/GameConfig/R4QK01.ini +++ b/Data/User/GameConfig/R4QK01.ini @@ -1,20 +1,19 @@ -# R4QK01 - Mario Power Soccer -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QK01 - Mario Power Soccer +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/User/GameConfig/R4QP01.ini index 8ec96e8cf3..54fa2ec234 100644 --- a/Data/User/GameConfig/R4QP01.ini +++ b/Data/User/GameConfig/R4QP01.ini @@ -1,20 +1,19 @@ -# R4QP01 - Mario Strikers Charged -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Video_Hacks] -DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +# R4QP01 - Mario Strikers Charged +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Video_Hacks] +DlistCachingEnable = False +[Wii] diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/User/GameConfig/R5WEA4.ini index 315f7f340a..48b1c5cd12 100644 --- a/Data/User/GameConfig/R5WEA4.ini +++ b/Data/User/GameConfig/R5WEA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/User/GameConfig/R5WJA4.ini index 30a983b648..25d6076a05 100644 --- a/Data/User/GameConfig/R5WJA4.ini +++ b/Data/User/GameConfig/R5WJA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/R7PE01.ini b/Data/User/GameConfig/R7PE01.ini index 1a052239ae..244ccc1db3 100644 --- a/Data/User/GameConfig/R7PE01.ini +++ b/Data/User/GameConfig/R7PE01.ini @@ -1,19 +1,18 @@ -# R7PE01 - Punch Out -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run -[OnFrame] Add memory patches to be applied every frame here. -+$Patch -0x8011E0F8:dword:0x4E800020 -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# R7PE01 - Punch Out +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run +[OnFrame] Add memory patches to be applied every frame here. ++$Patch +0x8011E0F8:dword:0x4E800020 +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/R7PP01.ini b/Data/User/GameConfig/R7PP01.ini index 302bd1e965..a0113b7415 100644 --- a/Data/User/GameConfig/R7PP01.ini +++ b/Data/User/GameConfig/R7PP01.ini @@ -1,13 +1,12 @@ -# R7PP01 - Punch Out -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 5 -[OnFrame] Add memory patches to be applied every frame here. -+$Patch -0x8011F1CC:dword:0x4E800020 -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# R7PP01 - Punch Out +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 5 +[OnFrame] Add memory patches to be applied every frame here. ++$Patch +0x8011F1CC:dword:0x4E800020 +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Wii] diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/User/GameConfig/RBWE01.ini index 9e8d586cf4..a2cad6ff7d 100644 --- a/Data/User/GameConfig/RBWE01.ini +++ b/Data/User/GameConfig/RBWE01.ini @@ -1,18 +1,17 @@ -# RBWE01 - Battalion Wars 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +# RBWE01 - Battalion Wars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/User/GameConfig/RBWJ01.ini index bf95ff65c8..0d799c74fa 100644 --- a/Data/User/GameConfig/RBWJ01.ini +++ b/Data/User/GameConfig/RBWJ01.ini @@ -1,18 +1,17 @@ -# RBWJ01 - Totsugeki Famicom Wars vs. -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +# RBWJ01 - Totsugeki Famicom Wars vs. +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/User/GameConfig/RBWP01.ini index f6282130a5..5422388866 100644 --- a/Data/User/GameConfig/RBWP01.ini +++ b/Data/User/GameConfig/RBWP01.ini @@ -1,18 +1,17 @@ -# RBWP01 - Battalion Wars 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs LLE audio for proper sound. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +# RBWP01 - Battalion Wars 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs LLE audio for proper sound. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Enhancements] +[Wii] diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/User/GameConfig/RCJE8P.ini index 845f08de77..79280a5609 100644 --- a/Data/User/GameConfig/RCJE8P.ini +++ b/Data/User/GameConfig/RCJE8P.ini @@ -24,6 +24,5 @@ PH_ZFar = [Video_Enhancements] ForceFiltering = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/RCJP8P.ini b/Data/User/GameConfig/RCJP8P.ini index 6d82c897e5..5a242b5e4e 100644 --- a/Data/User/GameConfig/RCJP8P.ini +++ b/Data/User/GameConfig/RCJP8P.ini @@ -18,6 +18,5 @@ PH_ZFar = [Video_Enhancements] ForceFiltering = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/User/GameConfig/RD2E41.ini index a93f6359e6..92ca3f53b5 100644 --- a/Data/User/GameConfig/RD2E41.ini +++ b/Data/User/GameConfig/RD2E41.ini @@ -1,17 +1,16 @@ -# RD2E41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2E41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/User/GameConfig/RD2J41.ini index 8fccc41c35..2042a71430 100644 --- a/Data/User/GameConfig/RD2J41.ini +++ b/Data/User/GameConfig/RD2J41.ini @@ -1,17 +1,16 @@ -# RD2J41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2J41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/User/GameConfig/RD2K41.ini index aa0e90f2b2..93123fa871 100644 --- a/Data/User/GameConfig/RD2K41.ini +++ b/Data/User/GameConfig/RD2K41.ini @@ -1,17 +1,16 @@ -# RD2K41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2K41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/User/GameConfig/RD2P41.ini index 7cbf91b22d..8a7e5f7541 100644 --- a/Data/User/GameConfig/RD2P41.ini +++ b/Data/User/GameConfig/RD2P41.ini @@ -1,17 +1,16 @@ -# RD2P41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2P41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/User/GameConfig/RD2X41.ini index 6748136cad..53f0716869 100644 --- a/Data/User/GameConfig/RD2X41.ini +++ b/Data/User/GameConfig/RD2X41.ini @@ -1,17 +1,16 @@ -# RD2X41 - Red Steel 2 -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Needs real wiimote and motion plus. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RD2X41 - Red Steel 2 +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Needs real wiimote and motion plus. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/User/GameConfig/RHDE8P.ini index b49ec93cb8..31d7a2f620 100644 --- a/Data/User/GameConfig/RHDE8P.ini +++ b/Data/User/GameConfig/RHDE8P.ini @@ -1,20 +1,19 @@ -# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/User/GameConfig/RHDJ8P.ini index 63e818f737..014c94aaba 100644 --- a/Data/User/GameConfig/RHDJ8P.ini +++ b/Data/User/GameConfig/RHDJ8P.ini @@ -1,20 +1,19 @@ -# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/User/GameConfig/RHDP8P.ini index e932c173fb..6183ad8422 100644 --- a/Data/User/GameConfig/RHDP8P.ini +++ b/Data/User/GameConfig/RHDP8P.ini @@ -1,20 +1,19 @@ -# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/User/GameConfig/RHOE8P.ini index c28f341fb6..55d697ca52 100644 --- a/Data/User/GameConfig/RHOE8P.ini +++ b/Data/User/GameConfig/RHOE8P.ini @@ -1,39 +1,38 @@ -# RHOE8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -$Infinte Bomb Usage after Getting 1 [g6flavor] -04159D1C 60000000 -$If Score Increase, MAX [ZiT] -C2142134 00000002 -3CA03B9B 38A5C9FF -90A60178 00000000 -$Infinite LIFE [ZiT] -04130ED4 60000000 -$Infinite Bullet [ZiT] -04159FAC 907D0720 -$CASH MAX [ZiT] -C214B118 00000002 -3CA03B9B 38A5C9FF -90A300D8 00000000 -$CASH MAX [ZiT] -C214B110 00000002 -3CA03B9B 38A5C9FF -90A300DC 00000000 -$If Score Increase, MAX [ZiT] -C2152674 00000002 -3CA03B9B 38A5C9FF -90B60178 00000000 -[Wii] -DisableWiimoteSpeaker = 1 +# RHOE8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +$Infinte Bomb Usage after Getting 1 [g6flavor] +04159D1C 60000000 +$If Score Increase, MAX [ZiT] +C2142134 00000002 +3CA03B9B 38A5C9FF +90A60178 00000000 +$Infinite LIFE [ZiT] +04130ED4 60000000 +$Infinite Bullet [ZiT] +04159FAC 907D0720 +$CASH MAX [ZiT] +C214B118 00000002 +3CA03B9B 38A5C9FF +90A300D8 00000000 +$CASH MAX [ZiT] +C214B110 00000002 +3CA03B9B 38A5C9FF +90A300DC 00000000 +$If Score Increase, MAX [ZiT] +C2152674 00000002 +3CA03B9B 38A5C9FF +90B60178 00000000 +[Wii] diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/User/GameConfig/RHOJ8P.ini index 3e23f6605c..2eb65c9fc9 100644 --- a/Data/User/GameConfig/RHOJ8P.ini +++ b/Data/User/GameConfig/RHOJ8P.ini @@ -1,12 +1,11 @@ -# RHOJ8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RHOJ8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/User/GameConfig/RHOP8P.ini index 8e9d0e879d..85a8e2770a 100644 --- a/Data/User/GameConfig/RHOP8P.ini +++ b/Data/User/GameConfig/RHOP8P.ini @@ -1,12 +1,11 @@ -# RHOP8P - House Of The Dead: OVERKILL -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Use dx11 plugin (r6945) -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RHOP8P - House Of The Dead: OVERKILL +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Use dx11 plugin (r6945) +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/User/GameConfig/RLGE64.ini index 505df3c17d..5e66cda379 100644 --- a/Data/User/GameConfig/RLGE64.ini +++ b/Data/User/GameConfig/RLGE64.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/User/GameConfig/RLGJ52.ini index 52b8648072..37b4f728d1 100644 --- a/Data/User/GameConfig/RLGJ52.ini +++ b/Data/User/GameConfig/RLGJ52.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/User/GameConfig/RLGP64.ini index f82d202584..6404bf0a77 100644 --- a/Data/User/GameConfig/RLGP64.ini +++ b/Data/User/GameConfig/RLGP64.ini @@ -6,7 +6,6 @@ EmulationIssues = [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/User/GameConfig/RM3E01.ini index cb87db9070..182660bd97 100644 --- a/Data/User/GameConfig/RM3E01.ini +++ b/Data/User/GameConfig/RM3E01.ini @@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/User/GameConfig/RM3J01.ini index 97a88c4c69..50c84d87a9 100644 --- a/Data/User/GameConfig/RM3J01.ini +++ b/Data/User/GameConfig/RM3J01.ini @@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/User/GameConfig/RM3P01.ini index 093afc15db..0832325938 100644 --- a/Data/User/GameConfig/RM3P01.ini +++ b/Data/User/GameConfig/RM3P01.ini @@ -23,6 +23,5 @@ SafeTextureCacheColorSamples = 512 EFBToTextureEnable = False EFBCopyEnable = True [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] EFBEmulateFormatChanges = True diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini index 91a35e540d..48d52b4320 100644 --- a/Data/User/GameConfig/RQREXJ.ini +++ b/Data/User/GameConfig/RQREXJ.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini index c647c4acee..7ae768c3b4 100644 --- a/Data/User/GameConfig/RQRJAF.ini +++ b/Data/User/GameConfig/RQRJAF.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini index 8052e6084b..752c0fa2bd 100644 --- a/Data/User/GameConfig/RQRPAF.ini +++ b/Data/User/GameConfig/RQRPAF.ini @@ -16,5 +16,4 @@ EmulationIssues = Needs single core to run properly(r7436). [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/User/GameConfig/RRKE70.ini index 621b0dfd09..ebb3188d0b 100644 --- a/Data/User/GameConfig/RRKE70.ini +++ b/Data/User/GameConfig/RRKE70.ini @@ -16,5 +16,4 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/User/GameConfig/RRKP70.ini index c5fc07ede3..e69e07f92e 100644 --- a/Data/User/GameConfig/RRKP70.ini +++ b/Data/User/GameConfig/RRKP70.ini @@ -16,5 +16,4 @@ EmulationIssues = [Gecko] [Video_Hacks] EFBEmulateFormatChanges = True -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RTZE08.ini b/Data/User/GameConfig/RTZE08.ini index ff41b71a06..27524e8236 100644 --- a/Data/User/GameConfig/RTZE08.ini +++ b/Data/User/GameConfig/RTZE08.ini @@ -1,20 +1,19 @@ -# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZE08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZJ08.ini b/Data/User/GameConfig/RTZJ08.ini index 5a62e2c8ca..6a5aa8d6ee 100644 --- a/Data/User/GameConfig/RTZJ08.ini +++ b/Data/User/GameConfig/RTZJ08.ini @@ -1,20 +1,19 @@ -# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZJ08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZK08.ini b/Data/User/GameConfig/RTZK08.ini index 6a7d00e753..ec333d6bce 100644 --- a/Data/User/GameConfig/RTZK08.ini +++ b/Data/User/GameConfig/RTZK08.ini @@ -1,20 +1,19 @@ -# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZK08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RTZP08.ini b/Data/User/GameConfig/RTZP08.ini index 8add9d2869..f3b0834049 100644 --- a/Data/User/GameConfig/RTZP08.ini +++ b/Data/User/GameConfig/RTZP08.ini @@ -1,20 +1,19 @@ -# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = -EmulationStateId = 4 -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Settings] -UseXFB = True -UseRealXFB = False -[Wii] -DisableWiimoteSpeaker = 1 +# RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationIssues = +EmulationStateId = 4 +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Settings] +UseXFB = True +UseRealXFB = False +[Wii] diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/User/GameConfig/RZJD69.ini index 671318fd38..848dcba860 100644 --- a/Data/User/GameConfig/RZJD69.ini +++ b/Data/User/GameConfig/RZJD69.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/User/GameConfig/RZJE69.ini index a37d3f9223..c48c837a27 100644 --- a/Data/User/GameConfig/RZJE69.ini +++ b/Data/User/GameConfig/RZJE69.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/User/GameConfig/RZJJ13.ini index d109d22a98..24aa98035b 100644 --- a/Data/User/GameConfig/RZJJ13.ini +++ b/Data/User/GameConfig/RZJJ13.ini @@ -17,5 +17,4 @@ PH_ZFar = [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/User/GameConfig/RZJP69.ini index 63b230b1da..9fa88eb843 100644 --- a/Data/User/GameConfig/RZJP69.ini +++ b/Data/User/GameConfig/RZJP69.ini @@ -31,6 +31,5 @@ $Rapid Fire [TNTkryzt] [Video_Settings] SafeTextureCacheColorSamples = 512 [Video_Enhancements] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/User/GameConfig/RZZE8P.ini index 31859ef891..9c74320a0b 100644 --- a/Data/User/GameConfig/RZZE8P.ini +++ b/Data/User/GameConfig/RZZE8P.ini @@ -1,17 +1,16 @@ -# RZZE8P - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZE8P - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/User/GameConfig/RZZJEL.ini index 0e6a08334a..6ace0cb90c 100644 --- a/Data/User/GameConfig/RZZJEL.ini +++ b/Data/User/GameConfig/RZZJEL.ini @@ -1,17 +1,16 @@ -# RZZJEL - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZJEL - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/User/GameConfig/RZZP8P.ini index 6dc117c26f..ac5bed9812 100644 --- a/Data/User/GameConfig/RZZP8P.ini +++ b/Data/User/GameConfig/RZZP8P.ini @@ -1,17 +1,16 @@ -# RZZP8P - MADWORLD -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 5 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# RZZP8P - MADWORLD +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 5 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/User/GameConfig/SC2E8P.ini index ff46b91be8..998d51859d 100644 --- a/Data/User/GameConfig/SC2E8P.ini +++ b/Data/User/GameConfig/SC2E8P.ini @@ -1,21 +1,20 @@ -# SC2E8P - Conduit 2 -[Core] -BlockMerging = 1 -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Gecko] -[Video_Hacks] -DlistCachingEnable = False -[Video_Settings] -[Wii] -DisableWiimoteSpeaker = 1 +# SC2E8P - Conduit 2 +[Core] +BlockMerging = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Gecko] +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +[Wii] diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/User/GameConfig/SC2P8P.ini index a065f8a096..b9f5c5989c 100644 --- a/Data/User/GameConfig/SC2P8P.ini +++ b/Data/User/GameConfig/SC2P8P.ini @@ -1,70 +1,69 @@ -# SC2P8P - Conduit 2 -[Core] -BlockMerging = 1 -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[EmuState] -EmulationStateId = 4 -EmulationIssues = -[OnFrame] -[ActionReplay] -[Gecko] -$Undead Invincibility Mode [Bully@Wiiplaza] -F6000001 80008100 -8001002C 90180000 -D200000C 00000006 -2C110035 40820020 -2C0800F4 40820018 -2C0300A0 40820010 -3C007FFF 6000FFFF -90040000 80040000 -60000000 00000000 -E0000000 80008000 -**Offline Only* -**You are completely untouchable* -*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/ -$Inf. Ammo [Bully@Wiiplaza] -F6000001 80008100 -80640000 80050000 -D2000008 00000003 -2C110021 4082000C -38600000 7C030050 -60000000 00000000 -E0000000 80008000 -**Offline Only* -$No Flashwhite [Bully@Wiiplaza] -F6000001 80008100 -EC210032 93C10008 -14000114 60000000 -E0000000 80008000 -$Inf. Money [Bully@Wiiplaza] -F6000001 80008100 -7C003A14 38E70001 -D2000010 00000004 -2C11002F 40820014 -2C0401A8 4082000C -3D807FFF 7D84012E -7C04002E 00000000 -E0000000 80008000 -$Profile One Name Changer Jedi Hack & [Mitch] -0487E2D4 XXXXXXXX -0487E2D8 XXXXXXXX -0487E2DC XXXXXXXX -$Profile Two Name Changer Jedi Hack & [Mitch] -0487E320 0000XXXX -0487E324 XXXXXXXX -0487E328 XXXXXXXX -0487E32C XXXX0000 -$Profile Three Name Changer Jedi Hack & [Mitch] -0487E370 XXXXXXXX -0487E374 XXXXXXXX -[Video_Hacks] -DlistCachingEnable = False -[Video_Settings] -[Wii] -DisableWiimoteSpeaker = 1 +# SC2P8P - Conduit 2 +[Core] +BlockMerging = 1 +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[EmuState] +EmulationStateId = 4 +EmulationIssues = +[OnFrame] +[ActionReplay] +[Gecko] +$Undead Invincibility Mode [Bully@Wiiplaza] +F6000001 80008100 +8001002C 90180000 +D200000C 00000006 +2C110035 40820020 +2C0800F4 40820018 +2C0300A0 40820010 +3C007FFF 6000FFFF +90040000 80040000 +60000000 00000000 +E0000000 80008000 +**Offline Only* +**You are completely untouchable* +*Picture -> http://imageshack.us/photo/my-images/684/sc2p8p008.png/ +$Inf. Ammo [Bully@Wiiplaza] +F6000001 80008100 +80640000 80050000 +D2000008 00000003 +2C110021 4082000C +38600000 7C030050 +60000000 00000000 +E0000000 80008000 +**Offline Only* +$No Flashwhite [Bully@Wiiplaza] +F6000001 80008100 +EC210032 93C10008 +14000114 60000000 +E0000000 80008000 +$Inf. Money [Bully@Wiiplaza] +F6000001 80008100 +7C003A14 38E70001 +D2000010 00000004 +2C11002F 40820014 +2C0401A8 4082000C +3D807FFF 7D84012E +7C04002E 00000000 +E0000000 80008000 +$Profile One Name Changer Jedi Hack & [Mitch] +0487E2D4 XXXXXXXX +0487E2D8 XXXXXXXX +0487E2DC XXXXXXXX +$Profile Two Name Changer Jedi Hack & [Mitch] +0487E320 0000XXXX +0487E324 XXXXXXXX +0487E328 XXXXXXXX +0487E32C XXXX0000 +$Profile Three Name Changer Jedi Hack & [Mitch] +0487E370 XXXXXXXX +0487E374 XXXXXXXX +[Video_Hacks] +DlistCachingEnable = False +[Video_Settings] +[Wii] diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/User/GameConfig/SD2E41.ini index 179c13afb9..ae90ff5196 100644 --- a/Data/User/GameConfig/SD2E41.ini +++ b/Data/User/GameConfig/SD2E41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/User/GameConfig/SD2J01.ini index f29168a46c..3285e7c75a 100644 --- a/Data/User/GameConfig/SD2J01.ini +++ b/Data/User/GameConfig/SD2J01.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/User/GameConfig/SD2P41.ini index 744a354aaf..2111a3c298 100644 --- a/Data/User/GameConfig/SD2P41.ini +++ b/Data/User/GameConfig/SD2P41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/User/GameConfig/SD2Y41.ini index 9daa079aac..59c9fb666b 100644 --- a/Data/User/GameConfig/SD2Y41.ini +++ b/Data/User/GameConfig/SD2Y41.ini @@ -16,5 +16,4 @@ EmulationIssues = [OnFrame] [ActionReplay] [Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini index 7e340985b3..48056894b9 100644 --- a/Data/User/GameConfig/SEME4Q.ini +++ b/Data/User/GameConfig/SEME4Q.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini index 7dc481ea34..f0740ca7a3 100644 --- a/Data/User/GameConfig/SEMJ01.ini +++ b/Data/User/GameConfig/SEMJ01.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini index fa1afc01c2..f425547cf4 100644 --- a/Data/User/GameConfig/SEMP4Q.ini +++ b/Data/User/GameConfig/SEMP4Q.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini index b4c56197ea..43232806a2 100644 --- a/Data/User/GameConfig/SEMX4Q.ini +++ b/Data/User/GameConfig/SEMX4Q.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini index 5d8798227d..817f8387e0 100644 --- a/Data/User/GameConfig/SEMY4Q.ini +++ b/Data/User/GameConfig/SEMY4Q.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini index eecaa23166..515a1bd029 100644 --- a/Data/User/GameConfig/SEMZ4Q.ini +++ b/Data/User/GameConfig/SEMZ4Q.ini @@ -20,5 +20,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] DlistCachingEnable = False -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini index ef5f4edfb2..fbc9fa9d3c 100644 --- a/Data/User/GameConfig/SERE4Q.ini +++ b/Data/User/GameConfig/SERE4Q.ini @@ -16,5 +16,4 @@ PH_ZFar = [Video_Settings] EFBScale = 1 SafeTextureCacheColorSamples = 0 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini index b03abcf0e9..cd2fca395e 100644 --- a/Data/User/GameConfig/SERF4Q.ini +++ b/Data/User/GameConfig/SERF4Q.ini @@ -16,5 +16,4 @@ PH_ZFar = [Video_Settings] EFBScale = 1 SafeTextureCacheColorSamples = 0 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini index e57bb14704..7e332b8bcd 100644 --- a/Data/User/GameConfig/SERP4Q.ini +++ b/Data/User/GameConfig/SERP4Q.ini @@ -16,5 +16,4 @@ PH_ZFar = [Video_Settings] EFBScale = 1 SafeTextureCacheColorSamples = 0 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/User/GameConfig/SF8E01.ini index e8e185cda9..bb2bce7406 100644 --- a/Data/User/GameConfig/SF8E01.ini +++ b/Data/User/GameConfig/SF8E01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/User/GameConfig/SF8J01.ini index bc0b0c2ba5..1f3ef9bb85 100644 --- a/Data/User/GameConfig/SF8J01.ini +++ b/Data/User/GameConfig/SF8J01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/User/GameConfig/SF8P01.ini index 41a5957888..e17f5f4247 100644 --- a/Data/User/GameConfig/SF8P01.ini +++ b/Data/User/GameConfig/SF8P01.ini @@ -16,5 +16,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SFIE01.ini b/Data/User/GameConfig/SFIE01.ini index 867859d8c4..7475f94fca 100644 --- a/Data/User/GameConfig/SFIE01.ini +++ b/Data/User/GameConfig/SFIE01.ini @@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/User/GameConfig/SFIP01.ini index 8a198d4fe8..114906aac3 100644 --- a/Data/User/GameConfig/SFIP01.ini +++ b/Data/User/GameConfig/SFIP01.ini @@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/User/GameConfig/SHLPA4.ini index ce64ff21e1..b9eebf93c5 100644 --- a/Data/User/GameConfig/SHLPA4.ini +++ b/Data/User/GameConfig/SHLPA4.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 512 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/User/GameConfig/SJDE41.ini index 1e16ddd21f..64b712f81d 100644 --- a/Data/User/GameConfig/SJDE41.ini +++ b/Data/User/GameConfig/SJDE41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/User/GameConfig/SJDP41.ini index 53f65d5704..450a81c4f8 100644 --- a/Data/User/GameConfig/SJDP41.ini +++ b/Data/User/GameConfig/SJDP41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/User/GameConfig/SJDY41.ini index 107abedfd2..74584766c3 100644 --- a/Data/User/GameConfig/SJDY41.ini +++ b/Data/User/GameConfig/SJDY41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/User/GameConfig/SJDZ41.ini index 53f65d5704..450a81c4f8 100644 --- a/Data/User/GameConfig/SJDZ41.ini +++ b/Data/User/GameConfig/SJDZ41.ini @@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/User/GameConfig/SMOE41.ini index 15dc5a693e..3c61475544 100644 --- a/Data/User/GameConfig/SMOE41.ini +++ b/Data/User/GameConfig/SMOE41.ini @@ -1,21 +1,20 @@ -# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOE41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/User/GameConfig/SMOP41.ini index 6095cd9174..b9f913a639 100644 --- a/Data/User/GameConfig/SMOP41.ini +++ b/Data/User/GameConfig/SMOP41.ini @@ -1,21 +1,20 @@ -# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOP41 - MICHAEL JACKSON THE EXPERIENCE SPECIAL EDITION +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/User/GameConfig/SMOX41.ini index 88ba03da1c..929a58f076 100644 --- a/Data/User/GameConfig/SMOX41.ini +++ b/Data/User/GameConfig/SMOX41.ini @@ -1,21 +1,20 @@ -# SMOX41 - Michael Jackson The Experience: Walmart Edition -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 0 -PH_SZNear = 0 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Video_Hacks] -EFBEmulateFormatChanges = True -[Video_Enhancements] -MaxAnisotropy = 0 -[Wii] -DisableWiimoteSpeaker = 1 +# SMOX41 - Michael Jackson The Experience: Walmart Edition +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = Sound noise eliminated using LLE audio. With hle disable idleskip for normal dance school speed. +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 0 +PH_SZNear = 0 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Video_Hacks] +EFBEmulateFormatChanges = True +[Video_Enhancements] +MaxAnisotropy = 0 +[Wii] diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/User/GameConfig/SO3EE9.ini index f8da896a23..c359fede43 100644 --- a/Data/User/GameConfig/SO3EE9.ini +++ b/Data/User/GameConfig/SO3EE9.ini @@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/User/GameConfig/SO3J99.ini index 2ad57e3af2..e29dca5b96 100644 --- a/Data/User/GameConfig/SO3J99.ini +++ b/Data/User/GameConfig/SO3J99.ini @@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches. [OnFrame] Add memory patches to be applied every frame here. [ActionReplay] Add action replay cheats here. [Wii] -DisableWiimoteSpeaker = 1 [Video] ProjectionHack = 0 PH_SZNear = 0 diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/User/GameConfig/SOJE41.ini index 183a8823ca..af6d49b785 100644 --- a/Data/User/GameConfig/SOJE41.ini +++ b/Data/User/GameConfig/SOJE41.ini @@ -1,17 +1,16 @@ -# SOJE41 - Rayman Origins -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 1 -PH_SZNear = 1 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# SOJE41 - Rayman Origins +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/User/GameConfig/SOJP41.ini index 2c835fe6e2..fca55f9117 100644 --- a/Data/User/GameConfig/SOJP41.ini +++ b/Data/User/GameConfig/SOJP41.ini @@ -1,17 +1,16 @@ -# SOJP41 - Rayman Origins -[Core] Values set here will override the main dolphin settings. -[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationStateId = 4 -EmulationIssues = -[OnFrame] Add memory patches to be applied every frame here. -[ActionReplay] Add action replay cheats here. -[Video] -ProjectionHack = 1 -PH_SZNear = 1 -PH_SZFar = 0 -PH_ExtraParam = 0 -PH_ZNear = -PH_ZFar = -[Gecko] -[Wii] -DisableWiimoteSpeaker = 1 +# SOJP41 - Rayman Origins +[Core] Values set here will override the main dolphin settings. +[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. +EmulationStateId = 4 +EmulationIssues = +[OnFrame] Add memory patches to be applied every frame here. +[ActionReplay] Add action replay cheats here. +[Video] +ProjectionHack = 1 +PH_SZNear = 1 +PH_SZFar = 0 +PH_ExtraParam = 0 +PH_ZNear = +PH_ZFar = +[Gecko] +[Wii] diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/User/GameConfig/SOUE01.ini index 8461821933..7e37e04936 100644 --- a/Data/User/GameConfig/SOUE01.ini +++ b/Data/User/GameConfig/SOUE01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/User/GameConfig/SOUJ01.ini index ede7d81148..b02302e15c 100644 --- a/Data/User/GameConfig/SOUJ01.ini +++ b/Data/User/GameConfig/SOUJ01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/User/GameConfig/SOUK01.ini index 512bd21408..201ec99315 100644 --- a/Data/User/GameConfig/SOUK01.ini +++ b/Data/User/GameConfig/SOUK01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/User/GameConfig/SOUP01.ini index 1b6e47096f..eab4d6b442 100644 --- a/Data/User/GameConfig/SOUP01.ini +++ b/Data/User/GameConfig/SOUP01.ini @@ -17,5 +17,4 @@ PH_ZFar = EFBAccessEnable = True DlistCachingEnable = False [Wii] -DisableWiimoteSpeaker = 1 [Video_Settings] diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/User/GameConfig/SRQE41.ini index 5060189327..e923433ee8 100644 --- a/Data/User/GameConfig/SRQE41.ini +++ b/Data/User/GameConfig/SRQE41.ini @@ -14,6 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/User/GameConfig/SRQP41.ini index f360aef050..c1001990b1 100644 --- a/Data/User/GameConfig/SRQP41.ini +++ b/Data/User/GameConfig/SRQP41.ini @@ -14,6 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Wii] -DisableWiimoteSpeaker = 1 [Video_Hacks] DlistCachingEnable = False diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/User/GameConfig/SX3J01.ini index 276118af1a..3aef192f00 100644 --- a/Data/User/GameConfig/SX3J01.ini +++ b/Data/User/GameConfig/SX3J01.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/User/GameConfig/SX3P01.ini index 94b5c6ef16..a753975414 100644 --- a/Data/User/GameConfig/SX3P01.ini +++ b/Data/User/GameConfig/SX3P01.ini @@ -15,5 +15,4 @@ PH_ZFar = [Gecko] [Video_Settings] SafeTextureCacheColorSamples = 0 -[Wii] -DisableWiimoteSpeaker = 1 +[Wii] From d76ca5783743d654f3fa6ad8b69c239f93c9493e Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 22 Feb 2013 15:13:49 +1100 Subject: [PATCH 602/627] Fixed a JIT timing bug that prevented Eternal Darkness from booting in Single Core mode. --- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 31caca0a43..900a8475f7 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -338,7 +338,7 @@ void Jit64::WriteRfiExitDestInEAX() Cleanup(); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExceptions)); SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); - JMP(asm_routines.dispatcher, true); + JMP(asm_routines.outerLoop, true); } void Jit64::WriteExceptionExit() From ba979582e2d0b4961f1087b76eef659856eb23bb Mon Sep 17 00:00:00 2001 From: Jonathan Jones Date: Fri, 22 Feb 2013 15:27:28 -0500 Subject: [PATCH 603/627] Makes the "No banner" banner image theme-able. Current "sexy X" banner included as part of "Boomy" theme. Fixes issue 6023. --- Data/User/Themes/Boomy/nobanner.png | Bin 0 -> 2484 bytes Source/Core/DolphinWX/Src/ConfigMain.cpp | 1 + Source/Core/DolphinWX/Src/ISOFile.cpp | 14 ++++++--- Source/Core/DolphinWX/resources/no_banner.cpp | 28 ------------------ 4 files changed, 11 insertions(+), 32 deletions(-) create mode 100644 Data/User/Themes/Boomy/nobanner.png delete mode 100644 Source/Core/DolphinWX/resources/no_banner.cpp diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/User/Themes/Boomy/nobanner.png new file mode 100644 index 0000000000000000000000000000000000000000..4d34be77626c7f9d77659f8766109b9017baa619 GIT binary patch literal 2484 zcmV;l2}|~gP)WFU8GbZ8()Nlj2>E@cM*00|gLL_t(&-p!hAbKloBF>s^;&fX(Gmm_Z|S}9000{tr#Q2F!1#Bg!i6d7^td>VHoh*_Jsw#kde_Q2wMC9VVa}E(<7zR$K6VK1jytjmejt5-uBv~^m z_)zok@Ico#)OAf7C!FZ~r)hpR^+Y@=DKKLa$B9t6jHQoIF6_)(=_3|XPTz`fF`u6s_@?DhfgVGkVFLM93cc&s}<8U&4-LJgY3P> zdr#l@d9Q)C+wC|Wj~QHBc7MA^`I&)l0Q7y&uV25owW_+oxqy(UgX5uD@zAdERUpO@ zClRj`#A#L(h2#M52&;;^5`=-ON=(Cv@pOa~nWiZ#u$}XCI#I7y48wo}Sg+T4L#g>8 z1gfga!ZASWx@H&#LI^nLvY<-sv}ODM{`+s*w!Juz32hul+O{Ren1xfOYEK;;>pB!l5fJgH3U$3E#yI0QP174GnHH;RKD=3hs%9D~KR1&% z?KAo*ule)mPk#LP!8ne2k6F<$44H~dpeB&R;lSy1Vw$E4z^_?@Da+w-;N|6oVHmQt zeIx)SoN1?H+qBe`N2dreQHKhTBFq*ZH4#xD5m1~YDj)Ebojo$9$fPNs(-hU%Vi*RH zM5wAN1MZy54^#5Fh-C2XyK5A%|WbvtPe{vDs{J z&gF+N;TqjkRYi=EmzS4|>z5q7v>ZFzMB;JN@z^y4fi!>H;E)W40E5 z_6G?iB|%(30dbBgD&hkPK-27FjA^R**+Pu*f?vOCnT44UM1;QYGx#Es0|0wpg5{j! z_wV0`2;1#8Tc-J@x~@5$PV{}x;c&R#KuRPa zoh>He07sGurwNs_vYcN5L~r8~?g4&j1tLOS*IE0FqpvyI^1THJyWI{Ep=p||-Of3t zX`=6YUS3`A~1wVoj5tj)^09Ts&S1$v>9DLVxG)xMnk0~v~3GO z-}gC;y%zHuaONM3j@Iinec!X+@AEzr%F?3j{-px6Z99j?Q$k4~uhytcI2A-CLz@)* z95;a`km(hCEijbxbKDYuap=8hsN{AF#kSimBEo*Z&$)u-3+6YLp`_8#;c$3!ezS}+ zDk`nYdp{>xU6-v&oQHhAgq|q^=Wu7>-GW9SA!jG77uugnvv@;IZ!EwPuY37`^1Veh z79ExQmyt^u(HL;2(pHN0N z=4g$^-b>2L`=pfk@#9AhflGf9qt02XF^4!1(_3Y}l(O)+7u1tr&KcCbBdBW>lyFVc z%vsqtFA?E*JW^E^fBp3rP1C$_s<(t`b)}TjMa-|NY`5EUobTSDIamDs56UE$ueZT3 ze1KImzgqxhvbNoBFQTJcLa->Qq^&a4G>5zN57#2DdoFjcO!zYzY$a){HEp+Bnx^?w zh`cOCo8_!lD;^&ob19|t70YbUXa2o&0xA0AgKJ`y=f);LGy2 zm8UJ|Skl>d`#*P2fIsSHSz{)p#PjnryWKATrp#__zm+N8)7~YpPft&|Sa+?TT(&fC zUF(lpz-vWOzno&0pqJWutDavL(=0Q#1kE)6RzJZks_VLotl7GH*BVP-Z6QJRK4EC- zV6O?}Rz3e(NqgC7xz$fl)ofW^*X5+G>?dEdsIT-7?w$>qQY)8^@K!y))Ku#mTVtji zt9h@VVEjK#6T97xzVCCR-*SX&{pGI~Kv}1sE~Ah#G1~2R02hrG1E{Rmmm`snkB@X+ckz805m^Bb$QiWFqb`NI zoO`mlBb)ZSRx$k(VR%V#&N+fjYyI2KSUCZ9O>+#0ID8V?tbh0M22PF_ZxQsYvHq7HP4!&4n&GHiU37p=}3jnuhImd(m`XCQRjP88NkOi>h)w y9&c)})u7BVmzGdAd;ZsD5!q_B$^*zLCH@1LNII_TaD>hP0000GetStringSelection(); main_frame->InitBitmaps(); + main_frame->UpdateGameList(); })); auto const scInterface = new wxBoxSizer(wxHORIZONTAL); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index 1e4164b7aa..833268ad63 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -34,7 +34,7 @@ #include "FileSearch.h" #include "CompressedBlob.h" #include "ChunkFile.h" -#include "../resources/no_banner.cpp" +#include "ConfigManager.h" #define CACHE_REVISION 0x10F @@ -174,10 +174,16 @@ GameListItem::GameListItem(const std::string& _rFileName) } else { + std::string theme = SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name + "/"; + std::string dir = File::GetUserPath(D_THEMES_IDX) + theme; + +#if !defined(_WIN32) + // If theme does not exist in user's dir load from shared directory + if (!File::Exists(dir)) + dir = SHARED_USER_DIR THEMES_DIR "/" + theme; +#endif // default banner - wxMemoryInputStream istream(no_banner_png, sizeof no_banner_png); - wxImage iNoBanner(istream, wxBITMAP_TYPE_PNG); - m_Image = iNoBanner; + m_Image = wxImage(dir + "nobanner.png", wxBITMAP_TYPE_PNG); } } diff --git a/Source/Core/DolphinWX/resources/no_banner.cpp b/Source/Core/DolphinWX/resources/no_banner.cpp deleted file mode 100644 index df8d51d737..0000000000 --- a/Source/Core/DolphinWX/resources/no_banner.cpp +++ /dev/null @@ -1,28 +0,0 @@ -static const unsigned char no_banner_png[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, - 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x04, 0x03, - 0x00, 0x00, 0x00, 0x1f, 0xee, 0x60, 0x67, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, - 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, - 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xdd, 0x02, - 0x09, 0x16, 0x39, 0x17, 0xf0, 0x40, 0x6e, 0x04, 0x00, 0x00, 0x00, 0x15, 0x50, - 0x4c, 0x54, 0x45, 0x66, 0x66, 0x66, 0x6a, 0x6a, 0x6a, 0x6b, 0x6b, 0x6b, 0x6d, - 0x6d, 0x6d, 0x70, 0x70, 0x70, 0x73, 0x73, 0x73, 0x80, 0x80, 0x80, 0xd1, 0x7d, - 0x40, 0x35, 0x00, 0x00, 0x00, 0xc6, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x8d, - 0xd4, 0x31, 0x0e, 0xc3, 0x20, 0x10, 0x44, 0xd1, 0x51, 0x64, 0xfa, 0x1c, 0x25, - 0x47, 0x48, 0x45, 0xed, 0xca, 0x07, 0xb0, 0x80, 0xfb, 0x1f, 0x21, 0x05, 0x60, - 0xd6, 0x30, 0xe3, 0xac, 0xbb, 0x95, 0xf8, 0x7a, 0xb2, 0x01, 0xa3, 0x98, 0x27, - 0x01, 0x00, 0x10, 0xfa, 0x9c, 0xeb, 0xbc, 0xd9, 0x35, 0xb0, 0x43, 0xf9, 0xd6, - 0x15, 0x47, 0x1b, 0xf7, 0x3a, 0x46, 0x1d, 0xdc, 0x09, 0x06, 0x4c, 0xc1, 0x9d, - 0x60, 0xc0, 0x1c, 0x58, 0x82, 0x02, 0x73, 0x60, 0x09, 0x0a, 0x2c, 0xc1, 0x20, - 0x38, 0xb0, 0x04, 0x83, 0xe0, 0xc0, 0x1a, 0x74, 0x42, 0x00, 0x6b, 0xd0, 0x89, - 0x0f, 0x07, 0x48, 0xd0, 0x08, 0x01, 0x90, 0xa0, 0x13, 0x1c, 0x60, 0x41, 0x7a, - 0x02, 0x58, 0x60, 0x88, 0xe8, 0x0b, 0xd2, 0x03, 0x40, 0x83, 0x8b, 0x88, 0xde, - 0xe0, 0xac, 0xeb, 0x5f, 0xc5, 0x1b, 0xb4, 0x4d, 0xbe, 0xee, 0xc5, 0xbf, 0x20, - 0xf7, 0x77, 0x08, 0xce, 0x60, 0xbf, 0xbe, 0xd2, 0xe1, 0x0a, 0xf2, 0xd8, 0x87, - 0xe0, 0x0a, 0x76, 0xb3, 0xd3, 0x87, 0x23, 0xc8, 0xf6, 0x2c, 0x05, 0x47, 0xd0, - 0x80, 0xb7, 0x20, 0x20, 0x80, 0x2d, 0x09, 0x02, 0x02, 0x88, 0xf3, 0x3f, 0x4a, - 0x05, 0xe3, 0xa2, 0x09, 0x02, 0x0a, 0x28, 0x82, 0x80, 0x02, 0x14, 0x01, 0x09, - 0x08, 0x02, 0x12, 0x10, 0x04, 0x34, 0xc0, 0x89, 0x1f, 0xe2, 0x9a, 0xca, 0x1c, - 0x5f, 0x12, 0x62, 0x57, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, - 0x42, 0x60, 0x82 -}; From 4aeaf3477e7bf2e4b8a6dc692ca7d43f26c63855 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 22 Feb 2013 22:17:32 -0600 Subject: [PATCH 604/627] Eliminate artifacts in nobanner.png. --- Data/User/Themes/Boomy/nobanner.png | Bin 2484 -> 321 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/User/Themes/Boomy/nobanner.png index 4d34be77626c7f9d77659f8766109b9017baa619..08a30884310ecba0d240432e197700b8db560f68 100644 GIT binary patch delta 306 zcmV-20nPrj6Tt$I7=Hu<0000V?qFvC000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0000LP)t-sW@ct;YHDk1Yi(_9aBy&Qb8~=zfYE(GH2?qr!bwCyR5;6x z)H@EtAP|J%QDpiYB}Yg_?aBwRfcqaI1+O*C5ZtY_zdqRrBY&AE007|X9P@nG9oQj# z^Tt)iGml;ePl5qM@FW;829}_}7+8V=Q_u+xOhG3&Fb9(so{0m}z2e%oV?JHedLG0(?wt@~Y0xN(KP{3Od z5Wo=x0Ri~&A1kGTe$fO01tdX00g8YG1OW*M0vh1N58|529GnDB{Qv*}07*qoM6N<$ Ef@VQ+I{*Lx literal 2484 zcmV;l2}|~gP)WFU8GbZ8()Nlj2>E@cM*00|gLL_t(&-p!hAbKloBF>s^;&fX(Gmm_Z|S}9000{tr#Q2F!1#Bg!i6d7^td>VHoh*_Jsw#kde_Q2wMC9VVa}E(<7zR$K6VK1jytjmejt5-uBv~^m z_)zok@Ico#)OAf7C!FZ~r)hpR^+Y@=DKKLa$B9t6jHQoIF6_)(=_3|XPTz`fF`u6s_@?DhfgVGkVFLM93cc&s}<8U&4-LJgY3P> zdr#l@d9Q)C+wC|Wj~QHBc7MA^`I&)l0Q7y&uV25owW_+oxqy(UgX5uD@zAdERUpO@ zClRj`#A#L(h2#M52&;;^5`=-ON=(Cv@pOa~nWiZ#u$}XCI#I7y48wo}Sg+T4L#g>8 z1gfga!ZASWx@H&#LI^nLvY<-sv}ODM{`+s*w!Juz32hul+O{Ren1xfOYEK;;>pB!l5fJgH3U$3E#yI0QP174GnHH;RKD=3hs%9D~KR1&% z?KAo*ule)mPk#LP!8ne2k6F<$44H~dpeB&R;lSy1Vw$E4z^_?@Da+w-;N|6oVHmQt zeIx)SoN1?H+qBe`N2dreQHKhTBFq*ZH4#xD5m1~YDj)Ebojo$9$fPNs(-hU%Vi*RH zM5wAN1MZy54^#5Fh-C2XyK5A%|WbvtPe{vDs{J z&gF+N;TqjkRYi=EmzS4|>z5q7v>ZFzMB;JN@z^y4fi!>H;E)W40E5 z_6G?iB|%(30dbBgD&hkPK-27FjA^R**+Pu*f?vOCnT44UM1;QYGx#Es0|0wpg5{j! z_wV0`2;1#8Tc-J@x~@5$PV{}x;c&R#KuRPa zoh>He07sGurwNs_vYcN5L~r8~?g4&j1tLOS*IE0FqpvyI^1THJyWI{Ep=p||-Of3t zX`=6YUS3`A~1wVoj5tj)^09Ts&S1$v>9DLVxG)xMnk0~v~3GO z-}gC;y%zHuaONM3j@Iinec!X+@AEzr%F?3j{-px6Z99j?Q$k4~uhytcI2A-CLz@)* z95;a`km(hCEijbxbKDYuap=8hsN{AF#kSimBEo*Z&$)u-3+6YLp`_8#;c$3!ezS}+ zDk`nYdp{>xU6-v&oQHhAgq|q^=Wu7>-GW9SA!jG77uugnvv@;IZ!EwPuY37`^1Veh z79ExQmyt^u(HL;2(pHN0N z=4g$^-b>2L`=pfk@#9AhflGf9qt02XF^4!1(_3Y}l(O)+7u1tr&KcCbBdBW>lyFVc z%vsqtFA?E*JW^E^fBp3rP1C$_s<(t`b)}TjMa-|NY`5EUobTSDIamDs56UE$ueZT3 ze1KImzgqxhvbNoBFQTJcLa->Qq^&a4G>5zN57#2DdoFjcO!zYzY$a){HEp+Bnx^?w zh`cOCo8_!lD;^&ob19|t70YbUXa2o&0xA0AgKJ`y=f);LGy2 zm8UJ|Skl>d`#*P2fIsSHSz{)p#PjnryWKATrp#__zm+N8)7~YpPft&|Sa+?TT(&fC zUF(lpz-vWOzno&0pqJWutDavL(=0Q#1kE)6RzJZks_VLotl7GH*BVP-Z6QJRK4EC- zV6O?}Rz3e(NqgC7xz$fl)ofW^*X5+G>?dEdsIT-7?w$>qQY)8^@K!y))Ku#mTVtji zt9h@VVEjK#6T97xzVCCR-*SX&{pGI~Kv}1sE~Ah#G1~2R02hrG1E{Rmmm`snkB@X+ckz805m^Bb$QiWFqb`NI zoO`mlBb)ZSRx$k(VR%V#&N+fjYyI2KSUCZ9O>+#0ID8V?tbh0M22PF_ZxQsYvHq7HP4!&4n&GHiU37p=}3jnuhImd(m`XCQRjP88NkOi>h)w y9&c)})u7BVmzGdAd;ZsD5!q_B$^*zLCH@1LNII_TaD>hP0000 Date: Sat, 23 Feb 2013 01:47:37 -0500 Subject: [PATCH 605/627] Update CLRun to have OCL 1.2 --- Externals/CLRun/CMakeLists.txt | 5 +- Externals/CLRun/clrun/Makefile | 5 + Externals/CLRun/clrun/gencl.c | 343 +++++++++---- Externals/CLRun/clrun/genclext.c | 28 ++ Externals/CLRun/clrun/genclgl.c | 42 +- Externals/CLRun/clrun/genclglext.c | 11 + Externals/CLRun/clrun/generateClRun.pl | 0 Externals/CLRun/include/CL/cl.h | 454 +++++++++++++++--- Externals/CLRun/include/CL/cl_d3d10.h | 126 +++++ Externals/CLRun/include/CL/cl_d3d11.h | 126 +++++ .../CLRun/include/CL/cl_dx9_media_sharing.h | 127 +++++ Externals/CLRun/include/CL/cl_ext.h | 251 ++++++++++ Externals/CLRun/include/CL/cl_gl.h | 95 ++-- Externals/CLRun/include/CL/cl_gl_ext.h | 69 +++ Externals/CLRun/include/CL/cl_platform.h | 203 +++++++- 15 files changed, 1649 insertions(+), 236 deletions(-) create mode 100644 Externals/CLRun/clrun/genclext.c create mode 100644 Externals/CLRun/clrun/genclglext.c mode change 100644 => 100755 Externals/CLRun/clrun/generateClRun.pl create mode 100644 Externals/CLRun/include/CL/cl_d3d10.h create mode 100644 Externals/CLRun/include/CL/cl_d3d11.h create mode 100644 Externals/CLRun/include/CL/cl_dx9_media_sharing.h create mode 100644 Externals/CLRun/include/CL/cl_ext.h create mode 100644 Externals/CLRun/include/CL/cl_gl_ext.h diff --git a/Externals/CLRun/CMakeLists.txt b/Externals/CLRun/CMakeLists.txt index 7810173a81..3a57ae4563 100644 --- a/Externals/CLRun/CMakeLists.txt +++ b/Externals/CLRun/CMakeLists.txt @@ -1,7 +1,10 @@ set(SRCS clrun/clrun.c clrun/dynamiclib.c clrun/gencl.c - clrun/genclgl.c) + clrun/genclgl.c + clrun/genclext.c + clrun/genclglext.c + ) add_library(clrun STATIC ${SRCS}) target_link_libraries(clrun ${CMAKE_DL_LIBS}) diff --git a/Externals/CLRun/clrun/Makefile b/Externals/CLRun/clrun/Makefile index 9f637269e0..f4186ff741 100644 --- a/Externals/CLRun/clrun/Makefile +++ b/Externals/CLRun/clrun/Makefile @@ -10,6 +10,11 @@ compile: genclrun gencl.c genclgl.c genclrun: ../include/CL/cl.h ../include/CL/cl_gl.h ./generateClRun.pl ../include/CL/cl.h > gencl.c ./generateClRun.pl ../include/CL/cl_gl.h > genclgl.c + ./generateClRun.pl ../include/CL/cl_ext.h > genclext.c + ./generateClRun.pl ../include/CL/cl_gl_ext.h > genclglext.c + ./generateClRun.pl ../include/CL/cl_d3d10.h > gencld3d10.c + ./generateClRun.pl ../include/CL/cl_d3d11.h > gencld3d11.c + ./generateClRun.pl ../include/CL/cl_dx9_media_sharing.h > gencldx9.c clean: diff --git a/Externals/CLRun/clrun/gencl.c b/Externals/CLRun/clrun/gencl.c index 9d55b70232..649e3c67b7 100644 --- a/Externals/CLRun/clrun/gencl.c +++ b/Externals/CLRun/clrun/gencl.c @@ -3,398 +3,543 @@ #include "../include/CL/cl.h" -static cl_int (CL_API_CALL *clGetPlatformIDs_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; +static cl_int (*clGetPlatformIDs_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; cl_int CL_API_CALL clGetPlatformIDs (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) { if(!clGetPlatformIDs_ptr) clGetPlatformIDs_ptr = getFunction("clGetPlatformIDs"); return (*clGetPlatformIDs_ptr)(num_entries, platforms, num_platforms); } -static cl_int (CL_API_CALL *clGetPlatformInfo_ptr)(cl_platform_id, cl_platform_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetPlatformInfo_ptr)(cl_platform_id, cl_platform_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetPlatformInfo (cl_platform_id platform,cl_platform_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetPlatformInfo_ptr) clGetPlatformInfo_ptr = getFunction("clGetPlatformInfo"); return (*clGetPlatformInfo_ptr)(platform, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetDeviceIDs_ptr)(cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *) = NULL; +static cl_int (*clGetDeviceIDs_ptr)(cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *) = NULL; cl_int CL_API_CALL clGetDeviceIDs (cl_platform_id platform,cl_device_type device_type,cl_uint num_entries,cl_device_id * devices,cl_uint * num_devices) { if(!clGetDeviceIDs_ptr) clGetDeviceIDs_ptr = getFunction("clGetDeviceIDs"); return (*clGetDeviceIDs_ptr)(platform, device_type, num_entries, devices, num_devices); } -static cl_int (CL_API_CALL *clGetDeviceInfo_ptr)(cl_device_id, cl_device_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetDeviceInfo_ptr)(cl_device_id, cl_device_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetDeviceInfo (cl_device_id device,cl_device_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetDeviceInfo_ptr) clGetDeviceInfo_ptr = getFunction("clGetDeviceInfo"); return (*clGetDeviceInfo_ptr)(device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_context (CL_API_CALL *clCreateContext_ptr)(const cl_context_properties *, cl_uint, const cl_device_id *, void (CL_CALLBACK *)(const char *, const void *, size_t, void *), void *, cl_int *) = NULL; -cl_context CL_API_CALL clCreateContext (const cl_context_properties * properties,cl_uint num_devices,const cl_device_id * devices,void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *),void * user_data,cl_int * errcode_ret) { +static cl_int (*clCreateSubDevices_ptr)(cl_device_id, const cl_device_partition_property *, cl_uint, cl_device_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clCreateSubDevices (cl_device_id in_device,const cl_device_partition_property * properties,cl_uint num_devices,cl_device_id * out_devices,cl_uint * num_devices_ret) { + if(!clCreateSubDevices_ptr) clCreateSubDevices_ptr = getFunction("clCreateSubDevices"); + return (*clCreateSubDevices_ptr)(in_device, properties, num_devices, out_devices, num_devices_ret); +} + +static cl_int (*clRetainDevice_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clRetainDevice (cl_device_id device) { + if(!clRetainDevice_ptr) clRetainDevice_ptr = getFunction("clRetainDevice"); + return (*clRetainDevice_ptr)(device); +} + +static cl_int (*clReleaseDevice_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clReleaseDevice (cl_device_id device) { + if(!clReleaseDevice_ptr) clReleaseDevice_ptr = getFunction("clReleaseDevice"); + return (*clReleaseDevice_ptr)(device); +} + +static cl_context (*clCreateContext_ptr)(const cl_context_properties *, cl_uint, const cl_device_id *, void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL; +cl_context CL_API_CALL clCreateContext(const cl_context_properties * properties, + cl_uint num_devices, + const cl_device_id * devices, + void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), + void * user_data, + cl_int * errcode_ret) { if(!clCreateContext_ptr) clCreateContext_ptr = getFunction("clCreateContext"); return (*clCreateContext_ptr)(properties, num_devices, devices, pfn_notify, user_data, errcode_ret); } -static cl_context (CL_API_CALL *clCreateContextFromType_ptr)(const cl_context_properties *, cl_device_type, void (CL_CALLBACK *)(const char *, const void *, size_t, void *), void *, cl_int *) = NULL; -cl_context CL_API_CALL clCreateContextFromType (const cl_context_properties * properties,cl_device_type device_type,void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *),void * user_data,cl_int * errcode_ret) { +static cl_context (*clCreateContextFromType_ptr)(const cl_context_properties *, cl_device_type, void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), void*, cl_int*) = NULL; +cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * properties, + cl_device_type device_type, + void (CL_CALLBACK * pfn_notify)(const char *, const void *, size_t, void *), + void * user_data, + cl_int * errcode_ret) { if(!clCreateContextFromType_ptr) clCreateContextFromType_ptr = getFunction("clCreateContextFromType"); return (*clCreateContextFromType_ptr)(properties, device_type, pfn_notify, user_data, errcode_ret); } -static cl_int (CL_API_CALL *clRetainContext_ptr)(cl_context) = NULL; +static cl_int (*clRetainContext_ptr)(cl_context) = NULL; cl_int CL_API_CALL clRetainContext (cl_context context) { if(!clRetainContext_ptr) clRetainContext_ptr = getFunction("clRetainContext"); return (*clRetainContext_ptr)(context); } -static cl_int (CL_API_CALL *clReleaseContext_ptr)(cl_context) = NULL; +static cl_int (*clReleaseContext_ptr)(cl_context) = NULL; cl_int CL_API_CALL clReleaseContext (cl_context context) { if(!clReleaseContext_ptr) clReleaseContext_ptr = getFunction("clReleaseContext"); return (*clReleaseContext_ptr)(context); } -static cl_int (CL_API_CALL *clGetContextInfo_ptr)(cl_context, cl_context_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetContextInfo_ptr)(cl_context, cl_context_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetContextInfo (cl_context context,cl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetContextInfo_ptr) clGetContextInfo_ptr = getFunction("clGetContextInfo"); return (*clGetContextInfo_ptr)(context, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_command_queue (CL_API_CALL *clCreateCommandQueue_ptr)(cl_context, cl_device_id, cl_command_queue_properties, cl_int *) = NULL; +static cl_command_queue (*clCreateCommandQueue_ptr)(cl_context, cl_device_id, cl_command_queue_properties, cl_int *) = NULL; cl_command_queue CL_API_CALL clCreateCommandQueue (cl_context context,cl_device_id device,cl_command_queue_properties properties,cl_int * errcode_ret) { if(!clCreateCommandQueue_ptr) clCreateCommandQueue_ptr = getFunction("clCreateCommandQueue"); return (*clCreateCommandQueue_ptr)(context, device, properties, errcode_ret); } -static cl_int (CL_API_CALL *clRetainCommandQueue_ptr)(cl_command_queue) = NULL; +static cl_int (*clRetainCommandQueue_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clRetainCommandQueue (cl_command_queue command_queue) { if(!clRetainCommandQueue_ptr) clRetainCommandQueue_ptr = getFunction("clRetainCommandQueue"); return (*clRetainCommandQueue_ptr)(command_queue); } -static cl_int (CL_API_CALL *clReleaseCommandQueue_ptr)(cl_command_queue) = NULL; +static cl_int (*clReleaseCommandQueue_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clReleaseCommandQueue (cl_command_queue command_queue) { if(!clReleaseCommandQueue_ptr) clReleaseCommandQueue_ptr = getFunction("clReleaseCommandQueue"); return (*clReleaseCommandQueue_ptr)(command_queue); } -static cl_int (CL_API_CALL *clGetCommandQueueInfo_ptr)(cl_command_queue, cl_command_queue_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetCommandQueueInfo_ptr)(cl_command_queue, cl_command_queue_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetCommandQueueInfo (cl_command_queue command_queue,cl_command_queue_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetCommandQueueInfo_ptr) clGetCommandQueueInfo_ptr = getFunction("clGetCommandQueueInfo"); return (*clGetCommandQueueInfo_ptr)(command_queue, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clSetCommandQueueProperty_ptr)(cl_command_queue, cl_command_queue_properties, cl_bool, cl_command_queue_properties *) = NULL; -cl_int CL_API_CALL clSetCommandQueueProperty (cl_command_queue command_queue,cl_command_queue_properties properties,cl_bool enable,cl_command_queue_properties * old_properties) { - if(!clSetCommandQueueProperty_ptr) clSetCommandQueueProperty_ptr = getFunction("clSetCommandQueueProperty"); - return (*clSetCommandQueueProperty_ptr)(command_queue, properties, enable, old_properties); -} - -static cl_mem (CL_API_CALL *clCreateBuffer_ptr)(cl_context, cl_mem_flags, size_t, void *, cl_int *) = NULL; +static cl_mem (*clCreateBuffer_ptr)(cl_context, cl_mem_flags, size_t, void *, cl_int *) = NULL; cl_mem CL_API_CALL clCreateBuffer (cl_context context,cl_mem_flags flags,size_t size,void * host_ptr,cl_int * errcode_ret) { if(!clCreateBuffer_ptr) clCreateBuffer_ptr = getFunction("clCreateBuffer"); return (*clCreateBuffer_ptr)(context, flags, size, host_ptr, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateImage2D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, void *, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateImage2D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_row_pitch,void * host_ptr,cl_int * errcode_ret) { - if(!clCreateImage2D_ptr) clCreateImage2D_ptr = getFunction("clCreateImage2D"); - return (*clCreateImage2D_ptr)(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); +static cl_mem (*clCreateSubBuffer_ptr)(cl_mem, cl_mem_flags, cl_buffer_create_type, const void *, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateSubBuffer (cl_mem buffer,cl_mem_flags flags,cl_buffer_create_type buffer_create_type,const void * buffer_create_info,cl_int * errcode_ret) { + if(!clCreateSubBuffer_ptr) clCreateSubBuffer_ptr = getFunction("clCreateSubBuffer"); + return (*clCreateSubBuffer_ptr)(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateImage3D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, size_t, size_t, void *, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateImage3D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_depth,size_t image_row_pitch,size_t image_slice_pitch,void * host_ptr,cl_int * errcode_ret) { - if(!clCreateImage3D_ptr) clCreateImage3D_ptr = getFunction("clCreateImage3D"); - return (*clCreateImage3D_ptr)(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); +static cl_mem (*clCreateImage_ptr)(cl_context, cl_mem_flags, const cl_image_format *, const cl_image_desc *, void *, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateImage (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,const cl_image_desc * image_desc,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage_ptr) clCreateImage_ptr = getFunction("clCreateImage"); + return (*clCreateImage_ptr)(context, flags, image_format, image_desc, host_ptr, errcode_ret); } -static cl_int (CL_API_CALL *clRetainMemObject_ptr)(cl_mem) = NULL; +static cl_int (*clRetainMemObject_ptr)(cl_mem) = NULL; cl_int CL_API_CALL clRetainMemObject (cl_mem memobj) { if(!clRetainMemObject_ptr) clRetainMemObject_ptr = getFunction("clRetainMemObject"); return (*clRetainMemObject_ptr)(memobj); } -static cl_int (CL_API_CALL *clReleaseMemObject_ptr)(cl_mem) = NULL; +static cl_int (*clReleaseMemObject_ptr)(cl_mem) = NULL; cl_int CL_API_CALL clReleaseMemObject (cl_mem memobj) { if(!clReleaseMemObject_ptr) clReleaseMemObject_ptr = getFunction("clReleaseMemObject"); return (*clReleaseMemObject_ptr)(memobj); } -static cl_int (CL_API_CALL *clGetSupportedImageFormats_ptr)(cl_context, cl_mem_flags, cl_mem_object_type, cl_uint, cl_image_format *, cl_uint *) = NULL; +static cl_int (*clGetSupportedImageFormats_ptr)(cl_context, cl_mem_flags, cl_mem_object_type, cl_uint, cl_image_format *, cl_uint *) = NULL; cl_int CL_API_CALL clGetSupportedImageFormats (cl_context context,cl_mem_flags flags,cl_mem_object_type image_type,cl_uint num_entries,cl_image_format * image_formats,cl_uint * num_image_formats) { if(!clGetSupportedImageFormats_ptr) clGetSupportedImageFormats_ptr = getFunction("clGetSupportedImageFormats"); return (*clGetSupportedImageFormats_ptr)(context, flags, image_type, num_entries, image_formats, num_image_formats); } -static cl_int (CL_API_CALL *clGetMemObjectInfo_ptr)(cl_mem, cl_mem_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetMemObjectInfo_ptr)(cl_mem, cl_mem_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetMemObjectInfo (cl_mem memobj,cl_mem_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetMemObjectInfo_ptr) clGetMemObjectInfo_ptr = getFunction("clGetMemObjectInfo"); return (*clGetMemObjectInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetImageInfo_ptr)(cl_mem, cl_image_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetImageInfo_ptr)(cl_mem, cl_image_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetImageInfo (cl_mem image,cl_image_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetImageInfo_ptr) clGetImageInfo_ptr = getFunction("clGetImageInfo"); return (*clGetImageInfo_ptr)(image, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_sampler (CL_API_CALL *clCreateSampler_ptr)(cl_context, cl_bool, cl_addressing_mode, cl_filter_mode, cl_int *) = NULL; -cl_sampler CL_API_CALL clCreateSampler (cl_context context,cl_bool normalized_coords,cl_addressing_mode addressing_mode,cl_filter_mode filter_mode,cl_int * errcode_ret) { +/* Sampler APIs */ +static cl_int (*clSetMemObjectDestructorCallback_ptr)(cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data ) = NULL; +cl_int CL_API_CALL clSetMemObjectDestructorCallback (cl_mem memobj,void (CL_CALLBACK *pfn_notify)( cl_mem memobj, void*) ,void *user_data ) +{ + if(!clSetMemObjectDestructorCallback_ptr) clSetMemObjectDestructorCallback_ptr = getFunction("clSetMemObjectDestructorCallback"); + return (*clSetMemObjectDestructorCallback_ptr)(memobj, pfn_notify, user_data); +} + +/* Sampler APIs */ +static cl_sampler (*clCreateSampler_ptr)(cl_context, cl_bool, cl_addressing_mode, cl_filter_mode, cl_int *) = NULL; +cl_sampler CL_API_CALL clCreateSampler(cl_context context,cl_bool normalized_coords,cl_addressing_mode addressing_mode,cl_filter_mode filter_mode,cl_int * errcode_ret) { if(!clCreateSampler_ptr) clCreateSampler_ptr = getFunction("clCreateSampler"); return (*clCreateSampler_ptr)(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); } -static cl_int (CL_API_CALL *clRetainSampler_ptr)(cl_sampler) = NULL; +static cl_int (*clRetainSampler_ptr)(cl_sampler) = NULL; cl_int CL_API_CALL clRetainSampler (cl_sampler sampler) { if(!clRetainSampler_ptr) clRetainSampler_ptr = getFunction("clRetainSampler"); return (*clRetainSampler_ptr)(sampler); } -static cl_int (CL_API_CALL *clReleaseSampler_ptr)(cl_sampler) = NULL; +static cl_int (*clReleaseSampler_ptr)(cl_sampler) = NULL; cl_int CL_API_CALL clReleaseSampler (cl_sampler sampler) { if(!clReleaseSampler_ptr) clReleaseSampler_ptr = getFunction("clReleaseSampler"); return (*clReleaseSampler_ptr)(sampler); } -static cl_int (CL_API_CALL *clGetSamplerInfo_ptr)(cl_sampler, cl_sampler_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetSamplerInfo_ptr)(cl_sampler, cl_sampler_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetSamplerInfo (cl_sampler sampler,cl_sampler_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetSamplerInfo_ptr) clGetSamplerInfo_ptr = getFunction("clGetSamplerInfo"); return (*clGetSamplerInfo_ptr)(sampler, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_program (CL_API_CALL *clCreateProgramWithSource_ptr)(cl_context, cl_uint, const char **, const size_t *, cl_int *) = NULL; +static cl_program (*clCreateProgramWithSource_ptr)(cl_context, cl_uint, const char **, const size_t *, cl_int *) = NULL; cl_program CL_API_CALL clCreateProgramWithSource (cl_context context,cl_uint count,const char ** strings,const size_t * lengths,cl_int * errcode_ret) { if(!clCreateProgramWithSource_ptr) clCreateProgramWithSource_ptr = getFunction("clCreateProgramWithSource"); return (*clCreateProgramWithSource_ptr)(context, count, strings, lengths, errcode_ret); } -static cl_program (CL_API_CALL *clCreateProgramWithBinary_ptr)(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int *) = NULL; +static cl_program (*clCreateProgramWithBinary_ptr)(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int *) = NULL; cl_program CL_API_CALL clCreateProgramWithBinary (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const size_t * lengths,const unsigned char ** binaries,cl_int * binary_status,cl_int * errcode_ret) { if(!clCreateProgramWithBinary_ptr) clCreateProgramWithBinary_ptr = getFunction("clCreateProgramWithBinary"); return (*clCreateProgramWithBinary_ptr)(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); } -static cl_int (CL_API_CALL *clRetainProgram_ptr)(cl_program) = NULL; +static cl_program (*clCreateProgramWithBuiltInKernels_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_int *) = NULL; +cl_program CL_API_CALL clCreateProgramWithBuiltInKernels (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * kernel_names,cl_int * errcode_ret) { + if(!clCreateProgramWithBuiltInKernels_ptr) clCreateProgramWithBuiltInKernels_ptr = getFunction("clCreateProgramWithBuiltInKernels"); + return (*clCreateProgramWithBuiltInKernels_ptr)(context, num_devices, device_list, kernel_names, errcode_ret); +} + +static cl_int (*clRetainProgram_ptr)(cl_program) = NULL; cl_int CL_API_CALL clRetainProgram (cl_program program) { if(!clRetainProgram_ptr) clRetainProgram_ptr = getFunction("clRetainProgram"); return (*clRetainProgram_ptr)(program); } -static cl_int (CL_API_CALL *clReleaseProgram_ptr)(cl_program) = NULL; +static cl_int (*clReleaseProgram_ptr)(cl_program) = NULL; cl_int CL_API_CALL clReleaseProgram (cl_program program) { if(!clReleaseProgram_ptr) clReleaseProgram_ptr = getFunction("clReleaseProgram"); return (*clReleaseProgram_ptr)(program); } -static cl_int (CL_API_CALL *clBuildProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void *), void *) = NULL; -cl_int CL_API_CALL clBuildProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void *),void * user_data) { +static cl_int (*clBuildProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL; +cl_int CL_API_CALL clBuildProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options, void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) { if(!clBuildProgram_ptr) clBuildProgram_ptr = getFunction("clBuildProgram"); - return (*clBuildProgram_ptr)(program, num_devices, device_list, options, pfn_notify, user_data); + return (*clBuildProgram_ptr)(program, num_devices, device_list, options, user_data, user_data); } -static cl_int (CL_API_CALL *clUnloadCompiler_ptr)(void) = NULL; -cl_int CL_API_CALL clUnloadCompiler (void) { - if(!clUnloadCompiler_ptr) clUnloadCompiler_ptr = getFunction("clUnloadCompiler"); - return (*clUnloadCompiler_ptr)(); +static cl_int (*clCompileProgram_ptr)(cl_program, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, const char **, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *) = NULL; +cl_int CL_API_CALL clCompileProgram (cl_program program,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_headers,const cl_program * input_headers,const char ** header_include_names,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data) { + if(!clCompileProgram_ptr) clCompileProgram_ptr = getFunction("clCompileProgram"); + return (*clCompileProgram_ptr)(program, num_devices, device_list, options, num_input_headers, input_headers, header_include_names, user_data, user_data); } -static cl_int (CL_API_CALL *clGetProgramInfo_ptr)(cl_program, cl_program_info, size_t, void *, size_t *) = NULL; +static cl_program (*clLinkProgram_ptr)(cl_context, cl_uint, const cl_device_id *, const char *, cl_uint, const cl_program *, void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), void *, cl_int *) = NULL; +cl_program CL_API_CALL clLinkProgram (cl_context context,cl_uint num_devices,const cl_device_id * device_list,const char * options,cl_uint num_input_programs,const cl_program * input_programs,void (CL_CALLBACK * pfn_notify)(cl_program /* program */, void * /* user_data */),void * user_data,cl_int * errcode_ret) { + if(!clLinkProgram_ptr) clLinkProgram_ptr = getFunction("clLinkProgram"); + return (*clLinkProgram_ptr)(context, num_devices, device_list, options, num_input_programs, input_programs, user_data, user_data, errcode_ret); +} + +static cl_int (*clUnloadPlatformCompiler_ptr)(cl_platform_id) = NULL; +cl_int CL_API_CALL clUnloadPlatformCompiler (cl_platform_id platform) { + if(!clUnloadPlatformCompiler_ptr) clUnloadPlatformCompiler_ptr = getFunction("clUnloadPlatformCompiler"); + return (*clUnloadPlatformCompiler_ptr)(platform); +} + +static cl_int (*clGetProgramInfo_ptr)(cl_program, cl_program_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetProgramInfo (cl_program program,cl_program_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetProgramInfo_ptr) clGetProgramInfo_ptr = getFunction("clGetProgramInfo"); return (*clGetProgramInfo_ptr)(program, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetProgramBuildInfo_ptr)(cl_program, cl_device_id, cl_program_build_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetProgramBuildInfo_ptr)(cl_program, cl_device_id, cl_program_build_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetProgramBuildInfo (cl_program program,cl_device_id device,cl_program_build_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetProgramBuildInfo_ptr) clGetProgramBuildInfo_ptr = getFunction("clGetProgramBuildInfo"); return (*clGetProgramBuildInfo_ptr)(program, device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_kernel (CL_API_CALL *clCreateKernel_ptr)(cl_program, const char *, cl_int *) = NULL; +static cl_kernel (*clCreateKernel_ptr)(cl_program, const char *, cl_int *) = NULL; cl_kernel CL_API_CALL clCreateKernel (cl_program program,const char * kernel_name,cl_int * errcode_ret) { if(!clCreateKernel_ptr) clCreateKernel_ptr = getFunction("clCreateKernel"); return (*clCreateKernel_ptr)(program, kernel_name, errcode_ret); } -static cl_int (CL_API_CALL *clCreateKernelsInProgram_ptr)(cl_program, cl_uint, cl_kernel *, cl_uint *) = NULL; +static cl_int (*clCreateKernelsInProgram_ptr)(cl_program, cl_uint, cl_kernel *, cl_uint *) = NULL; cl_int CL_API_CALL clCreateKernelsInProgram (cl_program program,cl_uint num_kernels,cl_kernel * kernels,cl_uint * num_kernels_ret) { if(!clCreateKernelsInProgram_ptr) clCreateKernelsInProgram_ptr = getFunction("clCreateKernelsInProgram"); return (*clCreateKernelsInProgram_ptr)(program, num_kernels, kernels, num_kernels_ret); } -static cl_int (CL_API_CALL *clRetainKernel_ptr)(cl_kernel) = NULL; +static cl_int (*clRetainKernel_ptr)(cl_kernel) = NULL; cl_int CL_API_CALL clRetainKernel (cl_kernel kernel) { if(!clRetainKernel_ptr) clRetainKernel_ptr = getFunction("clRetainKernel"); return (*clRetainKernel_ptr)(kernel); } -static cl_int (CL_API_CALL *clReleaseKernel_ptr)(cl_kernel) = NULL; +static cl_int (*clReleaseKernel_ptr)(cl_kernel) = NULL; cl_int CL_API_CALL clReleaseKernel (cl_kernel kernel) { if(!clReleaseKernel_ptr) clReleaseKernel_ptr = getFunction("clReleaseKernel"); return (*clReleaseKernel_ptr)(kernel); } -static cl_int (CL_API_CALL *clSetKernelArg_ptr)(cl_kernel, cl_uint, size_t, const void *) = NULL; +static cl_int (*clSetKernelArg_ptr)(cl_kernel, cl_uint, size_t, const void *) = NULL; cl_int CL_API_CALL clSetKernelArg (cl_kernel kernel,cl_uint arg_index,size_t arg_size,const void * arg_value) { if(!clSetKernelArg_ptr) clSetKernelArg_ptr = getFunction("clSetKernelArg"); return (*clSetKernelArg_ptr)(kernel, arg_index, arg_size, arg_value); } -static cl_int (CL_API_CALL *clGetKernelInfo_ptr)(cl_kernel, cl_kernel_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetKernelInfo_ptr)(cl_kernel, cl_kernel_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetKernelInfo (cl_kernel kernel,cl_kernel_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetKernelInfo_ptr) clGetKernelInfo_ptr = getFunction("clGetKernelInfo"); return (*clGetKernelInfo_ptr)(kernel, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clGetKernelWorkGroupInfo_ptr)(cl_kernel, cl_device_id, cl_kernel_work_group_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetKernelArgInfo_ptr)(cl_kernel, cl_uint, cl_kernel_arg_info, size_t, void *, size_t *) = NULL; +cl_int CL_API_CALL clGetKernelArgInfo (cl_kernel kernel,cl_uint arg_indx,cl_kernel_arg_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { + if(!clGetKernelArgInfo_ptr) clGetKernelArgInfo_ptr = getFunction("clGetKernelArgInfo"); + return (*clGetKernelArgInfo_ptr)(kernel, arg_indx, param_name, param_value_size, param_value, param_value_size_ret); +} + +static cl_int (*clGetKernelWorkGroupInfo_ptr)(cl_kernel, cl_device_id, cl_kernel_work_group_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetKernelWorkGroupInfo (cl_kernel kernel,cl_device_id device,cl_kernel_work_group_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetKernelWorkGroupInfo_ptr) clGetKernelWorkGroupInfo_ptr = getFunction("clGetKernelWorkGroupInfo"); return (*clGetKernelWorkGroupInfo_ptr)(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clWaitForEvents_ptr)(cl_uint, const cl_event *) = NULL; +static cl_int (*clWaitForEvents_ptr)(cl_uint, const cl_event *) = NULL; cl_int CL_API_CALL clWaitForEvents (cl_uint num_events,const cl_event * event_list) { if(!clWaitForEvents_ptr) clWaitForEvents_ptr = getFunction("clWaitForEvents"); return (*clWaitForEvents_ptr)(num_events, event_list); } -static cl_int (CL_API_CALL *clGetEventInfo_ptr)(cl_event, cl_event_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetEventInfo_ptr)(cl_event, cl_event_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetEventInfo (cl_event event,cl_event_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetEventInfo_ptr) clGetEventInfo_ptr = getFunction("clGetEventInfo"); return (*clGetEventInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clRetainEvent_ptr)(cl_event) = NULL; -cl_int CL_API_CALL clRetainEvent (cl_event event) { +static cl_event (*clCreateUserEvent_ptr)(cl_context, cl_int * /* errcode_ret */) = NULL; +cl_event CL_API_CALL clCreateUserEvent (cl_context context,cl_int * errcode_ret) +{ + if(!clCreateUserEvent_ptr) clCreateUserEvent_ptr = getFunction("clCreateUserEvent"); + return (*clCreateUserEvent_ptr)(context,errcode_ret); +} + +static cl_int (*clRetainEvent_ptr)(cl_event) = NULL; +cl_int CL_API_CALL clRetainEvent(cl_event event) { if(!clRetainEvent_ptr) clRetainEvent_ptr = getFunction("clRetainEvent"); return (*clRetainEvent_ptr)(event); } -static cl_int (CL_API_CALL *clReleaseEvent_ptr)(cl_event) = NULL; +static cl_int (*clReleaseEvent_ptr)(cl_event) = NULL; cl_int CL_API_CALL clReleaseEvent (cl_event event) { if(!clReleaseEvent_ptr) clReleaseEvent_ptr = getFunction("clReleaseEvent"); return (*clReleaseEvent_ptr)(event); } -static cl_int (CL_API_CALL *clGetEventProfilingInfo_ptr)(cl_event, cl_profiling_info, size_t, void *, size_t *) = NULL; +static cl_int (*clSetUserEventStatus_ptr)(cl_event, cl_int) = NULL; +cl_int CL_API_CALL clSetUserEventStatus (cl_event event,cl_int execution_status) { + if(!clSetUserEventStatus_ptr) clSetUserEventStatus_ptr = getFunction("clSetUserEventStatus"); + return (*clSetUserEventStatus_ptr)(event, execution_status); +} + +static cl_int (*clSetEventCallback_ptr)(cl_event, cl_int, void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), void*) = NULL; +cl_int CL_API_CALL clSetEventCallback (cl_event event,cl_int command_exec_callback_type, void (CL_CALLBACK * pfn_notify)(cl_event, cl_int, void *), void* user_data) { + if(!clSetEventCallback_ptr) clSetEventCallback_ptr = getFunction("clSetEventCallback"); + return (*clSetEventCallback_ptr)(event, command_exec_callback_type, pfn_notify, user_data); +} + +static cl_int (*clGetEventProfilingInfo_ptr)(cl_event, cl_profiling_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetEventProfilingInfo (cl_event event,cl_profiling_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetEventProfilingInfo_ptr) clGetEventProfilingInfo_ptr = getFunction("clGetEventProfilingInfo"); return (*clGetEventProfilingInfo_ptr)(event, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clFlush_ptr)(cl_command_queue) = NULL; +static cl_int (*clFlush_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clFlush (cl_command_queue command_queue) { if(!clFlush_ptr) clFlush_ptr = getFunction("clFlush"); return (*clFlush_ptr)(command_queue); } -static cl_int (CL_API_CALL *clFinish_ptr)(cl_command_queue) = NULL; +static cl_int (*clFinish_ptr)(cl_command_queue) = NULL; cl_int CL_API_CALL clFinish (cl_command_queue command_queue) { if(!clFinish_ptr) clFinish_ptr = getFunction("clFinish"); return (*clFinish_ptr)(command_queue); } -static cl_int (CL_API_CALL *clEnqueueReadBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueReadBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,size_t offset,size_t cb,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueReadBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueReadBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,size_t offset,size_t size,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReadBuffer_ptr) clEnqueueReadBuffer_ptr = getFunction("clEnqueueReadBuffer"); - return (*clEnqueueReadBuffer_ptr)(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueReadBuffer_ptr)(command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueWriteBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueWriteBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,size_t offset,size_t cb,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueReadBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueReadBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_read,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueReadBufferRect_ptr) clEnqueueReadBufferRect_ptr = getFunction("clEnqueueReadBufferRect"); + return (*clEnqueueReadBufferRect_ptr)(command_queue, buffer, blocking_read, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueWriteBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueWriteBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,size_t offset,size_t size,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueWriteBuffer_ptr) clEnqueueWriteBuffer_ptr = getFunction("clEnqueueWriteBuffer"); - return (*clEnqueueWriteBuffer_ptr)(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueWriteBuffer_ptr)(command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueCopyBuffer (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t cb,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueWriteBufferRect_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueWriteBufferRect (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_write,const size_t * buffer_offset,const size_t * host_offset,const size_t * region,size_t buffer_row_pitch,size_t buffer_slice_pitch,size_t host_row_pitch,size_t host_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueWriteBufferRect_ptr) clEnqueueWriteBufferRect_ptr = getFunction("clEnqueueWriteBufferRect"); + return (*clEnqueueWriteBufferRect_ptr)(command_queue, buffer, blocking_write, buffer_offset, host_offset, region, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueFillBuffer_ptr)(cl_command_queue, cl_mem, const void *, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueFillBuffer (cl_command_queue command_queue,cl_mem buffer,const void * pattern,size_t pattern_size,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueFillBuffer_ptr) clEnqueueFillBuffer_ptr = getFunction("clEnqueueFillBuffer"); + return (*clEnqueueFillBuffer_ptr)(command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueCopyBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueCopyBuffer (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,size_t src_offset,size_t dst_offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyBuffer_ptr) clEnqueueCopyBuffer_ptr = getFunction("clEnqueueCopyBuffer"); - return (*clEnqueueCopyBuffer_ptr)(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); + return (*clEnqueueCopyBuffer_ptr)(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueReadImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyBufferRect_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, size_t, size_t, size_t, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueCopyBufferRect (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_buffer,const size_t * src_origin,const size_t * dst_origin,const size_t * region,size_t src_row_pitch,size_t src_slice_pitch,size_t dst_row_pitch,size_t dst_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueCopyBufferRect_ptr) clEnqueueCopyBufferRect_ptr = getFunction("clEnqueueCopyBufferRect"); + return (*clEnqueueCopyBufferRect_ptr)(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueReadImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueReadImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_read,const size_t * origin,const size_t * region,size_t row_pitch,size_t slice_pitch,void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReadImage_ptr) clEnqueueReadImage_ptr = getFunction("clEnqueueReadImage"); return (*clEnqueueReadImage_ptr)(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueWriteImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueWriteImage_ptr)(cl_command_queue, cl_mem, cl_bool, const size_t *, const size_t *, size_t, size_t, const void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueWriteImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_write,const size_t * origin,const size_t * region,size_t input_row_pitch,size_t input_slice_pitch,const void * ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueWriteImage_ptr) clEnqueueWriteImage_ptr = getFunction("clEnqueueWriteImage"); return (*clEnqueueWriteImage_ptr)(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyImage_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueFillImage_ptr)(cl_command_queue, cl_mem, const void *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueFillImage (cl_command_queue command_queue,cl_mem image,const void * fill_color,const size_t * origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueFillImage_ptr) clEnqueueFillImage_ptr = getFunction("clEnqueueFillImage"); + return (*clEnqueueFillImage_ptr)(command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueCopyImage_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyImage (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_image,const size_t * src_origin,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyImage_ptr) clEnqueueCopyImage_ptr = getFunction("clEnqueueCopyImage"); return (*clEnqueueCopyImage_ptr)(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyImageToBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, size_t, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyImageToBuffer_ptr)(cl_command_queue, cl_mem, cl_mem, const size_t *, const size_t *, size_t, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyImageToBuffer (cl_command_queue command_queue,cl_mem src_image,cl_mem dst_buffer,const size_t * src_origin,const size_t * region,size_t dst_offset,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyImageToBuffer_ptr) clEnqueueCopyImageToBuffer_ptr = getFunction("clEnqueueCopyImageToBuffer"); return (*clEnqueueCopyImageToBuffer_ptr)(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueCopyBufferToImage_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueCopyBufferToImage_ptr)(cl_command_queue, cl_mem, cl_mem, size_t, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueCopyBufferToImage (cl_command_queue command_queue,cl_mem src_buffer,cl_mem dst_image,size_t src_offset,const size_t * dst_origin,const size_t * region,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueCopyBufferToImage_ptr) clEnqueueCopyBufferToImage_ptr = getFunction("clEnqueueCopyBufferToImage"); return (*clEnqueueCopyBufferToImage_ptr)(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); } -static void * (CL_API_CALL *clEnqueueMapBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, size_t, size_t, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; -void * CL_API_CALL clEnqueueMapBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_map,cl_map_flags map_flags,size_t offset,size_t cb,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { +static void * (*clEnqueueMapBuffer_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, size_t, size_t, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; +void * CL_API_CALL clEnqueueMapBuffer (cl_command_queue command_queue,cl_mem buffer,cl_bool blocking_map,cl_map_flags map_flags,size_t offset,size_t size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { if(!clEnqueueMapBuffer_ptr) clEnqueueMapBuffer_ptr = getFunction("clEnqueueMapBuffer"); - return (*clEnqueueMapBuffer_ptr)(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); + return (*clEnqueueMapBuffer_ptr)(command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret); } -static void * (CL_API_CALL *clEnqueueMapImage_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, const size_t *, const size_t *, size_t *, size_t *, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; +static void * (*clEnqueueMapImage_ptr)(cl_command_queue, cl_mem, cl_bool, cl_map_flags, const size_t *, const size_t *, size_t *, size_t *, cl_uint, const cl_event *, cl_event *, cl_int *) = NULL; void * CL_API_CALL clEnqueueMapImage (cl_command_queue command_queue,cl_mem image,cl_bool blocking_map,cl_map_flags map_flags,const size_t * origin,const size_t * region,size_t * image_row_pitch,size_t * image_slice_pitch,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event,cl_int * errcode_ret) { if(!clEnqueueMapImage_ptr) clEnqueueMapImage_ptr = getFunction("clEnqueueMapImage"); return (*clEnqueueMapImage_ptr)(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); } -static cl_int (CL_API_CALL *clEnqueueUnmapMemObject_ptr)(cl_command_queue, cl_mem, void *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueUnmapMemObject_ptr)(cl_command_queue, cl_mem, void *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueUnmapMemObject (cl_command_queue command_queue,cl_mem memobj,void * mapped_ptr,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueUnmapMemObject_ptr) clEnqueueUnmapMemObject_ptr = getFunction("clEnqueueUnmapMemObject"); return (*clEnqueueUnmapMemObject_ptr)(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueNDRangeKernel_ptr)(cl_command_queue, cl_kernel, cl_uint, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueMigrateMemObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_mem_migration_flags, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueMigrateMemObjects (cl_command_queue command_queue,cl_uint num_mem_objects,const cl_mem * mem_objects,cl_mem_migration_flags flags,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueMigrateMemObjects_ptr) clEnqueueMigrateMemObjects_ptr = getFunction("clEnqueueMigrateMemObjects"); + return (*clEnqueueMigrateMemObjects_ptr)(command_queue, num_mem_objects, mem_objects, flags, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueNDRangeKernel_ptr)(cl_command_queue, cl_kernel, cl_uint, const size_t *, const size_t *, const size_t *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueNDRangeKernel (cl_command_queue command_queue,cl_kernel kernel,cl_uint work_dim,const size_t * global_work_offset,const size_t * global_work_size,const size_t * local_work_size,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueNDRangeKernel_ptr) clEnqueueNDRangeKernel_ptr = getFunction("clEnqueueNDRangeKernel"); return (*clEnqueueNDRangeKernel_ptr)(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueTask_ptr)(cl_command_queue, cl_kernel, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueTask_ptr)(cl_command_queue, cl_kernel, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueTask (cl_command_queue command_queue,cl_kernel kernel,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueTask_ptr) clEnqueueTask_ptr = getFunction("clEnqueueTask"); return (*clEnqueueTask_ptr)(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueNativeKernel_ptr)(cl_command_queue, void (*)(void *), void *, size_t, cl_uint, const cl_mem *, const void **, cl_uint, const cl_event *, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueNativeKernel (cl_command_queue command_queue,void (*user_func)(void *),void * args,size_t cb_args,cl_uint num_mem_objects,const cl_mem * mem_list,const void ** args_mem_loc,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { +static cl_int (*clEnqueueNativeKernel_ptr)(cl_command_queue, void (CL_CALLBACK * /*user_func*/)(void *), void *, size_t, cl_uint, const cl_mem *, const void **, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueNativeKernel (cl_command_queue command_queue,void (CL_CALLBACK *user_func)(void *) ,void * args,size_t cb_args,cl_uint num_mem_objects,const cl_mem * mem_list,const void ** args_mem_loc,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueNativeKernel_ptr) clEnqueueNativeKernel_ptr = getFunction("clEnqueueNativeKernel"); return (*clEnqueueNativeKernel_ptr)(command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueMarker_ptr)(cl_command_queue, cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueMarker (cl_command_queue command_queue,cl_event * event) { +static cl_int (*clEnqueueMarkerWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueMarkerWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueMarkerWithWaitList_ptr) clEnqueueMarkerWithWaitList_ptr = getFunction("clEnqueueMarkerWithWaitList"); + return (*clEnqueueMarkerWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event); +} + +static cl_int (*clEnqueueBarrierWithWaitList_ptr)(cl_command_queue, cl_uint, const cl_event *, cl_event *) = NULL; +cl_int CL_API_CALL clEnqueueBarrierWithWaitList (cl_command_queue command_queue,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { + if(!clEnqueueBarrierWithWaitList_ptr) clEnqueueBarrierWithWaitList_ptr = getFunction("clEnqueueBarrierWithWaitList"); + return (*clEnqueueBarrierWithWaitList_ptr)(command_queue, num_events_in_wait_list, event_wait_list, event); +} + +static void * (*clGetExtensionFunctionAddressForPlatform_ptr)(cl_platform_id, const char *) = NULL; +void * CL_API_CALL clGetExtensionFunctionAddressForPlatform (cl_platform_id platform,const char * func_name) { + if(!clGetExtensionFunctionAddressForPlatform_ptr) clGetExtensionFunctionAddressForPlatform_ptr = getFunction("clGetExtensionFunctionAddressForPlatform"); + return (*clGetExtensionFunctionAddressForPlatform_ptr)(platform, func_name); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage2D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, void *, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage2D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_row_pitch,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage2D_ptr) clCreateImage2D_ptr = getFunction("clCreateImage2D"); + return (*clCreateImage2D_ptr)(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateImage3D_ptr)(cl_context, cl_mem_flags, const cl_image_format *, size_t, size_t, size_t, size_t, size_t, void *, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateImage3D (cl_context context,cl_mem_flags flags,const cl_image_format * image_format,size_t image_width,size_t image_height,size_t image_depth,size_t image_row_pitch,size_t image_slice_pitch,void * host_ptr,cl_int * errcode_ret) { + if(!clCreateImage3D_ptr) clCreateImage3D_ptr = getFunction("clCreateImage3D"); + return (*clCreateImage3D_ptr)(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueMarker_ptr)(cl_command_queue, cl_event *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueMarker (cl_command_queue command_queue,cl_event * event) { if(!clEnqueueMarker_ptr) clEnqueueMarker_ptr = getFunction("clEnqueueMarker"); return (*clEnqueueMarker_ptr)(command_queue, event); } -static cl_int (CL_API_CALL *clEnqueueWaitForEvents_ptr)(cl_command_queue, cl_uint, const cl_event *) = NULL; -cl_int CL_API_CALL clEnqueueWaitForEvents (cl_command_queue command_queue,cl_uint num_events,const cl_event * event_list) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueWaitForEvents_ptr)(cl_command_queue, cl_uint, const cl_event *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueWaitForEvents (cl_command_queue command_queue,cl_uint num_events,const cl_event * event_list) { if(!clEnqueueWaitForEvents_ptr) clEnqueueWaitForEvents_ptr = getFunction("clEnqueueWaitForEvents"); return (*clEnqueueWaitForEvents_ptr)(command_queue, num_events, event_list); } -static cl_int (CL_API_CALL *clEnqueueBarrier_ptr)(cl_command_queue) = NULL; -cl_int CL_API_CALL clEnqueueBarrier (cl_command_queue command_queue) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clEnqueueBarrier_ptr)(cl_command_queue) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clEnqueueBarrier (cl_command_queue command_queue) { if(!clEnqueueBarrier_ptr) clEnqueueBarrier_ptr = getFunction("clEnqueueBarrier"); return (*clEnqueueBarrier_ptr)(command_queue); } -static void * (CL_API_CALL *clGetExtensionFunctionAddress_ptr)(const char *) = NULL; -void * CL_API_CALL clGetExtensionFunctionAddress (const char * func_name) { +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int (*clUnloadCompiler_ptr)(void) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL clUnloadCompiler (void) { + if(!clUnloadCompiler_ptr) clUnloadCompiler_ptr = getFunction("clUnloadCompiler"); + return (*clUnloadCompiler_ptr)(); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * (*clGetExtensionFunctionAddress_ptr)(const char *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL clGetExtensionFunctionAddress (const char * func_name) { if(!clGetExtensionFunctionAddress_ptr) clGetExtensionFunctionAddress_ptr = getFunction("clGetExtensionFunctionAddress"); return (*clGetExtensionFunctionAddress_ptr)(func_name); } diff --git a/Externals/CLRun/clrun/genclext.c b/Externals/CLRun/clrun/genclext.c new file mode 100644 index 0000000000..e6a73afabf --- /dev/null +++ b/Externals/CLRun/clrun/genclext.c @@ -0,0 +1,28 @@ +// Automatically generated by generateClRun.pl +#include "dynamiclib.h" +#include "../include/CL/cl_ext.h" + + +static cl_int (*clIcdGetPlatformIDsKHR_ptr)(cl_uint, cl_platform_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clIcdGetPlatformIDsKHR (cl_uint num_entries,cl_platform_id * platforms,cl_uint * num_platforms) { + if(!clIcdGetPlatformIDsKHR_ptr) clIcdGetPlatformIDsKHR_ptr = getFunction("clIcdGetPlatformIDsKHR"); + return (*clIcdGetPlatformIDsKHR_ptr)(num_entries, platforms, num_platforms); +} +static cl_int (* clReleaseDeviceEXT_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clReleaseDeviceEXT (cl_device_id device) { + if(! clReleaseDeviceEXT_ptr) clReleaseDeviceEXT_ptr = getFunction(" clReleaseDeviceEXT"); + return (* clReleaseDeviceEXT_ptr)(device); +} + +static cl_int (* clRetainDeviceEXT_ptr)(cl_device_id) = NULL; +cl_int CL_API_CALL clRetainDeviceEXT (cl_device_id device) { + if(! clRetainDeviceEXT_ptr) clRetainDeviceEXT_ptr = getFunction(" clRetainDeviceEXT"); + return (* clRetainDeviceEXT_ptr)(device); +} + +static cl_int (* clCreateSubDevicesEXT_ptr)(cl_device_id, const cl_device_partition_property_ext *, cl_uint, cl_device_id *, cl_uint *) = NULL; +cl_int CL_API_CALL clCreateSubDevicesEXT (cl_device_id in_device,const cl_device_partition_property_ext * properties,cl_uint num_entries,cl_device_id * out_devices,cl_uint * num_devices) { + if(! clCreateSubDevicesEXT_ptr) clCreateSubDevicesEXT_ptr = getFunction(" clCreateSubDevicesEXT"); + return (* clCreateSubDevicesEXT_ptr)(in_device, properties, num_entries, out_devices, num_devices); +} + diff --git a/Externals/CLRun/clrun/genclgl.c b/Externals/CLRun/clrun/genclgl.c index cc83a8a7ff..acb06a1ff7 100644 --- a/Externals/CLRun/clrun/genclgl.c +++ b/Externals/CLRun/clrun/genclgl.c @@ -3,55 +3,61 @@ #include "../include/CL/cl_gl.h" -static cl_mem (CL_API_CALL *clCreateFromGLBuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, int *) = NULL; +static cl_mem (*clCreateFromGLBuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, int *) = NULL; cl_mem CL_API_CALL clCreateFromGLBuffer (cl_context context,cl_mem_flags flags,cl_GLuint bufobj,int * errcode_ret) { if(!clCreateFromGLBuffer_ptr) clCreateFromGLBuffer_ptr = getFunction("clCreateFromGLBuffer"); - return (*clCreateFromGLBuffer_ptr)(context, flags, bufobj, errcode_ret ); + return (*clCreateFromGLBuffer_ptr)(context, flags, bufobj, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateFromGLTexture2D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateFromGLTexture2D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { - if(!clCreateFromGLTexture2D_ptr) clCreateFromGLTexture2D_ptr = getFunction("clCreateFromGLTexture2D"); - return (*clCreateFromGLTexture2D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +static cl_mem (*clCreateFromGLTexture_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +cl_mem CL_API_CALL clCreateFromGLTexture (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture_ptr) clCreateFromGLTexture_ptr = getFunction("clCreateFromGLTexture"); + return (*clCreateFromGLTexture_ptr)(context, flags, target, miplevel, texture, errcode_ret); } -static cl_mem (CL_API_CALL *clCreateFromGLTexture3D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; -cl_mem CL_API_CALL clCreateFromGLTexture3D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { - if(!clCreateFromGLTexture3D_ptr) clCreateFromGLTexture3D_ptr = getFunction("clCreateFromGLTexture3D"); - return (*clCreateFromGLTexture3D_ptr)(context, flags, target, miplevel, texture, errcode_ret); -} - -static cl_mem (CL_API_CALL *clCreateFromGLRenderbuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, cl_int *) = NULL; +static cl_mem (*clCreateFromGLRenderbuffer_ptr)(cl_context, cl_mem_flags, cl_GLuint, cl_int *) = NULL; cl_mem CL_API_CALL clCreateFromGLRenderbuffer (cl_context context,cl_mem_flags flags,cl_GLuint renderbuffer,cl_int * errcode_ret) { if(!clCreateFromGLRenderbuffer_ptr) clCreateFromGLRenderbuffer_ptr = getFunction("clCreateFromGLRenderbuffer"); return (*clCreateFromGLRenderbuffer_ptr)(context, flags, renderbuffer, errcode_ret); } -static cl_int (CL_API_CALL *clGetGLObjectInfo_ptr)(cl_mem, cl_gl_object_type *, cl_GLuint *) = NULL; +static cl_int (*clGetGLObjectInfo_ptr)(cl_mem, cl_gl_object_type *, cl_GLuint *) = NULL; cl_int CL_API_CALL clGetGLObjectInfo (cl_mem memobj,cl_gl_object_type * gl_object_type,cl_GLuint * gl_object_name) { if(!clGetGLObjectInfo_ptr) clGetGLObjectInfo_ptr = getFunction("clGetGLObjectInfo"); return (*clGetGLObjectInfo_ptr)(memobj, gl_object_type, gl_object_name); } -static cl_int (CL_API_CALL *clGetGLTextureInfo_ptr)(cl_mem, cl_gl_texture_info, size_t, void *, size_t *) = NULL; +static cl_int (*clGetGLTextureInfo_ptr)(cl_mem, cl_gl_texture_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetGLTextureInfo (cl_mem memobj,cl_gl_texture_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetGLTextureInfo_ptr) clGetGLTextureInfo_ptr = getFunction("clGetGLTextureInfo"); return (*clGetGLTextureInfo_ptr)(memobj, param_name, param_value_size, param_value, param_value_size_ret); } -static cl_int (CL_API_CALL *clEnqueueAcquireGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueAcquireGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueAcquireGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueAcquireGLObjects_ptr) clEnqueueAcquireGLObjects_ptr = getFunction("clEnqueueAcquireGLObjects"); return (*clEnqueueAcquireGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clEnqueueReleaseGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; +static cl_int (*clEnqueueReleaseGLObjects_ptr)(cl_command_queue, cl_uint, const cl_mem *, cl_uint, const cl_event *, cl_event *) = NULL; cl_int CL_API_CALL clEnqueueReleaseGLObjects (cl_command_queue command_queue,cl_uint num_objects,const cl_mem * mem_objects,cl_uint num_events_in_wait_list,const cl_event * event_wait_list,cl_event * event) { if(!clEnqueueReleaseGLObjects_ptr) clEnqueueReleaseGLObjects_ptr = getFunction("clEnqueueReleaseGLObjects"); return (*clEnqueueReleaseGLObjects_ptr)(command_queue, num_objects, mem_objects, num_events_in_wait_list, event_wait_list, event); } -static cl_int (CL_API_CALL *clGetGLContextInfoKHR_ptr)(const cl_context_properties *, cl_gl_context_info, size_t, void *, size_t *) = NULL; +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture2D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture2D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture2D_ptr) clCreateFromGLTexture2D_ptr = getFunction("clCreateFromGLTexture2D"); + return (*clCreateFromGLTexture2D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +} + +static CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem (*clCreateFromGLTexture3D_ptr)(cl_context, cl_mem_flags, cl_GLenum, cl_GLint, cl_GLuint, cl_int *) = NULL; +CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL clCreateFromGLTexture3D (cl_context context,cl_mem_flags flags,cl_GLenum target,cl_GLint miplevel,cl_GLuint texture,cl_int * errcode_ret) { + if(!clCreateFromGLTexture3D_ptr) clCreateFromGLTexture3D_ptr = getFunction("clCreateFromGLTexture3D"); + return (*clCreateFromGLTexture3D_ptr)(context, flags, target, miplevel, texture, errcode_ret); +} + +static cl_int (*clGetGLContextInfoKHR_ptr)(const cl_context_properties *, cl_gl_context_info, size_t, void *, size_t *) = NULL; cl_int CL_API_CALL clGetGLContextInfoKHR (const cl_context_properties * properties,cl_gl_context_info param_name,size_t param_value_size,void * param_value,size_t * param_value_size_ret) { if(!clGetGLContextInfoKHR_ptr) clGetGLContextInfoKHR_ptr = getFunction("clGetGLContextInfoKHR"); return (*clGetGLContextInfoKHR_ptr)(properties, param_name, param_value_size, param_value, param_value_size_ret); diff --git a/Externals/CLRun/clrun/genclglext.c b/Externals/CLRun/clrun/genclglext.c new file mode 100644 index 0000000000..333103ea85 --- /dev/null +++ b/Externals/CLRun/clrun/genclglext.c @@ -0,0 +1,11 @@ +// Automatically generated by generateClRun.pl +#include "dynamiclib.h" +#include "../include/CL/cl_gl_ext.h" + + +static cl_event (*clCreateEventFromGLsyncKHR_ptr)(cl_context, cl_GLsync, cl_int *) = NULL; +cl_event CL_API_CALL clCreateEventFromGLsyncKHR (cl_context context,cl_GLsync cl_GLsync,cl_int * errcode_ret) { + if(!clCreateEventFromGLsyncKHR_ptr) clCreateEventFromGLsyncKHR_ptr = getFunction("clCreateEventFromGLsyncKHR"); + return (*clCreateEventFromGLsyncKHR_ptr)(context, cl_GLsync, errcode_ret); +} + diff --git a/Externals/CLRun/clrun/generateClRun.pl b/Externals/CLRun/clrun/generateClRun.pl old mode 100644 new mode 100755 diff --git a/Externals/CLRun/include/CL/cl.h b/Externals/CLRun/include/CL/cl.h index 6e9a72c776..203c65974f 100644 --- a/Externals/CLRun/include/CL/cl.h +++ b/Externals/CLRun/include/CL/cl.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008 - 2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,8 +21,6 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. ******************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ - #ifndef __OPENCL_CL_H #define __OPENCL_CL_H @@ -53,14 +51,15 @@ typedef cl_ulong cl_bitfield; typedef cl_bitfield cl_device_type; typedef cl_uint cl_platform_info; typedef cl_uint cl_device_info; -typedef cl_bitfield cl_device_address_info; typedef cl_bitfield cl_device_fp_config; typedef cl_uint cl_device_mem_cache_type; typedef cl_uint cl_device_local_mem_type; typedef cl_bitfield cl_device_exec_capabilities; typedef cl_bitfield cl_command_queue_properties; +typedef intptr_t cl_device_partition_property; +typedef cl_bitfield cl_device_affinity_domain; -typedef intptr_t cl_context_properties; +typedef intptr_t cl_context_properties; typedef cl_uint cl_context_info; typedef cl_uint cl_command_queue_info; typedef cl_uint cl_channel_order; @@ -68,25 +67,50 @@ typedef cl_uint cl_channel_type; typedef cl_bitfield cl_mem_flags; typedef cl_uint cl_mem_object_type; typedef cl_uint cl_mem_info; +typedef cl_bitfield cl_mem_migration_flags; typedef cl_uint cl_image_info; +typedef cl_uint cl_buffer_create_type; typedef cl_uint cl_addressing_mode; typedef cl_uint cl_filter_mode; typedef cl_uint cl_sampler_info; typedef cl_bitfield cl_map_flags; typedef cl_uint cl_program_info; typedef cl_uint cl_program_build_info; +typedef cl_uint cl_program_binary_type; typedef cl_int cl_build_status; typedef cl_uint cl_kernel_info; +typedef cl_uint cl_kernel_arg_info; +typedef cl_uint cl_kernel_arg_address_qualifier; +typedef cl_uint cl_kernel_arg_access_qualifier; +typedef cl_bitfield cl_kernel_arg_type_qualifier; typedef cl_uint cl_kernel_work_group_info; typedef cl_uint cl_event_info; typedef cl_uint cl_command_type; typedef cl_uint cl_profiling_info; + typedef struct _cl_image_format { cl_channel_order image_channel_order; cl_channel_type image_channel_data_type; } cl_image_format; +typedef struct _cl_image_desc { + cl_mem_object_type image_type; + size_t image_width; + size_t image_height; + size_t image_depth; + size_t image_array_size; + size_t image_row_pitch; + size_t image_slice_pitch; + cl_uint num_mip_levels; + cl_uint num_samples; + cl_mem buffer; +} cl_image_desc; + +typedef struct _cl_buffer_region { + size_t origin; + size_t size; +} cl_buffer_region; /******************************************************************************/ @@ -105,6 +129,13 @@ typedef struct _cl_image_format { #define CL_IMAGE_FORMAT_NOT_SUPPORTED -10 #define CL_BUILD_PROGRAM_FAILURE -11 #define CL_MAP_FAILURE -12 +#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13 +#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14 +#define CL_COMPILE_PROGRAM_FAILURE -15 +#define CL_LINKER_NOT_AVAILABLE -16 +#define CL_LINK_PROGRAM_FAILURE -17 +#define CL_DEVICE_PARTITION_FAILED -18 +#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE -19 #define CL_INVALID_VALUE -30 #define CL_INVALID_DEVICE_TYPE -31 @@ -140,13 +171,22 @@ typedef struct _cl_image_format { #define CL_INVALID_BUFFER_SIZE -61 #define CL_INVALID_MIP_LEVEL -62 #define CL_INVALID_GLOBAL_WORK_SIZE -63 +#define CL_INVALID_PROPERTY -64 +#define CL_INVALID_IMAGE_DESCRIPTOR -65 +#define CL_INVALID_COMPILER_OPTIONS -66 +#define CL_INVALID_LINKER_OPTIONS -67 +#define CL_INVALID_DEVICE_PARTITION_COUNT -68 /* OpenCL Version */ #define CL_VERSION_1_0 1 +#define CL_VERSION_1_1 1 +#define CL_VERSION_1_2 1 /* cl_bool */ #define CL_FALSE 0 #define CL_TRUE 1 +#define CL_BLOCKING CL_TRUE +#define CL_NON_BLOCKING CL_FALSE /* cl_platform_info */ #define CL_PLATFORM_PROFILE 0x0900 @@ -160,6 +200,7 @@ typedef struct _cl_image_format { #define CL_DEVICE_TYPE_CPU (1 << 1) #define CL_DEVICE_TYPE_GPU (1 << 2) #define CL_DEVICE_TYPE_ACCELERATOR (1 << 3) +#define CL_DEVICE_TYPE_CUSTOM (1 << 4) #define CL_DEVICE_TYPE_ALL 0xFFFFFFFF /* cl_device_info */ @@ -213,8 +254,32 @@ typedef struct _cl_image_format { #define CL_DEVICE_VERSION 0x102F #define CL_DEVICE_EXTENSIONS 0x1030 #define CL_DEVICE_PLATFORM 0x1031 -/* 0x1032 reserved for CL_DEVICE_DOUBLE_FP_CONFIG */ +#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032 /* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */ +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034 +#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C +#define CL_DEVICE_OPENCL_C_VERSION 0x103D +#define CL_DEVICE_LINKER_AVAILABLE 0x103E +#define CL_DEVICE_BUILT_IN_KERNELS 0x103F +#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE 0x1040 +#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE 0x1041 +#define CL_DEVICE_PARENT_DEVICE 0x1042 +#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES 0x1043 +#define CL_DEVICE_PARTITION_PROPERTIES 0x1044 +#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN 0x1045 +#define CL_DEVICE_PARTITION_TYPE 0x1046 +#define CL_DEVICE_REFERENCE_COUNT 0x1047 +#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC 0x1048 +#define CL_DEVICE_PRINTF_BUFFER_SIZE 0x1049 +#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT 0x104A +#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT 0x104B /* cl_device_fp_config - bitfield */ #define CL_FP_DENORM (1 << 0) @@ -223,6 +288,8 @@ typedef struct _cl_image_format { #define CL_FP_ROUND_TO_ZERO (1 << 3) #define CL_FP_ROUND_TO_INF (1 << 4) #define CL_FP_FMA (1 << 5) +#define CL_FP_SOFT_FLOAT (1 << 6) +#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT (1 << 7) /* cl_device_mem_cache_type */ #define CL_NONE 0x0 @@ -245,9 +312,25 @@ typedef struct _cl_image_format { #define CL_CONTEXT_REFERENCE_COUNT 0x1080 #define CL_CONTEXT_DEVICES 0x1081 #define CL_CONTEXT_PROPERTIES 0x1082 +#define CL_CONTEXT_NUM_DEVICES 0x1083 -/* cl_context_info + cl_context_properties */ +/* cl_context_properties */ #define CL_CONTEXT_PLATFORM 0x1084 +#define CL_CONTEXT_INTEROP_USER_SYNC 0x1085 + +/* cl_device_partition_property */ +#define CL_DEVICE_PARTITION_EQUALLY 0x1086 +#define CL_DEVICE_PARTITION_BY_COUNTS 0x1087 +#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END 0x0 +#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN 0x1088 + +/* cl_device_affinity_domain */ +#define CL_DEVICE_AFFINITY_DOMAIN_NUMA (1 << 0) +#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE (1 << 1) +#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE (1 << 2) +#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE (1 << 3) +#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE (1 << 4) +#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE (1 << 5) /* cl_command_queue_info */ #define CL_QUEUE_CONTEXT 0x1090 @@ -262,6 +345,14 @@ typedef struct _cl_image_format { #define CL_MEM_USE_HOST_PTR (1 << 3) #define CL_MEM_ALLOC_HOST_PTR (1 << 4) #define CL_MEM_COPY_HOST_PTR (1 << 5) +// reserved (1 << 6) +#define CL_MEM_HOST_WRITE_ONLY (1 << 7) +#define CL_MEM_HOST_READ_ONLY (1 << 8) +#define CL_MEM_HOST_NO_ACCESS (1 << 9) + +/* cl_mem_migration_flags - bitfield */ +#define CL_MIGRATE_MEM_OBJECT_HOST (1 << 0) +#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED (1 << 1) /* cl_channel_order */ #define CL_R 0x10B0 @@ -274,6 +365,11 @@ typedef struct _cl_image_format { #define CL_ARGB 0x10B7 #define CL_INTENSITY 0x10B8 #define CL_LUMINANCE 0x10B9 +#define CL_Rx 0x10BA +#define CL_RGx 0x10BB +#define CL_RGBx 0x10BC +#define CL_DEPTH 0x10BD +#define CL_DEPTH_STENCIL 0x10BE /* cl_channel_type */ #define CL_SNORM_INT8 0x10D0 @@ -291,11 +387,16 @@ typedef struct _cl_image_format { #define CL_UNSIGNED_INT32 0x10DC #define CL_HALF_FLOAT 0x10DD #define CL_FLOAT 0x10DE +#define CL_UNORM_INT24 0x10DF /* cl_mem_object_type */ #define CL_MEM_OBJECT_BUFFER 0x10F0 #define CL_MEM_OBJECT_IMAGE2D 0x10F1 #define CL_MEM_OBJECT_IMAGE3D 0x10F2 +#define CL_MEM_OBJECT_IMAGE2D_ARRAY 0x10F3 +#define CL_MEM_OBJECT_IMAGE1D 0x10F4 +#define CL_MEM_OBJECT_IMAGE1D_ARRAY 0x10F5 +#define CL_MEM_OBJECT_IMAGE1D_BUFFER 0x10F6 /* cl_mem_info */ #define CL_MEM_TYPE 0x1100 @@ -305,6 +406,8 @@ typedef struct _cl_image_format { #define CL_MEM_MAP_COUNT 0x1104 #define CL_MEM_REFERENCE_COUNT 0x1105 #define CL_MEM_CONTEXT 0x1106 +#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107 +#define CL_MEM_OFFSET 0x1108 /* cl_image_info */ #define CL_IMAGE_FORMAT 0x1110 @@ -314,12 +417,17 @@ typedef struct _cl_image_format { #define CL_IMAGE_WIDTH 0x1114 #define CL_IMAGE_HEIGHT 0x1115 #define CL_IMAGE_DEPTH 0x1116 +#define CL_IMAGE_ARRAY_SIZE 0x1117 +#define CL_IMAGE_BUFFER 0x1118 +#define CL_IMAGE_NUM_MIP_LEVELS 0x1119 +#define CL_IMAGE_NUM_SAMPLES 0x111A /* cl_addressing_mode */ #define CL_ADDRESS_NONE 0x1130 #define CL_ADDRESS_CLAMP_TO_EDGE 0x1131 #define CL_ADDRESS_CLAMP 0x1132 #define CL_ADDRESS_REPEAT 0x1133 +#define CL_ADDRESS_MIRRORED_REPEAT 0x1134 /* cl_filter_mode */ #define CL_FILTER_NEAREST 0x1140 @@ -335,6 +443,7 @@ typedef struct _cl_image_format { /* cl_map_flags - bitfield */ #define CL_MAP_READ (1 << 0) #define CL_MAP_WRITE (1 << 1) +#define CL_MAP_WRITE_INVALIDATE_REGION (1 << 2) /* cl_program_info */ #define CL_PROGRAM_REFERENCE_COUNT 0x1160 @@ -344,11 +453,20 @@ typedef struct _cl_image_format { #define CL_PROGRAM_SOURCE 0x1164 #define CL_PROGRAM_BINARY_SIZES 0x1165 #define CL_PROGRAM_BINARIES 0x1166 +#define CL_PROGRAM_NUM_KERNELS 0x1167 +#define CL_PROGRAM_KERNEL_NAMES 0x1168 /* cl_program_build_info */ #define CL_PROGRAM_BUILD_STATUS 0x1181 #define CL_PROGRAM_BUILD_OPTIONS 0x1182 #define CL_PROGRAM_BUILD_LOG 0x1183 +#define CL_PROGRAM_BINARY_TYPE 0x1184 + +/* cl_program_binary_type */ +#define CL_PROGRAM_BINARY_TYPE_NONE 0x0 +#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT 0x1 +#define CL_PROGRAM_BINARY_TYPE_LIBRARY 0x2 +#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE 0x4 /* cl_build_status */ #define CL_BUILD_SUCCESS 0 @@ -362,17 +480,47 @@ typedef struct _cl_image_format { #define CL_KERNEL_REFERENCE_COUNT 0x1192 #define CL_KERNEL_CONTEXT 0x1193 #define CL_KERNEL_PROGRAM 0x1194 +#define CL_KERNEL_ATTRIBUTES 0x1195 + +/* cl_kernel_arg_info */ +#define CL_KERNEL_ARG_ADDRESS_QUALIFIER 0x1196 +#define CL_KERNEL_ARG_ACCESS_QUALIFIER 0x1197 +#define CL_KERNEL_ARG_TYPE_NAME 0x1198 +#define CL_KERNEL_ARG_TYPE_QUALIFIER 0x1199 +#define CL_KERNEL_ARG_NAME 0x119A + +/* cl_kernel_arg_address_qualifier */ +#define CL_KERNEL_ARG_ADDRESS_GLOBAL 0x119B +#define CL_KERNEL_ARG_ADDRESS_LOCAL 0x119C +#define CL_KERNEL_ARG_ADDRESS_CONSTANT 0x119D +#define CL_KERNEL_ARG_ADDRESS_PRIVATE 0x119E + +/* cl_kernel_arg_access_qualifier */ +#define CL_KERNEL_ARG_ACCESS_READ_ONLY 0x11A0 +#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY 0x11A1 +#define CL_KERNEL_ARG_ACCESS_READ_WRITE 0x11A2 +#define CL_KERNEL_ARG_ACCESS_NONE 0x11A3 + +/* cl_kernel_arg_type_qualifer */ +#define CL_KERNEL_ARG_TYPE_NONE 0 +#define CL_KERNEL_ARG_TYPE_CONST (1 << 0) +#define CL_KERNEL_ARG_TYPE_RESTRICT (1 << 1) +#define CL_KERNEL_ARG_TYPE_VOLATILE (1 << 2) /* cl_kernel_work_group_info */ #define CL_KERNEL_WORK_GROUP_SIZE 0x11B0 #define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1 #define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2 +#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3 +#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4 +#define CL_KERNEL_GLOBAL_WORK_SIZE 0x11B5 /* cl_event_info */ #define CL_EVENT_COMMAND_QUEUE 0x11D0 #define CL_EVENT_COMMAND_TYPE 0x11D1 #define CL_EVENT_REFERENCE_COUNT 0x11D2 #define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3 +#define CL_EVENT_CONTEXT 0x11D4 /* cl_command_type */ #define CL_COMMAND_NDRANGE_KERNEL 0x11F0 @@ -392,13 +540,24 @@ typedef struct _cl_image_format { #define CL_COMMAND_MARKER 0x11FE #define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF #define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200 +#define CL_COMMAND_READ_BUFFER_RECT 0x1201 +#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202 +#define CL_COMMAND_COPY_BUFFER_RECT 0x1203 +#define CL_COMMAND_USER 0x1204 +#define CL_COMMAND_BARRIER 0x1205 +#define CL_COMMAND_MIGRATE_MEM_OBJECTS 0x1206 +#define CL_COMMAND_FILL_BUFFER 0x1207 +#define CL_COMMAND_FILL_IMAGE 0x1208 /* command execution status */ #define CL_COMPLETE 0x0 #define CL_RUNNING 0x1 #define CL_SUBMITTED 0x2 #define CL_QUEUED 0x3 - + +/* cl_buffer_create_type */ +#define CL_BUFFER_CREATE_TYPE_REGION 0x1220 + /* cl_profiling_info */ #define CL_PROFILING_COMMAND_QUEUED 0x1280 #define CL_PROFILING_COMMAND_SUBMIT 0x1281 @@ -434,22 +593,35 @@ clGetDeviceInfo(cl_device_id /* device */, size_t /* param_value_size */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +extern CL_API_ENTRY cl_int CL_API_CALL +clCreateSubDevices(cl_device_id /* in_device */, + const cl_device_partition_property * /* properties */, + cl_uint /* num_devices */, + cl_device_id * /* out_devices */, + cl_uint * /* num_devices_ret */) CL_API_SUFFIX__VERSION_1_2; +extern CL_API_ENTRY cl_int CL_API_CALL +clRetainDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_int CL_API_CALL +clReleaseDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2; + /* Context APIs */ extern CL_API_ENTRY cl_context CL_API_CALL clCreateContext(const cl_context_properties * /* properties */, - cl_uint /* num_devices */, - const cl_device_id * /* devices */, + cl_uint /* num_devices */, + const cl_device_id * /* devices */, void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * /* properties */, - cl_device_type /* device_type */, + cl_device_type /* device_type */, void (CL_CALLBACK * /* pfn_notify*/ )(const char *, const void *, size_t, void *), - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; @@ -484,13 +656,7 @@ clGetCommandQueueInfo(cl_command_queue /* command_queue */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -extern CL_API_ENTRY cl_int CL_API_CALL -clSetCommandQueueProperty(cl_command_queue /* command_queue */, - cl_command_queue_properties /* properties */, - cl_bool /* enable */, - cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0; - -/* Memory Object APIs */ +/* Memory Object APIs */ extern CL_API_ENTRY cl_mem CL_API_CALL clCreateBuffer(cl_context /* context */, cl_mem_flags /* flags */, @@ -499,26 +665,19 @@ clCreateBuffer(cl_context /* context */, cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage2D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_row_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - +clCreateSubBuffer(cl_mem /* buffer */, + cl_mem_flags /* flags */, + cl_buffer_create_type /* buffer_create_type */, + const void * /* buffer_create_info */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage3D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_depth */, - size_t /* image_row_pitch */, - size_t /* image_slice_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; +clCreateImage(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + const cl_image_desc * /* image_desc */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; @@ -548,7 +707,12 @@ clGetImageInfo(cl_mem /* image */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -/* Sampler APIs */ +extern CL_API_ENTRY cl_int CL_API_CALL +clSetMemObjectDestructorCallback( cl_mem /* memobj */, + void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), + void * /*user_data */ ) CL_API_SUFFIX__VERSION_1_1; + +/* Sampler APIs */ extern CL_API_ENTRY cl_sampler CL_API_CALL clCreateSampler(cl_context /* context */, cl_bool /* normalized_coords */, @@ -586,6 +750,13 @@ clCreateProgramWithBinary(cl_context /* context */, cl_int * /* binary_status */, cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_program CL_API_CALL +clCreateProgramWithBuiltInKernels(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* kernel_names */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; @@ -601,7 +772,30 @@ clBuildProgram(cl_program /* program */, void * /* user_data */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL -clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_0; +clCompileProgram(cl_program /* program */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + cl_uint /* num_input_headers */, + const cl_program * /* input_headers */, + const char ** /* header_include_names */, + void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_2; + +extern CL_API_ENTRY cl_program CL_API_CALL +clLinkProgram(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + cl_uint /* num_input_programs */, + const cl_program * /* input_programs */, + void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), + void * /* user_data */, + cl_int * /* errcode_ret */ ) CL_API_SUFFIX__VERSION_1_2; + + +extern CL_API_ENTRY cl_int CL_API_CALL +clUnloadPlatformCompiler(cl_platform_id /* platform */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL clGetProgramInfo(cl_program /* program */, @@ -649,6 +843,14 @@ clGetKernelInfo(cl_kernel /* kernel */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clGetKernelArgInfo(cl_kernel /* kernel */, + cl_uint /* arg_indx */, + cl_kernel_arg_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clGetKernelWorkGroupInfo(cl_kernel /* kernel */, cl_device_id /* device */, @@ -657,7 +859,7 @@ clGetKernelWorkGroupInfo(cl_kernel /* kernel */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; -/* Event Object APIs */ +/* Event Object APIs */ extern CL_API_ENTRY cl_int CL_API_CALL clWaitForEvents(cl_uint /* num_events */, const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; @@ -669,13 +871,27 @@ clGetEventInfo(cl_event /* event */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_event CL_API_CALL +clCreateUserEvent(cl_context /* context */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; -/* Profiling APIs */ +extern CL_API_ENTRY cl_int CL_API_CALL +clSetUserEventStatus(cl_event /* event */, + cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clSetEventCallback( cl_event /* event */, + cl_int /* command_exec_callback_type */, + void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_1; + +/* Profiling APIs */ extern CL_API_ENTRY cl_int CL_API_CALL clGetEventProfilingInfo(cl_event /* event */, cl_profiling_info /* param_name */, @@ -696,34 +912,92 @@ clEnqueueReadBuffer(cl_command_queue /* command_queue */, cl_mem /* buffer */, cl_bool /* blocking_read */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, void * /* ptr */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueReadBufferRect(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_read */, + const size_t * /* buffer_offset */, + const size_t * /* host_offset */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue /* command_queue */, cl_mem /* buffer */, cl_bool /* blocking_write */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, const void * /* ptr */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueWriteBufferRect(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_write */, + const size_t * /* buffer_offset */, + const size_t * /* host_offset */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueFillBuffer(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + const void * /* pattern */, + size_t /* pattern_size */, + size_t /* offset */, + size_t /* size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueCopyBuffer(cl_command_queue /* command_queue */, cl_mem /* src_buffer */, cl_mem /* dst_buffer */, size_t /* src_offset */, size_t /* dst_offset */, - size_t /* cb */, + size_t /* size */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueCopyBufferRect(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_buffer */, + const size_t * /* src_origin */, + const size_t * /* dst_origin */, + const size_t * /* region */, + size_t /* src_row_pitch */, + size_t /* src_slice_pitch */, + size_t /* dst_row_pitch */, + size_t /* dst_slice_pitch */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueReadImage(cl_command_queue /* command_queue */, cl_mem /* image */, @@ -750,6 +1024,16 @@ clEnqueueWriteImage(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueFillImage(cl_command_queue /* command_queue */, + cl_mem /* image */, + const void * /* fill_color */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue /* command_queue */, cl_mem /* src_image */, @@ -789,7 +1073,7 @@ clEnqueueMapBuffer(cl_command_queue /* command_queue */, cl_bool /* blocking_map */, cl_map_flags /* map_flags */, size_t /* offset */, - size_t /* cb */, + size_t /* size */, cl_uint /* num_events_in_wait_list */, const cl_event * /* event_wait_list */, cl_event * /* event */, @@ -817,6 +1101,15 @@ clEnqueueUnmapMemObject(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY cl_int CL_API_CALL +clEnqueueMigrateMemObjects(cl_command_queue /* command_queue */, + cl_uint /* num_mem_objects */, + const cl_mem * /* mem_objects */, + cl_mem_migration_flags /* flags */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue /* command_queue */, cl_kernel /* kernel */, @@ -837,7 +1130,7 @@ clEnqueueTask(cl_command_queue /* command_queue */, extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueNativeKernel(cl_command_queue /* command_queue */, - void (*user_func)(void *), + void (CL_CALLBACK * /*user_func*/)(void *), void * /* args */, size_t /* cb_args */, cl_uint /* num_mem_objects */, @@ -848,16 +1141,17 @@ clEnqueueNativeKernel(cl_command_queue /* command_queue */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueMarker(cl_command_queue /* command_queue */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; +clEnqueueMarkerWithWaitList(cl_command_queue /* command_queue */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWaitForEvents(cl_command_queue /* command_queue */, - cl_uint /* num_events */, - const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; +clEnqueueBarrierWithWaitList(cl_command_queue /* command_queue */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_2; -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; /* Extension function access * @@ -866,7 +1160,51 @@ clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_ * check to make sure the address is not NULL, before using or * calling the returned function address. */ -extern CL_API_ENTRY void * CL_API_CALL clGetExtensionFunctionAddress(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0; +extern CL_API_ENTRY void * CL_API_CALL +clGetExtensionFunctionAddressForPlatform(cl_platform_id /* platform */, + const char * /* func_name */) CL_API_SUFFIX__VERSION_1_2; + + +// Deprecated OpenCL 1.1 APIs +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateImage2D(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_row_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateImage3D(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_depth */, + size_t /* image_row_pitch */, + size_t /* image_slice_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueMarker(cl_command_queue /* command_queue */, + cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueWaitForEvents(cl_command_queue /* command_queue */, + cl_uint /* num_events */, + const cl_event * /* event_list */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clEnqueueBarrier(cl_command_queue /* command_queue */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL +clGetExtensionFunctionAddress(const char * /* func_name */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; #ifdef __cplusplus } diff --git a/Externals/CLRun/include/CL/cl_d3d10.h b/Externals/CLRun/include/CL/cl_d3d10.h new file mode 100644 index 0000000000..81b0d37214 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_d3d10.h @@ -0,0 +1,126 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_D3D10_H +#define __OPENCL_CL_D3D10_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** + * cl_khr_d3d10_sharing */ +#define cl_khr_d3d10_sharing 1 + +typedef cl_uint cl_d3d10_device_source_khr; +typedef cl_uint cl_d3d10_device_set_khr; + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_D3D10_DEVICE_KHR -1002 +#define CL_INVALID_D3D10_RESOURCE_KHR -1003 +#define CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR -1004 +#define CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR -1005 + +// cl_d3d10_device_source_nv +#define CL_D3D10_DEVICE_KHR 0x4010 +#define CL_D3D10_DXGI_ADAPTER_KHR 0x4011 + +// cl_d3d10_device_set_nv +#define CL_PREFERRED_DEVICES_FOR_D3D10_KHR 0x4012 +#define CL_ALL_DEVICES_FOR_D3D10_KHR 0x4013 + +// cl_context_info +#define CL_CONTEXT_D3D10_DEVICE_KHR 0x4014 +#define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C + +// cl_mem_info +#define CL_MEM_D3D10_RESOURCE_KHR 0x4015 + +// cl_image_info +#define CL_IMAGE_D3D10_SUBRESOURCE_KHR 0x4016 + +// cl_command_type +#define CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR 0x4017 +#define CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR 0x4018 + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)( + cl_platform_id platform, + cl_d3d10_device_source_khr d3d_device_source, + void * d3d_object, + cl_d3d10_device_set_khr d3d_device_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_D3D10_H + diff --git a/Externals/CLRun/include/CL/cl_d3d11.h b/Externals/CLRun/include/CL/cl_d3d11.h new file mode 100644 index 0000000000..d3c8bdc2b1 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_d3d11.h @@ -0,0 +1,126 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_D3D11_H +#define __OPENCL_CL_D3D11_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** + * cl_khr_d3d11_sharing */ +#define cl_khr_d3d11_sharing 1 + +typedef cl_uint cl_d3d11_device_source_khr; +typedef cl_uint cl_d3d11_device_set_khr; + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_D3D11_DEVICE_KHR -1006 +#define CL_INVALID_D3D11_RESOURCE_KHR -1007 +#define CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR -1008 +#define CL_D3D11_RESOURCE_NOT_ACQUIRED_KHR -1009 + +// cl_d3d11_device_source +#define CL_D3D11_DEVICE_KHR 0x4019 +#define CL_D3D11_DXGI_ADAPTER_KHR 0x401A + +// cl_d3d11_device_set +#define CL_PREFERRED_DEVICES_FOR_D3D11_KHR 0x401B +#define CL_ALL_DEVICES_FOR_D3D11_KHR 0x401C + +// cl_context_info +#define CL_CONTEXT_D3D11_DEVICE_KHR 0x401D +#define CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR 0x402D + +// cl_mem_info +#define CL_MEM_D3D11_RESOURCE_KHR 0x401E + +// cl_image_info +#define CL_IMAGE_D3D11_SUBRESOURCE_KHR 0x401F + +// cl_command_type +#define CL_COMMAND_ACQUIRE_D3D11_OBJECTS_KHR 0x4020 +#define CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR 0x4021 + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)( + cl_platform_id platform, + cl_d3d11_device_source_khr d3d_device_source, + void * d3d_object, + cl_d3d11_device_set_khr d3d_device_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_D3D11_H + diff --git a/Externals/CLRun/include/CL/cl_dx9_media_sharing.h b/Externals/CLRun/include/CL/cl_dx9_media_sharing.h new file mode 100644 index 0000000000..1ef543a5af --- /dev/null +++ b/Externals/CLRun/include/CL/cl_dx9_media_sharing.h @@ -0,0 +1,127 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H +#define __OPENCL_CL_DX9_MEDIA_SHARING_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/****************************************************************************** +/* cl_khr_dx9_media_sharing */ +#define cl_khr_dx9_media_sharing 1 + +typedef cl_uint cl_dx9_media_adapter_type_khr; +typedef cl_uint cl_dx9_media_adapter_set_khr; + +#if defined(_WIN32) +#include +typedef struct _cl_dx9_surface_info_khr +{ + IDirect3DSurface9 *resource; + HANDLE shared_handle; +} cl_dx9_surface_info_khr; +#endif + + +/******************************************************************************/ + +// Error Codes +#define CL_INVALID_DX9_MEDIA_ADAPTER_KHR -1010 +#define CL_INVALID_DX9_MEDIA_SURFACE_KHR -1011 +#define CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR -1012 +#define CL_DX9_MEDIA_SURFACE_NOT_ACQUIRED_KHR -1013 + +// cl_media_adapter_type_khr +#define CL_ADAPTER_D3D9_KHR 0x2020 +#define CL_ADAPTER_D3D9EX_KHR 0x2021 +#define CL_ADAPTER_DXVA_KHR 0x2022 + +// cl_media_adapter_set_khr +#define CL_PREFERRED_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR 0x2023 +#define CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR 0x2024 + +// cl_context_info +#define CL_CONTEXT_ADAPTER_D3D9_KHR 0x2025 +#define CL_CONTEXT_ADAPTER_D3D9EX_KHR 0x2026 +#define CL_CONTEXT_ADAPTER_DXVA_KHR 0x2027 + +// cl_mem_info +#define CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR 0x2028 +#define CL_MEM_DX9_MEDIA_SURFACE_INFO_KHR 0x2029 + +// cl_image_info +#define CL_IMAGE_DX9_MEDIA_PLANE_KHR 0x202A + +// cl_command_type +#define CL_COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR 0x202B +#define CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR 0x202C + +/******************************************************************************/ + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)( + cl_platform_id platform, + cl_uint num_media_adapters, + cl_dx9_media_adapter_type_khr * media_adapter_type, + void * media_adapters, + cl_dx9_media_adapter_set_khr media_adapter_set, + cl_uint num_entries, + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)( + cl_context context, + cl_mem_flags flags, + cl_dx9_media_adapter_type_khr adapter_type, + void * surface_info, + cl_uint plane, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +#ifdef __cplusplus +} +#endif + +#endif // __OPENCL_CL_DX9_MEDIA_SHARING_H + diff --git a/Externals/CLRun/include/CL/cl_ext.h b/Externals/CLRun/include/CL/cl_ext.h new file mode 100644 index 0000000000..632cb216b3 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_ext.h @@ -0,0 +1,251 @@ +/******************************************************************************* + * Copyright (c) 2008 - 2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + ******************************************************************************/ + +/* $Revision: 11928 $ on $Date: 2010-07-13 09:04:56 -0700 (Tue, 13 Jul 2010) $ */ + +/* cl_ext.h contains OpenCL extensions which don't have external */ +/* (OpenGL, D3D) dependencies. */ + +#ifndef __CL_EXT_H +#define __CL_EXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __APPLE__ + #include + #include +#else + #include +#endif + +/* cl_khr_fp16 extension - no extension #define since it has no functions */ +#define CL_DEVICE_HALF_FP_CONFIG 0x1033 + +/* Memory object destruction + * + * Apple extension for use to manage externally allocated buffers used with cl_mem objects with CL_MEM_USE_HOST_PTR + * + * Registers a user callback function that will be called when the memory object is deleted and its resources + * freed. Each call to clSetMemObjectCallbackFn registers the specified user callback function on a callback + * stack associated with memobj. The registered user callback functions are called in the reverse order in + * which they were registered. The user callback functions are called and then the memory object is deleted + * and its resources freed. This provides a mechanism for the application (and libraries) using memobj to be + * notified when the memory referenced by host_ptr, specified when the memory object is created and used as + * the storage bits for the memory object, can be reused or freed. + * + * The application may not call CL api's with the cl_mem object passed to the pfn_notify. + * + * Please check for the "cl_APPLE_SetMemObjectDestructor" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS) + * before using. + */ +#define cl_APPLE_SetMemObjectDestructor 1 +cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem /* memobj */, + void (* /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), + void * /*user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + + +/* Context Logging Functions + * + * The next three convenience functions are intended to be used as the pfn_notify parameter to clCreateContext(). + * Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS) + * before using. + * + * clLogMessagesToSystemLog fowards on all log messages to the Apple System Logger + */ +#define cl_APPLE_ContextLoggingFunctions 1 +extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + +/* clLogMessagesToStdout sends all log messages to the file descriptor stdout */ +extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + +/* clLogMessagesToStderr sends all log messages to the file descriptor stderr */ +extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * /* errstr */, + const void * /* private_info */, + size_t /* cb */, + void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; + + +/************************ +* cl_khr_icd extension * +************************/ +#define cl_khr_icd 1 + +/* cl_platform_info */ +#define CL_PLATFORM_ICD_SUFFIX_KHR 0x0920 + +/* Additional Error Codes */ +#define CL_PLATFORM_NOT_FOUND_KHR -1001 + +extern CL_API_ENTRY cl_int CL_API_CALL +clIcdGetPlatformIDsKHR(cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */); + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)( + cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */); + + +/* Extension: cl_khr_image2D_buffer + * + * This extension allows a 2D image to be created from a cl_mem buffer without a copy. + * The type associated with a 2D image created from a buffer in an OpenCL program is image2d_t. + * Both the sampler and sampler-less read_image built-in functions are supported for 2D images + * and 2D images created from a buffer. Similarly, the write_image built-ins are also supported + * for 2D images created from a buffer. + * + * When the 2D image from buffer is created, the client must specify the width, + * height, image format (i.e. channel order and channel data type) and optionally the row pitch + * + * The pitch specified must be a multiple of CL_DEVICE_IMAGE_PITCH_ALIGNMENT pixels. + * The base address of the buffer must be aligned to CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT pixels. + */ + +/************************************* + * cl_khr_initalize_memory extension * + *************************************/ + +#define CL_CONTEXT_MEMORY_INITIALIZE_KHR 0x200E + + +/************************************** + * cl_khr_terminate_context extension * + **************************************/ + +#define CL_DEVICE_TERMINATE_CAPABILITY_KHR 0x200F +#define CL_CONTEXT_TERMINATE_KHR 0x2010 + +#define cl_khr_terminate_context 1 +extern CL_API_ENTRY cl_int CL_API_CALL clTerminateContextKHR(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; + +typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; + + +/* + * Extension: cl_khr_spir + * + * This extension adds support to create an OpenCL program object from a + * Standard Portable Intermediate Representation (SPIR) instance + */ + +/****************************************** +* cl_nv_device_attribute_query extension * +******************************************/ +/* cl_nv_device_attribute_query extension - no extension #define since it has no functions */ +#define CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV 0x4000 +#define CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV 0x4001 +#define CL_DEVICE_REGISTERS_PER_BLOCK_NV 0x4002 +#define CL_DEVICE_WARP_SIZE_NV 0x4003 +#define CL_DEVICE_GPU_OVERLAP_NV 0x4004 +#define CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV 0x4005 +#define CL_DEVICE_INTEGRATED_MEMORY_NV 0x4006 + + +/********************************* +* cl_amd_device_attribute_query * +*********************************/ +#define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD 0x4036 + +#ifdef CL_VERSION_1_1 + /*********************************** + * cl_ext_device_fission extension * + ***********************************/ + #define cl_ext_device_fission 1 + + extern CL_API_ENTRY cl_int CL_API_CALL + clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + (CL_API_CALL *clReleaseDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_int CL_API_CALL + clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + (CL_API_CALL *clRetainDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef cl_ulong cl_device_partition_property_ext; + extern CL_API_ENTRY cl_int CL_API_CALL + clCreateSubDevicesEXT( cl_device_id /*in_device*/, + const cl_device_partition_property_ext * /* properties */, + cl_uint /*num_entries*/, + cl_device_id * /*out_devices*/, + cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + typedef CL_API_ENTRY cl_int + ( CL_API_CALL * clCreateSubDevicesEXT_fn)( cl_device_id /*in_device*/, + const cl_device_partition_property_ext * /* properties */, + cl_uint /*num_entries*/, + cl_device_id * /*out_devices*/, + cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; + + /* cl_device_partition_property_ext */ + #define CL_DEVICE_PARTITION_EQUALLY_EXT 0x4050 + #define CL_DEVICE_PARTITION_BY_COUNTS_EXT 0x4051 + #define CL_DEVICE_PARTITION_BY_NAMES_EXT 0x4052 + #define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT 0x4053 + + /* clDeviceGetInfo selectors */ + #define CL_DEVICE_PARENT_DEVICE_EXT 0x4054 + #define CL_DEVICE_PARTITION_TYPES_EXT 0x4055 + #define CL_DEVICE_AFFINITY_DOMAINS_EXT 0x4056 + #define CL_DEVICE_REFERENCE_COUNT_EXT 0x4057 + #define CL_DEVICE_PARTITION_STYLE_EXT 0x4058 + + /* error codes */ + #define CL_DEVICE_PARTITION_FAILED_EXT -1057 + #define CL_INVALID_PARTITION_COUNT_EXT -1058 + #define CL_INVALID_PARTITION_NAME_EXT -1059 + + /* CL_AFFINITY_DOMAINs */ + #define CL_AFFINITY_DOMAIN_L1_CACHE_EXT 0x1 + #define CL_AFFINITY_DOMAIN_L2_CACHE_EXT 0x2 + #define CL_AFFINITY_DOMAIN_L3_CACHE_EXT 0x3 + #define CL_AFFINITY_DOMAIN_L4_CACHE_EXT 0x4 + #define CL_AFFINITY_DOMAIN_NUMA_EXT 0x10 + #define CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT 0x100 + + /* cl_device_partition_property_ext list terminators */ + #define CL_PROPERTIES_LIST_END_EXT ((cl_device_partition_property_ext) 0) + #define CL_PARTITION_BY_COUNTS_LIST_END_EXT ((cl_device_partition_property_ext) 0) + #define CL_PARTITION_BY_NAMES_LIST_END_EXT ((cl_device_partition_property_ext) 0 - 1) + + + +#endif /* CL_VERSION_1_1 */ + +#ifdef __cplusplus +} +#endif + + +#endif /* __CL_EXT_H */ diff --git a/Externals/CLRun/include/CL/cl_gl.h b/Externals/CLRun/include/CL/cl_gl.h index fcaa5bd392..af2036cc99 100644 --- a/Externals/CLRun/include/CL/cl_gl.h +++ b/Externals/CLRun/include/CL/cl_gl.h @@ -1,5 +1,5 @@ /********************************************************************************** - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008 - 2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,14 +21,6 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. **********************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ - -/* - * cl_gl.h contains Khronos-approved (KHR) OpenCL extensions which have - * OpenGL dependencies. The application is responsible for #including - * OpenGL or OpenGL ES headers before #including cl_gl.h. - */ - #ifndef __OPENCL_CL_GL_H #define __OPENCL_CL_GL_H @@ -36,7 +28,7 @@ #include #else #include -#endif +#endif #ifdef __cplusplus extern "C" { @@ -45,16 +37,23 @@ extern "C" { typedef cl_uint cl_gl_object_type; typedef cl_uint cl_gl_texture_info; typedef cl_uint cl_gl_platform_info; +typedef struct __GLsync *cl_GLsync; -/* cl_gl_object_type */ -#define CL_GL_OBJECT_BUFFER 0x2000 -#define CL_GL_OBJECT_TEXTURE2D 0x2001 -#define CL_GL_OBJECT_TEXTURE3D 0x2002 -#define CL_GL_OBJECT_RENDERBUFFER 0x2003 +/* cl_gl_object_type = 0x2000 - 0x200F enum values are currently taken */ +#define CL_GL_OBJECT_BUFFER 0x2000 +#define CL_GL_OBJECT_TEXTURE2D 0x2001 +#define CL_GL_OBJECT_TEXTURE3D 0x2002 +#define CL_GL_OBJECT_RENDERBUFFER 0x2003 +#define CL_GL_OBJECT_TEXTURE2D_ARRAY 0x200E +#define CL_GL_OBJECT_TEXTURE1D 0x200F +#define CL_GL_OBJECT_TEXTURE1D_ARRAY 0x2010 +#define CL_GL_OBJECT_TEXTURE_BUFFER 0x2011 + +/* cl_gl_texture_info */ +#define CL_GL_TEXTURE_TARGET 0x2004 +#define CL_GL_MIPMAP_LEVEL 0x2005 +#define CL_GL_NUM_SAMPLES 0x2012 -/* cl_gl_texture_info */ -#define CL_GL_TEXTURE_TARGET 0x2004 -#define CL_GL_MIPMAP_LEVEL 0x2005 extern CL_API_ENTRY cl_mem CL_API_CALL clCreateFromGLBuffer(cl_context /* context */, @@ -63,21 +62,13 @@ clCreateFromGLBuffer(cl_context /* context */, int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture2D(cl_context /* context */, - cl_mem_flags /* flags */, - cl_GLenum /* target */, - cl_GLint /* miplevel */, - cl_GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture3D(cl_context /* context */, - cl_mem_flags /* flags */, - cl_GLenum /* target */, - cl_GLint /* miplevel */, - cl_GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - +clCreateFromGLTexture(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; + extern CL_API_ENTRY cl_mem CL_API_CALL clCreateFromGLRenderbuffer(cl_context /* context */, cl_mem_flags /* flags */, @@ -87,8 +78,8 @@ clCreateFromGLRenderbuffer(cl_context /* context */, extern CL_API_ENTRY cl_int CL_API_CALL clGetGLObjectInfo(cl_mem /* memobj */, cl_gl_object_type * /* gl_object_type */, - cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; - + cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; + extern CL_API_ENTRY cl_int CL_API_CALL clGetGLTextureInfo(cl_mem /* memobj */, cl_gl_texture_info /* param_name */, @@ -112,33 +103,51 @@ clEnqueueReleaseGLObjects(cl_command_queue /* command_queue */, const cl_event * /* event_wait_list */, cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +// Deprecated OpenCL 1.1 APIs +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateFromGLTexture2D(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + +extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL +clCreateFromGLTexture3D(cl_context /* context */, + cl_mem_flags /* flags */, + cl_GLenum /* target */, + cl_GLint /* miplevel */, + cl_GLuint /* texture */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; + /* cl_khr_gl_sharing extension */ - + #define cl_khr_gl_sharing 1 - + typedef cl_uint cl_gl_context_info; - + /* Additional Error Codes */ #define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000 - + /* cl_gl_context_info */ #define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006 #define CL_DEVICES_FOR_GL_CONTEXT_KHR 0x2007 - + /* Additional cl_context_properties */ #define CL_GL_CONTEXT_KHR 0x2008 #define CL_EGL_DISPLAY_KHR 0x2009 #define CL_GLX_DISPLAY_KHR 0x200A #define CL_WGL_HDC_KHR 0x200B #define CL_CGL_SHAREGROUP_KHR 0x200C - + extern CL_API_ENTRY cl_int CL_API_CALL clGetGLContextInfoKHR(const cl_context_properties * /* properties */, cl_gl_context_info /* param_name */, size_t /* param_value_size */, void * /* param_value */, size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - + typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( const cl_context_properties * properties, cl_gl_context_info param_name, @@ -150,4 +159,4 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( } #endif -#endif /* __OPENCL_CL_GL_H */ +#endif /* __OPENCL_CL_GL_H */ diff --git a/Externals/CLRun/include/CL/cl_gl_ext.h b/Externals/CLRun/include/CL/cl_gl_ext.h new file mode 100644 index 0000000000..77d53536f6 --- /dev/null +++ b/Externals/CLRun/include/CL/cl_gl_ext.h @@ -0,0 +1,69 @@ +/********************************************************************************** + * Copyright (c) 2008-2012 The Khronos Group Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and/or associated documentation files (the + * "Materials"), to deal in the Materials without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Materials, and to + * permit persons to whom the Materials are furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. + * + * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + **********************************************************************************/ + +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ + +/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have */ +/* OpenGL dependencies. */ + +#ifndef __OPENCL_CL_GL_EXT_H +#define __OPENCL_CL_GL_EXT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __APPLE__ + #include +#else + #include +#endif + +/* + * For each extension, follow this template + * cl_VEN_extname extension */ +/* #define cl_VEN_extname 1 + * ... define new types, if any + * ... define new tokens, if any + * ... define new APIs, if any + * + * If you need GLtypes here, mirror them with a cl_GLtype, rather than including a GL header + * This allows us to avoid having to decide whether to include GL headers or GLES here. + */ + +/* + * cl_khr_gl_event extension + * See section 9.9 in the OpenCL 1.1 spec for more information + */ +#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D + +extern CL_API_ENTRY cl_event CL_API_CALL +clCreateEventFromGLsyncKHR(cl_context /* context */, + cl_GLsync /* cl_GLsync */, + cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; + +#ifdef __cplusplus +} +#endif + +#endif /* __OPENCL_CL_GL_EXT_H */ diff --git a/Externals/CLRun/include/CL/cl_platform.h b/Externals/CLRun/include/CL/cl_platform.h index 8fdcb17341..cf2b7210ac 100644 --- a/Externals/CLRun/include/CL/cl_platform.h +++ b/Externals/CLRun/include/CL/cl_platform.h @@ -1,5 +1,5 @@ /********************************************************************************** - * Copyright (c) 2008-2010 The Khronos Group Inc. + * Copyright (c) 2008-2012 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,7 +21,7 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. **********************************************************************************/ -/* $Revision: 11707 $ on $Date: 2010-06-13 23:30:16 -0700 (Sun, 13 Jun 2010) $ */ +/* $Revision: 11803 $ on $Date: 2010-06-25 10:02:12 -0700 (Fri, 25 Jun 2010) $ */ #ifndef __CL_PLATFORM_H #define __CL_PLATFORM_H @@ -36,21 +36,85 @@ extern "C" { #endif #if defined(_WIN32) -#define CL_API_ENTRY -#define CL_API_CALL __stdcall + #define CL_API_ENTRY + #define CL_API_CALL __stdcall + #define CL_CALLBACK __stdcall #else -#define CL_API_ENTRY -#define CL_API_CALL + #define CL_API_ENTRY + #define CL_API_CALL + #define CL_CALLBACK #endif #ifdef __APPLE__ -#define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER -#define CL_API_SUFFIX__VERSION_1_1 -#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) + #define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) + #define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_1 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7 + + #ifdef AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_8 + #else + #warning This path should never happen outside of internal operating system development. AvailabilityMacros do not function correctly here! + #define CL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define GCL_API_SUFFIX__VERSION_1_2 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_2 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER + #endif #else -#define CL_API_SUFFIX__VERSION_1_0 -#define CL_API_SUFFIX__VERSION_1_1 -#define CL_EXTENSION_WEAK_LINK + #define CL_EXTENSION_WEAK_LINK + #define CL_API_SUFFIX__VERSION_1_0 + #define CL_EXT_SUFFIX__VERSION_1_0 + #define CL_API_SUFFIX__VERSION_1_1 + #define CL_EXT_SUFFIX__VERSION_1_1 + #define CL_API_SUFFIX__VERSION_1_2 + #define CL_EXT_SUFFIX__VERSION_1_2 + + #ifdef __GNUC__ + #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated)) + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated)) + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #endif + #elif _WIN32 + #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated) + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #else + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated) + #endif + #else + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED + + #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED + #endif #endif #if (defined (_WIN32) && defined(_MSC_VER)) @@ -108,14 +172,40 @@ typedef double cl_double; #define CL_DBL_MIN 2.225073858507201383090e-308 #define CL_DBL_EPSILON 2.220446049250313080847e-16 +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + #define CL_NAN (CL_INFINITY - CL_INFINITY) #define CL_HUGE_VALF ((cl_float) 1e50) #define CL_HUGE_VAL ((cl_double) 1e500) #define CL_MAXFLOAT CL_FLT_MAX #define CL_INFINITY CL_HUGE_VALF -#define CL_CALLBACK __stdcall - #else #include @@ -173,6 +263,34 @@ typedef double cl_double __attribute__((aligned(8))); #define CL_DBL_MIN 0x1.0p-1022 #define CL_DBL_EPSILON 0x1.0p-52 +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + #if defined( __GNUC__ ) #define CL_HUGE_VALF __builtin_huge_valf() #define CL_HUGE_VAL __builtin_huge_val() @@ -186,13 +304,11 @@ typedef double cl_double __attribute__((aligned(8))); #define CL_MAXFLOAT CL_FLT_MAX #define CL_INFINITY CL_HUGE_VALF -#define CL_CALLBACK - #endif #include -/* Mirror types to GL types. Mirror types allow us to avoid deciding which headers to load based on whether we are using GL or GLES here. */ +/* Mirror types to GL types. Mirror types allow us to avoid deciding which 87s to load based on whether we are using GL or GLES here. */ typedef unsigned int cl_GLuint; typedef int cl_GLint; typedef unsigned int cl_GLenum; @@ -389,6 +505,9 @@ typedef union #endif }cl_char4; +/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */ +typedef cl_char4 cl_char3; + typedef union { cl_char CL_ALIGNED(8) s[8]; @@ -461,6 +580,9 @@ typedef union #endif }cl_uchar4; +/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */ +typedef cl_uchar4 cl_uchar3; + typedef union { cl_uchar CL_ALIGNED(8) s[8]; @@ -533,6 +655,9 @@ typedef union #endif }cl_short4; +/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */ +typedef cl_short4 cl_short3; + typedef union { cl_short CL_ALIGNED(16) s[8]; @@ -605,6 +730,9 @@ typedef union #endif }cl_ushort4; +/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */ +typedef cl_ushort4 cl_ushort3; + typedef union { cl_ushort CL_ALIGNED(16) s[8]; @@ -676,6 +804,9 @@ typedef union #endif }cl_int4; +/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */ +typedef cl_int4 cl_int3; + typedef union { cl_int CL_ALIGNED(32) s[8]; @@ -748,6 +879,9 @@ typedef union #endif }cl_uint4; +/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */ +typedef cl_uint4 cl_uint3; + typedef union { cl_uint CL_ALIGNED(32) s[8]; @@ -819,6 +953,9 @@ typedef union #endif }cl_long4; +/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */ +typedef cl_long4 cl_long3; + typedef union { cl_long CL_ALIGNED(64) s[8]; @@ -891,6 +1028,9 @@ typedef union #endif }cl_ulong4; +/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */ +typedef cl_ulong4 cl_ulong3; + typedef union { cl_ulong CL_ALIGNED(64) s[8]; @@ -964,6 +1104,9 @@ typedef union #endif }cl_float4; +/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */ +typedef cl_float4 cl_float3; + typedef union { cl_float CL_ALIGNED(32) s[8]; @@ -1036,6 +1179,9 @@ typedef union #endif }cl_double4; +/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */ +typedef cl_double4 cl_double3; + typedef union { cl_double CL_ALIGNED(64) s[8]; @@ -1077,6 +1223,29 @@ typedef union #endif }cl_double16; +/* Macro to facilitate debugging + * Usage: + * Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. + * The first line ends with: CL_PROGRAM_STRING_DEBUG_INFO \" + * Each line thereafter of OpenCL C source must end with: \n\ + * The last line ends in "; + * + * Example: + * + * const char *my_program = CL_PROGRAM_STRING_DEBUG_INFO "\ + * kernel void foo( int a, float * b ) \n\ + * { \n\ + * // my comment \n\ + * *b[ get_global_id(0)] = a; \n\ + * } \n\ + * "; + * + * This should correctly set up the line, (column) and file information for your source + * string so you can do source level debugging. + */ +#define __CL_STRINGIFY( _x ) # _x +#define _CL_STRINGIFY( _x ) __CL_STRINGIFY( _x ) +#define CL_PROGRAM_STRING_DEBUG_INFO "#line " _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n" #ifdef __cplusplus } From dc98ce59224b7f0c175af1886d4d74d1d8fcb8d6 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 24 Feb 2013 23:05:12 +1100 Subject: [PATCH 606/627] Added the addeo instruction to the JIT tables. Fixes Inkub (WiiWare). --- Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp | 1 + Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp | 1 + Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp index 8ea35503bf..07219218a2 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -297,6 +297,7 @@ static GekkoOPTemplate table31_2[] = {10, Interpreter::addcx, {"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {522, Interpreter::addcx, {"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {138, Interpreter::addex, {"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, + {650, Interpreter::addex, {"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {234, Interpreter::addmex, {"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {202, Interpreter::addzex, {"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT, 0, 0, 0, 0}}, {491, Interpreter::divwx, {"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39, 0, 0, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp index ddb59903d2..cee1f4d048 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit64_Tables.cpp @@ -310,6 +310,7 @@ static GekkoOPTemplate table31_2[] = {10, &Jit64::addcx}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {522, &Jit64::addcx}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &Jit64::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {650, &Jit64::addex}, //"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &Jit64::addmex}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &Jit64::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {491, &Jit64::divwx}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp index 9418030b9c..fd920c4a48 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_Tables.cpp @@ -311,6 +311,7 @@ static GekkoOPTemplate table31_2[] = {10, &JitIL::Default}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {522, &JitIL::Default}, //"addcox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, {138, &JitIL::addex}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {650, &JitIL::addex}, //"addeox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {234, &JitIL::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {202, &JitIL::addzex}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, {491, &JitIL::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, From 6b2804e2960b4c8d9ba9ef95ad4c843eab9ae00b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 24 Feb 2013 22:29:33 -0600 Subject: [PATCH 607/627] Possible crashfix for OSX. --- Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 3 ++- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index fda1d99462..cec18ed63a 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -195,6 +195,8 @@ bool Wiimote::Connect() ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels " "for wiimote %i", index + 1); Disconnect(); + + [cbt release]; return false; } @@ -209,7 +211,6 @@ bool Wiimote::Connect() m_connected = true; [cbt release]; - return true; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index b5a1703527..3608c060fc 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -51,7 +51,7 @@ WiimoteScanner g_wiimote_scanner; Wiimote::Wiimote() : index() #ifdef __APPLE__ - , inputlen(0) + , btd(), ichan(), cchan(), inputlen(), m_connected() #elif defined(__linux__) && HAVE_BLUEZ , cmd_sock(-1), int_sock(-1) #elif defined(_WIN32) From 1141af64f64b801fc1509bb9c1eff92436f340e6 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 25 Feb 2013 12:36:50 +0000 Subject: [PATCH 608/627] TextureCacheBase: Do not assume EFB copies can safely be deleted when we think they're "unused". Fixes issue 6040. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index fda4f21a7e..46aaf79bd4 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -129,8 +129,13 @@ void TextureCache::Cleanup() TexCache::iterator tcend = textures.end(); while (iter != tcend) { - if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) // TODO: Deleting EFB copies might not be a good idea here... + if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) { + // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted + // TODO: encoding the texture back to RAM here might be a good idea + if (g_ActiveConfig.bCopyEFBToTexture && entry->IsEfbCopy()) + continue; + delete iter->second; textures.erase(iter++); } From 73a0bdd379672c4f218b92788002dbc39815fb85 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 25 Feb 2013 12:42:52 +0000 Subject: [PATCH 609/627] Build fixing. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 46aaf79bd4..d261d9d6d2 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -133,7 +133,7 @@ void TextureCache::Cleanup() { // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted // TODO: encoding the texture back to RAM here might be a good idea - if (g_ActiveConfig.bCopyEFBToTexture && entry->IsEfbCopy()) + if (g_ActiveConfig.bCopyEFBToTexture && iter->second->IsEfbCopy()) continue; delete iter->second; From d173d646de18bc9e158651989045fef8ddd1523f Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 25 Feb 2013 16:11:24 +0100 Subject: [PATCH 610/627] fix last commit by neobrain --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index d261d9d6d2..6871c411fa 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -129,13 +129,12 @@ void TextureCache::Cleanup() TexCache::iterator tcend = textures.end(); while (iter != tcend) { - if (frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount) - { + if ( frameCount > TEXTURE_KILL_THRESHOLD + iter->second->frameCount + // EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted // TODO: encoding the texture back to RAM here might be a good idea - if (g_ActiveConfig.bCopyEFBToTexture && iter->second->IsEfbCopy()) - continue; - + && ! (g_ActiveConfig.bCopyEFBToTexture && iter->second->IsEfbCopy()) ) + { delete iter->second; textures.erase(iter++); } From 0e4b07ddf97b9769b341dbbc54b26b6784396da7 Mon Sep 17 00:00:00 2001 From: "kostamarino@hotmail.com" Date: Mon, 25 Feb 2013 19:14:36 +0200 Subject: [PATCH 611/627] Update the gameini of F-zero. Efb to Ram is no longer the default choice. --- Data/User/GameConfig/GFZE01.ini | 3 --- Data/User/GameConfig/GFZP01.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini index 450553aa06..32b1e195c0 100644 --- a/Data/User/GameConfig/GFZE01.ini +++ b/Data/User/GameConfig/GFZE01.ini @@ -43,7 +43,4 @@ $All Vehicles Unlocked 840030C8 FFDC6F00 [Gecko] [Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False -EFBCopyCacheEnable = True [Video_Settings] diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/User/GameConfig/GFZP01.ini index 70c517ef4a..0586d53d3f 100644 --- a/Data/User/GameConfig/GFZP01.ini +++ b/Data/User/GameConfig/GFZP01.ini @@ -24,7 +24,4 @@ $Make Save Copyable 04C3110C 4B400410 [Gecko] [Video_Hacks] -EFBCopyEnable = True -EFBToTextureEnable = False -EFBCopyCacheEnable = True [Video_Settings] From a450ba442025d897a63f3b8e3655a8a49885df2b Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 25 Feb 2013 15:58:12 -0500 Subject: [PATCH 612/627] Abort load state if it uses a different dsp engine, instead of crashing. --- Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 9 +++++++++ Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 9 +++++++++ Source/Core/Core/Src/State.cpp | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index b22be91104..dac977922b 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -27,6 +27,7 @@ #include "UCodes/UCodes.h" #include "../AudioInterface.h" #include "ConfigManager.h" +#include "Core.h" DSPHLE::DSPHLE() { m_InitMixer = false; @@ -130,6 +131,14 @@ void DSPHLE::SwapUCode(u32 _crc) void DSPHLE::DoState(PointerWrap &p) { + bool isHLE = true; + p.Do(isHLE); + if (isHLE != true && p.GetMode() == PointerWrap::MODE_READ) + { + Core::DisplayMessage("Save states made with the LLE audio engine are incompatible with the HLE DSP engine. Aborting load state.", 3000); + p.SetMode(PointerWrap::MODE_VERIFY); + return; + } bool prevInitMixer = m_InitMixer; p.Do(m_InitMixer); if (prevInitMixer != m_InitMixer && p.GetMode() == PointerWrap::MODE_READ) diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 92053053de..2dbb7a8292 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -26,6 +26,7 @@ #include "IniFile.h" #include "ConfigManager.h" #include "CPUDetect.h" +#include "Core.h" #include "DSPLLEGlobals.h" // Local #include "DSP/DSPInterpreter.h" @@ -56,6 +57,14 @@ Common::Event ppcEvent; void DSPLLE::DoState(PointerWrap &p) { + bool isHLE = false; + p.Do(isHLE); + if (isHLE != false && p.GetMode() == PointerWrap::MODE_READ) + { + Core::DisplayMessage("Save states made with the HLE audio engine are incompatible with the LLE DSP engine. Aborting load state.", 3000); + p.SetMode(PointerWrap::MODE_VERIFY); + return; + } p.Do(g_dsp.r); p.Do(g_dsp.pc); #if PROFILE diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 084a94e5f6..0facf2f387 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 13; +static const u32 STATE_VERSION = 14; struct StateHeader { From e5c53e371f5ea96504b7c903239c2059b2f288bc Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 25 Feb 2013 18:12:25 -0500 Subject: [PATCH 613/627] Make error message for loading save state with wrong dsp engine shorter. --- Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp | 2 +- Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp index dac977922b..6d2a1f9097 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp @@ -135,7 +135,7 @@ void DSPHLE::DoState(PointerWrap &p) p.Do(isHLE); if (isHLE != true && p.GetMode() == PointerWrap::MODE_READ) { - Core::DisplayMessage("Save states made with the LLE audio engine are incompatible with the HLE DSP engine. Aborting load state.", 3000); + Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000); p.SetMode(PointerWrap::MODE_VERIFY); return; } diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index 2dbb7a8292..2cbf39f457 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -61,7 +61,7 @@ void DSPLLE::DoState(PointerWrap &p) p.Do(isHLE); if (isHLE != false && p.GetMode() == PointerWrap::MODE_READ) { - Core::DisplayMessage("Save states made with the HLE audio engine are incompatible with the LLE DSP engine. Aborting load state.", 3000); + Core::DisplayMessage("State is incompatible with current DSP engine. Aborting load state.", 3000); p.SetMode(PointerWrap::MODE_VERIFY); return; } From 415a2f17c95db405309d9d259134a40f21a3582d Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 25 Feb 2013 20:05:02 -0500 Subject: [PATCH 614/627] Begin implementing save states to video software. Kind of works, sometimes. --- .../Plugin_VideoSoftware/Src/EfbInterface.cpp | 7 +++++++ .../Plugins/Plugin_VideoSoftware/Src/EfbInterface.h | 1 + .../Plugin_VideoSoftware/Src/OpcodeDecoder.cpp | 12 ++++++++++++ .../Plugin_VideoSoftware/Src/OpcodeDecoder.h | 3 +++ .../Plugin_VideoSoftware/Src/SWCommandProcessor.cpp | 5 +++++ .../Plugin_VideoSoftware/Src/SWVertexLoader.cpp | 13 ++++++++++++- .../Plugin_VideoSoftware/Src/SWVertexLoader.h | 3 ++- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 10 ++++++++-- .../Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp | 7 +++++++ Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h | 2 ++ 10 files changed, 59 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp index 6722ec7935..8fdc0425a4 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp @@ -28,6 +28,7 @@ u8 efb[EFB_WIDTH*EFB_HEIGHT*6]; namespace EfbInterface { + u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; inline u32 GetColorOffset(u16 x, u16 y) @@ -40,6 +41,12 @@ namespace EfbInterface return (x + y * EFB_WIDTH) * 3 + DEPTH_BUFFER_START; } + void DoState(PointerWrap &p) + { + p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6); + p.DoArray(efbColorTexture, EFB_WIDTH*EFB_HEIGHT*4); + } + void SetPixelAlphaOnly(u32 offset, u8 a) { switch (bpmem.zcontrol.pixel_format) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h index 15d19e7783..fdad69567c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h @@ -47,6 +47,7 @@ namespace EfbInterface void UpdateColorTexture(); extern u8 efbColorTexture[EFB_WIDTH*EFB_HEIGHT*4]; // RGBA format + void DoState(PointerWrap &p); } #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index 0091e4eaca..396a5a54af 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -46,6 +46,18 @@ static bool inObjectStream; static u8 lastPrimCmd; +void DoState(PointerWrap &p) +{ + p.Do(minCommandSize); + vertexLoader.DoState(p); + p.Do(streamSize); + p.Do(streamAddress); + p.Do(readOpcode); + p.Do(inObjectStream); + p.Do(lastPrimCmd); + //p.Do(currentFunction); +} + void DecodePrimitiveStream(u32 iBufferSize) { u32 vertexSize = vertexLoader.GetVertexSize(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h index 635fcc24ee..53715b2832 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h @@ -20,6 +20,7 @@ #define _OPCODEDECODER_H_ #include "CommonTypes.h" +#include "ChunkFile.h" namespace OpcodeDecoder { @@ -57,6 +58,8 @@ namespace OpcodeDecoder bool CommandRunnable(u32 iBufferSize); void Run(u32 iBufferSize); + + void DoState(PointerWrap &p); } #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp index b9afc1abb5..97a99ff710 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp @@ -57,6 +57,11 @@ CPReg cpreg; // shared between gfx and emulator thread void DoState(PointerWrap &p) { p.Do(cpreg); + p.Do(readPos); + p.Do(writePos); + p.Do(et_UpdateInterrupts); + p.Do(interruptSet); + p.Do(interruptWaiting); } // does it matter that there is no synchronization between threads during writes? diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp index cc5ee66772..3142fc4262 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp @@ -328,4 +328,15 @@ void SWVertexLoader::LoadTexCoord(SWVertexLoader *vertexLoader, InputVertexData vertexLoader->m_texCoordLoader[index](); } - +void SWVertexLoader::DoState(PointerWrap &p) +{ + p.DoArray(m_AttributeLoaders, sizeof m_AttributeLoaders); + p.Do(m_VertexSize); + p.Do(m_CurrentVat); + p.Do(m_positionLoader); + p.Do(m_normalLoader); + p.DoArray(m_colorLoader, sizeof m_colorLoader); + p.Do(m_NumAttributeLoaders); + m_SetupUnit->DoState(p); + p.Do(m_TexGenSpecialCase); +} \ No newline at end of file diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h index 91a0d8e911..e05346a7a5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h @@ -22,6 +22,7 @@ #include "NativeVertexFormat.h" #include "CPMemLoader.h" +#include "ChunkFile.h" class SetupUnit; @@ -69,7 +70,7 @@ public: u32 GetVertexSize() { return m_VertexSize; } void LoadVertex(); - + void DoState(PointerWrap &p); }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 332e83d0e8..096315af4e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -39,6 +39,8 @@ #include "FileUtil.h" #include "VideoBackend.h" #include "Core.h" +#include "OpcodeDecoder.h" +#include "SWVertexLoader.h" #define VSYNC_ENABLED 0 @@ -93,9 +95,13 @@ bool VideoSoftware::Initialize(void *&window_handle) return true; } -void VideoSoftware::DoState(PointerWrap&) +void VideoSoftware::DoState(PointerWrap& p) { - // NYI + // TODO: incomplete + SWCommandProcessor::DoState(p); + SWPixelEngine::DoState(p); + EfbInterface::DoState(p); + OpcodeDecoder::DoState(p); } void VideoSoftware::CheckInvalidState() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp index 6e0fab57d8..57d69af7bd 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp @@ -169,3 +169,10 @@ void SetupUnit::SetupLineStrip() void SetupUnit::SetupPoint() {} + +void SetupUnit::DoState(PointerWrap &p) +{ + p.Do(m_PrimType); + p.Do(m_VertexCounter); + p.DoArray(m_Vertices, sizeof m_Vertices); +} \ No newline at end of file diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h index 45a575afcb..f337de21a2 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h @@ -21,6 +21,7 @@ #include "Common.h" #include "NativeVertexFormat.h" +#include "ChunkFile.h" class SetupUnit { @@ -45,6 +46,7 @@ public: OutputVertexData* GetVertex() { return m_VertWritePointer; } void SetupVertex(); + void DoState(PointerWrap &p); }; #endif From db838e759b8935e213fa225be88ac0bfc78c27f7 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Mon, 25 Feb 2013 23:49:24 -0500 Subject: [PATCH 615/627] Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed. --- .../Plugin_VideoSoftware/Src/Clipper.cpp | 7 +++++ .../Plugin_VideoSoftware/Src/Clipper.h | 3 ++ .../Src/NativeVertexFormat.h | 13 +++++++++ .../Src/OpcodeDecoder.cpp | 10 ++++--- .../Plugin_VideoSoftware/Src/Rasterizer.cpp | 22 ++++++++++++++ .../Plugin_VideoSoftware/Src/Rasterizer.h | 9 ++++++ .../Src/SWCommandProcessor.cpp | 4 +++ .../Src/SWPixelEngine.cpp | 2 ++ .../Src/SWVertexLoader.cpp | 2 +- .../Plugin_VideoSoftware/Src/SWmain.cpp | 13 +++++++++ .../Plugin_VideoSoftware/Src/SetupUnit.cpp | 29 +++++++++++++------ .../Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 28 ++++++++++++++++++ Source/Plugins/Plugin_VideoSoftware/Src/Tev.h | 3 ++ .../Plugins/Plugin_VideoSoftware/Src/Vec3.h | 7 +++++ 14 files changed, 138 insertions(+), 14 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp index e9a3525d84..c4755b50bf 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp @@ -65,6 +65,13 @@ namespace Clipper OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES]; OutputVertexData *Vertices[NUM_INDICES]; + void DoState(PointerWrap &p) + { + p.DoArray(m_ViewOffset,2); + for (int i = 0; i< NUM_CLIPPED_VERTICES; ++i) + ClippedVertices[i].DoState(p); + } + void Init() { for (int i = 0; i < NUM_CLIPPED_VERTICES; ++i) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h index 5e5dd4d02c..babc8b4e88 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h @@ -21,6 +21,7 @@ #include "Common.h" #include "NativeVertexFormat.h" +#include "ChunkFile.h" namespace Clipper @@ -36,6 +37,8 @@ namespace Clipper bool CullTest(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2, bool &backface); void PerspectiveDivide(OutputVertexData *vertex); + + void DoState(PointerWrap &p); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h index d19844105f..e2d87e207e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h @@ -19,6 +19,7 @@ #define _NATIVEVERTEXFORMAT_H #include "Vec3.h" +#include "ChunkFile.h" #ifdef WIN32 #define LOADERDECL __cdecl @@ -92,6 +93,18 @@ struct OutputVertexData #undef LINTERP #undef LINTERP_INT } + void DoState(PointerWrap &p) + { + mvPosition.DoState(p); + p.Do(projectedPosition); + screenPosition.DoState(p); + for (int i = 0; i < 3;++i) + normal[i].DoState(p); + p.DoArray(color, sizeof color); + for (int i = 0; i < 8;++i) + texCoords[i].DoState(p); + } + }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index 396a5a54af..4401916e1f 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -35,7 +35,6 @@ typedef void (*DecodingFunction)(u32); namespace OpcodeDecoder { - static DecodingFunction currentFunction = NULL; static u32 minCommandSize; static u16 streamSize; @@ -49,12 +48,15 @@ static u8 lastPrimCmd; void DoState(PointerWrap &p) { p.Do(minCommandSize); - vertexLoader.DoState(p); - p.Do(streamSize); - p.Do(streamAddress); + // Not sure what is wrong with this. Something(s) in here is causing dolphin to crash/hang when loading states saved from another run of dolphin. Doesn't seem too important anyway... + //vertexLoader.DoState(p); p.Do(readOpcode); p.Do(inObjectStream); p.Do(lastPrimCmd); + p.Do(streamSize); + p.Do(streamAddress); + // not sure how to save this... It seems to be the only thing left that is really important. + // uncommenting this will prevent all error messages, and any crashes/hangs on load, but then obviously it'll segfault once you restart dolphin. //p.Do(currentFunction); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index 225400e08b..5eed912dcb 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -62,6 +62,28 @@ s32 scissorBottom = 0; Tev tev; RasterBlock rasterBlock; +void DoState(PointerWrap &p) +{ + ZSlope.DoState(p); + WSlope.DoState(p); + for (int i=0;i<2;++i) + for (int n=0; n<4; ++n) + ColorSlopes[i][n].DoState(p); + for (int i=0;i<8;++i) + for (int n=0; n<3; ++n) + TexSlopes[i][n].DoState(p); + p.Do(vertex0X); + p.Do(vertex0Y); + p.Do(vertexOffsetX); + p.Do(vertexOffsetY); + p.Do(scissorLeft); + p.Do(scissorTop); + p.Do(scissorRight); + p.Do(scissorBottom); + tev.DoState(p); + p.Do(rasterBlock); +} + void Init() { tev.Init(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h index f8850571a9..784c4a8d62 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h @@ -19,6 +19,7 @@ #define _RASTERIZER_H_ #include "NativeVertexFormat.h" +#include "ChunkFile.h" namespace Rasterizer { @@ -37,6 +38,12 @@ namespace Rasterizer float f0; float GetValue(float dx, float dy) { return f0 + (dfdx * dx) + (dfdy * dy); } + void DoState(PointerWrap &p) + { + p.Do(dfdx); + p.Do(dfdy); + p.Do(f0); + } }; struct RasterBlockPixel @@ -53,6 +60,8 @@ namespace Rasterizer s32 TextureLod[16]; bool TextureLinear[16]; }; + + void DoState(PointerWrap &p); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp index 97a99ff710..c15a02f93e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp @@ -57,11 +57,15 @@ CPReg cpreg; // shared between gfx and emulator thread void DoState(PointerWrap &p) { p.Do(cpreg); + p.DoArray(commandBuffer, commandBufferSize); p.Do(readPos); p.Do(writePos); p.Do(et_UpdateInterrupts); p.Do(interruptSet); p.Do(interruptWaiting); + + // Is this right? + p.DoArray(g_pVideoData,writePos); } // does it matter that there is no synchronization between threads during writes? diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp index 33a6164b01..e9d2c1fe96 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp @@ -53,6 +53,8 @@ void DoState(PointerWrap &p) p.Do(pereg); p.Do(g_bSignalTokenInterrupt); p.Do(g_bSignalFinishInterrupt); + p.Do(et_SetTokenOnMainThread); + p.Do(et_SetFinishOnMainThread); } void UpdateInterrupts(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp index 3142fc4262..1c1eeb2005 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp @@ -332,7 +332,7 @@ void SWVertexLoader::DoState(PointerWrap &p) { p.DoArray(m_AttributeLoaders, sizeof m_AttributeLoaders); p.Do(m_VertexSize); - p.Do(m_CurrentVat); + p.Do(*m_CurrentVat); p.Do(m_positionLoader); p.Do(m_normalLoader); p.DoArray(m_colorLoader, sizeof m_colorLoader); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 096315af4e..d78b8ba13b 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -102,6 +102,19 @@ void VideoSoftware::DoState(PointerWrap& p) SWPixelEngine::DoState(p); EfbInterface::DoState(p); OpcodeDecoder::DoState(p); + Clipper::DoState(p); + p.Do(swxfregs); + p.Do(bpmem); + + // CP Memory + p.DoArray(arraybases, 16); + p.DoArray(arraystrides, 16); + p.Do(MatrixIndexA); + p.Do(MatrixIndexB); + p.Do(g_VtxDesc.Hex); + p.DoArray(g_VtxAttr, 8); + p.DoMarker("CP Memory"); + } void VideoSoftware::CheckInvalidState() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp index 57d69af7bd..d2185e31d5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp @@ -25,13 +25,13 @@ void SetupUnit::Init(u8 primitiveType) { - m_PrimType = primitiveType; + m_PrimType = primitiveType; - m_VertexCounter = 0; - m_VertPointer[0] = &m_Vertices[0]; - m_VertPointer[1] = &m_Vertices[1]; - m_VertPointer[2] = &m_Vertices[2]; - m_VertWritePointer = m_VertPointer[0]; + m_VertexCounter = 0; + m_VertPointer[0] = &m_Vertices[0]; + m_VertPointer[1] = &m_Vertices[1]; + m_VertPointer[2] = &m_Vertices[2]; + m_VertWritePointer = m_VertPointer[0]; } void SetupUnit::SetupVertex() @@ -172,7 +172,18 @@ void SetupUnit::SetupPoint() void SetupUnit::DoState(PointerWrap &p) { - p.Do(m_PrimType); + // TODO: some or all of this is making the save states stop working once dolphin is closed...sometimes (usually) + // I have no idea what specifically is wrong, or if this is even important. Disabling it doesn't seem to make any noticible difference... +/* p.Do(m_PrimType); p.Do(m_VertexCounter); - p.DoArray(m_Vertices, sizeof m_Vertices); -} \ No newline at end of file + for (int i = 0; i < 3; ++i) + m_Vertices[i].DoState(p); + + if (p.GetMode() == PointerWrap::MODE_READ) + { + m_VertPointer[0] = &m_Vertices[0]; + m_VertPointer[1] = &m_Vertices[1]; + m_VertPointer[2] = &m_Vertices[2]; + m_VertWritePointer = m_VertPointer[0]; + }*/ +} diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index 927f8931e9..0f4b4fce20 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -827,3 +827,31 @@ void Tev::SetRegColor(int reg, int comp, bool konst, s16 color) Reg[reg][comp] = color; } } + +void Tev::DoState(PointerWrap &p) +{ + p.DoArray(Reg, sizeof(Reg)); + + p.DoArray(KonstantColors, sizeof(KonstantColors)); + p.DoArray(TexColor,4); + p.DoArray(RasColor,4); + p.DoArray(StageKonst,4); + p.DoArray(Zero16,4); + + p.DoArray(FixedConstants,9); + p.Do(AlphaBump); + p.DoArray(IndirectTex, sizeof(IndirectTex)); + p.Do(TexCoord); + + p.DoArray(m_BiasLUT,4); + p.DoArray(m_ScaleLShiftLUT,4); + p.DoArray(m_ScaleRShiftLUT,4); + + p.DoArray(Position,3); + p.DoArray(Color, sizeof(Color)); + p.DoArray(Uv, 8); + p.DoArray(IndirectLod,4); + p.DoArray(IndirectLinear,4); + p.DoArray(TextureLod,16); + p.DoArray(TextureLinear,16); +} diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h index bdd265170c..1d1bc8d2ba 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h @@ -19,6 +19,7 @@ #define _TEV_H_ #include "BPMemLoader.h" +#include "ChunkFile.h" class Tev { @@ -96,6 +97,8 @@ public: void SetRegColor(int reg, int comp, bool konst, s16 color); enum { ALP_C, BLU_C, GRN_C, RED_C }; + + void DoState(PointerWrap &p); }; #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h index 3a36a13307..80460edd60 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h @@ -20,6 +20,7 @@ #include #include +#include "ChunkFile.h" class Vec3 { @@ -111,6 +112,12 @@ public: { memset((void *)this,0,sizeof(float)*3); } + void DoState(PointerWrap &p) + { + p.Do(x); + p.Do(y); + p.Do(z); + } }; #endif From 717b9768750dfef39120d4457a832ce7558bd879 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 26 Feb 2013 13:49:00 -0600 Subject: [PATCH 616/627] ARM Support without GLSL --- CMakeLists.txt | 344 +-- Source/Core/AudioCommon/CMakeLists.txt | 5 + Source/Core/AudioCommon/Src/AudioCommon.cpp | 7 +- .../Core/AudioCommon/Src/OpenSLESStream.cpp | 145 ++ Source/Core/AudioCommon/Src/OpenSLESStream.h | 48 + Source/Core/Common/CMakeLists.txt | 23 +- Source/Core/Common/Common.vcxproj | 9 +- Source/Core/Common/Common.vcxproj.filters | 9 +- Source/Core/Common/Src/ArmCPUDetect.cpp | 160 ++ Source/Core/Common/Src/ArmEmitter.cpp | 967 ++++++++ Source/Core/Common/Src/ArmEmitter.h | 587 +++++ Source/Core/Common/Src/CPUDetect.h | 23 +- Source/Core/Common/Src/Common.h | 6 +- Source/Core/Common/Src/CommonFuncs.h | 14 +- Source/Core/Common/Src/CommonPaths.h | 5 + Source/Core/Common/Src/FPURoundMode.h | 51 + Source/Core/Common/Src/FileUtil.cpp | 5 +- .../Core/Common/Src/GenericFPURoundMode.cpp | 41 + Source/Core/Common/Src/LogManager.cpp | 7 +- Source/Core/Common/Src/MathUtil.cpp | 24 - Source/Core/Common/Src/MathUtil.h | 13 +- Source/Core/Common/Src/MemArena.cpp | 34 + Source/Core/Common/Src/MemoryUtil.cpp | 5 +- Source/Core/Common/Src/StdConditionVariable.h | 2 +- Source/Core/Common/Src/StdMutex.h | 2 +- Source/Core/Common/Src/StdThread.h | 2 +- Source/Core/Common/Src/StringUtil.cpp | 38 +- Source/Core/Common/Src/Thread.cpp | 2 +- Source/Core/Common/Src/Thread.h | 2 - .../Core/Common/Src/{ABI.cpp => x64ABI.cpp} | 2 +- Source/Core/Common/Src/{ABI.h => x64ABI.h} | 0 .../Src/{CPUDetect.cpp => x64CPUDetect.cpp} | 6 +- Source/Core/Common/Src/x64Emitter.cpp | 2 +- Source/Core/Common/Src/x64Emitter.h | 2 +- Source/Core/Common/Src/x64FPURoundMode.cpp | 120 + .../Common/Src/{Thunk.cpp => x64Thunk.cpp} | 3 +- Source/Core/Core/CMakeLists.txt | 36 +- Source/Core/Core/Core.vcxproj | 12 +- Source/Core/Core/Core.vcxproj.filters | 9 +- Source/Core/Core/Src/ArmMemTools.cpp | 103 + Source/Core/Core/Src/ConfigManager.h | 2 +- Source/Core/Core/Src/Core.cpp | 7 +- Source/Core/Core/Src/DSP/DSPEmitter.cpp | 2 +- Source/Core/Core/Src/DSP/DSPHWInterface.cpp | 2 + .../Core/Src/DSP/Jit/DSPJitArithmetic.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp | 2 +- .../Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp | 2 +- .../Core/Src/DSP/Jit/DSPJitMultiplier.cpp | 2 +- Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp | 2 +- Source/Core/Core/Src/HW/Memmap.cpp | 126 - Source/Core/Core/Src/HW/Memmap.h | 5 - .../Interpreter/Interpreter_FloatingPoint.cpp | 4 +- .../Interpreter/Interpreter_LoadStore.cpp | 21 +- .../Interpreter_SystemRegisters.cpp | 51 +- .../Interpreter/Interpreter_Tables.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp | 4 +- Source/Core/Core/Src/PowerPC/Jit64/Jit.h | 2 +- Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp | 6 +- Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h | 1 - .../Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp | 2 +- .../PowerPC/Jit64/Jit_LoadStoreFloating.cpp | 2 +- .../Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp | 2 +- .../Src/PowerPC/Jit64/Jit_SystemRegisters.cpp | 2 +- .../Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp | 10 +- .../Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h | 2 +- .../Core/Src/PowerPC/Jit64IL/JitILAsm.cpp | 8 +- .../Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp | 2 +- .../Jit64IL/JitIL_LoadStoreFloating.cpp | 2 +- .../PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp | 2 +- .../PowerPC/Jit64IL/JitIL_SystemRegisters.cpp | 2 +- Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 498 ++++ Source/Core/Core/Src/PowerPC/JitArm32/Jit.h | 186 ++ .../Core/Src/PowerPC/JitArm32/JitArmCache.cpp | 46 + .../Core/Src/PowerPC/JitArm32/JitArmCache.h | 33 + .../Src/PowerPC/JitArm32/JitArm_BackPatch.cpp | 164 ++ .../Src/PowerPC/JitArm32/JitArm_Branch.cpp | 347 +++ .../PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 80 + .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 297 +++ .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 414 ++++ .../JitArm32/JitArm_LoadStoreFloating.cpp | 72 + .../JitArm32/JitArm_SystemRegisters.cpp | 111 + .../Src/PowerPC/JitArm32/JitArm_Tables.cpp | 502 ++++ .../Core/Src/PowerPC/JitArm32/JitArm_Tables.h | 29 + .../Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp | 174 ++ .../Core/Core/Src/PowerPC/JitArm32/JitAsm.h | 43 + .../Core/Src/PowerPC/JitArm32/JitRegCache.cpp | 167 ++ .../Core/Src/PowerPC/JitArm32/JitRegCache.h | 92 + .../Src/PowerPC/JitCommon/JitAsmCommon.cpp | 4 +- .../Core/Src/PowerPC/JitCommon/JitAsmCommon.h | 25 +- .../Src/PowerPC/JitCommon/JitBackpatch.cpp | 4 +- .../Core/Src/PowerPC/JitCommon/JitBackpatch.h | 4 + .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 26 +- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 94 +- .../Core/Src/PowerPC/JitCommon/JitCache.h | 16 +- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 2 +- Source/Core/Core/Src/PowerPC/JitInterface.cpp | 350 +++ Source/Core/Core/Src/PowerPC/JitInterface.h | 56 + Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp | 3 +- Source/Core/Core/Src/PowerPC/PPCCache.cpp | 7 +- Source/Core/Core/Src/PowerPC/PPCTables.cpp | 18 +- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 70 +- Source/Core/Core/Src/PowerPC/Profiler.cpp | 78 +- Source/Core/Core/Src/PowerPC/Profiler.h | 9 + .../Src/{MemTools.cpp => x64MemTools.cpp} | 12 +- Source/Core/DiscIO/Src/BannerLoader.cpp | 6 + Source/Core/DolphinWX/CMakeLists.txt | 187 +- .../DolphinWX/Src/Debugger/CodeWindow.cpp | 14 +- Source/Core/DolphinWX/Src/Frame.cpp | 2 +- Source/Core/DolphinWX/Src/GLInterface.h | 13 +- .../Src/GLInterface/{EGL.cpp => EGL_X11.cpp} | 2 +- .../Src/GLInterface/{EGL.h => EGL_X11.h} | 0 .../DolphinWX/Src/GLInterface/InterfaceBase.h | 10 +- Source/Core/DolphinWX/Src/MainAndroid.cpp | 149 ++ Source/Core/VideoCommon/CMakeLists.txt | 10 +- Source/Core/VideoCommon/Src/Fifo.cpp | 6 +- .../Core/VideoCommon/Src/GenericDLCache.cpp | 52 + .../VideoCommon/Src/GenericTextureDecoder.cpp | 2182 +++++++++++++++++ Source/Core/VideoCommon/Src/VertexLoader.cpp | 18 +- Source/Core/VideoCommon/Src/VertexLoader.h | 7 + .../Src/{DLCache.cpp => x64DLCache.cpp} | 2 +- ...xtureDecoder.cpp => x64TextureDecoder.cpp} | 93 - Source/Core/VideoCommon/VideoCommon.vcxproj | 10 +- .../VideoCommon/VideoCommon.vcxproj.filters | 12 +- .../Src/NativeVertexFormat.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 +- .../Src/NativeVertexFormat.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 4 + .../Src/OpcodeDecoder.cpp | 6 +- .../Src/SWCommandProcessor.cpp | 6 +- 133 files changed, 9048 insertions(+), 948 deletions(-) create mode 100644 Source/Core/AudioCommon/Src/OpenSLESStream.cpp create mode 100644 Source/Core/AudioCommon/Src/OpenSLESStream.h create mode 100644 Source/Core/Common/Src/ArmCPUDetect.cpp create mode 100644 Source/Core/Common/Src/ArmEmitter.cpp create mode 100644 Source/Core/Common/Src/ArmEmitter.h create mode 100644 Source/Core/Common/Src/FPURoundMode.h create mode 100644 Source/Core/Common/Src/GenericFPURoundMode.cpp rename Source/Core/Common/Src/{ABI.cpp => x64ABI.cpp} (99%) rename Source/Core/Common/Src/{ABI.h => x64ABI.h} (100%) rename Source/Core/Common/Src/{CPUDetect.cpp => x64CPUDetect.cpp} (98%) create mode 100644 Source/Core/Common/Src/x64FPURoundMode.cpp rename Source/Core/Common/Src/{Thunk.cpp => x64Thunk.cpp} (98%) create mode 100644 Source/Core/Core/Src/ArmMemTools.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h create mode 100644 Source/Core/Core/Src/PowerPC/JitInterface.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitInterface.h rename Source/Core/Core/Src/{MemTools.cpp => x64MemTools.cpp} (96%) rename Source/Core/DolphinWX/Src/GLInterface/{EGL.cpp => EGL_X11.cpp} (99%) rename Source/Core/DolphinWX/Src/GLInterface/{EGL.h => EGL_X11.h} (100%) create mode 100644 Source/Core/DolphinWX/Src/MainAndroid.cpp create mode 100644 Source/Core/VideoCommon/Src/GenericDLCache.cpp create mode 100644 Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp rename Source/Core/VideoCommon/Src/{DLCache.cpp => x64DLCache.cpp} (99%) rename Source/Core/VideoCommon/Src/{TextureDecoder.cpp => x64TextureDecoder.cpp} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4598eaa9e2..ea531f030c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,9 +106,22 @@ if(DOLPHIN_IS_STABLE) else() set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION}) endif() +message(${CMAKE_SYSTEM_PROCESSOR}) +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") + set(_M_GENERIC 1) + set(_M_ARM 1) + add_definitions(-marm -march=armv7-a) + add_definitions(-D_M_ARM=1) + add_definitions(-D_M_GENERIC=1) +endif() +# Set these next two lines to test generic +#set(_M_GENERIC 1) +#add_definitions(-D_M_GENERIC=1) # Various compile flags -add_definitions(-msse2) +if(NOT _M_GENERIC) + add_definitions(-msse2) +endif() include(CheckCXXCompilerFlag) macro(check_and_add_flag var flag) @@ -258,135 +271,141 @@ if(USE_EGL) endif() add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE) +option(ANDROID "Enables a build for Android" OFF) +if(ANDROID) + message("Building for Android") + add_definitions(-DANDROID) +endif() ######################################## # Dependency checking # # TODO: We should have options for dependencies included in the externals to # override autodetection of system libraries and force the usage of the # externals. +if(NOT ANDROID) + include(CheckLib) -include(CheckLib) - -include(FindOpenGL) -include_directories(${OPENGL_INCLUDE_DIR}) -if(NOT OPENGL_GLU_FOUND) - message(FATAL_ERROR "GLU is required but not found") -endif() - -if(OPENMP) - include(FindOpenMP OPTIONAL) - if(OPENMP_FOUND) - message("OpenMP parallelization enabled") - add_definitions("${OpenMP_CXX_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}") + include(FindOpenGL) + include_directories(${OPENGL_INCLUDE_DIR}) + if(NOT OPENGL_GLU_FOUND) + message(FATAL_ERROR "GLU is required but not found") endif() -endif() -if(NOT OPENMP_FOUND) - add_definitions(-Wno-unknown-pragmas) - message("OpenMP parallelization disabled") -endif() -include(FindALSA OPTIONAL) -if(ALSA_FOUND) - add_definitions(-DHAVE_ALSA=1) - message("ALSA found, enabling ALSA sound backend") -else() - add_definitions(-DHAVE_ALSA=0) - message("ALSA NOT found, disabling ALSA sound backend") -endif(ALSA_FOUND) + if(OPENMP) + include(FindOpenMP OPTIONAL) + if(OPENMP_FOUND) + message("OpenMP parallelization enabled") + add_definitions("${OpenMP_CXX_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + endif() + if(NOT OPENMP_FOUND) + add_definitions(-Wno-unknown-pragmas) + message("OpenMP parallelization disabled") + endif() -check_lib(AO ao QUIET) -if(AO_FOUND) - add_definitions(-DHAVE_AO=1) - message("ao found, enabling ao sound backend") -else() - add_definitions(-DHAVE_AO=0) - message("ao NOT found, disabling ao sound backend") -endif(AO_FOUND) + include(FindALSA OPTIONAL) + if(ALSA_FOUND) + add_definitions(-DHAVE_ALSA=1) + message("ALSA found, enabling ALSA sound backend") + else() + add_definitions(-DHAVE_ALSA=0) + message("ALSA NOT found, disabling ALSA sound backend") + endif(ALSA_FOUND) -check_lib(BLUEZ bluez QUIET) -if(BLUEZ_FOUND) - add_definitions(-DHAVE_BLUEZ=1) - message("bluez found, enabling bluetooth support") -else() - add_definitions(-DHAVE_BLUEZ=0) - message("bluez NOT found, disabling bluetooth support") -endif(BLUEZ_FOUND) + check_lib(AO ao QUIET) + if(AO_FOUND) + add_definitions(-DHAVE_AO=1) + message("ao found, enabling ao sound backend") + else() + add_definitions(-DHAVE_AO=0) + message("ao NOT found, disabling ao sound backend") + endif(AO_FOUND) -check_lib(PULSEAUDIO libpulse-simple QUIET) -if(PULSEAUDIO_FOUND) - add_definitions(-DHAVE_PULSEAUDIO=1) - message("PulseAudio found, enabling PulseAudio sound backend") -else() - add_definitions(-DHAVE_PULSEAUDIO=0) - message("PulseAudio NOT found, disabling PulseAudio sound backend") -endif(PULSEAUDIO_FOUND) + check_lib(BLUEZ bluez QUIET) + if(BLUEZ_FOUND) + add_definitions(-DHAVE_BLUEZ=1) + message("bluez found, enabling bluetooth support") + else() + add_definitions(-DHAVE_BLUEZ=0) + message("bluez NOT found, disabling bluetooth support") + endif(BLUEZ_FOUND) -include(FindOpenAL OPTIONAL) -if(OPENAL_FOUND) - add_definitions(-DHAVE_OPENAL=1) - include_directories(${OPENAL_INCLUDE_DIR}) - message("OpenAL found, enabling OpenAL sound backend") -else() - add_definitions(-DHAVE_OPENAL=0) - message("OpenAL NOT found, disabling OpenAL sound backend") -endif(OPENAL_FOUND) + check_lib(PULSEAUDIO libpulse QUIET) + if(PULSEAUDIO_FOUND) + add_definitions(-DHAVE_PULSEAUDIO=1) + message("PulseAudio found, enabling PulseAudio sound backend") + else() + add_definitions(-DHAVE_PULSEAUDIO=0) + message("PulseAudio NOT found, disabling PulseAudio sound backend") + endif(PULSEAUDIO_FOUND) + + include(FindOpenAL OPTIONAL) + if(OPENAL_FOUND) + add_definitions(-DHAVE_OPENAL=1) + include_directories(${OPENAL_INCLUDE_DIR}) + message("OpenAL found, enabling OpenAL sound backend") + else() + add_definitions(-DHAVE_OPENAL=0) + message("OpenAL NOT found, disabling OpenAL sound backend") + endif(OPENAL_FOUND) # Note: We do not need to explicitly check for X11 as it is done in the cmake # FindOpenGL module on linux. -if(UNIX AND NOT APPLE) + if(UNIX AND NOT APPLE) + if(X11_FOUND) + add_definitions(-DHAVE_X11=1) + include_directories(${X11_INCLUDE_DIR}) + message("X11 found") + else() + message(FATAL_ERROR "X11 is required but not found") + endif(X11_FOUND) + else() + add_definitions(-DHAVE_X11=0) + endif() + if(X11_FOUND) - add_definitions(-DHAVE_X11=1) - include_directories(${X11_INCLUDE_DIR}) - message("X11 found") + check_lib(XRANDR Xrandr) + endif() + if(XRANDR_FOUND) + add_definitions(-DHAVE_XRANDR=1) else() - message(FATAL_ERROR "X11 is required but not found") - endif(X11_FOUND) -else() - add_definitions(-DHAVE_X11=0) -endif() + add_definitions(-DHAVE_XRANDR=0) + endif(XRANDR_FOUND) -if(X11_FOUND) - check_lib(XRANDR Xrandr) -endif() -if(XRANDR_FOUND) - add_definitions(-DHAVE_XRANDR=1) -else() - add_definitions(-DHAVE_XRANDR=0) -endif(XRANDR_FOUND) + if(ENCODE_FRAMEDUMPS) + check_libav() + endif() -if(ENCODE_FRAMEDUMPS) - check_libav() -endif() - -include(CheckCXXSourceRuns) -set(CMAKE_REQUIRED_LIBRARIES portaudio) -CHECK_CXX_SOURCE_RUNS( - "#include - int main(int argc, char **argv) - { if(Pa_GetVersion() >= 1890) return 0; else return 1; }" - PORTAUDIO) -if(PORTAUDIO) - message("PortAudio found, enabling mic support") - add_definitions(-DHAVE_PORTAUDIO=1) - set(PORTAUDIO_FOUND TRUE) -else() - message("PortAudio not found, disabling mic support") - add_definitions(-DHAVE_PORTAUDIO=0) - set(PORTAUDIO_FOUND FALSE) -endif(PORTAUDIO) - -if(OPROFILING) - check_lib(OPROFILE opagent opagent.h) - check_lib(BFD bfd bfd.h) - if(OPROFILE_FOUND AND BFD_FOUND) - message("oprofile found, enabling profiling support") - add_definitions(-DUSE_OPROFILE=1) + include(CheckCXXSourceRuns) + set(CMAKE_REQUIRED_LIBRARIES portaudio) + CHECK_CXX_SOURCE_RUNS( + "#include + int main(int argc, char **argv) + { if(Pa_GetVersion() >= 1890) return 0; else return 1; }" + PORTAUDIO) + if(PORTAUDIO) + message("PortAudio found, enabling mic support") + add_definitions(-DHAVE_PORTAUDIO=1) + set(PORTAUDIO_FOUND TRUE) else() - message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.") + message("PortAudio not found, disabling mic support") + add_definitions(-DHAVE_PORTAUDIO=0) + set(PORTAUDIO_FOUND FALSE) + endif(PORTAUDIO) + + option(OPROFILING "Enable profiling" OFF) + if(OPROFILING) + check_lib(OPROFILE opagent opagent.h) + check_lib(BFD bfd bfd.h) + if(OPROFILE_FOUND AND BFD_FOUND) + message("oprofile found, enabling profiling support") + add_definitions(-DUSE_OPROFILE=1) + else() + message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.") + endif() endif() endif() - ######################################## # Setup include directories (and make sure they are preferred over the Externals) # @@ -401,7 +420,6 @@ include_directories(Source/Core/InputCommon/Src) include_directories(Source/Core/VideoCommon/Src) include_directories(Source/Core/VideoUICommon/Src) - ######################################## # Process externals and setup their include directories # @@ -415,7 +433,7 @@ include_directories(Source/Core/VideoUICommon/Src) add_subdirectory(Externals/Bochs_disasm) include_directories(Externals/Bochs_disasm) -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) check_lib(LZO lzo2 lzo/lzo1x.h QUIET) endif() if(LZO_FOUND) @@ -440,15 +458,16 @@ if(OPENAL_FOUND) endif() endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - include(FindSDL2 OPTIONAL) -endif() -if(SDL2_FOUND) - message("Using shared SDL2") - include_directories(${SDL2_INCLUDE_DIR}) -else(SDL2_FOUND) - # SDL2 not found, try SDL +if(NOT ANDROID) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(FindSDL2 OPTIONAL) + endif() + if(SDL2_FOUND) + message("Using shared SDL2") + include_directories(${SDL2_INCLUDE_DIR}) + else(SDL2_FOUND) + # SDL2 not found, try SDL + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindSDL OPTIONAL) endif() if(SDL_FOUND) @@ -460,12 +479,13 @@ else(SDL2_FOUND) include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include) add_subdirectory(Externals/SDL) endif(SDL_FOUND) -endif(SDL2_FOUND) + endif(SDL2_FOUND) +endif() set(SFML_FIND_VERSION TRUE) set(SFML_FIND_VERSION_MAJOR 1) set(SFML_FIND_VERSION_MINOR 5) -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) include(FindSFML OPTIONAL) endif() if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR @@ -476,7 +496,7 @@ else() include_directories(Externals/SFML/include) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) check_lib(SOIL SOIL SOIL/SOIL.h QUIET) endif() if(SOIL_FOUND) @@ -506,26 +526,19 @@ if(WIN32) find_library(GLEW glew32s PATHS Externals/GLew) include_directories(Externals/GLew/include) else() - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(GLEW GLEW GL/glew.h) + if(NOT ANDROID) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(GLEW GLEW GL/glew.h) + endif() + if(NOT GLEW_FOUND) + message("Using static GLEW from Externals") + add_subdirectory(Externals/GLew) + include_directories(Externals/GLew/include) + endif(NOT GLEW_FOUND) endif() - if(NOT GLEW_FOUND) - message("Using static GLEW from Externals") - add_subdirectory(Externals/GLew) - include_directories(Externals/GLew/include) - endif(NOT GLEW_FOUND) - - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(CG Cg Cg/cg.h) - endif() - if(NOT CG_FOUND) - message("Using static Cg from Externals") - include_directories(Externals) - endif(NOT CG_FOUND) - check_lib(CGGL CgGL Cg/cgGL.h) endif() -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) find_library(CL OpenCL) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL") else() @@ -533,10 +546,25 @@ else() add_subdirectory(Externals/CLRun) endif() -if(NOT DISABLE_WX) +if(NOT DISABLE_WX AND NOT ANDROID) include(FindwxWidgets OPTIONAL) FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) + if(wxWidgets_FOUND) + EXECUTE_PROCESS( + COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" + ${wxWidgets_CONFIG_OPTIONS} --version + OUTPUT_VARIABLE wxWidgets_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + message("Found wxWidgets version ${wxWidgets_VERSION}") + if(${wxWidgets_VERSION} VERSION_LESS "2.8.9") + message("At least 2.8.9 is required; ignoring found version") + unset(wxWidgets_FOUND) + endif() + endif(wxWidgets_FOUND) + if(wxWidgets_FOUND) EXECUTE_PROCESS( COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" @@ -557,26 +585,26 @@ if(NOT DISABLE_WX) endif() endif(wxWidgets_FOUND) - if(UNIX AND NOT APPLE) - # There is a bug in the FindGTK module in cmake version 2.8.2 that - # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 - # users have complained that pkg-config does not find - # gdk-pixbuf-2.0. On yet another hand, cmake version 2.8.3 in - # Ubuntu Natty does not find the glib libraries correctly. - # Ugly!!! - execute_process(COMMAND lsb_release -c -s - OUTPUT_VARIABLE DIST_NAME - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} - VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty") - check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED) - else() - include(FindGTK2) - if(GTK2_FOUND) - include_directories(${GTK2_INCLUDE_DIRS}) + if(UNIX AND NOT APPLE) + # There is a bug in the FindGTK module in cmake version 2.8.2 that + # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3 + # users have complained that pkg-config does not find + # gdk-pixbuf-2.0. On yet another hand, cmake version 2.8.3 in + # Ubuntu Natty does not find the glib libraries correctly. + # Ugly!!! + execute_process(COMMAND lsb_release -c -s + OUTPUT_VARIABLE DIST_NAME + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} + VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty") + check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED) + else() + include(FindGTK2) + if(GTK2_FOUND) + include_directories(${GTK2_INCLUDE_DIRS}) + endif() endif() endif() - endif() if(wxWidgets_FOUND) include(${wxWidgets_USE_FILE}) @@ -608,7 +636,7 @@ if(NOT DISABLE_WX) set(wxWidgets_LIBRARIES "wx") endif(wxWidgets_FOUND) add_definitions(-DHAVE_WX=1) -endif(NOT DISABLE_WX) +endif(NOT DISABLE_WX AND NOT ANDROID) ######################################## @@ -682,4 +710,4 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}") # CPack must be included after the CPACK_* variables are set in order for those # variables to take effect. -include(CPack) +Include(CPack) diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index 3b6d0cea4d..939956460d 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -6,6 +6,11 @@ set(SRCS Src/AudioCommon.cpp set(LIBS "") +if(ANDROID) + set(SRCS ${SRCS} Src/OpenSLESStream.cpp) + set(LIBS ${LIBS} OpenSLES) +endif(ANDROID) + if(ALSA_FOUND) set(SRCS ${SRCS} Src/AlsaSoundStream.cpp) set(LIBS ${LIBS} ${ALSA_LIBRARIES}) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index e14b9ac45e..2f299d0edb 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -26,6 +26,7 @@ #include "CoreAudioSoundStream.h" #include "OpenALStream.h" #include "PulseAudioStream.h" +#include "OpenSLESStream.h" #include "../../Core/Src/Movie.h" #include "../../Core/Src/ConfigManager.h" @@ -55,7 +56,8 @@ namespace AudioCommon soundStream = new CoreAudioSound(mixer); else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) soundStream = new PulseAudio(mixer); - + else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid()) + soundStream = new OpenSLESStream(mixer); if (soundStream != NULL) { UpdateSoundStream(); @@ -116,7 +118,8 @@ namespace AudioCommon backends.push_back(BACKEND_PULSEAUDIO); if (OpenALStream::isValid()) backends.push_back(BACKEND_OPENAL); - + if (OpenSLESStream::isValid()) + backends.push_back(BACKEND_OPENSLES); return backends; } diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp new file mode 100644 index 0000000000..b0913a1895 --- /dev/null +++ b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp @@ -0,0 +1,145 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifdef ANDROID +#include "Common.h" +#include +#include "OpenSLESStream.h" + +#include +#include + +// engine interfaces +static SLObjectItf engineObject; +static SLEngineItf engineEngine; +static SLObjectItf outputMixObject; + +// buffer queue player interfaces +static SLObjectItf bqPlayerObject = NULL; +static SLPlayItf bqPlayerPlay; +static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue; +static SLMuteSoloItf bqPlayerMuteSolo; +static SLVolumeItf bqPlayerVolume; +static CMixer *g_mixer; +#define BUFFER_SIZE 512 +#define BUFFER_SIZE_IN_SAMPLES (BUFFER_SIZE / 2) + +// Double buffering. +static short buffer[2][BUFFER_SIZE]; +static int curBuffer = 0; + +static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) { + assert(bq == bqPlayerBufferQueue); + assert(NULL == context); + + short *nextBuffer = buffer[curBuffer]; + int nextSize = sizeof(buffer[0]); + + SLresult result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, nextBuffer, nextSize); + + // Comment from sample code: + // the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT, + // which for this code example would indicate a programming error + assert(SL_RESULT_SUCCESS == result); + + curBuffer ^= 1; // Switch buffer + // Render to the fresh buffer + g_mixer->Mix(reinterpret_cast(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES); +} +bool OpenSLESStream::Start() +{ + SLresult result; + // create engine + result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL); + assert(SL_RESULT_SUCCESS == result); + result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine); + assert(SL_RESULT_SUCCESS == result); + result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, 0, 0); + assert(SL_RESULT_SUCCESS == result); + result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + + SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2}; + SLDataFormat_PCM format_pcm = { + SL_DATAFORMAT_PCM, + 2, + SL_SAMPLINGRATE_44_1, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT, + SL_BYTEORDER_LITTLEENDIAN + }; + + SLDataSource audioSrc = {&loc_bufq, &format_pcm}; + + // configure audio sink + SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject}; + SLDataSink audioSnk = {&loc_outmix, NULL}; + + // create audio player + const SLInterfaceID ids[2] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME}; + const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE}; + result = (*engineEngine)->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req); + assert(SL_RESULT_SUCCESS == result); + + result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE, + &bqPlayerBufferQueue); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL); + assert(SL_RESULT_SUCCESS == result); + result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING); + assert(SL_RESULT_SUCCESS == result); + + // Render and enqueue a first buffer. (or should we just play the buffer empty?) + curBuffer = 0; + + result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[curBuffer], sizeof(buffer[curBuffer])); + if (SL_RESULT_SUCCESS != result) { + return false; + } + curBuffer ^= 1; + g_mixer = m_mixer; + return true; +} + +void OpenSLESStream::Stop() +{ + if (bqPlayerObject != NULL) { + (*bqPlayerObject)->Destroy(bqPlayerObject); + bqPlayerObject = NULL; + bqPlayerPlay = NULL; + bqPlayerBufferQueue = NULL; + bqPlayerMuteSolo = NULL; + bqPlayerVolume = NULL; + } + if (outputMixObject != NULL) { + (*outputMixObject)->Destroy(outputMixObject); + outputMixObject = NULL; + } + if (engineObject != NULL) { + (*engineObject)->Destroy(engineObject); + engineObject = NULL; + engineEngine = NULL; + } +} +#endif diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.h b/Source/Core/AudioCommon/Src/OpenSLESStream.h new file mode 100644 index 0000000000..f49160c4bc --- /dev/null +++ b/Source/Core/AudioCommon/Src/OpenSLESStream.h @@ -0,0 +1,48 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _OPENSLSTREAM_H_ +#define _OPENSLSTREAM_H_ + +#include "Thread.h" +#include "SoundStream.h" + +class OpenSLESStream : public SoundStream +{ +#ifdef ANDROID +public: + OpenSLESStream(CMixer *mixer, void *hWnd = NULL) + : SoundStream(mixer) + {}; + + virtual ~OpenSLESStream() {}; + + virtual bool Start(); + virtual void Stop(); + static bool isValid() { return true; } + virtual bool usesMixer() const { return true; } + +private: + std::thread thread; + Common::Event soundSyncEvent; +#else +public: + OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {} +#endif // HAVE_OPENSL +}; + +#endif diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 92d2bec668..480a08a0fc 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -1,9 +1,7 @@ -set(SRCS Src/ABI.cpp - Src/BreakPoints.cpp +set(SRCS Src/BreakPoints.cpp Src/CDUtils.cpp Src/ColorUtil.cpp Src/ConsoleListener.cpp - Src/CPUDetect.cpp Src/FileSearch.cpp Src/FileUtil.cpp Src/Hash.cpp @@ -20,10 +18,10 @@ set(SRCS Src/ABI.cpp Src/SymbolDB.cpp Src/SysConf.cpp Src/Thread.cpp - Src/Thunk.cpp Src/Timer.cpp Src/Version.cpp Src/VideoBackendBase.cpp + Src/x64ABI.cpp Src/x64Analyzer.cpp Src/x64Emitter.cpp Src/Crypto/aes_cbc.cpp @@ -33,6 +31,23 @@ set(SRCS Src/ABI.cpp Src/Crypto/md5.cpp Src/Crypto/sha1.cpp) +if(_M_ARM) #ARM + set(SRCS ${SRCS} + Src/ArmCPUDetect.cpp + Src/ArmEmitter.cpp) +else() + if(NOT _M_GENERIC) #X86 + set(SRCS ${SRCS} + Src/x64FPURoundMode.cpp + Src/x64Thunk.cpp + ) + endif() + set(SRCS ${SRCS} Src/x64CPUDetect.cpp) +endif() +if(_M_GENERIC) #Generic + set(SRCS ${SRCS} + Src/GenericFPURoundMode.cpp) +endif() if(WIN32) set(SRCS ${SRCS} Src/ExtendedTrace.cpp) endif(WIN32) diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 0128a75a09..626a4df909 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -158,12 +158,10 @@ - - @@ -195,15 +193,17 @@ - + + + + - @@ -251,6 +251,7 @@ + diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 8b05ecbba4..d427b70cdd 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -1,11 +1,9 @@  - - @@ -23,7 +21,6 @@ - @@ -53,9 +50,12 @@ Crypto + + + + - @@ -121,6 +121,7 @@ + diff --git a/Source/Core/Common/Src/ArmCPUDetect.cpp b/Source/Core/Common/Src/ArmCPUDetect.cpp new file mode 100644 index 0000000000..c03ab08c48 --- /dev/null +++ b/Source/Core/Common/Src/ArmCPUDetect.cpp @@ -0,0 +1,160 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "CPUDetect.h" +#include "StringUtil.h" + +const char procfile[] = "/proc/cpuinfo"; + +char *GetCPUString() +{ + const char marker[] = "Hardware\t: "; + char *cpu_string = 0; + // Count the number of processor lines in /proc/cpuinfo + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + cpu_string = buf + sizeof(marker) - 1; + cpu_string = strndup(cpu_string, strlen(cpu_string) - 1); // Strip the newline + break; + } + return cpu_string; +} +bool CheckCPUFeature(const char *feature) +{ + const char marker[] = "Features\t: "; + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + char *featurestring = buf + sizeof(marker) - 1; + char *token = strtok(featurestring, " "); + while (token != NULL) + { + if (strstr(token, feature)) + return true; + token = strtok(NULL, " "); + } + } + return false; +} +int GetCoreCount() +{ + const char marker[] = "processor\t: "; + int cores = 0; + char buf[1024]; + FILE *fp; + + fp = fopen(procfile, "r"); + if (!fp) + return 0; + + while (fgets(buf, sizeof(buf), fp)) + { + if (strncmp(buf, marker, sizeof(marker) - 1)) + continue; + ++cores; + } + return cores; +} + +CPUInfo cpu_info; + +CPUInfo::CPUInfo() { + Detect(); +} + +// Detects the various cpu features +void CPUInfo::Detect() +{ + // Set some defaults here + // When ARMv8 cpus come out, these need to be updated. + HTT = false; + OS64bit = false; + CPU64bit = false; + Mode64bit = false; + vendor = VENDOR_ARM; + + // Get the information about the CPU + strncpy(cpu_string, GetCPUString(), sizeof(cpu_string)); + num_cores = GetCoreCount(); + bSwp = CheckCPUFeature("swp"); + bHalf = CheckCPUFeature("half"); + bThumb = CheckCPUFeature("thumb"); + bFastMult = CheckCPUFeature("fastmult"); + bVFP = CheckCPUFeature("vfp"); + bEDSP = CheckCPUFeature("edsp"); + bThumbEE = CheckCPUFeature("thumbee"); + bNEON = CheckCPUFeature("neon"); + bVFPv3 = CheckCPUFeature("vfpv3"); + bTLS = CheckCPUFeature("tls"); + bVFPv4 = CheckCPUFeature("vfpv4"); + bIDIVa = CheckCPUFeature("idiva"); + bIDIVt = CheckCPUFeature("idivt"); + // These two are ARMv8 specific. + bFP = CheckCPUFeature("fp"); + bASIMD = CheckCPUFeature("asimd"); + + +#if defined(__ARM_ARCH_7A__) + bArmV7 = true; +#else + bArmV7 = false; +#endif +} + +// Turn the cpu info into a string we can show +std::string CPUInfo::Summarize() +{ + std::string sum; + if (num_cores == 1) + sum = StringFromFormat("%s, %i core", cpu_string, num_cores); + else + sum = StringFromFormat("%s, %i cores", cpu_string, num_cores); + + if (bSwp) sum += ", SWP"; + if (bHalf) sum += ", Half"; + if (bThumb) sum += ", Thumb"; + if (bFastMult) sum += ", FastMult"; + if (bVFP) sum += ", VFP"; + if (bEDSP) sum += ", EDSP"; + if (bThumbEE) sum += ", ThumbEE"; + if (bNEON) sum += ", NEON"; + if (bVFPv3) sum += ", VFPv3"; + if (bTLS) sum += ", TLS"; + if (bVFPv4) sum += ", VFPv4"; + if (bIDIVa) sum += ", IDIVa"; + if (bIDIVt) sum += ", IDIVt"; + + return sum; +} diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp new file mode 100644 index 0000000000..6463dbe2ef --- /dev/null +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -0,0 +1,967 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "ArmEmitter.h" +#include "CPUDetect.h" + +#include +#include + +// For cache flushing on Symbian/Blackberry +#ifdef __SYMBIAN32__ +#include +#endif + +#ifdef BLACKBERRY +#include +#endif + +namespace ArmGen +{ + +inline u32 RotR(u32 a, int amount) { + if (!amount) return a; + return (a >> amount) | (a << (32 - amount)); +} + +inline u32 RotL(u32 a, int amount) { + if (!amount) return a; + return (a << amount) | (a >> (32 - amount)); +} + +bool TryMakeOperand2(u32 imm, Operand2 &op2) { + // Just brute force it. + for (int i = 0; i < 16; i++) { + int mask = RotR(0xFF, i * 2); + if ((imm & mask) == imm) { + op2 = Operand2((u8)(RotL(imm, i * 2)), (u8)i); + return true; + } + } + return false; +} + +bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse) +{ + if (!TryMakeOperand2(imm, op2)) { + *inverse = true; + return TryMakeOperand2(~imm, op2); + } else { + *inverse = false; + return true; + } +} + +bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated) +{ + if (!TryMakeOperand2(imm, op2)) { + *negated = true; + return TryMakeOperand2(-imm, op2); + } else { + *negated = false; + return true; + } +} + +void ARMXEmitter::MOVI2R(ARMReg reg, u32 val, bool optimize) +{ + Operand2 op2; + bool inverse; + if (!optimize) + { + // Only used in backpatch atm + // Only support ARMv7 right now + if (cpu_info.bArmV7) { + MOVW(reg, val & 0xFFFF); + MOVT(reg, val, true); + } + else + { + // ARMv6 version won't use backpatch for now + // Run again with optimizations + MOVI2R(reg, val); + } + } else if (TryMakeOperand2_AllowInverse(val, op2, &inverse)) { + if (!inverse) + MOV(reg, op2); + else + MVN(reg, op2); + } else { + if (cpu_info.bArmV7) { + // ARMv7 - can use MOVT/MOVW, best choice + MOVW(reg, val & 0xFFFF); + if(val & 0xFFFF0000) + MOVT(reg, val, true); + } else { + // ARMv6 - fallback sequence. + // TODO: Optimize further. Can for example choose negation etc. + // Literal pools is another way to do this but much more complicated + // so I can't really be bothered for an outdated CPU architecture like ARMv6. + bool first = true; + int shift = 16; + for (int i = 0; i < 4; i++) { + if (val & 0xFF) { + if (first) { + MOV(reg, Operand2((u8)val, (u8)(shift & 0xF))); + first = false; + } else { + ORR(reg, reg, Operand2((u8)val, (u8)(shift & 0xF))); + } + } + shift -= 4; + val >>= 8; + } + } + } +} +// Moves IMM to memory location +void ARMXEmitter::ARMABI_MOVI2M(Operand2 op, Operand2 val) +{ + // This moves imm to a memory location + MOVW(R14, val); MOVT(R14, val, true); + MOVW(R12, op); MOVT(R12, op, true); + STR(R12, R14); // R10 is what we want to store +} +void ARMXEmitter::QuickCallFunction(ARMReg reg, void *func) { + MOVI2R(reg, (u32)(func)); + BL(reg); +} + +void ARMXEmitter::SetCodePtr(u8 *ptr) +{ + code = ptr; + startcode = code; +} + +const u8 *ARMXEmitter::GetCodePtr() const +{ + return code; +} + +u8 *ARMXEmitter::GetWritableCodePtr() +{ + return code; +} + +void ARMXEmitter::ReserveCodeSpace(u32 bytes) +{ + for (u32 i = 0; i < bytes/4; i++) + Write32(0xE1200070); //bkpt 0 +} + +const u8 *ARMXEmitter::AlignCode16() +{ + ReserveCodeSpace((-(s32)code) & 15); + return code; +} + +const u8 *ARMXEmitter::AlignCodePage() +{ + ReserveCodeSpace((-(s32)code) & 4095); + return code; +} + +void ARMXEmitter::FlushIcache() +{ + FlushIcacheSection(lastCacheFlushEnd, code); + lastCacheFlushEnd = code; +} + +void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end) +{ +#ifdef __SYMBIAN32__ + User::IMB_Range( start, end); +#elif defined(BLACKBERRY) + msync(start, end - start, MS_SYNC | MS_INVALIDATE_ICACHE); +#else +#ifndef _WIN32 +#ifdef ANDROID + __builtin___clear_cache (start, end); +#else + // If on Linux, we HAVE to clear from start addr or else everything gets /really/ unstable + __builtin___clear_cache (startcode, end); +#endif +#endif +#endif +} + +void ARMXEmitter::SetCC(CCFlags cond) +{ + condition = cond << 28; +} + +void ARMXEmitter::NOP(int count) +{ + for (int i = 0; i < count; i++) { + Write32(condition | 0x01A00000); + } +} + +void ARMXEmitter::SETEND(bool BE) +{ + //SETEND is non-conditional + Write32( 0xF1010000 | (BE << 9)); +} +void ARMXEmitter::BKPT(u16 arg) +{ + Write32(condition | 0x01200070 | (arg << 4 & 0x000FFF00) | (arg & 0x0000000F)); +} +void ARMXEmitter::YIELD() +{ + Write32(condition | 0x0320F001); +} + +FixupBranch ARMXEmitter::B() +{ + FixupBranch branch; + branch.type = 0; // Zero for B + branch.ptr = code; + branch.condition = condition; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +FixupBranch ARMXEmitter::BL() +{ + FixupBranch branch; + branch.type = 1; // Zero for B + branch.ptr = code; + branch.condition = condition; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} + +FixupBranch ARMXEmitter::B_CC(CCFlags Cond) +{ + FixupBranch branch; + branch.type = 0; // Zero for B + branch.ptr = code; + branch.condition = Cond << 28; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "B_CC out of range (%p calls %p)", code, fnptr); + + Write32((Cond << 28) | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); +} +FixupBranch ARMXEmitter::BL_CC(CCFlags Cond) +{ + FixupBranch branch; + branch.type = 1; // Zero for B + branch.ptr = code; + branch.condition = Cond << 28; + //We'll write NOP here for now. + Write32(condition | 0x01A00000); + return branch; +} +void ARMXEmitter::SetJumpTarget(FixupBranch const &branch) +{ + s32 distance = (s32(code) - 8) - (s32)branch.ptr; + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "SetJumpTarget out of range (%p calls %p)", code, + branch.ptr); + if(branch.type == 0) // B + *(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) & + 0x00FFFFFF)); + else // BL + *(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2) + & 0x00FFFFFF)); +} +void ARMXEmitter::B (const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "B out of range (%p calls %p)", code, fnptr); + + Write32(condition | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); +} + +void ARMXEmitter::B(ARMReg src) +{ + Write32(condition | 0x12FFF10 | src); +} + +void ARMXEmitter::BL(const void *fnptr) +{ + s32 distance = (s32)fnptr - (s32(code) + 8); + _assert_msg_(DYNA_REC, distance > -33554432 + && distance <= 33554432, + "BL out of range (%p calls %p)", code, fnptr); + Write32(condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF)); +} +void ARMXEmitter::BL(ARMReg src) +{ + Write32(condition | 0x12FFF30 | src); +} +void ARMXEmitter::PUSH(const int num, ...) +{ + u16 RegList = 0; + u8 Reg; + int i; + va_list vl; + va_start(vl, num); + for (i=0;i> 16 : Rm); } + +void ARMXEmitter::WriteInstruction (u32 Op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags) // This can get renamed later +{ + s32 op = InstOps[Op][Rm.GetType()]; // Type always decided by last operand + u32 Data = Rm.GetData(); + if (Rm.GetType() == TYPE_IMM) + { + switch (Op) + { + // MOV cases that support IMM16 + case 16: + case 17: + Data = Rm.Imm16(); + break; + default: + break; + } + } + if (op == -1) + _assert_msg_(DYNA_REC, false, "%s not yet support %d", InstNames[Op], Rm.GetType()); + Write32(condition | (op << 21) | (SetFlags ? (1 << 20) : 0) | Rn << 16 | Rd << 12 | Data); +} + +// Data Operations +void ARMXEmitter::WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2) +{ + Write32(condition | (0x7 << 24) | (Op << 20) | (dest << 16) | (Op2 << 12) | (r1 << 8) | (Op3 << 5) | (1 << 4) | r2); +} +void ARMXEmitter::UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor) +{ + if (!cpu_info.bIDIVa) + PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer."); + WriteSignedMultiply(3, 0xF, 0, dest, divisor, dividend); +} +void ARMXEmitter::SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor) +{ + if (!cpu_info.bIDIVa) + PanicAlert("Trying to use integer divide on hardware that doesn't support it. Bad programmer."); + WriteSignedMultiply(1, 0xF, 0, dest, divisor, dividend); +} +void ARMXEmitter::LSL (ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, false, dest, src, op2);} +void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, Operand2 op2) { WriteShiftedDataOp(0, true, dest, src, op2);} +void ARMXEmitter::LSL (ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, false, dest, src, op2);} +void ARMXEmitter::LSLS(ARMReg dest, ARMReg src, ARMReg op2) { WriteShiftedDataOp(1, true, dest, src, op2);} +void ARMXEmitter::MUL (ARMReg dest, ARMReg src, ARMReg op2) +{ + Write32(condition | (dest << 16) | (src << 8) | (9 << 4) | op2); +} +void ARMXEmitter::MULS(ARMReg dest, ARMReg src, ARMReg op2) +{ + Write32(condition | (1 << 20) | (dest << 16) | (src << 8) | (9 << 4) | op2); +} + +void ARMXEmitter::Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) { + Write32(condition | (op << 20) | (destHi << 16) | (destLo << 12) | (rm << 8) | (9 << 4) | rn); +} + +void ARMXEmitter::UMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) +{ + Write4OpMultiply(0x8, destLo, destHi, rn, rm); +} + +void ARMXEmitter::SMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) +{ + Write4OpMultiply(0xC, destLo, destHi, rn, rm); +} +void ARMXEmitter::SXTB (ARMReg dest, ARMReg op2) +{ + Write32(condition | (0x6AF << 16) | (dest << 12) | (7 << 4) | op2); +} +void ARMXEmitter::SXTH (ARMReg dest, ARMReg op2, u8 rotation) +{ + SXTAH(dest, (ARMReg)15, op2, rotation); +} +void ARMXEmitter::SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation) +{ + // bits ten and 11 are the rotation amount, see 8.8.232 for more + // information + Write32(condition | (0x6B << 20) | (src << 16) | (dest << 12) | (rotation << 10) | (7 << 4) | op2); +} +void ARMXEmitter::REV (ARMReg dest, ARMReg src ) +{ + Write32(condition | (107 << 20) | (15 << 16) | (dest << 12) | (243 << 4) | src); +} +void ARMXEmitter::REV16(ARMReg dest, ARMReg src) +{ + Write32(condition | (0x3DF << 16) | (dest << 12) | (0xFD << 4) | src); +} + +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, Operand2 op2) +{ + Write32(condition | (0x320F << 12) | (write_nzcvq << 19) | (write_g << 18) | op2.Imm12Mod()); +} +void ARMXEmitter::_MSR (bool write_nzcvq, bool write_g, ARMReg src) +{ + Write32(condition | (0x120F << 12) | (write_nzcvq << 19) | (write_g << 18) | src); +} +void ARMXEmitter::MRS (ARMReg dest) +{ + Write32(condition | (16 << 20) | (15 << 16) | (dest << 12)); +} +void ARMXEmitter::WriteStoreOp(u32 op, ARMReg dest, ARMReg src, Operand2 op2) +{ + if (op2.GetData() == 0) // Don't index + Write32(condition | 0x01800000 | (op << 20) | (dest << 16) | (src << 12) | op2.Imm12()); + else + Write32(condition | (op << 20) | (3 << 23) | (dest << 16) | (src << 12) | op2.Imm12()); +} +void ARMXEmitter::STR (ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x40, dest, src, op);} +void ARMXEmitter::STRB(ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x44, dest, src, op);} +void ARMXEmitter::STR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add) +{ + Write32(condition | (0x60 << 20) | (Index << 24) | (Add << 23) | (dest << 16) | (base << 12) | offset); +} +void ARMXEmitter::LDREX(ARMReg dest, ARMReg base) +{ + Write32(condition | (25 << 20) | (base << 16) | (dest << 12) | 0xF9F); +} +void ARMXEmitter::STREX(ARMReg dest, ARMReg base, ARMReg op) +{ + _assert_msg_(DYNA_REC, (dest != base && dest != op), "STREX dest can't be other two registers"); + Write32(condition | (24 << 20) | (base << 16) | (dest << 12) | (0xF9 << 4) | op); +} +void ARMXEmitter::DMB () +{ + Write32(0xF57FF05E); +} +void ARMXEmitter::SVC(Operand2 op) +{ + Write32(condition | (0x0F << 24) | op.Imm24()); +} + +void ARMXEmitter::LDR (ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x41, src, dest, op);} +void ARMXEmitter::LDRH(ARMReg dest, ARMReg src, Operand2 op) +{ + u8 Imm = op.Imm8(); + Write32(condition | (0x05 << 20) | (src << 16) | (dest << 12) | ((Imm >> 4) << 8) | (0xB << 4) | (Imm & 0x0F)); +} +void ARMXEmitter::LDRB(ARMReg dest, ARMReg src, Operand2 op) { WriteStoreOp(0x45, src, dest, op);} + +void ARMXEmitter::LDR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add) +{ + Write32(condition | (0x61 << 20) | (Index << 24) | (Add << 23) | (base << 16) | (dest << 12) | offset); +} +void ARMXEmitter::WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList) +{ + Write32(condition | (op << 20) | (WriteBack << 21) | (dest << 16) | RegList); +} +void ARMXEmitter::STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...) +{ + u16 RegList = 0; + u8 Reg; + int i; + va_list vl; + va_start(vl, Regnum); + for (i=0;i= S0) + { + if (Reg >= D0) + { + if (Reg >= Q0) + return (ARMReg)((Reg - Q0) * 2); // Always gets encoded as a double register + return (ARMReg)(Reg - D0); + } + return (ARMReg)(Reg - S0); + } + return Reg; +} +// NEON Specific +void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= D0, "Pass invalid register to VADD(integer)"); + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it"); + + bool register_quad = Vd >= Q0; + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); + +} +void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= Q0, "Pass invalid register to VSUB(integer)"); + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VSUB(integer) when CPU doesn't support it"); + + // Gets encoded as a double register + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ + | ((Vm & 0x10) << 2) | (Vm & 0xF)); + +} + +// VFP Specific + +void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, u16 op) +{ + _assert_msg_(DYNA_REC, Dest >= S0 && Dest <= D31, "Passed Invalid dest register to VLDR"); + _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid Base register to VLDR"); + _assert_msg_(DYNA_REC, !(op & 3), "Offset needs to be word aligned"); + bool single_reg = Dest < D0; + + Dest = SubBase(Dest); + + if (single_reg) + { + Write32(NO_COND | (0x1B << 23) | ((Dest & 0x1) << 22) | (1 << 20) | (Base << 16) \ + | ((Dest & 0x1E) << 11) | (10 << 8) | (op >> 2)); + + } + else + { + Write32(NO_COND | (0x1B << 23) | ((Dest & 0x10) << 18) | (1 << 20) | (Base << 16) \ + | ((Dest & 0xF) << 12) | (11 << 8) | (op >> 2)); + } +} +void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, u16 op) +{ + _assert_msg_(DYNA_REC, Src >= S0 && Src <= D31, "Passed invalid src register to VSTR"); + _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid base register to VSTR"); + _assert_msg_(DYNA_REC, !(op & 3), "Offset needs to be word aligned"); + bool single_reg = Src < D0; + + Src = SubBase(Src); + + if (single_reg) + { + Write32(NO_COND | (0x1B << 23) | ((Src & 0x1) << 22) | (Base << 16) \ + | ((Src & 0x1E) << 11) | (10 << 8) | (op >> 2)); + + } + else + { + Write32(NO_COND | (0x1B << 23) | ((Src & 0x10) << 18) | (Base << 16) \ + | ((Src & 0xF) << 12) | (11 << 8) | (op >> 2)); + } +} +void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Passed invalid Vd to VCMP"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x34 << 16) | ((Vd & 0x1E) << 11) \ + | (0x2B << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x34 << 16) | ((Vd & 0xF) << 12) \ + | (0x2F << 6) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + } +} +void ARMXEmitter::VCMP(ARMReg Vd) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Passed invalid Vd to VCMP"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x35 << 16) | ((Vd & 0x1E) << 11) \ + | (0x2B << 6)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x35 << 16) | ((Vd & 0xF) << 12) \ + | (0x2F << 6)); + } +} +void ARMXEmitter::VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Pased invalid dest register to VSQRT"); + _assert_msg_(DYNA_REC, Vn < Q0, "Passed invalid Vn to VSQRT"); + _assert_msg_(DYNA_REC, Vm < Q0, "Passed invalid Vm to VSQRT"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | ((Vn & 0x1E) << 15) \ + | ((Vd & 0x1E) << 11) | (0xA << 8) | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) \ + | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xB << 8) | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) \ + | (Vm & 0xF)); + } +} +void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "Pased invalid dest register to VSQRT"); + _assert_msg_(DYNA_REC, Vm < Q0, "Passed invalid Vm to VSQRT"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x31 << 16) \ + | ((Vd & 0x1E) << 11) | (0x2B << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x31 << 16) \ + | ((Vd & 0xF) << 12) | (0x2F << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } +} +// VFP and ASIMD +void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "VABS doesn't currently support Quad reg"); + _assert_msg_(DYNA_REC, Vd >= S0, "VABS doesn't support ARM Regs"); + bool single_reg = Vd < D0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x1) << 6) | ((Vd & 0x1E) << 11) \ + | (0xAC << 4) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x10) << 18) | ((Vd & 0xF) << 12) \ + | (0xBC << 4) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + } +} +void ARMXEmitter::VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VADD"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VADD"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VADD"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x3 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) \ + | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + } +} +void ARMXEmitter::VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VSUB"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VSUB"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VSUB"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x3 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | (1 << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x3 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + Write32((0xF2 << 24) | (1 << 21) | ((Vd & 0x10) << 18) | ((Vn & 0xF) << 16) \ + | ((Vd & 0xF) << 12) | (0xD << 8) | ((Vn & 0x10) << 3) \ + | (1 << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + } +} + +void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high) +{ + _assert_msg_(DYNA_REC, Src < S0, "This VMOV doesn't support SRC other than ARM Reg"); + _assert_msg_(DYNA_REC, Dest >= D0, "This VMOV doesn't support DEST other than VFP"); + + Dest = SubBase(Dest); + + Write32(NO_COND | (0xE << 24) | (high << 21) | ((Dest & 0xF) << 16) | (Src << 12) \ + | (11 << 8) | ((Dest & 0x10) << 3) | (1 << 4)); +} +void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src) +{ + if (Dest > R15) + { + if (Src < S0) + { + if (Dest < D0) + { + // Moving to a Neon register FROM ARM Reg + Dest = (ARMReg)(Dest - S0); + Write32(NO_COND | (0xE0 << 20) | ((Dest & 0x1E) << 15) | (Src << 12) \ + | (0xA << 8) | ((Dest & 0x1) << 7) | (1 << 4)); + return; + } + else + { + // Move 64bit from Arm reg + _assert_msg_(DYNA_REC, false, "This VMOV doesn't support moving 64bit ARM to NEON"); + return; + } + } + } + else + { + if (Src > R15) + { + if (Src < D0) + { + // Moving to ARM Reg from Neon Register + Src = (ARMReg)(Src - S0); + Write32(NO_COND | (0xE1 << 20) | ((Src & 0x1E) << 15) | (Dest << 12) \ + | (0xA << 8) | ((Src & 0x1) << 7) | (1 << 4)); + return; + } + else + { + // Move 64bit To Arm reg + _assert_msg_(DYNA_REC, false, "This VMOV doesn't support moving 64bit ARM From NEON"); + return; + } + } + else + { + // Move Arm reg to Arm reg + _assert_msg_(DYNA_REC, false, "VMOV doesn't support moving ARM registers"); + } + } + // Moving NEON registers + int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4; + int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4; + bool Single = DestSize == 1; + bool Quad = DestSize == 4; + + _assert_msg_(DYNA_REC, SrcSize == DestSize, "VMOV doesn't support moving different register sizes"); + + Dest = SubBase(Dest); + Src = SubBase(Src); + + if (Single) + { + Write32(NO_COND | (0x1D << 23) | ((Dest & 0x1) << 22) | (0x3 << 20) | ((Dest & 0x1E) << 11) \ + | (0x5 << 9) | (1 << 6) | ((Src & 0x1) << 5) | ((Src & 0x1E) >> 1)); + } + else + { + // Double and quad + if (Quad) + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use quad registers when you don't support ASIMD."); + // Gets encoded as a Double register + Write32((0xF2 << 24) | ((Dest & 0x10) << 18) | (2 << 20) | ((Src & 0xF) << 16) \ + | ((Dest & 0xF) << 12) | (1 << 8) | ((Src & 0x10) << 3) | (1 << 6) \ + | ((Src & 0x10) << 1) | (1 << 4) | (Src & 0xF)); + + } + else + { + Write32(NO_COND | (0x1D << 23) | ((Dest & 0x10) << 18) | (0x3 << 20) | ((Dest & 0xF) << 12) \ + | (0x2D << 6) | ((Src & 0x10) << 1) | (Src & 0xF)); + } + } +} + +} diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h new file mode 100644 index 0000000000..13635867a9 --- /dev/null +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -0,0 +1,587 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// WARNING - THIS LIBRARY IS NOT THREAD SAFE!!! + +#ifndef _DOLPHIN_ARM_CODEGEN_ +#define _DOLPHIN_ARM_CODEGEN_ + +#include "Common.h" +#include "MemoryUtil.h" +#if defined(__SYMBIAN32__) || defined(PANDORA) +#include +#endif + +#undef _IP +#undef R0 +#undef _SP +#undef _LR +#undef _PC + +namespace ArmGen +{ +enum ARMReg +{ + // GPRs + R0 = 0, R1, R2, R3, R4, R5, + R6, R7, R8, R9, R10, R11, + + // SPRs + // R13 - R15 are SP, LR, and PC. + // Almost always referred to by name instead of register number + R12 = 12, R13 = 13, R14 = 14, R15 = 15, + _IP = 12, _SP = 13, _LR = 14, _PC = 15, + + + // VFP single precision registers + S0, S1, S2, S3, S4, S5, S6, + S7, S8, S9, S10, S11, S12, S13, + S14, S15, S16, S17, S18, S19, S20, + S21, S22, S23, S24, S25, S26, S27, + S28, S29, S30, S31, + + // VFP Double Precision registers + D0, D1, D2, D3, D4, D5, D6, D7, + D8, D9, D10, D11, D12, D13, D14, D15, + D16, D17, D18, D19, D20, D21, D22, D23, + D24, D25, D26, D27, D28, D29, D30, D31, + + // ASIMD Quad-Word registers + Q0, Q1, Q2, Q3, Q4, Q5, Q6, Q7, + Q8, Q9, Q10, Q11, Q12, Q13, Q14, Q15, + INVALID_REG = 0xFFFFFFFF +}; + +enum CCFlags +{ + CC_EQ = 0, // Equal + CC_NEQ, // Not equal + CC_CS, // Carry Set + CC_CC, // Carry Clear + CC_MI, // Minus (Negative) + CC_PL, // Plus + CC_VS, // Overflow + CC_VC, // No Overflow + CC_HI, // Unsigned higher + CC_LS, // Unsigned lower or same + CC_GE, // Signed greater than or equal + CC_LT, // Signed less than + CC_GT, // Signed greater than + CC_LE, // Signed less than or equal + CC_AL, // Always (unconditional) 14 + CC_HS = CC_CS, // Alias of CC_CS Unsigned higher or same + CC_LO = CC_CC, // Alias of CC_CC Unsigned lower +}; +const u32 NO_COND = 0xE0000000; + +enum ShiftType +{ + ST_LSL = 0, + ST_ASL = 0, + ST_LSR = 1, + ST_ASR = 2, + ST_ROR = 3, + ST_RRX = 4 +}; +enum IntegerSize +{ + I_I8 = 0, + I_I16, + I_I32, + I_I64 +}; + +enum +{ + NUMGPRs = 13, +}; + +class ARMXEmitter; + +enum OpType +{ + TYPE_IMM = 0, + TYPE_REG, + TYPE_IMMSREG, + TYPE_RSR, + TYPE_MEM +}; + +// This is no longer a proper operand2 class. Need to split up. +class Operand2 +{ + friend class ARMXEmitter; +protected: + u32 Value; + +private: + OpType Type; + + // IMM types + u8 Rotation; // Only for u8 values + + // Register types + u8 IndexOrShift; + ShiftType Shift; +public: + OpType GetType() + { + return Type; + } + Operand2() {} + Operand2(u32 imm, OpType type = TYPE_IMM) + { + Type = type; + Value = imm; + Rotation = 0; + } + + Operand2(ARMReg Reg) + { + Type = TYPE_REG; + Value = Reg; + Rotation = 0; + } + Operand2(u8 imm, u8 rotation) + { + Type = TYPE_IMM; + Value = imm; + Rotation = rotation; + } + Operand2(ARMReg base, ShiftType type, ARMReg shift) // RSR + { + Type = TYPE_RSR; + _assert_msg_(DYNA_REC, type != ST_RRX, "Invalid Operand2: RRX does not take a register shift amount"); + IndexOrShift = shift; + Shift = type; + Value = base; + } + + Operand2(u8 shift, ShiftType type, ARMReg base)// For IMM shifted register + { + if(shift == 32) shift = 0; + switch (type) + { + case ST_LSL: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSL %u", shift); + break; + case ST_LSR: + _assert_msg_(DYNA_REC, shift <= 32, "Invalid Operand2: LSR %u", shift); + if (!shift) + type = ST_LSL; + if (shift == 32) + shift = 0; + break; + case ST_ASR: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: LSR %u", shift); + if (!shift) + type = ST_LSL; + if (shift == 32) + shift = 0; + break; + case ST_ROR: + _assert_msg_(DYNA_REC, shift < 32, "Invalid Operand2: ROR %u", shift); + if (!shift) + type = ST_LSL; + break; + case ST_RRX: + _assert_msg_(DYNA_REC, shift == 0, "Invalid Operand2: RRX does not take an immediate shift amount"); + type = ST_ROR; + break; + } + IndexOrShift = shift; + Shift = type; + Value = base; + Type = TYPE_IMMSREG; + } + const u32 GetData() + { + switch(Type) + { + case TYPE_IMM: + return Imm12Mod(); // This'll need to be changed later + case TYPE_REG: + return Rm(); + case TYPE_IMMSREG: + return IMMSR(); + case TYPE_RSR: + return RSR(); + default: + _assert_msg_(DYNA_REC, false, "GetData with Invalid Type"); + return 0; + } + } + const u32 IMMSR() // IMM shifted register + { + _assert_msg_(DYNA_REC, Type = TYPE_IMMSREG, "IMMSR must be imm shifted register"); + return ((IndexOrShift & 0x1f) << 7 | (Shift << 5) | Value); + } + const u32 RSR() // Register shifted register + { + _assert_msg_(DYNA_REC, Type == TYPE_RSR, "RSR must be RSR Of Course"); + return (IndexOrShift << 8) | (Shift << 5) | 0x10 | Value; + } + const u32 Rm() + { + _assert_msg_(DYNA_REC, Type == TYPE_REG, "Rm must be with Reg"); + return Value; + } + + const u32 Imm5() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm5 not IMM value"); + return ((Value & 0x0000001F) << 7); + } + const u32 Imm8() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value"); + return Value & 0xFF; + } + const u32 Imm8Rot() // IMM8 with Rotation + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8Rot not IMM value"); + _assert_msg_(DYNA_REC, (Rotation & 0xE1) != 0, "Invalid Operand2: immediate rotation %u", Rotation); + return (1 << 25) | (Rotation << 7) | (Value & 0x000000FF); + } + const u32 Imm12() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12 not IMM"); + return (Value & 0x00000FFF); + } + + const u32 Imm12Mod() + { + // This is a IMM12 with the top four bits being rotation and the + // bottom eight being a IMM. This is for instructions that need to + // expand a 8bit IMM to a 32bit value and gives you some rotation as + // well. + // Each rotation rotates to the right by 2 bits + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm12Mod not IMM"); + return ((Rotation & 0xF) << 8) | (Value & 0xFF); + } + const u32 Imm16() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return ( (Value & 0xF000) << 4) | (Value & 0x0FFF); + } + const u32 Imm16Low() + { + return Imm16(); + } + const u32 Imm16High() // Returns high 16bits + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return ( ((Value >> 16) & 0xF000) << 4) | ((Value >> 16) & 0x0FFF); + } + const u32 Imm24() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm16 not IMM"); + return (Value & 0x0FFFFFFF); + } + // NEON and ASIMD specific + const u32 Imm8ASIMD() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8ASIMD not IMM"); + return ((Value & 0x80) << 17) | ((Value & 0x70) << 12) | (Value & 0xF); + } + const u32 Imm8VFP() + { + _assert_msg_(DYNA_REC, (Type == TYPE_IMM), "Imm8VFP not IMM"); + return ((Value & 0xF0) << 12) | (Value & 0xF); + } +}; + +// Use these when you don't know if an imm can be represented as an operand2. +// This lets you generate both an optimal and a fallback solution by checking +// the return value, which will be false if these fail to find a Operand2 that +// represents your 32-bit imm value. +bool TryMakeOperand2(u32 imm, Operand2 &op2); +bool TryMakeOperand2_AllowInverse(u32 imm, Operand2 &op2, bool *inverse); +bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated); + +inline Operand2 R(ARMReg Reg) { return Operand2(Reg, TYPE_REG); } +inline Operand2 IMM(u32 Imm) { return Operand2(Imm, TYPE_IMM); } +inline Operand2 Mem(void *ptr) { return Operand2((u32)ptr, TYPE_IMM); } +//usage: struct {int e;} s; STRUCT_OFFSET(s,e) +#define STRUCT_OFF(str,elem) ((u32)((u32)&(str).elem-(u32)&(str))) + + +struct FixupBranch +{ + u8 *ptr; + u32 condition; // Remembers our codition at the time + int type; //0 = B 1 = BL +}; + +typedef const u8* JumpTarget; + +class ARMXEmitter +{ + friend struct OpArg; // for Write8 etc +private: + u8 *code, *startcode; + u8 *lastCacheFlushEnd; + u32 condition; + + void WriteStoreOp(u32 op, ARMReg dest, ARMReg src, Operand2 op2); + void WriteRegStoreOp(u32 op, ARMReg dest, bool WriteBack, u16 RegList); + void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, ARMReg op2); + void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, Operand2 op2); + void WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2); + + void Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + + // New Ops + void WriteInstruction(u32 op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags = false); + +protected: + inline void Write32(u32 value) {*(u32*)code = value; code+=4;} + +public: + ARMXEmitter() : code(0), startcode(0), lastCacheFlushEnd(0) { + condition = CC_AL << 28; + } + ARMXEmitter(u8 *code_ptr) { + code = code_ptr; + lastCacheFlushEnd = code_ptr; + startcode = code_ptr; + condition = CC_AL << 28; + } + virtual ~ARMXEmitter() {} + + void SetCodePtr(u8 *ptr); + void ReserveCodeSpace(u32 bytes); + const u8 *AlignCode16(); + const u8 *AlignCodePage(); + const u8 *GetCodePtr() const; + void FlushIcache(); + void FlushIcacheSection(u8 *start, u8 *end); + u8 *GetWritableCodePtr(); + + void SetCC(CCFlags cond = CC_AL); + + // Special purpose instructions + + // Dynamic Endian Switching + void SETEND(bool BE); + // Debug Breakpoint + void BKPT(u16 arg); + + // Hint instruction + void YIELD(); + + // Do nothing + void NOP(int count = 1); //nop padding - TODO: fast nop slides, for amd and intel (check their manuals) + +#ifdef CALL +#undef CALL +#endif + + // Branching + FixupBranch B(); + FixupBranch B_CC(CCFlags Cond); + void B_CC(CCFlags Cond, const void *fnptr); + FixupBranch BL(); + FixupBranch BL_CC(CCFlags Cond); + void SetJumpTarget(FixupBranch const &branch); + + void B (const void *fnptr); + void B (ARMReg src); + void BL(const void *fnptr); + void BL(ARMReg src); + + void PUSH(const int num, ...); + void POP(const int num, ...); + + // New Data Ops + void AND (ARMReg Rd, ARMReg Rn, Operand2 Rm); + void ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm); + void EOR (ARMReg dest, ARMReg src, Operand2 op2); + void EORS(ARMReg dest, ARMReg src, Operand2 op2); + void SUB (ARMReg dest, ARMReg src, Operand2 op2); + void SUBS(ARMReg dest, ARMReg src, Operand2 op2); + void RSB (ARMReg dest, ARMReg src, Operand2 op2); + void RSBS(ARMReg dest, ARMReg src, Operand2 op2); + void ADD (ARMReg dest, ARMReg src, Operand2 op2); + void ADDS(ARMReg dest, ARMReg src, Operand2 op2); + void ADC (ARMReg dest, ARMReg src, Operand2 op2); + void ADCS(ARMReg dest, ARMReg src, Operand2 op2); + void LSL (ARMReg dest, ARMReg src, Operand2 op2); + void LSL (ARMReg dest, ARMReg src, ARMReg op2); + void LSLS(ARMReg dest, ARMReg src, Operand2 op2); + void LSLS(ARMReg dest, ARMReg src, ARMReg op2); + void SBC (ARMReg dest, ARMReg src, Operand2 op2); + void SBCS(ARMReg dest, ARMReg src, Operand2 op2); + void REV (ARMReg dest, ARMReg src); + void REV16 (ARMReg dest, ARMReg src); + void RSC (ARMReg dest, ARMReg src, Operand2 op2); + void RSCS(ARMReg dest, ARMReg src, Operand2 op2); + void TST ( ARMReg src, Operand2 op2); + void TEQ ( ARMReg src, Operand2 op2); + void CMP ( ARMReg src, Operand2 op2); + void CMN ( ARMReg src, Operand2 op2); + void ORR (ARMReg dest, ARMReg src, Operand2 op2); + void ORRS(ARMReg dest, ARMReg src, Operand2 op2); + void MOV (ARMReg dest, Operand2 op2); + void MOVS(ARMReg dest, Operand2 op2); + void BIC (ARMReg dest, ARMReg src, Operand2 op2); // BIC = ANDN + void BICS(ARMReg dest, ARMReg src, Operand2 op2); + void MVN (ARMReg dest, Operand2 op2); + void MVNS(ARMReg dest, Operand2 op2); + void MOVW(ARMReg dest, Operand2 op2); + void MOVT(ARMReg dest, Operand2 op2, bool TopBits = false); + + // UDIV and SDIV are only available on CPUs that have + // the idiva hardare capacity + void UDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); + void SDIV(ARMReg dest, ARMReg dividend, ARMReg divisor); + + void MUL (ARMReg dest, ARMReg src, ARMReg op2); + void MULS(ARMReg dest, ARMReg src, ARMReg op2); + + void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + void SMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); + + void SXTB(ARMReg dest, ARMReg op2); + void SXTH(ARMReg dest, ARMReg op2, u8 rotation = 0); + void SXTAH(ARMReg dest, ARMReg src, ARMReg op2, u8 rotation = 0); + // Using just MSR here messes with our defines on the PPC side of stuff (when this code was in dolphin...) + // Just need to put an underscore here, bit annoying. + void _MSR (bool nzcvq, bool g, Operand2 op2); + void _MSR (bool nzcvq, bool g, ARMReg src ); + void MRS (ARMReg dest); + + // Memory load/store operations + void LDR (ARMReg dest, ARMReg src, Operand2 op2 = 0); + // Offset adds to the base register in LDR + void LDR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add); + void LDRH(ARMReg dest, ARMReg src, Operand2 op = 0); + void LDRB(ARMReg dest, ARMReg src, Operand2 op2 = 0); + void STR (ARMReg dest, ARMReg src, Operand2 op2 = 0); + // Offset adds on to the destination register in STR + void STR (ARMReg dest, ARMReg base, ARMReg offset, bool Index, bool Add); + + void STRB(ARMReg dest, ARMReg src, Operand2 op2 = 0); + void STMFD(ARMReg dest, bool WriteBack, const int Regnum, ...); + void LDMFD(ARMReg dest, bool WriteBack, const int Regnum, ...); + + // Exclusive Access operations + void LDREX(ARMReg dest, ARMReg base); + // dest contains the result if the instruction managed to store the value + void STREX(ARMReg dest, ARMReg base, ARMReg op); + void DMB (); + void SVC(Operand2 op); + + // NEON and ASIMD instructions + // None of these will be created with conditional since ARM + // is deprecating conditional execution of ASIMD instructions. + // ASIMD instructions don't even have a conditional encoding. + + // Subtracts the base from the register to give us the real one + ARMReg SubBase(ARMReg Reg); + // NEON Only + void VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); + + // VFP Only + void VLDR(ARMReg Dest, ARMReg Base, u16 op); + void VSTR(ARMReg Src, ARMReg Base, u16 op); + void VCMP(ARMReg Vd, ARMReg Vm); + // Compares against zero + void VCMP(ARMReg Vd); + void VDIV(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSQRT(ARMReg Vd, ARMReg Vm); + + // NEON and VFP + void VABS(ARMReg Vd, ARMReg Vm); + void VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm); + void VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm); + + void VMOV(ARMReg Dest, ARMReg Src, bool high); + void VMOV(ARMReg Dest, ARMReg Src); + + void QuickCallFunction(ARMReg scratchreg, void *func); + // Utility functions + void MOVI2R(ARMReg reg, u32 val, bool optimize = true); + void ARMABI_MOVI2M(Operand2 op, Operand2 val); +}; // class ARMXEmitter + + +// Everything that needs to generate X86 code should inherit from this. +// You get memory management for free, plus, you can use all the MOV etc functions without +// having to prefix them with gen-> or something similar. +class ARMXCodeBlock : public ARMXEmitter +{ +protected: + u8 *region; + size_t region_size; + +public: + ARMXCodeBlock() : region(NULL), region_size(0) {} + virtual ~ARMXCodeBlock() { if (region) FreeCodeSpace(); } + + // Call this before you generate any code. + void AllocCodeSpace(int size) + { + region_size = size; + region = (u8*)AllocateExecutableMemory(region_size); + SetCodePtr(region); + } + + // Always clear code space with breakpoints, so that if someone accidentally executes + // uninitialized, it just breaks into the debugger. + void ClearCodeSpace() + { + // x86/64: 0xCC = breakpoint + memset(region, 0xCC, region_size); + ResetCodePtr(); + } + + // Call this when shutting down. Don't rely on the destructor, even though it'll do the job. + void FreeCodeSpace() + { + FreeMemoryPages(region, region_size); + region = NULL; + region_size = 0; + } + + bool IsInSpace(u8 *ptr) + { + return ptr >= region && ptr < region + region_size; + } + + // Cannot currently be undone. Will write protect the entire code region. + // Start over if you need to change the code (call FreeCodeSpace(), AllocCodeSpace()). + void WriteProtect() + { + WriteProtectMemory(region, region_size, true); + } + + void ResetCodePtr() + { + SetCodePtr(region); + } + + size_t GetSpaceLeft() const + { + return region_size - (GetCodePtr() - region); + } +}; + +} // namespace + +#endif // _DOLPHIN_INTEL_CODEGEN_ diff --git a/Source/Core/Common/Src/CPUDetect.h b/Source/Core/Common/Src/CPUDetect.h index 928b34c109..351120e3a2 100644 --- a/Source/Core/Common/Src/CPUDetect.h +++ b/Source/Core/Common/Src/CPUDetect.h @@ -25,7 +25,8 @@ enum CPUVendor { VENDOR_INTEL = 0, VENDOR_AMD = 1, - VENDOR_OTHER = 2, + VENDOR_ARM = 2, + VENDOR_OTHER = 3, }; struct CPUInfo @@ -55,6 +56,26 @@ struct CPUInfo bool bAES; bool bLAHFSAHF64; bool bLongMode; + + // ARM specific CPUInfo + bool bSwp; + bool bHalf; + bool bThumb; + bool bFastMult; + bool bVFP; + bool bEDSP; + bool bThumbEE; + bool bNEON; + bool bVFPv3; + bool bTLS; + bool bVFPv4; + bool bIDIVa; + bool bIDIVt; + bool bArmV7; // enable MOVT, MOVW etc + + // ARMv8 specific + bool bFP; + bool bASIMD; // Call Detect() explicit CPUInfo(); diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 0132915a5c..904095e255 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -133,7 +133,9 @@ private: // wxWidgets does not have a true dummy macro for this. #define _trans(a) a -#if defined __GNUC__ +#if defined _M_GENERIC +# define _M_SSE 0x0 +#elif defined __GNUC__ # if defined __SSE4_2__ # define _M_SSE 0x402 # elif defined __SSE4_1__ @@ -144,7 +146,7 @@ private: # define _M_SSE 0x300 # endif #elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008 -# define _M_SSE 0x402 +# define _M_SSE 0x402 #endif // Host communication. diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 585fe0999a..7c6bcdc703 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -35,7 +35,7 @@ template<> struct CompileTimeAssert {}; #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#if defined __GNUC__ && !defined __SSSE3__ +#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC #include static __inline __m128i __attribute__((__always_inline__)) _mm_shuffle_epi8(__m128i a, __m128i mask) @@ -60,6 +60,8 @@ _mm_shuffle_epi8(__m128i a, __m128i mask) // go to debugger mode #ifdef GEKKO #define Crash() + #elif defined _M_GENERIC + #define Crash() { exit(1); } #else #define Crash() {asm ("int $3");} #endif @@ -136,6 +138,15 @@ inline u8 swap8(u8 _data) {return _data;} inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);} inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);} inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);} +#elif _M_ARM +#ifdef ANDROID +#undef swap16 +#undef swap32 +#undef swap64 +#endif +inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} +inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} +inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);} #elif __linux__ inline u16 swap16(u16 _data) {return bswap_16(_data);} inline u32 swap32(u32 _data) {return bswap_32(_data);} @@ -161,7 +172,6 @@ inline u64 swap64(u64 data) {return ((u64)swap32(data) << 32) | swap32(data >> 3 inline u16 swap16(const u8* _pData) {return swap16(*(const u16*)_pData);} inline u32 swap32(const u8* _pData) {return swap32(*(const u32*)_pData);} inline u64 swap64(const u8* _pData) {return swap64(*(const u64*)_pData);} - } // Namespace Common #endif // _COMMONFUNCS_H_ diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 9e14d7cf7e..cab7ce3762 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -36,6 +36,9 @@ // You can use the File::GetUserPath() util for this #define USERDATA_DIR "Contents/Resources/User" #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin" +#elif defined ANDROID + #define USERDATA_DIR "user" + #define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu" #else #define USERDATA_DIR "user" #ifdef USER_DIR @@ -52,6 +55,8 @@ #define SYSDATA_DIR "Contents/Resources/Sys" #define SHARED_USER_DIR File::GetBundleDirectory() + \ DIR_SEP USERDATA_DIR DIR_SEP +#elif defined ANDROID + #define SYSDATA_DIR "/sdcard/dolphin-emu" #else #ifdef DATA_DIR #define SYSDATA_DIR DATA_DIR "sys" diff --git a/Source/Core/Common/Src/FPURoundMode.h b/Source/Core/Common/Src/FPURoundMode.h new file mode 100644 index 0000000000..acfd89c313 --- /dev/null +++ b/Source/Core/Common/Src/FPURoundMode.h @@ -0,0 +1,51 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#ifndef FPU_ROUND_MODE_H_ +#define FPU_ROUND_MODE_H_ +#include "Common.h" + +namespace FPURoundMode +{ + enum RoundModes + { + ROUND_NEAR = 0, + ROUND_CHOP, + ROUND_UP, + ROUND_DOWN + }; + enum PrecisionModes { + PREC_24 = 0, + PREC_53, + PREC_64 + }; + void SetRoundMode(u32 mode); + + void SetPrecisionMode(u32 mode); + + void SetSIMDMode(u32 mode); + + /* + There are two different flavors of float to int conversion: + _mm_cvtps_epi32() and _mm_cvttps_epi32(). The first rounds + according to the MXCSR rounding bits. The second one always + uses round towards zero. + */ + void SaveSIMDState(); + void LoadSIMDState(); + void LoadDefaultSIMDState(); +} +#endif diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 491db88e41..f42c204396 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -668,9 +668,10 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath) if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; else - paths[D_USER_IDX] = std::string(getenv("HOME") ? getenv("HOME") : getenv("PWD")) + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; + paths[D_USER_IDX] = std::string(getenv("HOME") ? + getenv("HOME") : getenv("PWD") ? + getenv("PWD") : "") + DIR_SEP DOLPHIN_DATA_DIR DIR_SEP; #endif - INFO_LOG(COMMON, "GetUserPath: Setting user directory to %s:", paths[D_USER_IDX].c_str()); paths[D_GCUSER_IDX] = paths[D_USER_IDX] + GC_USER_DIR DIR_SEP; paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; diff --git a/Source/Core/Common/Src/GenericFPURoundMode.cpp b/Source/Core/Common/Src/GenericFPURoundMode.cpp new file mode 100644 index 0000000000..cc878291a1 --- /dev/null +++ b/Source/Core/Common/Src/GenericFPURoundMode.cpp @@ -0,0 +1,41 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "FPURoundMode.h" + +// Generic, do nothing +namespace FPURoundMode +{ + void SetRoundMode(u32 mode) + { + } + void SetPrecisionMode(u32 mode) + { + } + void SetSIMDMode(u32 mode) + { + } + void SaveSIMDState() + { + } + void LoadSIMDState() + { + } + void LoadDefaultSIMDState() + { + } +} diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index a79c413cf8..3beae08c15 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -17,6 +17,9 @@ #include +#ifdef ANDROID +#include "Host.h" +#endif #include "LogManager.h" #include "ConsoleListener.h" #include "Timer.h" @@ -132,7 +135,9 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, Common::Timer::GetTimeFormatted().c_str(), file, line, level_to_char[(int)level], log->GetShortName(), temp); - +#ifdef ANDROID + Host_SysMessage(msg); +#endif log->Trigger(level, msg); } diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp index e078db2e9d..b97d55e62c 100644 --- a/Source/Core/Common/Src/MathUtil.cpp +++ b/Source/Core/Common/Src/MathUtil.cpp @@ -21,13 +21,6 @@ #include #include -namespace { - -static u32 saved_sse_state = _mm_getcsr(); -static const u32 default_sse_state = _mm_getcsr(); - -} - namespace MathUtil { @@ -114,23 +107,6 @@ u32 ClassifyFloat(float fvalue) } // namespace -void LoadDefaultSSEState() -{ - _mm_setcsr(default_sse_state); -} - - -void LoadSSEState() -{ - _mm_setcsr(saved_sse_state); -} - - -void SaveSSEState() -{ - saved_sse_state = _mm_getcsr(); -} - inline void MatrixMul(int n, const float *a, const float *b, float *result) { for (int i = 0; i < n; ++i) diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h index a6290ff602..114a91bf3c 100644 --- a/Source/Core/Common/Src/MathUtil.h +++ b/Source/Core/Common/Src/MathUtil.h @@ -20,8 +20,8 @@ #include "Common.h" -#include #include +#include "FPURoundMode.h" namespace MathUtil { @@ -147,17 +147,6 @@ struct Rectangle inline float pow2f(float x) {return x * x;} inline double pow2(double x) {return x * x;} - -/* - There are two different flavors of float to int conversion: - _mm_cvtps_epi32() and _mm_cvttps_epi32(). The first rounds - according to the MXCSR rounding bits. The second one always - uses round towards zero. - */ - -void SaveSSEState(); -void LoadSSEState(); -void LoadDefaultSSEState(); float MathFloatVectorSum(const std::vector&); #define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1)) diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp index 1dcdef6672..0a2b9e0306 100644 --- a/Source/Core/Common/Src/MemArena.cpp +++ b/Source/Core/Common/Src/MemArena.cpp @@ -27,6 +27,10 @@ #include #include #include +#ifdef ANDROID +#include +#include +#endif #endif #if defined(__APPLE__) @@ -34,11 +38,41 @@ static const char* ram_temp_file = "/tmp/gc_mem.tmp"; #elif !defined(_WIN32) // non OSX unixes static const char* ram_temp_file = "/dev/shm/gc_mem.tmp"; #endif +#ifdef ANDROID +#define ASHMEM_DEVICE "/dev/ashmem" + +int AshmemCreateFileMapping(const char *name, size_t size) +{ + int fd, ret; + fd = open(ASHMEM_DEVICE, O_RDWR); + if (fd < 0) + return fd; + + // We don't really care if we can't set the name, it is optional + ret = ioctl(fd, ASHMEM_SET_NAME, name); + + ret = ioctl(fd, ASHMEM_SET_SIZE, size); + if (ret < 0) + { + close(fd); + NOTICE_LOG(MEMMAP, "Ashmem returned error: 0x%08x", ret); + return ret; + } + return fd; +} +#endif void MemArena::GrabLowMemSpace(size_t size) { #ifdef _WIN32 hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), NULL); +#elif defined(ANDROID) + fd = AshmemCreateFileMapping("Dolphin-emu", size); + if (fd < 0) + { + NOTICE_LOG(MEMMAP, "Ashmem allocation failed"); + return; + } #else mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; fd = open(ram_temp_file, O_RDWR | O_CREAT, mode); diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index 0888746d42..ff50347799 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -117,9 +117,12 @@ void* AllocateAlignedMemory(size_t size,size_t alignment) void* ptr = _aligned_malloc(size,alignment); #else void* ptr = NULL; +#ifdef ANDROID + ptr = memalign(alignment, size); +#else if (posix_memalign(&ptr, alignment, size) != 0) ERROR_LOG(MEMMAP, "Failed to allocate aligned memory"); -; +#endif #endif // printf("Mapped memory at %p (size %ld)\n", ptr, diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h index 1b81766ee0..11de6536b4 100644 --- a/Source/Core/Common/Src/StdConditionVariable.h +++ b/Source/Core/Common/Src/StdConditionVariable.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #include #else diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h index 8949e905ac..8a5d22f928 100644 --- a/Source/Core/Common/Src/StdMutex.h +++ b/Source/Core/Common/Src/StdMutex.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #include #else diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h index fea058c874..6897235658 100644 --- a/Source/Core/Common/Src/StdThread.h +++ b/Source/Core/Common/Src/StdThread.h @@ -5,7 +5,7 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ +#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID // GCC 4.4 provides #ifndef _GLIBCXX_USE_SCHED_YIELD #define _GLIBCXX_USE_SCHED_YIELD diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index e5c70b2c6b..6ef3d91a73 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -245,7 +245,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st while(1) { const int pos = result.find(src); - if (pos == -1) break; + if (pos == 16) break; result.replace(pos, src.size(), dest); } return result; @@ -263,25 +263,25 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st const char HEX2DEC[256] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - /* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 1 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 2 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1, -1,-1,-1,-1, + /* 0 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 1 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 2 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,16,16, 16,16,16,16, - /* 4 */ -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 5 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 6 */ -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 7 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + /* 4 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16, + /* 5 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 6 */ 16,10,11,12, 13,14,15,16, 16,16,16,16, 16,16,16,16, + /* 7 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, - /* 8 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* 9 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* A */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* B */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + /* 8 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* 9 */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* A */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* B */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, - /* C */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* D */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* E */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - /* F */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1 + /* C */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* D */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* E */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16, + /* F */ 16,16,16,16, 16,16,16,16, 16,16,16,16, 16,16,16,16 }; std::string UriDecode(const std::string & sSrc) @@ -303,8 +303,8 @@ std::string UriDecode(const std::string & sSrc) if (*pSrc == '%') { char dec1, dec2; - if (-1 != (dec1 = HEX2DEC[*(pSrc + 1)]) - && -1 != (dec2 = HEX2DEC[*(pSrc + 2)])) + if (16 != (dec1 = HEX2DEC[*(pSrc + 1)]) + && 16 != (dec2 = HEX2DEC[*(pSrc + 2)])) { *pEnd++ = (dec1 << 4) + dec2; pSrc += 3; diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index 73f83c204f..3e8440b74f 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -105,7 +105,7 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) #ifdef __APPLE__ thread_policy_set(pthread_mach_thread_np(thread), THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1); -#elif defined __linux__ || defined BSD4_4 +#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID) cpu_set_t cpu_set; CPU_ZERO(&cpu_set); diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index e711fcab5c..8b38be1de1 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -33,8 +33,6 @@ #define INFINITE 0xffffffff #endif -#include - //for gettimeofday and struct time(spec|val) #include #include diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/x64ABI.cpp similarity index 99% rename from Source/Core/Common/Src/ABI.cpp rename to Source/Core/Common/Src/x64ABI.cpp index 63a8e76934..cd2f410dbf 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/x64ABI.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Common/Src/ABI.h b/Source/Core/Common/Src/x64ABI.h similarity index 100% rename from Source/Core/Common/Src/ABI.h rename to Source/Core/Common/Src/x64ABI.h diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/x64CPUDetect.cpp similarity index 98% rename from Source/Core/Common/Src/CPUDetect.cpp rename to Source/Core/Common/Src/x64CPUDetect.cpp index 282929e7b2..2898b91bec 100644 --- a/Source/Core/Common/Src/CPUDetect.cpp +++ b/Source/Core/Common/Src/x64CPUDetect.cpp @@ -30,7 +30,9 @@ #else //#include +#ifndef _M_GENERIC #include +#endif #if defined __FreeBSD__ #include @@ -39,7 +41,9 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { -#ifdef _LP64 +#if defined _M_GENERIC + (*eax) = (*ebx) = (*ecx) = (*edx) = 0; +#elif defined _LP64 // Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to // restored at the end of the asm block. __asm__ ( diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index 5f8d0a66f1..9f15845875 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "CPUDetect.h" namespace Gen diff --git a/Source/Core/Common/Src/x64Emitter.h b/Source/Core/Common/Src/x64Emitter.h index 3b699c81a0..6b8c59b5a5 100644 --- a/Source/Core/Common/Src/x64Emitter.h +++ b/Source/Core/Common/Src/x64Emitter.h @@ -757,7 +757,7 @@ public: region_size = 0; } - bool IsInCodeSpace(u8 *ptr) + bool IsInSpace(u8 *ptr) { return ptr >= region && ptr < region + region_size; } diff --git a/Source/Core/Common/Src/x64FPURoundMode.cpp b/Source/Core/Common/Src/x64FPURoundMode.cpp new file mode 100644 index 0000000000..0beefd860a --- /dev/null +++ b/Source/Core/Common/Src/x64FPURoundMode.cpp @@ -0,0 +1,120 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "FPURoundMode.h" + +#ifndef _WIN32 +static const unsigned short FPU_ROUND_NEAR = 0 << 10; +static const unsigned short FPU_ROUND_DOWN = 1 << 10; +static const unsigned short FPU_ROUND_UP = 2 << 10; +static const unsigned short FPU_ROUND_CHOP = 3 << 10; +static const unsigned short FPU_ROUND_MASK = 3 << 10; +#include +#endif + +const u32 MASKS = 0x1F80; // mask away the interrupts. +const u32 DAZ = 0x40; +const u32 FTZ = 0x8000; + +namespace FPURoundMode +{ + // Get the default SSE states here. + static u32 saved_sse_state = _mm_getcsr(); + static const u32 default_sse_state = _mm_getcsr(); + + void SetRoundMode(u32 mode) + { + // Set FPU rounding mode to mimic the PowerPC's + #ifdef _M_IX86 + // This shouldn't really be needed anymore since we use SSE + #ifdef _WIN32 + const int table[4] = + { + _RC_NEAR, + _RC_CHOP, + _RC_UP, + _RC_DOWN + }; + _set_controlfp(_MCW_RC, table[mode]); + #else + const unsigned short table[4] = + { + FPU_ROUND_NEAR, + FPU_ROUND_CHOP, + FPU_ROUND_UP, + FPU_ROUND_DOWN + }; + unsigned short _mode; + asm ("fstcw %0" : "=m" (_mode) : ); + _mode = (_mode & ~FPU_ROUND_MASK) | table[mode]; + asm ("fldcw %0" : : "m" (_mode)); + #endif + #endif + } + + void SetPrecisionMode(u32 mode) + { + #ifdef _M_IX86 + // sets the floating-point lib to 53-bit + // PowerPC has a 53bit floating pipeline only + // eg: sscanf is very sensitive + #ifdef _WIN32 + _control87(_PC_53, MCW_PC); + #else + const unsigned short table[4] = { + 0 << 8, // FPU_PREC_24 + 2 << 8, // FPU_PREC_53 + 3 << 8, // FPU_PREC_64 + 3 << 8, // FPU_PREC_MASK + }; + unsigned short _mode; + asm ("fstcw %0" : : "m" (_mode)); + _mode = (_mode & ~table[4]) | table[mode]; + asm ("fldcw %0" : : "m" (_mode)); + #endif + #else + //x64 doesn't need this - fpu is done with SSE + //but still - set any useful sse options here + #endif + } + void SetSIMDMode(u32 mode) + { + static const u32 ssetable[4] = + { + (0 << 13) | MASKS, + (3 << 13) | MASKS, + (2 << 13) | MASKS, + (1 << 13) | MASKS, + }; + u32 csr = ssetable[mode]; + _mm_setcsr(csr); + } + + void SaveSIMDState() + { + saved_sse_state = _mm_getcsr(); + } + void LoadSIMDState() + { + _mm_setcsr(saved_sse_state); + } + void LoadDefaultSIMDState() + { + _mm_setcsr(default_sse_state); + } +} diff --git a/Source/Core/Common/Src/Thunk.cpp b/Source/Core/Common/Src/x64Thunk.cpp similarity index 98% rename from Source/Core/Common/Src/Thunk.cpp rename to Source/Core/Common/Src/x64Thunk.cpp index 1792df3e77..b9fd54f354 100644 --- a/Source/Core/Common/Src/Thunk.cpp +++ b/Source/Core/Common/Src/x64Thunk.cpp @@ -18,9 +18,8 @@ #include #include "Common.h" -#include "x64Emitter.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #define THUNK_ARENA_SIZE 1024*1024*1 diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 6ffeeaec3a..b8976f42ea 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -9,7 +9,6 @@ set(SRCS Src/ActionReplay.cpp Src/DSPEmulator.cpp Src/GeckoCodeConfig.cpp Src/GeckoCode.cpp - Src/MemTools.cpp Src/Movie.cpp Src/NetPlay.cpp Src/NetPlayClient.cpp @@ -153,6 +152,7 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/PPCTables.cpp Src/PowerPC/Profiler.cpp Src/PowerPC/SignatureDB.cpp + Src/PowerPC/JitInterface.cpp Src/PowerPC/Interpreter/Interpreter_Branch.cpp Src/PowerPC/Interpreter/Interpreter.cpp Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -162,6 +162,15 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/Interpreter/Interpreter_Paired.cpp Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp Src/PowerPC/Interpreter/Interpreter_Tables.cpp + Src/PowerPC/JitCommon/JitAsmCommon.cpp + Src/PowerPC/JitCommon/JitBackpatch.cpp + Src/PowerPC/JitCommon/JitBase.cpp + Src/PowerPC/JitCommon/JitCache.cpp + Src/PowerPC/JitCommon/Jit_Util.cpp) + +if(NOT _M_GENERIC) + set(SRCS ${SRCS} + Src/x64MemTools.cpp Src/PowerPC/Jit64IL/IR.cpp Src/PowerPC/Jit64IL/IR_X86.cpp Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -186,12 +195,25 @@ set(SRCS Src/ActionReplay.cpp Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp Src/PowerPC/Jit64/Jit_Paired.cpp Src/PowerPC/Jit64/JitRegCache.cpp - Src/PowerPC/Jit64/Jit_SystemRegisters.cpp - Src/PowerPC/JitCommon/JitAsmCommon.cpp - Src/PowerPC/JitCommon/JitBackpatch.cpp - Src/PowerPC/JitCommon/JitBase.cpp - Src/PowerPC/JitCommon/JitCache.cpp - Src/PowerPC/JitCommon/Jit_Util.cpp) + Src/PowerPC/Jit64/Jit_SystemRegisters.cpp) +endif() +if(_M_ARM) + set(SRCS ${SRCS} + Src/ArmMemTools.cpp + Src/PowerPC/JitArm32/Jit.cpp + Src/PowerPC/JitArm32/JitAsm.cpp + Src/PowerPC/JitArm32/JitArm_BackPatch.cpp + Src/PowerPC/JitArm32/JitArm_Tables.cpp + Src/PowerPC/JitArm32/JitArmCache.cpp + Src/PowerPC/JitArm32/JitRegCache.cpp + Src/PowerPC/JitArm32/JitFPRCache.cpp + Src/PowerPC/JitArm32/JitArm_Branch.cpp + Src/PowerPC/JitArm32/JitArm_Integer.cpp + Src/PowerPC/JitArm32/JitArm_LoadStore.cpp + Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp + Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp + Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp) +endif() set(LIBS bdisasm inputcommon videosoftware sfml-network) diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index bd3d97f11b..1dd547b2ea 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -332,7 +332,7 @@ - + @@ -378,6 +378,7 @@ + @@ -387,10 +388,10 @@ - false - false - false - + false + false + false + Create Create @@ -563,6 +564,7 @@ + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 246dafd972..b4f3f47be7 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -5,9 +5,8 @@ - - + @@ -562,6 +561,9 @@ HW %28Flipper/Hollywood%29\GCMemcard + + PowerPC + @@ -1048,6 +1050,9 @@ HW %28Flipper/Hollywood%29\GCMemcard + + PowerPC + diff --git a/Source/Core/Core/Src/ArmMemTools.cpp b/Source/Core/Core/Src/ArmMemTools.cpp new file mode 100644 index 0000000000..34a0c34b7d --- /dev/null +++ b/Source/Core/Core/Src/ArmMemTools.cpp @@ -0,0 +1,103 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + + +#include +#include +#ifdef ANDROID +#include +#else +#include // Look in here for the context definition. +#include +#endif + +#include "Common.h" +#include "MemTools.h" +#include "HW/Memmap.h" +#include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" +#include "PowerPC/JitCommon/JitBase.h" + +namespace EMM +{ +#ifdef ANDROID +typedef struct sigcontext mcontext_t; +typedef struct ucontext { + uint32_t uc_flags; + struct ucontext* uc_link; + stack_t uc_stack; + mcontext_t uc_mcontext; + // Other fields are not used by Google Breakpad. Don't define them. +} ucontext_t; +#endif + +void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) +{ + if (signal != SIGSEGV) + { + // We are not interested in other signals - handle it as usual. + return; + } + ucontext_t *context = (ucontext_t *)raw_context; + int sicode = info->si_code; + if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR) + { + // Huh? Return. + return; + } + + + // Get all the information we can out of the context. + mcontext_t *ctx = &context->uc_mcontext; + + void *fault_memory_ptr = (void*)ctx->arm_r10; + u8 *fault_instruction_ptr = (u8 *)ctx->arm_pc; + + if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) { + // Let's not prevent debugging. + return; + } + + u64 bad_address = (u64)fault_memory_ptr; + u64 memspace_bottom = (u64)Memory::base; + if (bad_address < memspace_bottom) { + PanicAlertT("Exception handler - access below memory space. %08llx%08llx", + bad_address >> 32, bad_address); + } + + u32 em_address = (u32)(bad_address - memspace_bottom); + + int access_type = 0; + + CONTEXT fake_ctx; + fake_ctx.reg_pc = ctx->arm_pc; + const u8 *new_rip = jit->BackPatch(fault_instruction_ptr, access_type, em_address, &fake_ctx); + if (new_rip) { + ctx->arm_pc = fake_ctx.reg_pc; + } +} + +void InstallExceptionHandler() +{ + struct sigaction sa; + sa.sa_handler = 0; + sa.sa_sigaction = &sigsegv_handler; + sa.sa_flags = SA_SIGINFO; + sigemptyset(&sa.sa_mask); + sigaction(SIGSEGV, &sa, NULL); +} +} // namespace diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h index 0c4ceffa9f..4a36b37335 100644 --- a/Source/Core/Core/Src/ConfigManager.h +++ b/Source/Core/Core/Src/ConfigManager.h @@ -35,7 +35,7 @@ #define BACKEND_OPENAL "OpenAL" #define BACKEND_PULSEAUDIO "Pulse" #define BACKEND_XAUDIO2 "XAudio2" - +#define BACKEND_OPENSLES "OpenSLES" struct SConfig : NonCopyable { // Wii Devices diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index a6c07eeaaa..f7337def45 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -54,7 +54,6 @@ #include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "PowerPC/PowerPC.h" -#include "PowerPC/JitCommon/JitBase.h" #include "DSPEmulator.h" #include "ConfigManager.h" @@ -140,7 +139,7 @@ void DisplayMessage(const char *message, int time_in_ms) if (_CoreParameter.bRenderToMain && SConfig::GetInstance().m_InterfaceStatusbar) { - Host_UpdateStatusBar(message); + Host_UpdateStatusBar(message); } else Host_UpdateTitle(message); @@ -189,7 +188,7 @@ bool IsGPUThread() return IsCPUThread(); } } - + // This is called from the GUI thread. See the booting call schedule in // BootManager.cpp bool Init() @@ -310,7 +309,7 @@ void CpuThread() g_video_backend->Video_Prepare(); } - #if defined(_M_X64) + #if defined(_M_X64) || _M_ARM EMM::InstallExceptionHandler(); // Let's run under memory watch #endif diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp index 2ce441bf31..12dac52e31 100644 --- a/Source/Core/Core/Src/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/Src/DSP/DSPEmitter.cpp @@ -25,7 +25,7 @@ #include "DSPAnalyzer.h" #include "Jit/DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #define MAX_BLOCK_SIZE 250 #define DSP_IDLE_SKIP_CYCLES 0x1000 diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp index f2cbbc2b9f..e4c81e4a7a 100644 --- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp @@ -252,7 +252,9 @@ static void gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size) ERROR_LOG(DSPLLE, "*** idma_out IRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2, addr, size); } +#if _M_SSE >= 0x301 static const __m128i s_mask = _mm_set_epi32(0x0E0F0C0DL, 0x0A0B0809L, 0x06070405L, 0x02030001L); +#endif // TODO: These should eat clock cycles. static void gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size) diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp index 0b75431de6..185ada8ba3 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp @@ -25,7 +25,7 @@ #include "DSPJitUtil.h" #endif #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // CLR $acR diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp index 8ca770e35d..252550b84c 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp @@ -21,7 +21,7 @@ #include "../DSPAnalyzer.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp index e382b6114a..be7675378d 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp @@ -24,7 +24,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // In: RAX: s64 _Value diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp index 8203f7cde1..40e39a89e9 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp @@ -18,7 +18,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp index a784e2dd2d..248ed8f945 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp @@ -22,7 +22,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // SRS @M, $(0x18+S) diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp index 8d8a635536..d0bf7a3822 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp @@ -20,7 +20,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; //clobbers: diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp index 1323de002d..0dcbf41877 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp @@ -27,7 +27,7 @@ #include "DSPJitUtil.h" #endif #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; // Returns s64 in RAX diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp index b9e166f698..2fb18f83da 100644 --- a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp +++ b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp @@ -20,7 +20,7 @@ #include "../DSPEmitter.h" #include "DSPJitUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" using namespace Gen; diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index 88f6b2c358..6a6fb14212 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -419,132 +419,6 @@ u32 Read_Instruction(const u32 em_address) return inst.hex; } -u32 Read_Opcode_JIT_Uncached(const u32 _Address) -{ - u8* iCache; - u32 addr; - if (_Address & JIT_ICACHE_VMEM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheVMEM(); - addr = _Address & JIT_ICACHE_MASK; - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheEx(); - addr = _Address & JIT_ICACHEEX_MASK; - } - else - { - iCache = jit->GetBlockCache()->GetICache(); - addr = _Address & JIT_ICACHE_MASK; - } - u32 inst = *(u32*)(iCache + addr); - if (inst == JIT_ICACHE_INVALID_WORD) - { - u32 cache_block_start = addr & ~0x1f; - u32 mem_block_start = _Address & ~0x1f; - u8 *pMem = Memory::GetPointer(mem_block_start); - memcpy(iCache + cache_block_start, pMem, 32); - inst = *(u32*)(iCache + addr); - } - inst = Common::swap32(inst); - - if ((inst & 0xfc000000) == 0) - { - inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); - } - - return inst; -} - -u32 Read_Opcode_JIT(u32 _Address) -{ -#ifdef FAST_ICACHE - if (bMMU && !bFakeVMEM && (_Address & ADDR_MASK_MEM1)) - { - _Address = Memory::TranslateAddress(_Address, FLAG_OPCODE); - if (_Address == 0) - { - return 0; - } - } - u32 inst = 0; - - // Bypass the icache for the external interrupt exception handler - if ( (_Address & 0x0FFFFF00) == 0x00000500 ) - inst = Read_Opcode_JIT_Uncached(_Address); - else - inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); -#else - u32 inst = Memory::ReadUnchecked_U32(_Address); -#endif - return inst; -} - -// The following function is deprecated in favour of FAST_ICACHE -u32 Read_Opcode_JIT_LC(const u32 _Address) -{ -#ifdef JIT_UNLIMITED_ICACHE - if ((_Address & ~JIT_ICACHE_MASK) != 0x80000000 && (_Address & ~JIT_ICACHE_MASK) != 0x00000000 && - (_Address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area - (_Address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (_Address & ~JIT_ICACHEEX_MASK) != 0x10000000) - { - PanicAlertT("iCacheJIT: Reading Opcode from %x. Please report.", _Address); - ERROR_LOG(MEMMAP, "iCacheJIT: Reading Opcode from %x. Please report.", _Address); - return 0; - } - u8* iCache; - u32 addr; - if (_Address & JIT_ICACHE_VMEM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheVMEM(); - addr = _Address & JIT_ICACHE_MASK; - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - iCache = jit->GetBlockCache()->GetICacheEx(); - addr = _Address & JIT_ICACHEEX_MASK; - } - else - { - iCache = jit->GetBlockCache()->GetICache(); - addr = _Address & JIT_ICACHE_MASK; - } - u32 inst = *(u32*)(iCache + addr); - if (inst == JIT_ICACHE_INVALID_WORD) - inst = Memory::ReadUnchecked_U32(_Address); - else - inst = Common::swap32(inst); -#else - u32 inst = Memory::ReadUnchecked_U32(_Address); -#endif - if ((inst & 0xfc000000) == 0) - { - inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); - } - return inst; -} - -// WARNING! No checks! -// We assume that _Address is cached -void Write_Opcode_JIT(const u32 _Address, const u32 _Value) -{ -#ifdef JIT_UNLIMITED_ICACHE - if (_Address & JIT_ICACHE_VMEM_BIT) - { - *(u32*)(jit->GetBlockCache()->GetICacheVMEM() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); - } - else if (_Address & JIT_ICACHE_EXRAM_BIT) - { - *(u32*)(jit->GetBlockCache()->GetICacheEx() + (_Address & JIT_ICACHEEX_MASK)) = Common::swap32(_Value); - } - else - *(u32*)(jit->GetBlockCache()->GetICache() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); -#else - Memory::WriteUnchecked_U32(_Value, _Address); -#endif -} - void WriteBigEData(const u8 *_pData, const u32 _Address, const u32 _iSize) { memcpy(GetPointer(_Address), _pData, _iSize); diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h index 42ceb737ca..8662804185 100644 --- a/Source/Core/Core/Src/HW/Memmap.h +++ b/Source/Core/Core/Src/HW/Memmap.h @@ -119,11 +119,6 @@ inline u32 ReadFast32(const u32 _Address) // used by interpreter to read instructions, uses iCache u32 Read_Opcode(const u32 _Address); -// used by JIT to read instructions -u32 Read_Opcode_JIT(const u32 _Address); -// used by JIT. uses iCacheJIT. Reads in the "Locked cache" mode -u32 Read_Opcode_JIT_LC(const u32 _Address); -void Write_Opcode_JIT(const u32 _Address, const u32 _Value); // this is used by Debugger a lot. // For now, just reads from memory! u32 Read_Instruction(const u32 _Address); diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp index 1d6ea2e70d..ffaea0e868 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp @@ -28,8 +28,6 @@ #undef _interlockedbittestandreset #undef _interlockedbittestandset64 #undef _interlockedbittestandreset64 -#else -#include #endif #include "../../Core.h" @@ -514,4 +512,4 @@ void Interpreter::fsqrtx(UGeckoInstruction _inst) rPS0(_inst.FD) = sqrt(b); UpdateFPRF(rPS0(_inst.FD)); if (_inst.Rc) Helper_UpdateCR1(rPS0(_inst.FD)); -} \ No newline at end of file +} diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 5e665eb38e..8e406dbfab 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -24,8 +24,7 @@ #include "Interpreter.h" #include "../../Core.h" -#include "../JitCommon/JitBase.h" -#include "../JitCommon/JitCache.h" +#include "../JitInterface.h" #include "Interpreter_FPUtils.h" @@ -363,34 +362,24 @@ void Interpreter::dcbf(UGeckoInstruction _inst) { NPC = PC + 12; }*/ - // Invalidate the jit block cache on dcbf - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbi(UGeckoInstruction _inst) { // Removes a block from data cache. Since we don't emulate the data cache, we don't need to do anything to the data cache // However, we invalidate the jit block cache on dcbi - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbst(UGeckoInstruction _inst) { // Cache line flush. Since we don't emulate the data cache, we don't need to do anything. // Invalidate the jit block cache on dcbst in case new code has been loaded via the data cache - if (jit) - { u32 address = Helper_Get_EA_X(_inst); - jit->GetBlockCache()->InvalidateICache(address & ~0x1f, 32); - } + JitInterface::InvalidateICache(address & ~0x1f, 32); } void Interpreter::dcbt(UGeckoInstruction _inst) @@ -409,7 +398,7 @@ void Interpreter::dcbz(UGeckoInstruction _inst) // HACK but works... we think if (!Core::g_CoreStartupParameter.bDCBZOFF) Memory::Memset(Helper_Get_EA_X(_inst) & (~31), 0, 32); - if (!jit) + if (!JitInterface::GetCore()) PowerPC::CheckExceptions(); } diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index 5a199b56c8..ff65f52471 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -26,13 +26,6 @@ #undef _interlockedbittestandreset #undef _interlockedbittestandset64 #undef _interlockedbittestandreset64 -#else -static const unsigned short FPU_ROUND_NEAR = 0 << 10; -static const unsigned short FPU_ROUND_DOWN = 1 << 10; -static const unsigned short FPU_ROUND_UP = 2 << 10; -static const unsigned short FPU_ROUND_CHOP = 3 << 10; -static const unsigned short FPU_ROUND_MASK = 3 << 10; -#include #endif #include "CPUDetect.h" @@ -43,6 +36,7 @@ static const unsigned short FPU_ROUND_MASK = 3 << 10; #include "../../HW/SystemTimers.h" #include "../../Core.h" #include "Interpreter.h" +#include "FPURoundMode.h" #include "Interpreter_FPUtils.h" @@ -61,38 +55,11 @@ mffsx: 80036650 (huh?) // That is, set rounding mode etc when entering jit code or the interpreter loop // Restore rounding mode when calling anything external -const u32 MASKS = 0x1F80; // mask away the interrupts. -const u32 DAZ = 0x40; -const u32 FTZ = 0x8000; - static void FPSCRtoFPUSettings(UReg_FPSCR fp) { - // Set FPU rounding mode to mimic the PowerPC's -#ifdef _M_IX86 - // This shouldn't really be needed anymore since we use SSE -#ifdef _WIN32 - const int table[4] = - { - _RC_NEAR, - _RC_CHOP, - _RC_UP, - _RC_DOWN - }; - _set_controlfp(_MCW_RC, table[fp.RN]); -#else - const unsigned short table[4] = - { - FPU_ROUND_NEAR, - FPU_ROUND_CHOP, - FPU_ROUND_UP, - FPU_ROUND_DOWN - }; - unsigned short mode; - asm ("fstcw %0" : "=m" (mode) : ); - mode = (mode & ~FPU_ROUND_MASK) | table[fp.RN]; - asm ("fldcw %0" : : "m" (mode)); -#endif -#endif + + FPURoundMode::SetRoundMode(fp.RN); + if (fp.VE || fp.OE || fp.UE || fp.ZE || fp.XE) { //PanicAlert("FPSCR - exceptions enabled. Please report. VE=%i OE=%i UE=%i ZE=%i XE=%i", @@ -101,14 +68,6 @@ static void FPSCRtoFPUSettings(UReg_FPSCR fp) } // Also corresponding SSE rounding mode setting - static const u32 ssetable[4] = - { - (0 << 13) | MASKS, - (3 << 13) | MASKS, - (2 << 13) | MASKS, - (1 << 13) | MASKS, - }; - u32 csr = ssetable[FPSCR.RN]; if (FPSCR.NI) { // Either one of these two breaks Beyond Good & Evil. @@ -116,7 +75,7 @@ static void FPSCRtoFPUSettings(UReg_FPSCR fp) // csr |= DAZ; // csr |= FTZ; } - _mm_setcsr(csr); + FPURoundMode::SetSIMDMode(FPSCR.RN); } void Interpreter::mtfsb0x(UGeckoInstruction _inst) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp index 07219218a2..fee8ed70d8 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -267,7 +267,7 @@ static GekkoOPTemplate table31[] = {19, Interpreter::mfcr, {"mfcr", OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}}, {83, Interpreter::mfmsr, {"mfmsr", OPTYPE_SYSTEM, FL_OUT_D, 0, 0, 0, 0}}, {144, Interpreter::mtcrf, {"mtcrf", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, - {146, Interpreter::mtmsr, {"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK, 0, 0, 0, 0}}, + {146, Interpreter::mtmsr, {"mtmsr", OPTYPE_SYSTEM, FL_IN_S | FL_ENDBLOCK, 0, 0, 0, 0}}, {210, Interpreter::mtsr, {"mtsr", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, {242, Interpreter::mtsrin, {"mtsrin", OPTYPE_SYSTEM, 0, 0, 0, 0, 0}}, {339, Interpreter::mfspr, {"mfspr", OPTYPE_SPR, FL_OUT_D, 0, 0, 0, 0}}, diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp index 900a8475f7..710984571e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp @@ -24,7 +24,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HLE/HLE.h" #include "../../Core.h" @@ -357,7 +357,7 @@ void Jit64::WriteExternalExceptionExit() MOV(32, R(EAX), M(&PC)); MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExternalExceptions)); - SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); + SUB(32, M(&CoreTiming::downcount), js.downcountAmount > 127 ? Imm32(js.downcountAmount) : Imm8(js.downcountAmount)); JMP(asm_routines.dispatcher, true); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index 1ebd476134..1d856d6291 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -62,7 +62,7 @@ if (js.memcheck) \ SetJumpTarget(memException); -class Jit64 : public JitBase +class Jit64 : public Jitx86Base { private: GPRRegCache gpr; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index f7082cd1cc..df27a3a641 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "x64Emitter.h" #include "../../HW/Memmap.h" @@ -24,7 +24,7 @@ #include "../../CoreTiming.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "../JitCommon/JitCache.h" @@ -204,7 +204,7 @@ void Jit64AsmRoutineManager::Generate() MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExternalExceptions)); SetJumpTarget(noExtException); - + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); J_CC(CC_Z, outerLoop, true); diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h index e8df0877f7..19e1f41ba8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.h @@ -18,7 +18,6 @@ #ifndef _JIT64ASM_H #define _JIT64ASM_H -#include "x64Emitter.h" #include "../JitCommon/JitAsmCommon.h" // In Dolphin, we don't use inline assembly. Instead, we generate all machine-near diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp index 04e4d09cc9..7c1d60ad09 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp @@ -28,7 +28,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 9f61e097b8..5766eb3177 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -27,7 +27,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp index 3b14179cd4..924758ab3a 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -28,7 +28,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Jit.h" #include "JitAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp index 14827129f8..0b6c0462d9 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -23,7 +23,7 @@ #include "../PowerPC.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "Jit.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp index ce47e2c3ac..3638ba8da6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR_X86.cpp @@ -1991,8 +1991,10 @@ void JitIL::WriteCode() { } void ProfiledReJit() { - jit->SetCodePtr(jit->js.rewriteStart); - DoWriteCode(&((JitIL *)jit)->ibuild, (JitIL *)jit, true, false); - jit->js.curBlock->codeSize = (int)(jit->GetCodePtr() - jit->js.rewriteStart); - jit->GetBlockCache()->FinalizeBlock(jit->js.curBlock->blockNum, jit->jo.enableBlocklink, jit->js.curBlock->normalEntry); + JitIL *jitil = (JitIL *)jit; + jitil->SetCodePtr(jitil->js.rewriteStart); + DoWriteCode(&jitil->ibuild, jitil, true, false); + jitil->js.curBlock->codeSize = (int)(jitil->GetCodePtr() - jitil->js.rewriteStart); + jitil->GetBlockCache()->FinalizeBlock(jitil->js.curBlock->blockNum, jitil->jo.enableBlocklink, + jitil->js.curBlock->normalEntry); } diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index d56c9ffee8..dc21228858 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HLE/HLE.h" #include "../../Core.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h index fdda098e44..8c579fa4bd 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h @@ -57,7 +57,7 @@ #define DISABLE64 #endif -class JitIL : public JitBase +class JitIL : public Jitx86Base { private: diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp index 74c290aa9c..aaa155072e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "x64Emitter.h" #include "../../HW/Memmap.h" @@ -25,7 +25,7 @@ #include "MemoryUtil.h" #include "CPUDetect.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "../../HW/GPFifo.h" @@ -211,14 +211,14 @@ void JitILAsmRoutineManager::Generate() doTiming = GetCodePtr(); ABI_CallFunction(reinterpret_cast(&CoreTiming::Advance)); - + testExceptions = GetCodePtr(); MOV(32, R(EAX), M(&PC)); MOV(32, M(&NPC), R(EAX)); ABI_CallFunction(reinterpret_cast(&PowerPC::CheckExceptions)); MOV(32, R(EAX), M(&NPC)); MOV(32, M(&PC), R(EAX)); - + TEST(32, M((void*)PowerPC::GetStatePtr()), Imm32(0xFFFFFFFF)); J_CC(CC_Z, outer_loop, true); //Landing pad for drec space diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp index 45ceda694a..96902434a6 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp @@ -27,7 +27,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp index e06d289cc4..c74abfd8e9 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp @@ -27,7 +27,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp index 2f0a0762fd..6e86804bec 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp @@ -25,7 +25,7 @@ #include "../PPCTables.h" #include "CPUDetect.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitIL.h" #include "JitILAsm.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp index f3e25dc2dd..70a6ea4843 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp @@ -23,7 +23,7 @@ #include "../PowerPC.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "JitIL.h" diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp new file mode 100644 index 0000000000..e4b0ffd714 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp @@ -0,0 +1,498 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#include "Common.h" +#include "../../HLE/HLE.h" +#include "../../Core.h" +#include "../../PatchEngine.h" +#include "../../CoreTiming.h" +#include "../../ConfigManager.h" +#include "../PowerPC.h" +#include "../Profiler.h" +#include "../PPCTables.h" +#include "../PPCAnalyst.h" +#include "../../HW/Memmap.h" +#include "../../HW/GPFifo.h" +#include "Jit.h" +#include "JitArm_Tables.h" +#include "ArmEmitter.h" +#include "../JitInterface.h" + +using namespace ArmGen; +using namespace PowerPC; + +static int CODE_SIZE = 1024*1024*32; +namespace CPUCompare +{ + extern u32 m_BlockStart; +} + +void JitArm::Init() +{ + AllocCodeSpace(CODE_SIZE); + blocks.Init(); + asm_routines.Init(); + // TODO: Investigate why the register cache crashes when only doing Init with + // the pointer to this. Seems for some reason it doesn't set the emitter pointer + // In the class for some reason? + gpr.Init(this); + gpr.SetEmitter(this); + fpr.Init(this); + fpr.SetEmitter(this); + jo.enableBlocklink = true; + jo.optimizeGatherPipe = false; +} + +void JitArm::ClearCache() +{ + ClearCodeSpace(); + blocks.Clear(); +} + +void JitArm::Shutdown() +{ + FreeCodeSpace(); + blocks.Shutdown(); + asm_routines.Shutdown(); +} + +// This is only called by Default() in this file. It will execute an instruction with the interpreter functions. +void JitArm::WriteCallInterpreter(UGeckoInstruction inst) +{ + gpr.Flush(); + fpr.Flush(); + Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst); + MOVI2R(R0, inst.hex); + MOVI2R(R12, (u32)instr); + BL(R12); +} +void JitArm::unknown_instruction(UGeckoInstruction inst) +{ + PanicAlert("unknown_instruction %08x - Fix me ;)", inst.hex); +} + +void JitArm::Default(UGeckoInstruction _inst) +{ + WriteCallInterpreter(_inst.hex); +} + +void JitArm::HLEFunction(UGeckoInstruction _inst) +{ + gpr.Flush(); + fpr.Flush(); + MOVI2R(R0, js.compilerPC); + MOVI2R(R1, _inst.hex); + QuickCallFunction(R14, (void*)&HLE::Execute); + ARMReg rA = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + WriteExitDestInR(rA); +} + +void JitArm::DoNothing(UGeckoInstruction _inst) +{ + // Yup, just don't do anything. +} + +static const bool ImHereDebug = false; +static const bool ImHereLog = false; +static std::map been_here; + +static void ImHere() +{ + static File::IOFile f; + if (ImHereLog) + { + if (!f) + { + f.Open("log32.txt", "w"); + } + fprintf(f.GetHandle(), "%08x\n", PC); + } + if (been_here.find(PC) != been_here.end()) + { + been_here.find(PC)->second++; + if ((been_here.find(PC)->second) & 1023) + return; + } + DEBUG_LOG(DYNA_REC, "I'm here - PC = %08x , LR = %08x", PC, LR); + been_here[PC] = 1; +} + +void JitArm::Cleanup() +{ + if (jo.optimizeGatherPipe && js.fifoBytesThisBlock > 0) + QuickCallFunction(R14, (void*)&GPFifo::CheckGatherPipe); +} +void JitArm::DoDownCount() +{ + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&CoreTiming::downcount); + LDR(rB, rA); + if(js.downcountAmount < 255) // We can enlarge this if we used rotations + { + SUBS(rB, rB, js.downcountAmount); + STR(rA, rB); + } + else + { + ARMReg rC = gpr.GetReg(false); + MOVI2R(rC, js.downcountAmount); + SUBS(rB, rB, rC); + STR(rA, rB); + } + gpr.Unlock(rA, rB); +} +void JitArm::WriteExitDestInR(ARMReg Reg) +{ + STR(R9, Reg, STRUCT_OFF(PowerPC::ppcState, pc)); + Cleanup(); + DoDownCount(); + MOVI2R(Reg, (u32)asm_routines.dispatcher); + B(Reg); + gpr.Unlock(Reg); +} +void JitArm::WriteRfiExitDestInR(ARMReg Reg) +{ + STR(R9, Reg, STRUCT_OFF(PowerPC::ppcState, pc)); + Cleanup(); + DoDownCount(); + + MOVI2R(Reg, (u32)asm_routines.testExceptions); + B(Reg); + gpr.Unlock(Reg); // This was locked in the instruction beforehand +} +void JitArm::WriteExceptionExit() +{ + ARMReg A = gpr.GetReg(false); + Cleanup(); + DoDownCount(); + + MOVI2R(A, (u32)asm_routines.testExceptions); + B(A); +} +void JitArm::WriteExit(u32 destination, int exit_num) +{ + Cleanup(); + + DoDownCount(); + //If nobody has taken care of this yet (this can be removed when all branches are done) + JitBlock *b = js.curBlock; + b->exitAddress[exit_num] = destination; + b->exitPtrs[exit_num] = GetWritableCodePtr(); + + // Link opportunity! + int block = blocks.GetBlockNumberFromStartAddress(destination); + if (block >= 0 && jo.enableBlocklink) + { + // It exists! Joy of joy! + B(blocks.GetBlock(block)->checkedEntry); + b->linkStatus[exit_num] = true; + } + else + { + ARMReg A = gpr.GetReg(false); + MOVI2R(A, destination); + STR(R9, A, STRUCT_OFF(PowerPC::ppcState, pc)); + MOVI2R(A, (u32)asm_routines.dispatcher); + B(A); + } +} + +void STACKALIGN JitArm::Run() +{ + CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; + pExecAddr(); +} + +void JitArm::SingleStep() +{ + CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; + pExecAddr(); +} + +void JitArm::Trace() +{ + char regs[500] = ""; + char fregs[750] = ""; + +#ifdef JIT_LOG_GPR + for (int i = 0; i < 32; i++) + { + char reg[50]; + sprintf(reg, "r%02d: %08x ", i, PowerPC::ppcState.gpr[i]); + strncat(regs, reg, 500); + } +#endif + +#ifdef JIT_LOG_FPR + for (int i = 0; i < 32; i++) + { + char reg[50]; + sprintf(reg, "f%02d: %016x ", i, riPS0(i)); + strncat(fregs, reg, 750); + } +#endif + + DEBUG_LOG(DYNA_REC, "JITARM PC: %08x SRR0: %08x SRR1: %08x CRfast: %02x%02x%02x%02x%02x%02x%02x%02x FPSCR: %08x MSR: %08x LR: %08x %s %s", + PC, SRR0, SRR1, PowerPC::ppcState.cr_fast[0], PowerPC::ppcState.cr_fast[1], PowerPC::ppcState.cr_fast[2], PowerPC::ppcState.cr_fast[3], + PowerPC::ppcState.cr_fast[4], PowerPC::ppcState.cr_fast[5], PowerPC::ppcState.cr_fast[6], PowerPC::ppcState.cr_fast[7], PowerPC::ppcState.fpscr, + PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs, fregs); +} + +void JitArm::PrintDebug(UGeckoInstruction inst, u32 level) +{ + if (level > 0) + printf("Start: %08x OP '%s' Info\n", (u32)GetCodePtr(), PPCTables::GetInstructionName(inst)); + if (level > 1) + { + GekkoOPInfo* Info = GetOpInfo(inst.hex); + printf("\tOuts\n"); + if (Info->flags & FL_OUT_A) + printf("\t-OUT_A: %x\n", inst.RA); + if(Info->flags & FL_OUT_D) + printf("\t-OUT_D: %x\n", inst.RD); + printf("\tIns\n"); + // A, AO, B, C, S + if(Info->flags & FL_IN_A) + printf("\t-IN_A: %x\n", inst.RA); + if(Info->flags & FL_IN_A0) + printf("\t-IN_A0: %x\n", inst.RA); + if(Info->flags & FL_IN_B) + printf("\t-IN_B: %x\n", inst.RB); + if(Info->flags & FL_IN_C) + printf("\t-IN_C: %x\n", inst.RC); + if(Info->flags & FL_IN_S) + printf("\t-IN_S: %x\n", inst.RS); + } +} + +void STACKALIGN JitArm::Jit(u32 em_address) +{ + if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || Core::g_CoreStartupParameter.bJITNoBlockCache) + { + ClearCache(); + } + + int block_num = blocks.AllocateBlock(em_address); + JitBlock *b = blocks.GetBlock(block_num); + const u8* BlockPtr = DoJit(em_address, &code_buffer, b); + blocks.FinalizeBlock(block_num, jo.enableBlocklink, BlockPtr); +} +void JitArm::Break(UGeckoInstruction inst) +{ + BKPT(0x4444); +} + +const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b) +{ + int blockSize = code_buf->GetSize(); + + // Memory exception on instruction fetch + bool memory_exception = false; + + // A broken block is a block that does not end in a branch + bool broken_block = false; + + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + // Comment out the following to disable breakpoints (speed-up) + blockSize = 1; + broken_block = true; + Trace(); + } + + if (em_address == 0) + { + Core::SetState(Core::CORE_PAUSE); + PanicAlert("ERROR: Compiling at 0. LR=%08x CTR=%08x", LR, CTR); + } + + if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT)) + { + if (!Memory::TranslateAddress(em_address, Memory::FLAG_OPCODE)) + { + // Memory exception occurred during instruction fetch + memory_exception = true; + } + } + + + int size = 0; + js.isLastInstruction = false; + js.blockStart = em_address; + js.fifoBytesThisBlock = 0; + js.curBlock = b; + js.block_flags = 0; + js.cancel = false; + + // Analyze the block, collect all instructions it is made of (including inlining, + // if that is enabled), reorder instructions for optimal performance, and join joinable instructions. + u32 nextPC = em_address; + u32 merged_addresses[32]; + const int capacity_of_merged_addresses = sizeof(merged_addresses) / sizeof(merged_addresses[0]); + int size_of_merged_addresses = 0; + if (!memory_exception) + { + // If there is a memory exception inside a block (broken_block==true), compile up to that instruction. + nextPC = PPCAnalyst::Flatten(em_address, &size, &js.st, &js.gpa, &js.fpa, broken_block, code_buf, blockSize, merged_addresses, capacity_of_merged_addresses, size_of_merged_addresses); + } + PPCAnalyst::CodeOp *ops = code_buf->codebuffer; + + const u8 *start = GetCodePtr(); + b->checkedEntry = start; + b->runCount = 0; + + // Downcount flag check, Only valid for linked blocks + { + FixupBranch skip = B_CC(CC_PL); + ARMABI_MOVI2M((u32)&PC, js.blockStart); + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)asm_routines.doTiming); + B(rA); + SetJumpTarget(skip); + } + + const u8 *normalEntry = GetCodePtr(); + b->normalEntry = normalEntry; + + if(ImHereDebug) + QuickCallFunction(R14, (void *)&ImHere); //Used to get a trace of the last few blocks before a crash, sometimes VERY useful + + if (js.fpa.any) + { + // This block uses FPU - needs to add FP exception bailout + ARMReg A = gpr.GetReg(); + ARMReg C = gpr.GetReg(); + Operand2 Shift(2, 10); // 1 << 13 + MOVI2R(C, js.blockStart); // R3 + LDR(A, R9, STRUCT_OFF(PowerPC::ppcState, msr)); + TST(A, Shift); + FixupBranch b1 = B_CC(CC_NEQ); + STR(R9, C, STRUCT_OFF(PowerPC::ppcState, pc)); + MOVI2R(A, (u32)asm_routines.fpException); + B(A); + SetJumpTarget(b1); + gpr.Unlock(A, C); + } + // Conditionally add profiling code. + if (Profiler::g_ProfileBlocks) { + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&b->runCount); // Load in to register + LDR(rB, rA); // Load the actual value in to R11. + ADD(rB, rB, 1); // Add one to the value + STR(rA, rB); // Now store it back in the memory location + // get start tic + PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart); + gpr.Unlock(rA, rB); + } + gpr.Start(js.gpa); + fpr.Start(js.fpa); + js.downcountAmount = 0; + if (!Core::g_CoreStartupParameter.bEnableDebugging) + { + for (int i = 0; i < size_of_merged_addresses; ++i) + { + const u32 address = merged_addresses[i]; + js.downcountAmount += PatchEngine::GetSpeedhackCycles(address); + } + } + + js.skipnext = false; + js.blockSize = size; + js.compilerPC = nextPC; + // Translate instructions + for (int i = 0; i < (int)size; i++) + { + js.compilerPC = ops[i].address; + js.op = &ops[i]; + js.instructionNumber = i; + const GekkoOPInfo *opinfo = ops[i].opinfo; + js.downcountAmount += (opinfo->numCyclesMinusOne + 1); + + if (i == (int)size - 1) + { + // WARNING - cmp->branch merging will screw this up. + js.isLastInstruction = true; + js.next_inst = 0; + if (Profiler::g_ProfileBlocks) { + // CAUTION!!! push on stack regs you use, do your stuff, then pop + PROFILER_VPUSH; + // get end tic + PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop); + // tic counter += (end tic - start tic) + PROFILER_ADD_DIFF_LARGE_INTEGER(&b->ticCounter, &b->ticStop, &b->ticStart); + PROFILER_VPOP; + } + } + else + { + // help peephole optimizations + js.next_inst = ops[i + 1].inst; + js.next_compilerPC = ops[i + 1].address; + } + if (jo.optimizeGatherPipe && js.fifoBytesThisBlock >= 32) + { + js.fifoBytesThisBlock -= 32; + // TODO: This needs thunkmanager for ARM + //ARMABI_CallFunction(thunks.ProtectFunction((void *)&GPFifo::CheckGatherPipe, 0)); + } + if (Core::g_CoreStartupParameter.bEnableDebugging) + { + // Add run count + ARMReg RA = gpr.GetReg(); + ARMReg RB = gpr.GetReg(); + MOVI2R(RA, (u32)&opinfo->runCount); + LDR(RB, RA); + ADD(RB, RB, 1); + STR(RA, RB); + gpr.Unlock(RA, RB); + } + if (!ops[i].skip) + { + PrintDebug(ops[i].inst, 0); + if (js.memcheck && (opinfo->flags & FL_USE_FPU)) + { + // Don't do this yet + BKPT(0x7777); + } + JitArmTables::CompileInstruction(ops[i]); + if (js.memcheck && (opinfo->flags & FL_LOADSTORE)) + { + // Don't do this yet + BKPT(0x666); + } + } + } + if (memory_exception) + BKPT(0x500); + if (broken_block) + { + printf("Broken Block going to 0x%08x\n", nextPC); + WriteExit(nextPC, 0); + } + + b->flags = js.block_flags; + b->codeSize = (u32)(GetCodePtr() - normalEntry); + b->originalSize = size; + FlushIcache(); + return start; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h new file mode 100644 index 0000000000..c736ae77a1 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h @@ -0,0 +1,186 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// ======================== +// See comments in Jit.cpp. +// ======================== + +// Mystery: Capcom vs SNK 800aa278 + +// CR flags approach: +// * Store that "N+Z flag contains CR0" or "S+Z flag contains CR3". +// * All flag altering instructions flush this +// * A flush simply does a conditional write to the appropriate CRx. +// * If flag available, branch code can become absolutely trivial. + +// Settings +// ---------- +#ifndef _JITARM_H +#define _JITARM_H +#include "../CPUCoreBase.h" +#include "../PPCAnalyst.h" +#include "JitArmCache.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" +#include "../JitCommon/JitBase.h" + +// Use these to control the instruction selection +// #define INSTRUCTION_START Default(inst); return; +// #define INSTRUCTION_START PPCTables::CountInstruction(inst); +#define INSTRUCTION_START +#define JITDISABLE(type) \ + if (Core::g_CoreStartupParameter.bJITOff || \ + Core::g_CoreStartupParameter.bJIT##type##Off) \ + {Default(inst); return;} + +class JitArm : public JitBase, public ArmGen::ARMXCodeBlock +{ +private: + JitArmBlockCache blocks; + + JitArmAsmRoutineManager asm_routines; + + // TODO: Make arm specific versions of these, shouldn't be too hard to + // make it so we allocate some space at the start(?) of code generation + // and keep the registers in a cache. Will burn this bridge when we get to + // it. + ArmRegCache gpr; + ArmFPRCache fpr; + + PPCAnalyst::CodeBuffer code_buffer; + void DoDownCount(); + + void PrintDebug(UGeckoInstruction inst, u32 level); + + void Helper_UpdateCR1(ARMReg value); +public: + JitArm() : code_buffer(32000) {} + ~JitArm() {} + + void Init(); + void Shutdown(); + + // Jit! + + void Jit(u32 em_address); + const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b); + + JitBaseBlockCache *GetBlockCache() { return &blocks; } + + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + + bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } + + void Trace(); + + void ClearCache(); + + const u8 *GetDispatcher() { + return asm_routines.dispatcher; + } + CommonAsmRoutinesBase *GetAsmRoutines() { + return &asm_routines; + } + + const char *GetName() { + return "JITARM"; + } + // Run! + + void Run(); + void SingleStep(); + + // Utilities for use by opcodes + + void WriteExit(u32 destination, int exit_num); + void WriteExitDestInR(ARMReg Reg); + void WriteRfiExitDestInR(ARMReg Reg); + void WriteExceptionExit(); + void WriteCallInterpreter(UGeckoInstruction _inst); + void Cleanup(); + + void GenerateRC(int cr = 0); + void ComputeRC(int cr = 0); + + // TODO: This shouldn't be here + void StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset); + void LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset); + + // OPCODES + void unknown_instruction(UGeckoInstruction _inst); + void Default(UGeckoInstruction _inst); + void DoNothing(UGeckoInstruction _inst); + void HLEFunction(UGeckoInstruction _inst); + + void DynaRunTable4(UGeckoInstruction _inst); + void DynaRunTable19(UGeckoInstruction _inst); + void DynaRunTable31(UGeckoInstruction _inst); + void DynaRunTable59(UGeckoInstruction _inst); + void DynaRunTable63(UGeckoInstruction _inst); + + // Breakin shit + void Break(UGeckoInstruction _inst); + // Branch + void bx(UGeckoInstruction _inst); + void bcx(UGeckoInstruction _inst); + void bclrx(UGeckoInstruction _inst); + void sc(UGeckoInstruction _inst); + void rfi(UGeckoInstruction _inst); + void bcctrx(UGeckoInstruction _inst); + + // Integer + void addi(UGeckoInstruction _inst); + void addis(UGeckoInstruction _inst); + void addx(UGeckoInstruction _inst); + void cmp (UGeckoInstruction _inst); + void cmpi(UGeckoInstruction _inst); + void cmpli(UGeckoInstruction _inst); + void negx(UGeckoInstruction _inst); + void mulli(UGeckoInstruction _inst); + void ori(UGeckoInstruction _inst); + void oris(UGeckoInstruction _inst); + void orx(UGeckoInstruction _inst); + void rlwimix(UGeckoInstruction _inst); + void rlwinmx(UGeckoInstruction _inst); + void extshx(UGeckoInstruction inst); + void extsbx(UGeckoInstruction inst); + + // System Registers + void mtmsr(UGeckoInstruction _inst); + void mtspr(UGeckoInstruction _inst); + void mfspr(UGeckoInstruction _inst); + + // LoadStore + void icbi(UGeckoInstruction _inst); + void lbz(UGeckoInstruction _inst); + void lhz(UGeckoInstruction _inst); + void lwz(UGeckoInstruction _inst); + void lwzx(UGeckoInstruction _inst); + void stw(UGeckoInstruction _inst); + void stwu(UGeckoInstruction _inst); + + // Floating point + void fabsx(UGeckoInstruction _inst); + void faddx(UGeckoInstruction _inst); + void fmrx(UGeckoInstruction _inst); + + // Floating point loadStore + void lfs(UGeckoInstruction _inst); +}; + +#endif // _JIT64_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp new file mode 100644 index 0000000000..296ca736a9 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.cpp @@ -0,0 +1,46 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// Enable define below to enable oprofile integration. For this to work, +// it requires at least oprofile version 0.9.4, and changing the build +// system to link the Dolphin executable against libopagent. Since the +// dependency is a little inconvenient and this is possibly a slight +// performance hit, it's not enabled by default, but it's useful for +// locating performance issues. + +#include "../JitInterface.h" +#include "JitArmCache.h" + + +using namespace ArmGen; + + void JitArmBlockCache::WriteLinkBlock(u8* location, const u8* address) + { + ARMXEmitter emit(location); + emit.B(address); + } + void JitArmBlockCache::WriteDestroyBlock(const u8* location, u32 address) + { + ARMXEmitter emit((u8 *)location); + emit.MOVI2R(R10, (u32)&PC); + emit.MOVI2R(R11, address); + emit.MOVI2R(R12, (u32)jit->GetAsmRoutines()->dispatcher); + emit.STR(R10, R11); + emit.B(R12); + } + + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h new file mode 100644 index 0000000000..103947d5ad --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArmCache.h @@ -0,0 +1,33 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMCACHE_H +#define _JITARMCACHE_H + +#include "../JitCommon/JitCache.h" + + +typedef void (*CompiledCode)(); + +class JitArmBlockCache : public JitBaseBlockCache +{ +private: + void WriteLinkBlock(u8* location, const u8* address); + void WriteDestroyBlock(const u8* location, u32 address); +}; + +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp new file mode 100644 index 0000000000..677dc238a8 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_BackPatch.cpp @@ -0,0 +1,164 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#include "Common.h" + +#include "../../HW/Memmap.h" +#include "Jit.h" +#include "../JitCommon/JitBackpatch.h" +#include "StringUtil.h" + +#ifdef _M_X64 +static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) { + u64 code_addr = (u64)codePtr; + disassembler disasm; + char disbuf[256]; + memset(disbuf, 0, 256); +#ifdef _M_IX86 + disasm.disasm32(0, code_addr, codePtr, disbuf); +#else + disasm.disasm64(0, code_addr, codePtr, disbuf); +#endif + PanicAlert("%s\n\n" + "Error encountered accessing emulated address %08x.\n" + "Culprit instruction: \n%s\nat %#llx", + text.c_str(), emAddress, disbuf, code_addr); + return; +} +#endif + +// This generates some fairly heavy trampolines, but: +// 1) It's really necessary. We don't know anything about the context. +// 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be +// that many of them in a typical program/game. +bool DisamLoadStore(const u32 inst, ARMReg &rD, u8 &accessSize, bool &Store) +{ + u8 op = (inst >> 20) & 0xFF; + printf("op: 0x%08x\n", op); + switch (op) + { + case 0x58: // STR + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = true; + accessSize = 32; + } + break; + case 0x59: // LDR + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 32; + } + break; + case 0x05: // LDRH + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 16; + } + break; + case 0x45 + 0x18: // LDRB + { + rD = (ARMReg)((inst >> 16) & 0xF); + Store = false; + accessSize = 8; + } + break; + case 0x44 + 0x18: // STRB + default: + return false; + } + return true; +} +const u8 *JitArm::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +{ + // TODO: This ctx needs to be filled with our information + CONTEXT *ctx = (CONTEXT *)ctx_void; + + // We need to get the destination register before we start + u32 Value = *(u32*)codePtr; + ARMReg rD; + u8 accessSize; + bool Store; + + if (!DisamLoadStore(Value, rD, accessSize, Store)) + { + printf("Invalid backpatch at location 0x%08x(0x%08x)\n", ctx->reg_pc, Value); + exit(0); + } + + if (Store) + { + const u32 ARMREGOFFSET = 4 * 7; + ARMXEmitter emitter(codePtr - ARMREGOFFSET); + switch (accessSize) + { + case 8: // 8bit + //emitter.MOVI2R(R14, (u32)&Memory::Write_U8, false); // 1-2 + return 0; + break; + case 16: // 16bit + //emitter.MOVI2R(R14, (u32)&Memory::Write_U16, false); // 1-2 + return 0; + break; + case 32: // 32bit + emitter.MOVI2R(R14, (u32)&Memory::Write_U32, false); // 1-2 + break; + } + emitter.PUSH(4, R0, R1, R2, R3); // 3 + emitter.MOV(R0, rD); // Value - 4 + emitter.MOV(R1, R10); // Addr- 5 + emitter.BL(R14); // 6 + emitter.POP(4, R0, R1, R2, R3); // 7 + emitter.NOP(1); // 8 + u32 newPC = ctx->reg_pc - (ARMREGOFFSET + 4 * 4); + ctx->reg_pc = newPC; + emitter.FlushIcache(); + return codePtr; + } + else + { + const u32 ARMREGOFFSET = 4 * 6; + ARMXEmitter emitter(codePtr - ARMREGOFFSET); + switch (accessSize) + { + case 8: // 8bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U8, false); // 2 + break; + case 16: // 16bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U16, false); // 2 + break; + case 32: // 32bit + emitter.MOVI2R(R14, (u32)&Memory::Read_U32, false); // 2 + break; + } + emitter.PUSH(4, R0, R1, R2, R3); // 3 + emitter.MOV(R0, R10); // 4 + emitter.BL(R14); // 5 + emitter.MOV(R14, R0); // 6 + emitter.POP(4, R0, R1, R2, R3); // 7 + emitter.MOV(rD, R14); // 8 + ctx->reg_pc -= ARMREGOFFSET + (4 * 4); + emitter.FlushIcache(); + return codePtr; + } + return 0; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp new file mode 100644 index 0000000000..27d5c23141 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Branch.cpp @@ -0,0 +1,347 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +// The branches are known good, or at least reasonably good. +// No need for a disable-mechanism. + +// If defined, clears CR0 at blr and bl-s. If the assumption that +// flags never carry over between functions holds, then the task for +// an optimizer becomes much easier. + +// #define ACID_TEST + +// Zelda and many more games seem to pass the Acid Test. + + +using namespace ArmGen; +void JitArm::sc(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + ARMABI_MOVI2M((u32)&PC, js.compilerPC + 4); // Destroys R12 and R14 + ARMReg rA = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + ORR(rA, rA, EXCEPTION_SYSCALL); + STR(R9, rA, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + gpr.Unlock(rA); + + WriteExceptionExit(); +} + +void JitArm::rfi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + // See Interpreter rfi for details + const u32 mask = 0x87C0FFFF; + const u32 clearMSR13 = 0xFFFBFFFF; // Mask used to clear the bit MSR[13] + // MSR = ((MSR & ~mask) | (SRR1 & mask)) & clearMSR13; + // R0 = MSR location + // R1 = MSR contents + // R2 = Mask + // R3 = Mask + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg rC = gpr.GetReg(); + ARMReg rD = gpr.GetReg(); + MOVI2R(rA, (u32)&MSR); + MOVI2R(rB, (~mask) & clearMSR13); + MOVI2R(rC, mask & clearMSR13); + + LDR(rD, rA); + + AND(rD, rD, rB); // rD = Masked MSR + STR(rA, rD); + + MOVI2R(rB, (u32)&SRR1); + LDR(rB, rB); // rB contains SRR1 here + + AND(rB, rB, rC); // rB contains masked SRR1 here + ORR(rB, rD, rB); // rB = Masked MSR OR masked SRR1 + + STR(rA, rB); // STR rB in to rA + + MOVI2R(rA, (u32)&SRR0); + LDR(rA, rA); + + gpr.Unlock(rB, rC, rD); + WriteRfiExitDestInR(rA); // rA gets unlocked here + //AND(32, M(&MSR), Imm32((~mask) & clearMSR13)); + //MOV(32, R(EAX), M(&SRR1)); + //AND(32, R(EAX), Imm32(mask & clearMSR13)); + //OR(32, M(&MSR), R(EAX)); + // NPC = SRR0; + //MOV(32, R(EAX), M(&SRR0)); + //WriteRfiExitDestInEAX(); +} + +void JitArm::bx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + // We must always process the following sentence + // even if the blocks are merged by PPCAnalyst::Flatten(). + if (inst.LK) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + + // If this is not the last instruction of a block, + // we will skip the rest process. + // Because PPCAnalyst::Flatten() merged the blocks. + if (!js.isLastInstruction) { + return; + } + + gpr.Flush(); + fpr.Flush(); + + u32 destination; + if (inst.AA) + destination = SignExt26(inst.LI << 2); + else + destination = js.compilerPC + SignExt26(inst.LI << 2); + #ifdef ACID_TEST + // TODO: Not implemented yet. + //if (inst.LK) + //AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000))); + #endif + if (destination == js.compilerPC) + { + //PanicAlert("Idle loop detected at %08x", destination); + // CALL(ProtectFunction(&CoreTiming::Idle, 0)); + // JMP(Asm::testExceptions, true); + // make idle loops go faster + js.downcountAmount += 8; + } + WriteExit(destination, 0); +} + +void JitArm::bcx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + // USES_CR + _assert_msg_(DYNA_REC, js.isLastInstruction, "bcx not last instruction of block"); + + gpr.Flush(); + fpr.Flush(); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + FixupBranch pCTRDontBranch; + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR + { + MOVI2R(rA, (u32)&CTR); + LDR(rB, rA); + SUBS(rB, rB, 1); + STR(rA, rB); + + //SUB(32, M(&CTR), Imm8(1)); + if (inst.BO & BO_BRANCH_IF_CTR_0) + pCTRDontBranch = B_CC(CC_NEQ); + else + pCTRDontBranch = B_CC(CC_EQ); + } + + FixupBranch pConditionDontBranch; + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) // Test a CR bit + { + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + + //TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3))); + if (inst.BO & BO_BRANCH_IF_TRUE) // Conditional branch + pConditionDontBranch = B_CC(CC_EQ); // Zero + else + pConditionDontBranch = B_CC(CC_NEQ); // Not Zero + } + gpr.Unlock(rA, rB); + if (inst.LK) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); // Careful, destroys R14, R12 + + u32 destination; + if(inst.AA) + destination = SignExt16(inst.BD << 2); + else + destination = js.compilerPC + SignExt16(inst.BD << 2); + WriteExit(destination, 0); + + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) + SetJumpTarget( pConditionDontBranch ); + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) + SetJumpTarget( pCTRDontBranch ); + + WriteExit(js.compilerPC + 4, 1); +} +void JitArm::bcctrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + + gpr.Flush(); + fpr.Flush(); + + // bcctrx doesn't decrement and/or test CTR + _dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!"); + + if (inst.BO_2 & BO_DONT_CHECK_CONDITION) + { + // BO_2 == 1z1zz -> b always + + //NPC = CTR & 0xfffffffc; + if(inst.LK_3) + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, (u32)&CTR); + MVN(rB, 0x3); // 0xFFFFFFFC + LDR(rA, rA); + AND(rA, rA, rB); + gpr.Unlock(rB); + WriteExitDestInR(rA); + } + else + { + // Rare condition seen in (just some versions of?) Nintendo's NES Emulator + + // BO_2 == 001zy -> b if false + // BO_2 == 011zy -> b if true + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + CCFlags branch; + if (inst.BO_2 & BO_BRANCH_IF_TRUE) + branch = CC_EQ; + else + branch = CC_NEQ; + FixupBranch b = B_CC(branch); + + MOVI2R(rA, (u32)&CTR); + LDR(rA, rA); + MVN(rB, 0x3); // 0xFFFFFFFC + AND(rA, rA, rB); + + if (inst.LK_3){ + ARMReg rC = gpr.GetReg(false); + u32 Jumpto = js.compilerPC + 4; + MOVI2R(rB, (u32)&LR); + MOVI2R(rC, Jumpto); + STR(rB, rC); + //ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR + WriteExitDestInR(rA); + + SetJumpTarget(b); + WriteExit(js.compilerPC + 4, 1); + } +} +void JitArm::bclrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Branch) + if (!js.isLastInstruction && + (inst.BO & (1 << 4)) && (inst.BO & (1 << 2))) { + if (inst.LK) + { + ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + return; + } + gpr.Flush(); + fpr.Flush(); + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + FixupBranch pCTRDontBranch; + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR + { + MOVI2R(rA, (u32)&CTR); + LDR(rB, rA); + SUBS(rB, rB, 1); + STR(rA, rB); + + //SUB(32, M(&CTR), Imm8(1)); + if (inst.BO & BO_BRANCH_IF_CTR_0) + pCTRDontBranch = B_CC(CC_NEQ); + else + pCTRDontBranch = B_CC(CC_EQ); + } + + FixupBranch pConditionDontBranch; + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) // Test a CR bit + { + LDRB(rA, R9, STRUCT_OFF(PowerPC::ppcState, cr_fast) + (inst.BI >> 2)); + TST(rA, 8 >> (inst.BI & 3)); + //TEST(8, M(&PowerPC::ppcState.cr_fast[inst.BI >> 2]), Imm8(8 >> (inst.BI & 3))); + if (inst.BO & BO_BRANCH_IF_TRUE) // Conditional branch + pConditionDontBranch = B_CC(CC_EQ); // Zero + else + pConditionDontBranch = B_CC(CC_NEQ); // Not Zero + } + + // This below line can be used to prove that blr "eats flags" in practice. + // This observation will let us do a lot of fun observations. + #ifdef ACID_TEST + // TODO: Not yet implemented + // AND(32, M(&PowerPC::ppcState.cr), Imm32(~(0xFF000000))); + #endif + + //MOV(32, R(EAX), M(&LR)); + //AND(32, R(EAX), Imm32(0xFFFFFFFC)); + MOVI2R(rA, (u32)&LR); + MVN(rB, 0x3); // 0xFFFFFFFC + LDR(rA, rA); + AND(rA, rA, rB); + if (inst.LK){ + ARMReg rC = gpr.GetReg(false); + u32 Jumpto = js.compilerPC + 4; + MOVI2R(rB, (u32)&LR); + MOVI2R(rC, Jumpto); + STR(rB, rC); + //ARMABI_MOVI2M((u32)&LR, js.compilerPC + 4); + } + gpr.Unlock(rB); // rA gets unlocked in WriteExitDestInR + WriteExitDestInR(rA); + + if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0) + SetJumpTarget( pConditionDontBranch ); + if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) + SetJumpTarget( pCTRDontBranch ); + WriteExit(js.compilerPC + 4, 1); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp new file mode 100644 index 0000000000..fe4c0e3f22 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp @@ -0,0 +1,80 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" + +void JitArm::Helper_UpdateCR1(ARMReg value) +{ + // Should just update exception flags, not do any compares. + PanicAlert("CR1"); +} + +void JitArm::fabsx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vB = fpr.R0(inst.FB); + + VABS(vD, vB); + + if (inst.Rc) Helper_UpdateCR1(vD); +} + +void JitArm::faddx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vA = fpr.R0(inst.FA); + ARMReg vB = fpr.R0(inst.FB); + + VADD(vD, vA, vB); + if (inst.Rc) Helper_UpdateCR1(vD); +} + +void JitArm::fmrx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(FloatingPoint) + Default(inst); return; + + ARMReg vD = fpr.R0(inst.FD); + ARMReg vB = fpr.R0(inst.FB); + + VMOV(vD, vB); + + if (inst.Rc) Helper_UpdateCR1(vD); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp new file mode 100644 index 0000000000..63c96b21fd --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -0,0 +1,297 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" +extern u32 Helper_Mask(u8 mb, u8 me); +// ADDI and RLWINMX broken for now + +// Assumes that Sign and Zero flags were set by the last operation. Preserves all flags and registers. +// Jit64 ComputerRC is signed +// JIT64 GenerateRC is unsigned +void JitArm::GenerateRC(int cr) { + ARMReg rB = gpr.GetReg(); + + MOV(rB, 0x4); // Result > 0 + SetCC(CC_EQ); MOV(rB, 0x2); // Result == 0 + SetCC(CC_MI); MOV(rB, 0x8); // Result < 0 + SetCC(); + + STRB(R9, rB, STRUCT_OFF(PowerPC::ppcState, cr_fast) + cr); + gpr.Unlock(rB); +} +void JitArm::ComputeRC(int cr) { + ARMReg rB = gpr.GetReg(); + + MOV(rB, 0x2); // Result == 0 + SetCC(CC_LT); MOV(rB, 0x8); // Result < 0 + SetCC(CC_GT); MOV(rB, 0x4); // Result > 0 + SetCC(); + + STRB(R9, rB, STRUCT_OFF(PowerPC::ppcState, cr_fast) + cr); + gpr.Unlock(rB); +} + +void JitArm::addi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RD = gpr.R(inst.RD); + + if (inst.RA) + { + ARMReg rA = gpr.GetReg(false); + ARMReg RA = gpr.R(inst.RA); + MOVI2R(rA, (u32)inst.SIMM_16); + ADD(RD, RA, rA); + } + else + MOVI2R(RD, inst.SIMM_16); +} +void JitArm::addis(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RD = gpr.R(inst.RD); + if (inst.RA) + { + ARMReg rA = gpr.GetReg(false); + ARMReg RA = gpr.R(inst.RA); + MOVI2R(rA, inst.SIMM_16 << 16); + ADD(RD, RA, rA); + } + else + MOVI2R(RD, inst.SIMM_16 << 16); +} +void JitArm::addx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RB = gpr.R(inst.RB); + ARMReg RD = gpr.R(inst.RD); + ADDS(RD, RA, RB); + if (inst.Rc) ComputeRC(); +} +// Wrong - 28/10/2012 +void JitArm::mulli(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + Default(inst); return; + ARMReg RA = gpr.R(inst.RA); + ARMReg RD = gpr.R(inst.RD); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + MUL(RD, RA, rA); + gpr.Unlock(rA); +} +void JitArm::ori(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.UIMM); + ORR(RA, RS, rA); + gpr.Unlock(rA); +} +void JitArm::oris(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.UIMM << 16); + ORR(RA, RS, rA); + gpr.Unlock(rA); +} +void JitArm::orx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg rA = gpr.R(inst.RA); + ARMReg rS = gpr.R(inst.RS); + ARMReg rB = gpr.R(inst.RB); + ORRS(rA, rS, rB); + if (inst.Rc) + ComputeRC(); +} + +void JitArm::extshx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + ARMReg RA, RS; + RA = gpr.R(inst.RA); + RS = gpr.R(inst.RS); + SXTH(RA, RS); + if (inst.Rc){ + CMP(RA, 0); + ComputeRC(); + } +} +void JitArm::extsbx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + ARMReg RA, RS; + RA = gpr.R(inst.RA); + RS = gpr.R(inst.RS); + SXTB(RA, RS); + if (inst.Rc){ + CMP(RA, 0); + ComputeRC(); + } +} +void JitArm::cmp (UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RB = gpr.R(inst.RB); + int crf = inst.CRFD; + CMP(RA, RB); + ComputeRC(crf); +} +void JitArm::cmpi(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg rA = gpr.GetReg(); + int crf = inst.CRFD; + MOVI2R(rA, inst.SIMM_16); + CMP(RA, rA); + gpr.Unlock(rA); + ComputeRC(crf); +} +void JitArm::cmpli(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + ARMReg RA = gpr.R(inst.RA); + ARMReg rA = gpr.GetReg(); + int crf = inst.CRFD; + MOVI2R(rA, (u32)inst.UIMM); + CMP(RA, rA); + + // Unsigned GenerateRC() + + MOV(rA, 0x2); // Result == 0 + SetCC(CC_LO); MOV(rA, 0x8); // Result < 0 + SetCC(CC_HI); MOV(rA, 0x4); // Result > 0 + SetCC(); + + STRB(R9, rA, STRUCT_OFF(PowerPC::ppcState, cr_fast) + crf); + gpr.Unlock(rA); + +} +// Wrong - 27/10/2012 +void JitArm::negx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + Default(inst);return; + ARMReg RA = gpr.R(inst.RA); + ARMReg RD = gpr.R(inst.RD); + + RSBS(RD, RA, 0); + if (inst.Rc) + { + GenerateRC(); + } + if (inst.OE) + { + BKPT(0x333); + //GenerateOverflow(); + } +} +void JitArm::rlwimix(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + u32 mask = Helper_Mask(inst.MB,inst.ME); + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + MOVI2R(rA, mask); + + Operand2 Shift(32 - inst.SH, ST_ROR, RS); // This rotates left, while ARM has only rotate right, so swap it. + if (inst.Rc) + { + BIC (rB, RA, rA); // RA & ~mask + AND (rA, rA, Shift); + ORRS(RA, rB, rA); + GenerateRC(); + } + else + { + BIC (rB, RA, rA); // RA & ~mask + AND (rA, rA, Shift); + ORR(RA, rB, rA); + } + gpr.Unlock(rA, rB); +} +void JitArm::rlwinmx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(Integer) + + u32 mask = Helper_Mask(inst.MB,inst.ME); + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, mask); + + Operand2 Shift(32 - inst.SH, ST_ROR, RS); // This rotates left, while ARM has only rotate right, so swap it. + if (inst.Rc) + { + ANDS(RA, rA, Shift); + GenerateRC(); + } + else + AND (RA, rA, Shift); + gpr.Unlock(rA); + + //m_GPR[inst.RA] = _rotl(m_GPR[inst.RS],inst.SH) & mask; +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp new file mode 100644 index 0000000000..80c8a96cbb --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -0,0 +1,414 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +#ifdef ANDROID +#define FASTMEM 0 +#else +#define FASTMEM 0 +#endif +void JitArm::stw(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg RS = gpr.R(inst.RS); +#if FASTMEM + // R10 contains the dest address + ARMReg Value = R11; + ARMReg RA; + if (inst.RA) + RA = gpr.R(inst.RA); + MOV(Value, RS); + if (inst.RA) + { + MOVI2R(R10, inst.SIMM_16, false); + ADD(R10, R10, RA); + } + else + { + MOVI2R(R10, (u32)inst.SIMM_16, false); + NOP(1); + } + StoreFromReg(R10, Value, 32, 0); +#else + ARMReg ValueReg = gpr.GetReg(); + ARMReg Addr = gpr.GetReg(); + ARMReg Function = gpr.GetReg(); + + MOV(ValueReg, RS); + if (inst.RA) + { + MOVI2R(Addr, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(Addr, Addr, RA); + } + else + MOVI2R(Addr, (u32)inst.SIMM_16); + + MOVI2R(Function, (u32)&Memory::Write_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, ValueReg); + MOV(R1, Addr); + BL(Function); + POP(4, R0, R1, R2, R3); + gpr.Unlock(ValueReg, Addr, Function); +#endif +} +void JitArm::stwu(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg RA = gpr.R(inst.RA); + ARMReg RS = gpr.R(inst.RS); + ARMReg ValueReg = gpr.GetReg(); + ARMReg Addr = gpr.GetReg(); + ARMReg Function = gpr.GetReg(); + + MOVI2R(Addr, inst.SIMM_16); + ADD(Addr, Addr, RA); + + // Check and set the update before writing since calling a function can + // mess with the "special registers R11+ which may cause some issues. + LDR(Function, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(Function, EXCEPTION_DSI); + FixupBranch DoNotWrite = B_CC(CC_EQ); + MOV(RA, Addr); + SetJumpTarget(DoNotWrite); + + MOV(ValueReg, RS); + + MOVI2R(Function, (u32)&Memory::Write_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, ValueReg); + MOV(R1, Addr); + BL(Function); + POP(4, R0, R1, R2, R3); + + gpr.Unlock(ValueReg, Addr, Function); +} +void JitArm::StoreFromReg(ARMReg dest, ARMReg value, int accessSize, s32 offset) +{ + ARMReg rA = gpr.GetReg(); + + // All this gets replaced on backpatch + MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 1-2 + AND(dest, dest, rA); // 3 + MOVI2R(rA, (u32)Memory::base, false); // 4-5 + ADD(dest, dest, rA); // 6 + switch (accessSize) + { + case 32: + REV(value, value); // 7 + break; + case 16: + REV16(value, value); + break; + case 8: + NOP(1); + break; + } + switch (accessSize) + { + case 32: + STR(dest, value); // 8 + break; + case 16: + // Not implemented + break; + case 8: + // Not implemented + break; + } + gpr.Unlock(rA); +} +void JitArm::LoadToReg(ARMReg dest, ARMReg addr, int accessSize, s32 offset) +{ + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, offset, false); // -3 + ADD(addr, addr, rA); // - 1 + + // All this gets replaced on backpatch + MOVI2R(rA, Memory::MEMVIEW32_MASK, false); // 2 + AND(addr, addr, rA); // 3 + MOVI2R(rA, (u32)Memory::base, false); // 5 + ADD(addr, addr, rA); // 6 + switch (accessSize) + { + case 32: + LDR(dest, addr); // 7 + break; + case 16: + LDRH(dest, addr); + break; + case 8: + LDRB(dest, addr); + break; + } + switch (accessSize) + { + case 32: + REV(dest, dest); // 9 + break; + case 16: + REV16(dest, dest); + break; + case 8: + NOP(1); + break; + + } + gpr.Unlock(rA); +} +void JitArm::lbz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + MOV(R10, RA); // - 4 + } + else + MOV(R10, 0); // - 4 + LoadToReg(RD, R10, 8, inst.SIMM_16); +#else + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U8); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); +} + +void JitArm::lhz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if 0 // FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + printf("lhz jump to here: 0x%08x\n", (u32)GetCodePtr()); + MOV(R10, RA); // - 4 + } + else + { + printf("lhz jump to here: 0x%08x\n", (u32)GetCodePtr()); + MOV(R10, 0); // - 4 + } + LoadToReg(RD, R10, 16, (u32)inst.SIMM_16); +#else + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U16); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); +} +void JitArm::lwz(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + MOV(R10, RA); // - 4 + } + else + MOV(R10, 0); // - 4 + LoadToReg(RD, R10, 32, (u32)inst.SIMM_16); +#else + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle && + (inst.hex & 0xFFFF0000) == 0x800D0000 && + (Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x28000000 || + (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii && Memory::ReadUnchecked_U32(js.compilerPC + 4) == 0x2C000000)) && + Memory::ReadUnchecked_U32(js.compilerPC + 8) == 0x4182fff8) + { + gpr.Flush(); + fpr.Flush(); + + // if it's still 0, we can wait until the next event + TST(RD, RD); + FixupBranch noIdle = B_CC(CC_NEQ); + rA = gpr.GetReg(); + + MOVI2R(rA, (u32)&PowerPC::OnIdle); + MOVI2R(R0, PowerPC::ppcState.gpr[inst.RA] + (s32)(s16)inst.SIMM_16); + BL(rA); + + gpr.Unlock(rA); + WriteExceptionExit(); + + SetJumpTarget(noIdle); + + //js.compilerPC += 8; + return; + } +} +void JitArm::lwzx(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStore) + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + + ARMReg RB = gpr.R(inst.RB); + ARMReg RD = gpr.R(inst.RD); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); +#if FASTMEM + // Backpatch route + // Gets loaded in to RD + // Address is in R10 + gpr.Unlock(rA, rB); + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + ADD(R10, RA, RB); // - 4 + } + else + MOV(R10, RB); // -4 + LoadToReg(RD, R10, 32, 0); +#else + if (inst.RA) + { + ARMReg RA = gpr.R(inst.RA); + ADD(rB, RA, RB); + } + else + MOV(rB, RB); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + MOV(RD, rA); + gpr.Unlock(rA, rB); +#endif + SetJumpTarget(DoNotLoad); + //// u32 temp = Memory::Read_U32(_inst.RA ? (m_GPR[_inst.RA] + m_GPR[_inst.RB]) : m_GPR[_inst.RB]); +} +void JitArm::icbi(UGeckoInstruction inst) +{ + Default(inst); + WriteExit(js.compilerPC + 4, 0); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp new file mode 100644 index 0000000000..d9e320ab22 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp @@ -0,0 +1,72 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../ConfigManager.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" +#include "../../HW/Memmap.h" + + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitFPRCache.h" +#include "JitAsm.h" + +void JitArm::lfs(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(LoadStoreFloating) + Default(inst); return; + + ARMReg rA = gpr.GetReg(); + ARMReg rB = gpr.GetReg(); + LDR(rA, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + CMP(rA, EXCEPTION_DSI); + FixupBranch DoNotLoad = B_CC(CC_EQ); + + if (inst.RA) + { + MOVI2R(rB, inst.SIMM_16); + ARMReg RA = gpr.R(inst.RA); + ADD(rB, rB, RA); + } + else + MOVI2R(rB, (u32)inst.SIMM_16); + + MOVI2R(rA, (u32)&Memory::Read_U32); + PUSH(4, R0, R1, R2, R3); + MOV(R0, rB); + BL(rA); + MOV(rA, R0); + POP(4, R0, R1, R2, R3); + + ARMReg v0 = fpr.R0(inst.FD, false); + ARMReg v1 = fpr.R1(inst.FD, false); + + VMOV(v0, rA, false); + VMOV(v1, rA, false); + + gpr.Unlock(rA, rB); + SetJumpTarget(DoNotLoad); +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp new file mode 100644 index 0000000000..a99114df67 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp @@ -0,0 +1,111 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include "Common.h" +#include "Thunk.h" + +#include "../../Core.h" +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "../PPCTables.h" +#include "ArmEmitter.h" + +#include "Jit.h" +#include "JitRegCache.h" +#include "JitAsm.h" + +void JitArm::mtspr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(SystemRegisters) + + u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); + ARMReg RD = gpr.R(inst.RD); + + switch (iIndex) + { + case SPR_LR: + case SPR_CTR: + case SPR_XER: + // These are safe to do the easy way, see the bottom of this function. + break; + + case SPR_GQR0: + case SPR_GQR0 + 1: + case SPR_GQR0 + 2: + case SPR_GQR0 + 3: + case SPR_GQR0 + 4: + case SPR_GQR0 + 5: + case SPR_GQR0 + 6: + case SPR_GQR0 + 7: + // Prevent recompiler from compiling in old quantizer values. + // If the value changed, destroy all blocks using this quantizer + // This will create a little bit of block churn, but hopefully not too bad. + { + /* + MOV(32, R(EAX), M(&PowerPC::ppcState.spr[iIndex])); // Load old value + CMP(32, R(EAX), gpr.R(inst.RD)); + FixupBranch skip_destroy = J_CC(CC_E, false); + int gqr = iIndex - SPR_GQR0; + ABI_CallFunctionC(ProtectFunction(&Jit64::DestroyBlocksWithFlag, 1), (u32)BLOCK_USE_GQR0 << gqr); + SetJumpTarget(skip_destroy);*/ + } + // TODO - break block if quantizers are written to. + default: + Default(inst); + return; + } + + // OK, this is easy. + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)&PowerPC::ppcState.spr); + STR(rA, RD, iIndex * 4); +} + +void JitArm::mfspr(UGeckoInstruction inst) +{ + INSTRUCTION_START + JITDISABLE(SystemRegisters) + + u32 iIndex = (inst.SPRU << 5) | (inst.SPRL & 0x1F); + ARMReg RD = gpr.R(inst.RD); + switch (iIndex) + { + case SPR_WPAR: + case SPR_DEC: + case SPR_TL: + case SPR_TU: + Default(inst); + return; + default: + ARMReg rA = gpr.GetReg(false); + MOVI2R(rA, (u32)&PowerPC::ppcState.spr); + LDR(RD, rA, iIndex * 4); + break; + } +} +void JitArm::mtmsr(UGeckoInstruction inst) +{ + INSTRUCTION_START + // Don't interpret this, if we do we get thrown out + //JITDISABLE(SystemRegisters) + + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, (u32)&MSR); + STR(rA, gpr.R(inst.RS)); + gpr.Unlock(rA); + WriteExit(js.compilerPC + 4, 0); +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp new file mode 100644 index 0000000000..1929705df2 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp @@ -0,0 +1,502 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Jit.h" +#include "../JitInterface.h" +#include "JitArm_Tables.h" + +// Should be moved in to the Jit class +typedef void (JitArm::*_Instruction) (UGeckoInstruction instCode); + +static _Instruction dynaOpTable[64]; +static _Instruction dynaOpTable4[1024]; +static _Instruction dynaOpTable19[1024]; +static _Instruction dynaOpTable31[1024]; +static _Instruction dynaOpTable59[32]; +static _Instruction dynaOpTable63[1024]; + +void JitArm::DynaRunTable4(UGeckoInstruction _inst) {(this->*dynaOpTable4 [_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable19(UGeckoInstruction _inst) {(this->*dynaOpTable19[_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable31(UGeckoInstruction _inst) {(this->*dynaOpTable31[_inst.SUBOP10])(_inst);} +void JitArm::DynaRunTable59(UGeckoInstruction _inst) {(this->*dynaOpTable59[_inst.SUBOP5 ])(_inst);} +void JitArm::DynaRunTable63(UGeckoInstruction _inst) {(this->*dynaOpTable63[_inst.SUBOP10])(_inst);} + +struct GekkoOPTemplate +{ + int opcode; + _Instruction Inst; + //GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out +}; + +static GekkoOPTemplate primarytable[] = +{ + {4, &JitArm::DynaRunTable4}, //"RunTable4", OPTYPE_SUBTABLE | (4<<24), 0}}, + {19, &JitArm::DynaRunTable19}, //"RunTable19", OPTYPE_SUBTABLE | (19<<24), 0}}, + {31, &JitArm::DynaRunTable31}, //"RunTable31", OPTYPE_SUBTABLE | (31<<24), 0}}, + {59, &JitArm::DynaRunTable59}, //"RunTable59", OPTYPE_SUBTABLE | (59<<24), 0}}, + {63, &JitArm::DynaRunTable63}, //"RunTable63", OPTYPE_SUBTABLE | (63<<24), 0}}, + + {16, &JitArm::bcx}, //"bcx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {18, &JitArm::bx}, //"bx", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + + {1, &JitArm::HLEFunction}, //"HLEFunction", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {2, &JitArm::Default}, //"DynaBlock", OPTYPE_SYSTEM, 0}}, + {3, &JitArm::Break}, //"twi", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {17, &JitArm::sc}, //"sc", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, + + {7, &JitArm::mulli}, //"mulli", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_RC_BIT, 2}}, + {8, &JitArm::Default}, //"subfic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {10, &JitArm::cmpli}, //"cmpli", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, + {11, &JitArm::cmpi}, //"cmpi", OPTYPE_INTEGER, FL_IN_A | FL_SET_CRn}}, + {12, &JitArm::Default}, //"addic", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CA}}, + {13, &JitArm::Default}, //"addic_rc", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A | FL_SET_CR0}}, + {14, &JitArm::addi}, //"addi", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + {15, &JitArm::addis}, //"addis", OPTYPE_INTEGER, FL_OUT_D | FL_IN_A0}}, + + {20, &JitArm::rlwimix}, //"rlwimix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_A | FL_IN_S | FL_RC_BIT}}, + {21, &JitArm::rlwinmx}, //"rlwinmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {23, &JitArm::Default}, //"rlwnmx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_IN_B | FL_RC_BIT}}, + + {24, &JitArm::ori}, //"ori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {25, &JitArm::oris}, //"oris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {26, &JitArm::Default}, //"xori", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {27, &JitArm::Default}, //"xoris", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S}}, + {28, &JitArm::Default}, //"andi_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + {29, &JitArm::Default}, //"andis_rc", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_SET_CR0}}, + + {32, &JitArm::lwz}, //"lwz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {33, &JitArm::Default}, //"lwzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {34, &JitArm::lbz}, //"lbz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {35, &JitArm::Default}, //"lbzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {40, &JitArm::lhz}, //"lhz", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {41, &JitArm::Default}, //"lhzu", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + {42, &JitArm::Default}, //"lha", OPTYPE_LOAD, FL_OUT_D | FL_IN_A}}, + {43, &JitArm::Default}, //"lhau", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A}}, + + {44, &JitArm::Default}, //"sth", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {45, &JitArm::Default}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {36, &JitArm::stw}, //"stw", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {37, &JitArm::stwu}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + {38, &JitArm::Default}, //"stb", OPTYPE_STORE, FL_IN_A | FL_IN_S}}, + {39, &JitArm::Default}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}}, + + {46, &JitArm::Default}, //"lmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + {47, &JitArm::Default}, //"stmw", OPTYPE_SYSTEM, FL_EVIL, 10}}, + + {48, &JitArm::lfs}, //"lfs", OPTYPE_LOADFP, FL_IN_A}}, + {49, &JitArm::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + {50, &JitArm::Default}, //"lfd", OPTYPE_LOADFP, FL_IN_A}}, + {51, &JitArm::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}}, + + {52, &JitArm::Default}, //"stfs", OPTYPE_STOREFP, FL_IN_A}}, + {53, &JitArm::Default}, //"stfsu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + {54, &JitArm::Default}, //"stfd", OPTYPE_STOREFP, FL_IN_A}}, + {55, &JitArm::Default}, //"stfdu", OPTYPE_STOREFP, FL_OUT_A | FL_IN_A}}, + + {56, &JitArm::Default}, //"psq_l", OPTYPE_PS, FL_IN_A}}, + {57, &JitArm::Default}, //"psq_lu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + {60, &JitArm::Default}, //"psq_st", OPTYPE_PS, FL_IN_A}}, + {61, &JitArm::Default}, //"psq_stu", OPTYPE_PS, FL_OUT_A | FL_IN_A}}, + + //missing: 0, 5, 6, 9, 22, 30, 62, 58 + {0, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {5, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {6, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {9, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {22, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {30, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {62, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, + {58, &JitArm::Default}, //"unknown_instruction", OPTYPE_UNKNOWN, 0}}, +}; + +static GekkoOPTemplate table4[] = +{ //SUBOP10 + {0, &JitArm::Default}, //"ps_cmpu0", OPTYPE_PS, FL_SET_CRn}}, + {32, &JitArm::Default}, //"ps_cmpo0", OPTYPE_PS, FL_SET_CRn}}, + {40, &JitArm::Default}, //"ps_neg", OPTYPE_PS, FL_RC_BIT}}, + {136, &JitArm::Default}, //"ps_nabs", OPTYPE_PS, FL_RC_BIT}}, + {264, &JitArm::Default}, //"ps_abs", OPTYPE_PS, FL_RC_BIT}}, + {64, &JitArm::Default}, //"ps_cmpu1", OPTYPE_PS, FL_RC_BIT}}, + {72, &JitArm::Default}, //"ps_mr", OPTYPE_PS, FL_RC_BIT}}, + {96, &JitArm::Default}, //"ps_cmpo1", OPTYPE_PS, FL_RC_BIT}}, + {528, &JitArm::Default}, //"ps_merge00", OPTYPE_PS, FL_RC_BIT}}, + {560, &JitArm::Default}, //"ps_merge01", OPTYPE_PS, FL_RC_BIT}}, + {592, &JitArm::Default}, //"ps_merge10", OPTYPE_PS, FL_RC_BIT}}, + {624, &JitArm::Default}, //"ps_merge11", OPTYPE_PS, FL_RC_BIT}}, + + {1014, &JitArm::Default}, //"dcbz_l", OPTYPE_SYSTEM, 0}}, +}; + +static GekkoOPTemplate table4_2[] = +{ + {10, &JitArm::Default}, //"ps_sum0", OPTYPE_PS, 0}}, + {11, &JitArm::Default}, //"ps_sum1", OPTYPE_PS, 0}}, + {12, &JitArm::Default}, //"ps_muls0", OPTYPE_PS, 0}}, + {13, &JitArm::Default}, //"ps_muls1", OPTYPE_PS, 0}}, + {14, &JitArm::Default}, //"ps_madds0", OPTYPE_PS, 0}}, + {15, &JitArm::Default}, //"ps_madds1", OPTYPE_PS, 0}}, + {18, &JitArm::Default}, //"ps_div", OPTYPE_PS, 0, 16}}, + {20, &JitArm::Default}, //"ps_sub", OPTYPE_PS, 0}}, + {21, &JitArm::Default}, //"ps_add", OPTYPE_PS, 0}}, + {23, &JitArm::Default}, //"ps_sel", OPTYPE_PS, 0}}, + {24, &JitArm::Default}, //"ps_res", OPTYPE_PS, 0}}, + {25, &JitArm::Default}, //"ps_mul", OPTYPE_PS, 0}}, + {26, &JitArm::Default}, //"ps_rsqrte", OPTYPE_PS, 0, 1}}, + {28, &JitArm::Default}, //"ps_msub", OPTYPE_PS, 0}}, + {29, &JitArm::Default}, //"ps_madd", OPTYPE_PS, 0}}, + {30, &JitArm::Default}, //"ps_nmsub", OPTYPE_PS, 0}}, + {31, &JitArm::Default}, //"ps_nmadd", OPTYPE_PS, 0}}, +}; + + +static GekkoOPTemplate table4_3[] = +{ + {6, &JitArm::Default}, //"psq_lx", OPTYPE_PS, 0}}, + {7, &JitArm::Default}, //"psq_stx", OPTYPE_PS, 0}}, + {38, &JitArm::Default}, //"psq_lux", OPTYPE_PS, 0}}, + {39, &JitArm::Default}, //"psq_stux", OPTYPE_PS, 0}}, +}; + +static GekkoOPTemplate table19[] = +{ + {528, &JitArm::bcctrx}, //"bcctrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, + {16, &JitArm::bclrx}, //"bclrx", OPTYPE_BRANCH, FL_ENDBLOCK}}, + {257, &JitArm::Default}, //"crand", OPTYPE_CR, FL_EVIL}}, + {129, &JitArm::Default}, //"crandc", OPTYPE_CR, FL_EVIL}}, + {289, &JitArm::Default}, //"creqv", OPTYPE_CR, FL_EVIL}}, + {225, &JitArm::Default}, //"crnand", OPTYPE_CR, FL_EVIL}}, + {33, &JitArm::Default}, //"crnor", OPTYPE_CR, FL_EVIL}}, + {449, &JitArm::Default}, //"cror", OPTYPE_CR, FL_EVIL}}, + {417, &JitArm::Default}, //"crorc", OPTYPE_CR, FL_EVIL}}, + {193, &JitArm::Default}, //"crxor", OPTYPE_CR, FL_EVIL}}, + + {150, &JitArm::DoNothing}, //"isync", OPTYPE_ICACHE, FL_EVIL}}, + {0, &JitArm::Default}, //"mcrf", OPTYPE_SYSTEM, FL_EVIL}}, + + {50, &JitArm::rfi}, //"rfi", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS, 1}}, + {18, &JitArm::Break}, //"rfid", OPTYPE_SYSTEM, FL_ENDBLOCK | FL_CHECKEXCEPTIONS}} +}; + + +static GekkoOPTemplate table31[] = +{ + {28, &JitArm::Default}, //"andx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {60, &JitArm::Default}, //"andcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {444, &JitArm::orx}, //"orx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {124, &JitArm::Default}, //"norx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {316, &JitArm::Default}, //"xorx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {412, &JitArm::Default}, //"orcx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {476, &JitArm::Default}, //"nandx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {284, &JitArm::Default}, //"eqvx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}}, + {0, &JitArm::cmp}, //"cmp", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, + {32, &JitArm::Default}, //"cmpl", OPTYPE_INTEGER, FL_IN_AB | FL_SET_CRn}}, + {26, &JitArm::Default}, //"cntlzwx",OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {922, &JitArm::extshx}, //"extshx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {954, &JitArm::extsbx}, //"extsbx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_S | FL_RC_BIT}}, + {536, &JitArm::Default}, //"srwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {792, &JitArm::Default}, //"srawx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {824, &JitArm::Default}, //"srawix", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + {24, &JitArm::Default}, //"slwx", OPTYPE_INTEGER, FL_OUT_A | FL_IN_B | FL_IN_S | FL_RC_BIT}}, + + {54, &JitArm::Default}, //"dcbst", OPTYPE_DCACHE, 0, 4}}, + {86, &JitArm::Default}, //"dcbf", OPTYPE_DCACHE, 0, 4}}, + {246, &JitArm::Default}, //"dcbtst", OPTYPE_DCACHE, 0, 1}}, + {278, &JitArm::Default}, //"dcbt", OPTYPE_DCACHE, 0, 1}}, + {470, &JitArm::Default}, //"dcbi", OPTYPE_DCACHE, 0, 4}}, + {758, &JitArm::Default}, //"dcba", OPTYPE_DCACHE, 0, 4}}, + {1014, &JitArm::Default}, //"dcbz", OPTYPE_DCACHE, 0, 4}}, + + //load word + {23, &JitArm::lwzx}, //"lwzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {55, &JitArm::Default}, //"lwzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load halfword + {279, &JitArm::Default}, //"lhzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {311, &JitArm::Default}, //"lhzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load halfword signextend + {343, &JitArm::Default}, //"lhax", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {375, &JitArm::Default}, //"lhaux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load byte + {87, &JitArm::Default}, //"lbzx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {119, &JitArm::Default}, //"lbzux", OPTYPE_LOAD, FL_OUT_D | FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //load byte reverse + {534, &JitArm::Default}, //"lwbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + {790, &JitArm::Default}, //"lhbrx", OPTYPE_LOAD, FL_OUT_D | FL_IN_A0 | FL_IN_B}}, + + // Conditional load/store (Wii SMP) + {150, &JitArm::Default}, //"stwcxd", OPTYPE_STORE, FL_EVIL | FL_SET_CR0}}, + {20, &JitArm::Default}, //"lwarx", OPTYPE_LOAD, FL_EVIL | FL_OUT_D | FL_IN_A0B | FL_SET_CR0}}, + + //load string (interpret these) + {533, &JitArm::Default}, //"lswx", OPTYPE_LOAD, FL_EVIL | FL_IN_A | FL_OUT_D}}, + {597, &JitArm::Default}, //"lswi", OPTYPE_LOAD, FL_EVIL | FL_IN_AB | FL_OUT_D}}, + + //store word + {151, &JitArm::Default}, //"stwx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {183, &JitArm::Default}, //"stwux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store halfword + {407, &JitArm::Default}, //"sthx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {439, &JitArm::Default}, //"sthux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store byte + {215, &JitArm::Default}, //"stbx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {247, &JitArm::Default}, //"stbux", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_B}}, + + //store bytereverse + {662, &JitArm::Default}, //"stwbrx", OPTYPE_STORE, FL_IN_A0 | FL_IN_B}}, + {918, &JitArm::Default}, //"sthbrx", OPTYPE_STORE, FL_IN_A | FL_IN_B}}, + + {661, &JitArm::Default}, //"stswx", OPTYPE_STORE, FL_EVIL}}, + {725, &JitArm::Default}, //"stswi", OPTYPE_STORE, FL_EVIL}}, + + // fp load/store + {535, &JitArm::Default}, //"lfsx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {567, &JitArm::Default}, //"lfsux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + {599, &JitArm::Default}, //"lfdx", OPTYPE_LOADFP, FL_IN_A0 | FL_IN_B}}, + {631, &JitArm::Default}, //"lfdux", OPTYPE_LOADFP, FL_IN_A | FL_IN_B}}, + + {663, &JitArm::Default}, //"stfsx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + {695, &JitArm::Default}, //"stfsux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, + {727, &JitArm::Default}, //"stfdx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + {759, &JitArm::Default}, //"stfdux", OPTYPE_STOREFP, FL_IN_A | FL_IN_B}}, + {983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}}, + + {19, &JitArm::Default}, //"mfcr", OPTYPE_SYSTEM, FL_OUT_D}}, + {83, &JitArm::Default}, //"mfmsr", OPTYPE_SYSTEM, FL_OUT_D}}, + {144, &JitArm::Default}, //"mtcrf", OPTYPE_SYSTEM, 0}}, + {146, &JitArm::mtmsr}, //"mtmsr", OPTYPE_SYSTEM, FL_ENDBLOCK}}, + {210, &JitArm::Default}, //"mtsr", OPTYPE_SYSTEM, 0}}, + {242, &JitArm::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}}, + {339, &JitArm::mfspr}, //"mfspr", OPTYPE_SPR, FL_OUT_D}}, + {467, &JitArm::mtspr}, //"mtspr", OPTYPE_SPR, 0, 2}}, + {371, &JitArm::Default}, //"mftb", OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}}, + {512, &JitArm::Default}, //"mcrxr", OPTYPE_SYSTEM, 0}}, + {595, &JitArm::Default}, //"mfsr", OPTYPE_SYSTEM, FL_OUT_D, 2}}, + {659, &JitArm::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}}, + + {4, &JitArm::Break}, //"tw", OPTYPE_SYSTEM, FL_ENDBLOCK, 1}}, + {598, &JitArm::Default}, //"sync", OPTYPE_SYSTEM, 0, 2}}, + {982, &JitArm::icbi}, //"icbi", OPTYPE_SYSTEM, FL_ENDBLOCK, 3}}, + + // Unused instructions on GC + {310, &JitArm::Default}, //"eciwx", OPTYPE_INTEGER, FL_RC_BIT}}, + {438, &JitArm::Default}, //"ecowx", OPTYPE_INTEGER, FL_RC_BIT}}, + {854, &JitArm::Default}, //"eieio", OPTYPE_INTEGER, FL_RC_BIT}}, + {306, &JitArm::Default}, //"tlbie", OPTYPE_SYSTEM, 0}}, + {370, &JitArm::Default}, //"tlbia", OPTYPE_SYSTEM, 0}}, + {566, &JitArm::Default}, //"tlbsync", OPTYPE_SYSTEM, 0}}, +}; + +static GekkoOPTemplate table31_2[] = +{ + {266, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {778, &JitArm::addx}, //"addx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {10, &JitArm::Default}, //"addcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {138, &JitArm::Default}, //"addex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {234, &JitArm::Default}, //"addmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {202, &JitArm::Default}, //"addzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {491, &JitArm::Default}, //"divwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {1003, &JitArm::Default}, //"divwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {459, &JitArm::Default}, //"divwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {971, &JitArm::Default}, //"divwuox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 39}}, + {75, &JitArm::Default}, //"mulhwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {11, &JitArm::Default}, //"mulhwux", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {235, &JitArm::Default}, //"mullwx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {747, &JitArm::Default}, //"mullwox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}}, + {104, &JitArm::negx}, //"negx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {40, &JitArm::Default}, //"subfx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {552, &JitArm::Default}, //"subox", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}}, + {8, &JitArm::Default}, //"subfcx", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}}, + {136, &JitArm::Default}, //"subfex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {232, &JitArm::Default}, //"subfmex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, + {200, &JitArm::Default}, //"subfzex", OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}}, +}; + +static GekkoOPTemplate table59[] = +{ + {18, &JitArm::Default}, //{"fdivsx", OPTYPE_FPU, FL_RC_BIT_F, 16}}, + {20, &JitArm::Default}, //"fsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {21, &JitArm::Default}, //"faddsx", OPTYPE_FPU, FL_RC_BIT_F}}, +// {22, &JitArm::Default}, //"fsqrtsx", OPTYPE_FPU, FL_RC_BIT_F}}, // Not implemented on gekko + {24, &JitArm::Default}, //"fresx", OPTYPE_FPU, FL_RC_BIT_F}}, + {25, &JitArm::Default}, //"fmulsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {28, &JitArm::Default}, //"fmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::Default}, //"fmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {30, &JitArm::Default}, //"fnmsubsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {31, &JitArm::Default}, //"fnmaddsx", OPTYPE_FPU, FL_RC_BIT_F}}, +}; + +static GekkoOPTemplate table63[] = +{ + {264, &JitArm::fabsx}, //"fabsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {32, &JitArm::Default}, //"fcmpo", OPTYPE_FPU, FL_RC_BIT_F}}, + {0, &JitArm::Default}, //"fcmpu", OPTYPE_FPU, FL_RC_BIT_F}}, + {14, &JitArm::Default}, //"fctiwx", OPTYPE_FPU, FL_RC_BIT_F}}, + {15, &JitArm::Default}, //"fctiwzx", OPTYPE_FPU, FL_RC_BIT_F}}, + {72, &JitArm::fmrx}, //"fmrx", OPTYPE_FPU, FL_RC_BIT_F}}, + {136, &JitArm::Default}, //"fnabsx", OPTYPE_FPU, FL_RC_BIT_F}}, + {40, &JitArm::Default}, //"fnegx", OPTYPE_FPU, FL_RC_BIT_F}}, + {12, &JitArm::Default}, //"frspx", OPTYPE_FPU, FL_RC_BIT_F}}, + + {64, &JitArm::Default}, //"mcrfs", OPTYPE_SYSTEMFP, 0}}, + {583, &JitArm::Default}, //"mffsx", OPTYPE_SYSTEMFP, 0}}, + {70, &JitArm::Default}, //"mtfsb0x", OPTYPE_SYSTEMFP, 0, 2}}, + {38, &JitArm::Default}, //"mtfsb1x", OPTYPE_SYSTEMFP, 0, 2}}, + {134, &JitArm::Default}, //"mtfsfix", OPTYPE_SYSTEMFP, 0, 2}}, + {711, &JitArm::Default}, //"mtfsfx", OPTYPE_SYSTEMFP, 0, 2}}, +}; + +static GekkoOPTemplate table63_2[] = +{ + {18, &JitArm::Default}, //"fdivx", OPTYPE_FPU, FL_RC_BIT_F, 30}}, + {20, &JitArm::Default}, //"fsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {21, &JitArm::faddx}, //"faddx", OPTYPE_FPU, FL_RC_BIT_F}}, + {22, &JitArm::Default}, //"fsqrtx", OPTYPE_FPU, FL_RC_BIT_F}}, + {23, &JitArm::Default}, //"fselx", OPTYPE_FPU, FL_RC_BIT_F}}, + {25, &JitArm::Default}, //"fmulx", OPTYPE_FPU, FL_RC_BIT_F}}, + {26, &JitArm::Default}, //"frsqrtex", OPTYPE_FPU, FL_RC_BIT_F}}, + {28, &JitArm::Default}, //"fmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {29, &JitArm::Default}, //"fmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, + {30, &JitArm::Default}, //"fnmsubx", OPTYPE_FPU, FL_RC_BIT_F}}, + {31, &JitArm::Default}, //"fnmaddx", OPTYPE_FPU, FL_RC_BIT_F}}, +}; + + +namespace JitArmTables +{ + +void CompileInstruction(PPCAnalyst::CodeOp & op) +{ + JitArm *jitarm = (JitArm *)jit; + (jitarm->*dynaOpTable[op.inst.OPCD])(op.inst); + GekkoOPInfo *info = op.opinfo; + if (info) { +#ifdef OPLOG + if (!strcmp(info->opname, OP_TO_LOG)){ ///"mcrfs" + rsplocations.push_back(jit.js.compilerPC); + } +#endif + info->compileCount++; + info->lastUse = jit->js.compilerPC; + } +} + +void InitTables() +{ + // once initialized, tables are read-only + static bool initialized = false; + if (initialized) + return; + + //clear + for (int i = 0; i < 32; i++) + { + dynaOpTable59[i] = &JitArm::unknown_instruction; + } + + for (int i = 0; i < 1024; i++) + { + dynaOpTable4 [i] = &JitArm::unknown_instruction; + dynaOpTable19[i] = &JitArm::unknown_instruction; + dynaOpTable31[i] = &JitArm::unknown_instruction; + dynaOpTable63[i] = &JitArm::unknown_instruction; + } + + for (int i = 0; i < (int)(sizeof(primarytable) / sizeof(GekkoOPTemplate)); i++) + { + dynaOpTable[primarytable[i].opcode] = primarytable[i].Inst; + } + + for (int i = 0; i < 32; i++) + { + int fill = i << 5; + for (int j = 0; j < (int)(sizeof(table4_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill+table4_2[j].opcode; + dynaOpTable4[op] = table4_2[j].Inst; + } + } + + for (int i = 0; i < 16; i++) + { + int fill = i << 6; + for (int j = 0; j < (int)(sizeof(table4_3) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill+table4_3[j].opcode; + dynaOpTable4[op] = table4_3[j].Inst; + } + } + + for (int i = 0; i < (int)(sizeof(table4) / sizeof(GekkoOPTemplate)); i++) + { + int op = table4[i].opcode; + dynaOpTable4[op] = table4[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table31) / sizeof(GekkoOPTemplate)); i++) + { + int op = table31[i].opcode; + dynaOpTable31[op] = table31[i].Inst; + } + + for (int i = 0; i < 1; i++) + { + int fill = i << 9; + for (int j = 0; j < (int)(sizeof(table31_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill + table31_2[j].opcode; + dynaOpTable31[op] = table31_2[j].Inst; + } + } + + for (int i = 0; i < (int)(sizeof(table19) / sizeof(GekkoOPTemplate)); i++) + { + int op = table19[i].opcode; + dynaOpTable19[op] = table19[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table59) / sizeof(GekkoOPTemplate)); i++) + { + int op = table59[i].opcode; + dynaOpTable59[op] = table59[i].Inst; + } + + for (int i = 0; i < (int)(sizeof(table63) / sizeof(GekkoOPTemplate)); i++) + { + int op = table63[i].opcode; + dynaOpTable63[op] = table63[i].Inst; + } + + for (int i = 0; i < 32; i++) + { + int fill = i << 5; + for (int j = 0; j < (int)(sizeof(table63_2) / sizeof(GekkoOPTemplate)); j++) + { + int op = fill + table63_2[j].opcode; + dynaOpTable63[op] = table63_2[j].Inst; + } + } + + initialized = true; + +} + +} // namespace diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h new file mode 100644 index 0000000000..4904ce3984 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.h @@ -0,0 +1,29 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef JITARM_TABLES_H +#define JITARM_TABLES_H + +#include "../Gekko.h" +#include "../PPCTables.h" + +namespace JitArmTables +{ + void CompileInstruction(PPCAnalyst::CodeOp & op); + void InitTables(); +} +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp new file mode 100644 index 0000000000..e45058b57b --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.cpp @@ -0,0 +1,174 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + + +#include "../../HW/Memmap.h" + +#include "../PowerPC.h" +#include "../../CoreTiming.h" +#include "MemoryUtil.h" + +#include "Jit.h" +#include "../JitCommon/JitCache.h" + +#include "../../HW/GPFifo.h" +#include "../../Core.h" +#include "JitAsm.h" +#include "ArmEmitter.h" + +using namespace ArmGen; + +//TODO - make an option +//#if _DEBUG +// bool enableDebug = false; +//#else +// bool enableDebug = false; +//#endif + +JitArmAsmRoutineManager asm_routines; + +void JitArmAsmRoutineManager::Generate() +{ + enterCode = GetCodePtr(); + PUSH(2, R11, _LR); // R11 is frame pointer in Debug. + + MOVI2R(R0, (u32)&CoreTiming::downcount); + MOVI2R(R9, (u32)&PowerPC::ppcState); + + FixupBranch skipToRealDispatcher = B(); + dispatcher = GetCodePtr(); + printf("Dispatcher is %p\n", dispatcher); + + // Downcount Check + // The result of slice decrementation should be in flags if somebody jumped here + // IMPORTANT - We jump on negative, not carry!!! + FixupBranch bail = B_CC(CC_MI); + + SetJumpTarget(skipToRealDispatcher); + dispatcherNoCheck = GetCodePtr(); + + // This block of code gets the address of the compiled block of code + // It runs though to the compiling portion if it isn't found + LDR(R12, R9, STRUCT_OFF(PowerPC::ppcState, pc));// Load the current PC into R12 + + MOVI2R(R14, JIT_ICACHE_MASK); // Potential for optimization + AND(R12, R12, R14); // R12 contains PC & JIT_ICACHE_MASK here. + // Confirmed good to this point 08-03-12 + + MOVI2R(R14, (u32)jit->GetBlockCache()->GetICache()); + // Confirmed That this loads the base iCache Location correctly 08-04-12 + + LDR(R12, R14, R12, true, true); // R12 contains iCache[PC & JIT_ICACHE_MASK] here + // R12 Confirmed this is the correct iCache Location loaded. + TST(R12, 0xFC); // Test to see if it is a JIT block. + + SetCC(CC_EQ); // Only run next part if R12 is zero + // Success, it is our Jitblock. + MOVI2R(R14, (u32)jit->GetBlockCache()->GetCodePointers()); + // LDR R14 right here to get CodePointers()[0] pointer. + REV(R12, R12); // Reversing this gives us our JITblock. + LSL(R12, R12, 2); // Multiply by four because address locations are u32 in size + LDR(R14, R14, R12, true, true); // Load the block address in to R14 + + B(R14); + + FixupBranch NextBlock = B(); // Jump to end so we can start a new block + SetCC(); // Return to always executing codes + + // If we get to this point, that means that we don't have the block cached to execute + // So call ArmJit to compile the block and then execute it. + MOVI2R(R14, (u32)&Jit); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, pc)); + BL(R14); + + B(dispatcherNoCheck); + + // fpException() + // Floating Point Exception Check, Jumped to if false + fpException = GetCodePtr(); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + ORR(R0, R0, EXCEPTION_FPU_UNAVAILABLE); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, Exceptions)); + QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, pc)); + B(dispatcher); + + SetJumpTarget(bail); + doTiming = GetCodePtr(); + // XXX: In JIT64, Advance() gets called /after/ the exception checking + // once it jumps back to the start of outerLoop + QuickCallFunction(R14, (void*)&CoreTiming::Advance); + + // Does exception checking + testExceptions = GetCodePtr(); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, pc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, npc)); + QuickCallFunction(R14, (void*)&PowerPC::CheckExceptions); + LDR(R0, R9, STRUCT_OFF(PowerPC::ppcState, npc)); + STR(R9, R0, STRUCT_OFF(PowerPC::ppcState, pc)); + // Check the state pointer to see if we are exiting + // Gets checked on every exception check + MOVI2R(R0, (u32)PowerPC::GetStatePtr()); + MVN(R1, 0); + LDR(R0, R0); + TST(R0, R1); + FixupBranch Exit = B_CC(CC_NEQ); + + SetJumpTarget(NextBlock); + B(dispatcher); + + SetJumpTarget(Exit); + + POP(2, R11, _PC); + FlushIcache(); +} + +void JitArmAsmRoutineManager::GenerateCommon() +{ +/* fifoDirectWrite8 = AlignCode4(); + GenFifoWrite(8); + fifoDirectWrite16 = AlignCode4(); + GenFifoWrite(16); + fifoDirectWrite32 = AlignCode4(); + GenFifoWrite(32); + fifoDirectWriteFloat = AlignCode4(); + GenFifoFloatWrite(); + fifoDirectWriteXmm64 = AlignCode4(); + GenFifoXmm64Write(); + + GenQuantizedLoads(); + GenQuantizedStores(); + GenQuantizedSingleStores(); +*/ + //CMPSD(R(XMM0), M(&zero), + // TODO + + // Fast write routines - special case the most common hardware write + // TODO: use this. + // Even in x86, the param values will be in the right registers. + /* + const u8 *fastMemWrite8 = AlignCode16(); + CMP(32, R(ABI_PARAM2), Imm32(0xCC008000)); + FixupBranch skip_fast_write = J_CC(CC_NE, false); + MOV(32, EAX, M(&m_gatherPipeCount)); + MOV(8, MDisp(EAX, (u32)&m_gatherPipe), ABI_PARAM1); + ADD(32, 1, M(&m_gatherPipeCount)); + RET(); + SetJumpTarget(skip_fast_write); + CALL((void *)&Memory::Write_U8);*/ +} diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h new file mode 100644 index 0000000000..9a61e9e653 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitAsm.h @@ -0,0 +1,43 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMASM_H +#define _JITARMASM_H +#include "ArmEmitter.h" +#include "../JitCommon/JitAsmCommon.h" +using namespace ArmGen; +class JitArmAsmRoutineManager : public CommonAsmRoutinesBase, public ARMXCodeBlock +{ +private: + void Generate(); + void GenerateCommon(); + +public: + void Init() { + AllocCodeSpace(8192); + Generate(); + WriteProtect(); + } + + void Shutdown() { + FreeCodeSpace(); + } +}; + +extern JitArmAsmRoutineManager asm_routines; + +#endif // _JIT64ASM_H diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp new file mode 100644 index 0000000000..9c6ffdbac4 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.cpp @@ -0,0 +1,167 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "JitRegCache.h" + +ArmRegCache::ArmRegCache() +{ + emit = 0; +} + +void ArmRegCache::Init(ARMXEmitter *emitter) +{ + emit = emitter; + ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG); + ARMReg *Regs = GetAllocationOrder(NUMARMREG); + for(u8 a = 0; a < 32; ++a) + { + // This gives us the memory locations of the gpr registers so we can + // load them. + regs[a].location = (u8*)&PowerPC::ppcState.gpr[a]; + regs[a].UsesLeft = 0; + } + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].Reg = PPCRegs[a]; + ArmCRegs[a].LastLoad = 0; + } + for(u8 a = 0; a < NUMARMREG; ++a) + { + ArmRegs[a].Reg = Regs[a]; + ArmRegs[a].free = true; + } +} +void ArmRegCache::Start(PPCAnalyst::BlockRegStats &stats) +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } + for(u8 a = 0; a < 32; ++a) + regs[a].UsesLeft = stats.GetTotalNumAccesses(a); +} +ARMReg *ArmRegCache::GetPPCAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the ppc side. + static ARMReg allocationOrder[] = + { + R0, R1, R2, R3, R4, R5, R6, R7, R8 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} +ARMReg *ArmRegCache::GetAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the host side. + static ARMReg allocationOrder[] = + { + R14, R12, R11, R10 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} + +ARMReg ArmRegCache::GetReg(bool AutoLock) +{ + for(u8 a = 0; a < NUMARMREG; ++a) + if(ArmRegs[a].free) + { + // Alright, this one is free + if (AutoLock) + ArmRegs[a].free = false; + return ArmRegs[a].Reg; + } + // Uh Oh, we have all them locked.... + _assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb"); + return R0; +} +void ArmRegCache::Lock(ARMReg Reg) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + if(ArmRegs[RegNum].Reg == Reg) + { + _assert_msg_(_DYNA_REC, ArmRegs[RegNum].free, "This register is already locked"); + ArmRegs[RegNum].free = false; + } + _assert_msg_(_DYNA_REC, false, "Register %d can't be used with lock", Reg); +} +void ArmRegCache::Unlock(ARMReg R0, ARMReg R1, ARMReg R2, ARMReg R3) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + { + if(ArmRegs[RegNum].Reg == R0) + { + _assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked"); + ArmRegs[RegNum].free = true; + } + if( R1 != INVALID_REG && ArmRegs[RegNum].Reg == R1) ArmRegs[RegNum].free = true; + if( R2 != INVALID_REG && ArmRegs[RegNum].Reg == R2) ArmRegs[RegNum].free = true; + if( R3 != INVALID_REG && ArmRegs[RegNum].Reg == R3) ArmRegs[RegNum].free = true; + } +} + +ARMReg ArmRegCache::R(u32 preg) +{ + u32 HighestUsed = 0; + u8 Num = 0; + for(u8 a = 0; a < NUMPPCREG; ++a){ + ++ArmCRegs[a].LastLoad; + if (ArmCRegs[a].LastLoad > HighestUsed) + { + HighestUsed = ArmCRegs[a].LastLoad; + Num = a; + } + } + // Check if already Loaded + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == preg) + { + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Check if we have a free register + for (u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == 33) + { + emit->LDR(ArmCRegs[a].Reg, R9, STRUCT_OFF(PowerPC::ppcState, gpr) + preg * 4); + ArmCRegs[a].PPCReg = preg; + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Alright, we couldn't get a free space, dump that least used register + emit->STR(R9, ArmCRegs[Num].Reg, STRUCT_OFF(PowerPC::ppcState, gpr) + ArmCRegs[Num].PPCReg * 4); + emit->LDR(ArmCRegs[Num].Reg, R9, STRUCT_OFF(PowerPC::ppcState, gpr) + preg * 4); + ArmCRegs[Num].PPCReg = preg; + ArmCRegs[Num].LastLoad = 0; + return ArmCRegs[Num].Reg; +} + +void ArmRegCache::Flush() +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg != 33) + { + emit->STR(R9, ArmCRegs[a].Reg, STRUCT_OFF(PowerPC::ppcState, gpr) + ArmCRegs[a].PPCReg * 4); + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h new file mode 100644 index 0000000000..7292ce1581 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitRegCache.h @@ -0,0 +1,92 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMREGCACHE_H +#define _JITARMREGCACHE_H + +#include "ArmEmitter.h" +#include "../Gekko.h" +#include "../PPCAnalyst.h" + +using namespace ArmGen; +// This ARM Register cache actually pre loads the most used registers before +// the block to increase speed since every memory load requires two +// instructions to load it. We are going to use R0-RMAX as registers for the +// use of PPC Registers. +// Allocation order as follows +#define ARMREGS 16 +// Allocate R0 to R9 for PPC first. +// For General registers on the host side, start with R14 and go down as we go +// R13 is reserved for our stack pointer, don't ever use that. Unless you save +// it +// So we have R14, R12, R11, R10 to work with instructions + +struct PPCCachedReg +{ + const u8 *location; + u32 UsesLeft; +}; +struct JRCPPC +{ + u32 PPCReg; // Tied to which PPC Register + bool PS1; + ARMReg Reg; // Tied to which ARM Register + u32 LastLoad; +}; +struct JRCReg +{ + ARMReg Reg; // Which reg this is. + bool free; +}; +class ArmRegCache +{ +private: + PPCCachedReg regs[32]; + JRCPPC ArmCRegs[ARMREGS]; + JRCReg ArmRegs[ARMREGS]; // Four registers remaining + + int NUMPPCREG; + int NUMARMREG; + + ARMReg *GetAllocationOrder(int &count); + ARMReg *GetPPCAllocationOrder(int &count); + +protected: + ARMXEmitter *emit; + +public: + ArmRegCache(); + ~ArmRegCache() {} + + void Init(ARMXEmitter *emitter); + void Start(PPCAnalyst::BlockRegStats &stats); + + void SetEmitter(ARMXEmitter *emitter) {emit = emitter;} + + ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use. + void Lock(ARMReg reg); + void Unlock(ARMReg R0, ARMReg R1 = INVALID_REG, ARMReg R2 = INVALID_REG, ARMReg R3 = + INVALID_REG); + void Flush(); + ARMReg R(u32 preg); // Returns a cached register + +}; + + + + +#endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp index 34b9a681e9..7f509dbf0e 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp @@ -15,7 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "CPUDetect.h" #include "x64Emitter.h" @@ -26,7 +26,7 @@ #include "../../CoreTiming.h" #include "MemoryUtil.h" -#include "ABI.h" +#include "x64ABI.h" #include "../JitCommon/JitCache.h" #include "../../HW/GPFifo.h" diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h index cbec27d2aa..a610a03326 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h @@ -21,16 +21,8 @@ #include "../JitCommon/Jit_Util.h" #include "Thunk.h" -class CommonAsmRoutines : public EmuCodeBlock { -protected: - void GenQuantizedLoads(); - void GenQuantizedStores(); - void GenQuantizedSingleStores(); - +class CommonAsmRoutinesBase { public: - void GenFifoWrite(int size); - void GenFifoXmm64Write(); - void GenFifoFloatWrite(); const u8 *fifoDirectWrite8; const u8 *fifoDirectWrite16; @@ -72,8 +64,23 @@ public: // In: XMM0: Bottom 32-bit slot holds the float to be written. const u8 **singleStoreQuantized; +}; + +class CommonAsmRoutines : public CommonAsmRoutinesBase, public EmuCodeBlock +{ +protected: + void GenQuantizedLoads(); + void GenQuantizedStores(); + void GenQuantizedSingleStores(); + +public: + void GenFifoWrite(int size); + void GenFifoXmm64Write(); + void GenFifoFloatWrite(); + private: ThunkManager thunks; + }; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index 3042cfedba..76e791a94c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -25,7 +25,7 @@ #include "../../HW/Memmap.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "Thunk.h" #include "x64Analyzer.h" @@ -160,7 +160,7 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info) // 1) It's really necessary. We don't know anything about the context. // 2) It doesn't really hurt. Only instructions that access I/O will get these, and there won't be // that many of them in a typical program/game. -const u8 *JitBase::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) +const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void *ctx_void) { #ifdef _M_X64 CONTEXT *ctx = (CONTEXT *)ctx_void; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h index 4b880eb86d..871a112c6c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h @@ -34,6 +34,9 @@ // from the real context. struct CONTEXT { + #ifdef _M_ARM + u32 reg_pc; + #else #ifdef _M_X64 u64 Rip; u64 Rax; @@ -41,6 +44,7 @@ u32 Eip; u32 Eax; #endif + #endif }; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h index 5352c06d04..158171be0f 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h @@ -32,12 +32,9 @@ #define JIT_OPCODE 0 -class JitBase : public CPUCoreBase, public EmuCodeBlock +class JitBase : public CPUCoreBase { protected: - JitBlockCache blocks; - TrampolineCache trampolines; - struct JitOptions { bool optimizeStack; @@ -85,14 +82,29 @@ public: // This should probably be removed from public: JitOptions jo; JitState js; - - JitBlockCache *GetBlockCache() { return &blocks; } + + virtual JitBaseBlockCache *GetBlockCache() = 0; virtual void Jit(u32 em_address) = 0; + virtual const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) = 0; + + virtual const CommonAsmRoutinesBase *GetAsmRoutines() = 0; + + virtual bool IsInCodeSpace(u8 *ptr) = 0; +}; + +class Jitx86Base : public JitBase, public EmuCodeBlock +{ +protected: + JitBlockCache blocks; + TrampolineCache trampolines; +public: + JitBlockCache *GetBlockCache() { return &blocks; } + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); - virtual const CommonAsmRoutines *GetAsmRoutines() = 0; + bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } }; extern JitBase *jit; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index d409518bf9..415b37ca61 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -32,15 +32,13 @@ #include "MemoryUtil.h" #include "../../HW/Memmap.h" +#include "../JitInterface.h" #include "../../CoreTiming.h" #include "../PowerPC.h" #include "../PPCTables.h" #include "../PPCAnalyst.h" -#include "x64Emitter.h" -#include "x64Analyzer.h" - #include "JitCache.h" #include "JitBase.h" @@ -68,12 +66,12 @@ bool JitBlock::ContainsAddress(u32 em_address) return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize); } - bool JitBlockCache::IsFull() const + bool JitBaseBlockCache::IsFull() const { return GetNumBlocks() >= MAX_NUM_BLOCKS - 1; } - void JitBlockCache::Init() + void JitBaseBlockCache::Init() { MAX_NUM_BLOCKS = 65536*2; @@ -91,11 +89,11 @@ bool JitBlock::ContainsAddress(u32 em_address) } else { - PanicAlert("JitBlockCache::Init() - iCache is already initialized"); + PanicAlert("JitBaseBlockCache::Init() - iCache is already initialized"); } if (iCache == 0 || iCacheEx == 0 || iCacheVMEM == 0) { - PanicAlert("JitBlockCache::Init() - unable to allocate iCache"); + PanicAlert("JitBaseBlockCache::Init() - unable to allocate iCache"); } memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); memset(iCacheEx, JIT_ICACHE_INVALID_BYTE, JIT_ICACHEEX_SIZE); @@ -104,7 +102,7 @@ bool JitBlock::ContainsAddress(u32 em_address) Clear(); } - void JitBlockCache::Shutdown() + void JitBaseBlockCache::Shutdown() { delete[] blocks; delete[] blockCodePointers; @@ -133,7 +131,7 @@ bool JitBlock::ContainsAddress(u32 em_address) // This clears the JIT cache. It's called from JitCache.cpp when the JIT cache // is full and when saving and loading states. - void JitBlockCache::Clear() + void JitBaseBlockCache::Clear() { if (IsFull()) Core::DisplayMessage("Clearing block cache.", 3000); @@ -151,7 +149,7 @@ bool JitBlock::ContainsAddress(u32 em_address) memset(blockCodePointers, 0, sizeof(u8*)*MAX_NUM_BLOCKS); } - void JitBlockCache::ClearSafe() + void JitBaseBlockCache::ClearSafe() { #ifdef JIT_UNLIMITED_ICACHE memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); @@ -160,7 +158,7 @@ bool JitBlock::ContainsAddress(u32 em_address) #endif } - /*void JitBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag) + /*void JitBaseBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag) { for (int i = 0; i < num_blocks; i++) { @@ -171,23 +169,23 @@ bool JitBlock::ContainsAddress(u32 em_address) } }*/ - void JitBlockCache::Reset() + void JitBaseBlockCache::Reset() { Shutdown(); Init(); } - JitBlock *JitBlockCache::GetBlock(int no) + JitBlock *JitBaseBlockCache::GetBlock(int no) { return &blocks[no]; } - int JitBlockCache::GetNumBlocks() const + int JitBaseBlockCache::GetNumBlocks() const { return num_blocks; } - bool JitBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const + bool JitBaseBlockCache::RangeIntersect(int s1, int e1, int s2, int e2) const { // check if any endpoint is inside the other range if ((s1 >= s2 && s1 <= e2) || @@ -199,7 +197,7 @@ bool JitBlock::ContainsAddress(u32 em_address) return false; } - int JitBlockCache::AllocateBlock(u32 em_address) + int JitBaseBlockCache::AllocateBlock(u32 em_address) { JitBlock &b = blocks[num_blocks]; b.invalid = false; @@ -215,12 +213,12 @@ bool JitBlock::ContainsAddress(u32 em_address) return num_blocks - 1; } - void JitBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr) + void JitBaseBlockCache::FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr) { blockCodePointers[block_num] = code_ptr; JitBlock &b = blocks[block_num]; - b.originalFirstOpcode = Memory::Read_Opcode_JIT(b.originalAddress); - Memory::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); + b.originalFirstOpcode = JitInterface::Read_Opcode_JIT(b.originalAddress); + JitInterface::Write_Opcode_JIT(b.originalAddress, (JIT_OPCODE << 26) | block_num); // Convert the logical address to a physical address for the block map u32 pAddr = b.originalAddress & 0x1FFFFFFF; @@ -264,29 +262,29 @@ bool JitBlock::ContainsAddress(u32 em_address) #endif } - const u8 **JitBlockCache::GetCodePointers() + const u8 **JitBaseBlockCache::GetCodePointers() { return blockCodePointers; } #ifdef JIT_UNLIMITED_ICACHE - u8* JitBlockCache::GetICache() + u8* JitBaseBlockCache::GetICache() { return iCache; } - u8* JitBlockCache::GetICacheEx() + u8* JitBaseBlockCache::GetICacheEx() { return iCacheEx; } - u8* JitBlockCache::GetICacheVMEM() + u8* JitBaseBlockCache::GetICacheVMEM() { return iCacheVMEM; } #endif - int JitBlockCache::GetBlockNumberFromStartAddress(u32 addr) + int JitBaseBlockCache::GetBlockNumberFromStartAddress(u32 addr) { if (!blocks) return -1; @@ -317,24 +315,24 @@ bool JitBlock::ContainsAddress(u32 em_address) return inst; } - void JitBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers) + void JitBaseBlockCache::GetBlockNumbersFromAddress(u32 em_address, std::vector *block_numbers) { for (int i = 0; i < num_blocks; i++) if (blocks[i].ContainsAddress(em_address)) block_numbers->push_back(i); } - u32 JitBlockCache::GetOriginalFirstOp(int block_num) + u32 JitBaseBlockCache::GetOriginalFirstOp(int block_num) { if (block_num >= num_blocks) { - //PanicAlert("JitBlockCache::GetOriginalFirstOp - block_num = %u is out of range", block_num); + //PanicAlert("JitBaseBlockCache::GetOriginalFirstOp - block_num = %u is out of range", block_num); return block_num; } return blocks[block_num].originalFirstOpcode; } - CompiledCode JitBlockCache::GetCompiledCodeFromBlock(int block_num) + CompiledCode JitBaseBlockCache::GetCompiledCodeFromBlock(int block_num) { return (CompiledCode)blockCodePointers[block_num]; } @@ -345,7 +343,7 @@ bool JitBlock::ContainsAddress(u32 em_address) //Can be faster by doing a queue for blocks to link up, and only process those //Should probably be done - void JitBlockCache::LinkBlockExits(int i) + void JitBaseBlockCache::LinkBlockExits(int i) { JitBlock &b = blocks[i]; if (b.invalid) @@ -360,8 +358,7 @@ bool JitBlock::ContainsAddress(u32 em_address) int destinationBlock = GetBlockNumberFromStartAddress(b.exitAddress[e]); if (destinationBlock != -1) { - XEmitter emit(b.exitPtrs[e]); - emit.JMP(blocks[destinationBlock].checkedEntry, true); + WriteLinkBlock(b.exitPtrs[e], blocks[destinationBlock].checkedEntry); b.linkStatus[e] = true; } } @@ -370,7 +367,7 @@ bool JitBlock::ContainsAddress(u32 em_address) using namespace std; - void JitBlockCache::LinkBlock(int i) + void JitBaseBlockCache::LinkBlock(int i) { LinkBlockExits(i); JitBlock &b = blocks[i]; @@ -386,7 +383,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } } - void JitBlockCache::UnlinkBlock(int i) + void JitBaseBlockCache::UnlinkBlock(int i) { JitBlock &b = blocks[i]; pair::iterator, multimap::iterator> ppp; @@ -403,7 +400,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } } - void JitBlockCache::DestroyBlock(int block_num, bool invalidate) + void JitBaseBlockCache::DestroyBlock(int block_num, bool invalidate) { if (block_num < 0 || block_num >= num_blocks) { @@ -419,7 +416,7 @@ bool JitBlock::ContainsAddress(u32 em_address) } b.invalid = true; #ifdef JIT_UNLIMITED_ICACHE - Memory::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD); + JitInterface::Write_Opcode_JIT(b.originalAddress, b.originalFirstOpcode?b.originalFirstOpcode:JIT_ICACHE_INVALID_WORD); #else if (Memory::ReadFast32(b.originalAddress) == block_num) Memory::WriteUnchecked_U32(b.originalFirstOpcode, b.originalAddress); @@ -430,18 +427,10 @@ bool JitBlock::ContainsAddress(u32 em_address) // Send anyone who tries to run this block back to the dispatcher. // Not entirely ideal, but .. pretty good. // Spurious entrances from previously linked blocks can only come through checkedEntry - XEmitter emit((u8 *)b.checkedEntry); - emit.MOV(32, M(&PC), Imm32(b.originalAddress)); - emit.JMP(jit->GetAsmRoutines()->dispatcher, true); - // this is not needed really - /* - emit.SetCodePtr((u8 *)blockCodePointers[blocknum]); - emit.MOV(32, M(&PC), Imm32(b.originalAddress)); - emit.JMP(asm_routines.dispatcher, true); - */ + WriteDestroyBlock(b.checkedEntry, b.originalAddress); } - void JitBlockCache::InvalidateICache(u32 address, const u32 length) + void JitBaseBlockCache::InvalidateICache(u32 address, const u32 length) { // Convert the logical address to a physical address for the block map u32 pAddr = address & 0x1FFFFFFF; @@ -449,7 +438,7 @@ bool JitBlock::ContainsAddress(u32 em_address) // Optimize the common case of length == 32 which is used by Interpreter::dcb* bool destroy_block = true; if (length == 32) - { + { if (!valid_block[pAddr / 32]) destroy_block = false; else @@ -462,7 +451,7 @@ bool JitBlock::ContainsAddress(u32 em_address) { std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1; while (it2 != block_map.end() && it2->first.second < pAddr + length) - { + { #ifdef JIT_UNLIMITED_ICACHE JitBlock &b = blocks[it2->second]; if (b.originalAddress & JIT_ICACHE_VMEM_BIT) @@ -516,3 +505,14 @@ bool JitBlock::ContainsAddress(u32 em_address) } #endif } + void JitBlockCache::WriteLinkBlock(u8* location, const u8* address) + { + XEmitter emit(location); + emit.JMP(address, true); + } + void JitBlockCache::WriteDestroyBlock(const u8* location, u32 address) + { + XEmitter emit((u8 *)location); + emit.MOV(32, M(&PC), Imm32(address)); + emit.JMP(jit->GetAsmRoutines()->dispatcher, true); + } diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h index 4214f33875..b148cb8090 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.h @@ -78,7 +78,8 @@ struct JitBlock typedef void (*CompiledCode)(); -class JitBlockCache + +class JitBaseBlockCache { const u8 **blockCodePointers; JitBlock *blocks; @@ -97,9 +98,13 @@ class JitBlockCache void LinkBlockExits(int i); void LinkBlock(int i); void UnlinkBlock(int i); + + // Virtual for overloaded + virtual void WriteLinkBlock(u8* location, const u8* address) = 0; + virtual void WriteDestroyBlock(const u8* location, u32 address) = 0; public: - JitBlockCache() : + JitBaseBlockCache() : blockCodePointers(0), blocks(0), num_blocks(0), #ifdef JIT_UNLIMITED_ICACHE iCache(0), iCacheEx(0), iCacheVMEM(0), @@ -146,4 +151,11 @@ public: //void DestroyBlocksWithFlag(BlockFlag death_flag); }; +// x86 BlockCache +class JitBlockCache : public JitBaseBlockCache +{ +private: + void WriteLinkBlock(u8* location, const u8* address); + void WriteDestroyBlock(const u8* location, u32 address); +}; #endif diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index cc1327c695..f5c4cb022b 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp @@ -25,7 +25,7 @@ #include "../../HW/Memmap.h" #include "../PPCTables.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "JitBase.h" #include "Jit_Util.h" diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.cpp b/Source/Core/Core/Src/PowerPC/JitInterface.cpp new file mode 100644 index 0000000000..8fcdd9837f --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitInterface.cpp @@ -0,0 +1,350 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include + +#ifdef _WIN32 +#include +#endif + +#include "JitInterface.h" +#include "JitCommon/JitBase.h" + +#ifndef _M_GENERIC +#include "Jit64IL/JitIL.h" +#include "Jit64/Jit.h" +#include "Jit64/Jit64_Tables.h" +#include "Jit64IL/JitIL_Tables.h" +#endif + +#ifdef _M_ARM +#include "JitArm32/Jit.h" +#include "JitArm32/JitArm_Tables.h" +#endif + +#include "Profiler.h" +#include "PPCSymbolDB.h" +#include "HW/Memmap.h" +#include "ConfigManager.h" + +bool bFakeVMEM = false; +bool bMMU = false; + +namespace JitInterface +{ + void DoState(PointerWrap &p) + { + if (jit && p.GetMode() == PointerWrap::MODE_READ) + jit->GetBlockCache()->ClearSafe(); + } + CPUCoreBase *InitJitCore(int core) + { + bFakeVMEM = SConfig::GetInstance().m_LocalCoreStartupParameter.iTLBHack == 1; + bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; + + CPUCoreBase *ptr = NULL; + switch(core) + { + #ifndef _M_GENERIC + case 1: + { + ptr = new Jit64(); + break; + } + case 2: + { + ptr = new JitIL(); + break; + } + #endif + #ifdef _M_ARM + case 3: + { + ptr = new JitArm(); + break; + } + #endif + default: + { + PanicAlert("Unrecognizable cpu_core: %d", core); + return NULL; + break; + } + } + jit = static_cast(ptr); + jit->Init(); + return ptr; + } + void InitTables(int core) + { + switch(core) + { + #ifndef _M_GENERIC + case 1: + { + Jit64Tables::InitTables(); + break; + } + case 2: + { + JitILTables::InitTables(); + break; + } + #endif + #ifdef _M_ARM + case 3: + { + JitArmTables::InitTables(); + break; + } + #endif + default: + { + PanicAlert("Unrecognizable cpu_core: %d", core); + break; + } + } + } + CPUCoreBase *GetCore() + { + return jit; + } + + void WriteProfileResults(const char *filename) + { + // Can't really do this with no jit core available + #ifndef _M_GENERIC + + std::vector stats; + stats.reserve(jit->GetBlockCache()->GetNumBlocks()); + u64 cost_sum = 0; + #ifdef _WIN32 + u64 timecost_sum = 0; + u64 countsPerSec; + QueryPerformanceFrequency((LARGE_INTEGER *)&countsPerSec); + #endif + for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++) + { + const JitBlock *block = jit->GetBlockCache()->GetBlock(i); + // Rough heuristic. Mem instructions should cost more. + u64 cost = block->originalSize * (block->runCount / 4); + #ifdef _WIN32 + u64 timecost = block->ticCounter; + #endif + // Todo: tweak. + if (block->runCount >= 1) + stats.push_back(BlockStat(i, cost)); + cost_sum += cost; + #ifdef _WIN32 + timecost_sum += timecost; + #endif + } + + sort(stats.begin(), stats.end()); + File::IOFile f(filename, "w"); + if (!f) + { + PanicAlert("failed to open %s", filename); + return; + } + fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); + for (unsigned int i = 0; i < stats.size(); i++) + { + const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum); + if (block) + { + std::string name = g_symbolDB.GetDescription(block->originalAddress); + double percent = 100.0 * (double)stats[i].cost / (double)cost_sum; + #ifdef _WIN32 + double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum; + fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", + block->originalAddress, name.c_str(), stats[i].cost, + block->ticCounter, percent, timePercent, + (double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize); + #else + fprintf(f.GetHandle(), "%08x\t%s\t%llu\t???\t%.2lf\t???\t???\t%i\n", + block->originalAddress, name.c_str(), stats[i].cost, percent, block->codeSize); + #endif + } + } + #endif + } + bool IsInCodeSpace(u8 *ptr) + { + return jit->IsInCodeSpace(ptr); + } + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx) + { + return jit->BackPatch(codePtr, accessType, em_address, ctx); + } + + void ClearCache() + { + if (jit) + jit->ClearCache(); + } + void ClearSafe() + { + if (jit) + jit->GetBlockCache()->ClearSafe(); + } + + void InvalidateICache(u32 address, u32 size) + { + if (jit) + jit->GetBlockCache()->InvalidateICache(address, size); + } + + + // Memory functions + u32 Read_Opcode_JIT_Uncached(const u32 _Address) + { + u8* iCache; + u32 addr; + if (_Address & JIT_ICACHE_VMEM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheVMEM(); + addr = _Address & JIT_ICACHE_MASK; + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheEx(); + addr = _Address & JIT_ICACHEEX_MASK; + } + else + { + iCache = jit->GetBlockCache()->GetICache(); + addr = _Address & JIT_ICACHE_MASK; + } + u32 inst = *(u32*)(iCache + addr); + if (inst == JIT_ICACHE_INVALID_WORD) + { + u32 cache_block_start = addr & ~0x1f; + u32 mem_block_start = _Address & ~0x1f; + u8 *pMem = Memory::GetPointer(mem_block_start); + memcpy(iCache + cache_block_start, pMem, 32); + inst = *(u32*)(iCache + addr); + } + inst = Common::swap32(inst); + + if ((inst & 0xfc000000) == 0) + { + inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); + } + + return inst; + } + + u32 Read_Opcode_JIT(u32 _Address) + { + #ifdef FAST_ICACHE + if (bMMU && !bFakeVMEM && (_Address & Memory::ADDR_MASK_MEM1)) + { + _Address = Memory::TranslateAddress(_Address, Memory::FLAG_OPCODE); + if (_Address == 0) + { + return 0; + } + } + u32 inst = 0; + + // Bypass the icache for the external interrupt exception handler + if ( (_Address & 0x0FFFFF00) == 0x00000500 ) + inst = Read_Opcode_JIT_Uncached(_Address); + else + inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); + #else + u32 inst = Memory::ReadUnchecked_U32(_Address); + #endif + return inst; + } + + // The following function is deprecated in favour of FAST_ICACHE + u32 Read_Opcode_JIT_LC(const u32 _Address) + { + #ifdef JIT_UNLIMITED_ICACHE + if ((_Address & ~JIT_ICACHE_MASK) != 0x80000000 && (_Address & ~JIT_ICACHE_MASK) != 0x00000000 && + (_Address & ~JIT_ICACHE_MASK) != 0x7e000000 && // TLB area + (_Address & ~JIT_ICACHEEX_MASK) != 0x90000000 && (_Address & ~JIT_ICACHEEX_MASK) != 0x10000000) + { + PanicAlertT("iCacheJIT: Reading Opcode from %x. Please report.", _Address); + ERROR_LOG(MEMMAP, "iCacheJIT: Reading Opcode from %x. Please report.", _Address); + return 0; + } + u8* iCache; + u32 addr; + if (_Address & JIT_ICACHE_VMEM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheVMEM(); + addr = _Address & JIT_ICACHE_MASK; + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + iCache = jit->GetBlockCache()->GetICacheEx(); + addr = _Address & JIT_ICACHEEX_MASK; + } + else + { + iCache = jit->GetBlockCache()->GetICache(); + addr = _Address & JIT_ICACHE_MASK; + } + u32 inst = *(u32*)(iCache + addr); + if (inst == JIT_ICACHE_INVALID_WORD) + inst = Memory::ReadUnchecked_U32(_Address); + else + inst = Common::swap32(inst); + #else + u32 inst = Memory::ReadUnchecked_U32(_Address); + #endif + if ((inst & 0xfc000000) == 0) + { + inst = jit->GetBlockCache()->GetOriginalFirstOp(inst); + } + return inst; + } + + // WARNING! No checks! + // We assume that _Address is cached + void Write_Opcode_JIT(const u32 _Address, const u32 _Value) + { + #ifdef JIT_UNLIMITED_ICACHE + if (_Address & JIT_ICACHE_VMEM_BIT) + { + *(u32*)(jit->GetBlockCache()->GetICacheVMEM() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); + } + else if (_Address & JIT_ICACHE_EXRAM_BIT) + { + *(u32*)(jit->GetBlockCache()->GetICacheEx() + (_Address & JIT_ICACHEEX_MASK)) = Common::swap32(_Value); + } + else + *(u32*)(jit->GetBlockCache()->GetICache() + (_Address & JIT_ICACHE_MASK)) = Common::swap32(_Value); + #else + Memory::WriteUnchecked_U32(_Value, _Address); + #endif + } + + + void Shutdown() + { + if (jit) + { + jit->Shutdown(); + delete jit; + jit = NULL; + } + } +} diff --git a/Source/Core/Core/Src/PowerPC/JitInterface.h b/Source/Core/Core/Src/PowerPC/JitInterface.h new file mode 100644 index 0000000000..a01c3dfa6e --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitInterface.h @@ -0,0 +1,56 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "ChunkFile.h" +#include "CPUCoreBase.h" + +namespace JitInterface +{ + void DoState(PointerWrap &p); + + CPUCoreBase *InitJitCore(int core); + void InitTables(int core); + CPUCoreBase *GetCore(); + + // Debugging + void WriteProfileResults(const char *filename); + + // Memory Utilities + bool IsInCodeSpace(u8 *ptr); + const u8 *BackPatch(u8 *codePtr, int accessType, u32 em_address, void *ctx); + + // used by JIT to read instructions + u32 Read_Opcode_JIT(const u32 _Address); + // used by JIT. uses iCacheJIT. Reads in the "Locked cache" mode + u32 Read_Opcode_JIT_LC(const u32 _Address); + void Write_Opcode_JIT(const u32 _Address, const u32 _Value); + + // Clearing CodeCache + void ClearCache(); + + void ClearSafe(); + + void InvalidateICache(u32 address, u32 size); + + void Shutdown(); +} +extern bool bFakeVMEM; +extern bool bMMU; + +#ifdef _M_ARM +#include "JitArm32/Jit.h" +#endif diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index fa9f278c29..15a85568de 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -21,6 +21,7 @@ #include "StringUtil.h" #include "Interpreter/Interpreter.h" #include "../HW/Memmap.h" +#include "JitInterface.h" #include "PPCTables.h" #include "PPCSymbolDB.h" #include "SignatureDB.h" @@ -368,7 +369,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa, } else { - inst = Memory::Read_Opcode_JIT(address); + inst = JitInterface::Read_Opcode_JIT(address); } } diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp index 6956e9db1c..a0e4c666a4 100644 --- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp @@ -20,6 +20,7 @@ #include "PowerPC.h" #include "JitCommon/JitBase.h" #include "JitCommon/JitCache.h" +#include "JitInterface.h" namespace PowerPC { @@ -76,8 +77,7 @@ namespace PowerPC memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex)); memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem)); #endif - if (jit) - jit->GetBlockCache()->ClearSafe(); + JitInterface::ClearSafe(); } void InstructionCache::Init() @@ -109,8 +109,7 @@ namespace PowerPC } #endif valid[set] = 0; - if (jit) - jit->GetBlockCache()->InvalidateICache(addr & ~0x1f, 32); + JitInterface::InvalidateICache(addr & ~0x1f, 32); } u32 InstructionCache::ReadInstruction(u32 addr) diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp index d96089cebb..a6975f5860 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp @@ -24,11 +24,7 @@ #include "FileUtil.h" #include "Interpreter/Interpreter.h" #include "Interpreter/Interpreter_Tables.h" -#include "Jit64IL/JitIL_Tables.h" -#include "Jit64/Jit64_Tables.h" - -#include "Jit64IL/JitIL.h" -#include "Jit64/Jit.h" +#include "JitInterface.h" struct op_inf { @@ -165,19 +161,9 @@ void InitTables(int cpu_core) // Interpreter break; } - case 1: - { - Jit64Tables::InitTables(); - break; - } - case 2: - { - JitILTables::InitTables(); - break; - } default: { - PanicAlert("Unrecognizable cpu_core: %d", cpu_core); + JitInterface::InitTables(cpu_core); break; } } diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index 8a7b817212..d4447331e7 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -29,12 +29,10 @@ #include "../HW/SystemTimers.h" #include "Interpreter/Interpreter.h" -#include "JitCommon/JitBase.h" -#include "Jit64IL/JitIL.h" -#include "Jit64/Jit.h" #include "PowerPC.h" #include "PPCTables.h" #include "CPUCoreBase.h" +#include "JitInterface.h" #include "../Host.h" #include "HW/EXI.h" @@ -87,8 +85,7 @@ void DoState(PointerWrap &p) // SystemTimers::DecrementerSet(); // SystemTimers::TimeBaseSet(); - if (jit && p.GetMode() == PointerWrap::MODE_READ) - jit->GetBlockCache()->ClearSafe(); + JitInterface::DoState(p); } void ResetRegisters() @@ -131,28 +128,18 @@ void ResetRegisters() void Init(int cpu_core) { - enum { - FPU_PREC_24 = 0 << 8, - FPU_PREC_53 = 2 << 8, - FPU_PREC_64 = 3 << 8, - FPU_PREC_MASK = 3 << 8, - }; -#ifdef _M_IX86 - // sets the floating-point lib to 53-bit - // PowerPC has a 53bit floating pipeline only - // eg: sscanf is very sensitive -#ifdef _WIN32 - _control87(_PC_53, MCW_PC); -#else - unsigned short _mode; - asm ("fstcw %0" : : "m" (_mode)); - _mode = (_mode & ~FPU_PREC_MASK) | FPU_PREC_53; - asm ("fldcw %0" : : "m" (_mode)); -#endif -#else - //x64 doesn't need this - fpu is done with SSE - //but still - set any useful sse options here -#endif + FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53); + + memset(ppcState.mojs, 0, sizeof(ppcState.mojs)); + memset(ppcState.sr, 0, sizeof(ppcState.sr)); + ppcState.DebugCount = 0; + ppcState.dtlb_last = 0; + ppcState.dtlb_last = 0; + memset(ppcState.dtlb_va, 0, sizeof(ppcState.dtlb_va)); + memset(ppcState.dtlb_pa, 0, sizeof(ppcState.dtlb_pa)); + ppcState.itlb_last = 0; + memset(ppcState.itlb_va, 0, sizeof(ppcState.itlb_va)); + memset(ppcState.itlb_pa, 0, sizeof(ppcState.itlb_pa)); memset(ppcState.mojs, 0, sizeof(ppcState.mojs)); memset(ppcState.sr, 0, sizeof(ppcState.sr)); @@ -179,27 +166,13 @@ void Init(int cpu_core) cpu_core_base = interpreter; break; } - case 1: - { - cpu_core_base = new Jit64(); - break; - } - case 2: - { - cpu_core_base = new JitIL(); - break; - } - default: - { - PanicAlert("Unrecognizable cpu_core: %d", cpu_core); - break; - } + default: + cpu_core_base = JitInterface::InitJitCore(cpu_core); + break; } if (cpu_core_base != interpreter) { - jit = static_cast(cpu_core_base); - jit->Init(); mode = MODE_JIT; } else @@ -213,12 +186,7 @@ void Init(int cpu_core) void Shutdown() { - if (jit) - { - jit->Shutdown(); - delete jit; - jit = NULL; - } + JitInterface::Shutdown(); interpreter->Shutdown(); cpu_core_base = NULL; state = CPU_POWERDOWN; @@ -244,7 +212,7 @@ void SetMode(CoreMode new_mode) case MODE_JIT: // Switching from interpreter to JIT. // Don't really need to do much. It'll work, the cache will refill itself. - cpu_core_base = jit; + cpu_core_base = JitInterface::GetCore(); break; } } diff --git a/Source/Core/Core/Src/PowerPC/Profiler.cpp b/Source/Core/Core/Src/PowerPC/Profiler.cpp index 3636b00717..fc8942f09b 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.cpp +++ b/Source/Core/Core/Src/PowerPC/Profiler.cpp @@ -15,17 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "JitCommon/JitBase.h" - -#include -#include - -#ifdef _WIN32 -#include -#endif - -#include "PPCSymbolDB.h" -#include "FileUtil.h" +#include "JitInterface.h" namespace Profiler { @@ -33,73 +23,9 @@ namespace Profiler bool g_ProfileBlocks; bool g_ProfileInstructions; -struct BlockStat -{ - BlockStat(int bn, u64 c) : blockNum(bn), cost(c) {} - int blockNum; - u64 cost; - - bool operator <(const BlockStat &other) const - { return cost > other.cost; } -}; - void WriteProfileResults(const char *filename) { - std::vector stats; - stats.reserve(jit->GetBlockCache()->GetNumBlocks()); - u64 cost_sum = 0; -#ifdef _WIN32 - u64 timecost_sum = 0; - u64 countsPerSec; - QueryPerformanceFrequency((LARGE_INTEGER *)&countsPerSec); -#endif - for (int i = 0; i < jit->GetBlockCache()->GetNumBlocks(); i++) - { - const JitBlock *block = jit->GetBlockCache()->GetBlock(i); - if (block && !block->invalid) - { - // Rough heuristic. Mem instructions should cost more. - u64 cost = block->originalSize * (block->runCount / 4); -#ifdef _WIN32 - u64 timecost = block->ticCounter; -#endif - // Todo: tweak. - if (block->runCount >= 1) - stats.push_back(BlockStat(i, cost)); - cost_sum += cost; -#ifdef _WIN32 - timecost_sum += timecost; -#endif - } - } - - sort(stats.begin(), stats.end()); - File::IOFile f(filename, "w"); - if (!f) - { - PanicAlert("failed to open %s", filename); - return; - } - fprintf(f.GetHandle(), "origAddr\tblkName\tcost\trunCount\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); - for (unsigned int i = 0; i < stats.size(); i++) - { - const JitBlock *block = jit->GetBlockCache()->GetBlock(stats[i].blockNum); - if (block && !block->invalid) - { - std::string name = g_symbolDB.GetDescription(block->originalAddress); - double percent = 100.0 * (double)stats[i].cost / (double)cost_sum; -#ifdef _WIN32 - double timePercent = 100.0 * (double)block->ticCounter / (double)timecost_sum; - fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%llu\t%.2lf\t%llf\t%lf\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, block->runCount, - block->ticCounter, percent, timePercent, - (double)block->ticCounter*1000.0/(double)countsPerSec, block->codeSize); -#else - fprintf(f.GetHandle(), "%08x\t%s\t%llu\t???\t%.2lf\t???\t???\t%i\n", - block->originalAddress, name.c_str(), stats[i].cost, percent, block->codeSize); -#endif - } - } + JitInterface::WriteProfileResults(filename); } } // namespace diff --git a/Source/Core/Core/Src/PowerPC/Profiler.h b/Source/Core/Core/Src/PowerPC/Profiler.h index ada130e90f..b8beeaae72 100644 --- a/Source/Core/Core/Src/PowerPC/Profiler.h +++ b/Source/Core/Core/Src/PowerPC/Profiler.h @@ -57,6 +57,15 @@ #define PROFILER_VPOP #endif +struct BlockStat +{ + BlockStat(int bn, u64 c) : blockNum(bn), cost(c) {} + int blockNum; + u64 cost; + + bool operator <(const BlockStat &other) const + { return cost > other.cost; } +}; namespace Profiler { diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp similarity index 96% rename from Source/Core/Core/Src/MemTools.cpp rename to Source/Core/Core/Src/x64MemTools.cpp index bb6fef6439..fff26b3cb3 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/x64MemTools.cpp @@ -52,8 +52,10 @@ #include "MemTools.h" #include "HW/Memmap.h" #include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" +#ifndef _M_GENERIC #include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitBackpatch.h" +#endif #include "x64Analyzer.h" namespace EMM @@ -77,7 +79,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) PVOID codeAddr = pPtrs->ExceptionRecord->ExceptionAddress; unsigned char *codePtr = (unsigned char*)codeAddr; - if (!jit->IsInCodeSpace(codePtr)) { + if (!JitInterface::IsInCodeSpace(codePtr)) { // Let's not prevent debugging. return (DWORD)EXCEPTION_CONTINUE_SEARCH; } @@ -107,7 +109,7 @@ LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) //We could emulate the memory accesses here, but then they would still be around to take up //execution resources. Instead, we backpatch into a generic memory call and retry. - const u8 *new_rip = jit->BackPatch(codePtr, accessType, emAddress, ctx); + const u8 *new_rip = JitInterface::BackPatch(codePtr, accessType, emAddress, ctx); // Rip/Eip needs to be updated. if (new_rip) @@ -182,6 +184,7 @@ void print_trace(const char * msg) void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) { +#ifndef _M_GENERIC if (signal != SIGSEGV) { // We are not interested in other signals - handle it as usual. @@ -203,7 +206,7 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) #else u8 *fault_instruction_ptr = (u8 *)CREG_EIP(ctx); #endif - if (!jit->IsInCodeSpace(fault_instruction_ptr)) { + if (!JitInterface::IsInCodeSpace(fault_instruction_ptr)) { // Let's not prevent debugging. return; } @@ -240,6 +243,7 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) CREG_EIP(ctx) = fake_ctx.Eip; #endif } +#endif } void InstallExceptionHandler() diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 6451c73670..2350896c9c 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -27,7 +27,9 @@ #include #else #include +#ifndef ANDROID #include +#endif #include #endif @@ -131,6 +133,9 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] buffer; } } +#else +#ifdef ANDROID + return false; #else if (_src) { @@ -193,6 +198,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 delete[] src_buffer_start; iconv_close(conv_desc); } +#endif #endif return returnCode; } diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 858e05bbfd..c3cdccccfc 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -10,21 +10,21 @@ set(LIBS core ${GTK2_LIBRARIES} ${XRANDR_LIBRARIES} ${X11_LIBRARIES}) - -if(SDL2_FOUND) - # Using shared SDL2 - set(LIBS ${LIBS} ${SDL2_LIBRARY}) -else(SDL2_FOUND) - if(SDL_FOUND) - # Using shared SDL - set(LIBS ${LIBS} ${SDL_LIBRARY}) - else(SDL_FOUND) - # Using static SDL from Externals - set(LIBS ${LIBS} SDL) +if(NOT ANDROID) + if(SDL2_FOUND) + # Using shared SDL2 + set(LIBS ${LIBS} ${SDL2_LIBRARY}) + else(SDL2_FOUND) + if(SDL_FOUND) + # Using shared SDL + set(LIBS ${LIBS} ${SDL_LIBRARY}) + else(SDL_FOUND) + # Using static SDL from Externals + set(LIBS ${LIBS} SDL) + endif() endif() endif() - if(LIBAV_FOUND) set(LIBS ${LIBS} ${LIBAV_LIBRARIES}) endif() @@ -79,13 +79,18 @@ if(wxWidgets_FOUND) set(WXLIBS ${wxWidgets_LIBRARIES}) else() - set(SRCS - Src/MainNoGUI.cpp) + if(ANDROID) + set(SRCS Src/MainAndroid.cpp) + else() + set(SRCS Src/MainNoGUI.cpp) + endif() endif() if(USE_EGL) - set(SRCS ${SRCS} Src/GLInterface/EGL.cpp - Src/GLInterface/X11_Util.cpp) + if(NOT ANDROID) + set(SRCS ${SRCS} Src/GLInterface/EGL_X11.cpp + Src/GLInterface/X11_Util.cpp) + endif() else() if(WIN32) set(SRCS ${SRCS} Src/GLInterface/GLW.cpp) @@ -127,7 +132,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) else() - set(SRCS ${SRCS} Src/X11Utils.cpp) + if(NOT ANDROID) + set(SRCS ${SRCS} Src/X11Utils.cpp) + endif() endif() if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR @@ -146,75 +153,85 @@ else() set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui) endif() -add_executable(${DOLPHIN_EXE} ${SRCS}) -target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) - -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - include(BundleUtilities) - set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) - - # Ask for an application bundle. - set_target_properties(${DOLPHIN_EXE} PROPERTIES - MACOSX_BUNDLE true - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ) - - # Install Cg framework into application bundle. - copy_resolved_framework_into_bundle( - # Our framework in "Externals" does not have "Versions/Current/" in - # its path; work around the missing directory levels using "././". - "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg" - "${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg" - ) - - # Fix up the bundle after it is finished. - # There does not seem to be an easy way to run CMake commands post-build, - # so we invoke CMake again on a generated script. - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake " - include(BundleUtilities) - message(\"Fixing up application bundle: ${BUNDLE_PATH}\") - set(BU_CHMOD_BUNDLE_ITEMS ON) - fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") - ") - add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD - COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake - ) - - # Copy data files into application bundle. - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake " - file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User - DESTINATION ${BUNDLE_PATH}/Contents/Resources - ) - file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/*.gmo - ) - foreach(TRANSLATION_FILE \${TRANSLATION_FILES}) - string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR - \${TRANSLATION_FILE} - ) - # It would be better to copy to the new name as a single action, - # but I can't figure out a way to let CMake do that. - file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE} - DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR} - NO_SOURCE_PERMISSIONS - ) - file(RENAME - ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE} - ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo - ) - endforeach(TRANSLATION_FILE) - ") - add_custom_target(CopyDataIntoBundle ALL - COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake - VERBATIM - ) - - # Install bundle into systemwide /Applications directory. - install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications - USE_SOURCE_PERMISSIONS - ) +if(ANDROID) + add_library(${DOLPHIN_EXE} SHARED ${SRCS}) + target_link_libraries(${DOLPHIN_EXE} + log + android + "-Wl,--whole-archive" + ${LIBS} + "-Wl,--no-whole-archive" + ) else() - install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) + add_executable(${DOLPHIN_EXE} ${SRCS}) + target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS}) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include(BundleUtilities) + set(BUNDLE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${DOLPHIN_EXE}.app) + + # Ask for an application bundle. + set_target_properties(${DOLPHIN_EXE} PROPERTIES + MACOSX_BUNDLE true + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in + ) + + # Install Cg framework into application bundle. + copy_resolved_framework_into_bundle( + # Our framework in "Externals" does not have "Versions/Current/" in + # its path; work around the missing directory levels using "././". + "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg" + "${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg" + ) + + # Fix up the bundle after it is finished. + # There does not seem to be an easy way to run CMake commands post-build, + # so we invoke CMake again on a generated script. + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/postprocess_bundle.cmake " + include(BundleUtilities) + message(\"Fixing up application bundle: ${BUNDLE_PATH}\") + set(BU_CHMOD_BUNDLE_ITEMS ON) + fixup_bundle(\"${BUNDLE_PATH}\" \"\" \"\") + ") + add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD + COMMAND ${CMAKE_COMMAND} -P postprocess_bundle.cmake + ) + + # Copy data files into application bundle. + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake " + file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User + DESTINATION ${BUNDLE_PATH}/Contents/Resources + ) + file(GLOB TRANSLATION_FILES RELATIVE ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/*.gmo + ) + foreach(TRANSLATION_FILE \${TRANSLATION_FILES}) + string(REPLACE \".gmo\" \".lproj\" TRANSLATION_DIR + \${TRANSLATION_FILE} + ) + # It would be better to copy to the new name as a single action, + # but I can't figure out a way to let CMake do that. + file(COPY ${CMAKE_BINARY_DIR}/\${TRANSLATION_FILE} + DESTINATION ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR} + NO_SOURCE_PERMISSIONS + ) + file(RENAME + ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/\${TRANSLATION_FILE} + ${BUNDLE_PATH}/Contents/Resources/\${TRANSLATION_DIR}/dolphin-emu.mo + ) + endforeach(TRANSLATION_FILE) + ") + add_custom_target(CopyDataIntoBundle ALL + COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake + VERBATIM + ) + + # Install bundle into systemwide /Applications directory. + install(DIRECTORY ${BUNDLE_PATH} DESTINATION /Applications + USE_SOURCE_PERMISSIONS + ) + else() + install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) + endif() endif() set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE}) diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp index 1c0776862c..601faeaec6 100644 --- a/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindow.cpp @@ -38,6 +38,7 @@ #include "LogManager.h" #include "HW/CPU.h" #include "PowerPC/PowerPC.h" +#include "PowerPC/JitInterface.h" #include "Debugger/PPCDebugInterface.h" #include "Debugger/Debugger_SymbolMap.h" #include "PowerPC/PPCAnalyst.h" @@ -45,8 +46,6 @@ #include "PowerPC/PPCSymbolDB.h" #include "PowerPC/SignatureDB.h" #include "PowerPC/PPCTables.h" -#include "PowerPC/JitCommon/JitBase.h" -#include "PowerPC/JitCommon/JitCache.h" // for ClearCache() #include "ConfigManager.h" @@ -260,8 +259,7 @@ void CCodeWindow::SingleStep() { if (CCPU::IsStepping()) { - if (jit) - jit->GetBlockCache()->InvalidateICache(PC, 4); + JitInterface::InvalidateICache(PC, 4); CCPU::StepOpcode(&sync_event); wxThread::Sleep(20); // need a short wait here @@ -492,10 +490,8 @@ void CCodeWindow::OnCPUMode(wxCommandEvent& event) } // Clear the JIT cache to enable these changes - if (jit) - { - jit->ClearCache(); - } + JitInterface::ClearCache(); + // Update UpdateButtonStates(); } @@ -509,7 +505,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event) break; case IDM_CLEARCODECACHE: - jit->ClearCache(); + JitInterface::ClearCache(); break; case IDM_SEARCHINSTRUCTION: diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 46b3a1e8e5..b0b53cc5ea 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -704,7 +704,7 @@ bool IsHotkey(wxKeyEvent &event, int Id) { return (event.GetKeyCode() != WXK_NONE && event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && - event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); + event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); } int GetCmdForHotkey(unsigned int key) diff --git a/Source/Core/DolphinWX/Src/GLInterface.h b/Source/Core/DolphinWX/Src/GLInterface.h index a81f17104c..70b4942e94 100644 --- a/Source/Core/DolphinWX/Src/GLInterface.h +++ b/Source/Core/DolphinWX/Src/GLInterface.h @@ -18,9 +18,11 @@ #define _GLINTERFACE_H_ #include "Thread.h" - -#if defined(USE_EGL) && USE_EGL -#include "GLInterface/EGL.h" +#ifdef ANDROID +#include +#include +#elif defined(USE_EGL) && USE_EGL +#include "GLInterface/EGL_X11.h" #elif defined(USE_WX) && USE_WX #include "GLInterface/WX.h" #elif defined(__APPLE__) @@ -29,10 +31,13 @@ #include "GLInterface/WGL.h" #elif defined(HAVE_X11) && HAVE_X11 #include "GLInterface/GLX.h" +#else +#error Platform doesnt have a GLInterface #endif typedef struct { -#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop +#ifdef ANDROID +#elif defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop int screen; Display *dpy; Display *evdpy; diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp similarity index 99% rename from Source/Core/DolphinWX/Src/GLInterface/EGL.cpp rename to Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp index 304eb92059..c092aced64 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp @@ -19,7 +19,7 @@ #include "RenderBase.h" #include "../GLInterface.h" -#include "EGL.h" +#include "EGL_X11.h" // Show the current FPS void cInterfaceEGL::UpdateFPSDisplay(const char *text) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h similarity index 100% rename from Source/Core/DolphinWX/Src/GLInterface/EGL.h rename to Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h index c2d1ffc54b..1c00a1fd89 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h @@ -23,11 +23,11 @@ protected: u32 s_backbuffer_width; u32 s_backbuffer_height; public: - virtual void Swap() = 0; - virtual void UpdateFPSDisplay(const char *Text) = 0; - virtual bool Create(void *&window_handle) = 0; - virtual bool MakeCurrent() = 0; - virtual void Shutdown() = 0; + virtual void Swap() {} + virtual void UpdateFPSDisplay(const char *Text) {} + virtual bool Create(void *&window_handle) { return true; } + virtual bool MakeCurrent() { return true; } + virtual void Shutdown() {} virtual void SwapInterval(int Interval) { } virtual u32 GetBackBufferWidth() { return s_backbuffer_width; } diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp new file mode 100644 index 0000000000..ca2119921d --- /dev/null +++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp @@ -0,0 +1,149 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ +#include +#include +#include + +#include "Common.h" +#include "FileUtil.h" + +#include "Core.h" +#include "Host.h" +#include "CPUDetect.h" +#include "Thread.h" + +#include "PowerPC/PowerPC.h" +#include "HW/Wiimote.h" + +#include "VideoBackendBase.h" +#include "ConfigManager.h" +#include "LogManager.h" +#include "BootManager.h" + +#include +#include +#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "Dolphinemu", __VA_ARGS__)) + +bool rendererHasFocus = true; +bool running = true; + +void Host_NotifyMapLoaded() {} +void Host_RefreshDSPDebuggerWindow() {} + +void Host_ShowJitResults(unsigned int address){} + +Common::Event updateMainFrameEvent; +void Host_Message(int Id) +{ +} + +void* Host_GetRenderHandle() +{ + return NULL; +} + +void* Host_GetInstance() { return NULL; } + +void Host_UpdateTitle(const char* title){}; + +void Host_UpdateLogDisplay(){} + +void Host_UpdateDisasmDialog(){} + +void Host_UpdateMainFrame() +{ +} + +void Host_UpdateBreakPointView(){} + +bool Host_GetKeyState(int keycode) +{ + return false; +} + +void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height) +{ + x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos; + y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos; + width = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth; + height = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight; +} + +void Host_RequestRenderWindowSize(int width, int height) {} +void Host_SetStartupDebuggingParameters() +{ +} + +bool Host_RendererHasFocus() +{ + return true; +} + +void Host_ConnectWiimote(int wm_idx, bool connect) {} + +void Host_SetWaitCursor(bool enable){} + +void Host_UpdateStatusBar(const char* _pText, int Filed){} + +void Host_SysMessage(const char *fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + size_t len = strlen(msg); + if (msg[len - 1] != '\n') { + msg[len - 1] = '\n'; + msg[len] = '\0'; + } + LOGI(msg); +} + +void Host_SetWiiMoteConnectionState(int _State) {} + +#ifdef __cplusplus +extern "C" +{ +#endif +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_dolphinemuactivity_main(JNIEnv *env, jobject obj) +{ + LogManager::Init(); + SConfig::Init(); + VideoBackend::PopulateList(); + VideoBackend::ActivateBackend(SConfig::GetInstance(). + m_LocalCoreStartupParameter.m_strVideoBackend); + WiimoteReal::LoadSettings(); + + // No use running the loop when booting fails + if (BootManager::BootCore("")) + { + while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + updateMainFrameEvent.Wait(); + } + + WiimoteReal::Shutdown(); + VideoBackend::ClearList(); + SConfig::Shutdown(); + LogManager::Shutdown(); +} + +#ifdef __cplusplus +} +#endif diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 6ed8e29c6b..cba3666399 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -3,7 +3,6 @@ set(SRCS Src/BPFunctions.cpp Src/BPStructs.cpp Src/CPMemory.cpp Src/CommandProcessor.cpp - Src/DLCache.cpp Src/Debugger.cpp Src/Fifo.cpp Src/FPSCounter.cpp @@ -24,7 +23,6 @@ set(SRCS Src/BPFunctions.cpp Src/Statistics.cpp Src/TextureCacheBase.cpp Src/TextureConversionShader.cpp - Src/TextureDecoder.cpp Src/VertexLoader.cpp Src/VertexLoaderManager.cpp Src/VertexLoader_Color.cpp @@ -41,6 +39,14 @@ set(SRCS Src/BPFunctions.cpp Src/memcpy_amd.cpp) set(LIBS core) + +if(NOT _M_GENERIC) + set(SRCS ${SRCS} Src/x64TextureDecoder.cpp + Src/x64DLCache.cpp) +else() + set(SRCS ${SRCS} Src/GenericTextureDecoder.cpp + Src/GenericDLCache.cpp) +endif() if(NOT ${CL} STREQUAL CL-NOTFOUND) list(APPEND LIBS ${CL}) endif() diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index 50aa21ebbf..413b163ced 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -222,11 +222,11 @@ void RunGpu() { u8 *uData = Memory::GetPointer(fifo.CPReadPointer); - SaveSSEState(); - LoadDefaultSSEState(); + FPURoundMode::SaveSIMDState(); + FPURoundMode::LoadDefaultSIMDState(); ReadDataFromFifo(uData, 32); OpcodeDecoder_Run(g_bSkipCurrentFrame); - LoadSSEState(); + FPURoundMode::LoadSIMDState(); //DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base"); diff --git a/Source/Core/VideoCommon/Src/GenericDLCache.cpp b/Source/Core/VideoCommon/Src/GenericDLCache.cpp new file mode 100644 index 0000000000..5e27deb469 --- /dev/null +++ b/Source/Core/VideoCommon/Src/GenericDLCache.cpp @@ -0,0 +1,52 @@ +// Copyright (C) 2003-2009 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +// TODO: Handle cache-is-full condition :p + + +#include "Common.h" +#include "DLCache.h" + +namespace DLCache +{ + +void Init() +{ +} + +void Shutdown() +{ +} + +void Clear() +{ +} + +void ProgressiveCleanup() +{ +} +} // namespace + +// NOTE - outside the namespace on purpose. +bool HandleDisplayList(u32 address, u32 size) +{ + return false; +} + +void IncrementCheckContextId() +{ +} diff --git a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp b/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp new file mode 100644 index 0000000000..ad7cfeebf9 --- /dev/null +++ b/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp @@ -0,0 +1,2182 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" +//#include "VideoCommon.h" // to get debug logs + +#include "CPUDetect.h" +#include "TextureDecoder.h" +#include "OpenCL.h" +#include "OpenCL/OCLTextureDecoder.h" +#include "VideoConfig.h" + +#include "LookUpTables.h" + +#include + + + +bool TexFmt_Overlay_Enable=false; +bool TexFmt_Overlay_Center=false; + +extern const char* texfmt[]; +extern const unsigned char sfont_map[]; +extern const unsigned char sfont_raw[][9*10]; + +// TRAM +// STATE_TO_SAVE + GC_ALIGNED16(u8 texMem[TMEM_SIZE]); + + +// Gamecube/Wii texture decoder + +// Decodes all known Gamecube/Wii texture formats. +// by ector + +int TexDecoder_GetTexelSizeInNibbles(int format) +{ + switch (format & 0x3f) { + case GX_TF_I4: return 1; + case GX_TF_I8: return 2; + case GX_TF_IA4: return 2; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 8; + case GX_TF_C4: return 1; + case GX_TF_C8: return 2; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 1; + case GX_CTF_R4: return 1; + case GX_CTF_RA4: return 2; + case GX_CTF_RA8: return 4; + case GX_CTF_YUVA8: return 8; + case GX_CTF_A8: return 2; + case GX_CTF_R8: return 2; + case GX_CTF_G8: return 2; + case GX_CTF_B8: return 2; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + + case GX_TF_Z8: return 2; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 8; + + case GX_CTF_Z4: return 1; + case GX_CTF_Z8M: return 2; + case GX_CTF_Z8L: return 2; + case GX_CTF_Z16L: return 4; + default: return 1; + } +} + +int TexDecoder_GetTextureSizeInBytes(int width, int height, int format) +{ + return (width * height * TexDecoder_GetTexelSizeInNibbles(format)) / 2; +} + +int TexDecoder_GetBlockWidthInTexels(u32 format) +{ + switch (format) + { + case GX_TF_I4: return 8; + case GX_TF_I8: return 8; + case GX_TF_IA4: return 8; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 4; + case GX_TF_C4: return 8; + case GX_TF_C8: return 8; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 8; + case GX_CTF_R4: return 8; + case GX_CTF_RA4: return 8; + case GX_CTF_RA8: return 4; + case GX_CTF_A8: return 8; + case GX_CTF_R8: return 8; + case GX_CTF_G8: return 8; + case GX_CTF_B8: return 8; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + case GX_TF_Z8: return 8; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 4; + case GX_CTF_Z4: return 8; + case GX_CTF_Z8M: return 8; + case GX_CTF_Z8L: return 8; + case GX_CTF_Z16L: return 4; + default: + ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockWidthInTexels)", format); + return 8; + } +} + +int TexDecoder_GetBlockHeightInTexels(u32 format) +{ + switch (format) + { + case GX_TF_I4: return 8; + case GX_TF_I8: return 4; + case GX_TF_IA4: return 4; + case GX_TF_IA8: return 4; + case GX_TF_RGB565: return 4; + case GX_TF_RGB5A3: return 4; + case GX_TF_RGBA8: return 4; + case GX_TF_C4: return 8; + case GX_TF_C8: return 4; + case GX_TF_C14X2: return 4; + case GX_TF_CMPR: return 8; + case GX_CTF_R4: return 8; + case GX_CTF_RA4: return 4; + case GX_CTF_RA8: return 4; + case GX_CTF_A8: return 4; + case GX_CTF_R8: return 4; + case GX_CTF_G8: return 4; + case GX_CTF_B8: return 4; + case GX_CTF_RG8: return 4; + case GX_CTF_GB8: return 4; + case GX_TF_Z8: return 4; + case GX_TF_Z16: return 4; + case GX_TF_Z24X8: return 4; + case GX_CTF_Z4: return 8; + case GX_CTF_Z8M: return 4; + case GX_CTF_Z8L: return 4; + case GX_CTF_Z16L: return 4; + default: + ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format); + return 4; + } +} + +//returns bytes +int TexDecoder_GetPaletteSize(int format) +{ + switch (format) + { + case GX_TF_C4: return 16 * 2; + case GX_TF_C8: return 256 * 2; + case GX_TF_C14X2: return 16384 * 2; + default: + return 0; + } +} + +static inline u32 decodeIA8(u16 val) +{ + int a = val >> 8; + int i = val & 0xFF; + return (a << 24) | (i << 16) | (i << 8) | i; +} + +static inline u32 decode5A3(u16 val) +{ + int r,g,b,a; + if ((val & 0x8000)) + { + a = 0xFF; + r = Convert5To8((val >> 10) & 0x1F); + g = Convert5To8((val >> 5) & 0x1F); + b = Convert5To8(val & 0x1F); + } + else + { + a = Convert3To8((val >> 12) & 0x7); + r = Convert4To8((val >> 8) & 0xF); + g = Convert4To8((val >> 4) & 0xF); + b = Convert4To8(val & 0xF); + } + return (a << 24) | (r << 16) | (g << 8) | b; +} + +static inline u32 decode5A3RGBA(u16 val) +{ + int r,g,b,a; + if ((val&0x8000)) + { + r=Convert5To8((val>>10) & 0x1f); + g=Convert5To8((val>>5 ) & 0x1f); + b=Convert5To8((val ) & 0x1f); + a=0xFF; + } + else + { + a=Convert3To8((val>>12) & 0x7); + r=Convert4To8((val>>8 ) & 0xf); + g=Convert4To8((val>>4 ) & 0xf); + b=Convert4To8((val ) & 0xf); + } + return r | (g<<8) | (b << 16) | (a << 24); +} + +static inline u32 decode565RGBA(u16 val) +{ + int r,g,b,a; + r=Convert5To8((val>>11) & 0x1f); + g=Convert6To8((val>>5 ) & 0x3f); + b=Convert5To8((val ) & 0x1f); + a=0xFF; + return r | (g<<8) | (b << 16) | (a << 24); +} + +static inline u32 decodeIA8Swapped(u16 val) +{ + int a = val & 0xFF; + int i = val >> 8; + return i | (i<<8) | (i<<16) | (a<<24); +} + + + +struct DXTBlock +{ + u16 color1; + u16 color2; + u8 lines[4]; +}; + +//inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) +inline void decodebytesC4_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode5A3(Common::swap16(tlut[val >> 4])); + *dst++ = decode5A3(Common::swap16(tlut[val & 0xF])); + } +} + +inline void decodebytesC4_5A3_To_rgba32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode5A3RGBA(Common::swap16(tlut[val >> 4])); + *dst++ = decode5A3RGBA(Common::swap16(tlut[val & 0xF])); + } +} + +inline void decodebytesC4_To_Raw16(u16* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = Common::swap16(tlut[val >> 4]); + *dst++ = Common::swap16(tlut[val & 0xF]); + } +} + +inline void decodebytesC4IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decodeIA8Swapped(tlut[val >> 4]); + *dst++ = decodeIA8Swapped(tlut[val & 0xF]); + } +} + +inline void decodebytesC4RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem+tlutaddr); + for (int x = 0; x < 4; x++) + { + u8 val = src[x]; + *dst++ = decode565RGBA(Common::swap16(tlut[val >> 4])); + *dst++ = decode565RGBA(Common::swap16(tlut[val & 0xF])); + } +} + +//inline void decodebytesC8(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt) +inline void decodebytesC8_5A3_To_BGRA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = decode5A3(Common::swap16(tlut[val])); + } +} + +inline void decodebytesC8_5A3_To_RGBA32(u32 *dst, const u8 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = decode5A3RGBA(Common::swap16(tlut[val])); + } +} + +inline void decodebytesC8_To_Raw16(u16* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + u8 val = src[x]; + *dst++ = Common::swap16(tlut[val]); + } +} + +inline void decodebytesC8IA8_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + *dst++ = decodeIA8Swapped(tlut[src[x]]); + } +} + +inline void decodebytesC8RGB565_To_RGBA(u32* dst, const u8* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 8; x++) + { + *dst++ = decode565RGBA(Common::swap16(tlut[src[x]])); + } +} + +inline void decodebytesC14X2_5A3_To_BGRA32(u32 *dst, const u16 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode5A3(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +inline void decodebytesC14X2_5A3_To_RGBA(u32 *dst, const u16 *src, int tlutaddr) +{ + u16 *tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode5A3RGBA(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +inline void decodebytesC14X2_To_Raw16(u16* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = Common::swap16(tlut[(val & 0x3FFF)]); + } +} + +inline void decodebytesC14X2IA8_To_RGBA(u32* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decodeIA8Swapped(tlut[(val & 0x3FFF)]); + } +} + +inline void decodebytesC14X2rgb565_To_RGBA(u32* dst, const u16* src, int tlutaddr) +{ + u16* tlut = (u16*)(texMem + tlutaddr); + for (int x = 0; x < 4; x++) + { + u16 val = Common::swap16(src[x]); + *dst++ = decode565RGBA(Common::swap16(tlut[(val & 0x3FFF)])); + } +} + +// Needs more speed. +inline void decodebytesIA4(u16 *dst, const u8 *src) +{ + for (int x = 0; x < 8; x++) + { + const u8 val = src[x]; + u8 a = Convert4To8(val >> 4); + u8 l = Convert4To8(val & 0xF); + dst[x] = (a << 8) | l; + } +} + +inline void decodebytesIA4RGBA(u32 *dst, const u8 *src) +{ + for (int x = 0; x < 8; x++) + { + const u8 val = src[x]; + u8 a = Convert4To8(val >> 4); + u8 l = Convert4To8(val & 0xF); + dst[x] = (a << 24) | l << 16 | l << 8 | l; + } +} + +inline void decodebytesRGB5A3(u32 *dst, const u16 *src) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = decode5A3(Common::swap16(src[x])); +#else + dst[0] = decode5A3(Common::swap16(src[0])); + dst[1] = decode5A3(Common::swap16(src[1])); + dst[2] = decode5A3(Common::swap16(src[2])); + dst[3] = decode5A3(Common::swap16(src[3])); +#endif +} + +inline void decodebytesRGB5A3rgba(u32 *dst, const u16 *src) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = decode5A3RGBA(Common::swap16(src[x])); +#else + dst[0] = decode5A3RGBA(Common::swap16(src[0])); + dst[1] = decode5A3RGBA(Common::swap16(src[1])); + dst[2] = decode5A3RGBA(Common::swap16(src[2])); + dst[3] = decode5A3RGBA(Common::swap16(src[3])); +#endif +} + +// This one is used by many video formats. It'd therefore be good if it was fast. +// Needs more speed. +inline void decodebytesARGB8_4(u32 *dst, const u16 *src, const u16 *src2) +{ +#if 0 + for (int x = 0; x < 4; x++) + dst[x] = Common::swap32((src2[x] << 16) | src[x]); +#else + dst[0] = Common::swap32((src2[0] << 16) | src[0]); + dst[1] = Common::swap32((src2[1] << 16) | src[1]); + dst[2] = Common::swap32((src2[2] << 16) | src[2]); + dst[3] = Common::swap32((src2[3] << 16) | src[3]); +#endif + + // This can probably be done in a few SSE pack/unpack instructions + pshufb + // some unpack instruction x2: + // ABABABABABABABAB 1212121212121212 -> + // AB12AB12AB12AB12 AB12AB12AB12AB12 + // 2x pshufb-> + // 21BA21BA21BA21BA 21BA21BA21BA21BA + // and we are done. +} + +inline void decodebytesARGB8_4ToRgba(u32 *dst, const u16 *src, const u16 * src2) +{ +#if 0 + for (int x = 0; x < 4; x++) { + dst[x] = ((src[x] & 0xFF) << 24) | ((src[x] & 0xFF00)>>8) | (src2[x] << 8); + } +#else + dst[0] = ((src[0] & 0xFF) << 24) | ((src[0] & 0xFF00)>>8) | (src2[0] << 8); + dst[1] = ((src[1] & 0xFF) << 24) | ((src[1] & 0xFF00)>>8) | (src2[1] << 8); + dst[2] = ((src[2] & 0xFF) << 24) | ((src[2] & 0xFF00)>>8) | (src2[2] << 8); + dst[3] = ((src[3] & 0xFF) << 24) | ((src[3] & 0xFF00)>>8) | (src2[3] << 8); +#endif +} + +inline u32 makecol(int r, int g, int b, int a) +{ + return (a << 24)|(r << 16)|(g << 8)|b; +} + +inline u32 makeRGBA(int r, int g, int b, int a) +{ + return (a<<24)|(b<<16)|(g<<8)|r; +} + +void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch) +{ + // S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support) + // Needs more speed. + u16 c1 = Common::swap16(src->color1); + u16 c2 = Common::swap16(src->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + int colors[4]; + colors[0] = makecol(red1, green1, blue1, 255); + colors[1] = makecol(red2, green2, blue2, 255); + if (c1 > c2) + { + int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3); + int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3); + int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3); + colors[2] = makecol(red1 + red3, green1 + green3, blue1 + blue3, 255); + colors[3] = makecol(red2 - red3, green2 - green3, blue2 - blue3, 255); + } + else + { + colors[2] = makecol((red1 + red2 + 1) / 2, // Average + (green1 + green2 + 1) / 2, + (blue1 + blue2 + 1) / 2, 255); + colors[3] = makecol(red2, green2, blue2, 0); // Color2 but transparent + } + + for (int y = 0; y < 4; y++) + { + int val = src->lines[y]; + for (int x = 0; x < 4; x++) + { + dst[x] = colors[(val >> 6) & 3]; + val <<= 2; + } + dst += pitch; + } +} + +void decodeDXTBlockRGBA(u32 *dst, const DXTBlock *src, int pitch) +{ + // S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support) + // Needs more speed. + u16 c1 = Common::swap16(src->color1); + u16 c2 = Common::swap16(src->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + int colors[4]; + colors[0] = makeRGBA(red1, green1, blue1, 255); + colors[1] = makeRGBA(red2, green2, blue2, 255); + if (c1 > c2) + { + int blue3 = ((blue2 - blue1) >> 1) - ((blue2 - blue1) >> 3); + int green3 = ((green2 - green1) >> 1) - ((green2 - green1) >> 3); + int red3 = ((red2 - red1) >> 1) - ((red2 - red1) >> 3); + colors[2] = makeRGBA(red1 + red3, green1 + green3, blue1 + blue3, 255); + colors[3] = makeRGBA(red2 - red3, green2 - green3, blue2 - blue3, 255); + } + else + { + colors[2] = makeRGBA((red1 + red2 + 1) / 2, // Average + (green1 + green2 + 1) / 2, + (blue1 + blue2 + 1) / 2, 255); + colors[3] = makeRGBA(red2, green2, blue2, 0); // Color2 but transparent + } + + for (int y = 0; y < 4; y++) + { + int val = src->lines[y]; + for (int x = 0; x < 4; x++) + { + dst[x] = colors[(val >> 6) & 3]; + val <<= 2; + } + dst += pitch; + } +} + +#if 0 // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8 +static void copyDXTBlock(u8* dst, const u8* src) +{ + ((u16*)dst)[0] = Common::swap16(((u16*)src)[0]); + ((u16*)dst)[1] = Common::swap16(((u16*)src)[1]); + u32 pixels = ((u32*)src)[1]; + // A bit of trickiness here: the row are in the same order + // between the two formats, but the ordering within the rows + // is reversed. + pixels = ((pixels >> 4) & 0x0F0F0F0F) | ((pixels << 4) & 0xF0F0F0F0); + pixels = ((pixels >> 2) & 0x33333333) | ((pixels << 2) & 0xCCCCCCCC); + ((u32*)dst)[1] = pixels; +} +#endif + +static PC_TexFormat GetPCFormatFromTLUTFormat(int tlutfmt) +{ + switch (tlutfmt) + { + case 0: return PC_TEX_FMT_IA8; // IA8 + case 1: return PC_TEX_FMT_RGB565; // RGB565 + case 2: return PC_TEX_FMT_BGRA32; // RGB5A3: This TLUT format requires + // extra work to decode. + } + return PC_TEX_FMT_NONE; // Error +} + +PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt) +{ + switch (texformat) + { + case GX_TF_C4: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_I4: + return PC_TEX_FMT_IA8; + case GX_TF_I8: // speed critical + return PC_TEX_FMT_IA8; + case GX_TF_C8: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_IA4: + return PC_TEX_FMT_IA4_AS_IA8; + case GX_TF_IA8: + return PC_TEX_FMT_IA8; + case GX_TF_C14X2: + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_RGB565: + return PC_TEX_FMT_RGB565; + case GX_TF_RGB5A3: + return PC_TEX_FMT_BGRA32; + case GX_TF_RGBA8: // speed critical + return PC_TEX_FMT_BGRA32; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { + return PC_TEX_FMT_BGRA32; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_NONE; +} + + +//switch endianness, unswizzle +//TODO: to save memory, don't blindly convert everything to argb8888 +//also ARGB order needs to be swapped later, to accommodate modern hardware better +//need to add DXT support too +PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt) +{ + const int Wsteps4 = (width + 3) / 4; + const int Wsteps8 = (width + 7) / 8; + + switch (texformat) + { + case GX_TF_C4: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++) + decodebytesC4_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + else + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8; iy < 8; iy++, xStep++) + decodebytesC4_To_Raw16((u16*)dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_I4: + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = yStep * 8 ; iy < 8; iy++,xStep++) + for (int ix = 0; ix < 4; ix++) + { + int val = src[4 * xStep + ix]; + dst[(y + iy) * width + x + ix * 2] = Convert4To8(val >> 4); + dst[(y + iy) * width + x + ix * 2 + 1] = Convert4To8(val & 0xF); + } + } + return PC_TEX_FMT_I4_AS_I8; + case GX_TF_I8: // speed critical + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + { + ((u64*)(dst + (y + iy) * width + x))[0] = ((u64*)(src + 8 * xStep))[0]; + } + } + return PC_TEX_FMT_I8; + case GX_TF_C8: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + else + { + + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_To_Raw16((u16*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_IA4: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesIA4((u16*)dst + (y + iy) * width + x, src + 8 * xStep); + } + return PC_TEX_FMT_IA4_AS_IA8; + case GX_TF_IA8: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = yStep * 4; iy < 4; iy++, xStep++) + { + u16 *ptr = (u16 *)dst + (y + iy) * width + x; + u16 *s = (u16 *)(src + 8 * xStep); + for(int j = 0; j < 4; j++) + *ptr++ = Common::swap16(*s++); + } + + } + return PC_TEX_FMT_IA8; + case GX_TF_C14X2: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_5A3_To_BGRA32((u32*)dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_To_Raw16((u16*)dst + (y + iy) * width + x,(u16*)(src + 8 * xStep), tlutaddr); + } + return GetPCFormatFromTLUTFormat(tlutfmt); + case GX_TF_RGB565: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + { + u16 *ptr = (u16 *)dst + (y + iy) * width + x; + u16 *s = (u16 *)(src + 8 * xStep); + for(int j = 0; j < 4; j++) + *ptr++ = Common::swap16(*s++); + } + } + return PC_TEX_FMT_RGB565; + case GX_TF_RGB5A3: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + //decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)src, 4); + decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)(src + 8 * xStep)); + } + return PC_TEX_FMT_BGRA32; + case GX_TF_RGBA8: // speed critical + { + + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + { + const u8* src2 = src + 64 * yStep; + for (int iy = 0; iy < 4; iy++) + decodebytesARGB8_4((u32*)dst + (y+iy)*width + x, (u16*)src2 + 4 * iy, (u16*)src2 + 4 * iy + 16); + } + } + } + return PC_TEX_FMT_BGRA32; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { +#if 0 // TODO - currently does not handle transparency correctly and causes problems when texture dimensions are not multiples of 8 + // 11111111 22222222 55555555 66666666 + // 33333333 44444444 77777777 88888888 + for (int y = 0; y < height; y += 8) + { + for (int x = 0; x < width; x += 8) + { + copyDXTBlock(dst+(y/2)*width+x*2, src); + src += 8; + copyDXTBlock(dst+(y/2)*width+x*2+8, src); + src += 8; + copyDXTBlock(dst+(y/2+2)*width+x*2, src); + src += 8; + copyDXTBlock(dst+(y/2+2)*width+x*2+8, src); + src += 8; + } + } + return PC_TEX_FMT_DXT1; +#else + for (int y = 0; y < height; y += 8) + { + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8, yStep++) + { + const u8* src2 = src + 4 * sizeof(DXTBlock) * yStep; + decodeDXTBlock((u32*)dst + y * width + x, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + y * width + x + 4, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + (y + 4) * width + x, (DXTBlock*)src2, width); + src2 += sizeof(DXTBlock); + decodeDXTBlock((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src2, width); + } + } +#endif + return PC_TEX_FMT_BGRA32; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_NONE; +} + + + +// JSD 01/06/11: +// TODO: we really should ensure BOTH the source and destination addresses are aligned to 16-byte boundaries to +// squeeze out a little more performance. _mm_loadu_si128/_mm_storeu_si128 is slower than _mm_load_si128/_mm_store_si128 +// because they work on unaligned addresses. The processor is free to make the assumption that addresses are multiples +// of 16 in the aligned case. +// TODO: complete SSE2 optimization of less often used texture formats. +// TODO: refactor algorithms using _mm_loadl_epi64 unaligned loads to prefer 128-bit aligned loads. + +PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt) +{ + + const int Wsteps4 = (width + 3) / 4; + const int Wsteps8 = (width + 7) / 8; + + switch (texformat) + { + case GX_TF_C4: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4_5A3_To_rgba32(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + else if(tlutfmt == 0) + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4IA8_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + + } + else + { + for (int y = 0; y < height; y += 8) + for (int x = 0, yStep = (y / 8) * Wsteps8; x < width; x += 8,yStep++) + for (int iy = 0, xStep = 8 * yStep; iy < 8; iy++,xStep++) + decodebytesC4RGB565_To_RGBA(dst + (y + iy) * width + x, src + 4 * xStep, tlutaddr); + } + break; + case GX_TF_I4: + { + // Reference C implementation: + for (int y = 0; y < height; y += 8) + for (int x = 0; x < width; x += 8) + for (int iy = 0; iy < 8; iy++, src += 4) + for (int ix = 0; ix < 4; ix++) + { + int val = src[ix]; + u8 i1 = Convert4To8(val >> 4); + u8 i2 = Convert4To8(val & 0xF); + memset(dst+(y + iy) * width + x + ix * 2 , i1,4); + memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4); + } + } + break; + case GX_TF_I8: // speed critical + { + // Reference C implementation + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 8) + for (int iy = 0; iy < 4; ++iy, src += 8) + { + u32 * newdst = dst + (y + iy)*width+x; + const u8 * newsrc = src; + u8 srcval; + + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); + } + } + break; + case GX_TF_C8: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8_5A3_To_RGBA32((u32*)dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + } + else if(tlutfmt == 0) + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8IA8_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC8RGB565_To_RGBA(dst + (y + iy) * width + x, src + 8 * xStep, tlutaddr); + + } + break; + case GX_TF_IA4: + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps8; x < width; x += 8, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesIA4RGBA(dst + (y + iy) * width + x, src + 8 * xStep); + } + break; + case GX_TF_IA8: + { + // Reference C implementation: + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + { + u32 *ptr = dst + (y + iy) * width + x; + u16 *s = (u16 *)src; + ptr[0] = decodeIA8Swapped(s[0]); + ptr[1] = decodeIA8Swapped(s[1]); + ptr[2] = decodeIA8Swapped(s[2]); + ptr[3] = decodeIA8Swapped(s[3]); + } + } + break; + case GX_TF_C14X2: + if (tlutfmt == 2) + { + // Special decoding is required for TLUT format 5A3 + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2_5A3_To_BGRA32(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else if (tlutfmt == 0) + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2IA8_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + else + { + for (int y = 0; y < height; y += 4) + for (int x = 0, yStep = (y / 4) * Wsteps4; x < width; x += 4, yStep++) + for (int iy = 0, xStep = 4 * yStep; iy < 4; iy++, xStep++) + decodebytesC14X2rgb565_To_RGBA(dst + (y + iy) * width + x, (u16*)(src + 8 * xStep), tlutaddr); + } + break; + case GX_TF_RGB565: + { + // Reference C implementation. + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + { + u32 *ptr = dst + (y + iy) * width + x; + u16 *s = (u16 *)src; + for(int j = 0; j < 4; j++) + *ptr++ = decode565RGBA(Common::swap16(*s++)); + } + } + break; + case GX_TF_RGB5A3: + { + // Reference C implementation: + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + for (int iy = 0; iy < 4; iy++, src += 8) + decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src); + } + break; + case GX_TF_RGBA8: // speed critical + { + // Reference C implementation. + for (int y = 0; y < height; y += 4) + for (int x = 0; x < width; x += 4) + { + for (int iy = 0; iy < 4; iy++) + decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16); + src += 64; + } + } + break; + case GX_TF_CMPR: // speed critical + // The metroid games use this format almost exclusively. + { + for (int y = 0; y < height; y += 8) + { + for (int x = 0; x < width; x += 8) + { + decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width); + src += sizeof(DXTBlock); + } + } + break; + } + } + + // The "copy" texture formats, too? + return PC_TEX_FMT_RGBA32; +} + + + + +void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center) +{ + TexFmt_Overlay_Enable = enable; + TexFmt_Overlay_Center = center; +} + +PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly) +{ + PC_TexFormat retval = TexDecoder_Decode_OpenCL(dst, src, + width, height, texformat, tlutaddr, tlutfmt, rgbaOnly); + if (retval == PC_TEX_FMT_NONE) + retval = rgbaOnly ? TexDecoder_Decode_RGBA((u32*)dst, src, + width, height, texformat, tlutaddr, tlutfmt) + : TexDecoder_Decode_real(dst, src, + width, height, texformat, tlutaddr, tlutfmt); + + if ((!TexFmt_Overlay_Enable)|| (retval == PC_TEX_FMT_NONE)) + return retval; + + int w = min(width, 40); + int h = min(height, 10); + + int xoff = (width - w) >> 1; + int yoff = (height - h) >> 1; + + if (!TexFmt_Overlay_Center) + { + xoff=0; + yoff=0; + } + + const char* fmt = texfmt[texformat&15]; + while (*fmt) + { + int xcnt = 0; + int nchar = sfont_map[(int)*fmt]; + + const unsigned char *ptr = sfont_raw[nchar]; // each char is up to 9x10 + + for (int x = 0; x < 9;x++) + { + if (ptr[x] == 0x78) + break; + xcnt++; + } + + for (int y=0; y < 10; y++) + { + for (int x=0; x < xcnt; x++) + { + switch(retval) + { + case PC_TEX_FMT_I8: + { + // TODO: Is this an acceptable way to draw in I8? + u8 *dtp = (u8*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFF : 0x88; + break; + } + case PC_TEX_FMT_IA8: + case PC_TEX_FMT_IA4_AS_IA8: + { + u16 *dtp = (u16*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFF : 0xFF00; + break; + } + case PC_TEX_FMT_RGB565: + { + u16 *dtp = (u16*)dst; + dtp[(y + yoff)*width + x + xoff] = ptr[x] ? 0xFFFF : 0x0000; + break; + } + default: + case PC_TEX_FMT_BGRA32: + { + int *dtp = (int*)dst; + dtp[(y + yoff) * width + x + xoff] = ptr[x] ? 0xFFFFFFFF : 0xFF000000; + break; + } + } + } + ptr += 9; + } + xoff += xcnt; + fmt++; + } + + return retval; +} + + + +void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt) +{ + /* General formula for computing texture offset + // + u16 sBlk = s / blockWidth; + u16 tBlk = t / blockHeight; + u16 widthBlks = (width / blockWidth) + 1; + u32 base = (tBlk * widthBlks + sBlk) * blockWidth * blockHeight; + u16 blkS = s & (blockWidth - 1); + u16 blkT = t & (blockHeight - 1); + u32 blkOff = blkT * blockWidth + blkS; + */ + + switch (texformat) + { + case GX_TF_C4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 3; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 7; + u32 blkOff = (blkT << 3) + blkS; + + int rs = (blkOff & 1)?0:4; + u32 offset = base + (blkOff >> 1); + + u8 val = (*(src + offset) >> rs) & 0xF; + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_I4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 3; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 7; + u32 blkOff = (blkT << 3) + blkS; + + int rs = (blkOff & 1)?0:4; + u32 offset = base + (blkOff >> 1); + + u8 val = (*(src + offset) >> rs) & 0xF; + val = Convert4To8(val); + dst[0] = val; + dst[1] = val; + dst[2] = val; + dst[3] = val; + } + break; + case GX_TF_I8: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + dst[0] = val; + dst[1] = val; + dst[2] = val; + dst[3] = val; + } + break; + case GX_TF_C8: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_IA4: + { + u16 sBlk = s >> 3; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; + u16 blkS = s & 7; + u16 blkT = t & 3; + u32 blkOff = (blkT << 3) + blkS; + + u8 val = *(src + base + blkOff); + const u8 a = Convert4To8(val>>4); + const u8 l = Convert4To8(val&0xF); + dst[0] = l; + dst[1] = l; + dst[2] = l; + dst[3] = a; + } + break; + case GX_TF_IA8: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decodeIA8Swapped(*valAddr); + } + break; + case GX_TF_C14X2: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + u16 val = Common::swap16(*valAddr) & 0x3FFF; + u16 *tlut = (u16*)(texMem + tlutaddr); + + switch (tlutfmt) + { + case 0: + *((u32*)dst) = decodeIA8Swapped(tlut[val]); + break; + case 1: + *((u32*)dst) = decode565RGBA(Common::swap16(tlut[val])); + break; + case 2: + *((u32*)dst) = decode5A3RGBA(Common::swap16(tlut[val])); + break; + } + } + break; + case GX_TF_RGB565: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decode565RGBA(Common::swap16(*valAddr)); + } + break; + case GX_TF_RGB5A3: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1; + const u16* valAddr = (u16*)(src + offset); + + *((u32*)dst) = decode5A3RGBA(Common::swap16(*valAddr)); + } + break; + case GX_TF_RGBA8: + { + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 5; // shift by 5 is correct + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blkOff = (blkT << 2) + blkS; + + u32 offset = (base + blkOff) << 1 ; + const u8* valAddr = src + offset; + + dst[3] = valAddr[0]; + dst[0] = valAddr[1]; + dst[1] = valAddr[32]; + dst[2] = valAddr[33]; + } + break; + case GX_TF_CMPR: + { + u16 sDxt = s >> 2; + u16 tDxt = t >> 2; + + u16 sBlk = sDxt >> 1; + u16 tBlk = tDxt >> 1; + u16 widthBlks = (imageWidth >> 3) + 1; + u32 base = (tBlk * widthBlks + sBlk) << 2; + u16 blkS = sDxt & 1; + u16 blkT = tDxt & 1; + u32 blkOff = (blkT << 1) + blkS; + + u32 offset = (base + blkOff) << 3; + + const DXTBlock* dxtBlock = (const DXTBlock*)(src + offset); + + u16 c1 = Common::swap16(dxtBlock->color1); + u16 c2 = Common::swap16(dxtBlock->color2); + int blue1 = Convert5To8(c1 & 0x1F); + int blue2 = Convert5To8(c2 & 0x1F); + int green1 = Convert6To8((c1 >> 5) & 0x3F); + int green2 = Convert6To8((c2 >> 5) & 0x3F); + int red1 = Convert5To8((c1 >> 11) & 0x1F); + int red2 = Convert5To8((c2 >> 11) & 0x1F); + + u16 ss = s & 3; + u16 tt = t & 3; + + int colorSel = dxtBlock->lines[tt]; + int rs = 6 - (ss << 1); + colorSel = (colorSel >> rs) & 3; + colorSel |= c1 > c2?0:4; + + u32 color = 0; + + switch (colorSel) + { + case 0: + case 4: + color = makeRGBA(red1, green1, blue1, 255); + break; + case 1: + case 5: + color = makeRGBA(red2, green2, blue2, 255); + break; + case 2: + color = makeRGBA(red1+(red2-red1)/3, green1+(green2-green1)/3, blue1+(blue2-blue1)/3, 255); + break; + case 3: + color = makeRGBA(red2+(red1-red2)/3, green2+(green1-green2)/3, blue2+(blue1-blue2)/3, 255); + break; + case 6: + color = makeRGBA((int)ceil((float)(red1+red2)/2), (int)ceil((float)(green1+green2)/2), (int)ceil((float)(blue1+blue2)/2), 255); + break; + case 7: + color = makeRGBA(red2, green2, blue2, 0); + break; + } + + *((u32*)dst) = color; + } + break; + } +} + + +const char* texfmt[] = { + // pixel + "I4", "I8", "IA4", "IA8", + "RGB565", "RGB5A3", "RGBA8", "0x07", + "C4", "C8", "C14X2", "0x0B", + "0x0C", "0x0D", "CMPR", "0x0F", + // Z-buffer + "0x10", "Z8", "0x12", "Z16", + "0x14", "0x15", "Z24X8", "0x17", + "0x18", "0x19", "0x1A", "0x1B", + "0x1C", "0x1D", "0x1E", "0x1F", + // pixel + copy + "CR4", "0x21", "CRA4", "CRA8", + "0x24", "0x25", "CYUVA8", "CA8", + "CR8", "CG8", "CB8", "CRG8", + "CGB8", "0x2D", "0x2E", "0x2F", + // Z + copy + "CZ4", "0x31", "0x32", "0x33", + "0x34", "0x35", "0x36", "0x37", + "0x38", "CZ8M", "CZ8L", "0x3B", + "CZ16L", "0x3D", "0x3E", "0x3F", +}; + +const unsigned char sfont_map[] = { + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,10,10,10,10, + 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25, + 26,27,28,29,30,31,32,33,34,35,36,10,10,10,10,10, + 10,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51, + 52,53,54,55,56,57,58,59,60,61,62,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, +}; + +const unsigned char sfont_raw[][9*10] = { + { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0x00, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + },{ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x78, 0x78, 0x78, 0x78, + }, +}; diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index 5bffab8ee7..526cbe7e49 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -23,7 +23,7 @@ #include "MemoryUtil.h" #include "StringUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "PixelEngine.h" #include "Host.h" @@ -43,8 +43,9 @@ //BBox #include "XFMemory.h" extern float GC_ALIGNED16(g_fProjectionMatrix[16]); - +#ifndef _M_GENERIC #define USE_JIT +#endif #define COMPILED_CODE_SIZE 4096 @@ -82,8 +83,9 @@ static const float fractionTable[32] = { 1.0f / (1U << 24), 1.0f / (1U << 25), 1.0f / (1U << 26), 1.0f / (1U << 27), 1.0f / (1U << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31), }; - +#ifdef USE_JIT using namespace Gen; +#endif void LOADERDECL PosMtx_ReadDirect_UByte() { @@ -182,14 +184,19 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr) m_VtxDesc = vtx_desc; SetVAT(vtx_attr.g0.Hex, vtx_attr.g1.Hex, vtx_attr.g2.Hex); + #ifdef USE_JIT AllocCodeSpace(COMPILED_CODE_SIZE); CompileVertexTranslator(); WriteProtect(); + #endif + } VertexLoader::~VertexLoader() { + #ifdef USE_JIT FreeCodeSpace(); + #endif delete m_NativeFmt; } @@ -474,7 +481,8 @@ void VertexLoader::WriteCall(TPipelineFunction func) m_PipelineStages[m_numPipelineStages++] = func; #endif } - +// ARMTODO: This should be done in a better way +#ifndef _M_GENERIC void VertexLoader::WriteGetVariable(int bits, OpArg dest, void *address) { #ifdef USE_JIT @@ -498,7 +506,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) #endif #endif } - +#endif void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int count) { m_numLoadedVertices += count; diff --git a/Source/Core/VideoCommon/Src/VertexLoader.h b/Source/Core/VideoCommon/Src/VertexLoader.h index 98a57cb9ff..0f321cd14f 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.h +++ b/Source/Core/VideoCommon/Src/VertexLoader.h @@ -76,7 +76,12 @@ private: } }; +// ARMTODO: This should be done in a better way +#ifndef _M_GENERIC class VertexLoader : public Gen::XCodeBlock, NonCopyable +#else +class VertexLoader +#endif { public: VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr); @@ -122,8 +127,10 @@ private: void WriteCall(TPipelineFunction); +#ifndef _M_GENERIC void WriteGetVariable(int bits, Gen::OpArg dest, void *address); void WriteSetVariable(int bits, void *address, Gen::OpArg dest); +#endif }; #endif diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/x64DLCache.cpp similarity index 99% rename from Source/Core/VideoCommon/Src/DLCache.cpp rename to Source/Core/VideoCommon/Src/x64DLCache.cpp index c828ea3a03..559593a08c 100644 --- a/Source/Core/VideoCommon/Src/DLCache.cpp +++ b/Source/Core/VideoCommon/Src/x64DLCache.cpp @@ -35,7 +35,7 @@ #include "VertexLoaderManager.h" #include "VertexManagerBase.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "DLCache.h" #include "VideoConfig.h" diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp similarity index 97% rename from Source/Core/VideoCommon/Src/TextureDecoder.cpp rename to Source/Core/VideoCommon/Src/x64TextureDecoder.cpp index 30df817902..6c474920cd 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp @@ -1119,20 +1119,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128( (__m128i*)( dst+(y + iy+1) * width + x + 4 ), o4 ); } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 8) - for (int x = 0; x < width; x += 8) - for (int iy = 0; iy < 8; iy++, src += 4) - for (int ix = 0; ix < 4; ix++) - { - int val = src[ix]; - u8 i1 = Convert4To8(val >> 4); - u8 i2 = Convert4To8(val & 0xF); - memset(dst+(y + iy) * width + x + ix * 2 , i1,4); - memset(dst+(y + iy) * width + x + ix * 2 + 1 , i2,4); - } -#endif } break; case GX_TF_I8: // speed critical @@ -1248,26 +1234,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } -#if 0 - // Reference C implementation - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 8) - for (int iy = 0; iy < 4; ++iy, src += 8) - { - u32 * newdst = dst + (y + iy)*width+x; - const u8 * newsrc = src; - u8 srcval; - - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = (newsrc++)[0]; (newdst++)[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - srcval = newsrc[0]; newdst[0] = srcval | (srcval << 8) | (srcval << 16) | (srcval << 24); - } -#endif } break; case GX_TF_C8: @@ -1380,20 +1346,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128( (__m128i*)(dst + (y + iy) * width + x), r1 ); } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - { - u32 *ptr = dst + (y + iy) * width + x; - u16 *s = (u16 *)src; - ptr[0] = decodeIA8Swapped(s[0]); - ptr[1] = decodeIA8Swapped(s[1]); - ptr[2] = decodeIA8Swapped(s[2]); - ptr[3] = decodeIA8Swapped(s[3]); - } -#endif } break; case GX_TF_C14X2: @@ -1493,18 +1445,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he __m128i *ptr = (__m128i *)(dst + (y + iy) * width + x); _mm_storeu_si128(ptr, abgr888x4); } -#if 0 - // Reference C implementation. - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - { - u32 *ptr = dst + (y + iy) * width + x; - u16 *s = (u16 *)src; - for(int j = 0; j < 4; j++) - *ptr++ = decode565RGBA(Common::swap16(*s++)); - } -#endif } break; case GX_TF_RGB5A3: @@ -1718,13 +1658,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } } -#if 0 - // Reference C implementation: - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - for (int iy = 0; iy < 4; iy++, src += 8) - decodebytesRGB5A3rgba(dst+(y+iy)*width+x, (u16*)src); -#endif } break; case GX_TF_RGBA8: // speed critical @@ -1860,16 +1793,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he _mm_storeu_si128(dst128, rgba11); } } -#if 0 - // Reference C implementation. - for (int y = 0; y < height; y += 4) - for (int x = 0; x < width; x += 4) - { - for (int iy = 0; iy < 4; iy++) - decodebytesARGB8_4ToRgba(dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16); - src += 64; - } -#endif } break; case GX_TF_CMPR: // speed critical @@ -2104,22 +2027,6 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he } } } -#if 0 - for (int y = 0; y < height; y += 8) - { - for (int x = 0; x < width; x += 8) - { - decodeDXTBlockRGBA((u32*)dst + y * width + x, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + y * width + x + 4, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - decodeDXTBlockRGBA((u32*)dst + (y + 4) * width + x + 4, (DXTBlock*)src, width); - src += sizeof(DXTBlock); - } - } -#endif break; } } diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index bf9122e6b5..0c1b13f301 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -111,8 +111,8 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - false - + false + true @@ -143,7 +143,7 @@ ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) false - + true true @@ -182,7 +182,6 @@ - @@ -204,7 +203,6 @@ - @@ -216,6 +214,8 @@ + + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index e7019f17ed..6038d5e9e2 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -5,9 +5,6 @@ - - Vertex Loading - Vertex Loading @@ -92,9 +89,6 @@ Decoding - - Decoding - Base @@ -122,6 +116,12 @@ Util + + Decoding + + + Vertex Loading + diff --git a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp index bfaf21ec7e..d68228273c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp @@ -19,7 +19,7 @@ #include "D3DBase.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "MemoryUtil.h" #include "VertexShaderGen.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 29a1b6a662..01ea415263 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -51,7 +51,9 @@ void VideoBackend::UpdateFPSDisplay(const char *text) } void InitInterface() { - #if defined(USE_EGL) && USE_EGL + #ifdef ANDROID + GLInterface = new cInterfaceBase; + #elif defined(USE_EGL) && USE_EGL GLInterface = new cInterfaceEGL; #elif defined(USE_WX) && USE_WX GLInterface = new cInterfaceWX; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index ae20649433..0528bd1878 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -17,7 +17,7 @@ #include "GLUtil.h" #include "x64Emitter.h" -#include "ABI.h" +#include "x64ABI.h" #include "MemoryUtil.h" #include "VertexShaderGen.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 05f21beed1..99e01bfb3d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -204,7 +204,9 @@ void VideoBackend::Video_Prepare() GL_REPORT_ERRORD(); VertexLoaderManager::Init(); TextureConverter::Init(); +#ifndef _M_GENERIC DLCache::Init(); +#endif // Notify the core that the video backend is ready Host_Message(WM_USER_CREATE); @@ -219,7 +221,9 @@ void VideoBackend::Shutdown() s_efbAccessRequested = false; s_FifoShuttingDown = false; s_swapRequested = false; +#ifndef _M_GENERIC DLCache::Shutdown(); +#endif Fifo_Shutdown(); PostProcessing::Shutdown(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index 0091e4eaca..032ff9d74a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -125,7 +125,9 @@ void DecodeStandard(u32 bufferSize) if (Cmd == GX_NOP) return; - + // Causes a SIGBUS error on Android + // XXX: Investigate +#ifndef ANDROID // check if switching in or out of an object // only used for debuggging if (inObjectStream && (Cmd & 0x87) != lastPrimCmd) @@ -139,7 +141,7 @@ void DecodeStandard(u32 bufferSize) lastPrimCmd = Cmd & 0x87; DebugUtil::OnObjectBegin(); } - +#endif switch(Cmd) { case GX_NOP: diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp index b9afc1abb5..72b26338b5 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp @@ -115,15 +115,15 @@ void RunGpu() if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread) { // We are going to do FP math on the main thread so have to save the current state - SaveSSEState(); - LoadDefaultSSEState(); + FPURoundMode::SaveSIMDState(); + FPURoundMode::LoadDefaultSIMDState(); // run the opcode decoder do { RunBuffer(); } while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr); - LoadSSEState(); + FPURoundMode::LoadSIMDState(); } } From 08fe3c213ad71e903fed83edfada5a79c75f11f9 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 26 Feb 2013 18:28:56 -0500 Subject: [PATCH 617/627] Abort loading states from incompatible graphics backends. --- Source/Core/Core/Src/State.cpp | 2 +- Source/Core/VideoCommon/Src/MainBase.cpp | 5 +++++ Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index 0facf2f387..773d757337 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -static const u32 STATE_VERSION = 14; +static const u32 STATE_VERSION = 15; struct StateHeader { diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 726ef71b38..a881bebfb2 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -186,6 +186,11 @@ void VideoBackendHardware::InitializeShared() // Run from the CPU thread void VideoBackendHardware::DoState(PointerWrap& p) { + bool software = false; + p.Do(software); + if (p.GetMode() == PointerWrap::MODE_READ && software == true) + // change mode to abort load of incompatible save state. + p.SetMode(PointerWrap::MODE_VERIFY); VideoCommon_DoState(p); p.DoMarker("VideoCommon"); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index d78b8ba13b..6976b18690 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -41,6 +41,7 @@ #include "Core.h" #include "OpcodeDecoder.h" #include "SWVertexLoader.h" +#include "SWStatistics.h" #define VSYNC_ENABLED 0 @@ -97,6 +98,11 @@ bool VideoSoftware::Initialize(void *&window_handle) void VideoSoftware::DoState(PointerWrap& p) { + bool software = true; + p.Do(software); + if (p.GetMode() == PointerWrap::MODE_READ && software == false) + // change mode to abort load of incompatible save state. + p.SetMode(PointerWrap::MODE_VERIFY); // TODO: incomplete SWCommandProcessor::DoState(p); SWPixelEngine::DoState(p); @@ -105,6 +111,7 @@ void VideoSoftware::DoState(PointerWrap& p) Clipper::DoState(p); p.Do(swxfregs); p.Do(bpmem); + p.Do(swstats); // CP Memory p.DoArray(arraybases, 16); From 46f5c19c6d2fbd3318e9a6de3c3c2e313c669cf0 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 26 Feb 2013 18:43:37 -0500 Subject: [PATCH 618/627] Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right? --- Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp | 5 ++--- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp index 4401916e1f..8e3f0c2925 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp @@ -55,9 +55,8 @@ void DoState(PointerWrap &p) p.Do(lastPrimCmd); p.Do(streamSize); p.Do(streamAddress); - // not sure how to save this... It seems to be the only thing left that is really important. - // uncommenting this will prevent all error messages, and any crashes/hangs on load, but then obviously it'll segfault once you restart dolphin. - //p.Do(currentFunction); + if (p.GetMode() == PointerWrap::MODE_READ) + ResetDecoding(); } void DecodePrimitiveStream(u32 iBufferSize) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 6976b18690..0e2d6afa72 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -103,7 +103,8 @@ void VideoSoftware::DoState(PointerWrap& p) if (p.GetMode() == PointerWrap::MODE_READ && software == false) // change mode to abort load of incompatible save state. p.SetMode(PointerWrap::MODE_VERIFY); - // TODO: incomplete + + // TODO: incomplete? SWCommandProcessor::DoState(p); SWPixelEngine::DoState(p); EfbInterface::DoState(p); From f1c990069c8d0e54f7aa079e6e2c7b785a0d56db Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 26 Feb 2013 20:47:48 -0500 Subject: [PATCH 619/627] Yell at the user if they change window size while dumping frames, and some other avi dumping stuff. --- Source/Core/VideoCommon/Src/AVIDump.cpp | 18 ++++- Source/Core/VideoCommon/Src/AVIDump.h | 6 +- Source/Core/VideoCommon/Src/RenderBase.cpp | 5 +- Source/Core/VideoCommon/Src/RenderBase.h | 2 +- .../Plugins/Plugin_VideoDX11/Src/Render.cpp | 25 ++++--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 29 ++++---- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 66 ++++++++----------- 7 files changed, 73 insertions(+), 78 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index c172903b5d..8514e8bd03 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -157,9 +157,21 @@ void AVIDump::Stop() NOTICE_LOG(VIDEO, "Stop"); } -void AVIDump::AddFrame(char *data) +void AVIDump::AddFrame(const u8* data, int w, int h) { - AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, (LPVOID) data, m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer); + static bool bShownError = false; + if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !bShownError) + { + PanicAlert("You have resized the window while dumping frames.\n" + "Nothing sane can be done to handle this.\n" + "Your video will likely be broken."); + bShownError=true; + + m_bitmap.biWidth = w; + m_bitmap.biHeight = h; + } + + AVIStreamWrite(m_streamCompressed, ++m_frameCount, 1, const_cast(data), m_bitmap.biSizeImage, AVIIF_KEYFRAME, NULL, &m_byteBuffer); m_totalBytes += m_byteBuffer; // Close the recording if the file is more than 2gb // VfW can't properly save files over 2gb in size, but can keep writing to them up to 4gb. @@ -298,7 +310,7 @@ bool AVIDump::CreateFile() return true; } -void AVIDump::AddFrame(uint8_t *data, int width, int height) +void AVIDump::AddFrame(const u8* data, int width, int height) { avpicture_fill((AVPicture *)s_BGRFrame, data, PIX_FMT_BGR24, width, height); diff --git a/Source/Core/VideoCommon/Src/AVIDump.h b/Source/Core/VideoCommon/Src/AVIDump.h index e74df05db4..08ab6be254 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.h +++ b/Source/Core/VideoCommon/Src/AVIDump.h @@ -24,6 +24,8 @@ #include #endif +#include "CommonTypes.h" + class AVIDump { private: @@ -36,11 +38,11 @@ class AVIDump public: #ifdef _WIN32 static bool Start(HWND hWnd, int w, int h); - static void AddFrame(char *data); #else static bool Start(int w, int h); - static void AddFrame(uint8_t *data, int width, int height); #endif + static void AddFrame(const u8* data, int width, int height); + static void Stop(); }; diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 8e1d012fa2..90a09aec43 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -83,7 +83,9 @@ unsigned int Renderer::efb_scale_denominatorY = 1; unsigned int Renderer::ssaa_multiplier = 1; -Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) +Renderer::Renderer() + : frame_data() + , bLastFrameDumped(false) { UpdateActiveConfig(); TextureCache::OnConfigChanged(g_ActiveConfig); @@ -110,7 +112,6 @@ Renderer::~Renderer() if (pFrameDump.IsOpen()) pFrameDump.Close(); #endif - delete[] frame_data; } void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma) diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 5376577cbd..8b5505e082 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -147,7 +147,7 @@ protected: #else File::IOFile pFrameDump; #endif - char* frame_data; + std::vector frame_data; bool bLastFrameDumped; // The framebuffer size diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index a6cb52c40f..44f4f1b15b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -761,11 +761,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle return SUCCEEDED(hr); } -void formatBufferDump(const char *in, char *out, int w, int h, int p) +void formatBufferDump(const u8* in, u8* out, int w, int h, int p) { for (int y = 0; y < h; ++y) { - const u8 *line = (u8*)(in + (h - y - 1) * p); + auto line = (in + (h - y - 1) * p); for (int x = 0; x < w; ++x) { out[0] = line[2]; @@ -782,8 +782,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -794,8 +794,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -934,16 +934,15 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3D11_MAPPED_SUBRESOURCE map; D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map); - if (!frame_data || w != s_recordWidth || h != s_recordHeight) + if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight) { - delete[] frame_data; - frame_data = new char[3 * s_recordWidth * s_recordHeight]; + frame_data.resize(3 * s_recordWidth * s_recordHeight); w = s_recordWidth; h = s_recordHeight; } - char* source_ptr = (char*)map.pData + GetTargetRectangle().left*4 + GetTargetRectangle().top*map.RowPitch; - formatBufferDump(source_ptr, frame_data, s_recordWidth, s_recordHeight, map.RowPitch); - AVIDump::AddFrame(frame_data); + auto source_ptr = (const u8*)map.pData + GetTargetRectangle().left*4 + GetTargetRectangle().top*map.RowPitch; + formatBufferDump(source_ptr, &frame_data[0], s_recordWidth, s_recordHeight, map.RowPitch); + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); D3D::context->Unmap(s_screenshot_texture, 0); } bLastFrameDumped = true; @@ -952,7 +951,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - SAFE_DELETE_ARRAY(frame_data); + std::vector().swap(frame_data); w = h = 0; AVIDump::Stop(); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 0657309801..151d80b16f 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -216,11 +216,11 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc) } -void formatBufferDump(const char *in, char *out, int w, int h, int p) +void formatBufferDump(const u8* in, u8* out, int w, int h, int p) { for (int y = 0; y < h; y++) { - const char *line = in + (h - y - 1) * p; + auto line = in + (h - y - 1) * p; for (int x = 0; x < w; x++) { memcpy(out, line, 3); @@ -725,8 +725,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -737,8 +737,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) { - if (g_ActiveConfig.bDumpFrames && frame_data) - AVIDump::AddFrame(frame_data); + if (g_ActiveConfig.bDumpFrames && !frame_data.empty()) + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); Core::Callback_VideoCopiedToXFB(false); return; @@ -935,15 +935,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons D3DLOCKED_RECT rect; if (SUCCEEDED(ScreenShootMEMSurface->LockRect(&rect, GetTargetRectangle().AsRECT(), D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY))) { - if (!frame_data || w != s_recordWidth || h != s_recordHeight) + if (frame_data.empty() || w != s_recordWidth || h != s_recordHeight) { - delete[] frame_data; - frame_data = new char[3 * s_recordWidth * s_recordHeight]; + frame_data.resize(3 * s_recordWidth * s_recordHeight); w = s_recordWidth; h = s_recordHeight; } - formatBufferDump((const char*)rect.pBits, frame_data, s_recordWidth, s_recordHeight, rect.Pitch); - AVIDump::AddFrame(frame_data); + formatBufferDump((const u8*)rect.pBits, &frame_data[0], s_recordWidth, s_recordHeight, rect.Pitch); + AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight); ScreenShootMEMSurface->UnlockRect(); } } @@ -953,12 +952,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - if (frame_data) - { - delete[] frame_data; - frame_data = 0; - w = h = 0; - } + std::vector().swap(frame_data); + w = h = 0; AVIDump::Stop(); bAVIDumping = false; OSD::AddMessage("Stop dumping frames to AVI", 2000); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 3ff8b834ce..3cb4426513 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -956,20 +956,23 @@ void Renderer::SetBlendMode(bool forceUpdate) s_blendMode = newval; } +void DumpFrame(const std::vector& data, int w, int h) +{ +#if defined(HAVE_LIBAV) || defined(_WIN32) + if (g_ActiveConfig.bDumpFrames && !data.empty()) + { + AVIDump::AddFrame(&data[0], w, h); + } +#endif +} + // This function has the final picture. We adjust the aspect ratio here. void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma) { static int w = 0, h = 0; if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight) { - if (g_ActiveConfig.bDumpFrames && frame_data) - { -#ifdef _WIN32 - AVIDump::AddFrame(frame_data); -#elif defined HAVE_LIBAV - AVIDump::AddFrame((u8*)frame_data, w, h); -#endif - } + DumpFrame(frame_data, w, h); Core::Callback_VideoCopiedToXFB(false); return; } @@ -979,14 +982,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if (g_ActiveConfig.VirtualXFBEnabled() && (!xfbSourceList || xfbCount == 0)) { - if (g_ActiveConfig.bDumpFrames && frame_data) - { -#ifdef _WIN32 - AVIDump::AddFrame(frame_data); -#elif defined HAVE_LIBAV - AVIDump::AddFrame((u8*)frame_data, w, h); -#endif - } + DumpFrame(frame_data, w, h); Core::Callback_VideoCopiedToXFB(false); return; } @@ -1149,16 +1145,15 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons if (g_ActiveConfig.bDumpFrames) { std::lock_guard lk(s_criticalScreenshot); - if (!frame_data || w != flipped_trc.GetWidth() || + if (frame_data.empty() || w != flipped_trc.GetWidth() || h != flipped_trc.GetHeight()) { - if (frame_data) delete[] frame_data; w = flipped_trc.GetWidth(); h = flipped_trc.GetHeight(); - frame_data = new char[3 * w * h]; + frame_data.resize(3 * w * h); } glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(flipped_trc.left, flipped_trc.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0) { if (!bLastFrameDumped) @@ -1179,12 +1174,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } if (bAVIDumping) { - #ifdef _WIN32 - AVIDump::AddFrame(frame_data); - #else - FlipImageData((u8*)frame_data, w, h); - AVIDump::AddFrame((u8*)frame_data, w, h); + #ifndef _WIN32 + FlipImageData(&frame_data[0], w, h); #endif + + AVIDump::AddFrame(&frame_data[0], w, h); } bLastFrameDumped = true; @@ -1196,12 +1190,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { if (bLastFrameDumped && bAVIDumping) { - if (frame_data) - { - delete[] frame_data; - frame_data = NULL; - w = h = 0; - } + std::vector().swap(frame_data); + w = h = 0; AVIDump::Stop(); bAVIDumping = false; OSD::AddMessage("Stop dumping frames", 2000); @@ -1215,9 +1205,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons std::string movie_file_name; w = GetTargetRectangle().GetWidth(); h = GetTargetRectangle().GetHeight(); - frame_data = new char[3 * w * h]; + frame_data.resize(3 * w * h); glPixelStorei(GL_PACK_ALIGNMENT, 1); - glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, frame_data); + glReadPixels(GetTargetRectangle().left, GetTargetRectangle().bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, &frame_data[0]); if (GL_REPORT_ERROR() == GL_NO_ERROR) { if (!bLastFrameDumped) @@ -1228,21 +1218,17 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { - char msg [255]; - sprintf(msg, "Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h); - OSD::AddMessage(msg, 2000); + OSD::AddMessage(StromFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h), 2000); } } if (pFrameDump) { - FlipImageData((u8*)frame_data, w, h); - pFrameDump.WriteBytes(frame_data, w * 3 * h); + FlipImageData(&frame_data[0], w, h); + pFrameDump.WriteBytes(&frame_data[0], w * 3 * h); pFrameDump.Flush(); } bLastFrameDumped = true; } - - delete[] frame_data; } else { From a680d17eef88646b8cd6018c1c5e8f0e39d056ee Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 26 Feb 2013 19:59:33 -0600 Subject: [PATCH 620/627] Buildfix. --- Source/Core/VideoCommon/Src/AVIDump.cpp | 8 ++++---- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 8514e8bd03..fefb09fecb 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -159,13 +159,13 @@ void AVIDump::Stop() void AVIDump::AddFrame(const u8* data, int w, int h) { - static bool bShownError = false; - if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !bShownError) + static bool shown_error = false; + if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !shown_error) { PanicAlert("You have resized the window while dumping frames.\n" "Nothing sane can be done to handle this.\n" "Your video will likely be broken."); - bShownError=true; + shown_error = true; m_bitmap.biWidth = w; m_bitmap.biHeight = h; @@ -312,7 +312,7 @@ bool AVIDump::CreateFile() void AVIDump::AddFrame(const u8* data, int width, int height) { - avpicture_fill((AVPicture *)s_BGRFrame, data, PIX_FMT_BGR24, width, height); + avpicture_fill((AVPicture *)s_BGRFrame, const_cast(data), PIX_FMT_BGR24, width, height); // Convert image from BGR24 to desired pixel format, and scale to initial // width and height diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 3cb4426513..b5393cdbde 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1218,7 +1218,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons OSD::AddMessage("Error opening framedump.raw for writing.", 2000); else { - OSD::AddMessage(StromFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h), 2000); + OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h).c_str(), 2000); } } if (pFrameDump) From be7643cd2d1a27324070550ad82eca2c3bd59f19 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 27 Feb 2013 02:15:32 +0000 Subject: [PATCH 621/627] Add the missing FPR cache --- .../Core/Src/PowerPC/JitArm32/JitFPRCache.cpp | 168 ++++++++++++++++++ .../Core/Src/PowerPC/JitArm32/JitFPRCache.h | 62 +++++++ 2 files changed, 230 insertions(+) create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp create mode 100644 Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp new file mode 100644 index 0000000000..08f10df826 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp @@ -0,0 +1,168 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "JitFPRCache.h" + +ArmFPRCache::ArmFPRCache() +{ + emit = 0; +} + +void ArmFPRCache::Init(ARMXEmitter *emitter) +{ + emit = emitter; + ARMReg *PPCRegs = GetPPCAllocationOrder(NUMPPCREG); + ARMReg *Regs = GetAllocationOrder(NUMARMREG); + + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].Reg = PPCRegs[a]; + ArmCRegs[a].LastLoad = 0; + ArmCRegs[a].PS1 = false; + } + for(u8 a = 0; a < NUMARMREG; ++a) + { + ArmRegs[a].Reg = Regs[a]; + ArmRegs[a].free = true; + } +} +void ArmFPRCache::Start(PPCAnalyst::BlockRegStats &stats) +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + { + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} +ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the ppc side. + static ARMReg allocationOrder[] = + { + D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, + D11, D12, D13, D14, D15, D16, D17, D18, D19, + D20, D21, D22, D23, D24, D25, D26, D27 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} +ARMReg *ArmFPRCache::GetAllocationOrder(int &count) +{ + // This will return us the allocation order of the registers we can use on + // the host side. + static ARMReg allocationOrder[] = + { + D31, D30, D29, D28 + }; + count = sizeof(allocationOrder) / sizeof(const int); + return allocationOrder; +} + +ARMReg ArmFPRCache::GetReg(bool AutoLock) +{ + for(u8 a = 0; a < NUMARMREG; ++a) + if(ArmRegs[a].free) + { + // Alright, this one is free + if (AutoLock) + ArmRegs[a].free = false; + return ArmRegs[a].Reg; + } + // Uh Oh, we have all them locked.... + _assert_msg_(_DYNA_REC_, false, "All available registers are locked dumb dumb"); + return D31; +} +void ArmFPRCache::Unlock(ARMReg V0) +{ + for(u8 RegNum = 0; RegNum < NUMARMREG; ++RegNum) + { + if(ArmRegs[RegNum].Reg == V0) + { + _assert_msg_(_DYNA_REC, !ArmRegs[RegNum].free, "This register is already unlocked"); + ArmRegs[RegNum].free = true; + } + } +} +ARMReg ArmFPRCache::GetPPCReg(u32 preg, bool PS1, bool preLoad) +{ + u32 HighestUsed = 0; + u8 Num = 0; + for(u8 a = 0; a < NUMPPCREG; ++a){ + ++ArmCRegs[a].LastLoad; + if (ArmCRegs[a].LastLoad > HighestUsed) + { + HighestUsed = ArmCRegs[a].LastLoad; + Num = a; + } + } + // Check if already Loaded + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == preg && ArmCRegs[a].PS1 == PS1) + { + ArmCRegs[a].LastLoad = 0; + return ArmCRegs[a].Reg; + } + // Check if we have a free register + for (u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg == 33) + { + u16 offset = STRUCT_OFF(PowerPC::ppcState, ps) + (preg * 16) + (PS1 ? 8 : 0); + if (preLoad) + emit->VLDR(ArmCRegs[a].Reg, R9, offset); + ArmCRegs[a].PPCReg = preg; + ArmCRegs[a].LastLoad = 0; + ArmCRegs[a].PS1 = PS1; + return ArmCRegs[a].Reg; + } + // Alright, we couldn't get a free space, dump that least used register + u16 offsetOld = STRUCT_OFF(PowerPC::ppcState, ps) + (ArmCRegs[Num].PPCReg * 16) + (ArmCRegs[Num].PS1 ? 8 : 0); + emit->VSTR(ArmCRegs[Num].Reg, R9, offsetOld); + + u16 offsetNew = STRUCT_OFF(PowerPC::ppcState, ps) + (preg * 16) + (PS1 ? 8 : 0); + if (preLoad) + emit->VLDR(ArmCRegs[Num].Reg, R9, offsetNew); + ArmCRegs[Num].PPCReg = preg; + ArmCRegs[Num].LastLoad = 0; + ArmCRegs[Num].PS1 = PS1; + return ArmCRegs[Num].Reg; + +} + +ARMReg ArmFPRCache::R0(u32 preg, bool preLoad) +{ + return GetPPCReg(preg, false, preLoad); +} + +ARMReg ArmFPRCache::R1(u32 preg, bool preLoad) +{ + return GetPPCReg(preg, true, preLoad); +} + +void ArmFPRCache::Flush() +{ + for(u8 a = 0; a < NUMPPCREG; ++a) + if (ArmCRegs[a].PPCReg != 33) + { + u16 offset = STRUCT_OFF(PowerPC::ppcState, ps) + (ArmCRegs[a].PPCReg * 16) + (ArmCRegs[a].PS1 ? 8 : 0); + emit->VSTR(ArmCRegs[a].Reg, R9, offset); + ArmCRegs[a].PPCReg = 33; + ArmCRegs[a].LastLoad = 0; + } +} + diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h new file mode 100644 index 0000000000..6b4f056409 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h @@ -0,0 +1,62 @@ +// Copyright (C) 2003 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#ifndef _JITARMFPRCACHE_H +#define _JITARMFPRCACHE_H + +#include "ArmEmitter.h" +#include "../Gekko.h" +#include "../PPCAnalyst.h" +#include "JitRegCache.h" + +#define ARMFPUREGS 32 +using namespace ArmGen; + +class ArmFPRCache +{ +private: + PPCCachedReg regs[32]; + JRCPPC ArmCRegs[ARMFPUREGS]; + JRCReg ArmRegs[ARMFPUREGS]; + + int NUMPPCREG; + int NUMARMREG; + + ARMReg *GetAllocationOrder(int &count); + ARMReg *GetPPCAllocationOrder(int &count); + + ARMReg GetPPCReg(u32 preg, bool PS1, bool preLoad); + +protected: + ARMXEmitter *emit; + +public: + ArmFPRCache(); + ~ArmFPRCache() {} + + void Init(ARMXEmitter *emitter); + void Start(PPCAnalyst::BlockRegStats &stats); + + void SetEmitter(ARMXEmitter *emitter) {emit = emitter;} + + ARMReg GetReg(bool AutoLock = true); // Return a ARM register we can use. + void Unlock(ARMReg V0); + void Flush(); + ARMReg R0(u32 preg, bool preLoad = true); // Returns a cached register + ARMReg R1(u32 preg, bool preLoad = true); +}; +#endif From e435851e7a8dd56c94bb9bdc30f4c60c5b561163 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 25 Feb 2013 00:28:25 -0600 Subject: [PATCH 622/627] Add disabled code for authenticating wiimotes on Windows. --- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 93 ++++++++++++------- 1 file changed, 57 insertions(+), 36 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 61abeffa2d..2ae34a7ca5 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -35,6 +35,8 @@ #include #include +//#define AUTHENTICATE_WIIMOTES + typedef struct _HIDD_ATTRIBUTES { ULONG Size; @@ -56,6 +58,7 @@ typedef BOOL (__stdcall *PBth_BluetoothFindRadioClose)(HBLUETOOTH_RADIO_FIND); typedef DWORD (__stdcall *PBth_BluetoothGetRadioInfo)(HANDLE, PBLUETOOTH_RADIO_INFO); typedef DWORD (__stdcall *PBth_BluetoothRemoveDevice)(const BLUETOOTH_ADDRESS*); typedef DWORD (__stdcall *PBth_BluetoothSetServiceState)(HANDLE, const BLUETOOTH_DEVICE_INFO*, const GUID*, DWORD); +typedef DWORD (__stdcall *PBth_BluetoothAuthenticateDevice)(HWND, HANDLE, BLUETOOTH_DEVICE_INFO*, PWCHAR, ULONG); PHidD_GetHidGuid HidD_GetHidGuid = NULL; PHidD_GetAttributes HidD_GetAttributes = NULL; @@ -70,6 +73,7 @@ PBth_BluetoothFindRadioClose Bth_BluetoothFindRadioClose = NULL; PBth_BluetoothGetRadioInfo Bth_BluetoothGetRadioInfo = NULL; PBth_BluetoothRemoveDevice Bth_BluetoothRemoveDevice = NULL; PBth_BluetoothSetServiceState Bth_BluetoothSetServiceState = NULL; +PBth_BluetoothAuthenticateDevice Bth_BluetoothAuthenticateDevice = NULL; HINSTANCE hid_lib = NULL; HINSTANCE bthprops_lib = NULL; @@ -114,12 +118,13 @@ inline void init_lib() Bth_BluetoothGetRadioInfo = (PBth_BluetoothGetRadioInfo)GetProcAddress(bthprops_lib, "BluetoothGetRadioInfo"); Bth_BluetoothRemoveDevice = (PBth_BluetoothRemoveDevice)GetProcAddress(bthprops_lib, "BluetoothRemoveDevice"); Bth_BluetoothSetServiceState = (PBth_BluetoothSetServiceState)GetProcAddress(bthprops_lib, "BluetoothSetServiceState"); + Bth_BluetoothAuthenticateDevice = (PBth_BluetoothAuthenticateDevice)GetProcAddress(bthprops_lib, "BluetoothAuthenticateDevice"); if (!Bth_BluetoothFindDeviceClose || !Bth_BluetoothFindFirstDevice || !Bth_BluetoothFindFirstRadio || !Bth_BluetoothFindNextDevice || !Bth_BluetoothFindNextRadio || !Bth_BluetoothFindRadioClose || !Bth_BluetoothGetRadioInfo || !Bth_BluetoothRemoveDevice || - !Bth_BluetoothSetServiceState) + !Bth_BluetoothSetServiceState || !Bth_BluetoothAuthenticateDevice) { PanicAlertT("Failed to load bthprops.cpl"); exit(EXIT_FAILURE); @@ -135,9 +140,9 @@ namespace WiimoteReal template void ProcessWiimotes(bool new_scan, T& callback); -bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); -void RemoveWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); -bool ForgetWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi); +bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT&); +void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&); +bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&); WiimoteScanner::WiimoteScanner() : m_run_thread() @@ -149,16 +154,19 @@ WiimoteScanner::WiimoteScanner() WiimoteScanner::~WiimoteScanner() { // TODO: what do we want here? - ProcessWiimotes(false, RemoveWiimote); + ProcessWiimotes(false, [](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + { + RemoveWiimote(btdi); + }); } void WiimoteScanner::Update() { bool forgot_some = false; - ProcessWiimotes(false, [&](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + ProcessWiimotes(false, [&](HANDLE, BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { - forgot_some |= ForgetWiimote(hRadio, btdi); + forgot_some |= ForgetWiimote(btdi); }); // Some hacks that allows disconnects to be detected before connections are handled @@ -173,10 +181,10 @@ void WiimoteScanner::Update() // Returns the total number of found and connected wiimotes. std::vector WiimoteScanner::FindWiimotes() { - ProcessWiimotes(true, [](HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) + ProcessWiimotes(true, [](HANDLE hRadio, const BLUETOOTH_RADIO_INFO& rinfo, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { - ForgetWiimote(hRadio, btdi); - AttachWiimote(hRadio, btdi); + ForgetWiimote(btdi); + AttachWiimote(hRadio, rinfo, btdi); }); // Get the device id @@ -485,31 +493,32 @@ void ProcessWiimotes(bool new_scan, T& callback) BLUETOOTH_RADIO_INFO radioInfo; radioInfo.dwSize = sizeof(radioInfo); - // TODO: check for SUCCEEDED() - Bth_BluetoothGetRadioInfo(hRadio, &radioInfo); - - srch.hRadio = hRadio; - - BLUETOOTH_DEVICE_INFO btdi; - btdi.dwSize = sizeof(btdi); - - // Enumerate BT devices - HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi); - while (hFindDevice) + auto const rinfo_result = Bth_BluetoothGetRadioInfo(hRadio, &radioInfo); + if (ERROR_SUCCESS == rinfo_result) { - // btdi.szName is sometimes missings it's content - it's a bt feature.. - DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ", - btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered); + srch.hRadio = hRadio; - if (std::regex_match(btdi.szName, wiimote_device_name)) - { - callback(hRadio, btdi); - } + BLUETOOTH_DEVICE_INFO btdi; + btdi.dwSize = sizeof(btdi); - if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi)) + // Enumerate BT devices + HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi); + while (hFindDevice) { - Bth_BluetoothFindDeviceClose(hFindDevice); - hFindDevice = NULL; + // btdi.szName is sometimes missings it's content - it's a bt feature.. + DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ", + btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered); + + if (std::regex_match(btdi.szName, wiimote_device_name)) + { + callback(hRadio, radioInfo, btdi); + } + + if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi)) + { + Bth_BluetoothFindDeviceClose(hFindDevice); + hFindDevice = NULL; + } } } @@ -521,7 +530,7 @@ void ProcessWiimotes(bool new_scan, T& callback) } } -void RemoveWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { //if (btdi.fConnected) { @@ -532,14 +541,26 @@ void RemoveWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) } } -bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { // We don't want "remembered" devices. // SetServiceState will just fail with them.. if (!btdi.fConnected && !btdi.fRemembered) { - NOTICE_LOG(WIIMOTE, "Found wiimote. Enabling HID service."); + auto const& wm_addr = btdi.Address.rgBytes; + NOTICE_LOG(WIIMOTE, "Found wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.", + wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]); + +#if defined(AUTHENTICATE_WIIMOTES) + // Authenticate + auto const& radio_addr = radio_info.address.rgBytes; + const DWORD auth_result = Bth_BluetoothAuthenticateDevice(NULL, hRadio, &btdi, + std::vector(radio_addr, radio_addr + 6).data(), 6); + + if (ERROR_SUCCESS != auth_result) + ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothAuthenticateDevice returned %08x", auth_result); +#endif // Activate service const DWORD hr = Bth_BluetoothSetServiceState(hRadio, &btdi, &HumanInterfaceDeviceServiceClass_UUID, BLUETOOTH_SERVICE_ENABLE); @@ -547,7 +568,7 @@ bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) g_connect_times[btdi.Address.ullLong] = std::time(nullptr); if (FAILED(hr)) - ERROR_LOG(WIIMOTE, "Pair-Up: BluetoothSetServiceState() returned %08x", hr); + ERROR_LOG(WIIMOTE, "AttachWiimote: BluetoothSetServiceState returned %08x", hr); else return true; } @@ -556,7 +577,7 @@ bool AttachWiimote(HANDLE hRadio, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) } // Removes remembered non-connected devices -bool ForgetWiimote(HANDLE, BLUETOOTH_DEVICE_INFO_STRUCT& btdi) +bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi) { if (!btdi.fConnected && btdi.fRemembered) { From 8c779bb2426a5eae7fbf0e5048ae18bdf3d34a3c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 27 Feb 2013 10:26:32 -0600 Subject: [PATCH 623/627] Ah. I blame vim on this typo entirely. --- Source/Core/Common/Src/ArmEmitter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index 6463dbe2ef..f24ffbb07f 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -791,7 +791,7 @@ void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm) if (single_reg) { - Write32(NO_COND | (0xEB << 20) | ((Vd & 0x1) << 6) | ((Vd & 0x1E) << 11) \ + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x1) << 22) | ((Vd & 0x1E) << 11) \ | (0xAC << 4) | ((Vm & 0x1) << 5) | (Vm >> 1)); } else From f1d727cf1376efebf434abcaa31c63abd2894dad Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 27 Feb 2013 11:53:24 -0600 Subject: [PATCH 624/627] Merge latest ArmEmitter changes from ppsspp while we're at it. --- Source/Core/Common/Src/ArmEmitter.cpp | 137 +++++++++++++++++++++----- Source/Core/Common/Src/ArmEmitter.h | 16 +-- 2 files changed, 123 insertions(+), 30 deletions(-) diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp index f24ffbb07f..3b3bf7c550 100644 --- a/Source/Core/Common/Src/ArmEmitter.cpp +++ b/Source/Core/Common/Src/ArmEmitter.cpp @@ -22,11 +22,16 @@ #include #include -// For cache flushing on Symbian/Blackberry +// For cache flushing on Symbian/iOS/Blackberry #ifdef __SYMBIAN32__ #include #endif +#ifdef IOS +#include +#include +#endif + #ifdef BLACKBERRY #include #endif @@ -185,18 +190,16 @@ void ARMXEmitter::FlushIcache() void ARMXEmitter::FlushIcacheSection(u8 *start, u8 *end) { #ifdef __SYMBIAN32__ - User::IMB_Range( start, end); + User::IMB_Range(start, end); #elif defined(BLACKBERRY) msync(start, end - start, MS_SYNC | MS_INVALIDATE_ICACHE); -#else -#ifndef _WIN32 -#ifdef ANDROID - __builtin___clear_cache (start, end); -#else - // If on Linux, we HAVE to clear from start addr or else everything gets /really/ unstable - __builtin___clear_cache (startcode, end); -#endif +#elif defined(IOS) + sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start); +#elif !defined(_WIN32) +#ifndef ANDROID + start = startcode; #endif + __builtin___clear_cache(start, end); #endif } @@ -493,6 +496,7 @@ void ARMXEmitter::SMULL(ARMReg destLo, ARMReg destHi, ARMReg rm, ARMReg rn) { Write4OpMultiply(0xC, destLo, destHi, rn, rm); } + void ARMXEmitter::SXTB (ARMReg dest, ARMReg op2) { Write32(condition | (0x6AF << 16) | (dest << 12) | (7 << 4) | op2); @@ -528,9 +532,10 @@ void ARMXEmitter::MRS (ARMReg dest) { Write32(condition | (16 << 20) | (15 << 16) | (dest << 12)); } + void ARMXEmitter::WriteStoreOp(u32 op, ARMReg dest, ARMReg src, Operand2 op2) { - if (op2.GetData() == 0) // Don't index + if (op2.GetData() == 0) // set the preindex bit, but not the W bit! Write32(condition | 0x01800000 | (op << 20) | (dest << 16) | (src << 12) | op2.Imm12()); else Write32(condition | (op << 20) | (3 << 23) | (dest << 16) | (src << 12) | op2.Imm12()); @@ -620,6 +625,7 @@ ARMReg ARMXEmitter::SubBase(ARMReg Reg) } return Reg; } + // NEON Specific void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) { @@ -627,7 +633,7 @@ void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) _assert_msg_(DYNA_REC, cpu_info.bNEON, "Can't use VADD(integer) when CPU doesn't support it"); bool register_quad = Vd >= Q0; - + // Gets encoded as a double register Vd = SubBase(Vd); Vn = SubBase(Vn); @@ -651,16 +657,20 @@ void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm) Write32((0xF3 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \ | ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (1 << 6) \ | ((Vm & 0x10) << 2) | (Vm & 0xF)); - } // VFP Specific -void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, u16 op) +void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, u16 offset) { _assert_msg_(DYNA_REC, Dest >= S0 && Dest <= D31, "Passed Invalid dest register to VLDR"); _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid Base register to VLDR"); - _assert_msg_(DYNA_REC, !(op & 3), "Offset needs to be word aligned"); + _assert_msg_(DYNA_REC, (offset & 0xC03) == 0, "VLDR: Offset needs to be word aligned and small enough"); + + if (offset & 0xC03) { + ERROR_LOG(DYNA_REC, "VLDR: Bad offset %08x", offset); + } + bool single_reg = Dest < D0; Dest = SubBase(Dest); @@ -668,20 +678,25 @@ void ARMXEmitter::VLDR(ARMReg Dest, ARMReg Base, u16 op) if (single_reg) { Write32(NO_COND | (0x1B << 23) | ((Dest & 0x1) << 22) | (1 << 20) | (Base << 16) \ - | ((Dest & 0x1E) << 11) | (10 << 8) | (op >> 2)); + | ((Dest & 0x1E) << 11) | (10 << 8) | (offset >> 2)); } else { Write32(NO_COND | (0x1B << 23) | ((Dest & 0x10) << 18) | (1 << 20) | (Base << 16) \ - | ((Dest & 0xF) << 12) | (11 << 8) | (op >> 2)); + | ((Dest & 0xF) << 12) | (11 << 8) | (offset >> 2)); } } -void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, u16 op) +void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, u16 offset) { _assert_msg_(DYNA_REC, Src >= S0 && Src <= D31, "Passed invalid src register to VSTR"); _assert_msg_(DYNA_REC, Base <= R15, "Passed invalid base register to VSTR"); - _assert_msg_(DYNA_REC, !(op & 3), "Offset needs to be word aligned"); + _assert_msg_(DYNA_REC, (offset & 0xC03) == 0, "VSTR: Offset needs to be word aligned"); + + if (offset & 0xC03) { + ERROR_LOG(DYNA_REC, "VSTR: Bad offset %08x", offset); + } + bool single_reg = Src < D0; Src = SubBase(Src); @@ -689,13 +704,13 @@ void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, u16 op) if (single_reg) { Write32(NO_COND | (0x1B << 23) | ((Src & 0x1) << 22) | (Base << 16) \ - | ((Src & 0x1E) << 11) | (10 << 8) | (op >> 2)); + | ((Src & 0x1E) << 11) | (10 << 8) | (offset >> 2)); } else { Write32(NO_COND | (0x1B << 23) | ((Src & 0x10) << 18) | (Base << 16) \ - | ((Src & 0xF) << 12) | (11 << 8) | (op >> 2)); + | ((Src & 0xF) << 12) | (11 << 8) | (offset >> 2)); } } void ARMXEmitter::VCMP(ARMReg Vd, ARMReg Vm) @@ -779,12 +794,14 @@ void ARMXEmitter::VSQRT(ARMReg Vd, ARMReg Vm) | ((Vd & 0xF) << 12) | (0x2F << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); } } + // VFP and ASIMD void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm) { _assert_msg_(DYNA_REC, Vd < Q0, "VABS doesn't currently support Quad reg"); _assert_msg_(DYNA_REC, Vd >= S0, "VABS doesn't support ARM Regs"); bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; Vd = SubBase(Vd); Vm = SubBase(Vm); @@ -796,10 +813,19 @@ void ARMXEmitter::VABS(ARMReg Vd, ARMReg Vm) } else { - Write32(NO_COND | (0xEB << 20) | ((Vd & 0x10) << 18) | ((Vd & 0xF) << 12) \ - | (0xBC << 4) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + if (double_reg) + { + Write32(NO_COND | (0xEB << 20) | ((Vd & 0x10) << 18) | ((Vd & 0xF) << 12) \ + | (0xBC << 4) | ((Vm & 0x10) << 1) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VADD with Quad Reg without support!"); + // XXX: TODO + } } } + void ARMXEmitter::VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm) { _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VADD"); @@ -870,6 +896,70 @@ void ARMXEmitter::VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm) } } } +void ARMXEmitter::VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd >= S0, "Passed invalid dest register to VADD"); + _assert_msg_(DYNA_REC, Vn >= S0, "Passed invalid Vn to VADD"); + _assert_msg_(DYNA_REC, Vm >= S0, "Passed invalid Vm to VADD"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vn = SubBase(Vn); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x1) << 22) | (0x2 << 20) \ + | ((Vn & 0x1E) << 15) | ((Vd & 0x1E) << 11) | (0x5 << 9) \ + | ((Vn & 0x1) << 7) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1C << 23) | ((Vd & 0x10) << 18) | (0x2 << 20) \ + | ((Vn & 0xF) << 16) | ((Vd & 0xF) << 12) | (0xB << 8) \ + | ((Vn & 0x10) << 3) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VMUL with Quad Reg without support!"); + // XXX: TODO + } + } +} + +void ARMXEmitter::VNEG(ARMReg Vd, ARMReg Vm) +{ + _assert_msg_(DYNA_REC, Vd < Q0, "VNEG doesn't currently support Quad reg"); + _assert_msg_(DYNA_REC, Vd >= S0, "VNEG doesn't support ARM Regs"); + bool single_reg = Vd < D0; + bool double_reg = Vd < Q0; + + Vd = SubBase(Vd); + Vm = SubBase(Vm); + + if (single_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x1) << 22) | (0x31 << 16) \ + | ((Vd & 0x1E) << 11) | (0x29 << 6) | ((Vm & 0x1) << 5) | (Vm >> 1)); + } + else + { + if (double_reg) + { + Write32(NO_COND | (0x1D << 23) | ((Vd & 0x10) << 18) | (0x31 << 16) \ + | ((Vd & 0xF) << 12) | (0x2D << 6) | ((Vm & 0x10) << 2) | (Vm & 0xF)); + } + else + { + _assert_msg_(DYNA_REC, cpu_info.bNEON, "Trying to use VNEG with Quad Reg without support!"); + // XXX: TODO + + } + } +} void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high) { @@ -881,6 +971,7 @@ void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src, bool high) Write32(NO_COND | (0xE << 24) | (high << 21) | ((Dest & 0xF) << 16) | (Src << 12) \ | (11 << 8) | ((Dest & 0x10) << 3) | (1 << 4)); } + void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src) { if (Dest > R15) diff --git a/Source/Core/Common/Src/ArmEmitter.h b/Source/Core/Common/Src/ArmEmitter.h index 13635867a9..a3ff7d25ae 100644 --- a/Source/Core/Common/Src/ArmEmitter.h +++ b/Source/Core/Common/Src/ArmEmitter.h @@ -227,7 +227,7 @@ public: } const u32 IMMSR() // IMM shifted register { - _assert_msg_(DYNA_REC, Type = TYPE_IMMSREG, "IMMSR must be imm shifted register"); + _assert_msg_(DYNA_REC, Type == TYPE_IMMSREG, "IMMSR must be imm shifted register"); return ((IndexOrShift & 0x1f) << 7 | (Shift << 5) | Value); } const u32 RSR() // Register shifted register @@ -343,8 +343,9 @@ private: void WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg src, Operand2 op2); void WriteSignedMultiply(u32 Op, u32 Op2, u32 Op3, ARMReg dest, ARMReg r1, ARMReg r2); + void Write4OpMultiply(u32 op, ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); - + // New Ops void WriteInstruction(u32 op, ARMReg Rd, ARMReg Rn, Operand2 Rm, bool SetFlags = false); @@ -452,7 +453,7 @@ public: void MUL (ARMReg dest, ARMReg src, ARMReg op2); void MULS(ARMReg dest, ARMReg src, ARMReg op2); - + void UMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); void SMULL(ARMReg destLo, ARMReg destHi, ARMReg rn, ARMReg rm); @@ -498,8 +499,8 @@ public: void VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm); // VFP Only - void VLDR(ARMReg Dest, ARMReg Base, u16 op); - void VSTR(ARMReg Src, ARMReg Base, u16 op); + void VLDR(ARMReg Dest, ARMReg Base, u16 offset); + void VSTR(ARMReg Src, ARMReg Base, u16 offset); void VCMP(ARMReg Vd, ARMReg Vm); // Compares against zero void VCMP(ARMReg Vd); @@ -507,10 +508,11 @@ public: void VSQRT(ARMReg Vd, ARMReg Vm); // NEON and VFP - void VABS(ARMReg Vd, ARMReg Vm); void VADD(ARMReg Vd, ARMReg Vn, ARMReg Vm); void VSUB(ARMReg Vd, ARMReg Vn, ARMReg Vm); - + void VABS(ARMReg Vd, ARMReg Vm); + void VNEG(ARMReg Vd, ARMReg Vm); + void VMUL(ARMReg Vd, ARMReg Vn, ARMReg Vm); void VMOV(ARMReg Dest, ARMReg Src, bool high); void VMOV(ARMReg Dest, ARMReg Src); From 9ff704f202cf4d31e00476c08d27327f12478b8a Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 27 Feb 2013 15:17:23 -0600 Subject: [PATCH 625/627] Small improvement to cmpli/cmpi in ARMJit. --- .../Src/PowerPC/JitArm32/JitArm_Integer.cpp | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp index 63c96b21fd..753568c9d3 100644 --- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp @@ -193,11 +193,18 @@ void JitArm::cmpi(UGeckoInstruction inst) JITDISABLE(Integer) ARMReg RA = gpr.R(inst.RA); - ARMReg rA = gpr.GetReg(); int crf = inst.CRFD; - MOVI2R(rA, inst.SIMM_16); - CMP(RA, rA); - gpr.Unlock(rA); + if (inst.SIMM_16 >= 0 && inst.SIMM_16 < 256) + { + CMP(RA, inst.SIMM_16); + } + else + { + ARMReg rA = gpr.GetReg(); + MOVI2R(rA, inst.SIMM_16); + CMP(RA, rA); + gpr.Unlock(rA); + } ComputeRC(crf); } void JitArm::cmpli(UGeckoInstruction inst) @@ -208,9 +215,16 @@ void JitArm::cmpli(UGeckoInstruction inst) ARMReg RA = gpr.R(inst.RA); ARMReg rA = gpr.GetReg(); int crf = inst.CRFD; - MOVI2R(rA, (u32)inst.UIMM); - CMP(RA, rA); - + u32 uimm = (u32)inst.UIMM; + if (uimm < 256) + { + CMP(RA, uimm); + } + else + { + MOVI2R(rA, (u32)inst.UIMM); + CMP(RA, rA); + } // Unsigned GenerateRC() MOV(rA, 0x2); // Result == 0 From 07539b9a3ff1bc55bd829d0098ac025dbfd4ad44 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 28 Feb 2013 13:12:35 +0100 Subject: [PATCH 626/627] Fix a StringUtil regression from the arm-noglsl merge Fixes issue 6048. Thanks to Starscream for locating the regression. --- Source/Core/Common/Src/StringUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index 6ef3d91a73..cd08863877 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -245,7 +245,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st while(1) { const int pos = result.find(src); - if (pos == 16) break; + if (pos == -1) break; result.replace(pos, src.size(), dest); } return result; From bc15919e2ebefe327ce6330f7abdaccaa2fd2004 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 28 Feb 2013 16:15:32 -0600 Subject: [PATCH 627/627] Make ARMJit core default CPU core on ARM architecture --- Source/Core/Core/Src/ConfigManager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index 85ecc7143f..377aa16a27 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -362,7 +362,11 @@ void SConfig::LoadSettings() // Core ini.Get("Core", "HLE_BS2", &m_LocalCoreStartupParameter.bHLE_BS2, false); +#ifdef _M_ARM + ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 3); +#else ini.Get("Core", "CPUCore", &m_LocalCoreStartupParameter.iCPUCore, 1); +#endif ini.Get("Core", "DSPThread", &m_LocalCoreStartupParameter.bDSPThread, false); ini.Get("Core", "DSPHLE", &m_LocalCoreStartupParameter.bDSPHLE, true); ini.Get("Core", "CPUThread", &m_LocalCoreStartupParameter.bCPUThread, true);

z$0dG*#JpagvlJ+ugow;8XlEfgBgrWuXOa_6u_a(LVHQyZR)Nt<&oxL+CCLTG74Zm= zfJ$PFwL!H*wP#0Nd9^zQy-oM5vw7-bw2HHj)zt;sK_=k_2oynap~X+EAT9no0?^)1 zw}!PBdV3Sn49_HJ%pl`CQpqWn@)R=w<#96r?VS!FQhR4usHGOF*Fv2qQLCtpK()d` zU1*^`XrV5WsFwCVVWC!8s7nMY#w$m5*9@)vCYzsP&U`I=JljZNl1X0Yx$weobPL=wvqV_=8^06|n}E6Sm2kitqOMW>|}A^J(68`4@D z;EhetOFJGXl691U`ITE%OdqVHK%%@n0zNAfoun+Jqmha8WTH-qq@$6EHzQGM8p%S` z+So*@l|@cAId)Pq-I9d)+}%RSvYM@A1)eoR$!3s}y+UFPiOle%LJU+kcU}moV?D7z zPU(nX`D6gl$9=^jT8+kmGOZ~k=`5M4DE-&P^s)tqLtlfh$0}}@HN-+^J8y2N!3XxCu+WMy=?vYDnhOhUWNE)vs34m0Q_UL-<)9Vz(Vt_;5+bRx7L!8{kC;*s z)r+tL4*{q>;j_B3iIIsA#7_cNX|G=DX9CC>8>Buv;kz(;f*@%mjhv(oq_}1#dIM3j zQybFgiEJUwY$X#TG&7vIj}^(45uusk#H}*XMPzC8j3m2UCKmG08TdE&DDC&_zaSOO zyBYy0iWBxp^#W|mQ>7t|41l3Nsh)w5RW%k#A|jx0^`t>E;9l8P^3iDBHJR9G-G9DI zNKNN1305Mj_Yo2eb#6RLhArwLpX|_C44|3rWFTRgO^1m-l9X$}wQR){jjpdj(4NfF zexJPt!MKc?x0F&vai3PcZMy3D%{Hrb?pCeh4M z>F^cCJKjnsOy^ctWy;4JFa?ZTg@u4;m!{VoY313Sq_?WoE7hXHSaj`n1$xcb@p|-@ zg+~A1J=Jxd!!4)T9Y)3M>fTWO==bY(8~tO9mWQ_VKig?bD7`DmR+3;u8JEZOZ{boB zf+S9bg8 z{kl5O*QoOrR8-ZYKhY~=t}?u9tGuy_sINBnBaF;OMfsRZKrDJ=-EMu{fcORytJ#g* zn{|WAsEjE9i6tPR8z}e}t*a{)P3-U?8^&N%G5xyLr%J{6e~kugF7HOFjp0m9DEDrB z-m2IN=#dye6;j}4RV^$VAr=x!6Y@L`J;~wIF@*mK`L`qa>&II~bH~zdy1WZ2ydd!&i~xMB_tPu^1be^{BlgkJOw} zZa5WkYezG=T98USoioyaB;{OloSff^qH%ZCAexaaw0aF85T0fP^ll!VF?5aYqbN_~ z`4&%?ixg!Bo=z9zt}dP%vT>CdPx~B2xgC!*e|SCKV0^yyq~mj+wI?5+aq>yybC&&2 zj?dKG|I^X=7mbv0ne7*cmJDe&Ybb1Nt`NKkcUVVoE`CW60**e{NEVXyazF3;8F7@|-%y$WHw7s76&jb*953`Ht`8 zkoe}%`a|NVS`?urw{B(!IIb;tmY8AD9{t~URBl^UJ zM`7Jwma8ap@od9$L0?7LfM;4iMd^B}qRhjy2hRYUTC%-utQm?O)lyi1Fu2*;z6!V0 zbYC&7?deHcmts@vGJOZ$Ca~AS(N~b=UD;>Cdv$dP7CsMW6{3c-BzTe~-!L## zfjxP_(06%YXeNTqW@u_N8Jcz~3?0Quf?#MkF|-#!W=MOZDG^;FM5I-`3ne>A^?}Qc zcklft$2BUr^&l}?$sF2pw)6A^hbP-sl6jIsj0ZVKFsj$KlVJ)4X+f=V3`=%V`H@ak z{wD+}H)(FuW}>BIFf6PLSp1w=*CVwu$;v?k{Rw+VI0t64z;MY~QyGNl9ERe9&`u@< z3)vn6Z04vrr0wy*ZWr*gZFu699!(xr0e?L=IpBs`EDKlb)?=*b_xo2dic{;c>1Vuu zlJY$Q1gIYaxFhaohn7?w?4b2Hbcd>Ct_wzMnSNgRoJNy_L%U`bNe%;ebrbT?dU$z+ z&}P$?4i(h|;dg18h#*|s1mSuk-3TH)jaZ!qE)Rjrb>?jrF{)BEv+8J?*GN4|2qa>^ zL@4}?4k-LF>@n68UCoyfqFagpi|%m%P1JDbu!tI-pmwyB)GHGTa=n{q%-1SjIJxA! zr$(2@;^B=5t*=EVQfOVboPblYMZ_JPN9@mVA|piB+YXU!K(L<37JLyQvO5uAkxc^7 zgvefi1r<_?6EO0#ew@r^zj$()6`mqt656!JgcfHJ3Ja}3Yqrpy#m21=THU1(+QYPg zF1zUGu-p0->|~*RNyHO-Bfvsy1pxQAl2SH(4(Y`L(I4#N(0cqVBv}*8B%ALKB%7%xOPW^ z7obXgI-mfm;%AAZG7ykSlmtR?vR}-HA|QI#5VW2(}l^QQXg_1X~JQbUa{O zuo}bHtcGP|0mcD?Zmi5$1c~Uzay|iHWVOVtaTVM+tvGNii}Hr0}0`t1T6rQv!q zF^YO$wQ>{cxy7Rt!yvDVYfH+;|#*CJc&^m?c66#edU$t-HKF z;o2s&>!jxEYZfu8(*MYOef}aSyfk0KqKn!dA-W$wl%m@Spb62XSxhxCB>Wlkb!|a} z%0grFb^g`}^R)y47McqHo39#x6B?73B2k*J zJtzYmyS?aW)R=7E8uX;*>jzsxCH@;AmzdpniOufaCo*5hpa3#oM~Z^hnVaphYX24U z_0^tX^YvN4{{{2)I*^GpUneen;0i_QjyH8`@C+NIC}RdI$`5#E4Z&w~3KeD0mAD9V z6}~?-RNAk&|A7k}E@Qnmmo9VQ)`suOcwFIV`y#Gz9KVNJsa9>Gn?W&Gy`2u^f|_0N zuIOrqVHcM;T1?aF5=X_=@)8FUVjM<1U*l+z;3%DrdmOE?$>T6|y2%lr5KKjguW|rR z04j3OWsVjJ1)l0u-SdO3P--#CR_bY}NHmDb;I#^ZLy`_BWef3e~e zik2+noUVDS3Vgn^a4H$B%L=E!84IP^d=d63a7E~Uf+y5I2|}kuzWRY2v-V_T)}bp2 z(X7wSZgkK(AGCt6HBXK#4nCC%mWmZ_Zg(5qqG6GWm@bGBNA9CnFH9SuD8uDrz~6%B zrjg<~2LE#C_MLdFKGdN9?8Y`+v-;1fXB+gN2ap&2C;qxq>OWjZajAvG|DLLodSbj#aVXXZhYH93=>i3 zA3t#H?-Cw3t{tT)58&B|r{!pjA$S6Kd}Hv5zH4D);CTg)PUpFvy~WmH?rXFKbCSc{ zMNiAkv1Xj(M$E>igEY=@<8P$VN+t~Q8FI(x z0r%JjX?jW}f2$vjv^wPQkv8XpM#EqVm^T+dR!U#{~(o zLoPR;&OhlnuE>EaKUR*Dp5t0&v z5esimG~*l>1cj~!?#8M~DE#7cpzu==g#8dc0zXn6A-X*Xu;@Mn(1hsPSxhydp%EKa zOR0X%ImcajQH10gTifAwegxfRpnFeaN0M%fPNdLIx)BCyJYv(kBtm3UIzeREFt0DN zb?-%p>{SF*0+CZnq&Vg`cw8# zrm%lfi|gAzCqEa2!2U}6=drN;a~71B%pp1ZGN z?4e1D@+qDvlkpPqP5AkXn-%3@Jm=#JWfN{ults5$T@C7|6&P%rn*$7~A#AxiJ_d`Fk{a?uRqGYpL@VVt#dIrO}@(Jsj=xQy`Eoogow}B=*(SRa=BjqV}Y@A)^$eAQ@yr1R+JL`$<>60 zuLxv&vHV--&7Ka==JYMeo&kXTQuyYPv+zoYXSGew{bELSup>^-orQ&pNUfVeYf}#Bs2puv-hkse|Q=)>+>?p z%zd7a$n9sD=THnj#B>Gw8}!NRiCOK9mGQ)7ul43CgqairIJ`u&DtR=ZRbc89UqoPzyAe8uScvZJA-$=hW2I1ur)5k$3`sv#XLmM<5urP>m1GNAZ~G<;kZwt_fp>m0 zh0ODGFrGCwaHtBB5r51-sa6twk$~%vPIYh?`@#OZKr~xO_J@M~m+`p?uz#uf>q~;= zj)G;$g{YOqOGyjkV{=0_xJe~e?ci`28zI><%|VjQ680OBY*%8hkJ(w`3H;42V_m~WaC{QxJ*83J z7cUOURf@L(|4>5W|2K0SaLs?dDEPn9*kE4u2aC3^`6xv~8*13MG_kCX6edEn?agAm z#1m{!ynbT-iZ2LQjXu3?V}gxh<{Fjf4h$t9;-h2cnUbGzkmo9VdJIiHSTFzF-QSFn zOm$^{v(?_mSc^5B(0Jpi^P(q22RmC_x{TG(03Y5R4JPw)Jg5q_{J2eH92S9v6Y|%K z_?z{Dkk?r7*Gce)k>+#g<9JGe&??wJj=xrh;Lg{8w?QPr`n+AzC~s??6irL~rOGc^ zIanoK;|}y%?=rqN?*odt^Lge_^WqgG#oYI5U7e%sm>6_%KA;RL-=lf4sK%gMN25Bv zCgRQ*`3?=g@6veVFn%g9>I!m?&Ah_Ak4T|PZ^3tFugsdhI$kO1WZosCpP}fSm02?= zx|PG%aiwQ124ugDhR(8eJRcOI8n@O^yZ20TEsZ_qrJo=pA>KrQGw=$KAH@}mStz~2>MQ)XmN8pF%fXa$g zFD14+g9drO4ON|C1Un9{jCmbJ0uNthG7p_@4e~E1S&BkC3+axr^1Cj9-cN+vqyG5b z5-H|zDjNesczhoqxw)Brt5@;(4t_AcfBiUB>=eiMCy~iC{~-!H;rQ++1hnK&>>oD@ zku?7C1=R3jbFst|_zlN*pkfUDbYHluS8A4g>=EPpY2Zo@K;iz>*!cb>Ze*BUB>VNo z_jZz%zJg_|zw@lc-5b2{_#WH|ZbIXGzi-359cXRw7CFA(jUuhVv8nNW0I{~IDrVfluP3^BfYfNO4A zBKWU2zQ0A0;CVOumL^7w??SZg&4r(XAvwP9`6kTVB7BulOzM$>?ZnI-&kxU+G`|0` z2>e_s`Dr-5XGo@8>>oFN%JCh1MU3wViShmPufSUUG4xOuQvqmz&J#+=Ys#BtWbp(nm2=p z;X)-RucsP1=dFyVI+#O`i}$UJ=i21fkEgMWh4Ib5(12&wPeeuIxz@1_<5>XvV1z~# z?)S!rWbq-ALb6y_ACC$pp;)t`8QT_Oc^XJ0mi6S*M+8|UFb00rDpDYl@EoZd8_f^f zSaYPWh1J;#X@Va~v;Cy{vt{f<*1*O6FEmuqdg!wUq0F7BOmw`CP^a5ZGutyOG&GS+ zX_6$FVv_tfkQ+{t5#zai=+#6WoTvxpgubw*8?cca#$nj)H&bzMz!v4cvj#RJR&^6m zJ<`ON5cC9XnwP$4$H09A9JRT{YfOQAflyxO);x6-63tpww9i|~s%d5;&})6E2-&m;YkaPZ-exDn(&x>3Tm6GRlSW_nqmP%N z_KLZ%JBowYF$$jl$=m41#QNiSZ71*t0x(JMJs_$v4%N{oALJgl0d}izWfrT^dt~6E zg}-NihxrP8qk_}q1glp*(TWzw=7Ws#A$ZA(=svT~j7D9rn@CkGFG9a4?N=xQ_-Gdb z{W;*h73`Q-$-?ep|FGGg3VT8pCJekD6jgB+8ScJ{EY|3bi1MstSSjg+s*A7Is)&X> z#OL3@6LlH+=~y8fcQ=UPAeb;egBdI-*xc>S4G5M=f~CavRzi9mv8XH8&A2;} z09oD>5TC8U@mq$u>)+=2wkdzk&hW_827FNgD5E%2DYqSnxBj<)iA zlVr{%0+lI+H^eIQMG3T?&i3rq^i~`6==Da-`wkyI3-*4D!)K3y9}hnsKE4!VPcU_4 zrc0wcKo>()eRO zvyf_wZx7Pf^VHU4-mfVfd)@Kh&!hbk-fs|t5XOZ99v6lpyZIChR~{E009WW-gOBnW zbe4`jKNaJF+eJ<{8W7_6)>Uwlc@yO^Hd$lUyWV)3f9TF2jFq^c%PgpefTbX5m@h8a z)9i743iVRD{U);3w;MXeSi@|j)wT3qYh)FJ;PLiNsD8Ht(R>$1E!VG1)bG~cxPDWp zennI@2RZ4eU&#&TeT3YgVqkorc}Kk@>>-6Jb%8mmUK*-Pl|ruiwHX%OSZ%&sP`@?} z?b}d&{ti@gA8byp&pc6|r;c!aZm0U(NLA6vIWMBUt~KALJdIatalNGa)gpU3ob5!_ zni}i%nT(#7R(Uc@XKvbXU@_rnz~AQP#>c) z-?9dr^Ok1Oo}<$zFv#bP(OoU06`az?RH3szXya{Z8^QAcTN|eLqE|A)?Gy=1z%Et_ zITqGlT*I~4b^uV_y3JGWPuESF;Ai-o7khK+c1;#-kyf3wi z!DM+#0ro^fXq7dE_Lm_{`aqktzx=8J5!#3ImVBmb+-@N)1F`1E4@+rHq&cLPLa69| z_|DuaGIX_j`y+*AmqP%w(oUMDyRh`Y$EdON$m?}5uY6CQv9G}RQd_Wt1c$~c%ro{% znO=BM$n89(A=CCStV!(N(=cl@g9xyhpB-VRTofPH)E|z8r;0BDldubNcWM=V z$V!4d3tfi;H&MquFC~>A^%(a0F=SL|**XM#P zq%Y%7M|{X44cWUz#u3_=FQo1H85!6uq3!uEeQ2yMR0yf|CbR@}^;7&_9_i}q2x9os zypIaN-8sS#eG+ka|Eudde4v+eMdL?}0u_kWM%3Xm9@^|NgaIpN-(z?qtH(NR_7#YT zSc<&{Ll`sEa$Y`}OAyj}tmJ^Oe%d_F){ntxNr`O{Bx<*AR>%!z8 zaJ_~$#vD}tL9FbE@OtRJ~xTZVbqzR@E>+6IH`b!IEE5 zV!^ooxbLEIwn*-YWA#0A{99SbXF4PwD8qdvh8uh_m%e1{(^0&R;&l|SXX?fknPz*i z;89;0No8YK-r9#A#UF}XJso-cg_x-8+gHiv&XN5PJ)yT~1Ie#@Vm_=Mz{m2?{ zW%+XdtlmjUQNg$agACL7%s67c4r^Gb2Y*xD91hap=~B55@H9RNQeKCV7e1m7L7XmQ zmuGrM3_JTEwL!F#_AP+2qw#Gp7TueRQ5d!fdRtjgNhYx#)4XF4L`T3c=Ahjfz}HIz z@Gs5_V-W;#^+Pe%J?i;7E_#(`S6uEYt$aR`3$T`nugtgW`r z&D*dw5n{52c#DQ4m^T9S%8r)_wy|w%_6DPa(1`K9sxSA&bhzB-><~{*5;>`rF_#fH zNs*id+Dis@*?O%aAx%JI2@WcUU6gMAjJd}uUh`5*!W=$WkBum>F{^v%tclK?9NHVM zZc=3EDHA<4r4ws*nLOOr)e3}F?MD2qvy#bENHhD_cTFQjBKS&dWS zNHHaum)GO-VWiiS3^8o8U8S$ zZM2qjC$yd}Xyu<^h7lDtj)hd>x_W%Q2o$Owbs1I*0s?ywTNZ2uQ1d3unlWy7=WwN%{5x2#FBtj{&_uJv9(2!3vil?-vcsM^E`@ePgiBX7jcE+ow|EK z$2SZ!CDc@}EEx%n$go47^0fEzqF84DU5k0AdZN?U(T2dFSUAIR?+(4wsp)H-x$E@G zJ7eirII^HLxY#pfU0(Tmptp-cIM(0)lbQ+|N6em*^!*a z&yJd7(GFuB`jRtxzZ26z#(>J0gEhONs5>3N1`GG{f^i?CJ5f>SPDy4-LS%QU0Txbz z>J4QI_osW%|9brh^4x>aZ(PP7+=cMNLsw3&s}uc)dW#s7ssH5p65<9`j);++hV{|2 zHiqTp_&0SO9YU4;!)c`AEsF4+0*A3dbci|O4za-M5DSj$5Va26ArqSVmZhm1P~L{d zJA|Vq7z6HHQOEwuQVKk)VyGnD^OKEB`&}zPmzS=nwC<^fZv60XP&fFOCgaDM5Uwaiq0RV$M1YGt9C^V2H3u62QH3WyJ#- z1@|A?7yWU~Z_&mo8tAv&ysdTa&szC)A%60UiJ2d;#}a1dqT`uqZ81XtG4rAtW`;Hr z5=J^J`xl$P9BPb}`%&W+FTMEU`G@vx{Y~;wnQ&Fj?x@@YTKR|A5#ioZnO{V#jIGDY zOGvFJ7n<{U9wdNRIjb>Nip)ukv0^RVTEQNLMNYpFR)ilR!cREej2|Mp-Cls-APU`9 znRBOQp|gD~&)>{f*r0}Ce%Kra3|s>1$9oU%Hn`K&8o^_eY>L?DmKUd<{E;}t@0(cW zci@5$X*R)+x4&tFv%ok|VC;a^eVJ9BY3`X0101DXh-;wkuDS=qm*UQVt^E#`(75*1 z2CIbD2+jy`kib{Bux&=xsM(Gg*(eynK#Jj#w#PhJ5d;>2_HpY0=n_|2@bRXHt$$jO zjFEg$(f0a9+fGpQqkBmPn`F_U)p92;wekAzFn%)*n0BjJ)BJWCS6^I>#nNUiFP=5; zd(bbs7yBlBM9;d>rj-3;ODF4xE}>!w(7d#H3BY~2IE0Lx^vEPpf%FD01i$L|QkPxnXD8BQ?Ou(!hnh~#?BbW4zA)p#=< zxC719xV%ir>r*pncBq+N2QGFi-Tk4IkMb#}I}6&=6~R&1l}FjZ)9ef`<~Lu4b?*PoHZnEVsp&oI>S1=toa(uTvs%6%Z;aYnzv`W-*T zSH9k@nm1rj!%sfZf*RWcJ`Bn9gF_C?yAG_n99VQYGR=O3gvKku$24b%6>R+js^jHB zyBpMpa6X`qJ7DkmqxoAYO9dmlxwr(Y>4VyWI>s`brgwC=tG6A!GN35-*Kx;#?mvGyW3}D;qgMVBsL*xo z1M(^k(JgIn)X9K)U^H>at55IAkdrYgi9g|?Ntx&f(YlGr< zlZHc9I6ECV=rk@A@_q%MJIrv0+m@Qx&clL^!ReWMNX4o(??$RE9lT(SGgpdOR8-tk z!7*s^Jo+7g&F0f+OTwrAi0Gf^is<$4sp6|H6G#>8@O44vp^*-0M0 zT-h>ik zp=1*Z-Jy48^d&O*5D-8+;Url&PQq!&3A#D*Ypm9C-i!zH4&$IU2j8*}-C;Ezz|CwW zdPH{FZ{pDZZSsP#<=Y(EkdF<6&QZ*{AV8A)1p!E`*v>LZ8j#5axKZ*IU9FO*qvQej z?J%%30|^7bd$Kp9ROGlKTcA~BcsXLs0Mr1<^F;ChR05#~B{E(e!IzAaEBKSUL{{fy z+LXtkbJqdwuuo6Q%z;z{7D_VlW*+TgqalhN#%3f`Apu4_@k8?WW;`!2ujt71mmriq zz=hvb1nyD8S!2F;;(cimio z@@c~tSMcc6fN;z+ifqv5H-3VCb1&Zw@{YGq8qSH8H>(40$I(deAm?&a>NfMKuh3V#KN@P~q8P|_9mEq0|cVsw?;dF*m7|sCf*7V8;NE0C-^YU|T zihcgtU=)9tu9{*kyYbr5t8?F<5%0*Yy$7GcTHUjH^#|CGrSLQ>OdlPH*LrN3DkEG* zi(b{9-&A~&u55H&omT#L5FC^{pMDg%B-v#Y#3MjIgNz@p-GU#k-RAkMu6O-7ZF z7l}I}G3i&3kHh>P1O+DjAaaN%{Rr}LnEz%>+o0Uphmok2FX6BQ9L!emlYm+|TTQir z`vi;hleZyq^jo*}$hoJALZ?S!(a+r0$8rfQ`nB5-E&7Gq`dH_>3}S1M#A24{$8CXC z3!$v{d|Fq&zC>LCp(v}uAM?U|1@e}B&mMIO^2O(rnlm74Eb{~Z8TLh$vM`BWA2~5!h5>u*pBqlYMz!XhDgRR6C zP4GB1L2cmC6E{I5Ip~@sCz?Q#l4>4_NsT267R?|rrK*Q9-BSgYXa=#PftUu3VZ7KE$VB(Bv|jN728N*Fgv;!+38&|p>zjh1v`AFPl4R9d^OJ3QLnDz#k)Mil@RXq~7umLWp zS}m3uiJ9I2lc?I1)dfbIg4_o(Dfx^7<0|O#16dSEIj`p|BXi!NIS*lp zWp2hf{PSngQirT`*ai!*d?!Pd2lCD4Pgi4|b~LIa-3jBV3MjnJb{HREmpI*g73Pnz zBd`iXlILj536K)f7>Ta0;Hq~?OPIfzWHtp8Jx7yDGAW1?ADC2)6i|2x=e-_z--$u- zfe{4R2*OWODlcHmR@1z6#tPOy!~!4tNG$+ngYDpT4r2k?kOjuOWMlTK#+vj@oWFbC zLw*>PZORXpwAPLHvQRwPlQmQK;1*#?4q3f+vU+i8$83E%jL3q|$cQXSq5XMt=kN&Y z@o-5?!5A4mxTb<;F6kIi72Wv664ry*LkZ3#oTwAxWSt3|YX~Psai33qyyEUeeiAlj z$WK??ZOFGPZjvPNt_0%=BAH?*wF;gK$5w{lVQj~bf4eg>*=+qbmqZEE)ZJdMd}If( z$P~P+BLtLL_zkg>-2 z5NA_3C`&gN(LwQkz738acn>RLJ*2h}E|BOpxTh{&XdVg8YOZ?7`Gt(Ugprf9^2Y&K zsv6w*t_=bU%tf43!D#@&Z6R|D72IIHj{EV!Q4Zr?p@O{3G1fr^JLqyj)294K(m!6$ z;LUdE-?y}u!JTR7U*#1xG@adCfOpQ#^`Ef*wPXDo1Hz6sNO)Mhl(c*|hFHO>gYHO@ z`kfU~A3ZE0H3?{MNHl2R3DEXs0*zkRBx-i0B!en_oRlJ{4!I2KH;!tdESHWRJn?I3*uJH+31@= z^nfPT%491U_d1O+} zV!TMXPEACj%|5SRJbZWxJV*Aw?I7Wf$4-`cIc*i^yhFul-otQp!=L~wMjmb^7~(__ z0?NXEQZHW&4v5##6{bv#S?P6!saWyO!}}8!S!`rcz_X^#;rU(F=3;3NVu{-Z)z$Sk zyiadgj$m|6-7ekmU=QURs{oF~9^fC~kfX?PX^^5tg* zI->|d%@-TsRjOwSCB+6>aSBmK;21o^gL^>~IKTla41qoHLZbcz0f+YXuV;b(*4o_F z2!j7Ml7BPAKW(J{1BsqLdTX<3#sP1=$>SRJWr%C!6d={eB|xgtFac7H#t1Oe@L=DQ zYlLpcTcTdt{PFw|qs=CIf{>Z#czWL2>y)KEQKO+{F~v)9{c`5!a34&Y`$74NsAX zJDuV*ifbt)8XHvKi>U%**v2fTecS2Q$K7yY9q(~CX!CY8?l%d_ zi{}-z`ce2}{-r2)<9Q6vTX=3o{0{hs@U#cq6Hh*#QFvzKc^D6dfzV%QJiwm4_5LNs z16TkU4-UJGA80`M+$@=lPDx|#emCyamr{q%Uc~*~o}JeBLUeZw+=)NkhVDM<1=-!p zaF2DJdL|NW^U}_MH!rO%-0Y`BU#A;x*WHdOG3QAL0)3sDufV9J0QL1r4g31V*cax$ zJ_CJyOsKDSMV}H>H81r%hi9+N-42~4S}RYX{+2((7sowMH}c)OFAm-e-8T@Odybb% z^9@8-n8W+pzJcfpa~>42=n8Xaw-5-K0G9|bD^QJQ&3PiD6k*N#F9guOn)g`%RyWnO zxerr3_PYycn5lTi2{q-9@WaZ|ymune^GCKeo5vX=zpvoRDY(ja36}DQ!3RJ2W8j0C z{PFO?N&Xc0S^Qlgrgi~SL!ayf0K`yR>VBMt7uH3Wisdvr((tB&Nc#m9fL3a=e*j?Q zJCXJ+AkIgfj?*@A8u$xP_v5s8tTZSf^0|MSFF z7~YVXfk?b&gl=(*kv|dCp4s8Pg5EU0H-~XBXYB3!3T~7z_LH zB)q98nRuLditx<9vk1@2c;3ac8P6^}2k=B8Ut2t(&IKUUzi=+*mS3_!|0>EecJq8| z1Tfv6Hqn}HXI^fjSrs#GqZ8}4ZgOHRzZE@g|Fg2Eo%TKTwB<;oiS-ru@ScNLZ(=?0 zHlNe>4pOmCx%Pm%FB z=HU3(W&9r)NR7c+y|&>FMx1%CjQt+5x)H1Ugh66p()J09#K?yp35&$Y$B->75+gqy zAX_9xK8_^WA~Eu_d~A?NCD6RRLALB$42Y#z{CYM<86TO0@b#s@Oe&5>u)hI7V`D&= z0H}U@eq)N7UqLCcIn0^hPkX4wyI%8NOqqotr+L>x1vq zxtu?MXS5E9ah5FPJBmgjY&5ZpLV}NS=J$~%GFNlvNDaDF=KqJx&vq6|4*3Jv6r+P; z%{w``AFE{Ozs$14H@A3Xb6aU77z}nSTc7CztXsgXl&5 zL;3$e6!a@4XA-F{{ladn`KTnaTcou{Bsa6xz2>gu5_}sX*&sW#=lZ}{#t^|*ZGl3I z{&N6?i0~F|B!6d0(sL*p^7S%*r%&2w(ITu0KMYAGc7f`U9f+-!?I#{`lq!DTza*F@I#XNAO2M@b@kD zm#F>}1b-hRDC&=})PHmlqMsZ=|4~VQw@73946s?AFW#0E!u>D4yZ)uu6HFqPdqn0?24B2buFF`Pmc+87u;6F;GAT-u3RORwpjsLT>}FcVDl){q0#( zPuDAX?8h2(5^{(sz`XV=+TIZBGpz0}!s5*78_x@~$L@x)hL^~UwGnHxbYnByy_hrf z&BhUF1=Ht@`FlEre67pyV+EUzi(Q$x*o6yT--u~>;V{fhSG)yV5B5hDo-gpEuf)>x zUChn!tMDigh8<582?g<0cw&*ynv>}=X%fDf5b+jGG0ldBc#X`db-_6}&&=3W4D|Xu zuV)>0ad3?6H{I7YVF2fzD-Ga%Xh!pzr{uI;`V~#fX-I?td^)^&X>H&}8o<|1io#A5 zB(yZ68Vu9qT%_^53=48pJoK@$TbIjdUM?R4^GlE3Nb@ob$V-ui#)Spho3RG>b*#t+ z1#G#Q&tr_IN%<_K7+Pp>I~$+0A-$z*O~#P$jNC%T2eCy*x>!Dr=e&XOTIOamK_+ez ziG3zG%7bJy&G7+=jCi8unSb;=iNV~}4`d*oIo6L8X%!k=~vw6Qv z9LD)N%6wZ8GDpay9FcDzX77(F%UBtIHfPCTh3{bI$kpYV|!xh@4*lipaTV zm#FGGibl@qzWnKw6W=TqWxgEB`FB91NByp6Imc1Utd-g4iZo1ON%=Dx4rqgCXx_;{ zu~u^|rIrBiy$1b&4j78!o072paAd<}DvEdeLD~Wt0(pV_8LJrSz3n++L z?q8VANgNc!EQgj5EIuBhe;=R_i`;`B`cjBt8l`|mx_RScmsq^sB0+D!2o?teA{G-O zSS*%AdWtk=kyh>zEK(3Gl4V0IQV=ZKEc%B52>SZ~8JZk1;w0fuInwc_O}}}4wr+U4 zD7$cLkGrwAOT2*5mAze(7?$1H+a*;5c|!rI=^{vl6LO{q^2P#!St7UusR6QAxp~R5 z6O0W9L=``Jt zrJbT0w?xn!MdL?#$jQK>;g$@5~ zIvk*x++`&5TMl`Z&I}ut=a--yvZsi$qwcCyC(Qs+?pVC!oIEhT^j&)lGP%3cK|z=B znCVUv1LXL{^#;fv@hW<(q1hvRY9t z!Q;l0utrg)DFn)GV3&=&r==c zrpb;`u+H8=H^e!qYJU9@S!bn4#HLA~yWqpSjlAsFNtSejccZxycAq&HH+qmKEzj7P zXRH&anr8n+bS#Arl$6t^c5r|^*m7TD*~4^@6|sj&uNKjP#WTebo0#s$r$xJH23Nc4Olz$}2<1&DFZvr~ZfV3vpuo-2w9VoSRUX~FiQz+h{`^E`!P zabFO=FHRhv(g{?A{eCxI(D+7tNOX1ZecV?^4XkGb;IVja#Phd^cq{!x{t)0!!*iTI zSs$5!CSm{D#4U1s3GH+9jjN>fez=kC>se<=>wN{x4fFB)rGBjXko2PniLl;B!<&~j z6mIrnOF1^1i}A*@dD8=&A%(g=4(>ML`xdMiJKO_;_Y`28m=xAsTp&;Qk3Yt8%5$u{ zv7_gNa`CyJwYNPzr}RD1uiN5Y%zJ2IV$9UI-s9h!qjZ50>bZj8wTMqWj@RM!&Sjm2$IhH zt{#oUOWa%~Gr-!S#43olDLseVYjan%L}e;d&g{uuV9O4K#1n2+rct06BELq-U1Q6_yXrk)9u60smUjFEwCv_TwSZ;SE^nbeb$!dsMU zW&9Z&pA=eiy)5IS5HGeSQwCqn6ZpV(wCu3bzivS+q=xd9$b9c3o@V6JWhUGO-(*gg zi7$)9e%pr&idY8mCgn((UMbQCV)K$W9qlr{gbNFAUdGG#Yh__eB|WTxHkqwtqMb8k zg*g0hyAV>QETp$Aon+snp;}6GkjRy9W@h{2vT{0f~0F3{DjITw!F~li1 zFK&^s{42CZM!`wi z?8StLf~meGxHX?NXN6Vpxg~g2AZZR&AB@D`)m|`0$5;p_5MvXOJH*%_bXj7|g-EHj zi-rmviy@t`(z_xZg!>JZiP$k<1^h(jPY~$?u}Q#f`ksvcm6xBsIm9a0i8#f|*vBjy z0~366h_}F0;BhTi0}$eUi?X7Y)PABCwSX+~Rv|T1iwk9Ga}Y`5{phL)@%EO9lZhV0 zOZ1o(A{RKK%7QOPG783yxSbH|Ewi?66;i^M4jY)Hi9#P?V3Kv&hBAv`PV+tklGcv+ zChUlRh_4_8_FLtA4M3E$15m`edx|WihN5A`()8kAYn^wc)mm}pTuEf5NaHn#=vCH^_yP)I4bqn}k~xSqNH+wT z{%in({&YYQ@=cJWu~)(JC6yG4N&NkYl_lrzAIeWh-^AbC!Z3f|Zx%x8DAJfe(fLCB zQ4st+0fMwfq9FLIwCH~gK-Qlzl2Yo1gz3+f^jC^BrY|~kh&~0W{)~~lfPz$i1V#M; z$odN!DT^cMpC{>$5ot_c3=Sds6a@X9yx2@$Kta&oh#=GN6r!IBC_=tVHwn?$C>r`p z{Y>;WZhtHP*8pVwxdgO-1b=fSk(DBi`4inf#2*Ez{)~~lfPz$i1V#M;$od0{;4eXv zrY#5Jk0t{jyWIW=iS`fW&jv*8KX!1qeZI%9Y|wbwQKT_{TaYzkBZ7j|{_v>%DM;-P zkLiC6K-Qlz(EfwM^yfC;q2^y{ApEZ}JGA|hvvJedfTeG8`)S1vpoZ5Vv6 z#@C_(wm75(=cuQIMWg?9W-vKzHauh`6;&EO;m7^dkcLcW?nZAm! zpnnuL8PV?)LI1@Mgz&x+X-t2oq<>uHINFO{f2(rtA%O{pWhsj(nri|38%-=NhFnR$ zlp@iFeJEvGE-E0?cveN~i>sBuu08@A0 zMn##r1G>hj@Vthn&2~k(3eRhJ+I)m~Jg?zt^D*M_yoRU8 zCyH_}p8w#n*5ktd58wZh_p6I>9)gz+^KdQ+2#Zr=N@xJo?Kov zc01^-M7g}W21mzc-*UMu7`Kj=1vVsNS@3%TEen2y8+kZlAHs(t5r-nDYjYn-fb=U< z+MUZQfo0zz6j}+~jWo|6#oFwt09=*-pp}tW7NHU8hb|U;Al3pSkZueKoA0sj3mv?K zd9(*k0TOywH`Krr>bu`JLWv(}O$ke^9IJM76k(%O?SUBF;Wd2Jc z`2|u+Tbalf{=+iyMVWZ8AZ+2Acgn;{BpO39B4_(cWztlcZM+ij9eJXn z%A_2Tk*xENIZuL2NT)oaPjxiEuN7ixC9wP4Es9AQA&X-pahpW?4oe@%h>nv4$+u*} zMv;(W6S)#+>Y|b^^AU;hlFV9YWt}Ax?w45yi!6zk%B;i8F%qL#W*uo|9Uv1%h=jyP zWR@|g=2o+_OwB>6F=PsTpra1TWB%b6H9cG8>a%+w^O&+;_ydcmDNTv=yIArhj+dmz zqil17O#BLoP(j)}5)1WCtD>Z~JC@@s2QOmXKw^Rl(Ws7Zu_3~#Wp43}ofN19%tPs; zpn|JR+U$h@BBrrCS<0OhjZtm|nD?0I{_spBp)`O89YRoMf$o zKw#F^Q0*cQh$sSE?YjdzVD^iBYL1$}JFpHhT-0Y^lZ)C4fQm|!MfI_YdSa~*UsSGpQ+v2w3&^TP%M_SlB_P2N;B=(!b|j0B=mBhYd|ANfy>c-~@o8{UFpsgQs?40oat za}1J&>M627)8_4Y&yvc;=fYx=LV)-9|Xlsx($<0HLufl?JV#QDA-rHTc=fjS_QFSsGfywK>)x5srHd?VUtkS|y`x{3I zf8#B7-7A-uf0)7ky2akjU_V94i=^`m_T>1Bc_{)`D| zEUEU|=2=mNSLTB1Pgqb5nYdg}C5~{N)Gb&(O)jTa(HU#2MOfJ7QfdJBfto0}l3Et% z@t$2tJ!iaKNj^ZgB9_Ezjq$JZXX?*WbpfOWNJuj{XRpY(`Q=X>wM&rj~Q zLuA?2tv-o~b+IumuWn~nU?b(xSLA|~>}qVzM&;m5z$F|@J`YbW z#~LHcysN+Vs2bwsVv0Pm8+X1~X+e}*iBeW?zY$1Q zZ+9xl)!W?)a`iR~)r_72iRLQE)!R-Aa`l!|PYA%(+d>6{fm#Pbb)q~T6CWB*+$=T* z#36|5oM?eUS12QJyU>ZUx&m|-c6k=V8;3%(29`10WAG3< zF1;Ysf%p!?cMQIv_|C^SAD^#n+qV8z_)Gp;XSHpc-NvimDeIZsR}jSJjNy8~@oVRo zkh97C8+OegCl&x<7EX&-<8)Vj3rm{gc0=E|qTW3v+E6}aYL%wvT$2&~6qCdsjwv9beq>~i-iu<<%l!=+t0Lrb*7ar+!j zth&Y3y6|27O5zEGu}uBL%M>VnkD1*T7z4XtOWCt~Tu`6HdAV2OV(gA^w_gY15FCjg z$#cG5;?IIJY{%FTsO^uiI`gek3B(HFlE%cCKgPtTAe;CE#n+ucCXh=lGSMT+#PbN7 zVCTh1ArN~IE@@0OU=H~YNa9>FF`7(#d9BbtIztr$RUp!9vb%Ifs6oqvVCA*k!a2=x0iY334OkP?#kKPX8O@k5!2`~5M* z7ZNeGA3ZzE?yyX(?_#tW@W+zK^1RjOu7NX7R(9d=#$BT322-Th^V!b=jK) zt-qqbuX-O|8&uIhm=kGRcF5LHbQA7A-WsS~fq1x?H*#q7KL-YCpC^_H>#A_Vy5~Z0 z9m0N<#6!jrTRwCW?9{rsJ-KA#=0AxAiD~r4eiUqn#wPudL2ZLtm{iV>WngC|ea(ZM5X4#{(`cveH~ix7cx)^V8jQZETK zq?21=Jipgre}10&bm(kCbauO$5Ni*XuGdH1bFgrSJLGH3Ld(93lsw-il zsJ^Dg^DuzzxArKD)853*LaHFnv{eGnLBgDA?+Q#!ai)DB@I1gE;S({|NA{1-ECNw< zziW8A3`aWK47w?)Mc(=e)1m@LRI1?&xmcTKAMI6y8W|)d28WC8; z5uGHkh$A{hVC8?Nz{>w@ftCL`0xSP>1y=qS2(0`s6j=GE$~e=M|HlMY{+9@>{J$cw z@?S5o^1ni0<$t@RMY1!xQ()zPm%z&ZZh@75JjRifKi(1oto+Lsg=xxv7jakqiv?Ex zdkd`m_Z3+AA3%7P@b8QeSon8F2`v0OqXicJoiTt-I}(WDUMA?;YWMPoP{dV#}?N`2+n$`ZFM$^X=7_s3DFt18|f9Rm;u$s z5v8ztSW6}FE-8`85_l`-nmr{DJJ1Udz=!?o7!^z`b-rr6oPSTbSC40#$zAa*(~*Nq zotYZ|l;P3}=R=O9yJE;$>TGU2$!wD6I{C2}2HUd!9Hw*kMhWj7d}YSok>hz)Q@5~l zzn05?MGg&3{SuUFLe7W0x$CYf&PT}QLA*5x_kdxbs#|SkhpWBObL<7nFPqchXY`7< zBl7pyuf7A76TTnu(VgFzAAG*&e$qLT=&xCU+800x7a!un!^hj|MS8QwqmyZnDf~xnP<~i$lA%~wQbGk{K@6lcBuh*(B#TK}$iWh_ z`7Y8k#Gbs1G%*PF=$lQ;nrEh(_ao<&I?F1Yx59N@dw~66by@YeB^$5UO?^y++_9qn zoqbWcRqt2foPmz$ok3c%L)`Uj`UinpY*_Y{*9F^@J8$CfPE~k9ebtco{C2FK2RFpp zVJZl}?Loq&0@n;8%qqJxy2ON8WzPqjjK?Z_a6?v(&o{Y*eyp}fE_qGjj0U`A@+g7F z0EVIo%?oV8-&S|nLrwLUSo+2>cL~P<`)jqmk?*a5@)lQSuI!#vT z3^NlZXq`g0*~V>-$8D~0nKSJ~;o$r-##w0m7r`6^XKohHfwED)VXu5gWXQLA z3=fl{FfQ>f<|m_l8>YW5(yQ>d#~tr|#}LM79LDbzpj7sct9X2PSrgex-% zACOMi8+p7pa#d#Jlf98|Usf#~k!uT+>#74aHRM{()_S;`2Eo|o8y zOk&qEWkcihCBw-*2|;H{np5(tzy|pshGhoRpQXiD(_d1`(!vr#f0h>dSBn43WppFc zUd9%A8G9;|vD3UFrzR2!nImE%yJp}l$p+>p3DaGf^u114wXk)6FVQ7lqV<_XkMK&v z5^Rb4H@%47%|tY~B}A5U>^YItkaHp@*OucglNS&2a=gJyXmci^L%m|k^@vH4gmKuc z|DCQN38PkpWqT%)LN5}ZZ~@(4B;*Ie6N{cNnhjbQTuwLO|~9!$d7tal(6>t$qGWv;&;2z2Q$7->(~M#`nKG z$npI=cw)BpFED0yorV9D+1m9*t>m`;8j|7(lqqQ0n3uibNcJgtH%?h6EP%eteM`kAP%DYt zeE4M7!^+>*&N56a>tZ7`8IL#AW8nEfN{sg4$!Es@K@+ji?E7yp?o;9J3~xSoa=UTA z#Dwo|3EgcxN+m+`p_8%3{b&=x9y+T(Jjr_Zu!WpC@wlLC>~=#N zEK7?av(gxd9k)L^rLQf5{`m1YD=b)PL|L!Fe%%mGn_vf%yAZ3`Xo!N?5r&r?cwt5r zpAD!%9L~wiFWd|$Jaq*NRr9gU3zmyEz6aIC@B*h(mH~n`Cb#!@FueZ_?nqSr(}&xk zM_HDeXFQ{#`L}UpDzpS$AQaB^ZpkAkoU=BE@jf3;%g`@z*?#ciOQFM+9_D{eNuziF z0u|-qa5pDQP60{EGm9!|{deaJKLdX$P)~cZ72XR%KPqDZ@1k)3YGt#8Vv&*Eb@rO6f{KUMYQr8if1XhAY*42VCiGJ&@AZ#`9Pu zoeP}JQtFyQntq9(rT1eep@*5NF9D_15fOuRCB4dg*f)eEVc!rF7PxB#6{x$Z!2+>u zNNG}kHp608s;NK7s_~a#xVfA&y6jV=DQbF-*z;N-WB#O>}SOA{FJe$c{pBpfEeu84db2$H|?*cB4z;(jx zHd?U0rIAF&iyK^nRI6!Q#IrAFKixQQCyrvaV8+L z+0M)6c!TEz^;9-}&@~U6w35wb`zo8Xlg(#fmkjw1YN>2)21FV+clC%O%g}gDJ(UK_ zkB0`Wq%qdepq(^Mvoxk8XM@XgX*ojjv&sbhJy- z_!Wxc75Cu={U>y%xLF+I@-O24yG8K=0;nh!0ir1G#mSzeR{V0GvN>HnRTO!tY|=_L z&ope(PBu#{jnX8IK7hPzPB!Q})17Q~5;pm-`fpL}fO;sKUx@DI<-c=?hs}`&&rf>R_Z1A7O)oY1;4Dr{<}gZbY^^?UT-bHO}YKx#SxzbK&~w53mGQvYks{B|EtUR1)j??TylV1Tw!phpS2w5y$(7@iXY8I5 ziCzbSe1kQNORs}iI0(chwDX8{EG(%l@R#R9qyrg?E$~)mc(kcFFl{}c7DbvZ2`fTL zkly>jovGsNy$}5AKlEXb+@9MVBBpdY_oAcm1KrB4@MRl_hU@>`H3L4aWUT2-2%i7aI2i5MC9b7>W>>_VXU(u2F`Mc4CUM?t(7R0O-UVT(&}; z;GFT{xZAVLxlVQ9)Xu}5_sW-ko?X_jch72E;$(cO38ponaax3bxMh@;5TUi5->K;D~2A-8M6DV(T*XlzMXy>rH z-12@|YpVB!Wfwz>){QNT_wGrpbKVXw-I5)y>ogKt7muAFd^jap0EGjmBnP0721O!^ z$37%Mpvwa&^qB2g==Gua#6Bc`s4q5SEib0}25PraQmho7`XOC~7h(B0Su^nNGC4T0 zX6ok(}_afnbcSOPEIVevD10mK9`0%*d zqJhED!AjO*q8Jc_;Djp+dU#o{H3t}p2W91HVZFRA_b|*x2aBwK~jz+ zi_i>9nTdupmvl3WDQ|d_|KayY{(AgLU2`>#W}vPqz4c zytaR`ZgBvjZpq`r>b8DquD7?`p~e0b?lb5dT|ori>caZx!=E0ux_HaP+llp5y4&jF zY2*Gr+)?#=t1(nvXa~>&pc>nqtj6Y;2rCgmi+_O>|Itm&#ec(gDgJB#Q2bFpddmNo zEdM1a|8Iut&gdLQ;VC;?9$Iu zy`S(G&995tLUoSLwfTipX}prJr}6Fw@82c#A*bOb*nCUftmrS@4fGtyy-IA$tU) z3P;3SvEm&JCCrHrh7#t+2j@EPiHf=jsG%Vg3_On!ODItKAMlsQNAIg&3&!yH_+y3d zf@UE08c0{*lJPJP64%}KF7w-2U%qs6mU{#aq%}_g#Sk!A`(6f1O6~jTnawkyoCQkU zN-beuLMtk6Z{ahl5M}k= zX#9r`GJV8b@@yT_I)Vx4Pn`BV(7_ELId1)JN^Ct`oMFxLnv0CPoOF=>8=h3$bL|SN zIEC9-p{~aU5WG)x$v)2DEcD1aAp;{FU=65=@TptiuUw@hZtM2Z|L`uK1tm?y^>6{ShSC&(KfHR#F8~w_1tJ^!$ZSPl>7wHz4 zI8GU^d*SR0W~<^7#VNzpD2(8g<(Xc-Jpn0i0N6RigAfEQ2U1w$nM16^?M;c78=IP> zg-P^>PNc}MTe`zRaF9tyXG@}kf#v>45%+HtAeC{41riq6Y=Ms~z|%ew_zerNREi7l zj}+klEbx#8=2_r&3rx4b%@&AQV1flMwg5NG3g!_O7z!Xk^+*ilUtj)FM-tdY=t~^K zze4_D<-wOYn1A{F6{tL9%7|0eM7 zGXC+!u*4Ytox{J8{2R`{F#k&U$J0LYfP_5Vk~p5$Zu~one+B$IgntL{uOt6*`Nym7 z60P|6AC&q8yMu`z`1dXUxIaI!m47&;;!AAg-+KPBGEA_?kyy#UrTlw^e=qRw8U8)a zKTd%s9^oJEQ1;2wEeW<;@+Om<8cNjCT7$pFTbQ+tljQ$e`JX8Nm&t#n{GTWPqvZcI z`R969uyL^b50L*8<-b_|yUBl{{2wa+o#lT&`OlUAHu8@ead&n#7Hpe)!IduSvE*Kt z8!@ph{XMx9lFvEeu0z>V6NvXgP%VYW0&)*1la6Xv?&oGtRW{VD=W(jpS3-q1B(eo{ zGpQfHN+I<`!QMzM$y$KQKD;5Z95K+oU5V3M*I>my4{K~S_)g67`yR#DHQVpI0N*3{ zzQlJ7&b-y(dlz4C5@x%Ib39;CvHR5b(ddmHVg92^?c9!rBS z3^q%HpGLVfcr$$cE3>N^Xl3?QH0(Yk+^4wOU4n^1zB*Uqdl8i&E~;Bt=)x?mJ7bT% zv@UQvZza({`fxg7yb5+LO}q+r8cnW>t4agoh9zjm5^(*>I2>>D*Y>gkEDW#JK=*THw9$K=_?N2GST0)!_gbb_DHe z8<^1z;|Gk`wu2!!H(|Xsx~olK#xHE$>+%oz9P6*KX_GGC`s=c$&CxyC)u)z6UtNIU z=x|Z2<`E&RC1d4~XJAmA$}taw@>k?6he{PNEDpUCaJU!+tVJ;gyI@==B)ZW(T>IG zmt8zo_X@=93`MWFu3jL#R9?4&P+I_OHFzF7R`--Zm?EfKEKn|>C4j0sIYYYuep6fv z0IdRq2{)>C-A2!?qd7=SIJxBx4-`Y7RorjU$uN$63p|1>oTKW&F&xmay`TtTXcJxQSR6{ke4Yg=*rQ)tid+=yEg8#qIlk2ee zZm)Tg%n+7?#CafuWMW+Ro=ELu`(K;mInF#wuIM0=8Z*@VZ9t z36Fq5!NIQ-NDjz&+41F@&UR;se2-{Gm{Y#nEM8#57H z3K_T8B$y_5A(Ra%DcoCzt{4j;ZeS(Xc#fqTDgT``nS&uY&0CAXarje`ZOkZT$#b@I z`k`%oMH}@%Y#MCMwNT^$EinsATPQK-AZVF`6@>ikO?$9Wv~(L9xY@O=6NfuEt2C`I z_b}l-Yo1q{7No^{iiB+#TbaNyiwkSS#I6eEJ5c)s*P@&T-2{Ytr|#ft#q4QwrQMO& zu~1ScoPI&l#Q;+hpT8)f{2L8H z?Ce?N&NG3c26ZQcdK~YQy2*H60MBygjpX%a+~FLqn_n~lZ3dg{M{aF}0*>p+V+F_q zxHR89wFob)n!;!L(l~DUr(+}?&G%0o0EbfS6l)kd9%aLqXal=cjvIT4(xZK90F=zc zbyHLz|Da=ARslHX$Gz9_*fC_vbm9GpAUGF9*C!EO0*G3FfRTSUHQTy%25CPH5I~BV zP=t*Y1%Z^c<{{Mw1$$y`tmABP3eH?CV}-<7MLu8fd8tcNJqEx-Q_?e;5D{6L zT3zQE;t#233UO3NLVSPDUxG62;3Bd4Pef!Lp7$r#!a<0QOcEOe$kVLHZ&JY>M(4Ih zX#HZxgn<&WqY(_;wK7p_F>O1+vb_p-^igGO87lGN~JT=?8OAXF1izPscIJrYOEidWBykv8p zh=Y#J%M_0)%fJj^<>tJ=w20!*U;3*u@Ufb0-JoIM)D{>Royh>5k__Z{7)bH>?kFRH z#^Wsm8vs!PLBqgk%fRb5s#KrQ04Wj}V;HasMLQMhcHkF<5(g;MEtcSgNrDxClDAH| z=xVxs45ee}Cq0^n>R1VBRsP;8Msfq<$%_W_~+9@^y*K$gK*t)3|Y zm;_{0UYm8aQve?vX#^k+5WsRchyadOVi3UofLap36yTr$Hr<#hfGHNu>h6~3mjIFH z=YCe5KS9m5Zp95MhdCM`h3}bZeA7<8yI8)(0erW&1Vc%JJq*DbLr6LVpIxuSa#|oZ zJB=9aB=+PHMo8iSVh_MUg!JOEHg%5zV(Ko$-C8g^oUUeD_i96MiUvqY-JCRnw3FZ| zmY_I*;Bl7VaY=#)8-foTLXtYaA-1!daFar8ZW=M#N$kDDP3pt}#OmQ7srwtSsJ`8y z_&Q`a6MN5{Tdks;*aES6hM1?}qf@f38Uq@(vP|(PvBWzhiT|q2e*UhVDq7!NHymSA038`IWj z6|r~)sym<}%q=3N8x<~h$w=fuA(>& zkmt&C)=L#l*mt#LF;eZmVY~|AMY)H5 z5H%W#v-udlG#KCipb>>{pJB!~m%i-OK57EIuK_yj*rCz$=ovSjkE>_?TgH>yh~9E1 z7~kpem5Q`8`0=zP10XhL$epP2lP!rp7*T@RT|UECl9xEM* z;WT2jlh~>*hL|{@z`hIzDGOtg#L5k^VkOpL`*u?gIfme2EfB0oBS8EXzy31e%}QX!wPt>a}t$frIBekTes@Xl{lG0ZNOiC1fq9St@VQw6fSWt4Hh z67J6FIWLVS)g?UJ=^kXfhKN`0OB*(^8Y@DUyL+xuY)8OLQl8gx%7;|7P?;pQ9%RJ2 zvB2g|10ZVIxyp5i_1lbEFE*6!*8nM+#_aNHnp7{)v>5P9p%n*c+I5!TX-R_p4MA54 zbr@#}mKcH^TOb%rBS7x!(= zSf(+=8k6i~m_4m`iZ0%RwgG9yZju-v=BD$F=AzUYUr*5Fj)kXrMQRS$be}Qq12s~g zRvKyGo<@l*^HFm)MsvR;}w2zrA2hq4fa(fcf6hO?9gdJ4vvYA$Ytc`1uu@h?N>3g&@_`TcSm6QNW(bH?k53 z5PS#@BC8vKMP)V45L}kf6uzcrTlX46@Z=Ty|62*FymId)XxIKGqb2}} zX4Gh{u_c9hYg!j%b0{-U`^V{Y=Vi0ecz_qVMmc zM$(kk17gaK_7bZ##O_tkl$7nQaGhm|*}_$7i498<>uZR;_@x%E8`W&|q2bmBn5JCz*M%pbkotIzMLczCV zMVPptumrdA^0D@kg2c9f(cy7Gt2%rJpwv8Bi2dF%^y_=j$J4~I4)Bg37g%JwQ4AGX zLP}^}e%%+EjW?^=)~zx)U)KOBg<@~TJqY|#x7gx-yd_wbBzOU!RPMjLSh+u$J|6B_ zjJ;jD&-XQ=$VnpmQA%N6{>z^$_r`4NK4WmcqXAO5-&>KM2K>UkEz;Lmf>VG+#dU=t z_@yCuvYKt(kRdpz1%i7k(j6^9TcmxK;C7a6sfs@Vlq#+lE>dy5L?4g1I6{QDWT43Y z%(ESgxMn7iRRf~(zPm-mRi!50KQK7W;n);$jY_NAX=nf4oIaghBo3(C2U~)>F|aY( z1&9P+Fa+CMg8LbQuWNu5g6!>k8xz_|@bg@gKjHv_@4-Rp_o^hp3jn2xYi6aCQbjMr+>$h`c| zK9dxi8MaG}@1yG5Ct-Y(9imbbV2TFlFvkRt4$+^C=h+5#FXO2*Z0(Hi@$i*e6AgY# zwdM(ULvQahYz_MuP52BtsH(RLkWKmAv6}KH>E_Xa^!l;JqPaPV=1M{1onbr4ARC&7 zET{@aLlml)MV6mL)(Q}dL(QimUhTxSHTX7(g5;$r)84u|AGI?@!FF|4!a<5c9koho zj>(EIzrUB*y%(q?Mzug}Z}sApmYA&<&$Yy|lf-tk*OaaKM2pI8YPNNcF$CY#04b^4 zTfO*8j!B)Z7hO0=>TU!UP2FXN;J-I{MES}XOF>ye-ya^7r zT<$B-^31TEK_tg6!>f&SC-5lrnsaXFrp&qh1q38zd_Y=Lb`2o2 z@1d2u@qA6unRN7MZhG6e5?wRF!?(l~&%RzfcNjd|k#$}?=}LQx#q$~hDxQBz_UGk4 z_%Dy7M;d&!>Y0+QELC1f)6N?32;fc`d33bIPE=x8u{_cc>**!-@AFg$|AA0Zamh)T zR_^P@^;2=pF|PkGuCK#Y>JzAFOZCYXRQ$>M#H{^JZDVu$O>b_$o0;1@{F3ZNW1ZtI z*fB(XC8ZYbMjen^_&~C#`;of3Z4HONAoZ+<-6otgsvBJFetNDZ^CR)l1a);c7}q7@ zn%f-wN#k+1ckV*aRg=F_a&4&Aw)Yv|5%B$Qwe9lrJ<>s66!+P9)-%q< z7($fI2Q;cA+aS7R3Xd{W*3!|VwCUAtM~mlv1XMh;1W$7!-yW?p(U+8)x38q@?Mlod z3ri;@Q56a*QH!qb9R^PuI(k@2FGsgnJRfkJB=x8~jvQ!a=_G?{0YZ3Dv35jFbxkYJ>ZeLk9aU;rg+*X@$lMdW^UgNo+A0W!M9F5 zQ;Ou?D!)3bdoWF@G0c0y4-$|!-Ca8RG6slCZZ?pq-6E2MKF;*P;2{P0?{0 zc6^f9S%%m_USjW#Qs#NM44kA8W8Qj+(N1CufIFoHy4@1n3;-!Z3$$9o)B^D(iB& z1$Y6BFm{#&DlAZ90eNbb(NC~0MHV>B0tZ;2g9WlI@EiLpjK0GH2@7ntz(*EXV}Um; z@QMYVwE*9r6@(92V4ekTx4?7@+-!k}1twVFVhfyWfe{uMYJpQM(8mJZEpVg-4z@r? z3*=a!34I!2^(PB#v%pph{L2FCEbx{E>Mihs1)i|L-z+fS0(V+qmIbC-V3Gy?Y=O%x zaDfFzSzwq223w$?1&S^3Ckq^EfqV<_sZ~j`JhjSv|CQY&0^eJ}wZLZ<_|O8YEwI7@ zFI(Ul3;e?Z3oLMt1#YuItp%o7;5rNNsa4^JPpt|t+5)FrV2A|+k7U*h$P8ML#Qb@G20MA2;%XSNVWr0sEu-*czEU?@H zydXoOKW%|U7I@GCcUz#&0x=8RWPxifaD@dbEpUzn@EDZRDzm@<3$P0=Y~U^%1#oIw z0o-||0ADtdFnsGofd8<2N9D)%J_V#3N*B!bs>{a~;H4W9xWNLiS>QPfJZ6DMEO4&{ z{$hcd7P!>{*IVE!3yibC`4*7PhqGFFJBO^0t*~yfqgBIZGqkBQcB<-Ebz4jwpd_;1=d<%r3GHKfE<-& zUi{O#@bU%0{8tOivA_%q++qPj7| zYZx4~SAfT^CDzaE%#!(UE%0v(Y_h=n7I@nNOD(X(0#91tQ48E}fw>lNEHKRgjZ;Xv z@p}2MlK(5^f1Lb}mH*N5KT`fH74-BiR-Mv3C05V=cBMO_Z7WCKo2$QLGj@ewpG0Z zY5JTsrFEzNd3asyIF3Wy%TdoH?uEO>9*(}Y09Ich78BRoXp`4WE1YqKVIIEZ14a$y zI5o^u<|*edc>>Z>=Sj#&iMcd_EO;wlg+s|)$%A~2w~SX+3r z_SGO*_C*HRW0aAe&D)bBN0_b2yx+)dPd=-C%5lmBrEKq$mdm9pAjCO9S%EW>E)yFl zswk|)KQ2eYh0{}4%!4B?n!ez|u@{_=H&(vy>i7NmFu(8h0>7{A;eOw@_(DhcebexL zalYSo1vGo?pZvbR<0~ri`|iT`8NOqV@%ygBw-aA=H{2_Muh+4D-vWGJ;p^Sq?|TTJ zi|f!e-#CJFbmUrOWh421izwe#Vpm~Dd*S{y|;#-Sv03K%f2fl-Q`+X1N zHk4(3aPI}m-S_w|KFRNU65r2f`+cYN_4~T@^ZV|>w*}wGll{Ks_=?~+y}#c#ae&|V zF}@)K{k~`M6`TToFzWpR<_$r=Zw0nrr^7DB;;`_?8E%NGx0ru?@N3qRQP>2;^X}pd>=389K2~- z5bTM|Mm`Sq9k_f3&b3a$wfB{8w)VM)1UcxAbY7YL54hu6i-%}5WZwq^x{WIoI&6Le z;eHro!%c+`?!CBC!(9i1x`c4`4EK(P>$oy|G{ZGykAwjLG0GVOhi{8PmpjgCu$2?< zWp$jDeLQ@4(F$%ITv2f0a)jB9#+PBnAWY!-4jpWO+Irlf^%2f+&swHonMluXR`%!9 zvwh2xF0-=VPqC-S!(HMp(De1sIs^MRT$1jqPoKw{SS!6{R^6fUT&Zxgd-_i)9H5?zNbSMe2E>amT>d-g{rZX~`-uNd?@3f5o)rHMdLDU0&LQV5 zNIisSCY-M|u{ZaTW~L`zxBYwp)nH~N3I|`cI!we~>a3~2AzW7bOmGi0$sPuNhse|9 z{lECx);r11$lt>cYRNy&Px{lFy|&>lp0M+MuO>Xh1XT_5FX&$MvSdsJUW1$tuU6$?Ug1Eg z^f65vO=1{M&Lt<34u%gkomn6ehUD77l3>KZ6^8lUTMiscVakjBH_Y6oVn=>Gaqpg{ zL_3>O9{`A11(laV6%=10g1QjyVM>+r+t{Nif?5h78NE|_^qVw#c6xNjMxW-5-Z?$` z0FB-zJ$i+WUgC}3B|Z9oFk1}f+onhFV54VwqZgz{e@&y~JW*=e*I?JDr2P#5$+Q=y zN5560w@Z(HyNy2G8=bw&6cr6>^nKE!kFe2)dZTwwkM7s#?bD-ow9#|C(TmfgFMD4^ zmzy4a9kz)`+TQ|@OnYxemjz#=)lrS!AwBw?Hu@}Y^k6#mQjNZEdh}5?`Y>N#p^+pe;Grw}3q#dt?rsn&H*eoPzUkxCc_EG87XJ~XhbDJ9d9vl5OZ}idW z(Zd>jzx3#%ZS>Q<(Z{4mZ>Q1sPmg|(jh^R?UYQ>K?e`?@xM??)`Hk39Drx7dGs(1% zOONho^!)Vb_u1%oc%zR`k6xkC4@i$b#zsHW8+~GW^bQ*R!1U-{ZS+pw=vC>_*I-Tw z)dlu|rl$Q<>`IliuLqD!dn7&j?Hc`{^ym*FRxM_db!X>regGcZUNG!;}ncB3Wk?Es2aanq* z;4if}#|X|`;G2Xmn5f9WnbB}$+@}h$5qP-GQCD zB8r4=*&R|OJkPZ}k4d}>k5qwVw7r)q@{G3kE{l9N0B1;d@Qmt!JXa=e%s`vbChx0g zGuq@+EZRN*DCc6~dA{X&T%t<`a%r)>J>sX|5rJg1*junGR|K*F0Fn0=M26UOL`>O;tvnc!rH0_D0XBQkT6YLdh85>}R95)99Y2#j6cbM$hE^ z1MDCw#mFt>ycu}u`%ckBR%DRKMw)B2DQS zPg5F*<-`GY%JD>BpwTlV&PRMC`aRz0 z(sP0mCaGVf(KGV5;K_D=yM)1J{|UZl}8T9QRJ`h(u+89nAJG5ZPzWA3KW zGuni1Hu~Y-=o8Z=--yXz6mOWuuStMxT_lqZl#T;JU@aighIBC6 zF_@of0rNkX8O#u324?R47tF5$aHcbUyf#M6kHNu%d2tJv&#;)GqZybdTFjRSX2wUC zoR~+ZVqVe$=AV}uo>B5MFz;tEw-d~aAFrKF%)77;$HOywyy^OWzr~E~%D}t?@kJU> zazoE_#*f#IC*}uIF|%Kqj=98QM)i<^d91~JmSAT5cx@Fimm19dlIm&M?u|gUVgIsT z6g;D0=brR%T^)JE<4}wlTEckl1%(_E*I{un&7)L2x?WX_u`)LvMcr1>UAci7uK*T} z-Q?BSOs>3@-w5R@qrXrETq4KI0eIyYuO&l?5u^pJZN|gB=XL@r^#cQ$3iuVUIurFwV_Y)O+ zMrY(~i+#9YXViFYM0m$KtuJw62KI$5VBdg!LTK_b`YOB7Nfq9|)86WIM#iS)+DX7o z6KlM_1ZLOLb^R^r9L zM${27bVyo{TfI9)cNIhq8OS{m)!p!FROBc=W$v7f99oSLXX61}_^}MCiPMpumRzQO*|C4OJWYyG}TlrDZtuk`y~zQON1 z3oX;#c*$q>HP|x(b34NIfXuGKch05o!?zw^r^~P(1m7L_-oux7Io?#kcN@Od_;S%M z4Z}AJ-&^={uJHSY;+u}|4SZRkSAuUEzMt_;oZ$D>Oy1OKF}5b1}Ys;rGmBr2QuFjBgdb zZs?ochVL7EBX0Klp1`-?Eq>qi_&&hb7cxy-U*~=X?5y~>+}Xt)4etH(WewYXL(Jr6 zh7-)5inXQAO6eOo>$&FYj&0@l)z(ki&ly!%MSUuES8Z-;>Q&#Ey(DV^wT`&|Q0r&-Ws?O^2QB?zAIyU(vB)=g#qLIl=LW zQe1(K?Epnihr=$;#)Mb{ECt-e)9D<%jnt}FJ?X`#R|*cGj2y~TjXyBRLn4!$x3o3O-s7H{s)h4LmHQU z@;i0vfARO&Jmv2LnwGyaz|@_X_=dcO0Ngbtg}?u%`;QOs=sx&-6?X~#k?O$ie~J|5 zNg;5)$AoFf*${Sqb^Xc_ULbNWOXcVUmWD9*yME~QA0r%y-h{zHe{f(+1GZcBWfrR5 z6m$DkU(p-57`)kcypbQxE!7){oeh1fmjx5HLNlo_8>MsKGT)E83VB|zy{n}!;J;yKI6Pf zo#)P1=a_MRPMvFw^Hs+A0d>CKIG=5tXQ=Z%Pbrc?;vBgg^Foc>Ap>3;oQ<;V-tLSj+#T(nfl)=Nd?m3B?yC)*(XR_&)bN(b{+Ym_Uzb zccTr#Yq;l69oE|iwM4I7oEi^Cpz9In+LHo3t}8}}e$ipQ`O3w0czKvp33E`$^PHXAy!=g05-NgX*#xG{BBvKmi30i+nl1zw~+ zxmC@Iq;q`Wr%=laeI_>nS63}Us@p3l7h*{RUb=BE-ZzU3#t#L z1yV05(svBzHTHSwBAszNE^wwI_`8nqSf$?)jHeY->#v~_5fbZMv;Ufwbz~L-waD0eyTF*%pDpY+F9@;kfmb&_2Zz&dPjXm64vz-T zQs<-4)UT!Z9vq7Pnk>JQffhB5yC1?dqV#wB6yJKR&UagdF7qm7(%p$ZgDq-di6K&( zhz<&b9%OGbO!@6)Ke~}0!fix(`|38s-YzXtWHAZ?=t2Zy2cc+TTXtw_Ld)Dr=uaq` zK%wL03ZQn8(?e5#@s_q1er6KZGABonozdVVcwr(4lt@c^6?dy&TMTrF20}&CZCDmh z^Ax-oKv{>@q3(cVNe;k@!b1A9>cY^8uB^Z+3cJ&_leiX(LvQy!5m*KC=M9x~1v ziI+-)=-tsRqqqhrwC->Csl}v>U;wMqUP0W0@J6ML{#boB^Rv1%?Xa01h)cu%!5TP=48?Z*!Uh9ZCblNp4P5H zd2_d7Zlm!mJS>m2gyLC+PDx%I(@!Ox;%(eF>DLc0(Oa)9@ydbMFtt(3(kDo3v=K##({|BD zv|sGOMjNvu;iA;VVmJUIcT@W9V z;|wi~4?+E36d!{6zk7TL)-Y3J-X$?Xss*e!iXQ|mSn~vHCtyv-aR$S2BA&#vBv?)h z!MY)sWPbA&ar%4&GK;t z%f~oVKKgsgM|b7WU4hVz7a>{65<-||geFVL!wfM9Hd{{U!IDCgWo0S@n6k3|dr7!^ z72Ql(St@S-rK~W;8TrNXaydH5(txA9oMg&NYhaf0lI`r;WRads0UBaDyS zq9pTy*dn7oD=@c>?ox*)y)p^PMC;X8HrKuRaEdl!v*A;sOa92|c%yqeh71SlIBLhY zlQw4Vo9Fph}w__E1@cRHi4=%~Tt+ z#0>*QD!};W(IWbc7$-LCD_^)j8_Nw2db-Q!1$^> z7mwVRCP5QcyR9*}i(&d{0)oLhZag$$4_jf*GR)>>5>xlIfi-a3!3ra11GOhG^jdfN z7keb~4_MuDUu4f1t;!adrTrIGAxNO^WBBm>TPhPvMA@Hc>S+tBYmYl&(EN8S>N|)yb zVs9ZXCk-k&kJwkT0hBp|Fak3On9Fyc{B%zfJqK{FkFa$=T*?CHyoLNl9Q^mWDc%}~ z(T{&~M<8$Dg@CVb1E`_#puq7fZ)hDTTKPlZyn6T1Ccke-;N0vX2(Tm2y?$6-I4(Dy+qC1#SE?ljs{K%i~tVqOlZu_2PuplWPB^7SHE}r{7ZIo5K;(dr}wvVC$OiB4Dsd(x8xitg7 zEl2ef8HEl&(J&)@oW|~k2}m6At*Fag{t^!6aDB9(Gfel2j!lr7vzb)tI&hv6!Ct~y zJqZ$IkRb>nWxQtKoEDK^g}KERk>{o$AELohktgzid=1Fd4D3ndP$F1rn^r~(VDm+~ z4y&uU%IC!15lLYyEkH^OwNURyIgPP>LsJuy)0-xzwu_ODo9@?iVDpir0}*`gEg;1J zy%FF%6ClSM-~t3_EYp@}O9C+F2)e~Y%Q+(b1h$Wy51rL0^{fL=!Dq9CgAeSheI02(qe+)m;_@TMtY_n2NeFg;nLwgyM4NI=nvrMQAK8M6grq(u%P? zkoBg{XNN|G&O&`qpaThKV=2}jyGkz`6~g8~tUZdHv}IFJ6c%Is6dk2NY!gUIzv6uY z7$#TBtkN5>g-|bS!dRN+mXmC>4;W`#3>;{Wj7NhJ865r1AL*irT#c(t%Te4fC3+wW zCUDr+=LCDh5nZQ{Q_?ry2LA)%xG&v?X}rY=29p6wB|sPf3X%aXaDqk20No`(F#(skT@V^GHYwx(A>UV}C#~`= z@XB`-2~ob^Q>+~4xCD~&-Du=F1yci*@6*P<>0+;ZZ=igKdE|T5S1R9Zn~sF;OX+SU z3@z+V8H-6N{|gK0niI1?0&TVxwS<7M#iY2OwjmoYVK5_b@rKC7q|j$2gBhWJ{H5}A zP13^%z210?PI?%j{~aEC5xVqmbgAkW_d@CO*7KT$$!uYou#o|+PZ(o+ETs(t`1nN- z*QC+=p`og7-w+(VKY*3NQK)OA8=+0T4@Fp-0}OcG_W!0l%peEZePQB7U{&=A2wz^m z`{|dpfH}t=poCBS+tY(&*U@vULIEx^2w(Dx`#1DYr6ESSTLQT^_aQMO<(>qr9H3P9 z+J?dwc0Rc!-^qQzt-^pC>B5Z<%l+a0pG|3m=Pl^Z9CPQUWRY^(4EuW}V_6 znre3#upp!6V!)2HVQJg_#sCW;I_ZOk%8VH z+bpG%o267bvvO31ln!oQ|N6c1T3s4nK!LfxZ2_}J;bvGxX@mVnR#ATaoDy5ji-@eE zc*iUkCT_$w9wWe1k9x-Be1t8}x1*bD^@G!eyM^wf~L?VYIlYiM9q#xCAv%Z9#AQY)S(#FAYtCA6A zPILpjLsOlZFjz5!;&)OG$@-yjGk8oIt(|hPCbL|Lsq9A1^i!i>ZplHxu)vW zM8r%A7eMX0Kx_>pSb^RixP^x@vIt`+3RWXHC{iNjBFm9&LMR$elofCMx+$gc36uJ7zy5#* zaey24OFTsbzs8(nSH{KNlpvoUSEDtE5|F>gKk?(3-5U2&Yy%WN8;{hYvl!cr=uwgM zFnxjh;86jdipXvOTG(*t!m-PIcK?Lb9~3V-xv4EJ3IjC7+(-yDZVhi-uU|B8&Ep)qTw)e@#Vx{Tm&?LMwG@M+9}{eyVTgN z22u+DhgiM9$WbF#4bEZ1v6C8|)nI=Rj)iIzsnK1HVl~FA(OV7ZJR|f~1MMbl1JpoQ zn6{uA=v~l8HHA^5Mui$NHAbj0M~yLRpxR-CQZ?qPQ3)eHb)Ni>Q>XcAEKp;i8jI9; zOpT}1Sgghh7!CMp1~r7bs8N7JG`BW{3e}dS25N5xk!rkQ>UK!B7)}jSyCANN(x%P? zgg~b>OdXYkW((vS)G&2)5?Yel zjjd|9YJ8){b~SdYu}h8JFdC*}Ld0+?T@)WV$WgaJAe9TSVJi1{GtF@5Bo3XM9k5-7 zJQb)>NTcsjBTvruy~y!*xbDtkIN^@4a9y9;Gxs#bqeZYcM7!f(Q1(6QC@H z3jB@0;{@I=@OXiD3OrHZT>?)Mc(=e)1oq)_`*^fQ;4Fb-0t?GgP8b=sqdazCIFC*e zSeTDa5m@=3DX{WCTVUmXj=;)4k2hHU7YMBUFBDk$UnH>d|Cqqa{}O?f|5pT7{&7kM zIF>HqnMjiwQzZa2CL#bdW)cCTF;fIqjj0h> zH6|voYRpW5RbyrgtQs>%VAYtp0;|T%6IeB7zQC$63j|h;Stzh-jIeApM%XqQBb*zJ z5$27?DF3Q4%D-xi@~;}B{Hw+&|Ee*{ziN!~uNtHLtHvn*sxivHYK-!)8l(KH#wh=) zG0MMcjPkD@ zeKAIJ-eCB$_$9kTI30mdx2u!AJ{8d$xZ(hvkq)TzN71_l8T+2*hQ z)S2E{s*raP#hKnk;12{Y5O{;Yg#vF9xJcm50(Td9tH8wqy8`zX_#1&0|8{{D|4xAw z|1N zM-Uhj)u>V<0;2()Psj%%Ss9%I$iFgrGmT#BR^r490OUXoOuT$jSvvC(PLaAde2POC z>)^3jJ%a9~aM2#zcNmT9`qCVxt@=yG+G1jb&w4g&qZzCvFP?wIU1i0gwfN3jof9@UT6;Gx922H&;_97YyTyKZ(5$SRz-=IC5Rj-*10qI2Cm7If(t(aN z5*9TmA`U(XqvK?tBd928xR z`4P2SQk+;i707gQI;SDtqllLjCzcNTea3Oy(z#8h)7^>_y&RbVHyn8SKnp(x9>8;? zA3fY(^BTr3#*Qo@dps+A@bHjw_7=PtCBwuN9JX{y)im6kWDA46LiDd5=+Q4>sm)=w zu+wDNP=v8`=6SX-o|z$DCc;<>Q$tvEDYB4QSImx8R|7)-ZCxFm(=rcJ)zwDe|2K7Y z-wD#O>MGY(qTkAN;&sI>KUB{(=Vzt`u7YDU9jC|Z=#hjvx@$AGktRuoF@&OEXV??L zWQH|d45Ekof@ohEZGeh4z?Lh2vuOIN6$sZ?y@CJrA@=#~L-kd;h^?>66aVwY|Gwfs z$3st{Fq9r}(PA$S8?O8(^b@{7muG~s5xkO1Tu(+xVbSX7OY9X-IA*cKOdQMv=mB2D6}>5p=zz65rb8eIdxrp zR78v62zDGJ80*X&VGBct#;{`uW7U}#+QOVN>=%Tw63wphFxbTRM24SQ5-FaD&;sPj z50xd>9)DST{AKO&m$hf^d?%hGj>V*kcu4$abCoSDc`SY`9_Cq*i-?|xuaWY|)XX44 zqntg)D$klcL69LDa`N=VU83?blPWwmr6F5b53x9?ht{ZvTM#cPPAna=Di)1=& zlH$bDAsZ9oARQ;-Wi(F*9LD^NoMnWGD9p(?%yE+CMWt}sxBN~qrY2=2mi<&RK8sQQ ziwK;O9>NZ7BG4q9VYVmMU>NDgb)n~{>E8jUO6Y%+R#oT|hxdI1Pc;RFsz@FJT*xPm zoBUwNOmT70T;k?9gS+0QZn>bGRFQ4oX?eZIOb4~$rmW1!h4|mM3%2u(8m=v^m3%<+ zAp85$*f#*Lq0oafn(@M2ibJR=9&P!7jDx&bdwS?D9Eo)?+T(o?GT}N`Mg(a+k*&pg3@=Ycs?WvJjm*FY-bb+HS9O-aW`oOR?#gVMqx-VP(s7=V6S;-3=qYyJ=H!i8GE^Q!wFeIjI`7rhyKZ}us5Lezi`5L=M+z9 z3o7$lFwW0sCqC1{&bWtI@RP=^%2}CnKvEUw= zkhXk$UU|kR4HuzVs1&s2bs13pB}pL?_spHVQ&D46Prl!>A?DJGV}8SFPWuVz)s zvut;NRNztnq%Xb3A+wAdH>!d*WBsVK24?cSyTIJz$5AYdJ}5TP1Gc>pNVN{fMuZy+7-;Sq2-3W4CA@lY7cyam^?;5@ zXf6}SyjIXM7ICTMjm${TxVkWSluM?&JBpQ)E+>u+Svd3`xl{S9So28Ly!#EFCW~Bq zj1QHz2bqzLV`2n|-O9pMGee!y0@E=2*>gIUg;Oz~uR?4lrO5d)Jts)18$lg(IAm=l zr#Kjka*^FMbJW++CYEWbgsfOV??H6VdSd8j0^KLk8}fZdh<5}~n}Hq)_t}M}L6r)t z{2p8{o%A0q3_VdynDQH87q$8zPj z>Op2ie=uLvoJ5@qEsI#K2n1Oxp3pkHGW1T1HPfMbhesRveynO_R9Q89R$o{ zfUR<7yqU6cN_sY{96``xbG&l?iLJuK%6WMoD@UZ(ymDp}J)v@{f$o#&LeTGrX#y|Q zB`QjaeiABjfy-adTm~lYe-qme{iO=sZo1Ev?)T~LE>wZc^>k}!i+3npyVn4q5RNQm zInh|T;XV^>-!05IjlW^S8X0o|5$)j3?yI2ZPt7wwdUGfi`p3!&H=sGR17bk^2)F16 za9f1hCuQbGKA6vF(iX7C$0?0jDx+v&m}*KZdXsHUs~H7%|AQPJzVR8K-*c9wqk<{J zU((F4vB^R`nAH$qOT*|Z(sUylP+mzh*C>=DK#`C$AYTw)Lss|Roh-^-Q_=!`sPiJa z#kS_L-$*SNp#noQH^o!TJ9eQ+#H{?#7g{xuZ7a}T?!uXo*I5rjXUkGFst?TrMp`Z^ z5Hl8B&E84125z)qTnq^!dXPUV z3zuGE@7Xq)ecoY{+GMWY$!xDnFD?2>n{Ps18qSfGxM3CCr%Cslba$+7vLxXj@S{$s ziGy)~*M1-gZd5tcj&Ha=+HaVp_GCe3A%b1sDM=qjXx5d2=`<5iFgh+9JW^#pym=^L zxVFp(;30xpn`F&$H30ALQMh0eUv7hvowkrtp@lEN|42;}bfH3r&(>0R{i<5 z(t7RHaJ#@Z=93`x=Z0TL!_U;wGqcn=}w%TnL; zRP3hnY(Z$`XP8@weKW9S?es#IMC8{9<}4ja;rbRc^dv!pB`8ON78BG*g76X>vF;)0 zRDg`CDMFUE;KYEFiB1{jZyDAIc?;GbX*$*vYRc4VxP1gxzIGv5S#N~rJR(@Qx@ot^ z2=S0ll0BDEYk>A#4-M@h&oX4FROdgwLNe$9!Y-2S=vxJwLzue$_@RQ`Mwn9US}kCS*B_}ry=Kwp zTkt+2zOMMr#dj&b5%?Ssfa&<1i*F*nhwzyciu6|P#a~AI_Kr;HwEb`0#@V)AyLOWo zl>_%Sd{hYhGrpJcZN+!;_H!7w=c49;D^>f!1b94>W&4?5Oc*XK@g62bWpll3Kb)h$ zdwze^ZzC_Di}u4!OD((y|AUR`oEy)7QMfbcUa(QPdB-X+HrSZS-@d^{amlKh%K5k^ zfl)$l11T)jhrzTxu1O4Yn%$6v=!YWQZH0SfxR2pSh9LY^5srCi8YN_N=DYbDq#}{Q!?_Rf?YwFl95LREQO53s_aDloqL3;FN}rH zqtju1ed-|${auah;Cf)Ai6fa%L)mKHeIcr*iB*I8ntgGg7Z!g&)T-GZYHzvyvZ*}< zD$z**@gjuk5$+>wBw(_?)D~h`MP(1f|47YotFz?x4_f#K=c9!`h`zGbgYS#JateM# zUn%ZULNQJy_qaoZ?rfkd zSSEX1Bt3z+-GM9n+vP9I?qnFj4uE6bCU7qz@H>iWyuW070yk^=TK#3MU?ciV^1;?) z{(Lziv#kkuywCiMa8eQQc(3^m;d21D^_s}TKLKvI&DLK6_GiMbwe^&M%_U6rksrS# z3pI@}Oa2vX0%4Z?E7%o;S@JJnDdc}q6)O9Fe9z!}1K&1$d+^? zfhlS15YyYoJIaKvvUQvG&bDpaqK}-1ILq*@z_%UWK75DqSq(0Adz1a+c1&Nb_2OK6qGwZ4L90^&i^XnCuHhdtq-V9HKwm zfMGrQm6C~K+2x8*cDlkLy4}Z#_Lha_7Coy7W#20tqW8UvXnztJ6us*Ofs$ZjF0(rS z9B97>8_$6Io(qGGXA-ucvw-nIn0tCgGlhrUsy6=!W{|RL)fWC6ZmWB36lP(znq82N zC0;lGOERiyP+YvmC|CnwO1v%?uoU7odC}iKfSLln&G@E*Z&%xX=}!KLLm8pI{imom zoXfblS1|_b6W&6`?Zm_WNibf}|KHq%%r&1t7Xe}M)8@w#L=gLvkQkvMFEsSc0%R2v z={str$Xo_2ct1XmowFHSaR5xsC)2_?jBk`r32lXT&nI5v>%ch!&#P?DZASPje{47v z8;_48p3&aG4%LHjVgJi(oKn`35n-ilT z{yh;|YJ7k#7O#IhPTxyLDBD|Y{|OIF7F9uviS_doheVQ?FLqdq;Lg&&8TqAwT1?aZI@1^-Y< zcp5&hcS+G#vrh|&ixuha!s#O_C)N*hK`g80Bac9HB z``XwpJ?|Z{ORI}}8ir=Bt38gaVYkx|kdll~uqkxtN4N^}{JQa&W?q9GS>beTdt_oI;vUK8MQb z1bP9r2lCSMuv~gje~EZvy?X<9v6D_elI@{L`xer)#Sdngn2Xnn4eF6NiRAdRAMcYb`r~H*?QNjW`iIV;OVu`$CnTX zcM)k$xx#P|<0D|GVu^!}>5hiEz#Jto`zg#^VlIzkx&_VL=s1J}IZq&`E95*P&mpps zC5Vi`&x`h!_&;68Y`lwskQwbke5jsU*~k^hJ)*xL9K`Dd@{{nem?MU%VlGj!vlu(u zmKp|JK_Dx-N)nhW2uxB0vMd6l6#*9s;3d~scCm3J2)LqmN&+QB+t)@?{$aW8a6ciwcwprG#WOG23VC0}mGc6M zB4qF&%yJUY9=yVS$qSsDYZn}#jg14av9Zn^@8yM&c0{tv2 z4wVoqZ2GLk0bYEkeZ^KZX=HA9f0iG)s2Y5|DJ+Gp@e-WbPiD>`M6otxAg<{m(P)FoP zLW+M>Q6FN|DDr|rU0=>ZT`J1p%3M{f3e{T`id$G!gBLJ?Q7h;eZT{XD7h;y+OXBjxp(j+AHgo?9?ag_O;UQbDJ zeT^_RXKpWGxM9gzgEYT`;R=>_CNH}7)AY3E`1XI2p7uF@@B1u0?LB<|gYRN|*-)x? z;`b{2=6nJ6{;GW|Yvm<>Q>?#W{DbSS@6ED7VoHt2tF&+rkQd`$0by8w9Rl|t^L<~D z1L6D98_8um=7>D|YPBqhJdPl19PBV-9LB(NdxD>01+|w$A9i%nGKZn-aoym+zf;lV zl`%+j7U=sh(G4Tr=wCre4zqzWY-F*wIGvkF+#tH=GT9}pdQwIhg9r`Nu{i*`=#ECx z*lyo8(qPn9H0oUQ46)s`#q3SYQY&5aTUf|oik%5o>+8vi=y7aSTkGr53id5wsxmJV zFmXbH_cY|`E6&fc2RRibwZ3mK?pxn^fLkBK?QZ&6Ke$%_qhZ3{ikcZ#;A{?;AdHVo zjQu6XPuNR*67zR!`BT_V)D`b9ECa{PLgWwy3S#lkIm@xOsJSiXp3}+9vrtvElen;} z=$Yx&!V6H@=%wjicx~Jr&Y-(NE~A&TE*hFTpz)N$V2D!g=`b64?Yv_q-W?(?hZw zfs;h1lyqK{bViWQQ*k;$K_?B}l#SE~^WZX&nhi9JdEj!u6Kr(xw~yQy)fPO9PDw81 zwS|w0-mTAvV)v8wHlrnoDc2!e{tE9U@EY#&!L(`-IAyRfbODpf%TV?IVE8Ev-)f%m zv|N$0DfzvL)uIgI%G^ATRIuY*pcad`4CeIf6Gi6hhgG0l zX=Zz*Wo$LdU1mBnZ@j~WsLE+oyc+ZyX4VgzC1Ol{3mM8jd1r!C;%uR17HB|9i>!51Q&QyXm|=X7WrvMPf=B85AV z0ytE;P}a?EO#+wd2h>Ooy$g;6i(rTLdyTz(Z!p2#Wb+gEevJ~fwQn(JYz$okhS&{)rb{dkE zhS7wbkOh*7?e=ms#Pe06ygwa*K6P$z>GP0qpf2gMY;4pq!kECzNbYHy$(!a^?)qY2bI$|Of(s0XlX06ixr z8QOgus?c;*z0HiJd$gr%J?+yQg_+;!1 zV)N1~u>HW+!r#GTqrY)vQg+{6jTjr*!W-JNH4FU)+RD=8%)|2tnENcklg5YMgx?1^ zn9jpb@aD6lEik>S%%))ayKgI|{}b2=OkbFswWo+mrq3a&o#~Eb)VqKhV|rtZ>C9NV zSM%mQ0-of~(-PF+fUktt2X#I_oXP)N#O0VCtpGNsl5bnR-4^ z?Mz*c%WoX=Vv>9gP!&^gNrd8jEXG;pj-35ca(2(*IA?Psqq1#<&#~q6CbW%)i4=d} zC*j#rtXr>D@XzTpu98?w856@#wDD2dw1Aw{OeyrfbwOaUd zqz>;0tO(^?X!fSP*=GhWl53P%>(sHyney1=o>%1>rr~+D$~fbmC)J+B zBVGe$&ABD&l1N;>3I4lyAd(9^&X4trGdw66E+5Of1e9^qG5hb5*zH1i~>*FM5yY@1I93%?{3wH z1@xM*fX|ZJXX4$a3DGyt#69rY!faju28~8e>0etvOc)Eow*9(cW7F3SyDD8DHeMe# zF-AkLc>$F4ntk{`ujXap=5kZ7sl|T-=w*T4mOfdsJ*fsw(YJ_)-sZ5H7U(E$w?eIc zt2qxg8P&XBO%yR<7V}w#UU5I$$5!rBV`qOnG*d%sb0B}(VEPX&!b27pX zA~=9xi*!0r6D!bdsZr-Dg}YDsiaHb)G;vCz6z;G9#BvhGb)nBo8&l=xB#<9LgO8O! zDxqqf&-ktss&(C^O5Kvb$-1saVQngPrN%*R0W^0ldjL|E?nAT=nTy5%?alC7QUGxoImK2-LJqD<#}Wd@!e&gw z7x3z@QI_ySLBJ0s!8`9YiUNF;1^m?FM+!qVBo7R| zbO~3N*fo~(xZz9Ljc%qjDJVNAb!*gBOwA6;*3or1fR?fV*%4~`(JqJwQIPL-nO{NA zOLUdHs7|=vtY(B(%OG71ODJ9HEvtL%bgqkTLs+6XS@iCY(}S}3dh_BKy@w?|vp*o# zV_0$}7DR{ziBVPkyJg?s_{e=xlldEqIu^UHf_Y5gz0=XM8`5gQ%1T-hoeVqifop<| z$236BmSyQB(%x#m23+^O^<)y7RP0f=;9I#4m=M^`s}N{$?$^@INNP;1apv{~ZbN6f z^6BF4(cC<^w0@cAV)GM*vNJ$|E!dZuh%B{npX_L5Mwly9QA|Bvj&Ia@ED%=`CTrIm zL`Qo`Z&h7~1NX4-ANGtDemo0b!ov4cg;(!FohcI9X08No!{{HhKCiK~w5IknA#Q9! zzs52V@&F2@`^g|JT08G7>V45H(t?TdYP4EcVvLZiKKDqW|J?X<^76O|u7PvKZKDv)AEuBB^cWkJv_l*#aTxwiL0tjg@PAODL{bLI2S* zidFJ^TSl>1adT=ES;5aPQoKQKZ5dS(-b}vxH<{(qlZvyOKaz~PGVYA2NoK4O{~G!#2S2!YVeo1(cpVlcISI>+nQ4t z1_~=M=CR#05ABUm*_Y2=K$bMirjrPcWsIKCVMRv*Kh{%9M@s&+;S`$}X~4f@ihoaZ zQ~cW$P7%`qEQp@LnRM z;@P_fc$Si1f5I%=;+NH4`-4nUd)2}gziuPHe2Hy#8px+;42{q}F)VI1FV3e3MlaSf zw^k_xC27qm{8=Hi$gw+sAUU?}-jrD^CqgQYJqG-w_A2LJ!6TW=aAb9N;1=wFUlWX` z!xy+5cMJo4_^)f|NP6WAJPGU2e{Ds%IVp}dbxuz!dW<6t?5v5gRu?{z_hAFv%zJl{cYCZ2h-GVzf>PI5{zCgBT(}hL!3U{;{-TBa8cL)!4K@m8LfPJ<~WiqdXM^{M9UmS6#X=xeyuZNUNMez_())E0tP(uh374JLTjM%)6@%MSVL`NUnH}9 zAKxCX#Uiur%S>O!dSs^r=*XU5htA|AUs0WnS7Uv~DDY}W00SZN*UAUm4e+55um_=o z14SL$AU3&!;LOIopj6c17yOVz#L4^)o>1li{BQDu+2Aaa?2Jg3PcnvTpfbLmPR4XN zB;p;$e^Bo5C4Nz|7fGh;{vM*3UlGRM8M5;cKsI?1;_?o{DK4)_^xH+;r{VENZfL?O zEcr5{bL5&Pbnc_}!uDX@o=l(712)1sTp@77GUDCBGlQN4_HV{Yk@9@K2){vuXBNUk zt0NG-NQZ_!4(z=M+mrkWtxgww9_RAw-TeAEr#>o&LLtiDvT-ie({j_&ro9TRoymO&=)6}&NC@az_ z0*JE4-0|S?CiC}D9|A&afiMpU<|?cU<5Li8@U=u+8rMaQ%@ zRY~(ui0M!$4&Q|@LtFV&A-a)Xetm*-IwWPAxdc5At)62yAd#a9&0p}>Z*0K(4C2vS zw9Z1`z){XXXFs@Mv_*5R{0==6OEjXo79tqXO7%4JD&$RpOCfG%N!*`AAEyKm(G>Q- zVc6jHUEo%!afJ3KCw*&9d>p6Y$J*-odIc^Y?$T<8qe%Wprtj!69BD6o`lfcR(n>S7 zH|+`i#}ViP%>%8vH!zGgdhsA}I!9Mwv@2kt8} ztEq)svB1}!Vn{I&8HS{YOuFz(7UbZUEXc(#S&)xkvH%-mf(3=qfJ~%#K=gM^;dr_d z)!7xe&$bTwq_acE+iEqq9cLvOPDnDuWd^8$HK9kO6A6c&luo2AY-P&iLoZ7xau9k0 zPUJxkt%W1{AN&igJ03corPb^ql57OeTS<{YOep#e{?YRwJ>vWa9;O?8PK7L^=TYTh zHlmA_=V^Mv%JV#a8}1~j7wD>>i`i?KOcyCPjHiqFY#2>fEnQ%<%yPqJq5q`ARLy^2 z45mLiR^hmrj^pW-X95dves|}Ovw?a^imR1Q#$OLgK4}IJE_6Ec^U53mp?_;v3cFPF zH1zgGg6KBUffuF)x{5J{_Z#9s*hkhM5*TvlLcG0`WN~-$qPDGDrJaLY)W5WqUxBk# z+I{%mg5SjVPG+mLZ}6QByf5Kzf_o6$AHzKqzh(HY#dj0F+wjfAHwWK*e2?RM9^b3@ zHskvc-)?;0;`<5TaePjs-5FmGe5Lpv#`kx8tMJw1dl%oYiTergzQXq%zF+XQMHx=P zcNRWBzW+_$=K=pSl=D4&eNayF#;bnmzD2p`;CDX02k;T^H~5G*3f}~L#G8rFj<*c{ zXYsv^PtMnTq1RcVXe1v6E=)LIgSh}v?}n^sJw%^5_Yn-Wp;aPI<)>o8qYS#J{QztH z5;Nug|JD~zr0_&Wq0t|y7dDiiMh8oz=oN1vUSZ6|VM@Yo0_@8>$0BqrVAACVEN$7D z@6^{o?Ktg2sM>)lU_&N;Ra9Ry9x&;eLcBCzF;WMNO%*W!D<3#uP<_o!fYGHdp8^-+ z3G4%Iq!e@cV=iyZH7Mq~74cvm1~EA73U<{5glk!Cea%d`V53;$Q&@X&|J6(CZTJb;F`?iZq&Kt+CI1>uS~e~<%1BVzUDBLl_Yoe11eny;F8?o zFf8+u#+(X1(Sp3>lM^t>9V*pGmrIn0e98iSnTH&}B%fS>NmpNi$MWXITs>m0?3gPn z=5oYbzfi$S@M@RHAF1%dpv-9j(m+;gAyuM;xgs8nz1QT5kgCh{<$Xm+z6t^V-bZwB za~9xwA4sCYtgjhB7g`G>O2F#^qrA~ zyWofXvfyNmxln?ALZ0K`nE?AEkF7_`iIh0xJ5iSYgr~kZm+TU6Ch(_txAYd*s^4Ym zw@UtoCZfw#&N4X3Jx_h8f>3l3Ah3vx!tV>nTrqyPlO^~?Emd8HUl)JzID^9nyR2F@ zFN+y-`EZ3;Kk79rkbU)NNX;9|ea(9O2SrrZX5k_Wx6{R8 zZh1BeEetIAtP`)K^&i&D*r)5TuM@AD)KOoy&V239+|(YIIlDL3`&?Sas)80WHki!J!T5`utwR z9N0yxuEQ@ZBlnsoeme|6@8dIEzM@XtP{CGF5f-~`O1kgxgg$O6!R_ekML-;J%O@3h zZh<{kNn}VxX=G`43W2%cUToHfdp!tudT1U(gRA&o*f?tk!$!&-G&t7dFO!>kJmV63 zNue)~$1+yg*9eh|64jZO5hB0!&@Q+W$i$fim%f-a5N9CwC$wv7wF_3y zxJtXAYdQvn8Gf&^+E_i}mf8y3S#yQ4~^fHX5sa zw``~wIxyUpeMR6mLv`u$AlW`lc1SGU?tB)S9QMczI6br-sOw~|+H#P2NKcgqmS3eW z6UU`jq&@`;7#r+z0_#o)`af$eJG;Aa_e^m}!I%LQQ=WqjT|+sD>)Ju4UZ;co2j@j?Pbs}Cay|G*+kvT`iR679nc3}Y#Z%_brf7xjze<04M} zf^z174(vZx&nSmbJK>%&GD)a8zDS|&Cxw~-Fg!P*f;$I=P*{Xl9q5PlDqNm{oh#2EN6}tgvNk(=g7=E<4!u>0K4)3HNUX&Z%j=cx!PRTn z&nJs&pe{*NyTr;Ela>}mwY-_APH8TxxhR+v)$@g@(hpHp@}fkwv+Byx5mH*8MBz>( zt@iSYr6SmUEjAl=;ZyA_0+Cxqbr5e1nKh|gF@O-a-h zl#mNKGa6x}`-?IvJCod95nL!L%!yW9^E8Tt7<$d~!r_E=sH{OTZpD?!pKm!^lF#>X z)|1ecPCsmw@#OOPU^DrAy19IEvTK)5`dgIGTq&O`P`LjK`TTBCvV4A~AaVKJq#(`Z zvk)2l|5QHRl+QPWSVBH)g#+@rR@UIJluvp7(8756RBJh2o{8TSozQo0BvtZ)gTKC# zS2U~S_021ps}_4D)8AqxSIJ6Vf1*ledsOp34wdOBShJyu3#5dhihve}DvVVesy0im z$ESdEu$^Od1@RgDN!pV`^826oO~LQktCIMAdMu5TH>zFD_-!`lw?B#B^tZ_GG?*O zm>Kc;$xQ5!G^_Nn$(2q(%Xx8%yr{KDywW2-CgmlTeye!;o8fMjetB~G1hkyKOQg?r zP{N$QLrdwqY~>%HDt)f?6NH|CmebD_>F-WXKk`G0^4r?m)Kp1NOir4BmXmgir1vE! z-8ngFApuw#V}ZlS!;I+n$ODOeH*`g=kf(@S(2hD66;Db&MrFx*zo z2D~Aiv%_>bFUC3_{9fY;?Ky6XlA9Q%Q|PaZay%i5635Lc^YgBmoTFAY@~LywDuFz5 zbj%hdb&ifDM3Fg4nV&kdRdR+LHtMM}wjJntYrm~IkZuDQsmY7CX^YPruP9w0?@fTI| z#oR<>XQV7W8j4}_>D(AL-^)$J&V){71D<2S`l*_)=EhL@RBkiWjE3_iD&LZgp>pRx z0adI1J9^yEMy$=3a9ec*wiP?U&8^fC*jY?O4*yxXCRdw z{Dzy1D|pSCD+(=)yaDz`kj9reE; z5|1v)B@l`2daZ};KaoRgR)rK|@~ifnZaRh=>DaG6U%Q~gc(`ZeY5jC=g=1?=Z6bk# zcs-_*fF?{*rhvXhIzBU&DOmHR!lRP@-Jri7yLB@HpwA6o(EqJ(QaTCK3mb(2w;wkZ zBVF&n7CKvGX(Ze>R@bd6JIZ<e(AO4cLVmG|L^iECV_ghNucv2`9*s)_nE27ME)DC26Ojp78KfM(@xP94l#qP zn=uHLv5kf6U*svM#I(J10E*X34~|92bWZ_rhd4r|PS#Ga95DQP2B^A+3SExej+@d# z+LQoW`r7;|h!FCCr)WVJ)<o>}MXFKNnMlW*SL-!OKLmawi5Hx9ZkJ}iM z6)eTBj~j*YHp}+EzDdC{TYhIEZ$|98L}KKpJwJ%w*A|~IDs#0J7pCqfj^Cqb zR6)Rn^eIdFVj-xb3Yt;*;Hwr`#QZ4f?~B@e_h;1RSxWG;Su6}$?2DANmo}I7I}=E! zC|{wie1*+&R+JE3v=5b^Jmkm2{B%ct20^ea;YEH*2Q?$~!@g8Sw3UzaHbCh@&~qoz zb2p>+_^+XNheeOg&7QyJ&1-av^pfPkXXBTzS+?3Il1VCGCo4Z}i1z$6Z-lG&w!|-c zejs0ELcXvvgnR`=lPPPKtICwbRDWlauhJite2qo^gnY^EC4D9cvtGwGBYj!|X@7D1pjc{+Fs&1CibmZet0>KdDw+q%`ly>Mx|ol<#8E^E9<5#R z+_UlzR*-QZQF>^%-}tz+uE9|PGu%B%-xC>g-2D5O7K<>C6ZRQyScBtuAaRZgE1DO- zviTTn7JiOC#~&GTT0kNzZ z;4{V`(Fa5^&qbop{2i&L1XtlfF3y1q)t2(-=r1rgf-G~GwM-;(k9I0&Wjkwbr zpma@K$rpv&j4uMW74t$|i#sBt&A3yddDoCX9%H*N;vcQ)j&0zN4^^srw^4OF$6J(E z*(Nwr%pqU}BZtf?4SfqWlOJ(hElS9lwe043K*aSRl#>H^-w;hLH$e#f1|CSpZ3kSg zx%j4y$C@CHxccC$`!16PF{{CK%!x4H=vo9*Qk(;|$M1;9kemd0b6n@E+wCaLSnW3; zWD7)9K;nG#D2dyE6{cMO1a6mDmc$7x#a|m%nZ&XrPGBj{+OYZvMUog#sZ8=fGoEVI z2O%sTBTa}IUYddrXMhWL;};vkF1N#@nW4!k!AW!&2xcK#>RaV9<+ab+zj+?4X~gZxWeDgO$$SzW=Z)E2yjXYY5sWgIvQS*={}j z9{0HsoDCxM)QjaXK56IjivGl1qsEUUQ*tY#I-cj!9V zx-f1brD|?`%Ol?0bokf~g7}R$x3%!8_ONEgQ~_r*n=ygyV_d9x&A5{OQaLKr=893F z5mh2ag`r@VZB%f{QQ=pP2PJq};{TQLARWVj2Rjg=JzT2VLy#;KyH=q(w1-P&d%(p* z(H;gOBnwbBg%ra^E`|+!95!IpIn}Ts7lWKX{x|cNZ?L*g9%vIK{^vE6_-`l%*X+R1 z(qWfLNgs|z`~UCx%O7GBmj6L#eIrHH!x1F7REYF;ifo-FvT7oeZ%t%iW#_*a+52|> zzaz4>n6tRSDLuSRbiax}lvjY*4X2Pw+hiu%qEy=DG2Y)g?EUT351UJ0{|(mU*=xM3 zh1)R)k&FLO$BT_S(6Su9jQ9LTJ6nf(MZ80`?U2hSJtd~qsR~TlsU~1@>sDe~9jm~U z9jgs9fLS=IYJ1%`0zYmnyo` zW8kz0Mn5b6=roA;S0h&+!^1x4(~^Sj0~tOAxNq$2?te{gdGn;x2|V4>PJ0@snFhi*#1<5;JMrT`Yb9&=-h=zKvG*9_0$bC63&TT(NM-I9b+ z>{ap3Mm!X3IIL2?oW}`0JQts`2OGb=-^iM?jpcLzML*-UjvYv?l z(D}uGYSbeCFw)=WWBz*=FqoqDX!-9!^Zs2}=#iy`C!E8q|EQI(#%MBOHLP0So~h-3 z-f*TW0&pJ@g#hj&7VgKyC1uxeH}-8FX1Plz;Vx_)lMqRJ?CIdOD8V?;aOBw2n$cHA z6H%;OwSbM6MUY_eAT9q0(tL^hM>fjWQbDSxPN` zBNE?^T&xHF``BH-y?Y$l;sjX2SPea!2bIepL|%(Pl(j)-eB5_%ANjF_xdFSMlnfL3 z@*-ofn2lOvKG%AXN#wyK1HYYtv76a-3X|FsWw~KAf>o!vmUd${wEWe;&j!~7>zM1+ zxA!8~6i+$l0(KTL=8Gr|XQU1;m%(He^TKRFD3IZCUuf4fY5l$cw0skw5Fh4mBb<;Y z>|M3d`W@oQg1(9^q2V?y|D7MT32U?q*4_?=uSEv;qe?_G0rdv$0+SW-j+PHmv%nKR z)GpXgFw3(!4j;djb8o=wvDydJt$ z2%!bzFt3Ly0E<$<6Om!2B-<$V>q{6%VL_!cEdzP$vk}e9i^k>E4I4=?qz_6nZn&SV zMf$G2yG@i9H@>EJEz{=l^Vm`sFHTaF)~|^NYKXtGk>Bi=EEEwSxNDNz}cO zAr6&-h;i)AROB-SdE_dQd=B~7sx)S)G|)hpMyHn3=!`UGS!vv#oCZTyc1fK^j+F-X zK#)e~mec5hG^(sLE=*2?A$)QyRXJX+l)P$c6lrv6ISp9sH^NpLTV6}z6+`$CSgJJ2 ztTYaZG_qSxqbt&wXQeSUISq#J?SWKj><_4NeAk3-H@)RxbHR{kIt^wR({_rcmylIG%b{gp&c70n35F0Fw_MvP_vMi*?L?VdBimj#7d2# z(xMeY0S;=0u#Hu;f(me0bFPUkV})h;K+Z~x4>-TrXs%dmZPEXNs4F5%J0C_4%&Ax6Iyer&%8fO+ z^<4oFmDsL>{VY(}1iGZ)(B{;_NeZ}qCn9=uSl7m5u=Q!2xxi>wJl6g3Sohju{Q|rb z#JV9Ki?5GbX@QX^iq$(F>vUTz$BAS8h&-!unQ&TZIZqtx&3LRAZLxS)_5|gsiO1sG zHdb1$6UQ1Ak2Ta5EBnN;y2oR=Y_W1q9P2AIMa7Me;k0tt!i;prvD#mnOxm@(wt0 zthZGx=y^qrkMv z%iBaJklSqtR#L%TK3`-=2JdzbF&wTF#Cj+mi|+_pY4Q5b31Ur($Ku-9ibeMcVx1q4 zb*3#ASGXsLbqGSF%Ec{OE3Jtqj#U?r^{Oq_O)bV+mF`Zfvbsgw@lQ+R6W*CxO&HNJ z8l3SgchkdF>qVDc+q7HAxSnH0LH`>V$$a*h=EEr_G-7EDGBkG zwHOcfH}_xFDs3PZv3KG77rt-s^&HhIZ45pg-`n_p#&_Q6R%til`xCw`__~jQjW2vP z_&&hb9y2Bnz8U!bfp0IqZlFC9Uo}3a(}-{C)veOr#P@G}XQSeUKG(`0df~V)bhI^O z1LEY5^vrx(n2=mDZybm7_nP*QyJcP-PpGdJ3YX9Y4itMrM|w;f>@$KZ(7s{j60Ta| za--J?u9r?1Oozec(cMBI%Iec75EdP&0X!K?V$Vv7g9Ru3y`b-!_L(H_(bJ6J8)%e~Q4n!Vdr)QvL_|U4l);9kg{Py=h^oz*%GwKV7GzsQ_r}mK z73i{vEuwdgp|=<4G(wV?8LzZVV&%!RlC9VBOno@MEj$wuLXAFc&L7}__1s)h%bxsFupZt5{KBN0rx3rWU5^{Tx%lcFzFRG%TD#0_)S9DWh%YM6=PQ&8ZjB z3PrR*jD}1JIq`V$V;7RmlVl1%!C`m?oixH`E5aHP!F|#Q4_guL6A`>8jqp1w!i^$=@1zk1S`lbD z(D3+A8o_Br;H$1^KPQc_6L^A4TSbJiCynrw72z);LitG}R9X>k6%odtG=kTPP$VKu zJZXe3R)lsU!c8ZQfD=9xI!BxH5gY>Brm1^qFVwn9BV(rcpr>2(kv8lj%s2cI$91K3 zyEDvRE~k}8^dyn2>*~JDNYy;Kg%WBk(B|CLoI0La_aTA0Z!>XbI_zE8zY1T05wjHA zyZi~Q?ok?CvkP66WzP)v3q1xp(#3$myjbA3{MSEp7^*za0^~7*R3q@{L-3w<@Db@W z;iNtRp!?x`63&KMa8NBlVa|_ZQa?dqE+yt@U{cjVVa|$UQs+TohKZRE%qelqTjQ7& zaZK7bL!<-L^V5g?Le;*tBIC50(h6#Mu$nT&f!{3rI*oMv&r<3m&>r!GYM~st8r}Gi z-9|7MV;_|Da^YKR1oPm7?MKSGcl`eHnwp-C!}bJMXR|KE#bl@r69dD_#}daH#8bu z(=J^BAxeWJ`XWNlplBDQQ5&{PX3}BaYLThi>qyFETqAMVOHEC0i^;OR5HXD{HDE9L z8gqf8_-?rtc5m^0gYWd~FbBj}h3{YZ_TcM+-7hb`N_%sPmp!3#-!6WyNKTx+MbbW6;8ai5 zZrGqZ%$IfRpe||-`4?ZgTMrckF`-m*7}A3-L>}zL2YSUxu&x45uO4>NrF8XqZ>{f( z@x3VC9hCNLt9Rg%Kh-?KE5UwD>!1bk0$d{u>}L1O|I4wa{yRn#Es@(^BVg7J9<}YY zI==123#D518*JFdhSG>91E$w$xr?^->cicBK~89R5Ke9pVYBaYI2~}(wj)=n@Nz@v z5pYId+Ksz3fNGOS=_H9Bu{xmHPk)_u>Z$Tm}eb8W66&1tdEMKCX{xsT59jWy0WN zxEoipxU*P{SX`bW@Fx7w=A%Cn?#Asq57z`Ca#EK@1K|^PM8mzrip>a-u?XX85n;lX zXt)Za&G8egexZ6CL)gB__-Bd9c31O-jdD5qfLF3z{AuH(hHkrR&&R@W-Cd92(Nca_i+d#ItzSaIbiS`4v znrh^qRv>q9rKby$b2V@iRU*)!GgU|6?Rp26mM%3l_lMcy>JA! zU5kzR?I_%yjP=1I)E`nd2Jdd~sSnOW5d}=yAXF_>uI}djGhTvb_j|Ek$>II?GQMx< z=411`Had9bTfDw`)cBUIIR6K&hBoM7Fvd%G4QE*HScy6VB~PbU^3BP?lRp4Q zRO0i9_xf`x@tMsN9|si?D+7PTsG>69Y9Rv;S{ZnngwtM*MR2zeVTBc8JtHiCB^IG7 za4z`x@^iZYPb%nym!C5M1qaOk;2ec*09A_0#g!mUO3+a7GdA2+@U14dmJdlm6Do_} zMQ3}E{Xd2yY<6MsyDQLDQgFm5h*JVFvQ!Lw#7XvR;fEnL9+-qMKg0PZ*1hu<0DvLd z^R6ktSL67$x_0JW1i=`JfbEd5nQ~&?dAu9U-EBh!#Pk0`pbXTL^tdvA$<3xgs0?GJCFK`{hjrs4{CcSF=PH zba-ML8%ilWM1-o7D>Hz>P@wdeC}Zib;WY+7u9ZbPxE{c`SUaLfObX>KGJN63f!36 zDT@?UM=s6zRo;N-kRtxPT$uFZC2j|But$hX+_aXMt9!8e-)0(;%_U&SaBN*{GcSEx z)WrY-vd#I@cMg5n(HJinUvNV-uePa4ND`yG_KZy&Su=4HoSeV-jnxL;gV_)~$}Ulx ze}p5$QQ82~7XF*_5yS0J*N#4im)9-O1rzL4;Cgrm%Ls4CkSrDQ4;A5W5^P;xdO(2} z;1_yVE?>61M5@)yA_RBB&V8Mgzfr5XMaIlg1Tps$Ilz9QjM+noNC~_GeUJsu74Y-v z1-Tb6uNC1vtZ-ZxhV=0f5dn9=ffD7bWPXN}v7rCPFTe!~{J8>uh+mQK0fI_Byn@PG z7Q9fvms{|sEI3RMAk{xvaPIgEI&J}stO3*te~6+B6bd8&ef9QPv~Ss zW_u8Nk%ID)sDS1YdaHtRmM5Tjgg&L9F9HgxxU99o+@oN^^dLo`FQHj$WLk1cQ&vEj zPrzo*6!ZoVGFL(-3rHa$Yb9i?fD9s}6;6H8XAKb$Hz95bDL@Xq^jArLu18$&&&A$y z!p;2PQ&y`XT+L%*_X7&3oc&i?Z|R01e|moinb<-0NAv*zMy_#sBY4nfR$eZ~5sw?W z=#*}5eE_y~o?s-@>oIMmaOO-O6IwM9Fl-ras?6!X11I&f(D)b^`gZB&gNW5|HZ-C0 z+)&_SkW%2Q06T%DwD(5ch-ND&0(|^nh{>b}%1%VPl{u(6Z8QX>DG{gr^F*vY1#Lwb z?;JNH%sGk5bcVV2etV`Fv=U!4!jHrVACozDq#zuQ6Ly&QCJ<)ON))si;o=zKMoHM2 zf-t9nD#w}Tg$aZiv=Uo?%?N*cgT;zNlCUcU;rVgGt<7C{x;$Qg46Z3I^Gf72|~Gg0K|j+3WyiJ8`CHCy&I5w=*jeh%?Bhr5GpPJ4Re; zDGIS}n}YbVIPvyomjvPrvZ*J=iEqB%%6XGePZY%4r6B%foOqV`D&9JeO9+E(dWmu3 ze~1$odWnK~`xL~VjuY=-j!PiUAf=F)m1gfgI>(6%g+xI-D+O^{*hQY$H+3|BS!~Za zgKV0J@tnUhKE@WIi71G7NI`r>oVaE_mOz|AHWkD;@$xwFFJjWtF$M8A;>2C%kOblk zQo4tUY-zkMmh-n`#I+Q}*T;!>GQYyJ=J5(;kWJ|@p7TfJ#3ATP&Rr>p(>kl-d1rH8 z0&xb}v<>6LJ#pef+feYlQwrkSE;yh{q=yW+&Vntx0n&LEp&VVrm$8*wTY3gX!*h<_RFZ(=YTv(a%@i6gYkIBHZhA27ONK_hAh=(rIp9&lULP2(8=~n^`q-$4XkL zi?4L#1Wuec$KR{G#xvH#-JAlyaVu_J8Q+&0hrI^02ckmRqqM#ReIzE|)#&|8j89=f z@yA}cR|v&}Mu1_oZGO$MrXj}sKZozYqBdh=)0h1}iPkcRRuy)_5jx&Oo3oV=W2ev9 zVm2ITYKn4KOJKYrFmMk1JREp#kjp{2`b+0?kXREA6Kld@SzR2~Jiy4Kh= zGZ!V@*J~Q4wp+}$KPzB+pHa#&;awDd0~(@`&gC&H0~8{!awkJ+NA%n9lPAnAS&iyv4HwGaciYtq!_tHFc0T z)PZxZtb^@$TXk?SI)_0t?!sfkP?Jxavy>1#DT@-d`5tv}t%Y%yz;J4Fro}N{0o$U5 z7RES%fm$kyV{`$lqNi9GzY!Rq(JzkiS7Q8x*|f+5e3Zd6aKzPwYAf`ar7(=*{2#YNQVhV(3VhFz{LWPAuOo2d+XqkukL>Ory5K|!B z3p^t1&2kW%_~4T%|a=%P`J9bPzDf%igTjCJS`DaG#ko|M0wvr`I$WdtA9Tn z7L^4=p=lUFWru~b0S=kjH;KS4et|&DP!rCXpN4}+zf#&jP zfZ+#5;E$oE+-bMQxU2b6w{{R zTZ-=$d>`UFgfHhVoCV?=kMC}L%kZti_cgvY*iY(%Z#cf&@GZvoGQOSo4&yrwea0Ys zSL3T-{~`M)yeB}VBy2zIDly#Iuv%n%Z@Tu09R=J17yYy!qZjw?iXFyI`5p&%?}}wl zz12KZV&{5sBb;6TRx=G|5wRoD5s(}Sxos~;FH!#3(>!XUA$h-{%o93%8aBy{quBoU z^3VbQu?dL(&{X>9_S59P@#g!jO$(5nf=;>Y2K3L6gl#97fG+;WYF@IA0My z7|6#nNqj=2+cE^E2Reqt13u|qUFc_xUvrLRt_i@zKZ>=o zjn?L;NT0h@4+Gn43o z3Rh=KD%<}gsa&qWV4^wbK?yrgQtn}+@>dn)Qs}vYicF#8AsOu_v`3D&Zq_KS9B|_r z7P0hJFiMP!Q$t{<>HM=q<}M$~R3Oqos3i5V3VlX4?W+galDX$$88h;0lJPtuk$G^* zQu}48+bxw~wKaZqxvhxDRTS#=GRjyPW#?aHlv5OVqAg0%qcZF$YMN2T%P858N$_3; zEE5O{MJS~X$ZTP6%LL{tyvF9aV%tsrCM=06o^uLOyHVw0J(L?UjHP)NU7 zsX!d+NHWJ(qZ?G%qbjV2Ozv?dH#G_j@i#lF);V2L&a+XOu7Y@&&J^+m6)EDUs`khe zdShtcSX(JT?>DqS_I^VLp!Z`jKUT;b>QKx=kw&bwJg?gD_oxXbGsu=qnQE{fAj}vV zZ;~PzuS&+JlIfyaFo!x4@+YRVPX+5L81l@_y(t>&%-b1btgZBCi-tOL0^#KnwUuaF zGlvs|Mq*Br{v!G(!oNrQ&!hh)_(zLIH?uqa5M^_<^tT5OZiTlC1U+UL94Gz(PM_tx z*=@Ta)x!MP?Khs!ej_EggjLr5NReLdE=RtC$ z>z8-pHWkj3p$SnyQX^#wqPJobm9vEPA$hmIV%l4NV~z0vX)ZvMih2~n z-xY#m+F!gzhD11a7znuvVXlRs&6(LG&WyWAtebZO>nID#8UJ{M#WAl;zbG;w^yM@>`0g)!cVu-g8@g56tH-h46@314jNW`lw#McrKpMei@(}faA z#>i%OfHBUpVpJ!@n4w}w2E2+*o9Gb?>4E{*C18$7z|2|<%xxCtg$bBv!H04sX5uv=N=HDE;*b5k|t-Jd0m5#s(|KdGQ#?Vo&%^mcZXvOMR zvD(&tq-sB?0kN9!6cCgLwIV*D_2I?^#ixKEv!=vsh4 z;O(!)h0%?3mx(Z1i&F!X4i`s}K`~Q+FIO6Qz5%k8kc4R4bz6{-L`t zFPb4Jb{>jl#(I3YgnzReP?rnTia4l;Vxb;-6Hs{qH7^dTJ{Bq;P|(^O)aKs=Z<%vp zpF5mvO;^ZZgnv+`u z7diX!HVy>qhj2Fc07YI)=J_EM-_pff7qKtdVIS#ZbgqHx;;*CwS_*H(>B<^JXd1J9k+>|%4!R36u36P?P4m&g|koZ0PdX= z!D)>%(W4NjHg_6b=G;9ehQHK>FH-Oyof!Tk7d~CVTPKG95Q1INvx_cs?%or_|Bnm* zxPsq*V)(f(e7%CFy6d=n)EcjL;e!hP;ECaRo35fiN5Ox8Vt964fQP)d=rZSWLJWG~ zN);FE_L_6kl@sGyIm^S9p_p2sHLg%tP>O$0Sg71PL9XVw@G}*>_r&n!3LaEms^AAG zc#xK(NF$X4mGih%_HtAG9&#KJa!;JsHF6?? zNRSl)i9}x6l?&FNEgA2M$ zKy8-V{EwrR6A_iIp9`pBx+f86xeI!!fU-6mhXZH1pr;C`DxHK_yIkqE7cQsx5`u1V zL1CB`psIWmf-ZMKvB@-A#EG(nQKrp-+XPfqf`nKvcR_su%Iba`4xH(NW((-|#|Qn! zm3N=PrCQE$ux@riUlLH+^{7TOJuBfuF6dGLWg|Qe)>$s-tpb{n5Y#;)ybgN(saT7e zfu{@4+4m-UrsDZ6o;ExYJf|$d`EWeb@!W@JEuMXNa+W50O7Pr{=YBlv@qB^jbO@(X zJTvgb$}_d6_3o2O8{0y?pXdJ8NS5r(Ue~nqp5FBRvT*0<#TgM zLp*U?W-Pj`|0X_;&K!Kn#^U{gkDkZDcN!__FZAJ}wZ$B)tviNHe%Xw zjflW%ej{O7CSl}w1mY-r-Pp#@L}h`5iH6wsV2|w#ypeLdqzuPFC-vqMN!_bbhx*9g zgY0YMJQAsg2ADbr)=c*x_SPHv_xMGaz8AiVw$sBx8*eNUFq=FAsOA3njm>tcDNCg%biL;5~XV zN7zoC%{3OYOESbWw#JEmQf105|7jSbs7iNi(J%1-2SuL_It)ESsPgI@!N+mjhjh(U zki|Dc6O_BqC-wxs)~-)h#|*3kC-dI(+7ft`q*|To>q35|TW_ncb7|U{a{w_s%_#s* ziW<$F0H{>#LyK+|w!crre_ng<@SpBu_&-2$niclqJ$fJkH`NE-+#dW9MECt1BEKD&bdik)1#h+tk1BEfB-#%w?|E=oF z=Kl@qOZd;(jqsn78{z*zH;Lo$UsXl7eSbOMVMP!5cS*vg%}IJ})3#*{hl zLZbfQ+p&rG;fk6(rXr#yQGMG5T@drP3GamYyH8<1j=b-YzkJExa65mTI{pXwOFB;e zvQL~pPB>NmV)&&^dYierN98KM{%jbNh+jG zBJRZdnEuI^kO;TXILkezf9Qe#EE|7&BK&)b6J^rHFWaGd_CEnLEVEg&4QI!Sw}&pl zVdyh;BNsWxo#Px#cycjr)Hh)>fj~l%>5nk@C{B^#j&TPh8tnFMbVTvXCFAia;0|#o zI#NiEqEIOuK?=At+yRLO$D|O&uPzObPXKpZ zScE&ioyfqC^WyO=Isp8*)7t@w1}Da!dJKNt+3iFIes2_kqW=rv#~s}cNHjPxeqPcY z&mY{u?L-Ft+$aKt|9#-co!bsbG&qVM)uk_n-Ke^dXs8)su^J0Obd{QG(Igi7na47h#Sy$<+Yv4|BXD4u_?Z{_32Mz z@aqgpcvfJBi=Sr&x^$vXa!ydhqbH3v`lHtTIP^k3I;dj~s$>DZF686P4sjZ;a&&gAyL)8R6o$kMagKtG7Dz!_Kiof4{`|Iasvm?_+&DIhK9~#TWqxlzn9H_9*@X zF8++f_&J!c@%Ocw;_x#l;jx?kQT$)H_%jpZ&yC{mXAO?S&!B`SZ=Rgy^5=alb;>Em zB;1vB+Xk0Tk3r}W1Vz&F9Ukw+m+JRtX7!^vn-eC9;k<7Dm!iZFeB(Tz8( zb21i*X6y`=G47eKDCg~rrP^~=5Lpc1Bi9;sfn*Pt1Th>x_7$WGAIFr>VjC>x06`o{ zMVD1>OwFrNQTLxOQI!pxPVO!y_&gUJdhaddW2FLbj{|=Q;N;#Oa*w(vojO|K-VbYY z`ArQ!zSDVeIlrlG#W!~IhJI@3j|+Dh8)4(9ane`Vd?g}yPQaCYnYo|_VJ4ByJPF1i zGW**;PXjvAw?pTff9ALh6cI)WhNQ$=2GYw-WH-tiR64RbI{x_otp3f$Mr3EE6<7a$ zU2uZ>N4`*BEPTtT?MsewIV5zd+1n5oj)5Rs9$42Dz<*WWqWTC|-+7EasLj>~jb6+( z2wWrG2jdPX8u%46^b#f|z?VpW$`y(zB7WJ362w0NJzTv|XprB<{5mc@Sj0)7&xNn( zbGfz=MZ~Y;(~~GalnEhC?}J<9MGP#a2T`Cd#_C&n)Ws?FSbghnM@XUf)VES%pvYZ) z>&be*T-I(|qL>VipC~5aUm|+hjzTAe`}jPl|BIzj_VuK{eRg8{-#9NJ{dUWA z=|3ghuK_7C3wGl*2@;cq9{d_|ob+x^oE}?!EWa+nM_MLuFhvI9VxgI*qkSaNt9p|t zN=-@xH4#=JQ5g|Km@NW&&}Y;o=EsKN3Hd>h7E51$HdQtEXV9_9{k!W2A_JshvLW!x zF3BGBCLM>~?8Nj^)Eq;v;wFRs_w;fhi}eq33iLiBzx4Z8_3yOW#QeT?SR#JAs)+A_ zT9t4QerygU#+Q~5pH6a*;fJcv3`)R{9_dvbC%xYeO+>$*+9N%*9}mV>Kx#fHLC|l< zr`sdF&RL1`H#l*6=?T(JvPld&*s0Qn z@34M`69MKy9RHk86YGke)X)&7&-IO%2$NTGse|eN332RHC8ovkj7mQ}iT0MO%3~0~2jC;KG50k7rBP_i7yYRW=GkR=N9zTOe`)A4YIc2Ya zREkdueWog(%fu&@KL4Y9Mu|@veLVXl)(^#}7k#c&K3;!&XK%m$0d7v-VO9&Sw)pZbtFslbL=t9*XSbVpgK*ldbIn#ivr8^Wjj zeDoV*`#q@qhSSey`yEt%Ip(B*?Q(+9$;MLQxjTdZIzJ>7eJRidu28(T#nI4ct{& zTdCR%7+gb-hZp{7)i%csFS(JU&6xC+yDomH<97$6&!i z%YPTnC8|@)QW=HEWxlR?6#BW$;){DxXmmWpC3%Sd#ylTcs(I&e6$T#Va&~fQUQoOd zUL=mncS3_eBCj{yjB7rt-beqi33qvJncWWry%k9l&n}%^Uvj7y{N9YDg6i!}`?N;3 zQzmM1)Q4h)EdgY0+e|QJsLYTNSiKF<793TZA{W7b3CHK4OXkfI4xGGYbTi(xxmfiw ze>O8nqJ75CP5^uZV^Y;!=m{V~K{EQrDqiaA2s(@hv$a!&C5n z2Xp#{mj9`S8)3DoFHyhtAUuGQE7ht$Vdz2r?1E>boyDpT@L|)BAYSCjLBj)Tmhe7H z?{)ZX0RML4V=}MFZAV5Xzloo!^+1PO4OZ`**$W^CBO_2mW?T_z)$b$EZA`eGKR{o7 z5Lj^AYt>=Y>VJ?e#4&trAVuGfJOxJUOUaWA{bh&_aT_NCpz?M8FyY}lQ1DJ$GwFtAga8DWzeeP_+g{SIM_lXfPeKUK+6IS zx~2g1Rkm{VrU_u3QP`CNx&BOEI=C#iqb1kIUTVseux4|_PEC@@Pn-;T2+#9KupvH~ zLsvq7e)iF>6zDHs$n%^qnWIRC43uQrgFSM?5Wg4+mo=C8WR^%WN4iq5opnW?_k_uG zBN>)}By)YwWEf&6gDmyP&2UNPa92t?PaJYI5sE7sxo6fc9u}T+&+IqjdSr%yb}9hx zk;=yLN>SIrCM5%lkOrKsCr6QbvBxuTB2B*)rzSq~;LBxd0x9{nTbWYSArDe5xV zgy?x$?h1$c89mW6BxcP2rwNFeGLfC_ag6R1&fbbatkuKZ!;sGWYW670~M==(`VV*1rzGAfzX1oIf%_I;3 zW_m2lUcwAYovc289LFOAgd?aJV^pjxe(vmoG!MhNr0FQC^`v7Y>)I{e*d!RiBk4&4KwIJ~5d3LPylu>Oj2@hhX{# z94@Bo2t&1yV4`gjfuXtK7)%X-vQOqxogpAJh!g|zSAvWOme8FDo*9Y>O8yK%VhL$7 zgQ{YJCNbz##wuaZ#V%b>A^<0I_ty_omXKiM=oPC9GFUvZW*cV-DU$YLl26%J@Eyk> z(jsFW?l!^mKX~56^F5xk*5m90o?G#>;Q1S#H}D+BbLIww;kgaZVm!~{c^gkRo*$yE zmg1?wa~B?}t>iqePd`LcLr{lczKpI$e)Hrvzs_CL^5MRRL#NlCDmuA$QE`pMuj5w~ zcnITF2NhV+Z%JD=JjD~dwVON-rW~YZxt9X9w}$x`mAjo2W>Ow<&i&^S%ZK&A}&cc&Koyb&PIT+Ka8* z{mz=HB37`6#ree>VX+dX(Lm&A?fF0ZP`kBReS_H49!{r9(Dw62{m^fkSEO6TP+kYk zA0TqA7*;F@OXTif9qrctOfBV6sF-u3`f+ppb(5g(Tm@pG?({;vnHw;NLc_VKaGzg4 za=L7)`LYA8_!NNPop-8w=jW*Ra2V{Qe?fos9;K;wQI>j-IZ3^JC#!dW@$OD5ZQ6Hd zO2FKQBKc({ghjdWjOZPx4P6chXu%ru8sN}I9MpdO1Jot0DVsG4`k+gp%ox$e#hVN? zv7qswC@9K}$MW_d0%Dd!u|&Pm(MnO8PRy$*oANGwt}ZWcxiFZYg7qZo$%a(JT->d1 zQ?kHg?bnxT)q%oFtMwC=&Y+Xf;}a4J9lY99IBmpN9k%WzkXCuHe9F`n1zJvE#SEe- zqmj@2%{Ed8;Vpnwc=q?e^R;!k!n0o+d9<#VmVdO=+#A$4Bn9;&z2-a$EeuG+FS3AN zVtaeuTW1O?d_Rn|5vrv^E`_F+gr^X7057SA>@Hs~=AaVY5ut zrX5zO7v61=&rt$1CkikWq+A~&7tXK2Av^rr;Jf0$2Y3BK^nULk|8Eg2`UIy;T#-v| z)Zh+XhX^hI4V#X5BDP1dB3+vVo6z|5|EtzIJIJ=uH39vNByz)Mg>;@BCD-;}XZv$O(wv0l7za_` zmsNyo?FjkSG~1_ypyR|mS1x-Z8YdjbUP|o9D*IfoTDxs%Hb!$2)?ysQ=WkJn?eW)y zG1fxc=QFU;9OrX8C_&7%7(uKoa=mILZB_AK05mz9Zs(-R_J7RwN3Z21`Jx?U*g>jG zdDZ%nbRG4zM1vm70sn>arj@P<=;MTc5#@I|{Zvo&s&%f65bA$KzZx5EiSqj){ifP} z?<>Fl=r(Mh7E}bxnO1?G8z*xO@;LLQ0?e1{WxfQX!N;2~rCC=N$IO*r+2kmuIhZR= z8Yy$7HdJe6Gq|gBEkigA-UEl;Jwuzzn=-@a~@uEOrBJeC6?ojjO4S=b0 zUox*vwFAYmq$J8_ACu_Qgu)qMg{#$pdJ+z@!AY`{V4So` zlAPfQGMp5$kvV_`Xy2VB4&Z+YAWUschC`Y9aa&Odr9_O8s#mO~jN99ZO9>;1{E%^D zXnB`ld(hH^77i!{jK-Q&#vEGmARanf9Y9JLy&JUbgyUb*GM{npa^gNLaZx>f$G9iU z&=dBdY1?R$14CdTWF{Oj9KQHHK%MVEQNjpRc|4S)*Uy0(=|G+1LOGdwpM-sgwj{al z=}pWJ$xtcNcNnAX9k}8 z@w|lRV>}svyAaPEc$VR5$MbW<`5m4Y@O+FX9qlN9=SDo2BhE0qonfr9zl5W(T>Q3P zMTd!lnh=saDBGsKu;9ysvj3yLdU5!9!#Yf8C)~@U7Ibs}MJAmb2rBR!#=m?jdL2HP>aGt2Nfp@fq%9`~~Y79jrn6XS}KAP^#ASB*I~+0@rlt|rkxKwM2 z`l{wvy49qE42LMGel9B1I6Tc! z%rwUhG<24(IWE`GS)}H;JVT!@j(kI(A&%jO9uh}^q1TIJlrnZ~jw>?s2JsoAD&<5d z!nv=LTxvu>Br7aj5`V=goNQq&I#VbXO$HgII0lNzF`-zMEhtuH3yN8`LNTkEP|R8; z6c>mC6ps=IDCYDJBRWGLBMwmP69*^`h+~YQ2jQ5NAsXUd+`Av?i~CLC2TgWmR2j}i zC$}|LikAC=;T&G01j+v<4paL)!Ay1j9!@Fh$R24w=SZ_4KiPhaFc}J0x-KorXN1XE zRB35OJ^^M{6fpBbU?a@TM3(5E8v1C&UZB_e4s_6%hgxLxcoBNL;38beP4WHMZEO4fzgb#|k9Y z%+Bd9Iu9bKW}5{5N|ig>)J63~jT~{PKebC|ktOkB)GZLuMU!vn{O_Bw3bIjsth4od zXobn#Nm;-hNa(J1Yx!Sm`G>4maR>xk=+zcX?l-``M*_gWs~8OFr;Yrs?mUcrXW+yP zW`~%7rrmoJcIIFkHa3)G6&JSkjHQiywJt}+$OL%i6aoKo=7Rt)i~@_)7p`_icx!Km+^2lqqS1Z7_F2sMyu?DYNd2BS}CrL)*AeFG*hTd zL#cN(Q>xHqw6Yl(t!x4v&8+tx+^TG}vfMhFSu6P6(aai_f7|U>8m+9Z*12ni3NNSt zO$+b}w7`CH>j1cn)*SgA$lnW$)?E3@liz gg3Q<^ucz`NbX0qr~MwvPBXyMui|* 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 J!2eSO{tJOSHnIQ! literal 0 HcmV?d00001 diff --git a/Externals/OpenAL/include/EFX-Util.h b/Externals/OpenAL/include/EFX-Util.h new file mode 100644 index 0000000000..b4a6b4e2d8 --- /dev/null +++ b/Externals/OpenAL/include/EFX-Util.h @@ -0,0 +1,422 @@ +/*******************************************************************\ +* * +* EFX-UTIL.H - EFX Utilities functions and Reverb Presets * +* * +* File revision 1.0 * +* * +\*******************************************************************/ + +#ifndef EAXVECTOR_DEFINED +#define EAXVECTOR_DEFINED +typedef struct _EAXVECTOR { + float x; + float y; + float z; +} EAXVECTOR; +#endif + +#ifndef EAXREVERBPROPERTIES_DEFINED +#define EAXREVERBPROPERTIES_DEFINED +typedef struct _EAXREVERBPROPERTIES +{ + unsigned long ulEnvironment; + float flEnvironmentSize; + float flEnvironmentDiffusion; + long lRoom; + long lRoomHF; + long lRoomLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + long lReflections; + float flReflectionsDelay; + EAXVECTOR vReflectionsPan; + long lReverb; + float flReverbDelay; + EAXVECTOR vReverbPan; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + unsigned long ulFlags; +} EAXREVERBPROPERTIES, *LPEAXREVERBPROPERTIES; +#endif + +#ifndef EFXEAXREVERBPROPERTIES_DEFINED +#define EFXEAXREVERBPROPERTIES_DEFINED +typedef struct +{ + float flDensity; + float flDiffusion; + float flGain; + float flGainHF; + float flGainLF; + float flDecayTime; + float flDecayHFRatio; + float flDecayLFRatio; + float flReflectionsGain; + float flReflectionsDelay; + float flReflectionsPan[3]; + float flLateReverbGain; + float flLateReverbDelay; + float flLateReverbPan[3]; + float flEchoTime; + float flEchoDepth; + float flModulationTime; + float flModulationDepth; + float flAirAbsorptionGainHF; + float flHFReference; + float flLFReference; + float flRoomRolloffFactor; + int iDecayHFLimit; +} EFXEAXREVERBPROPERTIES, *LPEFXEAXREVERBPROPERTIES; +#endif + +#ifndef EAXOBSTRUCTIONPROPERTIES_DEFINED +#define EAXOBSTRUCTIONPROPERTIES_DEFINED +typedef struct _EAXOBSTRUCTIONPROPERTIES +{ + long lObstruction; + float flObstructionLFRatio; +} EAXOBSTRUCTIONPROPERTIES, *LPEAXOBSTRUCTIONPROPERTIES; +#endif + +#ifndef EAXOCCLUSIONPROPERTIES_DEFINED +#define EAXOCCLUSIONPROPERTIES_DEFINED +typedef struct _EAXOCCLUSIONPROPERTIES +{ + long lOcclusion; + float flOcclusionLFRatio; + float flOcclusionRoomRatio; + float flOcclusionDirectRatio; +} EAXOCCLUSIONPROPERTIES, *LPEAXOCCLUSIONPROPERTIES; +#endif + +#ifndef EAXEXCLUSIONPROPERTIES_DEFINED +#define EAXEXCLUSIONPROPERTIES_DEFINED +typedef struct _EAXEXCLUSIONPROPERTIES +{ + long lExclusion; + float flExclusionLFRatio; +} EAXEXCLUSIONPROPERTIES, *LPEAXEXCLUSIONPROPERTIES; +#endif + +#ifndef EFXLOWPASSFILTER_DEFINED +#define EFXLOWPASSFILTER_DEFINED +typedef struct _EFXLOWPASSFILTER +{ + float flGain; + float flGainHF; +} EFXLOWPASSFILTER, *LPEFXLOWPASSFILTER; +#endif + +void ConvertReverbParameters(EAXREVERBPROPERTIES *pEAXProp, EFXEAXREVERBPROPERTIES *pEFXEAXReverb); +void ConvertObstructionParameters(EAXOBSTRUCTIONPROPERTIES *pObProp, EFXLOWPASSFILTER *pDirectLowPassFilter); +void ConvertExclusionParameters(EAXEXCLUSIONPROPERTIES *pExProp, EFXLOWPASSFILTER *pSendLowPassFilter); +void ConvertOcclusionParameters(EAXOCCLUSIONPROPERTIES *pOcProp, EFXLOWPASSFILTER *pDirectLowPassFilter, EFXLOWPASSFILTER *pSendLowPassFilter); + + +/***********************************************************************************************\ +* +* EAX Reverb Presets in legacy format - use ConvertReverbParameters() to convert to +* EFX EAX Reverb Presets for use with the OpenAL Effects Extension. +* +************************************************************************************************/ + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_GENERIC \ + {0, 7.5f, 1.000f, -1000, -100, 0, 1.49f, 0.83f, 1.00f, -2602, 0.007f, 0.00f,0.00f,0.00f, 200, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PADDEDCELL \ + {1, 1.4f, 1.000f, -1000, -6000, 0, 0.17f, 0.10f, 1.00f, -1204, 0.001f, 0.00f,0.00f,0.00f, 207, 0.002f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_ROOM \ + {2, 1.9f, 1.000f, -1000, -454, 0, 0.40f, 0.83f, 1.00f, -1646, 0.002f, 0.00f,0.00f,0.00f, 53, 0.003f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_BATHROOM \ + {3, 1.4f, 1.000f, -1000, -1200, 0, 1.49f, 0.54f, 1.00f, -370, 0.007f, 0.00f,0.00f,0.00f, 1030, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_LIVINGROOM \ + {4, 2.5f, 1.000f, -1000, -6000, 0, 0.50f, 0.10f, 1.00f, -1376, 0.003f, 0.00f,0.00f,0.00f, -1104, 0.004f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_STONEROOM \ + {5, 11.6f, 1.000f, -1000, -300, 0, 2.31f, 0.64f, 1.00f, -711, 0.012f, 0.00f,0.00f,0.00f, 83, 0.017f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_AUDITORIUM \ + {6, 21.6f, 1.000f, -1000, -476, 0, 4.32f, 0.59f, 1.00f, -789, 0.020f, 0.00f,0.00f,0.00f, -289, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CONCERTHALL \ + {7, 19.6f, 1.000f, -1000, -500, 0, 3.92f, 0.70f, 1.00f, -1230, 0.020f, 0.00f,0.00f,0.00f, -02, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CAVE \ + {8, 14.6f, 1.000f, -1000, 0, 0, 2.91f, 1.30f, 1.00f, -602, 0.015f, 0.00f,0.00f,0.00f, -302, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_ARENA \ + {9, 36.2f, 1.000f, -1000, -698, 0, 7.24f, 0.33f, 1.00f, -1166, 0.020f, 0.00f,0.00f,0.00f, 16, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_HANGAR \ + {10, 50.3f, 1.000f, -1000, -1000, 0, 10.05f, 0.23f, 1.00f, -602, 0.020f, 0.00f,0.00f,0.00f, 198, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CARPETTEDHALLWAY \ + {11, 1.9f, 1.000f, -1000, -4000, 0, 0.30f, 0.10f, 1.00f, -1831, 0.002f, 0.00f,0.00f,0.00f, -1630, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_HALLWAY \ + {12, 1.8f, 1.000f, -1000, -300, 0, 1.49f, 0.59f, 1.00f, -1219, 0.007f, 0.00f,0.00f,0.00f, 441, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_STONECORRIDOR \ + {13, 13.5f, 1.000f, -1000, -237, 0, 2.70f, 0.79f, 1.00f, -1214, 0.013f, 0.00f,0.00f,0.00f, 395, 0.020f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_ALLEY \ + {14, 7.5f, 0.300f, -1000, -270, 0, 1.49f, 0.86f, 1.00f, -1204, 0.007f, 0.00f,0.00f,0.00f, -4, 0.011f, 0.00f,0.00f,0.00f, 0.125f, 0.950f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_FOREST \ + {15, 38.0f, 0.300f, -1000, -3300, 0, 1.49f, 0.54f, 1.00f, -2560, 0.162f, 0.00f,0.00f,0.00f, -229, 0.088f, 0.00f,0.00f,0.00f, 0.125f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_CITY \ + {16, 7.5f, 0.500f, -1000, -800, 0, 1.49f, 0.67f, 1.00f, -2273, 0.007f, 0.00f,0.00f,0.00f, -1691, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_MOUNTAINS \ + {17, 100.0f, 0.270f, -1000, -2500, 0, 1.49f, 0.21f, 1.00f, -2780, 0.300f, 0.00f,0.00f,0.00f, -1434, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_QUARRY \ + {18, 17.5f, 1.000f, -1000, -1000, 0, 1.49f, 0.83f, 1.00f, -10000, 0.061f, 0.00f,0.00f,0.00f, 500, 0.025f, 0.00f,0.00f,0.00f, 0.125f, 0.700f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PLAIN \ + {19, 42.5f, 0.210f, -1000, -2000, 0, 1.49f, 0.50f, 1.00f, -2466, 0.179f, 0.00f,0.00f,0.00f, -1926, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PARKINGLOT \ + {20, 8.3f, 1.000f, -1000, 0, 0, 1.65f, 1.50f, 1.00f, -1363, 0.008f, 0.00f,0.00f,0.00f, -1153, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_SEWERPIPE \ + {21, 1.7f, 0.800f, -1000, -1000, 0, 2.81f, 0.14f, 1.00f, 429, 0.014f, 0.00f,0.00f,0.00f, 1023, 0.021f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_UNDERWATER \ + {22, 1.8f, 1.000f, -1000, -4000, 0, 1.49f, 0.10f, 1.00f, -449, 0.007f, 0.00f,0.00f,0.00f, 1700, 0.011f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 1.180f, 0.348f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_DRUGGED \ + {23, 1.9f, 0.500f, -1000, 0, 0, 8.39f, 1.39f, 1.00f, -115, 0.002f, 0.00f,0.00f,0.00f, 985, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DIZZY \ + {24, 1.8f, 0.600f, -1000, -400, 0, 17.23f, 0.56f, 1.00f, -1713, 0.020f, 0.00f,0.00f,0.00f, -613, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.810f, 0.310f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_PSYCHOTIC \ + {25, 1.0f, 0.500f, -1000, -151, 0, 7.56f, 0.91f, 1.00f, -626, 0.020f, 0.00f,0.00f,0.00f, 774, 0.030f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 4.000f, 1.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } + + +// CASTLE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_CASTLE_SMALLROOM \ + { 26, 8.3f, 0.890f, -1000, -800, -2000, 1.22f, 0.83f, 0.31f, -100, 0.022f, 0.00f,0.00f,0.00f, 600, 0.011f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_SHORTPASSAGE \ + { 26, 8.3f, 0.890f, -1000, -1000, -2000, 2.32f, 0.83f, 0.31f, -100, 0.007f, 0.00f,0.00f,0.00f, 200, 0.023f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_MEDIUMROOM \ + { 26, 8.3f, 0.930f, -1000, -1100, -2000, 2.04f, 0.83f, 0.46f, -400, 0.022f, 0.00f,0.00f,0.00f, 400, 0.011f, 0.00f,0.00f,0.00f, 0.155f, 0.030f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_LONGPASSAGE \ + { 26, 8.3f, 0.890f, -1000, -800, -2000, 3.42f, 0.83f, 0.31f, -100, 0.007f, 0.00f,0.00f,0.00f, 300, 0.023f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_LARGEROOM \ + { 26, 8.3f, 0.820f, -1000, -1100, -1800, 2.53f, 0.83f, 0.50f, -700, 0.034f, 0.00f,0.00f,0.00f, 200, 0.016f, 0.00f,0.00f,0.00f, 0.185f, 0.070f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_HALL \ + { 26, 8.3f, 0.810f, -1000, -1100, -1500, 3.14f, 0.79f, 0.62f, -1500, 0.056f, 0.00f,0.00f,0.00f, 100, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_CUPBOARD \ + { 26, 8.3f, 0.890f, -1000, -1100, -2000, 0.67f, 0.87f, 0.31f, 300, 0.010f, 0.00f,0.00f,0.00f, 1100, 0.007f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } +#define REVERB_PRESET_CASTLE_COURTYARD \ + { 26, 8.3f, 0.420f, -1000, -700, -1400, 2.13f, 0.61f, 0.23f, -1300, 0.160f, 0.00f,0.00f,0.00f, -300, 0.036f, 0.00f,0.00f,0.00f, 0.250f, 0.370f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_CASTLE_ALCOVE \ + { 26, 8.3f, 0.890f, -1000, -600, -2000, 1.64f, 0.87f, 0.31f, 00, 0.007f, 0.00f,0.00f,0.00f, 300, 0.034f, 0.00f,0.00f,0.00f, 0.138f, 0.080f, 0.250f, 0.000f, -5.0f, 5168.6f, 139.5f, 0.00f, 0x20 } + + +// FACTORY PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_FACTORY_ALCOVE \ + { 26, 1.8f, 0.590f, -1200, -200, -600, 3.14f, 0.65f, 1.31f, 300, 0.010f, 0.00f,0.00f,0.00f, 000, 0.038f, 0.00f,0.00f,0.00f, 0.114f, 0.100f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_SHORTPASSAGE \ + { 26, 1.8f, 0.640f, -1200, -200, -600, 2.53f, 0.65f, 1.31f, 0, 0.010f, 0.00f,0.00f,0.00f, 200, 0.038f, 0.00f,0.00f,0.00f, 0.135f, 0.230f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_MEDIUMROOM \ + { 26, 1.9f, 0.820f, -1200, -200, -600, 2.76f, 0.65f, 1.31f, -1100, 0.022f, 0.00f,0.00f,0.00f, 300, 0.023f, 0.00f,0.00f,0.00f, 0.174f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_LONGPASSAGE \ + { 26, 1.8f, 0.640f, -1200, -200, -600, 4.06f, 0.65f, 1.31f, 0, 0.020f, 0.00f,0.00f,0.00f, 200, 0.037f, 0.00f,0.00f,0.00f, 0.135f, 0.230f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_LARGEROOM \ + { 26, 1.9f, 0.750f, -1200, -300, -400, 4.24f, 0.51f, 1.31f, -1500, 0.039f, 0.00f,0.00f,0.00f, 100, 0.023f, 0.00f,0.00f,0.00f, 0.231f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_HALL \ + { 26, 1.9f, 0.750f, -1000, -300, -400, 7.43f, 0.51f, 1.31f, -2400, 0.073f, 0.00f,0.00f,0.00f, -100, 0.027f, 0.00f,0.00f,0.00f, 0.250f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_CUPBOARD \ + { 26, 1.7f, 0.630f, -1200, -200, -600, 0.49f, 0.65f, 1.31f, 200, 0.010f, 0.00f,0.00f,0.00f, 600, 0.032f, 0.00f,0.00f,0.00f, 0.107f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_COURTYARD \ + { 26, 1.7f, 0.570f, -1000, -1000, -400, 2.32f, 0.29f, 0.56f, -1300, 0.140f, 0.00f,0.00f,0.00f, -800, 0.039f, 0.00f,0.00f,0.00f, 0.250f, 0.290f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } +#define REVERB_PRESET_FACTORY_SMALLROOM \ + { 26, 1.8f, 0.820f, -1000, -200, -600, 1.72f, 0.65f, 1.31f, -300, 0.010f, 0.00f,0.00f,0.00f, 500, 0.024f, 0.00f,0.00f,0.00f, 0.119f, 0.070f, 0.250f, 0.000f, -5.0f, 3762.6f, 362.5f, 0.00f, 0x20 } + + +// ICE PALACE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_ICEPALACE_ALCOVE \ + { 26, 2.7f, 0.840f, -1000, -500, -1100, 2.76f, 1.46f, 0.28f, 100, 0.010f, 0.00f,0.00f,0.00f, -100, 0.030f, 0.00f,0.00f,0.00f, 0.161f, 0.090f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_SHORTPASSAGE \ + { 26, 2.7f, 0.750f, -1000, -500, -1100, 1.79f, 1.46f, 0.28f, -600, 0.010f, 0.00f,0.00f,0.00f, 100, 0.019f, 0.00f,0.00f,0.00f, 0.177f, 0.090f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_MEDIUMROOM \ + { 26, 2.7f, 0.870f, -1000, -500, -700, 2.22f, 1.53f, 0.32f, -800, 0.039f, 0.00f,0.00f,0.00f, 100, 0.027f, 0.00f,0.00f,0.00f, 0.186f, 0.120f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_LONGPASSAGE \ + { 26, 2.7f, 0.770f, -1000, -500, -800, 3.01f, 1.46f, 0.28f, -200, 0.012f, 0.00f,0.00f,0.00f, 200, 0.025f, 0.00f,0.00f,0.00f, 0.186f, 0.040f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_LARGEROOM \ + { 26, 2.9f, 0.810f, -1000, -500, -700, 3.14f, 1.53f, 0.32f, -1200, 0.039f, 0.00f,0.00f,0.00f, 000, 0.027f, 0.00f,0.00f,0.00f, 0.214f, 0.110f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_HALL \ + { 26, 2.9f, 0.760f, -1000, -700, -500, 5.49f, 1.53f, 0.38f, -1900, 0.054f, 0.00f,0.00f,0.00f, -400, 0.052f, 0.00f,0.00f,0.00f, 0.226f, 0.110f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_CUPBOARD \ + { 26, 2.7f, 0.830f, -1000, -600, -1300, 0.76f, 1.53f, 0.26f, 100, 0.012f, 0.00f,0.00f,0.00f, 600, 0.016f, 0.00f,0.00f,0.00f, 0.143f, 0.080f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_COURTYARD \ + { 26, 2.9f, 0.590f, -1000, -1100, -1000, 2.04f, 1.20f, 0.38f, -1000, 0.173f, 0.00f,0.00f,0.00f, -1000, 0.043f, 0.00f,0.00f,0.00f, 0.235f, 0.480f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } +#define REVERB_PRESET_ICEPALACE_SMALLROOM \ + { 26, 2.7f, 0.840f, -1000, -500, -1100, 1.51f, 1.53f, 0.27f, -100, 0.010f, 0.00f,0.00f,0.00f, 300, 0.011f, 0.00f,0.00f,0.00f, 0.164f, 0.140f, 0.250f, 0.000f, -5.0f, 12428.5f, 99.6f, 0.00f, 0x20 } + + +// SPACE STATION PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_SPACESTATION_ALCOVE \ + { 26, 1.5f, 0.780f, -1000, -300, -100, 1.16f, 0.81f, 0.55f, 300, 0.007f, 0.00f,0.00f,0.00f, 000, 0.018f, 0.00f,0.00f,0.00f, 0.192f, 0.210f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_MEDIUMROOM \ + { 26, 1.5f, 0.750f, -1000, -400, -100, 3.01f, 0.50f, 0.55f, -800, 0.034f, 0.00f,0.00f,0.00f, 100, 0.035f, 0.00f,0.00f,0.00f, 0.209f, 0.310f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_SHORTPASSAGE \ + { 26, 1.5f, 0.870f, -1000, -400, -100, 3.57f, 0.50f, 0.55f, 0, 0.012f, 0.00f,0.00f,0.00f, 100, 0.016f, 0.00f,0.00f,0.00f, 0.172f, 0.200f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_LONGPASSAGE \ + { 26, 1.9f, 0.820f, -1000, -400, -100, 4.62f, 0.62f, 0.55f, 0, 0.012f, 0.00f,0.00f,0.00f, 200, 0.031f, 0.00f,0.00f,0.00f, 0.250f, 0.230f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_LARGEROOM \ + { 26, 1.8f, 0.810f, -1000, -400, -100, 3.89f, 0.38f, 0.61f, -1000, 0.056f, 0.00f,0.00f,0.00f, -100, 0.035f, 0.00f,0.00f,0.00f, 0.233f, 0.280f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_HALL \ + { 26, 1.9f, 0.870f, -1000, -400, -100, 7.11f, 0.38f, 0.61f, -1500, 0.100f, 0.00f,0.00f,0.00f, -400, 0.047f, 0.00f,0.00f,0.00f, 0.250f, 0.250f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_CUPBOARD \ + { 26, 1.4f, 0.560f, -1000, -300, -100, 0.79f, 0.81f, 0.55f, 300, 0.007f, 0.00f,0.00f,0.00f, 500, 0.018f, 0.00f,0.00f,0.00f, 0.181f, 0.310f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPACESTATION_SMALLROOM \ + { 26, 1.5f, 0.700f, -1000, -300, -100, 1.72f, 0.82f, 0.55f, -200, 0.007f, 0.00f,0.00f,0.00f, 300, 0.013f, 0.00f,0.00f,0.00f, 0.188f, 0.260f, 0.250f, 0.000f, -5.0f, 3316.1f, 458.2f, 0.00f, 0x20 } + + +// WOODEN GALLEON PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_WOODEN_ALCOVE \ + { 26, 7.5f, 1.000f, -1000, -1800, -1000, 1.22f, 0.62f, 0.91f, 100, 0.012f, 0.00f,0.00f,0.00f, -300, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_SHORTPASSAGE \ + { 26, 7.5f, 1.000f, -1000, -1800, -1000, 1.75f, 0.50f, 0.87f, -100, 0.012f, 0.00f,0.00f,0.00f, -400, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_MEDIUMROOM \ + { 26, 7.5f, 1.000f, -1000, -2000, -1100, 1.47f, 0.42f, 0.82f, -100, 0.049f, 0.00f,0.00f,0.00f, -100, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_LONGPASSAGE \ + { 26, 7.5f, 1.000f, -1000, -2000, -1000, 1.99f, 0.40f, 0.79f, 000, 0.020f, 0.00f,0.00f,0.00f, -700, 0.036f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_LARGEROOM \ + { 26, 7.5f, 1.000f, -1000, -2100, -1100, 2.65f, 0.33f, 0.82f, -100, 0.066f, 0.00f,0.00f,0.00f, -200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_HALL \ + { 26, 7.5f, 1.000f, -1000, -2200, -1100, 3.45f, 0.30f, 0.82f, -100, 0.088f, 0.00f,0.00f,0.00f, -200, 0.063f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_CUPBOARD \ + { 26, 7.5f, 1.000f, -1000, -1700, -1000, 0.56f, 0.46f, 0.91f, 100, 0.012f, 0.00f,0.00f,0.00f, 100, 0.028f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_SMALLROOM \ + { 26, 7.5f, 1.000f, -1000, -1900, -1000, 0.79f, 0.32f, 0.87f, 00, 0.032f, 0.00f,0.00f,0.00f, -100, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } +#define REVERB_PRESET_WOODEN_COURTYARD \ + { 26, 7.5f, 0.650f, -1000, -2200, -1000, 1.79f, 0.35f, 0.79f, -500, 0.123f, 0.00f,0.00f,0.00f, -2000, 0.032f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 4705.0f, 99.6f, 0.00f, 0x3f } + + +// SPORTS PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_SPORT_EMPTYSTADIUM \ + { 26, 7.2f, 1.000f, -1000, -700, -200, 6.26f, 0.51f, 1.10f, -2400, 0.183f, 0.00f,0.00f,0.00f, -800, 0.038f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_SQUASHCOURT \ + { 26, 7.5f, 0.750f, -1000, -1000, -200, 2.22f, 0.91f, 1.16f, -700, 0.007f, 0.00f,0.00f,0.00f, -200, 0.011f, 0.00f,0.00f,0.00f, 0.126f, 0.190f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_SMALLSWIMMINGPOOL \ + { 26, 36.2f, 0.700f, -1000, -200, -100, 2.76f, 1.25f, 1.14f, -400, 0.020f, 0.00f,0.00f,0.00f, -200, 0.030f, 0.00f,0.00f,0.00f, 0.179f, 0.150f, 0.895f, 0.190f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_SPORT_LARGESWIMMINGPOOL\ + { 26, 36.2f, 0.820f, -1000, -200, 0, 5.49f, 1.31f, 1.14f, -700, 0.039f, 0.00f,0.00f,0.00f, -600, 0.049f, 0.00f,0.00f,0.00f, 0.222f, 0.550f, 1.159f, 0.210f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_SPORT_GYMNASIUM \ + { 26, 7.5f, 0.810f, -1000, -700, -100, 3.14f, 1.06f, 1.35f, -800, 0.029f, 0.00f,0.00f,0.00f, -500, 0.045f, 0.00f,0.00f,0.00f, 0.146f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_FULLSTADIUM \ + { 26, 7.2f, 1.000f, -1000, -2300, -200, 5.25f, 0.17f, 0.80f, -2000, 0.188f, 0.00f,0.00f,0.00f, -1100, 0.038f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_SPORT_STADIUMTANNOY \ + { 26, 3.0f, 0.780f, -1000, -500, -600, 2.53f, 0.88f, 0.68f, -1100, 0.230f, 0.00f,0.00f,0.00f, -600, 0.063f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } + + +// PREFAB PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_PREFAB_WORKSHOP \ + { 26, 1.9f, 1.000f, -1000, -1700, -800, 0.76f, 1.00f, 1.00f, 0, 0.012f, 0.00f,0.00f,0.00f, 100, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PREFAB_SCHOOLROOM \ + { 26, 1.86f, 0.690f, -1000, -400, -600, 0.98f, 0.45f, 0.18f, 300, 0.017f, 0.00f,0.00f,0.00f, 300, 0.015f, 0.00f,0.00f,0.00f, 0.095f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_PREFAB_PRACTISEROOM \ + { 26, 1.86f, 0.870f, -1000, -800, -600, 1.12f, 0.56f, 0.18f, 200, 0.010f, 0.00f,0.00f,0.00f, 300, 0.011f, 0.00f,0.00f,0.00f, 0.095f, 0.140f, 0.250f, 0.000f, -5.0f, 7176.9f, 211.2f, 0.00f, 0x20 } +#define REVERB_PRESET_PREFAB_OUTHOUSE \ + { 26, 80.3f, 0.820f, -1000, -1900, -1600, 1.38f, 0.38f, 0.35f, -100, 0.024f, 0.00f,0.00f,-0.00f, -400, 0.044f, 0.00f,0.00f,0.00f, 0.121f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_PREFAB_CARAVAN \ + { 26, 8.3f, 1.000f, -1000, -2100, -1800, 0.43f, 1.50f, 1.00f, 0, 0.012f, 0.00f,0.00f,0.00f, 600, 0.012f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x1f } + // for US developers, a caravan is the same as a trailer =o) + + +// DOME AND PIPE PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DOME_TOMB \ + { 26, 51.8f, 0.790f, -1000, -900, -1300, 4.18f, 0.21f, 0.10f, -825, 0.030f, 0.00f,0.00f,0.00f, 450, 0.022f, 0.00f,0.00f,0.00f, 0.177f, 0.190f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PIPE_SMALL \ + { 26, 50.3f, 1.000f, -1000, -900, -1300, 5.04f, 0.10f, 0.10f, -600, 0.032f, 0.00f,0.00f,0.00f, 800, 0.015f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_DOME_SAINTPAULS \ + { 26, 50.3f, 0.870f, -1000, -900, -1300, 10.48f, 0.19f, 0.10f, -1500, 0.090f, 0.00f,0.00f,0.00f, 200, 0.042f, 0.00f,0.00f,0.00f, 0.250f, 0.120f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PIPE_LONGTHIN \ + { 26, 1.6f, 0.910f, -1000, -700, -1100, 9.21f, 0.18f, 0.10f, -300, 0.010f, 0.00f,0.00f,0.00f, -300, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } +#define REVERB_PRESET_PIPE_LARGE \ + { 26, 50.3f, 1.000f, -1000, -900, -1300, 8.45f, 0.10f, 0.10f, -800, 0.046f, 0.00f,0.00f,0.00f, 400, 0.032f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x3f } +#define REVERB_PRESET_PIPE_RESONANT \ + { 26, 1.3f, 0.910f, -1000, -700, -1100, 6.81f, 0.18f, 0.10f, -300, 0.010f, 0.00f,0.00f,0.00f, 00, 0.022f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 2854.4f, 20.0f, 0.00f, 0x0 } + + +// OUTDOORS PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_OUTDOORS_BACKYARD \ + { 26, 80.3f, 0.450f, -1000, -1200, -600, 1.12f, 0.34f, 0.46f, -700, 0.069f, 0.00f,0.00f,-0.00f, -300, 0.023f, 0.00f,0.00f,0.00f, 0.218f, 0.340f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_ROLLINGPLAINS \ + { 26, 80.3f, 0.000f, -1000, -3900, -400, 2.13f, 0.21f, 0.46f, -1500, 0.300f, 0.00f,0.00f,-0.00f, -700, 0.019f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_DEEPCANYON \ + { 26, 80.3f, 0.740f, -1000, -1500, -400, 3.89f, 0.21f, 0.46f, -1000, 0.223f, 0.00f,0.00f,-0.00f, -900, 0.019f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_CREEK \ + { 26, 80.3f, 0.350f, -1000, -1500, -600, 2.13f, 0.21f, 0.46f, -800, 0.115f, 0.00f,0.00f,-0.00f, -1400, 0.031f, 0.00f,0.00f,0.00f, 0.218f, 0.340f, 0.250f, 0.000f, -5.0f, 4399.1f, 242.9f, 0.00f, 0x0 } +#define REVERB_PRESET_OUTDOORS_VALLEY \ + { 26, 80.3f, 0.280f, -1000, -3100, -1600, 2.88f, 0.26f, 0.35f, -1700, 0.263f, 0.00f,0.00f,-0.00f, -800, 0.100f, 0.00f,0.00f,0.00f, 0.250f, 0.340f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } + + +// MOOD PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_MOOD_HEAVEN \ + { 26, 19.6f, 0.940f, -1000, -200, -700, 5.04f, 1.12f, 0.56f, -1230, 0.020f, 0.00f,0.00f,0.00f, 200, 0.029f, 0.00f,0.00f,0.00f, 0.250f, 0.080f, 2.742f, 0.050f, -2.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_MOOD_HELL \ + { 26, 100.0f, 0.570f, -1000, -900, -700, 3.57f, 0.49f, 2.00f, -10000, 0.020f, 0.00f,0.00f,0.00f, 300, 0.030f, 0.00f,0.00f,0.00f, 0.110f, 0.040f, 2.109f, 0.520f, -5.0f, 5000.0f, 139.5f, 0.00f, 0x40 } +#define REVERB_PRESET_MOOD_MEMORY \ + { 26, 8.0f, 0.850f, -1000, -400, -900, 4.06f, 0.82f, 0.56f, -2800, 0.000f, 0.00f,0.00f,0.00f, 100, 0.000f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.474f, 0.450f, -10.0f, 5000.0f, 250.0f, 0.00f, 0x0 } + + +// DRIVING SIMULATION PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DRIVING_COMMENTATOR \ + { 26, 3.0f, 0.000f, 1000, -500, -600, 2.42f, 0.88f, 0.68f, -1400, 0.093f, 0.00f,0.00f,0.00f, -1200, 0.017f, 0.00f,0.00f,0.00f, 0.250f, 1.000f, 0.250f, 0.000f, -10.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_PITGARAGE \ + { 26, 1.9f, 0.590f, -1000, -300, -500, 1.72f, 0.93f, 0.87f, -500, 0.000f, 0.00f,0.00f,0.00f, 200, 0.016f, 0.00f,0.00f,0.00f, 0.250f, 0.110f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x0 } +#define REVERB_PRESET_DRIVING_INCAR_RACER \ + { 26, 1.1f, 0.800f, -1000, 0, -200, 0.17f, 2.00f, 0.41f, 500, 0.007f, 0.00f,0.00f,0.00f, -300, 0.015f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_INCAR_SPORTS \ + { 26, 1.1f, 0.800f, -1000, -400, 0, 0.17f, 0.75f, 0.41f, 0, 0.010f, 0.00f,0.00f,0.00f, -500, 0.000f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_INCAR_LUXURY \ + { 26, 1.6f, 1.000f, -1000, -2000, -600, 0.13f, 0.41f, 0.46f, -200, 0.010f, 0.00f,0.00f,0.00f, 400, 0.010f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10268.2f, 251.0f, 0.00f, 0x20 } +#define REVERB_PRESET_DRIVING_FULLGRANDSTAND \ + { 26, 8.3f, 1.000f, -1000, -1100, -400, 3.01f, 1.37f, 1.28f, -900, 0.090f, 0.00f,0.00f,0.00f, -1500, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10420.2f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DRIVING_EMPTYGRANDSTAND \ + { 26, 8.3f, 1.000f, -1000, 0, -200, 4.62f, 1.75f, 1.40f, -1363, 0.090f, 0.00f,0.00f,0.00f, -1200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.000f, -5.0f, 10420.2f, 250.0f, 0.00f, 0x1f } +#define REVERB_PRESET_DRIVING_TUNNEL \ + { 26, 3.1f, 0.810f, -1000, -800, -100, 3.42f, 0.94f, 1.31f, -300, 0.051f, 0.00f,0.00f,0.00f, -300, 0.047f, 0.00f,0.00f,0.00f, 0.214f, 0.050f, 0.250f, 0.000f, -5.0f, 5000.0f, 155.3f, 0.00f, 0x20 } + + +// CITY PRESETS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_CITY_STREETS \ + { 26, 3.0f, 0.780f, -1000, -300, -100, 1.79f, 1.12f, 0.91f, -1100, 0.046f, 0.00f,0.00f,0.00f, -1400, 0.028f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_SUBWAY \ + { 26, 3.0f, 0.740f, -1000, -300, -100, 3.01f, 1.23f, 0.91f, -300, 0.046f, 0.00f,0.00f,0.00f, 200, 0.028f, 0.00f,0.00f,0.00f, 0.125f, 0.210f, 0.250f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_MUSEUM \ + { 26, 80.3f, 0.820f, -1000, -1500, -1500, 3.28f, 1.40f, 0.57f, -1200, 0.039f, 0.00f,0.00f,-0.00f, -100, 0.034f, 0.00f,0.00f,0.00f, 0.130f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_CITY_LIBRARY \ + { 26, 80.3f, 0.820f, -1000, -1100, -2100, 2.76f, 0.89f, 0.41f, -900, 0.029f, 0.00f,0.00f,-0.00f, -100, 0.020f, 0.00f,0.00f,0.00f, 0.130f, 0.170f, 0.250f, 0.000f, -5.0f, 2854.4f, 107.5f, 0.00f, 0x0 } +#define REVERB_PRESET_CITY_UNDERPASS \ + { 26, 3.0f, 0.820f, -1000, -700, -100, 3.57f, 1.12f, 0.91f, -800, 0.059f, 0.00f,0.00f,0.00f, -100, 0.037f, 0.00f,0.00f,0.00f, 0.250f, 0.140f, 0.250f, 0.000f, -7.0f, 5000.0f, 250.0f, 0.00f, 0x20 } +#define REVERB_PRESET_CITY_ABANDONED \ + { 26, 3.0f, 0.690f, -1000, -200, -100, 3.28f, 1.17f, 0.91f, -700, 0.044f, 0.00f,0.00f,0.00f, -1100, 0.024f, 0.00f,0.00f,0.00f, 0.250f, 0.200f, 0.250f, 0.000f, -3.0f, 5000.0f, 250.0f, 0.00f, 0x20 } + + +// MISC ROOMS + +// Env Size Diffus Room RoomHF RoomLF DecTm DcHF DcLF Refl RefDel Ref Pan Revb RevDel Rev Pan EchTm EchDp ModTm ModDp AirAbs HFRef LFRef RRlOff FLAGS +#define REVERB_PRESET_DUSTYROOM \ + { 26, 1.8f, 0.560f, -1000, -200, -300, 1.79f, 0.38f, 0.21f, -600, 0.002f, 0.00f,0.00f,0.00f, 200, 0.006f, 0.00f,0.00f,0.00f, 0.202f, 0.050f, 0.250f, 0.000f, -10.0f, 13046.0f, 163.3f, 0.00f, 0x20 } +#define REVERB_PRESET_CHAPEL \ + { 26, 19.6f, 0.840f, -1000, -500, 0, 4.62f, 0.64f, 1.23f, -700, 0.032f, 0.00f,0.00f,0.00f, -200, 0.049f, 0.00f,0.00f,0.00f, 0.250f, 0.000f, 0.250f, 0.110f, -5.0f, 5000.0f, 250.0f, 0.00f, 0x3f } +#define REVERB_PRESET_SMALLWATERROOM \ + { 26, 36.2f, 0.700f, -1000, -698, 0, 1.51f, 1.25f, 1.14f, -100, 0.020f, 0.00f,0.00f,0.00f, 300, 0.030f, 0.00f,0.00f,0.00f, 0.179f, 0.150f, 0.895f, 0.190f, -7.0f, 5000.0f, 250.0f, 0.00f, 0x0 } diff --git a/Externals/OpenAL/include/al.h b/Externals/OpenAL/include/al.h new file mode 100644 index 0000000000..1c2f95b318 --- /dev/null +++ b/Externals/OpenAL/include/al.h @@ -0,0 +1,732 @@ +#ifndef AL_AL_H +#define AL_AL_H + + + +#if defined(__cplusplus) +extern "C" { +#endif + +#if defined(_WIN32) && !defined(_XBOX) + /* _OPENAL32LIB is deprecated */ + #if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB) + #define AL_API __declspec(dllexport) + #else + #define AL_API __declspec(dllimport) + #endif +#else + #define AL_API extern +#endif + +#if defined(_WIN32) + #define AL_APIENTRY __cdecl +#else + #define AL_APIENTRY +#endif + +#if TARGET_OS_MAC + #pragma export on +#endif + +/* The OPENAL, ALAPI, and ALAPIENTRY macros are deprecated, but are included for applications porting code + from AL 1.0 */ +#define OPENAL +#define ALAPI AL_API +#define ALAPIENTRY AL_APIENTRY + +#define AL_VERSION_1_0 +#define AL_VERSION_1_1 + + +/** 8-bit boolean */ +typedef char ALboolean; + +/** character */ +typedef char ALchar; + +/** signed 8-bit 2's complement integer */ +typedef char ALbyte; + +/** unsigned 8-bit integer */ +typedef unsigned char ALubyte; + +/** signed 16-bit 2's complement integer */ +typedef short ALshort; + +/** unsigned 16-bit integer */ +typedef unsigned short ALushort; + +/** signed 32-bit 2's complement integer */ +typedef int ALint; + +/** unsigned 32-bit integer */ +typedef unsigned int ALuint; + +/** non-negative 32-bit binary integer size */ +typedef int ALsizei; + +/** enumerated 32-bit value */ +typedef int ALenum; + +/** 32-bit IEEE754 floating-point */ +typedef float ALfloat; + +/** 64-bit IEEE754 floating-point */ +typedef double ALdouble; + +/** void type (for opaque pointers only) */ +typedef void ALvoid; + + +/* Enumerant values begin at column 50. No tabs. */ + +/* bad value */ +#define AL_INVALID -1 + +#define AL_NONE 0 + +/* Boolean False. */ +#define AL_FALSE 0 + +/** Boolean True. */ +#define AL_TRUE 1 + +/** Indicate Source has relative coordinates. */ +#define AL_SOURCE_RELATIVE 0x202 + + + +/** + * Directional source, inner cone angle, in degrees. + * Range: [0-360] + * Default: 360 + */ +#define AL_CONE_INNER_ANGLE 0x1001 + +/** + * Directional source, outer cone angle, in degrees. + * Range: [0-360] + * Default: 360 + */ +#define AL_CONE_OUTER_ANGLE 0x1002 + +/** + * Specify the pitch to be applied, either at source, + * or on mixer results, at listener. + * Range: [0.5-2.0] + * Default: 1.0 + */ +#define AL_PITCH 0x1003 + +/** + * Specify the current location in three dimensional space. + * OpenAL, like OpenGL, uses a right handed coordinate system, + * where in a frontal default view X (thumb) points right, + * Y points up (index finger), and Z points towards the + * viewer/camera (middle finger). + * To switch from a left handed coordinate system, flip the + * sign on the Z coordinate. + * Listener position is always in the world coordinate system. + */ +#define AL_POSITION 0x1004 + +/** Specify the current direction. */ +#define AL_DIRECTION 0x1005 + +/** Specify the current velocity in three dimensional space. */ +#define AL_VELOCITY 0x1006 + +/** + * Indicate whether source is looping. + * Type: ALboolean? + * Range: [AL_TRUE, AL_FALSE] + * Default: FALSE. + */ +#define AL_LOOPING 0x1007 + +/** + * Indicate the buffer to provide sound samples. + * Type: ALuint. + * Range: any valid Buffer id. + */ +#define AL_BUFFER 0x1009 + +/** + * Indicate the gain (volume amplification) applied. + * Type: ALfloat. + * Range: ]0.0- ] + * A value of 1.0 means un-attenuated/unchanged. + * Each division by 2 equals an attenuation of -6dB. + * Each multiplicaton with 2 equals an amplification of +6dB. + * A value of 0.0 is meaningless with respect to a logarithmic + * scale; it is interpreted as zero volume - the channel + * is effectively disabled. + */ +#define AL_GAIN 0x100A + +/* + * Indicate minimum source attenuation + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * Logarthmic + */ +#define AL_MIN_GAIN 0x100D + +/** + * Indicate maximum source attenuation + * Type: ALfloat + * Range: [0.0 - 1.0] + * + * Logarthmic + */ +#define AL_MAX_GAIN 0x100E + +/** + * Indicate listener orientation. + * + * at/up + */ +#define AL_ORIENTATION 0x100F + +/** + * Specify the channel mask. (Creative) + * Type: ALuint + * Range: [0 - 255] + */ +#define AL_CHANNEL_MASK 0x3000 + + +/** + * Source state information. + */ +#define AL_SOURCE_STATE 0x1010 +#define AL_INITIAL 0x1011 +#define AL_PLAYING 0x1012 +#define AL_PAUSED 0x1013 +#define AL_STOPPED 0x1014 + +/** + * Buffer Queue params + */ +#define AL_BUFFERS_QUEUED 0x1015 +#define AL_BUFFERS_PROCESSED 0x1016 + +/** + * Source buffer position information + */ +#define AL_SEC_OFFSET 0x1024 +#define AL_SAMPLE_OFFSET 0x1025 +#define AL_BYTE_OFFSET 0x1026 + +/* + * Source type (Static, Streaming or undetermined) + * Source is Static if a Buffer has been attached using AL_BUFFER + * Source is Streaming if one or more Buffers have been attached using alSourceQueueBuffers + * Source is undetermined when it has the NULL buffer attached + */ +#define AL_SOURCE_TYPE 0x1027 +#define AL_STATIC 0x1028 +#define AL_STREAMING 0x1029 +#define AL_UNDETERMINED 0x1030 + +/** Sound samples: format specifier. */ +#define AL_FORMAT_MONO8 0x1100 +#define AL_FORMAT_MONO16 0x1101 +#define AL_FORMAT_STEREO8 0x1102 +#define AL_FORMAT_STEREO16 0x1103 + +/** + * source specific reference distance + * Type: ALfloat + * Range: 0.0 - +inf + * + * At 0.0, no distance attenuation occurs. Default is + * 1.0. + */ +#define AL_REFERENCE_DISTANCE 0x1020 + +/** + * source specific rolloff factor + * Type: ALfloat + * Range: 0.0 - +inf + * + */ +#define AL_ROLLOFF_FACTOR 0x1021 + +/** + * Directional source, outer cone gain. + * + * Default: 0.0 + * Range: [0.0 - 1.0] + * Logarithmic + */ +#define AL_CONE_OUTER_GAIN 0x1022 + +/** + * Indicate distance above which sources are not + * attenuated using the inverse clamped distance model. + * + * Default: +inf + * Type: ALfloat + * Range: 0.0 - +inf + */ +#define AL_MAX_DISTANCE 0x1023 + +/** + * Sound samples: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ +#define AL_FREQUENCY 0x2001 +#define AL_BITS 0x2002 +#define AL_CHANNELS 0x2003 +#define AL_SIZE 0x2004 + +/** + * Buffer state. + * + * Not supported for public use (yet). + */ +#define AL_UNUSED 0x2010 +#define AL_PENDING 0x2011 +#define AL_PROCESSED 0x2012 + + +/** Errors: No Error. */ +#define AL_NO_ERROR AL_FALSE + +/** + * Invalid Name paramater passed to AL call. + */ +#define AL_INVALID_NAME 0xA001 + +/** + * Invalid parameter passed to AL call. + */ +#define AL_ILLEGAL_ENUM 0xA002 +#define AL_INVALID_ENUM 0xA002 + +/** + * Invalid enum parameter value. + */ +#define AL_INVALID_VALUE 0xA003 + +/** + * Illegal call. + */ +#define AL_ILLEGAL_COMMAND 0xA004 +#define AL_INVALID_OPERATION 0xA004 + + +/** + * No mojo. + */ +#define AL_OUT_OF_MEMORY 0xA005 + + +/** Context strings: Vendor Name. */ +#define AL_VENDOR 0xB001 +#define AL_VERSION 0xB002 +#define AL_RENDERER 0xB003 +#define AL_EXTENSIONS 0xB004 + +/** Global tweakage. */ + +/** + * Doppler scale. Default 1.0 + */ +#define AL_DOPPLER_FACTOR 0xC000 + +/** + * Tweaks speed of propagation. + */ +#define AL_DOPPLER_VELOCITY 0xC001 + +/** + * Speed of Sound in units per second + */ +#define AL_SPEED_OF_SOUND 0xC003 + +/** + * Distance models + * + * used in conjunction with DistanceModel + * + * implicit: NONE, which disances distance attenuation. + */ +#define AL_DISTANCE_MODEL 0xD000 +#define AL_INVERSE_DISTANCE 0xD001 +#define AL_INVERSE_DISTANCE_CLAMPED 0xD002 +#define AL_LINEAR_DISTANCE 0xD003 +#define AL_LINEAR_DISTANCE_CLAMPED 0xD004 +#define AL_EXPONENT_DISTANCE 0xD005 +#define AL_EXPONENT_DISTANCE_CLAMPED 0xD006 + + +#if !defined(AL_NO_PROTOTYPES) + +/* + * Renderer State management + */ +AL_API void AL_APIENTRY alEnable( ALenum capability ); + +AL_API void AL_APIENTRY alDisable( ALenum capability ); + +AL_API ALboolean AL_APIENTRY alIsEnabled( ALenum capability ); + + +/* + * State retrieval + */ +AL_API const ALchar* AL_APIENTRY alGetString( ALenum param ); + +AL_API void AL_APIENTRY alGetBooleanv( ALenum param, ALboolean* data ); + +AL_API void AL_APIENTRY alGetIntegerv( ALenum param, ALint* data ); + +AL_API void AL_APIENTRY alGetFloatv( ALenum param, ALfloat* data ); + +AL_API void AL_APIENTRY alGetDoublev( ALenum param, ALdouble* data ); + +AL_API ALboolean AL_APIENTRY alGetBoolean( ALenum param ); + +AL_API ALint AL_APIENTRY alGetInteger( ALenum param ); + +AL_API ALfloat AL_APIENTRY alGetFloat( ALenum param ); + +AL_API ALdouble AL_APIENTRY alGetDouble( ALenum param ); + + +/* + * Error support. + * Obtain the most recent error generated in the AL state machine. + */ +AL_API ALenum AL_APIENTRY alGetError( void ); + + +/* + * Extension support. + * Query for the presence of an extension, and obtain any appropriate + * function pointers and enum values. + */ +AL_API ALboolean AL_APIENTRY alIsExtensionPresent( const ALchar* extname ); + +AL_API void* AL_APIENTRY alGetProcAddress( const ALchar* fname ); + +AL_API ALenum AL_APIENTRY alGetEnumValue( const ALchar* ename ); + + +/* + * LISTENER + * Listener represents the location and orientation of the + * 'user' in 3D-space. + * + * Properties include: - + * + * Gain AL_GAIN ALfloat + * Position AL_POSITION ALfloat[3] + * Velocity AL_VELOCITY ALfloat[3] + * Orientation AL_ORIENTATION ALfloat[6] (Forward then Up vectors) +*/ + +/* + * Set Listener parameters + */ +AL_API void AL_APIENTRY alListenerf( ALenum param, ALfloat value ); + +AL_API void AL_APIENTRY alListener3f( ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); + +AL_API void AL_APIENTRY alListenerfv( ALenum param, const ALfloat* values ); + +AL_API void AL_APIENTRY alListeneri( ALenum param, ALint value ); + +AL_API void AL_APIENTRY alListener3i( ALenum param, ALint value1, ALint value2, ALint value3 ); + +AL_API void AL_APIENTRY alListeneriv( ALenum param, const ALint* values ); + +/* + * Get Listener parameters + */ +AL_API void AL_APIENTRY alGetListenerf( ALenum param, ALfloat* value ); + +AL_API void AL_APIENTRY alGetListener3f( ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3 ); + +AL_API void AL_APIENTRY alGetListenerfv( ALenum param, ALfloat* values ); + +AL_API void AL_APIENTRY alGetListeneri( ALenum param, ALint* value ); + +AL_API void AL_APIENTRY alGetListener3i( ALenum param, ALint *value1, ALint *value2, ALint *value3 ); + +AL_API void AL_APIENTRY alGetListeneriv( ALenum param, ALint* values ); + + +/** + * SOURCE + * Sources represent individual sound objects in 3D-space. + * Sources take the PCM data provided in the specified Buffer, + * apply Source-specific modifications, and then + * submit them to be mixed according to spatial arrangement etc. + * + * Properties include: - + * + * Gain AL_GAIN ALfloat + * Min Gain AL_MIN_GAIN ALfloat + * Max Gain AL_MAX_GAIN ALfloat + * Position AL_POSITION ALfloat[3] + * Velocity AL_VELOCITY ALfloat[3] + * Direction AL_DIRECTION ALfloat[3] + * Head Relative Mode AL_SOURCE_RELATIVE ALint (AL_TRUE or AL_FALSE) + * Reference Distance AL_REFERENCE_DISTANCE ALfloat + * Max Distance AL_MAX_DISTANCE ALfloat + * RollOff Factor AL_ROLLOFF_FACTOR ALfloat + * Inner Angle AL_CONE_INNER_ANGLE ALint or ALfloat + * Outer Angle AL_CONE_OUTER_ANGLE ALint or ALfloat + * Cone Outer Gain AL_CONE_OUTER_GAIN ALint or ALfloat + * Pitch AL_PITCH ALfloat + * Looping AL_LOOPING ALint (AL_TRUE or AL_FALSE) + * MS Offset AL_MSEC_OFFSET ALint or ALfloat + * Byte Offset AL_BYTE_OFFSET ALint or ALfloat + * Sample Offset AL_SAMPLE_OFFSET ALint or ALfloat + * Attached Buffer AL_BUFFER ALint + * State (Query only) AL_SOURCE_STATE ALint + * Buffers Queued (Query only) AL_BUFFERS_QUEUED ALint + * Buffers Processed (Query only) AL_BUFFERS_PROCESSED ALint + */ + +/* Create Source objects */ +AL_API void AL_APIENTRY alGenSources( ALsizei n, ALuint* sources ); + +/* Delete Source objects */ +AL_API void AL_APIENTRY alDeleteSources( ALsizei n, const ALuint* sources ); + +/* Verify a handle is a valid Source */ +AL_API ALboolean AL_APIENTRY alIsSource( ALuint sid ); + +/* + * Set Source parameters + */ +AL_API void AL_APIENTRY alSourcef( ALuint sid, ALenum param, ALfloat value ); + +AL_API void AL_APIENTRY alSource3f( ALuint sid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); + +AL_API void AL_APIENTRY alSourcefv( ALuint sid, ALenum param, const ALfloat* values ); + +AL_API void AL_APIENTRY alSourcei( ALuint sid, ALenum param, ALint value ); + +AL_API void AL_APIENTRY alSource3i( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); + +AL_API void AL_APIENTRY alSourceiv( ALuint sid, ALenum param, const ALint* values ); + +/* + * Get Source parameters + */ +AL_API void AL_APIENTRY alGetSourcef( ALuint sid, ALenum param, ALfloat* value ); + +AL_API void AL_APIENTRY alGetSource3f( ALuint sid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); + +AL_API void AL_APIENTRY alGetSourcefv( ALuint sid, ALenum param, ALfloat* values ); + +AL_API void AL_APIENTRY alGetSourcei( ALuint sid, ALenum param, ALint* value ); + +AL_API void AL_APIENTRY alGetSource3i( ALuint sid, ALenum param, ALint* value1, ALint* value2, ALint* value3); + +AL_API void AL_APIENTRY alGetSourceiv( ALuint sid, ALenum param, ALint* values ); + + +/* + * Source vector based playback calls + */ + +/* Play, replay, or resume (if paused) a list of Sources */ +AL_API void AL_APIENTRY alSourcePlayv( ALsizei ns, const ALuint *sids ); + +/* Stop a list of Sources */ +AL_API void AL_APIENTRY alSourceStopv( ALsizei ns, const ALuint *sids ); + +/* Rewind a list of Sources */ +AL_API void AL_APIENTRY alSourceRewindv( ALsizei ns, const ALuint *sids ); + +/* Pause a list of Sources */ +AL_API void AL_APIENTRY alSourcePausev( ALsizei ns, const ALuint *sids ); + +/* + * Source based playback calls + */ + +/* Play, replay, or resume a Source */ +AL_API void AL_APIENTRY alSourcePlay( ALuint sid ); + +/* Stop a Source */ +AL_API void AL_APIENTRY alSourceStop( ALuint sid ); + +/* Rewind a Source (set playback postiton to beginning) */ +AL_API void AL_APIENTRY alSourceRewind( ALuint sid ); + +/* Pause a Source */ +AL_API void AL_APIENTRY alSourcePause( ALuint sid ); + +/* + * Source Queuing + */ +AL_API void AL_APIENTRY alSourceQueueBuffers( ALuint sid, ALsizei numEntries, const ALuint *bids ); + +AL_API void AL_APIENTRY alSourceUnqueueBuffers( ALuint sid, ALsizei numEntries, ALuint *bids ); + + +/** + * BUFFER + * Buffer objects are storage space for sample data. + * Buffers are referred to by Sources. One Buffer can be used + * by multiple Sources. + * + * Properties include: - + * + * Frequency (Query only) AL_FREQUENCY ALint + * Size (Query only) AL_SIZE ALint + * Bits (Query only) AL_BITS ALint + * Channels (Query only) AL_CHANNELS ALint + */ + +/* Create Buffer objects */ +AL_API void AL_APIENTRY alGenBuffers( ALsizei n, ALuint* buffers ); + +/* Delete Buffer objects */ +AL_API void AL_APIENTRY alDeleteBuffers( ALsizei n, const ALuint* buffers ); + +/* Verify a handle is a valid Buffer */ +AL_API ALboolean AL_APIENTRY alIsBuffer( ALuint bid ); + +/* Specify the data to be copied into a buffer */ +AL_API void AL_APIENTRY alBufferData( ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq ); + +/* + * Set Buffer parameters + */ +AL_API void AL_APIENTRY alBufferf( ALuint bid, ALenum param, ALfloat value ); + +AL_API void AL_APIENTRY alBuffer3f( ALuint bid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); + +AL_API void AL_APIENTRY alBufferfv( ALuint bid, ALenum param, const ALfloat* values ); + +AL_API void AL_APIENTRY alBufferi( ALuint bid, ALenum param, ALint value ); + +AL_API void AL_APIENTRY alBuffer3i( ALuint bid, ALenum param, ALint value1, ALint value2, ALint value3 ); + +AL_API void AL_APIENTRY alBufferiv( ALuint bid, ALenum param, const ALint* values ); + +/* + * Get Buffer parameters + */ +AL_API void AL_APIENTRY alGetBufferf( ALuint bid, ALenum param, ALfloat* value ); + +AL_API void AL_APIENTRY alGetBuffer3f( ALuint bid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); + +AL_API void AL_APIENTRY alGetBufferfv( ALuint bid, ALenum param, ALfloat* values ); + +AL_API void AL_APIENTRY alGetBufferi( ALuint bid, ALenum param, ALint* value ); + +AL_API void AL_APIENTRY alGetBuffer3i( ALuint bid, ALenum param, ALint* value1, ALint* value2, ALint* value3); + +AL_API void AL_APIENTRY alGetBufferiv( ALuint bid, ALenum param, ALint* values ); + + +/* + * Global Parameters + */ +AL_API void AL_APIENTRY alDopplerFactor( ALfloat value ); + +AL_API void AL_APIENTRY alDopplerVelocity( ALfloat value ); + +AL_API void AL_APIENTRY alSpeedOfSound( ALfloat value ); + +AL_API void AL_APIENTRY alDistanceModel( ALenum distanceModel ); + +#else /* AL_NO_PROTOTYPES */ + +typedef void (AL_APIENTRY *LPALENABLE)( ALenum capability ); +typedef void (AL_APIENTRY *LPALDISABLE)( ALenum capability ); +typedef ALboolean (AL_APIENTRY *LPALISENABLED)( ALenum capability ); +typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)( ALenum param ); +typedef void (AL_APIENTRY *LPALGETBOOLEANV)( ALenum param, ALboolean* data ); +typedef void (AL_APIENTRY *LPALGETINTEGERV)( ALenum param, ALint* data ); +typedef void (AL_APIENTRY *LPALGETFLOATV)( ALenum param, ALfloat* data ); +typedef void (AL_APIENTRY *LPALGETDOUBLEV)( ALenum param, ALdouble* data ); +typedef ALboolean (AL_APIENTRY *LPALGETBOOLEAN)( ALenum param ); +typedef ALint (AL_APIENTRY *LPALGETINTEGER)( ALenum param ); +typedef ALfloat (AL_APIENTRY *LPALGETFLOAT)( ALenum param ); +typedef ALdouble (AL_APIENTRY *LPALGETDOUBLE)( ALenum param ); +typedef ALenum (AL_APIENTRY *LPALGETERROR)( void ); +typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar* extname ); +typedef void* (AL_APIENTRY *LPALGETPROCADDRESS)( const ALchar* fname ); +typedef ALenum (AL_APIENTRY *LPALGETENUMVALUE)( const ALchar* ename ); +typedef void (AL_APIENTRY *LPALLISTENERF)( ALenum param, ALfloat value ); +typedef void (AL_APIENTRY *LPALLISTENER3F)( ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); +typedef void (AL_APIENTRY *LPALLISTENERFV)( ALenum param, const ALfloat* values ); +typedef void (AL_APIENTRY *LPALLISTENERI)( ALenum param, ALint value ); +typedef void (AL_APIENTRY *LPALLISTENER3I)( ALenum param, ALint value1, ALint value2, ALint value3 ); +typedef void (AL_APIENTRY *LPALLISTENERIV)( ALenum param, const ALint* values ); +typedef void (AL_APIENTRY *LPALGETLISTENERF)( ALenum param, ALfloat* value ); +typedef void (AL_APIENTRY *LPALGETLISTENER3F)( ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3 ); +typedef void (AL_APIENTRY *LPALGETLISTENERFV)( ALenum param, ALfloat* values ); +typedef void (AL_APIENTRY *LPALGETLISTENERI)( ALenum param, ALint* value ); +typedef void (AL_APIENTRY *LPALGETLISTENER3I)( ALenum param, ALint *value1, ALint *value2, ALint *value3 ); +typedef void (AL_APIENTRY *LPALGETLISTENERIV)( ALenum param, ALint* values ); +typedef void (AL_APIENTRY *LPALGENSOURCES)( ALsizei n, ALuint* sources ); +typedef void (AL_APIENTRY *LPALDELETESOURCES)( ALsizei n, const ALuint* sources ); +typedef ALboolean (AL_APIENTRY *LPALISSOURCE)( ALuint sid ); +typedef void (AL_APIENTRY *LPALSOURCEF)( ALuint sid, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALSOURCE3F)( ALuint sid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); +typedef void (AL_APIENTRY *LPALSOURCEFV)( ALuint sid, ALenum param, const ALfloat* values ); +typedef void (AL_APIENTRY *LPALSOURCEI)( ALuint sid, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALSOURCE3I)( ALuint sid, ALenum param, ALint value1, ALint value2, ALint value3 ); +typedef void (AL_APIENTRY *LPALSOURCEIV)( ALuint sid, ALenum param, const ALint* values ); +typedef void (AL_APIENTRY *LPALGETSOURCEF)( ALuint sid, ALenum param, ALfloat* value ); +typedef void (AL_APIENTRY *LPALGETSOURCE3F)( ALuint sid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); +typedef void (AL_APIENTRY *LPALGETSOURCEFV)( ALuint sid, ALenum param, ALfloat* values ); +typedef void (AL_APIENTRY *LPALGETSOURCEI)( ALuint sid, ALenum param, ALint* value ); +typedef void (AL_APIENTRY *LPALGETSOURCE3I)( ALuint sid, ALenum param, ALint* value1, ALint* value2, ALint* value3); +typedef void (AL_APIENTRY *LPALGETSOURCEIV)( ALuint sid, ALenum param, ALint* values ); +typedef void (AL_APIENTRY *LPALSOURCEPLAYV)( ALsizei ns, const ALuint *sids ); +typedef void (AL_APIENTRY *LPALSOURCESTOPV)( ALsizei ns, const ALuint *sids ); +typedef void (AL_APIENTRY *LPALSOURCEREWINDV)( ALsizei ns, const ALuint *sids ); +typedef void (AL_APIENTRY *LPALSOURCEPAUSEV)( ALsizei ns, const ALuint *sids ); +typedef void (AL_APIENTRY *LPALSOURCEPLAY)( ALuint sid ); +typedef void (AL_APIENTRY *LPALSOURCESTOP)( ALuint sid ); +typedef void (AL_APIENTRY *LPALSOURCEREWIND)( ALuint sid ); +typedef void (AL_APIENTRY *LPALSOURCEPAUSE)( ALuint sid ); +typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint sid, ALsizei numEntries, const ALuint *bids ); +typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint sid, ALsizei numEntries, ALuint *bids ); +typedef void (AL_APIENTRY *LPALGENBUFFERS)( ALsizei n, ALuint* buffers ); +typedef void (AL_APIENTRY *LPALDELETEBUFFERS)( ALsizei n, const ALuint* buffers ); +typedef ALboolean (AL_APIENTRY *LPALISBUFFER)( ALuint bid ); +typedef void (AL_APIENTRY *LPALBUFFERDATA)( ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq ); +typedef void (AL_APIENTRY *LPALBUFFERF)( ALuint bid, ALenum param, ALfloat value); +typedef void (AL_APIENTRY *LPALBUFFER3F)( ALuint bid, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3 ); +typedef void (AL_APIENTRY *LPALBUFFERFV)( ALuint bid, ALenum param, const ALfloat* values ); +typedef void (AL_APIENTRY *LPALBUFFERI)( ALuint bid, ALenum param, ALint value); +typedef void (AL_APIENTRY *LPALBUFFER3I)( ALuint bid, ALenum param, ALint value1, ALint value2, ALint value3 ); +typedef void (AL_APIENTRY *LPALBUFFERIV)( ALuint bid, ALenum param, const ALint* values ); +typedef void (AL_APIENTRY *LPALGETBUFFERF)( ALuint bid, ALenum param, ALfloat* value ); +typedef void (AL_APIENTRY *LPALGETBUFFER3F)( ALuint bid, ALenum param, ALfloat* value1, ALfloat* value2, ALfloat* value3); +typedef void (AL_APIENTRY *LPALGETBUFFERFV)( ALuint bid, ALenum param, ALfloat* values ); +typedef void (AL_APIENTRY *LPALGETBUFFERI)( ALuint bid, ALenum param, ALint* value ); +typedef void (AL_APIENTRY *LPALGETBUFFER3I)( ALuint bid, ALenum param, ALint* value1, ALint* value2, ALint* value3); +typedef void (AL_APIENTRY *LPALGETBUFFERIV)( ALuint bid, ALenum param, ALint* values ); +typedef void (AL_APIENTRY *LPALDOPPLERFACTOR)( ALfloat value ); +typedef void (AL_APIENTRY *LPALDOPPLERVELOCITY)( ALfloat value ); +typedef void (AL_APIENTRY *LPALSPEEDOFSOUND)( ALfloat value ); +typedef void (AL_APIENTRY *LPALDISTANCEMODEL)( ALenum distanceModel ); + +#endif /* AL_NO_PROTOTYPES */ + +#if TARGET_OS_MAC + #pragma export off +#endif + +#if defined(__cplusplus) +} /* extern "C" */ +#endif + +#endif /* AL_AL_H */ diff --git a/Externals/OpenAL/include/alc.h b/Externals/OpenAL/include/alc.h new file mode 100644 index 0000000000..b0bbfbe7de --- /dev/null +++ b/Externals/OpenAL/include/alc.h @@ -0,0 +1,281 @@ +#ifndef AL_ALC_H +#define AL_ALC_H + +#if defined(__cplusplus) +extern "C" { +#endif + +#if defined(_WIN32) && !defined(_XBOX) + /* _OPENAL32LIB is deprecated */ + #if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB) + #define ALC_API __declspec(dllexport) + #else + #define ALC_API __declspec(dllimport) + #endif +#else + #if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY) + #define ALC_API __attribute__((visibility("default"))) + #else + #define ALC_API extern + #endif +#endif + +#if defined(_WIN32) + #define ALC_APIENTRY __cdecl +#else + #define ALC_APIENTRY +#endif + +#if defined(TARGET_OS_MAC) && TARGET_OS_MAC + #pragma export on +#endif + +/* + * The ALCAPI, ALCAPIENTRY, and ALC_INVALID macros are deprecated, but are + * included for applications porting code from AL 1.0 + */ +#define ALCAPI ALC_API +#define ALCAPIENTRY ALC_APIENTRY +#define ALC_INVALID 0 + + +#define ALC_VERSION_0_1 1 + +typedef struct ALCdevice_struct ALCdevice; +typedef struct ALCcontext_struct ALCcontext; + + +/** 8-bit boolean */ +typedef char ALCboolean; + +/** character */ +typedef char ALCchar; + +/** signed 8-bit 2's complement integer */ +typedef char ALCbyte; + +/** unsigned 8-bit integer */ +typedef unsigned char ALCubyte; + +/** signed 16-bit 2's complement integer */ +typedef short ALCshort; + +/** unsigned 16-bit integer */ +typedef unsigned short ALCushort; + +/** signed 32-bit 2's complement integer */ +typedef int ALCint; + +/** unsigned 32-bit integer */ +typedef unsigned int ALCuint; + +/** non-negative 32-bit binary integer size */ +typedef int ALCsizei; + +/** enumerated 32-bit value */ +typedef int ALCenum; + +/** 32-bit IEEE754 floating-point */ +typedef float ALCfloat; + +/** 64-bit IEEE754 floating-point */ +typedef double ALCdouble; + +/** void type (for opaque pointers only) */ +typedef void ALCvoid; + + +/* Enumerant values begin at column 50. No tabs. */ + +/* Boolean False. */ +#define ALC_FALSE 0 + +/* Boolean True. */ +#define ALC_TRUE 1 + +/** + * followed by Hz + */ +#define ALC_FREQUENCY 0x1007 + +/** + * followed by Hz + */ +#define ALC_REFRESH 0x1008 + +/** + * followed by AL_TRUE, AL_FALSE + */ +#define ALC_SYNC 0x1009 + +/** + * followed by Num of requested Mono (3D) Sources + */ +#define ALC_MONO_SOURCES 0x1010 + +/** + * followed by Num of requested Stereo Sources + */ +#define ALC_STEREO_SOURCES 0x1011 + +/** + * errors + */ + +/** + * No error + */ +#define ALC_NO_ERROR ALC_FALSE + +/** + * No device + */ +#define ALC_INVALID_DEVICE 0xA001 + +/** + * invalid context ID + */ +#define ALC_INVALID_CONTEXT 0xA002 + +/** + * bad enum + */ +#define ALC_INVALID_ENUM 0xA003 + +/** + * bad value + */ +#define ALC_INVALID_VALUE 0xA004 + +/** + * Out of memory. + */ +#define ALC_OUT_OF_MEMORY 0xA005 + + +/** + * The Specifier string for default device + */ +#define ALC_DEFAULT_DEVICE_SPECIFIER 0x1004 +#define ALC_DEVICE_SPECIFIER 0x1005 +#define ALC_EXTENSIONS 0x1006 + +#define ALC_MAJOR_VERSION 0x1000 +#define ALC_MINOR_VERSION 0x1001 + +#define ALC_ATTRIBUTES_SIZE 0x1002 +#define ALC_ALL_ATTRIBUTES 0x1003 + +/** + * ALC_ENUMERATE_ALL_EXT enums + */ +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 + +/** + * Capture extension + */ +#define ALC_CAPTURE_DEVICE_SPECIFIER 0x310 +#define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER 0x311 +#define ALC_CAPTURE_SAMPLES 0x312 + + +/* + * Context Management + */ +ALC_API ALCcontext * ALC_APIENTRY alcCreateContext( ALCdevice *device, const ALCint* attrlist ); + +ALC_API ALCboolean ALC_APIENTRY alcMakeContextCurrent( ALCcontext *context ); + +ALC_API void ALC_APIENTRY alcProcessContext( ALCcontext *context ); + +ALC_API void ALC_APIENTRY alcSuspendContext( ALCcontext *context ); + +ALC_API void ALC_APIENTRY alcDestroyContext( ALCcontext *context ); + +ALC_API ALCcontext * ALC_APIENTRY alcGetCurrentContext( void ); + +ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice( ALCcontext *context ); + + +/* + * Device Management + */ +ALC_API ALCdevice * ALC_APIENTRY alcOpenDevice( const ALCchar *devicename ); + +ALC_API ALCboolean ALC_APIENTRY alcCloseDevice( ALCdevice *device ); + + +/* + * Error support. + * Obtain the most recent Context error + */ +ALC_API ALCenum ALC_APIENTRY alcGetError( ALCdevice *device ); + + +/* + * Extension support. + * Query for the presence of an extension, and obtain any appropriate + * function pointers and enum values. + */ +ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent( ALCdevice *device, const ALCchar *extname ); + +ALC_API void * ALC_APIENTRY alcGetProcAddress( ALCdevice *device, const ALCchar *funcname ); + +ALC_API ALCenum ALC_APIENTRY alcGetEnumValue( ALCdevice *device, const ALCchar *enumname ); + + +/* + * Query functions + */ +ALC_API const ALCchar * ALC_APIENTRY alcGetString( ALCdevice *device, ALCenum param ); + +ALC_API void ALC_APIENTRY alcGetIntegerv( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *data ); + + +/* + * Capture functions + */ +ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize ); + +ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice( ALCdevice *device ); + +ALC_API void ALC_APIENTRY alcCaptureStart( ALCdevice *device ); + +ALC_API void ALC_APIENTRY alcCaptureStop( ALCdevice *device ); + +ALC_API void ALC_APIENTRY alcCaptureSamples( ALCdevice *device, ALCvoid *buffer, ALCsizei samples ); + +/* + * Pointer-to-function types, useful for dynamically getting ALC entry points. + */ +typedef ALCcontext * (ALC_APIENTRY *LPALCCREATECONTEXT) (ALCdevice *device, const ALCint *attrlist); +typedef ALCboolean (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)( ALCcontext *context ); +typedef void (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context ); +typedef void (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context ); +typedef void (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context ); +typedef ALCcontext * (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void ); +typedef ALCdevice * (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context ); +typedef ALCdevice * (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename ); +typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device ); +typedef ALCenum (ALC_APIENTRY *LPALCGETERROR)( ALCdevice *device ); +typedef ALCboolean (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)( ALCdevice *device, const ALCchar *extname ); +typedef void * (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname ); +typedef ALCenum (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname ); +typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)( ALCdevice *device, ALCenum param ); +typedef void (ALC_APIENTRY *LPALCGETINTEGERV)( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *dest ); +typedef ALCdevice * (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize ); +typedef ALCboolean (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)( ALCdevice *device ); +typedef void (ALC_APIENTRY *LPALCCAPTURESTART)( ALCdevice *device ); +typedef void (ALC_APIENTRY *LPALCCAPTURESTOP)( ALCdevice *device ); +typedef void (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, ALCvoid *buffer, ALCsizei samples ); + +#if defined(TARGET_OS_MAC) && TARGET_OS_MAC + #pragma export off +#endif + +#if defined(__cplusplus) +} +#endif + +#endif /* AL_ALC_H */ diff --git a/Externals/OpenAL/include/efx-creative.h b/Externals/OpenAL/include/efx-creative.h new file mode 100644 index 0000000000..4ea9da6b72 --- /dev/null +++ b/Externals/OpenAL/include/efx-creative.h @@ -0,0 +1,151 @@ +#ifndef __efxcreative_h_ +#define __efxcreative_h_ + +/** + * efx-creative.h - Environmental Audio Extensions + * for OpenAL Effects Extension. + * + */ +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * Effect object definitions to be used with alEffect functions. + * + * Effect parameter value definitions, ranges, and defaults + * appear farther down in this file. + */ + +/* AL EAXReverb effect parameters. */ +#define AL_EAXREVERB_DENSITY 0x0001 +#define AL_EAXREVERB_DIFFUSION 0x0002 +#define AL_EAXREVERB_GAIN 0x0003 +#define AL_EAXREVERB_GAINHF 0x0004 +#define AL_EAXREVERB_GAINLF 0x0005 +#define AL_EAXREVERB_DECAY_TIME 0x0006 +#define AL_EAXREVERB_DECAY_HFRATIO 0x0007 +#define AL_EAXREVERB_DECAY_LFRATIO 0x0008 +#define AL_EAXREVERB_REFLECTIONS_GAIN 0x0009 +#define AL_EAXREVERB_REFLECTIONS_DELAY 0x000A +#define AL_EAXREVERB_REFLECTIONS_PAN 0x000B +#define AL_EAXREVERB_LATE_REVERB_GAIN 0x000C +#define AL_EAXREVERB_LATE_REVERB_DELAY 0x000D +#define AL_EAXREVERB_LATE_REVERB_PAN 0x000E +#define AL_EAXREVERB_ECHO_TIME 0x000F +#define AL_EAXREVERB_ECHO_DEPTH 0x0010 +#define AL_EAXREVERB_MODULATION_TIME 0x0011 +#define AL_EAXREVERB_MODULATION_DEPTH 0x0012 +#define AL_EAXREVERB_AIR_ABSORPTION_GAINHF 0x0013 +#define AL_EAXREVERB_HFREFERENCE 0x0014 +#define AL_EAXREVERB_LFREFERENCE 0x0015 +#define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR 0x0016 +#define AL_EAXREVERB_DECAY_HFLIMIT 0x0017 + +/* Effect type definitions to be used with AL_EFFECT_TYPE. */ +#define AL_EFFECT_EAXREVERB 0x8000 + + + + /********************************************************** + * Effect parameter structures, value definitions, ranges and defaults. + */ + +/** + * AL reverb effect parameter ranges and defaults + */ +#define AL_EAXREVERB_MIN_DENSITY 0.0f +#define AL_EAXREVERB_MAX_DENSITY 1.0f +#define AL_EAXREVERB_DEFAULT_DENSITY 1.0f + +#define AL_EAXREVERB_MIN_DIFFUSION 0.0f +#define AL_EAXREVERB_MAX_DIFFUSION 1.0f +#define AL_EAXREVERB_DEFAULT_DIFFUSION 1.0f + +#define AL_EAXREVERB_MIN_GAIN 0.0f +#define AL_EAXREVERB_MAX_GAIN 1.0f +#define AL_EAXREVERB_DEFAULT_GAIN 0.32f + +#define AL_EAXREVERB_MIN_GAINHF 0.0f +#define AL_EAXREVERB_MAX_GAINHF 1.0f +#define AL_EAXREVERB_DEFAULT_GAINHF 0.89f + +#define AL_EAXREVERB_MIN_GAINLF 0.0f +#define AL_EAXREVERB_MAX_GAINLF 1.0f +#define AL_EAXREVERB_DEFAULT_GAINLF 1.0f + +#define AL_EAXREVERB_MIN_DECAY_TIME 0.1f +#define AL_EAXREVERB_MAX_DECAY_TIME 20.0f +#define AL_EAXREVERB_DEFAULT_DECAY_TIME 1.49f + +#define AL_EAXREVERB_MIN_DECAY_HFRATIO 0.1f +#define AL_EAXREVERB_MAX_DECAY_HFRATIO 2.0f +#define AL_EAXREVERB_DEFAULT_DECAY_HFRATIO 0.83f + +#define AL_EAXREVERB_MIN_DECAY_LFRATIO 0.1f +#define AL_EAXREVERB_MAX_DECAY_LFRATIO 2.0f +#define AL_EAXREVERB_DEFAULT_DECAY_LFRATIO 1.0f + +#define AL_EAXREVERB_MIN_REFLECTIONS_GAIN 0.0f +#define AL_EAXREVERB_MAX_REFLECTIONS_GAIN 3.16f +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_GAIN 0.05f + +#define AL_EAXREVERB_MIN_REFLECTIONS_DELAY 0.0f +#define AL_EAXREVERB_MAX_REFLECTIONS_DELAY 0.3f +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_DELAY 0.007f + +#define AL_EAXREVERB_DEFAULT_REFLECTIONS_PAN {0.0f, 0.0f, 0.0f} + +#define AL_EAXREVERB_MIN_LATE_REVERB_GAIN 0.0f +#define AL_EAXREVERB_MAX_LATE_REVERB_GAIN 10.0f +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_GAIN 1.26f + +#define AL_EAXREVERB_MIN_LATE_REVERB_DELAY 0.0f +#define AL_EAXREVERB_MAX_LATE_REVERB_DELAY 0.1f +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_DELAY 0.011f + +#define AL_EAXREVERB_DEFAULT_LATE_REVERB_PAN {0.0f, 0.0f, 0.0f} + +#define AL_EAXREVERB_MIN_ECHO_TIME 0.075f +#define AL_EAXREVERB_MAX_ECHO_TIME 0.25f +#define AL_EAXREVERB_DEFAULT_ECHO_TIME 0.25f + +#define AL_EAXREVERB_MIN_ECHO_DEPTH 0.0f +#define AL_EAXREVERB_MAX_ECHO_DEPTH 1.0f +#define AL_EAXREVERB_DEFAULT_ECHO_DEPTH 0.0f + +#define AL_EAXREVERB_MIN_MODULATION_TIME 0.04f +#define AL_EAXREVERB_MAX_MODULATION_TIME 4.0f +#define AL_EAXREVERB_DEFAULT_MODULATION_TIME 0.25f + +#define AL_EAXREVERB_MIN_MODULATION_DEPTH 0.0f +#define AL_EAXREVERB_MAX_MODULATION_DEPTH 1.0f +#define AL_EAXREVERB_DEFAULT_MODULATION_DEPTH 0.0f + +#define AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF 0.892f +#define AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF 1.0f +#define AL_EAXREVERB_DEFAULT_AIR_ABSORPTION_GAINHF 0.994f + +#define AL_EAXREVERB_MIN_HFREFERENCE 1000.0f +#define AL_EAXREVERB_MAX_HFREFERENCE 20000.0f +#define AL_EAXREVERB_DEFAULT_HFREFERENCE 5000.0f + +#define AL_EAXREVERB_MIN_LFREFERENCE 20.0f +#define AL_EAXREVERB_MAX_LFREFERENCE 1000.0f +#define AL_EAXREVERB_DEFAULT_LFREFERENCE 250.0f + +#define AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR 0.0f +#define AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR 10.0f +#define AL_EAXREVERB_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f + +#define AL_EAXREVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_EAXREVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_EAXREVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __efxcreative_h_ */ diff --git a/Externals/OpenAL/include/efx.h b/Externals/OpenAL/include/efx.h new file mode 100644 index 0000000000..fece1608de --- /dev/null +++ b/Externals/OpenAL/include/efx.h @@ -0,0 +1,737 @@ +#ifndef __efx_h_ +#define __efx_h_ + + +#ifdef __cplusplus +extern "C" { +#endif + +#define ALC_EXT_EFX_NAME "ALC_EXT_EFX" + +/** + * Context definitions to be used with alcCreateContext. + * These values must be unique and not conflict with other + * al context values. + */ +#define ALC_EFX_MAJOR_VERSION 0x20001 +#define ALC_EFX_MINOR_VERSION 0x20002 +#define ALC_MAX_AUXILIARY_SENDS 0x20003 + + + + +/** + * Listener definitions to be used with alListener functions. + * These values must be unique and not conflict with other + * al listener values. + */ +#define AL_METERS_PER_UNIT 0x20004 + + + + +/** + * Source definitions to be used with alSource functions. + * These values must be unique and not conflict with other + * al source values. + */ +#define AL_DIRECT_FILTER 0x20005 +#define AL_AUXILIARY_SEND_FILTER 0x20006 +#define AL_AIR_ABSORPTION_FACTOR 0x20007 +#define AL_ROOM_ROLLOFF_FACTOR 0x20008 +#define AL_CONE_OUTER_GAINHF 0x20009 +#define AL_DIRECT_FILTER_GAINHF_AUTO 0x2000A +#define AL_AUXILIARY_SEND_FILTER_GAIN_AUTO 0x2000B +#define AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO 0x2000C + + + + +/** + * Effect object definitions to be used with alEffect functions. + * + * Effect parameter value definitions, ranges, and defaults + * appear farther down in this file. + */ + +/* Reverb Parameters */ +#define AL_REVERB_DENSITY 0x0001 +#define AL_REVERB_DIFFUSION 0x0002 +#define AL_REVERB_GAIN 0x0003 +#define AL_REVERB_GAINHF 0x0004 +#define AL_REVERB_DECAY_TIME 0x0005 +#define AL_REVERB_DECAY_HFRATIO 0x0006 +#define AL_REVERB_REFLECTIONS_GAIN 0x0007 +#define AL_REVERB_REFLECTIONS_DELAY 0x0008 +#define AL_REVERB_LATE_REVERB_GAIN 0x0009 +#define AL_REVERB_LATE_REVERB_DELAY 0x000A +#define AL_REVERB_AIR_ABSORPTION_GAINHF 0x000B +#define AL_REVERB_ROOM_ROLLOFF_FACTOR 0x000C +#define AL_REVERB_DECAY_HFLIMIT 0x000D + +/* Chorus Parameters */ +#define AL_CHORUS_WAVEFORM 0x0001 +#define AL_CHORUS_PHASE 0x0002 +#define AL_CHORUS_RATE 0x0003 +#define AL_CHORUS_DEPTH 0x0004 +#define AL_CHORUS_FEEDBACK 0x0005 +#define AL_CHORUS_DELAY 0x0006 + +/* Distortion Parameters */ +#define AL_DISTORTION_EDGE 0x0001 +#define AL_DISTORTION_GAIN 0x0002 +#define AL_DISTORTION_LOWPASS_CUTOFF 0x0003 +#define AL_DISTORTION_EQCENTER 0x0004 +#define AL_DISTORTION_EQBANDWIDTH 0x0005 + +/* Echo Parameters */ +#define AL_ECHO_DELAY 0x0001 +#define AL_ECHO_LRDELAY 0x0002 +#define AL_ECHO_DAMPING 0x0003 +#define AL_ECHO_FEEDBACK 0x0004 +#define AL_ECHO_SPREAD 0x0005 + +/* Flanger Parameters */ +#define AL_FLANGER_WAVEFORM 0x0001 +#define AL_FLANGER_PHASE 0x0002 +#define AL_FLANGER_RATE 0x0003 +#define AL_FLANGER_DEPTH 0x0004 +#define AL_FLANGER_FEEDBACK 0x0005 +#define AL_FLANGER_DELAY 0x0006 + +/* Frequencyshifter Parameters */ +#define AL_FREQUENCY_SHIFTER_FREQUENCY 0x0001 +#define AL_FREQUENCY_SHIFTER_LEFT_DIRECTION 0x0002 +#define AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION 0x0003 + +/* Vocalmorpher Parameters */ +#define AL_VOCAL_MORPHER_PHONEMEA 0x0001 +#define AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING 0x0002 +#define AL_VOCAL_MORPHER_PHONEMEB 0x0003 +#define AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING 0x0004 +#define AL_VOCAL_MORPHER_WAVEFORM 0x0005 +#define AL_VOCAL_MORPHER_RATE 0x0006 + +/* Pitchshifter Parameters */ +#define AL_PITCH_SHIFTER_COARSE_TUNE 0x0001 +#define AL_PITCH_SHIFTER_FINE_TUNE 0x0002 + +/* Ringmodulator Parameters */ +#define AL_RING_MODULATOR_FREQUENCY 0x0001 +#define AL_RING_MODULATOR_HIGHPASS_CUTOFF 0x0002 +#define AL_RING_MODULATOR_WAVEFORM 0x0003 + +/* Autowah Parameters */ +#define AL_AUTOWAH_ATTACK_TIME 0x0001 +#define AL_AUTOWAH_RELEASE_TIME 0x0002 +#define AL_AUTOWAH_RESONANCE 0x0003 +#define AL_AUTOWAH_PEAK_GAIN 0x0004 + +/* Compressor Parameters */ +#define AL_COMPRESSOR_ONOFF 0x0001 + +/* Equalizer Parameters */ +#define AL_EQUALIZER_LOW_GAIN 0x0001 +#define AL_EQUALIZER_LOW_CUTOFF 0x0002 +#define AL_EQUALIZER_MID1_GAIN 0x0003 +#define AL_EQUALIZER_MID1_CENTER 0x0004 +#define AL_EQUALIZER_MID1_WIDTH 0x0005 +#define AL_EQUALIZER_MID2_GAIN 0x0006 +#define AL_EQUALIZER_MID2_CENTER 0x0007 +#define AL_EQUALIZER_MID2_WIDTH 0x0008 +#define AL_EQUALIZER_HIGH_GAIN 0x0009 +#define AL_EQUALIZER_HIGH_CUTOFF 0x000A + +/* Effect type */ +#define AL_EFFECT_FIRST_PARAMETER 0x0000 +#define AL_EFFECT_LAST_PARAMETER 0x8000 +#define AL_EFFECT_TYPE 0x8001 + +/* Effect type definitions to be used with AL_EFFECT_TYPE. */ +#define AL_EFFECT_NULL 0x0000 /* Can also be used as an Effect Object ID */ +#define AL_EFFECT_REVERB 0x0001 +#define AL_EFFECT_CHORUS 0x0002 +#define AL_EFFECT_DISTORTION 0x0003 +#define AL_EFFECT_ECHO 0x0004 +#define AL_EFFECT_FLANGER 0x0005 +#define AL_EFFECT_FREQUENCY_SHIFTER 0x0006 +#define AL_EFFECT_VOCAL_MORPHER 0x0007 +#define AL_EFFECT_PITCH_SHIFTER 0x0008 +#define AL_EFFECT_RING_MODULATOR 0x0009 +#define AL_EFFECT_AUTOWAH 0x000A +#define AL_EFFECT_COMPRESSOR 0x000B +#define AL_EFFECT_EQUALIZER 0x000C + +/** + * Auxiliary Slot object definitions to be used with alAuxiliaryEffectSlot functions. + */ +#define AL_EFFECTSLOT_EFFECT 0x0001 +#define AL_EFFECTSLOT_GAIN 0x0002 +#define AL_EFFECTSLOT_AUXILIARY_SEND_AUTO 0x0003 + +/** + * Value to be used as an Auxiliary Slot ID to disable a source send.. + */ +#define AL_EFFECTSLOT_NULL 0x0000 + + + +/** + * Filter object definitions to be used with alFilter functions. + */ + +/* Lowpass parameters. */ +#define AL_LOWPASS_GAIN 0x0001 +#define AL_LOWPASS_GAINHF 0x0002 + +/* Highpass Parameters */ +#define AL_HIGHPASS_GAIN 0x0001 +#define AL_HIGHPASS_GAINLF 0x0002 + +/* Bandpass Parameters */ +#define AL_BANDPASS_GAIN 0x0001 +#define AL_BANDPASS_GAINLF 0x0002 +#define AL_BANDPASS_GAINHF 0x0003 + +/* Filter type */ +#define AL_FILTER_FIRST_PARAMETER 0x0000 +#define AL_FILTER_LAST_PARAMETER 0x8000 +#define AL_FILTER_TYPE 0x8001 + +/* Filter type definitions to be used with AL_FILTER_TYPE. */ +#define AL_FILTER_NULL 0x0000 /* Can also be used as a Filter Object ID */ +#define AL_FILTER_LOWPASS 0x0001 +#define AL_FILTER_HIGHPASS 0x0002 +#define AL_FILTER_BANDPASS 0x0003 + + +/** + * Effect object functions. + */ + +/* Create Effect objects. */ +typedef void (__cdecl *LPALGENEFFECTS)( ALsizei n, ALuint* effects ); + +/* Delete Effect objects. */ +typedef void (__cdecl *LPALDELETEEFFECTS)( ALsizei n, ALuint* effects ); + +/* Verify a handle is a valid Effect. */ +typedef ALboolean (__cdecl *LPALISEFFECT)( ALuint eid ); + +/* Set an integer parameter for an Effect object. */ +typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); +typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); + +/* Set a floating point parameter for an Effect object. */ +typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value); +typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); + +/* Get an integer parameter for an Effect object. */ +typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value ); +typedef void (__cdecl *LPALGETEFFECTIV)( ALuint eid, ALenum pname, ALint* values ); + +/* Get a floating point parameter for an Effect object. */ +typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value ); +typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values ); + + +/** + * Filter object functions + */ + +/* Create Filter objects. */ +typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); + +/* Delete Filter objects. */ +typedef void (__cdecl *LPALDELETEFILTERS)( ALsizei n, ALuint* filters ); + +/* Verify a handle is a valid Filter. */ +typedef ALboolean (__cdecl *LPALISFILTER)( ALuint fid ); + +/* Set an integer parameter for a Filter object. */ +typedef void (__cdecl *LPALFILTERI)( ALuint fid, ALenum param, ALint value ); +typedef void (__cdecl *LPALFILTERIV)( ALuint fid, ALenum param, ALint* values ); + +/* Set a floating point parameter for an Filter object. */ +typedef void (__cdecl *LPALFILTERF)( ALuint fid, ALenum param, ALfloat value); +typedef void (__cdecl *LPALFILTERFV)( ALuint fid, ALenum param, ALfloat* values ); + +/* Get an integer parameter for a Filter object. */ +typedef void (__cdecl *LPALGETFILTERI)( ALuint fid, ALenum pname, ALint* value ); +typedef void (__cdecl *LPALGETFILTERIV)( ALuint fid, ALenum pname, ALint* values ); + +/* Get a floating point parameter for a Filter object. */ +typedef void (__cdecl *LPALGETFILTERF)( ALuint fid, ALenum pname, ALfloat* value ); +typedef void (__cdecl *LPALGETFILTERFV)( ALuint fid, ALenum pname, ALfloat* values ); + + +/** + * Auxiliary Slot object functions + */ + +/* Create Auxiliary Slot objects. */ +typedef void (__cdecl *LPALGENAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); + +/* Delete Auxiliary Slot objects. */ +typedef void (__cdecl *LPALDELETEAUXILIARYEFFECTSLOTS)( ALsizei n, ALuint* slots ); + +/* Verify a handle is a valid Auxiliary Slot. */ +typedef ALboolean (__cdecl *LPALISAUXILIARYEFFECTSLOT)( ALuint slot ); + +/* Set an integer parameter for a Auxiliary Slot object. */ +typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum param, ALint value ); +typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum param, ALint* values ); + +/* Set a floating point parameter for an Auxiliary Slot object. */ +typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum param, ALfloat value ); +typedef void (__cdecl *LPALAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum param, ALfloat* values ); + +/* Get an integer parameter for a Auxiliary Slot object. */ +typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTI)( ALuint asid, ALenum pname, ALint* value ); +typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTIV)( ALuint asid, ALenum pname, ALint* values ); + +/* Get a floating point parameter for a Auxiliary Slot object. */ +typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTF)( ALuint asid, ALenum pname, ALfloat* value ); +typedef void (__cdecl *LPALGETAUXILIARYEFFECTSLOTFV)( ALuint asid, ALenum pname, ALfloat* values ); + + + + +/********************************************************** + * Filter ranges and defaults. + */ + +/** + * Lowpass filter + */ + +#define LOWPASS_MIN_GAIN 0.0f +#define LOWPASS_MAX_GAIN 1.0f +#define LOWPASS_DEFAULT_GAIN 1.0f + +#define LOWPASS_MIN_GAINHF 0.0f +#define LOWPASS_MAX_GAINHF 1.0f +#define LOWPASS_DEFAULT_GAINHF 1.0f + +/** + * Highpass filter + */ + +#define HIGHPASS_MIN_GAIN 0.0f +#define HIGHPASS_MAX_GAIN 1.0f +#define HIGHPASS_DEFAULT_GAIN 1.0f + +#define HIGHPASS_MIN_GAINLF 0.0f +#define HIGHPASS_MAX_GAINLF 1.0f +#define HIGHPASS_DEFAULT_GAINLF 1.0f + +/** + * Bandpass filter + */ + +#define BANDPASS_MIN_GAIN 0.0f +#define BANDPASS_MAX_GAIN 1.0f +#define BANDPASS_DEFAULT_GAIN 1.0f + +#define BANDPASS_MIN_GAINHF 0.0f +#define BANDPASS_MAX_GAINHF 1.0f +#define BANDPASS_DEFAULT_GAINHF 1.0f + +#define BANDPASS_MIN_GAINLF 0.0f +#define BANDPASS_MAX_GAINLF 1.0f +#define BANDPASS_DEFAULT_GAINLF 1.0f + + + + + /********************************************************** + * Effect parameter structures, value definitions, ranges and defaults. + */ + +/** + * AL reverb effect parameter ranges and defaults + */ +#define AL_REVERB_MIN_DENSITY 0.0f +#define AL_REVERB_MAX_DENSITY 1.0f +#define AL_REVERB_DEFAULT_DENSITY 1.0f + +#define AL_REVERB_MIN_DIFFUSION 0.0f +#define AL_REVERB_MAX_DIFFUSION 1.0f +#define AL_REVERB_DEFAULT_DIFFUSION 1.0f + +#define AL_REVERB_MIN_GAIN 0.0f +#define AL_REVERB_MAX_GAIN 1.0f +#define AL_REVERB_DEFAULT_GAIN 0.32f + +#define AL_REVERB_MIN_GAINHF 0.0f +#define AL_REVERB_MAX_GAINHF 1.0f +#define AL_REVERB_DEFAULT_GAINHF 0.89f + +#define AL_REVERB_MIN_DECAY_TIME 0.1f +#define AL_REVERB_MAX_DECAY_TIME 20.0f +#define AL_REVERB_DEFAULT_DECAY_TIME 1.49f + +#define AL_REVERB_MIN_DECAY_HFRATIO 0.1f +#define AL_REVERB_MAX_DECAY_HFRATIO 2.0f +#define AL_REVERB_DEFAULT_DECAY_HFRATIO 0.83f + +#define AL_REVERB_MIN_REFLECTIONS_GAIN 0.0f +#define AL_REVERB_MAX_REFLECTIONS_GAIN 3.16f +#define AL_REVERB_DEFAULT_REFLECTIONS_GAIN 0.05f + +#define AL_REVERB_MIN_REFLECTIONS_DELAY 0.0f +#define AL_REVERB_MAX_REFLECTIONS_DELAY 0.3f +#define AL_REVERB_DEFAULT_REFLECTIONS_DELAY 0.007f + +#define AL_REVERB_MIN_LATE_REVERB_GAIN 0.0f +#define AL_REVERB_MAX_LATE_REVERB_GAIN 10.0f +#define AL_REVERB_DEFAULT_LATE_REVERB_GAIN 1.26f + +#define AL_REVERB_MIN_LATE_REVERB_DELAY 0.0f +#define AL_REVERB_MAX_LATE_REVERB_DELAY 0.1f +#define AL_REVERB_DEFAULT_LATE_REVERB_DELAY 0.011f + +#define AL_REVERB_MIN_AIR_ABSORPTION_GAINHF 0.892f +#define AL_REVERB_MAX_AIR_ABSORPTION_GAINHF 1.0f +#define AL_REVERB_DEFAULT_AIR_ABSORPTION_GAINHF 0.994f + +#define AL_REVERB_MIN_ROOM_ROLLOFF_FACTOR 0.0f +#define AL_REVERB_MAX_ROOM_ROLLOFF_FACTOR 10.0f +#define AL_REVERB_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f + +#define AL_REVERB_MIN_DECAY_HFLIMIT AL_FALSE +#define AL_REVERB_MAX_DECAY_HFLIMIT AL_TRUE +#define AL_REVERB_DEFAULT_DECAY_HFLIMIT AL_TRUE + +/** + * AL chorus effect parameter ranges and defaults + */ +#define AL_CHORUS_MIN_WAVEFORM 0 +#define AL_CHORUS_MAX_WAVEFORM 1 +#define AL_CHORUS_DEFAULT_WAVEFORM 1 + +#define AL_CHORUS_WAVEFORM_SINUSOID 0 +#define AL_CHORUS_WAVEFORM_TRIANGLE 1 + +#define AL_CHORUS_MIN_PHASE (-180) +#define AL_CHORUS_MAX_PHASE 180 +#define AL_CHORUS_DEFAULT_PHASE 90 + +#define AL_CHORUS_MIN_RATE 0.0f +#define AL_CHORUS_MAX_RATE 10.0f +#define AL_CHORUS_DEFAULT_RATE 1.1f + +#define AL_CHORUS_MIN_DEPTH 0.0f +#define AL_CHORUS_MAX_DEPTH 1.0f +#define AL_CHORUS_DEFAULT_DEPTH 0.1f + +#define AL_CHORUS_MIN_FEEDBACK (-1.0f) +#define AL_CHORUS_MAX_FEEDBACK 1.0f +#define AL_CHORUS_DEFAULT_FEEDBACK 0.25f + +#define AL_CHORUS_MIN_DELAY 0.0f +#define AL_CHORUS_MAX_DELAY 0.016f +#define AL_CHORUS_DEFAULT_DELAY 0.016f + +/** + * AL distortion effect parameter ranges and defaults + */ +#define AL_DISTORTION_MIN_EDGE 0.0f +#define AL_DISTORTION_MAX_EDGE 1.0f +#define AL_DISTORTION_DEFAULT_EDGE 0.2f + +#define AL_DISTORTION_MIN_GAIN 0.01f +#define AL_DISTORTION_MAX_GAIN 1.0f +#define AL_DISTORTION_DEFAULT_GAIN 0.05f + +#define AL_DISTORTION_MIN_LOWPASS_CUTOFF 80.0f +#define AL_DISTORTION_MAX_LOWPASS_CUTOFF 24000.0f +#define AL_DISTORTION_DEFAULT_LOWPASS_CUTOFF 8000.0f + +#define AL_DISTORTION_MIN_EQCENTER 80.0f +#define AL_DISTORTION_MAX_EQCENTER 24000.0f +#define AL_DISTORTION_DEFAULT_EQCENTER 3600.0f + +#define AL_DISTORTION_MIN_EQBANDWIDTH 80.0f +#define AL_DISTORTION_MAX_EQBANDWIDTH 24000.0f +#define AL_DISTORTION_DEFAULT_EQBANDWIDTH 3600.0f + +/** + * AL echo effect parameter ranges and defaults + */ +#define AL_ECHO_MIN_DELAY 0.0f +#define AL_ECHO_MAX_DELAY 0.207f +#define AL_ECHO_DEFAULT_DELAY 0.1f + +#define AL_ECHO_MIN_LRDELAY 0.0f +#define AL_ECHO_MAX_LRDELAY 0.404f +#define AL_ECHO_DEFAULT_LRDELAY 0.1f + +#define AL_ECHO_MIN_DAMPING 0.0f +#define AL_ECHO_MAX_DAMPING 0.99f +#define AL_ECHO_DEFAULT_DAMPING 0.5f + +#define AL_ECHO_MIN_FEEDBACK 0.0f +#define AL_ECHO_MAX_FEEDBACK 1.0f +#define AL_ECHO_DEFAULT_FEEDBACK 0.5f + +#define AL_ECHO_MIN_SPREAD (-1.0f) +#define AL_ECHO_MAX_SPREAD 1.0f +#define AL_ECHO_DEFAULT_SPREAD (-1.0f) + +/** + * AL flanger effect parameter ranges and defaults + */ +#define AL_FLANGER_MIN_WAVEFORM 0 +#define AL_FLANGER_MAX_WAVEFORM 1 +#define AL_FLANGER_DEFAULT_WAVEFORM 1 + +#define AL_FLANGER_WAVEFORM_SINUSOID 0 +#define AL_FLANGER_WAVEFORM_TRIANGLE 1 + +#define AL_FLANGER_MIN_PHASE (-180) +#define AL_FLANGER_MAX_PHASE 180 +#define AL_FLANGER_DEFAULT_PHASE 0 + +#define AL_FLANGER_MIN_RATE 0.0f +#define AL_FLANGER_MAX_RATE 10.0f +#define AL_FLANGER_DEFAULT_RATE 0.27f + +#define AL_FLANGER_MIN_DEPTH 0.0f +#define AL_FLANGER_MAX_DEPTH 1.0f +#define AL_FLANGER_DEFAULT_DEPTH 1.0f + +#define AL_FLANGER_MIN_FEEDBACK (-1.0f) +#define AL_FLANGER_MAX_FEEDBACK 1.0f +#define AL_FLANGER_DEFAULT_FEEDBACK (-0.5f) + +#define AL_FLANGER_MIN_DELAY 0.0f +#define AL_FLANGER_MAX_DELAY 0.004f +#define AL_FLANGER_DEFAULT_DELAY 0.002f + +/** + * AL frequency shifter effect parameter ranges and defaults + */ +#define AL_FREQUENCY_SHIFTER_MIN_FREQUENCY 0.0f +#define AL_FREQUENCY_SHIFTER_MAX_FREQUENCY 24000.0f +#define AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY 0.0f + +#define AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION 0 +#define AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION 2 +#define AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION 0 + +#define AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION 0 +#define AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION 2 +#define AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION 0 + +#define AL_FREQUENCY_SHIFTER_DIRECTION_DOWN 0 +#define AL_FREQUENCY_SHIFTER_DIRECTION_UP 1 +#define AL_FREQUENCY_SHIFTER_DIRECTION_OFF 2 + +/** + * AL vocal morpher effect parameter ranges and defaults + */ +#define AL_VOCAL_MORPHER_MIN_PHONEMEA 0 +#define AL_VOCAL_MORPHER_MAX_PHONEMEA 29 +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA 0 + +#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING 24 +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING 0 + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB 0 +#define AL_VOCAL_MORPHER_MAX_PHONEMEB 29 +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB 10 + +#define AL_VOCAL_MORPHER_PHONEME_A 0 +#define AL_VOCAL_MORPHER_PHONEME_E 1 +#define AL_VOCAL_MORPHER_PHONEME_I 2 +#define AL_VOCAL_MORPHER_PHONEME_O 3 +#define AL_VOCAL_MORPHER_PHONEME_U 4 +#define AL_VOCAL_MORPHER_PHONEME_AA 5 +#define AL_VOCAL_MORPHER_PHONEME_AE 6 +#define AL_VOCAL_MORPHER_PHONEME_AH 7 +#define AL_VOCAL_MORPHER_PHONEME_AO 8 +#define AL_VOCAL_MORPHER_PHONEME_EH 9 +#define AL_VOCAL_MORPHER_PHONEME_ER 10 +#define AL_VOCAL_MORPHER_PHONEME_IH 11 +#define AL_VOCAL_MORPHER_PHONEME_IY 12 +#define AL_VOCAL_MORPHER_PHONEME_UH 13 +#define AL_VOCAL_MORPHER_PHONEME_UW 14 +#define AL_VOCAL_MORPHER_PHONEME_B 15 +#define AL_VOCAL_MORPHER_PHONEME_D 16 +#define AL_VOCAL_MORPHER_PHONEME_F 17 +#define AL_VOCAL_MORPHER_PHONEME_G 18 +#define AL_VOCAL_MORPHER_PHONEME_J 19 +#define AL_VOCAL_MORPHER_PHONEME_K 20 +#define AL_VOCAL_MORPHER_PHONEME_L 21 +#define AL_VOCAL_MORPHER_PHONEME_M 22 +#define AL_VOCAL_MORPHER_PHONEME_N 23 +#define AL_VOCAL_MORPHER_PHONEME_P 24 +#define AL_VOCAL_MORPHER_PHONEME_R 25 +#define AL_VOCAL_MORPHER_PHONEME_S 26 +#define AL_VOCAL_MORPHER_PHONEME_T 27 +#define AL_VOCAL_MORPHER_PHONEME_V 28 +#define AL_VOCAL_MORPHER_PHONEME_Z 29 + +#define AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING 24 +#define AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING 0 + +#define AL_VOCAL_MORPHER_MIN_WAVEFORM 0 +#define AL_VOCAL_MORPHER_MAX_WAVEFORM 2 +#define AL_VOCAL_MORPHER_DEFAULT_WAVEFORM 0 + +#define AL_VOCAL_MORPHER_WAVEFORM_SINUSOID 0 +#define AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE 1 +#define AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH 2 + +#define AL_VOCAL_MORPHER_MIN_RATE 0.0f +#define AL_VOCAL_MORPHER_MAX_RATE 10.0f +#define AL_VOCAL_MORPHER_DEFAULT_RATE 1.41f + +/** + * AL pitch shifter effect parameter ranges and defaults + */ +#define AL_PITCH_SHIFTER_MIN_COARSE_TUNE (-12) +#define AL_PITCH_SHIFTER_MAX_COARSE_TUNE 12 +#define AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE 12 + +#define AL_PITCH_SHIFTER_MIN_FINE_TUNE (-50) +#define AL_PITCH_SHIFTER_MAX_FINE_TUNE 50 +#define AL_PITCH_SHIFTER_DEFAULT_FINE_TUNE 0 + +/** + * AL ring modulator effect parameter ranges and defaults + */ +#define AL_RING_MODULATOR_MIN_FREQUENCY 0.0f +#define AL_RING_MODULATOR_MAX_FREQUENCY 8000.0f +#define AL_RING_MODULATOR_DEFAULT_FREQUENCY 440.0f + +#define AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF 0.0f +#define AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF 24000.0f +#define AL_RING_MODULATOR_DEFAULT_HIGHPASS_CUTOFF 800.0f + +#define AL_RING_MODULATOR_MIN_WAVEFORM 0 +#define AL_RING_MODULATOR_MAX_WAVEFORM 2 +#define AL_RING_MODULATOR_DEFAULT_WAVEFORM 0 + +#define AL_RING_MODULATOR_SINUSOID 0 +#define AL_RING_MODULATOR_SAWTOOTH 1 +#define AL_RING_MODULATOR_SQUARE 2 + +/** + * AL autowah effect parameter ranges and defaults + */ +#define AL_AUTOWAH_MIN_ATTACK_TIME 0.0001f +#define AL_AUTOWAH_MAX_ATTACK_TIME 1.0f +#define AL_AUTOWAH_DEFAULT_ATTACK_TIME 0.06f + +#define AL_AUTOWAH_MIN_RELEASE_TIME 0.0001f +#define AL_AUTOWAH_MAX_RELEASE_TIME 1.0f +#define AL_AUTOWAH_DEFAULT_RELEASE_TIME 0.06f + +#define AL_AUTOWAH_MIN_RESONANCE 2.0f +#define AL_AUTOWAH_MAX_RESONANCE 1000.0f +#define AL_AUTOWAH_DEFAULT_RESONANCE 1000.0f + +#define AL_AUTOWAH_MIN_PEAK_GAIN 0.00003f +#define AL_AUTOWAH_MAX_PEAK_GAIN 31621.0f +#define AL_AUTOWAH_DEFAULT_PEAK_GAIN 11.22f + +/** + * AL compressor effect parameter ranges and defaults + */ +#define AL_COMPRESSOR_MIN_ONOFF 0 +#define AL_COMPRESSOR_MAX_ONOFF 1 +#define AL_COMPRESSOR_DEFAULT_ONOFF 1 + +/** + * AL equalizer effect parameter ranges and defaults + */ +#define AL_EQUALIZER_MIN_LOW_GAIN 0.126f +#define AL_EQUALIZER_MAX_LOW_GAIN 7.943f +#define AL_EQUALIZER_DEFAULT_LOW_GAIN 1.0f + +#define AL_EQUALIZER_MIN_LOW_CUTOFF 50.0f +#define AL_EQUALIZER_MAX_LOW_CUTOFF 800.0f +#define AL_EQUALIZER_DEFAULT_LOW_CUTOFF 200.0f + +#define AL_EQUALIZER_MIN_MID1_GAIN 0.126f +#define AL_EQUALIZER_MAX_MID1_GAIN 7.943f +#define AL_EQUALIZER_DEFAULT_MID1_GAIN 1.0f + +#define AL_EQUALIZER_MIN_MID1_CENTER 200.0f +#define AL_EQUALIZER_MAX_MID1_CENTER 3000.0f +#define AL_EQUALIZER_DEFAULT_MID1_CENTER 500.0f + +#define AL_EQUALIZER_MIN_MID1_WIDTH 0.01f +#define AL_EQUALIZER_MAX_MID1_WIDTH 1.0f +#define AL_EQUALIZER_DEFAULT_MID1_WIDTH 1.0f + +#define AL_EQUALIZER_MIN_MID2_GAIN 0.126f +#define AL_EQUALIZER_MAX_MID2_GAIN 7.943f +#define AL_EQUALIZER_DEFAULT_MID2_GAIN 1.0f + +#define AL_EQUALIZER_MIN_MID2_CENTER 1000.0f +#define AL_EQUALIZER_MAX_MID2_CENTER 8000.0f +#define AL_EQUALIZER_DEFAULT_MID2_CENTER 3000.0f + +#define AL_EQUALIZER_MIN_MID2_WIDTH 0.01f +#define AL_EQUALIZER_MAX_MID2_WIDTH 1.0f +#define AL_EQUALIZER_DEFAULT_MID2_WIDTH 1.0f + +#define AL_EQUALIZER_MIN_HIGH_GAIN 0.126f +#define AL_EQUALIZER_MAX_HIGH_GAIN 7.943f +#define AL_EQUALIZER_DEFAULT_HIGH_GAIN 1.0f + +#define AL_EQUALIZER_MIN_HIGH_CUTOFF 4000.0f +#define AL_EQUALIZER_MAX_HIGH_CUTOFF 16000.0f +#define AL_EQUALIZER_DEFAULT_HIGH_CUTOFF 6000.0f + + + + +/********************************************************** + * Source parameter value definitions, ranges and defaults. + */ +#define AL_MIN_AIR_ABSORPTION_FACTOR 0.0f +#define AL_MAX_AIR_ABSORPTION_FACTOR 10.0f +#define AL_DEFAULT_AIR_ABSORPTION_FACTOR 0.0f + +#define AL_MIN_ROOM_ROLLOFF_FACTOR 0.0f +#define AL_MAX_ROOM_ROLLOFF_FACTOR 10.0f +#define AL_DEFAULT_ROOM_ROLLOFF_FACTOR 0.0f + +#define AL_MIN_CONE_OUTER_GAINHF 0.0f +#define AL_MAX_CONE_OUTER_GAINHF 1.0f +#define AL_DEFAULT_CONE_OUTER_GAINHF 1.0f + +#define AL_MIN_DIRECT_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_DIRECT_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_DIRECT_FILTER_GAINHF_AUTO AL_TRUE + +#define AL_MIN_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAIN_AUTO AL_TRUE + +#define AL_MIN_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_FALSE +#define AL_MAX_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE +#define AL_DEFAULT_AUXILIARY_SEND_FILTER_GAINHF_AUTO AL_TRUE + + + + +/********************************************************** + * Listener parameter value definitions, ranges and defaults. + */ +#define AL_MIN_METERS_PER_UNIT FLT_MIN +#define AL_MAX_METERS_PER_UNIT FLT_MAX +#define AL_DEFAULT_METERS_PER_UNIT 1.0f + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __efx_h_ */ diff --git a/Externals/OpenAL/include/xram.h b/Externals/OpenAL/include/xram.h new file mode 100644 index 0000000000..cfff054329 --- /dev/null +++ b/Externals/OpenAL/include/xram.h @@ -0,0 +1,94 @@ +#include + +// X-RAM Function pointer definitions +typedef ALboolean (__cdecl *EAXSetBufferMode)(ALsizei n, ALuint *buffers, ALint value); +typedef ALenum (__cdecl *EAXGetBufferMode)(ALuint buffer, ALint *value); + +////////////////////////////////////////////////////////////////////////////// +// Query for X-RAM extension +// +// if (alIsExtensionPresent("EAX-RAM") == AL_TRUE) +// X-RAM Extension found +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// X-RAM enum names +// +// "AL_EAX_RAM_SIZE" +// "AL_EAX_RAM_FREE" +// "AL_STORAGE_AUTOMATIC" +// "AL_STORAGE_HARDWARE" +// "AL_STORAGE_ACCESSIBLE" +// +// Query enum values using alGetEnumValue, for example +// +// long lRamSizeEnum = alGetEnumValue("AL_EAX_RAM_SIZE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query total amount of X-RAM +// +// long lTotalSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_SIZE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query free X-RAM available +// +// long lFreeSize = alGetInteger(alGetEnumValue("AL_EAX_RAM_FREE") +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Query X-RAM Function pointers +// +// Use typedefs defined above to get the X-RAM function pointers using +// alGetProcAddress +// +// EAXSetBufferMode eaxSetBufferMode; +// EAXGetBufferMode eaxGetBufferMode; +// +// eaxSetBufferMode = (EAXSetBufferMode)alGetProcAddress("EAXSetBufferMode"); +// eaxGetBufferMode = (EAXGetBufferMode)alGetProcAddress("EAXGetBufferMode"); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Force an Open AL Buffer into X-RAM (good for non-streaming buffers) +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_HARDWARE")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Force an Open AL Buffer into 'accessible' (currently host) RAM (good for streaming buffers) +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_ACCESSIBLE")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////// +// Put an Open AL Buffer into X-RAM if memory is available, otherwise use +// host RAM. This is the default mode. +// +// ALuint uiBuffer; +// alGenBuffers(1, &uiBuffer); +// eaxSetBufferMode(1, &uiBuffer, alGetEnumValue("AL_STORAGE_AUTOMATIC")); +// alBufferData(...); +// +////////////////////////////////////////////////////////////////////////////// diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 0c5f256c19..4bcee7559b 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -114,7 +114,10 @@ true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + @@ -123,7 +126,10 @@ true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + @@ -134,7 +140,10 @@ true true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + @@ -145,7 +154,10 @@ true true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + @@ -156,7 +168,10 @@ true true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + @@ -167,17 +182,13 @@ true true - + + OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + - - true - true - true - true - true - true - + @@ -189,14 +200,7 @@ - - true - true - true - true - true - true - + diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 884a1e6c16..c3cab37dd8 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -81,8 +81,9 @@ private: #define GC_ALIGNED16_DECL(x) __declspec(align(16)) x #define GC_ALIGNED64_DECL(x) __declspec(align(64)) x -// Since it is always around on windows +// Since they are always around on windows #define HAVE_WX 1 + #define HAVE_OPENAL 1 #define HAVE_PORTAUDIO 1 From 5240e75be20791d5226e7ac589a09a102755edf2 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 7 Jan 2013 12:25:18 +1100 Subject: [PATCH 318/627] Fixed the infinite rumble problem caused by r4d6056f14625. --- Source/Core/Core/Src/HW/GCPad.cpp | 8 ++++++-- Source/Core/Core/Src/HW/GCPadEmu.cpp | 19 +++++++++++++++---- Source/Core/Core/Src/HW/GCPadEmu.h | 1 + .../DInput/DInputJoystick.cpp | 6 +----- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 61b666af12..68ba3ab88a 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -105,6 +105,10 @@ void Rumble(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) { ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(255); } + else + { + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(0); + } } } @@ -123,9 +127,9 @@ void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength) { // TODO: this has potential to not stop rumble if user is messing with GUI at the perfect time // set rumble - if (_uType == 06) + if (_uType == 6) { - ((GCPad*)g_plugin.controllers[ _numPAD ])->SetOutput(_uStrength); + ((GCPad*)g_plugin.controllers[ _numPAD ])->SetMotor(_uStrength); } } } diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp index 5233ed2877..a2c0c2afa9 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.cpp +++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp @@ -130,13 +130,24 @@ void GCPad::GetInput(SPADStatus* const pad) } } +void GCPad::SetMotor(const u8 on) +{ + float state = (float)on / 255; + float force = abs(state - 0.5) * 2; + if (state < 0.5) + force = -force; + + // only rumble if window has focus or background input is enabled + if (Host_RendererHasFocus() || m_options[0].settings[0]->value) + m_rumble->controls[0]->control_ref->State(force); + else + m_rumble->controls[0]->control_ref->State(0); +} + void GCPad::SetOutput(const u8 on) { // only rumble if window has focus or background input is enabled - if (Host_RendererHasFocus() || m_options[0].settings[0]->value) - m_rumble->controls[0]->control_ref->State((float)on / 255); - else - m_rumble->controls[0]->control_ref->State(0); + m_rumble->controls[0]->control_ref->State(on && (Host_RendererHasFocus() || m_options[0].settings[0]->value)); } void GCPad::LoadDefaults(const ControllerInterface& ciface) diff --git a/Source/Core/Core/Src/HW/GCPadEmu.h b/Source/Core/Core/Src/HW/GCPadEmu.h index cf0940245e..e57e6b0b68 100644 --- a/Source/Core/Core/Src/HW/GCPadEmu.h +++ b/Source/Core/Core/Src/HW/GCPadEmu.h @@ -29,6 +29,7 @@ public: GCPad(const unsigned int index); void GetInput(SPADStatus* const pad); void SetOutput(const u8 on); + void SetMotor(const u8 on); bool GetMicButton() const; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index b7ac3bf82e..af6ee7e77c 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -535,11 +535,7 @@ ControlState Joystick::Hat::GetState() const void Joystick::ForceConstant::SetState(const ControlState state) { - float force = abs(state - 0.5) * 2; - if (state < 0.5) - force = -force; - - const LONG new_val = LONG(10000 * force); + const LONG new_val = LONG(10000 * state); LONG &val = params.lMagnitude; if (val != new_val) From c8c78e0aa9c7ec1ef738ca064daad5903a9e7b48 Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 7 Jan 2013 15:37:08 +1100 Subject: [PATCH 319/627] Implemented correct audio timing. Fixes issue 5493. --- Source/Core/AudioCommon/Src/OpenALStream.cpp | 21 ++++++++++++-------- Source/Core/AudioCommon/Src/OpenALStream.h | 1 - 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 2abd357782..4cc64a17de 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -19,6 +19,8 @@ #include "aldlist.h" #include "OpenALStream.h" +#include "../../Core/Src/HW/SystemTimers.h" +#include "../../Core/Src/HW/AudioInterface.h" #if defined HAVE_OPENAL && HAVE_OPENAL @@ -158,9 +160,16 @@ void OpenALStream::SoundLoop() iBuffersFilled = 0; } - unsigned int numSamples = m_mixer->GetNumSamples(); + // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. + const u32 stereo_16_bit_size = 4; + const u32 dma_length = 32; + const u64 audio_dma_period = SystemTimers::GetTicksPerSecond() / (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length); + const u64 ais_samples_per_second = 48000 * stereo_16_bit_size; + const u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); - if (iBuffersProcessed && (numSamples >= OAL_THRESHOLD)) + unsigned int numSamples = (unsigned int)num_samples_to_render; + + if (iBuffersProcessed) { numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) @@ -175,14 +184,10 @@ void OpenALStream::SoundLoop() if (iBuffersFilled == OAL_NUM_BUFFERS) alSourcePlay(uiSource); } - else if (numSamples >= OAL_THRESHOLD) + else { - ALint state = 0; - alGetSourcei(uiSource, AL_SOURCE_STATE, &state); - if (state == AL_STOPPED) - alSourcePlay(uiSource); + soundSyncEvent.Wait(); } - soundSyncEvent.Wait(); } } diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index 2c0d75b510..a9c1f51399 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -38,7 +38,6 @@ #define SFX_MAX_SOURCE 1 #define OAL_NUM_BUFFERS 16 #define OAL_MAX_SAMPLES 512 // AyuanX: Don't make it too large, as larger buffer means longer delay -#define OAL_THRESHOLD 128 // Some games are quite sensitive to delay #endif class OpenALStream: public SoundStream From d0301ca89d318d8d6e3e7fde9c4b60e470e184e4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 7 Jan 2013 13:47:34 -0600 Subject: [PATCH 320/627] Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae --- .gitignore | 1 - Source/Core/Common/Src/MathUtil.h | 2 - Source/Core/VideoCommon/Src/BPFunctions.cpp | 2 +- .../Src/FramebufferManager.cpp | 85 ++---- .../Src/NativeVertexFormat.cpp | 37 +-- .../Plugin_VideoOGL/Src/RasterFont.cpp | 240 ++++++---------- .../Plugins/Plugin_VideoOGL/Src/RasterFont.h | 20 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 268 +++++------------- .../Plugin_VideoOGL/Src/TextureCache.cpp | 91 +----- .../Plugin_VideoOGL/Src/TextureCache.h | 3 - .../Plugin_VideoOGL/Src/TextureConverter.cpp | 112 +------- .../Plugin_VideoOGL/Src/VertexManager.cpp | 3 + .../Plugin_VideoSoftware/Src/SWRenderer.cpp | 5 +- 13 files changed, 242 insertions(+), 627 deletions(-) diff --git a/.gitignore b/.gitignore index 6eaaaf119a..3cc8a1d8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,3 @@ Source/Core/Common/Src/scmrev.h *.ipch .sconsign.dblite Externals/scons-local/* -*~ diff --git a/Source/Core/Common/Src/MathUtil.h b/Source/Core/Common/Src/MathUtil.h index c5f613ada1..a6290ff602 100644 --- a/Source/Core/Common/Src/MathUtil.h +++ b/Source/Core/Common/Src/MathUtil.h @@ -117,8 +117,6 @@ struct Rectangle Rectangle(T theLeft, T theTop, T theRight, T theBottom) : left(theLeft), top(theTop), right(theRight), bottom(theBottom) { } - - bool operator==(const Rectangle& r) { return left==r.left && top==r.top && right==r.right && bottom==r.bottom; } T GetWidth() const { return abs(right - left); } T GetHeight() const { return abs(bottom - top); } diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index b9a76ba7b6..cddeae3000 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -236,7 +236,7 @@ bool GetConfig(const int &type) case CONFIG_DISABLEFOG: return g_ActiveConfig.bDisableFog; case CONFIG_SHOWEFBREGIONS: - return g_ActiveConfig.bShowEFBCopyRegions; + return false; default: PanicAlert("GetConfig Error: Unknown Config Type!"); return false; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp index e7fb7ad7b7..0e37c3adb6 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp @@ -17,7 +17,6 @@ #include "Globals.h" #include "FramebufferManager.h" -#include "VertexShaderGen.h" #include "TextureConverter.h" #include "Render.h" @@ -28,11 +27,6 @@ namespace OGL extern bool s_bHaveFramebufferBlit; // comes from Render.cpp. ugly. -static GLuint s_VBO = 0; -static GLuint s_VAO = 0; -static MathUtil::Rectangle s_cached_sourcerc; -static MathUtil::Rectangle s_cached_drawrc; - int FramebufferManager::m_targetWidth; int FramebufferManager::m_targetHeight; int FramebufferManager::m_msaaSamples; @@ -59,15 +53,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms m_resolvedDepthTexture = 0; m_xfbFramebuffer = 0; - s_cached_sourcerc.bottom = -1; - s_cached_sourcerc.left = -1; - s_cached_sourcerc.right = -1; - s_cached_sourcerc.top = -1; - s_cached_drawrc.bottom = -1; - s_cached_drawrc.left = -1; - s_cached_drawrc.right = -1; - s_cached_drawrc.top = -1; - m_targetWidth = targetWidth; m_targetHeight = targetHeight; @@ -184,28 +169,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms // Create XFB framebuffer; targets will be created elsewhere. glGenFramebuffersEXT(1, &m_xfbFramebuffer); - - // Generate VBO & VAO - and initialize the VAO for "Draw" - glGenBuffers(1, &s_VBO); - glGenVertexArrays(1, &s_VAO); - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - glBindVertexArray(s_VAO); - - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, 6*sizeof(GLfloat), NULL); - - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+2); - - glClientActiveTexture(GL_TEXTURE1); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 6*sizeof(GLfloat), (GLfloat*)NULL+4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - + // EFB framebuffer is currently bound, make sure to clear its alpha value to 1.f glViewport(0, 0, m_targetWidth, m_targetHeight); glScissor(0, 0, m_targetWidth, m_targetHeight); @@ -217,8 +181,6 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms FramebufferManager::~FramebufferManager() { glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - glDeleteBuffers(1, &s_VBO); - glDeleteVertexArrays(1, &s_VAO); GLuint glObj[3]; @@ -343,35 +305,24 @@ void XFBSource::Draw(const MathUtil::Rectangle &sourcerc, glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture); - if(!(s_cached_sourcerc == sourcerc) || !(s_cached_drawrc == drawrc)) { - GLfloat vertices[] = { - drawrc.left, drawrc.bottom, - sourcerc.left, sourcerc.bottom, - 0.0f, 0.0f, - drawrc.left, drawrc.top, - sourcerc.left, sourcerc.top, - 0.0f, 1.0f, - drawrc.right, drawrc.top, - sourcerc.right, sourcerc.top, - 1.0f, 1.0f, - drawrc.right, drawrc.bottom, - sourcerc.right, sourcerc.bottom, - 1.0f, 0.0f - }; - glBindBuffer(GL_ARRAY_BUFFER, s_VBO); - glBufferData(GL_ARRAY_BUFFER, 2*4*3*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - s_cached_sourcerc = sourcerc; - s_cached_drawrc = drawrc; - } + glBegin(GL_QUADS); + glTexCoord2f(sourcerc.left, sourcerc.bottom); + glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); + glVertex2f(drawrc.left, drawrc.bottom); + + glTexCoord2f(sourcerc.left, sourcerc.top); + glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); + glVertex2f(drawrc.left, drawrc.top); + + glTexCoord2f(sourcerc.right, sourcerc.top); + glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); + glVertex2f(drawrc.right, drawrc.top); + + glTexCoord2f(sourcerc.right, sourcerc.bottom); + glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); + glVertex2f(drawrc.right, drawrc.bottom); + glEnd(); - glBindVertexArray(s_VAO); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - GL_REPORT_ERRORD(); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp index a435be0dca..ae20649433 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp @@ -27,9 +27,8 @@ #define COMPILED_CODE_SIZE 4096 -// TODO: Use this again for performance, but without VAO we never know exactly the last configuration -static u32 s_prevcomponents; // previous state set - +// TODO: this guy is never initialized +u32 s_prevcomponents; // previous state set /* #ifdef _WIN32 #ifdef _M_IX86 @@ -65,6 +64,7 @@ public: virtual void Initialize(const PortableVertexDeclaration &_vtx_decl); virtual void SetupVertexPointers(); + virtual void EnableComponents(u32 components); }; namespace OGL @@ -187,7 +187,6 @@ void GLVertexFormat::SetupVertexPointers() { #ifdef USE_JIT ((void (*)())(void*)m_compiledCode)(); #else - glVertexPointer(3, GL_FLOAT, vtx_decl.stride, VertexManager::s_pBaseBufferPointer); if (vtx_decl.num_normals >= 1) { glNormalPointer(VarToGL(vtx_decl.normal_gl_type), vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.normal_offset[0])); @@ -220,32 +219,34 @@ void GLVertexFormat::SetupVertexPointers() { glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (void *)(VertexManager::s_pBaseBufferPointer + vtx_decl.posmtx_offset)); } #endif +} - if (s_prevcomponents != m_components) +void GLVertexFormat::EnableComponents(u32 components) +{ + if (s_prevcomponents != components) { - // vertices - glEnableClientState(GL_VERTEX_ARRAY); + VertexManager::Flush(); // matrices - if ((m_components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) + if ((components & VB_HAS_POSMTXIDX) != (s_prevcomponents & VB_HAS_POSMTXIDX)) { - if (m_components & VB_HAS_POSMTXIDX) + if (components & VB_HAS_POSMTXIDX) glEnableVertexAttribArray(SHADER_POSMTX_ATTRIB); else glDisableVertexAttribArray(SHADER_POSMTX_ATTRIB); } // normals - if ((m_components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) + if ((components & VB_HAS_NRM0) != (s_prevcomponents & VB_HAS_NRM0)) { - if (m_components & VB_HAS_NRM0) + if (components & VB_HAS_NRM0) glEnableClientState(GL_NORMAL_ARRAY); else glDisableClientState(GL_NORMAL_ARRAY); } - if ((m_components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) + if ((components & VB_HAS_NRM1) != (s_prevcomponents & VB_HAS_NRM1)) { - if (m_components & VB_HAS_NRM1) { + if (components & VB_HAS_NRM1) { glEnableVertexAttribArray(SHADER_NORM1_ATTRIB); glEnableVertexAttribArray(SHADER_NORM2_ATTRIB); } @@ -258,9 +259,9 @@ void GLVertexFormat::SetupVertexPointers() { // color for (int i = 0; i < 2; ++i) { - if ((m_components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) + if ((components & (VB_HAS_COL0 << i)) != (s_prevcomponents & (VB_HAS_COL0 << i))) { - if (m_components & (VB_HAS_COL0 << i)) + if (components & (VB_HAS_COL0 << i)) glEnableClientState(i ? GL_SECONDARY_COLOR_ARRAY : GL_COLOR_ARRAY); else glDisableClientState(i ? GL_SECONDARY_COLOR_ARRAY : GL_COLOR_ARRAY); @@ -270,16 +271,16 @@ void GLVertexFormat::SetupVertexPointers() { // tex for (int i = 0; i < 8; ++i) { - if ((m_components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) + if ((components & (VB_HAS_UV0 << i)) != (s_prevcomponents & (VB_HAS_UV0 << i))) { glClientActiveTexture(GL_TEXTURE0 + i); - if (m_components & (VB_HAS_UV0 << i)) + if (components & (VB_HAS_UV0 << i)) glEnableClientState(GL_TEXTURE_COORD_ARRAY); else glDisableClientState(GL_TEXTURE_COORD_ARRAY); } } - s_prevcomponents = m_components; + s_prevcomponents = components; } } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp index 95c99ac78c..da53fae6d5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp @@ -17,16 +17,12 @@ #include "GLUtil.h" +#include + #include "RasterFont.h" // globals - -static const u32 char_width = 8; -static const u32 char_height = 13; -static const u32 char_offset = 32; -static const u32 char_count = 95; - -const u8 rasters[char_count][char_height] = { +const GLubyte rasters[][13] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18}, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36}, @@ -124,160 +120,104 @@ const u8 rasters[char_count][char_height] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8f, 0xf1, 0x60, 0x00, 0x00, 0x00} }; -static const char *s_vertex_shader = - "attribute vec2 vertexPosition;\n" - "attribute vec2 texturePosition;\n" - "varying vec2 tpos;\n" - "void main(void) {\n" - " gl_Position = vec4(vertexPosition,0,1);\n" - " tpos = texturePosition;\n" - "}\n"; - -static const char *s_fragment_shader = - "#extension GL_ARB_texture_rectangle : enable\n" - "uniform sampler2DRect textureSampler;\n" - "uniform vec4 color;\n" - "varying vec2 tpos;\n" - "void main(void) {\n" - " gl_FragColor = texture2DRect(textureSampler,tpos) * color;\n" - "}\n"; - RasterFont::RasterFont() { - // generate the texture - glGenTextures(1, &texture); - glBindTexture(GL_TEXTURE_RECTANGLE, texture); - u32* texture_data = new u32[char_width*char_count*char_height]; - for(u32 y=0; y= char_count+char_offset) continue; - - vertices[usage++] = x; - vertices[usage++] = y; - vertices[usage++] = (c-char_offset)*char_width; - vertices[usage++] = 0; - - vertices[usage++] = x+delta_x; - vertices[usage++] = y; - vertices[usage++] = (c-char_offset+1)*char_width; - vertices[usage++] = 0; - - vertices[usage++] = x+delta_x; - vertices[usage++] = y+delta_y; - vertices[usage++] = (c-char_offset+1)*char_width; - vertices[usage++] = char_height; - - vertices[usage++] = x; - vertices[usage++] = y; - vertices[usage++] = (c-char_offset)*char_width; - vertices[usage++] = 0; - - vertices[usage++] = x+delta_x; - vertices[usage++] = y+delta_y; - vertices[usage++] = (c-char_offset+1)*char_width; - vertices[usage++] = char_height; - - vertices[usage++] = x; - vertices[usage++] = y+delta_y; - vertices[usage++] = (c-char_offset)*char_width; - vertices[usage++] = char_height; - - x += delta_x + border_x; - } - glUnmapBuffer(GL_ARRAY_BUFFER); + return; + if (length >= TEMP_BUFFER_SIZE) + length = TEMP_BUFFER_SIZE - 1; - glUseProgram(shader_program); - - if(color != cached_color) { - glUniform4f(uniform_color_id, ((color>>16)&0xff)/255.f,((color>>8)&0xff)/255.f,((color>>0)&0xff)/255.f,((color>>24)&0xff)/255.f); - cached_color = color; + // Sanitize string to avoid GL errors. + char *s2 = temp_buffer; + memcpy(s2, s, length); + s2[length] = 0; + for (int i = 0; i < length; i++) { + if (s2[i] < 32 || s2[i] > 126) + s2[i] = '!'; + } + + // go to the right spot + glRasterPos3d(x, y, z); + GL_REPORT_ERRORD(); + + glPushAttrib (GL_LIST_BIT); + glListBase(fontOffset); + glCallLists((GLsizei)strlen(s2), GL_UNSIGNED_BYTE, (GLubyte *) s2); + GL_REPORT_ERRORD(); + glPopAttrib(); + GL_REPORT_ERRORD(); +} + +void RasterFont::printCenteredString(const char *s, double y, int screen_width, double z) +{ + int length = (int)strlen(s); + int x = (int)(screen_width/2.0 - (length/2.0)*char_width); + printString(s, x, y, z); +} + +void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight) +{ + double x = start_x; + double y = start_y; + char temp[1024]; + char *t = temp; + while (*text) + { + if (*text == '\n') + { + *t = 0; + printString(temp, x, y, z); + y -= char_height * 2.0f / bbHeight; + x = start_x; + t = temp; + } + else if (*text == '\r') + { + t = temp; + } + else if (*text == '\t') + { + //todo: add tabs every something like 4*char_width + *t = 0; + int cpos = (int)strlen(temp); + int newpos = (cpos + 4) & (~3); + printString(temp, x, y, z); + x = start_x + (char_width*newpos) * 2.0f / bbWidth; + t = temp; + *t++ = ' '; + } + else + *t++ = *text; + + text++; + } + + // ???? + if (t != text) + { + *t = 0; + printString(temp, x, y, z); } - - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_RECTANGLE, texture); - glDrawArrays(GL_TRIANGLES, 0, usage/4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - glUseProgram(0); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h index fcbfdfff61..3ebc684dd0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h @@ -23,16 +23,20 @@ public: RasterFont(); ~RasterFont(void); static int debug; + + // some useful constants + enum {char_width = 10}; + enum {char_height = 15}; + + // and the happy helper functions + void printString(const char *s, double x, double y, double z=0.0); + void printCenteredString(const char *s, double y, int screen_width, double z=0.0); - void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight, u32 color); + void printMultilineText(const char *text, double x, double y, double z, int bbWidth, int bbHeight); private: - - u32 VBO; - u32 VAO; - u32 texture; - u32 shader_program; - u32 uniform_color_id; - u32 cached_color; + int fontOffset; + char *temp_buffer; + enum {TEMP_BUFFER_SIZE = 64 * 1024}; }; #endif // _RASTERFONT_H_ diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a2d0a94ee3..e2fff07b10 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -107,14 +107,10 @@ namespace OGL // Declarations and definitions // ---------------------------- -static int s_fps = 0; -static GLuint s_ShowEFBCopyRegions_VBO = 0; -static GLuint s_ShowEFBCopyRegions_VAO = 0; -static GLuint s_Swap_VBO = 0; -static GLuint s_Swap_VAO[2]; -static TargetRectangle s_cached_targetRc; +int s_fps=0; -static RasterFont* s_pfont = NULL; + +RasterFont* s_pfont = NULL; // 1 for no MSAA. Use s_MSAASamples > 1 to check for MSAA. static int s_MSAASamples = 1; @@ -130,9 +126,9 @@ static std::thread scrshotThread; #endif // EFB cache related -static const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. -static const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up -static const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; +const u32 EFB_CACHE_RECT_SIZE = 64; // Cache 64x64 blocks. +const u32 EFB_CACHE_WIDTH = (EFB_WIDTH + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; // round up +const u32 EFB_CACHE_HEIGHT = (EFB_HEIGHT + EFB_CACHE_RECT_SIZE - 1) / EFB_CACHE_RECT_SIZE; static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; static std::vector s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR @@ -255,16 +251,7 @@ Renderer::Renderer() OSDInternalH = 0; s_fps=0; - s_ShowEFBCopyRegions_VBO = 0; - s_Swap_VBO = 0; s_blendMode = 0; - - // should be invalid, so there will be an upload on the first call - s_cached_targetRc.bottom = -1; - s_cached_targetRc.top = -1; - s_cached_targetRc.left = -1; - s_cached_targetRc.right = -1; - InitFPSCounter(); @@ -325,13 +312,6 @@ Renderer::Renderer() bSuccess = false; } - if (!GLEW_ARB_vertex_array_object) - { - ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" - "GPU: Does your video card support OpenGL 3.0?"); - bSuccess = false; - } - s_bHaveFramebufferBlit = strstr(ptoken, "GL_EXT_framebuffer_blit") != NULL; s_bHaveCoverageMSAA = strstr(ptoken, "GL_NV_framebuffer_multisample_coverage") != NULL; @@ -471,46 +451,17 @@ Renderer::Renderer() cgGLSetDebugMode(GL_FALSE); #endif #endif - - // creating buffers - glGenBuffers(1, &s_ShowEFBCopyRegions_VBO); - glGenVertexArrays(1, &s_ShowEFBCopyRegions_VAO); - glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO); - glBindVertexArray( s_ShowEFBCopyRegions_VAO ); - glEnableClientState(GL_COLOR_ARRAY); - glColorPointer (3, GL_FLOAT, sizeof(GLfloat)*5, (GLfloat*)NULL+2); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*5, NULL); - - glGenBuffers(1, &s_Swap_VBO); - glGenVertexArrays(2, s_Swap_VAO); - glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); - glBindVertexArray(s_Swap_VAO[0]); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); - - glBindVertexArray(s_Swap_VAO[1]); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(3, GL_FLOAT, 7*sizeof(GLfloat), NULL); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+3); - glClientActiveTexture(GL_TEXTURE1); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 7*sizeof(GLfloat), (GLfloat*)NULL+5); - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - glStencilFunc(GL_ALWAYS, 0, 0); glBlendFunc(GL_ONE, GL_ONE); glViewport(0, 0, GetTargetWidth(), GetTargetHeight()); // Reset The Current Viewport + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glShadeModel(GL_SMOOTH); glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearDepth(1.0f); @@ -527,6 +478,11 @@ Renderer::Renderer() glBlendColorEXT(0, 0, 0, 0.5f); glClearDepth(1.0f); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + // legacy multitexturing: select texture channel only. glActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0); @@ -542,13 +498,6 @@ Renderer::~Renderer() { g_Config.bRunning = false; UpdateActiveConfig(); - - glDeleteBuffers(1, &s_ShowEFBCopyRegions_VBO); - glDeleteVertexArrays(1, &s_ShowEFBCopyRegions_VAO); - glDeleteBuffers(1, &s_Swap_VBO); - glDeleteVertexArrays(2, s_Swap_VAO); - s_ShowEFBCopyRegions_VBO = 0; - delete s_pfont; s_pfont = 0; @@ -596,15 +545,9 @@ void Renderer::DrawDebugInfo() // Set Line Size glLineWidth(3.0f); - // 2*Coords + 3*Color - glBindBuffer(GL_ARRAY_BUFFER, s_ShowEFBCopyRegions_VBO); - glBufferData(GL_ARRAY_BUFFER, stats.efb_regions.size() * sizeof(GLfloat) * (2+3)*2*6, NULL, GL_STREAM_DRAW); - GLfloat *Vertices = (GLfloat*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + glBegin(GL_LINES); // Draw EFB copy regions rectangles - int a = 0; - GLfloat color[3] = {0.0f, 1.0f, 1.0f}; - for (std::vector::const_iterator it = stats.efb_regions.begin(); it != stats.efb_regions.end(); ++it) { @@ -615,97 +558,22 @@ void Renderer::DrawDebugInfo() GLfloat x2 = (GLfloat) -1.0f + ((GLfloat)it->right / halfWidth); GLfloat y2 = (GLfloat) 1.0f - ((GLfloat)it->bottom / halfHeight); - Vertices[a++] = x; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x2; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - - Vertices[a++] = x2; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x2; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - - Vertices[a++] = x2; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - - Vertices[a++] = x; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - - Vertices[a++] = x; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x2; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - - Vertices[a++] = x2; - Vertices[a++] = y; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - Vertices[a++] = x; - Vertices[a++] = y2; - Vertices[a++] = color[0]; - Vertices[a++] = color[1]; - Vertices[a++] = color[2]; - - // TO DO: build something nicer here - GLfloat temp = color[0]; - color[0] = color[1]; - color[1] = color[2]; - color[2] = temp; + // Draw shadow of rect + glColor3f(0.0f, 0.0f, 0.0f); + glVertex2f(x, y - 0.01); glVertex2f(x2, y - 0.01); + glVertex2f(x, y2 - 0.01); glVertex2f(x2, y2 - 0.01); + glVertex2f(x + 0.005, y); glVertex2f(x + 0.005, y2); + glVertex2f(x2 + 0.005, y); glVertex2f(x2 + 0.005, y2); + + // Draw rect + glColor3f(0.0f, 1.0f, 1.0f); + glVertex2f(x, y); glVertex2f(x2, y); + glVertex2f(x, y2); glVertex2f(x2, y2); + glVertex2f(x, y); glVertex2f(x, y2); + glVertex2f(x2, y); glVertex2f(x2, y2); } - glUnmapBuffer(GL_ARRAY_BUFFER); - - glBindVertexArray( s_ShowEFBCopyRegions_VAO ); - glDrawArrays(GL_LINES, 0, stats.efb_regions.size() * 2*6); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); + + glEnd(); // Restore Line Size glLineWidth(lSize); @@ -733,13 +601,16 @@ void Renderer::RenderText(const char *text, int left, int top, u32 color) const int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); const int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); + glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, + ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); + glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); s_pfont->printMultilineText(text, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight, color); + 0, nBackbufferWidth, nBackbufferHeight); GL_REPORT_ERRORD(); @@ -1264,42 +1135,43 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons // Render to the real buffer now. glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); // switch to the window backbuffer glBindTexture(GL_TEXTURE_RECTANGLE_ARB, read_texture); + if (applyShader) + { + glBegin(GL_QUADS); + glTexCoord2f(targetRc.left, targetRc.bottom); + glMultiTexCoord2fARB(GL_TEXTURE1, 0, 0); + glVertex2f(-1, -1); - if(!( s_cached_targetRc == targetRc)) { - GLfloat vertices[] = { - -1.0f, -1.0f, 1.0f, - (GLfloat)targetRc.left, (GLfloat)targetRc.bottom, - 0.0f, 0.0f, - - -1.0f, 1.0f, 1.0f, - (GLfloat)targetRc.left, (GLfloat)targetRc.top, - 0.0f, 1.0f, - - 1.0f, 1.0f, 1.0f, - (GLfloat)targetRc.right, (GLfloat)targetRc.top, - 1.0f, 1.0f, - - 1.0f, -1.0f, 1.0f, - (GLfloat)targetRc.right, (GLfloat)targetRc.bottom, - 1.0f, 0.0f - }; - - glBindBuffer(GL_ARRAY_BUFFER, s_Swap_VBO); - glBufferData(GL_ARRAY_BUFFER, 4*7*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - s_cached_targetRc = targetRc; - } - - glBindVertexArray(s_Swap_VAO[applyShader]); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + glTexCoord2f(targetRc.left, targetRc.top); + glMultiTexCoord2fARB(GL_TEXTURE1, 0, 1); + glVertex2f(-1, 1); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - if(applyShader) + glTexCoord2f(targetRc.right, targetRc.top); + glMultiTexCoord2fARB(GL_TEXTURE1, 1, 1); + glVertex2f( 1, 1); + + glTexCoord2f(targetRc.right, targetRc.bottom); + glMultiTexCoord2fARB(GL_TEXTURE1, 1, 0); + glVertex2f( 1, -1); + glEnd(); PixelShaderCache::DisableShader(); + } + else + { + glBegin(GL_QUADS); + glTexCoord2f(targetRc.left, targetRc.bottom); + glVertex2f(-1, -1); + + glTexCoord2f(targetRc.left, targetRc.top); + glVertex2f(-1, 1); + + glTexCoord2f(targetRc.right, targetRc.top); + glVertex2f( 1, 1); + + glTexCoord2f(targetRc.right, targetRc.bottom); + glVertex2f( 1, -1); + glEnd(); + } } glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp index d90f651a82..7a62131f90 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp @@ -56,13 +56,6 @@ namespace OGL { -struct VBOCache { - GLuint vbo; - GLuint vao; - TargetRectangle targetSource; -}; -static std::map s_VBO; - static u32 s_TempFramebuffer = 0; static const GLint c_MinLinearFilter[8] = { @@ -113,8 +106,6 @@ TextureCache::TCacheEntry::~TCacheEntry() TextureCache::TCacheEntry::TCacheEntry() { glGenTextures(1, &texture); - currmode.hex = 0; - currmode1.hex = 0; GL_REPORT_ERRORD(); } @@ -127,9 +118,7 @@ void TextureCache::TCacheEntry::Bind(unsigned int stage) // TODO: is this already done somewhere else? TexMode0 &tm0 = bpmem.tex[stage >> 2].texMode0[stage & 3]; TexMode1 &tm1 = bpmem.tex[stage >> 2].texMode1[stage & 3]; - - if(currmode.hex != tm0.hex || currmode1.hex != tm1.hex) - SetTextureParameters(tm0, tm1); + SetTextureParameters(tm0, tm1); } bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level) @@ -315,57 +304,13 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo GL_REPORT_ERRORD(); TargetRectangle targetSource = g_renderer->ConvertEFBRectangle(srcRect); - GL_REPORT_ERRORD(); - - // should be unique enough, if not, vbo will "only" be uploaded to much - u64 targetSourceHash = u64(targetSource.left)<<48 | u64(targetSource.top)<<32 | u64(targetSource.right)<<16 | u64(targetSource.bottom); - std::map::iterator vbo_it = s_VBO.find(targetSourceHash); - - if(vbo_it == s_VBO.end()) { - VBOCache item; - item.targetSource.bottom = -1; - item.targetSource.top = -1; - item.targetSource.left = -1; - item.targetSource.right = -1; - glGenBuffers(1, &item.vbo); - glGenVertexArrays(1, &item.vao); - - glBindBuffer(GL_ARRAY_BUFFER, item.vbo); - glBindVertexArray(item.vao); - - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, 0); - - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL + 2); - - vbo_it = s_VBO.insert(std::pair(targetSourceHash, item)).first; - } - if(!(vbo_it->second.targetSource == targetSource)) { - GLfloat vertices[] = { - -1.f, 1.f, - (GLfloat)targetSource.left, (GLfloat)targetSource.bottom, - -1.f, -1.f, - (GLfloat)targetSource.left, (GLfloat)targetSource.top, - 1.f, -1.f, - (GLfloat)targetSource.right, (GLfloat)targetSource.top, - 1.f, 1.f, - (GLfloat)targetSource.right, (GLfloat)targetSource.bottom - }; - - glBindBuffer(GL_ARRAY_BUFFER, vbo_it->second.vbo); - glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - vbo_it->second.targetSource = targetSource; - } - glBindVertexArray(vbo_it->second.vao); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); + glBegin(GL_QUADS); + glTexCoord2f((GLfloat)targetSource.left, (GLfloat)targetSource.bottom); glVertex2f(-1, 1); + glTexCoord2f((GLfloat)targetSource.left, (GLfloat)targetSource.top ); glVertex2f(-1, -1); + glTexCoord2f((GLfloat)targetSource.right, (GLfloat)targetSource.top ); glVertex2f( 1, -1); + glTexCoord2f((GLfloat)targetSource.right, (GLfloat)targetSource.bottom); glVertex2f( 1, 1); + glEnd(); GL_REPORT_ERRORD(); @@ -412,9 +357,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1) { - currmode = newmode; - currmode1 = newmode1; - // TODO: not used anywhere TexMode0 mode = newmode; //mode1 = newmode1; @@ -446,24 +388,13 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co (float)(1 << g_ActiveConfig.iMaxAnisotropy)); } -TextureCache::TextureCache() -{ -} - - TextureCache::~TextureCache() { - for(std::map::iterator it = s_VBO.begin(); it != s_VBO.end(); it++) { - glDeleteBuffers(1, &it->second.vbo); - glDeleteVertexArrays(1, &it->second.vao); - } - s_VBO.clear(); - - if (s_TempFramebuffer) + if (s_TempFramebuffer) { - glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); - s_TempFramebuffer = 0; - } + glDeleteFramebuffersEXT(1, (GLuint*)&s_TempFramebuffer); + s_TempFramebuffer = 0; + } } void TextureCache::DisableStage(unsigned int stage) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h index dc560e098b..30f44b797d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h @@ -32,7 +32,6 @@ namespace OGL class TextureCache : public ::TextureCache { public: - TextureCache(); static void DisableStage(unsigned int stage); private: @@ -67,8 +66,6 @@ private: private: void SetTextureParameters(const TexMode0 &newmode, const TexMode1 &newmode1); - TexMode0 currmode; - TexMode1 currmode1; }; ~TextureCache(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 54a2e2464c..c73d3abdbf 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -57,14 +57,6 @@ static FRAGMENTSHADER s_yuyvToRgbProgram; const u32 NUM_ENCODING_PROGRAMS = 64; static FRAGMENTSHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS]; -static GLuint s_encode_VBO = 0; -static GLuint s_encode_VAO = 0; -static GLuint s_decode_VBO = 0; -static GLuint s_decode_VAO = 0; -static TargetRectangle s_cached_sourceRc; -static int s_cached_srcWidth = 0; -static int s_cached_srcHeight = 0; - void CreateRgbToYuyvProgram() { // Output is BGRA because that is slightly faster than RGBA. @@ -148,40 +140,9 @@ FRAGMENTSHADER &GetOrCreateEncodingShader(u32 format) void Init() { glGenFramebuffersEXT(1, &s_texConvFrameBuffer); - - glGenBuffers(1, &s_encode_VBO ); - glGenVertexArrays(1, &s_encode_VAO ); - glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); - glBindVertexArray( s_encode_VAO ); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, 4*sizeof(GLfloat), NULL); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 4*sizeof(GLfloat), (GLfloat*)NULL + 2); - s_cached_sourceRc.top = -1; - s_cached_sourceRc.bottom = -1; - s_cached_sourceRc.left = -1; - s_cached_sourceRc.right = -1; - - glGenBuffers(1, &s_decode_VBO ); - glGenVertexArrays(1, &s_decode_VAO ); - glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); - glBindVertexArray( s_decode_VAO ); - s_cached_srcWidth = -1; - s_cached_srcHeight = -1; - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2, GL_FLOAT, sizeof(GLfloat)*4, NULL); - glClientActiveTexture(GL_TEXTURE0); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLfloat)*4, (GLfloat*)NULL+2); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); glGenRenderbuffersEXT(1, &s_dstRenderBuffer); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, s_dstRenderBuffer); - glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, renderBufferWidth, renderBufferHeight); s_srcTextureWidth = 0; @@ -201,10 +162,6 @@ void Shutdown() glDeleteTextures(1, &s_srcTexture); glDeleteRenderbuffersEXT(1, &s_dstRenderBuffer); glDeleteFramebuffersEXT(1, &s_texConvFrameBuffer); - glDeleteBuffers(1, &s_encode_VBO ); - glDeleteVertexArrays(1, &s_encode_VAO ); - glDeleteBuffers(1, &s_decode_VBO ); - glDeleteVertexArrays(1, &s_decode_VAO ); s_rgbToYuyvProgram.Destroy(); s_yuyvToRgbProgram.Destroy(); @@ -256,31 +213,13 @@ void EncodeToRamUsingShader(FRAGMENTSHADER& shader, GLuint srcTexture, const Tar PixelShaderCache::SetCurrentShader(shader.glprogid); - GL_REPORT_ERRORD(); - if(!(s_cached_sourceRc == sourceRc)) { - GLfloat vertices[] = { - -1.f, -1.f, - (float)sourceRc.left, (float)sourceRc.top, - -1.f, 1.f, - (float)sourceRc.left, (float)sourceRc.bottom, - 1.f, 1.f, - (float)sourceRc.right, (float)sourceRc.bottom, - 1.f, -1.f, - (float)sourceRc.right, (float)sourceRc.top - }; - glBindBuffer(GL_ARRAY_BUFFER, s_encode_VBO ); - glBufferData(GL_ARRAY_BUFFER, 4*4*sizeof(GLfloat), vertices, GL_STREAM_DRAW); - - s_cached_sourceRc = sourceRc; - } - - glBindVertexArray( s_encode_VAO ); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - + // Draw... + glBegin(GL_QUADS); + glTexCoord2f((float)sourceRc.left, (float)sourceRc.top); glVertex2f(-1,-1); + glTexCoord2f((float)sourceRc.left, (float)sourceRc.bottom); glVertex2f(-1,1); + glTexCoord2f((float)sourceRc.right, (float)sourceRc.bottom); glVertex2f(1,1); + glTexCoord2f((float)sourceRc.right, (float)sourceRc.top); glVertex2f(1,-1); + glEnd(); GL_REPORT_ERRORD(); // .. and then read back the results. @@ -436,39 +375,18 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur PixelShaderCache::SetCurrentShader(s_yuyvToRgbProgram.glprogid); GL_REPORT_ERRORD(); - - if(s_cached_srcHeight != srcHeight || s_cached_srcWidth != srcWidth) { - GLfloat vertices[] = { - 1.f, -1.f, - (float)srcFmtWidth, (float)srcHeight, - 1.f, 1.f, - (float)srcFmtWidth, 0.f, - -1.f, 1.f, - 0.f, 0.f, - -1.f, -1.f, - 0.f, (float)srcHeight - }; - - glBindBuffer(GL_ARRAY_BUFFER, s_decode_VBO ); - glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat)*4*4, vertices, GL_STREAM_DRAW); - - s_cached_srcHeight = srcHeight; - s_cached_srcWidth = srcWidth; - } - - glBindVertexArray( s_decode_VAO ); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - // TODO: this after merging with graphic_update - glBindVertexArray(0); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - GL_REPORT_ERRORD(); + + glBegin(GL_QUADS); + glTexCoord2f((float)srcFmtWidth, (float)srcHeight); glVertex2f(1,-1); + glTexCoord2f((float)srcFmtWidth, 0); glVertex2f(1,1); + glTexCoord2f(0, 0); glVertex2f(-1,1); + glTexCoord2f(0, (float)srcHeight); glVertex2f(-1,-1); + glEnd(); // reset state glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0); glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, 0, 0); - TextureCache::DisableStage(0); + TextureCache::DisableStage(0); VertexShaderManager::SetViewportChanged(); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 3725d87add..501c4969e5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -64,6 +64,9 @@ VertexManager::VertexManager() // max_Index_size = MAXIBUFFERSIZE; // //GL_REPORT_ERRORD(); + + glEnableClientState(GL_VERTEX_ARRAY); + GL_REPORT_ERRORD(); } void VertexManager::CreateDeviceObjects() diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index d2f77cd256..49739b7f6e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -96,11 +96,12 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color) #ifndef USE_GLES int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth(); int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight(); - + glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f, + ((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f); s_pfont->printMultilineText(pstr, left * 2.0f / (float)nBackbufferWidth - 1, 1 - top * 2.0f / (float)nBackbufferHeight, - 0, nBackbufferWidth, nBackbufferHeight, color); + 0, nBackbufferWidth, nBackbufferHeight); #endif } From bb7c262539a5b2b663bbec065e9120fa9fb21e46 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 7 Jan 2013 16:50:48 -0600 Subject: [PATCH 321/627] Add a linux .desktop file to add dolphin-emu to the menu, and install it when running 'make install'. --- CMakeLists.txt | 7 +++++++ Source/Core/DolphinWX/resources/dolphin-emu.desktop | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 Source/Core/DolphinWX/resources/dolphin-emu.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index b025de11ef..5f36e1f8a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -622,6 +622,13 @@ endif() if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")) install(FILES Data/license.txt DESTINATION ${datadir}) endif() +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + # Install the application icon and menu item + install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm) + install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +endif() # packaging information set(CPACK_PACKAGE_NAME "dolphin-emu") diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop new file mode 100644 index 0000000000..0ce4678f00 --- /dev/null +++ b/Source/Core/DolphinWX/resources/dolphin-emu.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Dolphin-emu +Comment=A Wii/GameCube Emulator +Icon=dolphin-emu +Exec=dolphin-emu +Categories=Game; + From 8cfceb1186c80a4ad94618cfa8d8aa942134247e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 8 Jan 2013 00:00:30 +0100 Subject: [PATCH 322/627] Disable swapping cmp with instructions potentially raising interrupts Workaround for issue 5864 disabling parts of an optimization in the JIT. This is not the best solution to fix this issue, but at least it does not crash. --- Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index ddfec1c328..fa9f278c29 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -246,17 +246,13 @@ bool CanSwapAdjacentOps(const CodeOp &a, const CodeOp &b) return false; } - // For now, only integer ops acceptable. - switch (b_info->type) { - case OPTYPE_INTEGER: - case OPTYPE_LOAD: - case OPTYPE_STORE: - //case OPTYPE_LOADFP: - //case OPTYPE_STOREFP: - break; - default: + // For now, only integer ops acceptable. Any instruction which can raise an + // interrupt is *not* a possible swap candidate: see [1] for an example of + // a crash caused by this error. + // + // [1] https://code.google.com/p/dolphin-emu/issues/detail?id=5864#c7 + if (b_info->type != OPTYPE_INTEGER) return false; - } // Check that we have no register collisions. // That is, check that none of b's outputs matches any of a's inputs, From 6bd8474d054db7eafa546063e88f23e7ffe0d9d0 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 7 Jan 2013 17:05:51 -0600 Subject: [PATCH 323/627] Change the application name to "Dolphin Emulator" (from "Dolphin-emu"). --- Source/Core/DolphinWX/resources/dolphin-emu.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Source/Core/DolphinWX/resources/dolphin-emu.desktop index 0ce4678f00..f201f07f22 100644 --- a/Source/Core/DolphinWX/resources/dolphin-emu.desktop +++ b/Source/Core/DolphinWX/resources/dolphin-emu.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Dolphin-emu +Name=Dolphin Emulator Comment=A Wii/GameCube Emulator Icon=dolphin-emu Exec=dolphin-emu From 446d9279b10a3eb688d2b16036a9f3f832a1c6e4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 8 Jan 2013 11:14:53 -0600 Subject: [PATCH 324/627] Fix clearing of render targets. We were skipping every other one. --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index 9fc18ef1bd..e3152455df 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -208,7 +208,7 @@ void TextureCache::ClearRenderTargets() if (iter->second->type == TCET_EC_VRAM) { delete iter->second; - textures.erase(iter++); + textures.erase(iter); } } From 09197e0ffcd78a54cae9a80889bef6e6e9440511 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 31 Dec 2012 16:21:23 +0100 Subject: [PATCH 325/627] X11: Disable OSD hotkeys when the corresponding option is disabled. --- .../DolphinWX/Src/GLInterface/X11_Util.cpp | 69 +++--- Source/Core/VideoCommon/Src/RenderBase.cpp | 202 +++++++++--------- Source/Core/VideoCommon/Src/RenderBase.h | 2 +- 3 files changed, 142 insertions(+), 131 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp index 9372c4d644..6a30bb90a6 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp @@ -71,38 +71,45 @@ void cX11Window::XEventThread() switch(event.type) { case KeyPress: key = XLookupKeysym((XKeyEvent*)&event, 0); - switch (key) + if (g_Config.bOSDHotKey) { - case XK_3: - OSDChoice = 1; - // Toggle native resolution - g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; - break; - case XK_4: - OSDChoice = 2; - // Toggle aspect ratio - g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; - break; - case XK_5: - OSDChoice = 3; - // Toggle EFB copy - if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) - { - g_Config.bEFBCopyEnable ^= true; - g_Config.bCopyEFBToTexture = false; - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } - break; - case XK_6: - OSDChoice = 4; - g_Config.bDisableFog = !g_Config.bDisableFog; - break; - default: - break; + switch (key) + { + case XK_3: + OSDChoice = 1; + // Toggle native resolution + g_Config.iEFBScale = g_Config.iEFBScale + 1; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; + break; + + case XK_4: + OSDChoice = 2; + // Toggle aspect ratio + g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; + break; + + case XK_5: + OSDChoice = 3; + // Toggle EFB copy + if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture) + { + g_Config.bEFBCopyEnable ^= true; + g_Config.bCopyEFBToTexture = false; + } + else + { + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; + } + break; + + case XK_6: + OSDChoice = 4; + g_Config.bDisableFog = !g_Config.bDisableFog; + break; + + default: + break; + } } if (g_Config.bFreeLook) { diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 577570c568..8e1d012fa2 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -91,6 +91,9 @@ Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false) #if defined _WIN32 || defined HAVE_LIBAV bAVIDumping = false; #endif + + OSDChoice = 0; + OSDTime = 0; } Renderer::~Renderer() @@ -263,108 +266,109 @@ void Renderer::SetScreenshot(const char *filename) // Create On-Screen-Messages void Renderer::DrawDebugText() { + if (!g_Config.bOSDHotKey) + return; + // OSD Menu messages - if (g_ActiveConfig.bOSDHotKey) + if (OSDChoice > 0) { - if (OSDChoice > 0) - { - OSDTime = Common::Timer::GetTimeMs() + 3000; - OSDChoice = -OSDChoice; - } - if ((u32)OSDTime > Common::Timer::GetTimeMs()) - { - const char* res_text = ""; - switch (g_ActiveConfig.iEFBScale) - { - case 0: - res_text = "Auto (fractional)"; - break; - case 1: - res_text = "Auto (integral)"; - break; - case 2: - res_text = "Native"; - break; - case 3: - res_text = "1.5x"; - break; - case 4: - res_text = "2x"; - break; - case 5: - res_text = "2.5x"; - break; - case 6: - res_text = "3x"; - break; - case 7: - res_text = "4x"; - break; - } - - const char* ar_text = ""; - switch(g_ActiveConfig.iAspectRatio) - { - case ASPECT_AUTO: - ar_text = "Auto"; - break; - case ASPECT_FORCE_16_9: - ar_text = "16:9"; - break; - case ASPECT_FORCE_4_3: - ar_text = "4:3"; - break; - case ASPECT_STRETCH: - ar_text = "Stretch"; - break; - } - - const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ? - (g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled"; - - // The rows - const std::string lines[] = - { - std::string("3: Internal Resolution: ") + res_text, - std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""), - std::string("5: Copy EFB: ") + efbcopy_text, - std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"), - }; - - enum { lines_count = sizeof(lines)/sizeof(*lines) }; - - std::string final_yellow, final_cyan; - - // If there is more text than this we will have a collision - if (g_ActiveConfig.bShowFPS) - { - final_yellow = final_cyan = "\n\n"; - } - - // The latest changed setting in yellow - for (int i = 0; i != lines_count; ++i) - { - if (OSDChoice == -i - 1) - final_yellow += lines[i]; - final_yellow += '\n'; - } - - // The other settings in cyan - for (int i = 0; i != lines_count; ++i) - { - if (OSDChoice != -i - 1) - final_cyan += lines[i]; - final_cyan += '\n'; - } - - // Render a shadow - g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000); - g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000); - //and then the text - g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF); - g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00); - } + OSDTime = Common::Timer::GetTimeMs() + 3000; + OSDChoice = -OSDChoice; } + + if ((u32)OSDTime <= Common::Timer::GetTimeMs()) + return; + + const char* res_text = ""; + switch (g_ActiveConfig.iEFBScale) + { + case 0: + res_text = "Auto (fractional)"; + break; + case 1: + res_text = "Auto (integral)"; + break; + case 2: + res_text = "Native"; + break; + case 3: + res_text = "1.5x"; + break; + case 4: + res_text = "2x"; + break; + case 5: + res_text = "2.5x"; + break; + case 6: + res_text = "3x"; + break; + case 7: + res_text = "4x"; + break; + } + + const char* ar_text = ""; + switch(g_ActiveConfig.iAspectRatio) + { + case ASPECT_AUTO: + ar_text = "Auto"; + break; + case ASPECT_FORCE_16_9: + ar_text = "16:9"; + break; + case ASPECT_FORCE_4_3: + ar_text = "4:3"; + break; + case ASPECT_STRETCH: + ar_text = "Stretch"; + break; + } + + const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ? + (g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled"; + + // The rows + const std::string lines[] = + { + std::string("3: Internal Resolution: ") + res_text, + std::string("4: Aspect Ratio: ") + ar_text + (g_ActiveConfig.bCrop ? " (crop)" : ""), + std::string("5: Copy EFB: ") + efbcopy_text, + std::string("6: Fog: ") + (g_ActiveConfig.bDisableFog ? "Disabled" : "Enabled"), + }; + + enum { lines_count = sizeof(lines)/sizeof(*lines) }; + + std::string final_yellow, final_cyan; + + // If there is more text than this we will have a collision + if (g_ActiveConfig.bShowFPS) + { + final_yellow = final_cyan = "\n\n"; + } + + // The latest changed setting in yellow + for (int i = 0; i != lines_count; ++i) + { + if (OSDChoice == -i - 1) + final_yellow += lines[i]; + final_yellow += '\n'; + } + + // The other settings in cyan + for (int i = 0; i != lines_count; ++i) + { + if (OSDChoice != -i - 1) + final_cyan += lines[i]; + final_cyan += '\n'; + } + + // Render a shadow + g_renderer->RenderText(final_cyan.c_str(), 21, 21, 0xDD000000); + g_renderer->RenderText(final_yellow.c_str(), 21, 21, 0xDD000000); + //and then the text + g_renderer->RenderText(final_cyan.c_str(), 20, 20, 0xFF00FFFF); + g_renderer->RenderText(final_yellow.c_str(), 20, 20, 0xFFFFFF00); } // TODO: remove diff --git a/Source/Core/VideoCommon/Src/RenderBase.h b/Source/Core/VideoCommon/Src/RenderBase.h index 4da80c9752..5376577cbd 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.h +++ b/Source/Core/VideoCommon/Src/RenderBase.h @@ -39,7 +39,7 @@ // TODO: Move these out of here. extern int frameCount; -extern int OSDChoice, OSDTime; +extern int OSDChoice; extern bool bLastFrameDumped; From e979b2d4a2d6eeef38f5a124402fe365ce3b6422 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 31 Dec 2012 16:27:22 +0100 Subject: [PATCH 326/627] DX11: Fix a small mistake. Remove some incorrect and/or confusing comments. Fixes issue 5251. Thanks to limburgerite :) --- Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 4 +--- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 3 --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 830f16a9f6..2955bf6a6d 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -907,10 +907,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP + if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB) diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index a26b041ba0..1e37ff5456 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -844,9 +844,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index e2fff07b10..9053b0f164 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1013,9 +1013,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons Core::Callback_VideoCopiedToXFB(false); return; } - // this function is called after the XFB field is changed, not after - // EFB is copied to XFB. In this way, flickering is reduced in games - // and seems to also give more FPS in ZTP if (field == FIELD_LOWER) xfbAddr -= fbWidth * 2; u32 xfbCount = 0; From 876eee5e601915dd361a16899754d35b43cae80c Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 16:01:15 +0100 Subject: [PATCH 327/627] PixelShaderGen: Don't disable depth texture emulation if z writing is disabled (this is what VideoSoftware is doing). --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/VideoCommon/Src/BPMemory.h | 2 +- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 17 ++++++++--------- .../Plugin_VideoSoftware/Src/Rasterizer.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 4c746e9b75..0f4e3f7832 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6975 + LINEAR_DISKCACHE_VER = 6977 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index 9284674aa1..cd2aa1e4c5 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -793,7 +793,7 @@ union PE_CONTROL { u32 pixel_format : 3; // PIXELFMT_X u32 zformat : 3; // Z Compression for 16bit Z format - u32 zcomploc : 1; // 1: before tex stage + u32 early_ztest : 1; // 1: before tex stage u32 unused : 17; u32 rid : 8; }; diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index cc48276253..36aa4e930d 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -109,7 +109,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 uid->values[0] |= dstAlphaMode << 8; // 2 - bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth; + bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth; uid->values[0] |= DepthTextureEnable << 10; // 1 @@ -170,7 +170,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo if (DepthTextureEnable) { ptr[0] |= bpmem.ztex2.op << 11; // 2 - ptr[0] |= bpmem.zcontrol.zcomploc << 13; // 1 + ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 ptr[0] |= bpmem.zmode.testenable << 14; // 1 ptr[0] |= bpmem.zmode.updateenable << 15; // 1 } @@ -528,7 +528,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; } } - DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; + DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; // Declare samplers if(ApiType != API_D3D11) @@ -769,12 +769,11 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType if (DepthTextureEnable) { // use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format... - if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && bpmem.zmode.testenable && bpmem.zmode.updateenable) + // Note: depth textures are disabled if early depth test is enabled + if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) { - if (bpmem.ztex2.op == ZTEXTURE_ADD) - WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w + zCoord;\n"); - else - WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w;\n"); + WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n", + (bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : ""); // scale to make result from frac correct WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n"); @@ -1264,7 +1263,7 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode // depth channel. // 2 - in the next pass disable depth chanel update, but proccess the color data normally // this way is the only CORRECT way to emulate perfectly the zcomplock behaviour - if (!(bpmem.zcontrol.zcomploc && bpmem.zmode.updateenable)) + if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable)) { WRITE(p, "discard;\n"); if (ApiType != API_D3D11) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp index c212c93601..45c744ee81 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp @@ -125,7 +125,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi) if (z < 0 || z > 0x00ffffff) return; - if (bpmem.zcontrol.zcomploc && bpmem.zmode.testenable) + if (bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) { // early z if (!EfbInterface::ZCompare(x, y, z)) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index c67ee53837..eb083df15f 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -784,7 +784,7 @@ void Tev::Draw() output[BLU_C] = (output[BLU_C] * invFog + fogInt * bpmem.fog.color.b) >> 8; } - if (!bpmem.zcontrol.zcomploc && bpmem.zmode.testenable) + if (!bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) { if (!EfbInterface::ZCompare(Position[0], Position[1], Position[2])) return; From b06f30f8452af075f5929e37f168e54bfd37083a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 16:40:15 +0100 Subject: [PATCH 328/627] Remove the per pixel depth option. Depth calculations are always done in the pixel shader now. Due to the unpredictability of our zcomploc hacks this commit probably changes the behavior of some games which use zcomploc. --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 - .../Core/VideoCommon/Src/PixelShaderGen.cpp | 173 +++++++----------- Source/Core/VideoCommon/Src/PixelShaderGen.h | 2 +- .../Core/VideoCommon/Src/VertexShaderGen.cpp | 1 + Source/Core/VideoCommon/Src/VideoConfig.cpp | 4 - Source/Core/VideoCommon/Src/VideoConfig.h | 1 - 7 files changed, 72 insertions(+), 113 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index 0f4e3f7832..f75e80cd4b 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6977 + LINEAR_DISKCACHE_VER = 6978 }; // On disk format: diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index f59c7c34c9..d99bd97e8d 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -84,7 +84,6 @@ wxString af_desc = wxTRANSLATE("Enable anisotropic filtering.\nEnhances visual q wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky.\nHeavily decreases emulation speed and sometimes causes issues.\n\nIf unsure, select None."); wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked."); wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked."); -wxString pixel_depth_desc = wxTRANSLATE("Calculate depth values of 3D graphics per-pixel rather than per vertex.\nIn contrast to pixel lighting (which is merely an enhancement), per-pixel depth calculations are necessary to properly emulate a small number of games.\n\nIf unsure, leave this checked."); wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked."); wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked."); wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528."); @@ -493,7 +492,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable)); szr_other->Add(CreateCheckBox(page_hacks, _("Disable Fog"), wxGetTranslation(disable_fog_desc), vconfig.bDisableFog)); - szr_other->Add(CreateCheckBox(page_hacks, _("Disable Per-Pixel Depth"), wxGetTranslation(pixel_depth_desc), vconfig.bEnablePerPixelDepth, true)); szr_other->Add(CreateCheckBox(page_hacks, _("Skip Dest. Alpha Pass"), wxGetTranslation(disable_alphapass_desc), vconfig.bDstAlphaPass)); szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL)); szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder)); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 36aa4e930d..dbc65669ff 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -27,7 +27,12 @@ #include "VideoConfig.h" #include "NativeVertexFormat.h" -static int AlphaPreTest(); + +#define ALPHATEST_PASS 2 +#define ALPHATEST_FAIL 1 +#define ALPHATEST_UNDETERMINED 0 + +static unsigned int AlphaPreTest(); static void StageHash(int stage, u32* out) { @@ -109,29 +114,17 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4 uid->values[0] |= dstAlphaMode << 8; // 2 - bool DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth; - - uid->values[0] |= DepthTextureEnable << 10; // 1 - bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; - uid->values[0] |= enablePL << 11; // 1 + uid->values[0] |= enablePL << 10; // 1 - if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4 - u32 alphaPreTest = AlphaPreTest()+1; + if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 11; // 4 - uid->values[0] |= alphaPreTest << 16; // 2 - - if (alphaPreTest == 1 || (alphaPreTest && !DepthTextureEnable && dstAlphaMode == DSTALPHA_ALPHA_PASS)) - { - // Courtesy of PreAlphaTest, we're done already ;) - // NOTE: The comment header of generated shaders depends on the value of bpmem.genmode.numindstages.. shouldnt really bother about that though. - uid->num_values = 1; - return; - } + u32 alphaPreTest = AlphaPreTest(); + uid->values[0] |= alphaPreTest << 15; // 2 // numtexgens should be <= 8 for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) - uid->values[0] |= xfregs.texMtxInfo[i].projection << (18+i); // 1 + uid->values[0] |= xfregs.texMtxInfo[i].projection << (17+i); // 1 uid->values[1] = bpmem.genMode.numindstages; // 3 u32 indirectStagesUsed = 0; @@ -164,18 +157,17 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo ptr[0] |= bpmem.alphaFunc.comp1 << 3; // 3 ptr[0] |= bpmem.alphaFunc.logic << 6; // 2 - if (alphaPreTest == 0 || alphaPreTest == 2) + if (alphaPreTest != ALPHATEST_FAIL) { ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 - if (DepthTextureEnable) - { - ptr[0] |= bpmem.ztex2.op << 11; // 2 - ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 - ptr[0] |= bpmem.zmode.testenable << 14; // 1 - ptr[0] |= bpmem.zmode.updateenable << 15; // 1 - } + ptr[0] |= bpmem.ztex2.op << 11; // 2 +// ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 + ptr[0] |= bpmem.zmode.testenable << 14; // 1 } + ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 + ptr[0] |= bpmem.zmode.updateenable << 15; // 1 + if (dstAlphaMode != DSTALPHA_ALPHA_PASS) { if (bpmem.fog.c_proj_fsel.fsel != 0) @@ -204,9 +196,8 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.ztex2.hex; // 2 *ptr++ = bpmem.zcontrol.hex; // 3 *ptr++ = bpmem.zmode.hex; // 4 - *ptr++ = g_ActiveConfig.bEnablePerPixelDepth; // 5 - *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 6 - *ptr++ = xfregs.numTexGen.hex; // 7 + *ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 5 + *ptr++ = xfregs.numTexGen.hex; // 6 if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) { @@ -218,28 +209,28 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u } for (unsigned int i = 0; i < 8; ++i) - *ptr++ = xfregs.texMtxInfo[i].hex; // 8-15 + *ptr++ = xfregs.texMtxInfo[i].hex; // 7-14 for (unsigned int i = 0; i < 16; ++i) - *ptr++ = bpmem.tevind[i].hex; // 16-31 + *ptr++ = bpmem.tevind[i].hex; // 15-30 - *ptr++ = bpmem.tevindref.hex; // 32 + *ptr++ = bpmem.tevindref.hex; // 31 for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times { - *ptr++ = bpmem.combiners[i].colorC.hex; // 33+5*i - *ptr++ = bpmem.combiners[i].alphaC.hex; // 34+5*i - *ptr++ = bpmem.tevind[i].hex; // 35+5*i - *ptr++ = bpmem.tevksel[i/2].hex; // 36+5*i - *ptr++ = bpmem.tevorders[i/2].hex; // 37+5*i + *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i + *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i + *ptr++ = bpmem.tevind[i].hex; // 34+5*i + *ptr++ = bpmem.tevksel[i/2].hex; // 35+5*i + *ptr++ = bpmem.tevorders[i/2].hex; // 36+5*i } - ptr = &uid->values[113]; + ptr = &uid->values[112]; - *ptr++ = bpmem.alphaFunc.hex; // 113 + *ptr++ = bpmem.alphaFunc.hex; // 112 - *ptr++ = bpmem.fog.c_proj_fsel.hex; // 114 - *ptr++ = bpmem.fogRange.Base.hex; // 115 + *ptr++ = bpmem.fog.c_proj_fsel.hex; // 113 + *ptr++ = bpmem.fogRange.Base.hex; // 114 _assert_((ptr - uid->values) == uid->GetNumValues()); } @@ -481,7 +472,6 @@ static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; static char swapModeTable[4][5]; static char text[16384]; -static bool DepthTextureEnable; struct RegisterState { @@ -528,7 +518,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; } } - DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable && bpmem.zmode.updateenable) || g_ActiveConfig.bEnablePerPixelDepth ; // Declare samplers if(ApiType != API_D3D11) @@ -584,14 +573,14 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType { WRITE(p, " out float4 ocol0 : COLOR0,%s%s\n in float4 rawpos : %s,\n", dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n out float4 ocol1 : COLOR1," : "", - DepthTextureEnable ? "\n out float depth : DEPTH," : "", + "\n out float depth : DEPTH,", ApiType & API_OPENGL ? "WPOS" : ApiType & API_D3D9_SM20 ? "POSITION" : "VPOS"); } else { WRITE(p, " out float4 ocol0 : SV_Target0,%s%s\n in float4 rawpos : SV_Position,\n", dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n out float4 ocol1 : SV_Target1," : "", - DepthTextureEnable ? "\n out float depth : SV_Depth," : ""); + "\n out float depth : SV_Depth,"); } WRITE(p, " in float4 colors_0 : COLOR0,\n"); @@ -622,32 +611,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType } WRITE(p, " ) {\n"); - int Pretest = AlphaPreTest(); - if(Pretest >= 0 && !DepthTextureEnable) - { - if (!Pretest) - { - // alpha test will always fail, so restart the shader and just make it an empty function - WRITE(p, "ocol0 = 0;\n"); - if(DepthTextureEnable) - WRITE(p, "depth = 1.f;\n"); - if(dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) - WRITE(p, "ocol1 = 0;\n"); - WRITE(p, "discard;\n"); - if(ApiType != API_D3D11) - WRITE(p, "return;\n"); - } - else if (dstAlphaMode == DSTALPHA_ALPHA_PASS) - { - WRITE(p, " ocol0 = " I_ALPHA"[0].aaaa;\n"); - } - if(!Pretest || dstAlphaMode == DSTALPHA_ALPHA_PASS) - { - WRITE(p, "}\n"); - return text; - } - } - WRITE(p, " float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n" " float3 comp16 = float3(1.0f, 255.0f, 0.0f), comp24 = float3(1.0f, 255.0f, 255.0f*255.0f);\n" " float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n" @@ -755,33 +718,27 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - if(Pretest == -1) - { + // TODO: ALPHATEST_FAIL should be handled by disabling color writes in the render state + int Pretest = AlphaPreTest(); + if (Pretest == ALPHATEST_UNDETERMINED) WriteAlphaTest(p, ApiType, dstAlphaMode); - } - if((bpmem.fog.c_proj_fsel.fsel != 0) || DepthTextureEnable) - { - // the screen space depth value = far z + (clip z / clip w) * z range - WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n"); - } + // the screen space depth value = far z + (clip z / clip w) * z range + WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n"); - if (DepthTextureEnable) + // Note: depth textures are disabled if early depth test is enabled + if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) { // use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format... - // Note: depth textures are disabled if early depth test is enabled - if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) - { - WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n", - (bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : ""); + WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n", + (bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : ""); - // scale to make result from frac correct - WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n"); - WRITE(p, "zCoord = frac(zCoord);\n"); - WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n"); - } - WRITE(p, "depth = zCoord;\n"); + // scale to make result from frac correct + WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n"); + WRITE(p, "zCoord = frac(zCoord);\n"); + WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n"); } + WRITE(p, "depth = zCoord;\n"); if (dstAlphaMode == DSTALPHA_ALPHA_PASS) WRITE(p, " ocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n"); @@ -1191,37 +1148,46 @@ static const char *tevAlphaFunclogicTable[] = " != ", // xor " == " // xnor }; -static int AlphaPreTest() + +static unsigned int AlphaPreTest() { u32 op = bpmem.alphaFunc.logic; - u32 comp[2] = {bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1}; + u32 comp[2] = { bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1 }; // First kill all the simple cases switch(op) { case 0: // AND - if (comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) return true; - if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) return false; + if (comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) + return ALPHATEST_PASS; + if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) + return ALPHATEST_FAIL; break; + case 1: // OR - if (comp[0] == ALPHACMP_ALWAYS || comp[1] == ALPHACMP_ALWAYS) return true; - if (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)return false; + if (comp[0] == ALPHACMP_ALWAYS || comp[1] == ALPHACMP_ALWAYS) + return ALPHATEST_PASS; + if (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER) + return ALPHATEST_FAIL; break; + case 2: // XOR if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return true; + return ALPHATEST_PASS; if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return false; + return ALPHATEST_FAIL; break; + case 3: // XNOR if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return false; + return ALPHATEST_FAIL; if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return true; + return ALPHATEST_PASS; break; + default: PanicAlert("bad logic for alpha test? %08x", op); } - return -1; + return ALPHATEST_UNDETERMINED; } @@ -1248,8 +1214,7 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode WRITE(p, "ocol0 = 0;\n"); if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND) WRITE(p, "ocol1 = 0;\n"); - if (DepthTextureEnable) - WRITE(p, "depth = 1.f;\n"); + WRITE(p, "depth = 1.f;\n"); // HAXX: zcomploc is a way to control whether depth test is done before // or after texturing and alpha test. PC GPU does depth test before texturing ONLY if depth value is diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 31242a916e..12a499a472 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -45,7 +45,7 @@ #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) #define PIXELSHADERUID_MAX_VALUES 70 -#define PIXELSHADERUID_MAX_VALUES_SAFE 120 +#define PIXELSHADERUID_MAX_VALUES_SAFE 119 // DO NOT make anything in this class virtual. template diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index 07ace04b97..cad117c2c8 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -465,6 +465,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type) //write the true depth value, if the game uses depth textures pixel shaders will override with the correct values //if not early z culling will improve speed + // TODO: Can probably be dropped? if (is_d3d) { WRITE(p, "o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n"); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index c702b577e2..7418d60741 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -75,7 +75,6 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation, 200); iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0); iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0); - iniFile.Get("Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth, 0); iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0); iniFile.Get("Settings", "EFBScale", &iEFBScale, 2); // native @@ -134,7 +133,6 @@ void VideoConfig::GameIniLoad(const char *ini_file) iniFile.GetIfExists("Video_Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation); iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle); iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting); - iniFile.GetIfExists("Video_Settings", "EnablePerPixelDepth", &bEnablePerPixelDepth); iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode); iniFile.GetIfExists("Video_Settings", "EFBScale", &iEFBScale); // integral iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass); @@ -203,7 +201,6 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); iniFile.Set("Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); iniFile.Set("Settings", "EnablePixelLighting", bEnablePixelLighting); - iniFile.Set("Settings", "EnablePerPixelDepth", bEnablePerPixelDepth); iniFile.Set("Settings", "ShowEFBCopyRegions", bShowEFBCopyRegions); @@ -269,7 +266,6 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini) SET_IF_DIFFERS("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation); SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle); SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting); - SET_IF_DIFFERS("Video_Settings", "EnablePerPixelDepth", bEnablePerPixelDepth); SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode); SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index fe883e0dbe..4364bea6ea 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -133,7 +133,6 @@ struct VideoConfig bool bZTPSpeedHack; // The Legend of Zelda: Twilight Princess bool bUseBBox; bool bEnablePixelLighting; - bool bEnablePerPixelDepth; int iLog; // CONF_ bits int iSaveTargetId; // TODO: Should be dropped From c80f6e8b84cd98120ad55a6830a68039ab6a2a48 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 16:51:01 +0100 Subject: [PATCH 329/627] Reword a comment about early_ztest a bit. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index dbc65669ff..e1507e8389 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -1216,18 +1216,16 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode WRITE(p, "ocol1 = 0;\n"); WRITE(p, "depth = 1.f;\n"); - // HAXX: zcomploc is a way to control whether depth test is done before - // or after texturing and alpha test. PC GPU does depth test before texturing ONLY if depth value is - // not updated during shader execution. + // HAXX: zcomploc (aka early_ztest) is a way to control whether depth test is done before + // or after texturing and alpha test. PC GPUs have no way to support this + // feature properly as of 2012: depth buffer and depth test are not + // programmable and the depth test is always done after texturing. + // Most importantly, PC GPUs do not allow writing to the z buffer without + // writing a color value (unless color writing is disabled altogether). // We implement "depth test before texturing" by discarding the fragment // when the alpha test fail. This is not a correct implementation because - // even if the depth test fails the fragment could be alpha blended. - // this implemnetation is a trick to keep speed. - // the correct, but slow, way to implement a correct zComploc is : - // 1 - if zcomplock is enebled make a first pass, with color channel write disabled updating only - // depth channel. - // 2 - in the next pass disable depth chanel update, but proccess the color data normally - // this way is the only CORRECT way to emulate perfectly the zcomplock behaviour + // even if the depth test fails the fragment could be alpha blended, but + // we don't have a choice. if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable)) { WRITE(p, "discard;\n"); @@ -1236,7 +1234,6 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode } WRITE(p, "}\n"); - } static const char *tevFogFuncsTable[] = From d26bcb0847ad27235020ecaf749154d388f0e162 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 17:18:45 +0100 Subject: [PATCH 330/627] Move alpha pretest to BPMemory.h and rename a bunch of alpha testing related stuff --- Source/Core/VideoCommon/Src/BPMemory.cpp | 35 ++++++++++ Source/Core/VideoCommon/Src/BPMemory.h | 13 +++- Source/Core/VideoCommon/Src/BPStructs.cpp | 6 +- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 70 +++---------------- .../VideoCommon/Src/PixelShaderManager.cpp | 2 +- .../Core/VideoCommon/Src/PixelShaderManager.h | 2 +- .../VideoCommon/Src/VertexManagerBase.cpp | 2 +- .../Plugin_VideoOGL/Src/VertexManager.cpp | 4 +- .../Plugins/Plugin_VideoSoftware/Src/Tev.cpp | 6 +- 9 files changed, 68 insertions(+), 72 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index c452b238b6..ca0e748cb0 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -151,3 +151,38 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size #undef SET_REG_NAME } } + +AlphaTest::TEST_RESULT AlphaTest::TestResult() +{ + switch(logic) + { + case 0: // AND + if (comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) + return PASS; + if (comp0 == ALPHACMP_NEVER || comp1 == ALPHACMP_NEVER) + return FAIL; + break; + + case 1: // OR + if (comp0 == ALPHACMP_ALWAYS || comp1 == ALPHACMP_ALWAYS) + return PASS; + if (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER) + return FAIL; + break; + + case 2: // XOR + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS)) + return PASS; + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER)) + return FAIL; + break; + + case 3: // XNOR + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_NEVER) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_ALWAYS)) + return FAIL; + if ((comp0 == ALPHACMP_ALWAYS && comp1 == ALPHACMP_ALWAYS) || (comp0 == ALPHACMP_NEVER && comp1 == ALPHACMP_NEVER)) + return PASS; + break; + } + return UNDETERMINED; +} diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index cd2aa1e4c5..85e95f4f8b 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -857,7 +857,7 @@ union TevKSel int getKA(int i) {return i?kasel1:kasel0;} }; -union AlphaFunc +union AlphaTest { struct { @@ -868,6 +868,15 @@ union AlphaFunc u32 logic : 2; }; u32 hex; + + enum TEST_RESULT + { + UNDETERMINED = 0, + FAIL = 1, + PASS = 2, + }; + + TEST_RESULT TestResult(); }; union UPE_Copy @@ -981,7 +990,7 @@ struct BPMemory TevReg tevregs[4]; //0xE0 FogRangeParams fogRange; FogParams fog; //0xEE,0xEF,0xF0,0xF1,0xF2 - AlphaFunc alphaFunc; //0xF3 + AlphaTest alpha_test; //0xF3 ZTex1 ztex1; //0xf4,0xf5 ZTex2 ztex2; TevKSel tevksel[8];//0xf6,0xf7,f8,f9,fa,fb,fc,fd diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 0bde9cc613..88556cbee8 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -357,9 +357,9 @@ void BPWritten(const BPCmd& bp) PixelShaderManager::SetFogColorChanged(); break; case BPMEM_ALPHACOMPARE: // Compare Alpha Values - PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alphaFunc.ref0, - bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1, bpmem.alphaFunc.logic); - PixelShaderManager::SetAlpha(bpmem.alphaFunc); + PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0, + bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic); + PixelShaderManager::SetAlpha(bpmem.alpha_test); break; case BPMEM_BIAS: // BIAS PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index e1507e8389..b408b1bceb 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -28,12 +28,6 @@ #include "NativeVertexFormat.h" -#define ALPHATEST_PASS 2 -#define ALPHATEST_FAIL 1 -#define ALPHATEST_UNDETERMINED 0 - -static unsigned int AlphaPreTest(); - static void StageHash(int stage, u32* out) { out[0] |= bpmem.combiners[stage].colorC.hex & 0xFFFFFF; // 24 @@ -119,7 +113,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 11; // 4 - u32 alphaPreTest = AlphaPreTest(); + AlphaTest::TEST_RESULT alphaPreTest = bpmem.alpha_test.TestResult(); uid->values[0] |= alphaPreTest << 15; // 2 // numtexgens should be <= 8 @@ -153,11 +147,11 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo ptr += 4; // max: ptr = &uid->values[66] } - ptr[0] |= bpmem.alphaFunc.comp0; // 3 - ptr[0] |= bpmem.alphaFunc.comp1 << 3; // 3 - ptr[0] |= bpmem.alphaFunc.logic << 6; // 2 + ptr[0] |= bpmem.alpha_test.comp0; // 3 + ptr[0] |= bpmem.alpha_test.comp1 << 3; // 3 + ptr[0] |= bpmem.alpha_test.logic << 6; // 2 - if (alphaPreTest != ALPHATEST_FAIL) + if (alphaPreTest != AlphaTest::FAIL) { ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 ptr[0] |= bpmem.ztex2.op << 11; // 2 @@ -227,7 +221,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u ptr = &uid->values[112]; - *ptr++ = bpmem.alphaFunc.hex; // 112 + *ptr++ = bpmem.alpha_test.hex; // 112 *ptr++ = bpmem.fog.c_proj_fsel.hex; // 113 *ptr++ = bpmem.fogRange.Base.hex; // 114 @@ -719,8 +713,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); // TODO: ALPHATEST_FAIL should be handled by disabling color writes in the render state - int Pretest = AlphaPreTest(); - if (Pretest == ALPHATEST_UNDETERMINED) + AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult(); + if (Pretest == AlphaTest::UNDETERMINED) WriteAlphaTest(p, ApiType, dstAlphaMode); // the screen space depth value = far z + (clip z / clip w) * z range @@ -1149,48 +1143,6 @@ static const char *tevAlphaFunclogicTable[] = " == " // xnor }; -static unsigned int AlphaPreTest() -{ - u32 op = bpmem.alphaFunc.logic; - u32 comp[2] = { bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1 }; - - // First kill all the simple cases - switch(op) - { - case 0: // AND - if (comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) - return ALPHATEST_PASS; - if (comp[0] == ALPHACMP_NEVER || comp[1] == ALPHACMP_NEVER) - return ALPHATEST_FAIL; - break; - - case 1: // OR - if (comp[0] == ALPHACMP_ALWAYS || comp[1] == ALPHACMP_ALWAYS) - return ALPHATEST_PASS; - if (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER) - return ALPHATEST_FAIL; - break; - - case 2: // XOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return ALPHATEST_PASS; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return ALPHATEST_FAIL; - break; - - case 3: // XNOR - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_NEVER) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_ALWAYS)) - return ALPHATEST_FAIL; - if ((comp[0] == ALPHACMP_ALWAYS && comp[1] == ALPHACMP_ALWAYS) || (comp[0] == ALPHACMP_NEVER && comp[1] == ALPHACMP_NEVER)) - return ALPHATEST_PASS; - break; - - default: PanicAlert("bad logic for alpha test? %08x", op); - } - return ALPHATEST_UNDETERMINED; -} - - static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode) { static const char *alphaRef[2] = @@ -1202,12 +1154,12 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode // using discard then return works the same in cg and dx9 but not in dx11 WRITE(p, "if(!( "); - int compindex = bpmem.alphaFunc.comp0 % 8; + int compindex = bpmem.alpha_test.comp0; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table - WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alphaFunc.logic % 4]);//lookup the logic op + WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op - compindex = bpmem.alphaFunc.comp1 % 8; + compindex = bpmem.alpha_test.comp1; WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table WRITE(p, ")) {\n"); diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index 258ec04413..eaaf99fbc8 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -373,7 +373,7 @@ void PixelShaderManager::SetColorChanged(int type, int num, bool high) PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, pf[0], pf[1], pf[2], pf[3]); } -void PixelShaderManager::SetAlpha(const AlphaFunc& alpha) +void PixelShaderManager::SetAlpha(const AlphaTest& alpha) { if ((alpha.hex & 0xffff) != lastAlpha) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h index a336287a6f..12d749c871 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.h +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h @@ -38,7 +38,7 @@ public: // constant management, should be called after memory is committed static void SetColorChanged(int type, int index, bool high); - static void SetAlpha(const AlphaFunc& alpha); + static void SetAlpha(const AlphaTest& alpha); static void SetDestAlpha(const ConstantAlpha& alpha); static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt); static void SetZTextureBias(u32 bias); diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 5be72e4fcf..cd5a01c6b3 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -202,7 +202,7 @@ void VertexManager::Flush() } PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, - bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alphaFunc.hex>>16)&0xff); + bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff); #endif u32 usedtextures = 0; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 501c4969e5..ce33247d7c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -128,8 +128,8 @@ void VertexManager::vFlush() xfregs.postMtxInfo[i].index, xfregs.postMtxInfo[i].normalize); } - PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, - bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alphaFunc.hex>>16)&0xff); + PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, + bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff); #endif (void)GL_REPORT_ERROR(); diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp index eb083df15f..b10f5a2676 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp @@ -433,10 +433,10 @@ static bool AlphaCompare(int alpha, int ref, int comp) static bool AlphaTest(int alpha) { - bool comp0 = AlphaCompare(alpha, bpmem.alphaFunc.ref0, bpmem.alphaFunc.comp0); - bool comp1 = AlphaCompare(alpha, bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp1); + bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0); + bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1); - switch (bpmem.alphaFunc.logic) { + switch (bpmem.alpha_test.logic) { case 0: return comp0 && comp1; // and case 1: return comp0 || comp1; // or case 2: return comp0 ^ comp1; // xor From be706a397720d94729518595339211ebc15be588 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 17:23:01 +0100 Subject: [PATCH 331/627] Disable color writing when alpha test always fails. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 1 - Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 11 +++++++---- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 11 +++++++---- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 11 +++++++---- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index b408b1bceb..88cf77631f 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -712,7 +712,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl) WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n"); - // TODO: ALPHATEST_FAIL should be handled by disabling color writes in the render state AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult(); if (Pretest == AlphaTest::UNDETERMINED) WriteAlphaTest(p, ApiType, dstAlphaMode); diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 2955bf6a6d..44eaaf5dcf 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -471,10 +471,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format UINT8 color_mask = 0; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA; - if (bpmem.blendmode.colorupdate) - color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + color_mask = D3D11_COLOR_WRITE_ENABLE_ALPHA; + if (bpmem.blendmode.colorupdate) + color_mask |= D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN | D3D11_COLOR_WRITE_ENABLE_BLUE; + } gx_state.blenddc.RenderTarget[0].RenderTargetWriteMask = color_mask; } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 1e37ff5456..19692e25d3 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -428,10 +428,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format DWORD color_mask = 0; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - color_mask = D3DCOLORWRITEENABLE_ALPHA; - if (bpmem.blendmode.colorupdate) - color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + color_mask = D3DCOLORWRITEENABLE_ALPHA; + if (bpmem.blendmode.colorupdate) + color_mask |= D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; + } D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 9053b0f164..e3c35a6511 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -646,10 +646,13 @@ void Renderer::SetColorMask() { // Only enable alpha channel if it's supported by the current EFB format GLenum ColorMask = GL_FALSE, AlphaMask = GL_FALSE; - if (bpmem.blendmode.colorupdate) - ColorMask = GL_TRUE; - if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) - AlphaMask = GL_TRUE; + if (bpmem.alpha_test.TestResult() != AlphaTest::FAIL) + { + if (bpmem.blendmode.colorupdate) + ColorMask = GL_TRUE; + if (bpmem.blendmode.alphaupdate && (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24)) + AlphaMask = GL_TRUE; + } glColorMask(ColorMask, ColorMask, ColorMask, AlphaMask); } From 4925a28f94d8a9925a85824ec89513c6774bdc30 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 17:29:16 +0100 Subject: [PATCH 332/627] PixelShaderGen: Shader uid maintainance --- Source/Core/Common/Src/LinearDiskCache.h | 2 +- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h index f75e80cd4b..9755c996bd 100644 --- a/Source/Core/Common/Src/LinearDiskCache.h +++ b/Source/Core/Common/Src/LinearDiskCache.h @@ -24,7 +24,7 @@ // Increment this every time you change shader generation code. enum { - LINEAR_DISKCACHE_VER = 6978 + LINEAR_DISKCACHE_VER = 6979 }; // On disk format: diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 88cf77631f..fdb5f21a51 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -151,23 +151,17 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo ptr[0] |= bpmem.alpha_test.comp1 << 3; // 3 ptr[0] |= bpmem.alpha_test.logic << 6; // 2 - if (alphaPreTest != AlphaTest::FAIL) - { - ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 8; // 3 - ptr[0] |= bpmem.ztex2.op << 11; // 2 -// ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 - ptr[0] |= bpmem.zmode.testenable << 14; // 1 - } - - ptr[0] |= bpmem.zcontrol.early_ztest << 13; // 1 - ptr[0] |= bpmem.zmode.updateenable << 15; // 1 + ptr[0] |= bpmem.ztex2.op << 8; // 2 + ptr[0] |= bpmem.zcontrol.early_ztest << 10; // 1 + ptr[0] |= bpmem.zmode.testenable << 11; // 1 + ptr[0] |= bpmem.zmode.updateenable << 12; // 1 if (dstAlphaMode != DSTALPHA_ALPHA_PASS) { if (bpmem.fog.c_proj_fsel.fsel != 0) { - ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1 - ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1 + ptr[0] |= bpmem.fog.c_proj_fsel.proj << 13; // 1 + ptr[0] |= bpmem.fogRange.Base.Enabled << 14; // 1 } } From d3882771aadd1ab1813f383a14af66819e01e68b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 18:27:31 +0100 Subject: [PATCH 333/627] Fix an assert that had been wrong for ages, apparently. --- Source/Core/VideoCommon/Src/PixelShaderGen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h index 12a499a472..9c8bfce256 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.h +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h @@ -45,7 +45,7 @@ #define C_PMATERIALS (C_PLIGHTS + 40) #define C_PENVCONST_END (C_PMATERIALS + 4) #define PIXELSHADERUID_MAX_VALUES 70 -#define PIXELSHADERUID_MAX_VALUES_SAFE 119 +#define PIXELSHADERUID_MAX_VALUES_SAFE 115 // DO NOT make anything in this class virtual. template From e204a6e015b2f835d7f00d7e0f96cd4fd813a10b Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 18:33:58 +0100 Subject: [PATCH 334/627] Add some TODOs. --- .../Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp | 3 ++- Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp index bc7e37b533..5a199b56c8 100644 --- a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp +++ b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp @@ -293,7 +293,8 @@ void Interpreter::mfspr(UGeckoInstruction _inst) case SPR_WPAR: { - // If wpar_empty ever is false, Paper Mario hangs. Strange. + // TODO: If wpar_empty ever is false, Paper Mario hangs. Strange. + // Maybe WPAR is automatically flushed after a certain amount of time? bool wpar_empty = true; //GPFifo::IsEmpty(); if (!wpar_empty) rSPR(iIndex) |= 1; // BNE = buffer not empty diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 19692e25d3..f750313642 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -1201,6 +1201,7 @@ void Renderer::ApplyState(bool bUseDstAlpha) { if (bUseDstAlpha) { + // TODO: WTF is this crap? We're enabling color writing regardless of the actual GPU state here... D3D::ChangeRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA); D3D::ChangeRenderState(D3DRS_ALPHABLENDENABLE, false); if(bpmem.zmode.testenable && bpmem.zmode.updateenable) From 815fd197d3e292e869b85c5475ff08863b04a8de Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 8 Jan 2013 21:27:04 +0100 Subject: [PATCH 335/627] Fix a potential memleak in FifoPlayerDlg --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index b5caf139d6..494931f959 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -470,6 +470,7 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) if (obj_idx == -1) { m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)")); + delete[] search_val; return; } start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; From 2844708c2d5d350c4e8b9d203964dfbd259f7762 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Wed, 9 Jan 2013 09:22:36 +1300 Subject: [PATCH 336/627] Fix reference to deleted object bug. This should fix channels not loading from sysmenu anymore. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 1 + .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 3 ++- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp | 10 +++++++--- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index 5e23819d7b..49684ef5af 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -795,6 +795,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true); WII_IPC_HLE_Interface::Init(); + s_Usb = GetUsbPointer(); for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++) { if (wiiMoteConnected[i]) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 29e3c64a7c..33474af8c7 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -38,7 +38,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De // Activate only first Wiimote by default _conf_pads BT_DINF; - + SetUsbPointer(this); if (!SConfig::GetInstance().m_SYSCONF->GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads))) { PanicAlertT("Trying to read from invalid SYSCONF\nWiimote bt ids are not available"); @@ -100,6 +100,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De CWII_IPC_HLE_Device_usb_oh1_57e_305::~CWII_IPC_HLE_Device_usb_oh1_57e_305() { m_WiiMotes.clear(); + SetUsbPointer(NULL); } void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index e59e1b3208..6e06f60dd6 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -27,13 +27,19 @@ #include "l2cap.h" // Local #include "WiiMote_HID_Attr.h" -static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb; +static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer() { return s_Usb; } +void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr) +{ + s_Usb = ptr; +} + + CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number, bdaddr_t _BD, bool ready) : m_HIDControlChannel_Connected(false) , m_HIDControlChannel_ConnectedWait(false) @@ -49,8 +55,6 @@ CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* { DEBUG_LOG(WII_IPC_WIIMOTE, "Wiimote: #%i Constructed", _Number); - s_Usb = _pHost; - m_ConnectionState = (ready) ? CONN_READY : CONN_INACTIVE; m_ConnectionHandle = 0x100 + _Number; memset(m_LinkKey, 0xA0 + _Number, HCI_KEY_SIZE); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h index f3180c7dc9..5373f68c0a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -25,6 +25,7 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305; CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer(); +void SetUsbPointer(CWII_IPC_HLE_Device_usb_oh1_57e_305* ptr); class CBigEndianBuffer { From 00d303eeadf23f394836ecd317eb800f0047a0bf Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 8 Jan 2013 14:41:58 -0600 Subject: [PATCH 337/627] clean up FifoPlayerDlg::OnBeginSearch a bit --- Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 27 ++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp index 494931f959..160aaf211a 100644 --- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp @@ -22,9 +22,13 @@ #include "FifoPlayer/FifoPlayer.h" #include "FifoPlayer/FifoRecorder.h" #include "OpcodeDecoding.h" + #include #include +#include +#include + DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) @@ -440,26 +444,22 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) return; } - unsigned int val_length = str_search_val.Length() / 2; - u8* search_val = new u8[val_length]; + unsigned int const val_length = str_search_val.Length() / 2; + std::vector search_val(val_length); for (unsigned int i = 0; i < val_length; ++i) { wxString char_str = str_search_val.Mid(2*i, 2); - unsigned long val; + unsigned long val = 0; if (!char_str.ToULong(&val, 16)) { m_numResultsText->SetLabel(_("Invalid search string (couldn't convert to number)")); - delete[] search_val; return; } search_val[i] = (u8)val; } search_results.clear(); - u8* start_ptr; - u8* end_ptr; - - int frame_idx = m_framesList->GetSelection(); + int const frame_idx = m_framesList->GetSelection(); FifoPlayer& player = FifoPlayer::GetInstance(); const AnalyzedFrameInfo& frame = player.GetAnalyzedFrameInfo(frame_idx); const FifoFrameInfo& fifo_frame = player.GetFile()->GetFrame(frame_idx); @@ -470,15 +470,15 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) if (obj_idx == -1) { m_numResultsText->SetLabel(_("Invalid search parameters (no object selected)")); - delete[] search_val; return; } - start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; - end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]]; - for (u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr) + const u8* const start_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx]]; + const u8* const end_ptr = &fifo_frame.fifoData[frame.objectStarts[obj_idx+1]]; + + for (const u8* ptr = start_ptr; ptr < end_ptr-val_length+1; ++ptr) { - if (memcmp(ptr, search_val, val_length) == 0) + if (std::equal(search_val.begin(), search_val.end(), ptr)) { SearchResult result; result.frame_idx = frame_idx; @@ -497,7 +497,6 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event) search_results.push_back(result); } } - delete[] search_val; ChangeSearchResult(0); m_beginSearch->Disable(); From baa29f571c0fa914cc80d505e7db1f9c7a654488 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 8 Jan 2013 15:02:50 -0600 Subject: [PATCH 338/627] Fix incorrect iterator usage in BreakPoints::Clear --- Source/Core/Common/Src/BreakPoints.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/BreakPoints.cpp b/Source/Core/Common/Src/BreakPoints.cpp index 1700276d85..62fadefd4f 100644 --- a/Source/Core/Common/Src/BreakPoints.cpp +++ b/Source/Core/Common/Src/BreakPoints.cpp @@ -19,7 +19,9 @@ #include "DebugInterface.h" #include "BreakPoints.h" #include "../../Core/Src/PowerPC/JitCommon/JitBase.h" + #include +#include bool BreakPoints::IsAddressBreakPoint(u32 _iAddress) { @@ -110,12 +112,17 @@ void BreakPoints::Remove(u32 em_address) void BreakPoints::Clear() { - for (TBreakPoints::iterator i = m_BreakPoints.begin(); i != m_BreakPoints.end(); ++i) + if (jit) { - if (jit) - jit->GetBlockCache()->InvalidateICache(i->iAddress, 4); - m_BreakPoints.erase(i); + std::for_each(m_BreakPoints.begin(), m_BreakPoints.end(), + [](const TBreakPoint& bp) + { + jit->GetBlockCache()->InvalidateICache(bp.iAddress, 4); + } + ); } + + m_BreakPoints.clear(); } MemChecks::TMemChecksStr MemChecks::GetStrings() const From 4f4aa4860df98f401384f6e598cb649b13882e79 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 8 Jan 2013 16:50:09 -0600 Subject: [PATCH 339/627] Fix a currently unused unique_lock function. Thanks to Lioncash. --- Source/Core/Common/Src/StdMutex.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h index 150d18f53e..8949e905ac 100644 --- a/Source/Core/Common/Src/StdMutex.h +++ b/Source/Core/Common/Src/StdMutex.h @@ -318,9 +318,12 @@ public: mutex_type* release() { - return mutex(); + auto const ret = mutex(); + pm = NULL; owns = false; + + return ret; } bool owns_lock() const From b8691df723ab635b3db41e86c9324b3adb952abe Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 8 Jan 2013 19:15:11 -0500 Subject: [PATCH 340/627] Allow loading controller profiles from game ini. Currently loads the same profile for all 4 controllers, and overwrites the default control settings. --- Source/Core/Core/Src/BootManager.cpp | 8 +++++++- Source/Core/Core/Src/CoreParameter.h | 4 +++- Source/Core/Core/Src/HW/GCPad.cpp | 3 ++- Source/Core/Core/Src/HW/Wiimote.cpp | 3 ++- Source/Core/InputCommon/Src/InputConfig.cpp | 13 ++++++++++--- Source/Core/InputCommon/Src/InputConfig.h | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index e0fac1da87..113a12f761 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -47,7 +47,6 @@ #include "VideoBackendBase.h" #include "Movie.h" - namespace BootManager { @@ -137,6 +136,11 @@ bool BootCore(const std::string& _rFilename) } } + if (game_ini.Exists("Core", "WiiProfile")) + game_ini.Get("Core", "WiiProfile", &StartUp.strWiiControllerProfile); + if (game_ini.Exists("Core", "GCProfile")) + game_ini.Get("Core", "GCProfile", &StartUp.strGCControllerProfile); + // Run the game // Init the core if (!Core::Init()) @@ -169,6 +173,8 @@ void Stop() StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; + StartUp.strGCControllerProfile = ""; + StartUp.strWiiControllerProfile = ""; VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); } } diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index e67935906b..d5e7537354 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -138,7 +138,9 @@ struct SCoreStartupParameter int iTheme; int iPosX, iPosY, iWidth, iHeight; - + + std::string strGCControllerProfile; + std::string strWiiControllerProfile; enum EBootBS2 { BOOT_DEFAULT, diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 68ba3ab88a..62090dfc4f 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -20,6 +20,7 @@ #include "ControllerInterface/ControllerInterface.h" #include "GCPadEmu.h" +#include "../ConfigManager.h" #include "../../InputCommon/Src/InputConfig.h" @@ -55,7 +56,7 @@ void Initialize(void* const hwnd) g_controller_interface.Initialize(); // load the saved controller config - g_plugin.LoadConfig(); + g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strGCControllerProfile); } void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index 0928deffb1..4b95677581 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -5,6 +5,7 @@ #include "WiimoteReal/WiimoteReal.h" #include "WiimoteEmu/WiimoteEmu.h" #include "Movie.h" +#include "../ConfigManager.h" #include "ControllerInterface/ControllerInterface.h" @@ -44,7 +45,7 @@ void Initialize(void* const hwnd) g_controller_interface.SetHwnd(hwnd); g_controller_interface.Initialize(); - g_plugin.LoadConfig(); + g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strWiiControllerProfile); WiimoteReal::Initialize(); diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index b9d2a93b99..19be23ec74 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -26,10 +26,13 @@ InputPlugin::~InputPlugin() delete *i; } -bool InputPlugin::LoadConfig() +bool InputPlugin::LoadConfig(std::string ini) { IniFile inifile; - if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) + std::string ini2 = ini; + if (ini == "") + ini = ini_name; + if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini + ".ini")) { std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), @@ -37,7 +40,11 @@ bool InputPlugin::LoadConfig() for (; i!=e; ++i) { // load settings from ini - (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + std::string section; + section = (*i)->GetName(); + if (ini2 != "") + section = "Profile"; + (*i)->LoadConfig(inifile.GetOrCreateSection(section.c_str())); // update refs (*i)->UpdateReferences(g_controller_interface); } diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h index 4d25334ce7..bf12217304 100644 --- a/Source/Core/InputCommon/Src/InputConfig.h +++ b/Source/Core/InputCommon/Src/InputConfig.h @@ -42,7 +42,7 @@ public: ~InputPlugin(); - bool LoadConfig(); + bool LoadConfig(std::string ini); void SaveConfig(); std::vector< ControllerEmu* > controllers; From d9ea718559a1b820278f7517be7b95a0d2263bd2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 8 Jan 2013 23:46:30 -0500 Subject: [PATCH 341/627] Fix an issue where an iterator would become invalidated in TextureCache::ClearRenderTargets() --- Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index e3152455df..cfbd4eb6c8 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -204,12 +204,16 @@ void TextureCache::ClearRenderTargets() iter = textures.begin(), tcend = textures.end(); - for (; iter!=tcend; ++iter) + while (iter != tcend) + { if (iter->second->type == TCET_EC_VRAM) { delete iter->second; - textures.erase(iter); + textures.erase(iter++); } + else + ++iter; + } } bool TextureCache::CheckForCustomTextureLODs(u64 tex_hash, int texformat, unsigned int levels) From 32855a289c2be54da72e846f3b3670d3275c822a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 01:16:23 -0600 Subject: [PATCH 342/627] Actually export 0-sized files. Fixes issue 5177. --- Source/Core/DiscIO/Src/FileSystemGCWii.cpp | 39 +++++++++------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 8f40ab2f18..6103f53e67 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -19,6 +19,7 @@ #include "FileUtil.h" #include +#include #include "FileSystemGCWii.h" #include "StringUtil.h" @@ -95,7 +96,7 @@ bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFi const SFileInfo* pFileInfo = FindFileInfo(_rFullPath); - if (!pFileInfo || pFileInfo->m_FileSize == 0) + if (!pFileInfo) return false; u64 remainingSize = pFileInfo->m_FileSize; @@ -112,22 +113,17 @@ bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFi // Limit read size to 128 MB size_t readSize = (size_t)min(remainingSize, (u64)0x08000000); - u8* buffer = new u8[readSize]; + std::vector buffer(readSize); - result = m_rVolume->Read(fileOffset, readSize, buffer); + result = m_rVolume->Read(fileOffset, readSize, &buffer[0]); if (!result) - { - delete[] buffer; break; - } - f.WriteBytes(buffer, readSize); + f.WriteBytes(&buffer[0], readSize); remainingSize -= readSize; fileOffset += readSize; - - delete[] buffer; } return result; @@ -140,22 +136,20 @@ bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const AppSize += 0x20; // + header size DEBUG_LOG(DISCIO,"AppSize -> %x", AppSize); - u8* buffer = new u8[AppSize]; - if (m_rVolume->Read(0x2440, AppSize, buffer)) + std::vector buffer(AppSize); + if (m_rVolume->Read(0x2440, AppSize, &buffer[0])) { - char exportName[512]; - sprintf(exportName, "%s/apploader.img", _rExportFolder); + std::string exportName(_rExportFolder); + exportName += "/apploader.img"; File::IOFile AppFile(exportName, "wb"); if (AppFile) { - AppFile.WriteBytes(buffer, AppSize); - delete[] buffer; + AppFile.WriteBytes(&buffer[0], AppSize); return true; } } - delete[] buffer; return false; } @@ -182,21 +176,20 @@ bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const DolSize = offset + size; } - u8* buffer = new u8[DolSize]; - if (m_rVolume->Read(DolOffset, DolSize, buffer)) + std::vector buffer(DolSize); + if (m_rVolume->Read(DolOffset, DolSize, &buffer[0])) { - char exportName[512]; - sprintf(exportName, "%s/boot.dol", _rExportFolder); + std::string exportName(_rExportFolder); + exportName += "/boot.dol"; + File::IOFile DolFile(exportName, "wb"); if (DolFile) { - DolFile.WriteBytes(buffer, DolSize); - delete[] buffer; + DolFile.WriteBytes(&buffer[0], DolSize); return true; } } - delete[] buffer; return false; } From 63b38be97c12e6b6f0ec39008f6b0dd06dbcf3f0 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 9 Jan 2013 22:57:32 +1100 Subject: [PATCH 343/627] Added audio time stretching by using the SoundTouch library. --- CMakeLists.txt | 11 + Externals/SoundTouch/AAFilter.cpp | 184 ++++ Externals/SoundTouch/AAFilter.h | 91 ++ Externals/SoundTouch/BPMDetect.cpp | 370 ++++++++ Externals/SoundTouch/BPMDetect.h | 164 ++++ Externals/SoundTouch/CMakeLists.txt | 15 + Externals/SoundTouch/FIFOSampleBuffer.cpp | 274 ++++++ Externals/SoundTouch/FIFOSampleBuffer.h | 178 ++++ Externals/SoundTouch/FIFOSamplePipe.h | 234 +++++ Externals/SoundTouch/FIRFilter.cpp | 259 ++++++ Externals/SoundTouch/FIRFilter.h | 145 ++++ Externals/SoundTouch/PeakFinder.cpp | 276 ++++++ Externals/SoundTouch/PeakFinder.h | 97 +++ Externals/SoundTouch/RateTransposer.cpp | 626 ++++++++++++++ Externals/SoundTouch/RateTransposer.h | 159 ++++ Externals/SoundTouch/STTypes.h | 189 ++++ Externals/SoundTouch/SoundTouch.cpp | 501 +++++++++++ Externals/SoundTouch/SoundTouch.h | 277 ++++++ Externals/SoundTouch/SoundTouch.vcxproj | 352 ++++++++ .../SoundTouch/SoundTouch.vcxproj.filters | 60 ++ Externals/SoundTouch/TDStretch.cpp | 808 ++++++++++++++++++ Externals/SoundTouch/TDStretch.h | 268 ++++++ Externals/SoundTouch/cpu_detect.h | 62 ++ Externals/SoundTouch/cpu_detect_x86.cpp | 137 +++ Externals/SoundTouch/mmx_optimized.cpp | 317 +++++++ Externals/SoundTouch/sse_optimized.cpp | 361 ++++++++ Source/Core/AudioCommon/AudioCommon.vcxproj | 24 +- Source/Core/AudioCommon/Src/Mixer.h | 5 + Source/Core/AudioCommon/Src/OpenALStream.cpp | 79 +- Source/Core/AudioCommon/Src/OpenALStream.h | 12 +- Source/Core/Core/Src/Core.cpp | 9 +- Source/Dolphin_2010.sln | 14 + 32 files changed, 6520 insertions(+), 38 deletions(-) create mode 100644 Externals/SoundTouch/AAFilter.cpp create mode 100644 Externals/SoundTouch/AAFilter.h create mode 100644 Externals/SoundTouch/BPMDetect.cpp create mode 100644 Externals/SoundTouch/BPMDetect.h create mode 100644 Externals/SoundTouch/CMakeLists.txt create mode 100644 Externals/SoundTouch/FIFOSampleBuffer.cpp create mode 100644 Externals/SoundTouch/FIFOSampleBuffer.h create mode 100644 Externals/SoundTouch/FIFOSamplePipe.h create mode 100644 Externals/SoundTouch/FIRFilter.cpp create mode 100644 Externals/SoundTouch/FIRFilter.h create mode 100644 Externals/SoundTouch/PeakFinder.cpp create mode 100644 Externals/SoundTouch/PeakFinder.h create mode 100644 Externals/SoundTouch/RateTransposer.cpp create mode 100644 Externals/SoundTouch/RateTransposer.h create mode 100644 Externals/SoundTouch/STTypes.h create mode 100644 Externals/SoundTouch/SoundTouch.cpp create mode 100644 Externals/SoundTouch/SoundTouch.h create mode 100644 Externals/SoundTouch/SoundTouch.vcxproj create mode 100644 Externals/SoundTouch/SoundTouch.vcxproj.filters create mode 100644 Externals/SoundTouch/TDStretch.cpp create mode 100644 Externals/SoundTouch/TDStretch.h create mode 100644 Externals/SoundTouch/cpu_detect.h create mode 100644 Externals/SoundTouch/cpu_detect_x86.cpp create mode 100644 Externals/SoundTouch/mmx_optimized.cpp create mode 100644 Externals/SoundTouch/sse_optimized.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index b025de11ef..f286cb3502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,6 +452,17 @@ else() include_directories(Externals/SOIL) endif() +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(SoundTouch SoundTouch SoundTouch.h QUIET) +endif() +if(SOUNDTOUCH_FOUND) + message("Using shared SoundTouch") +else() + message("Using static SoundTouch from Externals") + add_subdirectory(Externals/SoundTouch) + include_directories(Externals/SoundTouch) +endif() + # If zlib has already been found on a previous run of cmake don't check again # as the check seems to take a long time. if(NOT ZLIB_FOUND) diff --git a/Externals/SoundTouch/AAFilter.cpp b/Externals/SoundTouch/AAFilter.cpp new file mode 100644 index 0000000000..f099bced93 --- /dev/null +++ b/Externals/SoundTouch/AAFilter.cpp @@ -0,0 +1,184 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// FIR low-pass (anti-alias) filter with filter coefficient design routine and +/// MMX optimization. +/// +/// Anti-alias filter is used to prevent folding of high frequencies when +/// transposing the sample rate with interpolation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2009-01-11 13:34:24 +0200 (Sun, 11 Jan 2009) $ +// File revision : $Revision: 4 $ +// +// $Id: AAFilter.cpp 45 2009-01-11 11:34:24Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "AAFilter.h" +#include "FIRFilter.h" + +using namespace soundtouch; + +#define PI 3.141592655357989 +#define TWOPI (2 * PI) + +/***************************************************************************** + * + * Implementation of the class 'AAFilter' + * + *****************************************************************************/ + +AAFilter::AAFilter(uint len) +{ + pFIR = FIRFilter::newInstance(); + cutoffFreq = 0.5; + setLength(len); +} + + + +AAFilter::~AAFilter() +{ + delete pFIR; +} + + + +// Sets new anti-alias filter cut-off edge frequency, scaled to +// sampling frequency (nyquist frequency = 0.5). +// The filter will cut frequencies higher than the given frequency. +void AAFilter::setCutoffFreq(double newCutoffFreq) +{ + cutoffFreq = newCutoffFreq; + calculateCoeffs(); +} + + + +// Sets number of FIR filter taps +void AAFilter::setLength(uint newLength) +{ + length = newLength; + calculateCoeffs(); +} + + + +// Calculates coefficients for a low-pass FIR filter using Hamming window +void AAFilter::calculateCoeffs() +{ + uint i; + double cntTemp, temp, tempCoeff,h, w; + double fc2, wc; + double scaleCoeff, sum; + double *work; + SAMPLETYPE *coeffs; + + assert(length >= 2); + assert(length % 4 == 0); + assert(cutoffFreq >= 0); + assert(cutoffFreq <= 0.5); + + work = new double[length]; + coeffs = new SAMPLETYPE[length]; + + fc2 = 2.0 * cutoffFreq; + wc = PI * fc2; + tempCoeff = TWOPI / (double)length; + + sum = 0; + for (i = 0; i < length; i ++) + { + cntTemp = (double)i - (double)(length / 2); + + temp = cntTemp * wc; + if (temp != 0) + { + h = fc2 * sin(temp) / temp; // sinc function + } + else + { + h = 1.0; + } + w = 0.54 + 0.46 * cos(tempCoeff * cntTemp); // hamming window + + temp = w * h; + work[i] = temp; + + // calc net sum of coefficients + sum += temp; + } + + // ensure the sum of coefficients is larger than zero + assert(sum > 0); + + // ensure we've really designed a lowpass filter... + assert(work[length/2] > 0); + assert(work[length/2 + 1] > -1e-6); + assert(work[length/2 - 1] > -1e-6); + + // Calculate a scaling coefficient in such a way that the result can be + // divided by 16384 + scaleCoeff = 16384.0f / sum; + + for (i = 0; i < length; i ++) + { + // scale & round to nearest integer + temp = work[i] * scaleCoeff; + temp += (temp >= 0) ? 0.5 : -0.5; + // ensure no overfloods + assert(temp >= -32768 && temp <= 32767); + coeffs[i] = (SAMPLETYPE)temp; + } + + // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384 + pFIR->setCoefficients(coeffs, length, 14); + + delete[] work; + delete[] coeffs; +} + + +// Applies the filter to the given sequence of samples. +// Note : The amount of outputted samples is by value of 'filter length' +// smaller than the amount of input samples. +uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const +{ + return pFIR->evaluate(dest, src, numSamples, numChannels); +} + + +uint AAFilter::getLength() const +{ + return pFIR->getLength(); +} diff --git a/Externals/SoundTouch/AAFilter.h b/Externals/SoundTouch/AAFilter.h new file mode 100644 index 0000000000..d0997570d3 --- /dev/null +++ b/Externals/SoundTouch/AAFilter.h @@ -0,0 +1,91 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like method +/// with several performance-increasing tweaks. +/// +/// Anti-alias filter is used to prevent folding of high frequencies when +/// transposing the sample rate with interpolation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $ +// File revision : $Revision: 4 $ +// +// $Id: AAFilter.h 11 2008-02-10 16:26:55Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef AAFilter_H +#define AAFilter_H + +#include "STTypes.h" + +namespace soundtouch +{ + +class AAFilter +{ +protected: + class FIRFilter *pFIR; + + /// Low-pass filter cut-off frequency, negative = invalid + double cutoffFreq; + + /// num of filter taps + uint length; + + /// Calculate the FIR coefficients realizing the given cutoff-frequency + void calculateCoeffs(); +public: + AAFilter(uint length); + + ~AAFilter(); + + /// Sets new anti-alias filter cut-off edge frequency, scaled to sampling + /// frequency (nyquist frequency = 0.5). The filter will cut off the + /// frequencies than that. + void setCutoffFreq(double newCutoffFreq); + + /// Sets number of FIR filter taps, i.e. ~filter complexity + void setLength(uint newLength); + + uint getLength() const; + + /// Applies the filter to the given sequence of samples. + /// Note : The amount of outputted samples is by value of 'filter length' + /// smaller than the amount of input samples. + uint evaluate(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples, + uint numChannels) const; +}; + +} + +#endif diff --git a/Externals/SoundTouch/BPMDetect.cpp b/Externals/SoundTouch/BPMDetect.cpp new file mode 100644 index 0000000000..a48cbd97c3 --- /dev/null +++ b/Externals/SoundTouch/BPMDetect.cpp @@ -0,0 +1,370 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Beats-per-minute (BPM) detection routine. +/// +/// The beat detection algorithm works as follows: +/// - Use function 'inputSamples' to input a chunks of samples to the class for +/// analysis. It's a good idea to enter a large sound file or stream in smallish +/// chunks of around few kilosamples in order not to extinguish too much RAM memory. +/// - Inputted sound data is decimated to approx 500 Hz to reduce calculation burden, +/// which is basically ok as low (bass) frequencies mostly determine the beat rate. +/// Simple averaging is used for anti-alias filtering because the resulting signal +/// quality isn't of that high importance. +/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by +/// taking absolute value that's smoothed by sliding average. Signal levels that +/// are below a couple of times the general RMS amplitude level are cut away to +/// leave only notable peaks there. +/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term +/// autocorrelation function of the enveloped signal. +/// - After whole sound data file has been analyzed as above, the bpm level is +/// detected by function 'getBpm' that finds the highest peak of the autocorrelation +/// function, calculates it's precise location and converts this reading to bpm's. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-08-30 22:45:25 +0300 (Thu, 30 Aug 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: BPMDetect.cpp 149 2012-08-30 19:45:25Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "FIFOSampleBuffer.h" +#include "PeakFinder.h" +#include "BPMDetect.h" + +using namespace soundtouch; + +#define INPUT_BLOCK_SAMPLES 2048 +#define DECIMATED_BLOCK_SAMPLES 256 + +/// decay constant for calculating RMS volume sliding average approximation +/// (time constant is about 10 sec) +const float avgdecay = 0.99986f; + +/// Normalization coefficient for calculating RMS sliding average approximation. +const float avgnorm = (1 - avgdecay); + + +//////////////////////////////////////////////////////////////////////////////// + +// Enable following define to create bpm analysis file: + +// #define _CREATE_BPM_DEBUG_FILE + +#ifdef _CREATE_BPM_DEBUG_FILE + + #define DEBUGFILE_NAME "c:\\temp\\soundtouch-bpm-debug.txt" + + static void _SaveDebugData(const float *data, int minpos, int maxpos, double coeff) + { + FILE *fptr = fopen(DEBUGFILE_NAME, "wt"); + int i; + + if (fptr) + { + printf("\n\nWriting BPM debug data into file " DEBUGFILE_NAME "\n\n"); + for (i = minpos; i < maxpos; i ++) + { + fprintf(fptr, "%d\t%.1lf\t%f\n", i, coeff / (double)i, data[i]); + } + fclose(fptr); + } + } +#else + #define _SaveDebugData(a,b,c,d) +#endif + +//////////////////////////////////////////////////////////////////////////////// + + +BPMDetect::BPMDetect(int numChannels, int aSampleRate) +{ + this->sampleRate = aSampleRate; + this->channels = numChannels; + + decimateSum = 0; + decimateCount = 0; + + envelopeAccu = 0; + + // Initialize RMS volume accumulator to RMS level of 1500 (out of 32768) that's + // safe initial RMS signal level value for song data. This value is then adapted + // to the actual level during processing. +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // integer samples + RMSVolumeAccu = (1500 * 1500) / avgnorm; +#else + // float samples, scaled to range [-1..+1[ + RMSVolumeAccu = (0.045f * 0.045f) / avgnorm; +#endif + + // choose decimation factor so that result is approx. 1000 Hz + decimateBy = sampleRate / 1000; + assert(decimateBy > 0); + assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES); + + // Calculate window length & starting item according to desired min & max bpms + windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM); + windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM); + + assert(windowLen > windowStart); + + // allocate new working objects + xcorr = new float[windowLen]; + memset(xcorr, 0, windowLen * sizeof(float)); + + // allocate processing buffer + buffer = new FIFOSampleBuffer(); + // we do processing in mono mode + buffer->setChannels(1); + buffer->clear(); +} + + + +BPMDetect::~BPMDetect() +{ + delete[] xcorr; + delete buffer; +} + + + +/// convert to mono, low-pass filter & decimate to about 500 Hz. +/// return number of outputted samples. +/// +/// Decimation is used to remove the unnecessary frequencies and thus to reduce +/// the amount of data needed to be processed as calculating autocorrelation +/// function is a very-very heavy operation. +/// +/// Anti-alias filtering is done simply by averaging the samples. This is really a +/// poor-man's anti-alias filtering, but it's not so critical in this kind of application +/// (it'd also be difficult to design a high-quality filter with steep cut-off at very +/// narrow band) +int BPMDetect::decimate(SAMPLETYPE *dest, const SAMPLETYPE *src, int numsamples) +{ + int count, outcount; + LONG_SAMPLETYPE out; + + assert(channels > 0); + assert(decimateBy > 0); + outcount = 0; + for (count = 0; count < numsamples; count ++) + { + int j; + + // convert to mono and accumulate + for (j = 0; j < channels; j ++) + { + decimateSum += src[j]; + } + src += j; + + decimateCount ++; + if (decimateCount >= decimateBy) + { + // Store every Nth sample only + out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels)); + decimateSum = 0; + decimateCount = 0; +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // check ranges for sure (shouldn't actually be necessary) + if (out > 32767) + { + out = 32767; + } + else if (out < -32768) + { + out = -32768; + } +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[outcount] = (SAMPLETYPE)out; + outcount ++; + } + } + return outcount; +} + + + +// Calculates autocorrelation function of the sample history buffer +void BPMDetect::updateXCorr(int process_samples) +{ + int offs; + SAMPLETYPE *pBuffer; + + assert(buffer->numSamples() >= (uint)(process_samples + windowLen)); + + pBuffer = buffer->ptrBegin(); + for (offs = windowStart; offs < windowLen; offs ++) + { + LONG_SAMPLETYPE sum; + int i; + + sum = 0; + for (i = 0; i < process_samples; i ++) + { + sum += pBuffer[i] * pBuffer[i + offs]; // scaling the sub-result shouldn't be necessary + } +// xcorr[offs] *= xcorr_decay; // decay 'xcorr' here with suitable coefficients + // if it's desired that the system adapts automatically to + // various bpms, e.g. in processing continouos music stream. + // The 'xcorr_decay' should be a value that's smaller than but + // close to one, and should also depend on 'process_samples' value. + + xcorr[offs] += (float)sum; + } +} + + +// Calculates envelope of the sample data +void BPMDetect::calcEnvelope(SAMPLETYPE *samples, int numsamples) +{ + const static double decay = 0.7f; // decay constant for smoothing the envelope + const static double norm = (1 - decay); + + int i; + LONG_SAMPLETYPE out; + double val; + + for (i = 0; i < numsamples; i ++) + { + // calc average RMS volume + RMSVolumeAccu *= avgdecay; + val = (float)fabs((float)samples[i]); + RMSVolumeAccu += val * val; + + // cut amplitudes that are below cutoff ~2 times RMS volume + // (we're interested in peak values, not the silent moments) + if (val < 0.5 * sqrt(RMSVolumeAccu * avgnorm)) + { + val = 0; + } + + // smooth amplitude envelope + envelopeAccu *= decay; + envelopeAccu += val; + out = (LONG_SAMPLETYPE)(envelopeAccu * norm); + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + // cut peaks (shouldn't be necessary though) + if (out > 32767) out = 32767; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + samples[i] = (SAMPLETYPE)out; + } +} + + + +void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples) +{ + SAMPLETYPE decimated[DECIMATED_BLOCK_SAMPLES]; + + // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration + while (numSamples > 0) + { + int block; + int decSamples; + + block = (numSamples > INPUT_BLOCK_SAMPLES) ? INPUT_BLOCK_SAMPLES : numSamples; + + // decimate. note that converts to mono at the same time + decSamples = decimate(decimated, samples, block); + samples += block * channels; + numSamples -= block; + + // envelope new samples and add them to buffer + calcEnvelope(decimated, decSamples); + buffer->putSamples(decimated, decSamples); + } + + // when the buffer has enought samples for processing... + if ((int)buffer->numSamples() > windowLen) + { + int processLength; + + // how many samples are processed + processLength = (int)buffer->numSamples() - windowLen; + + // ... calculate autocorrelations for oldest samples... + updateXCorr(processLength); + // ... and remove them from the buffer + buffer->receiveSamples(processLength); + } +} + + + +void BPMDetect::removeBias() +{ + int i; + float minval = 1e12f; // arbitrary large number + + for (i = windowStart; i < windowLen; i ++) + { + if (xcorr[i] < minval) + { + minval = xcorr[i]; + } + } + + for (i = windowStart; i < windowLen; i ++) + { + xcorr[i] -= minval; + } +} + + +float BPMDetect::getBpm() +{ + double peakPos; + double coeff; + PeakFinder peakFinder; + + coeff = 60.0 * ((double)sampleRate / (double)decimateBy); + + // save bpm debug analysis data if debug data enabled + _SaveDebugData(xcorr, windowStart, windowLen, coeff); + + // remove bias from xcorr data + removeBias(); + + // find peak position + peakPos = peakFinder.detectPeak(xcorr, windowStart, windowLen); + + assert(decimateBy != 0); + if (peakPos < 1e-9) return 0.0; // detection failed. + + // calculate BPM + return (float) (coeff / peakPos); +} diff --git a/Externals/SoundTouch/BPMDetect.h b/Externals/SoundTouch/BPMDetect.h new file mode 100644 index 0000000000..72489894bd --- /dev/null +++ b/Externals/SoundTouch/BPMDetect.h @@ -0,0 +1,164 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Beats-per-minute (BPM) detection routine. +/// +/// The beat detection algorithm works as follows: +/// - Use function 'inputSamples' to input a chunks of samples to the class for +/// analysis. It's a good idea to enter a large sound file or stream in smallish +/// chunks of around few kilosamples in order not to extinguish too much RAM memory. +/// - Input sound data is decimated to approx 500 Hz to reduce calculation burden, +/// which is basically ok as low (bass) frequencies mostly determine the beat rate. +/// Simple averaging is used for anti-alias filtering because the resulting signal +/// quality isn't of that high importance. +/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by +/// taking absolute value that's smoothed by sliding average. Signal levels that +/// are below a couple of times the general RMS amplitude level are cut away to +/// leave only notable peaks there. +/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term +/// autocorrelation function of the enveloped signal. +/// - After whole sound data file has been analyzed as above, the bpm level is +/// detected by function 'getBpm' that finds the highest peak of the autocorrelation +/// function, calculates it's precise location and converts this reading to bpm's. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-08-30 22:53:44 +0300 (Thu, 30 Aug 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: BPMDetect.h 150 2012-08-30 19:53:44Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _BPMDetect_H_ +#define _BPMDetect_H_ + +#include "STTypes.h" +#include "FIFOSampleBuffer.h" + +namespace soundtouch +{ + +/// Minimum allowed BPM rate. Used to restrict accepted result above a reasonable limit. +#define MIN_BPM 29 + +/// Maximum allowed BPM rate. Used to restrict accepted result below a reasonable limit. +#define MAX_BPM 200 + + +/// Class for calculating BPM rate for audio data. +class BPMDetect +{ +protected: + /// Auto-correlation accumulator bins. + float *xcorr; + + /// Amplitude envelope sliding average approximation level accumulator + double envelopeAccu; + + /// RMS volume sliding average approximation level accumulator + double RMSVolumeAccu; + + /// Sample average counter. + int decimateCount; + + /// Sample average accumulator for FIFO-like decimation. + soundtouch::LONG_SAMPLETYPE decimateSum; + + /// Decimate sound by this coefficient to reach approx. 500 Hz. + int decimateBy; + + /// Auto-correlation window length + int windowLen; + + /// Number of channels (1 = mono, 2 = stereo) + int channels; + + /// sample rate + int sampleRate; + + /// Beginning of auto-correlation window: Autocorrelation isn't being updated for + /// the first these many correlation bins. + int windowStart; + + /// FIFO-buffer for decimated processing samples. + soundtouch::FIFOSampleBuffer *buffer; + + /// Updates auto-correlation function for given number of decimated samples that + /// are read from the internal 'buffer' pipe (samples aren't removed from the pipe + /// though). + void updateXCorr(int process_samples /// How many samples are processed. + ); + + /// Decimates samples to approx. 500 Hz. + /// + /// \return Number of output samples. + int decimate(soundtouch::SAMPLETYPE *dest, ///< Destination buffer + const soundtouch::SAMPLETYPE *src, ///< Source sample buffer + int numsamples ///< Number of source samples. + ); + + /// Calculates amplitude envelope for the buffer of samples. + /// Result is output to 'samples'. + void calcEnvelope(soundtouch::SAMPLETYPE *samples, ///< Pointer to input/output data buffer + int numsamples ///< Number of samples in buffer + ); + + /// remove constant bias from xcorr data + void removeBias(); + +public: + /// Constructor. + BPMDetect(int numChannels, ///< Number of channels in sample data. + int sampleRate ///< Sample rate in Hz. + ); + + /// Destructor. + virtual ~BPMDetect(); + + /// Inputs a block of samples for analyzing: Envelopes the samples and then + /// updates the autocorrelation estimation. When whole song data has been input + /// in smaller blocks using this function, read the resulting bpm with 'getBpm' + /// function. + /// + /// Notice that data in 'samples' array can be disrupted in processing. + void inputSamples(const soundtouch::SAMPLETYPE *samples, ///< Pointer to input/working data buffer + int numSamples ///< Number of samples in buffer + ); + + + /// Analyzes the results and returns the BPM rate. Use this function to read result + /// after whole song data has been input to the class by consecutive calls of + /// 'inputSamples' function. + /// + /// \return Beats-per-minute rate, or zero if detection failed. + float getBpm(); +}; + +} + +#endif // _BPMDetect_H_ diff --git a/Externals/SoundTouch/CMakeLists.txt b/Externals/SoundTouch/CMakeLists.txt new file mode 100644 index 0000000000..a09aac1946 --- /dev/null +++ b/Externals/SoundTouch/CMakeLists.txt @@ -0,0 +1,15 @@ +set(SRCS + AAFilter.cpp + BPMDetect.cpp + cpu_detect_x86.cpp + FIFOSampleBuffer.cpp + FIRFilter.cpp + mmx_optimized.cpp + PeakFinder.cpp + RateTransposer.cpp + SoundTouch.cpp + sse_optimized.cpp + TDStretch.cpp + ) + +add_library(SoundTouch STATIC ${SRCS}) diff --git a/Externals/SoundTouch/FIFOSampleBuffer.cpp b/Externals/SoundTouch/FIFOSampleBuffer.cpp new file mode 100644 index 0000000000..7f088b80be --- /dev/null +++ b/Externals/SoundTouch/FIFOSampleBuffer.cpp @@ -0,0 +1,274 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A buffer class for temporarily storaging sound samples, operates as a +/// first-in-first-out pipe. +/// +/// Samples are added to the end of the sample buffer with the 'putSamples' +/// function, and are received from the beginning of the buffer by calling +/// the 'receiveSamples' function. The class automatically removes the +/// outputted samples from the buffer, as well as grows the buffer size +/// whenever necessary. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSampleBuffer.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include + +#include "FIFOSampleBuffer.h" + +using namespace soundtouch; + +// Constructor +FIFOSampleBuffer::FIFOSampleBuffer(int numChannels) +{ + assert(numChannels > 0); + sizeInBytes = 0; // reasonable initial value + buffer = NULL; + bufferUnaligned = NULL; + samplesInBuffer = 0; + bufferPos = 0; + channels = (uint)numChannels; + ensureCapacity(32); // allocate initial capacity +} + + +// destructor +FIFOSampleBuffer::~FIFOSampleBuffer() +{ + delete[] bufferUnaligned; + bufferUnaligned = NULL; + buffer = NULL; +} + + +// Sets number of channels, 1 = mono, 2 = stereo +void FIFOSampleBuffer::setChannels(int numChannels) +{ + uint usedBytes; + + assert(numChannels > 0); + usedBytes = channels * samplesInBuffer; + channels = (uint)numChannels; + samplesInBuffer = usedBytes / channels; +} + + +// if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and +// zeroes this pointer by copying samples from the 'bufferPos' pointer +// location on to the beginning of the buffer. +void FIFOSampleBuffer::rewind() +{ + if (buffer && bufferPos) + { + memmove(buffer, ptrBegin(), sizeof(SAMPLETYPE) * channels * samplesInBuffer); + bufferPos = 0; + } +} + + +// Adds 'numSamples' pcs of samples from the 'samples' memory position to +// the sample buffer. +void FIFOSampleBuffer::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + memcpy(ptrEnd(nSamples), samples, sizeof(SAMPLETYPE) * nSamples * channels); + samplesInBuffer += nSamples; +} + + +// Increases the number of samples in the buffer without copying any actual +// samples. +// +// This function is used to update the number of samples in the sample buffer +// when accessing the buffer directly with 'ptrEnd' function. Please be +// careful though! +void FIFOSampleBuffer::putSamples(uint nSamples) +{ + uint req; + + req = samplesInBuffer + nSamples; + ensureCapacity(req); + samplesInBuffer += nSamples; +} + + +// Returns a pointer to the end of the used part of the sample buffer (i.e. +// where the new samples are to be inserted). This function may be used for +// inserting new samples into the sample buffer directly. Please be careful! +// +// Parameter 'slackCapacity' tells the function how much free capacity (in +// terms of samples) there _at least_ should be, in order to the caller to +// succesfully insert all the required samples to the buffer. When necessary, +// the function grows the buffer size to comply with this requirement. +// +// When using this function as means for inserting new samples, also remember +// to increase the sample count afterwards, by calling the +// 'putSamples(numSamples)' function. +SAMPLETYPE *FIFOSampleBuffer::ptrEnd(uint slackCapacity) +{ + ensureCapacity(samplesInBuffer + slackCapacity); + return buffer + samplesInBuffer * channels; +} + + +// Returns a pointer to the beginning of the currently non-outputted samples. +// This function is provided for accessing the output samples directly. +// Please be careful! +// +// When using this function to output samples, also remember to 'remove' the +// outputted samples from the buffer by calling the +// 'receiveSamples(numSamples)' function +SAMPLETYPE *FIFOSampleBuffer::ptrBegin() +{ + assert(buffer); + return buffer + bufferPos * channels; +} + + +// Ensures that the buffer has enought capacity, i.e. space for _at least_ +// 'capacityRequirement' number of samples. The buffer is grown in steps of +// 4 kilobytes to eliminate the need for frequently growing up the buffer, +// as well as to round the buffer size up to the virtual memory page size. +void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement) +{ + SAMPLETYPE *tempUnaligned, *temp; + + if (capacityRequirement > getCapacity()) + { + // enlarge the buffer in 4kbyte steps (round up to next 4k boundary) + sizeInBytes = (capacityRequirement * channels * sizeof(SAMPLETYPE) + 4095) & (uint)-4096; + assert(sizeInBytes % 2 == 0); + tempUnaligned = new SAMPLETYPE[sizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE)]; + if (tempUnaligned == NULL) + { + ST_THROW_RT_ERROR("Couldn't allocate memory!\n"); + } + // Align the buffer to begin at 16byte cache line boundary for optimal performance + temp = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(tempUnaligned); + if (samplesInBuffer) + { + memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE)); + } + delete[] bufferUnaligned; + buffer = temp; + bufferUnaligned = tempUnaligned; + bufferPos = 0; + } + else + { + // simply rewind the buffer (if necessary) + rewind(); + } +} + + +// Returns the current buffer capacity in terms of samples +uint FIFOSampleBuffer::getCapacity() const +{ + return sizeInBytes / (channels * sizeof(SAMPLETYPE)); +} + + +// Returns the number of samples currently in the buffer +uint FIFOSampleBuffer::numSamples() const +{ + return samplesInBuffer; +} + + +// Output samples from beginning of the sample buffer. Copies demanded number +// of samples to output and removes them from the sample buffer. If there +// are less than 'numsample' samples in the buffer, returns all available. +// +// Returns number of samples copied. +uint FIFOSampleBuffer::receiveSamples(SAMPLETYPE *output, uint maxSamples) +{ + uint num; + + num = (maxSamples > samplesInBuffer) ? samplesInBuffer : maxSamples; + + memcpy(output, ptrBegin(), channels * sizeof(SAMPLETYPE) * num); + return receiveSamples(num); +} + + +// Removes samples from the beginning of the sample buffer without copying them +// anywhere. Used to reduce the number of samples in the buffer, when accessing +// the sample buffer with the 'ptrBegin' function. +uint FIFOSampleBuffer::receiveSamples(uint maxSamples) +{ + if (maxSamples >= samplesInBuffer) + { + uint temp; + + temp = samplesInBuffer; + samplesInBuffer = 0; + return temp; + } + + samplesInBuffer -= maxSamples; + bufferPos += maxSamples; + + return maxSamples; +} + + +// Returns nonzero if the sample buffer is empty +int FIFOSampleBuffer::isEmpty() const +{ + return (samplesInBuffer == 0) ? 1 : 0; +} + + +// Clears the sample buffer +void FIFOSampleBuffer::clear() +{ + samplesInBuffer = 0; + bufferPos = 0; +} + + +/// allow trimming (downwards) amount of samples in pipeline. +/// Returns adjusted amount of samples +uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples) +{ + if (numSamples < samplesInBuffer) + { + samplesInBuffer = numSamples; + } + return samplesInBuffer; +} + diff --git a/Externals/SoundTouch/FIFOSampleBuffer.h b/Externals/SoundTouch/FIFOSampleBuffer.h new file mode 100644 index 0000000000..3789b4d307 --- /dev/null +++ b/Externals/SoundTouch/FIFOSampleBuffer.h @@ -0,0 +1,178 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A buffer class for temporarily storaging sound samples, operates as a +/// first-in-first-out pipe. +/// +/// Samples are added to the end of the sample buffer with the 'putSamples' +/// function, and are received from the beginning of the buffer by calling +/// the 'receiveSamples' function. The class automatically removes the +/// output samples from the buffer as well as grows the storage size +/// whenever necessary. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSampleBuffer.h 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIFOSampleBuffer_H +#define FIFOSampleBuffer_H + +#include "FIFOSamplePipe.h" + +namespace soundtouch +{ + +/// Sample buffer working in FIFO (first-in-first-out) principle. The class takes +/// care of storage size adjustment and data moving during input/output operations. +/// +/// Notice that in case of stereo audio, one sample is considered to consist of +/// both channel data. +class FIFOSampleBuffer : public FIFOSamplePipe +{ +private: + /// Sample buffer. + SAMPLETYPE *buffer; + + // Raw unaligned buffer memory. 'buffer' is made aligned by pointing it to first + // 16-byte aligned location of this buffer + SAMPLETYPE *bufferUnaligned; + + /// Sample buffer size in bytes + uint sizeInBytes; + + /// How many samples are currently in buffer. + uint samplesInBuffer; + + /// Channels, 1=mono, 2=stereo. + uint channels; + + /// Current position pointer to the buffer. This pointer is increased when samples are + /// removed from the pipe so that it's necessary to actually rewind buffer (move data) + /// only new data when is put to the pipe. + uint bufferPos; + + /// Rewind the buffer by moving data from position pointed by 'bufferPos' to real + /// beginning of the buffer. + void rewind(); + + /// Ensures that the buffer has capacity for at least this many samples. + void ensureCapacity(uint capacityRequirement); + + /// Returns current capacity. + uint getCapacity() const; + +public: + + /// Constructor + FIFOSampleBuffer(int numChannels = 2 ///< Number of channels, 1=mono, 2=stereo. + ///< Default is stereo. + ); + + /// destructor + ~FIFOSampleBuffer(); + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin(); + + /// Returns a pointer to the end of the used part of the sample buffer (i.e. + /// where the new samples are to be inserted). This function may be used for + /// inserting new samples into the sample buffer directly. Please be careful + /// not corrupt the book-keeping! + /// + /// When using this function as means for inserting new samples, also remember + /// to increase the sample count afterwards, by calling the + /// 'putSamples(numSamples)' function. + SAMPLETYPE *ptrEnd( + uint slackCapacity ///< How much free capacity (in samples) there _at least_ + ///< should be so that the caller can succesfully insert the + ///< desired samples to the buffer. If necessary, the function + ///< grows the buffer size to comply with this requirement. + ); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position to + /// the sample buffer. + virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples. + uint numSamples ///< Number of samples to insert. + ); + + /// Adjusts the book-keeping to increase number of samples in the buffer without + /// copying any actual samples. + /// + /// This function is used to update the number of samples in the sample buffer + /// when accessing the buffer directly with 'ptrEnd' function. Please be + /// careful though! + virtual void putSamples(uint numSamples ///< Number of samples been inserted. + ); + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ); + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ); + + /// Returns number of samples currently available. + virtual uint numSamples() const; + + /// Sets number of channels, 1 = mono, 2 = stereo. + void setChannels(int numChannels); + + /// Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const; + + /// Clears all the samples. + virtual void clear(); + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + uint adjustAmountOfSamples(uint numSamples); +}; + +} + +#endif diff --git a/Externals/SoundTouch/FIFOSamplePipe.h b/Externals/SoundTouch/FIFOSamplePipe.h new file mode 100644 index 0000000000..f26c57b0b2 --- /dev/null +++ b/Externals/SoundTouch/FIFOSamplePipe.h @@ -0,0 +1,234 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound +/// samples by operating like a first-in-first-out pipe: New samples are fed +/// into one end of the pipe with the 'putSamples' function, and the processed +/// samples are received from the other end with the 'receiveSamples' function. +/// +/// 'FIFOProcessor' : A base class for classes the do signal processing with +/// the samples while operating like a first-in-first-out pipe. When samples +/// are input with the 'putSamples' function, the class processes them +/// and moves the processed samples to the given 'output' pipe object, which +/// may be either another processing stage, or a fifo sample buffer object. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIFOSamplePipe_H +#define FIFOSamplePipe_H + +#include +#include +#include "STTypes.h" + +namespace soundtouch +{ + +/// Abstract base class for FIFO (first-in-first-out) sample processing classes. +class FIFOSamplePipe +{ +public: + // virtual default destructor + virtual ~FIFOSamplePipe() {} + + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin() = 0; + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position to + /// the sample buffer. + virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples. + uint numSamples ///< Number of samples to insert. + ) = 0; + + + // Moves samples from the 'other' pipe instance to this instance. + void moveSamples(FIFOSamplePipe &other ///< Other pipe instance where from the receive the data. + ) + { + int oNumSamples = other.numSamples(); + + putSamples(other.ptrBegin(), oNumSamples); + other.receiveSamples(oNumSamples); + }; + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ) = 0; + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ) = 0; + + /// Returns number of samples currently available. + virtual uint numSamples() const = 0; + + // Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const = 0; + + /// Clears all the samples. + virtual void clear() = 0; + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + virtual uint adjustAmountOfSamples(uint numSamples) = 0; + +}; + + + +/// Base-class for sound processing routines working in FIFO principle. With this base +/// class it's easy to implement sound processing stages that can be chained together, +/// so that samples that are fed into beginning of the pipe automatically go through +/// all the processing stages. +/// +/// When samples are input to this class, they're first processed and then put to +/// the FIFO pipe that's defined as output of this class. This output pipe can be +/// either other processing stage or a FIFO sample buffer. +class FIFOProcessor :public FIFOSamplePipe +{ +protected: + /// Internal pipe where processed samples are put. + FIFOSamplePipe *output; + + /// Sets output pipe. + void setOutPipe(FIFOSamplePipe *pOutput) + { + assert(output == NULL); + assert(pOutput != NULL); + output = pOutput; + } + + + /// Constructor. Doesn't define output pipe; it has to be set be + /// 'setOutPipe' function. + FIFOProcessor() + { + output = NULL; + } + + + /// Constructor. Configures output pipe. + FIFOProcessor(FIFOSamplePipe *pOutput ///< Output pipe. + ) + { + output = pOutput; + } + + + /// Destructor. + virtual ~FIFOProcessor() + { + } + + + /// Returns a pointer to the beginning of the output samples. + /// This function is provided for accessing the output samples directly. + /// Please be careful for not to corrupt the book-keeping! + /// + /// When using this function to output samples, also remember to 'remove' the + /// output samples from the buffer by calling the + /// 'receiveSamples(numSamples)' function + virtual SAMPLETYPE *ptrBegin() + { + return output->ptrBegin(); + } + +public: + + /// Output samples from beginning of the sample buffer. Copies requested samples to + /// output buffer and removes them from the sample buffer. If there are less than + /// 'numsample' samples in the buffer, returns all that available. + /// + /// \return Number of samples returned. + virtual uint receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples. + uint maxSamples ///< How many samples to receive at max. + ) + { + return output->receiveSamples(outBuffer, maxSamples); + } + + + /// Adjusts book-keeping so that given number of samples are removed from beginning of the + /// sample buffer without copying them anywhere. + /// + /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly + /// with 'ptrBegin' function. + virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe. + ) + { + return output->receiveSamples(maxSamples); + } + + + /// Returns number of samples currently available. + virtual uint numSamples() const + { + return output->numSamples(); + } + + + /// Returns nonzero if there aren't any samples available for outputting. + virtual int isEmpty() const + { + return output->isEmpty(); + } + + /// allow trimming (downwards) amount of samples in pipeline. + /// Returns adjusted amount of samples + virtual uint adjustAmountOfSamples(uint numSamples) + { + return output->adjustAmountOfSamples(numSamples); + } + +}; + +} + +#endif diff --git a/Externals/SoundTouch/FIRFilter.cpp b/Externals/SoundTouch/FIRFilter.cpp new file mode 100644 index 0000000000..1570516b77 --- /dev/null +++ b/Externals/SoundTouch/FIRFilter.cpp @@ -0,0 +1,259 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// General FIR digital filter routines with MMX optimization. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific file, +/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: FIRFilter.cpp 131 2011-09-02 18:56:11Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "FIRFilter.h" +#include "cpu_detect.h" + +using namespace soundtouch; + +/***************************************************************************** + * + * Implementation of the class 'FIRFilter' + * + *****************************************************************************/ + +FIRFilter::FIRFilter() +{ + resultDivFactor = 0; + resultDivider = 0; + length = 0; + lengthDiv8 = 0; + filterCoeffs = NULL; +} + + +FIRFilter::~FIRFilter() +{ + delete[] filterCoeffs; +} + +// Usual C-version of the filter routine for stereo sound +uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const +{ + uint i, j, end; + LONG_SAMPLETYPE suml, sumr; +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + // when using floating point samples, use a scaler instead of a divider + // because division is much slower operation than multiplying. + double dScaler = 1.0 / (double)resultDivider; +#endif + + assert(length != 0); + assert(src != NULL); + assert(dest != NULL); + assert(filterCoeffs != NULL); + + end = 2 * (numSamples - length); + + for (j = 0; j < end; j += 2) + { + const SAMPLETYPE *ptr; + + suml = sumr = 0; + ptr = src + j; + + for (i = 0; i < length; i += 4) + { + // loop is unrolled by factor of 4 here for efficiency + suml += ptr[2 * i + 0] * filterCoeffs[i + 0] + + ptr[2 * i + 2] * filterCoeffs[i + 1] + + ptr[2 * i + 4] * filterCoeffs[i + 2] + + ptr[2 * i + 6] * filterCoeffs[i + 3]; + sumr += ptr[2 * i + 1] * filterCoeffs[i + 0] + + ptr[2 * i + 3] * filterCoeffs[i + 1] + + ptr[2 * i + 5] * filterCoeffs[i + 2] + + ptr[2 * i + 7] * filterCoeffs[i + 3]; + } + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + suml >>= resultDivFactor; + sumr >>= resultDivFactor; + // saturate to 16 bit integer limits + suml = (suml < -32768) ? -32768 : (suml > 32767) ? 32767 : suml; + // saturate to 16 bit integer limits + sumr = (sumr < -32768) ? -32768 : (sumr > 32767) ? 32767 : sumr; +#else + suml *= dScaler; + sumr *= dScaler; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[j] = (SAMPLETYPE)suml; + dest[j + 1] = (SAMPLETYPE)sumr; + } + return numSamples - length; +} + + + + +// Usual C-version of the filter routine for mono sound +uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const +{ + uint i, j, end; + LONG_SAMPLETYPE sum; +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + // when using floating point samples, use a scaler instead of a divider + // because division is much slower operation than multiplying. + double dScaler = 1.0 / (double)resultDivider; +#endif + + + assert(length != 0); + + end = numSamples - length; + for (j = 0; j < end; j ++) + { + sum = 0; + for (i = 0; i < length; i += 4) + { + // loop is unrolled by factor of 4 here for efficiency + sum += src[i + 0] * filterCoeffs[i + 0] + + src[i + 1] * filterCoeffs[i + 1] + + src[i + 2] * filterCoeffs[i + 2] + + src[i + 3] * filterCoeffs[i + 3]; + } +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + sum >>= resultDivFactor; + // saturate to 16 bit integer limits + sum = (sum < -32768) ? -32768 : (sum > 32767) ? 32767 : sum; +#else + sum *= dScaler; +#endif // SOUNDTOUCH_INTEGER_SAMPLES + dest[j] = (SAMPLETYPE)sum; + src ++; + } + return end; +} + + +// Set filter coeffiecients and length. +// +// Throws an exception if filter length isn't divisible by 8 +void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor) +{ + assert(newLength > 0); + if (newLength % 8) ST_THROW_RT_ERROR("FIR filter length not divisible by 8"); + + lengthDiv8 = newLength / 8; + length = lengthDiv8 * 8; + assert(length == newLength); + + resultDivFactor = uResultDivFactor; + resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor); + + delete[] filterCoeffs; + filterCoeffs = new SAMPLETYPE[length]; + memcpy(filterCoeffs, coeffs, length * sizeof(SAMPLETYPE)); +} + + +uint FIRFilter::getLength() const +{ + return length; +} + + + +// Applies the filter to the given sequence of samples. +// +// Note : The amount of outputted samples is by value of 'filter_length' +// smaller than the amount of input samples. +uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const +{ + assert(numChannels == 1 || numChannels == 2); + + assert(length > 0); + assert(lengthDiv8 * 8 == length); + if (numSamples < length) return 0; + if (numChannels == 2) + { + return evaluateFilterStereo(dest, src, numSamples); + } else { + return evaluateFilterMono(dest, src, numSamples); + } +} + + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX-capable CPU available or not. +void * FIRFilter::operator new(size_t s) +{ + // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead! + ST_THROW_RT_ERROR("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!"); + return newInstance(); +} + + +FIRFilter * FIRFilter::newInstance() +{ + uint uExtensions; + + uExtensions = detectCPUextensions(); + + // Check if MMX/SSE instruction set extensions supported by CPU + +#ifdef SOUNDTOUCH_ALLOW_MMX + // MMX routines available only with integer sample types + if (uExtensions & SUPPORT_MMX) + { + return ::new FIRFilterMMX; + } + else +#endif // SOUNDTOUCH_ALLOW_MMX + +#ifdef SOUNDTOUCH_ALLOW_SSE + if (uExtensions & SUPPORT_SSE) + { + // SSE support + return ::new FIRFilterSSE; + } + else +#endif // SOUNDTOUCH_ALLOW_SSE + + { + // ISA optimizations not supported, use plain C version + return ::new FIRFilter; + } +} diff --git a/Externals/SoundTouch/FIRFilter.h b/Externals/SoundTouch/FIRFilter.h new file mode 100644 index 0000000000..e1563094af --- /dev/null +++ b/Externals/SoundTouch/FIRFilter.h @@ -0,0 +1,145 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// General FIR digital filter routines with MMX optimization. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific file, +/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-02-13 21:13:57 +0200 (Sun, 13 Feb 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: FIRFilter.h 104 2011-02-13 19:13:57Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef FIRFilter_H +#define FIRFilter_H + +#include +#include "STTypes.h" + +namespace soundtouch +{ + +class FIRFilter +{ +protected: + // Number of FIR filter taps + uint length; + // Number of FIR filter taps divided by 8 + uint lengthDiv8; + + // Result divider factor in 2^k format + uint resultDivFactor; + + // Result divider value. + SAMPLETYPE resultDivider; + + // Memory for filter coefficients + SAMPLETYPE *filterCoeffs; + + virtual uint evaluateFilterStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) const; + virtual uint evaluateFilterMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) const; + +public: + FIRFilter(); + virtual ~FIRFilter(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we've a MMX-capable CPU available or not. + static void * operator new(size_t s); + + static FIRFilter *newInstance(); + + /// Applies the filter to the given sequence of samples. + /// Note : The amount of outputted samples is by value of 'filter_length' + /// smaller than the amount of input samples. + /// + /// \return Number of samples copied to 'dest'. + uint evaluate(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples, + uint numChannels) const; + + uint getLength() const; + + virtual void setCoefficients(const SAMPLETYPE *coeffs, + uint newLength, + uint uResultDivFactor); +}; + + +// Optional subclasses that implement CPU-specific optimizations: + +#ifdef SOUNDTOUCH_ALLOW_MMX + +/// Class that implements MMX optimized functions exclusive for 16bit integer samples type. + class FIRFilterMMX : public FIRFilter + { + protected: + short *filterCoeffsUnalign; + short *filterCoeffsAlign; + + virtual uint evaluateFilterStereo(short *dest, const short *src, uint numSamples) const; + public: + FIRFilterMMX(); + ~FIRFilterMMX(); + + virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor); + }; + +#endif // SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + /// Class that implements SSE optimized functions exclusive for floating point samples type. + class FIRFilterSSE : public FIRFilter + { + protected: + float *filterCoeffsUnalign; + float *filterCoeffsAlign; + + virtual uint evaluateFilterStereo(float *dest, const float *src, uint numSamples) const; + public: + FIRFilterSSE(); + ~FIRFilterSSE(); + + virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor); + }; + +#endif // SOUNDTOUCH_ALLOW_SSE + +} + +#endif // FIRFilter_H diff --git a/Externals/SoundTouch/PeakFinder.cpp b/Externals/SoundTouch/PeakFinder.cpp new file mode 100644 index 0000000000..47ed27cb50 --- /dev/null +++ b/Externals/SoundTouch/PeakFinder.cpp @@ -0,0 +1,276 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Peak detection routine. +/// +/// The routine detects highest value on an array of values and calculates the +/// precise peak location as a mass-center of the 'hump' around the peak value. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 21:52:47 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: PeakFinder.cpp 164 2012-12-28 19:52:47Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include + +#include "PeakFinder.h" + +using namespace soundtouch; + +#define max(x, y) (((x) > (y)) ? (x) : (y)) + + +PeakFinder::PeakFinder() +{ + minPos = maxPos = 0; +} + + +// Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'. +int PeakFinder::findTop(const float *data, int peakpos) const +{ + int i; + int start, end; + float refvalue; + + refvalue = data[peakpos]; + + // seek within ±10 points + start = peakpos - 10; + if (start < minPos) start = minPos; + end = peakpos + 10; + if (end > maxPos) end = maxPos; + + for (i = start; i <= end; i ++) + { + if (data[i] > refvalue) + { + peakpos = i; + refvalue = data[i]; + } + } + + // failure if max value is at edges of seek range => it's not peak, it's at slope. + if ((peakpos == start) || (peakpos == end)) return 0; + + return peakpos; +} + + +// Finds 'ground level' of a peak hump by starting from 'peakpos' and proceeding +// to direction defined by 'direction' until next 'hump' after minimum value will +// begin +int PeakFinder::findGround(const float *data, int peakpos, int direction) const +{ + int lowpos; + int pos; + int climb_count; + float refvalue; + float delta; + + climb_count = 0; + refvalue = data[peakpos]; + lowpos = peakpos; + + pos = peakpos; + + while ((pos > minPos+1) && (pos < maxPos-1)) + { + int prevpos; + + prevpos = pos; + pos += direction; + + // calculate derivate + delta = data[pos] - data[prevpos]; + if (delta <= 0) + { + // going downhill, ok + if (climb_count) + { + climb_count --; // decrease climb count + } + + // check if new minimum found + if (data[pos] < refvalue) + { + // new minimum found + lowpos = pos; + refvalue = data[pos]; + } + } + else + { + // going uphill, increase climbing counter + climb_count ++; + if (climb_count > 5) break; // we've been climbing too long => it's next uphill => quit + } + } + return lowpos; +} + + +// Find offset where the value crosses the given level, when starting from 'peakpos' and +// proceeds to direction defined in 'direction' +int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, int direction) const +{ + float peaklevel; + int pos; + + peaklevel = data[peakpos]; + assert(peaklevel >= level); + pos = peakpos; + while ((pos >= minPos) && (pos < maxPos)) + { + if (data[pos + direction] < level) return pos; // crossing found + pos += direction; + } + return -1; // not found +} + + +// Calculates the center of mass location of 'data' array items between 'firstPos' and 'lastPos' +double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos) const +{ + int i; + float sum; + float wsum; + + sum = 0; + wsum = 0; + for (i = firstPos; i <= lastPos; i ++) + { + sum += (float)i * data[i]; + wsum += data[i]; + } + + if (wsum < 1e-6) return 0; + return sum / wsum; +} + + + +/// get exact center of peak near given position by calculating local mass of center +double PeakFinder::getPeakCenter(const float *data, int peakpos) const +{ + float peakLevel; // peak level + int crosspos1, crosspos2; // position where the peak 'hump' crosses cutting level + float cutLevel; // cutting value + float groundLevel; // ground level of the peak + int gp1, gp2; // bottom positions of the peak 'hump' + + // find ground positions. + gp1 = findGround(data, peakpos, -1); + gp2 = findGround(data, peakpos, 1); + + groundLevel = 0.5f * (data[gp1] + data[gp2]); + peakLevel = data[peakpos]; + + // calculate 70%-level of the peak + cutLevel = 0.70f * peakLevel + 0.30f * groundLevel; + // find mid-level crossings + crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1); + crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1); + + if ((crosspos1 < 0) || (crosspos2 < 0)) return 0; // no crossing, no peak.. + + // calculate mass center of the peak surroundings + return calcMassCenter(data, crosspos1, crosspos2); +} + + + +double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) +{ + + int i; + int peakpos; // position of peak level + double highPeak, peak; + + this->minPos = aminPos; + this->maxPos = amaxPos; + + // find absolute peak + peakpos = minPos; + peak = data[minPos]; + for (i = minPos + 1; i < maxPos; i ++) + { + if (data[i] > peak) + { + peak = data[i]; + peakpos = i; + } + } + + // Calculate exact location of the highest peak mass center + highPeak = getPeakCenter(data, peakpos); + peak = highPeak; + + // Now check if the highest peak were in fact harmonic of the true base beat peak + // - sometimes the highest peak can be Nth harmonic of the true base peak yet + // just a slightly higher than the true base + + for (i = 3; i < 10; i ++) + { + double peaktmp, harmonic; + int i1,i2; + + harmonic = (double)i * 0.5; + peakpos = (int)(highPeak / harmonic + 0.5f); + if (peakpos < minPos) break; + peakpos = findTop(data, peakpos); // seek true local maximum index + if (peakpos == 0) continue; // no local max here + + // calculate mass-center of possible harmonic peak + peaktmp = getPeakCenter(data, peakpos); + + // accept harmonic peak if + // (a) it is found + // (b) is within ±4% of the expected harmonic interval + // (c) has at least half x-corr value of the max. peak + + double diff = harmonic * peaktmp / highPeak; + if ((diff < 0.96) || (diff > 1.04)) continue; // peak too afar from expected + + // now compare to highest detected peak + i1 = (int)(highPeak + 0.5); + i2 = (int)(peaktmp + 0.5); + if (data[i2] >= 0.4*data[i1]) + { + // The harmonic is at least half as high primary peak, + // thus use the harmonic peak instead + peak = peaktmp; + } + } + + return peak; +} diff --git a/Externals/SoundTouch/PeakFinder.h b/Externals/SoundTouch/PeakFinder.h new file mode 100644 index 0000000000..d170b1c58b --- /dev/null +++ b/Externals/SoundTouch/PeakFinder.h @@ -0,0 +1,97 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// The routine detects highest value on an array of values and calculates the +/// precise peak location as a mass-center of the 'hump' around the peak value. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-12-30 22:33:46 +0200 (Fri, 30 Dec 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: PeakFinder.h 132 2011-12-30 20:33:46Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _PeakFinder_H_ +#define _PeakFinder_H_ + +namespace soundtouch +{ + +class PeakFinder +{ +protected: + /// Min, max allowed peak positions within the data vector + int minPos, maxPos; + + /// Calculates the mass center between given vector items. + double calcMassCenter(const float *data, ///< Data vector. + int firstPos, ///< Index of first vector item beloging to the peak. + int lastPos ///< Index of last vector item beloging to the peak. + ) const; + + /// Finds the data vector index where the monotoniously decreasing signal crosses the + /// given level. + int findCrossingLevel(const float *data, ///< Data vector. + float level, ///< Goal crossing level. + int peakpos, ///< Peak position index within the data vector. + int direction /// Direction where to proceed from the peak: 1 = right, -1 = left. + ) const; + + // Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'. + int findTop(const float *data, int peakpos) const; + + + /// Finds the 'ground' level, i.e. smallest level between two neighbouring peaks, to right- + /// or left-hand side of the given peak position. + int findGround(const float *data, /// Data vector. + int peakpos, /// Peak position index within the data vector. + int direction /// Direction where to proceed from the peak: 1 = right, -1 = left. + ) const; + + /// get exact center of peak near given position by calculating local mass of center + double getPeakCenter(const float *data, int peakpos) const; + +public: + /// Constructor. + PeakFinder(); + + /// Detect exact peak position of the data vector by finding the largest peak 'hump' + /// and calculating the mass-center location of the peak hump. + /// + /// \return The location of the largest base harmonic peak hump. + double detectPeak(const float *data, /// Data vector to be analyzed. The data vector has + /// to be at least 'maxPos' items long. + int minPos, ///< Min allowed peak location within the vector data. + int maxPos ///< Max allowed peak location within the vector data. + ); +}; + +} + +#endif // _PeakFinder_H_ diff --git a/Externals/SoundTouch/RateTransposer.cpp b/Externals/SoundTouch/RateTransposer.cpp new file mode 100644 index 0000000000..3ad8d93e5c --- /dev/null +++ b/Externals/SoundTouch/RateTransposer.cpp @@ -0,0 +1,626 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sample rate transposer. Changes sample rate by using linear interpolation +/// together with anti-alias filtering (first order interpolation with anti- +/// alias filtering should be quite adequate for this application) +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $ +// File revision : $Revision: 4 $ +// +// $Id: RateTransposer.cpp 131 2011-09-02 18:56:11Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include "RateTransposer.h" +#include "AAFilter.h" + +using namespace soundtouch; + + +/// A linear samplerate transposer class that uses integer arithmetics. +/// for the transposing. +class RateTransposerInteger : public RateTransposer +{ +protected: + int iSlopeCount; + int iRate; + SAMPLETYPE sPrevSampleL, sPrevSampleR; + + virtual void resetRegisters(); + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + +public: + RateTransposerInteger(); + virtual ~RateTransposerInteger(); + + /// Sets new target rate. Normal rate = 1.0, smaller values represent slower + /// rate, larger faster rates. + virtual void setRate(float newRate); + +}; + + +/// A linear samplerate transposer class that uses floating point arithmetics +/// for the transposing. +class RateTransposerFloat : public RateTransposer +{ +protected: + float fSlopeCount; + SAMPLETYPE sPrevSampleL, sPrevSampleR; + + virtual void resetRegisters(); + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + +public: + RateTransposerFloat(); + virtual ~RateTransposerFloat(); +}; + + + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX/SSE/etc-capable CPU available or not. +void * RateTransposer::operator new(size_t s) +{ + ST_THROW_RT_ERROR("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!"); + return newInstance(); +} + + +RateTransposer *RateTransposer::newInstance() +{ +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + return ::new RateTransposerInteger; +#else + return ::new RateTransposerFloat; +#endif +} + + +// Constructor +RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer) +{ + numChannels = 2; + bUseAAFilter = TRUE; + fRate = 0; + + // Instantiates the anti-alias filter with default tap length + // of 32 + pAAFilter = new AAFilter(32); +} + + + +RateTransposer::~RateTransposer() +{ + delete pAAFilter; +} + + + +/// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable +void RateTransposer::enableAAFilter(BOOL newMode) +{ + bUseAAFilter = newMode; +} + + +/// Returns nonzero if anti-alias filter is enabled. +BOOL RateTransposer::isAAFilterEnabled() const +{ + return bUseAAFilter; +} + + +AAFilter *RateTransposer::getAAFilter() +{ + return pAAFilter; +} + + + +// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower +// iRate, larger faster iRates. +void RateTransposer::setRate(float newRate) +{ + double fCutoff; + + fRate = newRate; + + // design a new anti-alias filter + if (newRate > 1.0f) + { + fCutoff = 0.5f / newRate; + } + else + { + fCutoff = 0.5f * newRate; + } + pAAFilter->setCutoffFreq(fCutoff); +} + + +// Outputs as many samples of the 'outputBuffer' as possible, and if there's +// any room left, outputs also as many of the incoming samples as possible. +// The goal is to drive the outputBuffer empty. +// +// It's allowed for 'output' and 'input' parameters to point to the same +// memory position. +/* +void RateTransposer::flushStoreBuffer() +{ + if (storeBuffer.isEmpty()) return; + + outputBuffer.moveSamples(storeBuffer); +} +*/ + + +// Adds 'nSamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + processSamples(samples, nSamples); +} + + + +// Transposes up the sample rate, causing the observed playback 'rate' of the +// sound to decrease +void RateTransposer::upsample(const SAMPLETYPE *src, uint nSamples) +{ + uint count, sizeTemp, num; + + // If the parameter 'uRate' value is smaller than 'SCALE', first transpose + // the samples and then apply the anti-alias filter to remove aliasing. + + // First check that there's enough room in 'storeBuffer' + // (+16 is to reserve some slack in the destination buffer) + sizeTemp = (uint)((float)nSamples / fRate + 16.0f); + + // Transpose the samples, store the result into the end of "storeBuffer" + count = transpose(storeBuffer.ptrEnd(sizeTemp), src, nSamples); + storeBuffer.putSamples(count); + + // Apply the anti-alias filter to samples in "store output", output the + // result to "dest" + num = storeBuffer.numSamples(); + count = pAAFilter->evaluate(outputBuffer.ptrEnd(num), + storeBuffer.ptrBegin(), num, (uint)numChannels); + outputBuffer.putSamples(count); + + // Remove the processed samples from "storeBuffer" + storeBuffer.receiveSamples(count); +} + + +// Transposes down the sample rate, causing the observed playback 'rate' of the +// sound to increase +void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples) +{ + uint count, sizeTemp; + + // If the parameter 'uRate' value is larger than 'SCALE', first apply the + // anti-alias filter to remove high frequencies (prevent them from folding + // over the lover frequencies), then transpose. + + // Add the new samples to the end of the storeBuffer + storeBuffer.putSamples(src, nSamples); + + // Anti-alias filter the samples to prevent folding and output the filtered + // data to tempBuffer. Note : because of the FIR filter length, the + // filtering routine takes in 'filter_length' more samples than it outputs. + assert(tempBuffer.isEmpty()); + sizeTemp = storeBuffer.numSamples(); + + count = pAAFilter->evaluate(tempBuffer.ptrEnd(sizeTemp), + storeBuffer.ptrBegin(), sizeTemp, (uint)numChannels); + + if (count == 0) return; + + // Remove the filtered samples from 'storeBuffer' + storeBuffer.receiveSamples(count); + + // Transpose the samples (+16 is to reserve some slack in the destination buffer) + sizeTemp = (uint)((float)nSamples / fRate + 16.0f); + count = transpose(outputBuffer.ptrEnd(sizeTemp), tempBuffer.ptrBegin(), count); + outputBuffer.putSamples(count); +} + + +// Transposes sample rate by applying anti-alias filter to prevent folding. +// Returns amount of samples returned in the "dest" buffer. +// The maximum amount of samples that can be returned at a time is set by +// the 'set_returnBuffer_size' function. +void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples) +{ + uint count; + uint sizeReq; + + if (nSamples == 0) return; + assert(pAAFilter); + + // If anti-alias filter is turned off, simply transpose without applying + // the filter + if (bUseAAFilter == FALSE) + { + sizeReq = (uint)((float)nSamples / fRate + 1.0f); + count = transpose(outputBuffer.ptrEnd(sizeReq), src, nSamples); + outputBuffer.putSamples(count); + return; + } + + // Transpose with anti-alias filter + if (fRate < 1.0f) + { + upsample(src, nSamples); + } + else + { + downsample(src, nSamples); + } +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// Returns the number of samples returned in the "dest" buffer +inline uint RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + if (numChannels == 2) + { + return transposeStereo(dest, src, nSamples); + } + else + { + return transposeMono(dest, src, nSamples); + } +} + + +// Sets the number of channels, 1 = mono, 2 = stereo +void RateTransposer::setChannels(int nChannels) +{ + assert(nChannels > 0); + if (numChannels == nChannels) return; + + assert(nChannels == 1 || nChannels == 2); + numChannels = nChannels; + + storeBuffer.setChannels(numChannels); + tempBuffer.setChannels(numChannels); + outputBuffer.setChannels(numChannels); + + // Inits the linear interpolation registers + resetRegisters(); +} + + +// Clears all the samples in the object +void RateTransposer::clear() +{ + outputBuffer.clear(); + storeBuffer.clear(); +} + + +// Returns nonzero if there aren't any samples available for outputting. +int RateTransposer::isEmpty() const +{ + int res; + + res = FIFOProcessor::isEmpty(); + if (res == 0) return 0; + return storeBuffer.isEmpty(); +} + + +////////////////////////////////////////////////////////////////////////////// +// +// RateTransposerInteger - integer arithmetic implementation +// + +/// fixed-point interpolation routine precision +#define SCALE 65536 + +// Constructor +RateTransposerInteger::RateTransposerInteger() : RateTransposer() +{ + // Notice: use local function calling syntax for sake of clarity, + // to indicate the fact that C++ constructor can't call virtual functions. + RateTransposerInteger::resetRegisters(); + RateTransposerInteger::setRate(1.0f); +} + + +RateTransposerInteger::~RateTransposerInteger() +{ +} + + +void RateTransposerInteger::resetRegisters() +{ + iSlopeCount = 0; + sPrevSampleL = + sPrevSampleR = 0; +} + + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int i, used; + LONG_SAMPLETYPE temp, vol1; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the previous call first... + while (iSlopeCount <= SCALE) + { + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = vol1 * sPrevSampleL + iSlopeCount * src[0]; + dest[i] = (SAMPLETYPE)(temp / SCALE); + i++; + iSlopeCount += iRate; + } + // now always (iSlopeCount > SCALE) + iSlopeCount -= SCALE; + + while (1) + { + while (iSlopeCount > SCALE) + { + iSlopeCount -= SCALE; + used ++; + if (used >= nSamples - 1) goto end; + } + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = src[used] * vol1 + iSlopeCount * src[used + 1]; + dest[i] = (SAMPLETYPE)(temp / SCALE); + + i++; + iSlopeCount += iRate; + } +end: + // Store the last sample for the next round + sPrevSampleL = src[nSamples - 1]; + + return i; +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Stereo' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int srcPos, i, used; + LONG_SAMPLETYPE temp, vol1; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the sPrevSampleLious call first... + while (iSlopeCount <= SCALE) + { + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = vol1 * sPrevSampleL + iSlopeCount * src[0]; + dest[2 * i] = (SAMPLETYPE)(temp / SCALE); + temp = vol1 * sPrevSampleR + iSlopeCount * src[1]; + dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE); + i++; + iSlopeCount += iRate; + } + // now always (iSlopeCount > SCALE) + iSlopeCount -= SCALE; + + while (1) + { + while (iSlopeCount > SCALE) + { + iSlopeCount -= SCALE; + used ++; + if (used >= nSamples - 1) goto end; + } + srcPos = 2 * used; + vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount); + temp = src[srcPos] * vol1 + iSlopeCount * src[srcPos + 2]; + dest[2 * i] = (SAMPLETYPE)(temp / SCALE); + temp = src[srcPos + 1] * vol1 + iSlopeCount * src[srcPos + 3]; + dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE); + + i++; + iSlopeCount += iRate; + } +end: + // Store the last sample for the next round + sPrevSampleL = src[2 * nSamples - 2]; + sPrevSampleR = src[2 * nSamples - 1]; + + return i; +} + + +// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower +// iRate, larger faster iRates. +void RateTransposerInteger::setRate(float newRate) +{ + iRate = (int)(newRate * SCALE + 0.5f); + RateTransposer::setRate(newRate); +} + + +////////////////////////////////////////////////////////////////////////////// +// +// RateTransposerFloat - floating point arithmetic implementation +// +////////////////////////////////////////////////////////////////////////////// + +// Constructor +RateTransposerFloat::RateTransposerFloat() : RateTransposer() +{ + // Notice: use local function calling syntax for sake of clarity, + // to indicate the fact that C++ constructor can't call virtual functions. + RateTransposerFloat::resetRegisters(); + RateTransposerFloat::setRate(1.0f); +} + + +RateTransposerFloat::~RateTransposerFloat() +{ +} + + +void RateTransposerFloat::resetRegisters() +{ + fSlopeCount = 0; + sPrevSampleL = + sPrevSampleR = 0; +} + + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int i, used; + + used = 0; + i = 0; + + // Process the last sample saved from the previous call first... + while (fSlopeCount <= 1.0f) + { + dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]); + i++; + fSlopeCount += fRate; + } + fSlopeCount -= 1.0f; + + if (nSamples > 1) + { + while (1) + { + while (fSlopeCount > 1.0f) + { + fSlopeCount -= 1.0f; + used ++; + if (used >= nSamples - 1) goto end; + } + dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[used] + fSlopeCount * src[used + 1]); + i++; + fSlopeCount += fRate; + } + } +end: + // Store the last sample for the next round + sPrevSampleL = src[nSamples - 1]; + + return i; +} + + +// Transposes the sample rate of the given samples using linear interpolation. +// 'Mono' version of the routine. Returns the number of samples returned in +// the "dest" buffer +uint RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) +{ + unsigned int srcPos, i, used; + + if (nSamples == 0) return 0; // no samples, no work + + used = 0; + i = 0; + + // Process the last sample saved from the sPrevSampleLious call first... + while (fSlopeCount <= 1.0f) + { + dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]); + dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleR + fSlopeCount * src[1]); + i++; + fSlopeCount += fRate; + } + // now always (iSlopeCount > 1.0f) + fSlopeCount -= 1.0f; + + if (nSamples > 1) + { + while (1) + { + while (fSlopeCount > 1.0f) + { + fSlopeCount -= 1.0f; + used ++; + if (used >= nSamples - 1) goto end; + } + srcPos = 2 * used; + + dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos] + + fSlopeCount * src[srcPos + 2]); + dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos + 1] + + fSlopeCount * src[srcPos + 3]); + + i++; + fSlopeCount += fRate; + } + } +end: + // Store the last sample for the next round + sPrevSampleL = src[2 * nSamples - 2]; + sPrevSampleR = src[2 * nSamples - 1]; + + return i; +} diff --git a/Externals/SoundTouch/RateTransposer.h b/Externals/SoundTouch/RateTransposer.h new file mode 100644 index 0000000000..48f7bed5c2 --- /dev/null +++ b/Externals/SoundTouch/RateTransposer.h @@ -0,0 +1,159 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sample rate transposer. Changes sample rate by using linear interpolation +/// together with anti-alias filtering (first order interpolation with anti- +/// alias filtering should be quite adequate for this application). +/// +/// Use either of the derived classes of 'RateTransposerInteger' or +/// 'RateTransposerFloat' for corresponding integer/floating point tranposing +/// algorithm implementation. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $ +// File revision : $Revision: 4 $ +// +// $Id: RateTransposer.h 63 2009-02-21 16:00:14Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef RateTransposer_H +#define RateTransposer_H + +#include +#include "AAFilter.h" +#include "FIFOSamplePipe.h" +#include "FIFOSampleBuffer.h" + +#include "STTypes.h" + +namespace soundtouch +{ + +/// A common linear samplerate transposer class. +/// +/// Note: Use function "RateTransposer::newInstance()" to create a new class +/// instance instead of the "new" operator; that function automatically +/// chooses a correct implementation depending on if integer or floating +/// arithmetics are to be used. +class RateTransposer : public FIFOProcessor +{ +protected: + /// Anti-alias filter object + AAFilter *pAAFilter; + + float fRate; + + int numChannels; + + /// Buffer for collecting samples to feed the anti-alias filter between + /// two batches + FIFOSampleBuffer storeBuffer; + + /// Buffer for keeping samples between transposing & anti-alias filter + FIFOSampleBuffer tempBuffer; + + /// Output sample buffer + FIFOSampleBuffer outputBuffer; + + BOOL bUseAAFilter; + + virtual void resetRegisters() = 0; + + virtual uint transposeStereo(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) = 0; + virtual uint transposeMono(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples) = 0; + inline uint transpose(SAMPLETYPE *dest, + const SAMPLETYPE *src, + uint numSamples); + + void downsample(const SAMPLETYPE *src, + uint numSamples); + void upsample(const SAMPLETYPE *src, + uint numSamples); + + /// Transposes sample rate by applying anti-alias filter to prevent folding. + /// Returns amount of samples returned in the "dest" buffer. + /// The maximum amount of samples that can be returned at a time is set by + /// the 'set_returnBuffer_size' function. + void processSamples(const SAMPLETYPE *src, + uint numSamples); + + +public: + RateTransposer(); + virtual ~RateTransposer(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we're to use integer or floating point arithmetics. + static void *operator new(size_t s); + + /// Use this function instead of "new" operator to create a new instance of this class. + /// This function automatically chooses a correct implementation, depending on if + /// integer ot floating point arithmetics are to be used. + static RateTransposer *newInstance(); + + /// Returns the output buffer object + FIFOSamplePipe *getOutput() { return &outputBuffer; }; + + /// Returns the store buffer object + FIFOSamplePipe *getStore() { return &storeBuffer; }; + + /// Return anti-alias filter object + AAFilter *getAAFilter(); + + /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable + void enableAAFilter(BOOL newMode); + + /// Returns nonzero if anti-alias filter is enabled. + BOOL isAAFilterEnabled() const; + + /// Sets new target rate. Normal rate = 1.0, smaller values represent slower + /// rate, larger faster rates. + virtual void setRate(float newRate); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(int channels); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position into + /// the input of the object. + void putSamples(const SAMPLETYPE *samples, uint numSamples); + + /// Clears all the samples in the object + void clear(); + + /// Returns nonzero if there aren't any samples available for outputting. + int isEmpty() const; +}; + +} + +#endif diff --git a/Externals/SoundTouch/STTypes.h b/Externals/SoundTouch/STTypes.h new file mode 100644 index 0000000000..24828f3295 --- /dev/null +++ b/Externals/SoundTouch/STTypes.h @@ -0,0 +1,189 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Common type definitions for SoundTouch audio processing library. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 16:53:56 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 3 $ +// +// $Id: STTypes.h 162 2012-12-28 14:53:56Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef STTypes_H +#define STTypes_H + +typedef unsigned int uint; +typedef unsigned long ulong; + +// Patch for MinGW: on Win64 long is 32-bit +#ifdef _WIN64 + typedef unsigned long long ulongptr; +#else + typedef ulong ulongptr; +#endif + + +// Helper macro for aligning pointer up to next 16-byte boundary +#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 ) + + +#if (defined(__GNUC__) && !defined(ANDROID)) + // In GCC, include soundtouch_config.h made by config scritps. + // Skip this in Android compilation that uses GCC but without configure scripts. + #include "soundtouch_config.h" +#endif + +#ifndef _WINDEF_ + // if these aren't defined already by Windows headers, define now + + typedef int BOOL; + + #define FALSE 0 + #define TRUE 1 + +#endif // _WINDEF_ + + +namespace soundtouch +{ + /// Activate these undef's to overrule the possible sampletype + /// setting inherited from some other header file: + #undef SOUNDTOUCH_INTEGER_SAMPLES + #undef SOUNDTOUCH_FLOAT_SAMPLES + + #if (defined(__SOFTFP__)) + // For Android compilation: Force use of Integer samples in case that + // compilation uses soft-floating point emulation - soft-fp is way too slow + #undef SOUNDTOUCH_FLOAT_SAMPLES + #define SOUNDTOUCH_INTEGER_SAMPLES 1 + #endif + + #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES) + + /// Choose either 32bit floating point or 16bit integer sampletype + /// by choosing one of the following defines, unless this selection + /// has already been done in some other file. + //// + /// Notes: + /// - In Windows environment, choose the sample format with the + /// following defines. + /// - In GNU environment, the floating point samples are used by + /// default, but integer samples can be chosen by giving the + /// following switch to the configure script: + /// ./configure --enable-integer-samples + /// However, if you still prefer to select the sample format here + /// also in GNU environment, then please #undef the INTEGER_SAMPLE + /// and FLOAT_SAMPLE defines first as in comments above. + #define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples + //#define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples + + #endif + + #if (_M_IX86 || __i386__ || __x86_64__ || _M_X64) + /// Define this to allow X86-specific assembler/intrinsic optimizations. + /// Notice that library contains also usual C++ versions of each of these + /// these routines, so if you're having difficulties getting the optimized + /// routines compiled for whatever reason, you may disable these optimizations + /// to make the library compile. + + #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS 1 + + /// In GNU environment, allow the user to override this setting by + /// giving the following switch to the configure script: + /// ./configure --disable-x86-optimizations + /// ./configure --enable-x86-optimizations=no + #ifdef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS + #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + #endif + #else + /// Always disable optimizations when not using a x86 systems. + #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + + #endif + + // If defined, allows the SIMD-optimized routines to take minor shortcuts + // for improved performance. Undefine to require faithfully similar SIMD + // calculations as in normal C implementation. + #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION 1 + + + #ifdef SOUNDTOUCH_INTEGER_SAMPLES + // 16bit integer sample type + typedef short SAMPLETYPE; + // data type for sample accumulation: Use 32bit integer to prevent overflows + typedef long LONG_SAMPLETYPE; + + #ifdef SOUNDTOUCH_FLOAT_SAMPLES + // check that only one sample type is defined + #error "conflicting sample types defined" + #endif // SOUNDTOUCH_FLOAT_SAMPLES + + #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + // Allow MMX optimizations +#ifndef _M_X64 + #define SOUNDTOUCH_ALLOW_MMX 1 +#endif + #endif + + #else + + // floating point samples + typedef float SAMPLETYPE; + // data type for sample accumulation: Use double to utilize full precision. + typedef double LONG_SAMPLETYPE; + + #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS + // Allow SSE optimizations + #define SOUNDTOUCH_ALLOW_SSE 1 + #endif + + #endif // SOUNDTOUCH_INTEGER_SAMPLES + +}; + +// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions: +#define ST_NO_EXCEPTION_HANDLING 1 +#ifdef ST_NO_EXCEPTION_HANDLING + // Exceptions disabled. Throw asserts instead if enabled. + #include + #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} +#else + // use c++ standard exceptions + #include + #define ST_THROW_RT_ERROR(x) {throw std::runtime_error(x);} +#endif + +// When this #define is active, eliminates a clicking sound when the "rate" or "pitch" +// parameter setting crosses from value <1 to >=1 or vice versa during processing. +// Default is off as such crossover is untypical case and involves a slight sound +// quality compromise. +//#define SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER 1 + +#endif diff --git a/Externals/SoundTouch/SoundTouch.cpp b/Externals/SoundTouch/SoundTouch.cpp new file mode 100644 index 0000000000..f9160ed56d --- /dev/null +++ b/Externals/SoundTouch/SoundTouch.cpp @@ -0,0 +1,501 @@ +////////////////////////////////////////////////////////////////////////////// +/// +/// SoundTouch - main class for tempo/pitch/rate adjusting routines. +/// +/// Notes: +/// - Initialize the SoundTouch object instance by setting up the sound stream +/// parameters with functions 'setSampleRate' and 'setChannels', then set +/// desired tempo/pitch/rate settings with the corresponding functions. +/// +/// - The SoundTouch class behaves like a first-in-first-out pipeline: The +/// samples that are to be processed are fed into one of the pipe by calling +/// function 'putSamples', while the ready processed samples can be read +/// from the other end of the pipeline with function 'receiveSamples'. +/// +/// - The SoundTouch processing classes require certain sized 'batches' of +/// samples in order to process the sound. For this reason the classes buffer +/// incoming samples until there are enough of samples available for +/// processing, then they carry out the processing step and consequently +/// make the processed samples available for outputting. +/// +/// - For the above reason, the processing routines introduce a certain +/// 'latency' between the input and output, so that the samples input to +/// SoundTouch may not be immediately available in the output, and neither +/// the amount of outputtable samples may not immediately be in direct +/// relationship with the amount of previously input samples. +/// +/// - The tempo/pitch/rate control parameters can be altered during processing. +/// Please notice though that they aren't currently protected by semaphores, +/// so in multi-thread application external semaphore protection may be +/// required. +/// +/// - This class utilizes classes 'TDStretch' for tempo change (without modifying +/// pitch) and 'RateTransposer' for changing the playback rate (that is, both +/// tempo and pitch in the same ratio) of the sound. The third available control +/// 'pitch' (change pitch but maintain tempo) is produced by a combination of +/// combining the two other controls. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: SoundTouch.cpp 143 2012-06-13 19:29:53Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include + +#include "SoundTouch.h" +#include "TDStretch.h" +#include "RateTransposer.h" +#include "cpu_detect.h" + +using namespace soundtouch; + +/// test if two floating point numbers are equal +#define TEST_FLOAT_EQUAL(a, b) (fabs(a - b) < 1e-10) + + +/// Print library version string for autoconf +extern "C" void soundtouch_ac_test() +{ + printf("SoundTouch Version: %s\n",SOUNDTOUCH_VERSION); +} + + +SoundTouch::SoundTouch() +{ + // Initialize rate transposer and tempo changer instances + + pRateTransposer = RateTransposer::newInstance(); + pTDStretch = TDStretch::newInstance(); + + setOutPipe(pTDStretch); + + rate = tempo = 0; + + virtualPitch = + virtualRate = + virtualTempo = 1.0; + + calcEffectiveRateAndTempo(); + + channels = 0; + bSrateSet = FALSE; +} + + + +SoundTouch::~SoundTouch() +{ + delete pRateTransposer; + delete pTDStretch; +} + + + +/// Get SoundTouch library version string +const char *SoundTouch::getVersionString() +{ + static const char *_version = SOUNDTOUCH_VERSION; + + return _version; +} + + +/// Get SoundTouch library version Id +uint SoundTouch::getVersionId() +{ + return SOUNDTOUCH_VERSION_ID; +} + + +// Sets the number of channels, 1 = mono, 2 = stereo +void SoundTouch::setChannels(uint numChannels) +{ + if (numChannels != 1 && numChannels != 2) + { + ST_THROW_RT_ERROR("Illegal number of channels"); + } + channels = numChannels; + pRateTransposer->setChannels((int)numChannels); + pTDStretch->setChannels((int)numChannels); +} + + + +// Sets new rate control value. Normal rate = 1.0, smaller values +// represent slower rate, larger faster rates. +void SoundTouch::setRate(float newRate) +{ + virtualRate = newRate; + calcEffectiveRateAndTempo(); +} + + + +// Sets new rate control value as a difference in percents compared +// to the original rate (-50 .. +100 %) +void SoundTouch::setRateChange(float newRate) +{ + virtualRate = 1.0f + 0.01f * newRate; + calcEffectiveRateAndTempo(); +} + + + +// Sets new tempo control value. Normal tempo = 1.0, smaller values +// represent slower tempo, larger faster tempo. +void SoundTouch::setTempo(float newTempo) +{ + virtualTempo = newTempo; + calcEffectiveRateAndTempo(); +} + + + +// Sets new tempo control value as a difference in percents compared +// to the original tempo (-50 .. +100 %) +void SoundTouch::setTempoChange(float newTempo) +{ + virtualTempo = 1.0f + 0.01f * newTempo; + calcEffectiveRateAndTempo(); +} + + + +// Sets new pitch control value. Original pitch = 1.0, smaller values +// represent lower pitches, larger values higher pitch. +void SoundTouch::setPitch(float newPitch) +{ + virtualPitch = newPitch; + calcEffectiveRateAndTempo(); +} + + + +// Sets pitch change in octaves compared to the original pitch +// (-1.00 .. +1.00) +void SoundTouch::setPitchOctaves(float newPitch) +{ + virtualPitch = (float)exp(0.69314718056f * newPitch); + calcEffectiveRateAndTempo(); +} + + + +// Sets pitch change in semi-tones compared to the original pitch +// (-12 .. +12) +void SoundTouch::setPitchSemiTones(int newPitch) +{ + setPitchOctaves((float)newPitch / 12.0f); +} + + + +void SoundTouch::setPitchSemiTones(float newPitch) +{ + setPitchOctaves(newPitch / 12.0f); +} + + +// Calculates 'effective' rate and tempo values from the +// nominal control values. +void SoundTouch::calcEffectiveRateAndTempo() +{ + float oldTempo = tempo; + float oldRate = rate; + + tempo = virtualTempo / virtualPitch; + rate = virtualPitch * virtualRate; + + if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate); + if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo); + +#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER + if (rate <= 1.0f) + { + if (output != pTDStretch) + { + FIFOSamplePipe *tempoOut; + + assert(output == pRateTransposer); + // move samples in the current output buffer to the output of pTDStretch + tempoOut = pTDStretch->getOutput(); + tempoOut->moveSamples(*output); + // move samples in pitch transposer's store buffer to tempo changer's input + pTDStretch->moveSamples(*pRateTransposer->getStore()); + + output = pTDStretch; + } + } + else +#endif + { + if (output != pRateTransposer) + { + FIFOSamplePipe *transOut; + + assert(output == pTDStretch); + // move samples in the current output buffer to the output of pRateTransposer + transOut = pRateTransposer->getOutput(); + transOut->moveSamples(*output); + // move samples in tempo changer's input to pitch transposer's input + pRateTransposer->moveSamples(*pTDStretch->getInput()); + + output = pRateTransposer; + } + } +} + + +// Sets sample rate. +void SoundTouch::setSampleRate(uint srate) +{ + bSrateSet = TRUE; + // set sample rate, leave other tempo changer parameters as they are. + pTDStretch->setParameters((int)srate); +} + + +// Adds 'numSamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + if (bSrateSet == FALSE) + { + ST_THROW_RT_ERROR("SoundTouch : Sample rate not defined"); + } + else if (channels == 0) + { + ST_THROW_RT_ERROR("SoundTouch : Number of channels not defined"); + } + + // Transpose the rate of the new samples if necessary + /* Bypass the nominal setting - can introduce a click in sound when tempo/pitch control crosses the nominal value... + if (rate == 1.0f) + { + // The rate value is same as the original, simply evaluate the tempo changer. + assert(output == pTDStretch); + if (pRateTransposer->isEmpty() == 0) + { + // yet flush the last samples in the pitch transposer buffer + // (may happen if 'rate' changes from a non-zero value to zero) + pTDStretch->moveSamples(*pRateTransposer); + } + pTDStretch->putSamples(samples, nSamples); + } + */ +#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER + else if (rate <= 1.0f) + { + // transpose the rate down, output the transposed sound to tempo changer buffer + assert(output == pTDStretch); + pRateTransposer->putSamples(samples, nSamples); + pTDStretch->moveSamples(*pRateTransposer); + } + else +#endif + { + // evaluate the tempo changer, then transpose the rate up, + assert(output == pRateTransposer); + pTDStretch->putSamples(samples, nSamples); + pRateTransposer->moveSamples(*pTDStretch); + } +} + + +// Flushes the last samples from the processing pipeline to the output. +// Clears also the internal processing buffers. +// +// Note: This function is meant for extracting the last samples of a sound +// stream. This function may introduce additional blank samples in the end +// of the sound stream, and thus it's not recommended to call this function +// in the middle of a sound stream. +void SoundTouch::flush() +{ + int i; + int nUnprocessed; + int nOut; + SAMPLETYPE buff[64*2]; // note: allocate 2*64 to cater 64 sample frames of stereo sound + + // check how many samples still await processing, and scale + // that by tempo & rate to get expected output sample count + nUnprocessed = numUnprocessedSamples(); + nUnprocessed = (int)((double)nUnprocessed / (tempo * rate) + 0.5); + + nOut = numSamples(); // ready samples currently in buffer ... + nOut += nUnprocessed; // ... and how many we expect there to be in the end + + memset(buff, 0, 64 * channels * sizeof(SAMPLETYPE)); + // "Push" the last active samples out from the processing pipeline by + // feeding blank samples into the processing pipeline until new, + // processed samples appear in the output (not however, more than + // 8ksamples in any case) + for (i = 0; i < 128; i ++) + { + putSamples(buff, 64); + if ((int)numSamples() >= nOut) + { + // Enough new samples have appeared into the output! + // As samples come from processing with bigger chunks, now truncate it + // back to maximum "nOut" samples to improve duration accuracy + adjustAmountOfSamples(nOut); + + // finish + break; + } + } + + // Clear working buffers + pRateTransposer->clear(); + pTDStretch->clearInput(); + // yet leave the 'tempoChanger' output intouched as that's where the + // flushed samples are! +} + + +// Changes a setting controlling the processing system behaviour. See the +// 'SETTING_...' defines for available setting ID's. +BOOL SoundTouch::setSetting(int settingId, int value) +{ + int sampleRate, sequenceMs, seekWindowMs, overlapMs; + + // read current tdstretch routine parameters + pTDStretch->getParameters(&sampleRate, &sequenceMs, &seekWindowMs, &overlapMs); + + switch (settingId) + { + case SETTING_USE_AA_FILTER : + // enables / disabless anti-alias filter + pRateTransposer->enableAAFilter((value != 0) ? TRUE : FALSE); + return TRUE; + + case SETTING_AA_FILTER_LENGTH : + // sets anti-alias filter length + pRateTransposer->getAAFilter()->setLength(value); + return TRUE; + + case SETTING_USE_QUICKSEEK : + // enables / disables tempo routine quick seeking algorithm + pTDStretch->enableQuickSeek((value != 0) ? TRUE : FALSE); + return TRUE; + + case SETTING_SEQUENCE_MS: + // change time-stretch sequence duration parameter + pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs); + return TRUE; + + case SETTING_SEEKWINDOW_MS: + // change time-stretch seek window length parameter + pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs); + return TRUE; + + case SETTING_OVERLAP_MS: + // change time-stretch overlap length parameter + pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value); + return TRUE; + + default : + return FALSE; + } +} + + +// Reads a setting controlling the processing system behaviour. See the +// 'SETTING_...' defines for available setting ID's. +// +// Returns the setting value. +int SoundTouch::getSetting(int settingId) const +{ + int temp; + + switch (settingId) + { + case SETTING_USE_AA_FILTER : + return (uint)pRateTransposer->isAAFilterEnabled(); + + case SETTING_AA_FILTER_LENGTH : + return pRateTransposer->getAAFilter()->getLength(); + + case SETTING_USE_QUICKSEEK : + return (uint) pTDStretch->isQuickSeekEnabled(); + + case SETTING_SEQUENCE_MS: + pTDStretch->getParameters(NULL, &temp, NULL, NULL); + return temp; + + case SETTING_SEEKWINDOW_MS: + pTDStretch->getParameters(NULL, NULL, &temp, NULL); + return temp; + + case SETTING_OVERLAP_MS: + pTDStretch->getParameters(NULL, NULL, NULL, &temp); + return temp; + + case SETTING_NOMINAL_INPUT_SEQUENCE : + return pTDStretch->getInputSampleReq(); + + case SETTING_NOMINAL_OUTPUT_SEQUENCE : + return pTDStretch->getOutputBatchSize(); + + default : + return 0; + } +} + + +// Clears all the samples in the object's output and internal processing +// buffers. +void SoundTouch::clear() +{ + pRateTransposer->clear(); + pTDStretch->clear(); +} + + + +/// Returns number of samples currently unprocessed. +uint SoundTouch::numUnprocessedSamples() const +{ + FIFOSamplePipe * psp; + if (pTDStretch) + { + psp = pTDStretch->getInput(); + if (psp) + { + return psp->numSamples(); + } + } + return 0; +} diff --git a/Externals/SoundTouch/SoundTouch.h b/Externals/SoundTouch/SoundTouch.h new file mode 100644 index 0000000000..c6af895811 --- /dev/null +++ b/Externals/SoundTouch/SoundTouch.h @@ -0,0 +1,277 @@ +////////////////////////////////////////////////////////////////////////////// +/// +/// SoundTouch - main class for tempo/pitch/rate adjusting routines. +/// +/// Notes: +/// - Initialize the SoundTouch object instance by setting up the sound stream +/// parameters with functions 'setSampleRate' and 'setChannels', then set +/// desired tempo/pitch/rate settings with the corresponding functions. +/// +/// - The SoundTouch class behaves like a first-in-first-out pipeline: The +/// samples that are to be processed are fed into one of the pipe by calling +/// function 'putSamples', while the ready processed samples can be read +/// from the other end of the pipeline with function 'receiveSamples'. +/// +/// - The SoundTouch processing classes require certain sized 'batches' of +/// samples in order to process the sound. For this reason the classes buffer +/// incoming samples until there are enough of samples available for +/// processing, then they carry out the processing step and consequently +/// make the processed samples available for outputting. +/// +/// - For the above reason, the processing routines introduce a certain +/// 'latency' between the input and output, so that the samples input to +/// SoundTouch may not be immediately available in the output, and neither +/// the amount of outputtable samples may not immediately be in direct +/// relationship with the amount of previously input samples. +/// +/// - The tempo/pitch/rate control parameters can be altered during processing. +/// Please notice though that they aren't currently protected by semaphores, +/// so in multi-thread application external semaphore protection may be +/// required. +/// +/// - This class utilizes classes 'TDStretch' for tempo change (without modifying +/// pitch) and 'RateTransposer' for changing the playback rate (that is, both +/// tempo and pitch in the same ratio) of the sound. The third available control +/// 'pitch' (change pitch but maintain tempo) is produced by a combination of +/// combining the two other controls. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-12-28 21:32:59 +0200 (Fri, 28 Dec 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: SoundTouch.h 163 2012-12-28 19:32:59Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef SoundTouch_H +#define SoundTouch_H + +#include "FIFOSamplePipe.h" +#include "STTypes.h" + +namespace soundtouch +{ + +/// Soundtouch library version string +#define SOUNDTOUCH_VERSION "1.7.1" + +/// SoundTouch library version id +#define SOUNDTOUCH_VERSION_ID (10701) + +// +// Available setting IDs for the 'setSetting' & 'get_setting' functions: + +/// Enable/disable anti-alias filter in pitch transposer (0 = disable) +#define SETTING_USE_AA_FILTER 0 + +/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32) +#define SETTING_AA_FILTER_LENGTH 1 + +/// Enable/disable quick seeking algorithm in tempo changer routine +/// (enabling quick seeking lowers CPU utilization but causes a minor sound +/// quality compromising) +#define SETTING_USE_QUICKSEEK 2 + +/// Time-stretch algorithm single processing sequence length in milliseconds. This determines +/// to how long sequences the original sound is chopped in the time-stretch algorithm. +/// See "STTypes.h" or README for more information. +#define SETTING_SEQUENCE_MS 3 + +/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the +/// best possible overlapping location. This determines from how wide window the algorithm +/// may look for an optimal joining location when mixing the sound sequences back together. +/// See "STTypes.h" or README for more information. +#define SETTING_SEEKWINDOW_MS 4 + +/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences +/// are mixed back together, to form a continuous sound stream, this parameter defines over +/// how long period the two consecutive sequences are let to overlap each other. +/// See "STTypes.h" or README for more information. +#define SETTING_OVERLAP_MS 5 + + +/// Call "getSetting" with this ID to query nominal average processing sequence +/// size in samples. This value tells approcimate value how many input samples +/// SoundTouch needs to gather before it does DSP processing run for the sample batch. +/// +/// Notices: +/// - This is read-only parameter, i.e. setSetting ignores this parameter +/// - Returned value is approximate average value, exact processing batch +/// size may wary from time to time +/// - This parameter value is not constant but may change depending on +/// tempo/pitch/rate/samplerate settings. +#define SETTING_NOMINAL_INPUT_SEQUENCE 6 + + +/// Call "getSetting" with this ID to query nominal average processing output +/// size in samples. This value tells approcimate value how many output samples +/// SoundTouch outputs once it does DSP processing run for a batch of input samples. +/// +/// Notices: +/// - This is read-only parameter, i.e. setSetting ignores this parameter +/// - Returned value is approximate average value, exact processing batch +/// size may wary from time to time +/// - This parameter value is not constant but may change depending on +/// tempo/pitch/rate/samplerate settings. +#define SETTING_NOMINAL_OUTPUT_SEQUENCE 7 + +class SoundTouch : public FIFOProcessor +{ +private: + /// Rate transposer class instance + class RateTransposer *pRateTransposer; + + /// Time-stretch class instance + class TDStretch *pTDStretch; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualRate; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualTempo; + + /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters. + float virtualPitch; + + /// Flag: Has sample rate been set? + BOOL bSrateSet; + + /// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and + /// 'virtualPitch' parameters. + void calcEffectiveRateAndTempo(); + +protected : + /// Number of channels + uint channels; + + /// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch' + float rate; + + /// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch' + float tempo; + +public: + SoundTouch(); + virtual ~SoundTouch(); + + /// Get SoundTouch library version string + static const char *getVersionString(); + + /// Get SoundTouch library version Id + static uint getVersionId(); + + /// Sets new rate control value. Normal rate = 1.0, smaller values + /// represent slower rate, larger faster rates. + void setRate(float newRate); + + /// Sets new tempo control value. Normal tempo = 1.0, smaller values + /// represent slower tempo, larger faster tempo. + void setTempo(float newTempo); + + /// Sets new rate control value as a difference in percents compared + /// to the original rate (-50 .. +100 %) + void setRateChange(float newRate); + + /// Sets new tempo control value as a difference in percents compared + /// to the original tempo (-50 .. +100 %) + void setTempoChange(float newTempo); + + /// Sets new pitch control value. Original pitch = 1.0, smaller values + /// represent lower pitches, larger values higher pitch. + void setPitch(float newPitch); + + /// Sets pitch change in octaves compared to the original pitch + /// (-1.00 .. +1.00) + void setPitchOctaves(float newPitch); + + /// Sets pitch change in semi-tones compared to the original pitch + /// (-12 .. +12) + void setPitchSemiTones(int newPitch); + void setPitchSemiTones(float newPitch); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(uint numChannels); + + /// Sets sample rate. + void setSampleRate(uint srate); + + /// Flushes the last samples from the processing pipeline to the output. + /// Clears also the internal processing buffers. + // + /// Note: This function is meant for extracting the last samples of a sound + /// stream. This function may introduce additional blank samples in the end + /// of the sound stream, and thus it's not recommended to call this function + /// in the middle of a sound stream. + void flush(); + + /// Adds 'numSamples' pcs of samples from the 'samples' memory position into + /// the input of the object. Notice that sample rate _has_to_ be set before + /// calling this function, otherwise throws a runtime_error exception. + virtual void putSamples( + const SAMPLETYPE *samples, ///< Pointer to sample buffer. + uint numSamples ///< Number of samples in buffer. Notice + ///< that in case of stereo-sound a single sample + ///< contains data for both channels. + ); + + /// Clears all the samples in the object's output and internal processing + /// buffers. + virtual void clear(); + + /// Changes a setting controlling the processing system behaviour. See the + /// 'SETTING_...' defines for available setting ID's. + /// + /// \return 'TRUE' if the setting was succesfully changed + BOOL setSetting(int settingId, ///< Setting ID number. see SETTING_... defines. + int value ///< New setting value. + ); + + /// Reads a setting controlling the processing system behaviour. See the + /// 'SETTING_...' defines for available setting ID's. + /// + /// \return the setting value. + int getSetting(int settingId ///< Setting ID number, see SETTING_... defines. + ) const; + + /// Returns number of samples currently unprocessed. + virtual uint numUnprocessedSamples() const; + + + /// Other handy functions that are implemented in the ancestor classes (see + /// classes 'FIFOProcessor' and 'FIFOSamplePipe') + /// + /// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch. + /// - numSamples() : Get number of 'ready' samples that can be received with + /// function 'receiveSamples()' + /// - isEmpty() : Returns nonzero if there aren't any 'ready' samples. + /// - clear() : Clears all samples from ready/processing buffers. +}; + +} +#endif diff --git a/Externals/SoundTouch/SoundTouch.vcxproj b/Externals/SoundTouch/SoundTouch.vcxproj new file mode 100644 index 0000000000..8f5c475687 --- /dev/null +++ b/Externals/SoundTouch/SoundTouch.vcxproj @@ -0,0 +1,352 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {68A5DD20-7057-448B-8FE0-B6AC8D205509} + + + + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Release\ + Release\ + Release\ + Release\ + Debug\ + Debug\ + Debug\ + Debug\ + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + Full + AnySuitable + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + Release/SoundTouch.pch + Release/ + Release/ + Release/ + Level3 + true + + + Default + + + Win32\SoundTouch.lib + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Full + AnySuitable + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + Release/SoundTouch.pch + Release/ + Release/ + Release/ + Level3 + true + + + Default + StreamingSIMDExtensions2 + + + Win64\SoundTouch.lib + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Debug/SoundTouch.pch + Debug/ + Debug/ + Debug/ + true + Level3 + true + EditAndContinue + Default + + + Win32\SoundTouch.lib + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Debug/SoundTouch.pch + Debug/ + Debug/ + Debug/ + true + Level3 + true + ProgramDatabase + Default + + + Win64\SoundTouchD.lib + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x040b + + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + Disabled + Disabled + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + EnableFastChecks + EnableFastChecks + true + true + MaxSpeed + MaxSpeed + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/SoundTouch/SoundTouch.vcxproj.filters b/Externals/SoundTouch/SoundTouch.vcxproj.filters new file mode 100644 index 0000000000..1dee5b2a6e --- /dev/null +++ b/Externals/SoundTouch/SoundTouch.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {b7786182-6345-4203-8b48-39eec5ec85dc} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {75380bb9-1e58-4186-a9cd-ec7cd284e6a5} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\bpm + + + Source Files\bpm + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/SoundTouch/TDStretch.cpp b/Externals/SoundTouch/TDStretch.cpp new file mode 100644 index 0000000000..779cf7aa65 --- /dev/null +++ b/Externals/SoundTouch/TDStretch.cpp @@ -0,0 +1,808 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like +/// method with several performance-increasing tweaks. +/// +/// Note : MMX optimized functions reside in a separate, platform-specific +/// file, e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 1.12 $ +// +// $Id: TDStretch.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include +#include + +#include "STTypes.h" +#include "cpu_detect.h" +#include "TDStretch.h" + +#include + +using namespace soundtouch; + +#define max(x, y) (((x) > (y)) ? (x) : (y)) + + +/***************************************************************************** + * + * Constant definitions + * + *****************************************************************************/ + +// Table for the hierarchical mixing position seeking algorithm +static const short _scanOffsets[5][24]={ + { 124, 186, 248, 310, 372, 434, 496, 558, 620, 682, 744, 806, + 868, 930, 992, 1054, 1116, 1178, 1240, 1302, 1364, 1426, 1488, 0}, + {-100, -75, -50, -25, 25, 50, 75, 100, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { -20, -15, -10, -5, 5, 10, 15, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { -4, -3, -2, -1, 1, 2, 3, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 121, 114, 97, 114, 98, 105, 108, 32, 104, 99, 117, 111, + 116, 100, 110, 117, 111, 115, 0, 0, 0, 0, 0, 0}}; + +/***************************************************************************** + * + * Implementation of the class 'TDStretch' + * + *****************************************************************************/ + + +TDStretch::TDStretch() : FIFOProcessor(&outputBuffer) +{ + bQuickSeek = FALSE; + channels = 2; + + pMidBuffer = NULL; + pMidBufferUnaligned = NULL; + overlapLength = 0; + + bAutoSeqSetting = TRUE; + bAutoSeekSetting = TRUE; + +// outDebt = 0; + skipFract = 0; + + tempo = 1.0f; + setParameters(44100, DEFAULT_SEQUENCE_MS, DEFAULT_SEEKWINDOW_MS, DEFAULT_OVERLAP_MS); + setTempo(1.0f); + + clear(); +} + + + +TDStretch::~TDStretch() +{ + delete[] pMidBufferUnaligned; +} + + + +// Sets routine control parameters. These control are certain time constants +// defining how the sound is stretched to the desired duration. +// +// 'sampleRate' = sample rate of the sound +// 'sequenceMS' = one processing sequence length in milliseconds (default = 82 ms) +// 'seekwindowMS' = seeking window length for scanning the best overlapping +// position (default = 28 ms) +// 'overlapMS' = overlapping length (default = 12 ms) + +void TDStretch::setParameters(int aSampleRate, int aSequenceMS, + int aSeekWindowMS, int aOverlapMS) +{ + // accept only positive parameter values - if zero or negative, use old values instead + if (aSampleRate > 0) this->sampleRate = aSampleRate; + if (aOverlapMS > 0) this->overlapMs = aOverlapMS; + + if (aSequenceMS > 0) + { + this->sequenceMs = aSequenceMS; + bAutoSeqSetting = FALSE; + } + else if (aSequenceMS == 0) + { + // if zero, use automatic setting + bAutoSeqSetting = TRUE; + } + + if (aSeekWindowMS > 0) + { + this->seekWindowMs = aSeekWindowMS; + bAutoSeekSetting = FALSE; + } + else if (aSeekWindowMS == 0) + { + // if zero, use automatic setting + bAutoSeekSetting = TRUE; + } + + calcSeqParameters(); + + calculateOverlapLength(overlapMs); + + // set tempo to recalculate 'sampleReq' + setTempo(tempo); + +} + + + +/// Get routine control parameters, see setParameters() function. +/// Any of the parameters to this function can be NULL, in such case corresponding parameter +/// value isn't returned. +void TDStretch::getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const +{ + if (pSampleRate) + { + *pSampleRate = sampleRate; + } + + if (pSequenceMs) + { + *pSequenceMs = (bAutoSeqSetting) ? (USE_AUTO_SEQUENCE_LEN) : sequenceMs; + } + + if (pSeekWindowMs) + { + *pSeekWindowMs = (bAutoSeekSetting) ? (USE_AUTO_SEEKWINDOW_LEN) : seekWindowMs; + } + + if (pOverlapMs) + { + *pOverlapMs = overlapMs; + } +} + + +// Overlaps samples in 'midBuffer' with the samples in 'pInput' +void TDStretch::overlapMono(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput) const +{ + int i; + SAMPLETYPE m1, m2; + + m1 = (SAMPLETYPE)0; + m2 = (SAMPLETYPE)overlapLength; + + for (i = 0; i < overlapLength ; i ++) + { + pOutput[i] = (pInput[i] * m1 + pMidBuffer[i] * m2 ) / overlapLength; + m1 += 1; + m2 -= 1; + } +} + + + +void TDStretch::clearMidBuffer() +{ + memset(pMidBuffer, 0, 2 * sizeof(SAMPLETYPE) * overlapLength); +} + + +void TDStretch::clearInput() +{ + inputBuffer.clear(); + clearMidBuffer(); +} + + +// Clears the sample buffers +void TDStretch::clear() +{ + outputBuffer.clear(); + clearInput(); +} + + + +// Enables/disables the quick position seeking algorithm. Zero to disable, nonzero +// to enable +void TDStretch::enableQuickSeek(BOOL enable) +{ + bQuickSeek = enable; +} + + +// Returns nonzero if the quick seeking algorithm is enabled. +BOOL TDStretch::isQuickSeekEnabled() const +{ + return bQuickSeek; +} + + +// Seeks for the optimal overlap-mixing position. +int TDStretch::seekBestOverlapPosition(const SAMPLETYPE *refPos) +{ + if (bQuickSeek) + { + return seekBestOverlapPositionQuick(refPos); + } + else + { + return seekBestOverlapPositionFull(refPos); + } +} + + +// Overlaps samples in 'midBuffer' with the samples in 'pInputBuffer' at position +// of 'ovlPos'. +inline void TDStretch::overlap(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput, uint ovlPos) const +{ + if (channels == 2) + { + // stereo sound + overlapStereo(pOutput, pInput + 2 * ovlPos); + } else { + // mono sound. + overlapMono(pOutput, pInput + ovlPos); + } +} + + + +// Seeks for the optimal overlap-mixing position. The 'stereo' version of the +// routine +// +// The best position is determined as the position where the two overlapped +// sample sequences are 'most alike', in terms of the highest cross-correlation +// value over the overlapping period +int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos) +{ + int bestOffs; + double bestCorr, corr; + int i; + + bestCorr = FLT_MIN; + bestOffs = 0; + + // Scans for the best correlation value by testing each possible position + // over the permitted range. + for (i = 0; i < seekLength; i ++) + { + // Calculates correlation value for the mixing position corresponding + // to 'i' + corr = calcCrossCorr(refPos + channels * i, pMidBuffer); + // heuristic rule to slightly favour values close to mid of the range + double tmp = (double)(2 * i - seekLength) / (double)seekLength; + corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp)); + + // Checks for the highest correlation value + if (corr > bestCorr) + { + bestCorr = corr; + bestOffs = i; + } + } + // clear cross correlation routine state if necessary (is so e.g. in MMX routines). + clearCrossCorrState(); + + return bestOffs; +} + + +// Seeks for the optimal overlap-mixing position. The 'stereo' version of the +// routine +// +// The best position is determined as the position where the two overlapped +// sample sequences are 'most alike', in terms of the highest cross-correlation +// value over the overlapping period +int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos) +{ + int j; + int bestOffs; + double bestCorr, corr; + int scanCount, corrOffset, tempOffset; + + bestCorr = FLT_MIN; + bestOffs = _scanOffsets[0][0]; + corrOffset = 0; + tempOffset = 0; + + // Scans for the best correlation value using four-pass hierarchical search. + // + // The look-up table 'scans' has hierarchical position adjusting steps. + // In first pass the routine searhes for the highest correlation with + // relatively coarse steps, then rescans the neighbourhood of the highest + // correlation with better resolution and so on. + for (scanCount = 0;scanCount < 4; scanCount ++) + { + j = 0; + while (_scanOffsets[scanCount][j]) + { + tempOffset = corrOffset + _scanOffsets[scanCount][j]; + if (tempOffset >= seekLength) break; + + // Calculates correlation value for the mixing position corresponding + // to 'tempOffset' + corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer); + // heuristic rule to slightly favour values close to mid of the range + double tmp = (double)(2 * tempOffset - seekLength) / seekLength; + corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp)); + + // Checks for the highest correlation value + if (corr > bestCorr) + { + bestCorr = corr; + bestOffs = tempOffset; + } + j ++; + } + corrOffset = bestOffs; + } + // clear cross correlation routine state if necessary (is so e.g. in MMX routines). + clearCrossCorrState(); + + return bestOffs; +} + + + +/// clear cross correlation routine state if necessary +void TDStretch::clearCrossCorrState() +{ + // default implementation is empty. +} + + +/// Calculates processing sequence length according to tempo setting +void TDStretch::calcSeqParameters() +{ + // Adjust tempo param according to tempo, so that variating processing sequence length is used + // at varius tempo settings, between the given low...top limits + #define AUTOSEQ_TEMPO_LOW 0.5 // auto setting low tempo range (-50%) + #define AUTOSEQ_TEMPO_TOP 2.0 // auto setting top tempo range (+100%) + + // sequence-ms setting values at above low & top tempo + #define AUTOSEQ_AT_MIN 125.0 + #define AUTOSEQ_AT_MAX 50.0 + #define AUTOSEQ_K ((AUTOSEQ_AT_MAX - AUTOSEQ_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW)) + #define AUTOSEQ_C (AUTOSEQ_AT_MIN - (AUTOSEQ_K) * (AUTOSEQ_TEMPO_LOW)) + + // seek-window-ms setting values at above low & top tempo + #define AUTOSEEK_AT_MIN 25.0 + #define AUTOSEEK_AT_MAX 15.0 + #define AUTOSEEK_K ((AUTOSEEK_AT_MAX - AUTOSEEK_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW)) + #define AUTOSEEK_C (AUTOSEEK_AT_MIN - (AUTOSEEK_K) * (AUTOSEQ_TEMPO_LOW)) + + #define CHECK_LIMITS(x, mi, ma) (((x) < (mi)) ? (mi) : (((x) > (ma)) ? (ma) : (x))) + + double seq, seek; + + if (bAutoSeqSetting) + { + seq = AUTOSEQ_C + AUTOSEQ_K * tempo; + seq = CHECK_LIMITS(seq, AUTOSEQ_AT_MAX, AUTOSEQ_AT_MIN); + sequenceMs = (int)(seq + 0.5); + } + + if (bAutoSeekSetting) + { + seek = AUTOSEEK_C + AUTOSEEK_K * tempo; + seek = CHECK_LIMITS(seek, AUTOSEEK_AT_MAX, AUTOSEEK_AT_MIN); + seekWindowMs = (int)(seek + 0.5); + } + + // Update seek window lengths + seekWindowLength = (sampleRate * sequenceMs) / 1000; + if (seekWindowLength < 2 * overlapLength) + { + seekWindowLength = 2 * overlapLength; + } + seekLength = (sampleRate * seekWindowMs) / 1000; +} + + + +// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower +// tempo, larger faster tempo. +void TDStretch::setTempo(float newTempo) +{ + int intskip; + + tempo = newTempo; + + // Calculate new sequence duration + calcSeqParameters(); + + // Calculate ideal skip length (according to tempo value) + nominalSkip = tempo * (seekWindowLength - overlapLength); + intskip = (int)(nominalSkip + 0.5f); + + // Calculate how many samples are needed in the 'inputBuffer' to + // process another batch of samples + //sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength / 2; + sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength; +} + + + +// Sets the number of channels, 1 = mono, 2 = stereo +void TDStretch::setChannels(int numChannels) +{ + assert(numChannels > 0); + if (channels == numChannels) return; + assert(numChannels == 1 || numChannels == 2); + + channels = numChannels; + inputBuffer.setChannels(channels); + outputBuffer.setChannels(channels); +} + + +// nominal tempo, no need for processing, just pass the samples through +// to outputBuffer +/* +void TDStretch::processNominalTempo() +{ + assert(tempo == 1.0f); + + if (bMidBufferDirty) + { + // If there are samples in pMidBuffer waiting for overlapping, + // do a single sliding overlapping with them in order to prevent a + // clicking distortion in the output sound + if (inputBuffer.numSamples() < overlapLength) + { + // wait until we've got overlapLength input samples + return; + } + // Mix the samples in the beginning of 'inputBuffer' with the + // samples in 'midBuffer' using sliding overlapping + overlap(outputBuffer.ptrEnd(overlapLength), inputBuffer.ptrBegin(), 0); + outputBuffer.putSamples(overlapLength); + inputBuffer.receiveSamples(overlapLength); + clearMidBuffer(); + // now we've caught the nominal sample flow and may switch to + // bypass mode + } + + // Simply bypass samples from input to output + outputBuffer.moveSamples(inputBuffer); +} +*/ + +#include + +// Processes as many processing frames of the samples 'inputBuffer', store +// the result into 'outputBuffer' +void TDStretch::processSamples() +{ + int ovlSkip, offset; + int temp; + + /* Removed this small optimization - can introduce a click to sound when tempo setting + crosses the nominal value + if (tempo == 1.0f) + { + // tempo not changed from the original, so bypass the processing + processNominalTempo(); + return; + } + */ + + // Process samples as long as there are enough samples in 'inputBuffer' + // to form a processing frame. + while ((int)inputBuffer.numSamples() >= sampleReq) + { + // If tempo differs from the normal ('SCALE'), scan for the best overlapping + // position + offset = seekBestOverlapPosition(inputBuffer.ptrBegin()); + + // Mix the samples in the 'inputBuffer' at position of 'offset' with the + // samples in 'midBuffer' using sliding overlapping + // ... first partially overlap with the end of the previous sequence + // (that's in 'midBuffer') + overlap(outputBuffer.ptrEnd((uint)overlapLength), inputBuffer.ptrBegin(), (uint)offset); + outputBuffer.putSamples((uint)overlapLength); + + // ... then copy sequence samples from 'inputBuffer' to output: + + // length of sequence + temp = (seekWindowLength - 2 * overlapLength); + + // crosscheck that we don't have buffer overflow... + if ((int)inputBuffer.numSamples() < (offset + temp + overlapLength * 2)) + { + continue; // just in case, shouldn't really happen + } + + outputBuffer.putSamples(inputBuffer.ptrBegin() + channels * (offset + overlapLength), (uint)temp); + + // Copies the end of the current sequence from 'inputBuffer' to + // 'midBuffer' for being mixed with the beginning of the next + // processing sequence and so on + assert((offset + temp + overlapLength * 2) <= (int)inputBuffer.numSamples()); + memcpy(pMidBuffer, inputBuffer.ptrBegin() + channels * (offset + temp + overlapLength), + channels * sizeof(SAMPLETYPE) * overlapLength); + + // Remove the processed samples from the input buffer. Update + // the difference between integer & nominal skip step to 'skipFract' + // in order to prevent the error from accumulating over time. + skipFract += nominalSkip; // real skip size + ovlSkip = (int)skipFract; // rounded to integer skip + skipFract -= ovlSkip; // maintain the fraction part, i.e. real vs. integer skip + inputBuffer.receiveSamples((uint)ovlSkip); + } +} + + +// Adds 'numsamples' pcs of samples from the 'samples' memory position into +// the input of the object. +void TDStretch::putSamples(const SAMPLETYPE *samples, uint nSamples) +{ + // Add the samples into the input buffer + inputBuffer.putSamples(samples, nSamples); + // Process the samples in input buffer + processSamples(); +} + + + +/// Set new overlap length parameter & reallocate RefMidBuffer if necessary. +void TDStretch::acceptNewOverlapLength(int newOverlapLength) +{ + int prevOvl; + + assert(newOverlapLength >= 0); + prevOvl = overlapLength; + overlapLength = newOverlapLength; + + if (overlapLength > prevOvl) + { + delete[] pMidBufferUnaligned; + + pMidBufferUnaligned = new SAMPLETYPE[overlapLength * 2 + 16 / sizeof(SAMPLETYPE)]; + // ensure that 'pMidBuffer' is aligned to 16 byte boundary for efficiency + pMidBuffer = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(pMidBufferUnaligned); + + clearMidBuffer(); + } +} + + +// Operator 'new' is overloaded so that it automatically creates a suitable instance +// depending on if we've a MMX/SSE/etc-capable CPU available or not. +void * TDStretch::operator new(size_t s) +{ + // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead! + ST_THROW_RT_ERROR("Error in TDStretch::new: Don't use 'new TDStretch' directly, use 'newInstance' member instead!"); + return newInstance(); +} + + +TDStretch * TDStretch::newInstance() +{ + uint uExtensions; + + uExtensions = detectCPUextensions(); + + // Check if MMX/SSE instruction set extensions supported by CPU + +#ifdef SOUNDTOUCH_ALLOW_MMX + // MMX routines available only with integer sample types + if (uExtensions & SUPPORT_MMX) + { + return ::new TDStretchMMX; + } + else +#endif // SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + if (uExtensions & SUPPORT_SSE) + { + // SSE support + return ::new TDStretchSSE; + } + else +#endif // SOUNDTOUCH_ALLOW_SSE + + { + // ISA optimizations not supported, use plain C version + return ::new TDStretch; + } +} + + +////////////////////////////////////////////////////////////////////////////// +// +// Integer arithmetics specific algorithm implementations. +// +////////////////////////////////////////////////////////////////////////////// + +#ifdef SOUNDTOUCH_INTEGER_SAMPLES + +// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Stereo' +// version of the routine. +void TDStretch::overlapStereo(short *poutput, const short *input) const +{ + int i; + short temp; + int cnt2; + + for (i = 0; i < overlapLength ; i ++) + { + temp = (short)(overlapLength - i); + cnt2 = 2 * i; + poutput[cnt2] = (input[cnt2] * i + pMidBuffer[cnt2] * temp ) / overlapLength; + poutput[cnt2 + 1] = (input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength; + } +} + +// Calculates the x having the closest 2^x value for the given value +static int _getClosest2Power(double value) +{ + return (int)(log(value) / log(2.0) + 0.5); +} + + +/// Calculates overlap period length in samples. +/// Integer version rounds overlap length to closest power of 2 +/// for a divide scaling operation. +void TDStretch::calculateOverlapLength(int aoverlapMs) +{ + int newOvl; + + assert(aoverlapMs >= 0); + + // calculate overlap length so that it's power of 2 - thus it's easy to do + // integer division by right-shifting. Term "-1" at end is to account for + // the extra most significatnt bit left unused in result by signed multiplication + overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0) - 1; + if (overlapDividerBits > 9) overlapDividerBits = 9; + if (overlapDividerBits < 3) overlapDividerBits = 3; + newOvl = (int)pow(2.0, (int)overlapDividerBits + 1); // +1 => account for -1 above + + acceptNewOverlapLength(newOvl); + + // calculate sloping divider so that crosscorrelation operation won't + // overflow 32-bit register. Max. sum of the crosscorrelation sum without + // divider would be 2^30*(N^3-N)/3, where N = overlap length + slopingDivider = (newOvl * newOvl - 1) / 3; +} + + +double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare) const +{ + long corr; + long norm; + int i; + + corr = norm = 0; + // Same routine for stereo and mono. For stereo, unroll loop for better + // efficiency and gives slightly better resolution against rounding. + // For mono it same routine, just unrolls loop by factor of 4 + for (i = 0; i < channels * overlapLength; i += 4) + { + corr += (mixingPos[i] * compare[i] + + mixingPos[i + 1] * compare[i + 1] + + mixingPos[i + 2] * compare[i + 2] + + mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits; + norm += (mixingPos[i] * mixingPos[i] + + mixingPos[i + 1] * mixingPos[i + 1] + + mixingPos[i + 2] * mixingPos[i + 2] + + mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits; + } + + // Normalize result by dividing by sqrt(norm) - this step is easiest + // done using floating point operation + if (norm == 0) norm = 1; // to avoid div by zero + return (double)corr / sqrt((double)norm); +} + +#endif // SOUNDTOUCH_INTEGER_SAMPLES + +////////////////////////////////////////////////////////////////////////////// +// +// Floating point arithmetics specific algorithm implementations. +// + +#ifdef SOUNDTOUCH_FLOAT_SAMPLES + +// Overlaps samples in 'midBuffer' with the samples in 'pInput' +void TDStretch::overlapStereo(float *pOutput, const float *pInput) const +{ + int i; + float fScale; + float f1; + float f2; + + fScale = 1.0f / (float)overlapLength; + + f1 = 0; + f2 = 1.0f; + + for (i = 0; i < 2 * (int)overlapLength ; i += 2) + { + pOutput[i + 0] = pInput[i + 0] * f1 + pMidBuffer[i + 0] * f2; + pOutput[i + 1] = pInput[i + 1] * f1 + pMidBuffer[i + 1] * f2; + + f1 += fScale; + f2 -= fScale; + } +} + + +/// Calculates overlapInMsec period length in samples. +void TDStretch::calculateOverlapLength(int overlapInMsec) +{ + int newOvl; + + assert(overlapInMsec >= 0); + newOvl = (sampleRate * overlapInMsec) / 1000; + if (newOvl < 16) newOvl = 16; + + // must be divisible by 8 + newOvl -= newOvl % 8; + + acceptNewOverlapLength(newOvl); +} + + +double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) const +{ + double corr; + double norm; + int i; + + corr = norm = 0; + // Same routine for stereo and mono. For Stereo, unroll by factor of 2. + // For mono it's same routine yet unrollsd by factor of 4. + for (i = 0; i < channels * overlapLength; i += 4) + { + corr += mixingPos[i] * compare[i] + + mixingPos[i + 1] * compare[i + 1]; + + norm += mixingPos[i] * mixingPos[i] + + mixingPos[i + 1] * mixingPos[i + 1]; + + // unroll the loop for better CPU efficiency: + corr += mixingPos[i + 2] * compare[i + 2] + + mixingPos[i + 3] * compare[i + 3]; + + norm += mixingPos[i + 2] * mixingPos[i + 2] + + mixingPos[i + 3] * mixingPos[i + 3]; + } + + if (norm < 1e-9) norm = 1.0; // to avoid div by zero + return corr / sqrt(norm); +} + +#endif // SOUNDTOUCH_FLOAT_SAMPLES diff --git a/Externals/SoundTouch/TDStretch.h b/Externals/SoundTouch/TDStretch.h new file mode 100644 index 0000000000..6d6e7359ff --- /dev/null +++ b/Externals/SoundTouch/TDStretch.h @@ -0,0 +1,268 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo +/// while maintaining the original pitch by using a time domain WSOLA-like method +/// with several performance-increasing tweaks. +/// +/// Note : MMX/SSE optimized functions reside in separate, platform-specific files +/// 'mmx_optimized.cpp' and 'sse_optimized.cpp' +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-04-01 22:49:30 +0300 (Sun, 01 Apr 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: TDStretch.h 137 2012-04-01 19:49:30Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef TDStretch_H +#define TDStretch_H + +#include +#include "STTypes.h" +#include "RateTransposer.h" +#include "FIFOSamplePipe.h" + +namespace soundtouch +{ + +/// Default values for sound processing parameters: +/// Notice that the default parameters are tuned for contemporary popular music +/// processing. For speech processing applications these parameters suit better: +/// #define DEFAULT_SEQUENCE_MS 40 +/// #define DEFAULT_SEEKWINDOW_MS 15 +/// #define DEFAULT_OVERLAP_MS 8 +/// + +/// Default length of a single processing sequence, in milliseconds. This determines to how +/// long sequences the original sound is chopped in the time-stretch algorithm. +/// +/// The larger this value is, the lesser sequences are used in processing. In principle +/// a bigger value sounds better when slowing down tempo, but worse when increasing tempo +/// and vice versa. +/// +/// Increasing this value reduces computational burden & vice versa. +//#define DEFAULT_SEQUENCE_MS 40 +#define DEFAULT_SEQUENCE_MS USE_AUTO_SEQUENCE_LEN + +/// Giving this value for the sequence length sets automatic parameter value +/// according to tempo setting (recommended) +#define USE_AUTO_SEQUENCE_LEN 0 + +/// Seeking window default length in milliseconds for algorithm that finds the best possible +/// overlapping location. This determines from how wide window the algorithm may look for an +/// optimal joining location when mixing the sound sequences back together. +/// +/// The bigger this window setting is, the higher the possibility to find a better mixing +/// position will become, but at the same time large values may cause a "drifting" artifact +/// because consequent sequences will be taken at more uneven intervals. +/// +/// If there's a disturbing artifact that sounds as if a constant frequency was drifting +/// around, try reducing this setting. +/// +/// Increasing this value increases computational burden & vice versa. +//#define DEFAULT_SEEKWINDOW_MS 15 +#define DEFAULT_SEEKWINDOW_MS USE_AUTO_SEEKWINDOW_LEN + +/// Giving this value for the seek window length sets automatic parameter value +/// according to tempo setting (recommended) +#define USE_AUTO_SEEKWINDOW_LEN 0 + +/// Overlap length in milliseconds. When the chopped sound sequences are mixed back together, +/// to form a continuous sound stream, this parameter defines over how long period the two +/// consecutive sequences are let to overlap each other. +/// +/// This shouldn't be that critical parameter. If you reduce the DEFAULT_SEQUENCE_MS setting +/// by a large amount, you might wish to try a smaller value on this. +/// +/// Increasing this value increases computational burden & vice versa. +#define DEFAULT_OVERLAP_MS 8 + + +/// Class that does the time-stretch (tempo change) effect for the processed +/// sound. +class TDStretch : public FIFOProcessor +{ +protected: + int channels; + int sampleReq; + float tempo; + + SAMPLETYPE *pMidBuffer; + SAMPLETYPE *pMidBufferUnaligned; + int overlapLength; + int seekLength; + int seekWindowLength; + int overlapDividerBits; + int slopingDivider; + float nominalSkip; + float skipFract; + FIFOSampleBuffer outputBuffer; + FIFOSampleBuffer inputBuffer; + BOOL bQuickSeek; + + int sampleRate; + int sequenceMs; + int seekWindowMs; + int overlapMs; + BOOL bAutoSeqSetting; + BOOL bAutoSeekSetting; + + void acceptNewOverlapLength(int newOverlapLength); + + virtual void clearCrossCorrState(); + void calculateOverlapLength(int overlapMs); + + virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare) const; + + virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos); + virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos); + int seekBestOverlapPosition(const SAMPLETYPE *refPos); + + virtual void overlapStereo(SAMPLETYPE *output, const SAMPLETYPE *input) const; + virtual void overlapMono(SAMPLETYPE *output, const SAMPLETYPE *input) const; + + void clearMidBuffer(); + void overlap(SAMPLETYPE *output, const SAMPLETYPE *input, uint ovlPos) const; + + void calcSeqParameters(); + + /// Changes the tempo of the given sound samples. + /// Returns amount of samples returned in the "output" buffer. + /// The maximum amount of samples that can be returned at a time is set by + /// the 'set_returnBuffer_size' function. + void processSamples(); + +public: + TDStretch(); + virtual ~TDStretch(); + + /// Operator 'new' is overloaded so that it automatically creates a suitable instance + /// depending on if we've a MMX/SSE/etc-capable CPU available or not. + static void *operator new(size_t s); + + /// Use this function instead of "new" operator to create a new instance of this class. + /// This function automatically chooses a correct feature set depending on if the CPU + /// supports MMX/SSE/etc extensions. + static TDStretch *newInstance(); + + /// Returns the output buffer object + FIFOSamplePipe *getOutput() { return &outputBuffer; }; + + /// Returns the input buffer object + FIFOSamplePipe *getInput() { return &inputBuffer; }; + + /// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower + /// tempo, larger faster tempo. + void setTempo(float newTempo); + + /// Returns nonzero if there aren't any samples available for outputting. + virtual void clear(); + + /// Clears the input buffer + void clearInput(); + + /// Sets the number of channels, 1 = mono, 2 = stereo + void setChannels(int numChannels); + + /// Enables/disables the quick position seeking algorithm. Zero to disable, + /// nonzero to enable + void enableQuickSeek(BOOL enable); + + /// Returns nonzero if the quick seeking algorithm is enabled. + BOOL isQuickSeekEnabled() const; + + /// Sets routine control parameters. These control are certain time constants + /// defining how the sound is stretched to the desired duration. + // + /// 'sampleRate' = sample rate of the sound + /// 'sequenceMS' = one processing sequence length in milliseconds + /// 'seekwindowMS' = seeking window length for scanning the best overlapping + /// position + /// 'overlapMS' = overlapping length + void setParameters(int sampleRate, ///< Samplerate of sound being processed (Hz) + int sequenceMS = -1, ///< Single processing sequence length (ms) + int seekwindowMS = -1, ///< Offset seeking window length (ms) + int overlapMS = -1 ///< Sequence overlapping length (ms) + ); + + /// Get routine control parameters, see setParameters() function. + /// Any of the parameters to this function can be NULL, in such case corresponding parameter + /// value isn't returned. + void getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const; + + /// Adds 'numsamples' pcs of samples from the 'samples' memory position into + /// the input of the object. + virtual void putSamples( + const SAMPLETYPE *samples, ///< Input sample data + uint numSamples ///< Number of samples in 'samples' so that one sample + ///< contains both channels if stereo + ); + + /// return nominal input sample requirement for triggering a processing batch + int getInputSampleReq() const + { + return (int)(nominalSkip + 0.5); + } + + /// return nominal output sample amount when running a processing batch + int getOutputBatchSize() const + { + return seekWindowLength - overlapLength; + } +}; + + + +// Implementation-specific class declarations: + +#ifdef SOUNDTOUCH_ALLOW_MMX + /// Class that implements MMX optimized routines for 16bit integer samples type. + class TDStretchMMX : public TDStretch + { + protected: + double calcCrossCorr(const short *mixingPos, const short *compare) const; + virtual void overlapStereo(short *output, const short *input) const; + virtual void clearCrossCorrState(); + }; +#endif /// SOUNDTOUCH_ALLOW_MMX + + +#ifdef SOUNDTOUCH_ALLOW_SSE + /// Class that implements SSE optimized routines for floating point samples type. + class TDStretchSSE : public TDStretch + { + protected: + double calcCrossCorr(const float *mixingPos, const float *compare) const; + }; + +#endif /// SOUNDTOUCH_ALLOW_SSE + +} +#endif /// TDStretch_H diff --git a/Externals/SoundTouch/cpu_detect.h b/Externals/SoundTouch/cpu_detect.h new file mode 100644 index 0000000000..7859ffb55d --- /dev/null +++ b/Externals/SoundTouch/cpu_detect.h @@ -0,0 +1,62 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// A header file for detecting the Intel MMX instructions set extension. +/// +/// Please see 'mmx_win.cpp', 'mmx_cpp.cpp' and 'mmx_non_x86.cpp' for the +/// routine implementations for x86 Windows, x86 gnu version and non-x86 +/// platforms, respectively. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $ +// File revision : $Revision: 4 $ +// +// $Id: cpu_detect.h 11 2008-02-10 16:26:55Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef _CPU_DETECT_H_ +#define _CPU_DETECT_H_ + +#include "STTypes.h" + +#define SUPPORT_MMX 0x0001 +#define SUPPORT_3DNOW 0x0002 +#define SUPPORT_ALTIVEC 0x0004 +#define SUPPORT_SSE 0x0008 +#define SUPPORT_SSE2 0x0010 + +/// Checks which instruction set extensions are supported by the CPU. +/// +/// \return A bitmask of supported extensions, see SUPPORT_... defines. +uint detectCPUextensions(void); + +/// Disables given set of instruction extensions. See SUPPORT_... defines. +void disableExtensions(uint wDisableMask); + +#endif // _CPU_DETECT_H_ diff --git a/Externals/SoundTouch/cpu_detect_x86.cpp b/Externals/SoundTouch/cpu_detect_x86.cpp new file mode 100644 index 0000000000..fff3240d8a --- /dev/null +++ b/Externals/SoundTouch/cpu_detect_x86.cpp @@ -0,0 +1,137 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// Generic version of the x86 CPU extension detection routine. +/// +/// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp' +/// for the Microsoft compiler version. +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:44:37 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: cpu_detect_x86.cpp 159 2012-11-08 18:44:37Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "cpu_detect.h" +#include "STTypes.h" + +#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + + #if defined(__GNUC__) && defined(__i386__) + // gcc + #include "cpuid.h" + #elif defined(_M_IX86) + // windows non-gcc + #include + #define bit_MMX (1 << 23) + #define bit_SSE (1 << 25) + #define bit_SSE2 (1 << 26) + #endif + +#endif + + +////////////////////////////////////////////////////////////////////////////// +// +// processor instructions extension detection routines +// +////////////////////////////////////////////////////////////////////////////// + +// Flag variable indicating whick ISA extensions are disabled (for debugging) +static uint _dwDisabledISA = 0x00; // 0xffffffff; //<- use this to disable all extensions + +// Disables given set of instruction extensions. See SUPPORT_... defines. +void disableExtensions(uint dwDisableMask) +{ + _dwDisabledISA = dwDisableMask; +} + + + +/// Checks which instruction set extensions are supported by the CPU. +uint detectCPUextensions(void) +{ +/// If building for a 64bit system (no Itanium) and the user wants optimizations. +/// Return the OR of SUPPORT_{MMX,SSE,SSE2}. 11001 or 0x19. +/// Keep the _dwDisabledISA test (2 more operations, could be eliminated). +#if ((defined(__GNUC__) && defined(__x86_64__)) \ + || defined(_M_X64)) \ + && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + return 0x19 & ~_dwDisabledISA; + +/// If building for a 32bit system and the user wants optimizations. +/// Keep the _dwDisabledISA test (2 more operations, could be eliminated). +#elif ((defined(__GNUC__) && defined(__i386__)) \ + || defined(_M_IX86)) \ + && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS) + + if (_dwDisabledISA == 0xffffffff) return 0; + + uint res = 0; + +#if defined(__GNUC__) + // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support. + uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable. + + // Check if no cpuid support. + if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions. + + if (edx & bit_MMX) res = res | SUPPORT_MMX; + if (edx & bit_SSE) res = res | SUPPORT_SSE; + if (edx & bit_SSE2) res = res | SUPPORT_SSE2; + +#else + // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required + // for __cpuid intrinsic support. + int reg[4] = {-1}; + + // Check if no cpuid support. + __cpuid(reg,0); + if ((unsigned int)reg[0] == 0) return 0; // always disable extensions. + + __cpuid(reg,1); + if ((unsigned int)reg[3] & bit_MMX) res = res | SUPPORT_MMX; + if ((unsigned int)reg[3] & bit_SSE) res = res | SUPPORT_SSE; + if ((unsigned int)reg[3] & bit_SSE2) res = res | SUPPORT_SSE2; + +#endif + + return res & ~_dwDisabledISA; + +#else + +/// One of these is true: +/// 1) We don't want optimizations. +/// 2) Using an unsupported compiler. +/// 3) Running on a non-x86 platform. + return 0; + +#endif +} diff --git a/Externals/SoundTouch/mmx_optimized.cpp b/Externals/SoundTouch/mmx_optimized.cpp new file mode 100644 index 0000000000..0952fd4f84 --- /dev/null +++ b/Externals/SoundTouch/mmx_optimized.cpp @@ -0,0 +1,317 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// MMX optimized routines. All MMX optimized functions have been gathered into +/// this single source code file, regardless to their class or original source +/// code file, in order to ease porting the library to other compiler and +/// processor platforms. +/// +/// The MMX-optimizations are programmed using MMX compiler intrinsics that +/// are supported both by Microsoft Visual C++ and GCC compilers, so this file +/// should compile with both toolsets. +/// +/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ +/// 6.0 processor pack" update to support compiler intrinsic syntax. The update +/// is available for download at Microsoft Developers Network, see here: +/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: mmx_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "STTypes.h" + +#ifdef SOUNDTOUCH_ALLOW_MMX +// MMX routines available only with integer sample type + +using namespace soundtouch; + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of MMX optimized functions of class 'TDStretchMMX' +// +////////////////////////////////////////////////////////////////////////////// + +#include "TDStretch.h" +#include +#include +#include + + +// Calculates cross correlation of two buffers +double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const +{ + const __m64 *pVec1, *pVec2; + __m64 shifter; + __m64 accu, normaccu; + long corr, norm; + int i; + + pVec1 = (__m64*)pV1; + pVec2 = (__m64*)pV2; + + shifter = _m_from_int(overlapDividerBits); + normaccu = accu = _mm_setzero_si64(); + + // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples + // during each round for improved CPU-level parallellization. + for (i = 0; i < channels * overlapLength / 16; i ++) + { + __m64 temp, temp2; + + // dictionary of instructions: + // _m_pmaddwd : 4*16bit multiply-add, resulting two 32bits = [a0*b0+a1*b1 ; a2*b2+a3*b3] + // _mm_add_pi32 : 2*32bit add + // _m_psrad : 32bit right-shift + + temp = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]), + _mm_madd_pi16(pVec1[1], pVec2[1])); + temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]), + _mm_madd_pi16(pVec1[1], pVec1[1])); + accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter)); + normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter)); + + temp = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]), + _mm_madd_pi16(pVec1[3], pVec2[3])); + temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]), + _mm_madd_pi16(pVec1[3], pVec1[3])); + accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter)); + normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter)); + + pVec1 += 4; + pVec2 += 4; + } + + // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1 + // and finally store the result into the variable "corr" + + accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32)); + corr = _m_to_int(accu); + + normaccu = _mm_add_pi32(normaccu, _mm_srli_si64(normaccu, 32)); + norm = _m_to_int(normaccu); + + // Clear MMS state + _m_empty(); + + // Normalize result by dividing by sqrt(norm) - this step is easiest + // done using floating point operation + if (norm == 0) norm = 1; // to avoid div by zero + + return (double)corr / sqrt((double)norm); + // Note: Warning about the missing EMMS instruction is harmless + // as it'll be called elsewhere. +} + + + +void TDStretchMMX::clearCrossCorrState() +{ + // Clear MMS state + _m_empty(); + //_asm EMMS; +} + + + +// MMX-optimized version of the function overlapStereo +void TDStretchMMX::overlapStereo(short *output, const short *input) const +{ + const __m64 *pVinput, *pVMidBuf; + __m64 *pVdest; + __m64 mix1, mix2, adder, shifter; + int i; + + pVinput = (const __m64*)input; + pVMidBuf = (const __m64*)pMidBuffer; + pVdest = (__m64*)output; + + // mix1 = mixer values for 1st stereo sample + // mix1 = mixer values for 2nd stereo sample + // adder = adder for updating mixer values after each round + + mix1 = _mm_set_pi16(0, overlapLength, 0, overlapLength); + adder = _mm_set_pi16(1, -1, 1, -1); + mix2 = _mm_add_pi16(mix1, adder); + adder = _mm_add_pi16(adder, adder); + + // Overlaplength-division by shifter. "+1" is to account for "-1" deduced in + // overlapDividerBits calculation earlier. + shifter = _m_from_int(overlapDividerBits + 1); + + for (i = 0; i < overlapLength / 4; i ++) + { + __m64 temp1, temp2; + + // load & shuffle data so that input & mixbuffer data samples are paired + temp1 = _mm_unpacklo_pi16(pVMidBuf[0], pVinput[0]); // = i0l m0l i0r m0r + temp2 = _mm_unpackhi_pi16(pVMidBuf[0], pVinput[0]); // = i1l m1l i1r m1r + + // temp = (temp .* mix) >> shifter + temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter); + temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter); + pVdest[0] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit + + // update mix += adder + mix1 = _mm_add_pi16(mix1, adder); + mix2 = _mm_add_pi16(mix2, adder); + + // --- second round begins here --- + + // load & shuffle data so that input & mixbuffer data samples are paired + temp1 = _mm_unpacklo_pi16(pVMidBuf[1], pVinput[1]); // = i2l m2l i2r m2r + temp2 = _mm_unpackhi_pi16(pVMidBuf[1], pVinput[1]); // = i3l m3l i3r m3r + + // temp = (temp .* mix) >> shifter + temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter); + temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter); + pVdest[1] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit + + // update mix += adder + mix1 = _mm_add_pi16(mix1, adder); + mix2 = _mm_add_pi16(mix2, adder); + + pVinput += 2; + pVMidBuf += 2; + pVdest += 2; + } + + _m_empty(); // clear MMS state +} + + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of MMX optimized functions of class 'FIRFilter' +// +////////////////////////////////////////////////////////////////////////////// + +#include "FIRFilter.h" + + +FIRFilterMMX::FIRFilterMMX() : FIRFilter() +{ + filterCoeffsUnalign = NULL; +} + + +FIRFilterMMX::~FIRFilterMMX() +{ + delete[] filterCoeffsUnalign; +} + + +// (overloaded) Calculates filter coefficients for MMX routine +void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor) +{ + uint i; + FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor); + + // Ensure that filter coeffs array is aligned to 16-byte boundary + delete[] filterCoeffsUnalign; + filterCoeffsUnalign = new short[2 * newLength + 8]; + filterCoeffsAlign = (short *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign); + + // rearrange the filter coefficients for mmx routines + for (i = 0;i < length; i += 4) + { + filterCoeffsAlign[2 * i + 0] = coeffs[i + 0]; + filterCoeffsAlign[2 * i + 1] = coeffs[i + 2]; + filterCoeffsAlign[2 * i + 2] = coeffs[i + 0]; + filterCoeffsAlign[2 * i + 3] = coeffs[i + 2]; + + filterCoeffsAlign[2 * i + 4] = coeffs[i + 1]; + filterCoeffsAlign[2 * i + 5] = coeffs[i + 3]; + filterCoeffsAlign[2 * i + 6] = coeffs[i + 1]; + filterCoeffsAlign[2 * i + 7] = coeffs[i + 3]; + } +} + + + +// mmx-optimized version of the filter routine for stereo sound +uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const +{ + // Create stack copies of the needed member variables for asm routines : + uint i, j; + __m64 *pVdest = (__m64*)dest; + + if (length < 2) return 0; + + for (i = 0; i < (numSamples - length) / 2; i ++) + { + __m64 accu1; + __m64 accu2; + const __m64 *pVsrc = (const __m64*)src; + const __m64 *pVfilter = (const __m64*)filterCoeffsAlign; + + accu1 = accu2 = _mm_setzero_si64(); + for (j = 0; j < lengthDiv8 * 2; j ++) + { + __m64 temp1, temp2; + + temp1 = _mm_unpacklo_pi16(pVsrc[0], pVsrc[1]); // = l2 l0 r2 r0 + temp2 = _mm_unpackhi_pi16(pVsrc[0], pVsrc[1]); // = l3 l1 r3 r1 + + accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp1, pVfilter[0])); // += l2*f2+l0*f0 r2*f2+r0*f0 + accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp2, pVfilter[1])); // += l3*f3+l1*f1 r3*f3+r1*f1 + + temp1 = _mm_unpacklo_pi16(pVsrc[1], pVsrc[2]); // = l4 l2 r4 r2 + + accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp2, pVfilter[0])); // += l3*f2+l1*f0 r3*f2+r1*f0 + accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp1, pVfilter[1])); // += l4*f3+l2*f1 r4*f3+r2*f1 + + // accu1 += l2*f2+l0*f0 r2*f2+r0*f0 + // += l3*f3+l1*f1 r3*f3+r1*f1 + + // accu2 += l3*f2+l1*f0 r3*f2+r1*f0 + // l4*f3+l2*f1 r4*f3+r2*f1 + + pVfilter += 2; + pVsrc += 2; + } + // accu >>= resultDivFactor + accu1 = _mm_srai_pi32(accu1, resultDivFactor); + accu2 = _mm_srai_pi32(accu2, resultDivFactor); + + // pack 2*2*32bits => 4*16 bits + pVdest[0] = _mm_packs_pi32(accu1, accu2); + src += 4; + pVdest ++; + } + + _m_empty(); // clear emms state + + return (numSamples & 0xfffffffe) - length; +} + +#endif // SOUNDTOUCH_ALLOW_MMX diff --git a/Externals/SoundTouch/sse_optimized.cpp b/Externals/SoundTouch/sse_optimized.cpp new file mode 100644 index 0000000000..ffb6706288 --- /dev/null +++ b/Externals/SoundTouch/sse_optimized.cpp @@ -0,0 +1,361 @@ +//////////////////////////////////////////////////////////////////////////////// +/// +/// SSE optimized routines for Pentium-III, Athlon-XP and later CPUs. All SSE +/// optimized functions have been gathered into this single source +/// code file, regardless to their class or original source code file, in order +/// to ease porting the library to other compiler and processor platforms. +/// +/// The SSE-optimizations are programmed using SSE compiler intrinsics that +/// are supported both by Microsoft Visual C++ and GCC compilers, so this file +/// should compile with both toolsets. +/// +/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ +/// 6.0 processor pack" update to support SSE instruction set. The update is +/// available for download at Microsoft Developers Network, see here: +/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx +/// +/// If the above URL is expired or removed, go to "http://msdn.microsoft.com" and +/// perform a search with keywords "processor pack". +/// +/// Author : Copyright (c) Olli Parviainen +/// Author e-mail : oparviai 'at' iki.fi +/// SoundTouch WWW: http://www.surina.net/soundtouch +/// +//////////////////////////////////////////////////////////////////////////////// +// +// Last changed : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $ +// File revision : $Revision: 4 $ +// +// $Id: sse_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $ +// +//////////////////////////////////////////////////////////////////////////////// +// +// License : +// +// SoundTouch audio processing library +// Copyright (c) Olli Parviainen +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +//////////////////////////////////////////////////////////////////////////////// + +#include "cpu_detect.h" +#include "STTypes.h" + +using namespace soundtouch; + +#ifdef SOUNDTOUCH_ALLOW_SSE + +// SSE routines available only with float sample type + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of SSE optimized functions of class 'TDStretchSSE' +// +////////////////////////////////////////////////////////////////////////////// + +#include "TDStretch.h" +#include +#include + +// Calculates cross correlation of two buffers +double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const +{ + int i; + const float *pVec1; + const __m128 *pVec2; + __m128 vSum, vNorm; + + // Note. It means a major slow-down if the routine needs to tolerate + // unaligned __m128 memory accesses. It's way faster if we can skip + // unaligned slots and use _mm_load_ps instruction instead of _mm_loadu_ps. + // This can mean up to ~ 10-fold difference (incl. part of which is + // due to skipping every second round for stereo sound though). + // + // Compile-time define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION is provided + // for choosing if this little cheating is allowed. + +#ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION + // Little cheating allowed, return valid correlation only for + // aligned locations, meaning every second round for stereo sound. + + #define _MM_LOAD _mm_load_ps + + if (((ulongptr)pV1) & 15) return -1e50; // skip unaligned locations + +#else + // No cheating allowed, use unaligned load & take the resulting + // performance hit. + #define _MM_LOAD _mm_loadu_ps +#endif + + // ensure overlapLength is divisible by 8 + assert((overlapLength % 8) == 0); + + // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors + // Note: pV2 _must_ be aligned to 16-bit boundary, pV1 need not. + pVec1 = (const float*)pV1; + pVec2 = (const __m128*)pV2; + vSum = vNorm = _mm_setzero_ps(); + + // Unroll the loop by factor of 4 * 4 operations. Use same routine for + // stereo & mono, for mono it just means twice the amount of unrolling. + for (i = 0; i < channels * overlapLength / 16; i ++) + { + __m128 vTemp; + // vSum += pV1[0..3] * pV2[0..3] + vTemp = _MM_LOAD(pVec1); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp ,pVec2[0])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[4..7] * pV2[4..7] + vTemp = _MM_LOAD(pVec1 + 4); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[1])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[8..11] * pV2[8..11] + vTemp = _MM_LOAD(pVec1 + 8); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[2])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + // vSum += pV1[12..15] * pV2[12..15] + vTemp = _MM_LOAD(pVec1 + 12); + vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[3])); + vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp)); + + pVec1 += 16; + pVec2 += 4; + } + + // return value = vSum[0] + vSum[1] + vSum[2] + vSum[3] + float *pvNorm = (float*)&vNorm; + double norm = sqrt(pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]); + if (norm < 1e-9) norm = 1.0; // to avoid div by zero + + float *pvSum = (float*)&vSum; + return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / norm; + + /* This is approximately corresponding routine in C-language yet without normalization: + double corr, norm; + uint i; + + // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors + corr = norm = 0.0; + for (i = 0; i < channels * overlapLength / 16; i ++) + { + corr += pV1[0] * pV2[0] + + pV1[1] * pV2[1] + + pV1[2] * pV2[2] + + pV1[3] * pV2[3] + + pV1[4] * pV2[4] + + pV1[5] * pV2[5] + + pV1[6] * pV2[6] + + pV1[7] * pV2[7] + + pV1[8] * pV2[8] + + pV1[9] * pV2[9] + + pV1[10] * pV2[10] + + pV1[11] * pV2[11] + + pV1[12] * pV2[12] + + pV1[13] * pV2[13] + + pV1[14] * pV2[14] + + pV1[15] * pV2[15]; + + for (j = 0; j < 15; j ++) norm += pV1[j] * pV1[j]; + + pV1 += 16; + pV2 += 16; + } + return corr / sqrt(norm); + */ +} + + +////////////////////////////////////////////////////////////////////////////// +// +// implementation of SSE optimized functions of class 'FIRFilter' +// +////////////////////////////////////////////////////////////////////////////// + +#include "FIRFilter.h" + +FIRFilterSSE::FIRFilterSSE() : FIRFilter() +{ + filterCoeffsAlign = NULL; + filterCoeffsUnalign = NULL; +} + + +FIRFilterSSE::~FIRFilterSSE() +{ + delete[] filterCoeffsUnalign; + filterCoeffsAlign = NULL; + filterCoeffsUnalign = NULL; +} + + +// (overloaded) Calculates filter coefficients for SSE routine +void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor) +{ + uint i; + float fDivider; + + FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor); + + // Scale the filter coefficients so that it won't be necessary to scale the filtering result + // also rearrange coefficients suitably for SSE + // Ensure that filter coeffs array is aligned to 16-byte boundary + delete[] filterCoeffsUnalign; + filterCoeffsUnalign = new float[2 * newLength + 4]; + filterCoeffsAlign = (float *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign); + + fDivider = (float)resultDivider; + + // rearrange the filter coefficients for mmx routines + for (i = 0; i < newLength; i ++) + { + filterCoeffsAlign[2 * i + 0] = + filterCoeffsAlign[2 * i + 1] = coeffs[i + 0] / fDivider; + } +} + + + +// SSE-optimized version of the filter routine for stereo sound +uint FIRFilterSSE::evaluateFilterStereo(float *dest, const float *source, uint numSamples) const +{ + int count = (int)((numSamples - length) & (uint)-2); + int j; + + assert(count % 2 == 0); + + if (count < 2) return 0; + + assert(source != NULL); + assert(dest != NULL); + assert((length % 8) == 0); + assert(filterCoeffsAlign != NULL); + assert(((ulongptr)filterCoeffsAlign) % 16 == 0); + + // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2' + for (j = 0; j < count; j += 2) + { + const float *pSrc; + const __m128 *pFil; + __m128 sum1, sum2; + uint i; + + pSrc = (const float*)source; // source audio data + pFil = (const __m128*)filterCoeffsAlign; // filter coefficients. NOTE: Assumes coefficients + // are aligned to 16-byte boundary + sum1 = sum2 = _mm_setzero_ps(); + + for (i = 0; i < length / 8; i ++) + { + // Unroll loop for efficiency & calculate filter for 2*2 stereo samples + // at each pass + + // sum1 is accu for 2*2 filtered stereo sound data at the primary sound data offset + // sum2 is accu for 2*2 filtered stereo sound data for the next sound sample offset. + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc) , pFil[0])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 2), pFil[0])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 4), pFil[1])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 6), pFil[1])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 8) , pFil[2])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 10), pFil[2])); + + sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 12), pFil[3])); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 14), pFil[3])); + + pSrc += 16; + pFil += 4; + } + + // Now sum1 and sum2 both have a filtered 2-channel sample each, but we still need + // to sum the two hi- and lo-floats of these registers together. + + // post-shuffle & add the filtered values and store to dest. + _mm_storeu_ps(dest, _mm_add_ps( + _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(1,0,3,2)), // s2_1 s2_0 s1_3 s1_2 + _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(3,2,1,0)) // s2_3 s2_2 s1_1 s1_0 + )); + source += 4; + dest += 4; + } + + // Ideas for further improvement: + // 1. If it could be guaranteed that 'source' were always aligned to 16-byte + // boundary, a faster aligned '_mm_load_ps' instruction could be used. + // 2. If it could be guaranteed that 'dest' were always aligned to 16-byte + // boundary, a faster '_mm_store_ps' instruction could be used. + + return (uint)count; + + /* original routine in C-language. please notice the C-version has differently + organized coefficients though. + double suml1, suml2; + double sumr1, sumr2; + uint i, j; + + for (j = 0; j < count; j += 2) + { + const float *ptr; + const float *pFil; + + suml1 = sumr1 = 0.0; + suml2 = sumr2 = 0.0; + ptr = src; + pFil = filterCoeffs; + for (i = 0; i < lengthLocal; i ++) + { + // unroll loop for efficiency. + + suml1 += ptr[0] * pFil[0] + + ptr[2] * pFil[2] + + ptr[4] * pFil[4] + + ptr[6] * pFil[6]; + + sumr1 += ptr[1] * pFil[1] + + ptr[3] * pFil[3] + + ptr[5] * pFil[5] + + ptr[7] * pFil[7]; + + suml2 += ptr[8] * pFil[0] + + ptr[10] * pFil[2] + + ptr[12] * pFil[4] + + ptr[14] * pFil[6]; + + sumr2 += ptr[9] * pFil[1] + + ptr[11] * pFil[3] + + ptr[13] * pFil[5] + + ptr[15] * pFil[7]; + + ptr += 16; + pFil += 8; + } + dest[0] = (float)suml1; + dest[1] = (float)sumr1; + dest[2] = (float)suml2; + dest[3] = (float)sumr2; + + src += 4; + dest += 4; + } + */ +} + +#endif // SOUNDTOUCH_ALLOW_SSE diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 4bcee7559b..85608330dd 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -115,8 +115,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) @@ -127,8 +127,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + SoundTouchD.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) @@ -141,8 +141,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) @@ -155,8 +155,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win32;%(AdditionalLibraryDirectories) + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win32;..\..\..\Externals\SoundTouch\Win32;%(AdditionalLibraryDirectories) @@ -169,8 +169,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) @@ -183,8 +183,8 @@ true - OpenAL32.lib;dsound.lib;dxerr.lib - ..\..\..\Externals\OpenAL\Win64;%(AdditionalLibraryDirectories) + SoundTouch.lib;OpenAL32.lib;dsound.lib;dxerr.lib + ..\..\..\Externals\OpenAL\Win64;..\..\..\Externals\SoundTouch\Win64;%(AdditionalLibraryDirectories) diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h index da456d5bf7..c1a387cf49 100644 --- a/Source/Core/AudioCommon/Src/Mixer.h +++ b/Source/Core/AudioCommon/Src/Mixer.h @@ -92,6 +92,9 @@ public: std::mutex& MixerCritical() { return m_csMixing; } + volatile float GetCurrentSpeed() const { return m_speed; } + void UpdateSpeed(volatile float val) { m_speed = val; } + protected: unsigned int m_sampleRate; unsigned int m_aiSampleRate; @@ -113,6 +116,8 @@ protected: bool m_AIplaying; std::mutex m_csMixing; + + volatile float m_speed; // Current rate of the emulation (1.0 = 100% speed) private: }; diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 4cc64a17de..6f429db495 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -19,11 +19,12 @@ #include "aldlist.h" #include "OpenALStream.h" -#include "../../Core/Src/HW/SystemTimers.h" -#include "../../Core/Src/HW/AudioInterface.h" #if defined HAVE_OPENAL && HAVE_OPENAL +using namespace soundtouch; +SoundTouch soundTouch; + // // AyuanX: Spec says OpenAL1.1 is thread safe already // @@ -67,6 +68,7 @@ bool OpenALStream::Start() PanicAlertT("OpenAL: can't find sound devices"); } + soundTouch.clear(); return bReturn; } @@ -76,6 +78,8 @@ void OpenALStream::Stop() // kick the thread if it's waiting soundSyncEvent.Set(); + soundTouch.clear(); + thread.join(); alSourceStop(uiSource); @@ -105,6 +109,7 @@ void OpenALStream::SetVolume(int volume) void OpenALStream::Update() { soundSyncEvent.Set(); + mainSyncEvent.Wait(); } void OpenALStream::Clear(bool mute) @@ -113,6 +118,7 @@ void OpenALStream::Clear(bool mute) if(m_muted) { + soundTouch.clear(); alSourceStop(uiSource); } else @@ -136,9 +142,10 @@ void OpenALStream::SoundLoop() alGenSources(1, &uiSource); // Short Silence + memset(sampleBuffer, 0, OAL_MAX_SAMPLES * 4 * OAL_NUM_BUFFERS); memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4); for (int i = 0; i < OAL_NUM_BUFFERS; i++) - alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES, ulFrequency); + alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, OAL_MAX_SAMPLES * 4, ulFrequency); alSourceQueueBuffers(uiSource, OAL_NUM_BUFFERS, uiBuffers); alSourcePlay(uiSource); @@ -152,42 +159,68 @@ void OpenALStream::SoundLoop() ALint iBuffersProcessed = 0; ALuint uiBufferTemp[OAL_NUM_BUFFERS] = {0}; + soundTouch.setChannels(2); + soundTouch.setSampleRate(ulFrequency); + soundTouch.setSetting(SETTING_USE_QUICKSEEK, 0); + soundTouch.setSetting(SETTING_USE_AA_FILTER, 0); + soundTouch.setSetting(SETTING_SEQUENCE_MS, 1); + soundTouch.setSetting(SETTING_SEEKWINDOW_MS, 28); + soundTouch.setSetting(SETTING_OVERLAP_MS, 12); + while (!threadData) { + // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. + const u32 stereo_16_bit_size = 4; + const u32 dma_length = 32; + const u64 ais_samples_per_second = 48000 * stereo_16_bit_size; + u64 audio_dma_period = SystemTimers::GetTicksPerSecond() / (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length); + u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); + + unsigned int numSamples = (unsigned int)num_samples_to_render; + + numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; + numSamples = m_mixer->Mix(realtimeBuffer, numSamples); + soundTouch.putSamples(realtimeBuffer, numSamples); + if (iBuffersProcessed == iBuffersFilled) { alGetSourcei(uiSource, AL_BUFFERS_PROCESSED, &iBuffersProcessed); iBuffersFilled = 0; } - // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. - const u32 stereo_16_bit_size = 4; - const u32 dma_length = 32; - const u64 audio_dma_period = SystemTimers::GetTicksPerSecond() / (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length); - const u64 ais_samples_per_second = 48000 * stereo_16_bit_size; - const u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); - - unsigned int numSamples = (unsigned int)num_samples_to_render; - if (iBuffersProcessed) { - numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples; - // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) - if (iBuffersFilled == 0) - alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp); + float rate = m_mixer->GetCurrentSpeed(); + if (rate <= 0) + { + Core::RequestRefreshInfo(); + rate = m_mixer->GetCurrentSpeed(); + } + if (rate > 0) + { + // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio + soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)pow(1 / rate, 2)); + soundTouch.setTempo(rate); + } + unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS); + if (nSamples > 0) + { + // Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer) + if (iBuffersFilled == 0) + alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp); + alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, sampleBuffer, nSamples * 4, ulFrequency); + alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); + iBuffersFilled++; - m_mixer->Mix(realtimeBuffer, numSamples); - alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, realtimeBuffer, numSamples * 4, ulFrequency); - alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]); - iBuffersFilled++; - - if (iBuffersFilled == OAL_NUM_BUFFERS) - alSourcePlay(uiSource); + if (iBuffersFilled == OAL_NUM_BUFFERS) + alSourcePlay(uiSource); + } } else { soundSyncEvent.Wait(); } + mainSyncEvent.Set(); } } diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index a9c1f51399..c6dfe519ae 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -34,10 +34,16 @@ #include #endif +#include "../../Core/Src/Core.h" +#include "../../Core/Src/HW/SystemTimers.h" +#include "../../Core/Src/HW/AudioInterface.h" +#include "../../../../Externals/SoundTouch/STTypes.h" +#include "../../../../Externals/SoundTouch/SoundTouch.h" + // 16 bit Stereo #define SFX_MAX_SOURCE 1 #define OAL_NUM_BUFFERS 16 -#define OAL_MAX_SAMPLES 512 // AyuanX: Don't make it too large, as larger buffer means longer delay +#define OAL_MAX_SAMPLES 512 #endif class OpenALStream: public SoundStream @@ -63,8 +69,10 @@ public: private: std::thread thread; Common::Event soundSyncEvent; - + Common::Event mainSyncEvent; + short realtimeBuffer[OAL_MAX_SAMPLES * 2]; + soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS]; ALuint uiBuffers[OAL_NUM_BUFFERS]; ALuint uiSource; ALfloat fVolume; diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index e92b9088bc..c06755a90b 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -683,7 +683,14 @@ void VideoThrottle() SMessage; // Show message - g_video_backend->UpdateFPSDisplay(SMessage.c_str()); + g_video_backend->UpdateFPSDisplay(SMessage.c_str()); + + // Update the audio timestretcher with the current speed + if (soundStream) + { + CMixer* pMixer = soundStream->GetMixer(); + pMixer->UpdateSpeed((float)Speed / 100); + } if (_CoreParameter.bRenderToMain && SConfig::GetInstance().m_InterfaceStatusbar) { diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index 041f6c95bb..a65ba2e894 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -108,6 +108,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\SoundTouch\SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -382,6 +384,18 @@ Global {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.Build.0 = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.Build.0 = Debug|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.ActiveCfg = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.Build.0 = Debug|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.ActiveCfg = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.Build.0 = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.Build.0 = Release|Win32 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64 + {68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 91fe5cc821b0532154dc5a8a34869f13284394c5 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 9 Jan 2013 23:45:13 +1100 Subject: [PATCH 344/627] Build fix Added SoundTouch as a dependency of AudioCommon. Removed the "soundtouch_config.h" include on Linux and OSX. --- Externals/SoundTouch/STTypes.h | 2 +- Source/Core/AudioCommon/AudioCommon.vcxproj | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Externals/SoundTouch/STTypes.h b/Externals/SoundTouch/STTypes.h index 24828f3295..ad9efedb5f 100644 --- a/Externals/SoundTouch/STTypes.h +++ b/Externals/SoundTouch/STTypes.h @@ -57,7 +57,7 @@ typedef unsigned long ulong; #if (defined(__GNUC__) && !defined(ANDROID)) // In GCC, include soundtouch_config.h made by config scritps. // Skip this in Android compilation that uses GCC but without configure scripts. - #include "soundtouch_config.h" + //#include "soundtouch_config.h" #endif #ifndef _WINDEF_ diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 85608330dd..5a6896f5e2 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -216,6 +216,14 @@ + + {68a5dd20-7057-448b-8fe0-b6ac8d205509} + true + true + false + true + false + {c87a4178-44f6-49b2-b7aa-c79af1b8c534} true From 8494a439c74bdd2eed60d7aba678761c1a8a7284 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 10 Jan 2013 00:06:35 +1100 Subject: [PATCH 345/627] OSX build fix --- Externals/SoundTouch/STTypes.h | 4 ++-- Externals/SoundTouch/cpu_detect_x86.cpp | 6 +++--- Source/Core/AudioCommon/Src/OpenALStream.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Externals/SoundTouch/STTypes.h b/Externals/SoundTouch/STTypes.h index ad9efedb5f..8542556e5b 100644 --- a/Externals/SoundTouch/STTypes.h +++ b/Externals/SoundTouch/STTypes.h @@ -62,9 +62,9 @@ typedef unsigned long ulong; #ifndef _WINDEF_ // if these aren't defined already by Windows headers, define now - +#if !defined(__APPLE__) typedef int BOOL; - +#endif #define FALSE 0 #define TRUE 1 diff --git a/Externals/SoundTouch/cpu_detect_x86.cpp b/Externals/SoundTouch/cpu_detect_x86.cpp index fff3240d8a..1103adab57 100644 --- a/Externals/SoundTouch/cpu_detect_x86.cpp +++ b/Externals/SoundTouch/cpu_detect_x86.cpp @@ -50,11 +50,11 @@ #elif defined(_M_IX86) // windows non-gcc #include - #define bit_MMX (1 << 23) - #define bit_SSE (1 << 25) - #define bit_SSE2 (1 << 26) #endif + #define bit_MMX (1 << 23) + #define bit_SSE (1 << 25) + #define bit_SSE2 (1 << 26) #endif diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 6f429db495..85685b42cb 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -199,7 +199,7 @@ void OpenALStream::SoundLoop() if (rate > 0) { // Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio - soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)pow(1 / rate, 2)); + soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate))); soundTouch.setTempo(rate); } unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * 2 * OAL_NUM_BUFFERS); From 7600cf106bdc6cde7d63dd325764d41707d5376a Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 10 Jan 2013 00:24:42 +1100 Subject: [PATCH 346/627] OSX: typedef signed char BOOL --- Externals/SoundTouch/STTypes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Externals/SoundTouch/STTypes.h b/Externals/SoundTouch/STTypes.h index 8542556e5b..28f0ee9110 100644 --- a/Externals/SoundTouch/STTypes.h +++ b/Externals/SoundTouch/STTypes.h @@ -62,7 +62,9 @@ typedef unsigned long ulong; #ifndef _WINDEF_ // if these aren't defined already by Windows headers, define now -#if !defined(__APPLE__) +#if defined(__APPLE__) + typedef signed char BOOL; +#else typedef int BOOL; #endif #define FALSE 0 From 01f4d9f386d225675d12cea7fedc1144dd2e02d4 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 9 Jan 2013 10:26:12 -0600 Subject: [PATCH 347/627] Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup. --- CMakeLists.txt | 24 ++++++++++--------- .../{SoundTouch => soundtouch}/AAFilter.cpp | 0 .../{SoundTouch => soundtouch}/AAFilter.h | 0 .../{SoundTouch => soundtouch}/BPMDetect.cpp | 0 .../{SoundTouch => soundtouch}/BPMDetect.h | 0 .../{SoundTouch => soundtouch}/CMakeLists.txt | 0 .../FIFOSampleBuffer.cpp | 0 .../FIFOSampleBuffer.h | 0 .../FIFOSamplePipe.h | 0 .../{SoundTouch => soundtouch}/FIRFilter.cpp | 0 .../{SoundTouch => soundtouch}/FIRFilter.h | 0 .../{SoundTouch => soundtouch}/PeakFinder.cpp | 0 .../{SoundTouch => soundtouch}/PeakFinder.h | 0 .../RateTransposer.cpp | 0 .../RateTransposer.h | 0 .../{SoundTouch => soundtouch}/STTypes.h | 0 .../{SoundTouch => soundtouch}/SoundTouch.cpp | 0 .../{SoundTouch => soundtouch}/SoundTouch.h | 0 .../SoundTouch.vcxproj | 0 .../SoundTouch.vcxproj.filters | 0 .../{SoundTouch => soundtouch}/TDStretch.cpp | 0 .../{SoundTouch => soundtouch}/TDStretch.h | 0 .../{SoundTouch => soundtouch}/cpu_detect.h | 0 .../cpu_detect_x86.cpp | 0 .../mmx_optimized.cpp | 0 .../sse_optimized.cpp | 0 Source/Core/AudioCommon/CMakeLists.txt | 2 +- Source/Core/AudioCommon/Src/OpenALStream.cpp | 3 +-- Source/Core/AudioCommon/Src/OpenALStream.h | 10 ++++---- 29 files changed, 20 insertions(+), 19 deletions(-) rename Externals/{SoundTouch => soundtouch}/AAFilter.cpp (100%) rename Externals/{SoundTouch => soundtouch}/AAFilter.h (100%) rename Externals/{SoundTouch => soundtouch}/BPMDetect.cpp (100%) rename Externals/{SoundTouch => soundtouch}/BPMDetect.h (100%) rename Externals/{SoundTouch => soundtouch}/CMakeLists.txt (100%) rename Externals/{SoundTouch => soundtouch}/FIFOSampleBuffer.cpp (100%) rename Externals/{SoundTouch => soundtouch}/FIFOSampleBuffer.h (100%) rename Externals/{SoundTouch => soundtouch}/FIFOSamplePipe.h (100%) rename Externals/{SoundTouch => soundtouch}/FIRFilter.cpp (100%) rename Externals/{SoundTouch => soundtouch}/FIRFilter.h (100%) rename Externals/{SoundTouch => soundtouch}/PeakFinder.cpp (100%) rename Externals/{SoundTouch => soundtouch}/PeakFinder.h (100%) rename Externals/{SoundTouch => soundtouch}/RateTransposer.cpp (100%) rename Externals/{SoundTouch => soundtouch}/RateTransposer.h (100%) rename Externals/{SoundTouch => soundtouch}/STTypes.h (100%) rename Externals/{SoundTouch => soundtouch}/SoundTouch.cpp (100%) rename Externals/{SoundTouch => soundtouch}/SoundTouch.h (100%) rename Externals/{SoundTouch => soundtouch}/SoundTouch.vcxproj (100%) rename Externals/{SoundTouch => soundtouch}/SoundTouch.vcxproj.filters (100%) rename Externals/{SoundTouch => soundtouch}/TDStretch.cpp (100%) rename Externals/{SoundTouch => soundtouch}/TDStretch.h (100%) rename Externals/{SoundTouch => soundtouch}/cpu_detect.h (100%) rename Externals/{SoundTouch => soundtouch}/cpu_detect_x86.cpp (100%) rename Externals/{SoundTouch => soundtouch}/mmx_optimized.cpp (100%) rename Externals/{SoundTouch => soundtouch}/sse_optimized.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f286cb3502..235c5fa206 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,6 +405,19 @@ else() set(LZO lzo2) endif() +if(OPENAL_FOUND) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET) + endif() + if (SOUNDTOUCH_FOUND) + message("Using shared soundtouch") + else() + message("Using static soundtouch from Externals") + add_subdirectory(Externals/soundtouch) + include_directories(Externals/soundtouch) + endif() +endif() + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindSDL2 OPTIONAL) endif() @@ -452,17 +465,6 @@ else() include_directories(Externals/SOIL) endif() -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - check_lib(SoundTouch SoundTouch SoundTouch.h QUIET) -endif() -if(SOUNDTOUCH_FOUND) - message("Using shared SoundTouch") -else() - message("Using static SoundTouch from Externals") - add_subdirectory(Externals/SoundTouch) - include_directories(Externals/SoundTouch) -endif() - # If zlib has already been found on a previous run of cmake don't check again # as the check seems to take a long time. if(NOT ZLIB_FOUND) diff --git a/Externals/SoundTouch/AAFilter.cpp b/Externals/soundtouch/AAFilter.cpp similarity index 100% rename from Externals/SoundTouch/AAFilter.cpp rename to Externals/soundtouch/AAFilter.cpp diff --git a/Externals/SoundTouch/AAFilter.h b/Externals/soundtouch/AAFilter.h similarity index 100% rename from Externals/SoundTouch/AAFilter.h rename to Externals/soundtouch/AAFilter.h diff --git a/Externals/SoundTouch/BPMDetect.cpp b/Externals/soundtouch/BPMDetect.cpp similarity index 100% rename from Externals/SoundTouch/BPMDetect.cpp rename to Externals/soundtouch/BPMDetect.cpp diff --git a/Externals/SoundTouch/BPMDetect.h b/Externals/soundtouch/BPMDetect.h similarity index 100% rename from Externals/SoundTouch/BPMDetect.h rename to Externals/soundtouch/BPMDetect.h diff --git a/Externals/SoundTouch/CMakeLists.txt b/Externals/soundtouch/CMakeLists.txt similarity index 100% rename from Externals/SoundTouch/CMakeLists.txt rename to Externals/soundtouch/CMakeLists.txt diff --git a/Externals/SoundTouch/FIFOSampleBuffer.cpp b/Externals/soundtouch/FIFOSampleBuffer.cpp similarity index 100% rename from Externals/SoundTouch/FIFOSampleBuffer.cpp rename to Externals/soundtouch/FIFOSampleBuffer.cpp diff --git a/Externals/SoundTouch/FIFOSampleBuffer.h b/Externals/soundtouch/FIFOSampleBuffer.h similarity index 100% rename from Externals/SoundTouch/FIFOSampleBuffer.h rename to Externals/soundtouch/FIFOSampleBuffer.h diff --git a/Externals/SoundTouch/FIFOSamplePipe.h b/Externals/soundtouch/FIFOSamplePipe.h similarity index 100% rename from Externals/SoundTouch/FIFOSamplePipe.h rename to Externals/soundtouch/FIFOSamplePipe.h diff --git a/Externals/SoundTouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp similarity index 100% rename from Externals/SoundTouch/FIRFilter.cpp rename to Externals/soundtouch/FIRFilter.cpp diff --git a/Externals/SoundTouch/FIRFilter.h b/Externals/soundtouch/FIRFilter.h similarity index 100% rename from Externals/SoundTouch/FIRFilter.h rename to Externals/soundtouch/FIRFilter.h diff --git a/Externals/SoundTouch/PeakFinder.cpp b/Externals/soundtouch/PeakFinder.cpp similarity index 100% rename from Externals/SoundTouch/PeakFinder.cpp rename to Externals/soundtouch/PeakFinder.cpp diff --git a/Externals/SoundTouch/PeakFinder.h b/Externals/soundtouch/PeakFinder.h similarity index 100% rename from Externals/SoundTouch/PeakFinder.h rename to Externals/soundtouch/PeakFinder.h diff --git a/Externals/SoundTouch/RateTransposer.cpp b/Externals/soundtouch/RateTransposer.cpp similarity index 100% rename from Externals/SoundTouch/RateTransposer.cpp rename to Externals/soundtouch/RateTransposer.cpp diff --git a/Externals/SoundTouch/RateTransposer.h b/Externals/soundtouch/RateTransposer.h similarity index 100% rename from Externals/SoundTouch/RateTransposer.h rename to Externals/soundtouch/RateTransposer.h diff --git a/Externals/SoundTouch/STTypes.h b/Externals/soundtouch/STTypes.h similarity index 100% rename from Externals/SoundTouch/STTypes.h rename to Externals/soundtouch/STTypes.h diff --git a/Externals/SoundTouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp similarity index 100% rename from Externals/SoundTouch/SoundTouch.cpp rename to Externals/soundtouch/SoundTouch.cpp diff --git a/Externals/SoundTouch/SoundTouch.h b/Externals/soundtouch/SoundTouch.h similarity index 100% rename from Externals/SoundTouch/SoundTouch.h rename to Externals/soundtouch/SoundTouch.h diff --git a/Externals/SoundTouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj similarity index 100% rename from Externals/SoundTouch/SoundTouch.vcxproj rename to Externals/soundtouch/SoundTouch.vcxproj diff --git a/Externals/SoundTouch/SoundTouch.vcxproj.filters b/Externals/soundtouch/SoundTouch.vcxproj.filters similarity index 100% rename from Externals/SoundTouch/SoundTouch.vcxproj.filters rename to Externals/soundtouch/SoundTouch.vcxproj.filters diff --git a/Externals/SoundTouch/TDStretch.cpp b/Externals/soundtouch/TDStretch.cpp similarity index 100% rename from Externals/SoundTouch/TDStretch.cpp rename to Externals/soundtouch/TDStretch.cpp diff --git a/Externals/SoundTouch/TDStretch.h b/Externals/soundtouch/TDStretch.h similarity index 100% rename from Externals/SoundTouch/TDStretch.h rename to Externals/soundtouch/TDStretch.h diff --git a/Externals/SoundTouch/cpu_detect.h b/Externals/soundtouch/cpu_detect.h similarity index 100% rename from Externals/SoundTouch/cpu_detect.h rename to Externals/soundtouch/cpu_detect.h diff --git a/Externals/SoundTouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp similarity index 100% rename from Externals/SoundTouch/cpu_detect_x86.cpp rename to Externals/soundtouch/cpu_detect_x86.cpp diff --git a/Externals/SoundTouch/mmx_optimized.cpp b/Externals/soundtouch/mmx_optimized.cpp similarity index 100% rename from Externals/SoundTouch/mmx_optimized.cpp rename to Externals/soundtouch/mmx_optimized.cpp diff --git a/Externals/SoundTouch/sse_optimized.cpp b/Externals/soundtouch/sse_optimized.cpp similarity index 100% rename from Externals/SoundTouch/sse_optimized.cpp rename to Externals/soundtouch/sse_optimized.cpp diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index be8c58d14a..93547681b0 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -18,7 +18,7 @@ endif(AO_FOUND) if(OPENAL_FOUND) set(SRCS ${SRCS} Src/OpenALStream.cpp Src/aldlist.cpp) - set(LIBS ${LIBS} ${OPENAL_LIBRARY}) + set(LIBS ${LIBS} ${OPENAL_LIBRARY} SoundTouch ) endif(OPENAL_FOUND) if(PULSEAUDIO_FOUND) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp index 85685b42cb..b0c856dcad 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.cpp +++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp @@ -22,8 +22,7 @@ #if defined HAVE_OPENAL && HAVE_OPENAL -using namespace soundtouch; -SoundTouch soundTouch; +soundtouch::SoundTouch soundTouch; // // AyuanX: Spec says OpenAL1.1 is thread safe already diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index c6dfe519ae..6f39c8a49c 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -34,11 +34,11 @@ #include #endif -#include "../../Core/Src/Core.h" -#include "../../Core/Src/HW/SystemTimers.h" -#include "../../Core/Src/HW/AudioInterface.h" -#include "../../../../Externals/SoundTouch/STTypes.h" -#include "../../../../Externals/SoundTouch/SoundTouch.h" +#include "Core.h" +#include "HW/SystemTimers.h" +#include "HW/AudioInterface.h" +#include +#include // 16 bit Stereo #define SFX_MAX_SOURCE 1 From 6b29918ea3f8759b8cb2838a086580c84982a3c6 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 9 Jan 2013 10:42:05 -0600 Subject: [PATCH 348/627] Messed up the static include line --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 235c5fa206..a4f6bb7b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,7 +414,7 @@ if(OPENAL_FOUND) else() message("Using static soundtouch from Externals") add_subdirectory(Externals/soundtouch) - include_directories(Externals/soundtouch) + include_directories(Externals) endif() endif() From e32b1526b334950068cf5f1a7eb29ea6a873274c Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 9 Jan 2013 15:03:43 -0500 Subject: [PATCH 349/627] Allow setting different profiles for different controllers, and automatically use the appropriate profile directory. --- Source/Core/Core/Src/BootManager.cpp | 8 +--- Source/Core/Core/Src/CoreParameter.h | 2 - Source/Core/Core/Src/HW/GCPad.cpp | 2 +- Source/Core/Core/Src/HW/Wiimote.cpp | 2 +- Source/Core/InputCommon/Src/InputConfig.cpp | 51 ++++++++++++++++----- Source/Core/InputCommon/Src/InputConfig.h | 2 +- 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 113a12f761..71148efabc 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -136,11 +136,6 @@ bool BootCore(const std::string& _rFilename) } } - if (game_ini.Exists("Core", "WiiProfile")) - game_ini.Get("Core", "WiiProfile", &StartUp.strWiiControllerProfile); - if (game_ini.Exists("Core", "GCProfile")) - game_ini.Get("Core", "GCProfile", &StartUp.strGCControllerProfile); - // Run the game // Init the core if (!Core::Init()) @@ -158,6 +153,7 @@ void Stop() SCoreStartupParameter& StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter; + StartUp.m_strUniqueID = "00000000"; if (config_cache.valid) { config_cache.valid = false; @@ -173,8 +169,6 @@ void Stop() StartUp.bDSPHLE = config_cache.bDSPHLE; StartUp.bDisableWiimoteSpeaker = config_cache.bDisableWiimoteSpeaker; StartUp.m_strVideoBackend = config_cache.strBackend; - StartUp.strGCControllerProfile = ""; - StartUp.strWiiControllerProfile = ""; VideoBackend::ActivateBackend(StartUp.m_strVideoBackend); } } diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index d5e7537354..8aa6be83e5 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -139,8 +139,6 @@ struct SCoreStartupParameter int iTheme; int iPosX, iPosY, iWidth, iHeight; - std::string strGCControllerProfile; - std::string strWiiControllerProfile; enum EBootBS2 { BOOT_DEFAULT, diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp index 62090dfc4f..c4798b3964 100644 --- a/Source/Core/Core/Src/HW/GCPad.cpp +++ b/Source/Core/Core/Src/HW/GCPad.cpp @@ -56,7 +56,7 @@ void Initialize(void* const hwnd) g_controller_interface.Initialize(); // load the saved controller config - g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strGCControllerProfile); + g_plugin.LoadConfig(true); } void GetStatus(u8 _numPAD, SPADStatus* _pPADStatus) diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp index 4b95677581..59fe8b7fa5 100644 --- a/Source/Core/Core/Src/HW/Wiimote.cpp +++ b/Source/Core/Core/Src/HW/Wiimote.cpp @@ -45,7 +45,7 @@ void Initialize(void* const hwnd) g_controller_interface.SetHwnd(hwnd); g_controller_interface.Initialize(); - g_plugin.LoadConfig(SConfig::GetInstance().m_LocalCoreStartupParameter.strWiiControllerProfile); + g_plugin.LoadConfig(false); WiimoteReal::Initialize(); diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index 19be23ec74..7d1bf11de8 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "InputConfig.h" +#include "../../Core/Src/ConfigManager.h" InputPlugin::~InputPlugin() { @@ -26,25 +27,53 @@ InputPlugin::~InputPlugin() delete *i; } -bool InputPlugin::LoadConfig(std::string ini) +bool InputPlugin::LoadConfig(bool isGC) { IniFile inifile; - std::string ini2 = ini; - if (ini == "") - ini = ini_name; - if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini + ".ini")) + IniFile game_ini; + bool useProfile[4] = {false, false, false, false}; + std::string num[4] = {"1", "2", "3", "4"}; + std::string profile[4]; + + if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000") + { + std::string type; + if (isGC) + type = "GC"; + else + type = "Wii"; + game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); + for (int i = 0; i < 4; i++) + { + if (game_ini.Exists("Core", (type + "Profile" + num[i]).c_str())) + { + useProfile[i] = true; + game_ini.Get("Core", (type + "Profile" + num[i]).c_str(), &profile[i]); + } + } + } + + if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) { std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), e = controllers.end(); - for (; i!=e; ++i) + for (int n = 0; i!=e; ++i, ++n) { // load settings from ini - std::string section; - section = (*i)->GetName(); - if (ini2 != "") - section = "Profile"; - (*i)->LoadConfig(inifile.GetOrCreateSection(section.c_str())); + if (useProfile[n]) + { + IniFile profile_ini; + std::string path; + if (isGC) + path = "Profiles/GCPad/"; + else + path = "Profiles/Wiimote/"; + profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); + (*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); + } + else + (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); // update refs (*i)->UpdateReferences(g_controller_interface); } diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h index bf12217304..71505bb935 100644 --- a/Source/Core/InputCommon/Src/InputConfig.h +++ b/Source/Core/InputCommon/Src/InputConfig.h @@ -42,7 +42,7 @@ public: ~InputPlugin(); - bool LoadConfig(std::string ini); + bool LoadConfig(bool isGC); void SaveConfig(); std::vector< ControllerEmu* > controllers; From d34c847eddf72c8a928472c7512cddad02a8d853 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 10 Jan 2013 07:43:59 +1100 Subject: [PATCH 350/627] Fixed the include directories in Audio Common for the Windows build. --- Source/Core/AudioCommon/AudioCommon.vcxproj | 2 +- Source/Core/AudioCommon/Src/OpenALStream.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 5a6896f5e2..bc004268ea 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -161,7 +161,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index 6f39c8a49c..c775d31cf2 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -24,8 +24,8 @@ #if defined HAVE_OPENAL && HAVE_OPENAL #ifdef _WIN32 -#include "../../../../Externals/OpenAL/include/al.h" -#include "../../../../Externals/OpenAL/include/alc.h" +#include +#include #elif defined __APPLE__ #include #include From ad28986d510cfe7e064acd9f95d1de0d08b36325 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 10 Jan 2013 07:55:13 +1100 Subject: [PATCH 351/627] Fixed the include directories in Audio Common for the Windows 32bit build. --- Source/Core/AudioCommon/AudioCommon.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index bc004268ea..2e13aedb46 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -133,7 +133,7 @@ - ..\Common\Src;%(AdditionalIncludeDirectories) + ..\Core\Src;..\Common\Src;..\..\..\Externals;%(AdditionalIncludeDirectories) true From c7ccf7e5c6a78f2a41b6625dec64356318e27079 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 10 Jan 2013 09:11:37 +1100 Subject: [PATCH 352/627] Removed the system timing hack which was activated when the Accurate VBeam option was enabled. --- Source/Core/Core/Src/HW/SystemTimers.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp index b9f9fe0107..b520c51b39 100644 --- a/Source/Core/Core/Src/HW/SystemTimers.cpp +++ b/Source/Core/Core/Src/HW/SystemTimers.cpp @@ -160,8 +160,7 @@ void DSPCallback(u64 userdata, int cyclesLate) void AudioDMACallback(u64 userdata, int cyclesLate) { - int fields = SConfig::GetInstance().m_LocalCoreStartupParameter.bVBeam?2:1; - int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32 * fields); + int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32); DSP::UpdateAudioDMA(); // Push audio to speakers. CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA); } From 488a679ca71c63645598743c08c318164a6c38ae Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 17:39:19 -0600 Subject: [PATCH 353/627] use pulseaudio "simple" api --- Source/Core/AudioCommon/CMakeLists.txt | 3 +- .../Core/AudioCommon/Src/PulseAudioStream.cpp | 294 +++--------------- .../Core/AudioCommon/Src/PulseAudioStream.h | 23 +- Source/Core/DolphinWX/Src/ConfigMain.cpp | 3 +- 4 files changed, 56 insertions(+), 267 deletions(-) diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index be8c58d14a..b2005515cf 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -23,7 +23,8 @@ endif(OPENAL_FOUND) if(PULSEAUDIO_FOUND) set(SRCS ${SRCS} Src/PulseAudioStream.cpp) - set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES}) +# TODO: remove hacks + set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES} pulse-simple) endif(PULSEAUDIO_FOUND) if(WIN32) diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 4851b4bd12..82b7ee5fa9 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -22,31 +22,31 @@ #include "PulseAudioStream.h" -#define BUFFER_SIZE 4096 -#define BUFFER_SIZE_BYTES (BUFFER_SIZE * 4) +namespace +{ +const size_t BUFFER_SAMPLES = 512; +const size_t CHANNEL_COUNT = 2; +const size_t BUFFER_SIZE = BUFFER_SAMPLES * CHANNEL_COUNT; +} PulseAudio::PulseAudio(CMixer *mixer) - : SoundStream(mixer), thread_running(false), mainloop(NULL) - , context(NULL), stream(NULL), iVolume(100) -{ - mix_buffer = new u8[BUFFER_SIZE_BYTES]; -} - -PulseAudio::~PulseAudio() -{ - delete [] mix_buffer; -} + : SoundStream(mixer) + , mix_buffer(BUFFER_SIZE) + , thread() + , run_thread() + , pa() +{} bool PulseAudio::Start() { - thread_running = true; + run_thread = true; thread = std::thread(std::mem_fun(&PulseAudio::SoundLoop), this); return true; } void PulseAudio::Stop() { - thread_running = false; + run_thread = false; thread.join(); } @@ -60,260 +60,54 @@ void PulseAudio::SoundLoop() { Common::SetCurrentThreadName("Audio thread - pulse"); - thread_running = PulseInit(); - - while (thread_running) + if (PulseInit()) { - int frames_to_deliver = 512; - m_mixer->Mix((short *)mix_buffer, frames_to_deliver); - if (!Write(mix_buffer, frames_to_deliver * 4)) - ERROR_LOG(AUDIO, "PulseAudio failure writing data"); + while (run_thread) + { + m_mixer->Mix(&mix_buffer[0], mix_buffer.size() / CHANNEL_COUNT); + Write(&mix_buffer[0], mix_buffer.size() * sizeof(s16)); + } + + PulseShutdown(); } - PulseShutdown(); } bool PulseAudio::PulseInit() { - // The Sample format to use - const pa_sample_spec ss = + pa_sample_spec ss = {}; + ss.format = PA_SAMPLE_S16LE; + ss.channels = 2; + ss.rate = m_mixer->GetSampleRate(); + + int error; + pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK, + nullptr, "audio", &ss, nullptr, nullptr, &error); + + if (!pa) { - PA_SAMPLE_S16LE, - m_mixer->GetSampleRate(), - 2 - }; - - mainloop = pa_threaded_mainloop_new(); - - context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "dolphin-emu"); - pa_context_set_state_callback(context, ContextStateCB, this); - - if (pa_context_connect(context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) - { - ERROR_LOG(AUDIO, "PulseAudio failed to connect context: %s", - pa_strerror(pa_context_errno(context))); + ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s", + pa_strerror(error)); return false; } - - pa_threaded_mainloop_lock(mainloop); - pa_threaded_mainloop_start(mainloop); - - for (;;) + else { - pa_context_state_t state; - - state = pa_context_get_state(context); - - if (state == PA_CONTEXT_READY) - break; - - if (!PA_CONTEXT_IS_GOOD(state)) - { - ERROR_LOG(AUDIO, "PulseAudio context state failure: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Wait until the context is ready - pa_threaded_mainloop_wait(mainloop); + NOTICE_LOG(AUDIO, "Pulse successfully initialized."); + //SetVolume(iVolume); + return true; } - - if (!(stream = pa_stream_new(context, "emulator", &ss, NULL))) - { - ERROR_LOG(AUDIO, "PulseAudio failed to create playback stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Set callbacks for the playback stream - pa_stream_set_state_callback(stream, StreamStateCB, this); - pa_stream_set_write_callback(stream, StreamWriteCB, this); - - if (pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_NOFLAGS, NULL, NULL) < 0) - { - ERROR_LOG(AUDIO, "PulseAudio failed to connect playback stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - for (;;) - { - pa_stream_state_t state; - - state = pa_stream_get_state(stream); - - if (state == PA_STREAM_READY) - break; - - if (!PA_STREAM_IS_GOOD(state)) - { - ERROR_LOG(AUDIO, "PulseAudio stream state failure: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - // Wait until the stream is ready - pa_threaded_mainloop_wait(mainloop); - } - - pa_threaded_mainloop_unlock(mainloop); - - SetVolume(iVolume); - - NOTICE_LOG(AUDIO, "Pulse successfully initialized."); - return true; } void PulseAudio::PulseShutdown() { - if (mainloop) - pa_threaded_mainloop_stop(mainloop); - - if (stream) - pa_stream_unref(stream); - - if (context) - { - pa_context_disconnect(context); - pa_context_unref(context); - } - - if (mainloop) - pa_threaded_mainloop_free(mainloop); + pa_simple_free(pa); } -void PulseAudio::SignalMainLoop() +void PulseAudio::Write(const void *data, size_t length) { - pa_threaded_mainloop_signal(mainloop, 0); -} - -void PulseAudio::ContextStateCB(pa_context *c, void *userdata) -{ - switch (pa_context_get_state(c)) + int error; + if (pa_simple_write(pa, data, length, &error) < 0) { - case PA_CONTEXT_READY: - case PA_CONTEXT_TERMINATED: - case PA_CONTEXT_FAILED: - ((PulseAudio *)userdata)->SignalMainLoop(); - break; - - default: - break; + ERROR_LOG(AUDIO, "PulseAudio failed to write data: %s", + pa_strerror(error)); } } - -void PulseAudio::StreamStateCB(pa_stream *s, void * userdata) -{ - switch (pa_stream_get_state(s)) - { - case PA_STREAM_READY: - case PA_STREAM_TERMINATED: - case PA_STREAM_FAILED: - ((PulseAudio *)userdata)->SignalMainLoop(); - break; - - default: - break; - } -} - -void PulseAudio::StreamWriteCB(pa_stream *s, size_t length, void *userdata) -{ - ((PulseAudio *)userdata)->SignalMainLoop(); -} - -static bool StateIsGood(pa_context *context, pa_stream *stream) -{ - if (!context || !PA_CONTEXT_IS_GOOD(pa_context_get_state(context)) || - !stream || !PA_STREAM_IS_GOOD(pa_stream_get_state(stream))) - { - if ((context && pa_context_get_state(context) == PA_CONTEXT_FAILED) || - (stream && pa_stream_get_state(stream) == PA_STREAM_FAILED)) - { - ERROR_LOG(AUDIO, "PulseAudio state failure: %s", - pa_strerror(pa_context_errno(context))); - } - else - { - ERROR_LOG(AUDIO, "PulseAudio state failure: %s", - pa_strerror(PA_ERR_BADSTATE)); - } - return false; - } - return true; -} - -bool PulseAudio::Write(const void *data, size_t length) -{ - if (!data || length == 0 || !stream) - return false; - - pa_threaded_mainloop_lock(mainloop); - - if (!StateIsGood(context, stream)) - { - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - while (length > 0) - { - size_t l; - int r; - - while (!(l = pa_stream_writable_size(stream))) - { - pa_threaded_mainloop_wait(mainloop); - if (!StateIsGood(context, stream)) - { - pa_threaded_mainloop_unlock(mainloop); - return false; - } - } - - if (l == (size_t)-1) - { - ERROR_LOG(AUDIO, "PulseAudio invalid stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - if (l > length) - l = length; - - r = pa_stream_write(stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE); - if (r < 0) - { - ERROR_LOG(AUDIO, "PulseAudio error writing to stream: %s", - pa_strerror(pa_context_errno(context))); - pa_threaded_mainloop_unlock(mainloop); - return false; - } - - data = (const uint8_t*) data + l; - length -= l; - } - - pa_threaded_mainloop_unlock(mainloop); - return true; -} - -void PulseAudio::SetVolume(int volume) -{ - iVolume = volume; - - if (!stream) - return; - - pa_cvolume cvolume; - const pa_channel_map *channels = pa_stream_get_channel_map(stream); - pa_cvolume_set(&cvolume, channels->channels, - iVolume * (PA_VOLUME_NORM - PA_VOLUME_MUTED) / 100); - - pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), - &cvolume, NULL, this); -} diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.h b/Source/Core/AudioCommon/Src/PulseAudioStream.h index f3a5a43e79..38399e2506 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.h +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.h @@ -19,7 +19,8 @@ #define _PULSE_AUDIO_STREAM_H #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO -#include +#include +#include #endif #include "Common.h" @@ -27,16 +28,16 @@ #include "Thread.h" +#include + class PulseAudio : public SoundStream { #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO public: PulseAudio(CMixer *mixer); - virtual ~PulseAudio(); virtual bool Start(); virtual void Stop(); - virtual void SetVolume(int volume); static bool isValid() {return true;} @@ -46,22 +47,16 @@ public: private: virtual void SoundLoop(); + bool PulseInit(); void PulseShutdown(); - bool Write(const void *data, size_t bytes); - void SignalMainLoop(); - static void ContextStateCB(pa_context *c, void *userdata); - static void StreamStateCB(pa_stream *s, void * userdata); - static void StreamWriteCB(pa_stream *s, size_t length, void *userdata); + void Write(const void *data, size_t bytes); - u8 *mix_buffer; + std::vector mix_buffer; std::thread thread; - volatile bool thread_running; + volatile bool run_thread; - pa_threaded_mainloop *mainloop; - pa_context *context; - pa_stream *stream; - int iVolume; + pa_simple* pa; #else public: PulseAudio(CMixer *mixer) : SoundStream(mixer) {} diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ce4cd9cb22..20b0a0e31e 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -966,8 +966,7 @@ bool CConfigMain::SupportsVolumeChanges(std::string backend) return (backend == BACKEND_DIRECTSOUND || backend == BACKEND_COREAUDIO || backend == BACKEND_OPENAL || - backend == BACKEND_XAUDIO2 || - backend == BACKEND_PULSEAUDIO); + backend == BACKEND_XAUDIO2); } From 5c371549d319ae125fcfa6278e2ac569b21c0f78 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 18:39:28 -0600 Subject: [PATCH 354/627] fix cmake hacks --- CMakeLists.txt | 2 +- Source/Core/AudioCommon/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f36e1f8a2..4b0d5c42dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ else() message("bluez NOT found, disabling bluetooth support") endif(BLUEZ_FOUND) -check_lib(PULSEAUDIO libpulse QUIET) +check_lib(PULSEAUDIO libpulse-simple QUIET) if(PULSEAUDIO_FOUND) add_definitions(-DHAVE_PULSEAUDIO=1) message("PulseAudio found, enabling PulseAudio sound backend") diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt index b2005515cf..be8c58d14a 100644 --- a/Source/Core/AudioCommon/CMakeLists.txt +++ b/Source/Core/AudioCommon/CMakeLists.txt @@ -23,8 +23,7 @@ endif(OPENAL_FOUND) if(PULSEAUDIO_FOUND) set(SRCS ${SRCS} Src/PulseAudioStream.cpp) -# TODO: remove hacks - set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES} pulse-simple) + set(LIBS ${LIBS} ${PULSEAUDIO_LIBRARIES}) endif(PULSEAUDIO_FOUND) if(WIN32) From fad2468e3014334e1a050d0c60deb244b85923ff Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 9 Jan 2013 20:41:14 -0500 Subject: [PATCH 355/627] Make sure profile actually exists. --- Source/Core/InputCommon/Src/InputConfig.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index 7d1bf11de8..a0b396db0a 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -34,21 +34,31 @@ bool InputPlugin::LoadConfig(bool isGC) bool useProfile[4] = {false, false, false, false}; std::string num[4] = {"1", "2", "3", "4"}; std::string profile[4]; + std::string path; if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000") { std::string type; if (isGC) + { type = "GC"; + path = "Profiles/GCPad/"; + } else + { type = "Wii"; + path = "Profiles/Wiimote/"; + } game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); for (int i = 0; i < 4; i++) { if (game_ini.Exists("Core", (type + "Profile" + num[i]).c_str())) { - useProfile[i] = true; game_ini.Get("Core", (type + "Profile" + num[i]).c_str(), &profile[i]); + if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini")) + useProfile[i] = true; + else + PanicAlertT("Selected controller profile does not exist"); } } } @@ -64,11 +74,6 @@ bool InputPlugin::LoadConfig(bool isGC) if (useProfile[n]) { IniFile profile_ini; - std::string path; - if (isGC) - path = "Profiles/GCPad/"; - else - path = "Profiles/Wiimote/"; profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); (*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); } From 6598462aba1e614e1ffb279c8e12976e2dab5b45 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 19:59:31 -0600 Subject: [PATCH 356/627] Display error messages when failing to compress/decompress games. Fixes issue 4681. --- Source/Core/DiscIO/Src/CompressedBlob.cpp | 6 +++++- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 24 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp index 1e5077b352..48ce8f10f3 100644 --- a/Source/Core/DiscIO/Src/CompressedBlob.cpp +++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp @@ -296,9 +296,13 @@ bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB ca } CompressedBlobReader* reader = CompressedBlobReader::Create(infile); - if (!reader) return false; + if (!reader) + return false; File::IOFile f(outfile, "wb"); + if (!f) + return false; + const CompressedBlobHeader &header = reader->GetHeader(); u8* buffer = new u8[header.block_size]; int progress_monitor = max(1, header.num_blocks / 100); diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index c67ee83ed3..28051eb390 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -1121,6 +1121,9 @@ void CGameListCtrl::CompressSelection(bool _compress) if (browseDialog.ShowModal() != wxID_OK) return; + bool all_good = true; + + { wxProgressDialog progressDialog( _compress ? _("Compressing ISO") : _("Decompressing ISO"), _("Working..."), @@ -1157,7 +1160,7 @@ void CGameListCtrl::CompressSelection(bool _compress) wxYES_NO) == wxNO) continue; - DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), + all_good &= DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), OutputFileName.c_str(), (iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0, 16384, &MultiCompressCB, &progressDialog); @@ -1185,11 +1188,16 @@ void CGameListCtrl::CompressSelection(bool _compress) wxYES_NO) == wxNO) continue; - DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), + all_good &= DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), OutputFileName.c_str(), &MultiCompressCB, &progressDialog); } m_currentItem++; } + } + + if (!all_good) + wxMessageBox(_("Dolphin was unable to complete the requested action.")); + Update(); } @@ -1249,6 +1257,9 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) _("Confirm File Overwrite"), wxYES_NO) == wxNO); + bool all_good = false; + + { wxProgressDialog dialog( iso->IsCompressed() ? _("Decompressing ISO") : _("Compressing ISO"), _("Working..."), @@ -1259,14 +1270,19 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) wxPD_SMOOTH ); + if (iso->IsCompressed()) - DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), + all_good = DiscIO::DecompressBlobToFile(iso->GetFileName().c_str(), path.char_str(), &CompressCB, &dialog); else - DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), + all_good = DiscIO::CompressFileToBlob(iso->GetFileName().c_str(), path.char_str(), (iso->GetPlatform() == GameListItem::WII_DISC) ? 1 : 0, 16384, &CompressCB, &dialog); + } + + if (!all_good) + wxMessageBox(_("Dolphin was unable to complete the requested action.")); Update(); } From 0de8fbecfa389ad03232440bcd91c10a2a7af7f2 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 20:26:11 -0600 Subject: [PATCH 357/627] Don't hardcode left-shift to disabe keyboard input on linux. Left-shift can be used for gamepad input now. Fixes issue 4968. --- Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp index c2030a059d..fa30ba5c62 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp @@ -116,8 +116,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key ControlState KeyboardMouse::Key::GetState() const { const KeyCode shift = XKeysymToKeycode(m_display, XK_Shift_L); - return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0 - && (m_keyboard[shift / 8] & (1 << (shift % 8))) == 0; + return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } ControlState KeyboardMouse::Button::GetState() const From b9fc26540e8abd557a4b08dc951a10ca69f7a0d8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 9 Jan 2013 21:56:17 -0500 Subject: [PATCH 358/627] Change key names, and put it in section Controls. --- Source/Core/InputCommon/Src/InputConfig.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index a0b396db0a..1988a9ebb7 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -41,20 +41,20 @@ bool InputPlugin::LoadConfig(bool isGC) std::string type; if (isGC) { - type = "GC"; + type = "Pad"; path = "Profiles/GCPad/"; } else { - type = "Wii"; + type = "Wiimote"; path = "Profiles/Wiimote/"; } game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); for (int i = 0; i < 4; i++) { - if (game_ini.Exists("Core", (type + "Profile" + num[i]).c_str())) + if (game_ini.Exists("Controls", (type + "Profile" + num[i]).c_str())) { - game_ini.Get("Core", (type + "Profile" + num[i]).c_str(), &profile[i]); + game_ini.Get("Controls", (type + "Profile" + num[i]).c_str(), &profile[i]); if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini")) useProfile[i] = true; else From a8a71fdd8c55eecf1b42b22828ba82f053fbbd3b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 20:57:10 -0600 Subject: [PATCH 359/627] Resize the KDE theme's "Open" icon from 24x24px to 22x22px to match the rest of the icons. --- Source/Core/DolphinWX/resources/KDE.h | 752 +++++++++++--------------- 1 file changed, 316 insertions(+), 436 deletions(-) diff --git a/Source/Core/DolphinWX/resources/KDE.h b/Source/Core/DolphinWX/resources/KDE.h index 64d350fd2b..23fcd4272b 100644 --- a/Source/Core/DolphinWX/resources/KDE.h +++ b/Source/Core/DolphinWX/resources/KDE.h @@ -1261,442 +1261,322 @@ static const unsigned char Toolbar_Log3_png[] = { }; static const unsigned char Toolbar_Open3_png[] = { -0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, -0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, -0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xE0, -0x77, 0x3D, 0xF8, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, -0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, -0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4D, 0x69, 0x43, -0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, -0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, -0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x77, -0x58, 0x93, 0xF7, 0x16, 0x3E, 0xDF, 0xF7, 0x65, 0x0F, 0x56, -0x42, 0xD8, 0xF0, 0xB1, 0x97, 0x6C, 0x81, 0x00, 0x22, 0x23, -0xAC, 0x08, 0xC8, 0x10, 0x59, 0xA2, 0x10, 0x92, 0x00, 0x61, -0x84, 0x10, 0x12, 0x40, 0xC5, 0x85, 0x88, 0x0A, 0x56, 0x14, -0x15, 0x11, 0x9C, 0x48, 0x55, 0xC4, 0x82, 0xD5, 0x0A, 0x48, -0x9D, 0x88, 0xE2, 0xA0, 0x28, 0xB8, 0x67, 0x41, 0x8A, 0x88, -0x5A, 0x8B, 0x55, 0x5C, 0x38, 0xEE, 0x1F, 0xDC, 0xA7, 0xB5, -0x7D, 0x7A, 0xEF, 0xED, 0xED, 0xFB, 0xD7, 0xFB, 0xBC, 0xE7, -0x9C, 0xE7, 0xFC, 0xCE, 0x79, 0xCF, 0x0F, 0x80, 0x11, 0x12, -0x26, 0x91, 0xE6, 0xA2, 0x6A, 0x00, 0x39, 0x52, 0x85, 0x3C, -0x3A, 0xD8, 0x1F, 0x8F, 0x4F, 0x48, 0xC4, 0xC9, 0xBD, 0x80, -0x02, 0x15, 0x48, 0xE0, 0x04, 0x20, 0x10, 0xE6, 0xCB, 0xC2, -0x67, 0x05, 0xC5, 0x00, 0x00, 0xF0, 0x03, 0x79, 0x78, 0x7E, -0x74, 0xB0, 0x3F, 0xFC, 0x01, 0xAF, 0x6F, 0x00, 0x02, 0x00, -0x70, 0xD5, 0x2E, 0x24, 0x12, 0xC7, 0xE1, 0xFF, 0x83, 0xBA, -0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xE0, 0x22, 0x12, -0xE7, 0x0B, 0x01, 0x90, 0x52, 0x00, 0xC8, 0x2E, 0x54, 0xC8, -0x14, 0x00, 0xC8, 0x18, 0x00, 0xB0, 0x53, 0xB3, 0x64, 0x0A, -0x00, 0x94, 0x00, 0x00, 0x6C, 0x79, 0x7C, 0x42, 0x22, 0x00, -0xAA, 0x0D, 0x00, 0xEC, 0xF4, 0x49, 0x3E, 0x05, 0x00, 0xD8, -0xA9, 0x93, 0xDC, 0x17, 0x00, 0xD8, 0xA2, 0x1C, 0xA9, 0x08, -0x00, 0x8D, 0x01, 0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, -0xBB, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2C, 0x02, 0xC0, 0xC2, -0x00, 0xA0, 0xAC, 0x40, 0x22, 0x2E, 0x04, 0xC0, 0xAE, 0x01, -0x80, 0x59, 0xB6, 0x32, 0x47, 0x02, 0x80, 0xBD, 0x05, 0x00, -0x76, 0x8E, 0x58, 0x90, 0x0F, 0x40, 0x60, 0x00, 0x80, 0x99, -0x42, 0x2C, 0xCC, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1E, -0x13, 0xCD, 0x03, 0x20, 0x4C, 0x03, 0xA0, 0x30, 0xD2, 0xBF, -0xE0, 0xA9, 0x5F, 0x70, 0x85, 0xB8, 0x48, 0x01, 0x00, 0xC0, -0xCB, 0x95, 0xCD, 0x97, 0x4B, 0xD2, 0x33, 0x14, 0xB8, 0x95, -0xD0, 0x1A, 0x77, 0xF2, 0xF0, 0xE0, 0xE2, 0x21, 0xE2, 0xC2, -0x6C, 0xB1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xE4, -0x22, 0x9C, 0x97, 0x9B, 0x23, 0x13, 0x48, 0xE7, 0x03, 0x4C, -0xCE, 0x0C, 0x00, 0x00, 0x1A, 0xF9, 0xD1, 0xC1, 0xFE, 0x38, -0x3F, 0x90, 0xE7, 0xE6, 0xE4, 0xE1, 0xE6, 0x66, 0xE7, 0x6C, -0xEF, 0xF4, 0xC5, 0xA2, 0xFE, 0x6B, 0xF0, 0x6F, 0x22, 0x3E, -0x21, 0xF1, 0xDF, 0xFE, 0xBC, 0x8C, 0x02, 0x04, 0x00, 0x10, -0x4E, 0xCF, 0xEF, 0xDA, 0x5F, 0xE5, 0xE5, 0xD6, 0x03, 0x70, -0xC7, 0x01, 0xB0, 0x75, 0xBF, 0x6B, 0xA9, 0x5B, 0x00, 0xDA, -0x56, 0x00, 0x68, 0xDF, 0xF9, 0x5D, 0x33, 0xDB, 0x09, 0xA0, -0x5A, 0x0A, 0xD0, 0x7A, 0xF9, 0x8B, 0x79, 0x38, 0xFC, 0x40, -0x1E, 0x9E, 0xA1, 0x50, 0xC8, 0x3C, 0x1D, 0x1C, 0x0A, 0x0B, -0x0B, 0xED, 0x25, 0x62, 0xA1, 0xBD, 0x30, 0xE3, 0x8B, 0x3E, -0xFF, 0x33, 0xE1, 0x6F, 0xE0, 0x8B, 0x7E, 0xF6, 0xFC, 0x40, -0x1E, 0xFE, 0xDB, 0x7A, 0xF0, 0x00, 0x71, 0x9A, 0x40, 0x99, -0xAD, 0xC0, 0xA3, 0x83, 0xFD, 0x71, 0x61, 0x6E, 0x76, 0xAE, -0x52, 0x8E, 0xE7, 0xCB, 0x04, 0x42, 0x31, 0x6E, 0xF7, 0xE7, -0x23, 0xFE, 0xC7, 0x85, 0x7F, 0xFD, 0x8E, 0x29, 0xD1, 0xE2, -0x34, 0xB1, 0x5C, 0x2C, 0x15, 0x8A, 0xF1, 0x58, 0x89, 0xB8, -0x50, 0x22, 0x4D, 0xC7, 0x79, 0xB9, 0x52, 0x91, 0x44, 0x21, -0xC9, 0x95, 0xE2, 0x12, 0xE9, 0x7F, 0x32, 0xF1, 0x1F, 0x96, -0xFD, 0x09, 0x93, 0x77, 0x0D, 0x00, 0xAC, 0x86, 0x4F, 0xC0, -0x4E, 0xB6, 0x07, 0xB5, 0xCB, 0x6C, 0xC0, 0x7E, 0xEE, 0x01, -0x02, 0x8B, 0x0E, 0x58, 0xD2, 0x76, 0x00, 0x40, 0x7E, 0xF3, -0x2D, 0x8C, 0x1A, 0x0B, 0x91, 0x00, 0x10, 0x67, 0x34, 0x32, -0x79, 0xF7, 0x00, 0x00, 0x93, 0xBF, 0xF9, 0x8F, 0x40, 0x2B, -0x01, 0x00, 0xCD, 0x97, 0xA4, 0xE3, 0x00, 0x00, 0xBC, 0xE8, -0x18, 0x5C, 0xA8, 0x94, 0x17, 0x4C, 0xC6, 0x08, 0x00, 0x00, -0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x07, 0x0C, 0xC1, 0x14, -0xAC, 0xC0, 0x0E, 0x9C, 0xC1, 0x1D, 0xBC, 0xC0, 0x17, 0x02, -0x61, 0x06, 0x44, 0x40, 0x0C, 0x24, 0xC0, 0x3C, 0x10, 0x42, -0x06, 0xE4, 0x80, 0x1C, 0x0A, 0xA1, 0x18, 0x96, 0x41, 0x19, -0x54, 0xC0, 0x3A, 0xD8, 0x04, 0xB5, 0xB0, 0x03, 0x1A, 0xA0, -0x11, 0x9A, 0xE1, 0x10, 0xB4, 0xC1, 0x31, 0x38, 0x0D, 0xE7, -0xE0, 0x12, 0x5C, 0x81, 0xEB, 0x70, 0x17, 0x06, 0x60, 0x18, -0x9E, 0xC2, 0x18, 0xBC, 0x86, 0x09, 0x04, 0x41, 0xC8, 0x08, -0x13, 0x61, 0x21, 0x3A, 0x88, 0x11, 0x62, 0x8E, 0xD8, 0x22, -0xCE, 0x08, 0x17, 0x99, 0x8E, 0x04, 0x22, 0x61, 0x48, 0x34, -0x92, 0x80, 0xA4, 0x20, 0xE9, 0x88, 0x14, 0x51, 0x22, 0xC5, -0xC8, 0x72, 0xA4, 0x02, 0xA9, 0x42, 0x6A, 0x91, 0x5D, 0x48, -0x23, 0xF2, 0x2D, 0x72, 0x14, 0x39, 0x8D, 0x5C, 0x40, 0xFA, -0x90, 0xDB, 0xC8, 0x20, 0x32, 0x8A, 0xFC, 0x8A, 0xBC, 0x47, -0x31, 0x94, 0x81, 0xB2, 0x51, 0x03, 0xD4, 0x02, 0x75, 0x40, -0xB9, 0xA8, 0x1F, 0x1A, 0x8A, 0xC6, 0xA0, 0x73, 0xD1, 0x74, -0x34, 0x0F, 0x5D, 0x80, 0x96, 0xA2, 0x6B, 0xD1, 0x1A, 0xB4, -0x1E, 0x3D, 0x80, 0xB6, 0xA2, 0xA7, 0xD1, 0x4B, 0xE8, 0x75, -0x74, 0x00, 0x7D, 0x8A, 0x8E, 0x63, 0x80, 0xD1, 0x31, 0x0E, -0x66, 0x8C, 0xD9, 0x61, 0x5C, 0x8C, 0x87, 0x45, 0x60, 0x89, -0x58, 0x1A, 0x26, 0xC7, 0x16, 0x63, 0xE5, 0x58, 0x35, 0x56, -0x8F, 0x35, 0x63, 0x1D, 0x58, 0x37, 0x76, 0x15, 0x1B, 0xC0, -0x9E, 0x61, 0xEF, 0x08, 0x24, 0x02, 0x8B, 0x80, 0x13, 0xEC, -0x08, 0x5E, 0x84, 0x10, 0xC2, 0x6C, 0x82, 0x90, 0x90, 0x47, -0x58, 0x4C, 0x58, 0x43, 0xA8, 0x25, 0xEC, 0x23, 0xB4, 0x12, -0xBA, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31, 0xC2, 0x27, 0x22, -0x93, 0xA8, 0x4F, 0xB4, 0x25, 0x7A, 0x12, 0xF9, 0xC4, 0x78, -0x62, 0x3A, 0xB1, 0x90, 0x58, 0x46, 0xAC, 0x26, 0xEE, 0x21, -0x1E, 0x21, 0x9E, 0x25, 0x5E, 0x27, 0x0E, 0x13, 0x5F, 0x93, -0x48, 0x24, 0x0E, 0xC9, 0x92, 0xE4, 0x4E, 0x0A, 0x21, 0x25, -0x90, 0x32, 0x49, 0x0B, 0x49, 0x6B, 0x48, 0xDB, 0x48, 0x2D, -0xA4, 0x53, 0xA4, 0x3E, 0xD2, 0x10, 0x69, 0x9C, 0x4C, 0x26, -0xEB, 0x90, 0x6D, 0xC9, 0xDE, 0xE4, 0x08, 0xB2, 0x80, 0xAC, -0x20, 0x97, 0x91, 0xB7, 0x90, 0x0F, 0x90, 0x4F, 0x92, 0xFB, -0xC9, 0xC3, 0xE4, 0xB7, 0x14, 0x3A, 0xC5, 0x88, 0xE2, 0x4C, -0x09, 0xA2, 0x24, 0x52, 0xA4, 0x94, 0x12, 0x4A, 0x35, 0x65, -0x3F, 0xE5, 0x04, 0xA5, 0x9F, 0x32, 0x42, 0x99, 0xA0, 0xAA, -0x51, 0xCD, 0xA9, 0x9E, 0xD4, 0x08, 0xAA, 0x88, 0x3A, 0x9F, -0x5A, 0x49, 0x6D, 0xA0, 0x76, 0x50, 0x2F, 0x53, 0x87, 0xA9, -0x13, 0x34, 0x75, 0x9A, 0x25, 0xCD, 0x9B, 0x16, 0x43, 0xCB, -0xA4, 0x2D, 0xA3, 0xD5, 0xD0, 0x9A, 0x69, 0x67, 0x69, 0xF7, -0x68, 0x2F, 0xE9, 0x74, 0xBA, 0x09, 0xDD, 0x83, 0x1E, 0x45, -0x97, 0xD0, 0x97, 0xD2, 0x6B, 0xE8, 0x07, 0xE9, 0xE7, 0xE9, -0x83, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x0D, 0x83, 0xC7, 0x48, -0x62, 0x28, 0x19, 0x6B, 0x19, 0x7B, 0x19, 0xA7, 0x18, 0xB7, -0x19, 0x2F, 0x99, 0x4C, 0xA6, 0x05, 0xD3, 0x97, 0x99, 0xC8, -0x54, 0x30, 0xD7, 0x32, 0x1B, 0x99, 0x67, 0x98, 0x0F, 0x98, -0x6F, 0x55, 0x58, 0x2A, 0xF6, 0x2A, 0x7C, 0x15, 0x91, 0xCA, -0x12, 0x95, 0x3A, 0x95, 0x56, 0x95, 0x7E, 0x95, 0xE7, 0xAA, -0x54, 0x55, 0x73, 0x55, 0x3F, 0xD5, 0x79, 0xAA, 0x0B, 0x54, -0xAB, 0x55, 0x0F, 0xAB, 0x5E, 0x56, 0x7D, 0xA6, 0x46, 0x55, -0xB3, 0x50, 0xE3, 0xA9, 0x09, 0xD4, 0x16, 0xAB, 0xD5, 0xA9, -0x1D, 0x55, 0xBB, 0xA9, 0x36, 0xAE, 0xCE, 0x52, 0x77, 0x52, -0x8F, 0x50, 0xCF, 0x51, 0x5F, 0xA3, 0xBE, 0x5F, 0xFD, 0x82, -0xFA, 0x63, 0x0D, 0xB2, 0x86, 0x85, 0x46, 0xA0, 0x86, 0x48, -0xA3, 0x54, 0x63, 0xB7, 0xC6, 0x19, 0x8D, 0x21, 0x16, 0xC6, -0x32, 0x65, 0xF1, 0x58, 0x42, 0xD6, 0x72, 0x56, 0x03, 0xEB, -0x2C, 0x6B, 0x98, 0x4D, 0x62, 0x5B, 0xB2, 0xF9, 0xEC, 0x4C, -0x76, 0x05, 0xFB, 0x1B, 0x76, 0x2F, 0x7B, 0x4C, 0x53, 0x43, -0x73, 0xAA, 0x66, 0xAC, 0x66, 0x91, 0x66, 0x9D, 0xE6, 0x71, -0xCD, 0x01, 0x0E, 0xC6, 0xB1, 0xE0, 0xF0, 0x39, 0xD9, 0x9C, -0x4A, 0xCE, 0x21, 0xCE, 0x0D, 0xCE, 0x7B, 0x2D, 0x03, 0x2D, -0x3F, 0x2D, 0xB1, 0xD6, 0x6A, 0xAD, 0x66, 0xAD, 0x7E, 0xAD, -0x37, 0xDA, 0x7A, 0xDA, 0xBE, 0xDA, 0x62, 0xED, 0x72, 0xED, -0x16, 0xED, 0xEB, 0xDA, 0xEF, 0x75, 0x70, 0x9D, 0x40, 0x9D, -0x2C, 0x9D, 0xF5, 0x3A, 0x6D, 0x3A, 0xF7, 0x75, 0x09, 0xBA, -0x36, 0xBA, 0x51, 0xBA, 0x85, 0xBA, 0xDB, 0x75, 0xCF, 0xEA, -0x3E, 0xD3, 0x63, 0xEB, 0x79, 0xE9, 0x09, 0xF5, 0xCA, 0xF5, -0x0E, 0xE9, 0xDD, 0xD1, 0x47, 0xF5, 0x6D, 0xF4, 0xA3, 0xF5, -0x17, 0xEA, 0xEF, 0xD6, 0xEF, 0xD1, 0x1F, 0x37, 0x30, 0x34, -0x08, 0x36, 0x90, 0x19, 0x6C, 0x31, 0x38, 0x63, 0xF0, 0xCC, -0x90, 0x63, 0xE8, 0x6B, 0x98, 0x69, 0xB8, 0xD1, 0xF0, 0x84, -0xE1, 0xA8, 0x11, 0xCB, 0x68, 0xBA, 0x91, 0xC4, 0x68, 0xA3, -0xD1, 0x49, 0xA3, 0x27, 0xB8, 0x26, 0xEE, 0x87, 0x67, 0xE3, -0x35, 0x78, 0x17, 0x3E, 0x66, 0xAC, 0x6F, 0x1C, 0x62, 0xAC, -0x34, 0xDE, 0x65, 0xDC, 0x6B, 0x3C, 0x61, 0x62, 0x69, 0x32, -0xDB, 0xA4, 0xC4, 0xA4, 0xC5, 0xE4, 0xBE, 0x29, 0xCD, 0x94, -0x6B, 0x9A, 0x66, 0xBA, 0xD1, 0xB4, 0xD3, 0x74, 0xCC, 0xCC, -0xC8, 0x2C, 0xDC, 0xAC, 0xD8, 0xAC, 0xC9, 0xEC, 0x8E, 0x39, -0xD5, 0x9C, 0x6B, 0x9E, 0x61, 0xBE, 0xD9, 0xBC, 0xDB, 0xFC, -0x8D, 0x85, 0xA5, 0x45, 0x9C, 0xC5, 0x4A, 0x8B, 0x36, 0x8B, -0xC7, 0x96, 0xDA, 0x96, 0x7C, 0xCB, 0x05, 0x96, 0x4D, 0x96, -0xF7, 0xAC, 0x98, 0x56, 0x3E, 0x56, 0x79, 0x56, 0xF5, 0x56, -0xD7, 0xAC, 0x49, 0xD6, 0x5C, 0xEB, 0x2C, 0xEB, 0x6D, 0xD6, -0x57, 0x6C, 0x50, 0x1B, 0x57, 0x9B, 0x0C, 0x9B, 0x3A, 0x9B, -0xCB, 0xB6, 0xA8, 0xAD, 0x9B, 0xAD, 0xC4, 0x76, 0x9B, 0x6D, -0xDF, 0x14, 0xE2, 0x14, 0x8F, 0x29, 0xD2, 0x29, 0xF5, 0x53, -0x6E, 0xDA, 0x31, 0xEC, 0xFC, 0xEC, 0x0A, 0xEC, 0x9A, 0xEC, -0x06, 0xED, 0x39, 0xF6, 0x61, 0xF6, 0x25, 0xF6, 0x6D, 0xF6, -0xCF, 0x1D, 0xCC, 0x1C, 0x12, 0x1D, 0xD6, 0x3B, 0x74, 0x3B, -0x7C, 0x72, 0x74, 0x75, 0xCC, 0x76, 0x6C, 0x70, 0xBC, 0xEB, -0xA4, 0xE1, 0x34, 0xC3, 0xA9, 0xC4, 0xA9, 0xC3, 0xE9, 0x57, -0x67, 0x1B, 0x67, 0xA1, 0x73, 0x9D, 0xF3, 0x35, 0x17, 0xA6, -0x4B, 0x90, 0xCB, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6D, -0xA7, 0x8A, 0xA7, 0x6E, 0x9F, 0x7A, 0xCB, 0x95, 0xE5, 0x1A, -0xEE, 0xBA, 0xD2, 0xB5, 0xD3, 0xF5, 0xA3, 0x9B, 0xBB, 0x9B, -0xDC, 0xAD, 0xD9, 0x6D, 0xD4, 0xDD, 0xCC, 0x3D, 0xC5, 0x7D, -0xAB, 0xFB, 0x4D, 0x2E, 0x9B, 0x1B, 0xC9, 0x5D, 0xC3, 0x3D, -0xEF, 0x41, 0xF4, 0xF0, 0xF7, 0x58, 0xE2, 0x71, 0xCC, 0xE3, -0x9D, 0xA7, 0x9B, 0xA7, 0xC2, 0xF3, 0x90, 0xE7, 0x2F, 0x5E, -0x76, 0x5E, 0x59, 0x5E, 0xFB, 0xBD, 0x1E, 0x4F, 0xB3, 0x9C, -0x26, 0x9E, 0xD6, 0x30, 0x6D, 0xC8, 0xDB, 0xC4, 0x5B, 0xE0, -0xBD, 0xCB, 0x7B, 0x60, 0x3A, 0x3E, 0x3D, 0x65, 0xFA, 0xCE, -0xE9, 0x03, 0x3E, 0xC6, 0x3E, 0x02, 0x9F, 0x7A, 0x9F, 0x87, -0xBE, 0xA6, 0xBE, 0x22, 0xDF, 0x3D, 0xBE, 0x23, 0x7E, 0xD6, -0x7E, 0x99, 0x7E, 0x07, 0xFC, 0x9E, 0xFB, 0x3B, 0xFA, 0xCB, -0xFD, 0x8F, 0xF8, 0xBF, 0xE1, 0x79, 0xF2, 0x16, 0xF1, 0x4E, -0x05, 0x60, 0x01, 0xC1, 0x01, 0xE5, 0x01, 0xBD, 0x81, 0x1A, -0x81, 0xB3, 0x03, 0x6B, 0x03, 0x1F, 0x04, 0x99, 0x04, 0xA5, -0x07, 0x35, 0x05, 0x8D, 0x05, 0xBB, 0x06, 0x2F, 0x0C, 0x3E, -0x15, 0x42, 0x0C, 0x09, 0x0D, 0x59, 0x1F, 0x72, 0x93, 0x6F, -0xC0, 0x17, 0xF2, 0x1B, 0xF9, 0x63, 0x33, 0xDC, 0x67, 0x2C, -0x9A, 0xD1, 0x15, 0xCA, 0x08, 0x9D, 0x15, 0x5A, 0x1B, 0xFA, -0x30, 0xCC, 0x26, 0x4C, 0x1E, 0xD6, 0x11, 0x8E, 0x86, 0xCF, -0x08, 0xDF, 0x10, 0x7E, 0x6F, 0xA6, 0xF9, 0x4C, 0xE9, 0xCC, -0xB6, 0x08, 0x88, 0xE0, 0x47, 0x6C, 0x88, 0xB8, 0x1F, 0x69, -0x19, 0x99, 0x17, 0xF9, 0x7D, 0x14, 0x29, 0x2A, 0x32, 0xAA, -0x2E, 0xEA, 0x51, 0xB4, 0x53, 0x74, 0x71, 0x74, 0xF7, 0x2C, -0xD6, 0xAC, 0xE4, 0x59, 0xFB, 0x67, 0xBD, 0x8E, 0xF1, 0x8F, -0xA9, 0x8C, 0xB9, 0x3B, 0xDB, 0x6A, 0xB6, 0x72, 0x76, 0x67, -0xAC, 0x6A, 0x6C, 0x52, 0x6C, 0x63, 0xEC, 0x9B, 0xB8, 0x80, -0xB8, 0xAA, 0xB8, 0x81, 0x78, 0x87, 0xF8, 0x45, 0xF1, 0x97, -0x12, 0x74, 0x13, 0x24, 0x09, 0xED, 0x89, 0xE4, 0xC4, 0xD8, -0xC4, 0x3D, 0x89, 0xE3, 0x73, 0x02, 0xE7, 0x6C, 0x9A, 0x33, -0x9C, 0xE4, 0x9A, 0x54, 0x96, 0x74, 0x63, 0xAE, 0xE5, 0xDC, -0xA2, 0xB9, 0x17, 0xE6, 0xE9, 0xCE, 0xCB, 0x9E, 0x77, 0x3C, -0x59, 0x35, 0x59, 0x90, 0x7C, 0x38, 0x85, 0x98, 0x12, 0x97, -0xB2, 0x3F, 0xE5, 0x83, 0x20, 0x42, 0x50, 0x2F, 0x18, 0x4F, -0xE5, 0xA7, 0x6E, 0x4D, 0x1D, 0x13, 0xF2, 0x84, 0x9B, 0x85, -0x4F, 0x45, 0xBE, 0xA2, 0x8D, 0xA2, 0x51, 0xB1, 0xB7, 0xB8, -0x4A, 0x3C, 0x92, 0xE6, 0x9D, 0x56, 0x95, 0xF6, 0x38, 0xDD, -0x3B, 0x7D, 0x43, 0xFA, 0x68, 0x86, 0x4F, 0x46, 0x75, 0xC6, -0x33, 0x09, 0x4F, 0x52, 0x2B, 0x79, 0x91, 0x19, 0x92, 0xB9, -0x23, 0xF3, 0x4D, 0x56, 0x44, 0xD6, 0xDE, 0xAC, 0xCF, 0xD9, -0x71, 0xD9, 0x2D, 0x39, 0x94, 0x9C, 0x94, 0x9C, 0xA3, 0x52, -0x0D, 0x69, 0x96, 0xB4, 0x2B, 0xD7, 0x30, 0xB7, 0x28, 0xB7, -0x4F, 0x66, 0x2B, 0x2B, 0x93, 0x0D, 0xE4, 0x79, 0xE6, 0x6D, -0xCA, 0x1B, 0x93, 0x87, 0xCA, 0xF7, 0xE4, 0x23, 0xF9, 0x73, -0xF3, 0xDB, 0x15, 0x6C, 0x85, 0x4C, 0xD1, 0xA3, 0xB4, 0x52, -0xAE, 0x50, 0x0E, 0x16, 0x4C, 0x2F, 0xA8, 0x2B, 0x78, 0x5B, -0x18, 0x5B, 0x78, 0xB8, 0x48, 0xBD, 0x48, 0x5A, 0xD4, 0x33, -0xDF, 0x66, 0xFE, 0xEA, 0xF9, 0x23, 0x0B, 0x82, 0x16, 0x7C, -0xBD, 0x90, 0xB0, 0x50, 0xB8, 0xB0, 0xB3, 0xD8, 0xB8, 0x78, -0x59, 0xF1, 0xE0, 0x22, 0xBF, 0x45, 0xBB, 0x16, 0x23, 0x8B, -0x53, 0x17, 0x77, 0x2E, 0x31, 0x5D, 0x52, 0xBA, 0x64, 0x78, -0x69, 0xF0, 0xD2, 0x7D, 0xCB, 0x68, 0xCB, 0xB2, 0x96, 0xFD, -0x50, 0xE2, 0x58, 0x52, 0x55, 0xF2, 0x6A, 0x79, 0xDC, 0xF2, -0x8E, 0x52, 0x83, 0xD2, 0xA5, 0xA5, 0x43, 0x2B, 0x82, 0x57, -0x34, 0x95, 0xA9, 0x94, 0xC9, 0xCB, 0x6E, 0xAE, 0xF4, 0x5A, -0xB9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xEF, 0x6A, 0x97, -0xD5, 0x5B, 0x56, 0x7F, 0x2A, 0x17, 0x95, 0x5F, 0xAC, 0x70, -0xAC, 0xA8, 0xAE, 0xF8, 0xB0, 0x46, 0xB8, 0xE6, 0xE2, 0x57, -0x4E, 0x5F, 0xD5, 0x7C, 0xF5, 0x79, 0x6D, 0xDA, 0xDA, 0xDE, -0x4A, 0xB7, 0xCA, 0xED, 0xEB, 0x48, 0xEB, 0xA4, 0xEB, 0x6E, -0xAC, 0xF7, 0x59, 0xBF, 0xAF, 0x4A, 0xBD, 0x6A, 0x41, 0xD5, -0xD0, 0x86, 0xF0, 0x0D, 0xAD, 0x1B, 0xF1, 0x8D, 0xE5, 0x1B, -0x5F, 0x6D, 0x4A, 0xDE, 0x74, 0xA1, 0x7A, 0x6A, 0xF5, 0x8E, -0xCD, 0xB4, 0xCD, 0xCA, 0xCD, 0x03, 0x35, 0x61, 0x35, 0xED, -0x5B, 0xCC, 0xB6, 0xAC, 0xDB, 0xF2, 0xA1, 0x36, 0xA3, 0xF6, -0x7A, 0x9D, 0x7F, 0x5D, 0xCB, 0x56, 0xFD, 0xAD, 0xAB, 0xB7, -0xBE, 0xD9, 0x26, 0xDA, 0xD6, 0xBF, 0xDD, 0x77, 0x7B, 0xF3, -0x0E, 0x83, 0x1D, 0x15, 0x3B, 0xDE, 0xEF, 0x94, 0xEC, 0xBC, -0xB5, 0x2B, 0x78, 0x57, 0x6B, 0xBD, 0x45, 0x7D, 0xF5, 0x6E, -0xD2, 0xEE, 0x82, 0xDD, 0x8F, 0x1A, 0x62, 0x1B, 0xBA, 0xBF, -0xE6, 0x7E, 0xDD, 0xB8, 0x47, 0x77, 0x4F, 0xC5, 0x9E, 0x8F, -0x7B, 0xA5, 0x7B, 0x07, 0xF6, 0x45, 0xEF, 0xEB, 0x6A, 0x74, -0x6F, 0x6C, 0xDC, 0xAF, 0xBF, 0xBF, 0xB2, 0x09, 0x6D, 0x52, -0x36, 0x8D, 0x1E, 0x48, 0x3A, 0x70, 0xE5, 0x9B, 0x80, 0x6F, -0xDA, 0x9B, 0xED, 0x9A, 0x77, 0xB5, 0x70, 0x5A, 0x2A, 0x0E, -0xC2, 0x41, 0xE5, 0xC1, 0x27, 0xDF, 0xA6, 0x7C, 0x7B, 0xE3, -0x50, 0xE8, 0xA1, 0xCE, 0xC3, 0xDC, 0xC3, 0xCD, 0xDF, 0x99, -0x7F, 0xB7, 0xF5, 0x08, 0xEB, 0x48, 0x79, 0x2B, 0xD2, 0x3A, -0xBF, 0x75, 0xAC, 0x2D, 0xA3, 0x6D, 0xA0, 0x3D, 0xA1, 0xBD, -0xEF, 0xE8, 0x8C, 0xA3, 0x9D, 0x1D, 0x5E, 0x1D, 0x47, 0xBE, -0xB7, 0xFF, 0x7E, 0xEF, 0x31, 0xE3, 0x63, 0x75, 0xC7, 0x35, -0x8F, 0x57, 0x9E, 0xA0, 0x9D, 0x28, 0x3D, 0xF1, 0xF9, 0xE4, -0x82, 0x93, 0xE3, 0xA7, 0x64, 0xA7, 0x9E, 0x9D, 0x4E, 0x3F, -0x3D, 0xD4, 0x99, 0xDC, 0x79, 0xF7, 0x4C, 0xFC, 0x99, 0x6B, -0x5D, 0x51, 0x5D, 0xBD, 0x67, 0x43, 0xCF, 0x9E, 0x3F, 0x17, -0x74, 0xEE, 0x4C, 0xB7, 0x5F, 0xF7, 0xC9, 0xF3, 0xDE, 0xE7, -0x8F, 0x5D, 0xF0, 0xBC, 0x70, 0xF4, 0x22, 0xF7, 0x62, 0xDB, -0x25, 0xB7, 0x4B, 0xAD, 0x3D, 0xAE, 0x3D, 0x47, 0x7E, 0x70, -0xFD, 0xE1, 0x48, 0xAF, 0x5B, 0x6F, 0xEB, 0x65, 0xF7, 0xCB, -0xED, 0x57, 0x3C, 0xAE, 0x74, 0xF4, 0x4D, 0xEB, 0x3B, 0xD1, -0xEF, 0xD3, 0x7F, 0xFA, 0x6A, 0xC0, 0xD5, 0x73, 0xD7, 0xF8, -0xD7, 0x2E, 0x5D, 0x9F, 0x79, 0xBD, 0xEF, 0xC6, 0xEC, 0x1B, -0xB7, 0x6E, 0x26, 0xDD, 0x1C, 0xB8, 0x25, 0xBA, 0xF5, 0xF8, -0x76, 0xF6, 0xED, 0x17, 0x77, 0x0A, 0xEE, 0x4C, 0xDC, 0x5D, -0x7A, 0x8F, 0x78, 0xAF, 0xFC, 0xBE, 0xDA, 0xFD, 0xEA, 0x07, -0xFA, 0x0F, 0xEA, 0x7F, 0xB4, 0xFE, 0xB1, 0x65, 0xC0, 0x6D, -0xE0, 0xF8, 0x60, 0xC0, 0x60, 0xCF, 0xC3, 0x59, 0x0F, 0xEF, -0x0E, 0x09, 0x87, 0x9E, 0xFE, 0x94, 0xFF, 0xD3, 0x87, 0xE1, -0xD2, 0x47, 0xCC, 0x47, 0xD5, 0x23, 0x46, 0x23, 0x8D, 0x8F, -0x9D, 0x1F, 0x1F, 0x1B, 0x0D, 0x1A, 0xBD, 0xF2, 0x64, 0xCE, -0x93, 0xE1, 0xA7, 0xB2, 0xA7, 0x13, 0xCF, 0xCA, 0x7E, 0x56, -0xFF, 0x79, 0xEB, 0x73, 0xAB, 0xE7, 0xDF, 0xFD, 0xE2, 0xFB, -0x4B, 0xCF, 0x58, 0xFC, 0xD8, 0xF0, 0x0B, 0xF9, 0x8B, 0xCF, -0xBF, 0xAE, 0x79, 0xA9, 0xF3, 0x72, 0xEF, 0xAB, 0xA9, 0xAF, -0x3A, 0xC7, 0x23, 0xC7, 0x1F, 0xBC, 0xCE, 0x79, 0x3D, 0xF1, -0xA6, 0xFC, 0xAD, 0xCE, 0xDB, 0x7D, 0xEF, 0xB8, 0xEF, 0xBA, -0xDF, 0xC7, 0xBD, 0x1F, 0x99, 0x28, 0xFC, 0x40, 0xFE, 0x50, -0xF3, 0xD1, 0xFA, 0x63, 0xC7, 0xA7, 0xD0, 0x4F, 0xF7, 0x3E, -0xE7, 0x7C, 0xFE, 0xFC, 0x2F, 0xF7, 0x84, 0xF3, 0xFB, 0x25, -0xD2, 0x9F, 0x33, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, -0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, 0x93, 0x00, -0x00, 0x00, 0x20, 0x63, 0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, -0x25, 0x00, 0x00, 0x80, 0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, -0x00, 0x80, 0xE9, 0x00, 0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, -0x60, 0x00, 0x00, 0x3A, 0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, -0x5F, 0xC5, 0x46, 0x00, 0x00, 0x06, 0x23, 0x49, 0x44, 0x41, -0x54, 0x78, 0xDA, 0x64, 0x96, 0x4B, 0x6C, 0x5D, 0x47, 0x19, -0xC7, 0x7F, 0x73, 0x66, 0xCE, 0x39, 0xF7, 0xDC, 0x97, 0xEF, -0xBD, 0x7E, 0x25, 0x7E, 0x34, 0x71, 0x1C, 0xDB, 0xB1, 0x93, -0x34, 0xB8, 0x09, 0x45, 0x11, 0xB4, 0x42, 0x3C, 0x04, 0x24, -0x08, 0x95, 0xAA, 0x6C, 0x11, 0x3B, 0x24, 0x58, 0xB0, 0x62, -0xC1, 0x06, 0x58, 0x95, 0x15, 0x6B, 0x04, 0x95, 0x90, 0x22, -0x45, 0x42, 0x20, 0x84, 0x84, 0x5A, 0x90, 0xA2, 0xB4, 0xA1, -0x0A, 0x10, 0xDA, 0xF4, 0x45, 0x5A, 0x35, 0x4D, 0x1B, 0x39, -0x76, 0xDD, 0xD8, 0x71, 0x62, 0xFB, 0x3A, 0xBE, 0xCF, 0x73, -0xCE, 0xCC, 0x9C, 0x61, 0x71, 0x93, 0x6B, 0x94, 0x8C, 0x34, -0xCB, 0xF9, 0xFF, 0xBE, 0xEF, 0xFF, 0x9F, 0x4F, 0x33, 0xE2, -0xE7, 0x3F, 0x7E, 0x96, 0x47, 0x97, 0xD6, 0x29, 0x23, 0x23, -0xFB, 0xC9, 0x9C, 0xE0, 0xE0, 0xF4, 0x1C, 0x4F, 0x9D, 0x38, -0xC6, 0xC5, 0x0B, 0x2F, 0xB3, 0xBE, 0xD9, 0xE0, 0x9B, 0x67, -0x5E, 0xE0, 0xED, 0x37, 0xFE, 0xE5, 0xE5, 0x72, 0xB2, 0x36, -0x36, 0x31, 0x39, 0x5A, 0xAB, 0x96, 0xC6, 0x47, 0x07, 0x6B, -0xFB, 0xEE, 0x6D, 0x6D, 0xD5, 0x56, 0x3E, 0xBD, 0x5D, 0xA9, -0xD5, 0x2A, 0x33, 0x33, 0xB3, 0x4F, 0xFE, 0xF6, 0xC0, 0x89, -0xE7, 0x2E, 0x03, 0x28, 0x6B, 0xED, 0x63, 0x00, 0x6B, 0x2D, -0xA9, 0x36, 0x44, 0xB9, 0xD2, 0x50, 0x2E, 0x0C, 0x8F, 0x26, -0x49, 0xF7, 0xD0, 0xC2, 0xC2, 0xFC, 0xD4, 0x91, 0x2C, 0x3B, -0x34, 0x56, 0xCD, 0x0E, 0x7D, 0xF7, 0xEC, 0xE9, 0x7D, 0xBE, -0xF2, 0x46, 0xF3, 0x39, 0x3F, 0x9F, 0x68, 0x4D, 0x92, 0xA6, -0xCC, 0x1E, 0x1C, 0xE1, 0xE9, 0x93, 0x47, 0xE8, 0xEE, 0x6E, -0xE0, 0xA2, 0x91, 0xAB, 0x40, 0x0F, 0x10, 0x45, 0xD1, 0x63, -0x00, 0x63, 0x2C, 0xE3, 0x63, 0xFB, 0x5E, 0x3C, 0xF3, 0xF5, -0x67, 0x7E, 0xA6, 0xA4, 0xC5, 0x59, 0xCD, 0xD4, 0xC4, 0x1C, -0x41, 0xA8, 0xC8, 0x3A, 0x0D, 0x3C, 0xE9, 0x83, 0x2F, 0xA9, -0x6F, 0xB5, 0x48, 0x8C, 0x47, 0x21, 0x0A, 0x09, 0x03, 0x87, -0x6E, 0xDE, 0xA5, 0xB9, 0xB3, 0x85, 0xEF, 0xEB, 0x38, 0xFF, -0x40, 0x4B, 0xD5, 0x06, 0x47, 0x1F, 0x03, 0x48, 0xBF, 0xC8, -0xC4, 0xD8, 0xE8, 0xE9, 0xEA, 0x50, 0x48, 0xBC, 0xB3, 0x8B, -0x11, 0x90, 0xB4, 0x76, 0xE9, 0x36, 0x1C, 0x42, 0x08, 0x8A, -0x05, 0xC9, 0xD6, 0x7A, 0x9D, 0xE5, 0x3B, 0x1D, 0x8E, 0x1F, -0x99, 0x24, 0xF0, 0x0C, 0xD6, 0x81, 0x36, 0x19, 0x5A, 0x5B, -0xA4, 0x49, 0xD4, 0x43, 0x2D, 0x2F, 0xCB, 0x2C, 0x8F, 0x6E, -0xC8, 0x88, 0x93, 0xA4, 0x9B, 0x34, 0xDA, 0x74, 0x93, 0x94, -0x34, 0x4D, 0x31, 0x5A, 0xE3, 0x32, 0x8B, 0x92, 0x82, 0x77, -0x3E, 0xB8, 0xC5, 0x4B, 0x7F, 0xB8, 0xC4, 0x67, 0xEB, 0x9B, -0xE4, 0x23, 0x1F, 0xEB, 0x00, 0x04, 0x36, 0xCB, 0xB0, 0xD6, -0x10, 0xC7, 0xCD, 0xC2, 0x43, 0x80, 0xEA, 0xB4, 0x9B, 0x8F, -0x75, 0xD0, 0x6A, 0xB6, 0x48, 0x92, 0x34, 0x76, 0x59, 0x86, -0x6F, 0x3B, 0x28, 0x61, 0x70, 0x08, 0xA4, 0x10, 0x04, 0x04, -0x2C, 0x2D, 0xAD, 0xB2, 0x76, 0xA7, 0xCE, 0xD1, 0xF9, 0x59, -0x10, 0x02, 0x01, 0x38, 0xC0, 0x1A, 0x83, 0x31, 0x06, 0x52, -0x9D, 0xDF, 0x03, 0x6C, 0xAF, 0x3E, 0x22, 0xEF, 0xB8, 0xBF, -0xBD, 0x03, 0xF1, 0x13, 0xDD, 0x90, 0x2E, 0x2B, 0xED, 0x3C, -0x1B, 0xBA, 0x46, 0x9C, 0x85, 0x28, 0x09, 0x83, 0x61, 0x8A, -0xF1, 0x96, 0x28, 0x87, 0x06, 0x29, 0x0C, 0x08, 0xAF, 0x77, -0xCA, 0x39, 0x8C, 0x36, 0x68, 0x9D, 0xA2, 0x04, 0x61, 0x1F, -0x10, 0x8F, 0x3E, 0x72, 0x4D, 0x85, 0x24, 0xAA, 0x34, 0x69, -0x88, 0x4A, 0xE7, 0xC2, 0xE6, 0x51, 0xAE, 0x37, 0x07, 0x89, -0x5D, 0xD4, 0xEB, 0x40, 0x4A, 0x72, 0x4E, 0xB2, 0x12, 0x37, -0xD9, 0xD4, 0x1B, 0x58, 0xA7, 0x00, 0x0B, 0x42, 0x90, 0xD9, -0x0C, 0xA3, 0x13, 0x4C, 0x9A, 0x20, 0x70, 0xFD, 0x0C, 0x94, -0x37, 0x7D, 0xE6, 0xFF, 0xC4, 0x05, 0x3A, 0x8E, 0x19, 0xAC, -0x0D, 0x2D, 0x6C, 0x57, 0x2A, 0xDF, 0x5B, 0xEF, 0x14, 0xC9, -0x85, 0x96, 0x8A, 0xB0, 0x48, 0xCF, 0x43, 0x2A, 0x50, 0xBE, -0x22, 0xF3, 0x4B, 0xDC, 0xF6, 0x66, 0x69, 0x88, 0x2A, 0x08, -0x8D, 0x00, 0xB2, 0xCC, 0xA2, 0x8D, 0x46, 0x6B, 0x8D, 0x73, -0xCE, 0xEB, 0x03, 0xB6, 0x57, 0x3E, 0x7C, 0xA8, 0x4E, 0x9A, -0x74, 0x29, 0x16, 0xCB, 0xC1, 0xC0, 0xF4, 0xA1, 0x3F, 0xF9, -0x03, 0x83, 0x03, 0x79, 0x93, 0x20, 0x85, 0x87, 0x10, 0x3E, -0x4A, 0x4A, 0x94, 0x52, 0x28, 0x3F, 0xA0, 0x10, 0x0A, 0xF2, -0xBE, 0xC0, 0x93, 0xF2, 0x81, 0xA9, 0x3D, 0xFF, 0xB5, 0xD6, -0x68, 0x9D, 0xE2, 0x32, 0x27, 0xFA, 0x80, 0x8D, 0xE5, 0x9B, -0x08, 0x1C, 0x38, 0x47, 0xAB, 0xD5, 0x60, 0xF1, 0xCB, 0xDF, -0xFE, 0x49, 0x6D, 0x74, 0xFC, 0x68, 0xB7, 0xD3, 0x40, 0x2A, -0x09, 0xC2, 0xC3, 0xF7, 0x43, 0xF0, 0x14, 0x78, 0x92, 0x20, -0x0C, 0x50, 0x4A, 0x21, 0xA5, 0x87, 0xF7, 0xB0, 0x4E, 0xE7, -0xD0, 0x5A, 0x63, 0xB4, 0xC6, 0xE8, 0x04, 0x27, 0x9C, 0xEB, -0x03, 0xA4, 0x0A, 0x90, 0xCA, 0xA7, 0xDD, 0xB8, 0x4F, 0x90, -0x2B, 0x30, 0x79, 0x78, 0xEE, 0x79, 0xA5, 0x04, 0x81, 0x54, -0x48, 0x21, 0x50, 0x41, 0x48, 0xAC, 0x53, 0x76, 0x37, 0x6F, -0x83, 0x17, 0x50, 0xA8, 0x0E, 0x21, 0xA4, 0x4F, 0x2E, 0x97, -0x43, 0x3E, 0xE8, 0x20, 0xCB, 0x32, 0x8C, 0x4E, 0x31, 0x46, -0xA3, 0xD3, 0x14, 0x21, 0xBC, 0xBD, 0x0E, 0xBA, 0x5B, 0xB7, -0x69, 0xBA, 0x80, 0xEA, 0xE4, 0x0C, 0x81, 0x92, 0xE3, 0xC5, -0x52, 0xF9, 0xA8, 0xC2, 0x23, 0x0B, 0x42, 0x94, 0x92, 0x78, -0x32, 0xA0, 0xBD, 0x71, 0x8B, 0x62, 0xFD, 0x2D, 0xC6, 0xFD, -0x2D, 0xB6, 0xBB, 0x73, 0xB4, 0x9A, 0x96, 0x4E, 0xDC, 0xAB, -0x18, 0x4F, 0x62, 0x6D, 0xD6, 0xAB, 0x3E, 0xED, 0x65, 0x60, -0x8D, 0x95, 0x7D, 0x40, 0x7B, 0x67, 0x93, 0x0F, 0xDF, 0x7F, -0x9F, 0x7D, 0xD3, 0x2B, 0x1C, 0x39, 0xFD, 0x35, 0x55, 0x2C, -0x95, 0xA5, 0x1F, 0xFA, 0x78, 0x12, 0x82, 0x30, 0x04, 0x99, -0x23, 0xAF, 0x34, 0x03, 0x7E, 0x97, 0x31, 0x77, 0x8B, 0xC8, -0x8B, 0xB0, 0x6D, 0x9F, 0xAD, 0xED, 0x1D, 0x42, 0x19, 0x41, -0x4E, 0xA1, 0xD3, 0x14, 0xAD, 0x53, 0x8C, 0xD5, 0x64, 0x36, -0x23, 0xEE, 0x34, 0xFB, 0x73, 0xE0, 0xE5, 0x8B, 0x65, 0xA2, -0x42, 0x91, 0x5B, 0xD7, 0xDE, 0xE2, 0xF5, 0x3F, 0x9F, 0xB3, -0xC6, 0xE8, 0x9D, 0x91, 0xD1, 0x22, 0x61, 0x18, 0x92, 0xC6, -0x09, 0x9B, 0xF7, 0xEE, 0xD2, 0x35, 0x3E, 0x69, 0x34, 0xCE, -0x5A, 0xF9, 0x59, 0xBA, 0xC5, 0x29, 0x72, 0xBE, 0xA2, 0x5A, -0x29, 0xF2, 0xF1, 0x86, 0xA3, 0xBD, 0xD1, 0x45, 0x7A, 0x19, -0xC6, 0x18, 0x8C, 0xD6, 0xD8, 0xCC, 0x90, 0xC6, 0xAD, 0x52, -0x1F, 0xB0, 0xBA, 0xBA, 0x1A, 0x6D, 0xD7, 0x77, 0x26, 0x93, -0x8C, 0xD9, 0x9D, 0x7B, 0xEB, 0xD1, 0xDB, 0x97, 0x5F, 0xFB, -0xA4, 0x93, 0xC0, 0xCA, 0xCA, 0xA7, 0x2C, 0xAF, 0x2C, 0xB3, -0xB9, 0xB1, 0x46, 0xE2, 0x95, 0x68, 0x15, 0x8F, 0xD1, 0x2A, -0x9F, 0xA4, 0x5D, 0x3A, 0x45, 0x2A, 0x0A, 0x0C, 0x97, 0x7C, -0xDE, 0x5C, 0x36, 0xBC, 0xFA, 0xDF, 0x6D, 0x8A, 0xA1, 0xEC, -0x65, 0xA0, 0x7B, 0x90, 0x2C, 0xB3, 0xFD, 0x41, 0xF3, 0xE6, -0xE6, 0xE6, 0xD2, 0x6A, 0xB5, 0x1A, 0x00, 0xE3, 0x80, 0xFA, -0xEB, 0xB9, 0xDF, 0xBC, 0xFA, 0xD1, 0xF5, 0x25, 0x3C, 0x3F, -0x20, 0x97, 0xCB, 0x51, 0xAD, 0x54, 0x18, 0x28, 0x15, 0x90, -0xD1, 0x30, 0x71, 0xEE, 0x20, 0xAE, 0x30, 0xC6, 0xEC, 0xB1, -0x45, 0xCA, 0x03, 0x15, 0x02, 0xFF, 0xC1, 0x04, 0x1B, 0xBD, -0xB7, 0xB5, 0x06, 0xE7, 0xFC, 0x3E, 0x60, 0x6C, 0x6C, 0xCC, -0x4E, 0x4C, 0x4C, 0x2C, 0x01, 0x6D, 0xE0, 0xF0, 0xD2, 0x07, -0xEF, 0x5C, 0xBD, 0xF4, 0xC7, 0xDF, 0x5D, 0x19, 0x1A, 0xDD, -0x4F, 0x75, 0x70, 0x84, 0x7C, 0x3E, 0x22, 0x9F, 0xCF, 0x53, -0x2C, 0x84, 0x44, 0x21, 0xF8, 0xD2, 0x30, 0xBD, 0x70, 0x8C, -0xCA, 0xF0, 0x08, 0xD6, 0x68, 0x3C, 0xCF, 0xEB, 0xF9, 0xAF, -0x7B, 0x39, 0x58, 0xA3, 0x01, 0xFA, 0x21, 0x7B, 0xE7, 0xCF, -0x9F, 0xE7, 0xE6, 0xCD, 0x9B, 0xE4, 0x72, 0x39, 0x0D, 0x8C, -0x02, 0xDE, 0xD6, 0x7B, 0xAF, 0xDC, 0xF4, 0xD6, 0xDF, 0xC5, -0x8B, 0x6A, 0x0C, 0xEC, 0x1B, 0x27, 0x97, 0x2F, 0x20, 0x7D, -0x85, 0x27, 0x3D, 0x1C, 0xA0, 0x8D, 0x41, 0x86, 0x79, 0x9C, -0x8C, 0x48, 0xB5, 0xEE, 0xF9, 0x6F, 0x0C, 0xD6, 0x18, 0xAC, -0xD1, 0x64, 0x26, 0xD9, 0xB3, 0x48, 0x29, 0x85, 0x52, 0x4A, -0x6A, 0xAD, 0xE7, 0x41, 0x94, 0x81, 0xDA, 0xF8, 0xFE, 0xA1, -0xD2, 0x33, 0x63, 0x1D, 0x76, 0xFF, 0xF9, 0x6B, 0x3E, 0xFB, -0xE8, 0x3D, 0x12, 0xF2, 0x78, 0x85, 0x01, 0xFC, 0x62, 0x05, -0x55, 0x2C, 0x91, 0x05, 0x05, 0x3A, 0xED, 0x0E, 0xC9, 0xD2, -0x6B, 0x70, 0x7F, 0x19, 0xE3, 0x14, 0x46, 0x1B, 0xD2, 0xB8, -0x8B, 0xD1, 0x09, 0x61, 0xA1, 0xB2, 0xD3, 0xBF, 0xA6, 0xD5, -0x6A, 0x95, 0x34, 0x4D, 0x6D, 0xBD, 0x5E, 0xFF, 0x0F, 0xB8, -0xEF, 0x03, 0x63, 0xB1, 0x51, 0x51, 0x6E, 0x68, 0x8E, 0x03, -0xF1, 0x4B, 0xDC, 0xBA, 0xF4, 0x0A, 0x9B, 0xFB, 0xBF, 0x84, -0xA8, 0x4E, 0xE3, 0x54, 0x1E, 0x61, 0x63, 0xB2, 0xC6, 0x0A, -0xE1, 0xC7, 0x57, 0x98, 0x70, 0x4B, 0x4E, 0x8A, 0xC3, 0x24, -0x26, 0x13, 0x49, 0xB7, 0x45, 0xBB, 0xB1, 0xC5, 0xA1, 0x13, -0x5F, 0xBD, 0x36, 0xF5, 0xE4, 0x37, 0x7E, 0xD0, 0x07, 0x4C, -0x4F, 0x4F, 0xE3, 0x9C, 0x63, 0x66, 0x66, 0x66, 0xF9, 0xC6, -0x8D, 0x1B, 0x17, 0xD7, 0xD6, 0xD6, 0x5E, 0x88, 0xF2, 0xE1, -0x81, 0x9D, 0x56, 0x4A, 0x33, 0xB6, 0x0C, 0x07, 0xDB, 0xA4, -0x77, 0xFE, 0x02, 0x5B, 0x03, 0xC8, 0xA8, 0x42, 0xA1, 0x50, -0x5E, 0x3E, 0x7E, 0xFC, 0xF8, 0xEB, 0xE7, 0x6E, 0x96, 0x97, -0x7E, 0xF5, 0xB7, 0x65, 0xB9, 0x70, 0xAA, 0xFB, 0xDC, 0x17, -0xB3, 0xEE, 0x62, 0xF3, 0xFE, 0x26, 0xD3, 0x4F, 0x9D, 0xB9, -0x32, 0x77, 0xEA, 0xEC, 0x57, 0xC0, 0x25, 0x7D, 0xC0, 0xFC, -0xFC, 0x3C, 0x42, 0x08, 0x86, 0x87, 0x87, 0x09, 0xC3, 0xF0, -0xCA, 0xDA, 0xDA, 0xDA, 0xDD, 0x8B, 0xFF, 0x78, 0xBB, 0xF1, -0x85, 0xDF, 0xFF, 0xE2, 0xF9, 0x93, 0xB3, 0xC3, 0xC7, 0xF4, -0xFE, 0xC9, 0x6B, 0xD5, 0xE1, 0x03, 0xFF, 0xB6, 0x26, 0xBE, -0x3A, 0x39, 0xF7, 0xF4, 0x1B, 0x59, 0x96, 0x7D, 0x32, 0xF8, -0xC4, 0x38, 0x8D, 0x97, 0x37, 0x01, 0xCA, 0x8D, 0xDD, 0xFA, -0x77, 0x92, 0x56, 0x95, 0xE9, 0xC5, 0x6F, 0x5D, 0x98, 0x5A, -0x3C, 0x7B, 0xA6, 0xDB, 0xB8, 0x97, 0x21, 0x0D, 0x7B, 0x0F, -0x4E, 0xA7, 0xD3, 0x7B, 0x87, 0xA5, 0xA4, 0x5E, 0xAF, 0x33, -0x35, 0x35, 0xB5, 0xD4, 0x4E, 0xBC, 0x5F, 0xFE, 0xFD, 0xF2, -0x8D, 0x17, 0x7F, 0xF4, 0xD3, 0xF3, 0x95, 0x4E, 0xDB, 0xDE, -0xD3, 0xBA, 0xC3, 0xED, 0x1B, 0x6F, 0x82, 0x8C, 0x30, 0x69, -0x93, 0xE6, 0xEA, 0x12, 0xF3, 0x47, 0x0E, 0xF3, 0xB9, 0xC5, -0xCF, 0x37, 0xA6, 0xA6, 0x0E, 0x9C, 0x1F, 0x59, 0x38, 0x7B, -0x7D, 0x24, 0x3F, 0xF9, 0xC3, 0xA4, 0xDB, 0xCC, 0x74, 0xDA, -0x25, 0xC8, 0xEF, 0x7D, 0x24, 0xFE, 0x37, 0x00, 0x7B, 0x59, -0x0C, 0x33, 0xED, 0xB3, 0xBB, 0x03, 0x00, 0x00, 0x00, 0x00, -0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 +0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, +0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x08, 0x06, +0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x0a, 0x39, 0x69, 0x43, +0x43, 0x50, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x20, 0x49, +0x43, 0x43, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x48, +0xc7, 0x9d, 0x96, 0x77, 0x54, 0x54, 0xd7, 0x16, 0x87, 0xcf, 0xbd, 0x77, 0x7a, +0xa1, 0xcd, 0x30, 0xd2, 0x19, 0x7a, 0x93, 0x2e, 0x30, 0x80, 0xf4, 0x2e, 0x20, +0x1d, 0x04, 0x51, 0x18, 0x66, 0x06, 0x18, 0xca, 0x00, 0xc3, 0x0c, 0x4d, 0x6c, +0x88, 0xa8, 0x40, 0x44, 0x11, 0x11, 0x01, 0x45, 0x90, 0xa0, 0x80, 0x01, 0xa3, +0xa1, 0x48, 0xac, 0x88, 0x62, 0x21, 0x28, 0xa8, 0x60, 0x0f, 0x48, 0x10, 0x50, +0x62, 0x30, 0x8a, 0xa8, 0xa8, 0x64, 0x46, 0xd6, 0x4a, 0x7c, 0x79, 0x79, 0xef, +0xe5, 0xe5, 0xf7, 0xc7, 0xbd, 0xdf, 0xda, 0x67, 0xef, 0x73, 0xf7, 0xd9, 0x7b, +0x9f, 0xb5, 0x2e, 0x00, 0x24, 0x4f, 0x1f, 0x2e, 0x2f, 0x05, 0x96, 0x02, 0x20, +0x99, 0x27, 0xe0, 0x07, 0x7a, 0x38, 0xd3, 0x57, 0x85, 0x47, 0xd0, 0xb1, 0xfd, +0x00, 0x06, 0x78, 0x80, 0x01, 0xa6, 0x00, 0x30, 0x59, 0xe9, 0xa9, 0xbe, 0x41, +0xee, 0xc1, 0x40, 0x24, 0x2f, 0x37, 0x17, 0x7a, 0xba, 0xc8, 0x09, 0xfc, 0x8b, +0xde, 0x0c, 0x01, 0x48, 0xfc, 0xbe, 0x65, 0xe8, 0xe9, 0x4f, 0xa7, 0x83, 0xff, +0x4f, 0xd2, 0xac, 0x54, 0xbe, 0x00, 0x00, 0xc8, 0x5f, 0xc4, 0xe6, 0x6c, 0x4e, +0x3a, 0x4b, 0xc4, 0xf9, 0x22, 0x4e, 0xca, 0x14, 0xa4, 0x8a, 0xed, 0x33, 0x22, +0xa6, 0xc6, 0x24, 0x8a, 0x19, 0x46, 0x89, 0x99, 0x2f, 0x4a, 0x50, 0xc4, 0x72, +0x62, 0x8e, 0x5b, 0xe4, 0xa5, 0x9f, 0x7d, 0x16, 0xd9, 0x51, 0xcc, 0xec, 0x64, +0x1e, 0x5b, 0xc4, 0xe2, 0x9c, 0x53, 0xd9, 0xc9, 0x6c, 0x31, 0xf7, 0x88, 0x78, +0x7b, 0x86, 0x90, 0x23, 0x62, 0xc4, 0x47, 0xc4, 0x05, 0x19, 0x5c, 0x4e, 0xa6, +0x88, 0x6f, 0x8b, 0x58, 0x33, 0x49, 0x98, 0xcc, 0x15, 0xf1, 0x5b, 0x71, 0x6c, +0x32, 0x87, 0x99, 0x0e, 0x00, 0x8a, 0x24, 0xb6, 0x0b, 0x38, 0xac, 0x78, 0x11, +0x9b, 0x88, 0x98, 0xc4, 0x0f, 0x0e, 0x74, 0x11, 0xf1, 0x72, 0x00, 0x70, 0xa4, +0xb8, 0x2f, 0x38, 0xe6, 0x0b, 0x16, 0x70, 0xb2, 0x04, 0xe2, 0x43, 0xb9, 0xa4, +0xa4, 0x66, 0xf3, 0xb9, 0x71, 0xf1, 0x02, 0xba, 0x2e, 0x4b, 0x8f, 0x6e, 0x6a, +0x6d, 0xcd, 0xa0, 0x7b, 0x72, 0x32, 0x93, 0x38, 0x02, 0x81, 0xa1, 0x3f, 0x93, +0x95, 0xc8, 0xe4, 0xb3, 0xe9, 0x2e, 0x29, 0xc9, 0xa9, 0x4c, 0x5e, 0x36, 0x00, +0x8b, 0x67, 0xfe, 0x2c, 0x19, 0x71, 0x6d, 0xe9, 0xa2, 0x22, 0x5b, 0x9a, 0x5a, +0x5b, 0x5a, 0x1a, 0x9a, 0x19, 0x99, 0x7e, 0x51, 0xa8, 0xff, 0xba, 0xf8, 0x37, +0x25, 0xee, 0xed, 0x22, 0xbd, 0x0a, 0xf8, 0xdc, 0x33, 0x88, 0xd6, 0xf7, 0x87, +0xed, 0xaf, 0xfc, 0x52, 0xea, 0x00, 0x60, 0xcc, 0x8a, 0x6a, 0xb3, 0xeb, 0x0f, +0x5b, 0xcc, 0x7e, 0x00, 0x3a, 0xb6, 0x02, 0x20, 0x77, 0xff, 0x0f, 0x9b, 0xe6, +0x21, 0x00, 0x24, 0x45, 0x7d, 0x6b, 0xbf, 0xf1, 0xc5, 0x79, 0x68, 0xe2, 0x79, +0x89, 0x17, 0x08, 0x52, 0x6d, 0x8c, 0x8d, 0x33, 0x33, 0x33, 0x8d, 0xb8, 0x1c, +0x96, 0x91, 0xb8, 0xa0, 0xbf, 0xeb, 0x7f, 0x3a, 0xfc, 0x0d, 0x7d, 0xf1, 0x3d, +0x23, 0xf1, 0x76, 0xbf, 0x97, 0x87, 0xee, 0xca, 0x89, 0x65, 0x0a, 0x93, 0x04, +0x74, 0x71, 0xdd, 0x58, 0x29, 0x49, 0x29, 0x42, 0x3e, 0x3d, 0x3d, 0x95, 0xc9, +0xe2, 0xd0, 0x0d, 0xff, 0x3c, 0xc4, 0xff, 0x38, 0xf0, 0xaf, 0xf3, 0x58, 0x1a, +0xc8, 0x89, 0xe5, 0xf0, 0x39, 0x3c, 0x51, 0x44, 0xa8, 0x68, 0xca, 0xb8, 0xbc, +0x38, 0x51, 0xbb, 0x79, 0x6c, 0xae, 0x80, 0x9b, 0xc2, 0xa3, 0x73, 0x79, 0xff, +0xa9, 0x89, 0xff, 0x30, 0xec, 0x4f, 0x5a, 0x9c, 0x6b, 0x91, 0x28, 0xf5, 0x9f, +0x00, 0x35, 0xca, 0x08, 0x48, 0xdd, 0xa0, 0x02, 0xe4, 0xe7, 0x3e, 0x80, 0xa2, +0x10, 0x01, 0x12, 0x79, 0x50, 0xdc, 0xf5, 0xdf, 0xfb, 0xe6, 0x83, 0x0f, 0x05, +0xe2, 0x9b, 0x17, 0xa6, 0x3a, 0xb1, 0x38, 0xf7, 0x9f, 0x05, 0xfd, 0xfb, 0xae, +0x70, 0x89, 0xf8, 0x91, 0xce, 0x8d, 0xfb, 0x1c, 0xe7, 0x12, 0x18, 0x4c, 0x67, +0x09, 0xf9, 0x19, 0x8b, 0x6b, 0xe2, 0x6b, 0x09, 0xd0, 0x80, 0x00, 0x24, 0x01, +0x15, 0xc8, 0x03, 0x15, 0xa0, 0x01, 0x74, 0x81, 0x21, 0x30, 0x03, 0x56, 0xc0, +0x16, 0x38, 0x02, 0x37, 0xb0, 0x02, 0xf8, 0x81, 0x60, 0x10, 0x0e, 0xd6, 0x02, +0x16, 0x88, 0x07, 0xc9, 0x80, 0x0f, 0x32, 0x41, 0x2e, 0xd8, 0x0c, 0x0a, 0x40, +0x11, 0xd8, 0x05, 0xf6, 0x82, 0x4a, 0x50, 0x03, 0xea, 0x41, 0x23, 0x68, 0x01, +0x27, 0x40, 0x07, 0x38, 0x0d, 0x2e, 0x80, 0xcb, 0xe0, 0x3a, 0xb8, 0x09, 0xee, +0x80, 0x07, 0x60, 0x04, 0x8c, 0x83, 0xe7, 0x60, 0x06, 0xbc, 0x01, 0xf3, 0x10, +0x04, 0x61, 0x21, 0x32, 0x44, 0x81, 0xe4, 0x21, 0x55, 0x48, 0x0b, 0x32, 0x80, +0xcc, 0x20, 0x06, 0x64, 0x0f, 0xb9, 0x41, 0x3e, 0x50, 0x20, 0x14, 0x0e, 0x45, +0x43, 0x71, 0x10, 0x0f, 0x12, 0x42, 0xb9, 0xd0, 0x16, 0xa8, 0x08, 0x2a, 0x85, +0x2a, 0xa1, 0x5a, 0xa8, 0x11, 0xfa, 0x16, 0x3a, 0x05, 0x5d, 0x80, 0xae, 0x42, +0x03, 0xd0, 0x3d, 0x68, 0x14, 0x9a, 0x82, 0x7e, 0x85, 0xde, 0xc3, 0x08, 0x4c, +0x82, 0xa9, 0xb0, 0x32, 0xac, 0x0d, 0x1b, 0xc3, 0x0c, 0xd8, 0x09, 0xf6, 0x86, +0x83, 0xe1, 0x35, 0x70, 0x1c, 0x9c, 0x06, 0xe7, 0xc0, 0xf9, 0xf0, 0x4e, 0xb8, +0x02, 0xae, 0x83, 0x8f, 0xc1, 0xed, 0xf0, 0x05, 0xf8, 0x3a, 0x7c, 0x07, 0x1e, +0x81, 0x9f, 0xc3, 0xb3, 0x08, 0x40, 0x88, 0x08, 0x0d, 0x51, 0x43, 0x0c, 0x11, +0x06, 0xe2, 0x82, 0xf8, 0x21, 0x11, 0x48, 0x2c, 0xc2, 0x47, 0x36, 0x20, 0x85, +0x48, 0x39, 0x52, 0x87, 0xb4, 0x20, 0x5d, 0x48, 0x2f, 0x72, 0x0b, 0x19, 0x41, +0xa6, 0x91, 0x77, 0x28, 0x0c, 0x8a, 0x82, 0xa2, 0xa3, 0x0c, 0x51, 0xb6, 0x28, +0x4f, 0x54, 0x08, 0x8a, 0x85, 0x4a, 0x43, 0x6d, 0x40, 0x15, 0xa3, 0x2a, 0x51, +0x47, 0x51, 0xed, 0xa8, 0x1e, 0xd4, 0x2d, 0xd4, 0x28, 0x6a, 0x06, 0xf5, 0x09, +0x4d, 0x46, 0x2b, 0xa1, 0x0d, 0xd0, 0x36, 0x68, 0x2f, 0xf4, 0x2a, 0x74, 0x1c, +0x3a, 0x13, 0x5d, 0x80, 0x2e, 0x47, 0x37, 0xa0, 0xdb, 0xd0, 0x97, 0xd0, 0x77, +0xd0, 0xe3, 0xe8, 0x37, 0x18, 0x0c, 0x86, 0x86, 0xd1, 0xc1, 0x58, 0x61, 0x3c, +0x31, 0xe1, 0x98, 0x04, 0xcc, 0x3a, 0x4c, 0x31, 0xe6, 0x00, 0xa6, 0x15, 0x73, +0x1e, 0x33, 0x80, 0x19, 0xc3, 0xcc, 0x62, 0xb1, 0x58, 0x79, 0xac, 0x01, 0xd6, +0x0e, 0xeb, 0x87, 0x65, 0x62, 0x05, 0xd8, 0x02, 0xec, 0x7e, 0xec, 0x31, 0xec, +0x39, 0xec, 0x20, 0x76, 0x1c, 0xfb, 0x16, 0x47, 0xc4, 0xa9, 0xe2, 0xcc, 0x70, +0xee, 0xb8, 0x08, 0x1c, 0x0f, 0x97, 0x87, 0x2b, 0xc7, 0x35, 0xe1, 0xce, 0xe2, +0x06, 0x71, 0x13, 0xb8, 0x79, 0xbc, 0x14, 0x5e, 0x0b, 0x6f, 0x83, 0xf7, 0xc3, +0xb3, 0xf1, 0xd9, 0xf8, 0x12, 0x7c, 0x3d, 0xbe, 0x0b, 0x7f, 0x03, 0x3f, 0x8e, +0x9f, 0x27, 0x48, 0x13, 0x74, 0x08, 0x76, 0x84, 0x60, 0x42, 0x02, 0x61, 0x33, +0xa1, 0x82, 0xd0, 0x42, 0xb8, 0x44, 0x78, 0x48, 0x78, 0x45, 0x24, 0x12, 0xd5, +0x89, 0xd6, 0xc4, 0x00, 0x22, 0x97, 0xb8, 0x89, 0x58, 0x41, 0x3c, 0x4e, 0xbc, +0x42, 0x1c, 0x25, 0xbe, 0x23, 0xc9, 0x90, 0xf4, 0x49, 0x2e, 0xa4, 0x48, 0x92, +0x90, 0xb4, 0x93, 0x74, 0x84, 0x74, 0x9e, 0x74, 0x8f, 0xf4, 0x8a, 0x4c, 0x26, +0x6b, 0x93, 0x1d, 0xc9, 0x11, 0x64, 0x01, 0x79, 0x27, 0xb9, 0x91, 0x7c, 0x91, +0xfc, 0x98, 0xfc, 0x56, 0x82, 0x22, 0x61, 0x24, 0xe1, 0x25, 0xc1, 0x96, 0xd8, +0x28, 0x51, 0x25, 0xd1, 0x2e, 0x31, 0x28, 0xf1, 0x42, 0x12, 0x2f, 0xa9, 0x25, +0xe9, 0x24, 0xb9, 0x56, 0x32, 0x47, 0xb2, 0x5c, 0xf2, 0xa4, 0xe4, 0x0d, 0xc9, +0x69, 0x29, 0xbc, 0x94, 0xb6, 0x94, 0x8b, 0x14, 0x53, 0x6a, 0x83, 0x54, 0x95, +0xd4, 0x29, 0xa9, 0x61, 0xa9, 0x59, 0x69, 0x8a, 0xb4, 0xa9, 0xb4, 0x9f, 0x74, +0xb2, 0x74, 0xb1, 0x74, 0x93, 0xf4, 0x55, 0xe9, 0x49, 0x19, 0xac, 0x8c, 0xb6, +0x8c, 0x9b, 0x0c, 0x5b, 0x26, 0x5f, 0xe6, 0xb0, 0xcc, 0x45, 0x99, 0x31, 0x0a, +0x42, 0xd1, 0xa0, 0xb8, 0x50, 0x58, 0x94, 0x2d, 0x94, 0x7a, 0xca, 0x25, 0xca, +0x38, 0x15, 0x43, 0xd5, 0xa1, 0x7a, 0x51, 0x13, 0xa8, 0x45, 0xd4, 0x6f, 0xa8, +0xfd, 0xd4, 0x19, 0x59, 0x19, 0xd9, 0x65, 0xb2, 0xa1, 0xb2, 0x59, 0xb2, 0x55, +0xb2, 0x67, 0x64, 0x47, 0x68, 0x08, 0x4d, 0x9b, 0xe6, 0x45, 0x4b, 0xa2, 0x95, +0xd0, 0x4e, 0xd0, 0x86, 0x68, 0xef, 0x97, 0x28, 0x2f, 0x71, 0x5a, 0xc2, 0x59, +0xb2, 0x63, 0x49, 0xcb, 0x92, 0xc1, 0x25, 0x73, 0x72, 0x8a, 0x72, 0x8e, 0x72, +0x1c, 0xb9, 0x42, 0xb9, 0x56, 0xb9, 0x3b, 0x72, 0xef, 0xe5, 0xe9, 0xf2, 0x6e, +0xf2, 0x89, 0xf2, 0xbb, 0xe5, 0x3b, 0xe4, 0x1f, 0x29, 0xa0, 0x14, 0xf4, 0x15, +0x02, 0x14, 0x32, 0x15, 0x0e, 0x2a, 0x5c, 0x52, 0x98, 0x56, 0xa4, 0x2a, 0xda, +0x2a, 0xb2, 0x14, 0x0b, 0x15, 0x4f, 0x28, 0xde, 0x57, 0x82, 0x95, 0xf4, 0x95, +0x02, 0x95, 0xd6, 0x29, 0x1d, 0x56, 0xea, 0x53, 0x9a, 0x55, 0x56, 0x51, 0xf6, +0x50, 0x4e, 0x55, 0xde, 0xaf, 0x7c, 0x51, 0x79, 0x5a, 0x85, 0xa6, 0xe2, 0xa8, +0x92, 0xa0, 0x52, 0xa6, 0x72, 0x56, 0x65, 0x4a, 0x95, 0xa2, 0x6a, 0xaf, 0xca, +0x55, 0x2d, 0x53, 0x3d, 0xa7, 0xfa, 0x8c, 0x2e, 0x4b, 0x77, 0xa2, 0x27, 0xd1, +0x2b, 0xe8, 0x3d, 0xf4, 0x19, 0x35, 0x25, 0x35, 0x4f, 0x35, 0xa1, 0x5a, 0xad, +0x5a, 0xbf, 0xda, 0xbc, 0xba, 0x8e, 0x7a, 0x88, 0x7a, 0x9e, 0x7a, 0xab, 0xfa, +0x23, 0x0d, 0x82, 0x06, 0x43, 0x23, 0x56, 0xa3, 0x4c, 0xa3, 0x5b, 0x63, 0x46, +0x53, 0x55, 0xd3, 0x57, 0x33, 0x57, 0xb3, 0x59, 0xf3, 0xbe, 0x16, 0x5e, 0x8b, +0xa1, 0x15, 0xaf, 0xb5, 0x4f, 0xab, 0x57, 0x6b, 0x4e, 0x5b, 0x47, 0x3b, 0x4c, +0x7b, 0x9b, 0x76, 0x87, 0xf6, 0xa4, 0x8e, 0x9c, 0x8e, 0x97, 0x4e, 0x8e, 0x4e, +0xb3, 0xce, 0x43, 0x5d, 0xb2, 0xae, 0x83, 0x6e, 0x9a, 0x6e, 0x9d, 0xee, 0x6d, +0x3d, 0x8c, 0x1e, 0x43, 0x2f, 0x51, 0xef, 0x80, 0xde, 0x4d, 0x7d, 0x58, 0xdf, +0x42, 0x3f, 0x5e, 0xbf, 0x4a, 0xff, 0x86, 0x01, 0x6c, 0x60, 0x69, 0xc0, 0x35, +0x38, 0x60, 0x30, 0xb0, 0x14, 0xbd, 0xd4, 0x7a, 0x29, 0x6f, 0x69, 0xdd, 0xd2, +0x61, 0x43, 0x92, 0xa1, 0x93, 0x61, 0x86, 0x61, 0xb3, 0xe1, 0xa8, 0x11, 0xcd, +0xc8, 0xc7, 0x28, 0xcf, 0xa8, 0xc3, 0xe8, 0x85, 0xb1, 0xa6, 0x71, 0x84, 0xf1, +0x6e, 0xe3, 0x5e, 0xe3, 0x4f, 0x26, 0x16, 0x26, 0x49, 0x26, 0xf5, 0x26, 0x0f, +0x4c, 0x65, 0x4c, 0x57, 0x98, 0xe6, 0x99, 0x76, 0x99, 0xfe, 0x6a, 0xa6, 0x6f, +0xc6, 0x32, 0xab, 0x32, 0xbb, 0x6d, 0x4e, 0x36, 0x77, 0x37, 0xdf, 0x68, 0xde, +0x69, 0xfe, 0x72, 0x99, 0xc1, 0x32, 0xce, 0xb2, 0x83, 0xcb, 0xee, 0x5a, 0x50, +0x2c, 0x7c, 0x2d, 0xb6, 0x59, 0x74, 0x5b, 0x7c, 0xb4, 0xb4, 0xb2, 0xe4, 0x5b, +0xb6, 0x58, 0x4e, 0x59, 0x69, 0x5a, 0x45, 0x5b, 0x55, 0x5b, 0x0d, 0x33, 0xa8, +0x0c, 0x7f, 0x46, 0x31, 0xe3, 0x8a, 0x35, 0xda, 0xda, 0xd9, 0x7a, 0xa3, 0xf5, +0x69, 0xeb, 0x77, 0x36, 0x96, 0x36, 0x02, 0x9b, 0x13, 0x36, 0xbf, 0xd8, 0x1a, +0xda, 0x26, 0xda, 0x36, 0xd9, 0x4e, 0x2e, 0xd7, 0x59, 0xce, 0x59, 0x5e, 0xbf, +0x7c, 0xcc, 0x4e, 0xdd, 0x8e, 0x69, 0x57, 0x6b, 0x37, 0x62, 0x4f, 0xb7, 0x8f, +0xb6, 0x3f, 0x64, 0x3f, 0xe2, 0xa0, 0xe6, 0xc0, 0x74, 0xa8, 0x73, 0x78, 0xe2, +0xa8, 0xe1, 0xc8, 0x76, 0x6c, 0x70, 0x9c, 0x70, 0xd2, 0x73, 0x4a, 0x70, 0x3a, +0xe6, 0xf4, 0xc2, 0xd9, 0xc4, 0x99, 0xef, 0xdc, 0xe6, 0x3c, 0xe7, 0x62, 0xe3, +0xb2, 0xde, 0xe5, 0xbc, 0x2b, 0xe2, 0xea, 0xe1, 0x5a, 0xe8, 0xda, 0xef, 0x26, +0xe3, 0x16, 0xe2, 0x56, 0xe9, 0xf6, 0xd8, 0x5d, 0xdd, 0x3d, 0xce, 0xbd, 0xd9, +0x7d, 0xc6, 0xc3, 0xc2, 0x63, 0x9d, 0xc7, 0x79, 0x4f, 0xb4, 0xa7, 0xb7, 0xe7, +0x6e, 0xcf, 0x61, 0x2f, 0x65, 0x2f, 0x96, 0x57, 0xa3, 0xd7, 0xcc, 0x0a, 0xab, +0x15, 0xeb, 0x57, 0xf4, 0x78, 0x93, 0xbc, 0x83, 0xbc, 0x2b, 0xbd, 0x9f, 0xf8, +0xe8, 0xfb, 0xf0, 0x7d, 0xba, 0x7c, 0x61, 0xdf, 0x15, 0xbe, 0x7b, 0x7c, 0x1f, +0xae, 0xd4, 0x5a, 0xc9, 0x5b, 0xd9, 0xe1, 0x07, 0xfc, 0xbc, 0xfc, 0xf6, 0xf8, +0x3d, 0xf2, 0xd7, 0xf1, 0x4f, 0xf3, 0xff, 0x3e, 0x00, 0x13, 0xe0, 0x1f, 0x50, +0x15, 0xf0, 0x34, 0xd0, 0x34, 0x30, 0x37, 0xb0, 0x37, 0x88, 0x12, 0x14, 0x15, +0xd4, 0x14, 0xf4, 0x26, 0xd8, 0x39, 0xb8, 0x24, 0xf8, 0x41, 0x88, 0x6e, 0x88, +0x30, 0xa4, 0x3b, 0x54, 0x32, 0x34, 0x32, 0xb4, 0x31, 0x74, 0x2e, 0xcc, 0x35, +0xac, 0x34, 0x6c, 0x64, 0x95, 0xf1, 0xaa, 0xf5, 0xab, 0xae, 0x87, 0x2b, 0x84, +0x73, 0xc3, 0x3b, 0x23, 0xb0, 0x11, 0xa1, 0x11, 0x0d, 0x11, 0xb3, 0xab, 0xdd, +0x56, 0xef, 0x5d, 0x3d, 0x1e, 0x69, 0x11, 0x59, 0x10, 0x39, 0xb4, 0x46, 0x67, +0x4d, 0xd6, 0x9a, 0xab, 0x6b, 0x15, 0xd6, 0x26, 0xad, 0x3d, 0x13, 0x25, 0x19, +0xc5, 0x8c, 0x3a, 0x19, 0x8d, 0x8e, 0x0e, 0x8b, 0x6e, 0x8a, 0xfe, 0xc0, 0xf4, +0x63, 0xd6, 0x31, 0x67, 0x63, 0xbc, 0x62, 0xaa, 0x63, 0x66, 0x58, 0x2e, 0xac, +0x7d, 0xac, 0xe7, 0x6c, 0x47, 0x76, 0x19, 0x7b, 0x8a, 0x63, 0xc7, 0x29, 0xe5, +0x4c, 0xc4, 0xda, 0xc5, 0x96, 0xc6, 0x4e, 0xc6, 0xd9, 0xc5, 0xed, 0x89, 0x9b, +0x8a, 0x77, 0x88, 0x2f, 0x8f, 0x9f, 0xe6, 0xba, 0x70, 0x2b, 0xb9, 0x2f, 0x13, +0x3c, 0x13, 0x6a, 0x12, 0xe6, 0x12, 0xfd, 0x12, 0x8f, 0x24, 0x2e, 0x24, 0x85, +0x25, 0xb5, 0x26, 0xe3, 0x92, 0xa3, 0x93, 0x4f, 0xf1, 0x64, 0x78, 0x89, 0xbc, +0x9e, 0x14, 0x95, 0x94, 0xac, 0x94, 0x81, 0x54, 0x83, 0xd4, 0x82, 0xd4, 0x91, +0x34, 0x9b, 0xb4, 0xbd, 0x69, 0x33, 0x7c, 0x6f, 0x7e, 0x43, 0x3a, 0x94, 0xbe, +0x26, 0xbd, 0x53, 0x40, 0x15, 0xfd, 0x4c, 0xf5, 0x09, 0x75, 0x85, 0x5b, 0x85, +0xa3, 0x19, 0xf6, 0x19, 0x55, 0x19, 0x6f, 0x33, 0x43, 0x33, 0x4f, 0x66, 0x49, +0x67, 0xf1, 0xb2, 0xfa, 0xb2, 0xf5, 0xb3, 0x77, 0x64, 0x4f, 0xe4, 0xb8, 0xe7, +0x7c, 0xbd, 0x0e, 0xb5, 0x8e, 0xb5, 0xae, 0x3b, 0x57, 0x2d, 0x77, 0x73, 0xee, +0xe8, 0x7a, 0xa7, 0xf5, 0xb5, 0x1b, 0xa0, 0x0d, 0x31, 0x1b, 0xba, 0x37, 0x6a, +0x6c, 0xcc, 0xdf, 0x38, 0xbe, 0xc9, 0x63, 0xd3, 0xd1, 0xcd, 0x84, 0xcd, 0x89, +0x9b, 0x7f, 0xc8, 0x33, 0xc9, 0x2b, 0xcd, 0x7b, 0xbd, 0x25, 0x6c, 0x4b, 0x57, +0xbe, 0x72, 0xfe, 0xa6, 0xfc, 0xb1, 0xad, 0x1e, 0x5b, 0x9b, 0x0b, 0x24, 0x0a, +0xf8, 0x05, 0xc3, 0xdb, 0x6c, 0xb7, 0xd5, 0x6c, 0x47, 0x6d, 0xe7, 0x6e, 0xef, +0xdf, 0x61, 0xbe, 0x63, 0xff, 0x8e, 0x4f, 0x85, 0xec, 0xc2, 0x6b, 0x45, 0x26, +0x45, 0xe5, 0x45, 0x1f, 0x8a, 0x59, 0xc5, 0xd7, 0xbe, 0x32, 0xfd, 0xaa, 0xe2, +0xab, 0x85, 0x9d, 0xb1, 0x3b, 0xfb, 0x4b, 0x2c, 0x4b, 0x0e, 0xee, 0xc2, 0xec, +0xe2, 0xed, 0x1a, 0xda, 0xed, 0xb0, 0xfb, 0x68, 0xa9, 0x74, 0x69, 0x4e, 0xe9, +0xd8, 0x1e, 0xdf, 0x3d, 0xed, 0x65, 0xf4, 0xb2, 0xc2, 0xb2, 0xd7, 0x7b, 0xa3, +0xf6, 0x5e, 0x2d, 0x5f, 0x56, 0x5e, 0xb3, 0x8f, 0xb0, 0x4f, 0xb8, 0x6f, 0xa4, +0xc2, 0xa7, 0xa2, 0x73, 0xbf, 0xe6, 0xfe, 0x5d, 0xfb, 0x3f, 0x54, 0xc6, 0x57, +0xde, 0xa9, 0x72, 0xae, 0x6a, 0xad, 0x56, 0xaa, 0xde, 0x51, 0x3d, 0x77, 0x80, +0x7d, 0x60, 0xf0, 0xa0, 0xe3, 0xc1, 0x96, 0x1a, 0xe5, 0x9a, 0xa2, 0x9a, 0xf7, +0x87, 0xb8, 0x87, 0xee, 0xd6, 0x7a, 0xd4, 0xb6, 0xd7, 0x69, 0xd7, 0x95, 0x1f, +0xc6, 0x1c, 0xce, 0x38, 0xfc, 0xb4, 0x3e, 0xb4, 0xbe, 0xf7, 0x6b, 0xc6, 0xd7, +0x8d, 0x0d, 0x0a, 0x0d, 0x45, 0x0d, 0x1f, 0x8f, 0xf0, 0x8e, 0x8c, 0x1c, 0x0d, +0x3c, 0xda, 0xd3, 0x68, 0xd5, 0xd8, 0xd8, 0xa4, 0xd4, 0x54, 0xd2, 0x0c, 0x37, +0x0b, 0x9b, 0xa7, 0x8e, 0x45, 0x1e, 0xbb, 0xf9, 0x8d, 0xeb, 0x37, 0x9d, 0x2d, +0x86, 0x2d, 0xb5, 0xad, 0xb4, 0xd6, 0xa2, 0xe3, 0xe0, 0xb8, 0xf0, 0xf8, 0xb3, +0x6f, 0xa3, 0xbf, 0x1d, 0x3a, 0xe1, 0x7d, 0xa2, 0xfb, 0x24, 0xe3, 0x64, 0xcb, +0x77, 0x5a, 0xdf, 0x55, 0xb7, 0x51, 0xda, 0x0a, 0xdb, 0xa1, 0xf6, 0xec, 0xf6, +0x99, 0x8e, 0xf8, 0x8e, 0x91, 0xce, 0xf0, 0xce, 0x81, 0x53, 0x2b, 0x4e, 0x75, +0x77, 0xd9, 0x76, 0xb5, 0x7d, 0x6f, 0xf4, 0xfd, 0x91, 0xd3, 0x6a, 0xa7, 0xab, +0xce, 0xc8, 0x9e, 0x29, 0x39, 0x4b, 0x38, 0x9b, 0x7f, 0x76, 0xe1, 0x5c, 0xce, +0xb9, 0xd9, 0xf3, 0xa9, 0xe7, 0xa7, 0x2f, 0xc4, 0x5d, 0x18, 0xeb, 0x8e, 0xea, +0x7e, 0x70, 0x71, 0xd5, 0xc5, 0xdb, 0x3d, 0x01, 0x3d, 0xfd, 0x97, 0xbc, 0x2f, +0x5d, 0xb9, 0xec, 0x7e, 0xf9, 0x62, 0xaf, 0x53, 0xef, 0xb9, 0x2b, 0x76, 0x57, +0x4e, 0x5f, 0xb5, 0xb9, 0x7a, 0xea, 0x1a, 0xe3, 0x5a, 0xc7, 0x75, 0xcb, 0xeb, +0xed, 0x7d, 0x16, 0x7d, 0x6d, 0x3f, 0x58, 0xfc, 0xd0, 0xd6, 0x6f, 0xd9, 0xdf, +0x7e, 0xc3, 0xea, 0x46, 0xe7, 0x4d, 0xeb, 0x9b, 0x5d, 0x03, 0xcb, 0x07, 0xce, +0x0e, 0x3a, 0x0c, 0x5e, 0xb8, 0xe5, 0x7a, 0xeb, 0xf2, 0x6d, 0xaf, 0xdb, 0xd7, +0xef, 0xac, 0xbc, 0x33, 0x30, 0x14, 0x32, 0x74, 0x77, 0x38, 0x72, 0x78, 0xe4, +0x2e, 0xfb, 0xee, 0xe4, 0xbd, 0xa4, 0x7b, 0x2f, 0xef, 0x67, 0xdc, 0x9f, 0x7f, +0xb0, 0xe9, 0x21, 0xfa, 0x61, 0xe1, 0x23, 0xa9, 0x47, 0xe5, 0x8f, 0x95, 0x1e, +0xd7, 0xfd, 0xa8, 0xf7, 0x63, 0xeb, 0x88, 0xe5, 0xc8, 0x99, 0x51, 0xd7, 0xd1, +0xbe, 0x27, 0x41, 0x4f, 0x1e, 0x8c, 0xb1, 0xc6, 0x9e, 0xff, 0x94, 0xfe, 0xd3, +0x87, 0xf1, 0xfc, 0xa7, 0xe4, 0xa7, 0xe5, 0x13, 0xaa, 0x13, 0x8d, 0x93, 0x66, +0x93, 0xa7, 0xa7, 0xdc, 0xa7, 0x6e, 0x3e, 0x5b, 0xfd, 0x6c, 0xfc, 0x79, 0xea, +0xf3, 0xf9, 0xe9, 0x82, 0x9f, 0xa5, 0x7f, 0xae, 0x7e, 0xa1, 0xfb, 0xe2, 0xbb, +0x5f, 0x1c, 0x7f, 0xe9, 0x9b, 0x59, 0x35, 0x33, 0xfe, 0x92, 0xff, 0x72, 0xe1, +0xd7, 0xe2, 0x57, 0xf2, 0xaf, 0x8e, 0xbc, 0x5e, 0xf6, 0xba, 0x7b, 0xd6, 0x7f, +0xf6, 0xf1, 0x9b, 0xe4, 0x37, 0xf3, 0x73, 0x85, 0x6f, 0xe5, 0xdf, 0x1e, 0x7d, +0xc7, 0x78, 0xd7, 0xfb, 0x3e, 0xec, 0xfd, 0xc4, 0x7c, 0xe6, 0x07, 0xec, 0x87, +0x8a, 0x8f, 0x7a, 0x1f, 0xbb, 0x3e, 0x79, 0x7f, 0x7a, 0xb8, 0x90, 0xbc, 0xb0, +0xf0, 0x1b, 0xf7, 0x84, 0xf3, 0xfb, 0xe2, 0xe6, 0x1d, 0xc2, 0x00, 0x00, 0x00, +0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, +0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, +0x07, 0xdd, 0x01, 0x0a, 0x02, 0x35, 0x0f, 0x01, 0xa3, 0x67, 0xcc, 0x00, 0x00, +0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, +0xbd, 0xa7, 0x93, 0x00, 0x00, 0x05, 0x50, 0x49, 0x44, 0x41, 0x54, 0x18, 0x19, +0x6d, 0xc1, 0x5b, 0x88, 0x5c, 0x67, 0x01, 0xc0, 0xf1, 0xff, 0x77, 0x39, 0xe7, +0xcc, 0x7d, 0x76, 0xb2, 0xd9, 0xfb, 0x36, 0xdb, 0x24, 0x9b, 0xa4, 0x4d, 0x2f, +0xd1, 0x98, 0x62, 0x09, 0xb6, 0x25, 0x12, 0xd4, 0x3e, 0x28, 0x42, 0xd1, 0x80, +0x16, 0x5f, 0x4a, 0xa5, 0x0f, 0x56, 0x51, 0x1f, 0x6a, 0x11, 0x45, 0xa8, 0x45, +0x04, 0xb5, 0x68, 0xf1, 0x45, 0x9f, 0x0a, 0xb1, 0x52, 0x41, 0x6c, 0x20, 0x50, +0x7c, 0xb0, 0x68, 0x2c, 0x69, 0x5a, 0x6a, 0xb5, 0xe2, 0x62, 0x53, 0x4c, 0x8d, +0xb9, 0x6c, 0x92, 0x4e, 0x76, 0x27, 0x3b, 0xb3, 0x3b, 0x67, 0xce, 0x77, 0x75, +0x26, 0x2c, 0x18, 0x64, 0x7f, 0x3f, 0xc1, 0xff, 0x39, 0xfe, 0xd3, 0xc7, 0x79, +0xf4, 0x6b, 0xbf, 0x64, 0xe4, 0x17, 0x3f, 0xfa, 0x8a, 0xb8, 0xff, 0xbe, 0x03, +0xa2, 0xb3, 0x72, 0x59, 0x38, 0x6b, 0xc5, 0xee, 0x5d, 0x3b, 0xc5, 0xf2, 0xf2, +0x55, 0xdd, 0x5e, 0xed, 0x4e, 0xb4, 0xc6, 0xc7, 0x67, 0xc7, 0x5b, 0x63, 0xf3, +0x52, 0x30, 0xf5, 0xfe, 0xf9, 0x0b, 0x63, 0x4a, 0xca, 0xfd, 0xf3, 0x3b, 0x76, +0x9f, 0x98, 0x9c, 0x9c, 0xff, 0xdd, 0xe4, 0xde, 0xa3, 0x56, 0xb0, 0x85, 0x1f, +0x7e, 0xeb, 0xd3, 0xfa, 0xd0, 0x81, 0x7b, 0xa6, 0xd3, 0x72, 0xf5, 0xae, 0xe9, +0xa9, 0x89, 0xbd, 0xbd, 0x6e, 0x67, 0x97, 0x75, 0x76, 0x71, 0x7e, 0x66, 0x7a, +0xb7, 0x92, 0xcc, 0xa4, 0x89, 0x1a, 0xd3, 0x5a, 0x90, 0x17, 0x16, 0x81, 0xa2, +0x35, 0xbe, 0x8d, 0x68, 0xd6, 0xb0, 0x62, 0xf2, 0xf9, 0x98, 0x4e, 0x3d, 0x55, +0x9b, 0x3d, 0x98, 0x6b, 0xb6, 0x30, 0xd6, 0x68, 0x1e, 0x59, 0x58, 0x98, 0x39, +0x3e, 0x3d, 0xd1, 0x98, 0xf4, 0x76, 0xc0, 0x6d, 0x33, 0xf3, 0xa4, 0x59, 0x42, +0xc8, 0x7b, 0xa8, 0x34, 0xc3, 0x78, 0x4f, 0xbb, 0xdd, 0x8f, 0xa5, 0x52, 0x49, +0x54, 0x4a, 0x8a, 0x58, 0x74, 0x58, 0x5b, 0xbd, 0x4e, 0xac, 0x54, 0x72, 0xad, +0x27, 0x22, 0x43, 0x9a, 0x2d, 0xcc, 0xcd, 0x4e, 0x4f, 0xd5, 0xeb, 0x49, 0x96, +0x48, 0x87, 0x8f, 0x91, 0x41, 0xaf, 0x4b, 0x7f, 0x2d, 0x22, 0xb5, 0xc2, 0xf5, +0x06, 0x9c, 0x3d, 0xb7, 0x4c, 0x56, 0x69, 0x8a, 0x83, 0xfb, 0x9b, 0x58, 0x5b, +0xe0, 0x7c, 0xc4, 0xb9, 0x40, 0xb4, 0x45, 0x2a, 0x4c, 0x4f, 0x30, 0x24, 0xd9, +0xc2, 0x7a, 0x3f, 0x1f, 0x0c, 0xd6, 0x07, 0xc6, 0xe4, 0x39, 0xc2, 0xae, 0xa3, +0xc2, 0x06, 0x99, 0xc8, 0xa9, 0x48, 0xc3, 0xa9, 0x33, 0x4b, 0xbc, 0xfc, 0xfb, +0xb7, 0x30, 0xc6, 0x22, 0x12, 0x45, 0x8c, 0x82, 0x10, 0x22, 0xce, 0x3b, 0x8c, +0x19, 0x54, 0xf3, 0x7e, 0x57, 0x30, 0xa4, 0xd9, 0x42, 0xb1, 0xd1, 0xb1, 0x29, +0x7d, 0x17, 0x5d, 0x89, 0xce, 0x40, 0x53, 0x84, 0x04, 0xa5, 0x04, 0x35, 0x17, +0x58, 0x5d, 0xb9, 0x81, 0x70, 0x39, 0x49, 0x22, 0x41, 0x08, 0x46, 0x82, 0xf7, +0x58, 0x6b, 0x40, 0xf9, 0x92, 0xf0, 0x5e, 0x30, 0xa4, 0xb9, 0xc5, 0x0f, 0x5e, +0x3a, 0xc5, 0xd3, 0xc7, 0x1e, 0x84, 0x7c, 0x75, 0xe3, 0x72, 0xbf, 0x36, 0x68, +0x9b, 0xdd, 0x5c, 0xc8, 0xc7, 0x30, 0x21, 0x41, 0x29, 0x49, 0x3d, 0xf5, 0x5c, +0x88, 0xd7, 0xb0, 0x72, 0x15, 0x11, 0x03, 0x23, 0x11, 0xf0, 0xce, 0x61, 0x8b, +0x02, 0x9d, 0x85, 0x54, 0x4a, 0xc1, 0x88, 0x66, 0xd3, 0x93, 0xcf, 0x3c, 0xc7, +0xd3, 0xc7, 0x1e, 0x64, 0xa4, 0x73, 0xd7, 0xd7, 0xef, 0x3d, 0x6d, 0xc7, 0xe7, +0x6c, 0xa8, 0x83, 0x02, 0xa9, 0x05, 0x51, 0x6b, 0x7a, 0x3a, 0x61, 0x99, 0x05, +0xae, 0xc7, 0x35, 0x0a, 0x51, 0x01, 0xe1, 0x20, 0x82, 0x75, 0x16, 0x6b, 0x0a, +0x54, 0x08, 0x52, 0x10, 0x05, 0x43, 0x9a, 0x4d, 0xd3, 0xfb, 0x0e, 0x31, 0xf2, +0xb3, 0x93, 0x67, 0x1e, 0xd2, 0xb5, 0xd6, 0x37, 0xd0, 0xa5, 0x34, 0x8d, 0x16, +0x25, 0x04, 0x5a, 0x29, 0x92, 0x44, 0x23, 0x55, 0x42, 0x39, 0x53, 0x90, 0xd4, +0x08, 0x32, 0x01, 0x02, 0x21, 0x06, 0x9c, 0xb3, 0x18, 0x6b, 0x48, 0x7d, 0x10, +0x31, 0x70, 0x93, 0x66, 0xd3, 0xb7, 0x3f, 0xff, 0x00, 0x5f, 0xfa, 0xe6, 0xf7, +0xa6, 0x62, 0x14, 0x4f, 0xd4, 0x6b, 0xb5, 0x39, 0x67, 0x0b, 0x84, 0xd0, 0x31, +0x49, 0x52, 0x21, 0x75, 0x06, 0x52, 0x51, 0x4a, 0x34, 0xa9, 0x56, 0x24, 0x0a, +0x84, 0xe0, 0xa6, 0xe0, 0x3d, 0xd6, 0x58, 0x9c, 0x29, 0xf0, 0xd1, 0x83, 0xe4, +0x26, 0xc9, 0xd0, 0x23, 0x4f, 0x7e, 0x87, 0x91, 0x03, 0x87, 0x8f, 0xdc, 0x56, +0x6d, 0x36, 0x8e, 0xa4, 0x5a, 0x91, 0x4a, 0x19, 0xab, 0x59, 0x26, 0x84, 0x80, +0x4e, 0xfb, 0x22, 0x2b, 0xd7, 0x2e, 0x71, 0x63, 0xa3, 0x87, 0x4a, 0x4a, 0x94, +0x4a, 0x25, 0xa4, 0x94, 0x10, 0x23, 0xce, 0x59, 0xac, 0x35, 0x18, 0x53, 0x40, +0x8c, 0x48, 0xa9, 0x18, 0xd1, 0x0c, 0xfd, 0xf6, 0xf9, 0x67, 0x18, 0xf1, 0xde, +0xef, 0xa9, 0x64, 0xe5, 0xa9, 0x44, 0x69, 0x54, 0xb9, 0x2c, 0x92, 0xac, 0xc2, +0xda, 0xf2, 0xfb, 0x94, 0xdb, 0xa7, 0xd9, 0xa1, 0x2f, 0xd1, 0xde, 0xb8, 0x93, +0xde, 0xba, 0x21, 0x1f, 0x58, 0x42, 0x08, 0x20, 0x24, 0xce, 0x3a, 0x9c, 0x31, +0x58, 0x63, 0x71, 0xce, 0x2b, 0xef, 0x3c, 0x23, 0x9a, 0xff, 0x11, 0x69, 0x9a, +0xaa, 0x4a, 0xad, 0x4a, 0x92, 0xa5, 0x08, 0x40, 0x66, 0x55, 0xca, 0x49, 0xa4, +0x92, 0x59, 0xa6, 0xfc, 0x65, 0x52, 0xdd, 0xc4, 0xac, 0x47, 0x6e, 0xac, 0xf5, +0x48, 0xf4, 0x14, 0x48, 0xb0, 0x45, 0x81, 0x75, 0x86, 0xe0, 0x3d, 0x45, 0xde, +0xaf, 0x6c, 0xf4, 0x56, 0x05, 0x43, 0x72, 0xef, 0xde, 0xbd, 0x42, 0x29, 0x95, +0x00, 0xc9, 0xf9, 0xb3, 0x4b, 0xb9, 0x54, 0xbe, 0xa8, 0x37, 0xca, 0x0c, 0xf2, +0x01, 0xd7, 0x96, 0x2f, 0xd1, 0xcd, 0x23, 0x79, 0x79, 0x81, 0x0b, 0xad, 0x4f, +0xb2, 0x5e, 0xbf, 0x93, 0x72, 0x9a, 0x50, 0xae, 0x56, 0xf9, 0xdb, 0xb9, 0x82, +0xfe, 0xca, 0x00, 0x29, 0x03, 0xd6, 0x58, 0x9c, 0xb7, 0x38, 0x9b, 0xd7, 0xcc, +0xa0, 0x27, 0x19, 0xd2, 0x49, 0x92, 0x64, 0x43, 0xf3, 0xfd, 0x7e, 0xbf, 0xfc, +0xea, 0xcb, 0xbf, 0xee, 0xcd, 0xec, 0xdc, 0x75, 0x6e, 0xe7, 0xfe, 0x0f, 0xed, +0xbf, 0x72, 0xe9, 0x62, 0x8c, 0x21, 0x08, 0x9d, 0x55, 0x18, 0xd4, 0xee, 0x60, +0x23, 0x15, 0xa8, 0xac, 0x46, 0x56, 0xeb, 0x50, 0xcd, 0x7a, 0x9c, 0x39, 0x37, +0xe0, 0xf0, 0x9e, 0x0d, 0xe6, 0x6b, 0x01, 0x6b, 0x0c, 0xd6, 0x58, 0x82, 0xf7, +0x69, 0x0c, 0x81, 0x11, 0xbd, 0xb8, 0xb8, 0x58, 0x5c, 0xbd, 0x7a, 0xb5, 0x3f, +0x34, 0xf7, 0xf7, 0xd7, 0xff, 0xd8, 0xbf, 0xfd, 0xee, 0x8f, 0x9c, 0xaa, 0x8e, +0xcf, 0xde, 0xd1, 0xda, 0x3e, 0x29, 0xb1, 0x06, 0x95, 0x68, 0xa4, 0xca, 0x08, +0x2a, 0x25, 0x2d, 0x67, 0xdc, 0x7b, 0xe8, 0x7e, 0xba, 0x9d, 0x15, 0xa4, 0x5f, +0x47, 0x10, 0x31, 0xc6, 0x60, 0x9d, 0xc1, 0x59, 0x43, 0x8c, 0x51, 0x0b, 0x10, +0x0c, 0xc9, 0x13, 0x27, 0x4e, 0xc4, 0x95, 0x95, 0x95, 0x2b, 0x4a, 0x29, 0x07, +0x4c, 0xbe, 0xfd, 0xca, 0xaf, 0xde, 0x5e, 0x3d, 0xfb, 0xc6, 0xf9, 0x46, 0x73, +0x9c, 0xe6, 0xd4, 0x1c, 0xb5, 0x7a, 0x83, 0x4a, 0x39, 0xa1, 0x94, 0x06, 0x94, +0x70, 0x6c, 0x9b, 0x9e, 0xa6, 0xdc, 0x68, 0xe1, 0xd1, 0xf8, 0x10, 0xb0, 0xb6, +0xc0, 0x59, 0x8b, 0xb3, 0x86, 0xe8, 0x5d, 0x1a, 0xbc, 0x15, 0x0c, 0x49, 0x86, +0x4a, 0x43, 0xc0, 0x0e, 0xa0, 0x25, 0xdd, 0x7a, 0xb2, 0xa8, 0x2f, 0x9a, 0xf2, +0xd5, 0xd7, 0x58, 0xbb, 0x7e, 0x99, 0x90, 0x8d, 0xa1, 0x1a, 0xdb, 0x48, 0xeb, +0xe3, 0xe8, 0x7a, 0x03, 0xab, 0xaa, 0xb1, 0x30, 0x0e, 0xf3, 0xc1, 0x7b, 0xb8, +0xbc, 0x8b, 0xf3, 0x22, 0x3a, 0x63, 0xa2, 0x19, 0x6c, 0x20, 0x94, 0xd2, 0x49, +0x56, 0x66, 0x44, 0x33, 0xe4, 0xbd, 0x77, 0xde, 0xfb, 0x15, 0x60, 0x31, 0x88, +0x54, 0x4e, 0x4c, 0x2f, 0x24, 0xb3, 0xee, 0x5d, 0x2e, 0xbe, 0xfe, 0x02, 0xed, +0xd9, 0x07, 0x48, 0x26, 0xf6, 0x80, 0xae, 0x44, 0x7c, 0x5f, 0x0c, 0xae, 0x9f, +0x13, 0xd9, 0x7f, 0x4e, 0x52, 0xc9, 0xaf, 0x10, 0xfd, 0x3c, 0x85, 0x0d, 0xf4, +0x3a, 0xd7, 0x44, 0x73, 0x62, 0x81, 0x52, 0x75, 0xec, 0xd9, 0x6d, 0xb3, 0xfb, +0xba, 0x0c, 0x69, 0x86, 0xec, 0x50, 0xab, 0xd5, 0x7a, 0xb3, 0xd7, 0x5b, 0x9f, +0x4d, 0x12, 0xfd, 0x99, 0x3c, 0x96, 0xb6, 0x17, 0xb6, 0x4b, 0x63, 0xe3, 0x1d, +0xcc, 0x3f, 0xdf, 0x81, 0x7f, 0x4f, 0xa2, 0x2a, 0x2d, 0x51, 0xa9, 0x34, 0xd6, +0xe6, 0xe6, 0xe7, 0x5e, 0xfb, 0x6b, 0xa7, 0x7d, 0x69, 0xe9, 0x5f, 0xed, 0xf1, +0xcf, 0xe6, 0xf6, 0x21, 0x5d, 0xb4, 0x27, 0x2a, 0x63, 0x33, 0x45, 0x6b, 0x7a, +0xf1, 0xcb, 0xf7, 0x7c, 0xec, 0xd8, 0x8b, 0x69, 0x73, 0x8f, 0xff, 0xea, 0x87, +0x41, 0x0c, 0x11, 0x63, 0x64, 0x53, 0x5d, 0xa7, 0xd9, 0x27, 0x1e, 0x3b, 0x76, +0xe4, 0x89, 0x47, 0x8e, 0xec, 0x38, 0x5a, 0x4e, 0xc2, 0x8d, 0x52, 0x6d, 0xfb, +0x9f, 0x83, 0xb7, 0xa7, 0xab, 0xcd, 0xc9, 0xd3, 0x97, 0x97, 0xfe, 0xb4, 0x74, +0xdf, 0x47, 0x0f, 0x9b, 0xa3, 0x8f, 0xbf, 0x60, 0x17, 0xe6, 0x9b, 0x1f, 0xff, +0xc2, 0xa7, 0xf6, 0xfd, 0xe6, 0xd0, 0xdd, 0x0b, 0x74, 0x6c, 0xf3, 0xb1, 0x83, +0x0f, 0x3f, 0xf5, 0x12, 0x9b, 0xba, 0x1f, 0x2c, 0x71, 0xd3, 0xdc, 0xdc, 0x1c, +0xb7, 0x10, 0x07, 0x16, 0xb7, 0xa5, 0xef, 0xbe, 0x79, 0x7c, 0xea, 0xca, 0x3f, +0x5e, 0xac, 0xfd, 0xe5, 0xe4, 0xf7, 0xd5, 0xd2, 0x1f, 0x7e, 0x2c, 0x63, 0xff, +0x3d, 0x6e, 0xf5, 0x93, 0xef, 0x7e, 0x71, 0xc7, 0x1b, 0xaf, 0x3c, 0xf7, 0x73, +0x77, 0xed, 0xd5, 0x47, 0xd9, 0xf4, 0xec, 0xe7, 0xa0, 0x7b, 0xe5, 0x2d, 0x46, +0xfe, 0x0b, 0x23, 0x6d, 0x86, 0x4b, 0xa3, 0xa1, 0xde, 0x64, 0x00, 0x00, 0x00, +0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 }; static const unsigned char Toolbar_Options3_png[] = { From 14b8d3f107c697c900ca0f401f06fc360dca7b5b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 22:53:04 -0600 Subject: [PATCH 360/627] Add support for german region flag. Still need to change image. (currently using a copy of europe flag) --- Source/Core/DiscIO/Src/Volume.h | 1 + Source/Core/DiscIO/Src/VolumeCommon.cpp | 4 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 + .../Core/DolphinWX/resources/Flag_Germany.png | Bin 0 -> 795 bytes .../Core/DolphinWX/resources/Flag_Germany.xpm | 83 ++++++++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.xpm diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f8a6f13ecb..47cbc4f302 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -47,6 +47,7 @@ public: enum ECountry { COUNTRY_EUROPE = 0, + COUNTRY_GERMANY, COUNTRY_FRANCE, COUNTRY_RUSSIA, COUNTRY_USA, diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp index f3389aea42..415af2725a 100644 --- a/Source/Core/DiscIO/Src/VolumeCommon.cpp +++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp @@ -28,10 +28,12 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) // PAL case 'D': // German + return IVolume::COUNTRY_GERMANY; + break; + case 'X': // Used by a couple PAL games case 'Y': // German, french - case 'L': // Japanese import to PAL regions case 'M': // Japanese import to PAL regions case 'S': // Spanish-speaking regions diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 28051eb390..f0811a9d27 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -36,6 +36,7 @@ #include "Main.h" #include "../resources/Flag_Europe.xpm" +#include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" #include "../resources/Flag_Italy.xpm" #include "../resources/Flag_Japan.xpm" @@ -191,6 +192,8 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = + m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.png b/Source/Core/DolphinWX/resources/Flag_Germany.png new file mode 100644 index 0000000000000000000000000000000000000000..c41352f36a9f99809fdc50210496d29e2c11e479 GIT binary patch literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm new file mode 100644 index 0000000000..f0ca5a0934 --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static const char *const Flag_Germany_xpm[] = { +"96 32 48 1", +" c None", +". c #000000", +"+ c #0000FD", +"@ c #0000FF", +"# c #0808F7", +"$ c #5C5CA3", +"% c #1717E8", +"& c #767680", +"* c #EDED00", +"= c #A5A54D", +"- c #2E2EB9", +"; c #96961A", +"> c #4A4A8E", +", c #0000FB", +"' c #0000F4", +") c #0808EC", +"! c #5C5C9B", +"~ c #1717DD", +"{ c #0000EE", +"] c #767677", +"^ c #A5A547", +"/ c #0000DD", +"( c #2E2EA0", +"_ c #969616", +": c #4A4A7B", +"< c #0000D2", +"[ c #0000C6", +"} c #0808BF", +"| c #5C5C7E", +"1 c #1717B4", +"2 c #0000B9", +"3 c #76765C", +"4 c #A5A537", +"5 c #0808B3", +"6 c #5C5C76", +"7 c #1717A8", +"8 c #0000A9", +"9 c #2E2E7A", +"0 c #969611", +"a c #4A4A5E", +"b c #767654", +"c c #A5A533", +"d c #000097", +"e c #2E2E6D", +"f c #96960F", +"g c #4A4A54", +"h c #000081", +"i c #000077", +" ", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", +".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", +".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", +".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", +".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", +".''''''')!~''''''''')!~''''''''. ", +".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", +".///////(_://///////(_:////////. ", +".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", +".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", +".2222222223*4256723*42222222222. ", +".88888888890a8b*c890a8888888888. ", +".dddddddddddddefgdddddddddddddd. ", +".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; From 3ebe0718b8fde3d1acedb1840c5c8fe44625e8fd Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 10 Jan 2013 00:22:28 -0500 Subject: [PATCH 361/627] Change theme selection to wxChoice. --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 20 ++++++++++---------- Source/Core/DolphinWX/Src/ConfigMain.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index ce4cd9cb22..12deddb572 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -127,7 +127,7 @@ EVT_SLIDER(ID_VOLUME, CConfigMain::AudioSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_ONSCREENDISPLAYMESSAGES, CConfigMain::DisplaySettingsChanged) -EVT_RADIOBOX(ID_INTERFACE_THEME, CConfigMain::DisplaySettingsChanged) +EVT_CHOICE(ID_INTERFACE_THEME, CConfigMain::DisplaySettingsChanged) EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::DisplaySettingsChanged) EVT_BUTTON(ID_HOTKEY_CONFIG, CConfigMain::DisplaySettingsChanged) @@ -500,10 +500,7 @@ void CConfigMain::InitializeGUITooltips() OnScreenDisplayMessages->SetToolTip(_("Show messages on the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); // Display - Themes: Copyright notice - Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]")); - Theme->SetItemToolTip(1, _("Created by VistaIcons.com")); - Theme->SetItemToolTip(2, _("Created by black_rider and published on ForumW.org > Web Developments")); - Theme->SetItemToolTip(3, _("Created by KDE-Look.org")); + Theme->SetToolTip(_("Boomy: Milosz Wlazlo [miloszwl@miloszwl.com]\nVista: VistaIcons.com\nX-Plastik: black_rider [ForumW.org]\nKDE: KDE-Look.org")); InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); @@ -579,9 +576,9 @@ void CConfigMain::CreateGUIControls() // Hotkey configuration HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); - // Themes - this should really be a wxChoice... - Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, _("Theme"), - wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS); + // Themes + Theme = new wxChoice(DisplayPage, ID_INTERFACE_THEME, wxDefaultPosition, + wxDefaultSize, arrayStringFor_Themes, 0, wxDefaultValidator); // Interface settings ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm on Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); @@ -595,13 +592,16 @@ void CConfigMain::CreateGUIControls() sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterface->AddStretchSpacer(); sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5); + wxBoxSizer* scInterface = new wxBoxSizer(wxHORIZONTAL); + scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->Add(Theme, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); + scInterface->AddStretchSpacer(); sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings")); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); sbInterface->Add(OnScreenDisplayMessages, 0, wxALL, 5); - sbInterface->Add(Theme, 0, wxEXPAND | wxALL, 5); + sbInterface->Add(scInterface, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterface, 0, wxEXPAND | wxALL, 5); - sDisplayPage = new wxBoxSizer(wxVERTICAL); sDisplayPage->Add(sbInterface, 0, wxEXPAND | wxALL, 5); DisplayPage->SetSizer(sDisplayPage); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index 9b5dbf4243..0e594101df 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -165,7 +165,7 @@ private: wxCheckBox* ConfirmStop; wxCheckBox* UsePanicHandlers; wxCheckBox* OnScreenDisplayMessages; - wxRadioBox* Theme; + wxChoice* Theme; wxChoice* InterfaceLang; wxButton* HotkeyConfig; From 7bf72a6c8476798ecbb9cdb13ec3a8f0b9858da6 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 11 Jan 2013 01:03:18 +1100 Subject: [PATCH 362/627] Fixed the random static audio that would sometimes occur in DSP HLE and DSP LLE. --- Source/Core/Core/Src/DSP/DSPAccelerator.cpp | 5 ++--- Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp index dcb79b7ac5..2058a92f9d 100644 --- a/Source/Core/Core/Src/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp @@ -165,11 +165,10 @@ u16 dsp_read_accelerator() // Somehow, YN1 and YN2 must be initialized with their "loop" values, // so yeah, it seems likely that we should raise an exception to let // the DSP program do that, at least if DSP_FORMAT == 0x0A. - if (Address >= EndAddress) + if ((Address & ~0x1f) == (EndAddress & ~0x1f)) { // Set address back to start address. - if ((Address & ~0x1f) == (EndAddress & ~0x1f)) - Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; + Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL]; DSPCore_SetException(EXP_ACCOV); } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 349dc7e03b..e39b38b100 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -203,12 +203,10 @@ u16 AcceleratorGetSample() // // On real hardware, this would raise an interrupt that is handled by the // UCode. We simulate what this interrupt does here. - if (*acc_cur_addr >= acc_end_addr) + if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) { - // If we are really at the end (and we don't simply have cur_addr > - // end_addr all the time), loop back to loop_addr. - if ((*acc_cur_addr & ~0x1F) == (acc_end_addr & ~0x1F)) - *acc_cur_addr = acc_loop_addr; + // If we are really at the end, loop back to loop_addr. + *acc_cur_addr = acc_loop_addr; if (acc_pb->audio_addr.looping) { From 304814e7cca0d9ac1497a955f7a6741a62fe4396 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 9 Jan 2013 10:19:18 +0100 Subject: [PATCH 363/627] Video_Software: Implement proper RGBA8 texture loading from tmem. For RGBA8 textures, AR and GB tiles are stored in separate tmem banks. TextureDecoder did not support that previously. --- .../Core/VideoCommon/Src/TextureDecoder.cpp | 22 ++++++++++ Source/Core/VideoCommon/Src/TextureDecoder.h | 1 + .../Plugin_VideoSoftware/Src/BPMemLoader.cpp | 39 +++++++++++++---- .../Src/TextureSampler.cpp | 42 ++++++++++++++----- 4 files changed, 85 insertions(+), 19 deletions(-) diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index 180c901730..362a42e015 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -2515,6 +2515,28 @@ void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth } } +void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth) +{ + u16 sBlk = s >> 2; + u16 tBlk = t >> 2; + u16 widthBlks = (imageWidth >> 2) + 1; + u32 base_ar = (tBlk * widthBlks + sBlk) << 4; + u32 base_gb = (tBlk * widthBlks + sBlk) << 4; + u16 blkS = s & 3; + u16 blkT = t & 3; + u32 blk_off = (blkT << 2) + blkS; + + u32 offset_ar = (base_ar + blk_off) << 1; + u32 offset_gb = (base_gb + blk_off) << 1; + const u8* val_addr_ar = src_ar + offset_ar; + const u8* val_addr_gb = src_gb + offset_gb; + + dst[3] = val_addr_ar[0]; // A + dst[0] = val_addr_ar[1]; // R + dst[1] = val_addr_gb[0]; // G + dst[2] = val_addr_gb[1]; // B +} + const char* texfmt[] = { // pixel diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h index 1901c86d27..dd4b17eea3 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.h +++ b/Source/Core/VideoCommon/Src/TextureDecoder.h @@ -86,6 +86,7 @@ enum PC_TexFormat PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt,bool rgbaOnly = false); PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt); void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt); +void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth); void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center); #endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp index 3db8c5d493..6a17a40eb1 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp @@ -115,18 +115,39 @@ void SWBPWritten(int address, int newvalue) case BPMEM_PRELOAD_MODE: if (newvalue != 0) { - // NOTE(neobrain): Apparently tmemodd doesn't affect hardware behavior at all (libogc uses it just as a buffe$ + // TODO: Not quite sure if this is completely correct (likely not) + // NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature. + BPS_TmemConfig& tmem_cfg = bpmem.tmem_config; - u8* ram_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); - u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - u32 size = tmem_cfg.preload_tile_info.count * 32; + u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC? + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; + u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - // Check if the game has overflowed TMEM, and copy up to the limit. - // Paper Mario does this when entering the Great Boogly Tree (Chap 2) - if ((tmem_addr + size) > TMEM_SIZE) - size = TMEM_SIZE - tmem_addr; + if (tmem_cfg.preload_tile_info.type != 3) + { + if (tmem_addr_even + size > TMEM_SIZE) + size = TMEM_SIZE - tmem_addr_even; - memcpy(texMem + tmem_addr, ram_ptr, size); + memcpy(texMem + tmem_addr_even, src_ptr, size); + } + else // RGBA8 tiles (and CI14, but that might just be stupid libogc!) + { + // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything + u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; + + for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + { + if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || + tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) + break; + + memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); + memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE); + tmem_addr_even += TMEM_LINE_SIZE; + tmem_addr_odd += TMEM_LINE_SIZE; + src_ptr += TMEM_LINE_SIZE * 2; + } + } } break; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp index 66b6b68e22..56101dc69d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp @@ -120,10 +120,12 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) TexImage0& ti0 = texUnit.texImage0[subTexmap]; TexTLUT& texTlut = texUnit.texTlut[subTexmap]; - u8 *imageSrc; + u8 *imageSrc, *imageSrcOdd = NULL; if (texUnit.texImage1[subTexmap].image_type) { imageSrc = &texMem[texUnit.texImage1[subTexmap].tmem_even * TMEM_LINE_SIZE]; + if (ti0.format == GX_TF_RGBA8) + imageSrcOdd = &texMem[texUnit.texImage2[subTexmap].tmem_odd * TMEM_LINE_SIZE]; } else { @@ -190,17 +192,34 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) WrapCoord(imageSPlus1, tm0.wrap_s, imageWidth); WrapCoord(imageTPlus1, tm0.wrap_t, imageHeight); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); + if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type)) + { + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageS, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); - TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); - AddTexel(sampledTex, texel, (fractS) * (fractT)); + TexDecoder_DecodeTexel(sampledTex, imageSrc, imageSPlus1, imageTPlus1, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + AddTexel(sampledTex, texel, (fractS) * (fractT)); + } + else + { + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageS, imageT, imageWidth); + SetTexel(sampledTex, texel, (128 - fractS) * (128 - fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageSPlus1, imageT, imageWidth); + AddTexel(sampledTex, texel, (fractS) * (128 - fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageS, imageTPlus1, imageWidth); + AddTexel(sampledTex, texel, (128 - fractS) * (fractT)); + + TexDecoder_DecodeTexelRGBA8FromTmem(sampledTex, imageSrc, imageSrcOdd, imageSPlus1, imageTPlus1, imageWidth); + AddTexel(sampledTex, texel, (fractS) * (fractT)); + } sample[0] = (u8)(texel[0] >> 14); sample[1] = (u8)(texel[1] >> 14); @@ -217,7 +236,10 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample) WrapCoord(imageS, tm0.wrap_s, imageWidth); WrapCoord(imageT, tm0.wrap_t, imageHeight); - TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + if (!(ti0.format == GX_TF_RGBA8 && texUnit.texImage1[subTexmap].image_type)) + TexDecoder_DecodeTexel(sample, imageSrc, imageS, imageT, imageWidth, ti0.format, tlutAddress, texTlut.tlut_format); + else + TexDecoder_DecodeTexelRGBA8FromTmem(sample, imageSrc, imageSrcOdd, imageS, imageT, imageWidth); } } From e7c883d6be5979cc142c942efef354317998fcbc Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 10 Jan 2013 15:12:21 +0100 Subject: [PATCH 364/627] VideoCommon: Implement proper RGBA8 texture loading from tmem. --- Source/Core/VideoCommon/Src/BPStructs.cpp | 39 ++++++++++++++----- .../Core/VideoCommon/Src/TextureCacheBase.cpp | 16 ++++++-- .../Core/VideoCommon/Src/TextureDecoder.cpp | 14 ++++++- Source/Core/VideoCommon/Src/TextureDecoder.h | 1 + 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 88556cbee8..c975b12240 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -497,18 +497,39 @@ void BPWritten(const BPCmd& bp) // if this is different from 0, manual TMEM management is used (GX_PreloadEntireTexture). if (bp.newvalue != 0) { - // NOTE(neobrain): Apparently tmemodd doesn't affect hardware behavior at all (libogc uses it just as a buffer and switches its contents with tmemeven whenever this is called) + // TODO: Not quite sure if this is completely correct (likely not) + // NOTE: libogc's implementation of GX_PreloadEntireTexture seems flawed, so it's not necessarily a good reference for RE'ing this feature. + BPS_TmemConfig& tmem_cfg = bpmem.tmem_config; - u8* ram_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); - u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - u32 size = tmem_cfg.preload_tile_info.count * 32; + u8* src_ptr = Memory::GetPointer(tmem_cfg.preload_addr << 5); // TODO: Should we add mask here on GC? + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; + u32 tmem_addr_even = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; - // Check if the game has overflowed TMEM, and copy up to the limit. - // Paper Mario does this when entering the Great Boogly Tree (Chap 2) - if ((tmem_addr + size) > TMEM_SIZE) - size = TMEM_SIZE - tmem_addr; + if (tmem_cfg.preload_tile_info.type != 3) + { + if (tmem_addr_even + size > TMEM_SIZE) + size = TMEM_SIZE - tmem_addr_even; - memcpy(texMem + tmem_addr, ram_ptr, size); + memcpy(texMem + tmem_addr_even, src_ptr, size); + } + else // RGBA8 tiles (and CI14, but that might just be stupid libogc!) + { + // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything + u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; + + for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i) + { + if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || + tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) + break; + + memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); + memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE); + tmem_addr_even += TMEM_LINE_SIZE; + tmem_addr_odd += TMEM_LINE_SIZE; + src_ptr += TMEM_LINE_SIZE * 2; + } + } } break; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index cfbd4eb6c8..e0fc11fe1b 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -333,6 +333,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, if (from_tmem) src_data = &texMem[bpmem.tex[stage/4].texImage1[stage%4].tmem_even * TMEM_LINE_SIZE]; else src_data = Memory::GetPointer(address); + // TODO: This doesn't hash GB tiles for preloaded RGBA8 textures (instead, it's hashing more data from the low tmem bank than it should) tex_hash = GetHash64(src_data, texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); if (isPaletteTexture) { @@ -413,10 +414,19 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, } } - // TODO: RGBA8 textures are stored non-continuously in tmem, that might cause problems here when preloading is enabled if (!using_custom_texture) - pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, - expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + { + if (!(texformat == GX_TF_RGBA8 && from_tmem)) + { + pcfmt = TexDecoder_Decode(temp, src_data, expandedWidth, + expandedHeight, texformat, tlutaddr, tlutfmt, g_ActiveConfig.backend_info.bUseRGBATextures); + } + else + { + u8* src_data_gb = &texMem[bpmem.tex[stage/4].texImage2[stage%4].tmem_odd * TMEM_LINE_SIZE]; + pcfmt = TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight); + } + } // TODO: Cleanup. Plus, we still autogenerate mipmaps in certain cases (we shouldn't do that) bool isPow2; diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index 362a42e015..44efcf8bae 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -2519,7 +2519,7 @@ void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* sr { u16 sBlk = s >> 2; u16 tBlk = t >> 2; - u16 widthBlks = (imageWidth >> 2) + 1; + u16 widthBlks = (imageWidth >> 2) + 1; // TODO: Looks wrong. Shouldn't this be ((imageWidth-1)>>2)+1 ? u32 base_ar = (tBlk * widthBlks + sBlk) << 4; u32 base_gb = (tBlk * widthBlks + sBlk) << 4; u16 blkS = s & 3; @@ -2537,6 +2537,18 @@ void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* sr dst[2] = val_addr_gb[1]; // B } +PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height) +{ + // TODO for someone who cares: Make this less slow! + for (int y = 0; y < height; ++y) + for (int x = 0; x < width; ++x) + { + TexDecoder_DecodeTexelRGBA8FromTmem(dst, src_ar, src_gb, x, y, width-1); + dst += 4; + } + + return PC_TEX_FMT_RGBA32; +} const char* texfmt[] = { // pixel diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.h b/Source/Core/VideoCommon/Src/TextureDecoder.h index dd4b17eea3..fae70897f5 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.h +++ b/Source/Core/VideoCommon/Src/TextureDecoder.h @@ -87,6 +87,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt); void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth, int texformat, int tlutaddr, int tlutfmt); void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth); +PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height); void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center); #endif From 198d60c56964fc8a9c679cdf9ab9805c684146ef Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Wed, 9 Jan 2013 11:16:35 +0100 Subject: [PATCH 365/627] FifoPlayer: Support recording texture preloads --- Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp | 4 ++-- Source/Core/Core/Src/FifoPlayer/FifoDataFile.h | 2 +- .../Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp | 13 ++++++++++++- .../Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp index f074b6d88b..383fcb555d 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoAnalyzer.cpp @@ -90,9 +90,9 @@ void GetTlutLoadData(u32 &tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory & // TODO - figure out a cleaner way. if (Core::g_CoreStartupParameter.bWii) - memAddr = bpmem.tmem_config.tlut_src << 5; + memAddr = bpMem.tmem_config.tlut_src << 5; else - memAddr = (bpmem.tmem_config.tlut_src & 0xFFFFF) << 5; + memAddr = (bpMem.tmem_config.tlut_src & 0xFFFFF) << 5; } void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h index a95a46c1fd..d1ae9ee886 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoDataFile.h @@ -33,7 +33,7 @@ struct MemoryUpdate TEXTURE_MAP = 0x01, XF_DATA = 0x02, VERTEX_STREAM = 0x04, - TLUT = 0x08 + TMEM = 0x08, }; u32 fifoPosition; diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp index 1c0cd7abe1..a6467f0366 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.cpp @@ -114,6 +114,8 @@ void FifoRecordAnalyzer::DecodeOpcode(u8 *data) if (bp.address == BPMEM_LOADTLUT1) ProcessLoadTlut1(); + if (bp.address == BPMEM_PRELOAD_MODE) + ProcessPreloadTexture(); } break; @@ -143,7 +145,16 @@ void FifoRecordAnalyzer::ProcessLoadTlut1() GetTlutLoadData(tlutMemAddr, memAddr, tlutXferCount, *m_BpMem); - FifoRecorder::GetInstance().WriteMemory(memAddr, tlutXferCount, MemoryUpdate::TLUT); + FifoRecorder::GetInstance().WriteMemory(memAddr, tlutXferCount, MemoryUpdate::TMEM); +} + +void FifoRecordAnalyzer::ProcessPreloadTexture() +{ + BPS_TmemConfig& tmem_cfg = m_BpMem->tmem_config; + u32 tmem_addr = tmem_cfg.preload_tmem_even * TMEM_LINE_SIZE; + u32 size = tmem_cfg.preload_tile_info.count * TMEM_LINE_SIZE; // TODO: Should this be half size for RGBA8 preloads? + + FifoRecorder::GetInstance().WriteMemory(tmem_cfg.preload_addr << 5, size, MemoryUpdate::TMEM); } void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array) diff --git a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h index 0ffc279bf3..8ef3360ce7 100644 --- a/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/Src/FifoPlayer/FifoRecordAnalyzer.h @@ -40,6 +40,7 @@ private: void DecodeOpcode(u8 *data); void ProcessLoadTlut1(); + void ProcessPreloadTexture(); void ProcessLoadIndexedXf(u32 val, int array); void ProcessVertexArrays(u8 *data, u8 vtxAttrGroup); void ProcessTexMaps(); From 2c1c538fda491f97a735902e00987537db1d3487 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 10 Jan 2013 18:43:15 +0100 Subject: [PATCH 366/627] Disable the OpenAL and Pulseaudio audio backends They are currently broken and cause sound issues which are not present in other backends: * OpenAL plays music 2x too fast in Zelda UCode games with HLE * Pulse backend uses a lot of CPU power and slows down emulation significantly Both backends are currently being re-implemented in separate branches of Dolphin, so this should be a temporary removal. --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 8a568448a3..b21aec45ba 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -102,16 +102,12 @@ namespace AudioCommon backends.push_back(BACKEND_DIRECTSOUND); if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); - if (OpenALStream::isValid()) - backends.push_back(BACKEND_OPENAL); if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); - if (PulseAudio::isValid()) - backends.push_back(BACKEND_PULSEAUDIO); return backends; } From ab24149b1bda34fd8f0f72043f4d94f57d38cf60 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 10 Jan 2013 13:35:32 -0500 Subject: [PATCH 367/627] Retain scroll position after refreshing game list. Fixes issue 5878. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 28051eb390..6ee860c229 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -259,6 +259,7 @@ void CGameListCtrl::BrowseForDirectory() void CGameListCtrl::Update() { + int scrollPos = wxWindow::GetScrollPos(wxVERTICAL); // Don't let the user refresh it while a game is running if (Core::GetState() != Core::CORE_UNINITIALIZED) return; @@ -363,6 +364,7 @@ void CGameListCtrl::Update() Show(); AutomaticColumnWidth(); + ScrollLines(scrollPos); } wxString NiceSizeFormat(s64 _size) From 99246e1d2685d6796cca406a9366591ecd52e6e5 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 10 Jan 2013 19:50:45 +0100 Subject: [PATCH 368/627] Game ini updates for de Blob. --- Data/User/GameConfig/R6BE78.ini | 6 ++++-- Data/User/GameConfig/R6BJ78.ini | 3 +++ Data/User/GameConfig/R6BK78.ini | 5 ++++- Data/User/GameConfig/R6BP78.ini | 5 ++++- Data/User/GameConfig/R6BX78.ini | 5 ++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Data/User/GameConfig/R6BE78.ini b/Data/User/GameConfig/R6BE78.ini index 5cd3873ab9..067eae1c63 100644 --- a/Data/User/GameConfig/R6BE78.ini +++ b/Data/User/GameConfig/R6BE78.ini @@ -1,4 +1,4 @@ -# R6BE78 - Blob07 +# R6BE78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 @@ -15,4 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False - +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/User/GameConfig/R6BJ78.ini index dad405fa11..91e0a5aa71 100644 --- a/Data/User/GameConfig/R6BJ78.ini +++ b/Data/User/GameConfig/R6BJ78.ini @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/User/GameConfig/R6BK78.ini index 21aa5f90af..28f22a58ed 100644 --- a/Data/User/GameConfig/R6BK78.ini +++ b/Data/User/GameConfig/R6BK78.ini @@ -1,4 +1,4 @@ -# R6BK78 - Blob07 +# R6BK78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/User/GameConfig/R6BP78.ini index e49b9b4fca..4afc6d1f80 100644 --- a/Data/User/GameConfig/R6BP78.ini +++ b/Data/User/GameConfig/R6BP78.ini @@ -1,4 +1,4 @@ -# R6BP78 - Blob07 +# R6BP78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/User/GameConfig/R6BX78.ini index d37400d0e0..81f003a9bc 100644 --- a/Data/User/GameConfig/R6BX78.ini +++ b/Data/User/GameConfig/R6BX78.ini @@ -1,4 +1,4 @@ -# R6BX78 - Blob07 +# R6BX78 - de Blob [Core] Values set here will override the main dolphin settings. [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 3 @@ -15,3 +15,6 @@ PH_ZFar = [Gecko] [Video_Enhancements] ForceFiltering = False +[Video_Hacks] +EFBToTextureEnable = False +EFBCopyEnable = True From 202c005e61c12e546a69fb290ace57e170196c6a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 13:00:50 -0600 Subject: [PATCH 369/627] Remove commented code. No longer supporting setting volume with PulseAudio. --- Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 82b7ee5fa9..923a338190 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -92,7 +92,6 @@ bool PulseAudio::PulseInit() else { NOTICE_LOG(AUDIO, "Pulse successfully initialized."); - //SetVolume(iVolume); return true; } } From d6b53af115818878b0520f8d91e255351a4f48b8 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Thu, 10 Jan 2013 14:29:48 -0500 Subject: [PATCH 370/627] Automatically set focus on game list window. Fixes issue 5880. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 6ee860c229..2e31843ef9 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -365,6 +365,7 @@ void CGameListCtrl::Update() AutomaticColumnWidth(); ScrollLines(scrollPos); + SetFocus(); } wxString NiceSizeFormat(s64 _size) From e1c8bea2f6edc53644fd95d0f4a3f99526439577 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 15:23:42 -0600 Subject: [PATCH 371/627] fix crash, but now 100% cpu usage on disconnect --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index b01caf06c8..1fb61f7715 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -136,10 +136,10 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes) // Connect to a wiimote with a known address. bool Wiimote::Connect() { - struct sockaddr_l2 addr; - - if (IsConnected()) return false; + if (IsConnected()) + return false; + sockaddr_l2 addr; addr.l2_family = AF_BLUETOOTH; addr.l2_bdaddr = bdaddr; addr.l2_cid = 0; @@ -206,17 +206,15 @@ void Wiimote::RealDisconnect() int Wiimote::IORead(unsigned char *buf) { - struct timeval tv; - fd_set fds; - int r; - if (!IsConnected()) return 0; // Block select for 1/2000th of a second + timeval tv; tv.tv_sec = 0; tv.tv_usec = WIIMOTE_DEFAULT_TIMEOUT * 1000; + fd_set fds; FD_ZERO(&fds); FD_SET(in_sock, &fds); @@ -230,7 +228,7 @@ int Wiimote::IORead(unsigned char *buf) return 0; // Read the pending message into the buffer - r = read(in_sock, buf, MAX_PAYLOAD); + int r = read(in_sock, buf, MAX_PAYLOAD); if (r == -1) { // Error reading data @@ -241,17 +239,17 @@ int Wiimote::IORead(unsigned char *buf) // This can happen if the bluetooth dongle is disconnected ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected. " "Wiimote %i will be disconnected.", index + 1); - RealDisconnect(); + //RealDisconnect(); } return 0; } - if (!r) + else if (!r) { // Disconnect - RealDisconnect(); - return 0; + //RealDisconnect(); } + return r; } From 1c10d3a1bb9bde6a96c9e1789d7c758a12527f67 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 16:16:49 -0600 Subject: [PATCH 372/627] better fix for linux wiimote disconnect crash --- Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp | 30 ++++++++++++------- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 5 ++++ .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 5 ++++ .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- .../Core/Src/HW/WiimoteReal/WiimoteReal.h | 4 +++ 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp index 1fb61f7715..f56c11e248 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp @@ -195,20 +195,30 @@ void Wiimote::RealDisconnect() if (m_wiimote_thread.joinable()) m_wiimote_thread.join(); - Host_ConnectWiimote(index, false); + Close(); +} - close(out_sock); - close(in_sock); +void Wiimote::Close() +{ + if (IsOpen()) + { + Host_ConnectWiimote(index, false); - out_sock = -1; - in_sock = -1; + close(out_sock); + close(in_sock); + + out_sock = -1; + in_sock = -1; + } +} + +bool Wiimote::IsOpen() const +{ + return out_sock != -1 && in_sock != -1; } int Wiimote::IORead(unsigned char *buf) { - if (!IsConnected()) - return 0; - // Block select for 1/2000th of a second timeval tv; tv.tv_sec = 0; @@ -239,7 +249,7 @@ int Wiimote::IORead(unsigned char *buf) // This can happen if the bluetooth dongle is disconnected ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected. " "Wiimote %i will be disconnected.", index + 1); - //RealDisconnect(); + Close(); } return 0; @@ -247,7 +257,7 @@ int Wiimote::IORead(unsigned char *buf) else if (!r) { // Disconnect - //RealDisconnect(); + Close(); } return r; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index c22e1972dc..cc05bc10e1 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -294,6 +294,11 @@ void Wiimote::RealDisconnect() ResetEvent(&hid_overlap); } +bool Wiimote::IsOpen() const +{ + return IsConnected(); +} + int Wiimote::IORead(unsigned char* buf) { DWORD b, r; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm index 9ee39e5b92..64de880180 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm @@ -227,6 +227,11 @@ void Wiimote::RealDisconnect() ichan = NULL; } +bool Wiimote::IsOpen() const +{ + return IsConnected(); +} + int Wiimote::IORead(unsigned char *buf) { int bytes; diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 204a1fc698..5ead30bdf8 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -312,7 +312,7 @@ void Wiimote::ThreadFunc() Rumble(); // main loop - while (IsConnected()) + while (IsOpen()) { #ifdef __APPLE__ while (Write()) {} diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index cd1080903f..815c23d945 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -54,6 +54,7 @@ public: bool Write(); bool Connect(); bool IsConnected(); + bool IsOpen() const; void Disconnect(); void DisableDataReporting(); void Rumble(); @@ -72,6 +73,9 @@ public: bdaddr_t bdaddr; // Bluetooth address int out_sock; // Output socket int in_sock; // Input socket + + void Close(); + #elif defined(_WIN32) char devicepath[255]; // Unique wiimote reference //ULONGLONG btaddr; // Bluetooth address From cc0226254dabcbec36936a7c71d61d280168aecf Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 16:23:47 -0600 Subject: [PATCH 373/627] Windows/OS X buildfix --- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 2 +- Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp index 5ead30bdf8..1f9285f37e 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp @@ -240,7 +240,7 @@ void Wiimote::Disconnect() DisableDataReporting(); } -bool Wiimote::IsConnected() +bool Wiimote::IsConnected() const { return m_connected; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h index 815c23d945..15c8044acd 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h @@ -53,7 +53,7 @@ public: bool Read(); bool Write(); bool Connect(); - bool IsConnected(); + bool IsConnected() const; bool IsOpen() const; void Disconnect(); void DisableDataReporting(); From a693b847f0789e0bcf802ad2d5a61e42be23bfce Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 16:29:16 -0600 Subject: [PATCH 374/627] buildfix! --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index 0b3d16454b..49afee8ad1 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -36,6 +36,11 @@ void Wiimote::RealDisconnect() return; } +bool Wiimote::IsOpen() const +{ + return IsConnected(); +} + int Wiimote::IORead(unsigned char* buf) { return 0; From cf942450e0aec50ce815e086a9dc277b59b18bae Mon Sep 17 00:00:00 2001 From: lioncash Date: Thu, 10 Jan 2013 17:38:38 -0500 Subject: [PATCH 375/627] Very tiny cleanup of ChunkFile.h. Also changed the size parameter from DoVoid to size_t. As far as I know, that should never be negative. Also changed the the count parameter of DoArray to size_t, this also should never be negative. Got rid of some typecasts. --- Source/Core/Common/Src/ChunkFile.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index 38e1b2176c..cc893cc8e7 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -63,13 +63,13 @@ public: Mode GetMode() const {return mode;} u8 **GetPPtr() {return ptr;} - void DoVoid(void *data, int size) + void DoVoid(void *data, size_t size) { switch (mode) { case MODE_READ: memcpy(data, *ptr, size); break; case MODE_WRITE: memcpy(*ptr, data, size); break; case MODE_MEASURE: break; // MODE_MEASURE - don't need to do anything - case MODE_VERIFY: for(int i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break; + case MODE_VERIFY: for(size_t i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break; default: break; // throw an error? } (*ptr) += size; @@ -78,7 +78,7 @@ public: template void Do(std::map &x) { - unsigned int number = (unsigned int)x.size(); + size_t number = x.size(); Do(number); switch (mode) { case MODE_READ: @@ -126,18 +126,17 @@ public: template void Do(std::deque &x) { - u32 deq_size = (u32)x.size(); + size_t deq_size = x.size(); Do(deq_size); x.resize(deq_size); - u32 i; - for(i = 0; i < deq_size; i++) + for(size_t i = 0; i < deq_size; i++) DoVoid(&x[i],sizeof(T)); } // Store strings. void Do(std::string &x) { - int stringLen = (int)x.length() + 1; + size_t stringLen = (x.length() + 1); Do(stringLen); switch (mode) { @@ -151,7 +150,7 @@ public: void Do(std::wstring &x) { - int stringLen = sizeof(wchar_t)*((int)x.length() + 1); + size_t stringLen = sizeof(wchar_t)*(x.length() + 1); Do(stringLen); switch (mode) { @@ -164,7 +163,7 @@ public: } template - void DoArray(T *x, int count) { + void DoArray(T *x, size_t count) { DoVoid((void *)x, sizeof(T) * count); } From 51a1d4cde73b1d497792504f0b96afff1fc9cc09 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 17:39:07 -0600 Subject: [PATCH 376/627] Revert "Very tiny cleanup of ChunkFile.h." int/size_t change without updating the rev# caused crash on Dolphin start This reverts commit cf942450e0aec50ce815e086a9dc277b59b18bae. --- Source/Core/Common/Src/ChunkFile.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index cc893cc8e7..38e1b2176c 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -63,13 +63,13 @@ public: Mode GetMode() const {return mode;} u8 **GetPPtr() {return ptr;} - void DoVoid(void *data, size_t size) + void DoVoid(void *data, int size) { switch (mode) { case MODE_READ: memcpy(data, *ptr, size); break; case MODE_WRITE: memcpy(*ptr, data, size); break; case MODE_MEASURE: break; // MODE_MEASURE - don't need to do anything - case MODE_VERIFY: for(size_t i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break; + case MODE_VERIFY: for(int i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break; default: break; // throw an error? } (*ptr) += size; @@ -78,7 +78,7 @@ public: template void Do(std::map &x) { - size_t number = x.size(); + unsigned int number = (unsigned int)x.size(); Do(number); switch (mode) { case MODE_READ: @@ -126,17 +126,18 @@ public: template void Do(std::deque &x) { - size_t deq_size = x.size(); + u32 deq_size = (u32)x.size(); Do(deq_size); x.resize(deq_size); - for(size_t i = 0; i < deq_size; i++) + u32 i; + for(i = 0; i < deq_size; i++) DoVoid(&x[i],sizeof(T)); } // Store strings. void Do(std::string &x) { - size_t stringLen = (x.length() + 1); + int stringLen = (int)x.length() + 1; Do(stringLen); switch (mode) { @@ -150,7 +151,7 @@ public: void Do(std::wstring &x) { - size_t stringLen = sizeof(wchar_t)*(x.length() + 1); + int stringLen = sizeof(wchar_t)*((int)x.length() + 1); Do(stringLen); switch (mode) { @@ -163,7 +164,7 @@ public: } template - void DoArray(T *x, size_t count) { + void DoArray(T *x, int count) { DoVoid((void *)x, sizeof(T) * count); } From 6a13ae280d6093b9653c9b91ebed7151900df45e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 18:55:53 -0600 Subject: [PATCH 377/627] Updated flag images to not have ugly gradient. All images stolen from wikipedia. Added "SDK" flag to separate it from "Unknown" flag. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 7 +- .../Core/DolphinWX/resources/Flag_Europe.png | Bin 795 -> 419 bytes .../Core/DolphinWX/resources/Flag_Europe.xpm | 125 +++--- .../Core/DolphinWX/resources/Flag_France.png | Bin 466 -> 194 bytes .../Core/DolphinWX/resources/Flag_France.xpm | 84 ++-- .../Core/DolphinWX/resources/Flag_Germany.png | Bin 795 -> 191 bytes .../Core/DolphinWX/resources/Flag_Germany.xpm | 84 +--- .../Core/DolphinWX/resources/Flag_Italy.png | Bin 485 -> 194 bytes .../Core/DolphinWX/resources/Flag_Italy.xpm | 84 ++-- .../Core/DolphinWX/resources/Flag_Japan.png | Bin 908 -> 290 bytes .../Core/DolphinWX/resources/Flag_Japan.xpm | 114 ++---- .../Core/DolphinWX/resources/Flag_Korea.png | Bin 0 -> 730 bytes .../Core/DolphinWX/resources/Flag_Korea.xpm | 362 +++++++----------- .../Core/DolphinWX/resources/Flag_Taiwan.png | Bin 1081 -> 306 bytes .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 149 ++----- Source/Core/DolphinWX/resources/Flag_USA.png | Bin 726 -> 613 bytes Source/Core/DolphinWX/resources/Flag_USA.xpm | 152 +++++--- .../Core/DolphinWX/resources/Flag_Unknown.png | Bin 592 -> 485 bytes .../Core/DolphinWX/resources/Flag_Unknown.xpm | 118 ++++-- 19 files changed, 519 insertions(+), 760 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Korea.png diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index a9dfc2b7a1..8d9815e4cd 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -35,6 +35,8 @@ #include "WxUtils.h" #include "Main.h" +extern "C" +{ #include "../resources/Flag_Europe.xpm" #include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" @@ -44,6 +46,9 @@ #include "../resources/Flag_Taiwan.xpm" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" +#include "../resources/Flag_Sdk.xpm" +} + #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" #include "../resources/Platform_Gamecube.xpm" @@ -207,7 +212,7 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = - m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); + m_imageListSmall->Add(wxBitmap(Flag_Sdk_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png index c41352f36a9f99809fdc50210496d29e2c11e479..a0e8c187e2050e0c826aa6ed03d41ef55299159c 100644 GIT binary patch delta 405 zcmbQuwwQT>L_G&H0|Ub?x!yD&#aZAHS$QFBEknz# z!pa;Yi=3hg-Qw~+;_^LX^L&%Ce3P=X>x(0b%R^e4JzAQ*dfHt3J6zY!HC#8_VBH*p ztqXLwEzsGvKzI8>ogE9ccP-M|wMcvSBF($oMIY=GdazUY|NsA$CWkeFj$kYa@(X5g zcyyw)lf>1jI1&ycu*Q@`*6U(YX~D;Ydp{an^LB{Ts5=VFna literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index def46811a6..1608b2cb78 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,54 +1,49 @@ /* XPM */ -static const char *const Flag_Europe_xpm[] = { -"96 32 48 1", +static char * Flag_Europe_xpm[] = { +"96 32 43 1", " c None", ". c #000000", -"+ c #0000FD", -"@ c #0000FF", -"# c #0808F7", -"$ c #5C5CA3", -"% c #1717E8", -"& c #767680", -"* c #EDED00", -"= c #A5A54D", -"- c #2E2EB9", -"; c #96961A", -"> c #4A4A8E", -", c #0000FB", -"' c #0000F4", -") c #0808EC", -"! c #5C5C9B", -"~ c #1717DD", -"{ c #0000EE", -"] c #767677", -"^ c #A5A547", -"/ c #0000DD", -"( c #2E2EA0", -"_ c #969616", -": c #4A4A7B", -"< c #0000D2", -"[ c #0000C6", -"} c #0808BF", -"| c #5C5C7E", -"1 c #1717B4", -"2 c #0000B9", -"3 c #76765C", -"4 c #A5A537", -"5 c #0808B3", -"6 c #5C5C76", -"7 c #1717A8", -"8 c #0000A9", -"9 c #2E2E7A", -"0 c #969611", -"a c #4A4A5E", -"b c #767654", -"c c #A5A533", -"d c #000097", -"e c #2E2E6D", -"f c #96960F", -"g c #4A4A54", -"h c #000081", -"i c #000077", +"+ c #003399", +"@ c #043797", +"# c #013498", +"$ c #8F8845", +"% c #8C8645", +"& c #16408C", +"* c #DDB715", +"= c #415972", +"- c #848348", +"; c #84834A", +"> c #425A71", +", c #737754", +"' c #234884", +") c #4D626A", +"! c #B6A02D", +"~ c #0C3B92", +"{ c #B7A12C", +"] c #465E6F", +"^ c #AE9B30", +"/ c #AE9C30", +"( c #3A5676", +"_ c #BBA229", +": c #16418C", +"< c #BAA22A", +"[ c #395577", +"} c #2B4D7F", +"| c #B8A12B", +"1 c #BAA22B", +"2 c #2A4D7F", +"3 c #4D626B", +"4 c #B5A02D", +"5 c #B6A02C", +"6 c #AD9D31", +"7 c #103D8F", +"8 c #6B7358", +"9 c #1B4489", +"0 c #063795", +"a c #E0B912", +"b c #485E6F", +"c c #495D6E", +"d c #E0B913", " ", " ", " ", @@ -56,23 +51,23 @@ static const char *const Flag_Europe_xpm[] = { " ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@+#$%#+@+++++++++++. ", +".++++++++++&*=+-;+>*&++++++++++. ", +".+++++++++++,'++++',+++++++++++. ", +".++++++++)!~++++++++~{)++++++++. ", +".++++++++]^++++++++++/]++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+++++++(_:++++++++++:<[+++++++. ", +".+++++++}|++++++++++++12+++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++34~++++++++~53++++++++. ", +".++++++++]/++++++++++6]++++++++. ", +".++++++++++789++++987++++++++++. ", +".++++++++++0ab#$%#cd0++++++++++. ", +".++++++++++++++-;++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png index 3390ee79c2d9475a6ce222c217c410767de59668..6aed09aab155f98c106277d1a264671d077a3b66 100644 GIT binary patch delta 178 zcmcb_e28&^L_G^L0|SHnyM%Ng#aZAHS`*1afpd zT^vI!PA4ZwbUFy|3S3cG!os4Zr|s|{hlizYv6P!>Pu7B^Y?C&>&{)9Az~C8eDJ#_4 RmIBns;OXk;vd$@?2>|VHFyR0I literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)Y1Tubmx;TbZ+epj|R+ekhCaFap&xG_*&o>o-i3Kk?-9hBJ0dXFmS>x9Cg)&-xY9 zTnl#=om6fSh}+E1Fr$;0Ksd7KX{N)A6? zd4}`DL$L#e8rK=*)f#HA^9nP(JHT>bR$j&Zsg{g(ciu6q)huSJnZdBl*ZhnuLwN$z zics@Cxu@oUln0d@-l_$bExN`#eG$;8L?#bU^EsQ1)DN_CD!AP(@B%5!t8YFgvDirC z0P}j6xaE!C4}<&w0{>qy_brcj&$1W23hFo>gTe~DWM4fT$-mU diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 51cde44d8c..6336122380 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,75 +1,35 @@ /* XPM */ -static const char *const Flag_France_xpm[] = { -"96 32 45 1", +static char * Flag_France_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #0000FF", +"+ c #002395", "@ c #FFFFFF", -"# c #FF0000", -"$ c #0000FC", -"% c #0000F8", -"& c #FCFCFC", -"* c #FC0000", -"= c #0000F2", -"- c #F8F8F8", -"; c #F80000", -"> c #0000EC", -", c #F2F2F2", -"' c #F20000", -") c #0000E3", -"! c #ECECEC", -"~ c #EC0000", -"{ c #0000DB", -"] c #E3E3E3", -"^ c #E30000", -"/ c #0000D2", -"( c #DBDBDB", -"_ c #DB0000", -": c #0000C8", -"< c #D2D2D2", -"[ c #D20000", -"} c #0000BD", -"| c #C8C8C8", -"1 c #C80000", -"2 c #0000B1", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #0000A3", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #000093", -"9 c #A3A3A3", -"0 c #A30000", -"a c #000080", -"b c #939393", -"c c #930000", -"d c #000077", -"e c #808080", -"f c #800000", +"# c #ED2939", " ", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.png b/Source/Core/DolphinWX/resources/Flag_Germany.png index c41352f36a9f99809fdc50210496d29e2c11e479..f803d4ed133d25f34d6cc4c857ca618d656d6af0 100644 GIT binary patch delta 175 zcmbQuwx4l=L_G^L0|SHnyM%Ng#aZAHSDM|2c;L|Nl!!&T0qp8B2ovf*Bm1-ADs*lDyqrSo$+=1_C*n zo-U3d7N?UFBsv`gczd!Ibg?O_ifAmbSj8wUVCKfywpeP#q#tgKx(p0fk?Q&u5{=t| Px)?lN{an^LB{Ts5#;Gme literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index f0ca5a0934..4e4c69324d 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,78 +1,34 @@ /* XPM */ -static const char *const Flag_Germany_xpm[] = { -"96 32 48 1", +static char * Flag_Germany_xpm[] = { +"96 32 4 1", " c None", ". c #000000", -"+ c #0000FD", -"@ c #0000FF", -"# c #0808F7", -"$ c #5C5CA3", -"% c #1717E8", -"& c #767680", -"* c #EDED00", -"= c #A5A54D", -"- c #2E2EB9", -"; c #96961A", -"> c #4A4A8E", -", c #0000FB", -"' c #0000F4", -") c #0808EC", -"! c #5C5C9B", -"~ c #1717DD", -"{ c #0000EE", -"] c #767677", -"^ c #A5A547", -"/ c #0000DD", -"( c #2E2EA0", -"_ c #969616", -": c #4A4A7B", -"< c #0000D2", -"[ c #0000C6", -"} c #0808BF", -"| c #5C5C7E", -"1 c #1717B4", -"2 c #0000B9", -"3 c #76765C", -"4 c #A5A537", -"5 c #0808B3", -"6 c #5C5C76", -"7 c #1717A8", -"8 c #0000A9", -"9 c #2E2E7A", -"0 c #969611", -"a c #4A4A5E", -"b c #767654", -"c c #A5A533", -"d c #000097", -"e c #2E2E6D", -"f c #96960F", -"g c #4A4A54", -"h c #000081", -"i c #000077", +"+ c #DD0000", +"@ c #FFCE00", " ", " ", " ", " ", " ", "................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png index aa0ea79d31a21ecdbcfe4ec81adcf2b3385423b4..2b2a8ef1e2629d3bd8a34859c9497c3261a6505b 100644 GIT binary patch delta 178 zcmaFLe28&^L_G^L0|SHnyM%Ng#aZAHSCd7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+A^K@|xskrs_wr^gufrx8jaOwV=US?S* zH~kSmE+(52&@U1DYgWNN&YpQWM+BXio&)tVFzo1fTY97Xb*n^t+u17C4IlqjSMAnh zfB*Y$onP4PWjkVbK7BZ+IQ|+pgN`7BUN1vI=4tB#bFOtW{<|e~K;qQF;&YxsKi*Gc zs0!zkOXkT9YPgrl_~qX2GNlFESprrU88AMO)nVMSOeQ9K?X4vYdoRypSi5zZFV}@= zCJk518R`u84hlJ(J9TjBlto}c4^K;r=X17tGFEvroL^p4;H8;4nd!?k208wx4=|^*m!v#E0#T`o`^V1=_7np{%_4ahpMvf^>)vYt zMN~^%BT7;dOH!?pi&B9UgOP!OrLKXou90zwk+GGjk(H65wtIB*8>FVdQ&MBb@096dG-v9sr diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index c47c87791a..f81cc4bc94 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,75 +1,35 @@ /* XPM */ -static const char *const Flag_Italy_xpm[] = { -"96 32 45 1", +static char * Flag_Italy_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #006F00", +"+ c #009246", "@ c #FFFFFF", -"# c #FF0000", -"$ c #006C00", -"% c #006800", -"& c #FCFCFC", -"* c #FC0000", -"= c #006200", -"- c #F8F8F8", -"; c #F80000", -"> c #005C00", -", c #F2F2F2", -"' c #F20000", -") c #005300", -"! c #ECECEC", -"~ c #EC0000", -"{ c #004B00", -"] c #E3E3E3", -"^ c #E30000", -"/ c #004200", -"( c #DBDBDB", -"_ c #DB0000", -": c #003800", -"< c #D2D2D2", -"[ c #D20000", -"} c #002D00", -"| c #C8C8C8", -"1 c #C80000", -"2 c #002100", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #001C00", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #001500", -"9 c #A3A3A3", -"0 c #A30000", -"a c #001200", -"b c #939393", -"c c #930000", -"d c #000F00", -"e c #808080", -"f c #800000", +"# c #CE2B37", " ", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png index 183275cd85f020f62fd116a33531ba366989d7e3..d68affd97241ffb1dcb2316fcbdc42a7a4646999 100644 GIT binary patch delta 275 zcmeBSU&J&)qMn19fq~(cTyGkX;wKvpv*dAqv^Rqx3G8Jgtj;uzv_ zJUKyv^{~8w5W|#cg%FVdQ&MBb@00(7b+5i9m literal 908 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+0>gnPbQgQ3;?TvYl90b@N+`r)|7_f*% zqk&24g@W&^j!8nbb!GN4~=t5sTVp~V%St)@MuWf`qnxnNG@1fqia#Y?O=@;EFDcp z*cL2aR>}X-Fo=(>nNcBi`|Y<(2QFW}EX;7^@kfgV8b^~haxg3nT6sj7t5&m;Vb{9X zL0*;R<>lMw>f3FKi;s`@)_j^`G*d=t{ol;zGnUEy;?`^xaN@8JyKLgC*{UJJ)mne^ zhy8jdm&F%XOmXsAetG5mpO&w`6|=`ya!spd*`#xNlg@j_(5*Lf%osyud)*eFKOQI& zd%e`5BWr6EYtHV=FH4&A#B0sp)iyjW+8Lv_x20&^z2(bi`lxNbeIPD({l)zJ#~&+r z82oD1D^2uJ5h^@=AoH=u&mX)We*E~sv1kA9%^&MkTZ~#XZNAC#;jzTm+b&yw*4VL!T#cUR^1CLRL391Ob?X=oUoi1yX1KjA_rDNtyKtuq z(*+YVhM&iC8@^WUja$E$-K6LC?c31_n_qsdvVH$C#1!bH#>tao^rkcGoStvf*|3)_ zVr|&!tEZ|D1gr>J8Pf3ldENf|>`U(Cn9V+a+`Z$;0 zci0Sg4jc3|?`d6@dEjX(FihWHv%krAuKjd-2GDmm&+JqZmKEO4Sn}7vd_%{-^grH9 zg4yi299`hx{zd*Cxs4mcptHiD0NT c #FF2F2F", -", c #FFD7D7", -"' c #FEF5F5", -") c #FE2E2E", -"! c #FE1313", -"~ c #FEDDDD", -"{ c #F9F9F9", -"] c #FC7777", -"^ c #FD4545", -"/ c #F4F4F4", -"( c #F4F3F3", -"_ c #FA1313", -": c #FB0000", -"< c #FA0000", -"[ c #F4D4D4", -"} c #EFEFEF", -"| c #EFCFCF", -"1 c #F10000", -"2 c #EF9F9F", -"3 c #E4E4E4", -"4 c #E2BEBE", -"5 c #DD0000", -"6 c #E19090", -"7 c #D9D9D9", -"8 c #D8D0D0", -"9 c #CA0404", -"0 c #CA0000", -"a c #D5A9A9", -"b c #D0D0D0", -"c c #BC4242", -"d c #B40000", -"e c #B71A1A", -"f c #CFCFCF", -"g c #C6C6C6", -"h c #BEA7A7", -"i c #990808", -"j c #980000", -"k c #B78787", -"l c #BBBBBB", -"m c #A88989", -"n c #7B0B0B", -"o c #770000", -"p c #780202", -"q c #9E6B6B", -"r c #AEAEAE", -"s c #A89C9C", -"t c #8F4E4E", -"u c #7F1B1B", -"v c #7A0A0A", -"w c #7D1515", -"x c #8B4242", -"y c #A48F8F", -"z c #A0A0A0", -"A c #8F8F8F", -"B c #7C7C7C", +"@ c #FEFDFD", +"# c #F1C9D3", +"$ c #E9AAB9", +"% c #E69FB0", +"& c #C41F47", +"* c #BC002D", +"= c #C42047", +"- c #E6A1B2", +"; c #DA748D", +"> c #DB758D", +", c #EBB4C1", +"' c #ECB6C3", +") c #CD4263", +"! c #CE4465", +"~ c #BF0D38", +"{ c #C00E39", " ", " ", " ", @@ -77,21 +29,21 @@ static const char * const Flag_Japan_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++@#$%&*++++++++++++. ", -".++++++++++=-;;;;;>,+++++++++++. ", -".*********');;;;;;;!~**********. ", -".{{{{{{{{{];;;;;;;;;^{{{{{{{{{{. ", -".////////(_:::::::::<[/////////. ", -".}}}}}}}}|111111111112}}}}}}}}}. ", -".333333334555555555556333333333. ", -".77777777890000000000a777777777. ", -".bbbbbbbbbcdddddddddefbbbbbbbbb. ", -".ggggggggghijjjjjjjjkgggggggggg. ", -".llllllllllmnooooopqlllllllllll. ", -".rrrrrrrrrrrstuvwxyrrrrrrrrrrrr. ", -".zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz. ", -".AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA. ", -".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", +".++++++++++++@#$$#@++++++++++++. ", +".+++++++++++%&****=-+++++++++++. ", +".++++++++++;********>++++++++++. ", +".+++++++++,**********'+++++++++. ", +".+++++++++)**********!+++++++++. ", +".+++++++++~**********{+++++++++. ", +".+++++++++~**********{+++++++++. ", +".+++++++++)**********!+++++++++. ", +".+++++++++,**********'+++++++++. ", +".++++++++++;********>++++++++++. ", +".+++++++++++%&****=-+++++++++++. ", +".++++++++++++@#$$#@++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.png b/Source/Core/DolphinWX/resources/Flag_Korea.png new file mode 100644 index 0000000000000000000000000000000000000000..ff63df146c74a0ee226eabe014f6a661c668c5bc GIT binary patch literal 730 zcmV<00ww*4P)*J zGIS9!avL*p9W!z)EG#cCFEB7LG&D3dH8nOiHa9mnIXO8xIyyW&JU%`?KR-W0K6OGu zLPJACMMXtNM@L9VNKsKyQc_Y@C|*`pR#zfeTq0IoU0q*aUtwWkWMpJ#XJ=_?X=-X} zYaUT-Ms;j#Y;JCDaBy&OadC4UPIYy4dSr}yWsQF%Q-6PdhlhuVh=_`cij0hml$4Z~ zmX?^9n4O)SqobpyrlzcwudSA`uMs)3QF62pH@3F6x3{;ty1Kikyt})*!>_}}3^2$R zImjD6$rn1ww#mxM%FZlI(!kEw*VouubJ*C}+9?6?CkHl#qaO$ z@V&?J#m({5+w#iN^Yiod)!X*=_WAkw`uO_#`uh9(`~3X;{`>s?{Qdv`|F>lRtpET3 z0d!JMQvg8b*k%9#00Cl4M?`8RVwDa6009z7L_t(Y$75g^1;ZaO5&)E2kcAge&w@}? zgF~rpfvcc#IKudFV*z*SS`fjduFRhbGe4P6SzSAtniiys=?h7?WMySUg@naqW@Wjk z3Y&;H68gmaU4Jg$$L8 z3N1wuL{TBGq@@;3-AMKmu}nauodhdkzoAxK)3Cy!b(J{^M#10*04nFV=^PKAP5=M^ M07*qoM6N<$g3yyYY5)KL literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 7b51bc78ef..857f82e721 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,242 +1,137 @@ /* XPM */ -static const char *const Flag_Korea_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 210 2", -". c Black", -"p c #CACACA", -"= c #D9D9D9", -"a c #EED0D6", -">. c #770730", -"e c #F7F7F7", -"^ c #4B4B4B", -"}. c #5A5A5A", -"OX c #A0A4A8", -"k. c #878787", -"P c #D38494", -"u. c #161951", -"@ c #E1E1E1", -"{. c #353535", -"X c #FFFFFF", -"-. c #71163F", -"g c #E3A3AE", -"0 c #444444", -"t c #535353", -"%X c #626262", -"g. c #011F5A", -"x. c #3D557C", -"P. c #475D7F", -"C. c #8F8F8F", -"B c #B80020", -"$. c #949CB0", -"# c #9E9E9E", -".. c #B60323", -"N c #B6001A", -"C c #B6001B", -"k c #5B5B5B", -"`. c #6A6A6A", -"/ c #797979", -"*. c #AD0B2A", -"6 c #888888", -"2X c #979797", -"f c #D5667A", -"w. c #843656", -"Q c #BD2D47", -"y. c #16396E", -"+. c #D3D3D3", -"9. c #002F6C", -"$ c #E2E2E2", -"s. c #002C65", -"` c #D0C6CD", -"x c #F1F1F1", -"S. c #363636", -"=. c #B20927", -"F c #454545", -"W. c #959DA6", -"n. c #00295F", -"l c #545454", -"v. c #002962", -",. c #C0344C", -"J. c #00265A", -"2. c #7394AE", -"Z c #C53851", -"Q. c #3E5375", -";X c #9F9F9F", -"H. c #002358", -"z. c #C2C4C6", -"j c #AEAEAE", -"V. c #BDBDBD", -"e. c #D7B8BA", -"( c #CCCCCC", -"U c #B2001E", -"$X c #2F2F2F", -"; c #F9F9F9", -"! c #E1C0C6", -"v c #4D4D4D", -"@X c #6B6B6B", -"< c #7A7A7A", -"3. c #412554", -"c. c #001D59", -"q c #898989", -" c #656565", -"6X c #838383", -"1X c #929292", -"F. c #223A67", -"B. c #747D96", -"i. c #471E4A", -"Z. c #A1A1A1", -"N. c #0E275D", -"n c #B0B0B0", -"8. c #072C66", -"| c #B90928", -"!. c #072657", -"'. c #313131", -"b. c #002B62", -":X c #404040", -"y c #4F4F4F", -"2 c #6D6D6D", -"R c #B70C2D", -"3X c #8B8B8A", -"q. c #151C56", -"{ c #B00B2B", -"w c #C7C7C7", -"4. c #930326", -"z c #D6D6D6", -"^. c #001F53", -", c #484848", -"D. c #939CA9", -"% c #575757", -"p. c #302152", -"s c #DC8696", -"V c #B7001E", -"X. c #B7001F", -"d c #D35C72", -"H c #B1B1B1", -"#. c #DEDEDE", -"G. c #00164F", -"R. c #323232", -"1 c #FCFCFC", -"<. c #DBCBCE", -" . c #B80A29", -"D c #9B9B9B", -"T. c #B9B9B9", -"a. c #062A62", -"W c #B30018", -"O. c #E1E2E2", -"m c #D88695", -"1. c #D7D7D7", -"XX c #808A97", -"A c #E4BAC2", -"oX c #858E99", -"]. c #3A3A3A", -"+X c #585858", -"r c #949494", -" X c #ADAEAE", -"o. c #C66174", -"~ c #C1C1C1", -"L c #DADBDB", -"8 c #D0D0D0", -"t. c #92A0B1", -"=X c #333333", -"- c #FDFDFD", -"*X c #424242", -"u c #515151", -"#X c #606060", -"6. c #B40723", -"K c #7E7E7E", -"* c #8D8D8D", -"h. c #5A4F73", -"Y. c #BABABA", -"0. c #00306C", -"@. c #D8D8D8", -"S c #E7E7E7", -"|. c #2C2C2C", -">X c #3B3B3B", -"m. c #002A60", -"[ c #B20A2B", -"d. c #002A62", -"f. c #002A63", -"/. c #16315F", -"M c #BC1231", -"4 c #595959", -".X c #959BA2", -"] c #AD001C", -"h c #F3E6E9", -"7X c #959594", -"4X c #959595", -"Y c #B70B2E", -"o c #B3B3B3", -"A. c #C2C2C2", -"E c #B7082A", -"I c #B50E29", -"r. c #D1D1D1", -"U. c #252525", -"M. c #00215A", -"~. c #001E52", -"K. c #001E55", -"9 c #525252", -"G c #616161", -"[. c #7F7F7F", -"&X c #8E8E8E", -"j. c #D1C8C7", -"(. c #5F7088", -/* pixels */ +static char * Flag_Korea_xpm[] = { +"96 32 107 2", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E4E4E4", +"# c #BABABA", +"$ c #3A3A3A", +"% c #7F7F7F", +"& c #E8E8E8", +"* c #393939", +"= c #BBBBBB", +"- c #EBEBEB", +"; c #2F2F2F", +"> c #6A6A6A", +", c #616161", +"' c #373737", +") c #FAFAFA", +"! c #F9F9F9", +"~ c #363636", +"{ c #6E6E6E", +"] c #EFEFEF", +"^ c #FCFCFC", +"/ c #424242", +"( c #757575", +"_ c #3C3C3C", +": c #454545", +"< c #B7B7B7", +"[ c #FEFBFC", +"} c #EFBAC5", +"| c #E48E9E", +"1 c #E58F9F", +"2 c #F0BDC7", +"3 c #FEFCFD", +"4 c #676767", +"5 c #3E3E3E", +"6 c #878787", +"7 c #D7D7D7", +"8 c #707070", +"9 c #2C2C2C", +"0 c #717171", +"a c #F1C5CD", +"b c #CE2C4C", +"c c #C60C30", +"d c #F2CAD2", +"e c #9D9D9D", +"f c #D8D8D8", +"g c #F6F6F6", +"h c #B6B6B6", +"i c #474747", +"j c #FBFBFB", +"k c #F1D4DB", +"l c #C81639", +"m c #C9173A", +"n c #F5D5DB", +"o c #484848", +"p c #B35172", +"q c #D85A73", +"r c #56285E", +"s c #731D4E", +"t c #113172", +"u c #0B3274", +"v c #5C2256", +"w c #C81B3E", +"x c #0C3274", +"y c #6B1E51", +"z c #B41037", +"A c #AF1139", +"B c #572258", +"C c #003478", +"D c #7F2453", +"E c #423E75", +"F c #6C4675", +"G c #ECECEC", +"H c #A3A3A3", +"I c #343434", +"J c #C9B6C9", +"K c #093375", +"L c #D2C0CE", +"M c #353535", +"N c #6C6C6C", +"O c #303030", +"P c #BBA7BC", +"Q c #1B3372", +"R c #1D3372", +"S c #C3AFC3", +"T c #515151", +"U c #888888", +"V c #8C8C8C", +"W c #565656", +"X c #A6A6A6", +"Y c #FAF8FA", +"Z c #AD96B1", +"` c #7B658D", +" . c #7A648C", +".. c #AC95AF", +"+. c #646464", +"@. c #8A8A8A", +"#. c #949494", +"$. c #525252", +"%. c #5D5D5D", +"&. c #3F3F3F", +"*. c #434343", +"=. c #5F5F5F", +"-. c #696969", +";. c #CACACA", +">. c #969696", +",. c #F3F3F3", +"'. c #989898", " ", " ", " ", " ", " ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X . ", -". X X X X X X o O + X X X X X X X X X X X X @ # $ X X X X X X . ", -". X X X X X @ % & * = - X X X X X X X X ; : > , < X X X X X X . ", -". 1 1 1 1 1 2 3 4 5 6 7 1 1 1 1 1 1 1 1 8 9 0 3 q w 1 1 1 1 1 . ", -". e e e e r t y u i p e e a s d f g h e + j k 2 3 l z e e e e . ", -". x x x x c v l b n x x m M N B V C Z A x S D F & G H x x x x . ", -". 7 7 7 7 7 O J K L 7 P I U Y T R E W Q ! 7 ~ ^ / ( 7 7 7 7 7 . ", -". ) ) ) ) ) ) ( _ ) ` ' ] [ { } | ...X.o.) O.+.@.) ) ) ) ) ) . ", -". #.#.#.#.#.#.#.#.#.$.%.&.*.=.=.-.;.:.>.,.<.#.#.#.#.#.#.#.#.#.. ", -". 1.1.1.1.1.1.1.1.1.2.3.4.5.6.7.8.9.0.q.w.e.1.1.1.1.1.1.1.1.1.. ", -". r.r.r.r.r.r.r.r.r.t.y.u.i.p.a.s.d.f.g.h.j.r.r.r.r.r.r.r.r.r.. ", -". p p p p p p k.l.p z.x.c.v.b.n.n.m.M.N.B.p V.C.Z.p p p p p p . ", -". A.A.A.A.H 2 S.& l.A.D.F.G.H.J.J.K.L.P.I.A.C.U.y k.Y.A.A.A.A.. ", -". T.T.T.T.9 5 , R.2 E.T.W.Q.!.~.^./.(.).T._.`.u '.].[.T.T.T.T.. ", -". n n n n C.{.}.4 |./ n n X.XXXoXOXn n Z.+Xb @X#Xv n n n n n . ", -". l.l.l.l.l.G 5 $X'.%XD l.l.l.l.l.l.l.l.&X*X$X=X9 -Xl.l.l.l.l.. ", -". ;X;X;X;X;X;X:X>X,X , ' ) + + + + + + + + ! ~ , > { ] + + + + + . ", +". + + + + ^ / ( _ : < + + [ } | 1 2 3 + + < 4 5 6 / ^ + + + + . ", +". + + + + 7 8 9 8 0 + + a b c c c c b d + + e 8 9 8 f + + + + . ", +". + + + + + g h i j + k l c c c c c c m n + j o h g + + + + + . ", +". + + + + + + + ^ + + p c c c c c c c c q + + ^ + + + + + + + . ", +". + + + + + + + + + + r c c c c s t u v w + + + + + + + + + + . ", +". + + + + + + + + + + x y z A B C C C C D + + + + + + + + + + . ", +". + + + + + + + ^ + + E C C C C C C C C F + + ^ + + + + + + + . ", +". + + + + + G H I g + J K C C C C C C u L + g M H G + + + + + . ", +". + + + + 7 N O 8 0 + + P Q C C C C R S + + e 0 O N f + + + + . ", +". + + + + + T U V W X + + Y Z ` ...Y + + X +.@.#.$.+ + + + + . ", +". + + + + + - ; N %.&.) + + + + + + + + ! *.=.N -.] + + + + + . ", +". + + + + + + ;.&.>.,.+ + + + + + + + + + ,.'.5 ;.+ + + + + + . ", +". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", +". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", " ", " ", @@ -244,5 +139,4 @@ static const char *const Flag_Korea_xpm[] = { " ", " ", " ", -" " -}; +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png index c71920f92c5342c4aa9d05b48bcf7541fdddfb1a..d5bb1007f1cb3a62785204cf902e9c0d5b7d91fe 100644 GIT binary patch delta 291 zcmdnVv59GdL_G&H0|Ub?x!yD&#aZAHSShL1=7+BR8*GO+OCU?+|}22zOV0MfB%L4 z{)-bPT%0!T^0aAJrcb|e^XB_ox8DC_VEAAE|Nk?djn+Vu7)yfuf*Bm1-2l0SG0EHA zMV$NEjD8>|+0(@_#N+tetKNJK3OufXEL{p(KNkPKzcN|PYQpptFK-^;&6J)Z^#A(Z z3b_kggR(^n(hT?{6zuhPs>dj-VSgXpz?yUB%$&u4-*B7!Ec7}dd0;z775mdkEGi0( hGHQ%prfVMgJ(n{@P4s2?)?*+)dAj7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)U@^o(Z>H&oTKU6Rf#d;InF zJ2q8Li@wJ<%v=IRmVV@9I`On<=k4u^98C&cbvAaU*iw6JLo;P!<>hF@3 z_V<`qNJ@uXk6JMMl!9)}=k2fgcn{7t&%a;yFDGiY8*>^^o4ebC!|mVSpHBVocjCl{ ziNMmNoKj*Gvx{%*`E&sW4{jzoUm^=Qg z6k(9e;A-I6vTrZDfFK-9{QpKjd3s*ZmQdeBV75~&ag8WRNi0dVN-jzTQVd2029~-8 z=0Fr;WNc+@W@TWcZD4F=V6gQ{3pj&$1W25MmNboFyt=akR{01p4| AVE_OC diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index f0670e4bc4..3f092d6149 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,119 +1,54 @@ /* XPM */ -static const char *const Flag_Taiwan_xpm[] = { -"96 32 89 1", +static char * Flag_Taiwan_xpm[] = { +"96 32 24 1", " c None", ". c #000000", -"# c #000099", -"$ c #000098", -"% c #03039A", -"& c #000094", -"' c #05059B", -"( c #050095", -") c #DC0014", -"* c #FF0000", -"+ c #FD0001", -", c #04049B", -"- c #000096", -"! c #020299", -"0 c #2424A7", -"1 c #04049A", -"2 c #000097", -"3 c #000093", -"4 c #6262BF", -"5 c #2828A8", -"6 c #6C6CC1", -"7 c #3E3EB1", -"8 c #3B3BB0", -"9 c #00008F", -": c #01019A", -"; c #1919A3", -"< c #4040B0", -"= c #6363C0", -"> c #D6D6EE", -"? c #D9D9ED", -"@ c #C5C5E7", -"A c #3F3FB0", -"B c #3D3DAF", -"C c #020297", -"D c #010199", -"E c #5E5EBE", -"F c #DFDFF2", -"G c white", -"H c #BFBFE5", -"I c #2626A7", -"J c #4242B0", -"K c #7D7DCA", -"L c #FAFAFD", -"M c #FBFBFD", -"N c #FCFCFD", -"O c #FCFCFE", -"P c #DADAF0", -"Q c #6A6AC2", -"R c #1B1BA3", -"S c #000199", -"T c #0E0E9B", -"U c #5858BC", -"V c #D3D3ED", -"W c #2727A6", -"X c #060699", -"Y c #1212A0", -"Z c #6464C0", -"[ c #8080CC", -"] c #F4F4FA", -"^ c #F8F8FB", -"_ c #7070C4", -"` c #4949B5", -"a c #000095", -"b c #040499", -"c c #000092", -"d c #6767C2", -"e c #8686CA", -"f c #7070C5", -"g c #2B2BA9", -"h c #00009A", -"i c #01049C", -"j c #1619A4", -"k c #393CB3", -"l c #00029A", -"m c #1619A5", -"n c #020096", -"o c #DB0014", -"p c #FC0001", -"q c #0A0092", -"r c #060090", -"s c #0B0092", -"t c #0F008E", -"u c #DD0013", -"v c #FD0000", -"w c #E5000F", -"x c #E6010F", -"y c #E60110", -"z c #FB0002", -"{ c #FE0000", +"+ c #000095", +"@ c #FE0000", +"# c #12129C", +"$ c #010195", +"% c #3D3DAE", +"& c #0B0B9A", +"* c #1B1BA0", +"= c #8F8FD0", +"- c #9696D3", +"; c #9090D1", +"> c #1A1AA0", +", c #2424A4", +"' c #9696D4", +") c #DADAEF", +"! c #FFFFFF", +"~ c #D9D9EF", +"{ c #9797D4", +"] c #040497", +"^ c #5959BA", +"/ c #8E8ECF", +"( c #8E8ED1", +"_ c #8F8FD1", " ", " ", " ", " ", " ", "................................ ", -".#####$%#&'$$$##()*+***********. ", -".###$$,-!0&1!$##()*+***********. ", -".##$#23456789:$#()*+***********. ", -".###2;<=>?@ABCD#()*+***********. ", -".###$CEFGGGHI&D$()*+***********. ", -".##D-JKLMNOPQR-S()*+***********. ", -".###$TUGGNGVWX$#()*+***********. ", -".###2YZ[]^P_`aD$()*+***********. ", -".###$bcdEefg3D$#()*+***********. ", -".hhhhhijiklm#hhhno*p***********. ", -".qqqqqqrsrqrqqqqtu*v***********. ", -".wwwwwwxwywxwwwwwz*{***********. ", -".******************************. ", -".{{{{{{{{{{{{{{{{{*{***********. ", -".******************************. ", -".******************************. ", -".******************************. ", -".******************************. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".++++&*=-;>&++++@@@@@@@@@@@@@@@. ", +".++++,')!~{,++++@@@@@@@@@@@@@@@. ", +".+++]^;!!!;^]+++@@@@@@@@@@@@@@@. ", +".++++,')!~{,++++@@@@@@@@@@@@@@@. ", +".++++&*/(_>&++++@@@@@@@@@@@@@@@. ", +".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png index 2803a73a3d3a067360eac6e661d7723d6e24b7f1..e34f11c274a62a83baefc7c412f694efc8a759ee 100644 GIT binary patch delta 600 zcmcb{`jlmYL_G&H0|Ub?x!yD&#aZAHS`F@PNJ{ESPU=if>P}ATNlETX zN$yTb1~Ph6Q@T=9x>HknQd5BJzSPvdwAAjj)Sk4|-ZUUP4T$>F(|Xg>`qDv+3F+y5 z>FNFH=@T;2do$AeGSd4qfb5L^j0_+-F*Bn-Gh;$#W`CAfePLE+Ulx#+IUy@^Vpdjv zR@TJqtO?m5a#BwAq}-f|xjB>aa)D^dCMA;{M$V_wif+$b_;A(6w`VSVzWd<+|Nqz5 z#I*r~g0UpXFPOpM*$q%oGA4PuyM)(r-IND%u6epRhIkx*d)1wNj7FP@UZDcy@{dbn;IrHq- TIjAoN`jNrY)z4*}Q$iB}r7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+Y@9E+gQgQ3;ZNuzC4kGLyriWR%_#QZ^ zKjB?zfvEWNb$94!lN}0o+)ui9?@SQuMi;WBC|<`W%rVp_6M0(+rGxV z{9Avzu>1SH!{z!~LX1EgfI#Aqm$>Fm=0v^bqq2-2PRz|O*>*7L;qSF#@sFl@ZNL5Y z(_H>~uV2@u2c7y@VOCwc_s+i^T#79Mlg?J&OIUYC`NHw`ea+KP`#pczsWD$)gp2iW z=ly%X_Pt+i^g!@LK=||7hZ{BaZq(myzb?ovP(<+P$Ev+?uj3gz_W3ki^}2u1i6c-; z(6aBb1)uYyX{mGH)%q|5r`oZ&2UaDYf9~@A``4zcdTjAb zk9mfdZ-W8PVS^`p?(*k9+nf(hJ-}ixWfsHk*!}n47q>Gnn4Z;OaWBVA`dtCTmmuDP z;>$T^v+q27VItM*cE^yx{3?SJPy1oTatns4m24ID_w%+#LsV|KZ!Xo#R&HU%>L^ff zoZ(Igb4o=IEOiacfhfet*vi<<%D_n5z}U*bVC$6@b`%Y{`6-!cmAEw=>9pAmveDDk&t;uc GLK6U!ur6Hy diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 0a991bd02e..eca9509e16 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,60 +1,118 @@ /* XPM */ -static const char * Flag_USA_xpm[] = { -"96 32 30 1", +static char * Flag_USA_xpm[] = { +"96 32 88 1", " c None", ". c #000000", -"+ c #0000FF", -"@ c #CE7070", -"# c #B0BF99", -"$ c #F1F1F1", -"% c #FFFFFF", -"& c #0000FD", -"* c #CF8484", -"= c #DA9090", -"- c #0000F3", -"; c #B0BF96", -"> c #0000DF", -", c #0000CB", -"' c #B0BF8C", -") c #D98E8E", -"! c #0000B5", -"~ c #CA6C6C", -"{ c #000098", -"] c #B0BF80", -"^ c #000077", -"/ c #C26464", -"( c #DBDBDB", -"_ c #C17676", -": c #B55757", -"< c #BBBBBB", -"[ c #AC6161", -"} c #A34545", -"| c #8B8B8B", -"1 c #8E4343", +"+ c #545380", +"@ c #5C5B87", +"# c #565580", +"$ c #5B5A85", +"% c #585782", +"& c #5B5A84", +"* c #5A5984", +"= c #585783", +"- c #5C5B85", +"; c #555481", +"> c #5D5C85", +", c #54537F", +"' c #B22234", +") c #494878", +"! c #64638A", +"~ c #686891", +"{ c #66658B", +"] c #66668F", +"^ c #67668D", +"/ c #65658E", +"( c #68678E", +"_ c #65648D", +": c #6A6A8F", +"< c #62628C", +"[ c #4A4A78", +"} c #E1AAB1", +"| c #5B5A83", +"1 c #6B6A92", +"2 c #68678D", +"3 c #6A698E", +"4 c #696890", +"5 c #6A6990", +"6 c #676790", +"7 c #6D6C91", +"8 c #68678F", +"9 c #6C6B92", +"0 c #595883", +"a c #EDCCD0", +"b c #484777", +"c c #66668E", +"d c #69688F", +"e c #6B6A91", +"f c #6A6991", +"g c #6A6A91", +"h c #686790", +"i c #6E6D92", +"j c #67678E", +"k c #494877", +"l c #585784", +"m c #69698F", +"n c #61618A", +"o c #676690", +"p c #65648B", +"q c #65648E", +"r c #66658D", +"s c #64638D", +"t c #605F8A", +"u c #68688F", +"v c #F3DDE0", +"w c #434273", +"x c #64638B", +"y c #686890", +"z c #66658E", +"A c #63628C", +"B c #DB99A1", +"C c #6A698F", +"D c #626188", +"E c #67668E", +"F c #636289", +"G c #66658C", +"H c #63628B", +"I c #606089", +"J c #B83243", +"K c #414071", +"L c #65648A", +"M c #67668F", +"N c #6B6A90", +"O c #6E6D94", +"P c #64638C", +"Q c #FFFFFF", +"R c #5D5C86", +"S c #6D6C92", +"T c #65648C", +"U c #67678F", +"V c #CA6672", +"W c #6A4A71", " ", " ", " ", " ", " ", "................................ ", -".++++++++++++++@@@@@@@@@@@@@@@@. ", -".+#+#+#+#+#+#++$%%%%%%%%%%%%%%%. ", -".&&&&&&&&&&&&&&*===============. ", -".-;-;-;-;-;-;--@@@@@@@@@@@@@@@@. ", -".>>>>>>>>>>>>>>$%%%%%%%%%%%%%%%. ", -".,',',',',',',,*))))))))))))))). ", -".!!!!!!!!!!!!!!@~~~~~~~~~~~~~~~. ", -".{]{]{]{]{]{]{{$$$$$$$$$$$$$$$$. ", -".^^^^^^^^^^^^^^****************. ", -".^^^^^^^^^^^^^^@///////////////. ", -".((((((((((((((((((((((((((((((. ", -".______________________________. ", -".::::::::::::::::::::::::::::::. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[. ", +".+@#$%&*=-;>,''''''''''''''''''. ", +".)!~{]^/(_:<[}}}}}}}}}}}}}}}}}}. ", +".|12134567890aaaaaaaaaaaaaaaaaa. ", +".bc9d1efghijk''''''''''''''''''. ", +".lmnopqrs2tu0vvvvvvvvvvvvvvvvvv. ", +".wx9^5y8fziAwBBBBBBBBBBBBBBBBBB. ", +".$CDEFGqH2IC&JJJJJJJJJJJJJJJJJJ. ", +".KLiMeudNrOPKQQQQQQQQQQQQQQQQQQ. ", +".RST4_U4qNASRVVVVVVVVVVVVVVVVVV. ", +".WWWWWWWWWWWWVVVVVVVVVVVVVVVVVV. ", +".QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ. ", +".JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ. ", +".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", +".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv. ", +".''''''''''''''''''''''''''''''. ", +".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa. ", ".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".||||||||||||||||||||||||||||||. ", -".111111111111111111111111111111. ", +".''''''''''''''''''''''''''''''. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.png b/Source/Core/DolphinWX/resources/Flag_Unknown.png index 44cd41bafb29d62d7314058124968daa29e61164..73e2651bd2a079ab6a2a50690698a20f58b329ac 100644 GIT binary patch delta 471 zcmV;|0Vw{^1my#e7=H)@0002m9*t%I000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2i*Y+0520Bw{lYe006O2OjJbx000000R901{sIF20|Wj91pWpF{s;*E2?_oU4gL=g z{tyuU931{09{wL6{vaU!Cnx?dFa9wx{xdWFG&KG;HvT<5{(nbD{!vl>XJ`IsX#RS7 z{(OA?fPnsjg8qkx{*sdZlav0Gl>U~M{-UD(q@@0=tp2X9{;#k8u(1BIvHr8O{#h$($fCa)c)t^{^;ob>FNIM?f(1w{`~y^00960{}Eq~%K!iX0d!JM zQvg8b*k%9#0Dl2uOGiXHP6@>N00023NklN%o zAVUTL3#Fp2qs_Wz&7EOr{-4+zJ{RyMTJRGAK#~9nRKtqoDQ6C)1=u_VPBy)hPf!U3 z^JM-g-=aO%el?EQ&R>`T>*b(XSP2hVkpLYmJ;6v>3s50J0ax;ZqL-pk^0Ukm=2S+| zLECj(=z4+!f-Tyn)I>yZ>)DoN_wWApH^Vz{G8pKmLJOksWok6h=K(dWa7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME*d^mK6yskrs_*2cAm3NkBZa&1v>Gq6*+R^ zs$85+I>jmut5pjvrc~_oxRZC+{7dZhJntC2v)}Ay_Z~T_v}UhgO?;C=ZfiBe+!>QQ zj~rBZ)8=~JR7&W2_U70X7fYaDjS^F)2R$FEJ zy}0Dj?JsA~Ut+JkxXR&rcEs-6Z?`@_lO{Ct#}Dq*0F||$I2U*;#orXkIb`(WqekHM2T}WMWd40`_`C0pd_wr-lC|qQ6Q(;h+Pptr z@P5_p>0kFZ{dL=JzI)&2{f7@6FX()f9U#djq!2juJ`1y+3d1BfCWTBe1qvw;2#DpM zpb;8S>-%Cdkf&PW8c~vxSdwa$T$Bo=7>o=IEOiacfhfet*vi<<%D_n5z}U*bVC$6@ eb`%Y{`6-!cmAEw=>9pAmve47j&t;ucLK6VNQs>10 diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 3d95beb102..5c8c19968d 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,46 +1,90 @@ -/* XPM */ -static const char *const Flag_Unknown_xpm[] = { -"96 32 15 1", +/* XPM */ +static char * Flag_Unknown_xpm[] = { +"96 32 59 1", " c None", -"! c black", -"# c #360000", -"$ c #D60000", -"% c #1B0000", -"& c #6B0000", -"' c #510000", -"( c #280000", -") c #BB0000", -"* c #780000", -"+ c #A00000", -", c #0D0000", -"- c #C90000", -". c #AE0000", -"0 c #430000", +". c #000000", +"+ c #FFFFFF", +"@ c #FF0000", +"# c #FE3434", +"$ c #FED4D4", +"% c #FE1C1C", +"& c #FE0303", +"* c #FE9292", +"= c #FEB3B3", +"- c #FEC2C2", +"; c #FE1010", +"> c #FE0D0D", +", c #FEB6B6", +"' c #FE3333", +") c #FEACAC", +"! c #FE0808", +"~ c #FE1E1E", +"{ c #FED2D2", +"] c #FEB8B8", +"^ c #FEB1B1", +"/ c #FE9494", +"( c #FE0202", +"_ c #FE3636", +": c #FEE7E7", +"< c #FE3D3D", +"[ c #FE3131", +"} c #FEB0B0", +"| c #FE0101", +"1 c #FEAFAF", +"2 c #FE9393", +"3 c #FE0606", +"4 c #FEAEAE", +"5 c #FE1F1F", +"6 c #FEE9E9", +"7 c #FEE8E8", +"8 c #FE2020", +"9 c #FE4747", +"0 c #FE2F2F", +"a c #FEA4A4", +"b c #FE0404", +"c c #FEA2A2", +"d c #FE7A7A", +"e c #FE6868", +"f c #FEEDED", +"g c #FE6767", +"h c #FE7C7C", +"i c #FECBCB", +"j c #FEB4B4", +"k c #FE0909", +"l c #FE9696", +"m c #FEFBFB", +"n c #FE8080", +"o c #FE2727", +"p c #FE8282", +"q c #FEFCFC", +"r c #FE5151", +"s c #FE0F0F", +"t c #FE8787", " ", " ", " ", " ", " ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!####!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!#$$#!###! ", -"!!!%&'!!!!%&'!()$$$$$*!#$$##$$#! ", -"!!!#$+!!!!#$+,-$$$$$$$&#$$#))$#! ", -"!!!#$+!!!!#$+#$.!!!!0$+#$$)))#!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$)))#!! ", -"!!!#$.!!!!0$+#$+!!!!#$+#))#))$#! ", -"!!!,-$$$$$$$&#$+!!!!#$+#$$!#$$#! ", -"!!!!()$$$$$*!%&'!!!!%&'!##!!##!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@@++++@@++@@#+++@@++@@+++$%&*. ", +".+@@++++@@++@@@=++@@++@@++-;>,+. ", +".+@@++++@@++@@#'++@@++@@+)!~{++. ", +".+@@++++@@++@@]@^+@@++@@/(_:+++. ", +".+@@++++@@++@@+<[+@@++@@@@}++++. ", +".+@@++++@|++@@+-@1@@++@@2|34+++. ", +".+5@6++7@8++@@++90@@++@@+ab&c++. ", +".+d@effg@h++@@++i@@@++@@++jk|l+. ", +".+mno33opq++@@+++r@@++@@+++-s@t. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", " ", " ", " ", From a167bccb035e38c593472d4490a7e369af6d04c7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 18:59:15 -0600 Subject: [PATCH 378/627] Apparently the order here was important, cached somewhere I guess. --- Source/Core/DiscIO/Src/Volume.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index 47cbc4f302..c90ee4a381 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -47,7 +47,6 @@ public: enum ECountry { COUNTRY_EUROPE = 0, - COUNTRY_GERMANY, COUNTRY_FRANCE, COUNTRY_RUSSIA, COUNTRY_USA, @@ -57,6 +56,7 @@ public: COUNTRY_TAIWAN, COUNTRY_SDK, COUNTRY_UNKNOWN, + COUNTRY_GERMANY, NUMBER_OF_COUNTRIES }; From 561b09457c7a1f34a8183e3464b6a1def3fa8ccc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:01:58 -0600 Subject: [PATCH 379/627] Fix warnings. Forgot to add Sdk flags. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 - .../Core/DolphinWX/resources/Flag_Europe.xpm | 2 +- .../Core/DolphinWX/resources/Flag_France.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Germany.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Italy.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Japan.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Korea.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_Sdk.png | Bin 0 -> 588 bytes Source/Core/DolphinWX/resources/Flag_Sdk.xpm | 114 ++++++++++++++++++ .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_USA.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Unknown.xpm | 2 +- 12 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.xpm diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 8d9815e4cd..1b35e06c29 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -35,8 +35,6 @@ #include "WxUtils.h" #include "Main.h" -extern "C" -{ #include "../resources/Flag_Europe.xpm" #include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" @@ -47,7 +45,6 @@ extern "C" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" #include "../resources/Flag_Sdk.xpm" -} #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index 1608b2cb78..ea966ec317 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Europe_xpm[] = { +static const char * Flag_Europe_xpm[] = { "96 32 43 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 6336122380..f53abf6822 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_France_xpm[] = { +static const char * Flag_France_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index 4e4c69324d..cd925bd2c8 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Germany_xpm[] = { +static const char * Flag_Germany_xpm[] = { "96 32 4 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index f81cc4bc94..78d39a848c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Italy_xpm[] = { +static const char * Flag_Italy_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index 556dd9fa36..baf2c5982c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Japan_xpm[] = { +static const char * Flag_Japan_xpm[] = { "96 32 19 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 857f82e721..32ce1a5289 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Korea_xpm[] = { +static const char * Flag_Korea_xpm[] = { "96 32 107 2", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.png b/Source/Core/DolphinWX/resources/Flag_Sdk.png new file mode 100644 index 0000000000000000000000000000000000000000..803aab2b9a17a1bc2a6d29a05f2407572a26319d GIT binary patch literal 588 zcmW-eZAg;=6oub+n{IASrA=GYEgQ4QF&HKa%GRtcx2DT2G5irTNo9X3+O#N$CgxfY zgqleVDlr>m!-;HBSTHOHjtVjSz?BH|t6X0{oFwP%T^G)MxaZ$F*HdS%=5xhdf*|-t zgU(8`iB=(pN$*AJ-BubImkf;#g5U{KB8i7y5pA-a##%i)M)C+{#f2lcCunP{uBKj3 z^Z!sJ2?hg9CRi+_r6D~XY&JL?WMqKLMP?@Wd}L)II~zGU5D1W)3$Yma`6wuWL;|T4 zg@usGAeTd-fKrK)5|oueqd{#gEEY60ps^7)8`|1nx1+rs9UXAF;C92~K~E2Qd(qd2 z{(gA97#zgV5PUw2jKJ^5=qLgKjE^H2L@0!C7?YETMlmyk*;&M5SXn_lj@4DHtzmr~ z8ync%L?VIhZ6uS}*}?8ED2ke5@BF0Gl1{7nG@)IcPqjrho2qpr#ZZ2sk9ni6s@^cQ zbzd(CtAt(W?1vkcVzDPL_l79S@tCo+tnJ=VEgWw>^|$E9guFuXnKDsTUzz@kdh#gw zeN6g6^43je?pI3AU$N!g2%ccwd%s+2QUsb~c?*i0o@tHD!8oLQTJZbL^T@P$l(p7% zQrJ~Fx2PdZSBvJF_T*dDqU+>9W$`k{d|CTwNqBZRp0oQ=kd&V(AGju;a;81t`h4nj z(L&h)?bvHIFA@oSn-lV1bRXQOEsi=|;i@|=lEBIzX^q$S=~*YE^jC}3Vz-sQdv!~s S8thG^er?p7b^c>bo&Nv@3KIGN literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm new file mode 100644 index 0000000000..0df81bf81f --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm @@ -0,0 +1,114 @@ +/* XPM */ +static const char * Flag_Sdk_xpm[] = { +"96 32 79 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E9E9FE", +"# c #5959FE", +"$ c #1515FE", +"% c #0505FE", +"& c #1313FE", +"* c #3232FE", +"= c #0000FF", +"- c #0202FE", +"; c #0C0CFE", +"> c #2B2BFE", +", c #7676FE", +"' c #EEEEFE", +") c #D4D4FE", +"! c #1C1CFE", +"~ c #0303FE", +"{ c #9292FE", +"] c #5151FE", +"^ c #B1B1FE", +"/ c #F8F8FE", +"( c #CCCCFE", +"_ c #E5E5FE", +": c #9393FE", +"< c #0A0AFE", +"[ c #2424FE", +"} c #EAEAFE", +"| c #C2C2FE", +"1 c #1010FE", +"2 c #0D0DFE", +"3 c #B6B6FE", +"4 c #0F0FFE", +"5 c #8989FE", +"6 c #6767FE", +"7 c #ACACFE", +"8 c #0808FE", +"9 c #1E1EFE", +"0 c #D2D2FE", +"a c #5F5FFE", +"b c #9C9CFE", +"c c #E8E8FE", +"d c #DDDDFE", +"e c #1A1AFE", +"f c #9494FE", +"g c #3636FE", +"h c #E7E7FE", +"i c #B7B7FE", +"j c #0707FE", +"k c #A4A4FE", +"l c #F7F7FE", +"m c #B0B0FE", +"n c #FCFCFE", +"o c #C4C4FE", +"p c #8181FE", +"q c #2020FE", +"r c #1B1BFE", +"s c #0101FE", +"t c #0606FE", +"u c #AEAEFE", +"v c #E2E2FE", +"w c #8787FE", +"x c #0404FE", +"y c #A2A2FE", +"z c #3E3EFE", +"A c #A8A8FE", +"B c #F9F9FE", +"C c #5656FE", +"D c #E6E6FE", +"E c #B4B4FE", +"F c #0909FE", +"G c #9696FE", +"H c #4D4DFE", +"I c #2222FE", +"J c #1D1DFE", +"K c #6969FE", +"L c #0E0EFE", +"M c #2D2DFE", +"N c #7575FE", +" ", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@#$%&*+++==-;>,'+++==+++)!~{+. ", +".+]=^/(]+++==+_:<[}++==++|123++. ", +".+4=_++++++==+++5=6++==+7890+++. ", +".+9=&abc+++==+++d=e++==f-gh++++. ", +".+ie===jk++==+++l=%++====m+++++. ", +".++nopq=!++==+++d=r++==:stu++++. ", +".+++++v=1++==+++w=6++==+kx~y+++. ", +".+zAcB7=C++==+D:<[}++==++EFsG++. ", +".+HI;%JK'++==~LMN'+++==+++|4=w+. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index 3f092d6149..da0f13de47 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Taiwan_xpm[] = { +static const char * Flag_Taiwan_xpm[] = { "96 32 24 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index eca9509e16..44260eca52 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_USA_xpm[] = { +static const char * Flag_USA_xpm[] = { "96 32 88 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 5c8c19968d..381d43f304 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Unknown_xpm[] = { +static const char * Flag_Unknown_xpm[] = { "96 32 59 1", " c None", ". c #000000", From 34a82738017ba05bb05561c687ad69f06e821ce5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:11:03 -0600 Subject: [PATCH 380/627] we don't need PNGs of the flags --- Source/Core/DolphinWX/resources/Flag_Europe.png | Bin 419 -> 0 bytes Source/Core/DolphinWX/resources/Flag_France.png | Bin 194 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Germany.png | Bin 191 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Italy.png | Bin 194 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Japan.png | Bin 290 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Korea.png | Bin 730 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Sdk.png | Bin 588 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Taiwan.png | Bin 306 -> 0 bytes Source/Core/DolphinWX/resources/Flag_USA.png | Bin 613 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Unknown.png | Bin 485 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Source/Core/DolphinWX/resources/Flag_Europe.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_France.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Italy.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Japan.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Korea.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Taiwan.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_USA.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Unknown.png diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png deleted file mode 100644 index a0e8c187e2050e0c826aa6ed03d41ef55299159c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(LD77V`EDMdP)mSMh%1l=0pppBCNo&fr?Z()<*}Y5VB0U|&?Dy9Bkj_u z?9rm-Td(a~Zy8!{6;|dLS>zN|=oXjn5tr{7o9CO9<(rh9T^vzd9@5h6(bDYI)8^XW z;ktIN;kwxd>*g42U7)*dfzGxCy4x4(>{zJ1YmwHjMcTU;Y2Mu~`e3KfgPp?v|NpNv zIjjkE17k^$UoeBivl}2!FeZ7syJ)NIe8K_b%6NG4OSvmTC&;clX3SzdYX*~&sAktiCDD`0cXYjHhaAy6$GT|8k(-%Q zCP$jKI;KwS5Yy)M4o-+PnbMtoE5hNmRFVdQ&MBb@ E0I$!HfB*mh diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png deleted file mode 100644 index 6aed09aab155f98c106277d1a264671d077a3b66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!VDzk-zB62Db50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(LEa?g_s7#fA^rfL5LX}#0?Je0YFhsP|37ac|7IYUu_VYZn8D%MjWiG^ z$=lt9r9b0lAdsWu>Eak-aXL9cqSHZuSKx}m5*8LMJ%_!@h zljQC0!qT5{GZ4tp^mK6yu{fQaAkpa{z}u6xpo>jWRb+w1Dn@AmGdISz#ZoIK{cvN{ aWni$1RM)qVXxt9e#Ng@b=d#Wzp$Py|8!n6h diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png deleted file mode 100644 index 2b2a8ef1e2629d3bd8a34859c9497c3261a6505b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!VDzk-zB62Db50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L0N@s|BL{j5PyJAh%1l=fk|%Xw9Wtj|Nr&i44%=JvO=wGDL{P;p00i_>zopr01j3$00000 diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png deleted file mode 100644 index d68affd97241ffb1dcb2316fcbdc42a7a4646999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L6!OE`>wq}A*J zGIS9!avL*p9W!z)EG#cCFEB7LG&D3dH8nOiHa9mnIXO8xIyyW&JU%`?KR-W0K6OGu zLPJACMMXtNM@L9VNKsKyQc_Y@C|*`pR#zfeTq0IoU0q*aUtwWkWMpJ#XJ=_?X=-X} zYaUT-Ms;j#Y;JCDaBy&OadC4UPIYy4dSr}yWsQF%Q-6PdhlhuVh=_`cij0hml$4Z~ zmX?^9n4O)SqobpyrlzcwudSA`uMs)3QF62pH@3F6x3{;ty1Kikyt})*!>_}}3^2$R zImjD6$rn1ww#mxM%FZlI(!kEw*VouubJ*C}+9?6?CkHl#qaO$ z@V&?J#m({5+w#iN^Yiod)!X*=_WAkw`uO_#`uh9(`~3X;{`>s?{Qdv`|F>lRtpET3 z0d!JMQvg8b*k%9#00Cl4M?`8RVwDa6009z7L_t(Y$75g^1;ZaO5&)E2kcAge&w@}? zgF~rpfvcc#IKudFV*z*SS`fjduFRhbGe4P6SzSAtniiys=?h7?WMySUg@naqW@Wjk z3Y&;H68gmaU4Jg$$L8 z3N1wuL{TBGq@@;3-AMKmu}nauodhdkzoAxK)3Cy!b(J{^M#10*04nFV=^PKAP5=M^ M07*qoM6N<$g3yyYY5)KL diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.png b/Source/Core/DolphinWX/resources/Flag_Sdk.png deleted file mode 100644 index 803aab2b9a17a1bc2a6d29a05f2407572a26319d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmW-eZAg;=6oub+n{IASrA=GYEgQ4QF&HKa%GRtcx2DT2G5irTNo9X3+O#N$CgxfY zgqleVDlr>m!-;HBSTHOHjtVjSz?BH|t6X0{oFwP%T^G)MxaZ$F*HdS%=5xhdf*|-t zgU(8`iB=(pN$*AJ-BubImkf;#g5U{KB8i7y5pA-a##%i)M)C+{#f2lcCunP{uBKj3 z^Z!sJ2?hg9CRi+_r6D~XY&JL?WMqKLMP?@Wd}L)II~zGU5D1W)3$Yma`6wuWL;|T4 zg@usGAeTd-fKrK)5|oueqd{#gEEY60ps^7)8`|1nx1+rs9UXAF;C92~K~E2Qd(qd2 z{(gA97#zgV5PUw2jKJ^5=qLgKjE^H2L@0!C7?YETMlmyk*;&M5SXn_lj@4DHtzmr~ z8ync%L?VIhZ6uS}*}?8ED2ke5@BF0Gl1{7nG@)IcPqjrho2qpr#ZZ2sk9ni6s@^cQ zbzd(CtAt(W?1vkcVzDPL_l79S@tCo+tnJ=VEgWw>^|$E9guFuXnKDsTUzz@kdh#gw zeN6g6^43je?pI3AU$N!g2%ccwd%s+2QUsb~c?*i0o@tHD!8oLQTJZbL^T@P$l(p7% zQrJ~Fx2PdZSBvJF_T*dDqU+>9W$`k{d|CTwNqBZRp0oQ=kd&V(AGju;a;81t`h4nj z(L&h)?bvHIFA@oSn-lV1bRXQOEsi=|;i@|=lEBIzX^q$S=~*YE^jC}3Vz-sQdv!~s S8thG^er?p7b^c>bo&Nv@3KIGN diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png deleted file mode 100644 index d5bb1007f1cb3a62785204cf902e9c0d5b7d91fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L6^zR&_Ed|36`};5S_g|ba;o`Jum#0m;GJX1$n>XLzy7m4a1H=FS|DW+}v<4c)SQ6wH z%;50s2FM|dN#5=*;@sC}^aDA`o-U3d9>?Ea_2z3(;BgIP=~B@8vH17>mC0&W6Q-|t zdGi2ort}n{|JUzU$X(bPlr372X22(*V6VSZJw{;-`}^ny)|@kE<}CjEhTG(4q1Oq? r1KT;O*q=^fQBi1AWBf8*^T_YHoGEIeFUz+c1Nq3))z4*}Q$iB}BFSpY diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png deleted file mode 100644 index e34f11c274a62a83baefc7c412f694efc8a759ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(!9Z0e{ACCO10zR(Plzi}3J4q>3Z0#bJ>1JZJ%Fgf%c~+JxIQGfAvB~h zEVLmayeT5QIU>9zGNL&uvL!mIIXVhRw#GyQQG0AmYivwgLVQ<3LT6%PS5jg}Qc_QH zQfG2fcXCosN^)09a(7BHkkOl((v_Ohotn~n~~m^k=~yHWM}keWB|#DnHl|=851%y`?I_Xvoia# zfQ-xuS(y{Fvih^KCT3?%$Oe&+$=lr}yq4>xJdktE)5S5wG|w$64Nh;e%R^U z*YUQ6fg@tm=B(~@JSSsMRXH=T{9#gFbK~p-1EIZKObQ8EUB!*}-yJVHzvh(7Jl93h zi(av+nSHz`$iSHFx5WJN#chhh$F!Lg1Y*>0zm%Gq_~`WkNk#z!k*9q2GmF0_-}~Ue zz_KW4rs{8L{s{^G4GsPe5B?Ak{u~_s9v=Q5AO0X9{wF8?FE9QvG5#|%{xmfHHa7k} zJ^n{W{!vl>XJ`IsX#RS7{(OA?fPnsjg8qkx{*sdZlav0Gl>U~M{-UD(q@@0=tp2X9 z{;#k8u(1BIvHr8O{#h$($fCa)c)t^{^;ob>FNIM?f(1w{`~y^ z00960{}Eq~%K!iX0d!JMQvg8b*k%9#00Cl4M?^YK3B>vU006B?L_t(Y$L*Cj62d?b z1jQkQ2jRWw<)B$u2@hG3039qn!AMyPAwdCG z@`9q5qEYg*%o65QM$kdqbzA6qf&+pr+NRV*L~!fbmSy+v{`NP+J8&`>=%+#pqVQ#E bG|}e)HLP;7p8n7E00000NkvXXu0mjfY&zVt From 7fdfd1ef655e95a8c4f17480e4789f005a68848e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:20:47 -0600 Subject: [PATCH 381/627] Make all flags 2 pixels taller. Aspect-ratio is now correct for nearly all flags. --- .../Core/DolphinWX/resources/Flag_Europe.xpm | 129 +++++---- .../Core/DolphinWX/resources/Flag_France.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Germany.xpm | 22 +- .../Core/DolphinWX/resources/Flag_Italy.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Japan.xpm | 71 ++--- .../Core/DolphinWX/resources/Flag_Korea.xpm | 234 ++++++++--------- Source/Core/DolphinWX/resources/Flag_Sdk.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 68 ++--- Source/Core/DolphinWX/resources/Flag_USA.xpm | 247 +++++++++--------- .../Core/DolphinWX/resources/Flag_Unknown.xpm | 4 +- 10 files changed, 410 insertions(+), 377 deletions(-) diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index ea966ec317..3ab8534066 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,50 +1,66 @@ /* XPM */ static const char * Flag_Europe_xpm[] = { -"96 32 43 1", +"96 32 60 1", " c None", ". c #000000", "+ c #003399", -"@ c #043797", -"# c #013498", -"$ c #8F8845", -"% c #8C8645", -"& c #16408C", -"* c #DDB715", -"= c #415972", -"- c #848348", -"; c #84834A", -"> c #425A71", -", c #737754", -"' c #234884", -") c #4D626A", -"! c #B6A02D", -"~ c #0C3B92", -"{ c #B7A12C", -"] c #465E6F", -"^ c #AE9B30", -"/ c #AE9C30", -"( c #3A5676", -"_ c #BBA229", -": c #16418C", -"< c #BAA22A", -"[ c #395577", -"} c #2B4D7F", -"| c #B8A12B", -"1 c #BAA22B", -"2 c #2A4D7F", -"3 c #4D626B", -"4 c #B5A02D", -"5 c #B6A02C", -"6 c #AD9D31", -"7 c #103D8F", -"8 c #6B7358", -"9 c #1B4489", -"0 c #063795", -"a c #E0B912", -"b c #485E6F", -"c c #495D6E", -"d c #E0B913", -" ", +"@ c #013498", +"# c #33527A", +"$ c #32527B", +"% c #103D90", +"& c #707555", +"* c #1B4389", +"= c #C9AC20", +"- c #C9AC21", +"; c #6F7556", +"> c #083994", +", c #E6BB0F", +"' c #4D606B", +") c #0B3A92", +"! c #4F616A", +"~ c #E5BB0F", +"{ c #16408C", +"] c #023597", +"^ c #737954", +"/ c #E7BE0F", +"( c #0D3A91", +"_ c #E8BE0E", +": c #727854", +"< c #2F4F7D", +"[ c #445B70", +"} c #455C6F", +"| c #2E4E7D", +"1 c #465D6F", +"2 c #CCAD1E", +"3 c #18418B", +"4 c #CBAD1E", +"5 c #2D4F7E", +"6 c #C0A626", +"7 c #C0A625", +"8 c #0E3B91", +"9 c #50636A", +"0 c #053696", +"a c #506369", +"b c #80804D", +"c c #E6BE0E", +"d c #083794", +"e c #E7BE0E", +"f c #7F7F4D", +"g c #103B8F", +"h c #17408B", +"i c #E5BB10", +"j c #485D6E", +"k c #0C3992", +"l c #0B3892", +"m c #495E6D", +"n c #E4BB10", +"o c #777B51", +"p c #264982", +"q c #C7AA21", +"r c #C6A923", +"s c #767A52", +"t c #3B5675", +"u c #3A5576", " ", " ", " ", @@ -52,20 +68,22 @@ static const char * Flag_Europe_xpm[] = { "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".+++++++++++@+#$%#+@+++++++++++. ", -".++++++++++&*=+-;+>*&++++++++++. ", -".+++++++++++,'++++',+++++++++++. ", -".++++++++)!~++++++++~{)++++++++. ", -".++++++++]^++++++++++/]++++++++. ", +".+++++++++++++@#$@+++++++++++++. ", +".++++++++++%&*+=-+*;%++++++++++. ", +".++++++++++>,'+))+!~>++++++++++. ", +".+++++++++{+]]++++]]+{+++++++++. ", +".++++++++^/(++++++++(_:++++++++. ", +".++++++++<[++++++++++}|++++++++. ", +".++++++++]++++++++++++]++++++++. ", +".+++++++123++++++++++341+++++++. ", +".+++++++56++++++++++++75+++++++. ", ".++++++++++++++++++++++++++++++. ", -".+++++++(_:++++++++++:<[+++++++. ", -".+++++++}|++++++++++++12+++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++34~++++++++~53++++++++. ", -".++++++++]/++++++++++6]++++++++. ", -".++++++++++789++++987++++++++++. ", -".++++++++++0ab#$%#cd0++++++++++. ", -".++++++++++++++-;++++++++++++++. ", +".++++++++890++++++++0a8++++++++. ", +".++++++++bcd++++++++def++++++++. ", +".++++++++))+g++++++g+))++++++++. ", +".++++++++++hij+kl+mnh++++++++++. ", +".+++++++++++op@qr@ps+++++++++++. ", +".++++++++++++++tu++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", "................................ ", @@ -74,5 +92,4 @@ static const char * Flag_Europe_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index f53abf6822..1d71b3430d 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -10,7 +10,6 @@ static const char * Flag_France_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", @@ -30,11 +29,12 @@ static const char * Flag_France_xpm[] = { ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index cd925bd2c8..e178b30edf 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,11 +1,12 @@ /* XPM */ static const char * Flag_Germany_xpm[] = { -"96 32 4 1", +"96 32 6 1", " c None", ". c #000000", -"+ c #DD0000", -"@ c #FFCE00", -" ", +"+ c #4A0000", +"@ c #DD0000", +"# c #F48A00", +"$ c #FFCE00", " ", " ", " ", @@ -18,22 +19,23 @@ static const char * Flag_Germany_xpm[] = { "................................ ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".##############################. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index 78d39a848c..d0832f2d8a 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -10,7 +10,6 @@ static const char * Flag_Italy_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", @@ -30,11 +29,12 @@ static const char * Flag_Italy_xpm[] = { ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index baf2c5982c..bdd86a6882 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,26 +1,34 @@ /* XPM */ static const char * Flag_Japan_xpm[] = { -"96 32 19 1", +"96 32 28 1", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #FEFDFD", -"# c #F1C9D3", -"$ c #E9AAB9", -"% c #E69FB0", -"& c #C41F47", -"* c #BC002D", -"= c #C42047", -"- c #E6A1B2", -"; c #DA748D", -"> c #DB758D", -", c #EBB4C1", -"' c #ECB6C3", -") c #CD4263", -"! c #CE4465", -"~ c #BF0D38", -"{ c #C00E39", -" ", +"@ c #FDF9FA", +"# c #E497A9", +"$ c #CA3458", +"% c #C0113B", +"& c #CA3559", +"* c #E498AA", +"= c #FEFAFB", +"- c #F8E4E9", +"; c #C93155", +"> c #BC002D", +", c #C93256", +"' c #F8E5EA", +") c #FDF7F8", +"! c #C82E53", +"~ c #C93055", +"{ c #FDF8F9", +"] c #E18EA2", +"^ c #E290A4", +"/ c #CA375A", +"( c #BF0B36", +"_ c #BF0D38", +": c #CB385B", +"< c #E394A7", +"[ c #E396A9", +"} c #BE0733", " ", " ", " ", @@ -29,18 +37,20 @@ static const char * Flag_Japan_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++@#$$#@++++++++++++. ", -".+++++++++++%&****=-+++++++++++. ", -".++++++++++;********>++++++++++. ", -".+++++++++,**********'+++++++++. ", -".+++++++++)**********!+++++++++. ", -".+++++++++~**********{+++++++++. ", -".+++++++++~**********{+++++++++. ", -".+++++++++)**********!+++++++++. ", -".+++++++++,**********'+++++++++. ", -".++++++++++;********>++++++++++. ", -".+++++++++++%&****=-+++++++++++. ", -".++++++++++++@#$$#@++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@#$%%&*=+++++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++)!>>>>>>>>~{+++++++++. ", +".+++++++++]>>>>>>>>>>^+++++++++. ", +".+++++++++$>>>>>>>>>>/+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++&>>>>>>>>>>:+++++++++. ", +".+++++++++<>>>>>>>>>>[+++++++++. ", +".+++++++++{!>>>>>>>>~@+++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++++@#$}}&*=+++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", @@ -50,5 +60,4 @@ static const char * Flag_Japan_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 32ce1a5289..26ebd9fa24 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,114 +1,105 @@ /* XPM */ static const char * Flag_Korea_xpm[] = { -"96 32 107 2", +"96 32 99 2", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #E4E4E4", -"# c #BABABA", -"$ c #3A3A3A", -"% c #7F7F7F", -"& c #E8E8E8", -"* c #393939", -"= c #BBBBBB", -"- c #EBEBEB", -"; c #2F2F2F", -"> c #6A6A6A", -", c #616161", -"' c #373737", -") c #FAFAFA", -"! c #F9F9F9", -"~ c #363636", -"{ c #6E6E6E", -"] c #EFEFEF", -"^ c #FCFCFC", -"/ c #424242", -"( c #757575", -"_ c #3C3C3C", -": c #454545", -"< c #B7B7B7", -"[ c #FEFBFC", -"} c #EFBAC5", -"| c #E48E9E", -"1 c #E58F9F", -"2 c #F0BDC7", -"3 c #FEFCFD", -"4 c #676767", -"5 c #3E3E3E", -"6 c #878787", -"7 c #D7D7D7", -"8 c #707070", -"9 c #2C2C2C", -"0 c #717171", -"a c #F1C5CD", -"b c #CE2C4C", -"c c #C60C30", -"d c #F2CAD2", -"e c #9D9D9D", -"f c #D8D8D8", -"g c #F6F6F6", -"h c #B6B6B6", -"i c #474747", -"j c #FBFBFB", -"k c #F1D4DB", -"l c #C81639", -"m c #C9173A", -"n c #F5D5DB", -"o c #484848", -"p c #B35172", -"q c #D85A73", -"r c #56285E", -"s c #731D4E", -"t c #113172", -"u c #0B3274", -"v c #5C2256", -"w c #C81B3E", -"x c #0C3274", -"y c #6B1E51", -"z c #B41037", -"A c #AF1139", -"B c #572258", -"C c #003478", -"D c #7F2453", -"E c #423E75", -"F c #6C4675", -"G c #ECECEC", -"H c #A3A3A3", -"I c #343434", -"J c #C9B6C9", -"K c #093375", -"L c #D2C0CE", -"M c #353535", -"N c #6C6C6C", -"O c #303030", -"P c #BBA7BC", -"Q c #1B3372", -"R c #1D3372", -"S c #C3AFC3", -"T c #515151", -"U c #888888", -"V c #8C8C8C", -"W c #565656", -"X c #A6A6A6", -"Y c #FAF8FA", -"Z c #AD96B1", -"` c #7B658D", -" . c #7A648C", -".. c #AC95AF", -"+. c #646464", -"@. c #8A8A8A", -"#. c #949494", -"$. c #525252", -"%. c #5D5D5D", -"&. c #3F3F3F", -"*. c #434343", -"=. c #5F5F5F", -"-. c #696969", -";. c #CACACA", -">. c #969696", -",. c #F3F3F3", -"'. c #989898", -" ", +"@ c #FDFDFD", +"# c #E2E2E2", +"$ c #313131", +"% c #BABABA", +"& c #BBBBBB", +"* c #505050", +"= c #777777", +"- c #3F3F3F", +"; c #868686", +"> c #F9F9F9", +", c #3E3E3E", +"' c #5B5B5B", +") c #A1A1A1", +"! c #545454", +"~ c #2E2E2E", +"{ c #7D7D7D", +"] c #5F5F5F", +"^ c #5E5E5E", +"/ c #7E7E7E", +"( c #434343", +"_ c #9C9C9C", +": c #A5A5A5", +"< c #E4E4E4", +"[ c #292929", +"} c #636363", +"| c #717171", +"1 c #2B2B2B", +"2 c #F0F0F0", +"3 c #EEB6C0", +"4 c #D44964", +"5 c #C81537", +"6 c #C81638", +"7 c #D54C66", +"8 c #EEB7C1", +"9 c #F1F1F1", +"0 c #8D8D8D", +"a c #626262", +"b c #E8E8E8", +"c c #A0A0A0", +"d c #4B4B4B", +"e c #B0B0B0", +"f c #E17E91", +"g c #C60C30", +"h c #E28395", +"i c #B2B2B2", +"j c #C9C9C9", +"k c #E4B0BD", +"l c #707070", +"m c #A54367", +"n c #C10D32", +"o c #BD0D34", +"p c #D54D67", +"q c #52285E", +"r c #6A1E52", +"s c #093374", +"t c #023378", +"u c #50245B", +"v c #C7193C", +"w c #0A3275", +"x c #761C4D", +"y c #602155", +"z c #003478", +"A c #812351", +"B c #353973", +"C c #653E6F", +"D c #A38BA8", +"E c #B196B0", +"F c #323232", +"G c #555555", +"H c #6D5985", +"I c #6C5885", +"J c #565656", +"K c #ECECEC", +"L c #282828", +"M c #666666", +"N c #939393", +"O c #A68FAA", +"P c #373A73", +"Q c #0E3274", +"R c #0D3374", +"S c #363A73", +"T c #A891AC", +"U c #E9E9E9", +"V c #949494", +"W c #676767", +"X c #B1B1B1", +"Y c #646464", +"Z c #808080", +"` c #4F4F4F", +" . c #A6A6A6", +".. c #B7B7B7", +"+. c #787878", +"@. c #333333", +"#. c #EBEBEB", +"$. c #444444", +"%. c #CECECE", " ", " ", " ", @@ -116,20 +107,22 @@ static const char * Flag_Korea_xpm[] = { ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", -". + + + + + + # $ % & + + + + + + + + + + & % * = + + + + + + . ", -". + + + + + - ; > , ' ) + + + + + + + + ! ~ , > { ] + + + + + . ", -". + + + + ^ / ( _ : < + + [ } | 1 2 3 + + < 4 5 6 / ^ + + + + . ", -". + + + + 7 8 9 8 0 + + a b c c c c b d + + e 8 9 8 f + + + + . ", -". + + + + + g h i j + k l c c c c c c m n + j o h g + + + + + . ", -". + + + + + + + ^ + + p c c c c c c c c q + + ^ + + + + + + + . ", -". + + + + + + + + + + r c c c c s t u v w + + + + + + + + + + . ", -". + + + + + + + + + + x y z A B C C C C D + + + + + + + + + + . ", -". + + + + + + + ^ + + E C C C C C C C C F + + ^ + + + + + + + . ", -". + + + + + G H I g + J K C C C C C C u L + g M H G + + + + + . ", -". + + + + 7 N O 8 0 + + P Q C C C C R S + + e 0 O N f + + + + . ", -". + + + + + T U V W X + + Y Z ` ...Y + + X +.@.#.$.+ + + + + . ", -". + + + + + - ; N %.&.) + + + + + + + + ! *.=.N -.] + + + + + . ", -". + + + + + + ;.&.>.,.+ + + + + + + + + + ,.'.5 ;.+ + + + + + . ", +". + + + + + + # $ % + + + + + + + + + + + + & $ # + + + + + + . ", +". + + + + + + * = - ; > + + + + + + + + > ; , = ' + + + + + + . ", +". + + + + + ) ! ~ { ] + + + + + + + + + + ^ / ( _ : + + + + + . ", +". + + + + < [ } | 1 2 + + 3 4 5 6 7 8 + + 9 0 | a [ < + + + + . ", +". + + + + b c - d e + + f g g g g g g h + + i d - c b + + + + . ", +". + + + + + + j | + + k g g g g g g g g 8 + + l j + + + + + + . ", +". + + + + + + + + + + m g g g g g n o g p + + + + + + + + + + . ", +". + + + + + + + + + + q g g g g r s t u v + + + + + + + + + + . ", +". + + + + + + + + + + w x n o y z z z z A + + + + + + + + + + . ", +". + + + + + + + + + + B z z z z z z z z C + + + + + + + + + + . ", +". + + + + + + j | + + D z z z z z z z z E + + l j + + + + + + . ", +". + + + + b c F G e + + H z z z z z z I + + i J $ c b + + + + . ", +". + + + + K L M N F b + + O P Q R S T + + U 0 V W [ K + + + + . ", +". + + + + + X M Y Z ` + + + + + + + + + + ` Z a ...+ + + + + . ", +". + + + + + + * +.@.0 > + + + + + + + + > 0 @.= ' + + + + + + . ", +". + + + + + + #.$.%.+ + + + + + + + + + + + %.$.#.+ + + + + + . ", ". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", ". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", @@ -138,5 +131,4 @@ static const char * Flag_Korea_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm index 0df81bf81f..f4a5504044 100644 --- a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm @@ -84,12 +84,12 @@ static const char * Flag_Sdk_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".+@#$%&*+++==-;>,'+++==+++)!~{+. ", ".+]=^/(]+++==+_:<[}++==++|123++. ", ".+4=_++++++==+++5=6++==+7890+++. ", @@ -104,11 +104,11 @@ static const char * Flag_Sdk_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index da0f13de47..19aa7cc4f6 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,44 +1,52 @@ /* XPM */ static const char * Flag_Taiwan_xpm[] = { -"96 32 24 1", +"96 32 32 1", " c None", ". c #000000", "+ c #000095", "@ c #FE0000", -"# c #12129C", -"$ c #010195", -"% c #3D3DAE", -"& c #0B0B9A", -"* c #1B1BA0", -"= c #8F8FD0", -"- c #9696D3", -"; c #9090D1", -"> c #1A1AA0", -", c #2424A4", -"' c #9696D4", -") c #DADAEF", -"! c #FFFFFF", -"~ c #D9D9EF", -"{ c #9797D4", -"] c #040497", -"^ c #5959BA", -"/ c #8E8ECF", -"( c #8E8ED1", -"_ c #8F8FD1", -" ", +"# c #050597", +"$ c #2727A5", +"% c #2A2AA6", +"& c #6A6AC1", +"* c #A4A4D9", +"= c #6B6BC1", +"- c #2929A6", +"; c #3636AB", +"> c #8181CA", +", c #9595D3", +"' c #D4D4ED", +") c #9494D2", +"! c #8282CB", +"~ c #3535AB", +"{ c #2B2BA7", +"] c #7F7FC9", +"^ c #FFFFFF", +"/ c #7E7ECA", +"( c #040497", +"_ c #3C3CAE", +": c #8080C9", +"< c #7F7FCA", +"[ c #9494D3", +"} c #2C2CA7", +"| c #5454B8", +"1 c #9F9FD7", +"2 c #5555B8", +"3 c #2828A6", " ", " ", " ", " ", "................................ ", ".+++++++++++++++@@@@@@@@@@@@@@@. ", -".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", -".++++&*=-;>&++++@@@@@@@@@@@@@@@. ", -".++++,')!~{,++++@@@@@@@@@@@@@@@. ", -".+++]^;!!!;^]+++@@@@@@@@@@@@@@@. ", -".++++,')!~{,++++@@@@@@@@@@@@@@@. ", -".++++&*/(_>&++++@@@@@@@@@@@@@@@. ", -".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".+++++#+$+#+++++@@@@@@@@@@@@@@@. ", +".+++++%&*=-+++++@@@@@@@@@@@@@@@. ", +".++++;>,')!~++++@@@@@@@@@@@@@@@. ", +".++++{]^^^/{++++@@@@@@@@@@@@@@@. ", +".+++(_:^^^<_(+++@@@@@@@@@@@@@@@. ", +".++++;>[')!~++++@@@@@@@@@@@@@@@. ", +".+++++}|12{+++++@@@@@@@@@@@@@@@. ", +".+++++#+3+#+++++@@@@@@@@@@@@@@@. ", ".+++++++++++++++@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", @@ -49,11 +57,11 @@ static const char * Flag_Taiwan_xpm[] = { ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 44260eca52..2b1d466240 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,123 +1,128 @@ /* XPM */ static const char * Flag_USA_xpm[] = { -"96 32 88 1", -" c None", -". c #000000", -"+ c #545380", -"@ c #5C5B87", -"# c #565580", -"$ c #5B5A85", -"% c #585782", -"& c #5B5A84", -"* c #5A5984", -"= c #585783", -"- c #5C5B85", -"; c #555481", -"> c #5D5C85", -", c #54537F", -"' c #B22234", -") c #494878", -"! c #64638A", -"~ c #686891", -"{ c #66658B", -"] c #66668F", -"^ c #67668D", -"/ c #65658E", -"( c #68678E", -"_ c #65648D", -": c #6A6A8F", -"< c #62628C", -"[ c #4A4A78", -"} c #E1AAB1", -"| c #5B5A83", -"1 c #6B6A92", -"2 c #68678D", -"3 c #6A698E", -"4 c #696890", -"5 c #6A6990", -"6 c #676790", -"7 c #6D6C91", -"8 c #68678F", -"9 c #6C6B92", -"0 c #595883", -"a c #EDCCD0", -"b c #484777", -"c c #66668E", -"d c #69688F", -"e c #6B6A91", -"f c #6A6991", -"g c #6A6A91", -"h c #686790", -"i c #6E6D92", -"j c #67678E", -"k c #494877", -"l c #585784", -"m c #69698F", -"n c #61618A", -"o c #676690", -"p c #65648B", -"q c #65648E", -"r c #66658D", -"s c #64638D", -"t c #605F8A", -"u c #68688F", -"v c #F3DDE0", -"w c #434273", -"x c #64638B", -"y c #686890", -"z c #66658E", -"A c #63628C", -"B c #DB99A1", -"C c #6A698F", -"D c #626188", -"E c #67668E", -"F c #636289", -"G c #66658C", -"H c #63628B", -"I c #606089", -"J c #B83243", -"K c #414071", -"L c #65648A", -"M c #67668F", -"N c #6B6A90", -"O c #6E6D94", -"P c #64638C", -"Q c #FFFFFF", -"R c #5D5C86", -"S c #6D6C92", -"T c #65648C", -"U c #67678F", -"V c #CA6672", -"W c #6A4A71", -" ", -" ", -" ", -" ", -" ", -"................................ ", -".+@#$%&*=-;>,''''''''''''''''''. ", -".)!~{]^/(_:<[}}}}}}}}}}}}}}}}}}. ", -".|12134567890aaaaaaaaaaaaaaaaaa. ", -".bc9d1efghijk''''''''''''''''''. ", -".lmnopqrs2tu0vvvvvvvvvvvvvvvvvv. ", -".wx9^5y8fziAwBBBBBBBBBBBBBBBBBB. ", -".$CDEFGqH2IC&JJJJJJJJJJJJJJJJJJ. ", -".KLiMeudNrOPKQQQQQQQQQQQQQQQQQQ. ", -".RST4_U4qNASRVVVVVVVVVVVVVVVVVV. ", -".WWWWWWWWWWWWVVVVVVVVVVVVVVVVVV. ", -".QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ. ", -".JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ. ", -".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", -".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv. ", -".''''''''''''''''''''''''''''''. ", -".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa. ", -".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".''''''''''''''''''''''''''''''. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +"96 32 93 2", +" c None", +". c #000000", +"+ c #4C4B79", +"@ c #54537F", +"# c #4E4E7C", +"$ c #52517E", +"% c #4F4E7C", +"& c #504F7D", +"* c #51517E", +"= c #4F4E7D", +"- c #51517F", +"; c #4D4C7C", +"> c #52527F", +", c #4B4A79", +"' c #B22234", +") c #53527F", +"! c #5F5E89", +"~ c #616089", +"{ c #60608A", +"] c #616088", +"^ c #606088", +"/ c #605F87", +"( c #52517F", +"_ c #D58791", +": c #3E3D70", +"< c #62618A", +"[ c #65658C", +"} c #64638A", +"| c #62628B", +"1 c #63638B", +"2 c #63628A", +"3 c #61608A", +"4 c #64648B", +"5 c #605F89", +"6 c #3E3D6F", +"7 c #FFFFFF", +"8 c #6D6D92", +"9 c #68678E", +"0 c #6B6A91", +"a c #696890", +"b c #6A698F", +"c c #68688F", +"d c #66658F", +"e c #6E6D95", +"f c #63628B", +"g c #B83243", +"h c #3D3C6F", +"i c #68678D", +"j c #6F6E93", +"k c #69688F", +"l c #6C6C92", +"m c #6B6A92", +"n c #6C6B91", +"o c #6D6C91", +"p c #696990", +"q c #6F6F93", +"r c #CF7681", +"s c #66658C", +"t c #6F6E94", +"u c #6A6990", +"v c #6E6D92", +"w c #6B6B8F", +"x c #6D6D91", +"y c #6D6C92", +"z c #6E6D94", +"A c #676690", +"B c #6F6E95", +"C c #65648D", +"D c #3C3B6E", +"E c #6A6991", +"F c #66658B", +"G c #66658E", +"H c #66668E", +"I c #67668E", +"J c #BD4352", +"K c #6C6C93", +"L c #6C6B90", +"M c #6A6A91", +"N c #68678F", +"O c #6F6E96", +"P c #64638C", +"Q c #CA6672", +"R c #65648B", +"S c #6C6C91", +"T c #6B6B91", +"U c #62628A", +"V c #66658D", +"W c #67668F", +"X c #64638D", +"Y c #6E6E95", +"Z c #C45462", +"` c #5E456E", +" . c #5F456E", +" ", +" ", +" ", +" ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". + @ # $ % & * = - ; > , ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". ) ! ~ { ] ^ / ] ~ ~ ~ ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". : < [ } | } 1 2 3 4 5 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". } 8 9 0 a b a c 0 d e f g g g g g g g g g g g g g g g g g g . ", +". h i j k l m n o p q 9 h r r r r r r r r r r r r r r r r r r . ", +". s t u v w x y k z A B C 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". D } E F 9 G H I [ 0 2 D J J J J J J J J J J J J J J J J J J . ", +". F B 9 K k L M N v H O P Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". D R z N S p b T G t C D 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". U t V m W u T W 8 X Y 3 Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". ` ` ` .` ` ` ` ` .` ` Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". J J J J J J J J J J J J J J J J J J J J J J J J J J J J J J . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". r r r r r r r r r r r r r r r r r r r r r r r r r r r r r r . ", +". g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 381d43f304..d67ac42ee0 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -64,12 +64,12 @@ static const char * Flag_Unknown_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".+@@++++@@++@@#+++@@++@@+++$%&*. ", ".+@@++++@@++@@@=++@@++@@++-;>,+. ", ".+@@++++@@++@@#'++@@++@@+)!~{++. ", @@ -84,11 +84,11 @@ static const char * Flag_Unknown_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; From f21f097e7a831e752ab36974897b2ba57e266dfc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 10 Jan 2013 21:44:12 -0500 Subject: [PATCH 382/627] Redundant line of code in VertexShaderManager::Dirty() Also cleaned it up. --- .../VideoCommon/Src/VertexShaderManager.cpp | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index d960710ada..84340c6b98 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -169,14 +169,24 @@ void VertexShaderManager::Shutdown() void VertexShaderManager::Dirty() { - nTransformMatricesChanged[0] = 0; nTransformMatricesChanged[1] = 256; - nNormalMatricesChanged[0] = 0; nNormalMatricesChanged[1] = 96; - nPostTransformMatricesChanged[0] = 0; nPostTransformMatricesChanged[1] = 256; - nLightsChanged[0] = 0; nLightsChanged[1] = 0x80; + nTransformMatricesChanged[0] = 0; + nTransformMatricesChanged[1] = 256; + + nNormalMatricesChanged[0] = 0; + nNormalMatricesChanged[1] = 96; + + nPostTransformMatricesChanged[0] = 0; + nPostTransformMatricesChanged[1] = 256; + + nLightsChanged[0] = 0; + nLightsChanged[1] = 0x80; + bPosNormalMatrixChanged = true; - bTexMatricesChanged[0] = bTexMatricesChanged[1] = true; + bTexMatricesChanged[0] = true; + bTexMatricesChanged[1] = true; + bProjectionChanged = true; - bPosNormalMatrixChanged = bTexMatricesChanged[0] = bTexMatricesChanged[1] = true; + nMaterialsChanged = 15; } From 80f4475e76be299e19ff88283d8f8aa02726506b Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 11 Jan 2013 14:03:09 +1100 Subject: [PATCH 383/627] Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend. DPL2 audio is decoded to 5.1. Code adapted from ffdshow. Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system. Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build. Fixes issue 3023. --- Externals/OpenAL/Win32/soft_oal.dll | Bin 0 -> 402553 bytes Externals/OpenAL/Win64/soft_oal.dll | Bin 0 -> 417320 bytes Externals/OpenAL/include/al.h | 1110 +++++++------- Externals/OpenAL/include/alc.h | 258 ++-- Externals/OpenAL/include/alext.h | 355 +++++ Externals/OpenAL/include/efx-creative.h | 154 +- Externals/OpenAL/include/efx-presets.h | 402 +++++ Externals/OpenAL/include/efx.h | 1336 +++++++++-------- Source/Core/AudioCommon/AudioCommon.vcxproj | 10 +- .../AudioCommon/AudioCommon.vcxproj.filters | 2 + Source/Core/AudioCommon/CMakeLists.txt | 1 + Source/Core/AudioCommon/Src/DPL2Decoder.cpp | 397 +++++ Source/Core/AudioCommon/Src/DPL2Decoder.h | 24 + Source/Core/AudioCommon/Src/OpenALStream.cpp | 85 +- Source/Core/AudioCommon/Src/OpenALStream.h | 6 +- Source/Core/Core/Src/ConfigManager.cpp | 2 + Source/Core/Core/Src/CoreParameter.cpp | 2 + Source/Core/Core/Src/CoreParameter.h | 2 + Source/Core/DolphinWX/Src/ConfigMain.cpp | 16 + Source/Core/DolphinWX/Src/ConfigMain.h | 2 + 20 files changed, 2598 insertions(+), 1566 deletions(-) create mode 100644 Externals/OpenAL/Win32/soft_oal.dll create mode 100644 Externals/OpenAL/Win64/soft_oal.dll create mode 100644 Externals/OpenAL/include/alext.h create mode 100644 Externals/OpenAL/include/efx-presets.h create mode 100644 Source/Core/AudioCommon/Src/DPL2Decoder.cpp create mode 100644 Source/Core/AudioCommon/Src/DPL2Decoder.h diff --git a/Externals/OpenAL/Win32/soft_oal.dll b/Externals/OpenAL/Win32/soft_oal.dll new file mode 100644 index 0000000000000000000000000000000000000000..71ced6a21f8add6fdbd7571a81d4c4a36eca3418 GIT binary patch literal 402553 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